-ahi borre lo que se me escapo

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

diff --git a/Server/src/transmitter.cpp b/Server/src/transmitter.cpp
index 75f622d018e1d6bc831c470fb18647f46b6141d7..4211e51a0cc866828efaf6bdba632af6de24259a 100644 (file)
--- a/Server/src/transmitter.cpp
+++ b/Server/src/transmitter.cpp
@@ -32,34 +32,44 @@
 #      include <iostream>
 #endif // DEBUG
 
 #      include <iostream>
 #endif // DEBUG
 

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

 #ifdef DEBUG
 #ifdef DEBUG

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

 #endif // DEBUG
 }
 
 /// \todo debría conectarse en real_run() (?)
 #endif // DEBUG
 }
 
 /// \todo debría conectarse en real_run() (?)

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

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

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

 #endif // DEBUG
        // FIXME - deberia ir en run().
        socket->connect(host.c_str(), port);
 }
 
 /// \todo debría dar una excepción (?)
 #endif // DEBUG
        // FIXME - deberia ir en run().
        socket->connect(host.c_str(), port);
 }
 
 /// \todo debría dar una excepción (?)

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

 #ifdef DEBUG
        // FIXME - debería tirar una excepción?
        if (!socket->is_open()) {
 #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;
+               cerr << "Conectado a " << socket->peerhost() <<
+                       ":" << socket->peerport() << "." << endl;

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

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