lilypond-0.0.63

diff --git a/flower/include/varray.hh b/flower/include/varray.hh
index 4f67d3aac45d823301983eefb9c719739f9775a4..105d96ac27efa58382fcae315b2a1806ef5c0aaa 100644 (file)
--- 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 7df11bf2bb29ec28233b78e5135fe404dbe6d308..84788100528629696e7909e089d999d3c9cccb70 100644 (file)
--- 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;