svn commit: r273434 - head/contrib/libc++/src

Baptiste Daroussin bapt at FreeBSD.org
Tue Oct 21 21:49:07 UTC 2014


Author: bapt
Date: Tue Oct 21 21:49:06 2014
New Revision: 273434
URL: https://svnweb.freebsd.org/changeset/base/273434

Log:
  Do not define bad_array_new_length::bad_array_new_length in libc++ anymore
  when used in combinaison with libcxxrt since it is now defined there already.
  This fixes building world

Modified:
  head/contrib/libc++/src/new.cpp

Modified: head/contrib/libc++/src/new.cpp
==============================================================================
--- head/contrib/libc++/src/new.cpp	Tue Oct 21 21:44:24 2014	(r273433)
+++ head/contrib/libc++/src/new.cpp	Tue Oct 21 21:49:06 2014	(r273434)
@@ -192,8 +192,6 @@ bad_alloc::what() const _NOEXCEPT
 
 #endif // !__GLIBCXX__
 
-#endif //LIBCXXRT
-
 bad_array_new_length::bad_array_new_length() _NOEXCEPT
 {
 }
@@ -202,6 +200,8 @@ bad_array_new_length::~bad_array_new_len
 {
 }
 
+#endif //LIBCXXRT
+
 const char*
 bad_array_length::what() const _NOEXCEPT
 {


More information about the svn-src-head mailing list