Commit ca271b4f authored by stezow's avatar stezow
Browse files

correct to have compilation ok on mac/clang

git-svn-id: svn://gal-serv.lnl.infn.it/agata/trunk/narval_emulator@1292 170316e4-aea8-4b27-aad4-0380ec0519c9
parent ab5b8554
......@@ -186,7 +186,7 @@ public:
}
template<typename P0, typename P1, typename P2, typename P3, typename P4, typename P5>
int Add(const std::string &keyw, const std::string &help, P0 *p0, P1 *p1, P2 *p2, P3 *p3, P4 *p4, P5 *p5) {
Com& Add(const std::string &keyw, const std::string &help, P0 *p0, P1 *p1, P2 *p2, P3 *p3, P4 *p4, P5 *p5) {
Com* cc = new Com(keyw, help);
cc->Required = defaultRequired;
cc->vpar.push_back(new Par(p0));
......
......@@ -352,7 +352,7 @@ void CycleServer::TcpServer(int portno)
serv_addr.sin_family = AF_INET;
serv_addr.sin_addr.s_addr = INADDR_ANY;
serv_addr.sin_port = htons(portno);
if (bind(sockfd, (struct sockaddr *) &serv_addr, sizeof(serv_addr)) < 0) {
if (::bind(sockfd, (struct sockaddr *) &serv_addr, sizeof(serv_addr)) < 0) {
cout << "ERROR on binding" << endl;
return;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment