summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author R. Belmont <rb6502@users.noreply.github.com>2010-10-16 03:17:49 +0000
committer R. Belmont <rb6502@users.noreply.github.com>2010-10-16 03:17:49 +0000
commit29149cf7349fcd7a86f71bb70cbed6e26b6da650 (patch)
tree6cccab2fa13cf1bd6eda9c341d879458762a941c
parent570c5d992ec61a9f35ff55d5909a6e80ac0aecf0 (diff)
More Clang fixes (verified OK with GCC) [Balrog]
-rw-r--r--src/emu/debugint/debugint.c2
-rw-r--r--src/emu/devintrf.h8
-rw-r--r--src/emu/emualloc.h4
3 files changed, 7 insertions, 7 deletions
diff --git a/src/emu/debugint/debugint.c b/src/emu/debugint/debugint.c
index 0f8569e218c..918d8dd5335 100644
--- a/src/emu/debugint/debugint.c
+++ b/src/emu/debugint/debugint.c
@@ -956,7 +956,7 @@ static void process_string(DView *dv, const char *str)
downcast<debug_view_disasm *>(dv->view)->set_expression(str);
break;
case DVT_CONSOLE:
- if(!dv->editor.str[0])
+ if(!dv->editor.str[(long)0])
debug_cpu_get_visible_cpu(dv->machine)->debug()->single_step();
else
debug_console_execute_command(dv->machine, str, 1);
diff --git a/src/emu/devintrf.h b/src/emu/devintrf.h
index f1f32810524..ed7c058d0c3 100644
--- a/src/emu/devintrf.h
+++ b/src/emu/devintrf.h
@@ -545,7 +545,7 @@ protected:
{
public:
optional_device(device_t &base, const char *tag) : auto_finder_type<_DeviceClass *, false>(base, tag) { }
- virtual void findit(device_t &base) { this->set_target(downcast<_DeviceClass *>(find_device(base, this->m_tag))); }
+ virtual void findit(device_t &base) { this->set_target(downcast<_DeviceClass *>(this->find_device(base, this->m_tag))); }
};
// required devices are similar but throw an error if they are not found
@@ -554,7 +554,7 @@ protected:
{
public:
required_device(device_t &base, const char *tag) : auto_finder_type<_DeviceClass *, true>(base, tag) { }
- virtual void findit(device_t &base) { this->set_target(downcast<_DeviceClass *>(find_device(base, this->m_tag))); }
+ virtual void findit(device_t &base) { this->set_target(downcast<_DeviceClass *>(this->find_device(base, this->m_tag))); }
};
// optional shared pointer finder
@@ -563,7 +563,7 @@ protected:
{
public:
optional_shared_ptr(device_t &base, const char *tag) : auto_finder_type<_PointerType *, false>(base, tag) { }
- virtual void findit(device_t &base) { this->set_target(reinterpret_cast<_PointerType *>(find_shared_ptr(base, this->m_tag))); }
+ virtual void findit(device_t &base) { this->set_target(reinterpret_cast<_PointerType *>(this->find_shared_ptr(base, this->m_tag))); }
};
// required shared pointer finder
@@ -572,7 +572,7 @@ protected:
{
public:
required_shared_ptr(device_t &base, const char *tag) : auto_finder_type<_PointerType *, true>(base, tag) { }
- virtual void findit(device_t &base) { this->set_target(reinterpret_cast<_PointerType *>(find_shared_ptr(base, this->m_tag))); }
+ virtual void findit(device_t &base) { this->set_target(reinterpret_cast<_PointerType *>(this->find_shared_ptr(base, this->m_tag))); }
};
// optional shared pointer size finder
diff --git a/src/emu/emualloc.h b/src/emu/emualloc.h
index 6df6114f7ca..e4ff11a424c 100644
--- a/src/emu/emualloc.h
+++ b/src/emu/emualloc.h
@@ -220,13 +220,13 @@ inline void *operator new[](std::size_t size) throw (std::bad_alloc)
return result;
}
-inline void operator delete(void *ptr)
+inline void operator delete(void *ptr) throw()
{
if (ptr != NULL)
free_file_line(ptr, NULL, 0);
}
-inline void operator delete[](void *ptr)
+inline void operator delete[](void *ptr) throw()
{
if (ptr != NULL)
free_file_line(ptr, NULL, 0);