From 3f013898d11edbc7f73b7bb802e687d903812860 Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Mon, 18 Jul 2016 13:19:00 +0000 Subject: [PATCH] Change a couple ifdefs from '#if __cplusplus >= 2011xxx' to '#ifndef _LIBCPP_CXX03_LANG'. No functionality change. git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@275787 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/iterator | 10 +++++----- include/map | 4 ++-- include/unordered_map | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/iterator b/include/iterator index 2e30a9229..abd142e85 100644 --- a/include/iterator +++ b/include/iterator @@ -700,7 +700,7 @@ operator<=(const reverse_iterator<_Iter1>& __x, const reverse_iterator<_Iter2>& return __x.base() >= __y.base(); } -#if __cplusplus >= 201103L +#ifndef _LIBCPP_CXX03_LANG template inline _LIBCPP_INLINE_VISIBILITY auto @@ -1117,7 +1117,7 @@ operator<=(const move_iterator<_Iter1>& __x, const move_iterator<_Iter2>& __y) return __x.base() <= __y.base(); } -#if __cplusplus >= 201103L +#ifndef _LIBCPP_CXX03_LANG template 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 _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 friend auto @@ -1496,7 +1496,7 @@ operator<=(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter1>& __y) _NOEX return !(__y < __x); } -#if __cplusplus >= 201103L +#ifndef _LIBCPP_CXX03_LANG template inline _LIBCPP_INLINE_VISIBILITY auto diff --git a/include/map b/include/map index 8dc84e73c..b8aa7a6d7 100644 --- a/include/map +++ b/include/map @@ -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) { diff --git a/include/unordered_map b/include/unordered_map index 319c71e11..bf64ad66f 100644 --- a/include/unordered_map +++ b/include/unordered_map @@ -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) {