From b723ef0b2623ec4d56bcd4289df35d26e19e2ed9 Mon Sep 17 00:00:00 2001 From: Michael Zapf Date: Tue, 31 May 2016 14:22:36 +0200 Subject: [PATCH] ti99: Changed new to unique_ptr. --- src/devices/bus/ti99x/gromport.cpp | 23 +++++++++++------------ src/devices/bus/ti99x/gromport.h | 2 +- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/devices/bus/ti99x/gromport.cpp b/src/devices/bus/ti99x/gromport.cpp index 3eddb6433d9..32456359a40 100644 --- a/src/devices/bus/ti99x/gromport.cpp +++ b/src/devices/bus/ti99x/gromport.cpp @@ -1337,47 +1337,47 @@ bool ti99_cartridge_device::call_load() { case PCB_STANDARD: if (TRACE_CONFIG) logerror("Standard PCB\n"); - m_pcb = new ti99_standard_cartridge(); + m_pcb = std::make_unique(); break; case PCB_PAGED12K: if (TRACE_CONFIG) logerror("Paged PCB 12K\n"); - m_pcb = new ti99_paged12k_cartridge(); + m_pcb = std::make_unique(); break; case PCB_PAGED16K: if (TRACE_CONFIG) logerror("Paged PCB 16K\n"); - m_pcb = new ti99_paged16k_cartridge(); + m_pcb = std::make_unique(); break; case PCB_MINIMEM: if (TRACE_CONFIG) logerror("Minimem PCB\n"); - m_pcb = new ti99_minimem_cartridge(); + m_pcb = std::make_unique(); break; case PCB_SUPER: if (TRACE_CONFIG) logerror("Superspace PCB\n"); - m_pcb = new ti99_super_cartridge(); + m_pcb = std::make_unique(); break; case PCB_MBX: if (TRACE_CONFIG) logerror("MBX PCB\n"); - m_pcb = new ti99_mbx_cartridge(); + m_pcb = std::make_unique(); break; case PCB_PAGED379I: if (TRACE_CONFIG) logerror("Paged379i PCB\n"); - m_pcb = new ti99_paged379i_cartridge(); + m_pcb = std::make_unique(); break; case PCB_PAGED378: if (TRACE_CONFIG) logerror("Paged378 PCB\n"); - m_pcb = new ti99_paged378_cartridge(); + m_pcb = std::make_unique(); break; case PCB_PAGED377: if (TRACE_CONFIG) logerror("Paged377 PCB\n"); - m_pcb = new ti99_paged377_cartridge(); + m_pcb = std::make_unique(); break; case PCB_PAGEDCRU: if (TRACE_CONFIG) logerror("PagedCRU PCB\n"); - m_pcb = new ti99_pagedcru_cartridge(); + m_pcb = std::make_unique(); break; case PCB_GROMEMU: if (TRACE_CONFIG) logerror("Grom Emulation PCB\n"); - m_pcb = new ti99_gromemu_cartridge(); + m_pcb = std::make_unique(); break; } @@ -1408,7 +1408,6 @@ void ti99_cartridge_device::call_unload() } } - delete m_pcb; m_pcb = nullptr; m_connector->remove(m_slot); } diff --git a/src/devices/bus/ti99x/gromport.h b/src/devices/bus/ti99x/gromport.h index ee56c885b71..bebc7d9b05f 100644 --- a/src/devices/bus/ti99x/gromport.h +++ b/src/devices/bus/ti99x/gromport.h @@ -130,7 +130,7 @@ private: int m_slot; int get_index_from_tagname(); - ti99_cartridge_pcb* m_pcb; // inbound + std::unique_ptr m_pcb; // inbound ti99_cartridge_connector_device* m_connector; // outbound // RPK which is associated to this cartridge