diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2015-09-18 12:21:05 +0100 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2015-09-18 12:21:05 +0100 |
| commit | 7215aaedd627b93bf09bb5af9acbe46cc87d7c14 (patch) | |
| tree | efad5aaabfc6b23538da0a00e5d8bc06452b2929 | |
| parent | d0f4e7fcdbde6134337c5956a23a740a26a4af66 (diff) | |
| download | gcc-7215aaedd627b93bf09bb5af9acbe46cc87d7c14.zip gcc-7215aaedd627b93bf09bb5af9acbe46cc87d7c14.tar.gz gcc-7215aaedd627b93bf09bb5af9acbe46cc87d7c14.tar.bz2 | |
Fix errors due to extra includes in extc++.h
* include/precompiled/extc++.h: Fix bootstrap error due to
unconditional inclusion of <ext/enc_filebuf.h>.
* include/ext/random: Check for definition of UINT32_C.
From-SVN: r227902
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/ext/random | 4 | ||||
| -rw-r--r-- | libstdc++-v3/include/precompiled/extc++.h | 1 |
3 files changed, 8 insertions, 3 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 89b4017..1540db2 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2015-09-18 Jonathan Wakely <jwakely@redhat.com> + + * include/precompiled/extc++.h: Fix bootstrap error due to + unconditional inclusion of <ext/enc_filebuf.h>. + * include/ext/random: Check for definition of UINT32_C. + 2015-09-17 Catherine Moore <clm@codesourcery.com> * src/c++11/debug.cc: Include <cstdio>. diff --git a/libstdc++-v3/include/ext/random b/libstdc++-v3/include/ext/random index be6db5d..0bcfa4a 100644 --- a/libstdc++-v3/include/ext/random +++ b/libstdc++-v3/include/ext/random @@ -43,7 +43,7 @@ # include <x86intrin.h> #endif -#ifdef _GLIBCXX_USE_C99_STDINT_TR1 +#if defined(_GLIBCXX_USE_C99_STDINT_TR1) && defined(UINT32_C) namespace __gnu_cxx _GLIBCXX_VISIBILITY(default) { @@ -3499,7 +3499,7 @@ _GLIBCXX_END_NAMESPACE_VERSION #include "ext/opt_random.h" #include "random.tcc" -#endif // _GLIBCXX_USE_C99_STDINT_TR1 +#endif // _GLIBCXX_USE_C99_STDINT_TR1 && UINT32_C #endif // C++11 diff --git a/libstdc++-v3/include/precompiled/extc++.h b/libstdc++-v3/include/precompiled/extc++.h index 8883e47..31f5ec8 100644 --- a/libstdc++-v3/include/precompiled/extc++.h +++ b/libstdc++-v3/include/precompiled/extc++.h @@ -46,7 +46,6 @@ #endif #include <ext/concurrence.h> #include <ext/debug_allocator.h> -#include <ext/enc_filebuf.h> #include <ext/extptr_allocator.h> #include <ext/functional> #include <ext/iterator> |