stdcxx-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject svn commit: r550991 [18/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/loc/_time_get.cc
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/loc/_time_get.cc?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/loc/_time_get.cc (original)
+++ incubator/stdcxx/branches/4.2.0/include/loc/_time_get.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/_time_put.cc
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/loc/_time_put.cc?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/loc/_time_put.cc (original)
+++ incubator/stdcxx/branches/4.2.0/include/loc/_time_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/locale
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/locale?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/locale (original)
+++ incubator/stdcxx/branches/4.2.0/include/locale 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/map
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/map?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/map (original)
+++ incubator/stdcxx/branches/4.2.0/include/map Tue Jun 26 16:58:07 2007
@@ -124,8 +124,7 @@
         : _C_rep (__cmp, __alloc) { }
 
 
-#if !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES) \
-    && (!defined (_MSC_VER) || _MSC_VER >= 1300)
+#if !defined (_MSC_VER) || _MSC_VER >= 1300
 
     // 23.3.1.1, p3
     template <class _InputIter>
@@ -134,7 +133,7 @@
          const _Allocator& __alloc = _Allocator ())
       : _C_rep (__first, __last, __cmp, __alloc, false) { }
 
-#else   // if defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)
+#else   // if _MSC_VER < 1300
 
     map (const value_type* __first, const value_type* __last, 
          const key_compare &__cmp = key_compare (),
@@ -146,7 +145,7 @@
          const allocator_type &__alloc = allocator_type ())
       : _C_rep (__first, __last, __cmp, __alloc, false) { }
 
-#endif   // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
+#endif   // !defined (_MSC_VER) || _MSC_VER >= 1300
 
 
     map (const map &__rhs): _C_rep (__rhs._C_rep) { /* empty */ }
@@ -217,15 +216,14 @@
         return _C_rep.insert (__it, __x, false);
     }
 
-#if !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES) \
-    && (!defined (_MSC_VER) || _MSC_VER >= 1300)
+#if !defined (_MSC_VER) || _MSC_VER >= 1300
 
     template<class _InputIter>
     void insert (_InputIter __first, _InputIter __last) {
         _C_rep.insert (__first, __last, false);
     }
 
-#else   // if defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)
+#else   // if _MSC_VER < 1300
 
     void insert (const value_type* __first, const value_type* __last) {
         _C_rep.insert (__first, __last, false);
@@ -235,7 +233,7 @@
         _C_rep.insert (__first, __last, false);
     }
 
-#endif   // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
+#endif   // !defined (_MSC_VER) || _MSC_VER >= 1300
 
 
     void erase (iterator __it) {
@@ -364,8 +362,7 @@
               const allocator_type &__alloc = allocator_type ())
       : _C_rep (__cmp, __alloc) { }
 
-#if !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES) \
-    && (!defined (_MSC_VER) || _MSC_VER >= 1300)
+#if !defined (_MSC_VER) || _MSC_VER >= 1300
 
     template<class _InputIter>
     multimap (_InputIter __first, _InputIter __last, 
@@ -373,7 +370,7 @@
               const _Allocator& __alloc = _Allocator ()) 
       : _C_rep (__first, __last, __cmp, __alloc, true) { }
 
-#else   // if defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)
+#else   // if _MSC_VER < 1300
 
     multimap (const value_type* __first, const value_type* __last, 
               const key_compare &__cmp = key_compare (),
@@ -385,7 +382,7 @@
               const allocator_type &__alloc = allocator_type ())
       : _C_rep (__first, __last, __cmp, __alloc, true) { }
 
-#endif   // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
+#endif   // !defined (_MSC_VER) || _MSC_VER >= 1300
 
 
     multimap (const multimap &__rhs)
@@ -451,15 +448,14 @@
         return _C_rep.insert (__it, __x, true);
     }
 
-#if !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES) \
-    && (!defined (_MSC_VER) || _MSC_VER >= 1300)
+#if !defined (_MSC_VER) || _MSC_VER >= 1300
 
     template<class _InputIter>
     void insert (_InputIter __first, _InputIter __last) {
         _C_rep.insert (__first, __last, true);
     }
 
-#else  // if defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)
+#else  // if _MSC_VER < 1300
 
     void insert (const value_type* __first, const value_type* __last) {
         _C_rep.insert (__first, __last, true);
@@ -469,7 +465,7 @@
         _C_rep.insert (__first, __last, true);
     }
 
-#endif   // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
+#endif   // !defined (_MSC_VER) || _MSC_VER >= 1300
 
 
     void erase (iterator __it) {

Modified: incubator/stdcxx/branches/4.2.0/include/memory
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/memory?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/memory (original)
+++ incubator/stdcxx/branches/4.2.0/include/memory 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/new
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/new?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/new (original)
+++ incubator/stdcxx/branches/4.2.0/include/new 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/numeric
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/numeric?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/numeric (original)
+++ incubator/stdcxx/branches/4.2.0/include/numeric 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/ostream.cc
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/ostream.cc?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/ostream.cc (original)
+++ incubator/stdcxx/branches/4.2.0/include/ostream.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/queue
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/queue?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/queue (original)
+++ incubator/stdcxx/branches/4.2.0/include/queue Tue Jun 26 16:58:07 2007
@@ -7,6 +7,26 @@
  *
  ***************************************************************************
  *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
+ * 
+ ***************************************************************************
+ *
  * Copyright (c) 1994
  * Hewlett-Packard Company
  *
@@ -18,25 +38,6 @@
  * representations about the suitability of this software for any
  * purpose.  It is provided "as is" without express or implied warranty.
  *
- ***************************************************************************
- *
- * Copyright 2005-2006 The Apache Software Foundation or its licensors,
- * as applicable.
- *
- * Copyright 1994-2006 Rogue Wave Software.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
  **************************************************************************/
 
 #ifndef _RWSTD_QUEUE_INCLUDED
@@ -199,8 +200,6 @@
             _STD::make_heap (c.begin (), c.end (), comp);
     }
 
-#ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
     template <class _InputIter>
     priority_queue (_InputIter __first, _InputIter __last,
                     const _Compare   &__cmp = _Compare (),
@@ -209,19 +208,6 @@
             c.insert (c.end (), __first, __last);
             _STD::make_heap (c.begin (), c.end (), comp);
         }
-
-#else   // if defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)
-
-    priority_queue (_TYPENAME _Container::const_iterator __first,
-                    _TYPENAME _Container::const_iterator __last,
-                    const _Compare   &__cmp = _Compare (),
-                    const _Container &__c   = container_type ())
-        : c (__c), comp (__cmp) {
-            c.insert (c.end (), __first, __last);
-            _STD::make_heap (c.begin (), c.end (), comp);
-        }
-
-#endif   // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
 
     bool empty () const {
         return c.empty ();

Modified: incubator/stdcxx/branches/4.2.0/include/rw/_algobase.cc
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/rw/_algobase.cc?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/rw/_algobase.cc (original)
+++ incubator/stdcxx/branches/4.2.0/include/rw/_algobase.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/rw/_algobase.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/rw/_algobase.h?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/rw/_algobase.h (original)
+++ incubator/stdcxx/branches/4.2.0/include/rw/_algobase.h Tue Jun 26 16:58:07 2007
@@ -10,6 +10,26 @@
  *
  ***************************************************************************
  *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2005 Rogue Wave Software.
+ * 
+ ***************************************************************************
+ *
  * Copyright (c) 1994
  * Hewlett-Packard Company
  *
@@ -21,19 +41,6 @@
  * representations about the suitability of this software for any
  * purpose.  It is provided "as is" without express or implied warranty.
  *
- ***************************************************************************
- *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
- * 
  **************************************************************************/
 
 #ifndef _RWSTD_RW_ALGOBASE_H_INCLUDED
@@ -130,8 +137,6 @@
 
 _RWSTD_NAMESPACE (__rw) {
 
-#ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
 // `less than' function object - used by non-predicate forms
 // of algorithms to invoke the predicate forms for code reuse
 struct __rw_lt
@@ -146,35 +151,6 @@
 };
 
 #  define _RWSTD_LESS(ignore) _RW::__rw_lt ()
-
-#else   // if defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)
-
-template <class _TypeT>
-struct __rw_lt
-{
-    bool operator() (const _TypeT &__lhs, const _TypeT &__rhs) const {
-        return __lhs < __rhs;
-    }
-};
-
-#  ifndef _RWSTD_NO_CLASS_PARTIAL_SPEC
-
-#    define _RWSTD_LESS(iterT) \
-       _RW::__rw_lt<_TYPENAME _STD::iterator_traits< iterT >::value_type>()
-
-#  else   // if defined (_RWSTD_NO_PARTIAL_CLASS_SPEC)
-
-#    define _RWSTD_LESS(iterT) \
-       _RW::__rw_make_lt (_RWSTD_VALUE_TYPE (iterT))
-
-template <class _TypeT>
-__rw_lt<_TypeT> __rw_make_lt (const _TypeT*)
-{
-    return __rw_lt<_TypeT>();
-}
-
-#  endif   // _RWSTD_NO_PARTIAL_CLASS_SPEC
-#endif   // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
 
 
 // swaps values of 2 (possibly distinct) types

Modified: incubator/stdcxx/branches/4.2.0/include/rw/_allocator.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/rw/_allocator.h?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/rw/_allocator.h (original)
+++ incubator/stdcxx/branches/4.2.0/include/rw/_allocator.h Tue Jun 26 16:58:07 2007
@@ -23,16 +23,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/rw/_array.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/rw/_array.h?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/rw/_array.h (original)
+++ incubator/stdcxx/branches/4.2.0/include/rw/_array.h Tue Jun 26 16:58:07 2007
@@ -67,9 +67,7 @@
 
     __rw_array (const __rw_array&);
 
-    ~__rw_array () {
-        resize (0);
-    }
+    ~__rw_array ();
 
     __rw_array& operator= (const __rw_array&);
 
@@ -184,6 +182,16 @@
 
 
 template <class _TypeT>
+inline
+__rw_array<_TypeT>::
+~__rw_array ()
+{
+    __rw_destroy (_C_data, _C_data + _C_size);
+    ::operator delete (_C_data);
+}
+
+
+template <class _TypeT>
 inline void __rw_array<_TypeT>::swap (__rw_array<_TypeT> &__rhs)
 {
     pointer __tmp_data   = begin ();
@@ -200,9 +208,9 @@
 inline void __rw_array<_TypeT>::
 resize (size_type __size, const_reference __val /* = value_type () */)
 {
-    if (begin ()) {
-        __rw_destroy (begin (), end ());
-        ::operator delete (begin ());
+    if (_C_data) {
+        __rw_destroy (_C_data, _C_data + _C_size);
+        ::operator delete (_C_data);
         _C_data = 0;
     }
 

Modified: incubator/stdcxx/branches/4.2.0/include/rw/_basic_ios.cc
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/rw/_basic_ios.cc?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/rw/_basic_ios.cc (original)
+++ incubator/stdcxx/branches/4.2.0/include/rw/_basic_ios.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/rw/_bitmask.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/rw/_bitmask.h?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/rw/_bitmask.h (original)
+++ incubator/stdcxx/branches/4.2.0/include/rw/_bitmask.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/rw/_config-icc.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/rw/_config-icc.h?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/rw/_config-icc.h (original)
+++ incubator/stdcxx/branches/4.2.0/include/rw/_config-icc.h Tue Jun 26 16:58:07 2007
@@ -43,10 +43,20 @@
 #  undef _RWSTD_NO_NEW_HEADER
 #  undef _RWSTD_NO_LIBC_IN_STD
 
-#else   // if defined (_WIN{32,64}
+#else   // if defined (_WIN{32,64})
+
+#  include "_config-msvcrt.h"
+
 #  if defined (_RWSHARED)
      // only when using shared libstd and Intel C++/MSVC
      // working around an Intel C++ 7.1 bug (PR #29178)
 #    define _RWSTD_NO_OUTLINED_USE_FACET_SPECIALIZATIONS
-#  endif   // _MSC_VER > 1200 && _RWSHARED
-#endif
+#  endif   // _RWSHARED
+
+// disable "function was declared "deprecated"
+#  pragma warning (disable: 1478)
+
+// disable "dllexport/dllimport conflict with ... ; dllexport assumed"
+#  pragma warning (disable: 1740)
+
+#endif   // (_WIN{32,64})

Modified: incubator/stdcxx/branches/4.2.0/include/rw/_config-msvc.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/rw/_config-msvc.h?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/rw/_config-msvc.h (original)
+++ incubator/stdcxx/branches/4.2.0/include/rw/_config-msvc.h Tue Jun 26 16:58:07 2007
@@ -29,12 +29,9 @@
  * 
  **************************************************************************/
 
-#if _MSC_VER <= 1310   // MSVC <= 7.1
-#endif   // MSVC <= 7.1
+#include "_config-msvcrt.h"
 
 #if _MSC_VER <= 1300   // MSVC <= 7.0
-#  define _RWSTD_EXCEPTION_HANDLER_IN_STD
-#  define _RWSTD_NO_STATIC_DEF3
 #  define _RWSTD_NO_PTR_VALUE_TEMPLATE_OVERLOAD
 #  define _RWSTD_NO_PRAGMA_INSTANTIATE
      // disable explicit instantiation extensions if building
@@ -54,204 +51,24 @@
 #if _MSC_VER <= 1200   // MSVC <= 6.0
 #  define _RWSTD_NO_TYPENAME
 
-   // static data members of cass templates aren't properly collapsed
-   // (compiler emits one copy per each translation unit that contains
-   // the definition of the template member, and the linker fails to
-   // multiple copies that reside in shared libraries)
-#ifndef _RWSTD_NO_COLLAPSE_TEMPLATE_STATICS
-#  define _RWSTD_NO_COLLAPSE_TEMPLATE_STATICS
-#endif   // _RWSTD_NO_COLLAPSE_TEMPLATE_STATICS
-
-   // not declared/defined in libc
-#if !defined (_RWSTD_NO_STRTOLL_IN_LIBC)
-#  define _RWSTD_NO_STRTOLL_IN_LIBC
-#endif   // _RWSTD_NO_STRTOLL_IN_LIBC
-
-#if !defined (_RWSTD_NO_STRTOULL_IN_LIBC)
-#  define _RWSTD_NO_STRTOULL_IN_LIBC
-#endif   // _RWSTD_NO_STRTOULL_IN_LIBC
-
 #ifndef _RWSTD_NO_EXPORT
      // not implemented
 #  define _RWSTD_NO_EXPORT
 #endif   // _RWSTD_NO_EXPORT
 
-#define _RWSTD_NO_NL_LANGINFO
-
-   // functions are defined in MSVC's msvcprt.lib and msvcprtd.lib
-   // which include the compiler's implementation of the C++ Standard
-   // library and with which we (obviously) cannot use
-#ifndef _RWSTD_NO_WCTOB
-#  define _RWSTD_NO_WCTOB
-#endif   // _RWSTD_NO_WCTOB
-
-#ifndef _RWSTD_NO_WCTOB_IN_LIBC
-#  define _RWSTD_NO_WCTOB_IN_LIBC
-#endif   // _RWSTD_NO_WCTOB_IN_LIBC
-
-#ifndef _RWSTD_NO_MBRTOWC
-#  define _RWSTD_NO_MBRTOWC
-#endif   // _RWSTD_NO_MBRTOWC
-
-#ifndef _RWSTD_NO_MBRTOWC_IN_LIBC
-#  define _RWSTD_NO_MBRTOWC_IN_LIBC
-#endif   // _RWSTD_NO_MBRTOWC_IN_LIBC
-
-#ifndef _RWSTD_NO_WCRTOMB
-#  define _RWSTD_NO_WCRTOMB
-#endif   // _RWSTD_NO_WCRTOMB
-
-#ifndef _RWSTD_NO_WCRTOMB_IN_LIBC
-#  define _RWSTD_NO_WCRTOMB_IN_LIBC
-#endif   // _RWSTD_NO_WCRTOMB_IN_LIBC
-
-#ifndef _RWSTD_NO_MBSTOWCS
-#  define _RWSTD_NO_MBSTOWCS
-#endif   // _RWSTD_NO_MBSTOWCS
-
-#ifndef _RWSTD_NO_MBSTOWCS_IN_LIBC
-#  define _RWSTD_NO_MBSTOWCS_IN_LIBC
-#endif   // _RWSTD_NO_MBSTOWCS_IN_LIBC
-
-#ifndef _RWSTD_NO_MBRLEN
-#  define _RWSTD_NO_MBRLEN
-#endif   // _RWSTD_NO_MBRLEN
-
-#ifndef _RWSTD_NO_MBRLEN_IN_LIBC
-#  define _RWSTD_NO_MBRLEN_IN_LIBC
-#endif   // _RWSTD_NO_MBRLEN_IN_LIBC
-
-#ifndef _RWSTD_NO_WCSRTOMBS
-#  define _RWSTD_NO_WCSRTOMBS
-#endif   // _RWSTD_NO_WCSRTOMBS
-
-#ifndef _RWSTD_NO_WCSRTOMBS_IN_LIBC
-#  define _RWSTD_NO_WCSRTOMBS_IN_LIBC
-#endif   // _RWSTD_NO_WCSRTOMBS_IN_LIBC
-
-#ifndef _RWSTD_NO_BTOWC
-#  define _RWSTD_NO_BTOWC
-#endif   // _RWSTD_NO_BTOWC
-
-#ifndef _RWSTD_NO_BTOWC_IN_LIBC
-#  define _RWSTD_NO_BTOWC_IN_LIBC
-#endif   // _RWSTD_NO_BTOWC_IN_LIBC
-
-#ifndef _RWSTD_NO_MBSRTOWCS
-#  define _RWSTD_NO_MBSRTOWCS
-#endif   // _RWSTD_NO_MBSRTOWCS
-
-#ifndef _RWSTD_NO_MBSRTOWCS_IN_LIBC
-#  define _RWSTD_NO_MBSRTOWCS_IN_LIBC
-#endif   // _RWSTD_NO_MBSRTOWCS_IN_LIBC
-
 #endif   // MSVC <= 6.0
 
-   // enable the <cxxx> form of libc headers
-   // we can only use the rw version in include/ansi
-#ifndef _RWSTD_NO_PURE_C_HEADERS
-#  define _RWSTD_NO_PURE_C_HEADERS
-#endif   // _RWSTD_NO_PURE_C_HEADERS
-
-#if defined _RWSTD_NO_NEW_HEADER
-#  undef _RWSTD_NO_NEW_HEADER
-#endif   // _RWSTD_NO_NEW_HEADER
-
-   // our <cxxx> libc headers put the libc functions in namespace std
-#ifdef _RWSTD_NO_LIBC_IN_STD
-#  undef _RWSTD_NO_LIBC_IN_STD
-#endif   // _RWSTD_NO_LIBC_IN_STD
-
-#ifndef _RWSTD_NO_DEPRECATED_C_HEADERS
-#  define _RWSTD_NO_DEPRECATED_C_HEADERS
-#endif   // _RWSTD_NO_DEPRECATED_C_HEADERS
-
-   // operator new and delete is not reliably replaceable across
-   // shared library boundaries, which includes the shared library
-   // version of the language support library
-#define _RWSTD_NO_REPLACEABLE_NEW_DELETE
-
-   // names of (most) extern "C" libc symbols begin with an underscore
-#define _RWSTD_LIBC_SYM(name)   _ ## name
-
-#ifdef _DLL
-   // the _DLL macro is defined by the compiler when building a shared
-   // library, i.e., in response to either of the /MD and /MDd options
-   // _RWSTD_DLLIMPORT is used when declaring libc functions that need
-   // to be "imported" into the shared library
-#  define _RWSTD_DLLIMPORT   __declspec (dllimport)
-#endif   // _DLL
-
-#ifndef _RWSTD_NO_STATIC_CONST_MEMBER_DEFINITION
-     // both MSVC 7.x and Intel C++/Windows allow "inline" initializers
-     // for static const integral data members but out-of-line definitions
-     // cause multiply defined symbol errors (see PR #26562 and #30260)
-     // disable their definitions in source files (the members are still
-     // declared)
-#  define _RWSTD_NO_STATIC_CONST_MEMBER_DEFINITION
-#endif   // _RWSTD_NO_STATIC_CONST_MEMBER_DEFINITION
-
-   // enable iostream and locale support for long long integers
-#define _RWSTD_LONG_LONG __int64
-
-#if defined (_WIN64)
-     // FIXME: handle by forward declaring fuctions in <rw/_mutex.h>
-#  define _RWSTD_NO_FWD_DECLARATIONS
-#endif   // _WIN64
-
    // disable "Same type qualifier used more than once"
-#pragma warning (disable: 4114)
+#  pragma warning (disable: 4114)
 
    // disable "return type for operator->' is not a UDT"
-#pragma warning (disable: 4284)
+#  pragma warning (disable: 4284)
 
    // disable "decorated name length exceeded"
-#pragma warning (disable: 4503)
+#  pragma warning (disable: 4503)
 
    // disable "identifier was truncated to 255 characters"
-#pragma warning (disable: 4786)
-
-#if defined (WIN32) && !defined(_WIN32)
-#  define _WIN32
-#endif
-
-#ifdef _MT
-#  ifndef _RWSTD_REENTRANT
-#    define _RWSTD_REENTRANT 1
-#  endif   // _RWSTD_REENTRANT
-
-#  ifndef _RWSTD_NO_TLS
-       // thread-local stoprage declaration specifier
-#    ifndef _RWSTD_THREAD
-#      define _RWSTD_THREAD   __declspec (thread)
-#    endif   // _RWSTD_THREAD
-#  endif   // _RWSTD_NO_TLS
-#else   // if !defined (_MT)
-#  ifndef _RWSTD_THREAD
-#    define _RWSTD_THREAD   /* empty */
-#  endif   // _RWSTD_THREAD
-#endif   //_MT
-
-   // clean C++ C headers (the <cxxx> kind) not provided
-#ifndef _RWSTD_NO_PURE_C_HEADERS
-#  define _RWSTD_NO_PURE_C_HEADERS
-#endif   // _RWSTD_NO_PURE_C_HEADERS
-
-#define _RWSTD_MUNMAP_ARG1_T void*
-
-#if defined (_CPPRTTI)
-     // override in case library was configured with -GR-
-     // (i.e., with RTTI disabled)
-#  undef _RWSTD_NO_DYNAMIC_CAST
-#elif !defined (_RWSTD_NO_DYNAMIC_CAST)
-     // override in case library was configured with -GR
-     // (i.e., with RTTI enabled)
-#  define _RWSTD_NO_DYNAMIC_CAST
-#endif   // _CPPRTTI
-
-#ifndef _NATIVE_WCHAR_T_DEFINED
-   // define wchar_t if it is not a keyword recognized by the compiler
-   // (use the /Zc:wchar_t compiler option to enable wchar_t as a keyword)
-typedef unsigned short wchar_t;
+#  pragma warning (disable: 4786)
 
-#endif   // _NATIVE_WCHAR_T_DEFINED
+   // disable "'function': was declared deprecated"
+#  pragma warning (disable: 4996)

Modified: incubator/stdcxx/branches/4.2.0/include/rw/_config.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/rw/_config.h?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/rw/_config.h (original)
+++ incubator/stdcxx/branches/4.2.0/include/rw/_config.h Tue Jun 26 16:58:07 2007
@@ -164,8 +164,12 @@
 
 #if    defined (__EDG__)                \
     && !defined (__DECCXX)              \
+    && !defined (__HP_aCC)              \
     && !defined (__INTEL_COMPILER)      \
     && !defined (_SGI_COMPILER_VERSION)
+   // FIXME: make this more robust by detecting the EDG eccp demo
+   // during library configuration (and avoid relying on compiler
+   // specific macros)
 #  include "_config-eccp.h"
 #endif   // __EDG__
 
@@ -203,11 +207,11 @@
 #  endif   // _SGI_COMPILER_VERSION || !__GNUG__
 #endif   // _RWSTD_OS_IRIX64
 
-/*** MSVC (and Intel C++/Win{32,64}) **************************************/
+/*** MSVC *****************************************************************/
 
-#ifdef _MSC_VER
+#if defined (_MSC_VER) && !defined (__INTEL_COMPILER)
 #  include "_config-msvc.h"
-#endif   // _MSC_VER
+#endif   // _MSC_VER && !__INTEL_COMPILER
 
 /*** Siemens CDS++ ********************************************************/
 

Modified: incubator/stdcxx/branches/4.2.0/include/rw/_defs.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/rw/_defs.h?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/rw/_defs.h (original)
+++ incubator/stdcxx/branches/4.2.0/include/rw/_defs.h Tue Jun 26 16:58:07 2007
@@ -619,18 +619,10 @@
 // If compiler supports member and default templates then it supports
 // the _RWSTD_ALLOCATOR
 //
-#if    !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)  \
-    && !defined (_RWSTD_NO_SIMPLE_DEFAULT_TEMPLATES) \
+#if    !defined (_RWSTD_NO_SIMPLE_DEFAULT_TEMPLATES) \
     && (!defined (_MSC_VER) || _MSC_VER >= 1300)
 #  define _RWSTD_ALLOCATOR
 #endif
-
-#ifdef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-   // disable container member function templates
-#  ifndef _RWSTD_NO_CONTAINER_TEMPLATE_MEMBERS
-#    define _RWSTD_NO_CONTAINER_TEMPLATE_MEMBERS
-#  endif   // _RWSTD_NO_CONTAINER_TEMPLATE_MEMBERS
-#endif   // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
 
 
 #define _RWSTD_MB_CUR_MAX 16  // FIXME: must be determined dynamically

Modified: incubator/stdcxx/branches/4.2.0/include/rw/_error.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/rw/_error.h?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/rw/_error.h (original)
+++ incubator/stdcxx/branches/4.2.0/include/rw/_error.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.
  * 
  **************************************************************************/
 
@@ -37,14 +44,17 @@
 
 // throws an exception identified by first argument, optional arguments
 // (if any) used to format the exception object's what() string
-void _RWSTD_EXPORT __rw_throw (int, ...);
+_RWSTD_EXPORT void __rw_throw (int, ...);
+
+// frees memory buffer used for what() message
+_RWSTD_EXPORT void __rw_free_what_buf (char*);
 
 // throws an exception identified by first argument with the second
 // argument containing the exception object's what() string, which
-// if non-0, is dynamically allocated and must be delete[]'d
+// if non-0, is must be freed using __rw_free_what_buf()
 // may be assigned to a user-defined handler (e.g., to prevent
 // the library from throwing exceptions or to implement logging)
-extern void _RWSTD_EXPORT (*__rw_throw_proc)(int, char*);
+_RWSTD_EXPORT extern void (*__rw_throw_proc)(int, char*);
 
 }   // namespace __rw
 

Modified: incubator/stdcxx/branches/4.2.0/include/rw/_exception.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/rw/_exception.h?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/rw/_exception.h (original)
+++ incubator/stdcxx/branches/4.2.0/include/rw/_exception.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/rw/_file.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/rw/_file.h?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/rw/_file.h (original)
+++ incubator/stdcxx/branches/4.2.0/include/rw/_file.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/rw/_funcbase.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/rw/_funcbase.h?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/rw/_funcbase.h (original)
+++ incubator/stdcxx/branches/4.2.0/include/rw/_funcbase.h 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/rw/_heap.cc
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/rw/_heap.cc?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/rw/_heap.cc (original)
+++ incubator/stdcxx/branches/4.2.0/include/rw/_heap.cc 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/rw/_heap.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/rw/_heap.h?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/rw/_heap.h (original)
+++ incubator/stdcxx/branches/4.2.0/include/rw/_heap.h Tue Jun 26 16:58:07 2007
@@ -24,16 +24,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/rw/_iosbase.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/rw/_iosbase.h?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/rw/_iosbase.h (original)
+++ incubator/stdcxx/branches/4.2.0/include/rw/_iosbase.h Tue Jun 26 16:58:07 2007
@@ -291,13 +291,13 @@
 
     typedef void (*event_callback)(event, ios_base&, int);
 
-    // 27.5.2.6, p1
+    // 27.4.2.6, p1
     void register_callback (event_callback, int);
     
     // 27.4.2.4, p1
     static bool sync_with_stdio (bool = true);
 
-    // 27.5.2.7, p2
+    // 27.4.2.7, p2
     virtual ~ios_base ();    
 
     // returns a numeric base as per 22.2.2.1.2, p4
@@ -307,7 +307,7 @@
 
 protected:
 
-    // 27.5.2.7, p1
+    // 27.4.2.7, p1
     ios_base ();
 
     // implements basic_ios<T>::init()

Modified: incubator/stdcxx/branches/4.2.0/include/rw/_iosfailure.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/rw/_iosfailure.h?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/rw/_iosfailure.h (original)
+++ incubator/stdcxx/branches/4.2.0/include/rw/_iosfailure.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/rw/_iosfwd.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/rw/_iosfwd.h?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/rw/_iosfwd.h (original)
+++ incubator/stdcxx/branches/4.2.0/include/rw/_iosfwd.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/rw/_math.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/rw/_math.h?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/rw/_math.h (original)
+++ incubator/stdcxx/branches/4.2.0/include/rw/_math.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/rw/_new.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/rw/_new.h?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/rw/_new.h (original)
+++ incubator/stdcxx/branches/4.2.0/include/rw/_new.h Tue Jun 26 16:58:07 2007
@@ -10,16 +10,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/rw/_pair.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/rw/_pair.h?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/rw/_pair.h (original)
+++ incubator/stdcxx/branches/4.2.0/include/rw/_pair.h Tue Jun 26 16:58:07 2007
@@ -7,6 +7,26 @@
  *
  ***************************************************************************
  *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2005 Rogue Wave Software.
+ * 
+ ***************************************************************************
+ *
  * Copyright (c) 1994
  * Hewlett-Packard Company
  *
@@ -18,19 +38,6 @@
  * representations about the suitability of this software for any
  * purpose.  It is provided "as is" without express or implied warranty.
  *
- ***************************************************************************
- *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
- * 
  **************************************************************************/
 
 #ifndef _RWSTD_RW_PAIR_H_INCLUDED
@@ -67,8 +74,6 @@
     pair (const first_type &__x, const second_type &__y)
         : first (__x), second (__y) { }
 
-#ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
     // 20.2.2, p4
     template <class _TypeX, class _TypeY>
     pair (const pair <_TypeX, _TypeY> &__rhs) 
@@ -79,8 +84,6 @@
     pair<_TypeT, _TypeU>& operator= (const pair <_TypeX, _TypeY> &__rhs) {
         return first = __rhs.first, second = __rhs.second, *this;
     }
-
-#endif   // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
 
 };
 

Modified: incubator/stdcxx/branches/4.2.0/include/rw/_rawiter.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/rw/_rawiter.h?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/rw/_rawiter.h (original)
+++ incubator/stdcxx/branches/4.2.0/include/rw/_rawiter.h 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/rw/_relops.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/rw/_relops.h?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/rw/_relops.h (original)
+++ incubator/stdcxx/branches/4.2.0/include/rw/_relops.h 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/rw/_tree.cc
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/rw/_tree.cc?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/rw/_tree.cc (original)
+++ incubator/stdcxx/branches/4.2.0/include/rw/_tree.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/rw/_tree.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/rw/_tree.h?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/rw/_tree.h (original)
+++ incubator/stdcxx/branches/4.2.0/include/rw/_tree.h Tue Jun 26 16:58:07 2007
@@ -9,6 +9,26 @@
  *
  ***************************************************************************
  *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
+ * 
+ ***************************************************************************
+ *
  * Copyright (c) 1994
  * Hewlett-Packard Company
  *
@@ -20,25 +40,6 @@
  * representations about the suitability of this software for any
  * purpose.  It is provided "as is" without express or implied warranty.
  *
- ***************************************************************************
- *
- * Copyright 2005-2006 The Apache Software Foundation or its licensors,
- * as applicable.
- *
- * Copyright 1994-2006 Rogue Wave Software.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
  **************************************************************************/
 
 /***************************************************************************
@@ -151,15 +152,14 @@
     __rw_tree_iter (const _C_iterator &__rhs)
         : _C_node (__rhs._C_node) { }
 
-#if !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES) \
-    && (!defined (_MSC_VER) || _MSC_VER >= 1300)
+#if !defined (_MSC_VER) || _MSC_VER >= 1300
 
     template <class _Ptr, class _Ref>
     __rw_tree_iter (const __rw_tree_iter<_TypeT, _DiffT, _Ptr, _Ref, _Node>&
                     __rhs)
         : _C_node (__rhs._C_node) { }
 
-#endif   // _RWSTD_NO_INLINE_MEMBER_TEMPLATES && ...
+#endif   // !defined (_MSC_VER) || _MSC_VER >= 1300
 
     __rw_tree_iter (_C_link_t __lnk)
         : _C_node (__lnk) {}        
@@ -472,8 +472,7 @@
     __rb_tree (const key_compare& = key_compare (),
                const allocator_type& = allocator_type ());
 
-#if !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES) \
-    && (!defined (_MSC_VER) || _MSC_VER >= 1300)
+#if !defined (_MSC_VER) || _MSC_VER >= 1300
 
     template<class _InputIter>
     __rb_tree (_InputIter __first, _InputIter __last,
@@ -494,7 +493,7 @@
         }
     }
 
-#else   // if defined (_RWSTD_NO_MEMBER_TEMPLATES)
+#else   // if _MSC_VER < 1300
 
     __rb_tree (const value_type* __first, const value_type* __last, 
                const key_compare& __cmp,
@@ -532,7 +531,7 @@
         }
     }
    
-#endif   // _RWSTD_NO_MEMBER_TEMPLATES
+#endif   // !defined (_MSC_VER) || _MSC_VER >= 1300
 
     __rb_tree (const __rb_tree&);
 
@@ -619,8 +618,7 @@
 
     iterator insert (iterator, const value_type&, bool);
 
-#if !defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES)  \
-    && (!defined (_MSC_VER) || _MSC_VER >= 1300)
+#if !defined (_MSC_VER) || _MSC_VER >= 1300
 
     template<class _Iterator>
     void insert (_Iterator __first, _Iterator __last, bool __dup) {
@@ -629,12 +627,12 @@
     }
 
 
-#else   // if defined (_RWSTD_NO_MEMBER_TEMPLATES)
+#else   // if _MSC_VER < 1300
 
     void insert (const_iterator, const_iterator, bool);
     void insert (const value_type*, const value_type*, bool);
 
-#endif   // _RWSTD_NO_MEMBER_TEMPLATES
+#endif   // !defined (_MSC_VER) || _MSC_VER >= 1300
 
     iterator erase (iterator);
 
@@ -867,8 +865,7 @@
 #endif   // _RWSTD_NO_OPTIMIZE_SPEED
 
 
-#if defined (_RWSTD_NO_INLINE_MEMBER_TEMPLATES) \
-    || (defined (_MSC_VER) && _MSC_VER < 1300)
+#if defined (_MSC_VER) && _MSC_VER < 1300
 
 template <class _Key, class _Val, class _KeyOf, class _Comp, class _Alloc>
 inline void __rb_tree<_Key, _Val, _KeyOf, _Comp, _Alloc>::
@@ -886,7 +883,7 @@
         insert (*__first, __dup);
 }
 
-#endif   // _RWSTD_NO_MEMBER_TEMPLATES
+#endif   // defined (_MSC_VER) && _MSC_VER < 1300
          
 
 template <class _Key, class _Val, class _KeyOf, class _Comp, class _Alloc>

Modified: incubator/stdcxx/branches/4.2.0/include/rw/_typetraits.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/rw/_typetraits.h?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/rw/_typetraits.h (original)
+++ incubator/stdcxx/branches/4.2.0/include/rw/_typetraits.h Tue Jun 26 16:58:07 2007
@@ -10,16 +10,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