diff options
| author | dim <dim@FreeBSD.org> | 2015-02-01 01:42:38 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2015-02-01 01:42:38 +0000 |
| commit | 111a0cf771f31b0fdae5d6e0e7cbd3277e702172 (patch) | |
| tree | 9581dd0938555b446d2f6909b7f8fceb0efceeb7 /contrib/libc++/src | |
| parent | d55f158aa0c66ce046b7c35cebe1650e14161ca3 (diff) | |
| download | FreeBSD-src-111a0cf771f31b0fdae5d6e0e7cbd3277e702172.zip FreeBSD-src-111a0cf771f31b0fdae5d6e0e7cbd3277e702172.tar.gz | |
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
Diffstat (limited to 'contrib/libc++/src')
| -rw-r--r-- | contrib/libc++/src/new.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/libc++/src/new.cpp b/contrib/libc++/src/new.cpp index f4998cf..c179db1 100644 --- a/contrib/libc++/src/new.cpp +++ b/contrib/libc++/src/new.cpp @@ -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_length() _NOEXCEPT { } +#endif //LIBCXXRT + const char* bad_array_length::what() const _NOEXCEPT { |
