Still learning the difference between shared and unique pointers.

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3041 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2014-11-04 22:03:40 +00:00
parent 829d049385
commit 51737b9720
2 changed files with 2 additions and 2 deletions

View File

@ -587,7 +587,7 @@ void Console::setControllers(const string& rommd5)
// creates them for us, and also that they must be used in both ports
if(left == "COMPUMATE" || right == "COMPUMATE")
{
myCMHandler = make_shared<CompuMate>(*this, myEvent, *mySystem);
myCMHandler = make_ptr<CompuMate>(*this, myEvent, *mySystem);
// A somewhat ugly bit of code that casts to CartridgeCM to
// add the CompuMate, and then back again for the actual

View File

@ -349,7 +349,7 @@ class Console : public Serializable
unique_ptr<Controller> myLeftControl, myRightControl;
// Pointer to CompuMate handler (only used in CompuMate ROMs)
shared_ptr<CompuMate> myCMHandler;
unique_ptr<CompuMate> myCMHandler;
// The currently defined display format (NTSC/PAL/SECAM)
string myDisplayFormat;