From 5556680d956b8a3f18be3899eb3ca2bc64405bb8 Mon Sep 17 00:00:00 2001
From: superfunc <superfunc@users.noreply.github.com>
Date: Tue, 23 Jan 2018 12:06:08 -0800
Subject: [PATCH] [UsdImaging] Remove unnecessary boost::noncopyable

This leaves one in a wrap file in usdImaging(wrapGL), it
just removes them from C++ code in favor of standard constructs
(i.e. =delete, =default).
---
 pxr/usdImaging/lib/usdImaging/pch.h        |  1 -
 pxr/usdImaging/lib/usdImaging/valueCache.h |  7 ++++---
 pxr/usdImaging/lib/usdImagingGL/engine.h   | 10 ++++++++--
 pxr/usdImaging/lib/usdviewq/pch.h          |  1 -
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/pxr/usdImaging/lib/usdImaging/pch.h b/pxr/usdImaging/lib/usdImaging/pch.h
index f63e2878c0..5f8b1a6731 100644
--- a/pxr/usdImaging/lib/usdImaging/pch.h
+++ b/pxr/usdImaging/lib/usdImaging/pch.h
@@ -112,7 +112,6 @@
 #include <boost/mpl/remove.hpp>
 #include <boost/mpl/transform_view.hpp>
 #include <boost/mpl/vector.hpp>
-#include <boost/noncopyable.hpp>
 #include <boost/operators.hpp>
 #include <boost/optional.hpp>
 #include <boost/preprocessor.hpp>
diff --git a/pxr/usdImaging/lib/usdImaging/valueCache.h b/pxr/usdImaging/lib/usdImaging/valueCache.h
index 6fb5d7bfcd..f67c702564 100644
--- a/pxr/usdImaging/lib/usdImaging/valueCache.h
+++ b/pxr/usdImaging/lib/usdImaging/valueCache.h
@@ -38,8 +38,6 @@
 #include "pxr/base/gf/vec4f.h"
 #include "pxr/base/tf/token.h"
 
-#include <boost/noncopyable.hpp>
-
 #include <tbb/concurrent_unordered_map.h>
 #include <tbb/concurrent_queue.h>
 
@@ -51,8 +49,11 @@ PXR_NAMESPACE_OPEN_SCOPE
 ///
 /// A heterogeneous value container without type erasure.
 ///
-class UsdImagingValueCache : boost::noncopyable {
+class UsdImagingValueCache {
 public:
+    UsdImagingValueCache(const UsdImagingValueCache&) = delete;
+    UsdImagingValueCache& operator=(const UsdImagingValueCache&) = delete;
+
     typedef PxOsdSubdivTags SubdivTags;
 
     struct PrimvarInfo {
diff --git a/pxr/usdImaging/lib/usdImagingGL/engine.h b/pxr/usdImaging/lib/usdImagingGL/engine.h
index b33ffb36df..804aadb8d4 100644
--- a/pxr/usdImaging/lib/usdImagingGL/engine.h
+++ b/pxr/usdImaging/lib/usdImagingGL/engine.h
@@ -45,7 +45,6 @@
 #include "pxr/base/gf/vec4i.h"
 #include "pxr/base/vt/dictionary.h"
 
-#include <boost/noncopyable.hpp>
 #include <boost/unordered_map.hpp>
 
 PXR_NAMESPACE_OPEN_SCOPE
@@ -61,8 +60,15 @@ TF_DECLARE_WEAK_PTRS(GlfSimpleLightingContext);
 ///
 /// Interface class for render engines.
 ///
-class UsdImagingGLEngine : private boost::noncopyable {
+class UsdImagingGLEngine {
 public:
+    USDIMAGINGGL_API
+    UsdImagingGLEngine() = default;
+
+    // Disallow copies
+    UsdImagingGLEngine(const UsdImagingGLEngine&) = delete;
+    UsdImagingGLEngine& operator=(const UsdImagingGLEngine&) = delete;
+
     USDIMAGINGGL_API
     virtual ~UsdImagingGLEngine();
 
diff --git a/pxr/usdImaging/lib/usdviewq/pch.h b/pxr/usdImaging/lib/usdviewq/pch.h
index fd4cae784f..9a48f7babd 100644
--- a/pxr/usdImaging/lib/usdviewq/pch.h
+++ b/pxr/usdImaging/lib/usdviewq/pch.h
@@ -110,7 +110,6 @@
 #include <boost/mpl/remove.hpp>
 #include <boost/mpl/transform_view.hpp>
 #include <boost/mpl/vector.hpp>
-#include <boost/noncopyable.hpp>
 #include <boost/operators.hpp>
 #include <boost/optional.hpp>
 #include <boost/preprocessor.hpp>