From 49b52644602958ed3492ead85c1b73d15e3be016 Mon Sep 17 00:00:00 2001 From: superfunc Date: Mon, 7 May 2018 07:12:16 -0700 Subject: [PATCH] [Ar] Replace boost noncopyable. Further reduce dependence on boost in hopes of a brighter future of magnificent compile times. --- pxr/usd/lib/ar/resolver.h | 6 ++++-- pxr/usd/lib/ar/resolverScopedCache.h | 7 +++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pxr/usd/lib/ar/resolver.h b/pxr/usd/lib/ar/resolver.h index 497d2ccd23..7c2b2f502c 100644 --- 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 #include #include #include @@ -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 index bd720d5935..ea1ac24a76 100644 --- 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 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