diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2010-09-09 11:23:39 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2010-09-09 11:23:39 +0000 |
| commit | 06f29237d759b49656326add6d7c8e1c2c34049a (patch) | |
| tree | be3fc700c7224a83245390cb5a15f0dada1e15fd | |
| parent | 61356c15ac61881579a93c7f1d02e0bec7fec857 (diff) | |
| download | gcc-06f29237d759b49656326add6d7c8e1c2c34049a.zip gcc-06f29237d759b49656326add6d7c8e1c2c34049a.tar.gz gcc-06f29237d759b49656326add6d7c8e1c2c34049a.tar.bz2 | |
re PR libstdc++/45613 (bits/random.h misses include guards)
2010-09-09 Paolo Carlini <paolo.carlini@oracle.com>
PR libstdc++/45613
* include/bits/random.tcc: Add missing include guards.
* include/bits/random.h: Likewise.
* include/tr1/random.tcc: Likewise.
From-SVN: r164074
| -rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/random.h | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/random.tcc | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/tr1/random.tcc | 5 |
4 files changed, 21 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 86e05b1..127ea5e 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,12 @@ 2010-09-09 Paolo Carlini <paolo.carlini@oracle.com> + PR libstdc++/45613 + * include/bits/random.tcc: Add missing include guards. + * include/bits/random.h: Likewise. + * include/tr1/random.tcc: Likewise. + +2010-09-09 Paolo Carlini <paolo.carlini@oracle.com> + * libsupc++/cxxabi.h: Uglify nothrow to __nothrow__; fix a few inconsistent uglifications everywhere. diff --git a/libstdc++-v3/include/bits/random.h b/libstdc++-v3/include/bits/random.h index aa21a10..4c3ebe2 100644 --- a/libstdc++-v3/include/bits/random.h +++ b/libstdc++-v3/include/bits/random.h @@ -28,6 +28,9 @@ * You should not attempt to use it directly. */ +#ifndef _RANDOM_H +#define _RANDOM_H 1 + #include <vector> namespace std @@ -5337,6 +5340,6 @@ namespace std /* @} */ // group random_utilities /* @} */ // group random - } +#endif diff --git a/libstdc++-v3/include/bits/random.tcc b/libstdc++-v3/include/bits/random.tcc index 690af18..9312038 100644 --- a/libstdc++-v3/include/bits/random.tcc +++ b/libstdc++-v3/include/bits/random.tcc @@ -27,6 +27,9 @@ * You should not attempt to use it directly. */ +#ifndef _RANDOM_TCC +#define _RANDOM_TCC 1 + #include <numeric> // std::accumulate and std::partial_sum namespace std @@ -2815,3 +2818,5 @@ namespace std return __sum / __tmp; } } + +#endif diff --git a/libstdc++-v3/include/tr1/random.tcc b/libstdc++-v3/include/tr1/random.tcc index f458cc7..1bc8f1f 100644 --- a/libstdc++-v3/include/tr1/random.tcc +++ b/libstdc++-v3/include/tr1/random.tcc @@ -28,6 +28,9 @@ * You should not attempt to use it directly. */ +#ifndef _GLIBCXX_TR1_RANDOM_TCC +#define _GLIBCXX_TR1_RANDOM_TCC 1 + namespace std { namespace tr1 @@ -1708,3 +1711,5 @@ namespace tr1 } } } + +#endif |