summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2017-02-27 23:21:30 +1100
committer Vas Crabb <vas@vastheman.com>2017-02-27 23:21:30 +1100
commit93a1a444d27a8c6d460a14956b74330eca96d9c4 (patch)
tree5858287187e177d37d2323cd5b10788fa6645628
parent5d48b92701da2aaf79b2d2833692e78d8fc9cb35 (diff)
more workaround (nw)
-rw-r--r--src/emu/main.cpp4
-rw-r--r--src/frontend/mame/ui/devctrl.h3
2 files changed, 4 insertions, 3 deletions
diff --git a/src/emu/main.cpp b/src/emu/main.cpp
index ba3283e5a7d..9d0e1e3aff4 100644
--- a/src/emu/main.cpp
+++ b/src/emu/main.cpp
@@ -121,8 +121,8 @@ machine_manager::~machine_manager()
{
if (options().http())
m_server->stop();
- if (m_server_thread.joinable())
- m_server_thread.join();
+ if (m_server_thread.joinable())
+ m_server_thread.join();
}
void machine_manager::start_http_server()
diff --git a/src/frontend/mame/ui/devctrl.h b/src/frontend/mame/ui/devctrl.h
index 96cd6237e7b..a47ecf5b1cf 100644
--- a/src/frontend/mame/ui/devctrl.h
+++ b/src/frontend/mame/ui/devctrl.h
@@ -44,7 +44,8 @@ protected:
private:
// device iterator
- typedef device_type_iterator<device_creator<DeviceType>, DeviceType> iterator;
+ static constexpr device_type TYPE = device_creator<DeviceType>;
+ typedef device_type_iterator<TYPE, DeviceType> iterator;
DeviceType * m_device;
int m_count;