diff options
author | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-06-11 15:02:33 +0000 |
---|---|---|
committer | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-06-11 15:02:33 +0000 |
commit | 3be9fe847776077490a51aeeebf6485038cbd3d7 (patch) | |
tree | 202f4bc9efc7540d9d1aa709fe573ddf224dca23 /libstdc++-v3 | |
parent | 2053c8ce3108f50feb5e4c7216fae42fb4c93fbd (diff) | |
download | gcc-3be9fe847776077490a51aeeebf6485038cbd3d7.tar.gz |
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
Diffstat (limited to 'libstdc++-v3')
-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 b7c97270b70..699069190c8 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 bc458f15ba4..8b2252e3686 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 |