Fix FTBFS with stricter C++11

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 0184742fd6)
v3.5.13-sru
Slávek Banko 6 years ago
parent cea825bc2d
commit 3f9d407d27
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

@ -121,7 +121,7 @@ bool TCPServer::initSocket()
socket_addr.sin_family = AF_INET; socket_addr.sin_family = AF_INET;
socket_addr.sin_port = htons( TCPServerPort ); // 0 = choose port freely socket_addr.sin_port = htons( TCPServerPort ); // 0 = choose port freely
socket_addr.sin_addr.s_addr = htonl( inet_addr("0.0.0.0") ); socket_addr.sin_addr.s_addr = htonl( inet_addr("0.0.0.0") );
if ( bind( theSocket, (struct sockaddr *) &socket_addr, if ( ::bind( theSocket, (struct sockaddr *) &socket_addr,
sizeof(struct sockaddr_in) ) < 0 ) sizeof(struct sockaddr_in) ) < 0 )
{ {
arts_warning("MCOP TCPServer: can't bind to port/address"); arts_warning("MCOP TCPServer: can't bind to port/address");

@ -98,7 +98,7 @@ bool UnixServer::initSocket(const string& serverID)
xserverpath = socket_addr.sun_path; xserverpath = socket_addr.sun_path;
if ( bind( theSocket, (struct sockaddr *) &socket_addr, if ( ::bind( theSocket, (struct sockaddr *) &socket_addr,
sizeof(struct sockaddr_un) ) < 0 ) sizeof(struct sockaddr_un) ) < 0 )
{ {
arts_warning("MCOP UnixServer: can't bind to file \"%s\"", arts_warning("MCOP UnixServer: can't bind to file \"%s\"",

@ -134,7 +134,7 @@ public:
*/ */
std::string description() std::string description()
{ {
return "no description available (see "__FILE__")"; return "no description available (see " __FILE__ ")";
} }
poTime currentTime() poTime currentTime()

@ -74,7 +74,7 @@ public:
* KMedia2 interface * KMedia2 interface
*/ */
string description() { string description() {
return "no description (see "__FILE__")"; return "no description (see " __FILE__ ")";
} }
poTime currentTime() { poTime currentTime() {

Loading…
Cancel
Save