Fix calling default constructor by uniform init. (AcademySoftwareFoun…

…dation#340) I fixed calling default constructor in ImathTypeTraits.h by using uniform initialization. Signed-off-by: Yuya Asano <[email protected]>
cary-ilm · Jan 23, 2024 · 2254432 · 2254432
1 parent 237a81e
commit 2254432
Showing 1 changed file with 30 additions and 21 deletions.
diff --git a/src/Imath/ImathTypeTraits.h b/src/Imath/ImathTypeTraits.h
@@ -86,10 +86,11 @@ struct has_xy {
     typedef char No[2];
 
     // Valid only if .x, .y exist and are the right type: return a Yes.
-    template<typename C,
-             IMATH_ENABLE_IF(std::is_same<decltype(C().x), Base>::value),
-             IMATH_ENABLE_IF(std::is_same<decltype(C().y), Base>::value)>
-    static Yes& test(int);
+    template <
+        typename C,
+        IMATH_ENABLE_IF (std::is_same<decltype (C {}.x), Base>::value),
+        IMATH_ENABLE_IF (std::is_same<decltype (C {}.y), Base>::value)>
+    static Yes& test (int);
 
     // Fallback, default to returning a No.
     template<typename C> static No& test(...);
@@ -110,11 +111,12 @@ struct has_xyz {
     typedef char No[2];
 
     // Valid only if .x, .y, .z exist and are the right type: return a Yes.
-    template<typename C,
-             IMATH_ENABLE_IF(std::is_same<decltype(C().x), Base>::value),
-             IMATH_ENABLE_IF(std::is_same<decltype(C().y), Base>::value),
-             IMATH_ENABLE_IF(std::is_same<decltype(C().z), Base>::value)>
-    static Yes& test(int);
+    template <
+        typename C,
+        IMATH_ENABLE_IF (std::is_same<decltype (C {}.x), Base>::value),
+        IMATH_ENABLE_IF (std::is_same<decltype (C {}.y), Base>::value),
+        IMATH_ENABLE_IF (std::is_same<decltype (C {}.z), Base>::value)>
+    static Yes& test (int);
 
     // Fallback, default to returning a No.
     template<typename C> static No& test(...);
@@ -135,12 +137,13 @@ struct has_xyzw {
     typedef char No[2];
 
     // Valid only if .x, .y, .z, .w exist and are the right type: return a Yes.
-    template<typename C,
-             IMATH_ENABLE_IF(std::is_same<decltype(C().x), Base>::value),
-             IMATH_ENABLE_IF(std::is_same<decltype(C().y), Base>::value),
-             IMATH_ENABLE_IF(std::is_same<decltype(C().z), Base>::value),
-             IMATH_ENABLE_IF(std::is_same<decltype(C().w), Base>::value)>
-    static Yes& test(int);
+    template <
+        typename C,
+        IMATH_ENABLE_IF (std::is_same<decltype (C {}.x), Base>::value),
+        IMATH_ENABLE_IF (std::is_same<decltype (C {}.y), Base>::value),
+        IMATH_ENABLE_IF (std::is_same<decltype (C {}.z), Base>::value),
+        IMATH_ENABLE_IF (std::is_same<decltype (C {}.w), Base>::value)>
+    static Yes& test (int);
 
     // Fallback, default to returning a No.
     template<typename C> static No& test(...);
@@ -162,9 +165,12 @@ struct has_subscript {
     typedef char No[2];
 
     // Valid only if T[] is possible and is the right type: return a Yes.
-    template<typename C,
-             IMATH_ENABLE_IF(std::is_same<typename std::decay<decltype(C()[0])>::type, Base>::value)>
-    static Yes& test(int);
+    template <
+        typename C,
+        IMATH_ENABLE_IF (std::is_same<
+                         typename std::decay<decltype (C {}[0])>::type,
+                         Base>::value)>
+    static Yes& test (int);
 
     // Fallback, default to returning a No.
     template<typename C> static No& test(...);
@@ -191,9 +197,12 @@ struct has_double_subscript {
     typedef char No[2];
 
     // Valid only if T[][] is possible and is the right type: return a Yes.
-    template<typename C,
-             IMATH_ENABLE_IF(std::is_same<typename std::decay<decltype(C()[0][0])>::type, Base>::value)>
-    static Yes& test(int);
+    template <
+        typename C,
+        IMATH_ENABLE_IF (std::is_same<
+                         typename std::decay<decltype (C {}[0][0])>::type,
+                         Base>::value)>
+    static Yes& test (int);
 
     // Fallback, default to returning a No.
     template<typename C> static No& test(...);