diff options
author | 2016-03-18 22:41:17 +0100 | |
---|---|---|
committer | 2016-03-18 22:41:17 +0100 | |
commit | e39daaf5bdcf21d64abf239e1133963643dc6df1 (patch) | |
tree | 1f1b5f333e84bf056ce82c27bebdbad933f26c0d /src/osd/modules/input/input_common.h | |
parent | 421656e108e7091ee9e1b14c84f0a3f6efc2ad2e (diff) | |
parent | b79020559ea3617b2d6bd4c92041d314045e2938 (diff) |
Merge remote-tracking branch 'refs/remotes/mamedev/master'
Diffstat (limited to 'src/osd/modules/input/input_common.h')
-rw-r--r-- | src/osd/modules/input/input_common.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/osd/modules/input/input_common.h b/src/osd/modules/input/input_common.h index 23d9c958c8c..ce6a939ea74 100644 --- a/src/osd/modules/input/input_common.h +++ b/src/osd/modules/input/input_common.h @@ -13,7 +13,6 @@ #include <memory> #include <chrono> -#include <string> #include <queue> //============================================================ @@ -444,7 +443,8 @@ public: m_input_enabled(FALSE), m_mouse_enabled(FALSE), m_lightgun_enabled(FALSE), - m_input_paused(FALSE) + m_input_paused(FALSE), + m_options(nullptr) { } |