From 148c748d31a46d3862840b31db115d2e5d46d3e2 Mon Sep 17 00:00:00 2001 From: kervala Date: Sun, 18 Dec 2016 20:39:47 +0100 Subject: [PATCH] Fixed: Compilation --HG-- branch : develop --- code/nel/src/georges/form.cpp | 2 +- code/nel/src/georges/form_loader.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/nel/src/georges/form.cpp b/code/nel/src/georges/form.cpp index 6ec949078..07f4c2adf 100644 --- a/code/nel/src/georges/form.cpp +++ b/code/nel/src/georges/form.cpp @@ -289,7 +289,7 @@ bool CForm::insertParent (uint before, const std::string &filename, CForm *paren else { // Output an error - warning (false, "insertParent", "Can't insert parent form (%s) that has not the same DFN.", filename); + warning (false, "insertParent", "Can't insert parent form (%s) that has not the same DFN.", filename.c_str()); } return false; diff --git a/code/nel/src/georges/form_loader.cpp b/code/nel/src/georges/form_loader.cpp index 154fb9e0d..b56ed23ef 100644 --- a/code/nel/src/georges/form_loader.cpp +++ b/code/nel/src/georges/form_loader.cpp @@ -171,7 +171,7 @@ CFormDfn *CFormLoader::loadFormDfn (const std::string &filename, bool forceLoad) else { // Output error - warning (false, "loadFormDfn", "Can't open the form file (%s).", filename); + warning (false, "loadFormDfn", "Can't open the form file (%s).", filename.c_str()); // Delete the formDfn delete formDfn; @@ -182,7 +182,7 @@ CFormDfn *CFormLoader::loadFormDfn (const std::string &filename, bool forceLoad) catch (const Exception &e) { // Output error - warning (false, "loadFormDfn", "Error while loading the form (%s): %s", filename, e.what()); + warning (false, "loadFormDfn", "Error while loading the form (%s): %s", filename.c_str(), e.what()); // Delete the formDfn delete formDfn; @@ -257,7 +257,7 @@ UForm *CFormLoader::loadForm (const std::string &filename) else { // Output error - warning (false, "loadForm", "Can't open the form file (%s).", filename); + warning (false, "loadForm", "Can't open the form file (%s).", filename.c_str()); // Delete the form delete form; @@ -279,7 +279,7 @@ UForm *CFormLoader::loadForm (const std::string &filename) catch (const Exception &e) { // Output error - warning (false, "loadForm", "Error while loading the form (%s): %s", filename, e.what()); + warning (false, "loadForm", "Error while loading the form (%s): %s", filename.c_str(), e.what()); // Delete the form delete form; @@ -317,7 +317,7 @@ void CFormLoader::warning (bool exception, const std::string &function, const ch va_end( args ); // Set the warning - NLGEORGES::warning (exception, "(CFormLoader::%s) : %s", function, buffer); + NLGEORGES::warning (exception, "(CFormLoader::%s) : %s", function.c_str(), buffer); } // ***************************************************************************