Author: ericwf
Date: Mon Jan 23 19:03:36 2017
New Revision: 292867
URL: http://llvm.org/viewvc/llvm-project?rev=292867&view=rev
Log:
Merge r292830 - Fix GCC C++03 build by hiding default template argument in C++03
Modified:
libcxx/branches/release_40/include/string
Modified: libcxx/branches/release_40/include/string
URL:
http://llvm.org/viewvc/llvm-project/libcxx/branches/release_40/include/string?rev=292867&r1=292866&r2=292867&view=diff
==============================================================================
--- libcxx/branches/release_40/include/string (original)
+++ libcxx/branches/release_40/include/string Mon Jan 23 19:03:36 2017
@@ -818,7 +818,10 @@ public:
operator __self_view() const _NOEXCEPT { return __self_view(data(),
size()); }
basic_string& operator=(const basic_string& __str);
+
+#ifndef _LIBCPP_CXX03_LANG
template <class = void>
+#endif
_LIBCPP_INLINE_VISIBILITY
basic_string& operator=(__self_view __sv) {return assign(__sv);}
#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
