diff options
author | 2015-04-12 16:54:10 +0200 | |
---|---|---|
committer | 2015-04-12 16:54:10 +0200 | |
commit | 87f705b984df084f2a6658d838d6b56eee576e13 (patch) | |
tree | bee6c295b35db2143b130f1780bdb94a000ba96a /src/emu/ioport.h | |
parent | f2243d602081b2f5ccf5b1dfe0e9530e30567a2a (diff) |
string -> str rename due to future conflicts (nw)
Diffstat (limited to 'src/emu/ioport.h')
-rw-r--r-- | src/emu/ioport.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/emu/ioport.h b/src/emu/ioport.h index 19c2424e0a8..55a30c39782 100644 --- a/src/emu/ioport.h +++ b/src/emu/ioport.h @@ -830,7 +830,7 @@ public: void post_coded(const char *text, size_t length = 0, const attotime &rate = attotime::zero); void frame_update(ioport_port &port, ioport_value &digital); - const char *key_name(astring &string, unicode_char ch); + const char *key_name(astring &str, unicode_char ch); // debugging astring dump(); @@ -1397,7 +1397,7 @@ public: void setup_natural_keyboard(ioport_queue_chars_delegate queue_chars, ioport_accept_char_delegate accept_char, ioport_charqueue_empty_delegate charqueue_empty); INT32 frame_interpolate(INT32 oldval, INT32 newval); ioport_type token_to_input_type(const char *string, int &player) const; - const char *input_type_to_token(astring &string, ioport_type type, int player); + const char *input_type_to_token(astring &str, ioport_type type, int player); private: // internal helpers |