Fixed: GCC warnings

--HG--
branch : develop
hg/feature/material-editor
kervala 9 years ago
parent ac57a464d4
commit f482f77179

@ -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*/) 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) NL_PS_FUNC(CPSUtil_print)
nlassert((&fg) && (&fm));
CComputedString cptedString; CComputedString cptedString;
fm.computeString ( text, fm.computeString ( text,
&fg, &fg,

@ -190,8 +190,9 @@ public:
TParamInfo(const std::string &name, STRING_MANAGER::TParamType type, const std::string &compilerParam = "") TParamInfo(const std::string &name, STRING_MANAGER::TParamType type, const std::string &compilerParam = "")
: ParamName(name), : ParamName(name),
ParamType(type), CompilerParam(compilerParam),
CompilerParam(compilerParam) ParamType(type)
{ {
} }
}; };
@ -328,7 +329,7 @@ private:
std::string genPreRequisites(); std::string genPreRequisites();
// forbidden copy constructor ! // forbidden copy constructor !
CMissionData(const CMissionData &other) CMissionData(const CMissionData &other):NLMISC::CRefCount()
{ {
nlstop; nlstop;
} }

@ -255,8 +255,8 @@ public:
CStepObjective(CMissionData &md, IPrimitive *prim, const std::string &prefix = "") CStepObjective(CMissionData &md, IPrimitive *prim, const std::string &prefix = "")
: CStep(md, prim), : CStep(md, prim),
_HideObj(false), _Prefix(prefix),
_Prefix(prefix) _HideObj(false)
{ {
} }

@ -206,7 +206,7 @@ void extractNewWords(string workSheetFileName, string columnId, IWordListBuilder
return; return;
} }
// get the name column index // get the name column index
uint nameColIndex; uint nameColIndex = 0;
if(!workSheet.findCol(ucstring("name"), nameColIndex)) if(!workSheet.findCol(ucstring("name"), nameColIndex))
{ {
nlwarning("Error: Don't find the column 'name'. '%s' Aborted", workSheetFileName.c_str()); nlwarning("Error: Don't find the column 'name'. '%s' Aborted", workSheetFileName.c_str());

Loading…
Cancel
Save