Fix compliation of TestSWMaterialSaver DirectX operator==

nieznanysprawiciel · Oct 12, 2024 · 74be88f · 74be88f
1 parent 98f2653
commit 74be88f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/swCommonLib/Common/Macros/GenerateOperators.h b/swCommonLib/Common/Macros/GenerateOperators.h
@@ -17,11 +17,12 @@ namespace sw
 #define _APPEND_INSTANCE_OBJ2( member ) _APPEND_INSTANCE( obj2, member )
 
 #define _GENERATE_OPERATOR( OP, ClassType, ... ) \
-inline bool     operator##OP( const ClassType& obj1, const ClassType& obj2 )\
-{                                                                           \
-    return std::tie( FOR_EACH( _APPEND_INSTANCE_OBJ1, __VA_ARGS__ ) )       \
-        OP std::tie( FOR_EACH( _APPEND_INSTANCE_OBJ2, __VA_ARGS__ ) );      \
-}
+inline static bool     operator##OP( const ClassType& obj1, const ClassType& obj2 ) \
+{                                                                                   \
+    return std::tie( FOR_EACH( _APPEND_INSTANCE_OBJ1, __VA_ARGS__ ) )               \
+        OP std::tie( FOR_EACH( _APPEND_INSTANCE_OBJ2, __VA_ARGS__ ) );              \
+}                                                                                   \
+
 
 /**@brief Generates operator== function for ClassType.
 Pass all class members as variadic parameters.*/

diff --git a/swGraphicAPI/Tests/TestMaterial/TestSWMaterialSaver.cpp b/swGraphicAPI/Tests/TestMaterial/TestSWMaterialSaver.cpp
@@ -27,8 +27,10 @@ using namespace sw;
 //			Material test utils	
 //====================================================================================//
 
-GENERATE_RELATIONAL_OPERATORS( DirectX::XMFLOAT3, x, y, z );
-GENERATE_RELATIONAL_OPERATORS( DirectX::XMFLOAT4, x, y, z, w );
+namespace DirectX {
+    GENERATE_RELATIONAL_OPERATORS(DirectX::XMFLOAT3, x, y, z);
+    GENERATE_RELATIONAL_OPERATORS(DirectX::XMFLOAT4, x, y, z, w);
+}
 
 
 // ================================ //