stdcxx-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject svn commit: r550991 [19/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 GMT
Modified: incubator/stdcxx/branches/4.2.0/include/set
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/set?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/set (original)
+++ incubator/stdcxx/branches/4.2.0/include/set Tue Jun 26 16:58:07 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/branches/4.2.0/include/sstream
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/sstream?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/sstream (original)
+++ incubator/stdcxx/branches/4.2.0/include/sstream Tue Jun 26 16:58:07 2007
@@ -124,11 +124,7 @@
 
     virtual ~basic_stringbuf ();
     
-    _C_string_type str () const {
-        const _RWSTD_SIZE_T __slen = (this->egptr () < this->pptr () ?
-            this->pptr () : this->egptr ()) - this->pbase ();
-        return _C_string_type (this->_C_buffer, __slen);
-    }
+    _C_string_type str () const;
 
 #ifdef _RWSTD_NO_EXT_STRINGBUF_STR
 
@@ -181,6 +177,28 @@
     void _C_catchup (char_type*);
 };
 
+template <class _CharT, class _Traits, class _Allocator>
+inline basic_string<_CharT, _Traits, _Allocator>
+basic_stringbuf<_CharT, _Traits, _Allocator>::
+str () const {
+
+    const char_type * __first = 0;
+    const char_type * __last = 0;
+
+    if (this->_C_is_out ()) {
+        // in out only or in|out mode
+        __first = this->pbase ();
+        __last = this->egptr () < this->pptr () ?
+            this->pptr () : this->egptr ();
+    }
+    else if (this->_C_is_in ()) {
+        // in in only mode
+        __first = this->eback ();
+        __last = this->egptr ();
+    }
+
+    return _C_string_type (__first, __last - __first);
+}
 
 template <class _CharT, class _Traits, class _Allocator>
 inline _RWSTD_STREAMSIZE

Modified: incubator/stdcxx/branches/4.2.0/include/stdexcept
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/stdexcept?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/stdexcept (original)
+++ incubator/stdcxx/branches/4.2.0/include/stdexcept 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.
  * 
  **************************************************************************/
 
@@ -44,6 +51,8 @@
     // extension
     _EXPLICIT logic_error (const char *__s = 0)
         : _RW::__rw_exception (__s) { }
+
+    virtual ~logic_error () _THROWS (());
 };
 
 

Modified: incubator/stdcxx/branches/4.2.0/include/string
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/string?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/string (original)
+++ incubator/stdcxx/branches/4.2.0/include/string Tue Jun 26 16:58:07 2007
@@ -47,9 +47,15 @@
 _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 (_RWSTD_NO_EXTERN_MEMBER_TEMPLATE)) \
+    && (!defined (_MSC_VER) || _MSC_VER >= 1300 || defined (__INTEL_COMPILER))
+#  define _RWSTD_NO_STRING_OUTLINED_MEMBER_TEMPLATES
+#endif   // _RWSTD_NO_STRING_MEMBER_TEMPLATES
+
+
+#ifndef _RWSTD_NO_MEMBER_TEMPLATES
+#  ifdef _RWSTD_NO_STRING_OUTLINED_MEMBER_TEMPLATES
 
 template <class _CharT, class _Traits, class _Alloc,
           class _StringIter, class _InputIter>
@@ -63,7 +69,8 @@
 __rw_replace_aux (std::basic_string<_CharT, _Traits, _Alloc>&, 
                   _StringIter, _StringIter, _InputIter, _InputIter);
 
-#endif   // !NO_INLINE_MEMBER_TEMPLATES && NO_MEMBER_TEMPLATES
+#  endif   // _RWSTD_NO_STRING_OUTLINED_MEMBER_TEMPLATES
+#endif   // _RWSTD_NO_MEMBER_TEMPLATES
 
 
 _EXPORT
@@ -172,8 +179,7 @@
                   const allocator_type& = allocator_type ());
 
 
-#if    !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)  \
-    && (!defined (_MSC_VER) || _MSC_VER >= 1300 || defined (__INTEL_COMPILER))
+#ifndef _RWSTD_NO_MEMBER_TEMPLATES
 
     // 21.3.1, p15
     template <class _InputIter>
@@ -184,7 +190,7 @@
                  __first, __last);
     }
 
-#endif   // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
+#endif   // _RWSTD_NO_MEMBER_TEMPLATES
 
     basic_string (const_pointer, const_pointer, const allocator_type&
                   _RWSTD_REDECLARED_DEFAULT (allocator_type ()));
@@ -298,8 +304,7 @@
         return replace (size (), size_type (), __s);
     }
 
-#if    !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES) \
-    && (!defined (_MSC_VER) || _MSC_VER >= 1300 || defined (__INTEL_COMPILER))
+#ifndef _RWSTD_NO_MEMBER_TEMPLATES
 
     template<class _InputIter>
     basic_string& append (_InputIter __first, _InputIter __last) {
@@ -321,14 +326,14 @@
         return replace (size (), size_type (), __n, __c);
     }
 
-#else   // if defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)
+#else   // if defined (_RWSTD_NO_MEMBER_TEMPLATES)
 
     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   // _RWSTD_NO_MEMBER_TEMPLATES
 
     basic_string& append (size_type __n, value_type __c) {
         return replace (size (), size_type (), __n, __c);
@@ -354,8 +359,7 @@
     }
 
 
-#if    !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES) \
-    && (!defined (_MSC_VER) || _MSC_VER >= 1300 || defined (__INTEL_COMPILER))
+#ifndef _RWSTD_NO_MEMBER_TEMPLATES
 
     template<class _InputIter>
     basic_string& assign (_InputIter __first, _InputIter __last) {
@@ -378,14 +382,14 @@
         return replace (size_type (), size (), __n, __c);
     }
 
-#else   // if defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)
+#else   // if defined (_RWSTD_NO_MEMBER_TEMPLATES)
 
     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   // _RWSTD_NO_MEMBER_TEMPLATES
 
     basic_string& assign (size_type __n, value_type __c) {
         return replace (size_type (), size (), __n, __c);
@@ -410,8 +414,7 @@
         return insert (__inx, &__c, 1), begin () + __inx;
     }
 
-#if    !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATE) \
-    && (!defined (_MSC_VER) || _MSC_VER >= 1300 || defined (__INTEL_COMPILER))
+#ifndef _RWSTD_NO_MEMBER_TEMPLATES
 
     template<class _InputIter>
     void insert (iterator __p, _InputIter __first, _InputIter __last) {
@@ -457,7 +460,7 @@
 
 #  endif   // _RWSTD_NO_DEBUG_ITER
 
-#else   // if defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)
+#else   // if defined (_RWSTD_NO_MEMBER_TEMPLATES)
 
     void insert (iterator __p, const_pointer __first, const_pointer __last) {
         if (__first >= _C_data && __first <= _C_data + size ())
@@ -466,7 +469,7 @@
             replace (__p, __p, __first, __last);
     }
 
-#endif  // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
+#endif   // _RWSTD_NO_MEMBER_TEMPLATES
     
 
     void insert (iterator __it, size_type __n, value_type __c) {
@@ -506,18 +509,14 @@
         return _C_make_iter (_C_data + __pos1);
     }
 
+public:
 
-#if    !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)  \
-    && (!defined (_MSC_VER) || _MSC_VER >= 1300 || defined (__INTEL_COMPILER))
-
-#  ifndef _RWSTD_NO_MEMBER_TEMPLATES
+#ifndef _RWSTD_NO_STRING_OUTLINED_MEMBER_TEMPLATES
 
     template <class _InputIter>
     basic_string& __replace_aux (iterator, iterator, _InputIter, _InputIter);
 
-#  else   // if defined (_RWSTD_NO_MEMBER_TEMPLATES)
-
-public:
+#else
 
     template <class _InputIter>
     basic_string& __replace_aux (iterator __first1, iterator __last1, 
@@ -525,9 +524,7 @@
         return __rw_replace_aux (*this, __first1, __last1, __first2, __last2);
     }
 
-#  endif   // _RWSTD_NO_MEMBER_TEMPLATES
-
-#endif   // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
+#endif   // _RWSTD_NO_STRING_OUTLINED_MEMBER_TEMPLATES
 
     size_type _C_grow (size_type, size_type) const;
 
@@ -583,17 +580,16 @@
         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))
+#ifndef _RWSTD_NO_MEMBER_TEMPLATES
 
-#  ifndef _RWSTD_NO_MEMBER_TEMPLATES
+#  ifndef _RWSTD_NO_STRING_OUTLINED_MEMBER_TEMPLATES
 
     template<class _InputIter>
     basic_string&
     replace (iterator __first1, iterator __last1, 
              _InputIter __first2, _InputIter __last2, void*);
 
-#  else   // if defined (_RWSTD_NO_MEMBER_TEMPLATES)
+#  else   // if defined (_RWSTD_NO_STRING_OUTLINED_MEMBER_TEMPLATES)
 
     template<class _InputIter>
     basic_string&
@@ -602,7 +598,7 @@
         return __rw_replace (*this, __first1, __last1, __first2, __last2);
     }
 
-#  endif   // _RWSTD_NO_MEMBER_TEMPLATES
+#  endif   // _RWSTD_NO_STRING_OUTLINED_MEMBER_TEMPLATES
 
     basic_string&
     replace (iterator __first, iterator __last,
@@ -619,17 +615,17 @@
                         _RWSTD_DISPATCH (_InputIter));
     }
 
-#else   // if defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)
+#else   // if defined (_RWSTD_NO_MEMBER_TEMPLATES)
 
     basic_string&
     replace (iterator __first1, iterator __last1,
              const_pointer __first2, const_pointer __last2) {
         replace (_C_off (__first1), _C_off (__first1, __last1),
-                 __first2, _C_off (__first2, __last2));
+                 __first2, size_type (__last2 - __first2));
         return *this;
     }
 
-#endif  // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
+#endif   // _RWSTD_NO_MEMBER_TEMPLATES
 
 
     // 21.3.5.7, p1
@@ -819,17 +815,15 @@
     }
 #endif
 
-#if    !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)                            \
-    && (!defined (_MSC_VER) || _MSC_VER >= 1300 || defined (__INTEL_COMPILER)) \
-    && defined (_RWSTD_NO_MEMBER_TEMPLATES)
+#ifndef _RWSTD_NO_STRING_OUTLINED_MEMBER_TEMPLATES
 
-public:
+private:
 
-#else
+#else   // if defined (_RWSTD_NO_STRING_OUTLINED_MEMBER_TEMPLATSE)
 
-private:
+public:
 
-#endif
+#endif   // _RWSTD_NO_STRING_OUTLINED_MEMBER_TEMPLATES
 
     static size_type
     _C_off (const_iterator __first, const_iterator __last) {

Modified: incubator/stdcxx/branches/4.2.0/include/string.cc
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/string.cc?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/string.cc (original)
+++ incubator/stdcxx/branches/4.2.0/include/string.cc Tue Jun 26 16:58:07 2007
@@ -479,12 +479,12 @@
 }
 
 
-#if    !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES) \
-    && (!defined (_MSC_VER) || _MSC_VER >= 1300 || defined (__INTEL_COMPILER)) 
+#ifndef _RWSTD_NO_MEMBER_TEMPLATES
 
-#  ifdef _RWSTD_NO_MEMBER_TEMPLATES
+#  ifdef _RWSTD_NO_STRING_OUTLINED_MEMBER_TEMPLATES
 
-template<class _CharT, class _Traits, class _Alloc, class _StringIter, class _InputIter>
+template <class _CharT, class _Traits, class _Alloc,
+          class _StringIter, class _InputIter>
 _STD::basic_string<_CharT, _Traits, _Alloc>& 
 __rw_replace (_STD::basic_string<_CharT, _Traits, _Alloc> &__s, 
               _StringIter __first1, _StringIter __last1,
@@ -499,7 +499,7 @@
      _C_string_ref_type;
 
 
-#  else   // !defined (_RWSTD_NO_MEMBER_TEMPLATES)
+#  else   // !defined (_RWSTD_NO_STRING_OUTLINED_MEMBER_TEMPLATES)
 
 template<class _CharT, class _Traits, class _Allocator>
 template<class _InputIter>
@@ -510,7 +510,7 @@
 {
   basic_string &__s = *this;
 
-#  endif   // _RWSTD_NO_MEMBER_TEMPLATES
+#  endif   // _RWSTD_NO_STRING_OUTLINED_MEMBER_TEMPLATES
 
     _RWSTD_ASSERT_RANGE (__first1, __s._C_make_iter (__s._C_data + __s.size ()));
     _RWSTD_ASSERT_RANGE (__first1, __last1);
@@ -571,9 +571,10 @@
 // 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_STRING_OUTLINED_MEMBER_TEMPLATES
 
-template<class _CharT, class _Traits, class _Alloc, class _StringIter, class _InputIter>
+template <class _CharT, class _Traits, class _Alloc,
+          class _StringIter, class _InputIter>
 _STD::basic_string<_CharT, _Traits, _Alloc>& 
 __rw_replace_aux (_STD::basic_string<_CharT, _Traits, _Alloc> &__s, 
                   _StringIter __first1, _StringIter __last1,
@@ -588,7 +589,7 @@
     typedef _RW::__string_ref<value_type, traits_type, allocator_type>
      _C_string_ref_type;
 
-#  else
+#  else   // if !defined (_RWSTD_NO_STRING_OUTLINED_MEMBER_TEMPLATES)
 
 template<class _CharT, class _Traits, class _Allocator>
 template<class _InputIter>
@@ -599,7 +600,7 @@
 {
   basic_string &__s = *this;
 
-#  endif  // _RWSTD_NO_MEMBER_TEMPLATES
+#  endif  // _RWSTD_NO_STRING_OUTLINED_MEMBER_TEMPLATES
 
     _RWSTD_ASSERT_RANGE (__first1, __s._C_make_iter (__s._C_data 
                                                      + __s.size ()));
@@ -665,7 +666,7 @@
     return __s;
 }
 
-#endif   //_RWSTD_NO_INLINE_MEMBER_TEMPLATES
+#endif   // _RWSTD_NO_MEMBER_TEMPLATES
 
 
 template <class _CharT, class _Traits, class _Allocator>

Modified: incubator/stdcxx/branches/4.2.0/include/strstream
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/strstream?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/strstream (original)
+++ incubator/stdcxx/branches/4.2.0/include/strstream 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/tr1/array
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/tr1/array?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/tr1/array (original)
+++ incubator/stdcxx/branches/4.2.0/include/tr1/array 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/typeinfo
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/typeinfo?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/typeinfo (original)
+++ incubator/stdcxx/branches/4.2.0/include/typeinfo 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/utility
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/utility?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/utility (original)
+++ incubator/stdcxx/branches/4.2.0/include/utility 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/vector
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/vector?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/vector (original)
+++ incubator/stdcxx/branches/4.2.0/include/vector Tue Jun 26 16:58:07 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/branches/4.2.0/include/vector_spec.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/vector_spec.h?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/vector_spec.h (original)
+++ incubator/stdcxx/branches/4.2.0/include/vector_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/src/access.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/src/access.h?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/src/access.h (original)
+++ incubator/stdcxx/branches/4.2.0/src/access.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/source/stdlib/access.h#6 $
+ * $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/src/assert.cpp
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/src/assert.cpp?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/src/assert.cpp (original)
+++ incubator/stdcxx/branches/4.2.0/src/assert.cpp 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/src/catalog.cpp
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/src/catalog.cpp?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/src/catalog.cpp (original)
+++ incubator/stdcxx/branches/4.2.0/src/catalog.cpp Tue Jun 26 16:58:07 2007
@@ -2,20 +2,27 @@
  *
  * rwcats.cpp - Implementation of XPG4 messages
  *
- * $Id: //stdlib/dev/source/stdlib/catalog.cpp#5 $
+ * $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/src/catalog.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/src/catalog.h?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/src/catalog.h (original)
+++ incubator/stdcxx/branches/4.2.0/src/catalog.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/source/stdlib/catalog.h#6 $
+ * $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/src/codecvt.cpp
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/src/codecvt.cpp?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/src/codecvt.cpp (original)
+++ incubator/stdcxx/branches/4.2.0/src/codecvt.cpp 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/src/ctype_bits.cpp
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/src/ctype_bits.cpp?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/src/ctype_bits.cpp (original)
+++ incubator/stdcxx/branches/4.2.0/src/ctype_bits.cpp Tue Jun 26 16:58:07 2007
@@ -2,20 +2,27 @@
  *
  * ctype_bits.cpp - definitions of std::ctype_base constant data members
  *
- * $Id: //stdlib/dev/source/stdlib/ctype_bits.cpp#4 $
+ * $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/src/exception.cpp
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/src/exception.cpp?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/src/exception.cpp (original)
+++ incubator/stdcxx/branches/4.2.0/src/exception.cpp Tue Jun 26 16:58:07 2007
@@ -1,4 +1,4 @@
- /***************************************************************************
+/***************************************************************************
  *
  * exception.cpp - Source for the Standard Library exception classes
  *
@@ -40,14 +40,15 @@
 
 #include <rw/_defs.h>
 
-#if !defined (__EDG__) || defined (__DECCXX) || defined (__INTEL_COMPILER)
+#ifndef _RWSTD_EDG_ECCP
 #  include <stdarg.h>
 #else
+   // use "special" magic for the EDG eccp demo
 #  include <ansi/_cstdarg.h>
 
 _USING (_STD::va_list);
 
-#endif   // __EDG__ ...
+#endif   // EDG eccp demo
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -437,6 +438,16 @@
 static _RWSTD_THREAD int
 __rw_what_refcnt;
 
+// free memory buffer allocated in __rw_vfmtwhat()
+_RWSTD_EXPORT void __rw_free_what_buf (char* buf)
+{
+    if (__rw_what_buf == buf) {
+        _RWSTD_ASSERT (0 < __rw_what_refcnt);
+        _RWSTD_THREAD_PREDECREMENT (__rw_what_refcnt, false);
+    }
+    else
+        delete[] buf;
+}
 
 // allocate a char array and format it sprintf-style
 // caller responsible for calling delete[] on returned pointer
@@ -546,14 +557,8 @@
         if (bufsize)
             return 0;
 
-        if (buf == __rw_what_buf) {
-            _RWSTD_THREAD_PREDECREMENT (__rw_what_refcnt, false);
-        }
-        else {
-            delete[] buf;
-        }
+        __rw_free_what_buf (buf);
         buf = new char [size];
-
     }
 
     return buf;
@@ -740,13 +745,13 @@
             _STD::runtime_error ()._C_assign (what, 0);
     }
 
-    delete[] what;
+    __rw_free_what_buf (what);
 
 #else   // if defined (_RWSTD_NO_EXCEPTIONS)
 
     if (what) {
         fprintf (stderr,"Exception: %s.\n", what);
-        delete[] what;
+        __rw_free_what_buf (what);
     }
     else {
         const char *__str;
@@ -825,9 +830,6 @@
 
         // throw_proc takes ownership of allocated string
         __rw_throw_proc (id, what);
-
-        // if throw_proc returns, delete allocated what string
-        delete[] what;
     }
 }
 
@@ -839,12 +841,7 @@
 __rw_exception::__rw_exception (const __rw_exception &rhs)
     : _STD::exception (rhs), _C_what (0)
 {
-    if (rhs._C_what == __rw_what_buf) {
-        _RWSTD_THREAD_PREINCREMENT (__rw_what_refcnt, false);
-        _C_what = __rw_what_buf;
-    }
-    else
-        _C_assign (rhs.what ());
+    _C_assign (rhs.what ());
 }
 
   
@@ -866,12 +863,7 @@
 // outlined to avoid functional compatibility issues
 /* virtual */ __rw_exception::~__rw_exception () _THROWS (())
 {
-    if (_C_what == __rw_what_buf) {
-        _RWSTD_THREAD_PREDECREMENT (__rw_what_refcnt, false);
-    }
-    else {
-        delete[] _C_what;
-    }
+    __rw_free_what_buf (_C_what);
 
 #ifdef _C_dummy_what
     // zero out dummy member of the base exception class
@@ -916,21 +908,28 @@
 
         if (whatstr && *whatstr) {
 
-            if (_RWSTD_SIZE_MAX == len)
-                len = strlen (whatstr);
-
-            if (len) {
-                // allocate own buffer and copy string
-                tmp = new char [len + 1];
-                memcpy (tmp, whatstr, len + 1);
+            if (whatstr == __rw_what_buf) {
+                if (len)
+                    _RWSTD_THREAD_PREINCREMENT (__rw_what_refcnt, false);
+                tmp = __rw_what_buf;
             }
             else {
-                // special case: do not allocate, just use passed in pointer
-                tmp = _RWSTD_CONST_CAST (char*, whatstr);
+                if (_RWSTD_SIZE_MAX == len)
+                    len = strlen (whatstr);
+
+                if (len) {
+                    // allocate own buffer and copy string
+                    tmp = new char [len + 1];
+                    memcpy (tmp, whatstr, len + 1);
+                }
+                else {
+                    // special case: do not allocate, just use passed in pointer
+                    tmp = _RWSTD_CONST_CAST (char*, whatstr);
+                }
             }
         }
 
-        delete[] _C_what;
+        __rw_free_what_buf (_C_what);
         _C_what = tmp;
     }
     return *this;

Modified: incubator/stdcxx/branches/4.2.0/src/export.cpp
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/src/export.cpp?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/src/export.cpp (original)
+++ incubator/stdcxx/branches/4.2.0/src/export.cpp Tue Jun 26 16:58:07 2007
@@ -2,20 +2,27 @@
  *
  * export.cpp - exported templates
  *
- * $Id: //stdlib/dev/source/stdlib/export.cpp#11 $
+ * $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 2004-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
@@ -32,6 +39,9 @@
 
 #include <bitset>
 #include <bitset.cc>
+
+#include <complex>
+#include <complex.cc>
 
 #include <deque>
 #include <deque.cc>

Modified: incubator/stdcxx/branches/4.2.0/src/i86/atomic.s
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/src/i86/atomic.s?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/src/i86/atomic.s (original)
+++ incubator/stdcxx/branches/4.2.0/src/i86/atomic.s Tue Jun 26 16:58:07 2007
@@ -6,25 +6,33 @@
  *
  ***************************************************************************
  *
- * 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 2003-2006 Rogue Wave Software.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * 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 2003-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
+#if defined (__ELF__)
+   /* GNU as supports this .type directive only on ELF targets */
+#  define TYPE_DIR(name, kind)    .type name, kind
+#else
+#  define TYPE_DIR(ign1, ign2)
+#endif
+
     .text
     .align 4
 
@@ -36,6 +44,8 @@
  **************************************************************************/
 
     .globl __rw_atomic_xchg8
+    TYPE_DIR (__rw_atomic_xchg8, @function)
+
 __rw_atomic_xchg8:                 /* ; char (char *x, char y)        */
     mov           4(%esp), %ecx    /* ; %ecx = x                      */
     movb          8(%esp), %al     /* ; %al = y                       */
@@ -51,6 +61,8 @@
  **************************************************************************/
 
     .globl __rw_atomic_xchg16
+    TYPE_DIR (__rw_atomic_xchg16, @function)
+
 __rw_atomic_xchg16:                /* ; short (short *x, short y)     */
     mov           4(%esp), %ecx    /* ; %ecx = x                      */
     mov           8(%esp), %eax    /* ; %eax = y                      */
@@ -66,6 +78,8 @@
  **************************************************************************/
 
     .globl __rw_atomic_xchg32
+    TYPE_DIR (__rw_atomic_xchg32, @function)
+
 __rw_atomic_xchg32:                /* ; int (int *x, int y)           */
     movl          4(%esp), %ecx    /* ; %ecx = x                      */
     movl          8(%esp), %eax    /* ; %eax = y                      */
@@ -81,6 +95,8 @@
  **************************************************************************/
 
     .globl __rw_atomic_add8
+    TYPE_DIR (__rw_atomic_add8, @function)
+
 __rw_atomic_add8:                  /* ; char (char *dst, int inc)     */
     mov            4(%esp), %ecx   /* ; %ecx = dst                    */
     mov            8(%esp), %eax   /* ; %eax = inc                    */
@@ -103,6 +119,8 @@
  **************************************************************************/
 
      .globl __rw_atomic_add16
+    TYPE_DIR (__rw_atomic_add16, @function)
+
 __rw_atomic_add16:                 /* ; long (long *dst, long inc)    */
     mov            4(%esp), %ecx   /* ; %ecx = dst                    */
     mov            8(%esp), %eax   /* ; %eax = inc                    */
@@ -125,6 +143,8 @@
  **************************************************************************/
 
     .globl __rw_atomic_add32
+    TYPE_DIR (__rw_atomic_add32, @function)
+
 __rw_atomic_add32:                 /* ; long (long *dst, long inc)    */
     movl           4(%esp), %ecx   /* ; %ecx = dst                    */
     movl           8(%esp), %edx   /* ; %edx = inc                    */

Modified: incubator/stdcxx/branches/4.2.0/src/ios.cpp
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/src/ios.cpp?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/src/ios.cpp (original)
+++ incubator/stdcxx/branches/4.2.0/src/ios.cpp Tue Jun 26 16:58:07 2007
@@ -2,20 +2,27 @@
  *
  * ios.cpp - Source for the Standard Library ios classes
  *
- * $Id: //stdlib/dev/source/stdlib/ios.cpp#80 $
+ * $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/src/ios_bits.cpp
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/src/ios_bits.cpp?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/src/ios_bits.cpp (original)
+++ incubator/stdcxx/branches/4.2.0/src/ios_bits.cpp Tue Jun 26 16:58:07 2007
@@ -2,20 +2,27 @@
  *
  * ios_bits.cpp - definitions of ios_base static const data members
  *
- * $Id: //stdlib/dev/source/stdlib/ios_bits.cpp#5 $
+ * $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/src/iosdata.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/src/iosdata.h?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/src/iosdata.h (original)
+++ incubator/stdcxx/branches/4.2.0/src/iosdata.h Tue Jun 26 16:58:07 2007
@@ -2,20 +2,27 @@
  *
  * iosdata.h
  *
- * $Id: //stdlib/dev/source/stdlib/iosdata.h#8 $ 
+ * $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/src/iso2022.cpp
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/src/iso2022.cpp?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/src/iso2022.cpp (original)
+++ incubator/stdcxx/branches/4.2.0/src/iso2022.cpp 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/src/iso2022.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/src/iso2022.h?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/src/iso2022.h (original)
+++ incubator/stdcxx/branches/4.2.0/src/iso2022.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/src/limits.cpp
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/src/limits.cpp?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/src/limits.cpp (original)
+++ incubator/stdcxx/branches/4.2.0/src/limits.cpp Tue Jun 26 16:58:07 2007
@@ -2,20 +2,27 @@
  *
  * limits.cpp - Source for the Standard Library limits class
  *
- * $Id: //stdlib/dev/source/stdlib/limits.cpp#25 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * 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/src/limits_bits.cpp
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/src/limits_bits.cpp?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/src/limits_bits.cpp (original)
+++ incubator/stdcxx/branches/4.2.0/src/limits_bits.cpp Tue Jun 26 16:58:07 2007
@@ -2,20 +2,27 @@
  *
  * limits_bits.cpp - source for the C++ Standard Library limits constants
  *
- * $Id: //stdlib/dev/source/stdlib/limits_bits.cpp#6 $
+ * $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/src/locale_bits.cpp
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/src/locale_bits.cpp?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/src/locale_bits.cpp (original)
+++ incubator/stdcxx/branches/4.2.0/src/locale_bits.cpp Tue Jun 26 16:58:07 2007
@@ -2,20 +2,27 @@
  *
  * locale_bits.cpp - definitions of std::locale constant data members
  *
- * $Id: //stdlib/dev/source/stdlib/locale_bits.cpp#4 $
+ * $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/src/locale_body.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/src/locale_body.h?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/src/locale_body.h (original)
+++ incubator/stdcxx/branches/4.2.0/src/locale_body.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/source/stdlib/locale_body.h#9 $
+ * $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/src/locale_classic.cpp
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/src/locale_classic.cpp?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/src/locale_classic.cpp (original)
+++ incubator/stdcxx/branches/4.2.0/src/locale_classic.cpp Tue Jun 26 16:58:07 2007
@@ -2,20 +2,27 @@
  *
  * locale_classic.cpp - definition of std::locale::classic()
  *
- * $Id: //stdlib/dev/source/stdlib/locale_classic.cpp#6 $
+ * $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/src/locale_combine.cpp
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/src/locale_combine.cpp?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/src/locale_combine.cpp (original)
+++ incubator/stdcxx/branches/4.2.0/src/locale_combine.cpp Tue Jun 26 16:58:07 2007
@@ -3,20 +3,27 @@
  * locale_combine.cpp - definition of std::locale::combine() and related
  *                      member functions
  *
- * $Id: //stdlib/dev/source/stdlib/locale_combine.cpp#9 $
+ * $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/src/locale_core.cpp
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/src/locale_core.cpp?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/src/locale_core.cpp (original)
+++ incubator/stdcxx/branches/4.2.0/src/locale_core.cpp 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.
  * 
  **************************************************************************/
 



Mime
View raw message