Merge branch 'master' into windows

2013-09-14 16:24:46 -04:00
parent 60da662aff 25b9e266eb
commit 0da34e65e3
1 changed files with 2 additions and 2 deletions
--- a/libs/backends/jack/jack_connection.cc
+++ b/libs/backends/jack/jack_connection.cc
@@ -153,7 +153,7 @@ void
 JackConnection::halted_callback ()
 {
 	_jack = 0;
-	cerr << "JACK HALTED\n";
+	std::cerr << "JACK HALTED\n";
 	Disconnected ("");
 }

@@ -161,7 +161,7 @@ void
 JackConnection::halted_info_callback (jack_status_t /*status*/, const char* reason)
 {
 	_jack = 0;
-	cerr << "JACK HALTED: " << reason << endl;
+	std::cerr << "JACK HALTED: " << reason << std::endl;
 	Disconnected (reason);
 }