diff options
author | 2016-02-21 11:48:45 +0100 | |
---|---|---|
committer | 2016-02-21 11:48:45 +0100 | |
commit | cc24a339d8c0517259084b5c178d784626ba965c (patch) | |
tree | 9868e9687b5802ae0a3733712a3bbeb3bc75c953 /src/emu/diexec.h | |
parent | b5daabda5495dea5c50e17961ecfed2ea8619d76 (diff) |
Merge remote-tracking branch 'refs/remotes/mamedev/master'
Second attempt
Diffstat (limited to 'src/emu/diexec.h')
-rw-r--r-- | src/emu/diexec.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/emu/diexec.h b/src/emu/diexec.h index 7f9eb41bfcf..3a5cc0405f9 100644 --- a/src/emu/diexec.h +++ b/src/emu/diexec.h @@ -146,7 +146,6 @@ public: UINT64 attotime_to_cycles(const attotime &duration) const { return clocks_to_cycles(device().attotime_to_clocks(duration)); } UINT32 input_lines() const { return execute_input_lines(); } UINT32 default_irq_vector() const { return execute_default_irq_vector(); } - bool is_octal() const { return m_is_octal; } // static inline configuration helpers static void static_set_disable(device_t &device); @@ -260,7 +259,6 @@ protected: const char * m_vblank_interrupt_screen; // the screen that causes the VBLANK interrupt device_interrupt_delegate m_timed_interrupt; // for interrupts not tied to VBLANK attotime m_timed_interrupt_period; // period for periodic interrupts - bool m_is_octal; // to determine if messages/debugger will show octal or hex // execution lists device_execute_interface *m_nextexec; // pointer to the next device to execute, in order |