diff options
| author | Robin Gareus <robin@gareus.org> | 2019-01-16 01:17:52 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2019-01-16 01:17:52 +0100 |
| commit | cd70c6bda5b34bc254a5bf0f1e462f988c631f6a (patch) | |
| tree | ea4894a4f132027bb3c28703bdfdf984dfc6caed /libs/surfaces/us2400 | |
| parent | 8b71967be9c35213cb670d3057ffdd699fe23af3 (diff) | |
Fix ambiguity introduced in 91ed9840d
(bool) false == 0 == (const char*) NULL
error: ISO C++ says that these are ambiguous, even though the worst
conversion for the first is better than the worst conversion for the second:
actions.h:92: note: candidate 1: Glib::RefPtr<Gtk::Action> ActionManager::get_action(const char*, const char*, bool)
actions.h:91: note: candidate 2: Glib::RefPtr<Gtk::Action> ActionManager::get_action(const std::string&, bool)
Diffstat (limited to 'libs/surfaces/us2400')
| -rw-r--r-- | libs/surfaces/us2400/gui.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/surfaces/us2400/gui.cc b/libs/surfaces/us2400/gui.cc index a14620edd9..92d06e542c 100644 --- a/libs/surfaces/us2400/gui.cc +++ b/libs/surfaces/us2400/gui.cc @@ -556,7 +556,7 @@ US2400ProtocolGUI::refresh_function_key_editor () row[function_key_columns.plain] = action; } else { - act = ActionManager::get_action (action.c_str(), false); + act = ActionManager::get_action (action, false); if (act) { row[function_key_columns.plain] = act->get_label(); } else { |