We merged the first one, so I suppose we better fix it :-) Sounds good to me.
On Mon, Jan 23, 2017 at 1:37 PM, Eric Fiselier <e...@efcs.ca> wrote: > This patch should be merge into the 4.0 branch. > > It fixes a bug introduced to the 4.0 branch in r292354 > (https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=216054). > > /Eric > > On Mon, Jan 23, 2017 at 2:24 PM, Eric Fiselier via cfe-commits > <cfe-commits@lists.llvm.org> wrote: >> >> Author: ericwf >> Date: Mon Jan 23 15:24:58 2017 >> New Revision: 292830 >> >> URL: http://llvm.org/viewvc/llvm-project?rev=292830&view=rev >> Log: >> Fix GCC C++03 build by hiding default template argument in C++03 >> >> Modified: >> libcxx/trunk/include/string >> >> Modified: libcxx/trunk/include/string >> URL: >> http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/string?rev=292830&r1=292829&r2=292830&view=diff >> >> ============================================================================== >> --- libcxx/trunk/include/string (original) >> +++ libcxx/trunk/include/string Mon Jan 23 15:24:58 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 > > _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
