diff options
| author | Jonathan Wakely <jwakely.gcc@gmail.com> | 2010-06-11 15:02:33 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2010-06-11 16:02:33 +0100 |
| commit | cff90044727d4ef002a4ad16dbbed230d00f7551 (patch) | |
| tree | 202f4bc9efc7540d9d1aa709fe573ddf224dca23 | |
| parent | d725a1a5c025055d65ffa52009ee12bec0f34301 (diff) | |
| download | gcc-cff90044727d4ef002a4ad16dbbed230d00f7551.zip gcc-cff90044727d4ef002a4ad16dbbed230d00f7551.tar.gz gcc-cff90044727d4ef002a4ad16dbbed230d00f7551.tar.bz2 | |
tuple (_Swallow_assign::operator=): Add const.
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.
From-SVN: r160613
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/tuple | 10 |
2 files changed, 8 insertions, 7 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index b7c9727..6990691 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 bc458f1..8b2252e 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 |