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

[lilypond.git] / lily / stencil.cc

diff --git a/lily/stencil.cc b/lily/stencil.cc
index 41eb2f1e852498c7fc0cf454f9c9c892b124b307..34b68d9b3a38c6367c8b9fc80362523aad1d79fe 100644 (file)
--- a/lily/stencil.cc
+++ b/lily/stencil.cc
@@ -25,6 +25,7 @@
 #include "string-convert.hh"
 #include "warn.hh"
 
+using std::vector;
 
 Stencil::Stencil ()
 {
@@ -39,7 +40,7 @@ Stencil::Stencil (Box b, SCM func)
 }
 
 SCM
-Stencil::mark_smob ()
+Stencil::mark_smob () const
 {
   return expr_;
 }
@@ -55,7 +56,7 @@ Stencil::extent (Axis a) const
 bool
 Stencil::is_empty () const
 {
-  return (expr_ == SCM_EOL
+  return (scm_is_null (expr_)
           || dim_.is_empty ());
 }