summaryrefslogtreecommitdiffstats
path: root/src/emu/render.cpp
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2015-12-03 11:40:45 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2015-12-03 11:40:45 +0100
commit92f81361d64c720addf5d7e2528b3d1c675f65a4 (patch)
tree6640e797a7dd924e20f10ab0f009257e1d751fc8 /src/emu/render.cpp
parent39afa0533a1349566aa7f144e042b24227285e9f (diff)
Initial conversion of core to C++14. Note that compilers are now limited to GCC 4.9.0 and up, Clang 3.4.0 and up, and VS2013 and up [Miodrag Milanovic]
Diffstat (limited to 'src/emu/render.cpp')
-rw-r--r--src/emu/render.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/emu/render.cpp b/src/emu/render.cpp
index a90c727e39a..712c8287a32 100644
--- a/src/emu/render.cpp
+++ b/src/emu/render.cpp
@@ -722,9 +722,9 @@ const rgb_t *render_container::bcg_lookup_table(int texformat, palette_t *palett
{
case TEXFORMAT_PALETTE16:
case TEXFORMAT_PALETTEA16:
- if (m_palclient == NULL) // if adjusted palette hasn't been created yet, create it
+ if (m_palclient == nullptr) // if adjusted palette hasn't been created yet, create it
{
- m_palclient.reset(global_alloc(palette_client(*palette)));
+ m_palclient = std::make_unique<palette_client>(*palette);
m_bcglookup.resize(palette->max_index());
recompute_lookups();
}
@@ -813,7 +813,7 @@ void render_container::recompute_lookups()
}
// recompute the palette entries
- if (m_palclient != NULL)
+ if (m_palclient != nullptr)
{
palette_t &palette = m_palclient->palette();
const rgb_t *adjusted_palette = palette.entry_list_adjusted();