2010-06-11 Jonathan Wakely <jwakely.gcc@gmail.com>

	* include/std/tuple (_Swallow_assign::operator=): Add const.
	(ignore): Replace anonymous namespace member with const instance.

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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index b7c9727..6990691 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-11  Jonathan Wakely  <jwakely.gcc@gmail.com>
+
+       * include/std/tuple (_Swallow_assign::operator=): Add const.
+       (ignore): Replace anonymous namespace member with const instance.
+
 2010-06-10  Suresh Gumpula  <suresh.gumpula@amd.com>
 
        PR libstdc++/43918

diff --git a/libstdc++-v3/include/std/tuple b/libstdc++-v3/include/std/tuple
index bc458f1..8b2252e 100644 (file)
--- a/libstdc++-v3/include/std/tuple
+++ b/libstdc++-v3/include/std/tuple
@@ -689,16 +689,12 @@ namespace std
   struct _Swallow_assign
   {
     template<class _Tp>
-      _Swallow_assign&
-      operator=(const _Tp&)
+      const _Swallow_assign&
+      operator=(const _Tp&) const
       { return *this; }
   };
 
-  // TODO: Put this in some kind of shared file.
-  namespace
-  {
-    _Swallow_assign ignore;
-  }; // anonymous namespace
+  const _Swallow_assign ignore{};
 
   /**
    * Stores a tuple of indices. Used by bind() to extract the elements