char_traits.h (move): Qualify memmove with std::.

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.

From-SVN: r42854
This commit is contained in:
Jeffrey Oldham 2001-06-04 15:46:03 +00:00 committed by Jeffrey D. Oldham
parent 6bdfaf0910
commit 1007e271a3
4 changed files with 17 additions and 8 deletions

View File

@ -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,

View File

@ -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)

View File

@ -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()

View File

@ -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()