diff options
| author | David Robillard <d@drobilla.net> | 2014-11-23 16:30:09 -0500 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2014-11-23 16:31:59 -0500 |
| commit | f1926dc863f262e7e28de2cf47b2e443dc6d86b1 (patch) | |
| tree | 42ceb8a19df34a91318a91dfd8e42973f7d92e40 | |
| parent | ec01682714a7a7a87c38cf2ca4ef0ed6504c2a27 (diff) | |
Fix build with a certain awful broken compiler.
| -rw-r--r-- | libs/evoral/evoral/TimeConverter.hpp | 2 | ||||
| -rw-r--r-- | libs/evoral/src/TimeConverter.cpp (renamed from libs/evoral/src/IdentityConverter.cpp) | 9 | ||||
| -rw-r--r-- | libs/evoral/wscript | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/libs/evoral/evoral/TimeConverter.hpp b/libs/evoral/evoral/TimeConverter.hpp index 5572876cef..23e0823ac9 100644 --- a/libs/evoral/evoral/TimeConverter.hpp +++ b/libs/evoral/evoral/TimeConverter.hpp @@ -39,7 +39,7 @@ class LIBEVORAL_TEMPLATE_API TimeConverter { public: TimeConverter () : _origin_b (0) {} TimeConverter (B ob) : _origin_b (ob) {} - virtual ~TimeConverter() {} + virtual ~TimeConverter(); /** Convert A time to B time (A to B) */ virtual B to(A a) const = 0; diff --git a/libs/evoral/src/IdentityConverter.cpp b/libs/evoral/src/TimeConverter.cpp index 1af21debae..0d39087e7c 100644 --- a/libs/evoral/src/IdentityConverter.cpp +++ b/libs/evoral/src/TimeConverter.cpp @@ -17,15 +17,21 @@ */ #include <stdint.h> + #include "evoral/TimeConverter.hpp" +#include "evoral/types.hpp" typedef int64_t framepos_t; /* MUST match libs/ardour/ardour/types.h */ namespace Evoral { template<typename A, typename B> +TimeConverter<A,B>::~TimeConverter() +{} + +template<typename A, typename B> B -IdentityConverter<A,B>::to(A a) const +IdentityConverter<A,B>::to(A a) const { return static_cast<B>(a); } @@ -39,5 +45,6 @@ IdentityConverter<A,B>::from(B b) const template class IdentityConverter<double, framepos_t>; template class TimeConverter<double, framepos_t>; +template class TimeConverter<Evoral::MusicalTime, framepos_t>; } // namespace Evoral diff --git a/libs/evoral/wscript b/libs/evoral/wscript index 1eed40474a..10deb2ebb8 100644 --- a/libs/evoral/wscript +++ b/libs/evoral/wscript @@ -81,12 +81,12 @@ def build(bld): src/ControlSet.cpp src/Curve.cpp src/Event.cpp - src/IdentityConverter.cpp src/midi_util.cpp src/MIDIEvent.cpp src/Note.cpp src/SMF.cpp src/Sequence.cpp + src/TimeConverter.cpp src/debug.cpp src/types.cpp ''' |