From: fred <fred>
Date: Sun, 24 Mar 2002 19:40:34 +0000 (+0000)
Subject: lilypond-0.0.63
X-Git-Tag: release/1.5.59~4882
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=91e8a50e3e358c79307c09f2d2eb3915b15c45cc;p=lilypond.git

lilypond-0.0.63
---

diff --git a/flower/include/varray.hh b/flower/include/varray.hh
index 4f67d3aac4..105d96ac27 100644
--- a/flower/include/varray.hh
+++ b/flower/include/varray.hh
@@ -148,7 +148,7 @@ public:
 	(*this)[i]=(*this)[j];
 	(*this)[j]=t;
     }
-    bool empty() { return !size_; }
+    bool empty() const { return !size_; }
     void insert(T k, int j) {
 	assert(j >=0 && j<= size_);
 	set_size(size_+1);
diff --git a/lib/input.cc b/lib/input.cc
index 7df11bf2bb..8478810052 100644
--- a/lib/input.cc
+++ b/lib/input.cc
@@ -41,7 +41,7 @@ Input::message(String message_str)const
     String str = "";
     
     if ( source_file_l_ ) {
-	str += source_file_l_->file_line_no_str(defined_ch_C_) + String(": ");
+	str += location_str() + String(": ");
     }
     
     str += message_str;