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 2006/05/13 01:00:55 UTC
svn commit: r405930 - in /incubator/stdcxx/trunk/include: ./ loc/ rw/
Author: sebor
Date: Fri May 12 16:00:54 2006
New Revision: 405930
URL: http://svn.apache.org/viewcvs?rev=405930&view=rev
Log:
2006-05-12 Martin Sebor <se...@roguewave.com>
* deque (_RWSTD_COMPLEX_DEFAULT): Eliminated and unconditionally
used default template arguments.
* list: Same.
* map: Same.
* queue: Same.
* set: Same.
* stack: Same.
* vector: Same.
* _strref.h: Same.
* fstream (_RWSTD_COMPLEX_DEFAULT): Same.
(filebuf, fstream, ...): Made use of default template arguments
in typedef defintions and in explicit instantiation directives.
* iosfwd: Same.
* sstream: Same.
* istream: Same.
* streambuf: Same.
* _basic_ios.h: Same.
* _ioinsert.h: Same.
* _ioiter.h: Same.
* _iterator.h: Same.
* _money_get.h: Same. Replaced the _RWSTD_V3_LOCALE macro with std.
* _money_put.h: Same.
* _num_get.h: Same.
* _num_put.h: Same.
* _time_get.h: Same.
* _time_put.h: Same.
* _defs.h (_RWSTD_SIMPLE_DEFAULT, _RWSTD_COMPLEX_DEFAULT): Removed.
Modified:
incubator/stdcxx/trunk/include/deque
incubator/stdcxx/trunk/include/fstream
incubator/stdcxx/trunk/include/iosfwd
incubator/stdcxx/trunk/include/istream
incubator/stdcxx/trunk/include/list
incubator/stdcxx/trunk/include/loc/_money_get.h
incubator/stdcxx/trunk/include/loc/_money_put.h
incubator/stdcxx/trunk/include/loc/_num_get.h
incubator/stdcxx/trunk/include/loc/_num_put.h
incubator/stdcxx/trunk/include/loc/_time_get.h
incubator/stdcxx/trunk/include/loc/_time_put.h
incubator/stdcxx/trunk/include/map
incubator/stdcxx/trunk/include/queue
incubator/stdcxx/trunk/include/rw/_basic_ios.h
incubator/stdcxx/trunk/include/rw/_defs.h
incubator/stdcxx/trunk/include/rw/_ioinsert.h
incubator/stdcxx/trunk/include/rw/_ioiter.h
incubator/stdcxx/trunk/include/rw/_iterator.h
incubator/stdcxx/trunk/include/rw/_strref.h
incubator/stdcxx/trunk/include/set
incubator/stdcxx/trunk/include/sstream
incubator/stdcxx/trunk/include/stack
incubator/stdcxx/trunk/include/streambuf
incubator/stdcxx/trunk/include/vector
Modified: incubator/stdcxx/trunk/include/deque
URL: http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/deque?rev=405930&r1=405929&r2=405930&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/deque (original)
+++ incubator/stdcxx/trunk/include/deque Fri May 12 16:00:54 2006
@@ -1,9 +1,9 @@
// -*- C++ -*-
/***************************************************************************
*
- * deque - Declaration and definition for the Standard Library deque class
+ * <deque> - definition of the C++ Standard Library deque class template
*
- * $Id: //stdlib/dev/include/deque#44 $
+ * $Id$
*
***************************************************************************
*
@@ -20,16 +20,22 @@
*
***************************************************************************
*
- * Copyright (c) 1994-2005 Quovadx, Inc., acting through its Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0. Unless required by
- * applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied. See the License
- * for the specific language governing permissions and limitations under
- * the License.
+ * Copyright 2005-2006 The Apache Software Foundation or its licensors,
+ * as applicable.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*
**************************************************************************/
@@ -48,8 +54,7 @@
_RWSTD_NAMESPACE (std) {
_EXPORT
-template <class _TypeT,
- class _Allocator _RWSTD_COMPLEX_DEFAULT(allocator<_TypeT>) >
+template <class _TypeT, class _Allocator = allocator<_TypeT> >
class deque;
#ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
Modified: incubator/stdcxx/trunk/include/fstream
URL: http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/fstream?rev=405930&r1=405929&r2=405930&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/fstream (original)
+++ incubator/stdcxx/trunk/include/fstream Fri May 12 16:00:54 2006
@@ -7,16 +7,22 @@
*
***************************************************************************
*
- * Copyright (c) 1994-2005 Quovadx, Inc., acting through its Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0. Unless required by
- * applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied. See the License
- * for the specific language governing permissions and limitations under
- * the License.
+ * Copyright 2005-2006 The Apache Software Foundation or its licensors,
+ * as applicable.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*
**************************************************************************/
@@ -52,36 +58,32 @@
#ifndef _RWSTD_IOSFWD_INCLUDED
_EXPORT
-template <class _CharT,
- class _Traits _RWSTD_COMPLEX_DEFAULT (char_traits<_CharT>) >
+template <class _CharT, class _Traits = char_traits<_CharT> >
class basic_filebuf;
_EXPORT
-template <class _CharT,
- class _Traits _RWSTD_COMPLEX_DEFAULT (char_traits<_CharT>) >
+template <class _CharT, class _Traits = char_traits<_CharT> >
class basic_ifstream;
_EXPORT
-template <class _CharT,
- class _Traits _RWSTD_COMPLEX_DEFAULT (char_traits<_CharT>) >
+template <class _CharT, class _Traits = char_traits<_CharT> >
class basic_ofstream;
_EXPORT
-template <class _CharT,
- class _Traits _RWSTD_COMPLEX_DEFAULT (char_traits<_CharT>) >
+template <class _CharT, class _Traits = char_traits<_CharT> >
class basic_fstream;
-typedef basic_filebuf<char, char_traits<char> > filebuf;
-typedef basic_ifstream<char, char_traits<char> > ifstream;
-typedef basic_ofstream<char, char_traits<char> > ofstream;
-typedef basic_fstream<char, char_traits<char> > fstream;
+typedef basic_filebuf<char> filebuf;
+typedef basic_ifstream<char> ifstream;
+typedef basic_ofstream<char> ofstream;
+typedef basic_fstream<char> fstream;
# ifndef _RWSTD_NO_WCHAR_T
-typedef basic_filebuf<wchar_t, char_traits<wchar_t> > wfilebuf;
-typedef basic_ifstream<wchar_t, char_traits<wchar_t> > wifstream;
-typedef basic_ofstream<wchar_t, char_traits<wchar_t> > wofstream;
-typedef basic_fstream<wchar_t, char_traits<wchar_t> > wfstream;
+typedef basic_filebuf<wchar_t> wfilebuf;
+typedef basic_ifstream<wchar_t> wifstream;
+typedef basic_ofstream<wchar_t> wofstream;
+typedef basic_fstream<wchar_t> wfstream;
# endif // _RWSTD_NO_WCHAR_T
#endif // _RWSTD_IOSFWD_INCLUDED
Modified: incubator/stdcxx/trunk/include/iosfwd
URL: http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/iosfwd?rev=405930&r1=405929&r2=405930&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/iosfwd (original)
+++ incubator/stdcxx/trunk/include/iosfwd Fri May 12 16:00:54 2006
@@ -7,16 +7,22 @@
*
***************************************************************************
*
- * Copyright (c) 1994-2005 Quovadx, Inc., acting through its Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0. Unless required by
- * applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied. See the License
- * for the specific language governing permissions and limitations under
- * the License.
+ * Copyright 2005-2006 The Apache Software Foundation or its licensors,
+ * as applicable.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*
**************************************************************************/
@@ -37,15 +43,14 @@
#ifndef _RWSTD_RW_BASIC_IOS_H_INCLUDED
_EXPORT
-template<class _CharT,
- class _Traits _RWSTD_COMPLEX_DEFAULT (char_traits<_CharT>) >
+template <class _CharT, class _Traits = char_traits<_CharT> >
class basic_ios;
-typedef basic_ios<char, char_traits<char> > ios;
+typedef basic_ios<char> ios;
# ifndef _RWSTD_NO_WCHAR_T
-typedef basic_ios<wchar_t, char_traits<wchar_t> > wios;
+typedef basic_ios<wchar_t> wios;
# endif // _RWSTD_NO_WCHAR_T
#endif // _RWSTD_RW_BASIC_IOS_H_INCLUDED
@@ -54,15 +59,14 @@
#ifndef _RWSTD_STREAMBUF_INCLUDED
_EXPORT
-template<class _CharT,
- class _Traits _RWSTD_COMPLEX_DEFAULT (char_traits<_CharT>) >
+template <class _CharT, class _Traits = char_traits<_CharT> >
class basic_streambuf;
-typedef basic_streambuf<char, char_traits<char> > streambuf;
+typedef basic_streambuf<char> streambuf;
# ifndef _RWSTD_NO_WCHAR_T
-typedef basic_streambuf<wchar_t, char_traits<wchar_t> > wstreambuf;
+typedef basic_streambuf<wchar_t> wstreambuf;
# endif // _RWSTD_NO_WCHAR_T
#endif // _RWSTD_STREAMBUF_INCLUDED
@@ -72,23 +76,21 @@
// 27.2, p4
_EXPORT
-template<class _CharT,
- class _Traits _RWSTD_COMPLEX_DEFAULT (char_traits<_CharT>) >
+template <class _CharT, class _Traits = char_traits<_CharT> >
class basic_istream;
// 27.2, p6
-template<class _CharT,
- class _Traits _RWSTD_COMPLEX_DEFAULT (char_traits<_CharT>) >
+template <class _CharT, class _Traits = char_traits<_CharT> >
class basic_iostream;
-typedef basic_istream<char, char_traits<char> > istream;
-typedef basic_iostream<char, char_traits<char> > iostream;
+typedef basic_istream<char> istream;
+typedef basic_iostream<char> iostream;
# ifndef _RWSTD_NO_WCHAR_T
-typedef basic_istream<wchar_t, char_traits<wchar_t> > wistream;
-typedef basic_iostream<wchar_t, char_traits<wchar_t> > wiostream;
+typedef basic_istream<wchar_t> wistream;
+typedef basic_iostream<wchar_t> wiostream;
# endif // _RWSTD_NO_WCHAR_T
#endif // _RWSTD_ISTREAM_INCLUDED
@@ -98,8 +100,7 @@
// 27.2, p5
_EXPORT
-template<class _CharT,
- class _Traits _RWSTD_COMPLEX_DEFAULT (char_traits<_CharT>) >
+template <class _CharT, class _Traits = char_traits<_CharT> >
class basic_ostream;
typedef basic_ostream<char, char_traits<char> > ostream;
@@ -115,45 +116,37 @@
#ifndef _RWSTD_SSTREAM_INCLUDED
_EXPORT
-template<class _CharT,
- class _Traits _RWSTD_COMPLEX_DEFAULT (char_traits<_CharT>),
- class _Allocator _RWSTD_COMPLEX_DEFAULT (allocator<_CharT>) >
+template <class _CharT,
+ class _Traits = char_traits<_CharT>,
+ class _Allocator = allocator<_CharT> >
class basic_stringbuf;
-template<class _CharT,
- class _Traits _RWSTD_COMPLEX_DEFAULT (char_traits<_CharT>),
- class _Allocator _RWSTD_COMPLEX_DEFAULT (allocator<_CharT>) >
+template <class _CharT,
+ class _Traits = char_traits<_CharT>,
+ class _Allocator = allocator<_CharT> >
class basic_istringstream;
-template<class _CharT,
- class _Traits _RWSTD_COMPLEX_DEFAULT (char_traits<_CharT>),
- class _Allocator _RWSTD_COMPLEX_DEFAULT (allocator<_CharT>) >
+template <class _CharT,
+ class _Traits = char_traits<_CharT>,
+ class _Allocator = allocator<_CharT> >
class basic_ostringstream;
-template<class _CharT,
- class _Traits _RWSTD_COMPLEX_DEFAULT (char_traits<_CharT>),
- class _Allocator _RWSTD_COMPLEX_DEFAULT (allocator<_CharT>) >
+template <class _CharT,
+ class _Traits = char_traits<_CharT>,
+ class _Allocator = allocator<_CharT> >
class basic_stringstream;
-typedef basic_stringbuf<char, char_traits<char>, allocator<char> >
- stringbuf;
-typedef basic_istringstream<char, char_traits<char>, allocator<char> >
- istringstream;
-typedef basic_ostringstream<char, char_traits<char>, allocator<char> >
- ostringstream;
-typedef basic_stringstream<char, char_traits<char>, allocator<char> >
- stringstream;
+typedef basic_stringbuf<char> stringbuf;
+typedef basic_istringstream<char> istringstream;
+typedef basic_ostringstream<char> ostringstream;
+typedef basic_stringstream<char> stringstream;
# ifndef _RWSTD_NO_WCHAR_T
-typedef basic_stringbuf<wchar_t, char_traits<wchar_t>, allocator<wchar_t> >
- wstringbuf;
-typedef basic_istringstream<wchar_t, char_traits<wchar_t>, allocator<wchar_t> >
- wistringstream;
-typedef basic_ostringstream<wchar_t, char_traits<wchar_t>, allocator<wchar_t> >
- wostringstream;
-typedef basic_stringstream<wchar_t, char_traits<wchar_t>, allocator<wchar_t> >
- wstringstream;
+typedef basic_stringbuf<wchar_t> wstringbuf;
+typedef basic_istringstream<wchar_t> wistringstream;
+typedef basic_ostringstream<wchar_t> wostringstream;
+typedef basic_stringstream<wchar_t> wstringstream;
# endif // _RWSTD_NO_WCHAR_T
#endif // _RWSTD_SSTREAM_INCLUDED
@@ -162,33 +155,29 @@
#ifndef _RWSTD_FSTREAM_INCLUDED
_EXPORT
-template<class _CharT,
- class _Traits _RWSTD_COMPLEX_DEFAULT (char_traits<_CharT>) >
+template <class _CharT, class _Traits = char_traits<_CharT> >
class basic_filebuf;
-template<class _CharT,
- class _Traits _RWSTD_COMPLEX_DEFAULT (char_traits<_CharT>) >
+template <class _CharT, class _Traits = char_traits<_CharT> >
class basic_ifstream;
-template<class _CharT,
- class _Traits _RWSTD_COMPLEX_DEFAULT (char_traits<_CharT>) >
+template <class _CharT, class _Traits = char_traits<_CharT> >
class basic_ofstream;
-template<class _CharT,
- class _Traits _RWSTD_COMPLEX_DEFAULT (char_traits<_CharT>) >
+template <class _CharT, class _Traits = char_traits<_CharT> >
class basic_fstream;
-typedef basic_filebuf<char, char_traits<char> > filebuf;
-typedef basic_ifstream<char, char_traits<char> > ifstream;
-typedef basic_ofstream<char, char_traits<char> > ofstream;
-typedef basic_fstream<char, char_traits<char> > fstream;
+typedef basic_filebuf<char> filebuf;
+typedef basic_ifstream<char> ifstream;
+typedef basic_ofstream<char> ofstream;
+typedef basic_fstream<char> fstream;
# ifndef _RWSTD_NO_WCHAR_T
-typedef basic_filebuf<wchar_t, char_traits<wchar_t> > wfilebuf;
-typedef basic_ifstream<wchar_t, char_traits<wchar_t> > wifstream;
-typedef basic_ofstream<wchar_t, char_traits<wchar_t> > wofstream;
-typedef basic_fstream<wchar_t, char_traits<wchar_t> > wfstream;
+typedef basic_filebuf<wchar_t> wfilebuf;
+typedef basic_ifstream<wchar_t> wifstream;
+typedef basic_ofstream<wchar_t> wofstream;
+typedef basic_fstream<wchar_t> wfstream;
# endif // _RWSTD_NO_WCHAR_T
#endif // _RWSTD_FSTREAM_INCLUDED
@@ -196,12 +185,10 @@
#ifndef _RWSTD_RW_IOITER_H_INCLUDED
-template<class _CharT,
- class _Traits _RWSTD_COMPLEX_DEFAULT (char_traits<_CharT>) >
+template <class _CharT, class _Traits = char_traits<_CharT> >
struct ostreambuf_iterator;
-template<class _CharT,
- class _Traits _RWSTD_COMPLEX_DEFAULT (char_traits<_CharT>) >
+template <class _CharT, class _Traits = char_traits<_CharT> >
struct istreambuf_iterator;
#endif // _RWSTD_RW_IOITER_H_INCLUDED
Modified: incubator/stdcxx/trunk/include/istream
URL: http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/istream?rev=405930&r1=405929&r2=405930&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/istream (original)
+++ incubator/stdcxx/trunk/include/istream Fri May 12 16:00:54 2006
@@ -3,7 +3,7 @@
*
* istream - Declarations for the Standard Library istreams
*
- * $Id: //stdlib/dev/include/istream#53 $
+ * $Id$
*
***************************************************************************
*
@@ -56,22 +56,20 @@
#ifndef _RWSTD_IOSFWD_INCLUDED
_EXPORT
-template <class _CharT,
- class _Traits _RWSTD_COMPLEX_DEFAULT (char_traits<_CharT>) >
+template <class _CharT, class _Traits = char_traits<_CharT> >
class basic_istream;
_EXPORT
-template <class _CharT,
- class _Traits _RWSTD_COMPLEX_DEFAULT (char_traits<_CharT>) >
+template <class _CharT, class _Traits = char_traits<_CharT> >
class basic_iostream;
-typedef basic_istream<char, char_traits<char> > istream;
-typedef basic_iostream<char, char_traits<char> > iostream;
+typedef basic_istream<char> istream;
+typedef basic_iostream<char> iostream;
# ifndef _RWSTD_NO_WCHAR_T
-typedef basic_istream<wchar_t, char_traits<wchar_t> > wistream;
-typedef basic_iostream<wchar_t, char_traits<wchar_t> > wiostream;
+typedef basic_istream<wchar_t> wistream;
+typedef basic_iostream<wchar_t> wiostream;
# endif // _RWSTD_NO_WCHAR_T
#endif // _RWSTD_IOSFWD_INCLUDED
Modified: incubator/stdcxx/trunk/include/list
URL: http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/list?rev=405930&r1=405929&r2=405930&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/list (original)
+++ incubator/stdcxx/trunk/include/list Fri May 12 16:00:54 2006
@@ -1,7 +1,7 @@
// -*- C++ -*-
/***************************************************************************
*
- * list - list declarations for the Standard Library
+ * <list> - definition of the C++ Standard Library list class template
*
* $Id$
*
@@ -168,8 +168,7 @@
_EXPORT
-template <class _TypeT,
- class _Allocator _RWSTD_COMPLEX_DEFAULT (allocator<_TypeT>) >
+template <class _TypeT, class _Allocator = allocator<_TypeT> >
class list : private _Allocator
{
public:
Modified: incubator/stdcxx/trunk/include/loc/_money_get.h
URL: http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/loc/_money_get.h?rev=405930&r1=405929&r2=405930&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/loc/_money_get.h (original)
+++ incubator/stdcxx/trunk/include/loc/_money_get.h Fri May 12 16:00:54 2006
@@ -5,20 +5,26 @@
* This is an internal header file used to implement the C++ Standard
* Library. It should never be #included directly by a program.
*
- * $Id: //stdlib/dev/include/loc/_money_get.h#26 $
+ * $Id$
*
***************************************************************************
*
- * Copyright (c) 1994-2005 Quovadx, Inc., acting through its Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0. Unless required by
- * applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied. See the License
- * for the specific language governing permissions and limitations under
- * the License.
+ * Copyright 2005-2006 The Apache Software Foundation or its licensors,
+ * as applicable.
+ *
+ * Copyright 2001-2006 Rogue Wave Software.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*
**************************************************************************/
@@ -38,12 +44,11 @@
#include <rw/_defs.h>
-_RWSTD_NAMESPACE (_V3_LOCALE) {
+_RWSTD_NAMESPACE (std) {
_EXPORT
-template <class _CharT,
- class _InputIter _RWSTD_COMPLEX_DEFAULT (_RWSTD_ISTREAMBUF_ITER (_CharT)) >
+template <class _CharT, class _InputIter = istreambuf_iterator<_CharT> >
struct money_get: _RW::__rw_facet
{
typedef _CharT char_type;
@@ -106,17 +111,17 @@
#ifndef _RWSTD_NO_SPECIALIZED_FACET_ID
_RWSTD_SPECIALIZED_CLASS
-_RW::__rw_facet_id money_get<char, _RWSTD_ISTREAMBUF_ITER (char) >::id;
+_RW::__rw_facet_id money_get<char, istreambuf_iterator<char> >::id;
# ifndef _RWSTD_NO_WCHAR_T
_RWSTD_SPECIALIZED_CLASS
-_RW::__rw_facet_id money_get<wchar_t, _RWSTD_ISTREAMBUF_ITER (wchar_t) >::id;
+_RW::__rw_facet_id money_get<wchar_t, istreambuf_iterator<wchar_t> >::id;
# endif // _RWSTD_NO_WCHAR_T
#endif // _RWSTD_NO_SPECIALIZED_FACET_ID
-} // namespace _V3_LOCALE
+} // namespace std
#if _RWSTD_DEFINE_TEMPLATE_FIRST (_MONEY_GET)
@@ -124,23 +129,21 @@
#endif // _RWSTD_DEFINE_TEMPLATE_FIRST (_MONEY_GET)
-_RWSTD_NAMESPACE (_V3_LOCALE) {
+_RWSTD_NAMESPACE (std) {
#if _RWSTD_INSTANTIATE (_MONEY_GET, _CHAR)
-_RWSTD_INSTANTIATE_2 (struct _RWSTD_EXPORT
- money_get<char, _RWSTD_ISTREAMBUF_ITER (char) >);
+_RWSTD_INSTANTIATE_1 (struct _RWSTD_EXPORT money_get<char>);
#endif // _RWSTD_INSTANTIATE (_MONEY_GET, _CHAR)
#if _RWSTD_INSTANTIATE (_MONEY_GET, _WCHAR_T)
-_RWSTD_INSTANTIATE_2 (struct _RWSTD_EXPORT
- money_get<wchar_t, _RWSTD_ISTREAMBUF_ITER (wchar_t) >);
+_RWSTD_INSTANTIATE_1 (struct _RWSTD_EXPORT money_get<wchar_t>);
#endif // _RWSTD_INSTANTIATE (_MONEY_GET, _WCHAR_T)
-} // namespace _V3_LOCALE
+} // namespace std
#if _RWSTD_DEFINE_TEMPLATE_LAST (_MONEY_GET)
Modified: incubator/stdcxx/trunk/include/loc/_money_put.h
URL: http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/loc/_money_put.h?rev=405930&r1=405929&r2=405930&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/loc/_money_put.h (original)
+++ incubator/stdcxx/trunk/include/loc/_money_put.h Fri May 12 16:00:54 2006
@@ -5,21 +5,27 @@
* This is an internal header file used to implement the C++ Standard
* Library. It should never be #included directly by a program.
*
- * $Id: //stdlib/dev/include/loc/_money_put.h#25 $
+ * $Id$
*
***************************************************************************
*
- * Copyright (c) 1994-2005 Quovadx, Inc., acting through its Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0. Unless required by
- * applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied. See the License
- * for the specific language governing permissions and limitations under
- * the License.
- *
+ * Copyright 2005-2006 The Apache Software Foundation or its licensors,
+ * as applicable.
+ *
+ * Copyright 2001-2006 Rogue Wave Software.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
**************************************************************************/
#ifndef _RWSTD_LOC_MONEY_PUT_H_INCLUDED
@@ -40,15 +46,10 @@
struct _RWSTD_EXPORT ios_base;
-} // namespace std
-
-
-_RWSTD_NAMESPACE (_V3_LOCALE) {
// 22.2.6.2
_EXPORT
-template <class _CharT,
- class _OutputIter _RWSTD_COMPLEX_DEFAULT (ostreambuf_iterator<_CharT>) >
+template <class _CharT, class _OutputIter = ostreambuf_iterator<_CharT> >
struct money_put: _RW::__rw_facet
{
typedef _CharT char_type;
@@ -96,17 +97,17 @@
#ifndef _RWSTD_NO_SPECIALIZED_FACET_ID
_RWSTD_SPECIALIZED_CLASS
-_RW::__rw_facet_id money_put<char, _RWSTD_OSTREAMBUF_ITER (char) >::id;
+_RW::__rw_facet_id money_put<char, ostreambuf_iterator<char> >::id;
# ifndef _RWSTD_NO_WCHAR_T
_RWSTD_SPECIALIZED_CLASS
-_RW::__rw_facet_id money_put<wchar_t, _RWSTD_OSTREAMBUF_ITER (wchar_t) >::id;
+_RW::__rw_facet_id money_put<wchar_t, ostreambuf_iterator<wchar_t> >::id;
# endif // _RWSTD_NO_WCHAR_T
#endif // _RWSTD_NO_SPECIALIZED_FACET_ID
-} // namespace _V3_LOCALE
+} // namespace std
#if _RWSTD_DEFINE_TEMPLATE_FIRST (_MONEY_PUT)
@@ -114,23 +115,21 @@
#endif // _RWSTD_DEFINE_TEMPLATE_FIRST (_MONEY_PUT)
-_RWSTD_NAMESPACE (_V3_LOCALE) {
+_RWSTD_NAMESPACE (std) {
#if _RWSTD_INSTANTIATE (_MONEY_PUT, _CHAR)
-_RWSTD_INSTANTIATE_2 (struct _RWSTD_EXPORT
- money_put<char, _RWSTD_OSTREAMBUF_ITER (char) >);
+_RWSTD_INSTANTIATE_1 (struct _RWSTD_EXPORT money_put<char>);
#endif // _RWSTD_INSTANTIATE (_MONEY_PUT, _CHAR)
#if _RWSTD_INSTANTIATE (_MONEY_PUT, _WCHAR_T)
-_RWSTD_INSTANTIATE_2 (struct _RWSTD_EXPORT
- money_put<wchar_t, _RWSTD_OSTREAMBUF_ITER (wchar_t) >);
+_RWSTD_INSTANTIATE_1 (struct _RWSTD_EXPORT money_put<wchar_t>);
#endif // _RWSTD_INSTANTIATE (_MONEY_PUT, _WCHAR_T)
-} // namespace _V3_LOCALE
+} // namespace std
#if _RWSTD_DEFINE_TEMPLATE_LAST (_MONEY_PUT)
Modified: incubator/stdcxx/trunk/include/loc/_num_get.h
URL: http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/loc/_num_get.h?rev=405930&r1=405929&r2=405930&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/loc/_num_get.h (original)
+++ incubator/stdcxx/trunk/include/loc/_num_get.h Fri May 12 16:00:54 2006
@@ -5,20 +5,26 @@
* This is an internal header file used to implement the C++ Standard
* Library. It should never be #included directly by a program.
*
- * $Id: //stdlib/dev/include/loc/_num_get.h#34 $
+ * $Id$
*
***************************************************************************
*
- * Copyright (c) 1994-2005 Quovadx, Inc., acting through its Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0. Unless required by
- * applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied. See the License
- * for the specific language governing permissions and limitations under
- * the License.
+ * Copyright 2005-2006 The Apache Software Foundation or its licensors,
+ * as applicable.
+ *
+ * Copyright 2001-2006 Rogue Wave Software.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*
**************************************************************************/
@@ -38,13 +44,12 @@
#include <rw/_defs.h>
-_RWSTD_NAMESPACE (_V3_LOCALE) {
+_RWSTD_NAMESPACE (std) {
// 22.2.2.1
_EXPORT
-template <class _CharT,
- class _InputIter _RWSTD_COMPLEX_DEFAULT (_RWSTD_ISTREAMBUF_ITER (_CharT)) >
+template <class _CharT, class _InputIter = istreambuf_iterator<_CharT> >
struct num_get: _RW::__rw_facet
{
typedef _CharT char_type;
@@ -240,17 +245,17 @@
#ifndef _RWSTD_NO_SPECIALIZED_FACET_ID
_RWSTD_SPECIALIZED_CLASS
-_RW::__rw_facet_id num_get<char, _RWSTD_ISTREAMBUF_ITER (char) >::id;
+_RW::__rw_facet_id num_get<char, istreambuf_iterator<char> >::id;
# ifndef _RWSTD_NO_WCHAR_T
_RWSTD_SPECIALIZED_CLASS
-_RW::__rw_facet_id num_get<wchar_t, _RWSTD_ISTREAMBUF_ITER (wchar_t) >::id;
+_RW::__rw_facet_id num_get<wchar_t, istreambuf_iterator<wchar_t> >::id;
# endif // _RWSTD_NO_WCHAR_T
#endif // _RWSTD_NO_SPECIALIZED_FACET_ID
-} // namespace _V3_LOCALE
+} // namespace std
#if _RWSTD_DEFINE_TEMPLATE_FIRST (_NUM_GET)
@@ -258,23 +263,21 @@
#endif // _RWSTD_DEFINE_TEMPLATE_FIRST (_NUM_GET)
-_RWSTD_NAMESPACE (_V3_LOCALE) {
+_RWSTD_NAMESPACE (std) {
#if _RWSTD_INSTANTIATE (_NUM_GET, _CHAR)
-_RWSTD_INSTANTIATE_2 (struct _RWSTD_EXPORT
- num_get<char, _RWSTD_ISTREAMBUF_ITER (char) >);
+_RWSTD_INSTANTIATE_1 (struct _RWSTD_EXPORT num_get<char>);
#endif // _RWSTD_INSTANTIATE (_NUM_GET, _CHAR)
#if _RWSTD_INSTANTIATE (_NUM_GET, _WCHAR_T)
-_RWSTD_INSTANTIATE_2 (struct _RWSTD_EXPORT
- num_get<wchar_t, _RWSTD_ISTREAMBUF_ITER (wchar_t) >);
+_RWSTD_INSTANTIATE_1 (struct _RWSTD_EXPORT num_get<wchar_t>);
#endif // _RWSTD_INSTANTIATE (_NUM_GET, _WCHAR_T)
-} // namespace _V3_LOCALE
+} // namespace std
#if _RWSTD_DEFINE_TEMPLATE_LAST (_NUM_GET)
Modified: incubator/stdcxx/trunk/include/loc/_num_put.h
URL: http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/loc/_num_put.h?rev=405930&r1=405929&r2=405930&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/loc/_num_put.h (original)
+++ incubator/stdcxx/trunk/include/loc/_num_put.h Fri May 12 16:00:54 2006
@@ -5,7 +5,7 @@
* This is an internal header file used to implement the C++ Standard
* Library. It should never be #included directly by a program.
*
- * $Id: //stdlib/dev/include/loc/_num_put.h#30 $
+ * $Id$
*
***************************************************************************
*
@@ -39,12 +39,11 @@
#include <rw/_defs.h>
-_RWSTD_NAMESPACE (_V3_LOCALE) {
+_RWSTD_NAMESPACE (std) {
// 22.2.2.2
_EXPORT
-template <class _CharT,
- class _OutputIter _RWSTD_COMPLEX_DEFAULT (_RWSTD_OSTREAMBUF_ITER (_CharT)) >
+template <class _CharT, class _OutputIter = ostreambuf_iterator<_CharT> >
struct num_put: _RW::__rw_facet
{
typedef _CharT char_type;
@@ -190,17 +189,17 @@
#ifndef _RWSTD_NO_SPECIALIZED_FACET_ID
_RWSTD_SPECIALIZED_CLASS
-_RW::__rw_facet_id num_put<char, _RWSTD_OSTREAMBUF_ITER (char) >::id;
+_RW::__rw_facet_id num_put<char, ostreambuf_iterator<char> >::id;
# ifndef _RWSTD_NO_WCHAR_T
_RWSTD_SPECIALIZED_CLASS
-_RW::__rw_facet_id num_put<wchar_t, _RWSTD_OSTREAMBUF_ITER (wchar_t) >::id;
+_RW::__rw_facet_id num_put<wchar_t, ostreambuf_iterator<wchar_t> >::id;
# endif // _RWSTD_NO_WCHAR_T
#endif // _RWSTD_NO_SPECIALIZED_FACET_ID
-} // namespace _V3_LOCALE
+} // namespace std
#if _RWSTD_DEFINE_TEMPLATE_FIRST (_NUM_PUT)
@@ -208,23 +207,21 @@
#endif // _RWSTD_DEFINE_TEMPLATE_FIRST (_NUM_PUT)
-_RWSTD_NAMESPACE (_V3_LOCALE) {
+_RWSTD_NAMESPACE (std) {
#if _RWSTD_INSTANTIATE (_NUM_PUT, _CHAR)
-_RWSTD_INSTANTIATE_2 (struct _RWSTD_EXPORT
- num_put<char, _RWSTD_OSTREAMBUF_ITER (char) >);
+_RWSTD_INSTANTIATE_1 (struct _RWSTD_EXPORT num_put<char>);
#endif // _RWSTD_INSTANTIATE (_NUM_PUT, _CHAR)
#if _RWSTD_INSTANTIATE (_NUM_PUT, _WCHAR_T)
-_RWSTD_INSTANTIATE_2 (struct _RWSTD_EXPORT
- num_put<wchar_t, _RWSTD_OSTREAMBUF_ITER (wchar_t) >);
+_RWSTD_INSTANTIATE_1 (struct _RWSTD_EXPORT num_put<wchar_t>);
#endif // _RWSTD_INSTANTIATE (_NUM_PUT, _WCHAR_T)
-} // namespace _V3_LOCALE
+} // namespace std
#if _RWSTD_DEFINE_TEMPLATE_LAST (_NUM_PUT)
Modified: incubator/stdcxx/trunk/include/loc/_time_get.h
URL: http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/loc/_time_get.h?rev=405930&r1=405929&r2=405930&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/loc/_time_get.h (original)
+++ incubator/stdcxx/trunk/include/loc/_time_get.h Fri May 12 16:00:54 2006
@@ -5,20 +5,26 @@
* This is an internal header file used to implement the C++ Standard
* Library. It should never be #included directly by a program.
*
- * $Id: //stdlib/dev/include/loc/_time_get.h#32 $
+ * $Id$
*
***************************************************************************
*
- * Copyright (c) 1994-2005 Quovadx, Inc., acting through its Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0. Unless required by
- * applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied. See the License
- * for the specific language governing permissions and limitations under
- * the License.
+ * Copyright 2005-2006 The Apache Software Foundation or its licensors,
+ * as applicable.
+ *
+ * Copyright 2001-2006 Rogue Wave Software.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*
**************************************************************************/
@@ -46,7 +52,7 @@
} // namespace __rw
-_RWSTD_NAMESPACE (_V3_LOCALE) {
+_RWSTD_NAMESPACE (std) {
// 22.2.5.1
@@ -58,8 +64,7 @@
// 22.2.5.1
_EXPORT
-template <class _CharT,
- class _InputIter _RWSTD_COMPLEX_DEFAULT (istreambuf_iterator<_CharT>) >
+template <class _CharT, class _InputIter = istreambuf_iterator<_CharT> >
class time_get: public _RW::__rw_facet, public time_base
{
public:
@@ -178,20 +183,19 @@
#ifndef _RWSTD_NO_SPECIALIZED_FACET_ID
_RWSTD_SPECIALIZED_CLASS
-_RW::__rw_facet_id time_get<char, _RWSTD_ISTREAMBUF_ITER (char) >::id;
+_RW::__rw_facet_id time_get<char, istreambuf_iterator<char> >::id;
# ifndef _RWSTD_NO_WCHAR_T
_RWSTD_SPECIALIZED_CLASS
-_RW::__rw_facet_id time_get<wchar_t, _RWSTD_ISTREAMBUF_ITER (wchar_t) >::id;
+_RW::__rw_facet_id time_get<wchar_t, istreambuf_iterator<wchar_t> >::id;
# endif // _RWSTD_NO_WCHAR_T
#endif // _RWSTD_NO_SPECIALIZED_FACET_ID
// 22.2.5.2
-template <class _CharT,
- class _InputIter _RWSTD_COMPLEX_DEFAULT (istreambuf_iterator<_CharT>) >
+template <class _CharT, class _InputIter = istreambuf_iterator<_CharT> >
class time_get_byname: public time_get<_CharT, _InputIter>
{
char _C_namebuf [32];
@@ -204,7 +208,7 @@
}
};
-} // namespace _V3_LOCALE
+} // namespace std
#if _RWSTD_DEFINE_TEMPLATE_FIRST (_TIME_GET)
@@ -212,23 +216,21 @@
#endif // _RWSTD_DEFINE_TEMPLATE_FIRST (_TIME_GET)
-_RWSTD_NAMESPACE (_V3_LOCALE) {
+_RWSTD_NAMESPACE (std) {
#if _RWSTD_INSTANTIATE (_TIME_GET, _CHAR)
-_RWSTD_INSTANTIATE_2 (class _RWSTD_EXPORT
- time_get<char, _RWSTD_ISTREAMBUF_ITER (char) >);
+_RWSTD_INSTANTIATE_1 (class _RWSTD_EXPORT time_get<char>);
#endif // _RWSTD_INSTANTIATE (_TIME_GET, _CHAR)
#if _RWSTD_INSTANTIATE (_TIME_GET, _WCHAR_T)
-_RWSTD_INSTANTIATE_2 (class _RWSTD_EXPORT
- time_get<wchar_t, _RWSTD_ISTREAMBUF_ITER (wchar_t) >);
+_RWSTD_INSTANTIATE_1 (class _RWSTD_EXPORT time_get<wchar_t>);
#endif // _RWSTD_INSTANTIATE (_TIME_GET, _WCHAR_T)
-} // namespace _V3_LOCALE
+} // namespace std
#if _RWSTD_DEFINE_TEMPLATE_LAST (_TIME_GET)
Modified: incubator/stdcxx/trunk/include/loc/_time_put.h
URL: http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/loc/_time_put.h?rev=405930&r1=405929&r2=405930&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/loc/_time_put.h (original)
+++ incubator/stdcxx/trunk/include/loc/_time_put.h Fri May 12 16:00:54 2006
@@ -5,20 +5,26 @@
* This is an internal header file used to implement the C++ Standard
* Library. It should never be #included directly by a program.
*
- * $Id: //stdlib/dev/include/loc/_time_put.h#24 $
+ * $Id$
*
***************************************************************************
*
- * Copyright (c) 1994-2005 Quovadx, Inc., acting through its Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0. Unless required by
- * applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied. See the License
- * for the specific language governing permissions and limitations under
- * the License.
+ * Copyright 2005-2006 The Apache Software Foundation or its licensors,
+ * as applicable.
+ *
+ * Copyright 2001-2006 Rogue Wave Software.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*
**************************************************************************/
@@ -42,16 +48,10 @@
struct _RWSTD_EXPORT ios_base;
-} // namespace std
-
-
-_RWSTD_NAMESPACE (_V3_LOCALE) {
-
// 22.2.5.3
_EXPORT
-template <class _CharT,
- class _OutputIter _RWSTD_COMPLEX_DEFAULT (ostreambuf_iterator<_CharT>) >
+template <class _CharT, class _OutputIter = ostreambuf_iterator<_CharT> >
struct time_put: _RW::__rw_facet
{
typedef _CharT char_type;
@@ -82,20 +82,19 @@
#ifndef _RWSTD_NO_SPECIALIZED_FACET_ID
_RWSTD_SPECIALIZED_CLASS
-_RW::__rw_facet_id time_put<char, _RWSTD_OSTREAMBUF_ITER (char) >::id;
+_RW::__rw_facet_id time_put<char, ostreambuf_iterator<char> >::id;
# ifndef _RWSTD_NO_WCHAR_T
_RWSTD_SPECIALIZED_CLASS
-_RW::__rw_facet_id time_put<wchar_t, _RWSTD_OSTREAMBUF_ITER (wchar_t) >::id;
+_RW::__rw_facet_id time_put<wchar_t, ostreambuf_iterator<wchar_t> >::id;
# endif // _RWSTD_NO_WCHAR_T
#endif // _RWSTD_NO_SPECIALIZED_FACET_ID
// 22.2.5.2
-template <class _CharT,
- class _OutputIter _RWSTD_COMPLEX_DEFAULT (ostreambuf_iterator<_CharT>) >
+template <class _CharT, class _OutputIter = ostreambuf_iterator<_CharT> >
class time_put_byname: public time_put<_CharT, _OutputIter>
{
char _C_namebuf [32];
@@ -108,7 +107,7 @@
}
};
-} // namespace _V3_LOCALE
+} // namespace std
#if _RWSTD_DEFINE_TEMPLATE_FIRST (_TIME_PUT)
@@ -116,23 +115,21 @@
#endif // _RWSTD_DEFINE_TEMPLATE_FIRST (_TIME_PUT)
-_RWSTD_NAMESPACE (_V3_LOCALE) {
+_RWSTD_NAMESPACE (std) {
#if _RWSTD_INSTANTIATE (_TIME_PUT, _CHAR)
-_RWSTD_INSTANTIATE_2 (struct _RWSTD_EXPORT
- time_put<char, _RWSTD_OSTREAMBUF_ITER (char) >);
+_RWSTD_INSTANTIATE_1 (struct _RWSTD_EXPORT time_put<char>);
#endif // _RWSTD_INSTANTIATE (_TIME_PUT, _CHAR)
#if _RWSTD_INSTANTIATE (_TIME_PUT, _WCHAR_T)
-_RWSTD_INSTANTIATE_2 (struct _RWSTD_EXPORT
- time_put<wchar_t, _RWSTD_OSTREAMBUF_ITER (wchar_t) >);
+_RWSTD_INSTANTIATE_1 (struct _RWSTD_EXPORT time_put<wchar_t>);
#endif // _RWSTD_INSTANTIATE (_TIME_PUT, _WCHAR_T)
-} // namespace _V3_LOCALE
+} // namespace std
#if _RWSTD_DEFINE_TEMPLATE_LAST (_TIME_PUT)
Modified: incubator/stdcxx/trunk/include/map
URL: http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/map?rev=405930&r1=405929&r2=405930&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/map (original)
+++ incubator/stdcxx/trunk/include/map Fri May 12 16:00:54 2006
@@ -1,9 +1,9 @@
// -*- C++ -*-
/***************************************************************************
*
- * map - declarations for the Standard Library map class
+ * <map> - definition of the C++ Standard Library map class template
*
- * $Id: //stdlib/dev/include/map#21 $
+ * $Id$
*
***************************************************************************
*
@@ -20,16 +20,22 @@
*
***************************************************************************
*
- * Copyright (c) 1994-2005 Quovadx, Inc., acting through its Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0. Unless required by
- * applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied. See the License
- * for the specific language governing permissions and limitations under
- * the License.
+ * Copyright 2005-2006 The Apache Software Foundation or its licensors,
+ * as applicable.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*
**************************************************************************/
@@ -61,13 +67,9 @@
_RWSTD_NAMESPACE (std) {
-// prevent comma from messing up macro argument expansion
-#define _RWSTD_MAP_ALLOCATOR(K, T) allocator<pair<const K, T> >
-
template <class _Key, class _TypeT,
- class _Compare _RWSTD_COMPLEX_DEFAULT (less<_Key>),
- class _Allocator
- _RWSTD_COMPLEX_DEFAULT (_RWSTD_MAP_ALLOCATOR (_Key, _TypeT)) >
+ class _Compare = less<_Key>,
+ class _Allocator = allocator<pair<const _Key, _TypeT> > >
class map
{
public:
@@ -302,9 +304,8 @@
template <class _Key, class _TypeT,
- class _Compare _RWSTD_COMPLEX_DEFAULT (less<_Key>),
- class _Allocator
- _RWSTD_COMPLEX_DEFAULT (_RWSTD_MAP_ALLOCATOR (_Key, _TypeT)) >
+ class _Compare = less<_Key>,
+ class _Allocator = allocator<pair<const _Key, _TypeT> > >
class multimap
{
public:
Modified: incubator/stdcxx/trunk/include/queue
URL: http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/queue?rev=405930&r1=405929&r2=405930&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/queue (original)
+++ incubator/stdcxx/trunk/include/queue Fri May 12 16:00:54 2006
@@ -1,10 +1,9 @@
// -*- C++ -*-
/***************************************************************************
*
- * queue - declarations of the C++ Standard Library queue
- * and priority_queue class templates
+ * <queue> - definition of the C++ Standard Library queue class template
*
- * $Id: //stdlib/dev/include/queue#20 $
+ * $Id$
*
***************************************************************************
*
@@ -21,16 +20,22 @@
*
***************************************************************************
*
- * Copyright (c) 1994-2005 Quovadx, Inc., acting through its Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0. Unless required by
- * applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied. See the License
- * for the specific language governing permissions and limitations under
- * the License.
+ * Copyright 2005-2006 The Apache Software Foundation or its licensors,
+ * as applicable.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*
**************************************************************************/
@@ -47,8 +52,7 @@
_RWSTD_NAMESPACE (std) {
-template <class _TypeT,
- class _Container _RWSTD_COMPLEX_DEFAULT (deque<_TypeT>) >
+template <class _TypeT, class _Container = deque<_TypeT> >
class queue;
template <class _TypeT, class _Container>
@@ -167,14 +171,9 @@
}
-#ifndef _RWSTD_NO_COMPLEX_DEFAULT_TEMPLATES
-
template<class _TypeT,
class _Container = vector<_TypeT>,
class _Compare = less<_TYPENAME _Container::value_type> >
-#else // if defined (_RWSTD_NO_COMPLEX_DEFAULT_TEMPLATES)
-template <class _TypeT, class _Container, class _Compare>
-#endif // _RWSTD_NO_COMPLEX_DEFAULT_TEMPLATES
class priority_queue
{
public:
Modified: incubator/stdcxx/trunk/include/rw/_basic_ios.h
URL: http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/rw/_basic_ios.h?rev=405930&r1=405929&r2=405930&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_basic_ios.h (original)
+++ incubator/stdcxx/trunk/include/rw/_basic_ios.h Fri May 12 16:00:54 2006
@@ -7,16 +7,22 @@
*
***************************************************************************
*
- * Copyright (c) 1994-2005 Quovadx, Inc., acting through its Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0. Unless required by
- * applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied. See the License
- * for the specific language governing permissions and limitations under
- * the License.
+ * Copyright 2005-2006 The Apache Software Foundation or its licensors,
+ * as applicable.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*
**************************************************************************/
@@ -49,15 +55,14 @@
#ifndef _RWSTD_IOSFWD_INCLUDED
_EXPORT
-template <class _CharT,
- class _Traits _RWSTD_COMPLEX_DEFAULT (char_traits<_CharT>) >
+template <class _CharT, class _Traits = char_traits<_CharT> >
class basic_ios;
-typedef basic_ios<char, char_traits<char> > ios;
+typedef basic_ios<char> ios;
# ifndef _RWSTD_NO_WCHAR_T
-typedef basic_ios<wchar_t, char_traits<wchar_t> > wios;
+typedef basic_ios<wchar_t> wios;
# endif // _RWSTD_NO_WCHAR_T
#endif // _RWSTD_IOSFWD_INCLUDED
Modified: incubator/stdcxx/trunk/include/rw/_defs.h
URL: http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/rw/_defs.h?rev=405930&r1=405929&r2=405930&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_defs.h (original)
+++ incubator/stdcxx/trunk/include/rw/_defs.h Fri May 12 16:00:54 2006
@@ -540,32 +540,6 @@
#endif // !defined (_MSC_VER) || (_MSC_VER < 1300)
-
-//
-// Macro for forming or ommitting default template parameters.
-//
-#ifndef _RWSTD_NO_SIMPLE_DEFAULT_TEMPLATES
-# define _RWSTD_SIMPLE_DEFAULT(a) = a
-# ifndef _RWSTD_NO_COMPLEX_DEFAULT_TEMPLATES
-# define _RWSTD_COMPLEX_DEFAULT(a) = a
-# define _RWSTD_COMPLEX_DEFAULT_2(a, b) = a, b
-# else
-# define _RWSTD_COMPLEX_DEFAULT(ignore) /* empty */
-# define _RWSTD_COMPLEX_DEFAULT_2(ign1, ign2) /* empty */
-# endif
-#else // if defined (_RWSTD_NO_SIMPLE_DEFAULT_TEMPLATES)
-# ifndef _RWSTD_NO_COMPLEX_DEFAULT_TEMPLATES
-# define _RWSTD_NO_COMPLEX_DEFAULT_TEMPLATES
-# endif
-# define _RWSTD_SIMPLE_DEFAULT(ignore) /* empty */
-# define _RWSTD_COMPLEX_DEFAULT(ignore) /* empty */
-# define _RWSTD_COMPLEX_DEFAULT_2(ign1, ign2) /* empty */
-# ifndef _RWSTD_NO_DEFAULT_TEMPLATES
-# define _RWSTD_NO_DEFAULT_TEMPLATES
-# endif
-#endif // _RWSTD_NO_SIMPLE_DEFAULT_TEMPLATES
-
-
// Macro for casting, using either the "old" method
// or the new C++ cast system
#ifndef _RWSTD_NO_STATIC_CAST
@@ -650,6 +624,13 @@
# define _RWSTD_ALLOCATOR
#endif
+#ifdef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
+ // disable container member function templates
+# ifndef _RWSTD_NO_CONTAINER_TEMPLATE_MEMBERS
+# define _RWSTD_NO_CONTAINER_TEMPLATE_MEMBERS
+# endif // _RWSTD_NO_CONTAINER_TEMPLATE_MEMBERS
+#endif // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
+
#define _RWSTD_MB_CUR_MAX 16 // FIXME: must be determined dynamically
@@ -1142,9 +1123,16 @@
# define _RWSTD_ASSERT(expr) \
((expr) ? (void)0 : _RW::__rw_assert_fail (#expr, __FILE__, __LINE__, 0))
# endif
+#elif defined (_RWSTD_ASSUME)
+# define _RWSTD_ASSERT(expr) _RWSTD_ASSUME (expr)
#else // if !defined (_RWSTDDEBUG)
# define _RWSTD_ASSERT(ignore) ((void)0)
#endif // _RWSTDDEBUG
+
+#ifndef _RWSTD_ASSUME
+ // must be #defined after _RWSTD_ASSERT
+# define _RWSTD_ASSUME(expr) _RWSTD_ASSERT (expr)
+#endif // _RWSTD_ASSUME
// compile-time assertion - asserts constant expressions during
// compilation with no runtime overhead; failed assertions are reported
Modified: incubator/stdcxx/trunk/include/rw/_ioinsert.h
URL: http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/rw/_ioinsert.h?rev=405930&r1=405929&r2=405930&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_ioinsert.h (original)
+++ incubator/stdcxx/trunk/include/rw/_ioinsert.h Fri May 12 16:00:54 2006
@@ -11,16 +11,22 @@
*
***************************************************************************
*
- * Copyright (c) 1994-2005 Quovadx, Inc., acting through its Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0. Unless required by
- * applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied. See the License
- * for the specific language governing permissions and limitations under
- * the License.
+ * Copyright 2005-2006 The Apache Software Foundation or its licensors,
+ * as applicable.
+ *
+ * Copyright 2003-2006 Rogue Wave Software.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*
**************************************************************************/
@@ -53,15 +59,14 @@
#ifndef _RWSTD_IOSFWD_INCLUDED
_EXPORT
-template <class _CharT,
- class _Traits _RWSTD_COMPLEX_DEFAULT (char_traits<_CharT>) >
+template <class _CharT, class _Traits = char_traits<_CharT> >
class basic_ostream;
-typedef basic_ostream<char, char_traits<char> > ostream;
+typedef basic_ostream<char> ostream;
# ifndef _RWSTD_NO_WCHAR_T
-typedef basic_ostream<wchar_t, char_traits<wchar_t> > wostream;
+typedef basic_ostream<wchar_t> wostream;
# endif // _RWSTD_NO_WCHAR_T
#endif // _RWSTD_IOSFWD_INCLUDED
Modified: incubator/stdcxx/trunk/include/rw/_ioiter.h
URL: http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/rw/_ioiter.h?rev=405930&r1=405929&r2=405930&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_ioiter.h (original)
+++ incubator/stdcxx/trunk/include/rw/_ioiter.h Fri May 12 16:00:54 2006
@@ -9,16 +9,22 @@
*
***************************************************************************
*
- * Copyright (c) 1994-2005 Quovadx, Inc., acting through its Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0. Unless required by
- * applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied. See the License
- * for the specific language governing permissions and limitations under
- * the License.
+ * Copyright 2005-2006 The Apache Software Foundation or its licensors,
+ * as applicable.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*
**************************************************************************/
@@ -39,12 +45,10 @@
#ifndef _RWSTD_IOSFWD_INCLUDED
-template <class _CharT,
- class _Traits _RWSTD_COMPLEX_DEFAULT (char_traits<_CharT>) >
+template <class _CharT, class _Traits = char_traits<_CharT> >
struct istreambuf_iterator;
-template <class _CharT,
- class _Traits _RWSTD_COMPLEX_DEFAULT (char_traits<_CharT>) >
+template <class _CharT, class _Traits = char_traits<_CharT> >
struct ostreambuf_iterator;
#endif // _RWSTD_IOSFWD_INCLUDED
Modified: incubator/stdcxx/trunk/include/rw/_iterator.h
URL: http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/rw/_iterator.h?rev=405930&r1=405929&r2=405930&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_iterator.h (original)
+++ incubator/stdcxx/trunk/include/rw/_iterator.h Fri May 12 16:00:54 2006
@@ -22,16 +22,22 @@
*
***************************************************************************
*
- * Copyright (c) 1994-2005 Quovadx, Inc., acting through its Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0. Unless required by
- * applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied. See the License
- * for the specific language governing permissions and limitations under
- * the License.
+ * Copyright 2005-2006 The Apache Software Foundation or its licensors,
+ * as applicable.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*
**************************************************************************/
@@ -86,9 +92,9 @@
#else // if defined (_RWSTD_NO_CLASS_PARTIAL_SPEC)
template <class _Iterator, class _Category, class _TypeT,
- class _Reference _RWSTD_COMPLEX_DEFAULT (_TypeT&),
- class _Pointer _RWSTD_COMPLEX_DEFAULT (_TypeT*),
- class _Distance _RWSTD_COMPLEX_DEFAULT (_RWSTD_PTRDIFF_T)>
+ class _Reference = _TypeT&,
+ class _Pointer = _TypeT*,
+ class _Distance = _RWSTD_PTRDIFF_T>
class reverse_iterator
: public iterator<_Category, _TypeT, _Distance, _Pointer, _Reference>
@@ -284,9 +290,9 @@
// or not.
template <class _Iterator, class _Category, class _TypeT,
- class _Reference _RWSTD_COMPLEX_DEFAULT (_TypeT&),
- class _Pointer _RWSTD_COMPLEX_DEFAULT (_TypeT*),
- class _Distance _RWSTD_COMPLEX_DEFAULT (_RWSTD_PTRDIFF_T) >
+ class _Reference = _TypeT&,
+ class _Pointer = _TypeT*,
+ class _Distance = _RWSTD_PTRDIFF_T>
class __reverse_bi_iterator
: public _STD::iterator<_Category, _TypeT, _Distance, _Pointer, _Reference>
{
Modified: incubator/stdcxx/trunk/include/rw/_strref.h
URL: http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/rw/_strref.h?rev=405930&r1=405929&r2=405930&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_strref.h (original)
+++ incubator/stdcxx/trunk/include/rw/_strref.h Fri May 12 16:00:54 2006
@@ -9,16 +9,22 @@
*
***************************************************************************
*
- * Copyright (c) 1994-2005 Quovadx, Inc., acting through its Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0. Unless required by
- * applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied. See the License
- * for the specific language governing permissions and limitations under
- * the License.
+ * Copyright 2005-2006 The Apache Software Foundation or its licensors,
+ * as applicable.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*
**************************************************************************/
@@ -71,9 +77,9 @@
#endif
-template< class _CharT,
- class _Traits _RWSTD_COMPLEX_DEFAULT (char_traits<_CharT>),
- class _Allocator _RWSTD_COMPLEX_DEFAULT (allocator<_CharT>) >
+template <class _CharT,
+ class _Traits = char_traits<_CharT>,
+ class _Allocator = allocator<_CharT> >
class basic_string;
Modified: incubator/stdcxx/trunk/include/set
URL: http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/set?rev=405930&r1=405929&r2=405930&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/set (original)
+++ incubator/stdcxx/trunk/include/set Fri May 12 16:00:54 2006
@@ -1,9 +1,9 @@
// -*- C++ -*-
/***************************************************************************
*
- * set - declarations for the Standard Library set class
+ * <set> - definition of the C++ Standard Library set class template
*
- * $Id: //stdlib/dev/include/set#19 $
+ * $Id$
*
***************************************************************************
*
@@ -20,16 +20,22 @@
*
***************************************************************************
*
- * Copyright (c) 1994-2005 Quovadx, Inc., acting through its Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0. Unless required by
- * applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied. See the License
- * for the specific language governing permissions and limitations under
- * the License.
+ * Copyright 2005-2006 The Apache Software Foundation or its licensors,
+ * as applicable.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*
**************************************************************************/
@@ -61,9 +67,9 @@
_RWSTD_NAMESPACE (std) {
-template <class _Key,
- class _Compare _RWSTD_COMPLEX_DEFAULT (less<_Key>),
- class _Allocator _RWSTD_COMPLEX_DEFAULT (allocator<_Key>) >
+template <class _Key,
+ class _Compare = less<_Key>,
+ class _Allocator = allocator<_Key> >
class set
{
public:
@@ -299,8 +305,8 @@
template <class _Key,
- class _Compare _RWSTD_COMPLEX_DEFAULT (less<_Key>),
- class _Allocator _RWSTD_COMPLEX_DEFAULT (allocator<_Key>) >
+ class _Compare = less<_Key>,
+ class _Allocator = allocator<_Key> >
class multiset
{
public:
Modified: incubator/stdcxx/trunk/include/sstream
URL: http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/sstream?rev=405930&r1=405929&r2=405930&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/sstream (original)
+++ incubator/stdcxx/trunk/include/sstream Fri May 12 16:00:54 2006
@@ -52,47 +52,39 @@
_EXPORT
template <class _CharT,
- class _Traits _RWSTD_COMPLEX_DEFAULT (char_traits<_CharT>),
- class _Alloc _RWSTD_COMPLEX_DEFAULT (allocator<_CharT>) >
+ class _Traits = char_traits<_CharT>,
+ class _Alloc = allocator<_CharT> >
class basic_stringbuf;
_EXPORT
template <class _CharT,
- class _Traits _RWSTD_COMPLEX_DEFAULT (char_traits<_CharT>),
- class _Alloc _RWSTD_COMPLEX_DEFAULT (allocator<_CharT>) >
+ class _Traits = char_traits<_CharT>,
+ class _Alloc = allocator<_CharT> >
class basic_istringstream;
_EXPORT
template <class _CharT,
- class _Traits _RWSTD_COMPLEX_DEFAULT (char_traits<_CharT>),
- class _Alloc _RWSTD_COMPLEX_DEFAULT (allocator<_CharT>) >
+ class _Traits = char_traits<_CharT>,
+ class _Alloc = allocator<_CharT> >
class basic_ostringstream;
_EXPORT
template <class _CharT,
- class _Traits _RWSTD_COMPLEX_DEFAULT (char_traits<_CharT>),
- class _Alloc _RWSTD_COMPLEX_DEFAULT (allocator<_CharT>) >
+ class _Traits = char_traits<_CharT>,
+ class _Alloc = allocator<_CharT> >
class basic_stringstream;
-typedef basic_stringbuf<char, char_traits<char>, allocator<char> >
- stringbuf;
-typedef basic_istringstream<char, char_traits<char>, allocator<char> >
- istringstream;
-typedef basic_ostringstream<char, char_traits<char>, allocator<char> >
- ostringstream;
-typedef basic_stringstream<char, char_traits<char>, allocator<char> >
- stringstream;
+typedef basic_stringbuf<char> stringbuf;
+typedef basic_istringstream<char> istringstream;
+typedef basic_ostringstream<char> ostringstream;
+typedef basic_stringstream<char> stringstream;
# ifndef _RWSTD_NO_WCHAR_T
-typedef basic_stringbuf<wchar_t, char_traits<wchar_t>, allocator<wchar_t> >
- wstringbuf;
-typedef basic_istringstream<wchar_t, char_traits<wchar_t>, allocator<wchar_t> >
- wistringstream;
-typedef basic_ostringstream<wchar_t, char_traits<wchar_t>, allocator<wchar_t> >
- wostringstream;
-typedef basic_stringstream<wchar_t, char_traits<wchar_t>, allocator<wchar_t> >
- wstringstream;
+typedef basic_stringbuf<wchar_t> wstringbuf;
+typedef basic_istringstream<wchar_t> wistringstream;
+typedef basic_ostringstream<wchar_t> wostringstream;
+typedef basic_stringstream<wchar_t> wstringstream;
# endif // _RWSTD_NO_WCHAR_T
#endif // _RWSTD_IOSFWD_INCLUDED
@@ -431,17 +423,13 @@
#if _RWSTD_INSTANTIATE (_BASIC_STRINGBUF, _CHAR)
-_RWSTD_INSTANTIATE_3 (class _RWSTD_EXPORT
- basic_stringbuf<char, char_traits<char>,
- allocator<char> >);
+_RWSTD_INSTANTIATE_1 (class _RWSTD_EXPORT basic_stringbuf<char>);
#endif // _RWSTD_INSTANTIATE (_BASIC_STRINGBUF, _CHAR)
#if _RWSTD_INSTANTIATE (_BASIC_STRINGBUF, _WCHAR_T)
-_RWSTD_INSTANTIATE_3 (class _RWSTD_EXPORT
- basic_stringbuf<wchar_t, char_traits<wchar_t>,
- allocator<wchar_t> >);
+_RWSTD_INSTANTIATE_1 (class _RWSTD_EXPORT basic_stringbuf<wchar_t>);
#endif // _RWSTD_INSTANTIATE (_BASIC_STRINGBUF, _WCHAR_T)
Modified: incubator/stdcxx/trunk/include/stack
URL: http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/stack?rev=405930&r1=405929&r2=405930&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/stack (original)
+++ incubator/stdcxx/trunk/include/stack Fri May 12 16:00:54 2006
@@ -1,9 +1,9 @@
// -*- C++ -*-
/***************************************************************************
*
- * stack - Declaration of the C++ Standard Library stack class template
+ * <stack> - definition of the C++ Standard Library stack class template
*
- * $Id: //stdlib/dev/include/stack#13 $
+ * $Id$
*
***************************************************************************
*
@@ -20,16 +20,22 @@
*
***************************************************************************
*
- * Copyright (c) 1994-2005 Quovadx, Inc., acting through its Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0. Unless required by
- * applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied. See the License
- * for the specific language governing permissions and limitations under
- * the License.
+ * Copyright 2006 The Apache Software Foundation or its licensors,
+ * as applicable.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*
**************************************************************************/
@@ -43,8 +49,7 @@
_RWSTD_NAMESPACE (std) {
-template <class _TypeT,
- class _Container _RWSTD_COMPLEX_DEFAULT (deque<_TypeT>) >
+template <class _TypeT, class _Container = deque<_TypeT> >
class stack;
Modified: incubator/stdcxx/trunk/include/streambuf
URL: http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/streambuf?rev=405930&r1=405929&r2=405930&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/streambuf (original)
+++ incubator/stdcxx/trunk/include/streambuf Fri May 12 16:00:54 2006
@@ -1,22 +1,28 @@
// -*- C++ -*-
/***************************************************************************
*
- * streambuf - Declarations for the Standard Library stream buffers
+ * <streambuf> - definition of the C++ Standard Library streambuf template
*
* $Id$
*
***************************************************************************
*
- * Copyright (c) 1994-2005 Quovadx, Inc., acting through its Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0. Unless required by
- * applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied. See the License
- * for the specific language governing permissions and limitations under
- * the License.
+ * Copyright 2006 The Apache Software Foundation or its licensors,
+ * as applicable.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*
**************************************************************************/
@@ -39,15 +45,14 @@
#ifndef _RWSTD_IOSFWD_INCLUDED
_EXPORT
-template <class _CharT,
- class _Traits _RWSTD_COMPLEX_DEFAULT (char_traits<_CharT>) >
+template <class _CharT, class _Traits = char_traits<_CharT> >
class basic_streambuf;
-typedef basic_streambuf<char, char_traits<char> > streambuf;
+typedef basic_streambuf<char> streambuf;
# ifndef _RWSTD_NO_WCHAR_T
-typedef basic_streambuf<wchar_t, char_traits<wchar_t> > wstreambuf;
+typedef basic_streambuf<wchar_t> wstreambuf;
# endif // _RWSTD_NO_WCHAR_T
#endif // _RWSTD_IOSFWD_INCLUDED
@@ -538,15 +543,13 @@
#if _RWSTD_INSTANTIATE (_BASIC_STREAMBUF, _CHAR)
-_RWSTD_INSTANTIATE_2 (class _RWSTD_EXPORT
- basic_streambuf<char, char_traits<char> >);
+_RWSTD_INSTANTIATE_1 (class _RWSTD_EXPORT basic_streambuf<char>);
#endif // _RWSTD_INSTANTIATE (_BASIC_STREAMBUF, _CHAR)
#if _RWSTD_INSTANTIATE (_BASIC_STREAMBUF, _WCHAR_T)
-_RWSTD_INSTANTIATE_2 (class _RWSTD_EXPORT
- basic_streambuf<wchar_t, char_traits<wchar_t> >);
+_RWSTD_INSTANTIATE_1 (class _RWSTD_EXPORT basic_streambuf<wchar_t>);
#endif // _RWSTD_INSTANTIATE (_BASIC_STREAMBUF, _WCHAR_T)
Modified: incubator/stdcxx/trunk/include/vector
URL: http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/vector?rev=405930&r1=405929&r2=405930&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/vector (original)
+++ incubator/stdcxx/trunk/include/vector Fri May 12 16:00:54 2006
@@ -1,7 +1,7 @@
// -*- C++ -*-
/***************************************************************************
*
- * vector - declarations for the Standard Library vector class
+ * <vector> - dfefinition of the C++ Standard Library vector class template
*
* $Id$
*
@@ -20,16 +20,22 @@
*
***************************************************************************
*
- * Copyright (c) 1994-2005 Quovadx, Inc., acting through its Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0. Unless required by
- * applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied. See the License
- * for the specific language governing permissions and limitations under
- * the License.
+ * Copyright 2006 The Apache Software Foundation or its licensors,
+ * as applicable.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*
**************************************************************************/
@@ -48,8 +54,7 @@
_RWSTD_NAMESPACE (std) {
_EXPORT
-template <class _TypeT,
- class _Allocator _RWSTD_COMPLEX_DEFAULT(allocator<_TypeT>) >
+template <class _TypeT, class _Allocator = allocator<_TypeT> >
class vector;
#ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES