diff options
| author | Jan Nieuwenhuizen <janneke@gnu.org> | 2006-02-11 11:35:18 +0000 |
|---|---|---|
| committer | Jan Nieuwenhuizen <janneke@gnu.org> | 2006-02-11 11:35:18 +0000 |
| commit | 31568c504806f35aac420a394c9eab07abd9faa7 (patch) | |
| tree | e7ee5c7fa3217c501d868a94cd3530543e8f4c9e /lily/input.cc | |
| parent | e0d9c686b107b0d07a67f40b54a09009867620bf (diff) | |
* flower/include/std-string.hh:
* flower/include/std-vector.hh: Finish std:: conversion; move
flower extensions from std:: namespace. Update users.
* lily/include/lily-proto.hh: Replace Link_array__*_ macros by
their expansion to vector<*>. Update users.
Diffstat (limited to 'lily/input.cc')
| -rw-r--r-- | lily/input.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lily/input.cc b/lily/input.cc index ef78037fad..1379f1c7b5 100644 --- a/lily/input.cc +++ b/lily/input.cc @@ -67,7 +67,7 @@ Input::set_location (Input const &i_start, Input const &i_end) [file:line:column:][warning:]message */ void -Input::message (std::string s) const +Input::message (string s) const { if (source_file_) s = location_string () + ": " + s + "\n" @@ -76,13 +76,13 @@ Input::message (std::string s) const } void -Input::warning (std::string s) const +Input::warning (string s) const { message (_f ("warning: %s", s)); } void -Input::error (std::string s) const +Input::error (string s) const { message (_f ("error: %s", s)); // UGH, fix naming or usage @@ -90,12 +90,12 @@ Input::error (std::string s) const } void -Input::non_fatal_error (std::string s) const +Input::non_fatal_error (string s) const { message (_f ("error: %s", s)); } -std::string +string Input::location_string () const { if (source_file_) @@ -103,7 +103,7 @@ Input::location_string () const return " (" + _ ("position unknown") + ")"; } -std::string +string Input::line_number_string () const { if (source_file_) @@ -111,7 +111,7 @@ Input::line_number_string () const return "?"; } -std::string +string Input::file_string () const { if (source_file_) |