aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Carlini <pcarlini@suse.de>2006-10-30 23:23:44 +0000
committerPaolo Carlini <paolo@gcc.gnu.org>2006-10-30 23:23:44 +0000
commit8975fa18ad8ef52774073462dfc7698f06cf591e (patch)
treee0f963d09f9a6d272f8f6c250d3ec7f65f9bac0d
parenta1e45ff04c25fd5929f7a2fb8359856b53857df7 (diff)
downloadgcc-8975fa18ad8ef52774073462dfc7698f06cf591e.zip
gcc-8975fa18ad8ef52774073462dfc7698f06cf591e.tar.gz
gcc-8975fa18ad8ef52774073462dfc7698f06cf591e.tar.bz2
utility (tuple_size<std::pair<> >::value): Provide definition.
2006-10-30 Paolo Carlini <pcarlini@suse.de> * include/tr1/utility (tuple_size<std::pair<> >::value): Provide definition. From-SVN: r118207
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/include/tr1/utility7
2 files changed, 10 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 21f8030..84f7775 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,10 @@
2006-10-30 Paolo Carlini <pcarlini@suse.de>
+ * include/tr1/utility (tuple_size<std::pair<> >::value): Provide
+ definition.
+
+2006-10-30 Paolo Carlini <pcarlini@suse.de>
+
* include/tr1/tuple_iterate.h (tuple_size<tuple<> >::value): Provide
definition.
* include/tr1/functional (is_bind_expression<>::value,
diff --git a/libstdc++-v3/include/tr1/utility b/libstdc++-v3/include/tr1/utility
index db140b2..d9b99ec 100644
--- a/libstdc++-v3/include/tr1/utility
+++ b/libstdc++-v3/include/tr1/utility
@@ -1,6 +1,6 @@
// TR1 utility -*- 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
@@ -47,7 +47,10 @@ _GLIBCXX_BEGIN_NAMESPACE(tr1)
template<class _Tp1, class _Tp2>
struct tuple_size<std::pair<_Tp1, _Tp2> >
{ static const int value = 2; };
-
+
+ template<class _Tp1, class _Tp2>
+ const int tuple_size<std::pair<_Tp1, _Tp2> >::value;
+
template<class _Tp1, class _Tp2>
struct tuple_element<0, std::pair<_Tp1, _Tp2> >
{ typedef _Tp1 type; };