From 0736fd563fa409b16f4cf1c3a7e4c42051f8c6dc Mon Sep 17 00:00:00 2001
From: Paolo Carlini <pcarlini@suse.de>
Date: Sun, 12 Dec 2004 21:01:37 +0000
Subject: [PATCH] type_traits: Minor tweak.

2004-12-12  Paolo Carlini  <pcarlini@suse.de>

	* include/tr1/type_traits: Minor tweak.
	* testsuite/tr1/4_metaprogramming/type_properties/extent/
	typedefs.cc: Fix date.

From-SVN: r92062
---
 libstdc++-v3/ChangeLog                                 |  6 ++++++
 libstdc++-v3/include/tr1/type_traits                   | 10 +++++-----
 .../type_properties/extent/typedefs.cc                 |  2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 7a41704fb819..63e4842bd43c 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2004-12-12  Paolo Carlini  <pcarlini@suse.de>
+
+	* include/tr1/type_traits: Minor tweak.
+	* testsuite/tr1/4_metaprogramming/type_properties/extent/
+	typedefs.cc: Fix date.
+
 2004-12-12  Paolo Carlini  <pcarlini@suse.de>
 
 	* include/tr1/type_traits: Implement extent.
diff --git a/libstdc++-v3/include/tr1/type_traits b/libstdc++-v3/include/tr1/type_traits
index f38f51e858d7..fa0ae857436a 100644
--- a/libstdc++-v3/include/tr1/type_traits
+++ b/libstdc++-v3/include/tr1/type_traits
@@ -49,11 +49,11 @@ namespace tr1
     struct _Spec                                                 \
     : public true_type { };
       
-#define _DEFINE_SPEC(_Header, _Primary, _Type)                   \
-  _DEFINE_SPEC_HELPER(_Header, _Primary<_Type>)                  \
-  _DEFINE_SPEC_HELPER(_Header, _Primary<_Type const>)            \
-  _DEFINE_SPEC_HELPER(_Header, _Primary<_Type volatile>)         \
-  _DEFINE_SPEC_HELPER(_Header, _Primary<_Type const volatile>)
+#define _DEFINE_SPEC(_Header, _Trait, _Type)                     \
+  _DEFINE_SPEC_HELPER(_Header, _Trait<_Type>)                    \
+  _DEFINE_SPEC_HELPER(_Header, _Trait<_Type const>)              \
+  _DEFINE_SPEC_HELPER(_Header, _Trait<_Type volatile>)           \
+  _DEFINE_SPEC_HELPER(_Header, _Trait<_Type const volatile>)
 
   /// @brief  primary type categories [4.5.1].
   template<typename>
diff --git a/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/extent/typedefs.cc b/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/extent/typedefs.cc
index 02a468c58217..0356b54b6d36 100644
--- a/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/extent/typedefs.cc
+++ b/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/extent/typedefs.cc
@@ -1,4 +1,4 @@
-// 2004-12-11  Paolo Carlini  <pcarlini@suse.de>
+// 2004-12-12  Paolo Carlini  <pcarlini@suse.de>
 //
 // Copyright (C) 2004 Free Software Foundation, Inc.
 //
-- 
GitLab