From 3dc430e74a87167422728ea5f06cf5a5f9c827d8 Mon Sep 17 00:00:00 2001 From: Matt Blair Date: Mon, 27 Apr 2015 18:03:23 -0400 Subject: [PATCH] Remove usages of boost::enable_if and boost::next --- include/yaml-cpp/node/detail/iterator.h | 5 ++--- include/yaml-cpp/node/detail/node_iterator.h | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/include/yaml-cpp/node/detail/iterator.h b/include/yaml-cpp/node/detail/iterator.h index 2c701af..d170f81 100644 --- a/include/yaml-cpp/node/detail/iterator.h +++ b/include/yaml-cpp/node/detail/iterator.h @@ -11,7 +11,6 @@ #include "yaml-cpp/node/ptr.h" #include "yaml-cpp/node/detail/node_iterator.h" #include -#include namespace YAML { namespace detail { @@ -37,7 +36,7 @@ class iterator_base template iterator_base(const iterator_base& rhs, - typename boost::enable_if, + typename std::enable_if::value, enabler>::type = enabler()) : iterator_base::iterator_adaptor_(rhs.base()), m_pMemory(rhs.m_pMemory) {} @@ -45,7 +44,7 @@ class iterator_base private: 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 { const typename base_type::value_type& v = *this->base(); diff --git a/include/yaml-cpp/node/detail/node_iterator.h b/include/yaml-cpp/node/detail/node_iterator.h index 9669c81..1fa45f8 100644 --- a/include/yaml-cpp/node/detail/node_iterator.h +++ b/include/yaml-cpp/node/detail/node_iterator.h @@ -10,7 +10,6 @@ #include "yaml-cpp/dll.h" #include "yaml-cpp/node/ptr.h" #include -#include #include #include #include @@ -80,7 +79,7 @@ class node_iterator_base template node_iterator_base(const node_iterator_base& rhs, - typename boost::enable_if, + typename std::enable_if::value, enabler>::type = enabler()) : m_type(rhs.m_type), m_seqIt(rhs.m_seqIt),