OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

safe_base.h (__gnu_debug::_Safe_sequence_base): Revert -Weffc++ changes that defined copy ctory and or assignment operator.

Browse Source 
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.

From-SVN: r83804
This commit is contained in:
Benjamin Kosnik 2004-06-28 18:31:18 +00:00 committed by Benjamin Kosnik
parent 5afdc07a74
commit 4723805a61
3 changed files with 9 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libstdc++-v3/ChangeLog
View File

@ -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-28 Paolo Carlini <pcarlini@suse.de>
* src/localename.cc (locale::_Impl::_Impl): Slightly improve

21
libstdc++-v3/include/debug/safe_base.h
View File

@ -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()

21
libstdc++-v3/libsupc++/tinfo.cc
View File

@ -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