From 51737b9720db9ceac8e3ee6cfc094ca93d543482 Mon Sep 17 00:00:00 2001 From: stephena Date: Tue, 4 Nov 2014 22:03:40 +0000 Subject: [PATCH] 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 --- src/emucore/Console.cxx | 2 +- src/emucore/Console.hxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/emucore/Console.cxx b/src/emucore/Console.cxx index 87b1e318e..d2e384e37 100644 --- a/src/emucore/Console.cxx +++ b/src/emucore/Console.cxx @@ -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(*this, myEvent, *mySystem); + myCMHandler = make_ptr(*this, myEvent, *mySystem); // A somewhat ugly bit of code that casts to CartridgeCM to // add the CompuMate, and then back again for the actual diff --git a/src/emucore/Console.hxx b/src/emucore/Console.hxx index 0528987d8..3719a53c0 100644 --- a/src/emucore/Console.hxx +++ b/src/emucore/Console.hxx @@ -349,7 +349,7 @@ class Console : public Serializable unique_ptr myLeftControl, myRightControl; // Pointer to CompuMate handler (only used in CompuMate ROMs) - shared_ptr myCMHandler; + unique_ptr myCMHandler; // The currently defined display format (NTSC/PAL/SECAM) string myDisplayFormat;