From cd70c6bda5b34bc254a5bf0f1e462f988c631f6a Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Wed, 16 Jan 2019 01:17:52 +0100 Subject: 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 ActionManager::get_action(const char*, const char*, bool) actions.h:91: note: candidate 2: Glib::RefPtr ActionManager::get_action(const std::string&, bool) --- libs/surfaces/us2400/gui.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libs/surfaces/us2400') 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 { -- cgit v1.2.3