diff options
| author | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-06-28 19:00:23 +0000 |
|---|---|---|
| committer | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-06-28 19:00:23 +0000 |
| commit | 69716e795148ece3f2ee93e438fb88fe298cc16d (patch) | |
| tree | bb28dfd7317d9051b54b6bbe806e3a85c85c68bc | |
| parent | ef4e080f9aaf29cd11b9438f129a54140ed56afd (diff) | |
| download | gcc-69716e795148ece3f2ee93e438fb88fe298cc16d.tar.gz | |
2004-06-28 Benjamin Kosnik <bkoz@redhat.com>
* include/debug/safe_base.h (__gnu_debug::_Safe_sequence_base):
Revert -Weffc++ changes that defined copy ctory and or assignment
operator.
* libsupc++/tinfo.cc (__upcast_result): Same.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-3_4-branch@83805 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++-v3/include/debug/safe_base.h | 21 | ||||
| -rw-r--r-- | libstdc++-v3/libsupc++/tinfo.cc | 21 |
3 files changed, 9 insertions, 40 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index e5427682551..4819ad53b91 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2004-06-28 Benjamin Kosnik <bkoz@redhat.com> + + * include/debug/safe_base.h (__gnu_debug::_Safe_sequence_base): + Revert -Weffc++ changes that defined copy ctory and or assignment + operator. + * libsupc++/tinfo.cc (__upcast_result): Same. + 2004-06-25 Benjamin Kosnik <bkoz@redhat.com> PR libstdc++/16182 diff --git a/libstdc++-v3/include/debug/safe_base.h b/libstdc++-v3/include/debug/safe_base.h index fb62620f06a..a1af33ac5f7 100644 --- a/libstdc++-v3/include/debug/safe_base.h +++ b/libstdc++-v3/include/debug/safe_base.h @@ -98,7 +98,7 @@ namespace __gnu_debug _Safe_iterator_base& operator=(const _Safe_iterator_base&); - explicit + explicit _Safe_iterator_base(const _Safe_iterator_base&); ~_Safe_iterator_base() { this->_M_detach(); } @@ -164,25 +164,6 @@ namespace __gnu_debug : _M_iterators(0), _M_const_iterators(0), _M_version(1) { } - explicit - _Safe_sequence_base(const _Safe_sequence_base& __seq) - : _M_iterators(__seq._M_iterators), - _M_const_iterators(__seq._M_const_iterators), - _M_version(__seq._M_version) - { } - - _Safe_sequence_base& - operator=(const _Safe_sequence_base& __seq) - { - if (&__seq != this) - { - _M_iterators = __seq._M_iterators; - _M_const_iterators = __seq._M_const_iterators; - _M_version = __seq._M_version; - } - return *this; - } - /** Notify all iterators that reference this sequence that the sequence is being destroyed. */ ~_Safe_sequence_base() diff --git a/libstdc++-v3/libsupc++/tinfo.cc b/libstdc++-v3/libsupc++/tinfo.cc index ed6500697f0..62fa4486aeb 100644 --- a/libstdc++-v3/libsupc++/tinfo.cc +++ b/libstdc++-v3/libsupc++/tinfo.cc @@ -1,5 +1,5 @@ // Methods for type_info for -*- C++ -*- Run Time Type Identification. -// Copyright (C) 1994, 1996, 1998, 1999, 2000, 2001, 2002, 2003 +// Copyright (C) 1994, 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004 // Free Software Foundation // // This file is part of GCC. @@ -203,25 +203,6 @@ struct __class_type_info::__upcast_result __upcast_result (int d) :dst_ptr (NULL), part2dst (__unknown), src_details (d), base_type (NULL) {} - - explicit - __upcast_result(const __upcast_result& r) - : dst_ptr(r.dst_ptr), part2dst(r.part2dst), src_details(r.src_details), - base_type(r.base_type) - { } - - __upcast_result& - operator=(const __upcast_result& r) - { - if (&r != this) - { - dst_ptr = r.dst_ptr; - part2dst = r.part2dst; - src_details = r.src_details; - base_type = r.base_type; - } - return *this; - } }; // __dyncast_result is used to hold information during traversal of a class |