From da027795884ff09d4e079daf450fc57293364455 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Fri, 15 Jan 2016 12:04:06 +0100 Subject: [PATCH] More VS2015 fixes --HG-- branch : develop --- code/nel/src/3d/dru.cpp | 6 +++--- code/nel/src/3d/texture_dlm.cpp | 2 +- code/nel/src/net/service.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/nel/src/3d/dru.cpp b/code/nel/src/3d/dru.cpp index 22d207682..bb86d8b84 100644 --- a/code/nel/src/3d/dru.cpp +++ b/code/nel/src/3d/dru.cpp @@ -99,7 +99,7 @@ IDriver *CDRU::createGlDriver() throw (EDru) throw EDruOpenglDriverNotFound(); } - nlinfo ("Using the library '"NL3D_GL_DLL_NAME"' that is in the directory: '%s'", driverLib.getLibFileName().c_str()); + nlinfo ("Using the library '" NL3D_GL_DLL_NAME "' that is in the directory: '%s'", driverLib.getLibFileName().c_str()); createDriver = (IDRV_CREATE_PROC) driverLib.getSymbolAddress(IDRV_CREATE_PROC_NAME); if (createDriver == NULL) @@ -153,7 +153,7 @@ IDriver *CDRU::createGlEsDriver() throw (EDru) throw EDruOpenglEsDriverNotFound(); } - nlinfo ("Using the library '"NL3D_GLES_DLL_NAME"' that is in the directory: '%s'", driverLib.getLibFileName().c_str()); + nlinfo ("Using the library '" NL3D_GLES_DLL_NAME "' that is in the directory: '%s'", driverLib.getLibFileName().c_str()); createDriver = (IDRV_CREATE_PROC) driverLib.getSymbolAddress(IDRV_CREATE_PROC_NAME); if (createDriver == NULL) @@ -206,7 +206,7 @@ IDriver *CDRU::createD3DDriver() throw (EDru) throw EDruDirect3dDriverNotFound(); } - nlinfo ("Using the library '"NL3D_D3D_DLL_NAME"' that is in the directory: '%s'", driverLib.getLibFileName().c_str()); + nlinfo ("Using the library '" NL3D_D3D_DLL_NAME "' that is in the directory: '%s'", driverLib.getLibFileName().c_str()); createDriver = (IDRV_CREATE_PROC) driverLib.getSymbolAddress(IDRV_CREATE_PROC_NAME); if (createDriver == NULL) diff --git a/code/nel/src/3d/texture_dlm.cpp b/code/nel/src/3d/texture_dlm.cpp index 40f87987c..2c8603859 100644 --- a/code/nel/src/3d/texture_dlm.cpp +++ b/code/nel/src/3d/texture_dlm.cpp @@ -385,7 +385,7 @@ void CTextureDLM::releaseLightMap(uint x, uint y) // Free this bit in the block. nlassert(block->FreeSpace & mask); - block->FreeSpace&= ~mask; + block->FreeSpace&= (~mask & std::numeric_limits::max()); // Free the block if necessary. diff --git a/code/nel/src/net/service.cpp b/code/nel/src/net/service.cpp index f7dc40da1..8f5a142cc 100644 --- a/code/nel/src/net/service.cpp +++ b/code/nel/src/net/service.cpp @@ -838,7 +838,7 @@ sint IService::main (const char *serviceShortName, const char *serviceLongName, } } - nlinfo ("SERVICE: Starting Service '%s' using NeL ("__DATE__" "__TIME__") compiled %s", _ShortName.c_str(), CompilationDate.c_str()); + nlinfo ("SERVICE: Starting Service '%s' using NeL (" __DATE__ " " __TIME__ ") compiled %s", _ShortName.c_str(), CompilationDate.c_str()); nlinfo ("SERVICE: On OS: %s", CSystemInfo::getOS().c_str()); setExitStatus (EXIT_SUCCESS); @@ -1802,7 +1802,7 @@ NLMISC_CATEGORISED_COMMAND(nel, serviceInfo, "display information about this ser if(args.size() != 0) return false; - log.displayNL ("Service %s '%s' using NeL ("__DATE__" "__TIME__")", IService::getInstance()->getServiceLongName().c_str(), IService::getInstance()->getServiceUnifiedName().c_str()); + log.displayNL ("Service %s '%s' using NeL (" __DATE__ " " __TIME__ ")", IService::getInstance()->getServiceLongName().c_str(), IService::getInstance()->getServiceUnifiedName().c_str()); log.displayNL ("Service listening port: %d", IService::getInstance()->ListeningPort.get()); log.displayNL ("Service running directory: '%s'", IService::getInstance()->RunningDirectory.c_str()); log.displayNL ("Service log directory: '%s'", IService::getInstance()->LogDirectory.c_str());