OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

monetary_members.cc (_S_construct_pattern): Give __ret a default value, thus avoiding spurious warnings. 

2004-10-10  Paolo Carlini  <pcarlini@suse.de>

	* config/locale/gnu/monetary_members.cc (_S_construct_pattern):
	Give __ret a default value, thus avoiding spurious warnings.

	* testsuite/performance/27_io/filebuf_sgetn_unbuf.cc: Open either
	words or linux.words, otherwise exit.
	* testsuite/performance/27_io/ifstream_getline.cc: Slighlty tweak.

From-SVN: r88848
This commit is contained in:
Paolo Carlini 2004-10-10 17:55:23 +00:00 committed by Paolo Carlini
parent 0ba09d8fc6
commit a780ad2f43
4 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,12 @@
2004-10-10 Paolo Carlini <pcarlini@suse.de>
* config/locale/gnu/monetary_members.cc (_S_construct_pattern):
Give __ret a default value, thus avoiding spurious warnings.
* testsuite/performance/27_io/filebuf_sgetn_unbuf.cc: Open either
words or linux.words, otherwise exit.
* testsuite/performance/27_io/ifstream_getline.cc: Slighlty tweak.
2004-10-09 Paolo Carlini <pcarlini@suse.de>
* include/std/std_memory.h (__get_temporary_buffer): Don't use

2
libstdc++-v3/config/locale/gnu/monetary_members.cc
View File

@ -199,7 +199,7 @@ namespace std
}
break;
default:
;
__ret = pattern();
}
return __ret;
}

12
libstdc++-v3/testsuite/performance/27_io/filebuf_sgetn_unbuf.cc
View File

@ -42,10 +42,18 @@ int main()
const int chunksize = 100;
char* chunk = new char[chunksize];
const char* name = "/usr/share/dict/linux.words";
const char* name1 = "/usr/share/dict/words";
const char* name2 = "/usr/share/dict/linux.words";
const char* name = name1;
// C
FILE* file = fopen(name, "r");
FILE* file;
if (!(file = fopen(name, "r")))
{
name = name2;
if (!(file = fopen(name, "r")))
exit(1);
}
setvbuf(file, 0, _IONBF, 0);
start_counters(time, resource);
for (int i = 0; i < iterations; ++i)

9
libstdc++-v3/testsuite/performance/27_io/ifstream_getline.cc
View File

@ -46,14 +46,13 @@ int main ()
in.clear();
in.open(name2);
}
if (!in.is_open())
exit(1);
char buffer[BUFSIZ];
start_counters(time, resource);
if (in.is_open())
{
while (in.good())
in.getline(buffer, BUFSIZ);
}
while (in.good())
in.getline(buffer, BUFSIZ);
stop_counters(time, resource);
report_performance(__FILE__, "", time, resource);