svn commit: r312673 - projects/clang400-import/contrib/libc++/include

Dimitry Andric dim at FreeBSD.org
Mon Jan 23 22:10:58 UTC 2017


Author: dim
Date: Mon Jan 23 22:10:57 2017
New Revision: 312673
URL: https://svnweb.freebsd.org/changeset/base/312673

Log:
  Pull in r292830 from upstream libc++ trunk (by Eric Fiselier):
  
    Fix GCC C++03 build by hiding default template argument in C++03
  
  This allows the graphics/GraphicsMagic to compile with gcc 4.9 and
  libc++.
  
  PR:		216404

Modified:
  projects/clang400-import/contrib/libc++/include/string

Modified: projects/clang400-import/contrib/libc++/include/string
==============================================================================
--- projects/clang400-import/contrib/libc++/include/string	Mon Jan 23 21:09:27 2017	(r312672)
+++ projects/clang400-import/contrib/libc++/include/string	Mon Jan 23 22:10:57 2017	(r312673)
@@ -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


More information about the svn-src-projects mailing list