From 2f9b8f9f525e9cdff74e8fd1f0d32ca58f52bcf4 Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Mon, 11 Aug 2014 23:18:16 +0100 Subject: [PATCH] Fix build on MacOSX. std::bind conflicted with ::bind Patch to csocket is already upstream. --- src/Csocket.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Csocket.cpp b/src/Csocket.cpp index 347fd394..bbd1d91c 100644 --- a/src/Csocket.cpp +++ b/src/Csocket.cpp @@ -57,7 +57,11 @@ #define CS_SRANDBUFFER 128 -using namespace std; +using std::stringstream; +using std::ostream; +using std::endl; +using std::min; +using std::vector; #define CREATE_ARES_VER( a, b, c ) ((a<<16)|(b<<8)|c)