Makefile.in (VERSION): Bump to 2.9.0.

	* Makefile.in (VERSION): Bump to 2.9.0.
	* std/bastring.cc (find_last_of): Fix.
	(find_last_not_of): Likewise.

From-SVN: r21072

diff --git a/libstdc++/ChangeLog b/libstdc++/ChangeLog
index 306fe63cae48cd2491510b6b820688aecdf8e08e..c4ccec7d9a0ce3e21b330b8f5f03184de437d55d 100644 (file)
--- a/libstdc++/ChangeLog
+++ b/libstdc++/ChangeLog
@@ -1,3 +1,12 @@
+1998-07-12  Jason Merrill  <jason@yorick.cygnus.com>
+
+       * Makefile.in (VERSION): Bump to 2.9.0.
+
+1998-07-12  Lars Albertsson <lalle@sics.se>
+
+       * std/bastring.cc (find_last_of): Fix.
+       (find_last_not_of): Likewise.
+
 1998-07-06  Manfred Hollstein  <manfred@s-direktnet.de>
 
        * configure.in (INSTALLDIR): Make sed pattern failsafe.

diff --git a/libstdc++/Makefile.in b/libstdc++/Makefile.in
index 247d8b5105c2de4b17df50c639253e8fb0169daa..77e2ec931b268e81eedeaa9dbbb57aafc4533ca2 100644 (file)
--- a/libstdc++/Makefile.in
+++ b/libstdc++/Makefile.in
@@ -14,7 +14,7 @@
 # along with this library; see the file COPYING.  If not, write to the Free
 # Software Foundation, 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-VERSION = 2.8.0
+VERSION = 2.9.0
 
 OBJS  = cstringi.o stdexcepti.o cstdlibi.o cmathi.o stlinst.o
 SUBLIBS = $(STAMP)-string $(STAMP)-complx
@@ -55,10 +55,6 @@ INSTALLDIR = $(libdir)
 MOSTLYCLEAN_JUNK = *stmp-* tlib*.a *.s *.ii stdlist piclist
 CLEAN_JUNK = $(LIBS)
 
-# Remove these for public releases.
-CXXFLAGS = -g -O -Wpointer-arith -Wnested-externs -Woverloaded-virtual -Wbad-function-cast -Winline -Wwrite-strings -Weffc++
-CFLAGS = -g -O -Wpointer-arith -Wnested-externs
-
 .PHONY: libs
 libs: $(LIBS)
 
@@ -305,19 +301,22 @@ install:
 .PHONY: force
 force:
 
+# Remove these for public releases.
+MYCXXFLAGS = -g -O2 -Wpointer-arith -Wnested-externs -Woverloaded-virtual -Wbad-function-cast -Winline -Wwrite-strings
+MYCFLAGS = -g -O2 -Wpointer-arith -Wnested-externs
+
 .PHONY: stuff
 stuff:
-       $(MAKE) clean
-       $(MAKE) -C ../libio c++clean
-       -$(MAKE) $(MAKEFLAGS) check
-       -$(MAKE) -C ../libio check
-       -$(MAKE) -C ../../gcc check-g++
+       $(MAKE) stuff1
+       $(MAKE) stuff2
 
 stuff1:
        $(MAKE) clean
        $(MAKE) -C ../libio c++clean
+       touch ../../gcc/libgcc2.ready
 
 stuff2:
-       -$(MAKE) check
+       -$(MAKE) -C ../../gcc/ libgcc.a
+       -$(MAKE) check CXXFLAGS="$(MYCXXFLAGS)" CFLAGS="$(MYCFLAGS)"
        -$(MAKE) -C ../libio check
        -$(MAKE) -C ../../gcc check-g++

diff --git a/libstdc++/std/bastring.cc b/libstdc++/std/bastring.cc
index fca6f29680ba9dbd9f9390fe31aaa8ba102b49bb..b5f7a0dbfef64614d40583d094b34512a713b5cb 100644 (file)
--- a/libstdc++/std/bastring.cc
+++ b/libstdc++/std/bastring.cc
@@ -325,10 +325,12 @@ basic_string <charT, traits, Allocator>::size_type
 basic_string <charT, traits, Allocator>::
 find_last_of (const charT* s, size_type pos, size_type n) const
 {
+  if (length() == 0)
+    return npos;
   size_t xpos = length () - 1;
   if (xpos > pos)
     xpos = pos;
-  for (; xpos; --xpos)
+  for (++xpos; xpos-- > 0;)
     if (_find (s, data () [xpos], 0, n) != npos)
       return xpos;
   return npos;
@@ -363,10 +365,12 @@ basic_string <charT, traits, Allocator>::size_type
 basic_string <charT, traits, Allocator>::
 find_last_not_of (const charT* s, size_type pos, size_type n) const
 {
+  if (length() == 0)
+    return npos;
   size_t xpos = length () - 1;
   if (xpos > pos)
     xpos = pos;
-  for (; xpos; --xpos)
+  for (++xpos; xpos-- > 0;)
     if (_find (s, data () [xpos], 0, n) == npos)
       return xpos;
   return npos;
@@ -377,10 +381,12 @@ basic_string <charT, traits, Allocator>::size_type
 basic_string <charT, traits, Allocator>::
 find_last_not_of (charT c, size_type pos) const
 {
+  if (length() == 0)
+    return npos;
   size_t xpos = length () - 1;
   if (xpos > pos)
     xpos = pos;
-  for (; xpos; --xpos)
+  for (++xpos; xpos-- > 0;)
     if (traits::ne (data () [xpos], c))
       return xpos;
   return npos;