2006-05-07 Paolo Carlini <pcarlini@suse.de>

	* include/tr1/type_traits (integral_constant<>::value): Define.
	* testsuite/tr1/4_metaprogramming/helper_classes/static_definition.cc:
	New.

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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 003e8ef..314c553 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-07  Paolo Carlini  <pcarlini@suse.de>
+
+       * include/tr1/type_traits (integral_constant<>::value): Define.
+       * testsuite/tr1/4_metaprogramming/helper_classes/static_definition.cc:
+       New.
+
 2006-05-04  Douglas Gregor  <dgregor@cs.indiana.edu>
 
        PR libstdc++/27404

diff --git a/libstdc++-v3/include/tr1/type_traits b/libstdc++-v3/include/tr1/type_traits
index f4a1838..0f79831 100644 (file)
--- a/libstdc++-v3/include/tr1/type_traits
+++ b/libstdc++-v3/include/tr1/type_traits
@@ -1,6 +1,6 @@
 // TR1 type_traits -*- C++ -*-
 
-// Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+// Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -98,6 +98,9 @@ _GLIBCXX_BEGIN_NAMESPACE(tr1)
   typedef integral_constant<bool, true>     true_type;
   typedef integral_constant<bool, false>    false_type;
 
+  template<typename _Tp, _Tp __v>
+    const _Tp integral_constant<_Tp, __v>::value;
+
   /// @brief  primary type categories [4.5.1].
   template<typename>
     struct is_void

diff --git a/libstdc++-v3/testsuite/tr1/4_metaprogramming/helper_classes/static_definition.cc b/libstdc++-v3/testsuite/tr1/4_metaprogramming/helper_classes/static_definition.cc
new file mode 100644 (file)
index 0000000..bb2b3cd
--- /dev/null
+++ b/libstdc++-v3/testsuite/tr1/4_metaprogramming/helper_classes/static_definition.cc
@@ -0,0 +1,37 @@
+// 2006-05-07  Paolo Carlini  <pcarlini@suse.de>
+//
+// Copyright (C) 2006 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option)
+// any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING.  If not, write to the Free
+// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+// USA.
+
+// 4.3 Helper classes
+
+#include <tr1/type_traits>
+#include <testsuite_hooks.h>
+
+void test01()
+{
+  bool test __attribute__((unused)) = true;
+  const bool* p = &std::tr1::integral_constant<bool, true>::value;
+  VERIFY( p );
+}
+
+int main()
+{
+  test01();
+  return 0;
+}