Merge pull request #481 from superfunc/boostCleanupNonCopyAr

[Ar] Replace boost noncopyable. (Internal change: 1891914)
PixarAnimationStudios · Sep 10, 2018 · 31020a3 · 31020a3
2 parents 423e66b + 49b5264
commit 31020a3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/pxr/usd/lib/ar/resolver.h b/pxr/usd/lib/ar/resolver.h
@@ -28,7 +28,6 @@
 
 #include "pxr/pxr.h"
 #include "pxr/usd/ar/api.h"
-#include <boost/noncopyable.hpp>
 #include <memory>
 #include <string>
 #include <vector>
@@ -52,12 +51,15 @@ class VtValue;
 /// Clients may use #ArGetResolver to access the configured asset resolver.
 ///
 class ArResolver 
-    : public boost::noncopyable
 {
 public:
     AR_API
     virtual ~ArResolver();
 
+    // Disallow copies
+    ArResolver(const ArResolver&) = delete;
+    ArResolver& operator=(const ArResolver&) = delete;
+
     // --------------------------------------------------------------------- //
     /// \anchor ArResolver_resolution
     /// \name Path Resolution Operations

diff --git a/pxr/usd/lib/ar/resolverScopedCache.h b/pxr/usd/lib/ar/resolverScopedCache.h
@@ -29,7 +29,6 @@
 #include "pxr/pxr.h"
 #include "pxr/usd/ar/api.h"
 #include "pxr/base/vt/value.h"
-#include <boost/noncopyable.hpp>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
@@ -45,9 +44,13 @@ PXR_NAMESPACE_OPEN_SCOPE
 ///
 /// \see \ref ArResolver_scopedCache "Scoped Resolution Cache"
 class ArResolverScopedCache
-    : public boost::noncopyable
 {
 public:
+
+    // Disallow copies
+    ArResolverScopedCache(const ArResolverScopedCache&) = delete;
+    ArResolverScopedCache& operator=(const ArResolverScopedCache&) = delete;
+
     /// Begin an asset resolver cache scope. 
     ///
     /// Calls ArResolver::BeginCacheScope on the configured asset resolver