Fix a few issues with more strict modern compilers

H-uru · Apr 7, 2011 · fa6d505 · fa6d505
1 parent 6b2a4af
commit fa6d505
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/...penSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/cyAccountManagement.cpp b/...penSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/cyAccountManagement.cpp
@@ -51,7 +51,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/...urceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAgeDescription/plAgeDescription.cpp b/...urceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAgeDescription/plAgeDescription.cpp
@@ -202,8 +202,8 @@ void	plAgeDescription::SetAgeNameFromPath( const char *path )
 	}
 
 	// Construct our name from the path
-	char *pathSep1 = strrchr( path, '\\' );
-	char *pathSep2 = strrchr( path, '/' );
+	const char *pathSep1 = strrchr( path, '\\' );
+	const char *pathSep2 = strrchr( path, '/' );
 	if( pathSep2 > pathSep1 )
 		pathSep1 = pathSep2;
 	if( pathSep1 == nil )

diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGApplicator.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAGApplicator.h
@@ -145,6 +145,9 @@ class plAGApplicator : public plCreatable
 	plSimulationInterface * IGetSI(const plAGModifier *modifier) const;
 	plObjInterface * IGetGI(const plAGModifier *modifier, UInt16 classIdx) const;
 
+	// Allow plAGModifier to declare IGet?? as friends
+	friend class plAGModifier;
+
 	// -- members --
 	plAGChannel *fChannel;
 	hsBool fEnabled;

diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientGroup.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetClient/plNetClientGroup.h
@@ -83,7 +83,11 @@ class plNetClientGroups
 	{ 
 		std::set<OwnedGroup>::iterator it=IFind(grpId);
 		if (it != fGroups.end())
-			(*it).fOwnIt=ownIt;
+		{
+			OwnedGroup grp(it->fGroup, it->fOwnIt);
+			fGroups.erase(it);
+			fGroups.insert(grp);
+		}
 		else
 		{
 			ISetGroupDesc(grpId);