]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
Pull in r354515 from upstream libc++ trunk:
authordim <dim@FreeBSD.org>
Wed, 20 Feb 2019 21:06:11 +0000 (21:06 +0000)
committerdim <dim@FreeBSD.org>
Wed, 20 Feb 2019 21:06:11 +0000 (21:06 +0000)
commitbb9abf23e45c98e2051c6ec1bade58dd02d9cbb0
treea855123395f6bced89da9a883dcf665017525a33
parent700097c0a1bb60426cea782f148992d0f045ac68
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@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
MFC after: 3 days
contrib/libc++/include/__locale