diff options
| -rw-r--r-- | src/JackDbusDriver.cpp | 18 | ||||
| -rw-r--r-- | src/Patchage.cpp | 2 | ||||
| -rw-r--r-- | src/warnings.hpp | 2 | ||||
| -rw-r--r-- | wscript | 4 |
4 files changed, 12 insertions, 14 deletions
diff --git a/src/JackDbusDriver.cpp b/src/JackDbusDriver.cpp index daba095..926b058 100644 --- a/src/JackDbusDriver.cpp +++ b/src/JackDbusDriver.cpp @@ -697,16 +697,16 @@ JackDriver::connect_ports(dbus_uint64_t /*connection_id*/, PatchagePort* port1 = _app->canvas()->find_port_by_name(client1_name, port1_name); if (!port1) { - error_msg((std::string) "Unable to connect unknown port '" + - port1_name + "' of client '" + client1_name + "'"); + error_msg(std::string{"Unable to connect unknown port '"} + port1_name + + "' of client '" + client1_name + "'"); return; } PatchagePort* port2 = _app->canvas()->find_port_by_name(client2_name, port2_name); if (!port2) { - error_msg((std::string) "Unable to connect unknown port '" + - port2_name + "' of client '" + client2_name + "'"); + error_msg(std::string{"Unable to connect unknown port '"} + port2_name + + "' of client '" + client2_name + "'"); return; } @@ -727,7 +727,7 @@ JackDriver::disconnect_ports(dbus_uint64_t /*connection_id*/, PatchagePort* port1 = _app->canvas()->find_port_by_name(client1_name, port1_name); if (!port1) { - error_msg((std::string) "Unable to disconnect unknown port '" + + error_msg(std::string{"Unable to disconnect unknown port '"} + port1_name + "' of client '" + client1_name + "'"); return; } @@ -735,7 +735,7 @@ JackDriver::disconnect_ports(dbus_uint64_t /*connection_id*/, PatchagePort* port2 = _app->canvas()->find_port_by_name(client2_name, port2_name); if (!port2) { - error_msg((std::string) "Unable to disconnect unknown port '" + + error_msg(std::string{"Unable to disconnect unknown port '"} + port2_name + "' of client '" + client2_name + "'"); return; } @@ -788,7 +788,7 @@ JackDriver::refresh_internal(bool force) reply_signature = dbus_message_get_signature(reply_ptr); if (strcmp(reply_signature, "ta(tsa(tsuu))a(tstststst)") != 0) { - error_msg((std::string) "GetGraph() reply signature mismatch. " + + error_msg(std::string{"GetGraph() reply signature mismatch. "} + reply_signature); goto unref; } @@ -1189,11 +1189,11 @@ JackDriver::create_port_view(Patchage*, const PortID&) void JackDriver::error_msg(const std::string& msg) const { - _app->error_msg((std::string) "Jack: " + msg); + _app->error_msg(std::string{"Jack: "} + msg); } void JackDriver::info_msg(const std::string& msg) const { - _app->info_msg((std::string) "Jack: " + msg); + _app->info_msg(std::string{"Jack: "} + msg); } diff --git a/src/Patchage.cpp b/src/Patchage.cpp index aca3a54..b5e9bbf 100644 --- a/src/Patchage.cpp +++ b/src/Patchage.cpp @@ -115,7 +115,7 @@ struct ProjectList_column_record : public Gtk::TreeModel::ColumnRecord Gtk::TreeModelColumn<Glib::ustring> label; }; -#define INIT_WIDGET(x) x(_xml, ((const char*)#x) + 1) +#define INIT_WIDGET(x) x(_xml, (#x) + 1) Patchage::Patchage(int argc, char** argv) : _xml(UIFile::open("patchage")) diff --git a/src/warnings.hpp b/src/warnings.hpp index a420b16..df711f0 100644 --- a/src/warnings.hpp +++ b/src/warnings.hpp @@ -21,6 +21,8 @@ # define PATCHAGE_DISABLE_GANV_WARNINGS \ _Pragma("clang diagnostic push") \ + _Pragma( \ + "clang diagnostic ignored \"-Wdocumentation-unknown-command\"") \ _Pragma("clang diagnostic ignored \"-Wsuggest-destructor-override\"") \ _Pragma("clang diagnostic ignored \"-Wsuggest-override\"") \ _Pragma("clang diagnostic ignored \"-Wunused-parameter\"") @@ -61,7 +61,6 @@ def configure(conf): 'clang': [ '-Wno-alloca', '-Wno-cast-qual', - '-Wno-documentation-unknown-command', '-Wno-double-promotion', '-Wno-float-conversion', '-Wno-float-equal', @@ -89,19 +88,16 @@ def configure(conf): ], 'gcc': [ '-Wno-bad-function-cast', - '-Wno-c++-compat', ], }) autowaf.add_compiler_flags(conf.env, 'cxx', { 'clang': [ - '-Wno-old-style-cast', '-Wno-weak-vtables', ], 'gcc': [ '-Wno-conditionally-supported', '-Wno-effc++', - '-Wno-old-style-cast', ], }) |