Browse Source

Fix FTBFS with stricter C++11

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Slávek Banko 8 months ago
parent
commit
0184742fd6
Signed by: Slávek Banko <slavek.banko@axis.cz> GPG Key ID: 608F5293A04BE668
4 changed files with 4 additions and 4 deletions
  1. 1
    1
      mcop/tcpserver.cc
  2. 1
    1
      mcop/unixserver.cc
  3. 1
    1
      soundserver/gslplayobject_impl.cc
  4. 1
    1
      soundserver/wavplayobject_impl.cc

+ 1
- 1
mcop/tcpserver.cc View File

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

+ 1
- 1
mcop/unixserver.cc View File

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

+ 1
- 1
soundserver/gslplayobject_impl.cc View File

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

+ 1
- 1
soundserver/wavplayobject_impl.cc View File

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

Loading…
Cancel
Save