Merge branch 'pr72-RakMemoryOverride' into pr-integration

png85 · png85 · commit 41ba40c80fc6 · 2015-09-19T17:25:23.000+02:00
diff --git a/Source/RakPeer.cpp b/Source/RakPeer.cpp
@@ -5511,7 +5511,7 @@ void RakPeer::DerefAllSockets(void)
 	unsigned int i;
 	for (i=0; i < socketList.Size(); i++)
 	{
-		delete socketList[i];
+		RakNet::OP_DELETE(socketList[i], _FILE_AND_LINE_);
 	}
 	socketList.Clear(false, _FILE_AND_LINE_);
 }

Original file line number	Diff line number	Diff line change
`@@ -5511,7 +5511,7 @@ void RakPeer::DerefAllSockets(void)`
`5511`	`5511`	`unsigned int i;`
`5512`	`5512`	`for (i=0; i < socketList.Size(); i++)`
`5513`	`5513`	`{`
`5514`		`- delete socketList[i];`
	`5514`	`+ RakNet::OP_DELETE(socketList[i], _FILE_AND_LINE_);`
`5515`	`5515`	`}`
`5516`	`5516`	`socketList.Clear(false, _FILE_AND_LINE_);`
`5517`	`5517`	`}`