svn commit: r344483 - in stable: 11/contrib/libc++/include 12/contrib/libc++/include

[Dimitry Andric]

Author: dim
Date: Sat Feb 23 14:27:09 2019
New Revision: 344483
URL: https://svnweb.freebsd.org/changeset/base/344483

Log:
  MFC r344386:
  
  Pull in r354515 from upstream libc++ trunk:
  
    Fix the build with gcc when `-Wredundant-decls` is passed
  
    Summary:
  
    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
    declaration.
  
    Signed-off-by: Enji Cooper <yaneurabeya at gmail.com>
  
    Reviewers: kristina, MaskRay, EricWF, ldionne, ngie
  
    Reviewed By: EricWF
  
    Subscribers: krytarowski, brooks, emaste, dim, christof, jdoerfert, libcxx-commits
  
    Tags: #libc
  
    Differential Revision: https://reviews.llvm.org/D58425
  
  Submitted by:	ngie

Modified:
  stable/11/contrib/libc++/include/__locale
Directory Properties:
  stable/11/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/12/contrib/libc++/include/__locale
Directory Properties:
  stable/12/   (props changed)

Modified: stable/11/contrib/libc++/include/__locale
==============================================================================
--- stable/11/contrib/libc++/include/__locale	Sat Feb 23 09:34:57 2019	(r344482)
+++ stable/11/contrib/libc++/include/__locale	Sat Feb 23 14:27:09 2019	(r344483)
@@ -1230,8 +1230,6 @@ _LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_EXTERN_TEMPLATE
 _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
 {