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.

Sign up for GitHub

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

[Js] Remove boost noncopyable. #484

Merged
merged 1 commit into from
Sep 18, 2018
Merged

[Js] Remove boost noncopyable. #484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion pxr/base/lib/js/pch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
7 changes: 5 additions & 2 deletions pxr/base/lib/js/value.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.
Expand Down Expand Up @@ -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;
};
Expand Down