From f482f771797d3aa8b2e148a015a1ff87aa8a25a1 Mon Sep 17 00:00:00 2001 From: kervala Date: Tue, 5 Jan 2016 12:51:06 +0100 Subject: [PATCH] Fixed: GCC warnings --HG-- branch : develop --- code/nel/src/3d/ps_util.cpp | 1 - .../leveldesign/mission_compiler_lib/mission_compiler.h | 7 ++++--- .../ryzom/tools/leveldesign/mission_compiler_lib/steps.cpp | 4 ++-- .../tools/translation_tools/extract_new_sheet_names.cpp | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/code/nel/src/3d/ps_util.cpp b/code/nel/src/3d/ps_util.cpp index a09108ed5..94d67c777 100644 --- a/code/nel/src/3d/ps_util.cpp +++ b/code/nel/src/3d/ps_util.cpp @@ -271,7 +271,6 @@ void CPSUtil::displayBasis(IDriver *driver, const CMatrix &modelMat, const NLMIS void CPSUtil::print(IDriver *driver, const std::string &text, CFontGenerator &fg, CFontManager &fm, const CVector &pos, float size, NLMISC::CRGBA col /*= NLMISC::CRGBA::White*/) { NL_PS_FUNC(CPSUtil_print) - nlassert((&fg) && (&fm)); CComputedString cptedString; fm.computeString ( text, &fg, diff --git a/code/ryzom/tools/leveldesign/mission_compiler_lib/mission_compiler.h b/code/ryzom/tools/leveldesign/mission_compiler_lib/mission_compiler.h index 50544b090..bae7f8142 100644 --- a/code/ryzom/tools/leveldesign/mission_compiler_lib/mission_compiler.h +++ b/code/ryzom/tools/leveldesign/mission_compiler_lib/mission_compiler.h @@ -190,8 +190,9 @@ public: TParamInfo(const std::string &name, STRING_MANAGER::TParamType type, const std::string &compilerParam = "") : ParamName(name), - ParamType(type), - CompilerParam(compilerParam) + CompilerParam(compilerParam), + ParamType(type) + { } }; @@ -328,7 +329,7 @@ private: std::string genPreRequisites(); // forbidden copy constructor ! - CMissionData(const CMissionData &other) + CMissionData(const CMissionData &other):NLMISC::CRefCount() { nlstop; } diff --git a/code/ryzom/tools/leveldesign/mission_compiler_lib/steps.cpp b/code/ryzom/tools/leveldesign/mission_compiler_lib/steps.cpp index 79b7e5095..18d17ca13 100644 --- a/code/ryzom/tools/leveldesign/mission_compiler_lib/steps.cpp +++ b/code/ryzom/tools/leveldesign/mission_compiler_lib/steps.cpp @@ -255,8 +255,8 @@ public: CStepObjective(CMissionData &md, IPrimitive *prim, const std::string &prefix = "") : CStep(md, prim), - _HideObj(false), - _Prefix(prefix) + _Prefix(prefix), + _HideObj(false) { } diff --git a/code/ryzom/tools/translation_tools/extract_new_sheet_names.cpp b/code/ryzom/tools/translation_tools/extract_new_sheet_names.cpp index dbc4d0c0b..a2ef5f2d2 100644 --- a/code/ryzom/tools/translation_tools/extract_new_sheet_names.cpp +++ b/code/ryzom/tools/translation_tools/extract_new_sheet_names.cpp @@ -206,7 +206,7 @@ void extractNewWords(string workSheetFileName, string columnId, IWordListBuilder return; } // get the name column index - uint nameColIndex; + uint nameColIndex = 0; if(!workSheet.findCol(ucstring("name"), nameColIndex)) { nlwarning("Error: Don't find the column 'name'. '%s' Aborted", workSheetFileName.c_str());