Fix compilation with GCC 4.3 (at least with SYSLIBS=1).

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3334 d708f5d6-7413-0410-9779-e7cbd77b26cf

5 files changed, 12 insertions, 11 deletions

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 263171f3eb..19bb9839cd 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -3510,7 +3510,7 @@ Editor::get_valid_views (TimeAxisView* track, RouteGroup* group)
 			v->push_back (*i);
 		}
 
-	} else if (track != 0 && group == 0 || (track != 0 && group != 0 && !group->is_active())) {
+	} else if ((track != 0 && group == 0) || (track != 0 && group != 0 && !group->is_active())) {
 		
 		/* just the view for this track
 		 */
diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index 7aaccc62a8..8354e41f5f 100644
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -384,7 +384,7 @@ Editor::button_selection (ArdourCanvas::Item* item, GdkEvent* event, ItemType it
 	     (mouse_mode != MouseTimeFX || item_type != RegionItem) &&
 	     (mouse_mode != MouseRange)) ||
 
-	    (event->type != GDK_BUTTON_PRESS && event->type != GDK_BUTTON_RELEASE || event->button.button > 3)) {
+	    ((event->type != GDK_BUTTON_PRESS && event->type != GDK_BUTTON_RELEASE) || event->button.button > 3)) {
 		
 		return;
 	}
diff --git a/gtk2_ardour/new_session_dialog.cc b/gtk2_ardour/new_session_dialog.cc
index 608fd5e646..1dd07c51e1 100644
--- a/gtk2_ardour/new_session_dialog.cc
+++ b/gtk2_ardour/new_session_dialog.cc
@@ -748,7 +748,7 @@ NewSessionDialog::which_page () const
 	} else if (page_set == EnginePage) {
 		return EnginePage;
 
-	} else if (page_set == NewPage|OpenPage) {
+	} else if (page_set == (NewPage|OpenPage)) {
 		switch (num) {
 		case 0:
 			return NewPage;
@@ -756,7 +756,7 @@ NewSessionDialog::which_page () const
 			return OpenPage;
 		}
 
-	} else if (page_set == NewPage|EnginePage) {
+	} else if (page_set == (NewPage|EnginePage)) {
 		switch (num) {
 		case 0:
 			return NewPage;
@@ -764,7 +764,7 @@ NewSessionDialog::which_page () const
 			return EnginePage;
 		}
 
-	} else if (page_set == NewPage|EnginePage|OpenPage) {
+	} else if (page_set == (NewPage|EnginePage|OpenPage)) {
 		switch (num) {
 		case 0:
 			return NewPage;
@@ -774,7 +774,7 @@ NewSessionDialog::which_page () const
 			return EnginePage;
 		}
 
-	} else if (page_set == OpenPage|EnginePage) {
+	} else if (page_set == (OpenPage|EnginePage)) {
 		switch (num) {
 		case 0:
 			return OpenPage;
@@ -782,6 +782,8 @@ NewSessionDialog::which_page () const
 			return EnginePage;
 		}
 	}
+
+	return NewPage; /* shouldn't get here */
 }
 
 void
diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index db71753aaf..c3d4552044 100644
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -1087,7 +1087,7 @@ RouteTimeAxisView::get_selectables (nframes_t start, nframes_t end, double top,
 	nframes_t start_adjusted = session_frame_to_track_frame(start, speed);
 	nframes_t end_adjusted   = session_frame_to_track_frame(end, speed);
 
-	if (_view && ((top < 0.0 && bot < 0.0)) || touched (top, bot)) {
+	if ((_view && ((top < 0.0 && bot < 0.0))) || touched (top, bot)) {
 		_view->get_selectables (start_adjusted, end_adjusted, results);
 	}
 
diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc
index 4daab8029d..5aeaa4841d 100644
--- a/gtk2_ardour/sfdb_ui.cc
+++ b/gtk2_ardour/sfdb_ui.cc
@@ -394,12 +394,11 @@ SoundFileBrowser::SoundFileBrowser (Gtk::Window& parent, string title, ARDOUR::S
 	  found_list (ListStore::create(found_list_columns)),
 	  freesound_list (ListStore::create(freesound_list_columns)),
 	  chooser (FILE_CHOOSER_ACTION_OPEN),
-	  found_list_view (found_list),
-	  freesound_list_view (freesound_list),
 	  preview (persistent),
 	  found_search_btn (_("Search")),
-	  freesound_search_btn (_("Start Downloading"))
-
+	  found_list_view (found_list),
+	  freesound_search_btn (_("Start Downloading")),
+	  freesound_list_view (freesound_list)
 {
 	resetting_ourselves = false;
 	gm = 0;