diff options
| -rw-r--r-- | modules/worldengine/nucleus/src/cmake/compiler/clang/settings.cmake | 2 | ||||
| -rw-r--r-- | src/game/Server/WorldSession.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/modules/worldengine/nucleus/src/cmake/compiler/clang/settings.cmake b/modules/worldengine/nucleus/src/cmake/compiler/clang/settings.cmake index 3b2673938b..a5f06e1216 100644 --- a/modules/worldengine/nucleus/src/cmake/compiler/clang/settings.cmake +++ b/modules/worldengine/nucleus/src/cmake/compiler/clang/settings.cmake @@ -16,5 +16,5 @@ endif() # -Wno-narrowing needed to suppress a warning in g3d # -Wno-deprecated-register -Wstring-plus-int -Wpointer-bool-conversion are needed to suppress gsoap warnings on Unix systems. -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-narrowing -Wno-deprecated-register -Wstring-plus-int -Wparentheses") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-narrowing -Wno-deprecated-register -Wstring-plus-int -Wparentheses -Wreorder") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG=1") diff --git a/src/game/Server/WorldSession.cpp b/src/game/Server/WorldSession.cpp index e07ba35333..fac6ac4bfb 100644 --- a/src/game/Server/WorldSession.cpp +++ b/src/game/Server/WorldSession.cpp @@ -1081,9 +1081,9 @@ void WorldSession::InitializeQueryCallbackParameters() { // Callback parameters that have pointers in them should be properly // initialized to NULL here. - _charCreateCallback.SetParam(NULL); - _loadPetFromDBFirstCallback.SetFirstParam(NULL); - _loadPetFromDBFirstCallback.SetSecondParam(NULL); + _charCreateCallback.SetParam(nullptr); + _loadPetFromDBFirstCallback.SetFirstParam(0); + _loadPetFromDBFirstCallback.SetSecondParam(nullptr); } void WorldSession::ProcessQueryCallbacks() |