From: redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 11 Jun 2010 15:02:33 +0000 (+0000)
Subject: 2010-06-11  Jonathan Wakely  <jwakely.gcc@gmail.com>
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3be9fe847776077490a51aeeebf6485038cbd3d7;p=thirdparty%2Fgcc.git

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 b7c97270b70b..699069190c88 100644
--- 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 bc458f15ba47..8b2252e3686b 100644
--- 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