Changeset 10857 for code/branches/cpp11_v2/src/libraries

Timestamp:

Nov 25, 2015, 2:20:01 PM (9 years ago)

Author:

muemart

Message:

Fix clang build for LANDiscoverable
Looks like name lookup for operator<< is wrong in gcc and msvc and
incorrectly found the overloaded operator in the orxonox namespace

Location:

code/branches/cpp11_v2/src/libraries/network/packet

Files:

• ServerInformation.cc (modified) (1 diff)
• ServerInformation.h (modified) (1 diff)

code/branches/cpp11_v2/src/libraries/network/packet/ServerInformation.cc

@@ -87 +87 @@
   } // namespace packet
 
-  std::ostream& operator<<(std::ostream& out, const ENetAddress& address)
-  {
-      char addr[64];
-      if (!enet_address_get_host_ip(&address, addr, 64))
-          out << addr;
-      return out;
-  }
 } // namespace orxonox
+
+std::ostream& operator<<(std::ostream& out, const ENetAddress& address)
+{
+    char addr[64];
+    if (!enet_address_get_host_ip(&address, addr, 64))
+        out << addr;
+    return out;
+}

code/branches/cpp11_v2/src/libraries/network/packet/ServerInformation.h

@@ -66 +66 @@
   }
 
-  _NetworkExport std::ostream& operator<<(std::ostream& out, const ENetAddress& address);
 }
 
+_NetworkExport std::ostream& operator<<(std::ostream& out, const ENetAddress& address);
+
 #endif // SERVERINFORMATION_H