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/ardour/location.h | |
| 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/ardour/location.h')
| -rw-r--r-- | libs/ardour/ardour/location.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libs/ardour/ardour/location.h b/libs/ardour/ardour/location.h index f55f931731..45125e14f1 100644 --- a/libs/ardour/ardour/location.h +++ b/libs/ardour/ardour/location.h @@ -23,7 +23,6 @@ #include <list> #include <iostream> #include <map> -#include <ctime> #include <sys/types.h> @@ -70,7 +69,7 @@ public: void lock (); void unlock (); - time_t timestamp() { return _timestamp; }; + int64_t timestamp() const { return _timestamp; }; samplepos_t start() const { return _start; } samplepos_t end() const { return _end; } samplecnt_t length() const { return _end - _start; } @@ -162,7 +161,7 @@ private: bool _locked; PositionLockStyle _position_lock_style; boost::shared_ptr<SceneChange> _scene_change; - time_t _timestamp; + int64_t _timestamp; void set_mark (bool yn); bool set_flag_internal (bool yn, Flags flag); |