svn commit: r344386 - head/contrib/libc++/include

Dimitry Andric dim at
Wed Feb 20 21:06:13 UTC 2019

Author: dim
Date: Wed Feb 20 21:06:11 2019
New Revision: 344386

  Pull in r354515 from upstream libc++ trunk:
    Fix the build with gcc when `-Wredundant-decls` is passed
    gcc warns that `__throw_runtime_error` is declared both in
    `<__locale>` and `<stdexcept>`, if `-Wredundant-decls` is passed on
    the command line; this is the case with FreeBSD when ${WARNS} == 6.
    Since `<__locale>` gets its first declaration via a transitive
    include of `<stdexcept>`, and the second declaration is after the
    first invocation of `__throw_runtime_error`, delete that second
    Signed-off-by: Enji Cooper <yaneurabeya at>
    Reviewers: kristina, MaskRay, EricWF, ldionne, ngie
    Reviewed By: EricWF
    Subscribers: krytarowski, brooks, emaste, dim, christof, jdoerfert, libcxx-commits
    Tags: #libc
    Differential Revision:
  Submitted by:	ngie
  MFC after:	3 days


Modified: head/contrib/libc++/include/__locale
--- head/contrib/libc++/include/__locale	Wed Feb 20 20:55:02 2019	(r344385)
+++ head/contrib/libc++/include/__locale	Wed Feb 20 21:06:11 2019	(r344386)
 _LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS codecvt_byname<char16_t, char, mbstate_t>)
 _LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS codecvt_byname<char32_t, char, mbstate_t>)
-_LIBCPP_NORETURN _LIBCPP_FUNC_VIS void __throw_runtime_error(const char*);
 template <size_t _Np>
 struct __narrow_to_utf8

More information about the svn-src-all mailing list