Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / flower / include / file-name.hh

diff --git a/flower/include/file-name.hh b/flower/include/file-name.hh
index 3d3a442f541c3c1bd08e0625466aa47d654b5c52..edfa72c23f5fe52faf35501a4fe9da28a47bfefa 100644 (file)
--- a/flower/include/file-name.hh
+++ b/flower/include/file-name.hh
@@ -12,21 +12,21 @@
 #include "std-vector.hh"
 #include "std-string.hh"
 
+std::string dir_name (std::string const file_name);
+std::string get_working_directory ();
+
 class File_name
 {
 public:
-  std::string root_;
-  std::string dir_;
-  std::string base_;
-  std::string ext_;
+  string root_;
+  string dir_;
+  string base_;
+  string ext_;
 
-  File_name (std::string);
-#if 0// STD_STRING
-  File_name (String);
-#endif
+  File_name (string);
 
   bool is_absolute () const;
-  std::string to_string () const;
+  string to_string () const;
 };
 
 #endif /* FILE_NAME */