From aa117cce42d75d58e47c8d584fec7ace5693df48 Mon Sep 17 00:00:00 2001 From: Arseny Kapoulkine Date: Sun, 6 Nov 2016 11:49:10 -0800 Subject: Refactor move semantics support detection Do it in one place and set PUGIXML_HAS_MOVE if it's available. --- src/pugixml.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/pugixml.cpp') diff --git a/src/pugixml.cpp b/src/pugixml.cpp index 4ae10b4..ccf8c4c 100644 --- a/src/pugixml.cpp +++ b/src/pugixml.cpp @@ -11923,7 +11923,7 @@ namespace pugi } } -#if __cplusplus >= 201103 || (defined(_MSC_VER) && _MSC_VER >= 1800) +#ifdef PUGIXML_HAS_MOVE PUGI__FN void xpath_node_set::_move(xpath_node_set& rhs) { _type = rhs._type; @@ -11966,7 +11966,7 @@ namespace pugi return *this; } -#if __cplusplus >= 201103 || (defined(_MSC_VER) && _MSC_VER >= 1800) +#ifdef PUGIXML_HAS_MOVE PUGI__FN xpath_node_set::xpath_node_set(xpath_node_set&& rhs): _type(type_unsorted), _begin(&_storage), _end(&_storage) { _move(rhs); @@ -12166,7 +12166,7 @@ namespace pugi return *this; } -#if __cplusplus >= 201103 || (defined(_MSC_VER) && _MSC_VER >= 1800) +#ifdef PUGIXML_HAS_MOVE PUGI__FN xpath_variable_set::xpath_variable_set(xpath_variable_set&& rhs) { for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i) @@ -12360,7 +12360,7 @@ namespace pugi impl::xpath_query_impl::destroy(static_cast(_impl)); } -#if __cplusplus >= 201103 || (defined(_MSC_VER) && _MSC_VER >= 1800) +#ifdef PUGIXML_HAS_MOVE PUGI__FN xpath_query::xpath_query(xpath_query&& rhs) { _impl = rhs._impl; -- cgit v1.2.3