2000-05-18 Chip Salzenberg <chip@valinux.com>

        * bits/ostream.tcc (_S_pad_char): Function template should not be
        static.
        * bits/streambuf.tcc (_S_copy_streambufs): Likewise.
        * src/string-inst.cc (__destroy_aux): Instantiate for string*.

2000-05-18  Nathan C. Myers  <ncm@cantrip.org>

	* mkcshadow: Change C_Swamp to C_legacy.
	* shadow/*: Same.
	* shadow/bits/*: Same.
	s/C_Swamp/C_legacy/g
	s/SWAMP/LEGACY/g
	s/_Shadow/_shadow/g

2000-05-18  Anthony Williams  <anthony@anthonyw.cjb.net>

	* bits/locale_facets.tcc (num_get::_M_extract): Change char* to
	const char*.
	* src/string-inst.cc (string::_S_find): Same.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@34018 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 28 insertions, 28 deletions

diff --git a/libstdc++-v3/shadow/bits/std_ctime.h b/libstdc++-v3/shadow/bits/std_ctime.h
index e6febaffa74..429fcf832eb 100644
--- a/libstdc++-v3/shadow/bits/std_ctime.h
+++ b/libstdc++-v3/shadow/bits/std_ctime.h
@@ -36,9 +36,9 @@
 
 # include <bits/std_cstddef.h>  /* pick up size_t, NULL */
 
-  namespace _C_Swamp {
+  namespace _C_legacy {
     extern "C" {
-#     define _IN_C_SWAMP_
+#     define _IN_C_LEGACY_
 #     pragma system_header
 #     include_next <time.h>
     }
@@ -49,13 +49,13 @@
     typedef time_t    _CPP_time_t_capture;
     typedef struct tm _CPP_tm_capture;
 
-    namespace _C_Shadow { }
-  } // close namespace ::_C_Swamp::
+    namespace _C_shadow { }
+  } // close namespace ::_C_legacy::
 
 // #  undef  NULL
 // #  define NULL 0  /* handled in <cstddef> */
 #  undef  CLOCKS_PER_SEC
-#  define CLOCKS_PER_SEC (::_C_Swamp::_CPP_CLOCKS_PER_SEC_capture())
+#  define CLOCKS_PER_SEC (::_C_legacy::_CPP_CLOCKS_PER_SEC_capture())
 
 #  undef size_t  /* handled in <cstddef> */
 #  undef clock_t
@@ -71,49 +71,49 @@
 #  undef localtime
 #  undef strftime
 
-  namespace _C_Swamp {
-    namespace _C_Shadow {
-      // typedef ::_C_Swamp::_CPP_size_t_capture  size_t;
-      typedef ::_C_Swamp::_CPP_clock_t_capture  clock_t;
-      typedef ::_C_Swamp::_CPP_time_t_capture   time_t;
+  namespace _C_legacy {
+    namespace _C_shadow {
+      // typedef ::_C_legacy::_CPP_size_t_capture  size_t;
+      typedef ::_C_legacy::_CPP_clock_t_capture  clock_t;
+      typedef ::_C_legacy::_CPP_time_t_capture   time_t;
     }
   }
   namespace std {
 
     // Adopt C names into std::
-    // using ::_C_Swamp::_C_Shadow::size_t;  
-    using ::_C_Swamp::_C_Shadow::clock_t;  
-    using ::_C_Swamp::_C_Shadow::time_t;
+    // using ::_C_legacy::_C_shadow::size_t;  
+    using ::_C_legacy::_C_shadow::clock_t;  
+    using ::_C_legacy::_C_shadow::time_t;
 
     // note: still a POD type:
-    struct tm  : ::_C_Swamp::_CPP_tm_capture  { };
+    struct tm  : ::_C_legacy::_CPP_tm_capture  { };
 
-    using ::_C_Swamp::clock;
-    using ::_C_Swamp::difftime;
-    using ::_C_Swamp::mktime;
-    using ::_C_Swamp::time;
+    using ::_C_legacy::clock;
+    using ::_C_legacy::difftime;
+    using ::_C_legacy::mktime;
+    using ::_C_legacy::time;
 
     inline char* asctime(const tm* __tp) 
-      { return ::_C_Swamp::asctime(
-          static_cast< ::_C_Swamp::_CPP_tm_capture const*>(__tp)); }
+      { return ::_C_legacy::asctime(
+          static_cast< ::_C_legacy::_CPP_tm_capture const*>(__tp)); }
 
-    using ::_C_Swamp::ctime;
+    using ::_C_legacy::ctime;
 
     inline tm* gmtime(time_t const* __tp) 
-      { return reinterpret_cast<tm*>(::_C_Swamp::gmtime(__tp)); }
+      { return reinterpret_cast<tm*>(::_C_legacy::gmtime(__tp)); }
 
     inline tm* localtime(const time_t* __tp) 
-      { return reinterpret_cast<tm*>(::_C_Swamp::localtime(__tp)); } 
+      { return reinterpret_cast<tm*>(::_C_legacy::localtime(__tp)); } 
 
     inline size_t strftime(char* __buf, size_t __maxsz, 
                            char const* __fmt, tm const* __tp) 
-      { return ::_C_Swamp::strftime(__buf, __maxsz, __fmt,
-                 static_cast< ::_C_Swamp::_CPP_tm_capture const*>(__tp)); }
+      { return ::_C_legacy::strftime(__buf, __maxsz, __fmt,
+                 static_cast< ::_C_legacy::_CPP_tm_capture const*>(__tp)); }
 
   } // close namespace std::
   
-  namespace _C_Swamp {
-    namespace _C_Shadow {
+  namespace _C_legacy {
+    namespace _C_shadow {
       using ::std::tm;
       using ::std::asctime;
       using ::std::gmtime;
@@ -122,7 +122,7 @@
     }
   }
 
-# undef _IN_C_SWAMP_
+# undef _IN_C_LEGACY_
 
 #endif