OS 10.10 compile fixes

 * fix clang pickiness regarding boolean
 * ignore ‘verify’ macro
 * tested with Apple LLVM version 6.0 (clang-600.0.51) (based on LLVM 3.5svn)

diff --git a/gtk2_ardour/cocoacarbon.mm b/gtk2_ardour/cocoacarbon.mm
index 5795cf0de919ef90558fddbdb07c35ba1b245403..65648439726ddc3f870b1d5493f3240d5e7f2583 100644 (file)
--- a/gtk2_ardour/cocoacarbon.mm
+++ b/gtk2_ardour/cocoacarbon.mm
@@ -25,6 +25,9 @@
 #undef check
 #undef YES
 #undef NO
+#ifdef verify
+#undef verify
+#endif
 
 #include "ardour_ui.h"
 #include "actions.h"

diff --git a/gtk2_ardour/editor_regions.cc b/gtk2_ardour/editor_regions.cc
index 4113b6d00b571f9451bc65c6b9dab903a806c3ea..886d5e1209362de5e9495991e84f2a6b08bf5615 100644 (file)
--- a/gtk2_ardour/editor_regions.cc
+++ b/gtk2_ardour/editor_regions.cc
@@ -295,7 +295,7 @@ EditorRegions::add_region (boost::shared_ptr<Region> region)
        string str;
        TreeModel::Row row;
        Gdk::Color c;
-       bool missing_source = boost::dynamic_pointer_cast<SilentFileSource>(region->source());
+       bool missing_source = boost::dynamic_pointer_cast<SilentFileSource>(region->source()) != NULL;
 
        if (!_show_automatic_regions && region->automatic()) {
                return;

diff --git a/gtk2_ardour/export_preset_selector.cc b/gtk2_ardour/export_preset_selector.cc
index 9f699bbb800bc0587395a1e53e126a958f67c01c..6adf5a45be28ed0bcd3311112211eac175466b1f 100644 (file)
--- a/gtk2_ardour/export_preset_selector.cc
+++ b/gtk2_ardour/export_preset_selector.cc
@@ -123,8 +123,8 @@ ExportPresetSelector::update_selection ()
                }
        }
 
-       save_button.set_sensitive (current);
-       remove_button.set_sensitive (current);
+       save_button.set_sensitive (current != 0);
+       remove_button.set_sensitive (current != 0);
        new_button.set_sensitive (!current && !text.empty() && !preset_name_exists);
 }
 

diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc
index 8098131fe6a0fefb0889143bd8d952add4a91eb7..53af7df9f73770b8cb9cb9e014f14609a0dd7f66 100644 (file)
--- a/gtk2_ardour/gain_meter.cc
+++ b/gtk2_ardour/gain_meter.cc
@@ -1076,7 +1076,7 @@ GainMeterBase::get_controllable()
 bool
 GainMeterBase::level_meter_button_press (GdkEventButton* ev)
 {
-       return LevelMeterButtonPress (ev); /* EMIT SIGNAL */
+       return !!LevelMeterButtonPress (ev); /* EMIT SIGNAL */
 }
 
 void

diff --git a/gtk2_ardour/level_meter.cc b/gtk2_ardour/level_meter.cc
index 3672edbc6dee16a8c6f7d1445fd1f58ce8b449a8..9f50f6cc05d21cc042482b1ecc6df273a59fb80c 100644 (file)
--- a/gtk2_ardour/level_meter.cc
+++ b/gtk2_ardour/level_meter.cc
@@ -436,7 +436,7 @@ LevelMeterBase::set_type(MeterType t)
 bool
 LevelMeterBase::meter_button_press (GdkEventButton* ev)
 {
-       return ButtonPress (ev); /* EMIT SIGNAL */
+       return !!ButtonPress (ev); /* EMIT SIGNAL */
 }
 
 bool

diff --git a/gtk2_ardour/port_matrix.cc b/gtk2_ardour/port_matrix.cc
index aa1c853ed8c3dd5a7ebe9f8e28ac7d4c766fd78d..9a22ed97e67eeb58eb3d513fb7b7c3be0944c3e7 100644 (file)
--- a/gtk2_ardour/port_matrix.cc
+++ b/gtk2_ardour/port_matrix.cc
@@ -708,7 +708,7 @@ PortMatrix::io_from_bundle (boost::shared_ptr<Bundle> b) const
 bool
 PortMatrix::can_add_channels (boost::shared_ptr<Bundle> b) const
 {
-       return io_from_bundle (b);
+       return io_from_bundle (b) != 0;
 }
 
 void
@@ -731,7 +731,7 @@ PortMatrix::add_channel (boost::shared_ptr<Bundle> b, DataType t)
 bool
 PortMatrix::can_remove_channels (boost::shared_ptr<Bundle> b) const
 {
-       return io_from_bundle (b);
+       return io_from_bundle (b) != 0;
 }
 
 void

diff --git a/gtk2_ardour/session_option_editor.cc b/gtk2_ardour/session_option_editor.cc
index e75cf873f203fd7f3b75a27be89b4a48c299ee01..d3f6aa2c7f3e6f8c1dda1a3af40e825855e2456b 100644 (file)
--- a/gtk2_ardour/session_option_editor.cc
+++ b/gtk2_ardour/session_option_editor.cc
@@ -395,7 +395,7 @@ SessionOptionEditor::parameter_changed (std::string const & p)
 bool
 SessionOptionEditor::set_use_monitor_section (bool yn)
 {
-       bool had_monitor_section = _session->monitor_out();
+       bool had_monitor_section = _session->monitor_out() != 0;
 
        if (yn) {
                _session->add_monitor_section ();

diff --git a/libs/pbd/pbd/properties.h b/libs/pbd/pbd/properties.h
index 70d18db4c7bd74468250b7fefe570bc324593bda..684fc37ffe95d3f4b8e5669047f8ce986f1ee81e 100644 (file)
--- a/libs/pbd/pbd/properties.h
+++ b/libs/pbd/pbd/properties.h
@@ -443,7 +443,7 @@ public:
        }
 
        operator bool () const {
-               return _current;
+               return _current ? true : false;
        }
 
 protected: