External/pugixml
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add VS2013 check for C++11 availability (#121)

Browse Source 
VS 2013 supports C++11, but __cplusplus macro isn't updated, and it is 199711 so the old check always fails, even though the compiler supports c++11.
This commit is contained in:
iFarbod 2016-11-06 23:13:03 +03:30 committed by Arseny Kapoulkine
parent a832e8a5ef
commit b3fc28d177
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pugixml.cpp
View File

@ -11923,7 +11923,7 @@ namespace pugi
} }
} }
#if __cplusplus >= 201103 #if __cplusplus >= 201103 || (defined(_MSC_VER) && _MSC_VER >= 1800)
PUGI__FN void xpath_node_set::_move(xpath_node_set& rhs) PUGI__FN void xpath_node_set::_move(xpath_node_set& rhs)
{ {
_type = rhs._type; _type = rhs._type;
@ -11966,7 +11966,7 @@ namespace pugi
return *this; return *this;
} }
#if __cplusplus >= 201103 #if __cplusplus >= 201103 || (defined(_MSC_VER) && _MSC_VER >= 1800)
PUGI__FN xpath_node_set::xpath_node_set(xpath_node_set&& rhs): _type(type_unsorted), _begin(&_storage), _end(&_storage) PUGI__FN xpath_node_set::xpath_node_set(xpath_node_set&& rhs): _type(type_unsorted), _begin(&_storage), _end(&_storage)
{ {
_move(rhs); _move(rhs);
@ -12166,7 +12166,7 @@ namespace pugi
return *this; return *this;
} }
#if __cplusplus >= 201103 #if __cplusplus >= 201103 || (defined(_MSC_VER) && _MSC_VER >= 1800)
PUGI__FN xpath_variable_set::xpath_variable_set(xpath_variable_set&& rhs) PUGI__FN xpath_variable_set::xpath_variable_set(xpath_variable_set&& rhs)
{ {
for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i) 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::xpath_query_impl*>(_impl)); impl::xpath_query_impl::destroy(static_cast<impl::xpath_query_impl*>(_impl));
} }
#if __cplusplus >= 201103 #if __cplusplus >= 201103 || (defined(_MSC_VER) && _MSC_VER >= 1800)
PUGI__FN xpath_query::xpath_query(xpath_query&& rhs) PUGI__FN xpath_query::xpath_query(xpath_query&& rhs)
{ {
_impl = rhs._impl; _impl = rhs._impl;

6
src/pugixml.hpp
View File

@ -1117,7 +1117,7 @@ namespace pugi
xpath_variable_set(const xpath_variable_set& rhs); xpath_variable_set(const xpath_variable_set& rhs);
xpath_variable_set& operator=(const xpath_variable_set& rhs); xpath_variable_set& operator=(const xpath_variable_set& rhs);
#if __cplusplus >= 201103 #if __cplusplus >= 201103 || (defined(_MSC_VER) && _MSC_VER >= 1800)
// Move semantics support // Move semantics support
xpath_variable_set(xpath_variable_set&& rhs); xpath_variable_set(xpath_variable_set&& rhs);
xpath_variable_set& operator=(xpath_variable_set&& rhs); xpath_variable_set& operator=(xpath_variable_set&& rhs);
@ -1161,7 +1161,7 @@ namespace pugi
// Destructor // Destructor
~xpath_query(); ~xpath_query();
#if __cplusplus >= 201103 #if __cplusplus >= 201103 || (defined(_MSC_VER) && _MSC_VER >= 1800)
// Move semantics support // Move semantics support
xpath_query(xpath_query&& rhs); xpath_query(xpath_query&& rhs);
xpath_query& operator=(xpath_query&& rhs); xpath_query& operator=(xpath_query&& rhs);
@ -1302,7 +1302,7 @@ namespace pugi
xpath_node_set(const xpath_node_set& ns); xpath_node_set(const xpath_node_set& ns);
xpath_node_set& operator=(const xpath_node_set& ns); xpath_node_set& operator=(const xpath_node_set& ns);
#if __cplusplus >= 201103 #if __cplusplus >= 201103 || (defined(_MSC_VER) && _MSC_VER >= 1800)
// Move semantics support // Move semantics support
xpath_node_set(xpath_node_set&& rhs); xpath_node_set(xpath_node_set&& rhs);
xpath_node_set& operator=(xpath_node_set&& rhs); xpath_node_set& operator=(xpath_node_set&& rhs);