From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Thu, 26 Jan 2006 12:13:51 +0000 (+0000)
Subject: (path::parse_path): Oops.
X-Git-Tag: release/2.7.29~8
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=2224e6fdc1d94a2557220ffa92476f8e30e0c4f3;p=lilypond.git

(path::parse_path): Oops.
---

diff --git a/ChangeLog b/ChangeLog
index e000adc6e7..c6ad9ec27f 100644
--- 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 058d54793b..bf3f921aac 100644
--- 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));
     }
 }