Issue 4550 (2/2) Avoid "using namespace std;" in included files

[lilypond.git] / lily / mark-engraver.cc

diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc
index 6eb7ee321de0054f6838d79f1725b81d4e229f6c..51add1233e0c72ff1ae1d0833c167db3944509d8 100644 (file)
--- a/lily/mark-engraver.cc
+++ b/lily/mark-engraver.cc
@@ -18,7 +18,6 @@
 */
 
 #include <cctype>
-using namespace std;
 
 #include "engraver.hh"
 
@@ -140,17 +139,11 @@ Mark_engraver::process_music ()
           if (!scm_is_number (m))
             m = get_property ("rehearsalMark");
 
-          if (scm_integer_p (m) == SCM_BOOL_T
-              && scm_exact_p (m) == SCM_BOOL_T)
+          if (scm_is_number (m))
             {
-              int mark_count = scm_to_int (m);
-              mark_count++;
-              context ()->set_property ("rehearsalMark",
-                                        scm_from_int (mark_count));
+              context ()->set_property ("rehearsalMark", scm_oneplus (m));
+              m = scm_call_2 (proc, m, context ()->self_scm ());
             }
-
-          if (scm_is_number (m))
-            m = scm_call_2 (proc, m, context ()->self_scm ());
           else
             /* FIXME: constant error message.  */
             warning (_ ("rehearsalMark must have integer value"));