From 2268897446c5ba0810c22b8924935bd54df4c401 Mon Sep 17 00:00:00 2001 From: paolo Date: Thu, 9 Sep 2010 11:23:39 +0000 Subject: [PATCH] 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@164074 138bc75d-0d04-0410-961f-82ee72b054a4 --- 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 86e05b1..127ea5e 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,12 @@ 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 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 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 // 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 -- 2.7.4