diff options
author | Robin Gareus <robin@gareus.org> | 2019-07-26 01:58:01 +0200 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2019-07-26 01:58:18 +0200 |
commit | 7cf68eaf7235aa4ae7f9890aebc6b812759aa00e (patch) | |
tree | 6f72eae1b55979d82851628614e4e4819153c108 /libs/ardour/location.cc | |
parent | c81cbd8f30c89d37c03cbdbb0a9cef48e1e55b5e (diff) |
Fix time_t <> long int ambiguity (OSX gcc builds)
This fixes an issue with
* XMLNode::get_property(const char*, T&)
* XMLNode::set_property(const char*, const T&)
resulting in
string_convert.h:77: error: 'long int' is not a class,
struct, or union type
Diffstat (limited to 'libs/ardour/location.cc')
-rw-r--r-- | libs/ardour/location.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/ardour/location.cc b/libs/ardour/location.cc index 1b4b5a87c1..0ff707a80d 100644 --- a/libs/ardour/location.cc +++ b/libs/ardour/location.cc @@ -65,7 +65,7 @@ Location::Location (Session& s) , _flags (Flags (0)) , _locked (false) , _position_lock_style (AudioTime) - , _timestamp(time(0)) + , _timestamp (time (0)) { assert (_start >= 0); assert (_end >= 0); @@ -80,7 +80,7 @@ Location::Location (Session& s, samplepos_t sample_start, samplepos_t sample_end , _flags (bits) , _locked (false) , _position_lock_style (s.config.get_glue_new_markers_to_bars_and_beats() ? MusicTime : AudioTime) - , _timestamp(time(0)) + , _timestamp (time (0)) { recompute_beat_from_samples (sub_num); @@ -98,7 +98,7 @@ Location::Location (const Location& other) , _end_beat (other._end_beat) , _flags (other._flags) , _position_lock_style (other._position_lock_style) - , _timestamp(time(0)) + , _timestamp (time (0)) { /* copy is not locked even if original was */ @@ -114,7 +114,7 @@ Location::Location (Session& s, const XMLNode& node) : SessionHandleRef (s) , _flags (Flags (0)) , _position_lock_style (AudioTime) - , _timestamp(time(0)) + , _timestamp (time (0)) { /* Note: _position_lock_style is initialised above in case set_state doesn't set it (for 2.X session file compatibility). |