From 258fcdb490c75ad8d30c03c4982498a24d37bf0a Mon Sep 17 00:00:00 2001 From: kervala Date: Sun, 24 Oct 2010 18:57:09 +0200 Subject: [PATCH] Changed: #825 Remove all warning when compiling Ryzom --- code/nel/tools/3d/build_interface/main.cpp | 2 +- code/nel/tools/3d/cluster_viewer/view_cs.cpp | 2 +- code/nel/tools/3d/lightmap_optimizer/main.cpp | 2 +- code/nel/tools/3d/shapes_exporter/main.cpp | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/nel/tools/3d/build_interface/main.cpp b/code/nel/tools/3d/build_interface/main.cpp index ae317269b..2e6452f39 100644 --- a/code/nel/tools/3d/build_interface/main.cpp +++ b/code/nel/tools/3d/build_interface/main.cpp @@ -161,7 +161,7 @@ bool putIn (NLMISC::CBitmap *pSrc, NLMISC::CBitmap *pDst, sint32 x, sint32 y, bo // *************************************************************************** string getBaseName (const string &fullname) { - string sTmp2 = ""; + string sTmp2; string::size_type pos = fullname.rfind('_'); if (pos != string::npos) sTmp2 = fullname.substr(0, pos+1); diff --git a/code/nel/tools/3d/cluster_viewer/view_cs.cpp b/code/nel/tools/3d/cluster_viewer/view_cs.cpp index 8db2208fb..bed6a7518 100644 --- a/code/nel/tools/3d/cluster_viewer/view_cs.cpp +++ b/code/nel/tools/3d/cluster_viewer/view_cs.cpp @@ -346,7 +346,7 @@ int main(int argc, char **argv) TextContext.setColor (CRGBA(255,255,255,255)); - string sAllClusters = ""; + string sAllClusters; for( uint32 j = 0; j < vCluster.size(); ++j) { sAllClusters += vCluster[j]->Name; diff --git a/code/nel/tools/3d/lightmap_optimizer/main.cpp b/code/nel/tools/3d/lightmap_optimizer/main.cpp index a2dd5602a..528d85014 100644 --- a/code/nel/tools/3d/lightmap_optimizer/main.cpp +++ b/code/nel/tools/3d/lightmap_optimizer/main.cpp @@ -171,7 +171,7 @@ bool putIn (NLMISC::CBitmap *pSrc, NLMISC::CBitmap *pDst, sint32 x, sint32 y) // --------------------------------------------------------------------------- string getBaseName (const string &fullname) { - string sTmp2 = ""; + string sTmp2; string::size_type pos = fullname.rfind('_'); if (pos != string::npos) sTmp2 = fullname.substr(0, pos+1); diff --git a/code/nel/tools/3d/shapes_exporter/main.cpp b/code/nel/tools/3d/shapes_exporter/main.cpp index ec42049d6..dd004d460 100644 --- a/code/nel/tools/3d/shapes_exporter/main.cpp +++ b/code/nel/tools/3d/shapes_exporter/main.cpp @@ -174,9 +174,9 @@ sint main(int argc, char **argv) std::string output_path = exporter.settings.output_path + md5.substr(0, 2) + "/" + md5; // file is an animation - std::string animation = ""; // CPath::lookup(baseFilename + ".anim", false, false, false); + std::string animation; // CPath::lookup(baseFilename + ".anim", false, false, false); // file is a skeleton - std::string skeleton = ""; // CPath::lookup(baseFilename + ".skel", false, false, false); + std::string skeleton; // CPath::lookup(baseFilename + ".skel", false, false, false); // file is a shape std::string shape = CPath::lookup(baseFilename + ".shape", false, false, false);