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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 86e05b1cf896fcaa8f63d3e530315d6c2463bc9d..127ea5e79950da63486cb5607ef195c84c13d87e 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+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

diff --git a/libstdc++-v3/include/bits/random.h b/libstdc++-v3/include/bits/random.h
index aa21a10ca55b3a1df7a4e099aca733bf9acb0f3b..4c3ebe2fc65cd00e3a9a83afe07648c2d451f4b4 100644 (file)
--- 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 690af186f96ba6293a4a968076637c079c01baea..9312038f834bfcc5733a53f8d5958f1ac70e1340 100644 (file)
--- 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 f458cc74748a2cc4cd6d413768df986b198d2106..1bc8f1f8fbbb13279509cd3f3cb5cca77e45d6a8 100644 (file)
--- 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