mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-01 01:17:02 +00:00
Code Issues Releases Activity

Fix another several issues that were upsetting new Clang, missed in r460224.

Browse Source
This commit is contained in:
Alexey Dokuchaev 2018-02-11 09:14:00 +00:00
parent eb5f9c18a7
commit d013fc3f26
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=461480
5 changed files with 65 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
audio/ardour/files/patch-SConstruct
View File

@ -32,7 +32,7 @@
env.Append(CCFLAGS="-Wall")
-env.Append(CXXFLAGS="-Woverloaded-virtual")
+env.Append(CXXFLAGS="-Woverloaded-virtual -std=c++11")
+env.Append(CXXFLAGS="-Woverloaded-virtual -std=c++11 -Wno-c++11-narrowing")
if env['EXTRA_WARN']:
env.Append(CCFLAGS="-Wextra -pedantic -ansi")

10
audio/ardour/files/patch-gtk2__ardour_editor.cc
View File

@ -21,3 +21,13 @@
window_icons.push_back (icon);
}
if (!window_icons.empty()) {
@@ -1862,8 +1862,7 @@ Editor::add_region_context_items (AudioStreamView* sv,
become selected.
*/
- region_menu->signal_map_event().connect (
- bind (
+ region_menu->signal_map_event().connect ( bind (
mem_fun(*this, &Editor::set_selected_regionview_from_map_event),
sv,
boost::weak_ptr<Region>(region)

14
audio/ardour/files/patch-gtk2__ardour_editor__keyboard.cc Normal file
View File

@ -0,0 +1,14 @@
--- gtk2_ardour/editor_keyboard.cc.orig 2009-03-02 21:07:08 UTC
+++ gtk2_ardour/editor_keyboard.cc
@@ -42,9 +42,9 @@ Editor::kbd_driver (sigc::slot<void,GdkEvent*> theslot
Glib::RefPtr<Gdk::Window> evw = track_canvas->get_window()->get_pointer (x, y, mask);
bool doit = false;
- if (use_track_canvas && track_canvas_event_box.get_window()->get_pointer(x, y, mask) != 0) {
+ if (use_track_canvas && track_canvas_event_box.get_window()->get_pointer(x, y, mask)) {
doit = true;
- } else if (use_time_canvas && time_canvas_event_box.get_window()->get_pointer(x, y, mask)!= 0) {
+ } else if (use_time_canvas && time_canvas_event_box.get_window()->get_pointer(x, y, mask)) {
doit = true;
}

18
audio/ardour/files/patch-gtk2_ardour-ardour_ui.cc
View File

@ -31,3 +31,21 @@
VBox* vbox = msg.get_vbox();
HBox hbox;
@@ -1964,7 +1969,7 @@ ARDOUR_UI::name_io_setup (AudioEngine& engine,
const char **connections = io.input(0)->get_connections();
- if (connections == 0 || connections[0] == '\0') {
+ if (connections == 0 || *connections[0] == '\0') {
buf = _("off");
} else {
buf = connections[0];
@@ -1983,7 +1988,7 @@ ARDOUR_UI::name_io_setup (AudioEngine& engine,
const char **connections = io.output(0)->get_connections();
- if (connections == 0 || connections[0] == '\0') {
+ if (connections == 0 || *connections[0] == '\0') {
buf = _("off");
} else {
buf = connections[0];

23
audio/ardour/files/patch-gtk2_ardour-new_session_dialog.cc
View File

@ -1,6 +1,27 @@
--- gtk2_ardour/new_session_dialog.cc.orig 2008-01-14 10:04:17.000000000 +0100
+++ gtk2_ardour/new_session_dialog.cc 2008-01-14 10:04:44.000000000 +0100
@@ -556,7 +556,7 @@
@@ -361,16 +361,16 @@ NewSessionDialog::NewSessionDialog()
list<Glib::RefPtr<Gdk::Pixbuf> > window_icons;
Glib::RefPtr<Gdk::Pixbuf> icon;
- if ((icon = ::get_icon ("ardour_icon_16px")) != 0) {
+ if ((icon = ::get_icon ("ardour_icon_16px"))) {
window_icons.push_back (icon);
}
- if ((icon = ::get_icon ("ardour_icon_22px")) != 0) {
+ if ((icon = ::get_icon ("ardour_icon_22px"))) {
window_icons.push_back (icon);
}
- if ((icon = ::get_icon ("ardour_icon_32px")) != 0) {
+ if ((icon = ::get_icon ("ardour_icon_32px"))) {
window_icons.push_back (icon);
}
- if ((icon = ::get_icon ("ardour_icon_48px")) != 0) {
+ if ((icon = ::get_icon ("ardour_icon_48px"))) {
window_icons.push_back (icon);
}
if (!window_icons.empty()) {
@@ -589,7 +589,7 @@ NewSessionDialog::set_session_folder(const std::string
*/