diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/wrapTranslatorBase.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/wrapTranslatorBase.cpp index a38060c50c..1390f1aa7a 100644 --- a/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/wrapTranslatorBase.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/wrapTranslatorBase.cpp @@ -25,6 +25,7 @@ #include #include #include +#include #include #include @@ -378,5 +379,9 @@ void wrapTranslatorBase() MStatusFromPythonBool::Register(); } +// This macro was removed in USD 23.08. It was only needed to support +// Visual Studio 2015, which USD itself no longer supports. +#if PXR_VERSION < 2308 TF_REFPTR_CONST_VOLATILE_GET(TranslatorBaseWrapper) TF_REFPTR_CONST_VOLATILE_GET(TranslatorBase) +#endif diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/wrapTranslatorContext.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/wrapTranslatorContext.cpp index 51b99ba757..7092b0fd5a 100644 --- a/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/wrapTranslatorContext.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/fileio/translators/wrapTranslatorContext.cpp @@ -19,6 +19,7 @@ #include #include +#include #include #include @@ -163,4 +164,8 @@ void wrapTranslatorContext() .def("insertItem", &_insertItem); } +// This macro was removed in USD 23.08. It was only needed to support +// Visual Studio 2015, which USD itself no longer supports. +#if PXR_VERSION < 2308 TF_REFPTR_CONST_VOLATILE_GET(TranslatorContext) +#endif diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/wrapLayerManager.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/wrapLayerManager.cpp index a3243fc6b6..1b7fa21a1f 100644 --- a/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/wrapLayerManager.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/wrapLayerManager.cpp @@ -32,6 +32,7 @@ #endif #include +#include #include @@ -102,4 +103,8 @@ void wrapLayerManager() .def("getLayerIdentifiers", PyLayerManager::getLayerIdentifiers); } +// This macro was removed in USD 23.08. It was only needed to support +// Visual Studio 2015, which USD itself no longer supports. +#if PXR_VERSION < 2308 TF_REFPTR_CONST_VOLATILE_GET(LayerManager) +#endif diff --git a/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/wrapProxyShape.cpp b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/wrapProxyShape.cpp index 070f40dddb..896c82d5de 100644 --- a/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/wrapProxyShape.cpp +++ b/plugin/al/lib/AL_USDMaya/AL/usdmaya/nodes/wrapProxyShape.cpp @@ -486,6 +486,11 @@ void wrapProxyShape() // The best place to put this fix would be in pxr/base/lib/tf/refPtr.h // where TF_REFPTR_CONST_VOLATILE_GET is defined, but for now we are // patching it locally. +// +// This macro was removed in USD 23.08. It was only needed to support +// Visual Studio 2015, which USD itself no longer supports. +#if PXR_VERSION < 2308 #if defined(ARCH_COMPILER_MSVC) && ARCH_COMPILER_MSVC_VERSION <= 1910 TF_REFPTR_CONST_VOLATILE_GET(ProxyShape) #endif +#endif