From ff0b7e883d9f09785c92ab41fa32fa093b60b346 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 31 May 2019 14:59:19 +0100 Subject: [PATCH] Fix breakage due to removing __gnu_cxx::size_t declaration Restore the using-declaration but locally in the source file, not in the header. * src/c++98/bitmap_allocator.cc: Add using-declaration for size_t. From-SVN: r271812 --- libstdc++-v3/ChangeLog | 2 ++ libstdc++-v3/src/c++98/bitmap_allocator.cc | 2 ++ 2 files changed, 4 insertions(+) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index ac97f0e8d76..7dc8e581318 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,7 @@ 2019-05-31 Jonathan Wakely + * src/c++98/bitmap_allocator.cc: Add using-declaration for size_t. + PR libstdc++/90682 * libsupc++/eh_term_handler.cc: Include eh_term_handler.h to get definition of _GLIBCXX_DEFAULT_TERM_HANDLER. diff --git a/libstdc++-v3/src/c++98/bitmap_allocator.cc b/libstdc++-v3/src/c++98/bitmap_allocator.cc index d22bf4e118f..ffaea1cbac9 100644 --- a/libstdc++-v3/src/c++98/bitmap_allocator.cc +++ b/libstdc++-v3/src/c++98/bitmap_allocator.cc @@ -28,6 +28,8 @@ namespace __gnu_cxx _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION + using std::size_t; + namespace __detail { template class __mini_vector< -- 2.30.2