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

[lilypond.git] / lily / pango-font.cc

diff --git a/lily/pango-font.cc b/lily/pango-font.cc
index 762e0842f3db9a6889ba8ebd85c9de99bd04944f..a1e6182c568422eaa88f503033895065d5fb32d9 100644 (file)
--- a/lily/pango-font.cc
+++ b/lily/pango-font.cc
@@ -35,6 +35,7 @@
 #include "file-name.hh"
 #include "international.hh"
 #include "lookup.hh"            // debugging
+#include "ly-module.hh"
 #include "main.hh"
 #include "string-convert.hh"
 #include "warn.hh"
@@ -44,6 +45,8 @@
 #if HAVE_PANGO_FT2
 #include "stencil.hh"
 
+using std::string;
+
 Pango_font::Pango_font (PangoFT2FontMap *fontmap,
                         PangoFontDescription const *description,
                         Real output_scale)
@@ -440,8 +443,8 @@ Pango_font::text_stencil (Output_def * /* state */,
         variable that is bound to a *named* procedure, i.e. not a
         lambda expression.
       */
-      if (utf8_string != SCM_BOOL_F
-          && scm_procedure_name (SCM_VARIABLE_REF (utf8_string)) != SCM_BOOL_F)
+      if (scm_is_true (utf8_string)
+          && scm_is_true (scm_procedure_name (SCM_VARIABLE_REF (utf8_string))))
         has_utf8_string = true;
     }