stdcxx-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject svn commit: r580483 [36/42] - in /incubator/stdcxx/branches/4.2.0: ./ bin/ doc/ doc/stdlibref/ doc/stdlibug/ etc/config/ etc/config/src/ etc/config/windows/ etc/nls/charmaps/ etc/nls/posix/charmaps/ etc/nls/posix/src/ etc/nls/src/ examples/manual/ exam...
Date Fri, 28 Sep 2007 20:57:41 GMT
Modified: incubator/stdcxx/branches/4.2.0/examples/manual/ctype.cpp
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/examples/manual/ctype.cpp?rev=580483&r1=580482&r2=580483&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.0/examples/manual/ctype.cpp (original)
+++ incubator/stdcxx/branches/4.2.0/examples/manual/ctype.cpp Fri Sep 28 13:55:52 2007
@@ -22,7 +22,7 @@
  * implied.   See  the License  for  the  specific language  governing
  * permissions and limitations under the License.
  *
- * Copyright 1994-2006 Rogue Wave Software.
+ * Copyright 1994-2007 Rogue Wave Software, Inc.
  * 
  **************************************************************************/
  
@@ -49,7 +49,7 @@
               << std::endl;
 
     // Convert characters to upper case.
-    ct.toupper (s, s + sizeof s / sizeof *s);
+    (ct.toupper)(s, s + sizeof s / sizeof *s);
     std::cout << s << std::endl;
   
     return 0;

Modified: incubator/stdcxx/branches/4.2.0/examples/manual/fmtflags_manip.cpp
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/examples/manual/fmtflags_manip.cpp?rev=580483&r1=580482&r2=580483&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.0/examples/manual/fmtflags_manip.cpp (original)
+++ incubator/stdcxx/branches/4.2.0/examples/manual/fmtflags_manip.cpp Fri Sep 28 13:55:52 2007
@@ -42,7 +42,7 @@
     std::ios_base::fmtflags  saved_;
 
 public:
-    fmtflags_manip (): strm_ (), saved_ () { }
+    fmtflags_manip (): strm_ (), saved_ (std::ios_base::fmtflags (-1)) { }
 
     void operator() (std::ios_base           &strm,
                      std::ios_base::fmtflags  flags) const {

Modified: incubator/stdcxx/branches/4.2.0/examples/tutorial/dynatype.cpp
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/examples/tutorial/dynatype.cpp?rev=580483&r1=580482&r2=580483&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.0/examples/tutorial/dynatype.cpp (original)
+++ incubator/stdcxx/branches/4.2.0/examples/tutorial/dynatype.cpp Fri Sep 28 13:55:52 2007
@@ -22,7 +22,7 @@
  * implied.   See  the License  for  the  specific language  governing
  * permissions and limitations under the License.
  *
- * Copyright 1994-2005 Rogue Wave Software.
+ * Copyright 2001-2005, 2007 Rogue Wave Software, Inc.
  * 
  **************************************************************************/
 
@@ -43,10 +43,7 @@
     struct map {
         typedef std::map<const dynatype*, T> map_type;
         
-        static map_type& get () {
-            static map_type m;
-            return m;
-        }
+        static map_type& get ();
     };
 
     // helper: removes this instance of dynatype from map
@@ -58,6 +55,8 @@
     // helper: copies one instance of dynatype to another
     template <class T>
     void copy (const dynatype &rhs) {
+        // cast to <const T&> instead of <T> to avoid error on gcc 3.4.4/cygwin:
+        // error: invalid static_cast from type `const dynatype' to type `int'
         *this = static_cast<const T&>(rhs);
     }
 
@@ -112,26 +111,41 @@
 
 // 14.7.3, p6 - explicit specializations must be defined before first use
 template <>
-inline void dynatype::remove<void> ()
+void dynatype::
+remove<void> ()
 { /* no-op */ }
 
 
 template <>
-inline void dynatype::copy<void> (const dynatype&)
+void dynatype::
+copy<void> (const dynatype&)
 { /* no-op */ }
 
 
 // initialize with pointers to no-ops
-inline dynatype::dynatype ()
+dynatype::
+dynatype ()
     : p_remove (&dynatype::remove<void>),
       p_copy (&dynatype::copy<void>)
 {
 }
 
 
+template <class T>
+typename dynatype::map<T>::map_type&
+dynatype::map<T>::
+get ()
+{
+    static map_type m;
+
+    return m;
+}
+
+
 // construct a dynatype object from a value of any type
 template <class T>
-inline dynatype::dynatype (const T &t)
+dynatype::
+dynatype (const T &t)
     : p_remove (&dynatype::remove<T>),
       p_copy (&dynatype::copy<T>)
 {
@@ -140,7 +154,8 @@
 
 
 // assign one dynatype object to another
-inline dynatype& dynatype::operator= (const dynatype &rhs)
+dynatype& dynatype::
+operator= (const dynatype &rhs)
 {
     if (this != &rhs) {
         // remove `this' from the associated map
@@ -159,7 +174,8 @@
 
 // assign a value of any type to an instance of dynatype
 template <class T>
-inline dynatype& dynatype::operator= (const T &t)
+dynatype& dynatype::
+operator= (const T &t)
 {
     // remove `this' from the map of the corresponding type
     (this->*p_remove)();

Modified: incubator/stdcxx/branches/4.2.0/examples/tutorial/graph.cpp
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/examples/tutorial/graph.cpp?rev=580483&r1=580482&r2=580483&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.0/examples/tutorial/graph.cpp (original)
+++ incubator/stdcxx/branches/4.2.0/examples/tutorial/graph.cpp Fri Sep 28 13:55:52 2007
@@ -22,7 +22,7 @@
  * implied.   See  the License  for  the  specific language  governing
  * permissions and limitations under the License.
  *
- * Copyright 1994-2006 Rogue Wave Software.
+ * Copyright 1994-2006, 2007 Rogue Wave Software, Inc.
  * 
  **************************************************************************/
 
@@ -34,16 +34,9 @@
 
 #include <examples.h>
 
-typedef
-    std::map<std::string, int, std::less<std::string>,
-             std::allocator<std::pair<const std::string, int> > > stringVector;
-
-typedef
-    std::map<std::string, stringVector, std::less<std::string>,
-             std::allocator<std::pair<const std::string,
-                                           stringVector > > >     graph;
-
-typedef std::pair<unsigned,std::string> DistancePair;
+typedef std::map<std::string, int>       Distances;
+typedef std::map<std::string, Distances> Cities;
+typedef std::pair<unsigned, std::string> DistancePair;
 
 bool operator< (const DistancePair& lhs, const DistancePair& rhs) {
     
@@ -57,17 +50,11 @@
 }
 
 
-std::string pendleton ("Pendleton");
-std::string pensacola ("Pensacola");
-std::string peoria ("Peoria");
-std::string phoenix ("Phoenix");
-std::string pierre ("Pierre");
-std::string pittsburgh ("Pittsburgh");
-std::string princeton ("Princeton");
-std::string pueblo ("Pueblo");
-
-void shortestDistance (graph& city_map, std::string& start_city,
-                       stringVector& distances) {
+static void
+shortestDistance (Cities            &city_map,
+                  const std::string &start_city,
+                  Distances         &dist)
+{
     
     // Process a priority queue of distances to nodes.
     std::priority_queue<DistancePair,
@@ -85,15 +72,15 @@
         que.pop ();
 
         // If we haven't seen it already, process it.
-        if (0 == distances.count (city))
+        if (0 == dist.count (city))
         {
             // Then add it to shortest distance map.
-            distances[city] = distance;
+            dist[city] = distance;
 
             // And put values into queue.
-            const stringVector& cities = city_map[city];
-            stringVector::const_iterator start = cities.begin ();
-            stringVector::const_iterator stop  = cities.end ();
+            const Distances& cities = city_map[city];
+            Distances::const_iterator start = cities.begin ();
+            Distances::const_iterator stop  = cities.end ();
 
             for (; start != stop; ++start) 
                 que.push (DistancePair (distance + (*start).second,
@@ -103,15 +90,23 @@
 }
 
 
-// Global city map
-graph cityMap;
-
 int main () {
     
     std::cout << "Graph example program "
               << " - find shortest path in a directed graph." 
               << std::endl;
 
+    static const char pendleton[]  = "Pendleton";
+    static const char pensacola[]  = "Pensacola";
+    static const char peoria[]     = "Peoria";
+    static const char phoenix[]    = "Phoenix";
+    static const char pierre[]     = "Pierre";
+    static const char pittsburgh[] = "Pittsburgh";
+    static const char princeton[]  = "Princeton";
+    static const char pueblo[]     = "Pueblo";
+
+    Cities cityMap;
+
     cityMap[pendleton][phoenix]    = 4;
     cityMap[pendleton][pueblo]     = 8;
     cityMap[pensacola][phoenix]    = 5;
@@ -125,23 +120,19 @@
     cityMap[princeton][pittsburgh] = 2;
     cityMap[pueblo][pierre]        = 3;
     
-    stringVector distances;
+    Distances dist;
     
-    shortestDistance (cityMap, pierre, distances);
-    stringVector::iterator where;
+    shortestDistance (cityMap, pierre, dist);
+    Distances::iterator where;
 
     std::cout << "Find the shortest path from : " 
-              << pierre.c_str () << std::endl;
+              << pierre << '\n';
 
-    for (where = distances.begin (); where != distances.end (); ++where)
+    for (where = dist.begin (); where != dist.end (); ++where)
         std::cout << "  Distance to: " << (*where).first << ":"
-                  <<  (*where).second << std::endl;
+                  <<  (*where).second << '\n';
         
-    std::cout << "End of graph example program" << std::endl;
+    std::cout << "End of graph example program" << '\n';
 
     return 0;
 }
-
-
-
-

Modified: incubator/stdcxx/branches/4.2.0/include/algorithm.c
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/algorithm.c?rev=580483&r1=580482&r2=580483&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/algorithm.c (original)
+++ incubator/stdcxx/branches/4.2.0/include/algorithm.c Fri Sep 28 13:55:52 2007
@@ -2,20 +2,27 @@
  *
  * algorithm.c
  *
- * $Id: //stdlib/dev/include/algorithm.c#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/include/ansi/_cwchar.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/ansi/_cwchar.h?rev=580483&r1=580482&r2=580483&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/ansi/_cwchar.h (original)
+++ incubator/stdcxx/branches/4.2.0/include/ansi/_cwchar.h Fri Sep 28 13:55:52 2007
@@ -56,11 +56,11 @@
 struct tm;
 
 #ifndef WCHAR_MIN
-#  define WCHAR_MIN _RWSTD_WCHAR_T_MIN
+#  define WCHAR_MIN _RWSTD_WCHAR_MIN
 #endif   // WCHAR_MIN
 
 #ifndef WCHAR_MAX
-#  define WCHAR_MAX _RWSTD_WCHAR_T_MAX
+#  define WCHAR_MAX _RWSTD_WCHAR_MAX
 #endif   // WCHAR_MAX
 
 #ifndef WEOF

Modified: incubator/stdcxx/branches/4.2.0/include/ansi/climits
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/ansi/climits?rev=580483&r1=580482&r2=580483&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/ansi/climits (original)
+++ incubator/stdcxx/branches/4.2.0/include/ansi/climits Fri Sep 28 13:55:52 2007
@@ -107,4 +107,9 @@
 
 #endif  // _RWSTD_NO_PURE_C_HEADERS
 
+#if (MB_LEN_MAX != _RWSTD_MB_LEN_MAX)
+#  undef MB_LEN_MAX
+#  define MB_LEN_MAX _RWSTD_MB_LEN_MAX
+#endif   // MB_LEN_MAX
+
 #endif   // _RWSTD_CLIMITS_INCLUDED

Modified: incubator/stdcxx/branches/4.2.0/include/ansi/csetjmp
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/ansi/csetjmp?rev=580483&r1=580482&r2=580483&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/ansi/csetjmp (original)
+++ incubator/stdcxx/branches/4.2.0/include/ansi/csetjmp Fri Sep 28 13:55:52 2007
@@ -54,7 +54,7 @@
 #endif   // _RWSTD_NAMESPACE_STD_OPEN == 9
 
 #else   // if defined (_RWSTD_NO_DEPRECATED_C_HEADERS)
-#undef setjmp
+
 #ifndef _RWSTD_CSETJMP_INCLUDED
 #define _RWSTD_CSETJMP_INCLUDED
 
@@ -76,5 +76,9 @@
 #endif   // _RWSTD_CSETJMP_INCLUDED
 
 #endif   // _RWSTD_NO_DEPRECATED_C_HEADERS
+
+#ifndef setjmp
+#  define setjmp(env) setjmp (env)
+#endif
 
 #endif   // _RWSTD_NO_PURE_C_HEADERS

Modified: incubator/stdcxx/branches/4.2.0/include/ansi/cwchar
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/ansi/cwchar?rev=580483&r1=580482&r2=580483&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/ansi/cwchar (original)
+++ incubator/stdcxx/branches/4.2.0/include/ansi/cwchar Fri Sep 28 13:55:52 2007
@@ -113,13 +113,15 @@
 
 #ifndef _RWSTD_NO_STRUCT_TM_IN_WCHAR_H
 using ::tm;
-#elif !defined (_RWSTD_NO_TM)
+#elif !defined (_RWSTD_NO_STRUCT_TM)
 
 }   // namespace std
 
 #include _RWSTD_ANSI_C_TIME_H
 
 namespace std {
+
+using ::tm;
 
 #endif   // NO_STRUCT_TM
 

Modified: incubator/stdcxx/branches/4.2.0/include/ansi/limits.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/ansi/limits.h?rev=580483&r1=580482&r2=580483&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/ansi/limits.h (original)
+++ incubator/stdcxx/branches/4.2.0/include/ansi/limits.h Fri Sep 28 13:55:52 2007
@@ -115,4 +115,9 @@
 #  endif   // _POSIX_PATH_MAX
 #endif   // HP-UX
 
+#if (MB_LEN_MAX != _RWSTD_MB_LEN_MAX)
+#  undef MB_LEN_MAX
+#  define MB_LEN_MAX _RWSTD_MB_LEN_MAX
+#endif   // MB_LEN_MAX
+
 #endif   // _RWSTD_LIMITS_H_INCLUDED

Modified: incubator/stdcxx/branches/4.2.0/include/ansi/wchar.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/ansi/wchar.h?rev=580483&r1=580482&r2=580483&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/ansi/wchar.h (original)
+++ incubator/stdcxx/branches/4.2.0/include/ansi/wchar.h Fri Sep 28 13:55:52 2007
@@ -198,4 +198,213 @@
 
 #  include _RWSTD_ANSI_C_WCHAR_H
 
+#  include <rw/_mbstate.h>
+
+#  ifndef WCHAR_MAX
+#    define WCHAR_MAX   _RWSTD_WCHAR_MAX
+#  endif
+
+#  ifndef WCHAR_MIN
+#    define WCHAR_MIN   _RWSTD_WCHAR_MIN
+#  endif
+
+extern "C" {
+
+// add missing declarations for functions known to be defined
+// in the system libc
+
+#  if defined (_RWSTD_NO_MBSTATE_T) && defined (_RWSTD_MBSTATE_T)
+typedef _RWSTD_MBSTATE_T mbstate_t;
+#  endif   // _RWSTD_NO_MBSTATE_T && _RWSTD_MBSTATE_T
+
+#  if defined (_RWSTD_NO_FWPRINTF) && !defined (_RWSTD_NO_FWPRINTF_IN_LIBC)
+int fwprintf (FILE*, const wchar_t*, ...);
+#    undef _RWSTD_NO_FWPRINTF
+#  endif   // _RWSTD_NO_FWPRINTF && !_RWSTD_NO_FWPRINTF_IN_LIBC
+
+#  if defined (_RWSTD_NO_FWSCANF) && !defined (_RWSTD_NO_FWSCANF_IN_LIBC)
+int fwscanf (FILE*, const wchar_t*, ...);
+#    undef _RWSTD_NO_FWSCANF
+#  endif   // _RWSTD_NO_FWSCANF && !_RWSTD_NO_FWSCANF_IN_LIBC
+
+#  if defined (_RWSTD_NO_SWPRINTF) && !defined (_RWSTD_NO_SWPRINTF_IN_LIBC)
+#    if !defined (_MSC_VER)
+
+// disabled for MSVC to avoid running into its awful declaration hackery
+int swprintf (wchar_t*, _RWSTD_SIZE_T, const wchar_t*, ...);
+
+#    endif   // !MSVC
+#    undef _RWSTD_NO_SWPRINTF
+#  endif   // _RWSTD_NO_SWPRINTF && !_RWSTD_NO_SWPRINTF_IN_LIBC
+
+#  if defined (_RWSTD_NO_SWSCANF) && !defined (_RWSTD_NO_SWSCANF_IN_LIBC)
+int swscanf (const wchar_t*, const wchar_t*, ...);
+#    undef _RWSTD_NO_SWSCANF
+#  endif   // _RWSTD_NO_SWSCANF && !_RWSTD_NO_SWSCANF_IN_LIBC
+
+#  ifdef _RWSTD_VA_LIST
+#    if defined (_RWSTD_NO_VFWPRINTF) && !defined (_RWSTD_NO_VFWPRINTF_IN_LIBC)
+int vfwprintf (FILE*, const wchar_t*, _RWSTD_VA_LIST);
+#      undef _RWSTD_NO_VFWPRINTF
+#    endif   // _RWSTD_NO_VFWPRINTF && !_RWSTD_NO_VFWPRINTF_IN_LIBC
+
+#    if defined (_RWSTD_NO_VFWSCANF) && !defined (_RWSTD_NO_VFWSCANF_IN_LIBC)
+int vfwscanf (FILE*, const wchar_t*, _RWSTD_VA_LIST);
+#      undef _RWSTD_NO_VFWSCANF
+#    endif   // _RWSTD_NO_VFWSCANF && !_RWSTD_NO_VFWSCANF_IN_LIBC
+
+#    if defined (_RWSTD_NO_VWPRINTF) && !defined (_RWSTD_NO_VWPRINTF_IN_LIBC)
+int vwprintf (const wchar_t*, _RWSTD_VA_LIST);
+#      undef _RWSTD_NO_VWPRINTF
+#    endif   // _RWSTD_NO_VWPRINTF && !_RWSTD_NO_VWPRINTF_IN_LIBC
+
+#    if defined (_RWSTD_NO_VWSCANF) && !defined (_RWSTD_NO_VWSCANF_IN_LIBC)
+int vwscanf (const wchar_t*, _RWSTD_VA_LIST);
+#      undef _RWSTD_NO_VWSCANF
+#    endif   // _RWSTD_NO_VWSCANF && !_RWSTD_NO_VWSCANF_IN_LIBC
+#  endif   // _RWSTD_VA_LIST
+
+#  if defined (_RWSTD_NO_MBRLEN) && !defined (_RWSTD_NO_MBRLEN_IN_LIBC)
+_RWSTD_SIZE_T mbrlen (const char*, _RWSTD_SIZE_T, _RWSTD_MBSTATE_T*);
+#    undef _RWSTD_NO_MBRLEN
+#  endif   // _RWSTD_NO_MBRLEN && !_RWSTD_NO_MBRLEN_IN_LIBC
+
+#  if defined (_RWSTD_NO_MBRTOWC) && !defined (_RWSTD_NO_MBRTOWC_IN_LIBC)
+_RWSTD_SIZE_T mbrtowc (wchar_t*, const char*, _RWSTD_SIZE_T, _RWSTD_MBSTATE_T*);
+#    undef _RWSTD_NO_MBRTOWC
+#  endif   // _RWSTD_NO_MBRTOWC && !_RWSTD_NO_MBRTOWC_IN_LIBC
+
+#  if defined (_RWSTD_NO_MBSINIT) && !defined (_RWSTD_NO_MBSINIT_IN_LIBC)
+int mbsinit (const _RWSTD_MBSTATE_T*);
+#    undef _RWSTD_NO_MBSINIT
+#  endif   // _RWSTD_NO_MBSINIT && !_RWSTD_NO_MBSINIT_IN_LIBC
+
+#  if defined (_RWSTD_NO_MBSRTOWCS) && !defined (_RWSTD_NO_MBSRTOWCS_IN_LIBC)
+_RWSTD_SIZE_T mbsrtowcs (const wchar_t*, const char**, _RWSTD_SIZE_T,
+                         _RWSTD_MBSTATE_T*);
+#    undef _RWSTD_NO_MBSRTOWCS
+#  endif   // _RWSTD_NO_MBSRTOWCS && !_RWSTD_NO_MBSRTOWCS_IN_LIBC
+
+#  if defined (_RWSTD_NO_WCRTOMB) && !defined (_RWSTD_NO_WCRTOMB_IN_LIBC)
+_RWSTD_SIZE_T wcrtomb (char*, wchar_t, _RWSTD_MBSTATE_T*);
+#    undef _RWSTD_NO_WCRTOMB
+#  endif   // _RWSTD_NO_WCRTOMB && !_RWSTD_NO_WCRTOMB_IN_LIBC
+
+#  if defined (_RWSTD_NO_WCSRTOMBS) && !defined (_RWSTD_NO_WCSRTOMBS_IN_LIBC)
+_RWSTD_SIZE_T wcsrtombs (char*,  const char**, _RWSTD_SIZE_T,
+                         _RWSTD_MBSTATE_T*);
+#    undef _RWSTD_NO_WCSRTOMBS
+#  endif   // _RWSTD_NO_WCSRTOMBS && !_RWSTD_NO_WCSRTOMBS_IN_LIBC
+
+
+#  if defined (_RWSTD_NO_WCSCHR) && !defined (_RWSTD_NO_WCSCHR_IN_LIBC)
+
+wchar_t* wcschr (wchar_t*, wchar_t);
+
+}   // extern "C"
+
+inline const wchar_t*
+wcschr (const wchar_t *__s, wchar_t __c)
+{
+    return wcschr (_RWSTD_CONST_CAST (wchar_t*, __s), __c);
+}
+
+extern "C" {
+
+#    undef _RWSTD_NO_WCSCHR
+#  endif   // _RWSTD_NO_WCSCHR && !_RWSTD_NO_WCSCHR_IN_LIBC
+
+
+#  if defined (_RWSTD_NO_WCSRCHR) && !defined (_RWSTD_NO_WCSRCHR_IN_LIBC)
+
+wchar_t* wcsrchr (wchar_t*, wchar_t);
+
+}   // extern "C"
+
+inline const wchar_t*
+wcsrchr (const wchar_t *__s, wchar_t __c)
+{
+    return wcsrchr (_RWSTD_CONST_CAST (wchar_t*, __s), __c);
+}
+
+extern "C" {
+
+#    undef _RWSTD_NO_WCSCHR
+#  endif   // _RWSTD_NO_WCSCHR && !_RWSTD_NO_WCSCHR_IN_LIBC
+
+
+#  if defined (_RWSTD_NO_WCSSTR) && !defined (_RWSTD_NO_WCSSTR_IN_LIBC)
+
+wchar_t* wcsstr (wchar_t*, const wchar_t*);
+
+}   // extern "C"
+
+inline const wchar_t*
+wcsstr (const wchar_t *__s1, const wchar_t *__s2)
+{
+    return wcsstr (_RWSTD_CONST_CAST (wchar_t*, __s1), __s2);
+}
+
+extern "C" {
+
+#    undef _RWSTD_NO_WCSSTR
+#  endif   // _RWSTD_NO_WCSSTR && !_RWSTD_NO_WCSSTR_IN_LIBC
+
+
+#  if defined (_RWSTD_NO_WMEMCHR) && !defined (_RWSTD_NO_WMEMCHR_IN_LIBC)
+
+wchar_t* wmemchr (wchar_t*, wchar_t, _RWSTD_SIZE_T);
+
+}   // extern "C"
+
+inline const wchar_t*
+wmemchr (const wchar_t *__s, wchar_t __c, _RWSTD_SIZE_T __n)
+{
+    return wmemchr (_RWSTD_CONST_CAST (wchar_t*, __s), __c, __n);
+}
+
+extern "C" {
+
+#    undef _RWSTD_NO_WMEMCHR
+#  endif   // _RWSTD_NO_WMEMCHR && !_RWSTD_NO_WMEMCHR_IN_LIBC
+
+
+#  if defined (_RWSTD_NO_WMEMCMP) && !defined (_RWSTD_NO_WMEMCMP_IN_LIBC)
+int wmemcmp (const wchar_t*, const wchar_t*, _RWSTD_SIZE_T);
+#    undef _RWSTD_NO_WMEMCMP
+#  endif   // _RWSTD_NO_WMEMCMP && !_RWSTD_NO_WMEMCMP_IN_LIBC
+
+#  if defined (_RWSTD_NO_WMEMCPY) && !defined (_RWSTD_NO_WMEMCPY_IN_LIBC)
+wchar_t* wmemcpy (wchar_t*, const wchar_t*, _RWSTD_SIZE_T);
+#    undef _RWSTD_NO_WMEMCPY
+#  endif   // _RWSTD_NO_WMEMCPY && !_RWSTD_NO_WMEMCPY_IN_LIBC
+
+#  if defined (_RWSTD_NO_WMEMMOVE) && !defined (_RWSTD_NO_WMEMMOVE_IN_LIBC)
+wchar_t* wmemmove (wchar_t*, const wchar_t*, _RWSTD_SIZE_T);
+#    undef _RWSTD_NO_WMEMMOVE
+#  endif   // _RWSTD_NO_WMEMMOVE && !_RWSTD_NO_WMEMMOVE_IN_LIBC
+
+#  if defined (_RWSTD_NO_WMEMSET) && !defined (_RWSTD_NO_WMEMSET_IN_LIBC)
+wchar_t* wmemset (wchar_t*, wchar_t, _RWSTD_SIZE_T);
+#    undef _RWSTD_NO_WMEMSET
+#  endif   // _RWSTD_NO_WMEMSET && !_RWSTD_NO_WMEMSET_IN_LIBC
+
+
+#  if defined (_RWSTD_NO_WPRINTF) && !defined (_RWSTD_NO_WPRINTF_IN_LIBC)
+int wprintf (const wchar_t*, ...);
+#    undef _RWSTD_NO_WPRINTF
+#  endif   // _RWSTD_NO_WPRINTF && !_RWSTD_NO_WPRINTF_IN_LIBC
+
+#  if defined (_RWSTD_NO_WSCANF) && !defined (_RWSTD_NO_WSCANF_IN_LIBC)
+int wscanf (const wchar_t*, ...);
+#    undef _RWSTD_NO_WSCANF
+#  endif   // _RWSTD_NO_WSCANF && !_RWSTD_NO_WSCANF_IN_LIBC
+
+#  if defined (_RWSTD_NO_WCTOB) && !defined (_RWSTD_NO_WCTOB_IN_LIBC)
+int wctob (_RWSTD_WINT_T);
+#    undef _RWSTD_NO_WCTOB
+#  endif   // _RWSTD_NO_WCTOB && !_RWSTD_NO_WCTOB_IN_LIBC
+
+}   // extern "C"
+
 #endif   // _RWSTD_NO_DEPRECATED_C_HEADERS

Modified: incubator/stdcxx/branches/4.2.0/include/bitset.c
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/bitset.c?rev=580483&r1=580482&r2=580483&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/bitset.c (original)
+++ incubator/stdcxx/branches/4.2.0/include/bitset.c Fri Sep 28 13:55:52 2007
@@ -2,20 +2,27 @@
  *
  * bitset.c
  *
- * $Id: //stdlib/dev/include/bitset.c#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/include/complex
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/complex?rev=580483&r1=580482&r2=580483&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/complex (original)
+++ incubator/stdcxx/branches/4.2.0/include/complex Fri Sep 28 13:55:52 2007
@@ -23,7 +23,7 @@
  * implied.   See  the License  for  the  specific language  governing
  * permissions and limitations under the License.
  *
- * Copyright 2000-2006 Rogue Wave Software.
+ * Copyright 2000-2007 Rogue Wave Software, Inc.
  * 
  **************************************************************************/
 
@@ -776,7 +776,7 @@
 //     phi = v2 * log(r1) + u2 * theta1
 _EXPORT
 template <class _TypeT>
-inline complex<_TypeT>
+complex<_TypeT>
 pow (const complex<_TypeT>&, const complex<_TypeT>&);
 
 

Modified: incubator/stdcxx/branches/4.2.0/include/deque.c
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/deque.c?rev=580483&r1=580482&r2=580483&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/deque.c (original)
+++ incubator/stdcxx/branches/4.2.0/include/deque.c Fri Sep 28 13:55:52 2007
@@ -2,20 +2,27 @@
  *
  * deque.c
  *
- * $Id: //stdlib/dev/include/deque.c#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/include/fstream.c
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/fstream.c?rev=580483&r1=580482&r2=580483&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/fstream.c (original)
+++ incubator/stdcxx/branches/4.2.0/include/fstream.c Fri Sep 28 13:55:52 2007
@@ -2,20 +2,27 @@
  *
  * fstream.c
  *
- * $Id: //stdlib/dev/include/fstream.c#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/include/fstream.cc
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/fstream.cc?rev=580483&r1=580482&r2=580483&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/fstream.cc (original)
+++ incubator/stdcxx/branches/4.2.0/include/fstream.cc Fri Sep 28 13:55:52 2007
@@ -7,22 +7,23 @@
  *
  ***************************************************************************
  *
- * Copyright 2005-2006 The Apache Software Foundation or its licensors,
- * as applicable.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
  *
- * Copyright 1994-2006 Rogue Wave Software.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1997-2006 Rogue Wave Software, Inc.
  * 
  **************************************************************************/
 
@@ -351,8 +352,14 @@
         _RWSTD_STREAMSIZE __nchars;
 
         if (__unbuf) {
-            __buf    = &__c_to_char;
-            __nchars = 1;
+            if (this->_C_is_eof (__c)){
+                __buf    = 0;
+                __nchars = 0;
+            }
+            else {
+                __buf    = &__c_to_char;
+                __nchars = 1;
+            }
         }
         else {
             // call xsputn() with a special value to have it flush

Modified: incubator/stdcxx/branches/4.2.0/include/istream.c
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/istream.c?rev=580483&r1=580482&r2=580483&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/istream.c (original)
+++ incubator/stdcxx/branches/4.2.0/include/istream.c Fri Sep 28 13:55:52 2007
@@ -2,20 +2,27 @@
  *
  * istream.c
  *
- * $Id: //stdlib/dev/include/istream.c#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/include/limits
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/limits?rev=580483&r1=580482&r2=580483&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/limits (original)
+++ incubator/stdcxx/branches/4.2.0/include/limits Fri Sep 28 13:55:52 2007
@@ -23,7 +23,7 @@
  * implied.   See  the License  for  the  specific language  governing
  * permissions and limitations under the License.
  *
- * Copyright 1994-2006 Rogue Wave Software.
+ * Copyright 1994-2007 Rogue Wave Software, Inc.
  * 
  **************************************************************************/
 
@@ -86,69 +86,35 @@
 #endif   // _RWSTD_IS_IEC559
 
 
-_RWSTD_NAMESPACE (__rw) { 
+_RWSTD_NAMESPACE (__rw) {
+
+extern "C" {
 
 _RWSTD_EXPORT extern const float       __rw_flt_infinity;
 _RWSTD_EXPORT extern const double      __rw_dbl_infinity;
 
-#define _RWSTD_FLT_INFINITY            _RW::__rw_flt_infinity
-#define _RWSTD_DBL_INFINITY            _RW::__rw_dbl_infinity
-
 _RWSTD_EXPORT extern const float       __rw_flt_qNaN;
 _RWSTD_EXPORT extern const double      __rw_dbl_qNaN;
 
-#define _RWSTD_FLT_QNAN                _RW::__rw_flt_qNaN
-#define _RWSTD_DBL_QNAN                _RW::__rw_dbl_qNaN
+_RWSTD_EXPORT extern const float       __rw_flt_sNaN;
+_RWSTD_EXPORT extern const double      __rw_dbl_sNaN;
 
 _RWSTD_EXPORT extern const float       __rw_flt_denorm_min;
 _RWSTD_EXPORT extern const double      __rw_dbl_denorm_min;
 
-#define _RWSTD_FLT_DENORM_MIN          _RW::__rw_flt_denorm_min
-#define _RWSTD_DBL_DENORM_MIN          _RW::__rw_dbl_denorm_min
-
-
 #ifndef _RWSTD_NO_LONG_DOUBLE
 
 _RWSTD_EXPORT extern const long double __rw_ldbl_infinity;
 _RWSTD_EXPORT extern const long double __rw_ldbl_qNaN;
+_RWSTD_EXPORT extern const long double __rw_ldbl_sNaN;
 _RWSTD_EXPORT extern const long double __rw_ldbl_denorm_min;
 
-#  define _RWSTD_LDBL_INFINITY         _RW::__rw_ldbl_infinity
-#  define _RWSTD_LDBL_QNAN             _RW::__rw_ldbl_qNaN
-#  define _RWSTD_LDBL_DENORM_MIN       _RW::__rw_ldbl_denorm_min
-
 #endif   // _RWSTD_NO_LONG_DOUBLE
 
-}   // namespace __rw
-
-
-// signaling NAN
-#if defined (FLT_SNAN) && defined (DBL_SNAN) && defined (LDBL_SNAN)  // DEC osf
-#  define _RWSTD_FLT_SNAN    FLT_SNAN
-#  define _RWSTD_DBL_SNAN    DBL_SNAN
-#  define _RWSTD_LDBL_SNAN   LDBL_SNAN
-#else
-
-_RWSTD_NAMESPACE (__rw) { 
-
-_RWSTD_EXPORT extern const float       __rw_flt_sNaN;
-_RWSTD_EXPORT extern const double      __rw_dbl_sNaN;
-
-#  define _RWSTD_FLT_SNAN              _RW::__rw_flt_sNaN
-#  define _RWSTD_DBL_SNAN              _RW::__rw_dbl_sNaN
-
-#  ifndef _RWSTD_NO_LONG_DOUBLE
-
-_RWSTD_EXPORT extern const long double __rw_ldbl_sNaN;
-
-#    define _RWSTD_LDBL_SNAN           _RW::__rw_ldbl_sNaN
-
-#  endif   // _RWSTD_NO_LONG_DOUBLE
+}   // extern "C"
 
 }   // namespace __rw
 
-#endif   // FLT_SNAN && DBL_SNAN && LDBL_SNAN
-
 
 #ifndef _RWSTD_NO_SIGNALING_NAN
 #  define _RWSTD_HAS_SIG_NAN true
@@ -400,10 +366,10 @@
                    float_denorm_style (_RWSTD_FLT_HAS_DENORM));
     _RWSTD_STATIC (float, bool, has_denorm_loss, _RWSTD_HAS_DENORM_LOSS);
 
-    _RWSTD_STATIC_FUN (float, infinity,      _RWSTD_FLT_INFINITY)
-    _RWSTD_STATIC_FUN (float, quiet_NaN,     _RWSTD_FLT_QNAN)
-    _RWSTD_STATIC_FUN (float, signaling_NaN, _RWSTD_FLT_SNAN)
-    _RWSTD_STATIC_FUN (float, denorm_min,    _RWSTD_FLT_DENORM_MIN)
+    _RWSTD_STATIC_FUN (float, infinity,      _RW::__rw_flt_infinity)
+    _RWSTD_STATIC_FUN (float, quiet_NaN,     _RW::__rw_flt_qNaN)
+    _RWSTD_STATIC_FUN (float, signaling_NaN, _RW::__rw_flt_sNaN)
+    _RWSTD_STATIC_FUN (float, denorm_min,    _RW::__rw_flt_denorm_min)
 
     _RWSTD_STATIC (float, bool, is_iec559,  _RWSTD_IS_IEC559);
     _RWSTD_STATIC (float, bool, is_bounded, true);
@@ -447,10 +413,10 @@
                    float_denorm_style (_RWSTD_DBL_HAS_DENORM));
     _RWSTD_STATIC (double, bool, has_denorm_loss,   _RWSTD_HAS_DENORM_LOSS);
 
-    _RWSTD_STATIC_FUN (double, infinity,      _RWSTD_DBL_INFINITY)
-    _RWSTD_STATIC_FUN (double, quiet_NaN,     _RWSTD_DBL_QNAN)
-    _RWSTD_STATIC_FUN (double, signaling_NaN, _RWSTD_DBL_SNAN)
-    _RWSTD_STATIC_FUN (double, denorm_min,    _RWSTD_DBL_DENORM_MIN)
+    _RWSTD_STATIC_FUN (double, infinity,      _RW::__rw_dbl_infinity)
+    _RWSTD_STATIC_FUN (double, quiet_NaN,     _RW::__rw_dbl_qNaN)
+    _RWSTD_STATIC_FUN (double, signaling_NaN, _RW::__rw_dbl_sNaN)
+    _RWSTD_STATIC_FUN (double, denorm_min,    _RW::__rw_dbl_denorm_min)
 
     _RWSTD_STATIC (double, bool, is_iec559,  _RWSTD_IS_IEC559);
     _RWSTD_STATIC (double, bool, is_bounded, true);
@@ -496,10 +462,10 @@
                    float_denorm_style (_RWSTD_LDBL_HAS_DENORM));
     _RWSTD_STATIC (long double, bool, has_denorm_loss, _RWSTD_HAS_DENORM_LOSS);
 
-    _RWSTD_STATIC_FUN (long double, infinity,      _RWSTD_LDBL_INFINITY)
-    _RWSTD_STATIC_FUN (long double, quiet_NaN,     _RWSTD_LDBL_QNAN)
-    _RWSTD_STATIC_FUN (long double, signaling_NaN, _RWSTD_LDBL_SNAN)
-    _RWSTD_STATIC_FUN (long double, denorm_min,    _RWSTD_LDBL_DENORM_MIN)
+    _RWSTD_STATIC_FUN (long double, infinity,      _RW::__rw_ldbl_infinity)
+    _RWSTD_STATIC_FUN (long double, quiet_NaN,     _RW::__rw_ldbl_qNaN)
+    _RWSTD_STATIC_FUN (long double, signaling_NaN, _RW::__rw_ldbl_sNaN)
+    _RWSTD_STATIC_FUN (long double, denorm_min,    _RW::__rw_ldbl_denorm_min)
 
     _RWSTD_STATIC (long double, bool, is_iec559,  _RWSTD_IS_IEC559);
     _RWSTD_STATIC (long double, bool, is_bounded, true);
@@ -531,7 +497,7 @@
 #ifndef _RWSTD_NO_WCHAR_T
 #  ifndef _RWSTD_NO_NATIVE_WCHAR_T
 
-_RWSTD_SPECIALIZE_LIMITS (wchar_t, _RWSTD_WCHAR_T)
+_RWSTD_SPECIALIZE_LIMITS (wchar_t, _RWSTD_WCHAR)
 
 #  endif   // _RWSTD_NO_NATIVE_WCHAR_T
 #endif   // _RWSTD_NO_WCHAR_T

Modified: incubator/stdcxx/branches/4.2.0/include/limits.c
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/limits.c?rev=580483&r1=580482&r2=580483&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/limits.c (original)
+++ incubator/stdcxx/branches/4.2.0/include/limits.c Fri Sep 28 13:55:52 2007
@@ -2,20 +2,27 @@
  *
  * limits.c
  *
- * $Id: //stdlib/dev/include/limits.c#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/include/list.c
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/list.c?rev=580483&r1=580482&r2=580483&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/list.c (original)
+++ incubator/stdcxx/branches/4.2.0/include/list.c Fri Sep 28 13:55:52 2007
@@ -2,20 +2,27 @@
  *
  * list.c
  *
- * $Id: //stdlib/dev/include/list.c#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/include/loc/_codecvt.c
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/loc/_codecvt.c?rev=580483&r1=580482&r2=580483&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/loc/_codecvt.c (original)
+++ incubator/stdcxx/branches/4.2.0/include/loc/_codecvt.c Fri Sep 28 13:55:52 2007
@@ -2,20 +2,27 @@
  *
  * loc/_codecvt.c
  *
- * $Id: //stdlib/dev/include/loc/_codecvt.c#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/include/loc/_codecvt.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/loc/_codecvt.h?rev=580483&r1=580482&r2=580483&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/loc/_codecvt.h (original)
+++ incubator/stdcxx/branches/4.2.0/include/loc/_codecvt.h Fri Sep 28 13:55:52 2007
@@ -25,7 +25,7 @@
  * implied.   See  the License  for  the  specific language  governing
  * permissions and limitations under the License.
  *
- * Copyright 1994-2006 Rogue Wave Software.
+ * Copyright 1994-2007 Rogue Wave Software, Inc.
  * 
  **************************************************************************/
 
@@ -186,8 +186,7 @@
     typedef char             intern_type;
     typedef _RWSTD_MBSTATE_T state_type;
 
-    _EXPLICIT codecvt (_RWSTD_SIZE_T __refs = 0)
-        : _RW::__rw_facet (__refs), _C_always_noconv (-1) { }
+    _EXPLICIT codecvt (_RWSTD_SIZE_T = 0);
 
     virtual ~codecvt ();
 
@@ -318,23 +317,16 @@
     virtual result
     do_unshift (state_type&, extern_type*, extern_type*, extern_type*&) const;
 
-    virtual bool do_always_noconv () const _THROWS (()) {
-        return false;   // conversion always necessary
-    }
+    virtual bool do_always_noconv () const _THROWS (());
 
-    virtual int do_encoding () const _THROWS (()) {
-        // 22.2.1.5.2 p6    1(ext.) <=> 1(int.)
-        return 1;   
-    }
+    virtual int do_encoding () const _THROWS (());
 
     // signature follows lwg issue 75
     virtual int
     do_length (state_type&,
                const extern_type*, const extern_type*, _RWSTD_SIZE_T) const;
 
-    virtual int do_max_length () const _THROWS (()) {
-        return 1;
-    }
+    virtual int do_max_length () const _THROWS (());
 
 public:
 

Modified: incubator/stdcxx/branches/4.2.0/include/loc/_collate.c
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/loc/_collate.c?rev=580483&r1=580482&r2=580483&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/loc/_collate.c (original)
+++ incubator/stdcxx/branches/4.2.0/include/loc/_collate.c Fri Sep 28 13:55:52 2007
@@ -2,20 +2,27 @@
  *
  * loc/_collate.c
  *
- * $Id: //stdlib/dev/include/loc/_collate.c#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/include/loc/_ctype.c
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/loc/_ctype.c?rev=580483&r1=580482&r2=580483&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/loc/_ctype.c (original)
+++ incubator/stdcxx/branches/4.2.0/include/loc/_ctype.c Fri Sep 28 13:55:52 2007
@@ -2,20 +2,27 @@
  *
  * loc/_ctype.c
  *
- * $Id: //stdlib/dev/include/loc/_ctype.c#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/include/loc/_ctype.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/loc/_ctype.h?rev=580483&r1=580482&r2=580483&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/loc/_ctype.h (original)
+++ incubator/stdcxx/branches/4.2.0/include/loc/_ctype.h Fri Sep 28 13:55:52 2007
@@ -421,56 +421,8 @@
 
     typedef wchar_t char_type;
 
-protected:
-    // inline virtual functions defined first to allow compilers to
-    // inline their definitions when being called from nonvirtuals
-
-    virtual ~ctype ();
-
-    // 22.2.1.1.2, p1
-    virtual bool do_is (mask, char_type) const;
-
-    virtual const char_type*
-    do_is (const char_type*, const char_type*, mask*) const;
-
-    // 22.2.1.1.2, p7
-    virtual char_type do_toupper (char_type) const;
-
-    // 22.2.1.1.2, p9
-    virtual char_type do_tolower (char_type) const;
-
-    // 22.2.1.1.2, p11
-    virtual char_type do_widen (char) const;
-
-    virtual const char*
-    do_widen (const char*, const char*, char_type*) const;
-
-    // 22.2.1.1.2, p13
-    virtual char
-    do_narrow (char_type, char) const;
-
-    virtual const char_type*
-    do_toupper (char_type*, const char_type*) const;
-
-    virtual const char_type*
-    do_tolower (char_type*, const char_type*) const;
-
-    // 22.2.1.1.2, p3
-    virtual const char_type*
-    do_scan_is (mask, const char_type*, const char_type*) const;
-
-    // 22.2.1.1.2, p5
-    virtual const char_type*
-    do_scan_not (mask, const char_type*, const char_type*) const;
-
-    virtual const char_type*
-    do_narrow (const char_type*, const char_type*, char, char*) const;
-
-public:
-
     _EXPLICIT ctype (_RWSTD_SIZE_T = 0);
 
-
     // 22.2.1.1.1, p1
     bool is (mask __m, char_type __c) const {
         return do_is ( __m, __c);
@@ -529,6 +481,49 @@
     }
 
     static _RW::__rw_facet_id id;
+
+protected:
+
+    virtual ~ctype ();
+
+    // 22.2.1.1.2, p1
+    virtual bool do_is (mask, char_type) const;
+
+    virtual const char_type*
+    do_is (const char_type*, const char_type*, mask*) const;
+
+    // 22.2.1.1.2, p7
+    virtual char_type do_toupper (char_type) const;
+
+    // 22.2.1.1.2, p9
+    virtual char_type do_tolower (char_type) const;
+
+    // 22.2.1.1.2, p11
+    virtual char_type do_widen (char) const;
+
+    virtual const char*
+    do_widen (const char*, const char*, char_type*) const;
+
+    // 22.2.1.1.2, p13
+    virtual char
+    do_narrow (char_type, char) const;
+
+    virtual const char_type*
+    do_toupper (char_type*, const char_type*) const;
+
+    virtual const char_type*
+    do_tolower (char_type*, const char_type*) const;
+
+    // 22.2.1.1.2, p3
+    virtual const char_type*
+    do_scan_is (mask, const char_type*, const char_type*) const;
+
+    // 22.2.1.1.2, p5
+    virtual const char_type*
+    do_scan_not (mask, const char_type*, const char_type*) const;
+
+    virtual const char_type*
+    do_narrow (const char_type*, const char_type*, char, char*) const;
 
 private:
 

Modified: incubator/stdcxx/branches/4.2.0/include/loc/_facet.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/loc/_facet.h?rev=580483&r1=580482&r2=580483&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/loc/_facet.h (original)
+++ incubator/stdcxx/branches/4.2.0/include/loc/_facet.h Fri Sep 28 13:55:52 2007
@@ -38,20 +38,10 @@
 
 
 _RWSTD_NAMESPACE (std) { 
-}   // namespace std
-
-_RWSTD_NAMESPACE (_V3_LOCALE) { 
-
-#ifndef _MSC_VER
-// make _V3_LOCALE think it's std (if it isn't) to avoid
-// having to qualify all references to standard names with _STD::
-_USING (namespace std);
-
-#endif
 
 struct _RWSTD_CLASS_EXPORT locale;
 
-}   // namespace _V3_LOCALE
+}   // namespace std
 
 
 _RWSTD_NAMESPACE (__rw) { 
@@ -66,10 +56,14 @@
     // of standard types by the library
     typedef __rw_facet* (_C_ctor_t)(_RWSTD_SIZE_T, const char*);
 
+protected:
+
     _EXPLICIT __rw_facet (_RWSTD_SIZE_T = 0);
 
     virtual ~__rw_facet ();
 
+public:
+
     // types of standard facets; only globally managed facets (i.e.,
     // standard facets created internally) set this member, user-created
     // facet objects of any types set their type to _C_unknown
@@ -200,8 +194,6 @@
 
 protected:
 
-    typedef __rw_facet* (*_C_factory_f)(void*);
-
     // set facet locale name (will allocate if bufsize is too small)
     void _C_set_name (const char*, char*, _RWSTD_SIZE_T);
 
@@ -227,7 +219,7 @@
     static __rw_facet*
     _C_manage (__rw_facet*, _C_facet_type, const char*, _C_ctor_t*);
 
-    friend struct _V3_LOCALE::locale;
+    friend struct _STD::locale;
     friend class __rw_locale;
     friend struct __rw_facet_id;
     friend struct __rw_access;
@@ -270,7 +262,7 @@
     _MUTABLE _RWSTD_SIZE_T _C_id;           // unique id > 0
 
     friend class __rw_locale;
-    friend struct _V3_LOCALE::locale;
+    friend struct _STD::locale;
     friend struct __rw_access;
 };
 

Modified: incubator/stdcxx/branches/4.2.0/include/loc/_localedef.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/loc/_localedef.h?rev=580483&r1=580482&r2=580483&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/loc/_localedef.h (original)
+++ incubator/stdcxx/branches/4.2.0/include/loc/_localedef.h Fri Sep 28 13:55:52 2007
@@ -6,23 +6,24 @@
  *
  ***************************************************************************
  *
- * 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 2001-2006 Rogue Wave Software.
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
- * 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
+ * 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.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * Copyright 2001-2007 Rogue Wave Software, Inc.
  *
- * 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_LOC_LOCALEDEF_H_INCLUDED
@@ -88,7 +89,7 @@
     _RWSTD_UINT32_T codecvt_ext_off;
 
     // the size of the longest multibyte character
-    unsigned char mb_cur_max;
+    _RWSTD_UINT8_T mb_cur_max;
 
     // the name of the codeset and its database file
     const char* codeset_name () const {
@@ -150,10 +151,10 @@
     // this is added to allow for future extensions
     _RWSTD_UINT32_T ctype_ext_off;      // extended ctype data offset
 
-    unsigned char toupper_tab[256];   // the narrow char to_upper table
-    unsigned char tolower_tab[256];   // the narrow char to_lower table
-    _RWSTD_UINT32_T  mask_tab[256];      // the narrow char mask table
-    unsigned char mb_cur_max;         // max number of bytes per MB character
+    _RWSTD_UINT8_T  toupper_tab[256];   // the narrow char to_upper table
+    _RWSTD_UINT8_T  tolower_tab[256];   // the narrow char to_lower table
+    _RWSTD_UINT32_T mask_tab[256];      // the narrow char mask table
+    _RWSTD_UINT8_T  mb_cur_max;         // max number of bytes per MB character
 
     _RWSTD_SIZE_T wtoupper_s () const {
         return (wtolower_off - wtoupper_off) / sizeof (__rw_upper_elm);
@@ -236,11 +237,11 @@
 
     _RWSTD_UINT32_T undefined_optimization;
 
-    unsigned char longest_weight;    // the longest weight value
-    unsigned char num_weights;       // number of weights
-    unsigned char largest_ce;
+    _RWSTD_UINT8_T longest_weight;    // the longest weight value
+    _RWSTD_UINT8_T num_weights;       // number of weights
+    _RWSTD_UINT8_T largest_ce;
 
-    unsigned char weight_type[256];  // weight types (ex. forward)
+    _RWSTD_UINT8_T weight_type[256];  // weight types (ex. forward)
 
     // get the offset of a table number `tabno'
     _RWSTD_UINT32_T get_n_tab_off (_RWSTD_UINT32_T tabno) const {
@@ -266,29 +267,29 @@
                             + (tabno * sizeof (_RWSTD_UINT32_T))))));
     }
 
-    unsigned char get_first_char_in_n_tab (_RWSTD_UINT32_T tabno) const {
-        return *((const unsigned char*)this + sizeof *this 
+    _RWSTD_UINT8_T get_first_char_in_n_tab (_RWSTD_UINT32_T tabno) const {
+        return *((const _RWSTD_UINT8_T*)this + sizeof *this 
                  + n_char_first_char_off + tabno);
         
     }
 
-    unsigned char get_first_char_in_n_ce_tab (_RWSTD_UINT32_T tabno) const {
-        return *((const unsigned char*)this + sizeof *this 
+    _RWSTD_UINT8_T get_first_char_in_n_ce_tab (_RWSTD_UINT32_T tabno) const {
+        return *((const _RWSTD_UINT8_T*)this + sizeof *this 
                  + n_ce_first_char_off + tabno);
     }
 
-    unsigned char get_first_char_in_w_ce_tab (_RWSTD_UINT32_T tabno) const {
-        return *((const unsigned char*)this + sizeof *this 
+    _RWSTD_UINT8_T get_first_char_in_w_ce_tab (_RWSTD_UINT32_T tabno) const {
+        return *((const _RWSTD_UINT8_T*)this + sizeof *this 
                  + w_ce_first_char_off + tabno);
     }
 
-    unsigned char get_last_char_in_n_ce_tab (_RWSTD_UINT32_T tabno) const {
-        return *((const unsigned char*)this + sizeof *this 
+    _RWSTD_UINT8_T get_last_char_in_n_ce_tab (_RWSTD_UINT32_T tabno) const {
+        return *((const _RWSTD_UINT8_T*)this + sizeof *this 
                  + n_ce_last_char_off  + tabno);
     }
 
-    unsigned char get_last_char_in_w_ce_tab (_RWSTD_UINT32_T tabno) const {
-        return *((const unsigned char*)this + sizeof *this 
+    _RWSTD_UINT8_T get_last_char_in_w_ce_tab (_RWSTD_UINT32_T tabno) const {
+        return *((const _RWSTD_UINT8_T*)this + sizeof *this 
                  + w_ce_last_char_off + tabno);
     }
 
@@ -318,8 +319,8 @@
                             + (tabno * sizeof (_RWSTD_UINT32_T))))));
     }
 
-    unsigned char get_first_char_in_w_tab (_RWSTD_UINT32_T tabno) const {
-        return *((const unsigned char*)this + sizeof *this 
+    _RWSTD_UINT8_T get_first_char_in_w_tab (_RWSTD_UINT32_T tabno) const {
+        return *((const _RWSTD_UINT8_T*)this + sizeof *this 
                  + w_char_first_char_off + tabno);
         
     }
@@ -682,7 +683,7 @@
 static inline _RWSTD_SIZE_T
 __rw_itoutf8 (_RWSTD_UINT32_T wchar, char *to)
 {
-    typedef unsigned char _UChar;
+    typedef _RWSTD_UINT8_T _UChar;
 
     if (wchar < 0x80U) {
         to [0] = _UChar (wchar);
@@ -739,8 +740,8 @@
 
     typedef _RWSTD_INT32_T _Int32;
 
-    const unsigned char* const byte =
-        _RWSTD_REINTERPRET_CAST (const unsigned char*, from);
+    const _RWSTD_UINT8_T* const byte =
+        _RWSTD_REINTERPRET_CAST (const _RWSTD_UINT8_T*, from);
 
     if (byte [0] < 0x80U) {
         *ret = _Int32 (byte [0]);
@@ -823,7 +824,7 @@
                        const char     *&from,
                        const char     *from_end)
 {
-    typedef unsigned char _UChar;
+    typedef _RWSTD_UINT8_T _UChar;
 
     // `bit31' has the most significant bit set and all others clear
     const unsigned bit31 = 0x80000000U;

Modified: incubator/stdcxx/branches/4.2.0/include/loc/_messages.c
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/loc/_messages.c?rev=580483&r1=580482&r2=580483&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/loc/_messages.c (original)
+++ incubator/stdcxx/branches/4.2.0/include/loc/_messages.c Fri Sep 28 13:55:52 2007
@@ -2,20 +2,27 @@
  *
  * loc/_messages.c
  *
- * $Id: //stdlib/dev/include/loc/_messages.c#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/include/loc/_messages.cc
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/loc/_messages.cc?rev=580483&r1=580482&r2=580483&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/loc/_messages.cc (original)
+++ incubator/stdcxx/branches/4.2.0/include/loc/_messages.cc Fri Sep 28 13:55:52 2007
@@ -6,22 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright 2005-2006 The Apache Software Foundation or its licensors,
- * as applicable.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
  *
- * Copyright 2001-2006 Rogue Wave Software.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2007 Rogue Wave Software, Inc.
  * 
  **************************************************************************/
 
@@ -33,6 +34,25 @@
 
 template <class _CharT>
 _RW::__rw_facet_id messages<_CharT>::id;
+
+
+template <class _CharT>
+messages_base::catalog
+messages<_CharT>::
+do_open (const string& __fun, const locale&__loc) const
+{
+    return _RW::__rw_cat_open (__fun, __loc);
+}
+
+
+template <class _CharT>
+void
+messages<_CharT>::
+do_close (messages_base::catalog __cat) const
+{
+    _RW::__rw_cat_close (__cat);
+}
+
 
 template <class _CharT>
 _TYPENAME messages<_CharT>::string_type

Modified: incubator/stdcxx/branches/4.2.0/include/loc/_messages.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/loc/_messages.h?rev=580483&r1=580482&r2=580483&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/loc/_messages.h (original)
+++ incubator/stdcxx/branches/4.2.0/include/loc/_messages.h Fri Sep 28 13:55:52 2007
@@ -25,7 +25,7 @@
  * implied.   See  the License  for  the  specific language  governing
  * permissions and limitations under the License.
  *
- * Copyright 1994-2006 Rogue Wave Software.
+ * Copyright 1994-2007 Rogue Wave Software, Inc.
  * 
  **************************************************************************/
 
@@ -82,7 +82,7 @@
                          allocator<char_type> > string_type;
 
     _EXPLICIT messages (_RWSTD_SIZE_T __refs = 0)
-        : _RW::__rw_facet (__refs), messages_base () { }
+        : _RW::__rw_facet (__refs) { }
 
 
     catalog open (const string& __fun, const locale& __loc) const {
@@ -102,15 +102,11 @@
 
 protected:
 
-    virtual catalog do_open (const string& __fun, const locale&__loc) const {
-        return _RW::__rw_cat_open (__fun, __loc);
-    }
+    virtual catalog do_open (const string&, const locale&) const;
 
     virtual string_type do_get (catalog, int, int, const string_type&) const;
 
-    virtual void do_close (catalog __cat) const { 
-	_RW::__rw_cat_close (__cat);
-    }
+    virtual void do_close (catalog) const;
 };
 
 

Modified: incubator/stdcxx/branches/4.2.0/include/loc/_money_get.c
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/loc/_money_get.c?rev=580483&r1=580482&r2=580483&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/loc/_money_get.c (original)
+++ incubator/stdcxx/branches/4.2.0/include/loc/_money_get.c Fri Sep 28 13:55:52 2007
@@ -2,20 +2,27 @@
  *
  * loc/_money_get.c
  *
- * $Id: //stdlib/dev/include/loc/_money_get.c#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/include/loc/_money_get.cc
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/loc/_money_get.cc?rev=580483&r1=580482&r2=580483&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/loc/_money_get.cc (original)
+++ incubator/stdcxx/branches/4.2.0/include/loc/_money_get.cc Fri Sep 28 13:55:52 2007
@@ -165,7 +165,10 @@
         case /* '\3' */ money_base::sign: {
 
             if (__it == __end) {
-                __ebits |= _RW::__rw_failbit;
+                if (__ps.size () && __ns.size ())
+                    __ebits |= _RW::__rw_failbit;
+                else
+                    __sign = __ps.empty () - 1;
                 break;
             }
 

Modified: incubator/stdcxx/branches/4.2.0/include/loc/_money_put.c
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/loc/_money_put.c?rev=580483&r1=580482&r2=580483&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/loc/_money_put.c (original)
+++ incubator/stdcxx/branches/4.2.0/include/loc/_money_put.c Fri Sep 28 13:55:52 2007
@@ -2,20 +2,27 @@
  *
  * loc/_money_put.c
  *
- * $Id: //stdlib/dev/include/loc/_money_put.c#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/include/loc/_moneypunct.c
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/loc/_moneypunct.c?rev=580483&r1=580482&r2=580483&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/loc/_moneypunct.c (original)
+++ incubator/stdcxx/branches/4.2.0/include/loc/_moneypunct.c Fri Sep 28 13:55:52 2007
@@ -2,20 +2,27 @@
  *
  * loc/_moneypunct.c
  *
- * $Id: //stdlib/dev/include/loc/_moneypunct.c#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/include/loc/_moneypunct.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/loc/_moneypunct.h?rev=580483&r1=580482&r2=580483&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/loc/_moneypunct.h (original)
+++ incubator/stdcxx/branches/4.2.0/include/loc/_moneypunct.h Fri Sep 28 13:55:52 2007
@@ -66,7 +66,7 @@
     string_type;
 
     _EXPLICIT moneypunct (_RWSTD_SIZE_T __refs = 0)
-        : _RW::__rw_facet (__refs), money_base () { }
+        : _RW::__rw_facet (__refs) { }
 
     char_type decimal_point () const {
         return do_decimal_point ();

Modified: incubator/stdcxx/branches/4.2.0/include/loc/_num_get.c
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/loc/_num_get.c?rev=580483&r1=580482&r2=580483&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/loc/_num_get.c (original)
+++ incubator/stdcxx/branches/4.2.0/include/loc/_num_get.c Fri Sep 28 13:55:52 2007
@@ -2,20 +2,27 @@
  *
  * loc/_num_get.c
  *
- * $Id: //stdlib/dev/include/loc/_num_get.c#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/include/loc/_num_put.c
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/loc/_num_put.c?rev=580483&r1=580482&r2=580483&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/loc/_num_put.c (original)
+++ incubator/stdcxx/branches/4.2.0/include/loc/_num_put.c Fri Sep 28 13:55:52 2007
@@ -2,20 +2,27 @@
  *
  * loc/_num_put.c
  *
- * $Id: //stdlib/dev/include/loc/_num_put.c#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/include/loc/_numpunct.c
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/loc/_numpunct.c?rev=580483&r1=580482&r2=580483&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/loc/_numpunct.c (original)
+++ incubator/stdcxx/branches/4.2.0/include/loc/_numpunct.c Fri Sep 28 13:55:52 2007
@@ -2,20 +2,27 @@
  *
  * loc/_numpunct.c
  *
- * $Id: //stdlib/dev/include/loc/_numpunct.c#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.
  * 
  **************************************************************************/
 



Mime
View raw message