Date: Tue, 21 Oct 2014 21:49:07 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r273434 - head/contrib/libc++/src Message-ID: <201410212149.s9LLn7HU014071@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410212149.s9LLn7HU014071>