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

[lilypond.git] / lily / include / includable-lexer.hh

diff --git a/lily/include/includable-lexer.hh b/lily/include/includable-lexer.hh
index bfc3d81718904244e7b4638735f9105bb905fdfd..a4c3c0545d3fdf929e589cdb3e248c740bedaa3f 100644 (file)
--- a/lily/include/includable-lexer.hh
+++ b/lily/include/includable-lexer.hh
@@ -36,26 +36,26 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE;
 */
 class Includable_lexer : public yyFlexLexer
 {
-  vector<YY_BUFFER_STATE> state_stack_;
+  std::vector<YY_BUFFER_STATE> state_stack_;
 
 protected:
   bool close_input ();
-  vector<Source_file *> include_stack_;
-  vector<int> char_count_stack_;
+  std::vector<Source_file *> include_stack_;
+  std::vector<int> char_count_stack_;
 
 public:
 
   Includable_lexer ();
   ~Includable_lexer ();
-  string main_input_name_;
+  std::string main_input_name_;
 
   /// store dependencies for Makefile stuff.
-  vector<string> file_name_strings_;
+  std::vector<std::string> file_name_strings_;
 
   Source_file *get_source_file () const;
-  virtual void new_input (const string &s, Sources *);
+  virtual void new_input (const std::string &s, Sources *);
 
-  void new_input (const string &name, string data, Sources *);
+  void new_input (const std::string &name, std::string data, Sources *);
 
   char const *here_str0 () const;
 };