X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmodified-font-metric.hh;h=1716502267b33796a8690208fb741d16201c8ff1;hb=59a6d1a06432fc0ca88c3023c646182f389ec1b5;hp=c63c532fbde743a0d1e208e4b0702e0f67030520;hpb=f127e14af04f474d20406ca0e0f76f05061ee103;p=lilypond.git

diff --git a/lily/include/modified-font-metric.hh b/lily/include/modified-font-metric.hh
index c63c532fbd..1716502267 100644
--- a/lily/include/modified-font-metric.hh
+++ b/lily/include/modified-font-metric.hh
@@ -26,14 +26,14 @@
 struct Modified_font_metric : public Font_metric
 {
 public:
-  Stencil text_stencil (Output_def *output_state, const string&, bool) const;
+  Stencil text_stencil (Output_def *output_state, const std::string&, bool) const;
   Real get_magnification () const;
 
   static SCM make_scaled_font_metric (Font_metric *fm, Real magnification);
   size_t count () const;
   Offset get_indexed_wxwy (size_t) const;
-  Offset attachment_point (const string&) const;
-  size_t name_to_index (string) const;
+  Offset attachment_point (const std::string&) const;
+  size_t name_to_index (std::string) const;
   size_t index_to_charcode (size_t) const;
   Font_metric *original_font () const;
 
@@ -43,7 +43,7 @@ protected:
 
   Modified_font_metric (Font_metric *fm, Real magnification);
   SCM sub_fonts () const;
-  string font_name () const;
+  std::string font_name () const;
   Real design_size () const;
   void derived_mark () const;
   Box get_indexed_char_dimensions (size_t) const;