aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-12-24 01:48:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed: Compilation with clang

Browse source 
--HG--
branch : develop
This commit is contained in:
kervala 2016-12-05 19:39:19 +01:00
parent e0cb4bbe9e
commit 9bb46d2ae8
7 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
code/nel/src/3d/driver/opengl/mac/cocoa_opengl_view.m → code/nel/src/3d/driver/opengl/mac/cocoa_opengl_view.mm
View file

2
code/nel/src/gui/interface_expr.cpp
View file

@ -749,7 +749,7 @@ namespace NLGUI
std::string str; std::string str;
for (;;) for (;;)
{ {
if (expr == '\0') if (*expr == '\0')
{ {
nlwarning("CInterfaceExprValue::evalString : end of buffer encountered in a string"); nlwarning("CInterfaceExprValue::evalString : end of buffer encountered in a string");
return NULL; return NULL;

6
code/nel/src/misc/common.cpp
View file

@ -1493,7 +1493,7 @@ static bool openDocWithExtension (const std::string &document, const std::string
return true; return true;
} }
#elif defined(NL_OS_MAC) #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) if (url)
{ {
@ -1502,7 +1502,7 @@ static bool openDocWithExtension (const std::string &document, const std::string
if (res != 0) if (res != 0)
{ {
nlwarning("LSOpenCFURLRef %s returned %d", document, (sint)res); nlwarning("LSOpenCFURLRef %s returned %d", document.c_str(), (sint)res);
return false; return false;
} }
@ -1510,7 +1510,7 @@ static bool openDocWithExtension (const std::string &document, const std::string
} }
else else
{ {
nlwarning("Unable to create URL from %s", document); nlwarning("Unable to create URL from %s", document.c_str());
return false; return false;
} }
#else #else

11
code/nel/src/net/sock.cpp
View file

@ -497,9 +497,9 @@ CSock::TSockResult CSock::receive( uint8 *buffer, uint32& len, bool throw_except
if ( _NonBlocking ) if ( _NonBlocking )
{ {
// Receive incoming message (only the received part) // Receive incoming message (only the received part)
TTicks before = CTime::getPerformanceTime(); 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); //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 ); _MaxReceiveTime = max( (uint32)(CTime::ticksToSecond(CTime::getPerformanceTime()-before)*1000.0f), _MaxReceiveTime );
switch ( len )
switch (retLen)
{ {
// Graceful disconnection // Graceful disconnection
case 0 : case 0 :
@ -546,12 +547,14 @@ CSock::TSockResult CSock::receive( uint8 *buffer, uint32& len, bool throw_except
} }
} }
} }
len = (uint32)retLen;
} }
else // Blocking Mode else // Blocking Mode
{ {
// Receive incoming message, waiting until a complete message has arrived // Receive incoming message, waiting until a complete message has arrived
uint total = 0; uint total = 0;
uint brecvd; sint brecvd;
while ( total < len ) while ( total < len )
{ {

1
code/ryzom/client/src/login_patch.h
View file

@ -34,6 +34,7 @@ class CPatchThread;
class CCheckThread; class CCheckThread;
class CScanDataThread; class CScanDataThread;
class CInstallThread; 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 // Useful for using an external downloader (BitTorrent) use of interface with CGameDownloader from client_background_rd.exe using as install program

4
code/ryzom/common/src/game_share/ring_session_manager_itf.h
View file

@ -1666,12 +1666,11 @@ namespace RSMGR
sf_shard28 = 1<<28, sf_shard28 = 1<<28,
sf_shard29 = 1<<29, sf_shard29 = 1<<29,
sf_shard30 = 1<<30, sf_shard30 = 1<<30,
sf_shard31 = 1<<31,
invalid_val, invalid_val,
/// Number of enumerated values /// 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_shard28)
NL_STRING_CONVERSION_TABLE_ENTRY(sf_shard29) NL_STRING_CONVERSION_TABLE_ENTRY(sf_shard29)
NL_STRING_CONVERSION_TABLE_ENTRY(sf_shard30) NL_STRING_CONVERSION_TABLE_ENTRY(sf_shard30)
NL_STRING_CONVERSION_TABLE_ENTRY(sf_shard31)
NL_STRING_CONVERSION_TABLE_ENTRY(invalid_val) NL_STRING_CONVERSION_TABLE_ENTRY(invalid_val)
}; };
static NLMISC::CStringConversion<TValues> static NLMISC::CStringConversion<TValues>