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 00:43:00 UTC
svn commit: r405916 - in /incubator/stdcxx/trunk/include/rw: _iterbase.h
_streamiter.h
Author: sebor
Date: Fri May 12 15:42:59 2006
New Revision: 405916
URL: http://svn.apache.org/viewcvs?rev=405916&view=rev
Log:
2006-05-12 Martin Sebor <se...@roguewave.com>
* _iterbase.h (iterator): Removed uses of the _RWSTD_SIMPLE_DEFAULT
macro (no longer detected).
* _streamiter.h (istream_iterator, ostream_iterator): Same.
Modified:
incubator/stdcxx/trunk/include/rw/_iterbase.h
incubator/stdcxx/trunk/include/rw/_streamiter.h
Modified: incubator/stdcxx/trunk/include/rw/_iterbase.h
URL: http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/rw/_iterbase.h?rev=405916&r1=405915&r2=405916&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_iterbase.h (original)
+++ incubator/stdcxx/trunk/include/rw/_iterbase.h Fri May 12 15:42:59 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.
*
**************************************************************************/
@@ -94,9 +100,9 @@
// 24.3.2 - Basic iterator
template <class _Category, class _TypeT,
- class _Distance _RWSTD_SIMPLE_DEFAULT (_RWSTD_PTRDIFF_T),
- class _Pointer _RWSTD_SIMPLE_DEFAULT (_TypeT*),
- class _Reference _RWSTD_SIMPLE_DEFAULT (_TypeT&)>
+ class _Distance = _RWSTD_PTRDIFF_T,
+ class _Pointer = _TypeT*,
+ class _Reference = _TypeT&>
struct iterator
{
typedef _TypeT value_type;
Modified: incubator/stdcxx/trunk/include/rw/_streamiter.h
URL: http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/rw/_streamiter.h?rev=405916&r1=405915&r2=405916&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_streamiter.h (original)
+++ incubator/stdcxx/trunk/include/rw/_streamiter.h Fri May 12 15:42:59 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.
*
**************************************************************************/
@@ -45,10 +51,9 @@
// 24.5.1
#if !defined (_MSC_VER) || _MSC_VER > 1300
-template <class _TypeT,
- class _CharT _RWSTD_SIMPLE_DEFAULT (char),
- class _Traits _RWSTD_COMPLEX_DEFAULT (char_traits<_CharT>),
- class _Distance _RWSTD_COMPLEX_DEFAULT (_RWSTD_PTRDIFF_T)>
+template <class _TypeT, class _CharT = char,
+ class _Traits = char_traits<_CharT>,
+ class _Distance = _RWSTD_PTRDIFF_T>
#else
// prevent MSVC 6.0 ICE
@@ -130,9 +135,8 @@
// 24.5.2
-template <class _TypeT,
- class _CharT _RWSTD_SIMPLE_DEFAULT (char),
- class _Traits _RWSTD_COMPLEX_DEFAULT (char_traits<_CharT>) >
+template <class _TypeT, class _CharT = char,
+ class _Traits = char_traits<_CharT> >
struct ostream_iterator: iterator<output_iterator_tag, void, void, void, void>
{
typedef _CharT char_type;