Allow combined version macro in preprocessor (#2270)

Fixes #2269

Author: JGamache-autodesk

source/MaterialXCore/Library.h

@@ -21,8 +21,8 @@
 
 #include <MaterialXCore/Generated.h>
 
-#define MATERIALX_GENERATE_INDEX(major, minor, build) \
-    ((((uint32_t)(major)) << 22U) | (((uint32_t)(minor)) << 12U) | ((uint32_t)(build)))
+#define MATERIALX_GENERATE_INDEX(major, minor, build) (((major) << 22U) | ((minor) << 12U) | (build))
+
 #define MATERIALX_VERSION_INDEX \
     MATERIALX_GENERATE_INDEX(MATERIALX_MAJOR_VERSION, MATERIALX_MINOR_VERSION, MATERIALX_BUILD_VERSION)
 

source/MaterialXTest/MaterialXCore/CoreUtil.cpp

@@ -12,8 +12,15 @@ namespace mx = MaterialX;
 
 TEST_CASE("Version comparison", "[coreutil]")
 {
-    // Test for version comparison
+    // Test for version comparison (C++ context)
     REQUIRE(MATERIALX_VERSION_INDEX > MATERIALX_GENERATE_INDEX(1, 38, 8));
+
+    // Test for version comparison (preprocessor context)
+#if MATERIALX_VERSION_INDEX > MATERIALX_GENERATE_INDEX(1, 38, 8)
+    REQUIRE(true);
+#else
+    REQUIRE(false);
+#endif
 }
 
 TEST_CASE("String utilities", "[coreutil]")