From 928341b20854c6c73ae57a888e7c0dfe23efe354 Mon Sep 17 00:00:00 2001
From: Benjamin Kosnik <bkoz@redhat.com>
Date: Tue, 5 Dec 2006 10:57:09 +0000
Subject: [PATCH] tuple: Consistent include guards.

2006-12-05  Benjamin Kosnik  <bkoz@redhat.com>

	* include/tr1/tuple: Consistent include guards.
	* include/tr1/type_traits: Same.
	* include/tr1/array: Same.

From-SVN: r119539
---
 libstdc++-v3/ChangeLog               | 6 ++++++
 libstdc++-v3/include/tr1/array       | 4 ++--
 libstdc++-v3/include/tr1/tuple       | 4 ++--
 libstdc++-v3/include/tr1/type_traits | 4 ++--
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index b3c062f..83ff9ad 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2006-12-05  Benjamin Kosnik  <bkoz@redhat.com>
+
+	* include/tr1/tuple: Consistent include guards.
+	* include/tr1/type_traits: Same.
+	* include/tr1/array: Same.
+
 2006-12-04  Paolo Carlini  <pcarlini@suse.de>
 
 	PR libstdc++/29989 (again)
diff --git a/libstdc++-v3/include/tr1/array b/libstdc++-v3/include/tr1/array
index adf0e76..917bd9c 100644
--- a/libstdc++-v3/include/tr1/array
+++ b/libstdc++-v3/include/tr1/array
@@ -31,8 +31,8 @@
  *  This is a TR1 C++ Library header. 
  */
 
-#ifndef _ARRAY
-#define _ARRAY 1
+#ifndef _TR1_ARRAY
+#define _TR1_ARRAY 1
 
 #include <new>
 #include <iterator>
diff --git a/libstdc++-v3/include/tr1/tuple b/libstdc++-v3/include/tr1/tuple
index 7b4b8f0..d30bfba 100644
--- a/libstdc++-v3/include/tr1/tuple
+++ b/libstdc++-v3/include/tr1/tuple
@@ -33,8 +33,8 @@
 
 // Chris Jefferson <chris@bubblescope.net>
 
-#ifndef _TUPLE
-#define _TUPLE 1
+#ifndef _TR1_TUPLE
+#define _TR1_TUPLE 1
 
 #include <tr1/utility>
 #include <tr1/ref_fwd.h>
diff --git a/libstdc++-v3/include/tr1/type_traits b/libstdc++-v3/include/tr1/type_traits
index ccbfc60..bf81fe0 100644
--- a/libstdc++-v3/include/tr1/type_traits
+++ b/libstdc++-v3/include/tr1/type_traits
@@ -31,8 +31,8 @@
  *  This is a TR1 C++ Library header. 
  */
 
-#ifndef _TYPE_TRAITS
-#define _TYPE_TRAITS 1
+#ifndef _TR1_TYPE_TRAITS
+#define _TR1_TYPE_TRAITS 1
 
 #include <bits/c++config.h>
 #include <tr1/type_traits_fwd.h>
-- 
2.7.4