From 879cac9d29031732cbec116cf45c6a669dcc83c0 Mon Sep 17 00:00:00 2001 From: kervala Date: Sun, 11 Dec 2016 14:23:58 +0100 Subject: [PATCH] Changed: GCC warnings --- code/nel/src/pacs/primitive_world_image.cpp | 2 +- code/nel/src/sound/group_controller.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/nel/src/pacs/primitive_world_image.cpp b/code/nel/src/pacs/primitive_world_image.cpp index e8d0378e6..b669bbfe7 100644 --- a/code/nel/src/pacs/primitive_world_image.cpp +++ b/code/nel/src/pacs/primitive_world_image.cpp @@ -1395,7 +1395,7 @@ void CPrimitiveWorldImage::reaction (const CCollisionSurfaceDesc& surfaceDesc, c void CPrimitiveWorldImage::setGlobalPosition (const UGlobalPosition& pos, CMoveContainer& container, CMovePrimitive &primitive, uint8 worldImage) { // Cast type - nlassert (dynamic_cast(&container)); + nlassert (dynamic_cast(&container) != NULL); const CMoveContainer *cont=(const CMoveContainer*)&container; if (!cont->getGlobalRetriever()) return; diff --git a/code/nel/src/sound/group_controller.cpp b/code/nel/src/sound/group_controller.cpp index b82373c3e..f56eb34a4 100644 --- a/code/nel/src/sound/group_controller.cpp +++ b/code/nel/src/sound/group_controller.cpp @@ -62,7 +62,7 @@ CGroupController::~CGroupController() void CGroupController::addSource(CSourceCommon *source) { - nlassert(this); + nlassert(this != NULL); m_Sources.insert(source); increaseSources();