From 951011d90394f2da8f70f22257a43bb278b3ad84 Mon Sep 17 00:00:00 2001 From: Zrax Date: Wed, 6 Apr 2011 19:44:10 -0700 Subject: [PATCH] Fix a few issues with more strict modern compilers (cherry picked from commit ecb7d8b5665c02080ae641cb681665ecf15f26c5) --- Sources/Plasma/FeatureLib/pfPython/cyAccountManagement.cpp | 2 +- Sources/Plasma/PubUtilLib/plNetClient/plNetClientGroup.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Sources/Plasma/FeatureLib/pfPython/cyAccountManagement.cpp b/Sources/Plasma/FeatureLib/pfPython/cyAccountManagement.cpp index f615ad84..039b34b3 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyAccountManagement.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyAccountManagement.cpp @@ -67,7 +67,7 @@ PyObject* cyAccountManagement::GetPlayerList() for (int i = 0; i < numPlayers; ++i) { PyObject* playerTuple = PyTuple_New(3); - PyObject* playerName = PyUnicode_FromUnicode(playerList[i].playerName, wcslen(playerList[i].playerName)); + PyObject* playerName = PyUnicode_FromUnicode((const Py_UNICODE*)playerList[i].playerName, wcslen(playerList[i].playerName)); PyObject* playerId = PyInt_FromLong(playerList[i].playerInt); PyObject* avatarShape = PyString_FromString(playerList[i].avatarDatasetName); diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientGroup.h b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientGroup.h index 741f1f8b..b2459ddf 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientGroup.h +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientGroup.h @@ -100,8 +100,9 @@ public: std::set::iterator it=IFind(grpId); if (it != fGroups.end()) { + OwnedGroup grp(it->fGroup, it->fOwnIt); fGroups.erase(it); - fGroups.insert(OwnedGroup(grpId, ownIt)); + fGroups.insert(grp); } else {