From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Thu, 26 Jan 2006 22:10:09 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: release/2.7.30~16
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=0df564d0a0db8bfa46f06a7828d85bb9bda3ba71;p=lilypond.git

*** empty log message ***
---

diff --git a/flower/string.cc b/flower/string.cc
index e210ea2173..76429ff812 100644
--- a/flower/string.cc
+++ b/flower/string.cc
@@ -50,18 +50,9 @@ String::operator = (String const &source)
 String
 String::substr (int pos, ssize n) const
 {
-#if 1
   if (n == (ssize)-1 || n == (ssize)INT_MAX || n == NPOS)
     n = length () - pos;
   return cut_string (pos, n);
-#else
-  if (n == (ssize)-1 || n == (ssize)INT_MAX || n == NPOS)
-    n = length () - pos;
-  if (pos == 0)
-    return left_string (n);
-  else
-    return right_string (length () - pos).left_string (n);
-#endif
 }
 
 String