diff options
author | David Robillard <d@drobilla.net> | 2014-11-30 18:27:04 -0500 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2014-11-30 23:56:19 -0500 |
commit | cf537b97f5d015074578c809a15a38b8d3858d00 (patch) | |
tree | 929425d102806aee9867fde4c1a57641481d2447 /libs/ardour | |
parent | 008bfceb77298f21c592a3860d75d5cc4b315e4d (diff) |
Add missing namespace qualifiers.
Diffstat (limited to 'libs/ardour')
-rw-r--r-- | libs/ardour/ardour/midi_diskstream.h | 4 | ||||
-rw-r--r-- | libs/ardour/ardour/midi_track.h | 2 | ||||
-rw-r--r-- | libs/ardour/butler.cc | 2 | ||||
-rw-r--r-- | libs/ardour/port_manager.cc | 2 | ||||
-rw-r--r-- | libs/ardour/smf_source.cc | 1 |
5 files changed, 6 insertions, 5 deletions
diff --git a/libs/ardour/ardour/midi_diskstream.h b/libs/ardour/ardour/midi_diskstream.h index 91fb891f17..70b4454118 100644 --- a/libs/ardour/ardour/midi_diskstream.h +++ b/libs/ardour/ardour/midi_diskstream.h @@ -55,7 +55,7 @@ class Session; class LIBARDOUR_API MidiDiskstream : public Diskstream { public: - MidiDiskstream (Session &, const string& name, Diskstream::Flag f = Recordable); + MidiDiskstream (Session &, const std::string& name, Diskstream::Flag f = Recordable); MidiDiskstream (Session &, const XMLNode&); ~MidiDiskstream(); @@ -147,7 +147,7 @@ class LIBARDOUR_API MidiDiskstream : public Diskstream int use_new_write_source (uint32_t n=0); - int find_and_use_playlist (const string&); + int find_and_use_playlist (const std::string&); void allocate_temporary_buffers (); diff --git a/libs/ardour/ardour/midi_track.h b/libs/ardour/ardour/midi_track.h index 3db16937fc..dbfd18c090 100644 --- a/libs/ardour/ardour/midi_track.h +++ b/libs/ardour/ardour/midi_track.h @@ -38,7 +38,7 @@ class Session; class LIBARDOUR_API MidiTrack : public Track { public: - MidiTrack (Session&, string name, Route::Flag f = Route::Flag (0), TrackMode m = Normal); + MidiTrack (Session&, std::string name, Route::Flag f = Route::Flag (0), TrackMode m = Normal); ~MidiTrack (); int init (); diff --git a/libs/ardour/butler.cc b/libs/ardour/butler.cc index 9bc232007b..8ea3cb4624 100644 --- a/libs/ardour/butler.cc +++ b/libs/ardour/butler.cc @@ -466,7 +466,7 @@ Butler::empty_pool_trash () void Butler::drop_references () { - cerr << "Butler drops pool trash\n"; + std::cerr << "Butler drops pool trash\n"; SessionEvent::pool->set_trash (0); } diff --git a/libs/ardour/port_manager.cc b/libs/ardour/port_manager.cc index c7adefc531..a8d8da0067 100644 --- a/libs/ardour/port_manager.cc +++ b/libs/ardour/port_manager.cc @@ -451,7 +451,7 @@ PortManager::reestablish_ports () for (i = p->begin(); i != p->end(); ++i) { if (i->second->reestablish ()) { error << string_compose (_("Re-establising port %1 failed"), i->second->name()) << endmsg; - cerr << string_compose (_("Re-establising port %1 failed"), i->second->name()) << endl; + std::cerr << string_compose (_("Re-establising port %1 failed"), i->second->name()) << std::endl; break; } } diff --git a/libs/ardour/smf_source.cc b/libs/ardour/smf_source.cc index 1ffcdac1b2..72f03ba351 100644 --- a/libs/ardour/smf_source.cc +++ b/libs/ardour/smf_source.cc @@ -51,6 +51,7 @@ using namespace ARDOUR; using namespace Glib; using namespace PBD; using namespace Evoral; +using namespace std; /** Constructor used for new internal-to-session files. File cannot exist. */ SMFSource::SMFSource (Session& s, const string& path, Source::Flag flags) |