From aead758a0cd7b77edd4299cb2441704e1826a5b8 Mon Sep 17 00:00:00 2001 From: kervala Date: Mon, 5 Dec 2016 19:39:19 +0100 Subject: [PATCH] Fixed: Compilation with clang --- .../mac/{cocoa_opengl_view.m => cocoa_opengl_view.mm} | 0 code/nel/src/gui/interface_expr.cpp | 2 +- code/nel/src/misc/common.cpp | 6 +++--- code/nel/src/net/sock.cpp | 11 +++++++---- code/ryzom/client/src/login_patch.h | 1 + .../common/src/game_share/ring_session_manager_itf.h | 4 +--- code/ryzom/common/src/game_share/utils.h | 2 +- 7 files changed, 14 insertions(+), 12 deletions(-) rename code/nel/src/3d/driver/opengl/mac/{cocoa_opengl_view.m => cocoa_opengl_view.mm} (100%) diff --git a/code/nel/src/3d/driver/opengl/mac/cocoa_opengl_view.m b/code/nel/src/3d/driver/opengl/mac/cocoa_opengl_view.mm similarity index 100% rename from code/nel/src/3d/driver/opengl/mac/cocoa_opengl_view.m rename to code/nel/src/3d/driver/opengl/mac/cocoa_opengl_view.mm diff --git a/code/nel/src/gui/interface_expr.cpp b/code/nel/src/gui/interface_expr.cpp index 9d13286a9..77d48906e 100644 --- a/code/nel/src/gui/interface_expr.cpp +++ b/code/nel/src/gui/interface_expr.cpp @@ -749,7 +749,7 @@ namespace NLGUI std::string str; for (;;) { - if (expr == '\0') + if (*expr == '\0') { nlwarning("CInterfaceExprValue::evalString : end of buffer encountered in a string"); return NULL; diff --git a/code/nel/src/misc/common.cpp b/code/nel/src/misc/common.cpp index ca116d0f8..3f39ab86a 100644 --- a/code/nel/src/misc/common.cpp +++ b/code/nel/src/misc/common.cpp @@ -1493,7 +1493,7 @@ static bool openDocWithExtension (const std::string &document, const std::string return true; } #elif defined(NL_OS_MAC) - CFURLRef url = CFURLCreateWithBytes(NULL, (const UInt8 *)document, strlen(document), kCFStringEncodingUTF8, NULL); + CFURLRef url = CFURLCreateWithBytes(NULL, (const UInt8 *)document.c_str(), document.length(), kCFStringEncodingUTF8, NULL); if (url) { @@ -1502,7 +1502,7 @@ static bool openDocWithExtension (const std::string &document, const std::string if (res != 0) { - nlwarning("LSOpenCFURLRef %s returned %d", document, (sint)res); + nlwarning("LSOpenCFURLRef %s returned %d", document.c_str(), (sint)res); return false; } @@ -1510,7 +1510,7 @@ static bool openDocWithExtension (const std::string &document, const std::string } else { - nlwarning("Unable to create URL from %s", document); + nlwarning("Unable to create URL from %s", document.c_str()); return false; } #else diff --git a/code/nel/src/net/sock.cpp b/code/nel/src/net/sock.cpp index 77c707712..4a6b57e95 100644 --- a/code/nel/src/net/sock.cpp +++ b/code/nel/src/net/sock.cpp @@ -497,9 +497,9 @@ CSock::TSockResult CSock::receive( uint8 *buffer, uint32& len, bool throw_except if ( _NonBlocking ) { // Receive incoming message (only the received part) - TTicks before = CTime::getPerformanceTime(); - len = ::recv( _Sock, (char*)buffer, len, 0 ); + + sint retLen = ::recv( _Sock, (char*)buffer, len, 0 ); //nlinfo ("CSock::receive(): NBM Received %d bytes to %d res: %d (%d)", realLen, _Sock, len, ERROR_NUM); @@ -509,7 +509,8 @@ CSock::TSockResult CSock::receive( uint8 *buffer, uint32& len, bool throw_except } _MaxReceiveTime = max( (uint32)(CTime::ticksToSecond(CTime::getPerformanceTime()-before)*1000.0f), _MaxReceiveTime ); - switch ( len ) + + switch (retLen) { // Graceful disconnection case 0 : @@ -546,12 +547,14 @@ CSock::TSockResult CSock::receive( uint8 *buffer, uint32& len, bool throw_except } } } + + len = (uint32)retLen; } else // Blocking Mode { // Receive incoming message, waiting until a complete message has arrived uint total = 0; - uint brecvd; + sint brecvd; while ( total < len ) { diff --git a/code/ryzom/client/src/login_patch.h b/code/ryzom/client/src/login_patch.h index 0daf83b46..2b108994d 100644 --- a/code/ryzom/client/src/login_patch.h +++ b/code/ryzom/client/src/login_patch.h @@ -34,6 +34,7 @@ class CPatchThread; class CCheckThread; class CScanDataThread; class CInstallThread; +class CDownloadThread; // Useful for using an external downloader (BitTorrent) use of interface with CGameDownloader from client_background_rd.exe using as install program diff --git a/code/ryzom/common/src/game_share/ring_session_manager_itf.h b/code/ryzom/common/src/game_share/ring_session_manager_itf.h index 7dc9d5af3..832903ad1 100644 --- a/code/ryzom/common/src/game_share/ring_session_manager_itf.h +++ b/code/ryzom/common/src/game_share/ring_session_manager_itf.h @@ -1666,12 +1666,11 @@ namespace RSMGR sf_shard28 = 1<<28, sf_shard29 = 1<<29, sf_shard30 = 1<<30, - sf_shard31 = 1<<31, invalid_val, /// Number of enumerated values - nb_enum_items = 32 + nb_enum_items = 31 }; @@ -1709,7 +1708,6 @@ namespace RSMGR NL_STRING_CONVERSION_TABLE_ENTRY(sf_shard28) NL_STRING_CONVERSION_TABLE_ENTRY(sf_shard29) NL_STRING_CONVERSION_TABLE_ENTRY(sf_shard30) - NL_STRING_CONVERSION_TABLE_ENTRY(sf_shard31) NL_STRING_CONVERSION_TABLE_ENTRY(invalid_val) }; static NLMISC::CStringConversion diff --git a/code/ryzom/common/src/game_share/utils.h b/code/ryzom/common/src/game_share/utils.h index c4c0fe26f..2914f0dc8 100644 --- a/code/ryzom/common/src/game_share/utils.h +++ b/code/ryzom/common/src/game_share/utils.h @@ -76,7 +76,7 @@ inline ucstring capitalize(const ucstring & s) #define MACRO_CONCAT2(a,b) CONCAT(a,b) #define MACRO_TOTXT(a) #a #define MACRO_TOTXT2(a) TOTXT(a) -#define __FILE_LINE__ __FILE__ ":"TOTXT2(__LINE__)":" +#define __FILE_LINE__ __FILE__ ":" TOTXT2(__LINE__) ":" //-------------------------------------------------------------------------------------------------