2001-06-04 Jeffrey Oldham <oldham@codesourcery.com>

	* include/bits/char_traits.h (move): Qualify memmove with std::.
	(copy): Qualify memcpy with std::.
	* testsuite/27_io/filebuf_virtuals.cc (test01): Qualify strlen and
	strncmp with std::.
	(test02): Likewise.
	* testsuite/27_io/stringbuf_virtuals.cc (test01): Likewise.

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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 0fba2fe..0abbf73 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,12 @@
+2001-06-04  Jeffrey Oldham  <oldham@codesourcery.com>
+
+       * include/bits/char_traits.h (move): Qualify memmove with std::.
+       (copy): Qualify memcpy with std::.
+       * testsuite/27_io/filebuf_virtuals.cc (test01): Qualify strlen and
+       strncmp with std::.
+       (test02): Likewise.
+       * testsuite/27_io/stringbuf_virtuals.cc (test01): Likewise.
+
 2001-06-04  Hans-Peter Nilsson  <hp@axis.com>
 
        * libsupc++/Makefile.am (install-glibcppinstallHEADERS,

diff --git a/libstdc++-v3/include/bits/char_traits.h b/libstdc++-v3/include/bits/char_traits.h
index b98a304..73cce51 100644 (file)
--- a/libstdc++-v3/include/bits/char_traits.h
+++ b/libstdc++-v3/include/bits/char_traits.h
@@ -93,11 +93,11 @@ namespace std
 
       static char_type* 
       move(char_type* __s1, const char_type* __s2, size_t __n)
-      { return (char_type*) memmove(__s1, __s2, __n * sizeof(char_type)); }
+      { return (char_type*) std::memmove(__s1, __s2, __n * sizeof(char_type)); }
 
       static char_type* 
       copy(char_type* __s1, const char_type* __s2, size_t __n)
-      { return (char_type*) memcpy(__s1, __s2, __n * sizeof(char_type)); }
+      { return (char_type*) std::memcpy(__s1, __s2, __n * sizeof(char_type)); }
 
       static char_type* 
       assign(char_type* __s, size_t __n, char_type __a)

diff --git a/libstdc++-v3/testsuite/27_io/filebuf_virtuals.cc b/libstdc++-v3/testsuite/27_io/filebuf_virtuals.cc
index 50860cb..bcf0503 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/filebuf_virtuals.cc
+++ b/libstdc++-v3/testsuite/27_io/filebuf_virtuals.cc
@@ -30,12 +30,12 @@ void test01()
   bool test = true;
   char buf[512];
   const char* strlit = "how to tell a story and other essays: mark twain";
-  const size_t strlitsize = strlen(strlit);
+  const size_t strlitsize = std::strlen(strlit);
   filebuf fbuf01;
 
   fbuf01.pubsetbuf(buf, 512);
   fbuf01.sputn(strlit, strlitsize);
-  VERIFY( strncmp(strlit, buf, strlitsize) != 0 );
+  VERIFY( std::strncmp(strlit, buf, strlitsize) != 0 );
 }
 
 void test02()
@@ -45,13 +45,13 @@ void test02()
   bool test = true;
   char buf[512];
   const char* strlit = "how to tell a story and other essays: mark twain";
-  const size_t strlitsize = strlen(strlit);
+  const size_t strlitsize = std::strlen(strlit);
   filebuf fbuf01;
   fbuf01.open("tmp", ios_base::out);
 
   fbuf01.pubsetbuf(buf, strlitsize);
   fbuf01.sputn(strlit, strlitsize);
-  VERIFY( strncmp(strlit, buf, strlitsize) == 0 );
+  VERIFY( std::strncmp(strlit, buf, strlitsize) == 0 );
 }
 
 main() 

diff --git a/libstdc++-v3/testsuite/27_io/stringbuf_virtuals.cc b/libstdc++-v3/testsuite/27_io/stringbuf_virtuals.cc
index ebaf92c..ff367c9 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/stringbuf_virtuals.cc
+++ b/libstdc++-v3/testsuite/27_io/stringbuf_virtuals.cc
@@ -30,12 +30,12 @@ void test01()
   bool test = true;
   char buf[512];
   const char* strlit = "how to tell a story and other essays: mark twain";
-  const size_t strlitsize = strlen(strlit);
+  const size_t strlitsize = std::strlen(strlit);
   stringbuf sbuf(ios_base::out);
 
   sbuf.pubsetbuf(buf, strlitsize);
   sbuf.sputn(strlit, strlitsize);
-  VERIFY( strncmp(strlit, buf, strlitsize) != 0 );
+  VERIFY( std::strncmp(strlit, buf, strlitsize) != 0 );
 }
 
 int main()