From b766a01c8a46f19e8ed767a3402ee40383eddf77 Mon Sep 17 00:00:00 2001 From: kervala Date: Sun, 11 Dec 2016 19:26:23 +0100 Subject: [PATCH 1/2] Fixed: Compilation with clang --HG-- branch : develop --- code/nel/tools/misc/make_sheet_id/make_sheet_id.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/nel/tools/misc/make_sheet_id/make_sheet_id.cpp b/code/nel/tools/misc/make_sheet_id/make_sheet_id.cpp index a8e095db3..c6accc1cb 100644 --- a/code/nel/tools/misc/make_sheet_id/make_sheet_id.cpp +++ b/code/nel/tools/misc/make_sheet_id/make_sheet_id.cpp @@ -164,7 +164,9 @@ void readFormId( string& outputFileName ) map::iterator itFT = FileTypeToId.find(fileType); if( itFT == FileTypeToId.end() ) { - FileTypeToId.insert( std::pair(fileType,fid.FormIDInfos.Type) ); + uint8 type = (uint8)fid.FormIDInfos.Type; + + FileTypeToId.insert( std::pair(fileType, type) ); } } else From bca1722bdd26fdf61d4bdb40cfae2896dfaf9908 Mon Sep 17 00:00:00 2001 From: kervala Date: Sun, 11 Dec 2016 19:26:38 +0100 Subject: [PATCH 2/2] Changed: Fix warning --HG-- branch : develop --- code/nel/src/pacs/primitive_world_image.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/nel/src/pacs/primitive_world_image.cpp b/code/nel/src/pacs/primitive_world_image.cpp index b669bbfe7..22cf2cee2 100644 --- a/code/nel/src/pacs/primitive_world_image.cpp +++ b/code/nel/src/pacs/primitive_world_image.cpp @@ -1421,7 +1421,7 @@ void CPrimitiveWorldImage::setGlobalPosition (const UGlobalPosition& pos, CMoveC void CPrimitiveWorldImage::setGlobalPosition (const NLMISC::CVectorD& pos, CMoveContainer& container, CMovePrimitive &primitive, uint8 worldImage, bool keepZ /*= false*/, UGlobalPosition::TType type /* =UGlobalPosition::Unspecified*/) { // Cast type - nlassert (dynamic_cast(&container)); + nlassert (dynamic_cast(&container) != NULL); const CMoveContainer *cont=(const CMoveContainer*)&container; // Get the retriever