summaryrefslogtreecommitdiff
path: root/lily/input.cc
diff options
context:
space:
mode:
authorReinhold Kainhofer <reinhold@kainhofer.com>2011-09-28 12:39:12 +0200
committerReinhold Kainhofer <reinhold@kainhofer.com>2011-11-14 22:09:58 +0100
commitc618987255838a2af9813a69eb1f4f20a8df6315 (patch)
tree40c4d4192900a34ca2667089e8af262220b9e2ed /lily/input.cc
parent0722babbea9d5a6b26c4872cbb7ba41ba55cb7bc (diff)
Warnings: Move all warning-as-error handling to warn.cc
This finally makes that option apply to ALL warnings, and it considerably cleans up the error/warning functions.
Diffstat (limited to 'lily/input.cc')
-rw-r--r--lily/input.cc10
1 files changed, 2 insertions, 8 deletions
diff --git a/lily/input.cc b/lily/input.cc
index 28923f4948..9ba3767638 100644
--- a/lily/input.cc
+++ b/lily/input.cc
@@ -103,10 +103,7 @@ Input::error (string s) const
void
Input::programming_error (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
@@ -118,10 +115,7 @@ Input::non_fatal_error (string s) const
void
Input::warning (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