move function into anonymous namespace, and rebase onto latest dev

Autodesk · Feb 11, 2020 · c2ccc0d · c2ccc0d
1 parent de5b63c
commit c2ccc0d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/Version.h b/plugin/al/lib/AL_USDMaya/AL/usdmaya/Version.h
@@ -22,7 +22,7 @@
 
 #define AL_USDMAYA_VERSION_MAJOR 0
 #define AL_USDMAYA_VERSION_MINOR 39
-#define AL_USDMAYA_VERSION_PATCH 0
+#define AL_USDMAYA_VERSION_PATCH 1
 
 #define AL_USDMAYA_VERSION_STR xstr(AL_USDMAYA_VERSION_MAJOR) "." \
                                xstr(AL_USDMAYA_VERSION_MINOR) "." \

diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/TransformationMatrix.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/TransformationMatrix.cpp
@@ -31,18 +31,9 @@ PXR_NAMESPACE_USING_DIRECTIVE
 namespace AL {
 namespace usdmaya {
 namespace nodes {
-
+namespace {
 using AL::usdmaya::utils::UsdDataType;
 
-//----------------------------------------------------------------------------------------------------------------------
-const MTypeId TransformationMatrix::kTypeId(AL_USDMAYA_TRANSFORMATION_MATRIX);
-
-//----------------------------------------------------------------------------------------------------------------------
-MPxTransformationMatrix* TransformationMatrix::creator()
-{
-  return new TransformationMatrix;
-}
-
 //----------------------------------------------------------------------------------------------------------------------
 bool hasEmptyDefaultValue(const UsdGeomXformOp& op, UsdTimeCode time)
 {
@@ -57,6 +48,16 @@ bool hasEmptyDefaultValue(const UsdGeomXformOp& op, UsdTimeCode time)
   }
   return false;
 }
+} // anon
+
+//----------------------------------------------------------------------------------------------------------------------
+const MTypeId TransformationMatrix::kTypeId(AL_USDMAYA_TRANSFORMATION_MATRIX);
+
+//----------------------------------------------------------------------------------------------------------------------
+MPxTransformationMatrix* TransformationMatrix::creator()
+{
+  return new TransformationMatrix;
+}
 
 //----------------------------------------------------------------------------------------------------------------------
 TransformationMatrix::TransformationMatrix()