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)
This commit is contained in:
parent
892909b052
commit
ffde2fb5f9
@ -25,6 +25,9 @@
|
||||
#undef check
|
||||
#undef YES
|
||||
#undef NO
|
||||
#ifdef verify
|
||||
#undef verify
|
||||
#endif
|
||||
|
||||
#include "ardour_ui.h"
|
||||
#include "actions.h"
|
||||
|
@ -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;
|
||||
|
@ -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);
|
||||
}
|
||||
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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 ();
|
||||
|
@ -443,7 +443,7 @@ public:
|
||||
}
|
||||
|
||||
operator bool () const {
|
||||
return _current;
|
||||
return _current ? true : false;
|
||||
}
|
||||
|
||||
protected:
|
||||
|
Loading…
Reference in New Issue
Block a user