diff --git a/reference/SocketServer/SocketServer.cpp b/reference/SocketServer/SocketServer.cpp index 04e2c619a..2efc19d8d 100644 --- a/reference/SocketServer/SocketServer.cpp +++ b/reference/SocketServer/SocketServer.cpp @@ -15,7 +15,7 @@ CONSOLE_APP_MAIN Socket s; if(server.Accept(s)) { String w = s.ReadUntil('\n'); - Cout() << "Request: " << w << " from: " << s.GetPeerName() << '\n'; + Cout() << "Request: " << w << " from: " << s.GetPeerAddr() << '\n'; if(w == "time") s.Write(AsString(GetSysTime())); else diff --git a/reference/Xmlize_std/Xmlize.cpp b/reference/Xmlize_std/Xmlize.cpp index 14ee11987..1dc71b37c 100644 --- a/reference/Xmlize_std/Xmlize.cpp +++ b/reference/Xmlize_std/Xmlize.cpp @@ -1,10 +1,9 @@ #include #include -using namespace Upp; -using namespace std; +namespace Upp { -template<> void Upp::Xmlize(XmlIO xml, vector& data) { +template<> void Xmlize(XmlIO xml, std::vector& data) { if(xml.IsStoring()) for(int i = 0; i < (int)data.size(); i++) Xmlize(xml.Add("item"), data[i]); @@ -18,6 +17,11 @@ template<> void Upp::Xmlize(XmlIO xml, vector& data) { } } +}; + +using namespace Upp; +using namespace std; + CONSOLE_APP_MAIN { vector x;