aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-17 04:51:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed: Compilation with GCC 6

Browse source 
--HG--
branch : develop
This commit is contained in:
kervala 2016-12-03 18:14:31 +01:00
parent d9ab55640c
commit f3564ed86e
5 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
code/nel/include/nel/3d/gpu_program_params.h
View file

@ -27,7 +27,8 @@
#ifndef NL3D_GPU_PROGRAM_PARAMS_H #ifndef NL3D_GPU_PROGRAM_PARAMS_H
#define NL3D_GPU_PROGRAM_PARAMS_H #define NL3D_GPU_PROGRAM_PARAMS_H
#include <nel/misc/types_nl.h>
#include "nel/misc/types_nl.h"
// STL includes // STL includes
#include <map> #include <map>
@ -167,7 +168,7 @@ private:
std::map<std::string, size_t> m_MapName; // map from name to offset std::map<std::string, size_t> m_MapName; // map from name to offset
size_t m_First; size_t m_First;
size_t m_Last; size_t m_Last;
static const size_t s_End = -1; static const size_t s_End;
}; /* class CGPUProgramParams */ }; /* class CGPUProgramParams */

4
code/nel/include/nel/misc/debug.h
View file

@ -151,8 +151,8 @@ void setCrashAlreadyReported(bool state);
* Note 2 : To show a warning under GCC, use #warning "Your warning here", * Note 2 : To show a warning under GCC, use #warning "Your warning here",
* see nel/net/net_manager.h for an example on how to use these correctly. * see nel/net/net_manager.h for an example on how to use these correctly.
*/ */
#define NL_LOC_MSG __FILE__"("NL_MACRO_TO_STR(__LINE__)") : Message: " #define NL_LOC_MSG __FILE__ "(" NL_MACRO_TO_STR(__LINE__) ") : Message: "
#define NL_LOC_WRN __FILE__"("NL_MACRO_TO_STR(__LINE__)") : Warning Msg: " #define NL_LOC_WRN __FILE__ "(" NL_MACRO_TO_STR(__LINE__) ") : Warning Msg: "
/** /**

4
code/nel/include/nel/net/service.h
View file

@ -124,7 +124,7 @@ int APIENTRY WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdL
scn->setArgs (lpCmdLine); \ scn->setArgs (lpCmdLine); \
createDebug(NULL,!scn->haveLongArg("nolog"));\ createDebug(NULL,!scn->haveLongArg("nolog"));\
scn->setCallbackArray (__ServiceCallbackArray, sizeof(__ServiceCallbackArray)/sizeof(__ServiceCallbackArray[0])); \ scn->setCallbackArray (__ServiceCallbackArray, sizeof(__ServiceCallbackArray)/sizeof(__ServiceCallbackArray[0])); \
sint retval = scn->main (__ServiceShortName, __ServiceLongName, __ServicePort, __ConfigDir, __LogDir, __DATE__" "__TIME__); \ sint retval = scn->main (__ServiceShortName, __ServiceLongName, __ServicePort, __ConfigDir, __LogDir, __DATE__ " " __TIME__); \
delete scn; \ delete scn; \
return retval; \ return retval; \
} }
@ -139,7 +139,7 @@ int main(int argc, const char **argv) \
scn->setArgs (argc, argv); \ scn->setArgs (argc, argv); \
createDebug(NULL,!scn->haveLongArg("nolog"));\ createDebug(NULL,!scn->haveLongArg("nolog"));\
scn->setCallbackArray (__ServiceCallbackArray, sizeof(__ServiceCallbackArray)/sizeof(__ServiceCallbackArray[0])); \ scn->setCallbackArray (__ServiceCallbackArray, sizeof(__ServiceCallbackArray)/sizeof(__ServiceCallbackArray[0])); \
sint retval = scn->main (__ServiceShortName, __ServiceLongName, __ServicePort, __ConfigDir, __LogDir, __DATE__" "__TIME__); \ sint retval = scn->main (__ServiceShortName, __ServiceLongName, __ServicePort, __ConfigDir, __LogDir, __DATE__ " " __TIME__); \
delete scn; \ delete scn; \
return retval; \ return retval; \
} }

5
code/nel/src/3d/gpu_program_params.cpp
View file

@ -26,7 +26,6 @@
*/ */
#include "std3d.h" #include "std3d.h"
#include "nel/misc/types_nl.h"
#include "nel/3d/gpu_program_params.h" #include "nel/3d/gpu_program_params.h"
// STL includes // STL includes
@ -44,14 +43,14 @@ using namespace std;
namespace NL3D { namespace NL3D {
const size_t CGPUProgramParams::s_End = -1;
CGPUProgramParams::CGPUProgramParams() : m_First(s_End), m_Last(s_End) CGPUProgramParams::CGPUProgramParams() : m_First(s_End), m_Last(s_End)
{ {
} }
CGPUProgramParams::~CGPUProgramParams() CGPUProgramParams::~CGPUProgramParams()
{ {
} }
void CGPUProgramParams::copy(CGPUProgramParams *params) void CGPUProgramParams::copy(CGPUProgramParams *params)

2
code/ryzom/common/src/game_share/persistent_data_template.h
View file

@ -359,7 +359,7 @@ void PERSISTENT_CLASS::store(CPersistentDataRecord &pdr _PERSISTENT_STORE_ARGS)
// this class has been configured to use a specific token family. This means that it is not possible // this class has been configured to use a specific token family. This means that it is not possible
// to store the class to a pdr that is not using the same token family. // to store the class to a pdr that is not using the same token family.
BOMB_IF(pdr.getTokenFamily()!=NL_MACRO_TO_STR(PERSISTENT_TOKEN_FAMILY), BOMB_IF(pdr.getTokenFamily()!=NL_MACRO_TO_STR(PERSISTENT_TOKEN_FAMILY),
NL_MACRO_TO_STR(PERSISTENT_CLASS)"::store() requires token family '"NL_MACRO_TO_STR(PERSISTENT_TOKEN_FAMILY)"'" NL_MACRO_TO_STR(PERSISTENT_CLASS) "::store() requires token family '" NL_MACRO_TO_STR(PERSISTENT_TOKEN_FAMILY) "'"
" but pdr is using token family '"+pdr.getTokenFamily()+"'", " but pdr is using token family '"+pdr.getTokenFamily()+"'",
return); return);
#endif #endif