Return-Path: Delivered-To: apmail-incubator-stdcxx-commits-archive@www.apache.org Received: (qmail 98100 invoked from network); 27 Jun 2007 00:00:50 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 27 Jun 2007 00:00:50 -0000 Received: (qmail 55643 invoked by uid 500); 27 Jun 2007 00:00:53 -0000 Delivered-To: apmail-incubator-stdcxx-commits-archive@incubator.apache.org Received: (qmail 55625 invoked by uid 500); 27 Jun 2007 00:00:53 -0000 Mailing-List: contact stdcxx-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: stdcxx-dev@incubator.apache.org Delivered-To: mailing list stdcxx-commits@incubator.apache.org Received: (qmail 55614 invoked by uid 99); 27 Jun 2007 00:00:53 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 Jun 2007 17:00:53 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 Jun 2007 17:00:45 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id DF63F1A9879; Tue, 26 Jun 2007 16:59:33 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r550991 [17/23] - in /incubator/stdcxx/branches/4.2.0: ./ doc/ doc/stdlibref/ doc/stdlibug/ etc/config/ etc/config/src/ etc/config/windows/ etc/nls/ etc/nls/posix/charmaps/ etc/nls/posix/src/ examples/include/ examples/manual/ examples/manu... Date: Tue, 26 Jun 2007 23:58:55 -0000 To: stdcxx-commits@incubator.apache.org From: sebor@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070626235933.DF63F1A9879@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: incubator/stdcxx/branches/4.2.0/include/bitset URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/bitset?view=diff&rev=550991&r1=550990&r2=550991 ============================================================================== --- incubator/stdcxx/branches/4.2.0/include/bitset (original) +++ incubator/stdcxx/branches/4.2.0/include/bitset Tue Jun 26 16:58:07 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 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* __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 __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 @@ -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::length() to compute the length of the string // and char_traits::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 >() -# if !defined (_RWSTD_NO_EXT_BITSET_TO_STRING) \ - && !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES) +# ifndef _RWSTD_NO_EXT_BITSET_TO_STRING // convenience extensions template @@ -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/branches/4.2.0/include/complex URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/complex?view=diff&rev=550991&r1=550990&r2=550991 ============================================================================== --- incubator/stdcxx/branches/4.2.0/include/complex (original) +++ incubator/stdcxx/branches/4.2.0/include/complex Tue Jun 26 16:58:07 2007 @@ -748,84 +748,36 @@ // complex number `a' raised to an integer power `n' // a**n = r**n * (cos(n theta) + i sin (n theta)) +_EXPORT template -inline complex<_TypeT> pow (const complex<_TypeT>& __a, int __n) -{ - if (__a == complex<_TypeT>()) - return complex<_TypeT>(0 == __n); - - if (_TypeT () == __a.imag ()) { - if (__a.real () < _TypeT ()) - return pow (__a, complex<_TypeT>(__n)); - - return complex<_TypeT>(_RWSTD_C::pow (__a.real (), __n)); - } - - _TypeT __r = _RWSTD_C::pow (_TypeT (abs (__a)), __n); - _TypeT __th = __n * arg (__a); - - return complex<_TypeT>(__r * _RWSTD_C::cos (__th), - __r * _RWSTD_C::sin (__th)); -} +complex<_TypeT> +pow (const complex<_TypeT>&, int); // complex number `a' raised to a real power `s' // a**s = exp(s * log(a)) +_EXPORT template -inline complex<_TypeT> pow (const complex<_TypeT> &__a, const _TypeT &__s) -{ - if (__a == complex<_TypeT>()) - return complex<_TypeT>(_TypeT () == __s); - - if (_TypeT () == __a.imag ()) { - if (__a.real () < _TypeT ()) - return pow (__a, complex<_TypeT>(__s)); - - return complex<_TypeT>(_RWSTD_C::pow (__a.real (), __s)); - } - return exp (__s * log (__a)); -} +complex<_TypeT> +pow (const complex<_TypeT>&, const _TypeT&); // real number `s' raised to a complex power `a' // s**a = exp(a * log (s)) +_EXPORT template -inline complex<_TypeT> pow (const _TypeT& __s, const complex<_TypeT>& __a) -{ - if (_TypeT() == __s) - return complex<_TypeT>(complex<_TypeT>() == __a); - - if (__s < _TypeT ()) - return pow (complex<_TypeT>(__s), __a); - - if (_TypeT () == __a.imag ()) - return complex<_TypeT>(_RWSTD_C::pow (__s, __a.real ())); - - return complex<_TypeT>(exp(__a * _TypeT (_RWSTD_C::log (__s)))); -} +complex<_TypeT> +pow (const _TypeT&, const complex<_TypeT>&); // complex number `a1' raised to `a' complex power `a2' // a1**a2 = rho * (cos(phi) + i sin(phi)) // rho = r1 ** u2 * exp (-v2 * theta1) // phi = v2 * log(r1) + u2 * theta1 +_EXPORT template inline complex<_TypeT> -pow (const complex<_TypeT>& __x, const complex<_TypeT>& __y) -{ - if (complex<_TypeT>() == __x) - return complex<_TypeT>(complex<_TypeT>() == __y); - - _TypeT __r1 = abs (__x); - _TypeT __u2 = real (__y); - _TypeT __v2 = imag (__y); - _TypeT __th1 = arg (__x); - _TypeT __rho = _RWSTD_C::pow (__r1, __u2) * _RWSTD_C::exp (-__v2 * __th1); - _TypeT __phi = __v2 * _RWSTD_C::log (__r1) + __u2 * __th1; - - return complex<_TypeT>(__rho * _RWSTD_C::cos (__phi), - __rho * _RWSTD_C::sin (__phi)); -} +pow (const complex<_TypeT>&, const complex<_TypeT>&); // complex sine of complex number `a' @@ -887,61 +839,17 @@ // 26.2.6, p12: MT-safe extractor (not atomic) +_EXPORT template -inline basic_istream<_CharT, _Traits >& -operator>> (basic_istream<_CharT, _Traits>& __strm, complex<_TypeT> &__val) -{ - // read a complex number in one of the following forms: - // "r", "(r)", "(r, i)" - - // lwg issue 156: extraction is performed as a series of simpler - // extractions. Therefore, the skipping of whitespace is specified - // to be the same for each of the simpler extractions. - - _TypeT __re = _TypeT (), - __im = _TypeT (); - - _CharT __ch; - - if (!(__strm >> __ch)) - return __strm; - - if ('(' == __ch) { - if (__strm >> __re && __strm >> __ch) { - if (',' == __ch && __strm >> __im) - __strm >> __ch; - - // avoid setting failbit if either badbit - // or failbit is already set in the stream - if (')' != __ch && __strm) - __strm.setstate (__strm.failbit); - } - } - else if (__strm.putback (__ch)) { - __strm >> __re; - } - - if (__strm) - __val = complex<_TypeT>(__re, __im); - - return __strm; -} +basic_istream<_CharT, _Traits >& +operator>> (basic_istream<_CharT, _Traits>&, complex<_TypeT>&); // 26.2.6, p15: MT-safe atomic inserter +_EXPORT template -inline basic_ostream<_CharT, _Traits>& -operator<< (basic_ostream<_CharT, _Traits >& __strm, - const complex<_TypeT>& __val) -{ - basic_ostringstream<_CharT, _Traits, allocator<_CharT> > __ss; - __ss.flags (__strm.flags ()); - __ss.imbue (__strm.getloc ()); - __ss.precision (__strm.precision ()); - __ss << '(' << __val.real () << ',' << __val.imag () << ')'; - return __strm << __ss.str (); -} - +basic_ostream<_CharT, _Traits>& +operator<< (basic_ostream<_CharT, _Traits>&, const complex<_TypeT>&); } // namespace std @@ -949,6 +857,11 @@ #ifdef _MSC_VER # pragma warning (pop) #endif // _MSC_VER + + +#if _RWSTD_DEFINE_TEMPLATE (_COMPLEX) +# include +#endif // _RWSTD_DEFINE_TEMPLATE (_BASIC_OSTREAM) #endif // _RWSTD_COMPLEX_INCLUDED Modified: incubator/stdcxx/branches/4.2.0/include/deque URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/deque?view=diff&rev=550991&r1=550990&r2=550991 ============================================================================== --- incubator/stdcxx/branches/4.2.0/include/deque (original) +++ incubator/stdcxx/branches/4.2.0/include/deque Tue Jun 26 16:58:07 2007 @@ -58,8 +58,7 @@ template > 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 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 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 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 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/branches/4.2.0/include/deque.cc URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/deque.cc?view=diff&rev=550991&r1=550990&r2=550991 ============================================================================== --- incubator/stdcxx/branches/4.2.0/include/deque.cc (original) +++ incubator/stdcxx/branches/4.2.0/include/deque.cc Tue Jun 26 16:58:07 2007 @@ -19,16 +19,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-2006 Rogue Wave Software. * **************************************************************************/ Modified: incubator/stdcxx/branches/4.2.0/include/deque_spec.h URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/deque_spec.h?view=diff&rev=550991&r1=550990&r2=550991 ============================================================================== --- incubator/stdcxx/branches/4.2.0/include/deque_spec.h (original) +++ incubator/stdcxx/branches/4.2.0/include/deque_spec.h Tue Jun 26 16:58:07 2007 @@ -18,16 +18,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-2006 Rogue Wave Software. * **************************************************************************/ Modified: incubator/stdcxx/branches/4.2.0/include/exception URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/exception?view=diff&rev=550991&r1=550990&r2=550991 ============================================================================== --- incubator/stdcxx/branches/4.2.0/include/exception (original) +++ incubator/stdcxx/branches/4.2.0/include/exception Tue Jun 26 16:58:07 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-2006 Rogue Wave Software. * **************************************************************************/ Modified: incubator/stdcxx/branches/4.2.0/include/functional URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/functional?view=diff&rev=550991&r1=550990&r2=550991 ============================================================================== --- incubator/stdcxx/branches/4.2.0/include/functional (original) +++ incubator/stdcxx/branches/4.2.0/include/functional Tue Jun 26 16:58:07 2007 @@ -20,16 +20,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-2006 Rogue Wave Software. * **************************************************************************/ Modified: incubator/stdcxx/branches/4.2.0/include/iomanip URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/iomanip?view=diff&rev=550991&r1=550990&r2=550991 ============================================================================== --- incubator/stdcxx/branches/4.2.0/include/iomanip (original) +++ incubator/stdcxx/branches/4.2.0/include/iomanip Tue Jun 26 16:58:07 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 struct __rw_setfill { -#ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES - template 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/branches/4.2.0/include/ios URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/ios?view=diff&rev=550991&r1=550990&r2=550991 ============================================================================== --- incubator/stdcxx/branches/4.2.0/include/ios (original) +++ incubator/stdcxx/branches/4.2.0/include/ios Tue Jun 26 16:58:07 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-2006 Rogue Wave Software. * **************************************************************************/ Modified: incubator/stdcxx/branches/4.2.0/include/iostream URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/iostream?view=diff&rev=550991&r1=550990&r2=550991 ============================================================================== --- incubator/stdcxx/branches/4.2.0/include/iostream (original) +++ incubator/stdcxx/branches/4.2.0/include/iostream Tue Jun 26 16:58:07 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-2006 Rogue Wave Software. * **************************************************************************/ Modified: incubator/stdcxx/branches/4.2.0/include/istream URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/istream?view=diff&rev=550991&r1=550990&r2=550991 ============================================================================== --- incubator/stdcxx/branches/4.2.0/include/istream (original) +++ incubator/stdcxx/branches/4.2.0/include/istream Tue Jun 26 16:58:07 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-2006 Rogue Wave Software. * **************************************************************************/ Modified: incubator/stdcxx/branches/4.2.0/include/iterator URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/iterator?view=diff&rev=550991&r1=550990&r2=550991 ============================================================================== --- incubator/stdcxx/branches/4.2.0/include/iterator (original) +++ incubator/stdcxx/branches/4.2.0/include/iterator Tue Jun 26 16:58:07 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-2006 Rogue Wave Software. * **************************************************************************/ Modified: incubator/stdcxx/branches/4.2.0/include/limits.cc URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/limits.cc?view=diff&rev=550991&r1=550990&r2=550991 ============================================================================== --- incubator/stdcxx/branches/4.2.0/include/limits.cc (original) +++ incubator/stdcxx/branches/4.2.0/include/limits.cc Tue Jun 26 16:58:07 2007 @@ -6,16 +6,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-2006 Rogue Wave Software. * **************************************************************************/ Modified: incubator/stdcxx/branches/4.2.0/include/list URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/list?view=diff&rev=550991&r1=550990&r2=550991 ============================================================================== --- incubator/stdcxx/branches/4.2.0/include/list (original) +++ incubator/stdcxx/branches/4.2.0/include/list Tue Jun 26 16:58:07 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 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 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 @@ -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/branches/4.2.0/include/list.cc URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/list.cc?view=diff&rev=550991&r1=550990&r2=550991 ============================================================================== --- incubator/stdcxx/branches/4.2.0/include/list.cc (original) +++ incubator/stdcxx/branches/4.2.0/include/list.cc Tue Jun 26 16:58:07 2007 @@ -19,16 +19,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-2006 Rogue Wave Software. * **************************************************************************/ Modified: incubator/stdcxx/branches/4.2.0/include/list_spec.h URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/list_spec.h?view=diff&rev=550991&r1=550990&r2=550991 ============================================================================== --- incubator/stdcxx/branches/4.2.0/include/list_spec.h (original) +++ incubator/stdcxx/branches/4.2.0/include/list_spec.h Tue Jun 26 16:58:07 2007 @@ -21,16 +21,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-2006 Rogue Wave Software. * **************************************************************************/ Modified: incubator/stdcxx/branches/4.2.0/include/loc/_codecvt.cc URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/loc/_codecvt.cc?view=diff&rev=550991&r1=550990&r2=550991 ============================================================================== --- incubator/stdcxx/branches/4.2.0/include/loc/_codecvt.cc (original) +++ incubator/stdcxx/branches/4.2.0/include/loc/_codecvt.cc Tue Jun 26 16:58:07 2007 @@ -6,16 +6,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-2006 Rogue Wave Software. * **************************************************************************/ Modified: incubator/stdcxx/branches/4.2.0/include/loc/_codecvt.h URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/loc/_codecvt.h?view=diff&rev=550991&r1=550990&r2=550991 ============================================================================== --- incubator/stdcxx/branches/4.2.0/include/loc/_codecvt.h (original) +++ incubator/stdcxx/branches/4.2.0/include/loc/_codecvt.h Tue Jun 26 16:58:07 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-2006 Rogue Wave Software. * **************************************************************************/ Modified: incubator/stdcxx/branches/4.2.0/include/loc/_collate.cc URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/loc/_collate.cc?view=diff&rev=550991&r1=550990&r2=550991 ============================================================================== --- incubator/stdcxx/branches/4.2.0/include/loc/_collate.cc (original) +++ incubator/stdcxx/branches/4.2.0/include/loc/_collate.cc Tue Jun 26 16:58:07 2007 @@ -6,16 +6,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-2006 Rogue Wave Software. * **************************************************************************/ Modified: incubator/stdcxx/branches/4.2.0/include/loc/_collate.h URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/loc/_collate.h?view=diff&rev=550991&r1=550990&r2=550991 ============================================================================== --- incubator/stdcxx/branches/4.2.0/include/loc/_collate.h (original) +++ incubator/stdcxx/branches/4.2.0/include/loc/_collate.h Tue Jun 26 16:58:07 2007 @@ -5,20 +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/_collate.h#22 $ + * $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. + * 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. * **************************************************************************/ Modified: incubator/stdcxx/branches/4.2.0/include/loc/_convenience.h URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/loc/_convenience.h?view=diff&rev=550991&r1=550990&r2=550991 ============================================================================== --- incubator/stdcxx/branches/4.2.0/include/loc/_convenience.h (original) +++ incubator/stdcxx/branches/4.2.0/include/loc/_convenience.h Tue Jun 26 16:58:07 2007 @@ -6,20 +6,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/_convenience.h#7 $ + * $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. + * 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. * **************************************************************************/ Modified: incubator/stdcxx/branches/4.2.0/include/loc/_ctype.cc URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/loc/_ctype.cc?view=diff&rev=550991&r1=550990&r2=550991 ============================================================================== --- incubator/stdcxx/branches/4.2.0/include/loc/_ctype.cc (original) +++ incubator/stdcxx/branches/4.2.0/include/loc/_ctype.cc Tue Jun 26 16:58:07 2007 @@ -6,16 +6,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-2006 Rogue Wave Software. * **************************************************************************/ Modified: incubator/stdcxx/branches/4.2.0/include/loc/_ctype.h URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/loc/_ctype.h?view=diff&rev=550991&r1=550990&r2=550991 ============================================================================== --- incubator/stdcxx/branches/4.2.0/include/loc/_ctype.h (original) +++ incubator/stdcxx/branches/4.2.0/include/loc/_ctype.h Tue Jun 26 16:58:07 2007 @@ -1,24 +1,31 @@ /*************************************************************************** * - * _ctype.h - + * _ctype.h * * 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/_ctype.h#57 $ + * $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. + * 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 2001-2005 Rogue Wave Software. * **************************************************************************/ @@ -426,34 +433,21 @@ virtual const char_type* do_is (const char_type*, const char_type*, mask*) const; -// for convenience -#define _RWSTD_CONVERT(tab, c) \ - _RWSTD_STATIC_CAST (_RWSTD_SIZE_T, c) < _C_tab_size ? tab [_UChar (c)] : c - // 22.2.1.1.2, p7 - virtual char_type do_toupper (char_type __c) const { - return _RWSTD_CONVERT (_C_upper_tab, __c); - } + virtual char_type do_toupper (char_type) const; // 22.2.1.1.2, p9 - virtual char_type do_tolower (char_type __c) const { - return _RWSTD_CONVERT (_C_lower_tab, __c); - } + virtual char_type do_tolower (char_type) const; // 22.2.1.1.2, p11 - virtual char_type do_widen (char __c) const { - return _RWSTD_CONST_CAST (ctype*, this)-> - _C_wide_tab [_UChar (__c)] = char_type (_UChar (__c)); - } + virtual char_type do_widen (char) const; virtual const char* do_widen (const char*, const char*, char_type*) const; // 22.2.1.1.2, p13 - virtual char do_narrow (char_type __c, char __dfault) const { - return _RWSTD_STATIC_CAST (_RWSTD_SIZE_T, __c) <= _RWSTD_SCHAR_MAX ? - _RWSTD_STATIC_CAST (char, __c) : __dfault; - } + virtual char + do_narrow (char_type, char) const; virtual const char_type* do_toupper (char_type*, const char_type*) const; @@ -474,7 +468,7 @@ public: - _EXPLICIT ctype (_RWSTD_SIZE_T __ref = 0); + _EXPLICIT ctype (_RWSTD_SIZE_T = 0); // 22.2.1.1.1, p1 Modified: incubator/stdcxx/branches/4.2.0/include/loc/_facet.h URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/loc/_facet.h?view=diff&rev=550991&r1=550990&r2=550991 ============================================================================== --- incubator/stdcxx/branches/4.2.0/include/loc/_facet.h (original) +++ incubator/stdcxx/branches/4.2.0/include/loc/_facet.h Tue Jun 26 16:58:07 2007 @@ -5,20 +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/_facet.h#45 $ + * $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. + * 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. * **************************************************************************/ Modified: incubator/stdcxx/branches/4.2.0/include/loc/_locale.h URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/loc/_locale.h?view=diff&rev=550991&r1=550990&r2=550991 ============================================================================== --- incubator/stdcxx/branches/4.2.0/include/loc/_locale.h (original) +++ incubator/stdcxx/branches/4.2.0/include/loc/_locale.h Tue Jun 26 16:58:07 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 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 @@ -194,8 +201,6 @@ #else // if defined (_RWSTD_NO_MEMBER_TEMPLATES) -# ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES - template 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 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 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/branches/4.2.0/include/loc/_messages.h URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/loc/_messages.h?view=diff&rev=550991&r1=550990&r2=550991 ============================================================================== --- incubator/stdcxx/branches/4.2.0/include/loc/_messages.h (original) +++ incubator/stdcxx/branches/4.2.0/include/loc/_messages.h Tue Jun 26 16:58:07 2007 @@ -5,20 +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/_messages.h#29 $ + * $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. + * 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. * **************************************************************************/ Modified: incubator/stdcxx/branches/4.2.0/include/loc/_money_put.cc URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/loc/_money_put.cc?view=diff&rev=550991&r1=550990&r2=550991 ============================================================================== --- incubator/stdcxx/branches/4.2.0/include/loc/_money_put.cc (original) +++ incubator/stdcxx/branches/4.2.0/include/loc/_money_put.cc Tue Jun 26 16:58:07 2007 @@ -6,16 +6,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-2006 Rogue Wave Software. * **************************************************************************/ Modified: incubator/stdcxx/branches/4.2.0/include/loc/_moneypunct.cc URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/loc/_moneypunct.cc?view=diff&rev=550991&r1=550990&r2=550991 ============================================================================== --- incubator/stdcxx/branches/4.2.0/include/loc/_moneypunct.cc (original) +++ incubator/stdcxx/branches/4.2.0/include/loc/_moneypunct.cc Tue Jun 26 16:58:07 2007 @@ -6,16 +6,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-2006 Rogue Wave Software. * **************************************************************************/ Modified: incubator/stdcxx/branches/4.2.0/include/loc/_moneypunct.h URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/loc/_moneypunct.h?view=diff&rev=550991&r1=550990&r2=550991 ============================================================================== --- incubator/stdcxx/branches/4.2.0/include/loc/_moneypunct.h (original) +++ incubator/stdcxx/branches/4.2.0/include/loc/_moneypunct.h Tue Jun 26 16:58:07 2007 @@ -5,20 +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/_moneypunct.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. + * 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. * **************************************************************************/ Modified: incubator/stdcxx/branches/4.2.0/include/loc/_num_put.h URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/loc/_num_put.h?view=diff&rev=550991&r1=550990&r2=550991 ============================================================================== --- incubator/stdcxx/branches/4.2.0/include/loc/_num_put.h (original) +++ incubator/stdcxx/branches/4.2.0/include/loc/_num_put.h Tue Jun 26 16:58:07 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-2006 Rogue Wave Software. * **************************************************************************/ Modified: incubator/stdcxx/branches/4.2.0/include/loc/_numpunct.cc URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/loc/_numpunct.cc?view=diff&rev=550991&r1=550990&r2=550991 ============================================================================== --- incubator/stdcxx/branches/4.2.0/include/loc/_numpunct.cc (original) +++ incubator/stdcxx/branches/4.2.0/include/loc/_numpunct.cc Tue Jun 26 16:58:07 2007 @@ -6,16 +6,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-2006 Rogue Wave Software. * **************************************************************************/ Modified: incubator/stdcxx/branches/4.2.0/include/loc/_numpunct.h URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/loc/_numpunct.h?view=diff&rev=550991&r1=550990&r2=550991 ============================================================================== --- incubator/stdcxx/branches/4.2.0/include/loc/_numpunct.h (original) +++ incubator/stdcxx/branches/4.2.0/include/loc/_numpunct.h Tue Jun 26 16:58:07 2007 @@ -5,20 +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/_numpunct.h#29 $ + * $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. + * 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. * **************************************************************************/ Modified: incubator/stdcxx/branches/4.2.0/include/loc/_punct.cc URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/loc/_punct.cc?view=diff&rev=550991&r1=550990&r2=550991 ============================================================================== --- incubator/stdcxx/branches/4.2.0/include/loc/_punct.cc (original) +++ incubator/stdcxx/branches/4.2.0/include/loc/_punct.cc Tue Jun 26 16:58:07 2007 @@ -6,16 +6,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-2006 Rogue Wave Software. * **************************************************************************/ Modified: incubator/stdcxx/branches/4.2.0/include/loc/_punct.h URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/loc/_punct.h?view=diff&rev=550991&r1=550990&r2=550991 ============================================================================== --- incubator/stdcxx/branches/4.2.0/include/loc/_punct.h (original) +++ incubator/stdcxx/branches/4.2.0/include/loc/_punct.h Tue Jun 26 16:58:07 2007 @@ -5,20 +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/_punct.h#29 $ + * $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. + * 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. * **************************************************************************/