(path::parse_path): Oops.

diff --git a/ChangeLog b/ChangeLog
index e000adc6e7ba2f6dc73e7d3be44ecdff81f932f1..c6ad9ec27f3e3046b20b157a621829f0f0b42153 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2006-01-26  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * flower/file-path.cc (path::parse_path): Oops.
+
        * Finish std::string interface.  For now, use std:: marker
        throughout for easy s/r.
 

diff --git a/flower/file-path.cc b/flower/file-path.cc
index 058d54793ba126dbb74cef5ffb84aafce991c097..bf3f921aacc9a6d6352af23db176a2a4f67c82c3 100644 (file)
--- a/flower/file-path.cc
+++ b/flower/file-path.cc
@@ -48,12 +48,7 @@ File_path::parse_path (std::string p)
       if (i == NPOS)
        i = len;
       append (p.substr (0, i));
-      //p = p.substr (min (len, i + 1));
-      //ssize x = min (len, i + 1);
-      ssize a = len;
-      ssize b = i + 1;
-      ssize x = std::max (a, b);
-      p = p.substr (x);
+      p = p.substr (std::min (len, i + 1));
     }
 }