Correctly export TfStacked.

PixarAnimationStudios · Aug 18, 2016 · cd7567a · cd7567a
1 parent a976d1a
commit cd7567a
Show file tree

Hide file tree

Showing 9 changed files with 146 additions and 171 deletions.
diff --git a/pxr/base/lib/tf/stacked.h b/pxr/base/lib/tf/stacked.h
diff --git a/pxr/usd/lib/sdf/cleanupEnabler.h b/pxr/usd/lib/sdf/cleanupEnabler.h
@@ -63,8 +63,7 @@
 /// }
 /// \endcode
 ///
-class SdfCleanupEnabler : 
-    public TfStacked<SdfCleanupEnabler, /* thread safe */ false>
+TF_DECLARE_STACKED_CLASS(SdfCleanupEnabler, false, SDF_API)
 {
 public:
 

diff --git a/pxr/usd/lib/usd/stageCacheContext.h b/pxr/usd/lib/usd/stageCacheContext.h
@@ -117,7 +117,7 @@ enum UsdStageCacheContextBlockType
 /// UsdStageCacheContext objects that exist in one thread's stack do not
 /// influence calls to UsdStage::Open() from a different thread.
 ///
-class UsdStageCacheContext : public TfStacked<UsdStageCacheContext, true>
+TF_DECLARE_STACKED_CLASS(UsdStageCacheContext, true, USD_API)
 {
 public:
     /// \brief Bind a cache for calls to UsdStage::Open() to read from and write
@@ -154,6 +154,4 @@ class UsdStageCacheContext : public TfStacked<UsdStageCacheContext, true>
     UsdStageCacheContextBlockType _blockType;
 };
 
-// USD_API_TEMPLATE_CLASS(TfStacked<UsdStageCacheContext>);
-
 #endif // USD_STAGECACHECONTEXT_H
diff --git a/pxr/usd/lib/usd/wrapStageCacheContext.cpp b/pxr/usd/lib/usd/wrapStageCacheContext.cpp
@@ -35,10 +35,6 @@ using std::vector;
 
 using namespace boost::python;
 
-// XXX: NO!
-#include "pxr/base/tf/instantiateStacked.h"
-TF_INSTANTIATE_STACKED(UsdStageCacheContext);
-
 namespace {
 
 // Expose C++ RAII class as python context manager.

diff --git a/third_party/katana/lib/usdKatana/cache.cpp b/third_party/katana/lib/usdKatana/cache.cpp
@@ -45,10 +45,6 @@
 #include <regex.h>
 #endif
 
-// XXX: NO!
-#include "pxr/base/tf/instantiateStacked.h"
-TF_INSTANTIATE_STACKED(UsdStageCacheContext);
-
 TF_INSTANTIATE_SINGLETON(UsdKatanaCache);
 
 SdfLayerRefPtr&

diff --git a/third_party/maya/lib/usdMaya/proxyShape.cpp b/third_party/maya/lib/usdMaya/proxyShape.cpp
@@ -52,10 +52,6 @@
 
 #include <mutex>
 
-// XXX: NO!
-#include "pxr/base/tf/instantiateStacked.h"
-TF_INSTANTIATE_STACKED(UsdStageCacheContext);
-
 // Hydra performs its own high-performance frustum culling, so
 // we don't want to rely on Maya to do it on the CPU. AS such, the best
 // performance comes from telling Maya to pretend that every object has no

diff --git a/third_party/maya/lib/usdMaya/referenceAssembly.cpp b/third_party/maya/lib/usdMaya/referenceAssembly.cpp
@@ -67,10 +67,6 @@
 #include <string>
 #include <vector>
 
-// XXX: NO!
-#include "pxr/base/tf/instantiateStacked.h"
-TF_INSTANTIATE_STACKED(UsdStageCacheContext);
-
 TF_DEFINE_ENV_SETTING(PIXMAYA_USE_USD_REF_ASSEMBLIES, true,
                       "Uses USD scene assemblies for set dressing");
 

diff --git a/third_party/maya/lib/usdMaya/translatorModelAssembly.cpp b/third_party/maya/lib/usdMaya/translatorModelAssembly.cpp
@@ -64,10 +64,6 @@
 #include <string>
 #include <vector>
 
-// XXX: NO!
-#include "pxr/base/tf/instantiateStacked.h"
-TF_INSTANTIATE_STACKED(UsdStageCacheContext);
-
 TF_DEFINE_PRIVATE_TOKENS(_tokens,
     ((FilePathPlugName, "filePath"))
     ((PrimPathPlugName, "primPath"))

diff --git a/third_party/maya/lib/usdMaya/usdReadJob.cpp b/third_party/maya/lib/usdMaya/usdReadJob.cpp
@@ -55,10 +55,6 @@
 #include <string>
 #include <vector>
 
-// XXX: NO!
-#include "pxr/base/tf/instantiateStacked.h"
-TF_INSTANTIATE_STACKED(UsdStageCacheContext);
-
 // for now, we hard code this to use displayColor.  But maybe the more
 // appropriate thing to do is just to leave shadingMode a lone and pass
 // "displayColor" in from the UsdMayaRepresentationFull