diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 4 | ||||
| -rw-r--r-- | libstdc++-v3/include/ext/random | 11 |
2 files changed, 14 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 1935124..7a6f73e 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,7 @@ +2012-09-26 Paolo Carlini <paolo.carlini@oracle.com> + + * include/ext/random: Add include checks for c++11 and <cstdint>. + 2012-09-26 Benjamin Kosnik <bkoz@redhat.com> PR libstdc++/54314 diff --git a/libstdc++-v3/include/ext/random b/libstdc++-v3/include/ext/random index c7321a9..884e8a0 100644 --- a/libstdc++-v3/include/ext/random +++ b/libstdc++-v3/include/ext/random @@ -31,12 +31,17 @@ #pragma GCC system_header +#ifndef __GXX_EXPERIMENTAL_CXX0X__ +# include <bits/c++0x_warning.h> +#else + #include <random> #include <array> #ifdef __SSE2__ # include <x86intrin.h> #endif +#ifdef _GLIBCXX_USE_C99_STDINT_TR1 namespace __gnu_cxx _GLIBCXX_VISIBILITY(default) { @@ -1846,4 +1851,8 @@ _GLIBCXX_END_NAMESPACE_VERSION #include "opt_random.h" #include "random.tcc" -#endif /* _EXT_RANDOM */ +#endif // _GLIBCXX_USE_C99_STDINT_TR1 + +#endif // __GXX_EXPERIMENTAL_CXX0X__ + +#endif // _EXT_RANDOM |