Update more build configs to c++17. (#28296)

project-chip · Feb 7, 2024 · a22cc5c · a22cc5c
1 parent b984a02
commit a22cc5c
Show file tree

Hide file tree

Showing 31 changed files with 31 additions and 31 deletions.
diff --git a/config/telink/app/zephyr.conf b/config/telink/app/zephyr.conf
@@ -15,7 +15,7 @@
 #
 
 CONFIG_CHIP=y
-CONFIG_STD_CPP14=y
+CONFIG_STD_CPP17=y
 
 # Logging (set CONFIG_SERIAL to 'y' to enable logging and 'n' to disable logging)
 CONFIG_SERIAL=y

diff --git a/examples/all-clusters-app/nrfconnect/prj.conf b/examples/all-clusters-app/nrfconnect/prj.conf
@@ -23,7 +23,7 @@ CONFIG_CHIP=y
 CONFIG_CHIP_PROJECT_CONFIG="main/include/CHIPProjectConfig.h"
 # CHIP PID: 32769 == 0x8001 (all-clusters-app)
 CONFIG_CHIP_DEVICE_PRODUCT_ID=32769
-CONFIG_STD_CPP14=y
+CONFIG_STD_CPP17=y
 
 # Add support for LEDs and buttons on Nordic development kits
 CONFIG_DK_LIBRARY=y

diff --git a/examples/all-clusters-app/nrfconnect/prj_dfu.conf b/examples/all-clusters-app/nrfconnect/prj_dfu.conf
@@ -22,7 +22,7 @@ CONFIG_CHIP=y
 CONFIG_CHIP_PROJECT_CONFIG="main/include/CHIPProjectConfig.h"
 # CHIP PID: 32769 == 0x8001 (all-clusters-app)
 CONFIG_CHIP_DEVICE_PRODUCT_ID=32769
-CONFIG_STD_CPP14=y
+CONFIG_STD_CPP17=y
 
 # Add support for LEDs and buttons on Nordic development kits
 CONFIG_DK_LIBRARY=y

diff --git a/examples/all-clusters-app/nrfconnect/prj_release.conf b/examples/all-clusters-app/nrfconnect/prj_release.conf
@@ -23,7 +23,7 @@ CONFIG_CHIP=y
 CONFIG_CHIP_PROJECT_CONFIG="main/include/CHIPProjectConfig.h"
 # CHIP PID: 32769 == 0x8001 (all-clusters-app)
 CONFIG_CHIP_DEVICE_PRODUCT_ID=32769
-CONFIG_STD_CPP14=y
+CONFIG_STD_CPP17=y
 
 # Add support for LEDs and buttons on Nordic development kits
 CONFIG_DK_LIBRARY=y

diff --git a/examples/all-clusters-minimal-app/nrfconnect/prj.conf b/examples/all-clusters-minimal-app/nrfconnect/prj.conf
@@ -23,7 +23,7 @@ CONFIG_CHIP=y
 CONFIG_CHIP_PROJECT_CONFIG="main/include/CHIPProjectConfig.h"
 # CHIP PID: 32769 == 0x8001 (all-clusters-app-minimal)
 CONFIG_CHIP_DEVICE_PRODUCT_ID=32769
-CONFIG_STD_CPP14=y
+CONFIG_STD_CPP17=y
 
 # Add support for LEDs and buttons on Nordic development kits
 CONFIG_DK_LIBRARY=y

diff --git a/examples/all-clusters-minimal-app/nrfconnect/prj_dfu.conf b/examples/all-clusters-minimal-app/nrfconnect/prj_dfu.conf
@@ -23,7 +23,7 @@ CONFIG_CHIP=y
 CONFIG_CHIP_PROJECT_CONFIG="main/include/CHIPProjectConfig.h"
 # CHIP PID: 32769 == 0x8001 (all-clusters-minimal-app)
 CONFIG_CHIP_DEVICE_PRODUCT_ID=32769
-CONFIG_STD_CPP14=y
+CONFIG_STD_CPP17=y
 
 # Add support for LEDs and buttons on Nordic development kits
 CONFIG_DK_LIBRARY=y

diff --git a/examples/all-clusters-minimal-app/nrfconnect/prj_release.conf b/examples/all-clusters-minimal-app/nrfconnect/prj_release.conf
@@ -23,7 +23,7 @@ CONFIG_CHIP=y
 CONFIG_CHIP_PROJECT_CONFIG="main/include/CHIPProjectConfig.h"
 # CHIP PID: 32769 == 0x8001 (all-clusters-app-minimal)
 CONFIG_CHIP_DEVICE_PRODUCT_ID=32769
-CONFIG_STD_CPP14=y
+CONFIG_STD_CPP17=y
 
 # Add support for LEDs and buttons on Nordic development kits
 CONFIG_DK_LIBRARY=y

diff --git a/examples/bridge-app/esp32/main/CMakeLists.txt b/examples/bridge-app/esp32/main/CMakeLists.txt
@@ -58,7 +58,7 @@ include("${CHIP_ROOT}/build/chip/esp32/esp32_codegen.cmake")
 chip_app_component_codegen("${CHIP_ROOT}/examples/bridge-app/bridge-common/bridge-app.matter")
 chip_app_component_zapgen("${CHIP_ROOT}/examples/bridge-app/bridge-common/bridge-app.zap")
 
-set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 14)
+set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 17)
 target_compile_options(${COMPONENT_LIB} PRIVATE "-DCHIP_HAVE_CONFIG_H")
 target_compile_options(${COMPONENT_LIB} PUBLIC
            "-DCHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=<lib/address_resolve/AddressResolve_DefaultImpl.h>"

diff --git a/examples/chef/nrfconnect/prj.conf b/examples/chef/nrfconnect/prj.conf
@@ -15,7 +15,7 @@
 #
 
 CONFIG_CHIP=y
-CONFIG_STD_CPP14=y
+CONFIG_STD_CPP17=y
 
 # This sample uses Kconfig.defaults to set options common for all
 # samples. This file should contain only options specific for this sample

diff --git a/examples/light-switch-app/nrfconnect/prj.conf b/examples/light-switch-app/nrfconnect/prj.conf
@@ -23,7 +23,7 @@ CONFIG_CHIP=y
 CONFIG_CHIP_PROJECT_CONFIG="main/include/CHIPProjectConfig.h"
 # 32772 == 0x8004 (example light-switch-app)
 CONFIG_CHIP_DEVICE_PRODUCT_ID=32772
-CONFIG_STD_CPP14=y
+CONFIG_STD_CPP17=y
 
 # Add support for LEDs and buttons on Nordic development kits
 CONFIG_DK_LIBRARY=y

diff --git a/examples/light-switch-app/nrfconnect/prj_no_dfu.conf b/examples/light-switch-app/nrfconnect/prj_no_dfu.conf
@@ -23,7 +23,7 @@ CONFIG_CHIP=y
 CONFIG_CHIP_PROJECT_CONFIG="main/include/CHIPProjectConfig.h"
 # 32772 == 0x8004 (example light-switch-app)
 CONFIG_CHIP_DEVICE_PRODUCT_ID=32772
-CONFIG_STD_CPP14=y
+CONFIG_STD_CPP17=y
 
 # Add support for LEDs and buttons on Nordic development kits
 CONFIG_DK_LIBRARY=y

diff --git a/examples/light-switch-app/nrfconnect/prj_release.conf b/examples/light-switch-app/nrfconnect/prj_release.conf
@@ -23,7 +23,7 @@ CONFIG_CHIP=y
 CONFIG_CHIP_PROJECT_CONFIG="main/include/CHIPProjectConfig.h"
 # 32772 == 0x8004 (example light-switch-app)
 CONFIG_CHIP_DEVICE_PRODUCT_ID=32772
-CONFIG_STD_CPP14=y
+CONFIG_STD_CPP17=y
 
 # Add support for LEDs and buttons on Nordic development kits
 CONFIG_DK_LIBRARY=y

diff --git a/examples/lighting-app/nrfconnect/prj.conf b/examples/lighting-app/nrfconnect/prj.conf
@@ -23,7 +23,7 @@ CONFIG_CHIP=y
 CONFIG_CHIP_PROJECT_CONFIG="main/include/CHIPProjectConfig.h"
 # 32773 == 0x8005 (example lighting-app)
 CONFIG_CHIP_DEVICE_PRODUCT_ID=32773
-CONFIG_STD_CPP14=y
+CONFIG_STD_CPP17=y
 
 # Enable CHIP pairing automatically on application start.
 CONFIG_CHIP_ENABLE_PAIRING_AUTOSTART=y

diff --git a/examples/lighting-app/nrfconnect/prj_no_dfu.conf b/examples/lighting-app/nrfconnect/prj_no_dfu.conf
@@ -23,7 +23,7 @@ CONFIG_CHIP=y
 CONFIG_CHIP_PROJECT_CONFIG="main/include/CHIPProjectConfig.h"
 # 32773 == 0x8005 (example lighting-app)
 CONFIG_CHIP_DEVICE_PRODUCT_ID=32773
-CONFIG_STD_CPP14=y
+CONFIG_STD_CPP17=y
 
 # Enable CHIP pairing automatically on application start.
 CONFIG_CHIP_ENABLE_PAIRING_AUTOSTART=y

diff --git a/examples/lighting-app/nrfconnect/prj_release.conf b/examples/lighting-app/nrfconnect/prj_release.conf
@@ -23,7 +23,7 @@ CONFIG_CHIP=y
 CONFIG_CHIP_PROJECT_CONFIG="main/include/CHIPProjectConfig.h"
 # 32773 == 0x8005 (example lighting-app)
 CONFIG_CHIP_DEVICE_PRODUCT_ID=32773
-CONFIG_STD_CPP14=y
+CONFIG_STD_CPP17=y
 
 # Enable CHIP pairing automatically on application start.
 CONFIG_CHIP_ENABLE_PAIRING_AUTOSTART=y

diff --git a/examples/lock-app/nrfconnect/prj.conf b/examples/lock-app/nrfconnect/prj.conf
@@ -23,7 +23,7 @@ CONFIG_CHIP=y
 CONFIG_CHIP_PROJECT_CONFIG="main/include/CHIPProjectConfig.h"
 # 32774 == 0x8006 (example lock-app)
 CONFIG_CHIP_DEVICE_PRODUCT_ID=32774
-CONFIG_STD_CPP14=y
+CONFIG_STD_CPP17=y
 
 # Add support for LEDs and buttons on Nordic development kits
 CONFIG_DK_LIBRARY=y

diff --git a/examples/lock-app/nrfconnect/prj_no_dfu.conf b/examples/lock-app/nrfconnect/prj_no_dfu.conf
@@ -23,7 +23,7 @@ CONFIG_CHIP=y
 CONFIG_CHIP_PROJECT_CONFIG="main/include/CHIPProjectConfig.h"
 # 32774 == 0x8006 (example lock-app)
 CONFIG_CHIP_DEVICE_PRODUCT_ID=32774
-CONFIG_STD_CPP14=y
+CONFIG_STD_CPP17=y
 
 # Add support for LEDs and buttons on Nordic development kits
 CONFIG_DK_LIBRARY=y

diff --git a/examples/lock-app/nrfconnect/prj_release.conf b/examples/lock-app/nrfconnect/prj_release.conf
@@ -23,7 +23,7 @@ CONFIG_CHIP=y
 CONFIG_CHIP_PROJECT_CONFIG="main/include/CHIPProjectConfig.h"
 # 32774 == 0x8006 (example lock-app)
 CONFIG_CHIP_DEVICE_PRODUCT_ID=32774
-CONFIG_STD_CPP14=y
+CONFIG_STD_CPP17=y
 
 # Add support for LEDs and buttons on Nordic development kits
 CONFIG_DK_LIBRARY=y

diff --git a/examples/ota-provider-app/esp32/main/CMakeLists.txt b/examples/ota-provider-app/esp32/main/CMakeLists.txt
@@ -62,7 +62,7 @@ chip_app_component_codegen("${CHIP_ROOT}/examples/ota-provider-app/ota-provider-
 chip_app_component_zapgen("${CHIP_ROOT}/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap")
 
 spiffs_create_partition_image(img_storage ${CMAKE_SOURCE_DIR}/spiffs_image FLASH_IN_PROJECT)
-set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 14)
+set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 17)
 target_compile_options(${COMPONENT_LIB} PRIVATE "-DCHIP_HAVE_CONFIG_H")
 target_compile_options(${COMPONENT_LIB} PUBLIC
            "-DCHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=<lib/address_resolve/AddressResolve_DefaultImpl.h>"

diff --git a/examples/persistent-storage/esp32/main/CMakeLists.txt b/examples/persistent-storage/esp32/main/CMakeLists.txt
@@ -23,5 +23,5 @@ idf_component_register(PRIV_INCLUDE_DIRS
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/persistent-storage"
                       PRIV_REQUIRES chip nvs_flash)
 
-set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 14)
+set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 17)
 target_compile_options(${COMPONENT_LIB} PRIVATE "-DCHIP_HAVE_CONFIG_H")
diff --git a/examples/pump-app/nrfconnect/prj.conf b/examples/pump-app/nrfconnect/prj.conf
@@ -23,7 +23,7 @@ CONFIG_CHIP=y
 CONFIG_CHIP_PROJECT_CONFIG="main/include/CHIPProjectConfig.h"
 # 32784 == 0x8010 (example pump-app)
 CONFIG_CHIP_DEVICE_PRODUCT_ID=32784
-CONFIG_STD_CPP14=y
+CONFIG_STD_CPP17=y
 
 # Add support for LEDs and buttons on Nordic development kits
 CONFIG_DK_LIBRARY=y

diff --git a/examples/pump-app/nrfconnect/prj_no_dfu.conf b/examples/pump-app/nrfconnect/prj_no_dfu.conf
@@ -23,7 +23,7 @@ CONFIG_CHIP=y
 CONFIG_CHIP_PROJECT_CONFIG="main/include/CHIPProjectConfig.h"
 # 32784 == 0x8010 (example pump-app)
 CONFIG_CHIP_DEVICE_PRODUCT_ID=32784
-CONFIG_STD_CPP14=y
+CONFIG_STD_CPP17=y
 
 # Add support for LEDs and buttons on Nordic development kits
 CONFIG_DK_LIBRARY=y

diff --git a/examples/pump-app/nrfconnect/prj_release.conf b/examples/pump-app/nrfconnect/prj_release.conf
@@ -23,7 +23,7 @@ CONFIG_CHIP=y
 CONFIG_CHIP_PROJECT_CONFIG="main/include/CHIPProjectConfig.h"
 # 32784 == 0x8010 (example pump-app)
 CONFIG_CHIP_DEVICE_PRODUCT_ID=32784
-CONFIG_STD_CPP14=y
+CONFIG_STD_CPP17=y
 
 # Add support for LEDs and buttons on Nordic development kits
 CONFIG_DK_LIBRARY=y

diff --git a/examples/pump-controller-app/nrfconnect/prj.conf b/examples/pump-controller-app/nrfconnect/prj.conf
@@ -23,7 +23,7 @@ CONFIG_CHIP=y
 CONFIG_CHIP_PROJECT_CONFIG="main/include/CHIPProjectConfig.h"
 # 32785 == 0x8011 (example pump-controller-app)
 CONFIG_CHIP_DEVICE_PRODUCT_ID=32785
-CONFIG_STD_CPP14=y
+CONFIG_STD_CPP17=y
 
 # Add support for LEDs and buttons on Nordic development kits
 CONFIG_DK_LIBRARY=y

diff --git a/examples/pump-controller-app/nrfconnect/prj_no_dfu.conf b/examples/pump-controller-app/nrfconnect/prj_no_dfu.conf
@@ -24,7 +24,7 @@ CONFIG_CHIP_PROJECT_CONFIG="main/include/CHIPProjectConfig.h"
 # 32785 == 0x8011 (example pump-controller-app)
 CONFIG_CHIP_DEVICE_PRODUCT_ID=32785
 
-CONFIG_STD_CPP14=y
+CONFIG_STD_CPP17=y
 
 # Add support for LEDs and buttons on Nordic development kits
 CONFIG_DK_LIBRARY=y

diff --git a/examples/pump-controller-app/nrfconnect/prj_release.conf b/examples/pump-controller-app/nrfconnect/prj_release.conf
@@ -24,7 +24,7 @@ CONFIG_CHIP_PROJECT_CONFIG="main/include/CHIPProjectConfig.h"
 # 32785 == 0x8011 (example pump-controller-app)
 CONFIG_CHIP_DEVICE_PRODUCT_ID=32785
 
-CONFIG_STD_CPP14=y
+CONFIG_STD_CPP17=y
 
 # Add support for LEDs and buttons on Nordic development kits
 CONFIG_DK_LIBRARY=y

diff --git a/examples/shell/nrfconnect/prj.conf b/examples/shell/nrfconnect/prj.conf
@@ -15,7 +15,7 @@
 #
 
 CONFIG_CHIP=y
-CONFIG_STD_CPP14=y
+CONFIG_STD_CPP17=y
 
 # This sample uses Kconfig.defaults to set options common for all
 # samples. This file should contain only options specific for this sample

diff --git a/examples/window-app/nrfconnect/prj.conf b/examples/window-app/nrfconnect/prj.conf
@@ -19,7 +19,7 @@ CONFIG_CHIP=y
 CONFIG_CHIP_PROJECT_CONFIG="main/include/CHIPProjectConfig.h"
 # 32784 == 0x8010 (example window-app)
 CONFIG_CHIP_DEVICE_PRODUCT_ID=32784
-CONFIG_STD_CPP14=y
+CONFIG_STD_CPP17=y
 
 # Add support for LEDs and buttons on Nordic development kits
 CONFIG_DK_LIBRARY=y

diff --git a/examples/window-app/nrfconnect/prj_no_dfu.conf b/examples/window-app/nrfconnect/prj_no_dfu.conf
@@ -23,7 +23,7 @@ CONFIG_CHIP=y
 CONFIG_CHIP_PROJECT_CONFIG="main/include/CHIPProjectConfig.h"
 # 32784 == 0x8010 (example window-app)
 CONFIG_CHIP_DEVICE_PRODUCT_ID=32784
-CONFIG_STD_CPP14=y
+CONFIG_STD_CPP17=y
 
 # Add support for LEDs and buttons on Nordic development kits
 CONFIG_DK_LIBRARY=y

diff --git a/examples/window-app/nrfconnect/prj_release.conf b/examples/window-app/nrfconnect/prj_release.conf
@@ -23,7 +23,7 @@ CONFIG_CHIP=y
 CONFIG_CHIP_PROJECT_CONFIG="main/include/CHIPProjectConfig.h"
 # 32784 == 0x8010 (example window-app)
 CONFIG_CHIP_DEVICE_PRODUCT_ID=32784
-CONFIG_STD_CPP14=y
+CONFIG_STD_CPP17=y
 
 # Add support for LEDs and buttons on Nordic development kits
 CONFIG_DK_LIBRARY=y

diff --git a/src/test_driver/nrfconnect/prj.conf b/src/test_driver/nrfconnect/prj.conf
@@ -84,7 +84,7 @@ CONFIG_INIT_STACKS=y
 CONFIG_REBOOT=n
 
 # Build as C++14
-CONFIG_STD_CPP14=y
+CONFIG_STD_CPP17=y
 
 # CHIP configuration
 CONFIG_CHIP=y