diff options
author | Andrew Hsieh <andrewhsieh@google.com> | 2012-12-12 19:26:42 +0800 |
---|---|---|
committer | Andrew Hsieh <andrewhsieh@google.com> | 2012-12-12 19:26:42 +0800 |
commit | 1e4edc8addf7fc21d821e64cc81d85315561bcd9 (patch) | |
tree | af973be96467882e09f419050897ce3081121673 /gcc-4.4.3/libstdc++-v3/include/ext/vstring.h | |
parent | 7609f724df8ca390935f63243fa72e1de39d00c6 (diff) | |
download | toolchain_gcc-1e4edc8addf7fc21d821e64cc81d85315561bcd9.tar.gz toolchain_gcc-1e4edc8addf7fc21d821e64cc81d85315561bcd9.tar.bz2 toolchain_gcc-1e4edc8addf7fc21d821e64cc81d85315561bcd9.zip |
Patch GCC libstdc++ 4.4.3/4.6/4.7 to work with Clang in C++11
See http://clang.llvm.org/cxx_status.html
http://code.google.com/p/android/issues/detail?id=39600
https://android-review.googlesource.com/#/c/47836/
Change-Id: I1e625592dcc66fa952e0965bf86e8255cac6ca72
Diffstat (limited to 'gcc-4.4.3/libstdc++-v3/include/ext/vstring.h')
-rw-r--r-- | gcc-4.4.3/libstdc++-v3/include/ext/vstring.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/gcc-4.4.3/libstdc++-v3/include/ext/vstring.h b/gcc-4.4.3/libstdc++-v3/include/ext/vstring.h index 6377ca57d..a259d23fa 100644 --- a/gcc-4.4.3/libstdc++-v3/include/ext/vstring.h +++ b/gcc-4.4.3/libstdc++-v3/include/ext/vstring.h @@ -167,7 +167,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) * string. */ __versa_string(__versa_string&& __str) - : __vstring_base(std::forward<__vstring_base>(__str)) { } + : __vstring_base(std::move(__str)) { } /** * @brief Construct string from an initializer list. @@ -1454,11 +1454,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) * constant time. */ void -#ifdef __GXX_EXPERIMENTAL_CXX0X__ - swap(__versa_string&& __s) -#else swap(__versa_string& __s) -#endif { this->_M_swap(__s); } // String operations: |