From 4ee56cb68482814b8cb9e00672c60327d7592171 Mon Sep 17 00:00:00 2001 From: Davis King Date: Tue, 18 Mar 2014 19:18:04 -0400 Subject: [PATCH] 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. --- dlib/sockets/sockets_kernel_1.h | 12 ++++++------ dlib/sockets/sockets_kernel_2.h | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlib/sockets/sockets_kernel_1.h b/dlib/sockets/sockets_kernel_1.h index e3e49c018..326a3e2b6 100644 --- a/dlib/sockets/sockets_kernel_1.h +++ b/dlib/sockets/sockets_kernel_1.h @@ -90,8 +90,8 @@ namespace dlib connection*& new_connection, unsigned short foreign_port, const std::string& foreign_ip, - unsigned short local_port = 0, - const std::string& local_ip = "" + unsigned short local_port, + const std::string& local_ip ); public: @@ -255,7 +255,7 @@ namespace dlib friend int create_listener ( listener*& new_listener, unsigned short port, - const std::string& ip = "" + const std::string& ip ); public: @@ -312,15 +312,15 @@ namespace dlib int create_listener ( listener*& new_listener, unsigned short port, - const std::string& ip + const std::string& ip = "" ); int create_connection ( connection*& new_connection, unsigned short foreign_port, const std::string& foreign_ip, - unsigned short local_port, - const std::string& local_ip + unsigned short local_port = 0, + const std::string& local_ip = "" ); int create_listener ( diff --git a/dlib/sockets/sockets_kernel_2.h b/dlib/sockets/sockets_kernel_2.h index d1be8e23d..2ddaa8865 100644 --- a/dlib/sockets/sockets_kernel_2.h +++ b/dlib/sockets/sockets_kernel_2.h @@ -113,8 +113,8 @@ namespace dlib connection*& new_connection, unsigned short foreign_port, const std::string& foreign_ip, - unsigned short local_port = 0, - const std::string& local_ip = "" + unsigned short local_port, + const std::string& local_ip ); public: @@ -299,7 +299,7 @@ namespace dlib friend int create_listener ( listener*& new_listener, unsigned short port, - const std::string& ip = "" + const std::string& ip ); public: @@ -356,15 +356,15 @@ namespace dlib int create_listener ( listener*& new_listener, unsigned short port, - const std::string& ip + const std::string& ip = "" ); int create_connection ( connection*& new_connection, unsigned short foreign_port, const std::string& foreign_ip, - unsigned short local_port, - const std::string& local_ip + unsigned short local_port = 0, + const std::string& local_ip = "" ); int create_listener (