(USD Loader) Add pragmas to remove warnings in USD/TBB headers

Change-Id: I0344db75a965f936bec2ce1352006b458874df5d

diff --git a/dali-usd-loader/internal/usd-loader-impl.cpp b/dali-usd-loader/internal/usd-loader-impl.cpp
index 3f87e9dbf3127b9e4d02246e2ae368446a3a328b..889db753af4aafe196b44b713b7ff82add1e4196 100644 (file)
--- a/dali-usd-loader/internal/usd-loader-impl.cpp
+++ b/dali-usd-loader/internal/usd-loader-impl.cpp
@@ -21,6 +21,9 @@
 // EXTERNAL INCLUDES
 #include <dali/integration-api/debug.h>
 
+// Some TBB/USD headers produce compile warnings
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wclass-memaccess"
 #include <pxr/usd/usd/prim.h>
 #include <pxr/usd/usd/primRange.h>
 #include <pxr/usd/usd/stage.h>
@@ -34,6 +37,7 @@
 #include <pxr/usd/usdSkel/bindingAPI.h>
 #include <pxr/usd/usdSkel/root.h>
 #include <pxr/usd/usdSkel/skeleton.h>
+#pragma GCC diagnostic pop
 
 // INTERNAL INCLUDES
 #include <dali-scene3d/public-api/loader/load-result.h>

diff --git a/dali-usd-loader/internal/usd-material-processor.h b/dali-usd-loader/internal/usd-material-processor.h
index 00c2f5fec711b2cf82a2f467ecbc6720a1f684f4..ce486320afa52ce3652139d39443d002cccef535 100644 (file)
--- a/dali-usd-loader/internal/usd-material-processor.h
+++ b/dali-usd-loader/internal/usd-material-processor.h
@@ -19,7 +19,13 @@
 
 // EXTERNAL INCLUDES
 #include <dali/integration-api/debug.h>
+
+// Some TBB/USD headers produce compile warnings
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wclass-memaccess"
 #include <pxr/usd/usdShade/material.h>
+#pragma GCC diagnostic pop
+
 #include <string>
 
 // INTERNAL INCLUDES

diff --git a/dali-usd-loader/internal/usd-texture-converter.h b/dali-usd-loader/internal/usd-texture-converter.h
index 59f22fbd3a100b255b9b0e477cc182dc7676d811..081622b0f19389c959ad8f8b94ec42828c271616 100644 (file)
--- a/dali-usd-loader/internal/usd-texture-converter.h
+++ b/dali-usd-loader/internal/usd-texture-converter.h
@@ -19,7 +19,13 @@
 
 // EXTERNAL INCLUDES
 #include <dali/integration-api/debug.h>
+
+// Some TBB/USD headers produce compile warnings
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wclass-memaccess"
 #include <pxr/usd/usdShade/material.h>
+#pragma GCC diagnostic pop
+
 #include <string>
 
 // INTERNAL INCLUDES

diff --git a/dali-usd-loader/internal/utils.h b/dali-usd-loader/internal/utils.h
index b89dc4467a8f703640ec7d9cf221d6573bb13ef4..3e672dfd6cee6dc72f80b27d16415c2a65f4ca39 100644 (file)
--- a/dali-usd-loader/internal/utils.h
+++ b/dali-usd-loader/internal/utils.h
@@ -20,9 +20,14 @@
 // EXTERNAL INCLUDES
 #include <dali/public-api/math/matrix.h>
 
+// Some TBB/USD headers produce compile warnings
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wclass-memaccess"
 #include <pxr/usd/usd/attribute.h>
 #include <pxr/usd/usdGeom/primvar.h>
 #include <pxr/usd/usdShade/shader.h>
+#pragma GCC diagnostic pop
+
 #include <string>
 
 // INTERNAL INCLUDES