svn commit: r278018 - in stable: 10/contrib/libc++/src 9/contrib/libc++/src

[Dimitry Andric]

Author: dim
Date: Sun Feb  1 01:42:38 2015
New Revision: 278018
URL: https://svnweb.freebsd.org/changeset/base/278018

Log:
  MFC r273434 (by bapt):
  
  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:
  stable/9/contrib/libc++/src/new.cpp
Directory Properties:
  stable/9/contrib/libc++/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/10/contrib/libc++/src/new.cpp
Directory Properties:
  stable/10/   (props changed)

Modified: stable/9/contrib/libc++/src/new.cpp
==============================================================================
--- stable/9/contrib/libc++/src/new.cpp	Sat Jan 31 23:48:59 2015	(r278017)
+++ stable/9/contrib/libc++/src/new.cpp	Sun Feb  1 01:42:38 2015	(r278018)
@@ -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
 {