diff options
| author | Robin Gareus <robin@gareus.org> | 2014-10-19 19:54:01 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2014-10-19 23:15:13 +0200 |
| commit | ffde2fb5f982856afd9a569d9571b954032f0894 (patch) | |
| tree | e17db6bd88f47bf87b632a8842d97b1193338319 /gtk2_ardour | |
| parent | 892909b05299c2d974429d1d84c2e09082c39bf8 (diff) | |
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)
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/cocoacarbon.mm | 3 | ||||
| -rw-r--r-- | gtk2_ardour/editor_regions.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/export_preset_selector.cc | 4 | ||||
| -rw-r--r-- | gtk2_ardour/gain_meter.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/level_meter.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/port_matrix.cc | 4 | ||||
| -rw-r--r-- | gtk2_ardour/session_option_editor.cc | 2 |
7 files changed, 11 insertions, 8 deletions
diff --git a/gtk2_ardour/cocoacarbon.mm b/gtk2_ardour/cocoacarbon.mm index 5795cf0de9..6564843972 100644 --- 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 4113b6d00b..886d5e1209 100644 --- 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 9f699bbb80..6adf5a45be 100644 --- 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 8098131fe6..53af7df9f7 100644 --- 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 3672edbc6d..9f50f6cc05 100644 --- 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 aa1c853ed8..9a22ed97e6 100644 --- 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 e75cf873f2..d3f6aa2c7f 100644 --- 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 (); |