Skip to content

GitLab

Commit 4ee56cb6 authored by Davis King's avatar Davis King
Browse files

A minor change to avoid a compiler error from clang 3.4 on Mac OS X 10.9. 

Thanks to Martin Fergie for reporting this problem.
parent 353e8859
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 12 deletions
dlib/sockets/sockets_kernel_1.h
View file @ 4ee56cb6
...@@ -90,8 +90,8 @@ namespace dlib ...@@ -90,8 +90,8 @@ namespace dlib
connection*& new_connection, connection*& new_connection,
unsigned short foreign_port, unsigned short foreign_port,
const std::string& foreign_ip, const std::string& foreign_ip,
unsigned short local_port = 0, unsigned short local_port,
const std::string& local_ip = "" const std::string& local_ip
); );
public: public:
...@@ -255,7 +255,7 @@ namespace dlib ...@@ -255,7 +255,7 @@ namespace dlib
friend int create_listener ( friend int create_listener (
listener*& new_listener, listener*& new_listener,
unsigned short port, unsigned short port,
const std::string& ip = "" const std::string& ip
); );
public: public:
...@@ -312,15 +312,15 @@ namespace dlib ...@@ -312,15 +312,15 @@ namespace dlib
int create_listener ( int create_listener (
listener*& new_listener, listener*& new_listener,
unsigned short port, unsigned short port,
const std::string& ip const std::string& ip = ""
); );
int create_connection ( int create_connection (
connection*& new_connection, connection*& new_connection,
unsigned short foreign_port, unsigned short foreign_port,
const std::string& foreign_ip, const std::string& foreign_ip,
unsigned short local_port, unsigned short local_port = 0,
const std::string& local_ip const std::string& local_ip = ""
); );
int create_listener ( int create_listener (
......
dlib/sockets/sockets_kernel_2.h
View file @ 4ee56cb6
...@@ -113,8 +113,8 @@ namespace dlib ...@@ -113,8 +113,8 @@ namespace dlib
connection*& new_connection, connection*& new_connection,
unsigned short foreign_port, unsigned short foreign_port,
const std::string& foreign_ip, const std::string& foreign_ip,
unsigned short local_port = 0, unsigned short local_port,
const std::string& local_ip = "" const std::string& local_ip
); );
public: public:
...@@ -299,7 +299,7 @@ namespace dlib ...@@ -299,7 +299,7 @@ namespace dlib
friend int create_listener ( friend int create_listener (
listener*& new_listener, listener*& new_listener,
unsigned short port, unsigned short port,
const std::string& ip = "" const std::string& ip
); );
public: public:
...@@ -356,15 +356,15 @@ namespace dlib ...@@ -356,15 +356,15 @@ namespace dlib
int create_listener ( int create_listener (
listener*& new_listener, listener*& new_listener,
unsigned short port, unsigned short port,
const std::string& ip const std::string& ip = ""
); );
int create_connection ( int create_connection (
connection*& new_connection, connection*& new_connection,
unsigned short foreign_port, unsigned short foreign_port,
const std::string& foreign_ip, const std::string& foreign_ip,
unsigned short local_port, unsigned short local_port = 0,
const std::string& local_ip const std::string& local_ip = ""
); );
int create_listener ( int create_listener (
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment