Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge with develop

Browse source
This commit is contained in:
kervala 2015-11-30 10:30:14 +01:00
parent 56ab474832
commit fc3643bee0
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
code/nel/include/nel/misc/tool_logger.h
View file

@ -47,13 +47,13 @@
#endif #endif
#ifdef NL_DEBUG_H #ifdef NL_DEBUG_H
#define tlerror(toolLogger, path, error, ...) nlwarning(error, __VA_ARGS__), toolLogger.writeError(NLMISC::ERROR, path, error, __VA_ARGS__) #define tlerror(toolLogger, path, error, ...) nlwarning(error, __VA_ARGS__), toolLogger.writeError(NLMISC::ERROR, path, error, ## __VA_ARGS__)
#define tlwarning(toolLogger, path, error, ...) nlwarning(error, __VA_ARGS__), toolLogger.writeError(NLMISC::WARNING, path, error, __VA_ARGS__) #define tlwarning(toolLogger, path, error, ...) nlwarning(error, __VA_ARGS__), toolLogger.writeError(NLMISC::WARNING, path, error, ## __VA_ARGS__)
#define tlmessage(toolLogger, path, error, ...) nlinfo(error, __VA_ARGS__), toolLogger.writeError(NLMISC::MESSAGE, path, error, __VA_ARGS__) #define tlmessage(toolLogger, path, error, ...) nlinfo(error, __VA_ARGS__), toolLogger.writeError(NLMISC::MESSAGE, path, error, ## __VA_ARGS__)
#else #else
#define tlerror(toolLogger, path, error, ...) toolLogger.writeError(NLMISC::ERROR, path, error, __VA_ARGS__) #define tlerror(toolLogger, path, error, ...) toolLogger.writeError(NLMISC::ERROR, path, error, ## __VA_ARGS__)
#define tlwarning(toolLogger, path, error, ...) toolLogger.writeError(NLMISC::WARNING, path, error, __VA_ARGS__) #define tlwarning(toolLogger, path, error, ...) toolLogger.writeError(NLMISC::WARNING, path, error, ## __VA_ARGS__)
#define tlmessage(toolLogger, path, error, ...) toolLogger.writeError(NLMISC::MESSAGE, path, error, __VA_ARGS__) #define tlmessage(toolLogger, path, error, ...) toolLogger.writeError(NLMISC::MESSAGE, path, error, ## __VA_ARGS__)
#endif #endif
namespace NLMISC { namespace NLMISC {

2
code/nel/include/nel/misc/types_nl.h
View file

@ -463,7 +463,7 @@ typedef uint16 ucchar;
// To define a 64bits constant; ie: UINT64_CONSTANT(0x123456781234) // To define a 64bits constant; ie: UINT64_CONSTANT(0x123456781234)
#ifdef NL_COMP_VC #ifdef NL_COMP_VC
# if (NL_COMP_VC_VERSION >= 120) # if (NL_COMP_VC_VERSION >= 100)
# define INT64_CONSTANT(c) (c##LL) # define INT64_CONSTANT(c) (c##LL)
# define SINT64_CONSTANT(c) (c##LL) # define SINT64_CONSTANT(c) (c##LL)
# define UINT64_CONSTANT(c) (c##ULL) # define UINT64_CONSTANT(c) (c##ULL)

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

@ -45,7 +45,7 @@ inline uint64 wangHash64Inv(uint64 key)
key = key^tmp >> 28; key = key^tmp >> 28;
// Invert key *= 21 // Invert key *= 21
key *= 14933078535860113213u; key *= UINT64_CONSTANT(14933078535860113213);
// Invert key = key ^ (key >> 14) // Invert key = key ^ (key >> 14)
tmp = key^key >> 14; tmp = key^key >> 14;
@ -54,7 +54,7 @@ inline uint64 wangHash64Inv(uint64 key)
key = key^tmp >> 14; key = key^tmp >> 14;
// Invert key *= 265 // Invert key *= 265
key *= 15244667743933553977u; key *= UINT64_CONSTANT(15244667743933553977);
// Invert key = key ^ (key >> 24) // Invert key = key ^ (key >> 24)
tmp = key^key >> 24; tmp = key^key >> 24;

2
code/nel/tools/3d/mesh_utils/scene_meta.h
View file

@ -103,6 +103,6 @@ private:
}; };
#endif NL_SCENE_META_H #endif /* NL_SCENE_META_H */
/* end of file */ /* end of file */