Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Ar] Replace boost noncopyable. #481

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions pxr/usd/lib/ar/resolver.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@

#include "pxr/pxr.h"
#include "pxr/usd/ar/api.h"
#include <boost/noncopyable.hpp>
#include <memory>
#include <string>
#include <vector>
Expand All @@ -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
Expand Down
7 changes: 5 additions & 2 deletions pxr/usd/lib/ar/resolverScopedCache.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down