Warnings: Move all warning-as-error handling to warn.cc

[lilypond.git] / lily / warn-scheme.cc

diff --git a/lily/warn-scheme.cc b/lily/warn-scheme.cc
index 2f7a1af611f0f442c7577b589f010130a3dab27e..3b917b760e05da92beb3445cbd562927df302a78 100644 (file)
--- a/lily/warn-scheme.cc
+++ b/lily/warn-scheme.cc
@@ -49,12 +49,7 @@ LY_DEFINE (ly_programming_error, "ly:programming-error",
 {
   LY_ASSERT_TYPE (scm_is_string, str, 1);
   str = scm_simple_format (SCM_BOOL_F, str, rest);
-
-  if (get_program_option ("warning-as-error"))
-    error (ly_scm2string (str));
-  else
-    programming_error (ly_scm2string (str));
-
+  programming_error (ly_scm2string (str));
   return SCM_UNSPECIFIED;
 }
 
@@ -65,12 +60,7 @@ LY_DEFINE (ly_warning, "ly:warning",
 {
   LY_ASSERT_TYPE (scm_is_string, str, 1);
   str = scm_simple_format (SCM_BOOL_F, str, rest);
-
-  if (get_program_option ("warning-as-error"))
-    error (ly_scm2string (str));
-  else
-    warning (ly_scm2string (str));
-
+  warning (ly_scm2string (str));
   return SCM_UNSPECIFIED;
 }
 
@@ -129,12 +119,7 @@ LY_DEFINE (ly_warning_located, "ly:warning-located",
   LY_ASSERT_TYPE (scm_is_string, location, 1);
   LY_ASSERT_TYPE (scm_is_string, str, 2);
   str = scm_simple_format (SCM_BOOL_F, str, rest);
-
-  if (get_program_option ("warning-as-error"))
-    error (ly_scm2string (str), ly_scm2string (location));
-  else
-    warning (ly_scm2string (str), ly_scm2string (location));
-
+  warning (ly_scm2string (str), ly_scm2string (location));
   return SCM_UNSPECIFIED;
 }