Disable warning maybe-uninitialized via pragma in the Optional copy c…

…onstructor
project-chip · Jan 27, 2022 · bf11e62 · bf11e62
1 parent a3369af
commit bf11e62
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/examples/all-clusters-app/esp32/CMakeLists.txt b/examples/all-clusters-app/esp32/CMakeLists.txt
@@ -32,7 +32,7 @@ if(${IDF_TARGET} STREQUAL "esp32")
 endif()
 
 project(chip-all-clusters-app)
-idf_build_set_property(CXX_COMPILE_OPTIONS "-std=gnu++17;-Os;-Wno-maybe-uninitialized;-DLWIP_IPV6_SCOPES=0;-DCHIP_HAVE_CONFIG_H" APPEND)
+idf_build_set_property(CXX_COMPILE_OPTIONS "-std=gnu++17;-Os;-DLWIP_IPV6_SCOPES=0;-DCHIP_HAVE_CONFIG_H" APPEND)
 idf_build_set_property(C_COMPILE_OPTIONS "-Os;-DLWIP_IPV6_SCOPES=0" APPEND)
 # For the C3, project_include.cmake sets -Wno-format, but does not clear various
 # flags that depend on -Wformat

diff --git a/src/lib/core/Optional.h b/src/lib/core/Optional.h
@@ -68,7 +68,14 @@ class Optional
     {
         if (mHasValue)
         {
+#pragma GCC diagnostic push
+#if __GNUC__ && defined(__has_warning)
+#if __has_warning("-Wmaybe-uninitialized")
+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#endif
+#endif
             new (&mValue.mData) T(other.mValue.mData);
+#pragma GCC diagnostic pop
         }
     }