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

* config/locale/gnu/ctype_members.cc 

(ctype<wchar_t>::_M_convert_to_wmask): Remove stray semicolon.
	* config/locale/gnu/monetary_members.cc
	(moneypunct<wchar_t, true>::_M_initialize_moneypunct): Avoid
	defining classes in static_cast.
	(moneypunct<wchar_t, false>::_M_initialize_moneypunct): Likewise.
	* config/locale/gnu/numeric_members.cc
	(numpunct<wchar_t, false>::_M_initialize_numpunct): Likewise.
	* include/bits/stl_deque.h (operator-): Insert typename where
	required.
	* include/bits/stl_multiset.h (multiset): Remove stray semicolon.
	* include/bits/stl_set.h (set): Likewise.
	* include/bits/valarray_meta.h (bits/slice_array.h): Include it.
	* include/std/std_fstream.h (basic_fstream::open): Use this-> to
	avoid Koenig lookup.
	(basic_fstream::close): Likewise.
	* libsupc++/new (operator delete): Remove stray semicolon.
	* libsupc++/new (operator delete[]): Likewise.
	* libsupc++/tinfo.cc: Likewise.
	* src/stdexcept.c (logic_error::~logic_error): Likewise.
	(runtime_error::~runtime_error): Likewise.

From-SVN: r60547
This commit is contained in:
Mark Mitchell 2002-12-27 23:03:03 +00:00 committed by Mark Mitchell
parent 27e3f16dba
commit 43be7fe7d7
12 changed files with 60 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,27 @@
2002-12-27 Mark Mitchell <mark@codesourcery.com>
* config/locale/gnu/ctype_members.cc
(ctype<wchar_t>::_M_convert_to_wmask): Remove stray semicolon.
* config/locale/gnu/monetary_members.cc
(moneypunct<wchar_t, true>::_M_initialize_moneypunct): Avoid
defining classes in static_cast.
(moneypunct<wchar_t, false>::_M_initialize_moneypunct): Likewise.
* config/locale/gnu/numeric_members.cc
(numpunct<wchar_t, false>::_M_initialize_numpunct): Likewise.
* include/bits/stl_deque.h (operator-): Insert typename where
required.
* include/bits/stl_multiset.h (multiset): Remove stray semicolon.
* include/bits/stl_set.h (set): Likewise.
* include/bits/valarray_meta.h (bits/slice_array.h): Include it.
* include/std/std_fstream.h (basic_fstream::open): Use this-> to
avoid Koenig lookup.
(basic_fstream::close): Likewise.
* libsupc++/new (operator delete): Remove stray semicolon.
* libsupc++/new (operator delete[]): Likewise.
* libsupc++/tinfo.cc: Likewise.
* src/stdexcept.c (logic_error::~logic_error): Likewise.
(runtime_error::~runtime_error): Likewise.
2002-12-26 Phil Edwards <pme@gcc.gnu.org>
* libsupc++/exception: Add comment (mistakenly skipped).

2
libstdc++-v3/config/locale/gnu/ctype_members.cc
View File

@ -95,7 +95,7 @@ namespace std
__ret = 0;
}
return __ret;
};
}
wchar_t
ctype<wchar_t>::do_toupper(wchar_t __c) const

15
libstdc++-v3/config/locale/gnu/monetary_members.cc
View File

@ -347,9 +347,12 @@ namespace std
setlocale(LC_ALL, __name);
#endif
_M_decimal_point = static_cast<wchar_t>(((union { const char *__s; unsigned int __w; }){ __s: __nl_langinfo_l(_NL_NUMERIC_DECIMAL_POINT_WC, __cloc)}).__w);
union __s_and_w { const char *__s; unsigned int __w; } __u;
__u.__s = __nl_langinfo_l(_NL_NUMERIC_DECIMAL_POINT_WC, __cloc);
_M_decimal_point = static_cast<wchar_t>(__u.__w);
_M_thousands_sep = static_cast<wchar_t>(((union { const char *__s; unsigned int __w; }){ __s: __nl_langinfo_l(_NL_NUMERIC_THOUSANDS_SEP_WC, __cloc)}).__w);
__u.__s = __nl_langinfo_l(_NL_NUMERIC_THOUSANDS_SEP_WC, __cloc);
_M_thousands_sep = static_cast<wchar_t>(__u.__w);
_M_grouping = __nl_langinfo_l(GROUPING, __cloc);
const char* __cpossign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
@ -448,8 +451,12 @@ namespace std
setlocale(LC_ALL, __name);
#endif
_M_decimal_point = static_cast<wchar_t>(((union { const char *__s; unsigned int __w; }){ __s: __nl_langinfo_l(_NL_NUMERIC_DECIMAL_POINT_WC, __cloc)}).__w);
_M_thousands_sep = static_cast<wchar_t>(((union { const char *__s; unsigned int __w; }){ __s: __nl_langinfo_l(_NL_NUMERIC_THOUSANDS_SEP_WC, __cloc)}).__w);
union __s_and_w { const char *__s; unsigned int __w; } __u;
__u.__s = __nl_langinfo_l(_NL_NUMERIC_DECIMAL_POINT_WC, __cloc);
_M_decimal_point = static_cast<wchar_t>(__u.__w);
__u.__s = __nl_langinfo_l(_NL_NUMERIC_THOUSANDS_SEP_WC, __cloc);
_M_thousands_sep = static_cast<wchar_t>(__u.__w);
_M_grouping = __nl_langinfo_l(GROUPING, __cloc);
const char* __cpossign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);

8
libstdc++-v3/config/locale/gnu/numeric_members.cc
View File

@ -86,8 +86,12 @@ namespace std
else
{
// Named locale.
_M_decimal_point = static_cast<wchar_t>(((union { const char *__s; unsigned int __w; }){ __s: __nl_langinfo_l(_NL_NUMERIC_DECIMAL_POINT_WC, __cloc)}).__w);
_M_thousands_sep = static_cast<wchar_t>(((union { const char *__s; unsigned int __w; }){ __s: __nl_langinfo_l(_NL_NUMERIC_THOUSANDS_SEP_WC, __cloc)}).__w);
union __s_and_w { const char *__s; unsigned int __w; } __u;
__u.__s = __nl_langinfo_l(_NL_NUMERIC_DECIMAL_POINT_WC, __cloc);
_M_decimal_point = static_cast<wchar_t>(__u.__w);
__u.__s = __nl_langinfo_l(_NL_NUMERIC_THOUSANDS_SEP_WC, __cloc);
_M_thousands_sep = static_cast<wchar_t>(__u.__w);
if (_M_thousands_sep == L'\0')
_M_grouping = "";
else

2
libstdc++-v3/include/bits/stl_deque.h
View File

@ -319,7 +319,7 @@ namespace std
operator-(const _Deque_iterator<_Tp, _RefL, _PtrL>& __x,
const _Deque_iterator<_Tp, _RefR, _PtrR>& __y)
{
return _Deque_iterator<_Tp, _RefL, _PtrL>::difference_type
return typename _Deque_iterator<_Tp, _RefL, _PtrL>::difference_type
(_Deque_iterator<_Tp, _RefL, _PtrL>::_S_buffer_size()) *
(__x._M_node - __y._M_node - 1) + (__x._M_cur - __x._M_first) +
(__y._M_last - __y._M_cur);

4
libstdc++-v3/include/bits/stl_multiset.h
View File

@ -1,6 +1,6 @@
// Multiset implementation -*- C++ -*-
// Copyright (C) 2001 Free Software Foundation, Inc.
// Copyright (C) 2001, 2002 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@ -85,7 +85,7 @@ class multiset
{
// concept requirements
__glibcpp_class_requires(_Key, _SGIAssignableConcept)
__glibcpp_class_requires4(_Compare, bool, _Key, _Key, _BinaryFunctionConcept);
__glibcpp_class_requires4(_Compare, bool, _Key, _Key, _BinaryFunctionConcept)
public:

4
libstdc++-v3/include/bits/stl_set.h
View File

@ -1,6 +1,6 @@
// Set implementation -*- C++ -*-
// Copyright (C) 2001 Free Software Foundation, Inc.
// Copyright (C) 2001, 2002 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@ -86,7 +86,7 @@ class set
{
// concept requirements
__glibcpp_class_requires(_Key, _SGIAssignableConcept)
__glibcpp_class_requires4(_Compare, bool, _Key, _Key, _BinaryFunctionConcept);
__glibcpp_class_requires4(_Compare, bool, _Key, _Key, _BinaryFunctionConcept)
public:
// typedefs:

4
libstdc++-v3/include/bits/valarray_meta.h
View File

@ -1,6 +1,6 @@
// The template and inlines for the -*- C++ -*- internal _Meta class.
// Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@ -39,6 +39,8 @@
#pragma GCC system_header
#include <bits/slice_array.h>
namespace std
{
//

4
libstdc++-v3/include/std/std_fstream.h
View File

@ -797,7 +797,7 @@ namespace std
ios_base::openmode __mode = ios_base::in | ios_base::out)
{
if (!_M_filebuf.open(__s, __mode))
setstate(ios_base::failbit);
this->setstate(ios_base::failbit);
}
/**
@ -810,7 +810,7 @@ namespace std
close()
{
if (!_M_filebuf.close())
setstate(ios_base::failbit);
this->setstate(ios_base::failbit);
}
};
} // namespace std

4
libstdc++-v3/libsupc++/new
View File

@ -93,8 +93,8 @@ inline void* operator new(std::size_t, void* __p) throw() { return __p; }
inline void* operator new[](std::size_t, void* __p) throw() { return __p; }
// Default placement versions of operator delete.
inline void operator delete (void*, void*) throw() { };
inline void operator delete[](void*, void*) throw() { };
inline void operator delete (void*, void*) throw() { }
inline void operator delete[](void*, void*) throw() { }
//@}
} // extern "C++"

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

@ -85,7 +85,7 @@ __do_upcast (const abi::__class_type_info *, void **) const
return false;
}
};
}
namespace {
@ -172,7 +172,7 @@ inline bool contained_nonvirtual_p (__class_type_info::__sub_kind access_path)
static const __class_type_info *const nonvirtual_base_type =
static_cast <const __class_type_info *> (0) + 1;
}; // namespace
} // namespace
namespace __cxxabiv1
{
@ -735,4 +735,4 @@ __dynamic_cast (const void *src_ptr, // object started from
return NULL;
}
}; // namespace __cxxabiv1
} // namespace __cxxabiv1

6
libstdc++-v3/src/stdexcept.cc
View File

@ -1,6 +1,6 @@
// Methods for Exception Support for -*- C++ -*-
// Copyright (C) 1997, 1999, 2001 Free Software Foundation, Inc.
// Copyright (C) 1997, 1999, 2001, 2002 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@ -39,7 +39,7 @@ namespace std
logic_error::logic_error(const string& __arg)
: exception(), _M_msg(__arg) { }
logic_error::~logic_error() throw() { };
logic_error::~logic_error() throw() { }
const char*
logic_error::what() const throw()
@ -60,7 +60,7 @@ namespace std
runtime_error::runtime_error(const string& __arg)
: exception(), _M_msg(__arg) { }
runtime_error::~runtime_error() throw() { };
runtime_error::~runtime_error() throw() { }
const char*
runtime_error::what() const throw()