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

[lilypond.git] / flower / include / warn.hh

diff --git a/flower/include/warn.hh b/flower/include/warn.hh
index f52d3818cc11ae91569fa467b6128170673ffe13..dcc6f0ee24cdd3c1884a14a3f8b7ecc332bee407 100644 (file)
--- a/flower/include/warn.hh
+++ b/flower/include/warn.hh
@@ -44,25 +44,25 @@ extern int loglevel;
 extern bool warning_as_error;
 
 /* output messages, in decreasing order of importance */
-void error (string s, const string &location = ""); // Fatal error, exits lilypond!
-void programming_error (const string &s, const string &location = "");
-void non_fatal_error (const string&, const string &location = "");
-void warning (const string &s, const string &location = "");
-void basic_progress (const string &s, const string &location = "");
+void error (std::string s, const std::string &location = ""); // Fatal error, exits lilypond!
+void programming_error (const std::string &s, const std::string &location = "");
+void non_fatal_error (const std::string&, const std::string &location = "");
+void warning (const std::string &s, const std::string &location = "");
+void basic_progress (const std::string &s, const std::string &location = "");
 /* progress_indication does by default *NOT* start on a new line */
-void progress_indication (const string &s, bool newline = false, const string &location = "");
-void message (const string &s, bool newline = true, const string &location = "");
-void debug_output (const string &s, bool newline = true, const string &location = "");
+void progress_indication (const std::string &s, bool newline = false, const std::string &location = "");
+void message (const std::string &s, bool newline = true, const std::string &location = "");
+void debug_output (const std::string &s, bool newline = true, const std::string &location = "");
 
 /* Helper functions that always print out the message. Callers should ensure
    that the loglevel is obeyed */
-void print_message (int level, const string &location, string s, bool newline = true);
+void print_message (int level, const std::string &location, std::string s, bool newline = true);
 
 bool is_loglevel (int level);
 void set_loglevel (int level);
-void set_loglevel (string level);
+void set_loglevel (std::string level);
 
-void expect_warning (const string &msg);
+void expect_warning (const std::string &msg);
 void check_expected_warnings ();
 
 #endif /* WARN_HH */