From 96144e13e2f625eb3aef670e199f712f4967c63a Mon Sep 17 00:00:00 2001
From: Paolo Carlini <pcarlini@suse.de>
Date: Sun, 23 Jan 2005 11:10:37 +0000
Subject: [PATCH] type_traits (aligned_storage): Use __aligned__ instead of
 aligned.

2005-01-23  Paolo Carlini  <pcarlini@suse.de>

	* include/tr1/type_traits (aligned_storage): Use __aligned__ instead
	of aligned.

From-SVN: r94107
---
 libstdc++-v3/ChangeLog               |  5 +++++
 libstdc++-v3/include/tr1/type_traits | 14 +++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 2b53cfe7e35..f11dbc92c76 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-23  Paolo Carlini  <pcarlini@suse.de>
+
+	* include/tr1/type_traits (aligned_storage): Use __aligned__ instead
+	of aligned.
+
 2005-01-23  Paolo Carlini  <pcarlini@suse.de>
             Andreas Jaeger  <aj@suse.de>
 
diff --git a/libstdc++-v3/include/tr1/type_traits b/libstdc++-v3/include/tr1/type_traits
index 1cb847c760e..7fca1b87f7b 100644
--- a/libstdc++-v3/include/tr1/type_traits
+++ b/libstdc++-v3/include/tr1/type_traits
@@ -662,7 +662,7 @@ namespace tr1
   // 
   // template<std::size_t _Len, std::size_t _Align>
   //   struct aligned_storage
-  //   { typedef char type[_Len] __attribute__((aligned(_Align))); }
+  //   { typedef char type[_Len] __attribute__((__aligned__(_Align))); }
   //
   // Temporary workaround, useful for Align up to 32:
   template<std::size_t, std::size_t>
@@ -674,7 +674,7 @@ namespace tr1
       union type
       {
 	unsigned char __data[_Len];
-	char __align __attribute__((aligned(1)));
+	char __align __attribute__((__aligned__(1)));
       };
     };
 
@@ -684,7 +684,7 @@ namespace tr1
       union type
       {
 	unsigned char __data[_Len];
-	char __align __attribute__((aligned(2)));
+	char __align __attribute__((__aligned__(2)));
       };
     };
 
@@ -694,7 +694,7 @@ namespace tr1
       union type
       {
 	unsigned char __data[_Len];
-	char __align __attribute__((aligned(4)));
+	char __align __attribute__((__aligned__(4)));
       };
     };
 
@@ -704,7 +704,7 @@ namespace tr1
       union type
       {
 	unsigned char __data[_Len];
-	char __align __attribute__((aligned(8)));
+	char __align __attribute__((__aligned__(8)));
       };
     };
 
@@ -714,7 +714,7 @@ namespace tr1
       union type
       {
 	unsigned char __data[_Len];
-	char __align __attribute__((aligned(16)));
+	char __align __attribute__((__aligned__(16)));
       };
     };
   
@@ -724,7 +724,7 @@ namespace tr1
       union type
       {
 	unsigned char __data[_Len];
-	char __align __attribute__((aligned(32)));
+	char __align __attribute__((__aligned__(32)));
       };
     };