diff options
| author | Dimitry Andric <dimitry@andric.com> | 2019-02-20 21:01:31 +0000 |
|---|---|---|
| committer | Dimitry Andric <dimitry@andric.com> | 2019-02-20 21:01:31 +0000 |
| commit | d95da99b9159ca326a62b6c8ca44cb4a93db184c (patch) | |
| tree | 883cb17f691ab8662117362f600ab9025dbfe57a | |
| parent | 8d9c224a8c5fc3a5a48e6406ccbfc2c2d68128b2 (diff) | |
| download | bcm5719-llvm-d95da99b9159ca326a62b6c8ca44cb4a93db184c.tar.gz bcm5719-llvm-d95da99b9159ca326a62b6c8ca44cb4a93db184c.zip | |
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
llvm-svn: 354515
| -rw-r--r-- | libcxx/include/__locale | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libcxx/include/__locale b/libcxx/include/__locale index d1d66f94d0d..0a275c07a9a 100644 --- a/libcxx/include/__locale +++ b/libcxx/include/__locale @@ -1229,8 +1229,6 @@ _LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS codecvt_byname<w _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 { |
