Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10857


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/cpp11_v2/src/libraries/network/packet/ServerInformation.cc

    r10622 r10857  
    8787  } // namespace packet
    8888
    89   std::ostream& operator<<(std::ostream& out, const ENetAddress& address)
    90   {
    91       char addr[64];
    92       if (!enet_address_get_host_ip(&address, addr, 64))
    93           out << addr;
    94       return out;
    95   }
    9689} // namespace orxonox
     90
     91std::ostream& operator<<(std::ostream& out, const ENetAddress& address)
     92{
     93    char addr[64];
     94    if (!enet_address_get_host_ip(&address, addr, 64))
     95        out << addr;
     96    return out;
     97}
  • code/branches/cpp11_v2/src/libraries/network/packet/ServerInformation.h

    r10622 r10857  
    6666  }
    6767
    68   _NetworkExport std::ostream& operator<<(std::ostream& out, const ENetAddress& address);
    6968}
    7069
     70_NetworkExport std::ostream& operator<<(std::ostream& out, const ENetAddress& address);
     71
    7172#endif // SERVERINFORMATION_H
Note: See TracChangeset for help on using the changeset viewer.