From 06f29237d759b49656326add6d7c8e1c2c34049a Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Thu, 9 Sep 2010 11:23:39 +0000 Subject: [PATCH] re PR libstdc++/45613 (bits/random.h misses include guards) 2010-09-09 Paolo Carlini PR libstdc++/45613 * include/bits/random.tcc: Add missing include guards. * include/bits/random.h: Likewise. * include/tr1/random.tcc: Likewise. From-SVN: r164074 --- libstdc++-v3/ChangeLog | 7 +++++++ libstdc++-v3/include/bits/random.h | 5 ++++- libstdc++-v3/include/bits/random.tcc | 5 +++++ libstdc++-v3/include/tr1/random.tcc | 5 +++++ 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 86e05b1cf896..127ea5e79950 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2010-09-09 Paolo Carlini + + 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 * libsupc++/cxxabi.h: Uglify nothrow to __nothrow__; fix a few diff --git a/libstdc++-v3/include/bits/random.h b/libstdc++-v3/include/bits/random.h index aa21a10ca55b..4c3ebe2fc65c 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 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 690af186f96b..9312038f834b 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 // 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 f458cc74748a..1bc8f1f8fbbb 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