More of that VS2015 magic

--HG--
branch : develop

code/ryzom/client/src/login.cpp

@@ -208,7 +208,7 @@ void createOptionalCatUI()
 	CInterfaceGroup *pList = dynamic_cast<CInterfaceGroup*>(CWidgetManager::getInstance()->getElementFromId(GROUP_LIST_CAT));
 	if (pList == NULL)
 	{
-		nlwarning("element "GROUP_LIST_CAT" not found probably bad login_main.xml");
+		nlwarning("element " GROUP_LIST_CAT " not found probably bad login_main.xml");
 		return;
 	}
 
@@ -1085,7 +1085,7 @@ void initShardDisplay()
 	CInterfaceGroup *pList = dynamic_cast<CInterfaceGroup*>(CWidgetManager::getInstance()->getElementFromId(GROUP_LIST_SHARD));
 	if (pList == NULL)
 	{
-		nlwarning("element "GROUP_LIST_SHARD" not found probably bad login_main.xml");
+		nlwarning("element " GROUP_LIST_SHARD " not found probably bad login_main.xml");
 		return;
 	}
 	/* // To test more servers
@@ -1303,7 +1303,7 @@ class CAHOnLogin : public IActionHandler
 		CGroupEditBox *pGEBPwd = dynamic_cast<CGroupEditBox*>(CWidgetManager::getInstance()->getElementFromId(CTRL_EDITBOX_PASSWORD));
 		if ((pGEBLog == NULL) || (pGEBPwd == NULL))
 		{
-			nlwarning("element "CTRL_EDITBOX_LOGIN" or "CTRL_EDITBOX_PASSWORD" not found probably bad login_main.xml");
+			nlwarning("element " CTRL_EDITBOX_LOGIN " or " CTRL_EDITBOX_PASSWORD " not found probably bad login_main.xml");
 			return;
 		}
 
@@ -1587,7 +1587,7 @@ void initPatch()
 		CInterfaceGroup *pList = dynamic_cast<CInterfaceGroup*>(CWidgetManager::getInstance()->getElementFromId(GROUP_LIST_CAT));
 		if (pList == NULL)
 		{
-			nlwarning("element "GROUP_LIST_CAT" not found probably bad login_main.xml");
+			nlwarning("element " GROUP_LIST_CAT " not found probably bad login_main.xml");
 			return;
 		}
 

code/ryzom/client/src/r2/displayer_visual_entity.cpp

@@ -1108,7 +1108,7 @@ std::string CDisplayerVisualEntity::getVisualProperties() const
 	uint64 uVPB = leafB->getValue64();
 	uint64 uVPC = leafC->getValue64();
 
-	const std::string strVPABC = NLMISC::toString( "VPA:%016.16"NL_I64"x\nVPB:%016.16"NL_I64"x\nVPC:%016.16"NL_I64"x", uVPA, uVPB, uVPC );
+	const std::string strVPABC = NLMISC::toString( "VPA:%016.16" NL_I64 "x\nVPB:%016.16" NL_I64 "x\nVPC:%016.16" NL_I64 "x", uVPA, uVPB, uVPC );
 
 	return strVPABC;
 }

code/ryzom/client/src/r2/editor.cpp

@@ -806,7 +806,7 @@ int CEditor::luaGetVisualPropertiesFromInstanceId(CLuaState &ls)
 	uint64 uVPB = vB.get();
 	uint64 uVPC = vC.get();
 
-	std::string strVPABC = NLMISC::toString( "VPA:%016.16"NL_I64"x\nVPB:%016.16"NL_I64"x\nVPC:%016.16"NL_I64"x", uVPA, uVPB, uVPC );
+	std::string strVPABC = NLMISC::toString( "VPA:%016.16" NL_I64 "x\nVPB:%016.16" NL_I64 "x\nVPC:%016.16" NL_I64 "x", uVPA, uVPB, uVPC );
 
 	ls.push(strVPABC);
 
@@ -1957,12 +1957,12 @@ int CEditor::luaRemoveInstanceObserver(CLuaState &ls)
 	IInstanceObserver *observer = getEditor().getInstanceObserver((TInstanceObserverHandle) ls.toInteger(2));
 	if (observer == NULL)
 	{
-		CLuaIHM::fails(ls, "Instance observer not found for handle = %d"NL_I64, ls.toInteger(2));
+		CLuaIHM::fails(ls, "Instance observer not found for handle = %" NL_I64 "d", ls.toInteger(2));
 	}
 	CInstanceObserverLua *luaObserver = dynamic_cast<CInstanceObserverLua *>(observer);
 	if (luaObserver == NULL)
 	{
-		CLuaIHM::fails(ls, "Instance observer found for handle %d"NL_I64", but has bad type, it wasn't registered from lua.", ls.toInteger(2));
+		CLuaIHM::fails(ls, "Instance observer found for handle %" NL_I64 "d, but has bad type, it wasn't registered from lua.", ls.toInteger(2));
 	}
 	getEditor().removeInstanceObserver((TInstanceObserverHandle) ls.toInteger(2));
 	CLuaObject receiver = luaObserver->getReceiver();