Algunos cambios mas, ya es probable que compile de nuevo (aunque no ande como deberia).

[z.facultad/75.42/plaqui.git] / Server / src / controlclient.cpp

diff --git a/Server/src/controlclient.cpp b/Server/src/controlclient.cpp
index 99c5348ff9821f555b1f9d375e5539fd9bdbd357..2c76de3efc659f8a9cca22d759bf80de915e6fd6 100644 (file)
--- a/Server/src/controlclient.cpp
+++ b/Server/src/controlclient.cpp
@@ -30,35 +30,45 @@
 #      include <iostream>
 #endif // DEBUG
 
 #      include <iostream>
 #endif // DEBUG
 

-PlaQui::Server::ControlClient::~ControlClient(void) {
+using namespace std;
+
+namespace PlaQui {
+
+namespace Server {
+
+ControlClient::~ControlClient(void) {

 #ifdef DEBUG
 #ifdef DEBUG

-       std::cerr << __FILE__ << ": destructor." << std::endl;
+       cerr << __FILE__ << ": destructor." << endl;

 #endif // DEBUG
 }
 
 #endif // DEBUG
 }
 

-PlaQui::Server::ControlClient::ControlClient(std::string host, int port):
+ControlClient::ControlClient(string host, int port):

                Connection(sockbuf::sock_stream) {
 #ifdef DEBUG
                Connection(sockbuf::sock_stream) {
 #ifdef DEBUG

-       std::cerr << __FILE__ << ": host" << host
-               << " | port = " << port << std::endl;
+       cerr << __FILE__ << ": host" << host
+               << " | port = " << port << endl;

 #endif // DEBUG
        // FIXME - poner en run().
        socket->connect(host.c_str(), port);
 }
 
 #endif // DEBUG
        // FIXME - poner en run().
        socket->connect(host.c_str(), port);
 }
 

-void PlaQui::Server::ControlClient::real_run(void) {
+void ControlClient::real_run(void) {

 #ifdef DEBUG
 #ifdef DEBUG

-       std::cerr << __FILE__ << ": real_run." << std::endl;
+       cerr << __FILE__ << ": real_run." << endl;

 #endif // DEBUG
 #ifdef DEBUG
        // FIXME - debería tirar una excepción?
        if (!socket->is_open()) {
 #endif // DEBUG
 #ifdef DEBUG
        // FIXME - debería tirar una excepción?
        if (!socket->is_open()) {

-               std::cerr << "No se pudo conectar a " << socket->peerhost() <<
-                       ":" << socket->peerport() << "." << std::endl;
+               cerr << "No se pudo conectar a " << socket->peerhost() <<
+                       ":" << socket->peerport() << "." << endl;

        } else {
        } else {

-               std::cerr << "Conectado a " << socket->peerhost() <<
-                       ":" << socket->peerport() << "." << std::endl;
-#endif // DEBUG
+               cerr << "Conectado a " << socket->peerhost() <<
+                       ":" << socket->peerport() << "." << endl;

        }
        }

+#endif // DEBUG

 }
 
 }
 

+} // namespace Server
+
+} // namespace PlaQui
+