From: fred <fred>
Date: Wed, 4 Dec 1996 21:31:38 +0000 (+0000)
Subject: flower-1.0.11
X-Git-Tag: release/1.5.59~6667
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b73cc52c85a7b0b65c4ed1fc497686372c16dd59;p=lilypond.git

flower-1.0.11
---

diff --git a/flower/Sources.make b/flower/Sources.make
index 7f2f6441a1..044543beee 100644
--- a/flower/Sources.make
+++ b/flower/Sources.make
@@ -1,7 +1,7 @@
 
 cc=lgetopt.cc 	 string.cc dataf.cc textdb.cc unionfind.cc  \
 	smat.cc matrix.cc choleski.cc vector.cc dstream.cc\
-	matdebug.cc interval.cc
+	matdebug.cc interval.cc scalar.cc
 
 templatecc=cursor.cc list.cc tsmat.cc plist.cc
 inl=findcurs.inl link.inl list.inl  cursor.inl plist.inl
@@ -10,5 +10,5 @@ hh=cursor.hh pcursor.hh lgetopt.hh link.hh list.hh dstream.hh \
 	findcurs.hh unionfind.hh compare.hh handle.hh matrix.hh\
 	smat.hh vsmat.hh  vector.hh  real.hh choleski.hh\
 	tsmat.hh tvsmat.hh plist.hh associter.hh fproto.hh\
-	interval.hh
+	interval.hh scalar.hh
 
diff --git a/flower/string.hh b/flower/string.hh
index 77912beda2..8008f06394 100644
--- a/flower/string.hh
+++ b/flower/string.hh
@@ -49,10 +49,11 @@ public:
     ///  return a "new"-ed copy of contents
     char *copy_array() const; //  return a "new"-ed copy of contents
 
-    const char *ptr() const;
-    const char *ptr() { return ((const String *)this)->ptr(); }
+    const char *cptr() const;
+    const char *ptr() { return ((const String *)this)->cptr(); }
+
     /// return the data. Don't use for writing the data.
-    operator const char *() const { return ptr(); }
+    operator const char *() const { return cptr(); }
     
     String operator =( const String & source ) { data = source.data; return *this; }
 
@@ -114,10 +115,6 @@ public:
     /// the length of the string
     int len() const;
 
-    /// DO NOT MAKE THIS INTO AN OPERATOR
-    bool to_bool() const;
-    /** perl -like string to bool conversion
-     */
 };
 /**