You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stdcxx.apache.org by se...@apache.org on 2008/07/10 06:05:33 UTC
svn commit: r675434 - in /stdcxx/branches/4.3.x: etc/config/src/ include/
include/loc/ include/rw/ src/ tests/containers/ tests/diagnostics/
tests/localization/ tests/utilities/
Author: sebor
Date: Wed Jul 9 21:05:30 2008
New Revision: 675434
URL: http://svn.apache.org/viewvc?rev=675434&view=rev
Log:
2008-07-09 Martin Sebor <se...@roguewave.com>
* include/tuple (explicit): Replaced uses of the _EXPLICIT macro
with the universally supported C++ keyword.
* include/iomanip: Same.
* include/loc/_locale.h: Same.
* include/loc/_moneypunct.h: Same.
* include/loc/_messages.h: Same.
* include/loc/_numpunct.h: Same.
* include/loc/_facet.h: Same.
* include/loc/_collate.h: Same.
* include/loc/_money_get.h: Same.
* include/loc/_time_get.h: Same.
* include/loc/_num_get.h: Same.
* include/loc/_money_put.h: Same.
* include/loc/_ctype.h: Same.
* include/loc/_time_put.h: Same.
* include/loc/_num_put.h: Same.
* include/loc/_codecvt.h: Same.
* include/map: Same.
* include/rw/_basic_ios.h: Same.
* include/rw/_iosfailure.h: Same.
* include/rw/_iterator.h: Same.
* include/rw/_smartptr.h: Same.
* include/rw/_rawiter.h: Same.
* include/rw/_tuple.h: Same.
* include/rw/_autoptr.h: Same.
* include/rw/_exception.h: Same.
* include/bitset: Same.
* include/set: Same.
* include/functional: Same.
* include/istream: Same.
* include/stack: Same.
* include/string: Same.
* include/complex: Same.
* include/ostream: Same.
* include/sstream: Same.
* include/valarray: Same.
* include/vector: Same.
* include/stdexcept: Same.
* include/deque: Same.
* include/list: Same.
* include/strstream: Same.
* include/queue: Same.
* include/fstream: Same.
* src/podarray.h: Same.
* tests/localization/22.locale.synopsis.cpp: Same.
* tests/containers/23.deque.modifiers.cpp: Same.
* tests/containers/23.bitset.cpp: Same.
* tests/diagnostics/19.std.exceptions.cpp: Same.
* tests/utilities/20.function.objects.cpp: Same.
* etc/config/src/EXPLICIT.cpp: Deleted test.
* include/rw/_defs.h (_EXPLICIT): Removed macro #definition.
* tests/containers/23.deque.modifiers.cpp (_RWSTD_NO_EXPLICIT):
Removed conditional.
* tests/containers/23.bitset.cpp: Same.
* tests/utilities/20.function.objects.cpp: Same.
Removed:
stdcxx/branches/4.3.x/etc/config/src/EXPLICIT.cpp
Modified:
stdcxx/branches/4.3.x/include/bitset
stdcxx/branches/4.3.x/include/complex
stdcxx/branches/4.3.x/include/deque
stdcxx/branches/4.3.x/include/fstream
stdcxx/branches/4.3.x/include/functional
stdcxx/branches/4.3.x/include/iomanip
stdcxx/branches/4.3.x/include/istream
stdcxx/branches/4.3.x/include/list
stdcxx/branches/4.3.x/include/loc/_codecvt.h
stdcxx/branches/4.3.x/include/loc/_collate.h
stdcxx/branches/4.3.x/include/loc/_ctype.h
stdcxx/branches/4.3.x/include/loc/_facet.h
stdcxx/branches/4.3.x/include/loc/_locale.h
stdcxx/branches/4.3.x/include/loc/_messages.h
stdcxx/branches/4.3.x/include/loc/_money_get.h
stdcxx/branches/4.3.x/include/loc/_money_put.h
stdcxx/branches/4.3.x/include/loc/_moneypunct.h
stdcxx/branches/4.3.x/include/loc/_num_get.h
stdcxx/branches/4.3.x/include/loc/_num_put.h
stdcxx/branches/4.3.x/include/loc/_numpunct.h
stdcxx/branches/4.3.x/include/loc/_time_get.h
stdcxx/branches/4.3.x/include/loc/_time_put.h
stdcxx/branches/4.3.x/include/map
stdcxx/branches/4.3.x/include/ostream
stdcxx/branches/4.3.x/include/queue
stdcxx/branches/4.3.x/include/rw/_autoptr.h
stdcxx/branches/4.3.x/include/rw/_basic_ios.h
stdcxx/branches/4.3.x/include/rw/_defs.h
stdcxx/branches/4.3.x/include/rw/_exception.h
stdcxx/branches/4.3.x/include/rw/_iosfailure.h
stdcxx/branches/4.3.x/include/rw/_iterator.h
stdcxx/branches/4.3.x/include/rw/_rawiter.h
stdcxx/branches/4.3.x/include/rw/_smartptr.h
stdcxx/branches/4.3.x/include/rw/_tuple.h
stdcxx/branches/4.3.x/include/set
stdcxx/branches/4.3.x/include/sstream
stdcxx/branches/4.3.x/include/stack
stdcxx/branches/4.3.x/include/stdexcept
stdcxx/branches/4.3.x/include/string
stdcxx/branches/4.3.x/include/strstream
stdcxx/branches/4.3.x/include/tuple
stdcxx/branches/4.3.x/include/valarray
stdcxx/branches/4.3.x/include/vector
stdcxx/branches/4.3.x/src/podarray.h
stdcxx/branches/4.3.x/tests/containers/23.bitset.cpp
stdcxx/branches/4.3.x/tests/containers/23.deque.modifiers.cpp
stdcxx/branches/4.3.x/tests/diagnostics/19.std.exceptions.cpp
stdcxx/branches/4.3.x/tests/localization/22.locale.synopsis.cpp
stdcxx/branches/4.3.x/tests/utilities/20.function.objects.cpp
Modified: stdcxx/branches/4.3.x/include/bitset
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/bitset?rev=675434&r1=675433&r2=675434&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/bitset (original)
+++ stdcxx/branches/4.3.x/include/bitset Wed Jul 9 21:05:30 2008
@@ -167,7 +167,7 @@
// 23.3.5.1, p3
template <class _CharT, class _Traits, class _Allocator>
- _EXPLICIT
+ explicit
bitset (const basic_string<_CharT, _Traits, _Allocator> &__str,
typename basic_string<_CharT, _Traits,
_Allocator>::size_type __pos = 0,
@@ -187,7 +187,7 @@
// 23.3.5.1, p3
template <class _CharT, class _Traits, class _Allocator>
- _EXPLICIT
+ explicit
bitset (const basic_string<_CharT, _Traits, _Allocator> &__str,
_RWSTD_SIZE_T __pos = 0, _RWSTD_SIZE_T __n = _RWSTD_SIZE_MAX,
_CharT __b0 = '0', _CharT __b1 = '1') {
@@ -204,7 +204,7 @@
# ifndef _RWSTD_NO_MEMBER_TEMPLATE_OVERLOAD
// extension
- _EXPLICIT
+ explicit
bitset (const string &__str,
_RWSTD_SIZE_T __pos = 0, _RWSTD_SIZE_T __n = _RWSTD_SIZE_MAX,
char __b0 = '0', char __b1 = '1') {
@@ -217,7 +217,7 @@
# ifndef _RWSTD_NO_WCHAR_T
// extension
- _EXPLICIT
+ explicit
bitset (const wstring &__str,
_RWSTD_SIZE_T __pos = 0, _RWSTD_SIZE_T __n = _RWSTD_SIZE_MAX,
wchar_t __b0 = L'0', wchar_t __b1 = L'1') {
@@ -235,7 +235,7 @@
#ifndef _RWSTD_NO_EXT_BITSET_CTOR_CHAR_ARRAY
// extension
- _EXPLICIT
+ explicit
bitset (const char *__str,
_RWSTD_SIZE_T __pos = 0, _RWSTD_SIZE_T __n = _RWSTD_SIZE_MAX,
char __b0 = '0', char __b1 = '1') {
@@ -248,7 +248,7 @@
# ifndef _RWSTD_NO_WCHAR_T
// extension
- _EXPLICIT
+ explicit
bitset (const wchar_t *__str,
_RWSTD_SIZE_T __pos = 0, _RWSTD_SIZE_T __n = _RWSTD_SIZE_MAX,
wchar_t __b0 = L'0', wchar_t __b1 = L'1') {
@@ -264,7 +264,7 @@
// uses char_traits<CharT>::length() to compute the length of the string
// and char_traits<CharT>::eq() to compare characters with `b0' and `b1'
template <class _CharT>
- _EXPLICIT
+ explicit
bitset (const _CharT *__str,
_RWSTD_SIZE_T __pos = 0, _RWSTD_SIZE_T __n = _RWSTD_SIZE_MAX,
_CharT __b0 = '0', _CharT __b1 = '1') {
Modified: stdcxx/branches/4.3.x/include/complex
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/complex?rev=675434&r1=675433&r2=675434&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/complex (original)
+++ stdcxx/branches/4.3.x/include/complex Wed Jul 9 21:05:30 2008
@@ -124,12 +124,12 @@
: _C_re (__re), _C_im (__im) { }
// defined after the definition of the incomplete complex<double>
- _EXPLICIT complex (const complex<double>&);
+ explicit complex (const complex<double>&);
#ifndef _RWSTD_NO_LONG_DOUBLE
// defined after the definition of the incomplete complex<long double>
- _EXPLICIT complex (const complex<long double>&);
+ explicit complex (const complex<long double>&);
#endif // _RWSTD_NO_LONG_DOUBLE
@@ -217,7 +217,7 @@
#ifndef _RWSTD_NO_LONG_DOUBLE
// defined after the definition of the incomplete complex<long double>
- _EXPLICIT complex (const complex<long double>&);
+ explicit complex (const complex<long double>&);
#endif // _RWSTD_NO_LONG_DOUBLE
Modified: stdcxx/branches/4.3.x/include/deque
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/deque?rev=675434&r1=675433&r2=675434&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/deque (original)
+++ stdcxx/branches/4.3.x/include/deque Wed Jul 9 21:05:30 2008
@@ -434,13 +434,13 @@
#endif // _RWSTD_NO_CLASS_PARTIAL_SPEC
- _EXPLICIT
+ explicit
deque (const allocator_type &__alloc = allocator_type ())
: allocator_type (__alloc) {
_C_init ();
}
- _EXPLICIT
+ explicit
deque (size_type __n, const_reference __x = value_type (),
const allocator_type &__alloc = allocator_type ())
: allocator_type (__alloc) {
Modified: stdcxx/branches/4.3.x/include/fstream
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/fstream?rev=675434&r1=675433&r2=675434&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/fstream (original)
+++ stdcxx/branches/4.3.x/include/fstream Wed Jul 9 21:05:30 2008
@@ -128,7 +128,7 @@
// ctor extensions - associate this with an open file and
// optionally set buffer size and caller-allocated buffer
// NOTE: passed in buffer will NOT be deallocated
- _EXPLICIT
+ explicit
basic_filebuf (int __fd, char_type* __buf = 0,
_RWSTD_STREAMSIZE __bufsz = _RWSTD_DEFAULT_BUFSIZE)
: _Streambuf (ios_base::openmode (_RW::__rw_fdmode (__fd))),
@@ -145,7 +145,7 @@
# ifdef stdin
- _EXPLICIT
+ explicit
basic_filebuf (FILE *__fptr, char_type* __buf = 0,
_RWSTD_STREAMSIZE __bufsz = _RWSTD_DEFAULT_BUFSIZE)
: _Streambuf (),
@@ -376,7 +376,7 @@
basic_ifstream ()
: basic_istream<char_type, traits_type> (rdbuf ()) { }
- _EXPLICIT
+ explicit
basic_ifstream (const char *__name,
ios_base::openmode __mode = ios_base::in,
long __prot = 0666)
@@ -387,7 +387,7 @@
#ifndef _RWSTD_NO_EXT_FILEBUF
// extensions - associate this with an open file and set buffer
- _EXPLICIT
+ explicit
basic_ifstream (int __fd, char_type *__buf = 0,
_RWSTD_STREAMSIZE __n = _RWSTD_DEFAULT_BUFSIZE)
: basic_istream<char_type, traits_type> (rdbuf ()) {
@@ -396,7 +396,7 @@
# ifdef stdin
- _EXPLICIT
+ explicit
basic_ifstream (FILE *__fptr, char_type *__buf = 0,
_RWSTD_STREAMSIZE __n = _RWSTD_DEFAULT_BUFSIZE)
: basic_istream<char_type, traits_type> (rdbuf ()) {
@@ -477,7 +477,7 @@
basic_ofstream ()
: basic_ostream<char_type, traits_type> (rdbuf ()) { }
- _EXPLICIT basic_ofstream (const char *__name,
+ explicit basic_ofstream (const char *__name,
ios_base::openmode __mode = ios_base::out,
long __prot = 0666)
: basic_ostream<char_type, traits_type> (rdbuf ()) {
@@ -487,7 +487,7 @@
#ifndef _RWSTD_NO_EXT_FILEBUF
// extensions - associate this with an open file and set buffer
- _EXPLICIT
+ explicit
basic_ofstream (int __fd, char_type *__buf = 0,
_RWSTD_STREAMSIZE __n = _RWSTD_DEFAULT_BUFSIZE)
: basic_ostream<char_type, traits_type> (rdbuf ()) {
@@ -496,7 +496,7 @@
# ifdef stdin
- _EXPLICIT
+ explicit
basic_ofstream (FILE *__fptr, char_type *__buf = 0,
_RWSTD_STREAMSIZE __n = _RWSTD_DEFAULT_BUFSIZE)
: basic_ostream<char_type, traits_type> (rdbuf ()) {
@@ -577,7 +577,7 @@
basic_fstream ()
: basic_iostream<char_type, traits_type>(rdbuf ()) { }
- _EXPLICIT
+ explicit
basic_fstream (const char *__name,
ios_base::openmode __mode = _RW::__rw_in_out,
long __prot = 0666)
@@ -588,7 +588,7 @@
#ifndef _RWSTD_NO_EXT_FILEBUF
// extensions - associate this with an open file and set buffer
- _EXPLICIT
+ explicit
basic_fstream (int __fd, char_type *__buf = 0,
_RWSTD_STREAMSIZE __n = _RWSTD_DEFAULT_BUFSIZE)
: basic_iostream<char_type, traits_type>(rdbuf ()) {
@@ -597,7 +597,7 @@
# ifdef stdin
- _EXPLICIT
+ explicit
basic_fstream (FILE *__fptr, char_type *__buf = 0,
_RWSTD_STREAMSIZE __n = _RWSTD_DEFAULT_BUFSIZE)
: basic_iostream<char_type, traits_type>(rdbuf ()) {
Modified: stdcxx/branches/4.3.x/include/functional
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/functional?rev=675434&r1=675433&r2=675434&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/functional (original)
+++ stdcxx/branches/4.3.x/include/functional Wed Jul 9 21:05:30 2008
@@ -259,7 +259,7 @@
public:
_RWSTD_UNARY_FUNCTION_TYPES (typename _Predicate::argument_type, bool);
- _EXPLICIT unary_negate (const _Predicate &__pred) : _C_pred (__pred) { }
+ explicit unary_negate (const _Predicate &__pred) : _C_pred (__pred) { }
result_type operator() (const argument_type &__x) const {
return !_C_pred (__x);
@@ -288,7 +288,7 @@
typename _Predicate::second_argument_type,
bool);
- _EXPLICIT binary_negate (const _Predicate &__pred) : _C_pred (__pred) { }
+ explicit binary_negate (const _Predicate &__pred) : _C_pred (__pred) { }
result_type operator() (const first_argument_type &__x,
const second_argument_type &__y) const {
@@ -386,7 +386,7 @@
{
_RWSTD_UNARY_FUNCTION_TYPES (_Arg, _Result);
- _EXPLICIT pointer_to_unary_function (result_type (*__fun)(argument_type))
+ explicit pointer_to_unary_function (result_type (*__fun)(argument_type))
: _C_fn (__fun) {}
result_type operator() (argument_type __x) const {
@@ -414,7 +414,7 @@
{
_RWSTD_BINARY_FUNCTION_TYPES (_Arg1, _Arg2, _Result);
- _EXPLICIT
+ explicit
pointer_to_binary_function (result_type (*__fun)(first_argument_type,
second_argument_type))
: _C_fn (__fun) { }
@@ -447,7 +447,7 @@
{
_RWSTD_UNARY_FUNCTION_TYPES (_TypeT*, _Result);
- _EXPLICIT mem_fun_t (result_type (_TypeT::*__fun)()) : _C_fn (__fun) { }
+ explicit mem_fun_t (result_type (_TypeT::*__fun)()) : _C_fn (__fun) { }
result_type operator() (argument_type __x) const {
return (__x->*_C_fn)();
@@ -465,7 +465,7 @@
{
_RWSTD_BINARY_FUNCTION_TYPES (_TypeT*, _Arg, _Result);
- _EXPLICIT
+ explicit
mem_fun1_t (result_type (_TypeT::*__fun)(second_argument_type))
: _C_fn (__fun) { }
@@ -502,7 +502,7 @@
{
_RWSTD_UNARY_FUNCTION_TYPES (_TypeT, _Result);
- _EXPLICIT mem_fun_ref_t (result_type (_TypeT::*__fun)()) : _C_fn (__fun) { }
+ explicit mem_fun_ref_t (result_type (_TypeT::*__fun)()) : _C_fn (__fun) { }
result_type operator() (argument_type &__x) const {
return (__x.*_C_fn)();
@@ -520,7 +520,7 @@
{
_RWSTD_BINARY_FUNCTION_TYPES (_TypeT, _Arg, _Result);
- _EXPLICIT
+ explicit
mem_fun1_ref_t (result_type (_TypeT::*__fun)(second_argument_type))
: _C_fn (__fun) { }
@@ -558,7 +558,7 @@
{
_RWSTD_UNARY_FUNCTION_TYPES (const _TypeT*, _Result);
- _EXPLICIT const_mem_fun_t (result_type (_TypeT::*__fun)() const)
+ explicit const_mem_fun_t (result_type (_TypeT::*__fun)() const)
: _C_fn (__fun) { }
result_type operator() (argument_type __x) const {
@@ -577,7 +577,7 @@
{
_RWSTD_BINARY_FUNCTION_TYPES (const _TypeT*, _Arg, _Result);
- _EXPLICIT
+ explicit
const_mem_fun1_t (result_type (_TypeT::*__fun)(second_argument_type) const)
: _C_fn (__fun) { }
@@ -615,7 +615,7 @@
{
_RWSTD_UNARY_FUNCTION_TYPES (_TypeT, _Result);
- _EXPLICIT const_mem_fun_ref_t (result_type (_TypeT::*__fun)() const)
+ explicit const_mem_fun_ref_t (result_type (_TypeT::*__fun)() const)
: _C_fn (__fun) { }
result_type operator() (const argument_type &__x) const {
@@ -634,7 +634,7 @@
{
_RWSTD_BINARY_FUNCTION_TYPES (_TypeT, _Arg, _Result);
- _EXPLICIT
+ explicit
const_mem_fun1_ref_t
(result_type (_TypeT::*__fun)(second_argument_type) const)
: _C_fn (__fun) { }
Modified: stdcxx/branches/4.3.x/include/iomanip
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/iomanip?rev=675434&r1=675433&r2=675434&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/iomanip (original)
+++ stdcxx/branches/4.3.x/include/iomanip Wed Jul 9 21:05:30 2008
@@ -136,7 +136,7 @@
template <class _Functor, class _TypeT>
struct __rw_smanip
{
- _EXPLICIT
+ explicit
__rw_smanip (_TypeT __arg)
: _C_fun (), _C_arg (__arg) { /* empty */ }
Modified: stdcxx/branches/4.3.x/include/istream
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/istream?rev=675434&r1=675433&r2=675434&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/istream (original)
+++ stdcxx/branches/4.3.x/include/istream Wed Jul 9 21:05:30 2008
@@ -134,7 +134,7 @@
typedef typename traits_type::off_type off_type;
// 27.6.1.1.1, p1
- _EXPLICIT basic_istream (basic_streambuf<char_type, traits_type> *__sb)
+ explicit basic_istream (basic_streambuf<char_type, traits_type> *__sb)
: _C_gcount (0) {
this->init (__sb);
}
@@ -156,7 +156,7 @@
struct sentry: _RW::__rw_guard {
// 27.6.1.1.2, p2 - assumes 0 != __strm.rdbuf ()
- _EXPLICIT sentry (basic_istream &__strm, bool __noskipws = false)
+ explicit sentry (basic_istream &__strm, bool __noskipws = false)
: _RW::__rw_guard (__strm._C_bufmutex ()),
_C_ok (__strm._C_ipfx (__noskipws).good ()) { /* no-op */ }
@@ -576,7 +576,7 @@
typedef typename traits_type::pos_type pos_type;
typedef typename traits_type::off_type off_type;
- _EXPLICIT basic_iostream (basic_streambuf<_CharT, _Traits> *__sb)
+ explicit basic_iostream (basic_streambuf<_CharT, _Traits> *__sb)
: basic_istream<_CharT, _Traits>(__sb),
basic_ostream<_CharT, _Traits>(__sb)
{ /* 27.6.1.5.1, p1 */ }
Modified: stdcxx/branches/4.3.x/include/list
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/list?rev=675434&r1=675433&r2=675434&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/list (original)
+++ stdcxx/branches/4.3.x/include/list Wed Jul 9 21:05:30 2008
@@ -378,14 +378,14 @@
public:
- _EXPLICIT
+ explicit
list (const allocator_type& __alloc = allocator_type ())
: allocator_type (__alloc), _RWSTD_NODE_BUFFER_INIT(0,0)
_C_next_avail (0), _C_last (0), _C_node (0), _C_length (0) {
_C_init (true);
}
- _EXPLICIT
+ explicit
list (size_type __n,
const_reference __x = value_type (),
const allocator_type &__alloc = allocator_type ())
Modified: stdcxx/branches/4.3.x/include/loc/_codecvt.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/loc/_codecvt.h?rev=675434&r1=675433&r2=675434&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/loc/_codecvt.h (original)
+++ stdcxx/branches/4.3.x/include/loc/_codecvt.h Wed Jul 9 21:05:30 2008
@@ -118,7 +118,7 @@
public:
- _EXPLICIT codecvt (_RWSTD_SIZE_T __ref = 0): _RW::__rw_facet (__ref) { }
+ explicit codecvt (_RWSTD_SIZE_T __ref = 0): _RW::__rw_facet (__ref) { }
// 22,2,1,5,1, p1
result out (state_type& __state,
@@ -186,7 +186,7 @@
typedef char intern_type;
typedef _RWSTD_MBSTATE_T state_type;
- _EXPLICIT codecvt (_RWSTD_SIZE_T = 0);
+ explicit codecvt (_RWSTD_SIZE_T = 0);
virtual ~codecvt ();
@@ -330,7 +330,7 @@
public:
- _EXPLICIT codecvt (_RWSTD_SIZE_T = 0);
+ explicit codecvt (_RWSTD_SIZE_T = 0);
result out (state_type& __state,
const intern_type *__from, const intern_type *__from_end,
@@ -394,7 +394,7 @@
typedef _ExternT extern_type;
typedef _StateT state_type;
- _EXPLICIT codecvt_byname (const char *__name, _RWSTD_SIZE_T __ref = 0)
+ explicit codecvt_byname (const char *__name, _RWSTD_SIZE_T __ref = 0)
: codecvt <_InternT, _ExternT, _StateT> (__ref) {
this->_C_set_name (__name, _C_namebuf, sizeof _C_namebuf);
}
@@ -413,7 +413,7 @@
public:
- _EXPLICIT codecvt_byname (const char*, _RWSTD_SIZE_T = 0);
+ explicit codecvt_byname (const char*, _RWSTD_SIZE_T = 0);
protected:
Modified: stdcxx/branches/4.3.x/include/loc/_collate.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/loc/_collate.h?rev=675434&r1=675433&r2=675434&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/loc/_collate.h (original)
+++ stdcxx/branches/4.3.x/include/loc/_collate.h Wed Jul 9 21:05:30 2008
@@ -63,7 +63,7 @@
allocator<char_type> >
string_type;
- _EXPLICIT collate (_RWSTD_SIZE_T __refs = 0)
+ explicit collate (_RWSTD_SIZE_T __refs = 0)
: _RW::__rw_facet (__refs) { }
int
@@ -110,7 +110,7 @@
allocator<char_type> >
string_type;
- _EXPLICIT collate (_RWSTD_SIZE_T __refs = 0)
+ explicit collate (_RWSTD_SIZE_T __refs = 0)
: _RW::__rw_facet (__refs) { }
int
@@ -156,7 +156,7 @@
allocator<char_type> >
string_type;
- _EXPLICIT collate (_RWSTD_SIZE_T __refs = 0)
+ explicit collate (_RWSTD_SIZE_T __refs = 0)
: _RW::__rw_facet (__refs) { }
int
@@ -200,7 +200,7 @@
public:
- _EXPLICIT collate_byname (const char *__name, _RWSTD_SIZE_T __ref = 0)
+ explicit collate_byname (const char *__name, _RWSTD_SIZE_T __ref = 0)
: collate<_CharT>(__ref) {
this->_C_set_name (__name, _C_namebuf, sizeof _C_namebuf);
}
@@ -213,7 +213,7 @@
char _C_namebuf [32];
public:
- _EXPLICIT collate_byname (const char* __name, _RWSTD_SIZE_T __ref = 0)
+ explicit collate_byname (const char* __name, _RWSTD_SIZE_T __ref = 0)
: collate<char_type>(__ref){
this->_C_set_name (__name, _C_namebuf, sizeof _C_namebuf);
}
@@ -237,7 +237,7 @@
char _C_namebuf [32];
public:
- _EXPLICIT collate_byname (const char* __name, _RWSTD_SIZE_T __ref = 0)
+ explicit collate_byname (const char* __name, _RWSTD_SIZE_T __ref = 0)
: collate<char_type>(__ref){
this->_C_set_name (__name, _C_namebuf, sizeof _C_namebuf);
}
Modified: stdcxx/branches/4.3.x/include/loc/_ctype.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/loc/_ctype.h?rev=675434&r1=675433&r2=675434&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/loc/_ctype.h (original)
+++ stdcxx/branches/4.3.x/include/loc/_ctype.h Wed Jul 9 21:05:30 2008
@@ -102,7 +102,7 @@
typedef _CharT char_type;
- _EXPLICIT ctype (_RWSTD_SIZE_T __ref = 0)
+ explicit ctype (_RWSTD_SIZE_T __ref = 0)
: _RW::__rw_facet (__ref) { }
@@ -242,7 +242,7 @@
_RWSTD_STATIC_CONST (_RWSTD_SIZE_T, table_size = 256);
- _EXPLICIT ctype (const mask* = 0, bool = false, _RWSTD_SIZE_T = 0);
+ explicit ctype (const mask* = 0, bool = false, _RWSTD_SIZE_T = 0);
const char_type* is (const char_type*, const char_type*, mask*) const;
@@ -390,7 +390,7 @@
public:
- _EXPLICIT ctype_byname (const char *__name, _RWSTD_SIZE_T __ref = 0)
+ explicit ctype_byname (const char *__name, _RWSTD_SIZE_T __ref = 0)
: ctype<_CharT>(__ref) {
this->_C_set_name (__name, _C_namebuf, sizeof _C_namebuf);
}
@@ -404,7 +404,7 @@
public:
- _EXPLICIT ctype_byname (const char*, _RWSTD_SIZE_T = 0);
+ explicit ctype_byname (const char*, _RWSTD_SIZE_T = 0);
};
@@ -421,7 +421,7 @@
typedef wchar_t char_type;
- _EXPLICIT ctype (_RWSTD_SIZE_T = 0);
+ explicit ctype (_RWSTD_SIZE_T = 0);
// 22.2.1.1.1, p1
bool is (mask __m, char_type __c) const {
@@ -597,7 +597,7 @@
{
public:
- _EXPLICIT ctype_byname (const char*, _RWSTD_SIZE_T = 0);
+ explicit ctype_byname (const char*, _RWSTD_SIZE_T = 0);
protected:
Modified: stdcxx/branches/4.3.x/include/loc/_facet.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/loc/_facet.h?rev=675434&r1=675433&r2=675434&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/loc/_facet.h (original)
+++ stdcxx/branches/4.3.x/include/loc/_facet.h Wed Jul 9 21:05:30 2008
@@ -64,7 +64,7 @@
#endif // !MSVC || 5 <= stdcxx version
- _EXPLICIT __rw_facet (_RWSTD_SIZE_T = 0);
+ explicit __rw_facet (_RWSTD_SIZE_T = 0);
virtual ~__rw_facet ();
Modified: stdcxx/branches/4.3.x/include/loc/_locale.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/loc/_locale.h?rev=675434&r1=675433&r2=675434&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/loc/_locale.h (original)
+++ stdcxx/branches/4.3.x/include/loc/_locale.h Wed Jul 9 21:05:30 2008
@@ -175,7 +175,7 @@
_RWSTD_MEMBER_EXPORT locale (const locale&) _THROWS (());
// 22.1.1.2, p6
- _RWSTD_MEMBER_EXPORT _EXPLICIT locale (const char*);
+ _RWSTD_MEMBER_EXPORT explicit locale (const char*);
// 22.1.1.2, p9
_RWSTD_MEMBER_EXPORT locale (const locale&, const char*, category);
@@ -280,7 +280,7 @@
private:
- _RWSTD_MEMBER_EXPORT _EXPLICIT locale (_RW::__rw_locale &__rhs)
+ _RWSTD_MEMBER_EXPORT explicit locale (_RW::__rw_locale &__rhs)
_THROWS (())
: _C_body (&__rhs) { }
Modified: stdcxx/branches/4.3.x/include/loc/_messages.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/loc/_messages.h?rev=675434&r1=675433&r2=675434&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/loc/_messages.h (original)
+++ stdcxx/branches/4.3.x/include/loc/_messages.h Wed Jul 9 21:05:30 2008
@@ -81,7 +81,7 @@
typedef basic_string<char_type, char_traits<char_type>,
allocator<char_type> > string_type;
- _EXPLICIT messages (_RWSTD_SIZE_T __refs = 0)
+ explicit messages (_RWSTD_SIZE_T __refs = 0)
: _RW::__rw_facet (__refs) { }
@@ -132,7 +132,7 @@
public:
- _EXPLICIT messages_byname (const char *__name, _RWSTD_SIZE_T __refs = 0)
+ explicit messages_byname (const char *__name, _RWSTD_SIZE_T __refs = 0)
: messages<_CharT>(__refs) {
this->_C_set_name (__name, _C_namebuf, sizeof _C_namebuf);
}
Modified: stdcxx/branches/4.3.x/include/loc/_money_get.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/loc/_money_get.h?rev=675434&r1=675433&r2=675434&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/loc/_money_get.h (original)
+++ stdcxx/branches/4.3.x/include/loc/_money_get.h Wed Jul 9 21:05:30 2008
@@ -58,7 +58,7 @@
basic_string<char_type, char_traits<char_type>, allocator<char_type> >
string_type;
- _EXPLICIT money_get (_RWSTD_SIZE_T __ref = 0)
+ explicit money_get (_RWSTD_SIZE_T __ref = 0)
: _RW::__rw_facet (__ref) { }
iter_type get (iter_type __begin, iter_type __end, bool __intl,
Modified: stdcxx/branches/4.3.x/include/loc/_money_put.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/loc/_money_put.h?rev=675434&r1=675433&r2=675434&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/loc/_money_put.h (original)
+++ stdcxx/branches/4.3.x/include/loc/_money_put.h Wed Jul 9 21:05:30 2008
@@ -60,7 +60,7 @@
basic_string<char_type, char_traits<char_type>, allocator<char_type> >
string_type;
- _EXPLICIT money_put (_RWSTD_SIZE_T __ref = 0)
+ explicit money_put (_RWSTD_SIZE_T __ref = 0)
: _RW::__rw_facet (__ref) { }
// 22.2.6.2.1, p1
Modified: stdcxx/branches/4.3.x/include/loc/_moneypunct.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/loc/_moneypunct.h?rev=675434&r1=675433&r2=675434&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/loc/_moneypunct.h (original)
+++ stdcxx/branches/4.3.x/include/loc/_moneypunct.h Wed Jul 9 21:05:30 2008
@@ -65,7 +65,7 @@
basic_string<char_type, char_traits<char_type>, allocator<char_type> >
string_type;
- _EXPLICIT moneypunct (_RWSTD_SIZE_T __refs = 0)
+ explicit moneypunct (_RWSTD_SIZE_T __refs = 0)
: _RW::__rw_facet (__refs) { }
char_type decimal_point () const {
@@ -207,7 +207,7 @@
public:
- _EXPLICIT moneypunct_byname (const char *__name, _RWSTD_SIZE_T __ref = 0)
+ explicit moneypunct_byname (const char *__name, _RWSTD_SIZE_T __ref = 0)
: moneypunct<_CharT, _Intl>(__ref) {
this->_C_set_name (__name, _C_namebuf, sizeof _C_namebuf);
}
Modified: stdcxx/branches/4.3.x/include/loc/_num_get.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/loc/_num_get.h?rev=675434&r1=675433&r2=675434&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/loc/_num_get.h (original)
+++ stdcxx/branches/4.3.x/include/loc/_num_get.h Wed Jul 9 21:05:30 2008
@@ -58,7 +58,7 @@
static _RW::__rw_facet_id id;
- _EXPLICIT num_get (_RWSTD_SIZE_T __refs = 0)
+ explicit num_get (_RWSTD_SIZE_T __refs = 0)
: _RW::__rw_facet (__refs) { }
#ifndef _RWSTD_NO_NATIVE_BOOL
Modified: stdcxx/branches/4.3.x/include/loc/_num_put.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/loc/_num_put.h?rev=675434&r1=675433&r2=675434&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/loc/_num_put.h (original)
+++ stdcxx/branches/4.3.x/include/loc/_num_put.h Wed Jul 9 21:05:30 2008
@@ -56,7 +56,7 @@
typedef _CharT char_type;
typedef _OutputIter iter_type;
- _EXPLICIT num_put (_RWSTD_SIZE_T __refs = 0)
+ explicit num_put (_RWSTD_SIZE_T __refs = 0)
: _RW::__rw_facet (__refs) { }
virtual ~num_put ();
Modified: stdcxx/branches/4.3.x/include/loc/_numpunct.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/loc/_numpunct.h?rev=675434&r1=675433&r2=675434&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/loc/_numpunct.h (original)
+++ stdcxx/branches/4.3.x/include/loc/_numpunct.h Wed Jul 9 21:05:30 2008
@@ -60,7 +60,7 @@
basic_string<char_type, char_traits<char_type>, allocator<char_type> >
string_type;
- _EXPLICIT numpunct (_RWSTD_SIZE_T __ref = 0)
+ explicit numpunct (_RWSTD_SIZE_T __ref = 0)
: _RW::__rw_facet (__ref), _C_flags (0) { }
virtual ~numpunct ();
@@ -234,7 +234,7 @@
public:
- _EXPLICIT numpunct_byname (const char *__name, _RWSTD_SIZE_T __refs = 0)
+ explicit numpunct_byname (const char *__name, _RWSTD_SIZE_T __refs = 0)
: numpunct<_CharT>(__refs) {
this->_C_set_name (__name, _C_namebuf, sizeof _C_namebuf);
}
Modified: stdcxx/branches/4.3.x/include/loc/_time_get.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/loc/_time_get.h?rev=675434&r1=675433&r2=675434&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/loc/_time_get.h (original)
+++ stdcxx/branches/4.3.x/include/loc/_time_get.h Wed Jul 9 21:05:30 2008
@@ -72,7 +72,7 @@
typedef _CharT char_type;
typedef _InputIter iter_type;
- _EXPLICIT time_get (_RWSTD_SIZE_T __ref = 0)
+ explicit time_get (_RWSTD_SIZE_T __ref = 0)
: _RW::__rw_facet (__ref) { }
dateorder date_order() const {
@@ -203,7 +203,7 @@
public:
- _EXPLICIT time_get_byname (const char *__name, _RWSTD_SIZE_T __ref = 0)
+ explicit time_get_byname (const char *__name, _RWSTD_SIZE_T __ref = 0)
: time_get<_CharT, _InputIter>(__ref) {
this->_C_set_name (__name, _C_namebuf, sizeof _C_namebuf);
}
Modified: stdcxx/branches/4.3.x/include/loc/_time_put.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/loc/_time_put.h?rev=675434&r1=675433&r2=675434&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/loc/_time_put.h (original)
+++ stdcxx/branches/4.3.x/include/loc/_time_put.h Wed Jul 9 21:05:30 2008
@@ -58,7 +58,7 @@
typedef _CharT char_type;
typedef _OutputIter iter_type;
- _EXPLICIT time_put (_RWSTD_SIZE_T __refs = 0)
+ explicit time_put (_RWSTD_SIZE_T __refs = 0)
: _RW::__rw_facet (__refs) { }
// 22.2.5.3.1, p1
@@ -102,7 +102,7 @@
public:
- _EXPLICIT time_put_byname (const char *__name, _RWSTD_SIZE_T __ref = 0)
+ explicit time_put_byname (const char *__name, _RWSTD_SIZE_T __ref = 0)
: time_put<_CharT, _OutputIter>(__ref) {
this->_C_set_name (__name, _C_namebuf, sizeof _C_namebuf);
}
Modified: stdcxx/branches/4.3.x/include/map
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/map?rev=675434&r1=675433&r2=675434&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/map (original)
+++ stdcxx/branches/4.3.x/include/map Wed Jul 9 21:05:30 2008
@@ -118,7 +118,7 @@
};
// 23.3.1.1, p1
- _EXPLICIT
+ explicit
map (const key_compare &__cmp = key_compare (),
const allocator_type &__alloc = allocator_type ())
: _C_rep (__cmp, __alloc) { }
@@ -324,7 +324,7 @@
value_compare (key_compare __cmp): comp (__cmp) { /* empty */ }
};
- _EXPLICIT
+ explicit
multimap (const key_compare &__cmp = key_compare (),
const allocator_type &__alloc = allocator_type ())
: _C_rep (__cmp, __alloc) { }
Modified: stdcxx/branches/4.3.x/include/ostream
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/ostream?rev=675434&r1=675433&r2=675434&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/ostream (original)
+++ stdcxx/branches/4.3.x/include/ostream Wed Jul 9 21:05:30 2008
@@ -70,7 +70,7 @@
typedef basic_ios<char_type, traits_type> ios_type;
// 27.6.2.2, p1
- _EXPLICIT basic_ostream (basic_streambuf<char_type, traits_type> *__sb) {
+ explicit basic_ostream (basic_streambuf<char_type, traits_type> *__sb) {
this->init (__sb);
}
@@ -89,7 +89,7 @@
// 27.6.2.3
struct sentry: _RW::__rw_guard {
- _EXPLICIT
+ explicit
sentry (basic_ostream<char_type, traits_type> &__strm)
: _RW::__rw_guard (__strm.rdbuf () ? __strm._C_bufmutex () : 0),
_C_strm (__strm), _C_ok (_C_strm._C_opfx ().good ()) { }
Modified: stdcxx/branches/4.3.x/include/queue
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/queue?rev=675434&r1=675433&r2=675434&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/queue (original)
+++ stdcxx/branches/4.3.x/include/queue Wed Jul 9 21:05:30 2008
@@ -88,7 +88,7 @@
public:
- _EXPLICIT
+ explicit
queue (const container_type &__c = container_type ())
: c (__c) { }
@@ -193,7 +193,7 @@
public:
- _EXPLICIT
+ explicit
priority_queue (const _Compare &__cmp = _Compare (),
const container_type &__c = container_type ())
: c (__c), comp (__cmp) {
Modified: stdcxx/branches/4.3.x/include/rw/_autoptr.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/rw/_autoptr.h?rev=675434&r1=675433&r2=675434&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/rw/_autoptr.h (original)
+++ stdcxx/branches/4.3.x/include/rw/_autoptr.h Wed Jul 9 21:05:30 2008
@@ -129,7 +129,7 @@
typedef _TypeT element_type;
// 20.4.5.1, p1
- _EXPLICIT auto_ptr (element_type* __p = 0) _THROWS (())
+ explicit auto_ptr (element_type* __p = 0) _THROWS (())
: _C_ptr (__p) { }
// 20.4.5.1, p2
Modified: stdcxx/branches/4.3.x/include/rw/_basic_ios.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/rw/_basic_ios.h?rev=675434&r1=675433&r2=675434&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/rw/_basic_ios.h (original)
+++ stdcxx/branches/4.3.x/include/rw/_basic_ios.h Wed Jul 9 21:05:30 2008
@@ -90,7 +90,7 @@
// 27.4.4.1, p1 - NOTE: `sb' may point to a yet uninitialized
// object; it is unsafe to reference any of its members
- _EXPLICIT basic_ios (streambuf_type *__sb) {
+ explicit basic_ios (streambuf_type *__sb) {
init (__sb);
}
Modified: stdcxx/branches/4.3.x/include/rw/_defs.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/rw/_defs.h?rev=675434&r1=675433&r2=675434&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/rw/_defs.h (original)
+++ stdcxx/branches/4.3.x/include/rw/_defs.h Wed Jul 9 21:05:30 2008
@@ -494,13 +494,6 @@
#endif // _RWSTD_NO_BOOL
-#ifndef _RWSTD_NO_EXPLICIT
-# define _EXPLICIT explicit
-#else
-# define _EXPLICIT /* empty */
-#endif
-
-
#ifndef _RWSTD_NO_EXPORT
# define _EXPORT export
#else
Modified: stdcxx/branches/4.3.x/include/rw/_exception.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/rw/_exception.h?rev=675434&r1=675433&r2=675434&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/rw/_exception.h (original)
+++ stdcxx/branches/4.3.x/include/rw/_exception.h Wed Jul 9 21:05:30 2008
@@ -69,9 +69,9 @@
__rw_exception (const __rw_exception&);
- _EXPLICIT __rw_exception (const _STD::string&);
+ explicit __rw_exception (const _STD::string&);
- _EXPLICIT __rw_exception (const char*);
+ explicit __rw_exception (const char*);
virtual ~__rw_exception () _THROWS (());
Modified: stdcxx/branches/4.3.x/include/rw/_iosfailure.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/rw/_iosfailure.h?rev=675434&r1=675433&r2=675434&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/rw/_iosfailure.h (original)
+++ stdcxx/branches/4.3.x/include/rw/_iosfailure.h Wed Jul 9 21:05:30 2008
@@ -45,11 +45,11 @@
struct _RWSTD_EXPORT __rw_failure: __rw_exception
{
- _EXPLICIT __rw_failure (const _STD::string &__what)
+ explicit __rw_failure (const _STD::string &__what)
: __rw_exception (__what) { }
// extension
- _EXPLICIT __rw_failure (const char *__what = 0)
+ explicit __rw_failure (const char *__what = 0)
: __rw_exception (__what) { }
virtual ~__rw_failure () _THROWS (());
Modified: stdcxx/branches/4.3.x/include/rw/_iterator.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/rw/_iterator.h?rev=675434&r1=675433&r2=675434&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/rw/_iterator.h (original)
+++ stdcxx/branches/4.3.x/include/rw/_iterator.h Wed Jul 9 21:05:30 2008
@@ -113,7 +113,7 @@
reverse_iterator () { }
// 24.4.1.3.1, p1
- _EXPLICIT reverse_iterator (iterator_type __rhs) : current (__rhs) { }
+ explicit reverse_iterator (iterator_type __rhs) : current (__rhs) { }
#ifndef _RWSTD_NO_MEMBER_TEMPLATES
@@ -306,7 +306,7 @@
__reverse_bi_iterator () { }
- _EXPLICIT __reverse_bi_iterator (const iterator_type &__rhs)
+ explicit __reverse_bi_iterator (const iterator_type &__rhs)
: current (__rhs) { }
@@ -414,7 +414,7 @@
public:
typedef _Container container_type;
- _EXPLICIT back_insert_iterator (container_type& __rhs)
+ explicit back_insert_iterator (container_type& __rhs)
: container (&__rhs) { }
back_insert_iterator&
@@ -453,7 +453,7 @@
public:
typedef _Container container_type;
- _EXPLICIT front_insert_iterator (container_type& __rhs)
+ explicit front_insert_iterator (container_type& __rhs)
: container (&__rhs) { }
front_insert_iterator&
Modified: stdcxx/branches/4.3.x/include/rw/_rawiter.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/rw/_rawiter.h?rev=675434&r1=675433&r2=675434&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/rw/_rawiter.h (original)
+++ stdcxx/branches/4.3.x/include/rw/_rawiter.h Wed Jul 9 21:05:30 2008
@@ -71,7 +71,7 @@
typedef _OutputIterator iterator_type;
// 20.4.2, p2
- _EXPLICIT raw_storage_iterator (iterator_type __x): _C_iter (__x) { }
+ explicit raw_storage_iterator (iterator_type __x): _C_iter (__x) { }
// 20.4.2, p3
raw_storage_iterator& operator* () {
Modified: stdcxx/branches/4.3.x/include/rw/_smartptr.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/rw/_smartptr.h?rev=675434&r1=675433&r2=675434&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/rw/_smartptr.h (original)
+++ stdcxx/branches/4.3.x/include/rw/_smartptr.h Wed Jul 9 21:05:30 2008
@@ -177,7 +177,7 @@
_TypeT *_C_ptr;
template <class _TypeU>
- _EXPLICIT
+ explicit
shared_ptr (const shared_ptr<_TypeU> &__rhs, const _TypeT*)
: _C_pbody (__rhs._C_pbody) {
if (_C_pbody)
@@ -193,7 +193,7 @@
shared_ptr (): _C_pbody (0), _C_ptr (0) { }
template <class _TypeU>
- _EXPLICIT
+ explicit
shared_ptr (_TypeU *__ptr)
: _C_pbody (__ptr ? new _RW::__rw_ptr_body<_TypeU>(__ptr) : 0),
_C_ptr (__ptr) { /* empty */ }
@@ -217,7 +217,7 @@
}
template <class _TypeU>
- _EXPLICIT
+ explicit
shared_ptr (const weak_ptr<_TypeU> &__rhs)
: _C_pbody (__rhs._C_pbody), _C_ptr (__rhs._C_ptr) {
if (_C_pbody) {
@@ -228,7 +228,7 @@
}
template <class _TypeU>
- _EXPLICIT
+ explicit
shared_ptr (auto_ptr<_TypeU>&);
// [util.smartptr.shared.dest] destructor
Modified: stdcxx/branches/4.3.x/include/rw/_tuple.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/rw/_tuple.h?rev=675434&r1=675433&r2=675434&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/rw/_tuple.h (original)
+++ stdcxx/branches/4.3.x/include/rw/_tuple.h Wed Jul 9 21:05:30 2008
@@ -87,7 +87,7 @@
return *this;
}
- _EXPLICIT
+ explicit
__rw_tuple (const _HeadT& __head, const _TailT&... __tail)
: _Base (__tail...), _C_data (__head) { /* empty */ }
@@ -116,7 +116,7 @@
}
template <class _HeadU, class... _TailU>
- _EXPLICIT __rw_tuple (_HeadU&& __head, _TailU&&... __tail)
+ explicit __rw_tuple (_HeadU&& __head, _TailU&&... __tail)
: _Base (_RWSTD_FORWARD (_TailU, __tail)...)
, _C_data (_RWSTD_MOVE (__head)) { /* empty */ }
Modified: stdcxx/branches/4.3.x/include/set
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/set?rev=675434&r1=675433&r2=675434&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/set (original)
+++ stdcxx/branches/4.3.x/include/set Wed Jul 9 21:05:30 2008
@@ -117,8 +117,9 @@
//
// construct/copy/destroy
//
- _EXPLICIT set (const key_compare &__cmp = key_compare (),
- const allocator_type &__alloc = allocator_type ())
+ explicit
+ set (const key_compare &__cmp = key_compare (),
+ const allocator_type &__alloc = allocator_type ())
: _C_rep (__cmp, __alloc) { }
template<class _InputIter>
@@ -318,7 +319,7 @@
//
// construct/copy/destroy
//
- _EXPLICIT
+ explicit
multiset (const key_compare &__cmp = key_compare (),
const allocator_type &__alloc = allocator_type ())
: _C_rep (__cmp, __alloc) { }
Modified: stdcxx/branches/4.3.x/include/sstream
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/sstream?rev=675434&r1=675433&r2=675434&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/sstream (original)
+++ stdcxx/branches/4.3.x/include/sstream Wed Jul 9 21:05:30 2008
@@ -107,18 +107,18 @@
typedef typename traits_type::pos_type pos_type;
typedef typename traits_type::off_type off_type;
- _EXPLICIT
+ explicit
basic_stringbuf (ios_base::openmode __mode = _RW::__rw_in_out)
: basic_streambuf<char_type, traits_type>(__mode) {
this->_C_own_buf (true);
}
- _EXPLICIT
+ explicit
basic_stringbuf (const _C_string_type&,
ios_base::openmode = _RW::__rw_in_out);
// undetectable extension
- _EXPLICIT
+ explicit
basic_stringbuf (const char_type*,
ios_base::openmode = _RW::__rw_in_out);
@@ -263,19 +263,19 @@
typedef typename traits_type::pos_type pos_type;
typedef typename traits_type::off_type off_type;
- _EXPLICIT
+ explicit
basic_istringstream (ios_base::openmode __mode = ios_base::in)
: basic_istream<char_type, traits_type>(rdbuf ()),
_C_sb (__mode | ios_base::in) { }
- _EXPLICIT
+ explicit
basic_istringstream (const _C_string_type& __str,
ios_base::openmode __mode = ios_base::in)
: basic_istream<char_type, traits_type>(rdbuf ()),
_C_sb (__str, __mode | ios_base::in) { }
// undetectable extension
- _EXPLICIT
+ explicit
basic_istringstream (const char_type * __s,
ios_base::openmode __mode = ios_base::in)
: basic_istream<char_type, traits_type>(rdbuf ()),
@@ -333,19 +333,19 @@
// NOTE: the constructors pass the address of a yet uninitialized
// data member to the constructor of the base class
- _EXPLICIT
+ explicit
basic_ostringstream (ios_base::openmode __mode = ios_base::out)
: basic_ostream<char_type, traits_type> (rdbuf ()),
_C_sb (__mode | ios_base::out) { }
- _EXPLICIT
+ explicit
basic_ostringstream (const _C_string_type &__str,
ios_base::openmode __mode = ios_base::out)
: basic_ostream<char_type, traits_type>(rdbuf ()),
_C_sb (__str, __mode | ios_base::out) { }
// undetectable extension
- _EXPLICIT
+ explicit
basic_ostringstream (const char_type *__s,
ios_base::openmode __mode = ios_base::out)
: basic_ostream<char_type, traits_type>(rdbuf ()),
@@ -401,19 +401,19 @@
typedef typename traits_type::pos_type pos_type;
typedef typename traits_type::int_type off_type;
- _EXPLICIT
+ explicit
basic_stringstream (ios_base::openmode __mode = _RW::__rw_in_out)
: basic_iostream<char_type, traits_type>(rdbuf ()),
_C_sb (__mode) { }
- _EXPLICIT
+ explicit
basic_stringstream (const _C_string_type &__str,
ios_base::openmode __mode = _RW::__rw_in_out)
: basic_iostream<char_type, traits_type>(rdbuf ()),
_C_sb (__str, __mode) { }
// undetectable extension
- _EXPLICIT
+ explicit
basic_stringstream (const char_type *__s,
ios_base::openmode __mode = _RW::__rw_in_out)
: basic_iostream<char_type, traits_type>(rdbuf ()),
Modified: stdcxx/branches/4.3.x/include/stack
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/stack?rev=675434&r1=675433&r2=675434&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/stack (original)
+++ stdcxx/branches/4.3.x/include/stack Wed Jul 9 21:05:30 2008
@@ -86,7 +86,7 @@
public:
- _EXPLICIT
+ explicit
stack (const container_type &__c = container_type ())
: c (__c) { }
Modified: stdcxx/branches/4.3.x/include/stdexcept
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/stdexcept?rev=675434&r1=675433&r2=675434&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/stdexcept (original)
+++ stdcxx/branches/4.3.x/include/stdexcept Wed Jul 9 21:05:30 2008
@@ -45,11 +45,11 @@
// 19.1.1
struct _RWSTD_EXPORT logic_error: _RW::__rw_exception
{
- _EXPLICIT logic_error (const string& __str)
+ explicit logic_error (const string& __str)
: _RW::__rw_exception (__str) { }
// extension
- _EXPLICIT logic_error (const char *__s = 0)
+ explicit logic_error (const char *__s = 0)
: _RW::__rw_exception (__s) { }
virtual ~logic_error () _THROWS (());
@@ -59,11 +59,11 @@
// 19.1.2
struct _RWSTD_EXPORT domain_error: logic_error
{
- _EXPLICIT domain_error (const string &__str)
+ explicit domain_error (const string &__str)
: logic_error (__str) { }
// extension
- _EXPLICIT domain_error (const char *__s = 0)
+ explicit domain_error (const char *__s = 0)
: logic_error (__s) { }
virtual ~domain_error () _THROWS (());
@@ -73,11 +73,11 @@
// 19.1.3
struct _RWSTD_EXPORT invalid_argument: logic_error
{
- _EXPLICIT invalid_argument (const string &__str)
+ explicit invalid_argument (const string &__str)
: logic_error (__str) { }
// extension
- _EXPLICIT invalid_argument (const char *__s = 0)
+ explicit invalid_argument (const char *__s = 0)
: logic_error (__s) { }
virtual ~invalid_argument () _THROWS (());
@@ -87,11 +87,11 @@
// 19.1.4
struct _RWSTD_EXPORT length_error: logic_error
{
- _EXPLICIT length_error (const string &__str)
+ explicit length_error (const string &__str)
: logic_error (__str) { }
// extension
- _EXPLICIT length_error (const char *__s = 0)
+ explicit length_error (const char *__s = 0)
: logic_error (__s) { }
virtual ~length_error () _THROWS (());
@@ -101,11 +101,11 @@
// 19.1.5
struct _RWSTD_EXPORT out_of_range: logic_error
{
- _EXPLICIT out_of_range (const string &__str)
+ explicit out_of_range (const string &__str)
: logic_error (__str) { }
// extension
- _EXPLICIT out_of_range (const char *__s = 0)
+ explicit out_of_range (const char *__s = 0)
: logic_error (__s) { }
virtual ~out_of_range () _THROWS (());
@@ -115,11 +115,11 @@
// 19.1.6
struct _RWSTD_EXPORT runtime_error: _RW::__rw_exception
{
- _EXPLICIT runtime_error (const string &__str)
+ explicit runtime_error (const string &__str)
: _RW::__rw_exception (__str) { }
// extension
- _EXPLICIT runtime_error (const char *__s = 0)
+ explicit runtime_error (const char *__s = 0)
: _RW::__rw_exception (__s) { }
virtual ~runtime_error () _THROWS (());
@@ -129,11 +129,11 @@
// 19.1.7
struct _RWSTD_EXPORT range_error: runtime_error
{
- _EXPLICIT range_error (const string &__str)
+ explicit range_error (const string &__str)
: runtime_error (__str) { }
// extension
- _EXPLICIT range_error (const char *__s = 0)
+ explicit range_error (const char *__s = 0)
: runtime_error (__s) { }
virtual ~range_error () _THROWS (());
@@ -143,11 +143,11 @@
// 19.1.8
struct _RWSTD_EXPORT overflow_error: runtime_error
{
- _EXPLICIT overflow_error (const string &__str)
+ explicit overflow_error (const string &__str)
: runtime_error (__str) { }
// extension
- _EXPLICIT overflow_error (const char *__s = 0)
+ explicit overflow_error (const char *__s = 0)
: runtime_error (__s) { }
virtual ~overflow_error () _THROWS (());
@@ -157,11 +157,11 @@
// 19.1.9
struct _RWSTD_EXPORT underflow_error: runtime_error
{
- _EXPLICIT underflow_error (const string &__str)
+ explicit underflow_error (const string &__str)
: runtime_error (__str) { }
// extension
- _EXPLICIT underflow_error (const char *__s = 0)
+ explicit underflow_error (const char *__s = 0)
: runtime_error (__s) { }
virtual ~underflow_error () _THROWS (());
Modified: stdcxx/branches/4.3.x/include/string
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/string?rev=675434&r1=675433&r2=675434&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/string (original)
+++ stdcxx/branches/4.3.x/include/string Wed Jul 9 21:05:30 2008
@@ -158,7 +158,7 @@
#endif
// 21.3.1, p2
- _EXPLICIT basic_string (const allocator_type &__alloc = allocator_type ())
+ explicit basic_string (const allocator_type &__alloc = allocator_type ())
: allocator_type (__alloc), _C_data (_C_nullref ()->data ()) { }
// lwg issue #42
Modified: stdcxx/branches/4.3.x/include/strstream
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/strstream?rev=675434&r1=675433&r2=675434&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/strstream (original)
+++ stdcxx/branches/4.3.x/include/strstream Wed Jul 9 21:05:30 2008
@@ -55,7 +55,7 @@
public:
// D.7.1.1, p1
- _EXPLICIT
+ explicit
strstreambuf (streamsize __alsize = 0)
: _Base () {
_C_init (__alsize, 0, 0, 0, 0, 0, _C_dynamic);
@@ -176,11 +176,11 @@
}
// D.7.2.1, p1, and p2
- _EXPLICIT
+ explicit
istrstream (const char_type *__s, streamsize __n = 0)
: _Base (rdbuf ()), _C_sb (__s, __n) { }
- _EXPLICIT
+ explicit
istrstream (char_type *__s, streamsize __n = 0)
: _Base (rdbuf ()), _C_sb (__s, __n) { }
Modified: stdcxx/branches/4.3.x/include/tuple
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/tuple?rev=675434&r1=675433&r2=675434&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/tuple (original)
+++ stdcxx/branches/4.3.x/include/tuple Wed Jul 9 21:05:30 2008
@@ -86,7 +86,7 @@
return *this;
}
- _EXPLICIT
+ explicit
tuple (const _TypesT&... __values)
: _Base (__values...) { /* empty */ }
@@ -111,7 +111,7 @@
}
template <class... _TypesU>
- _EXPLICIT tuple (_TypesU&&... __values)
+ explicit tuple (_TypesU&&... __values)
: _Base (_RWSTD_FORWARD (_TypesU, __values)...) { /* empty */ }
template <class... _TypesU>
@@ -184,7 +184,7 @@
return *this;
}
- _EXPLICIT
+ explicit
tuple (const _TypeT1& __x, const _TypeT2& __y)
: _Base (__x, __y) { /* empty */ }
@@ -211,7 +211,7 @@
# if !defined _RWSTD_NO_RVALUE_REFERENCES
template <class _TypeU1, class _TypeU2>
- _EXPLICIT tuple (_TypeU1&& __x, _TypeU2&& __y)
+ explicit tuple (_TypeU1&& __x, _TypeU2&& __y)
: _Base (_RWSTD_FORWARD (_TypeU1, __x),
_RWSTD_FORWARD (_TypeU2, __y)) { /* empty */ }
Modified: stdcxx/branches/4.3.x/include/valarray
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/valarray?rev=675434&r1=675433&r2=675434&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/valarray (original)
+++ stdcxx/branches/4.3.x/include/valarray Wed Jul 9 21:05:30 2008
@@ -77,7 +77,7 @@
valarray () { }
// 26.3.2.1, p2
- _EXPLICIT valarray (_RWSTD_SIZE_T __size)
+ explicit valarray (_RWSTD_SIZE_T __size)
: _C_array (value_type (), __size) { }
// 26.3.2.1, p3
Modified: stdcxx/branches/4.3.x/include/vector
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/vector?rev=675434&r1=675433&r2=675434&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/vector (original)
+++ stdcxx/branches/4.3.x/include/vector Wed Jul 9 21:05:30 2008
@@ -155,11 +155,11 @@
public:
- _EXPLICIT
+ explicit
vector (const allocator_type &__alloc = allocator_type ())
: allocator_type (__alloc), _C_begin (), _C_end (), _C_bufend () { }
- _EXPLICIT
+ explicit
vector (size_type __n, const_reference __x = value_type (),
const allocator_type &__alloc = allocator_type ())
: allocator_type (__alloc), _C_begin (), _C_end (), _C_bufend () {
@@ -1117,7 +1117,7 @@
#if !defined (__SUNPRO_CC) || __SUNPRO_CC > 0x530
// working around a SunPro 5.3 bug (see PR #25962)
- _EXPLICIT
+ explicit
#endif // SunPro > 5.3
vector (size_type __n, bool __val = bool (),
const _Allocator& __alloc = allocator_type ())
Modified: stdcxx/branches/4.3.x/src/podarray.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/src/podarray.h?rev=675434&r1=675433&r2=675434&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/src/podarray.h (original)
+++ stdcxx/branches/4.3.x/src/podarray.h Wed Jul 9 21:05:30 2008
@@ -89,7 +89,7 @@
*_C_pbuf = _TypeT ();
}
- _EXPLICIT __rw_pod_array (const _TypeT *__a)
+ explicit __rw_pod_array (const _TypeT *__a)
: _C_len (_C_length (__a))
// , _C_pbuf (_C_len < _Size ? _C_buffer : new _TypeT [_C_len + 1])
{
Modified: stdcxx/branches/4.3.x/tests/containers/23.bitset.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/containers/23.bitset.cpp?rev=675434&r1=675433&r2=675434&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/containers/23.bitset.cpp (original)
+++ stdcxx/branches/4.3.x/tests/containers/23.bitset.cpp Wed Jul 9 21:05:30 2008
@@ -22,7 +22,7 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*
- * Copyright 2001-2006 Rogue Wave Software.
+ * Copyright 2001-2008 Rogue Wave Software, Inc.
*
**************************************************************************/
@@ -65,13 +65,13 @@
bits_ [N] = '\0'; // null-terminate
}
- _EXPLICIT test_set (unsigned long val) {
+ explicit test_set (unsigned long val) {
for (std::size_t i = 0; i != N; ++i)
set (i, !!(val & (1UL << i)));
bits_ [N] = '\0'; // NUL-terminate
}
- _EXPLICIT test_set (const std::bitset<N> &rhs) {
+ explicit test_set (const std::bitset<N> &rhs) {
for (std::size_t i = 0; i != N; ++i)
set (i, rhs.test (i));
bits_ [N] = '\0'; // NUL-terminate
@@ -187,8 +187,6 @@
/**************************************************************************/
-#ifndef _RWSTD_NO_EXPLICIT
-
// helper to verify that bitset ctor is explicit
// not defined since it must not be referenced if test is successful
// static commented out to prevent gcc warning: function declared
@@ -206,8 +204,6 @@
static void
is_explicit (const has_implicit_ctor&) { }
-#endif // _RWSTD_NO_EXPLICIT
-
static void
test_synopsis (std::bitset<0>*)
@@ -239,15 +235,14 @@
MEMFUN (Reference&, flip, ());
// 23.3.5.1 - verify bitset ctors
-#if !defined (_RWSTD_NO_EXPLICIT) \
- && (!defined (__SUNPRO_CC) || __SUNPRO_CC > 0x530) \
+#if (!defined (__SUNPRO_CC) || __SUNPRO_CC > 0x530) \
&& (!defined (__GNUG__) || __GNUG__ >= 3)
// working around a SunPro 5.2 bug (see PR #25959)
// verify that bitset ctor is declared explicit
is_explicit (std::string ());
-#endif // _RWSTD_NO_EXPLICIT && SunPro > 5.3
+#endif // SunPro > 5.3
// verify default arguments
(void)Bitset (std::string ());
Modified: stdcxx/branches/4.3.x/tests/containers/23.deque.modifiers.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/containers/23.deque.modifiers.cpp?rev=675434&r1=675433&r2=675434&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/containers/23.deque.modifiers.cpp (original)
+++ stdcxx/branches/4.3.x/tests/containers/23.deque.modifiers.cpp Wed Jul 9 21:05:30 2008
@@ -22,7 +22,7 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*
- * Copyright 1994-2006 Rogue Wave Software.
+ * Copyright 1994-2008 Rogue Wave Software, Inc.
*
**************************************************************************/
@@ -1248,8 +1248,7 @@
/**************************************************************************/
-#ifndef _RWSTD_NO_EXPLICIT
-# if !defined (_MSC_VER) || _MSC_VER > 1200
+#if !defined (_MSC_VER) || _MSC_VER > 1200
struct DR_438
{
@@ -1264,13 +1263,10 @@
bool DR_438::cast_used;
-# else // if MSVC <= 6.0
- // avoid an MSVC 6.0 ICE on this code
-# define NO_DR_438_TEST "this version of MSVC is too broken"
-# endif // !MSVC || MSVC > 6.0
-#else
-# define NO_DR_438_TEST "_RWSTD_NO_EXPLICIT #defined"
-#endif // _RWSTD_NO_EXPLICIT
+#else // if MSVC <= 6.0
+ // avoid an MSVC 6.0 ICE on this code
+# define NO_DR_438_TEST "this version of MSVC is too broken"
+#endif // !MSVC || MSVC > 6.0
void test_dr_438 ()
Modified: stdcxx/branches/4.3.x/tests/diagnostics/19.std.exceptions.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/diagnostics/19.std.exceptions.cpp?rev=675434&r1=675433&r2=675434&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/diagnostics/19.std.exceptions.cpp (original)
+++ stdcxx/branches/4.3.x/tests/diagnostics/19.std.exceptions.cpp Wed Jul 9 21:05:30 2008
@@ -157,8 +157,6 @@
_RWSTD_UNUSED (e);
-#ifndef _RWSTD_NO_EXPLICIT
-
// verify that each exceptions converting ctor is explicit
// use a pointer since std::string need not be a complete class
const char s[40] = "";
@@ -169,8 +167,6 @@
// (if one exists) is also explicit
is_explicit (s);
-#endif // _RWSTD_NO_EXPLICIT
-
return result;
}
Modified: stdcxx/branches/4.3.x/tests/localization/22.locale.synopsis.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/localization/22.locale.synopsis.cpp?rev=675434&r1=675433&r2=675434&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/localization/22.locale.synopsis.cpp (original)
+++ stdcxx/branches/4.3.x/tests/localization/22.locale.synopsis.cpp Wed Jul 9 21:05:30 2008
@@ -22,7 +22,7 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*
- * Copyright 1994-2008 Rogue Wave Software.
+ * Copyright 1994-2008 Rogue Wave Software, Inc.
*
**************************************************************************/
@@ -391,8 +391,6 @@
/***************************************************************************/
-#ifndef _RWSTD_NO_EXPLICIT
-
// helper to verify that locale and facet ctors are explicit
// not defined since they must not be referenced if test is successful
void is_explicit (const std::locale&);
@@ -425,8 +423,6 @@
// calls to the overloaded is_explicit() resolve to the function below
void is_explicit (const has_implicit_ctor&) { /* empty */ }
-#endif // _RWSTD_NO_EXPLICIT
-
/***************************************************************************/
// local to test_locale
@@ -1075,7 +1071,7 @@
// working around an MSVC 6.0 bug
typedef locale::facet Base;
- _EXPLICIT numpunct (size_t refs = 0)
+ explicit numpunct (size_t refs = 0)
: Base (refs) { /* empty */ }
static locale::id id;
@@ -1558,7 +1554,7 @@
// working around an MSVC 6.0 bug
typedef locale::facet Base;
- _EXPLICIT moneypunct (size_t refs = 0)
+ explicit moneypunct (size_t refs = 0)
: Base (refs), money_base () { /* empty */ }
static locale::id id;
@@ -1588,7 +1584,7 @@
// working around an MSVC 6.0 bug
typedef locale::facet Base;
- _EXPLICIT moneypunct (size_t refs = 0)
+ explicit moneypunct (size_t refs = 0)
: Base (refs), money_base () { /* empty */ }
static locale::id id;
Modified: stdcxx/branches/4.3.x/tests/utilities/20.function.objects.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/utilities/20.function.objects.cpp?rev=675434&r1=675433&r2=675434&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/utilities/20.function.objects.cpp (original)
+++ stdcxx/branches/4.3.x/tests/utilities/20.function.objects.cpp Wed Jul 9 21:05:30 2008
@@ -401,14 +401,10 @@
{
rw_info (0, 0, __LINE__, "[lib.negators]");
-#ifndef _RWSTD_NO_EXPLICIT
-
// verify that std::unary_negate<>() and std::binary_negate<>()
// ctors are declared explicit
is_explicit (std::logical_not<int>());
-#endif // _RWSTD_NO_EXPLICIT
-
// use std::negate<> as an argument in negator ctors
#undef CTOR_ARG_LIST
#define CTOR_ARG_LIST \
@@ -549,14 +545,10 @@
{
rw_info (0, 0, __LINE__, "[lib.function.pointer.adaptors]");
-#ifndef _RWSTD_NO_EXPLICIT
-
// verify that the pointer to function adapters' ctors are explicit
is_explicit ((int (*)(int))0);
is_explicit ((int (*)(int, int))0);
-#endif // _RWSTD_NO_EXPLICIT
-
// initialize pointer_to_unary_function with the address of square
#undef CTOR_ARG_LIST
#define CTOR_ARG_LIST (&::square)
@@ -641,16 +633,12 @@
{
rw_info (0, 0, __LINE__, "[lib.member.pointer.adaptors]");
-#ifndef _RWSTD_NO_EXPLICIT
-
// verify that the pointer to member adapters' ctors are explicit
is_explicit ((int (Integer::*)())0);
is_explicit ((int (Integer::*)(short))0);
is_explicit ((int (Integer::*)() const)0);
is_explicit ((int (Integer::*)(short) const)0);
-#endif // _RWSTD_NO_EXPLICIT
-
#undef CTOR_ARG_LIST
#define CTOR_ARG_LIST (&Integer::square)