You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stdcxx.apache.org by fa...@apache.org on 2007/05/15 16:24:02 UTC
svn commit: r538186 - in /incubator/stdcxx/trunk: etc/config/src/ include/
include/loc/ include/rw/ tests/algorithms/ tests/containers/ tests/include/
tests/utilities/
Author: faridz
Date: Tue May 15 07:23:59 2007
New Revision: 538186
URL: http://svn.apache.org/viewvc?view=rev&rev=538186
Log:
2007-05-15 Farid Zaripov <Fa...@epam.com>
* NONDEDUCED_CONTEXT.cpp: Removed macro _RWSTD_NO_INLINE_MEMBER_TEMPLATES.
Updated copyright notice.
* bitset: Ditto
* deque: Ditto
* iomanip: Ditto
* list: Ditto
* _locale.h: Ditto
* map: Ditto
* queue: Ditto
* _algobase.h: Ditto
* _defs.h: Ditto
* _pair.h: Ditto
* _tree.h: Ditto
* set: Ditto
* string: Ditto
* string.cc: Ditto
* vector: Ditto
* 25.random.shuffle.cpp: Ditto
* 23.deque.modifiers.cpp: Ditto
* 23.vector.cons.cpp: Ditto
* 23.vector.modifiers.cpp: Ditto
* rw_allocator.h: Ditto
* 20.pairs.cpp: Ditto
Modified:
incubator/stdcxx/trunk/etc/config/src/NONDEDUCED_CONTEXT.cpp
incubator/stdcxx/trunk/include/bitset
incubator/stdcxx/trunk/include/deque
incubator/stdcxx/trunk/include/iomanip
incubator/stdcxx/trunk/include/list
incubator/stdcxx/trunk/include/loc/_locale.h
incubator/stdcxx/trunk/include/map
incubator/stdcxx/trunk/include/queue
incubator/stdcxx/trunk/include/rw/_algobase.h
incubator/stdcxx/trunk/include/rw/_defs.h
incubator/stdcxx/trunk/include/rw/_pair.h
incubator/stdcxx/trunk/include/rw/_tree.h
incubator/stdcxx/trunk/include/set
incubator/stdcxx/trunk/include/string
incubator/stdcxx/trunk/include/string.cc
incubator/stdcxx/trunk/include/vector
incubator/stdcxx/trunk/tests/algorithms/25.random.shuffle.cpp
incubator/stdcxx/trunk/tests/containers/23.deque.modifiers.cpp
incubator/stdcxx/trunk/tests/containers/23.vector.cons.cpp
incubator/stdcxx/trunk/tests/containers/23.vector.modifiers.cpp
incubator/stdcxx/trunk/tests/include/rw_allocator.h
incubator/stdcxx/trunk/tests/utilities/20.pairs.cpp
Modified: incubator/stdcxx/trunk/etc/config/src/NONDEDUCED_CONTEXT.cpp
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/src/NONDEDUCED_CONTEXT.cpp?view=diff&rev=538186&r1=538185&r2=538186
==============================================================================
--- incubator/stdcxx/trunk/etc/config/src/NONDEDUCED_CONTEXT.cpp (original)
+++ incubator/stdcxx/trunk/etc/config/src/NONDEDUCED_CONTEXT.cpp Tue May 15 07:23:59 2007
@@ -38,8 +38,6 @@
}
-#ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
template <class T>
struct B
{
@@ -56,5 +54,3 @@
b.baz (a, ' ');
}
-
-#endif // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
Modified: incubator/stdcxx/trunk/include/bitset
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/bitset?view=diff&rev=538186&r1=538185&r2=538186
==============================================================================
--- incubator/stdcxx/trunk/include/bitset (original)
+++ incubator/stdcxx/trunk/include/bitset Tue May 15 07:23:59 2007
@@ -7,22 +7,23 @@
*
***************************************************************************
*
- * Copyright 2005-2006 The Apache Software Foundation or its licensors,
- * as applicable.
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you 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
*
- * 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
+ * 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.
+ * 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 1994-2006 Rogue Wave Software.
*
**************************************************************************/
@@ -108,8 +109,6 @@
_C_elembits - _Size % _C_elembits) % _C_elembits));
}
-#ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
template <class _CharT, class _Traits>
void _C_from_char (const _CharT *__str, _RWSTD_SIZE_T __len,
const _Traits *__traits, _CharT __b0, _CharT __b1,
@@ -120,32 +119,6 @@
__pos, __n, __file, __fun);
}
-#else // ifdef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
- void _C_from_char (const char *__str, _RWSTD_SIZE_T __len,
- const char_traits<char>* __traits, char __b0, char __b1,
- _RWSTD_SIZE_T __pos, _RWSTD_SIZE_T __n,
- const char *__file, const char *__fun) {
- _RW::__rw_bitset (_C_bits, _Size, __str, __len,
- __traits, __b0, __b1,
- __pos, __n, __file, __fun);
- }
-
-# ifndef _RWSTD_NO_WCHAR_T
-
- void _C_from_char (const wchar_t *__str, _RWSTD_SIZE_T __len,
- const char_traits<wchar_t*> __traits,
- wchar_t __b0, wchar_t __b1,
- _RWSTD_SIZE_T __pos, _RWSTD_SIZE_T __n,
- const char *__file, const char *__fun) {
- _RW::__rw_bitset (_C_bits, _Size, __str, __len,
- __traits, __b0, __b1,
- __pos, __n, __file, __fun);
- }
-
-# endif // _RWSTD_NO_WCHAR_T
-#endif // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
public:
class reference {
@@ -189,10 +162,8 @@
_C_from_ulong (__n);
}
-#ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
-# if !defined (_RWSTD_NO_NONDEDUCED_CONTEXT) \
- && (!defined (__SUNPRO_CC) || __SUNPRO_CC > 0x550)
+#if !defined (_RWSTD_NO_NONDEDUCED_CONTEXT) \
+ && (!defined (__SUNPRO_CC) || __SUNPRO_CC > 0x550)
// 23.3.5.1, p3
template <class _CharT, class _Traits, class _Allocator>
@@ -210,7 +181,7 @@
"size_type, size_type)"));
}
-# else // if defined (_RWSTD_NO_NONDEDUCED_CONTEXT)
+#else // if defined (_RWSTD_NO_NONDEDUCED_CONTEXT)
// working around a SunPro 5.5 and prior bug (PR #28992)
@@ -226,8 +197,7 @@
"size_t, size_t)"));
}
-# endif // _RWSTD_NO_NONDEDUCED_CONTEXT
-#endif // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
+#endif // _RWSTD_NO_NONDEDUCED_CONTEXT
#ifndef _RWSTD_NO_EXT_BITSET_CTOR_STRING
@@ -290,8 +260,6 @@
# endif // _RWSTD_NO_WCHAR_T
-# ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
// extension:
// uses char_traits<CharT>::length() to compute the length of the string
// and char_traits<CharT>::eq() to compare characters with `b0' and `b1'
@@ -306,8 +274,6 @@
"size_t, size_t)"));
}
-#endif // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
// extensions:
// prevent ambiguities between the above and bitset(unsigned long)
bitset (int __n) _THROWS (()) {
@@ -420,8 +386,7 @@
# define _RWSTD_BITSET_TO_STRING(charT, Traits) \
template to_string<charT, Traits, allocator <charT> >()
-# if !defined (_RWSTD_NO_EXT_BITSET_TO_STRING) \
- && !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)
+# ifndef _RWSTD_NO_EXT_BITSET_TO_STRING
// convenience extensions
template <class _CharT, class _Traits>
@@ -443,7 +408,7 @@
(__b0, __b1);
}
-# endif // !_NO_EXT_BITSET_TO_STRING && !NO_INLINE_MEMBER_TEMPLATES
+# endif // !_NO_EXT_BITSET_TO_STRING
#else // if _MEMBER_TEMPLATES || _NO_TEMPLATE_ON_RETURN_TYPE || ...
Modified: incubator/stdcxx/trunk/include/deque
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/deque?view=diff&rev=538186&r1=538185&r2=538186
==============================================================================
--- incubator/stdcxx/trunk/include/deque (original)
+++ incubator/stdcxx/trunk/include/deque Tue May 15 07:23:59 2007
@@ -58,8 +58,7 @@
template <class _TypeT, class _Allocator = allocator<_TypeT> >
class deque;
-#ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-# ifdef _RWSTD_NO_MEMBER_TEMPLATES
+#ifdef _RWSTD_NO_MEMBER_TEMPLATES
// declarations of non-member function templates implementing
// the functionality of deque member function templates
@@ -84,8 +83,7 @@
void __rw_insert_range (deque<_TypeT, _Allocator>*, _DequeIter,
_BidirIter, _BidirIter, bidirectional_iterator_tag);
-# endif // _RWSTD_NO_MEMBER_TEMPLATES
-#endif // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
+#endif // _RWSTD_NO_MEMBER_TEMPLATES
template <class _TypeT, class _DiffT, class _Pointer,
@@ -442,8 +440,6 @@
assign (__n, __x);
}
-#ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
template <class _InputIter>
deque (_InputIter __first, _InputIter __last,
const allocator_type &__alloc = allocator_type ())
@@ -452,26 +448,6 @@
assign (__first, __last);
}
-#else // if defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)
-
- deque (const_iterator __first, const_iterator __last,
- const allocator_type &__alloc = allocator_type ())
- : allocator_type (__alloc) {
- _RWSTD_ASSERT_RANGE (__first, __last);
- _C_init ();
- assign (__first, __last);
- }
-
- deque (const_pointer __first, const_pointer __last,
- const allocator_type &__alloc = allocator_type ())
- : allocator_type (__alloc) {
- _RWSTD_ASSERT_RANGE (__first, __last);
- _C_init ();
- assign (__first, __last);
- }
-
-#endif // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
deque (const deque &__rhs)
: allocator_type (__rhs.get_allocator ()) {
_C_init ();
@@ -484,22 +460,12 @@
deque& operator= (const deque&);
-#ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
template <class _InputIter>
void assign (_InputIter __first, _InputIter __last) {
// dispatch either to a range assign or to an assign with repetition
_C_assign (__first, __last, _RWSTD_DISPATCH (_InputIter));
}
-#else // if defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)
-
- void assign (const_iterator, const_iterator);
-
- void assign (const_pointer, const_pointer);
-
-#endif // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
void assign (size_type __n, const_reference __x) {
_C_assign_n (__n, __x);
}
@@ -615,27 +581,11 @@
_C_insert_n (__it, __n, __x);
}
-#ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
template <class _InputIter>
void insert (iterator __it, _InputIter __first, _InputIter __last) {
_C_insert (__it, __first, __last, _RWSTD_DISPATCH (_InputIter));
}
-#else // if defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)
-
- void insert (iterator __it,
- const_pointer __first, const_pointer __last) {
- _RWSTD_INSERT_RANGE (__it, __first, __last);
- }
-
- void insert (iterator __it,
- const_iterator __first, const_iterator __last) {
- _RWSTD_INSERT_RANGE (__it, __first, __last);
- }
-
-#endif // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
void pop_front ();
void pop_back ();
@@ -755,8 +705,6 @@
#endif // _RWSTD_NO_MEMBER_TEMPLATES
-#ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
// implements range assign
template <class _InputIter>
void _C_assign (_InputIter __first, _InputIter __last, void*) {
@@ -795,8 +743,6 @@
// see 23.1.1, p9 and DR 438
_C_insert_n (__it, __n, __x);
}
-
-#endif // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
bool _C_is_valid (int = -1) const;
Modified: incubator/stdcxx/trunk/include/iomanip
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/iomanip?view=diff&rev=538186&r1=538185&r2=538186
==============================================================================
--- incubator/stdcxx/trunk/include/iomanip (original)
+++ incubator/stdcxx/trunk/include/iomanip Tue May 15 07:23:59 2007
@@ -7,16 +7,23 @@
*
***************************************************************************
*
- * 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.
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you 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 1994-2005 Rogue Wave Software.
*
**************************************************************************/
@@ -92,24 +99,11 @@
template <class _CharT>
struct __rw_setfill
{
-#ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
template <class _Traits>
void operator() (_STD::basic_ios<_CharT, _Traits> &__strm,
_CharT __ch) const {
__strm.fill (__ch);
}
-
-#else // if defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)
-
- typedef _STD::basic_ios<_CharT, _STD::char_traits<_CharT> > _BasicIos;
-
- void operator() (_BasicIos &__strm, _CharT __ch) const {
- __strm.fill (__ch);
- }
-
-#endif // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
};
Modified: incubator/stdcxx/trunk/include/list
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/list?view=diff&rev=538186&r1=538185&r2=538186
==============================================================================
--- incubator/stdcxx/trunk/include/list (original)
+++ incubator/stdcxx/trunk/include/list Tue May 15 07:23:59 2007
@@ -394,8 +394,7 @@
_C_init (__n, __x);
}
-#if !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES) \
- && (!defined (_MSC_VER) || _MSC_VER >= 1300)
+#if !defined (_MSC_VER) || _MSC_VER >= 1300
template<class _InputIterator>
void _C_init (_InputIterator __first, _InputIterator __last, void*) {
@@ -419,7 +418,7 @@
_C_init (__first, __last, _RWSTD_DISPATCH (_InputIterator));
}
-#else // if defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)
+#else // if _MSC_VER < 1300
list (const_iterator __first, const_iterator __last,
const allocator_type& __alloc = allocator_type ())
@@ -439,7 +438,7 @@
_RWSTD_LIST_INSERT_RANGE (begin (), __first, __last);
}
-#endif // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
+#endif // !defined (_MSC_VER) || _MSC_VER >= 1300
list (const list &__rhs)
: allocator_type(__rhs.get_allocator()), _RWSTD_NODE_BUFFER_INIT(0,0)
@@ -452,8 +451,7 @@
list& operator= (const list&);
-#if !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES) \
- && (!defined (_MSC_VER) || _MSC_VER >= 1300)
+#if !defined (_MSC_VER) || _MSC_VER >= 1300
template<class _InputIterator>
void assign (_InputIterator __first, _InputIterator __last) {
@@ -469,7 +467,7 @@
insert (begin (), __n, __val);
}
-#else
+#else // if _MSC_VER < 1300
void assign (const_iterator __first, const_iterator __last) {
_RWSTD_ASSERT_RANGE (__first, __last);
@@ -490,7 +488,7 @@
insert (begin (), __n, __val);
}
-#endif // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
+#endif // !defined (_MSC_VER) || _MSC_VER >= 1300
allocator_type get_allocator () const {
return *this;
@@ -588,8 +586,7 @@
iterator insert (iterator __it, const_reference __x);
-#if !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES) \
- && (!defined (_MSC_VER) || _MSC_VER >= 1300)
+#if !defined (_MSC_VER) || _MSC_VER >= 1300
// handles nonintegral types
template<class _InputIterator>
@@ -628,7 +625,7 @@
_C_insert (__it, __n, __val);
}
-#else // if defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)
+#else // if _MSC_VER < 1300
void insert (iterator __it, size_type __n, const_reference __x) {
_RWSTD_ASSERT_RANGE (begin (), __it);
@@ -645,7 +642,7 @@
_RWSTD_LIST_SAFE_INSERT_RANGE (__it, __first, __last);
}
-#endif // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
+#endif // !defined (_MSC_VER) || _MSC_VER >= 1300
iterator erase (iterator);
Modified: incubator/stdcxx/trunk/include/loc/_locale.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/loc/_locale.h?view=diff&rev=538186&r1=538185&r2=538186
==============================================================================
--- incubator/stdcxx/trunk/include/loc/_locale.h (original)
+++ incubator/stdcxx/trunk/include/loc/_locale.h Tue May 15 07:23:59 2007
@@ -9,16 +9,23 @@
*
***************************************************************************
*
- * 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.
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you 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 1994-2005 Rogue Wave Software.
*
**************************************************************************/
@@ -185,7 +192,7 @@
template <class _Facet>
locale combine (const locale&) const;
-#endif // _RWSTD_NO_TEMPLATE_ON_RETURN_TYPE
+# endif // _RWSTD_NO_TEMPLATE_ON_RETURN_TYPE
// 22.1.1.4, p3
template <class _CharT, class _Traits, class _Allocator>
@@ -194,8 +201,6 @@
#else // if defined (_RWSTD_NO_MEMBER_TEMPLATES)
-# ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
template <class _Facet>
locale (const locale &__rhs, _Facet *__facet)
: _C_body (0) {
@@ -218,7 +223,7 @@
*this = locale (*__rhs._C_body, __facet);
}
-# ifndef _RWSTD_NO_TEMPLATE_ON_RETURN_TYPE
+# ifndef _RWSTD_NO_TEMPLATE_ON_RETURN_TYPE
template <class _Facet>
locale combine (const locale &__rhs) const {
@@ -232,7 +237,7 @@
return locale (__rhs, &use_facet<_Facet>(__rhs));
}
-# endif // _RWSTD_NO_TEMPLATE_ON_RETURN_TYPE
+# endif // _RWSTD_NO_TEMPLATE_ON_RETURN_TYPE
template <class _CharT, class _Traits, class _Allocator>
bool
@@ -244,7 +249,6 @@
__y.data (), __y.data () + __y.length ()) < 0;
}
-# endif // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
#endif // _RWSTD_NO_MEMBER_TEMPLATES
Modified: incubator/stdcxx/trunk/include/map
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/map?view=diff&rev=538186&r1=538185&r2=538186
==============================================================================
--- incubator/stdcxx/trunk/include/map (original)
+++ incubator/stdcxx/trunk/include/map Tue May 15 07:23:59 2007
@@ -124,8 +124,7 @@
: _C_rep (__cmp, __alloc) { }
-#if !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES) \
- && (!defined (_MSC_VER) || _MSC_VER >= 1300)
+#if !defined (_MSC_VER) || _MSC_VER >= 1300
// 23.3.1.1, p3
template <class _InputIter>
@@ -134,7 +133,7 @@
const _Allocator& __alloc = _Allocator ())
: _C_rep (__first, __last, __cmp, __alloc, false) { }
-#else // if defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)
+#else // if _MSC_VER < 1300
map (const value_type* __first, const value_type* __last,
const key_compare &__cmp = key_compare (),
@@ -146,7 +145,7 @@
const allocator_type &__alloc = allocator_type ())
: _C_rep (__first, __last, __cmp, __alloc, false) { }
-#endif // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
+#endif // !defined (_MSC_VER) || _MSC_VER >= 1300
map (const map &__rhs): _C_rep (__rhs._C_rep) { /* empty */ }
@@ -217,15 +216,14 @@
return _C_rep.insert (__it, __x, false);
}
-#if !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES) \
- && (!defined (_MSC_VER) || _MSC_VER >= 1300)
+#if !defined (_MSC_VER) || _MSC_VER >= 1300
template<class _InputIter>
void insert (_InputIter __first, _InputIter __last) {
_C_rep.insert (__first, __last, false);
}
-#else // if defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)
+#else // if _MSC_VER < 1300
void insert (const value_type* __first, const value_type* __last) {
_C_rep.insert (__first, __last, false);
@@ -235,7 +233,7 @@
_C_rep.insert (__first, __last, false);
}
-#endif // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
+#endif // !defined (_MSC_VER) || _MSC_VER >= 1300
void erase (iterator __it) {
@@ -364,8 +362,7 @@
const allocator_type &__alloc = allocator_type ())
: _C_rep (__cmp, __alloc) { }
-#if !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES) \
- && (!defined (_MSC_VER) || _MSC_VER >= 1300)
+#if !defined (_MSC_VER) || _MSC_VER >= 1300
template<class _InputIter>
multimap (_InputIter __first, _InputIter __last,
@@ -373,7 +370,7 @@
const _Allocator& __alloc = _Allocator ())
: _C_rep (__first, __last, __cmp, __alloc, true) { }
-#else // if defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)
+#else // if _MSC_VER < 1300
multimap (const value_type* __first, const value_type* __last,
const key_compare &__cmp = key_compare (),
@@ -385,7 +382,7 @@
const allocator_type &__alloc = allocator_type ())
: _C_rep (__first, __last, __cmp, __alloc, true) { }
-#endif // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
+#endif // !defined (_MSC_VER) || _MSC_VER >= 1300
multimap (const multimap &__rhs)
@@ -451,15 +448,14 @@
return _C_rep.insert (__it, __x, true);
}
-#if !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES) \
- && (!defined (_MSC_VER) || _MSC_VER >= 1300)
+#if !defined (_MSC_VER) || _MSC_VER >= 1300
template<class _InputIter>
void insert (_InputIter __first, _InputIter __last) {
_C_rep.insert (__first, __last, true);
}
-#else // if defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)
+#else // if _MSC_VER < 1300
void insert (const value_type* __first, const value_type* __last) {
_C_rep.insert (__first, __last, true);
@@ -469,7 +465,7 @@
_C_rep.insert (__first, __last, true);
}
-#endif // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
+#endif // !defined (_MSC_VER) || _MSC_VER >= 1300
void erase (iterator __it) {
Modified: incubator/stdcxx/trunk/include/queue
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/queue?view=diff&rev=538186&r1=538185&r2=538186
==============================================================================
--- incubator/stdcxx/trunk/include/queue (original)
+++ incubator/stdcxx/trunk/include/queue Tue May 15 07:23:59 2007
@@ -7,6 +7,26 @@
*
***************************************************************************
*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you 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 1994-2006 Rogue Wave Software.
+ *
+ ***************************************************************************
+ *
* Copyright (c) 1994
* Hewlett-Packard Company
*
@@ -18,25 +38,6 @@
* representations about the suitability of this software for any
* purpose. It is provided "as is" without express or implied warranty.
*
- ***************************************************************************
- *
- * 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.
- *
**************************************************************************/
#ifndef _RWSTD_QUEUE_INCLUDED
@@ -199,8 +200,6 @@
_STD::make_heap (c.begin (), c.end (), comp);
}
-#ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
template <class _InputIter>
priority_queue (_InputIter __first, _InputIter __last,
const _Compare &__cmp = _Compare (),
@@ -209,19 +208,6 @@
c.insert (c.end (), __first, __last);
_STD::make_heap (c.begin (), c.end (), comp);
}
-
-#else // if defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)
-
- priority_queue (_TYPENAME _Container::const_iterator __first,
- _TYPENAME _Container::const_iterator __last,
- const _Compare &__cmp = _Compare (),
- const _Container &__c = container_type ())
- : c (__c), comp (__cmp) {
- c.insert (c.end (), __first, __last);
- _STD::make_heap (c.begin (), c.end (), comp);
- }
-
-#endif // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
bool empty () const {
return c.empty ();
Modified: incubator/stdcxx/trunk/include/rw/_algobase.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/rw/_algobase.h?view=diff&rev=538186&r1=538185&r2=538186
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_algobase.h (original)
+++ incubator/stdcxx/trunk/include/rw/_algobase.h Tue May 15 07:23:59 2007
@@ -10,6 +10,26 @@
*
***************************************************************************
*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you 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 1994-2005 Rogue Wave Software.
+ *
+ ***************************************************************************
+ *
* Copyright (c) 1994
* Hewlett-Packard Company
*
@@ -21,19 +41,6 @@
* representations about the suitability of this software for any
* purpose. It is provided "as is" without express or implied warranty.
*
- ***************************************************************************
- *
- * 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.
- *
**************************************************************************/
#ifndef _RWSTD_RW_ALGOBASE_H_INCLUDED
@@ -130,8 +137,6 @@
_RWSTD_NAMESPACE (__rw) {
-#ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
// `less than' function object - used by non-predicate forms
// of algorithms to invoke the predicate forms for code reuse
struct __rw_lt
@@ -146,35 +151,6 @@
};
# define _RWSTD_LESS(ignore) _RW::__rw_lt ()
-
-#else // if defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)
-
-template <class _TypeT>
-struct __rw_lt
-{
- bool operator() (const _TypeT &__lhs, const _TypeT &__rhs) const {
- return __lhs < __rhs;
- }
-};
-
-# ifndef _RWSTD_NO_CLASS_PARTIAL_SPEC
-
-# define _RWSTD_LESS(iterT) \
- _RW::__rw_lt<_TYPENAME _STD::iterator_traits< iterT >::value_type>()
-
-# else // if defined (_RWSTD_NO_PARTIAL_CLASS_SPEC)
-
-# define _RWSTD_LESS(iterT) \
- _RW::__rw_make_lt (_RWSTD_VALUE_TYPE (iterT))
-
-template <class _TypeT>
-__rw_lt<_TypeT> __rw_make_lt (const _TypeT*)
-{
- return __rw_lt<_TypeT>();
-}
-
-# endif // _RWSTD_NO_PARTIAL_CLASS_SPEC
-#endif // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
// swaps values of 2 (possibly distinct) types
Modified: incubator/stdcxx/trunk/include/rw/_defs.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/rw/_defs.h?view=diff&rev=538186&r1=538185&r2=538186
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_defs.h (original)
+++ incubator/stdcxx/trunk/include/rw/_defs.h Tue May 15 07:23:59 2007
@@ -619,18 +619,10 @@
// If compiler supports member and default templates then it supports
// the _RWSTD_ALLOCATOR
//
-#if !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES) \
- && !defined (_RWSTD_NO_SIMPLE_DEFAULT_TEMPLATES) \
+#if !defined (_RWSTD_NO_SIMPLE_DEFAULT_TEMPLATES) \
&& (!defined (_MSC_VER) || _MSC_VER >= 1300)
# 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
Modified: incubator/stdcxx/trunk/include/rw/_pair.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/rw/_pair.h?view=diff&rev=538186&r1=538185&r2=538186
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_pair.h (original)
+++ incubator/stdcxx/trunk/include/rw/_pair.h Tue May 15 07:23:59 2007
@@ -7,6 +7,26 @@
*
***************************************************************************
*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you 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 1994-2005 Rogue Wave Software.
+ *
+ ***************************************************************************
+ *
* Copyright (c) 1994
* Hewlett-Packard Company
*
@@ -18,19 +38,6 @@
* representations about the suitability of this software for any
* purpose. It is provided "as is" without express or implied warranty.
*
- ***************************************************************************
- *
- * 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.
- *
**************************************************************************/
#ifndef _RWSTD_RW_PAIR_H_INCLUDED
@@ -67,8 +74,6 @@
pair (const first_type &__x, const second_type &__y)
: first (__x), second (__y) { }
-#ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
// 20.2.2, p4
template <class _TypeX, class _TypeY>
pair (const pair <_TypeX, _TypeY> &__rhs)
@@ -79,8 +84,6 @@
pair<_TypeT, _TypeU>& operator= (const pair <_TypeX, _TypeY> &__rhs) {
return first = __rhs.first, second = __rhs.second, *this;
}
-
-#endif // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
};
Modified: incubator/stdcxx/trunk/include/rw/_tree.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/rw/_tree.h?view=diff&rev=538186&r1=538185&r2=538186
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_tree.h (original)
+++ incubator/stdcxx/trunk/include/rw/_tree.h Tue May 15 07:23:59 2007
@@ -9,6 +9,26 @@
*
***************************************************************************
*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you 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 1994-2006 Rogue Wave Software.
+ *
+ ***************************************************************************
+ *
* Copyright (c) 1994
* Hewlett-Packard Company
*
@@ -20,25 +40,6 @@
* representations about the suitability of this software for any
* purpose. It is provided "as is" without express or implied warranty.
*
- ***************************************************************************
- *
- * 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.
- *
**************************************************************************/
/***************************************************************************
@@ -151,15 +152,14 @@
__rw_tree_iter (const _C_iterator &__rhs)
: _C_node (__rhs._C_node) { }
-#if !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES) \
- && (!defined (_MSC_VER) || _MSC_VER >= 1300)
+#if !defined (_MSC_VER) || _MSC_VER >= 1300
template <class _Ptr, class _Ref>
__rw_tree_iter (const __rw_tree_iter<_TypeT, _DiffT, _Ptr, _Ref, _Node>&
__rhs)
: _C_node (__rhs._C_node) { }
-#endif // _RWSTD_NO_INLINE_MEMBER_TEMPLATES && ...
+#endif // !defined (_MSC_VER) || _MSC_VER >= 1300
__rw_tree_iter (_C_link_t __lnk)
: _C_node (__lnk) {}
@@ -472,8 +472,7 @@
__rb_tree (const key_compare& = key_compare (),
const allocator_type& = allocator_type ());
-#if !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES) \
- && (!defined (_MSC_VER) || _MSC_VER >= 1300)
+#if !defined (_MSC_VER) || _MSC_VER >= 1300
template<class _InputIter>
__rb_tree (_InputIter __first, _InputIter __last,
@@ -494,7 +493,7 @@
}
}
-#else // if defined (_RWSTD_NO_MEMBER_TEMPLATES)
+#else // if _MSC_VER < 1300
__rb_tree (const value_type* __first, const value_type* __last,
const key_compare& __cmp,
@@ -532,7 +531,7 @@
}
}
-#endif // _RWSTD_NO_MEMBER_TEMPLATES
+#endif // !defined (_MSC_VER) || _MSC_VER >= 1300
__rb_tree (const __rb_tree&);
@@ -619,8 +618,7 @@
iterator insert (iterator, const value_type&, bool);
-#if !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES) \
- && (!defined (_MSC_VER) || _MSC_VER >= 1300)
+#if !defined (_MSC_VER) || _MSC_VER >= 1300
template<class _Iterator>
void insert (_Iterator __first, _Iterator __last, bool __dup) {
@@ -629,12 +627,12 @@
}
-#else // if defined (_RWSTD_NO_MEMBER_TEMPLATES)
+#else // if _MSC_VER < 1300
void insert (const_iterator, const_iterator, bool);
void insert (const value_type*, const value_type*, bool);
-#endif // _RWSTD_NO_MEMBER_TEMPLATES
+#endif // !defined (_MSC_VER) || _MSC_VER >= 1300
iterator erase (iterator);
@@ -867,8 +865,7 @@
#endif // _RWSTD_NO_OPTIMIZE_SPEED
-#if defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES) \
- || (defined (_MSC_VER) && _MSC_VER < 1300)
+#if defined (_MSC_VER) && _MSC_VER < 1300
template <class _Key, class _Val, class _KeyOf, class _Comp, class _Alloc>
inline void __rb_tree<_Key, _Val, _KeyOf, _Comp, _Alloc>::
@@ -886,7 +883,7 @@
insert (*__first, __dup);
}
-#endif // _RWSTD_NO_MEMBER_TEMPLATES
+#endif // defined (_MSC_VER) && _MSC_VER < 1300
template <class _Key, class _Val, class _KeyOf, class _Comp, class _Alloc>
Modified: incubator/stdcxx/trunk/include/set
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/set?view=diff&rev=538186&r1=538185&r2=538186
==============================================================================
--- incubator/stdcxx/trunk/include/set (original)
+++ incubator/stdcxx/trunk/include/set Tue May 15 07:23:59 2007
@@ -122,15 +122,15 @@
const allocator_type &__alloc = allocator_type ())
: _C_rep (__cmp, __alloc) { }
-#if !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES) \
- && (!defined (_MSC_VER) || _MSC_VER >= 1300)
+#if !defined (_MSC_VER) || _MSC_VER >= 1300
template<class _InputIter>
set (_InputIter __first, _InputIter __last,
const key_compare& __cmp = key_compare (),
const allocator_type& __al = allocator_type ())
: _C_rep (__first, __last, __cmp, __al, false) { }
-#else
+
+#else // if _MSC_VER < 1300
set (const value_type* __first, const value_type* __last,
const key_compare &__cmp = key_compare (),
@@ -142,7 +142,7 @@
const allocator_type &__alloc = allocator_type ())
: _C_rep (__first, __last, __cmp, __alloc, false) { }
-#endif
+#endif // !defined (_MSC_VER) || _MSC_VER >= 1300
set (const set &__x)
: _C_rep (__x._C_rep) { }
@@ -219,8 +219,7 @@
#endif
-#if !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES) \
- && (!defined (_MSC_VER) || _MSC_VER >= 1300)
+#if !defined (_MSC_VER) || _MSC_VER >= 1300
template<class _InputIter>
void insert (_InputIter __first, _InputIter __last) {
@@ -228,7 +227,7 @@
_C_rep.insert (*__first, false);
}
-#else // if defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)
+#else // if _MSC_VER < 1300
void insert (const value_type* __first, const value_type* __last) {
for ( ;__first != __last; ++__first)
@@ -240,7 +239,7 @@
_C_rep.insert (*__first, false);
}
-#endif // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
+#endif // !defined (_MSC_VER) || _MSC_VER >= 1300
size_type erase (const key_type& __x) {
return _C_rep.erase (__x);
@@ -357,8 +356,7 @@
const allocator_type &__alloc = allocator_type ())
: _C_rep (__cmp, __alloc) { }
-#if !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES) \
- && (!defined (_MSC_VER) || _MSC_VER >= 1300)
+#if !defined (_MSC_VER) || _MSC_VER >= 1300
template<class _InputIter>
multiset (_InputIter __first, _InputIter __last,
@@ -366,7 +364,7 @@
const allocator_type &__alloc = allocator_type ())
: _C_rep (__first, __last, __cmp, __alloc, true) { }
-#else
+#else // _MSC_VER < 1300
multiset (const value_type* __first, const value_type* __last,
const key_compare &__cmp = key_compare (),
@@ -378,7 +376,7 @@
const allocator_type &__alloc = allocator_type ())
: _C_rep (__first, __last, __cmp, __alloc, true) { }
-#endif
+#endif // !defined (_MSC_VER) || _MSC_VER >= 1300
multiset (const multiset &__x)
: _C_rep (__x._C_rep) { }
@@ -421,8 +419,7 @@
return _C_rep.insert (__it, __x, true);
}
-#if !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES) \
- && (!defined (_MSC_VER) || _MSC_VER >= 1300)
+#if !defined (_MSC_VER) || _MSC_VER >= 1300
template<class _InputIter>
void insert (_InputIter __first, _InputIter __last) {
@@ -430,7 +427,7 @@
_C_rep.insert (*__first, true);
}
-#else
+#else // _MSC_VER < 1300
void insert (const value_type* __first, const value_type* __last) {
for ( ;__first != __last; ++__first)
@@ -442,7 +439,7 @@
_C_rep.insert (*__first, true);
}
-#endif
+#endif // !defined (_MSC_VER) || _MSC_VER >= 1300
void erase (iterator __it) {
_C_rep.erase (__it);
Modified: incubator/stdcxx/trunk/include/string
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/string?view=diff&rev=538186&r1=538185&r2=538186
==============================================================================
--- incubator/stdcxx/trunk/include/string (original)
+++ incubator/stdcxx/trunk/include/string Tue May 15 07:23:59 2007
@@ -47,9 +47,8 @@
_RWSTD_NAMESPACE (std) {
-#if !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES) \
- && (!defined (_MSC_VER) || _MSC_VER >= 1300 || defined (__INTEL_COMPILER))\
- && defined (_RWSTD_NO_MEMBER_TEMPLATES)
+#if defined (_RWSTD_NO_MEMBER_TEMPLATES) \
+ && (!defined (_MSC_VER) || _MSC_VER >= 1300 || defined (__INTEL_COMPILER))
template <class _CharT, class _Traits, class _Alloc,
class _StringIter, class _InputIter>
@@ -63,7 +62,7 @@
__rw_replace_aux (std::basic_string<_CharT, _Traits, _Alloc>&,
_StringIter, _StringIter, _InputIter, _InputIter);
-#endif // !NO_INLINE_MEMBER_TEMPLATES && NO_MEMBER_TEMPLATES
+#endif // NO_MEMBER_TEMPLATES
_EXPORT
@@ -172,8 +171,7 @@
const allocator_type& = allocator_type ());
-#if !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES) \
- && (!defined (_MSC_VER) || _MSC_VER >= 1300 || defined (__INTEL_COMPILER))
+#if !defined (_MSC_VER) || _MSC_VER >= 1300 || defined (__INTEL_COMPILER)
// 21.3.1, p15
template <class _InputIter>
@@ -184,7 +182,7 @@
__first, __last);
}
-#endif // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
+#endif // !defined (_MSC_VER) || _MSC_VER >= 1300 || defined (__INTEL_COMPILER)
basic_string (const_pointer, const_pointer, const allocator_type&
_RWSTD_REDECLARED_DEFAULT (allocator_type ()));
@@ -298,8 +296,7 @@
return replace (size (), size_type (), __s);
}
-#if !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES) \
- && (!defined (_MSC_VER) || _MSC_VER >= 1300 || defined (__INTEL_COMPILER))
+#if !defined (_MSC_VER) || _MSC_VER >= 1300 || defined (__INTEL_COMPILER)
template<class _InputIter>
basic_string& append (_InputIter __first, _InputIter __last) {
@@ -321,14 +318,14 @@
return replace (size (), size_type (), __n, __c);
}
-#else // if defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)
+#else // if _MSC_VER < 1300 && !defined (__INTEL_COMPILER)
basic_string& append (const_pointer __first, const_pointer __last) {
replace (size (), size_type (), __first, __last - __first);
return *this;
}
-#endif // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
+#endif // !defined (_MSC_VER) || _MSC_VER >= 1300 || defined (__INTEL_COMPILER)
basic_string& append (size_type __n, value_type __c) {
return replace (size (), size_type (), __n, __c);
@@ -354,8 +351,7 @@
}
-#if !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES) \
- && (!defined (_MSC_VER) || _MSC_VER >= 1300 || defined (__INTEL_COMPILER))
+#if !defined (_MSC_VER) || _MSC_VER >= 1300 || defined (__INTEL_COMPILER)
template<class _InputIter>
basic_string& assign (_InputIter __first, _InputIter __last) {
@@ -378,14 +374,14 @@
return replace (size_type (), size (), __n, __c);
}
-#else // if defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)
+#else // if _MSC_VER < 1300 && !defined (__INTEL_COMPILER)
basic_string& assign (const_pointer __first, const_pointer __last) {
replace (size_type (), size (), __first, __last - __first);
return *this;
}
-#endif // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
+#endif // !defined (_MSC_VER) || _MSC_VER >= 1300 || defined (__INTEL_COMPILER)
basic_string& assign (size_type __n, value_type __c) {
return replace (size_type (), size (), __n, __c);
@@ -410,8 +406,7 @@
return insert (__inx, &__c, 1), begin () + __inx;
}
-#if !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATE) \
- && (!defined (_MSC_VER) || _MSC_VER >= 1300 || defined (__INTEL_COMPILER))
+#if !defined (_MSC_VER) || _MSC_VER >= 1300 || defined (__INTEL_COMPILER)
template<class _InputIter>
void insert (iterator __p, _InputIter __first, _InputIter __last) {
@@ -457,7 +452,7 @@
# endif // _RWSTD_NO_DEBUG_ITER
-#else // if defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)
+#else // if _MSC_VER < 1300 && !defined (__INTEL_COMPILER)
void insert (iterator __p, const_pointer __first, const_pointer __last) {
if (__first >= _C_data && __first <= _C_data + size ())
@@ -466,7 +461,7 @@
replace (__p, __p, __first, __last);
}
-#endif // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
+#endif // !defined (_MSC_VER) || _MSC_VER >= 1300 || defined (__INTEL_COMPILER)
void insert (iterator __it, size_type __n, value_type __c) {
@@ -507,8 +502,7 @@
}
-#if !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES) \
- && (!defined (_MSC_VER) || _MSC_VER >= 1300 || defined (__INTEL_COMPILER))
+#if !defined (_MSC_VER) || _MSC_VER >= 1300 || defined (__INTEL_COMPILER)
# ifndef _RWSTD_NO_MEMBER_TEMPLATES
@@ -527,7 +521,7 @@
# endif // _RWSTD_NO_MEMBER_TEMPLATES
-#endif // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
+#endif // !defined (_MSC_VER) || _MSC_VER >= 1300 || defined (__INTEL_COMPILER)
size_type _C_grow (size_type, size_type) const;
@@ -583,8 +577,7 @@
return replace (_C_off (__first), _C_off (__first, __last), __n, __c);
}
-#if !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES) \
- && (!defined (_MSC_VER) || _MSC_VER >= 1300 || defined (__INTEL_COMPILER))
+#if !defined (_MSC_VER) || _MSC_VER >= 1300 || defined (__INTEL_COMPILER)
# ifndef _RWSTD_NO_MEMBER_TEMPLATES
@@ -619,7 +612,7 @@
_RWSTD_DISPATCH (_InputIter));
}
-#else // if defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)
+#else // if _MSC_VER < 1300 && !defined (__INTEL_COMPILER)
basic_string&
replace (iterator __first1, iterator __last1,
@@ -629,7 +622,7 @@
return *this;
}
-#endif // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
+#endif // !defined (_MSC_VER) || _MSC_VER >= 1300 || defined (__INTEL_COMPILER)
// 21.3.5.7, p1
@@ -819,9 +812,8 @@
}
#endif
-#if !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES) \
- && (!defined (_MSC_VER) || _MSC_VER >= 1300 || defined (__INTEL_COMPILER)) \
- && defined (_RWSTD_NO_MEMBER_TEMPLATES)
+#if defined (_RWSTD_NO_MEMBER_TEMPLATES) \
+ && (!defined (_MSC_VER) || _MSC_VER >= 1300 || defined (__INTEL_COMPILER))
public:
Modified: incubator/stdcxx/trunk/include/string.cc
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/string.cc?view=diff&rev=538186&r1=538185&r2=538186
==============================================================================
--- incubator/stdcxx/trunk/include/string.cc (original)
+++ incubator/stdcxx/trunk/include/string.cc Tue May 15 07:23:59 2007
@@ -479,8 +479,7 @@
}
-#if !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES) \
- && (!defined (_MSC_VER) || _MSC_VER >= 1300 || defined (__INTEL_COMPILER))
+#if !defined (_MSC_VER) || _MSC_VER >= 1300 || defined (__INTEL_COMPILER)
# ifdef _RWSTD_NO_MEMBER_TEMPLATES
@@ -571,7 +570,7 @@
// Avoids the possibility of multiple allocations
// We still have to copy characters over one at a time.
-#ifdef _RWSTD_NO_MEMBER_TEMPLATES
+# ifdef _RWSTD_NO_MEMBER_TEMPLATES
template<class _CharT, class _Traits, class _Alloc, class _StringIter, class _InputIter>
_STD::basic_string<_CharT, _Traits, _Alloc>&
@@ -665,7 +664,7 @@
return __s;
}
-#endif //_RWSTD_NO_INLINE_MEMBER_TEMPLATES
+#endif // !defined (_MSC_VER) || _MSC_VER >= 1300 || defined (__INTEL_COMPILER)
template <class _CharT, class _Traits, class _Allocator>
Modified: incubator/stdcxx/trunk/include/vector
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/vector?view=diff&rev=538186&r1=538185&r2=538186
==============================================================================
--- incubator/stdcxx/trunk/include/vector (original)
+++ incubator/stdcxx/trunk/include/vector Tue May 15 07:23:59 2007
@@ -58,8 +58,7 @@
template <class _TypeT, class _Allocator = allocator<_TypeT> >
class vector;
-#ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-# ifdef _RWSTD_NO_MEMBER_TEMPLATES
+#ifdef _RWSTD_NO_MEMBER_TEMPLATES
// declarations of non-member function templates implementing
// the functionality of vector member function templates
@@ -84,8 +83,7 @@
void __rw_insert_range (vector<_TypeT, _Allocator>*, _VectorIter,
_FwdIter, _FwdIter, forward_iterator_tag);
-# endif // _RWSTD_NO_MEMBER_TEMPLATES
-#endif // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
+#endif // _RWSTD_NO_MEMBER_TEMPLATES
_EXPORT
@@ -168,9 +166,7 @@
assign (__n, __x);
}
-#ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
-# if !defined (_MSC_VER) || _MSC_VER >= 1300
+#if !defined (_MSC_VER) || _MSC_VER >= 1300
template <class _InputIter>
vector (_InputIter __first, _InputIter __last,
@@ -179,7 +175,7 @@
assign (__first, __last);
}
-# else // if !MSVC || MSVC <= 6.0
+#else // if !MSVC || MSVC <= 6.0
// working around an MSVC 6.0 ICE (bug #554)
template <class _InputIter>
@@ -195,18 +191,8 @@
assign (__first, __last);
}
-# endif // MSVC <= 6.0
+#endif // MSVC <= 6.0
-#else // defined _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
- vector (const_iterator __first, const_iterator __last,
- const _Allocator &__alloc = allocator_type ())
- : allocator_type (__alloc), _C_begin (), _C_end (), _C_bufend () {
- assign (__first, __last);
- }
-
-#endif // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
vector (const vector &__rhs)
: allocator_type (__rhs.get_allocator ()),
_C_begin (), _C_end (), _C_bufend () {
@@ -222,27 +208,12 @@
vector& operator= (const vector&);
-#ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
template <class _InputIter>
void assign (_InputIter __first, _InputIter __last) {
// dispatch either to a range assign or to an assign with repetition
_C_assign (__first, __last, _RWSTD_DISPATCH (_InputIter));
}
-#else // if defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)
-
- void assign (const_iterator, const_iterator);
-
-# ifndef _RWSTD_NO_DEBUG_ITER
-
- // otherwise, const_pointer is the same as const_iterator
- void assign (const_pointer, const_pointer);
-
-# endif // _RWSTD_NO_DEBUG_ITER
-
-#endif // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
void assign (size_type __n, const_reference __x) {
_C_assign_n (__n, __x);
}
@@ -341,22 +312,11 @@
iterator insert (iterator, const_reference);
-#ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
template <class _InputIter>
void insert (iterator __it, _InputIter __first, _InputIter __last) {
_C_insert (__it, __first, __last, _RWSTD_DISPATCH (_InputIter));
}
-#else // if defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)
-
- void insert (iterator __it,
- const_iterator __first, const_iterator __last) {
- _RWSTD_INSERT_RANGE (__it, __first, __last);
- }
-
-#endif // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
void insert (iterator __it, size_type __n, const_reference __x) {
_C_insert_n (__it, __n, __x);
}
@@ -406,8 +366,6 @@
#endif // _RWSTD_NO_MEMBER_TEMPLATES
-#ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
// implements range assign
template <class _InputIter>
void _C_assign (_InputIter __first, _InputIter __last, void*) {
@@ -451,8 +409,6 @@
_C_insert_n (__it, size_type (__n), __x);
}
-#endif // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
void _C_realloc (size_type);
// constructs a copy at the end and grows the size of container
@@ -1121,8 +1077,6 @@
while (__n-- > 0) *__first++ = __val;
}
-#ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
template <class _Iterator>
iterator _C_copy (_Iterator __first, _Iterator __last, iterator __res) {
while (__first != __last)
@@ -1137,36 +1091,6 @@
return __res;
}
-#else
- iterator
- _C_copy (const_iterator __first, const_iterator __last, iterator __res) {
- while (__first != __last)
- *__res++ = *__first++;
- return __res;
- }
-
- iterator _C_copy (const bool* __first, const bool* __last, iterator __res) {
- while (__first != __last)
- *__res++ = *__first++;
- return __res;
- }
-
- iterator _C_copy_backward (const_iterator __first, const_iterator __last,
- iterator __res) {
- while (__first != __last)
- *--__res = *--__last;
- return __res;
- }
-
- iterator
- _C_copy_backward (const bool* __first, const bool* __last, iterator __res) {
- while (__first != __last)
- *--__res = *--__last;
- return __res;
- }
-
-#endif
-
private:
iterator _C_begin;
@@ -1213,8 +1137,6 @@
_C_copy (__x.begin (), __x.end (), _C_begin);
}
-#ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
template<class _InputIter>
vector (_InputIter __first, _InputIter __last)
: allocator_type (), _C_bufend ()
@@ -1223,22 +1145,6 @@
_C_init(__n);
_C_copy(__first, __last, _C_begin);
}
-#else
- vector (const_iterator __first, const_iterator __last)
- : allocator_type (), _C_bufend ()
- {
- size_type __n = _DISTANCE (__first, __last, size_type);
- _C_init(__n);
- _C_copy(__first, __last, _C_begin);
- }
- vector (const bool* __first, const bool* __last)
- : allocator_type (), _C_bufend ()
- {
- size_type __n = _DISTANCE (__first, __last, size_type);
- _C_init(__n);
- _C_copy(__first, __last, _C_begin);
- }
-#endif
~vector () {
_C_value_alloc_type(*this).deallocate(_C_begin._C_p,
@@ -1258,22 +1164,11 @@
return *this;
}
-#ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
template<class _InputIter>
void assign (_InputIter __first, _InputIter __last) {
clear ();
insert (begin (), __first, __last);
}
-
-#else // if defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)
-
- void assign (const_iterator __first, const_iterator __last) {
- clear ();
- insert (begin (), __first, __last);
- }
-
-#endif // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
void assign (size_type __n, const bool& __x = bool()) {
clear ();
Modified: incubator/stdcxx/trunk/tests/algorithms/25.random.shuffle.cpp
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/tests/algorithms/25.random.shuffle.cpp?view=diff&rev=538186&r1=538185&r2=538186
==============================================================================
--- incubator/stdcxx/trunk/tests/algorithms/25.random.shuffle.cpp (original)
+++ incubator/stdcxx/trunk/tests/algorithms/25.random.shuffle.cpp Tue May 15 07:23:59 2007
@@ -70,22 +70,8 @@
private:
const DifferenceType val_;
-#ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
template <class T>
Convertible (T);
-
-#else // if defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)
-
- Convertible (unsigned short);
- Convertible (unsigned);
- Convertible (unsigned long);
-
-# ifdef _RWSTD_LONG_LONG
- Convertible (unsigned _RWSTD_LONG_LONG);
-# endif // _RWSTD_LONG_LONG
-#endif // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
};
// detect assumptions made by the algorithm about the return value
@@ -126,21 +112,8 @@
private:
-#ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
template <class T>
void operator() (T) /* non-const */;
-
-#else // if defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)
-
- void operator() (unsigned short);
- void operator() (unsigned);
- void operator() (unsigned long);
-
-# ifdef _RWSTD_LONG_LONG
- void operator() (unsigned _RWSTD_LONG_LONG);
-# endif // _RWSTD_LONG_LONG
-#endif // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
static DifferenceType gen_;
};
Modified: incubator/stdcxx/trunk/tests/containers/23.deque.modifiers.cpp
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/tests/containers/23.deque.modifiers.cpp?view=diff&rev=538186&r1=538185&r2=538186
==============================================================================
--- incubator/stdcxx/trunk/tests/containers/23.deque.modifiers.cpp (original)
+++ incubator/stdcxx/trunk/tests/containers/23.deque.modifiers.cpp Tue May 15 07:23:59 2007
@@ -1249,9 +1249,8 @@
/**************************************************************************/
-#ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-# ifndef _RWSTD_NO_EXPLICIT
-# if !defined (_MSC_VER) || _MSC_VER > 1200
+#ifndef _RWSTD_NO_EXPLICIT
+# if !defined (_MSC_VER) || _MSC_VER > 1200
struct DR_438
{
@@ -1266,16 +1265,13 @@
bool DR_438::cast_used;
-# else // if MSVC <= 6.0
+# 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
-# define NO_DR_438_TEST "_RWSTD_NO_INLINE_MEMBER_TEMPLATES #defined"
-#endif // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
+# 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
void test_dr_438 ()
Modified: incubator/stdcxx/trunk/tests/containers/23.vector.cons.cpp
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/tests/containers/23.vector.cons.cpp?view=diff&rev=538186&r1=538185&r2=538186
==============================================================================
--- incubator/stdcxx/trunk/tests/containers/23.vector.cons.cpp (original)
+++ incubator/stdcxx/trunk/tests/containers/23.vector.cons.cpp Tue May 15 07:23:59 2007
@@ -241,11 +241,10 @@
MEMFUN (void, insert, (Iterator, SizeType, const T&));
-#if !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES) \
- && (!defined (_MSC_VER) || _MSC_VER >= 1300)
+#if !defined (_MSC_VER) || _MSC_VER >= 1300
// member function template insert
MEMFUN (void, insert, (Iterator, InputIter<T>, InputIter<T>));
-#endif // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
+#endif // !defined (_MSC_VER) || _MSC_VER >= 1300
MEMFUN (Iterator, erase, (Iterator));
MEMFUN (Iterator, erase, (Iterator, Iterator));
@@ -603,8 +602,7 @@
}
}
-#if !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES) \
- && (!defined (_MSC_VER) || _MSC_VER >= 1300)
+#if !defined (_MSC_VER) || _MSC_VER >= 1300
if (1) {
@@ -669,7 +667,7 @@
alloc.deallocate (vals, rw_opt_nloops);
}
-#endif // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
+#endif // !defined (_MSC_VER) || _MSC_VER >= 1300
}
Modified: incubator/stdcxx/trunk/tests/containers/23.vector.modifiers.cpp
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/tests/containers/23.vector.modifiers.cpp?view=diff&rev=538186&r1=538185&r2=538186
==============================================================================
--- incubator/stdcxx/trunk/tests/containers/23.vector.modifiers.cpp (original)
+++ incubator/stdcxx/trunk/tests/containers/23.vector.modifiers.cpp Tue May 15 07:23:59 2007
@@ -1002,8 +1002,7 @@
}
-#if !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES) \
- && (!defined (_MSC_VER) || _MSC_VER >= 1300)
+#if !defined (_MSC_VER) || _MSC_VER >= 1300
v0.clear ();
for (i = 0; i < rw_opt_nloops; i++) {
@@ -1092,7 +1091,7 @@
X_count - UserClass::count_ , num_destroy);
}
-#endif // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
+#endif // !defined (_MSC_VER) || _MSC_VER >= 1300
rw_assert (success, 0, __LINE__, "vector<UserClass>::insert()");
rw_assert (success, 0, __LINE__, "vector<UserClass>::erase()");
Modified: incubator/stdcxx/trunk/tests/include/rw_allocator.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/tests/include/rw_allocator.h?view=diff&rev=538186&r1=538185&r2=538186
==============================================================================
--- incubator/stdcxx/trunk/tests/include/rw_allocator.h (original)
+++ incubator/stdcxx/trunk/tests/include/rw_allocator.h Tue May 15 07:23:59 2007
@@ -6,22 +6,23 @@
*
***************************************************************************
*
- * Copyright 2006 The Apache Software Foundation or its licensors,
- * as applicable.
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you 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
*
- * Copyright 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
+ * 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.
+ * 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 Rogue Wave Software.
*
**************************************************************************/
@@ -170,8 +171,6 @@
pal_->funcall (pal_->m_cpy_ctor);
}
-#ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
template <class U>
UserAlloc (const UserAlloc<U> &rhs) _THROWS (())
: pal_ (rhs.pal_) {
@@ -187,8 +186,6 @@
template <class U>
struct rebind { typedef UserAlloc<U> other; };
-
-#endif // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
void operator= (const UserAlloc &rhs) {
pal_->funcall (pal_->m_cpy_assign, rhs.pal_);
Modified: incubator/stdcxx/trunk/tests/utilities/20.pairs.cpp
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/tests/utilities/20.pairs.cpp?view=diff&rev=538186&r1=538185&r2=538186
==============================================================================
--- incubator/stdcxx/trunk/tests/utilities/20.pairs.cpp (original)
+++ incubator/stdcxx/trunk/tests/utilities/20.pairs.cpp Tue May 15 07:23:59 2007
@@ -99,8 +99,6 @@
_RWSTD_UNUSED (pu);
}
-#ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
if (0) { // compile only
Pair *p0 = 0;
std::pair<long, double> p1 (*p0);
@@ -192,8 +190,6 @@
"called %d assignment operators, "
"expected 2", UserClass::n_total_op_assign_);
}
-
-#endif // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
{