2000-07-21 Benjamin Kosnik <bkoz@purist.soma.redhat.com>

	* src/stl-inst.cc: Change __sink_unused_warning to unsigned int
	for alpha.

	* testsuite/26_numerics/complex_inserters_extractors.cc (testall):
	Change return type to void.
	* testsuite/25_algorithms/lower_bound.cc: Add return values.
	* bits/locale_facets.h: Add return values for the generic cases.


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

4 files changed, 27 insertions, 15 deletions

diff --git a/libstdc++-v3/bits/locale_facets.h b/libstdc++-v3/bits/locale_facets.h
index 14be3f25c56..839d550786b 100644
--- a/libstdc++-v3/bits/locale_facets.h
+++ b/libstdc++-v3/bits/locale_facets.h
@@ -284,72 +284,84 @@ namespace std
       do_is(mask, char_type) const
       {
 	// XXX Need definitions for these abstract mf's.
+	return true;
       }
 
       virtual const char_type*
-      do_is(const char_type*, const char_type*, mask*) const
+      do_is(const char_type*  __lo, const char_type*, mask*) const
       {
 	// XXX Need definitions for these abstract mf's.
+	return __lo;
       }
 
       virtual const char_type*
-      do_scan_is(mask, const char_type*, const char_type*) const
+      do_scan_is(mask, const char_type* __lo, const char_type*) const
       {
 	// XXX Need definitions for these abstract mf's.
+	return __lo;
       }
 
       virtual const char_type*
-      do_scan_not(mask, const char_type*, const char_type*) const
+      do_scan_not(mask, const char_type* __lo, const char_type*) const
       {
 	// XXX Need definitions for these abstract mf's.
+	return __lo;
       }
 
       virtual char_type 
-      do_toupper(char_type) const
+      do_toupper(char_type __c) const
       {
 	// XXX Need definitions for these abstract mf's.
+	return __c;
       }
 
       virtual const char_type*
-      do_toupper(char_type*, const char_type*) const
+      do_toupper(char_type* __lo, const char_type*) const
       {
 	// XXX Need definitions for these abstract mf's.
+	return __lo;
       }
 
       virtual char_type 
-      do_tolower(char_type) const
+      do_tolower(char_type __c) const
       {
 	// XXX Need definitions for these abstract mf's.
+	return __c;
       }
 
       virtual const char_type*
-      do_tolower(char_type*, const char_type*) const
+      do_tolower(char_type* __lo, const char_type*) const
       {
 	// XXX Need definitions for these abstract mf's.
+	return __lo;
       }
       
       virtual char_type 
-      do_widen(char) const
+      do_widen(char __c) const
       {
 	// XXX Need definitions for these abstract mf's.
+	return __c;
       }
 
       virtual const char*
-      do_widen(const char*, const char*, char_type*) const
+      do_widen(const char* __lo, const char*, char_type*) const
       {
 	// XXX Need definitions for these abstract mf's.
+	return __lo;
       }
 
       virtual char 
-      do_narrow(char_type, char) const
+      do_narrow(char_type, char __c) const
       {
 	// XXX Need definitions for these abstract mf's.
+	return __c;
       }
 
       virtual const char_type*
-      do_narrow(const char_type*, const char_type*, char, char*) const
+      do_narrow(const char_type* __lo, const char_type*, char, char*) const
       {
 	// XXX Need definitions for these abstract mf's.
+	return __lo;
       }
     };
 
diff --git a/libstdc++-v3/src/stl-inst.cc b/libstdc++-v3/src/stl-inst.cc
index 5e13a964685..e64e5d04c93 100644
--- a/libstdc++-v3/src/stl-inst.cc
+++ b/libstdc++-v3/src/stl-inst.cc
@@ -51,6 +51,6 @@ namespace std {
 
   template
     void
-    __sink_unused_warning<size_t>(size_t);
+    __sink_unused_warning<unsigned int>(unsigned int);
 
 } //std
diff --git a/libstdc++-v3/testsuite/25_algorithms/lower_bound.cc b/libstdc++-v3/testsuite/25_algorithms/lower_bound.cc
index 076c954c535..bd8813593d3 100644
--- a/libstdc++-v3/testsuite/25_algorithms/lower_bound.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/lower_bound.cc
@@ -24,8 +24,8 @@
 // http://sourceware.cygnus.com/ml/libstdc++/2000-06/msg00316.html
 struct foo { };
 
-bool operator== (const foo&, const foo&) { };
-bool operator< (const foo&, const foo&) { };
+bool operator== (const foo&, const foo&) { return true; };
+bool operator< (const foo&, const foo&) { return true; };
 
 void bar(foo* a, foo* b, foo& x)
 {
diff --git a/libstdc++-v3/testsuite/26_numerics/complex_inserters_extractors.cc b/libstdc++-v3/testsuite/26_numerics/complex_inserters_extractors.cc
index a14ccbd8f1a..7aff69a1a4e 100644
--- a/libstdc++-v3/testsuite/26_numerics/complex_inserters_extractors.cc
+++ b/libstdc++-v3/testsuite/26_numerics/complex_inserters_extractors.cc
@@ -66,7 +66,7 @@ void test_fail(std::string str)
 }
 
 template<typename R>
-int testall()
+void testall()
 {
   test_good<R>("(-1.1,3.7)#", -1.1, 3.7);
   test_good<R>("(  .7e6  ,  \n-3.1)#", .7e6, -3.1);