Merge pull request #484 from superfunc/boostCleanupNonCopyJs

[Js] Remove boost noncopyable. (Internal change: 1891895)
PixarAnimationStudios · Sep 10, 2018 · 423e66b · 423e66b
2 parents aa5cd6d + ee3b4a4
commit 423e66b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/pxr/base/lib/js/pch.h b/pxr/base/lib/js/pch.h
@@ -59,7 +59,6 @@
 #include <typeinfo>
 #include <vector>
 #include <boost/any.hpp>
-#include <boost/noncopyable.hpp>
 #include <boost/none.hpp>
 #include <boost/operators.hpp>
 #include <boost/optional.hpp>

diff --git a/pxr/base/lib/js/value.cpp b/pxr/base/lib/js/value.cpp
@@ -29,7 +29,6 @@
 #include "pxr/base/tf/diagnostic.h"
 #include "pxr/base/tf/staticData.h"
 #include "pxr/base/tf/stringUtils.h"
-#include <boost/noncopyable.hpp>
 #include <boost/variant.hpp>
 
 PXR_NAMESPACE_OPEN_SCOPE
@@ -50,7 +49,7 @@ struct Js_Null
 /// \struct JsValue::_Holder
 /// Private holder class used to abstract away how a value is stored
 /// internally in JsValue objects.
-struct JsValue::_Holder : private boost::noncopyable
+struct JsValue::_Holder
 {
     // The order these types are defined in the variant is important. See the
     // comments in the implementation of IsUInt64 for details.
@@ -87,6 +86,10 @@ struct JsValue::_Holder : private boost::noncopyable
     _Holder(double value)
         : value(value), type(JsValue::RealType) { }
 
+    // _Holder is not copyable
+    _Holder(const _Holder&) = delete;
+    _Holder& operator=(const _Holder&) = delete;
+
     Variant value;
     JsValue::Type type;
 };