From 2ee837256a86f5fda81589dc940076bec405fdb3 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. llvm-svn: 275787 --- libcxx/include/iterator | 10 +++++----- libcxx/include/map | 4 ++-- libcxx/include/unordered_map | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libcxx/include/iterator b/libcxx/include/iterator index 2e30a9229984..abd142e85aa3 100644 --- a/libcxx/include/iterator +++ b/libcxx/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/libcxx/include/map b/libcxx/include/map index 8dc84e73cbf2..b8aa7a6d7a5d 100644 --- a/libcxx/include/map +++ b/libcxx/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/libcxx/include/unordered_map b/libcxx/include/unordered_map index 319c71e11fbd..bf64ad66f39a 100644 --- a/libcxx/include/unordered_map +++ b/libcxx/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) {