Fixed: Compilation with GCC 6
This commit is contained in:
parent
bb9cec5372
commit
387ec5db8b
5 changed files with 10 additions and 10 deletions
|
@ -27,7 +27,8 @@
|
|||
|
||||
#ifndef 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
|
||||
#include <map>
|
||||
|
@ -167,7 +168,7 @@ private:
|
|||
std::map<std::string, size_t> m_MapName; // map from name to offset
|
||||
size_t m_First;
|
||||
size_t m_Last;
|
||||
static const size_t s_End = -1;
|
||||
static const size_t s_End;
|
||||
|
||||
}; /* class CGPUProgramParams */
|
||||
|
||||
|
|
|
@ -151,8 +151,8 @@ void setCrashAlreadyReported(bool state);
|
|||
* 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.
|
||||
*/
|
||||
#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_MSG __FILE__ "(" NL_MACRO_TO_STR(__LINE__) ") : Message: "
|
||||
#define NL_LOC_WRN __FILE__ "(" NL_MACRO_TO_STR(__LINE__) ") : Warning Msg: "
|
||||
|
||||
|
||||
/**
|
||||
|
|
|
@ -124,7 +124,7 @@ int APIENTRY WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdL
|
|||
scn->setArgs (lpCmdLine); \
|
||||
createDebug(NULL,!scn->haveLongArg("nolog"));\
|
||||
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; \
|
||||
return retval; \
|
||||
}
|
||||
|
@ -139,7 +139,7 @@ int main(int argc, const char **argv) \
|
|||
scn->setArgs (argc, argv); \
|
||||
createDebug(NULL,!scn->haveLongArg("nolog"));\
|
||||
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; \
|
||||
return retval; \
|
||||
}
|
||||
|
|
|
@ -26,7 +26,6 @@
|
|||
*/
|
||||
|
||||
#include "std3d.h"
|
||||
#include "nel/misc/types_nl.h"
|
||||
#include "nel/3d/gpu_program_params.h"
|
||||
|
||||
// STL includes
|
||||
|
@ -44,14 +43,14 @@ using namespace std;
|
|||
|
||||
namespace NL3D {
|
||||
|
||||
const size_t CGPUProgramParams::s_End = -1;
|
||||
|
||||
CGPUProgramParams::CGPUProgramParams() : m_First(s_End), m_Last(s_End)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
CGPUProgramParams::~CGPUProgramParams()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void CGPUProgramParams::copy(CGPUProgramParams *params)
|
||||
|
|
|
@ -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
|
||||
// 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),
|
||||
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()+"'",
|
||||
return);
|
||||
#endif
|
||||
|
|
Loading…
Reference in a new issue