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

Marshall Clow via cfe-commits cfe-commits at lists.llvm.org
Mon Jul 18 06:19:01 PDT 2016


Author: marshall
Date: Mon Jul 18 08:19:00 2016
New Revision: 275787

URL: http://llvm.org/viewvc/llvm-project?rev=275787&view=rev
Log:
Change a couple ifdefs from '#if __cplusplus >= 2011xxx' to '#ifndef _LIBCPP_CXX03_LANG'. No functionality change.

Modified:
    libcxx/trunk/include/iterator
    libcxx/trunk/include/map
    libcxx/trunk/include/unordered_map

Modified: libcxx/trunk/include/iterator
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/iterator?rev=275787&r1=275786&r2=275787&view=diff
==============================================================================
--- libcxx/trunk/include/iterator (original)
+++ libcxx/trunk/include/iterator Mon Jul 18 08:19:00 2016
@@ -700,7 +700,7 @@ operator<=(const reverse_iterator<_Iter1
     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 @@ operator<=(const move_iterator<_Iter1>&
     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 @@ _LIBCPP_INLINE_VISIBILITY
 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 @@ private:
     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 @@ operator<=(const __wrap_iter<_Iter1>& __
     return !(__y < __x);
 }
 
-#if __cplusplus >= 201103L
+#ifndef _LIBCPP_CXX03_LANG
 template <class _Iter1, class _Iter2>
 inline _LIBCPP_INLINE_VISIBILITY
 auto

Modified: libcxx/trunk/include/map
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/map?rev=275787&r1=275786&r2=275787&view=diff
==============================================================================
--- libcxx/trunk/include/map (original)
+++ libcxx/trunk/include/map Mon Jul 18 08:19:00 2016
@@ -910,7 +910,7 @@ public:
     _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 @@ public:
     _LIBCPP_INLINE_VISIBILITY
     multimap& operator=(const multimap& __m)
         {
-#if __cplusplus >= 201103L
+#ifndef _LIBCPP_CXX03_LANG
             __tree_ = __m.__tree_;
 #else
             if (this != &__m) {

Modified: libcxx/trunk/include/unordered_map
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/unordered_map?rev=275787&r1=275786&r2=275787&view=diff
==============================================================================
--- libcxx/trunk/include/unordered_map (original)
+++ libcxx/trunk/include/unordered_map Mon Jul 18 08:19:00 2016
@@ -865,7 +865,7 @@ public:
     _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 @@ public:
     _LIBCPP_INLINE_VISIBILITY
     unordered_multimap& operator=(const unordered_multimap& __u)
     {
-#if __cplusplus >= 201103L
+#ifndef _LIBCPP_CXX03_LANG
         __table_ = __u.__table_;
 #else
         if (this != &__u) {




More information about the cfe-commits mailing list