diff options
| author | Eric Fiselier <eric@efcs.ca> | 2016-10-14 05:29:46 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2016-10-14 05:29:46 +0000 |
| commit | 35355bb896a4b34c570fb9878401246725038c3f (patch) | |
| tree | 4b0810d655a69fe74e41ad9288f09cfe31731bb0 /libcxx | |
| parent | 5182ba5a9f918e3c44c383991b8f3b5de3565420 (diff) | |
| download | bcm5719-llvm-35355bb896a4b34c570fb9878401246725038c3f.tar.gz bcm5719-llvm-35355bb896a4b34c570fb9878401246725038c3f.zip | |
Remove two ABI symbols added after the 3.9 release
llvm-svn: 284200
Diffstat (limited to 'libcxx')
| -rw-r--r-- | libcxx/include/string | 1 | ||||
| -rw-r--r-- | libcxx/lib/abi/x86_64-linux-gnu.abilist | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/libcxx/include/string b/libcxx/include/string index 3ffe74d3232..b56ab384b5d 100644 --- a/libcxx/include/string +++ b/libcxx/include/string @@ -1174,6 +1174,7 @@ public: int compare(size_type __pos1, size_type __n1, const basic_string& __str) const; int compare(size_type __pos1, size_type __n1, const basic_string& __str, size_type __pos2, size_type __n2=npos) const; template <class _Tp> + inline _LIBCPP_INLINE_VISIBILITY typename enable_if < __can_be_converted_to_string_view<_CharT, _Traits, _Tp>::value, diff --git a/libcxx/lib/abi/x86_64-linux-gnu.abilist b/libcxx/lib/abi/x86_64-linux-gnu.abilist index de684bf642b..7820b2d54d7 100644 --- a/libcxx/lib/abi/x86_64-linux-gnu.abilist +++ b/libcxx/lib/abi/x86_64-linux-gnu.abilist @@ -67,7 +67,6 @@ {'type': 'FUNC', 'name': '_ZNKSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE7compareEmmPKc'} {'type': 'FUNC', 'name': '_ZNKSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE7compareEmmPKcm'} {'type': 'FUNC', 'name': '_ZNKSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE7compareEmmRKS5_mm'} -{'type': 'FUNC', 'name': '_ZNKSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE7compareINS_17basic_string_viewIcS2_EEEENS_9enable_ifIXsr33__can_be_converted_to_string_viewIcS2_T_EE5valueEiE4typeEmmRKSA_mm'} {'type': 'FUNC', 'name': '_ZNKSt3__112basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE12find_last_ofEPKwmm'} {'type': 'FUNC', 'name': '_ZNKSt3__112basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE13find_first_ofEPKwmm'} {'type': 'FUNC', 'name': '_ZNKSt3__112basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE16find_last_not_ofEPKwmm'} @@ -82,7 +81,6 @@ {'type': 'FUNC', 'name': '_ZNKSt3__112basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE7compareEmmPKw'} {'type': 'FUNC', 'name': '_ZNKSt3__112basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE7compareEmmPKwm'} {'type': 'FUNC', 'name': '_ZNKSt3__112basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE7compareEmmRKS5_mm'} -{'type': 'FUNC', 'name': '_ZNKSt3__112basic_stringIwNS_11char_traitsIwEENS_9allocatorIwEEE7compareINS_17basic_string_viewIwS2_EEEENS_9enable_ifIXsr33__can_be_converted_to_string_viewIwS2_T_EE5valueEiE4typeEmmRKSA_mm'} {'type': 'FUNC', 'name': '_ZNKSt3__112ctype_bynameIcE10do_tolowerEPcPKc'} {'type': 'FUNC', 'name': '_ZNKSt3__112ctype_bynameIcE10do_tolowerEc'} {'type': 'FUNC', 'name': '_ZNKSt3__112ctype_bynameIcE10do_toupperEPcPKc'} |
