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

Remove usages of boost::enable_if and boost::next

Browse Source
This commit is contained in:
Matt Blair 2015-04-27 18:03:23 -04:00
parent 86610fcb75
commit 3dc430e74a
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,7 +11,6 @@
#include "yaml-cpp/node/ptr.h" #include "yaml-cpp/node/ptr.h"
#include "yaml-cpp/node/detail/node_iterator.h" #include "yaml-cpp/node/detail/node_iterator.h"
#include <boost/iterator/iterator_adaptor.hpp> #include <boost/iterator/iterator_adaptor.hpp>
#include <boost/utility.hpp>
namespace YAML { namespace YAML {
namespace detail { namespace detail {
@ -37,7 +36,7 @@ class iterator_base
template <class W> template <class W>
iterator_base(const iterator_base<W>& rhs, iterator_base(const iterator_base<W>& rhs,
typename boost::enable_if<boost::is_convertible<W*, V*>, typename std::enable_if<boost::is_convertible<W*, V*>::value,
enabler>::type = enabler()) enabler>::type = enabler())
: iterator_base::iterator_adaptor_(rhs.base()), : iterator_base::iterator_adaptor_(rhs.base()),
m_pMemory(rhs.m_pMemory) {} m_pMemory(rhs.m_pMemory) {}
@ -45,7 +44,7 @@ class iterator_base
private: private:
friend class boost::iterator_core_access; friend class boost::iterator_core_access;
void increment() { this->base_reference() = boost::next(this->base()); } void increment() { this->base_reference() = std::next(this->base()); }
value_type dereference() const { value_type dereference() const {
const typename base_type::value_type& v = *this->base(); const typename base_type::value_type& v = *this->base();

3
include/yaml-cpp/node/detail/node_iterator.h
View File

@ -10,7 +10,6 @@
#include "yaml-cpp/dll.h" #include "yaml-cpp/dll.h"
#include "yaml-cpp/node/ptr.h" #include "yaml-cpp/node/ptr.h"
#include <boost/iterator/iterator_facade.hpp> #include <boost/iterator/iterator_facade.hpp>
#include <boost/utility/enable_if.hpp>
#include <map> #include <map>
#include <utility> #include <utility>
#include <vector> #include <vector>
@ -80,7 +79,7 @@ class node_iterator_base
template <typename W> template <typename W>
node_iterator_base(const node_iterator_base<W>& rhs, node_iterator_base(const node_iterator_base<W>& rhs,
typename boost::enable_if<boost::is_convertible<W*, V*>, typename std::enable_if<std::is_convertible<W*, V*>::value,
enabler>::type = enabler()) enabler>::type = enabler())
: m_type(rhs.m_type), : m_type(rhs.m_type),
m_seqIt(rhs.m_seqIt), m_seqIt(rhs.m_seqIt),