External/yaml-cpp
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace boost::noncopyable with deleted copy and assignment

Browse Source
This commit is contained in:
Matt Blair 2015-04-27 17:27:33 -04:00
parent 1b9796cec5
commit 52903e89a1
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/yaml-cpp/node/detail/node.h
View File

@ -13,13 +13,14 @@
#include "yaml-cpp/node/ptr.h" #include "yaml-cpp/node/ptr.h"
#include "yaml-cpp/node/detail/node_ref.h" #include "yaml-cpp/node/detail/node_ref.h"
#include <set> #include <set>
#include <boost/utility.hpp>
namespace YAML { namespace YAML {
namespace detail { namespace detail {
class node : private boost::noncopyable { class node {
public: public:
node() : m_pRef(new node_ref) {} node() : m_pRef(new node_ref) {}
node(const node&) = delete;
node& operator=(const node&) = delete;
bool is(const node& rhs) const { return m_pRef == rhs.m_pRef; } bool is(const node& rhs) const { return m_pRef == rhs.m_pRef; }
const node_ref* ref() const { return m_pRef.get(); } const node_ref* ref() const { return m_pRef.get(); }

6
include/yaml-cpp/node/detail/node_data.h
View File

@ -7,8 +7,6 @@
#pragma once #pragma once
#endif #endif
#include <boost/noncopyable.hpp>
#include <boost/utility.hpp>
#include <list> #include <list>
#include <map> #include <map>
#include <string> #include <string>
@ -29,9 +27,11 @@ class node;
namespace YAML { namespace YAML {
namespace detail { namespace detail {
class YAML_CPP_API node_data : private boost::noncopyable { class YAML_CPP_API node_data {
public: public:
node_data(); node_data();
node_data(const node_data&) = delete;
node_data& operator=(const node_data&) = delete;
void mark_defined(); void mark_defined();
void set_mark(const Mark& mark); void set_mark(const Mark& mark);

5
include/yaml-cpp/node/detail/node_ref.h
View File

@ -11,13 +11,14 @@
#include "yaml-cpp/node/type.h" #include "yaml-cpp/node/type.h"
#include "yaml-cpp/node/ptr.h" #include "yaml-cpp/node/ptr.h"
#include "yaml-cpp/node/detail/node_data.h" #include "yaml-cpp/node/detail/node_data.h"
#include <boost/utility.hpp>
namespace YAML { namespace YAML {
namespace detail { namespace detail {
class node_ref : private boost::noncopyable { class node_ref {
public: public:
node_ref() : m_pData(new node_data) {} node_ref() : m_pData(new node_data) {}
node_ref(const node_ref&) = delete;
node_ref& operator=(const node_ref&) = delete;
bool is_defined() const { return m_pData->is_defined(); } bool is_defined() const { return m_pData->is_defined(); }
const Mark& mark() const { return m_pData->mark(); } const Mark& mark() const { return m_pData->mark(); }