random: Make include guards consistent.

2006-07-21  Benjamin Kosnik  <bkoz@redhat.com>

	* include/tr1/random: Make include guards consistent.
	* include/tr1/unordered_map: Same.
	* include/tr1/hashtable: Same.
	* include/tr1/unordered_set: Same.

From-SVN: r115656

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index c0092fd6335d539cc9bcc2673d665a969b1936f0..155bb86b7f36872cd18ebc29d70bc550eec15dbd 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2006-07-21  Benjamin Kosnik  <bkoz@redhat.com>
+
+       * include/tr1/random: Make include guards consistent.
+       * include/tr1/unordered_map: Same.
+       * include/tr1/hashtable: Same.
+       * include/tr1/unordered_set: Same.
+
 2006-07-21  Steve Ellcey  <sje@cup.hp.com>
 
        PR target/26792

diff --git a/libstdc++-v3/include/tr1/hashtable b/libstdc++-v3/include/tr1/hashtable
index 7c7c14478024454d7770e97d1a8f377b5626f756..d5041f75db8eeafbc9efeaf766ab941576cd47b0 100644 (file)
--- a/libstdc++-v3/include/tr1/hashtable
+++ b/libstdc++-v3/include/tr1/hashtable
@@ -51,8 +51,8 @@
 // A. Tavori and V. Dreizin, "Generic Associative Containers", 2004.
 //    ??? Full citation?
 
-#ifndef GNU_LIBSTDCXX_TR1_HASHTABLE_
-#define GNU_LIBSTDCXX_TR1_HASHTABLE_
+#ifndef _TR1_HASHTABLE
+#define _TR1_HASHTABLE 1
 
 #include <utility>             // For std::pair
 #include <memory>
@@ -1957,7 +1957,7 @@ _GLIBCXX_BEGIN_NAMESPACE(tr1)
     }
 
 _GLIBCXX_END_NAMESPACE
-}                              // Namespace std::tr1
+} // namespace std::tr1
 
-#endif /* GNU_LIBSTDCXX_TR1_HASHTABLE_ */
+#endif // _TR1_HASHTABLE
 

diff --git a/libstdc++-v3/include/tr1/random b/libstdc++-v3/include/tr1/random
index 59e326dddcefc59b173e9eee315db2f10c630545..01ada8b83dc11fe703ebb76321c50bcce38e7c16 100644 (file)
--- a/libstdc++-v3/include/tr1/random
+++ b/libstdc++-v3/include/tr1/random
@@ -27,8 +27,8 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef _STD_TR1_RANDOM
-#define _STD_TR1_RANDOM 1
+#ifndef _TR1_RANDOM
+#define _TR1_RANDOM 1
 
 /**
  * @file 
@@ -2046,4 +2046,4 @@ _GLIBCXX_END_NAMESPACE
 
 #include <tr1/random.tcc>
 
-#endif // _STD_TR1_RANDOM
+#endif // _TR1_RANDOM

diff --git a/libstdc++-v3/include/tr1/unordered_map b/libstdc++-v3/include/tr1/unordered_map
index da0d86bf8b6f96f2f89d9608ff9e3724fa2555ba..207ddbfb29d33cedb1088cc974b49ff82fcd7252 100644 (file)
--- a/libstdc++-v3/include/tr1/unordered_map
+++ b/libstdc++-v3/include/tr1/unordered_map
@@ -31,8 +31,8 @@
  *  This is a TR1 C++ Library header. 
  */
 
-#ifndef GNU_LIBSTDCXX_TR1_UNORDERED_MAP_
-#define GNU_LIBSTDCXX_TR1_UNORDERED_MAP_
+#ifndef _TR1_UNORDERED_MAP
+#define _TR1_UNORDERED_MAP 1
 
 #include <tr1/hashtable>
 #include <tr1/functional>
@@ -164,4 +164,4 @@ _GLIBCXX_BEGIN_NAMESPACE(tr1)
 _GLIBCXX_END_NAMESPACE
 }
 
-#endif /* GNU_LIBSTDCXX_TR1_UNORDERED_MAP_ */
+#endif // _TR1_UNORDERED_MAP

diff --git a/libstdc++-v3/include/tr1/unordered_set b/libstdc++-v3/include/tr1/unordered_set
index 02c518451af5157751b89d1dd9b0c0cb22dc73e6..1e35c79960e14916b8a4b141663aa61cba28fb44 100644 (file)
--- a/libstdc++-v3/include/tr1/unordered_set
+++ b/libstdc++-v3/include/tr1/unordered_set
@@ -31,8 +31,8 @@
  *  This is a TR1 C++ Library header. 
  */
 
-#ifndef GNU_LIBSTDCXX_TR1_UNORDERED_SET_
-#define GNU_LIBSTDCXX_TR1_UNORDERED_SET_
+#ifndef _TR1_UNORDERED_SET
+#define _TR1_UNORDERED_SET 1
 
 #include <tr1/hashtable>
 #include <tr1/functional>
@@ -160,4 +160,4 @@ _GLIBCXX_BEGIN_NAMESPACE(tr1)
 _GLIBCXX_END_NAMESPACE
 }
 
-#endif /* GNU_LIBSTDCXX_TR1_UNORDERED_SET_ */
+#endif // _TR1_UNORDERED_SET