commit 476d3f41254f65f626cbed66eef52e79e42c9478
author Marshall Clow <mclow.lists@gmail.com> Mon Jul 18 13:19:00 2016 +0000
committer Marshall Clow <mclow.lists@gmail.com> Mon Jul 18 13:19:00 2016 +0000
tree d551149a6004028ac267589ce259128318ec656a
parent 5c7eb562570926dad4100945f513680526f70b5f

Change a couple ifdefs from '#if __cplusplus >= 2011xxx' to '#ifndef _LIBCPP_CXX03_LANG'. No functionality change.

llvm-svn: 275787
Cr-Mirrored-From: sso://chromium.googlesource.com/_direct/external/github.com/llvm/llvm-project
Cr-Mirrored-Commit: 2ee837256a86f5fda81589dc940076bec405fdb3

include/iterator

diff --git a/include/iterator b/include/iterator
index 2e30a92..abd142e 100644
--- a/include/iterator
+++ b/include/iterator
@@ -700,7 +700,7 @@
     return __x.base() >= __y.base();
 }
 
-#if __cplusplus >= 201103L
+#ifndef _LIBCPP_CXX03_LANG
 template <class _Iter1, class _Iter2>
 inline _LIBCPP_INLINE_VISIBILITY
 auto
@@ -1117,7 +1117,7 @@
     return __x.base() <= __y.base();
 }
 
-#if __cplusplus >= 201103L
+#ifndef _LIBCPP_CXX03_LANG
 template <class _Iter1, class _Iter2>
 inline _LIBCPP_INLINE_VISIBILITY
 auto
@@ -1186,7 +1186,7 @@
 bool
 operator<=(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT;
 
-#if __cplusplus >= 201103L
+#ifndef _LIBCPP_CXX03_LANG
 template <class _Iter1, class _Iter2>
 _LIBCPP_INLINE_VISIBILITY
 auto
@@ -1379,7 +1379,7 @@
     bool
     operator<=(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT;
 
-#if __cplusplus >= 201103L
+#ifndef _LIBCPP_CXX03_LANG
     template <class _Iter1, class _Iter2>
     friend
     auto
@@ -1496,7 +1496,7 @@
     return !(__y < __x);
 }
 
-#if __cplusplus >= 201103L
+#ifndef _LIBCPP_CXX03_LANG
 template <class _Iter1, class _Iter2>
 inline _LIBCPP_INLINE_VISIBILITY
 auto

include/map

diff --git a/include/map b/include/map
index 8dc84e7..b8aa7a6 100644
--- a/include/map
+++ b/include/map
@@ -910,7 +910,7 @@
     _LIBCPP_INLINE_VISIBILITY
     map& operator=(const map& __m)
         {
-#if __cplusplus >= 201103L
+#ifndef _LIBCPP_CXX03_LANG
             __tree_ = __m.__tree_;
 #else
             if (this != &__m) {
@@ -1637,7 +1637,7 @@
     _LIBCPP_INLINE_VISIBILITY
     multimap& operator=(const multimap& __m)
         {
-#if __cplusplus >= 201103L
+#ifndef _LIBCPP_CXX03_LANG
             __tree_ = __m.__tree_;
 #else
             if (this != &__m) {

include/unordered_map

diff --git a/include/unordered_map b/include/unordered_map
index 319c71e..bf64ad6 100644
--- a/include/unordered_map
+++ b/include/unordered_map
@@ -865,7 +865,7 @@
     _LIBCPP_INLINE_VISIBILITY
     unordered_map& operator=(const unordered_map& __u)
     {
-#if __cplusplus >= 201103L
+#ifndef _LIBCPP_CXX03_LANG
         __table_ = __u.__table_;
 #else
         if (this != &__u) {
@@ -1619,7 +1619,7 @@
     _LIBCPP_INLINE_VISIBILITY
     unordered_multimap& operator=(const unordered_multimap& __u)
     {
-#if __cplusplus >= 201103L
+#ifndef _LIBCPP_CXX03_LANG
         __table_ = __u.__table_;
 #else
         if (this != &__u) {