More Clang fixes (verified OK with GCC) [Balrog]

This commit is contained in:
R. Belmont 2010-10-16 03:17:49 +00:00
parent 570c5d992e
commit 29149cf734
3 changed files with 7 additions and 7 deletions

View File

@ -956,7 +956,7 @@ static void process_string(DView *dv, const char *str)
downcast<debug_view_disasm *>(dv->view)->set_expression(str); downcast<debug_view_disasm *>(dv->view)->set_expression(str);
break; break;
case DVT_CONSOLE: case DVT_CONSOLE:
if(!dv->editor.str[0]) if(!dv->editor.str[(long)0])
debug_cpu_get_visible_cpu(dv->machine)->debug()->single_step(); debug_cpu_get_visible_cpu(dv->machine)->debug()->single_step();
else else
debug_console_execute_command(dv->machine, str, 1); debug_console_execute_command(dv->machine, str, 1);

View File

@ -545,7 +545,7 @@ protected:
{ {
public: public:
optional_device(device_t &base, const char *tag) : auto_finder_type<_DeviceClass *, false>(base, tag) { } 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 // required devices are similar but throw an error if they are not found
@ -554,7 +554,7 @@ protected:
{ {
public: public:
required_device(device_t &base, const char *tag) : auto_finder_type<_DeviceClass *, true>(base, tag) { } 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 // optional shared pointer finder
@ -563,7 +563,7 @@ protected:
{ {
public: public:
optional_shared_ptr(device_t &base, const char *tag) : auto_finder_type<_PointerType *, false>(base, tag) { } 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 // required shared pointer finder
@ -572,7 +572,7 @@ protected:
{ {
public: public:
required_shared_ptr(device_t &base, const char *tag) : auto_finder_type<_PointerType *, true>(base, tag) { } 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 // optional shared pointer size finder

View File

@ -220,13 +220,13 @@ inline void *operator new[](std::size_t size) throw (std::bad_alloc)
return result; return result;
} }
inline void operator delete(void *ptr) inline void operator delete(void *ptr) throw()
{ {
if (ptr != NULL) if (ptr != NULL)
free_file_line(ptr, NULL, 0); free_file_line(ptr, NULL, 0);
} }
inline void operator delete[](void *ptr) inline void operator delete[](void *ptr) throw()
{ {
if (ptr != NULL) if (ptr != NULL)
free_file_line(ptr, NULL, 0); free_file_line(ptr, NULL, 0);