summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authoriFarbod <ifarbod@users.noreply.github.com>2016-11-06 23:13:03 +0330
committerArseny Kapoulkine <arseny.kapoulkine@gmail.com>2016-11-06 11:43:03 -0800
commitb3fc28d177dc1d5bcf937d3e7add77caff5a34f8 (patch)
treefdbf2bcf59dc90abb39b15730093d9a0e03c0391 /src
parenta832e8a5eff11f58a00ca41ec51ff3895b0da165 (diff)
Add VS2013 check for C++11 availability (#121)
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.
Diffstat (limited to 'src')
-rw-r--r--src/pugixml.cpp8
-rw-r--r--src/pugixml.hpp6
2 files changed, 7 insertions, 7 deletions
diff --git a/src/pugixml.cpp b/src/pugixml.cpp
index d2f0d6b..4ae10b4 100644
--- a/src/pugixml.cpp
+++ b/src/pugixml.cpp
@@ -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)
{
_type = rhs._type;
@@ -11966,7 +11966,7 @@ namespace pugi
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)
{
_move(rhs);
@@ -12166,7 +12166,7 @@ namespace pugi
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)
{
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));
}
-#if __cplusplus >= 201103
+#if __cplusplus >= 201103 || (defined(_MSC_VER) && _MSC_VER >= 1800)
PUGI__FN xpath_query::xpath_query(xpath_query&& rhs)
{
_impl = rhs._impl;
diff --git a/src/pugixml.hpp b/src/pugixml.hpp
index c4d44e6..44ad066 100644
--- a/src/pugixml.hpp
+++ b/src/pugixml.hpp
@@ -1117,7 +1117,7 @@ namespace pugi
xpath_variable_set(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
xpath_variable_set(xpath_variable_set&& rhs);
xpath_variable_set& operator=(xpath_variable_set&& rhs);
@@ -1161,7 +1161,7 @@ namespace pugi
// Destructor
~xpath_query();
- #if __cplusplus >= 201103
+ #if __cplusplus >= 201103 || (defined(_MSC_VER) && _MSC_VER >= 1800)
// Move semantics support
xpath_query(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& operator=(const xpath_node_set& ns);
- #if __cplusplus >= 201103
+ #if __cplusplus >= 201103 || (defined(_MSC_VER) && _MSC_VER >= 1800)
// Move semantics support
xpath_node_set(xpath_node_set&& rhs);
xpath_node_set& operator=(xpath_node_set&& rhs);