From 3f4cad0795d6126af38cf96018c46ef46595eab0 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Fri, 15 Jan 2016 12:33:27 +0100 Subject: [PATCH] And more VS2015 fixes --- code/ryzom/client/src/connection.cpp | 4 ++-- code/ryzom/common/src/game_share/object.cpp | 4 ++-- .../leveldesign/csv_transform/sadge_lib/include/text_output.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/ryzom/client/src/connection.cpp b/code/ryzom/client/src/connection.cpp index a2d139294..69c05cc08 100644 --- a/code/ryzom/client/src/connection.cpp +++ b/code/ryzom/client/src/connection.cpp @@ -2122,7 +2122,7 @@ public: CInterfaceGroup *pList = dynamic_cast(CWidgetManager::getInstance()->getElementFromId(GROUP_LIST_MAINLAND)); if (pList == NULL) { - nlwarning("element "GROUP_LIST_MAINLAND" not found probably bad outgame.xml"); + nlwarning("element " GROUP_LIST_MAINLAND " not found probably bad outgame.xml"); return; } @@ -2315,7 +2315,7 @@ public: List = dynamic_cast(CWidgetManager::getInstance()->getElementFromId(GROUP_LIST_KEYSET)); if (List == NULL) { - nlwarning("element "GROUP_LIST_KEYSET" not found probably bad outgame.xml"); + nlwarning("element " GROUP_LIST_KEYSET " not found probably bad outgame.xml"); return; } diff --git a/code/ryzom/common/src/game_share/object.cpp b/code/ryzom/common/src/game_share/object.cpp index f4426d067..d3f8856af 100644 --- a/code/ryzom/common/src/game_share/object.cpp +++ b/code/ryzom/common/src/game_share/object.cpp @@ -894,7 +894,7 @@ void CObjectInteger::inPlaceCopy(const CObjectInteger &src) } -std::string CObjectInteger::doToString() const { return NLMISC::toString("%d"NL_I64, _Value); } +std::string CObjectInteger::doToString() const { return NLMISC::toString("%" NL_I64 "d", _Value); } void CObjectInteger::doSerialize(std::string& out, CSerializeContext& /* context */) const { @@ -1977,7 +1977,7 @@ void CObjectInteger::dump(const std::string prefix, uint depth) const { //H_AUTO(R2_CObjectInteger_dump) std::string result(depth * 4, ' '); - result += NLMISC::toString("%sInteger, ptr = 0x%p, value = %d"NL_I64", ghost = %s", prefix.c_str(), this, _Value, _Ghost ? "true" : "false"); + result += NLMISC::toString("%sInteger, ptr = 0x%p, value = %" NL_I64 "d, ghost = %s", prefix.c_str(), this, _Value, _Ghost ? "true" : "false"); nlwarning(result.c_str()); } diff --git a/code/ryzom/tools/leveldesign/csv_transform/sadge_lib/include/text_output.h b/code/ryzom/tools/leveldesign/csv_transform/sadge_lib/include/text_output.h index 2eec9a4a0..1fd931f17 100644 --- a/code/ryzom/tools/leveldesign/csv_transform/sadge_lib/include/text_output.h +++ b/code/ryzom/tools/leveldesign/csv_transform/sadge_lib/include/text_output.h @@ -236,7 +236,7 @@ private: break; default: - fprintf(stderr,"\n"__FILE__":%d: BUG: invlid special code in CTextOutput object: %d\n",__LINE__,(int)code); + fprintf(stderr,"\n" __FILE__ ":%d: BUG: invlid special code in CTextOutput object: %d\n",__LINE__,(int)code); } }