Merge branch 'v1'

Conflicts: src/network/socket_handler.hpp
2014-07-15 15:56:37 +02:00
parent b94247813b 6a4e17cb0a
commit 609722b4e7
2 changed files with 2 additions and 2 deletions
@@ -139,7 +139,7 @@ void TCPSocketHandler::connect(const std::string& address, const std::string& po
          this->ai_addrlen = rp->ai_addrlen;
          memcpy(&this->ai_addr, rp->ai_addr, this->ai_addrlen);
          memcpy(&this->addrinfo, rp, sizeof(struct addrinfo));
-          this->addrinfo.ai_addr = &this->ai_addr;
+          this->addrinfo.ai_addr = reinterpret_cast<struct sockaddr*>(&this->ai_addr);
          this->addrinfo.ai_next = nullptr;
          // If the connection has not succeeded or failed in 5s, we consider
          // it to have failed