X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Finput.cc;h=2b29c828bac6f18d80b151445d014b83578dc51f;hb=a02cfaa060e2c5b0d21236016ee5328d21c2f8cb;hp=28923f49481efd792eb93a9e67d210ec8b970820;hpb=05f05a51ca0078ce9a8c87cbf30ac7fbd4def706;p=lilypond.git

diff --git a/lily/input.cc b/lily/input.cc
index 28923f4948..2b29c828ba 100644
--- a/lily/input.cc
+++ b/lily/input.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -79,7 +79,7 @@ Input::set_location (Input const &i_start, Input const &i_end)
   [file:line:column:][warning:]message
 */
 string
-Input::message_string (string msg) const
+Input::message_string (const string &msg) const
 {
   if (source_file_)
     return msg + "\n" + source_file_->quote_input (start_);
@@ -93,7 +93,7 @@ Input::message_location () const
   return (source_file_) ? location_string () : "";
 }
 void
-Input::error (string s) const
+Input::error (const string &s) const
 {
   ::non_fatal_error (message_string (s), message_location ());
   // UGH, fix naming or usage (use non_fatal_error in most places, instead)
@@ -101,37 +101,31 @@ Input::error (string s) const
 }
 
 void
-Input::programming_error (string s) const
+Input::programming_error (const string &s) const
 {
-  if (get_program_option ("warning-as-error"))
-    ::error (message_string (s), message_location ());
-  else
-    ::programming_error (message_string (s), message_location ());
+  ::programming_error (message_string (s), message_location ());
 }
 
 void
-Input::non_fatal_error (string s) const
+Input::non_fatal_error (const string &s) const
 {
   ::non_fatal_error (message_string (s), message_location ());
 }
 
 void
-Input::warning (string s) const
+Input::warning (const string &s) const
 {
-  if (get_program_option ("warning-as-error"))
-    ::non_fatal_error (message_string (s), message_location ());
-  else
-    ::warning (message_string (s), message_location ());
+  ::warning (message_string (s), message_location ());
 }
 
 void
-Input::message (string s) const
+Input::message (const string &s) const
 {
   ::message (message_string (s), true, message_location ());
 }
 
 void
-Input::debug_output (string s) const
+Input::debug_output (const string &s) const
 {
   ::debug_output (message_string (s), true, message_location ());
 }
@@ -148,7 +142,7 @@ string
 Input::line_number_string () const
 {
   if (source_file_)
-    return to_string (source_file_->get_line (start_));
+    return ::to_string (source_file_->get_line (start_));
   return "?";
 }