mirror/ULib
1
0
Fork 0
mirror of https://github.com/stefanocasazza/ULib.git synced 2025-09-28 19:05:55 +08:00
Code Issues Releases Wiki Activity

fix

Browse Source
This commit is contained in:
stefanocasazza 2019-10-31 14:46:20 +01:00
parent 65a7070a9d
commit a3ba283e66
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/ulib/internal/common.h
View File

@ -32,12 +32,14 @@
# else
# define U_openmode std::ios_base::out
# endif
# ifdef __clang__
# define ios std::ios
# if defined(__clang__)
# define istream std::istream
# define ostream std::ostream
# define streambuf std::streambuf
# define streamsize std::streamsize
# if !defined(__OSX__)
# define ios std::ios
# endif
# endif
#else
typedef char istream;

2
include/ulib/net/client/redis.h
View File

@ -825,7 +825,7 @@ protected:
void processResponse();
bool processRequest(char recvtype);
#if defined(HAVE_CXX20) && !defined(__clang__)
#if defined(U_STDCPP_ENABLE) && defined(U_LINUX) && defined(HAVE_CXX20) && !defined(__clang__)
bool sendRequest(UStringType&& pipeline)
#else
bool sendRequest(const UString& pipeline)

2
include/ulib/net/socket.h
View File

@ -733,7 +733,7 @@ protected:
# ifdef _MSWINDOWS_
if (setSockOpt(SOL_SOCKET, type, (const char*)&timeoutMS)) U_RETURN(true);
# else
struct timeval timer = { (long)timeoutMS / 1000L, ((long)timeoutMS % 1000L) * 1000L }; // convert the timeout value (in milliseconds) into a timeval struct
struct timeval timer = { timeoutMS / 1000, ((int)timeoutMS % 1000) * 1000 }; // convert the timeout value (in milliseconds) into a timeval struct
U_INTERNAL_DUMP("timer = { %ld %ld }", timer.tv_sec, timer.tv_usec)