From: bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 5 Dec 2006 10:57:09 +0000 (+0000)
Subject: 2006-12-05  Benjamin Kosnik  <bkoz@redhat.com>
X-Git-Tag: upstream/4.9.2~51698
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=72148304985449c397dd27993218308a391c47cf;p=platform%2Fupstream%2Flinaro-gcc.git

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

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



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@119539 138bc75d-0d04-0410-961f-82ee72b054a4
---

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>