summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/input.cpp
diff options
context:
space:
mode:
author ImJezze <jezze@gmx.net>2016-03-02 21:49:49 +0100
committer ImJezze <jezze@gmx.net>2016-03-02 21:49:49 +0100
commit9fe9f6d93e672bcd926f9e7461774bc9cc22e094 (patch)
tree3911b611dd010a4108b90fb8b8c82116eec21117 /src/emu/input.cpp
parentdbdf21ee465acadf3e643d62d6bedfcc297ada85 (diff)
parent1914702e6fae052668df5b068a502bca57c9a3b0 (diff)
Merge remote-tracking branch 'refs/remotes/mamedev/master'
# Resolved Conflicts: # src/osd/modules/render/d3d/d3dhlsl.cpp # src/osd/windows/winmain.cpp
Diffstat (limited to 'src/emu/input.cpp')
-rw-r--r--src/emu/input.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/emu/input.cpp b/src/emu/input.cpp
index 474680a7409..68e825402b4 100644
--- a/src/emu/input.cpp
+++ b/src/emu/input.cpp
@@ -1471,7 +1471,7 @@ std::string input_manager::code_name(input_code code) const
const char *devclass = (*devclass_string_table)[code.device_class()];
// determine the devindex part
- std::string devindex = strformat("%d", code.device_index() + 1);
+ std::string devindex = string_format("%d", code.device_index() + 1);
// if we're unifying all devices, don't display a number
if (!m_class[code.device_class()]->multi())
@@ -1521,7 +1521,7 @@ std::string input_manager::code_to_token(input_code code) const
const char *devclass = (*devclass_token_table)[code.device_class()];
// determine the devindex part; keyboard 0 doesn't show an index
- std::string devindex = strformat("%d", code.device_index() + 1);
+ std::string devindex = string_format("%d", code.device_index() + 1);
if (code.device_class() == DEVICE_CLASS_KEYBOARD && code.device_index() == 0)
devindex.clear();