Fix build with a certain awful broken compiler.
This commit is contained in:
parent
ec01682714
commit
f1926dc863
|
@ -39,7 +39,7 @@ class LIBEVORAL_TEMPLATE_API TimeConverter {
|
||||||
public:
|
public:
|
||||||
TimeConverter () : _origin_b (0) {}
|
TimeConverter () : _origin_b (0) {}
|
||||||
TimeConverter (B ob) : _origin_b (ob) {}
|
TimeConverter (B ob) : _origin_b (ob) {}
|
||||||
virtual ~TimeConverter() {}
|
virtual ~TimeConverter();
|
||||||
|
|
||||||
/** Convert A time to B time (A to B) */
|
/** Convert A time to B time (A to B) */
|
||||||
virtual B to(A a) const = 0;
|
virtual B to(A a) const = 0;
|
||||||
|
|
|
@ -17,15 +17,21 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|
||||||
#include "evoral/TimeConverter.hpp"
|
#include "evoral/TimeConverter.hpp"
|
||||||
|
#include "evoral/types.hpp"
|
||||||
|
|
||||||
typedef int64_t framepos_t; /* MUST match libs/ardour/ardour/types.h */
|
typedef int64_t framepos_t; /* MUST match libs/ardour/ardour/types.h */
|
||||||
|
|
||||||
namespace Evoral {
|
namespace Evoral {
|
||||||
|
|
||||||
|
template<typename A, typename B>
|
||||||
|
TimeConverter<A,B>::~TimeConverter()
|
||||||
|
{}
|
||||||
|
|
||||||
template<typename A, typename B>
|
template<typename A, typename B>
|
||||||
B
|
B
|
||||||
IdentityConverter<A,B>::to(A a) const
|
IdentityConverter<A,B>::to(A a) const
|
||||||
{
|
{
|
||||||
return static_cast<B>(a);
|
return static_cast<B>(a);
|
||||||
}
|
}
|
||||||
|
@ -39,5 +45,6 @@ IdentityConverter<A,B>::from(B b) const
|
||||||
|
|
||||||
template class IdentityConverter<double, framepos_t>;
|
template class IdentityConverter<double, framepos_t>;
|
||||||
template class TimeConverter<double, framepos_t>;
|
template class TimeConverter<double, framepos_t>;
|
||||||
|
template class TimeConverter<Evoral::MusicalTime, framepos_t>;
|
||||||
|
|
||||||
} // namespace Evoral
|
} // namespace Evoral
|
|
@ -81,12 +81,12 @@ def build(bld):
|
||||||
src/ControlSet.cpp
|
src/ControlSet.cpp
|
||||||
src/Curve.cpp
|
src/Curve.cpp
|
||||||
src/Event.cpp
|
src/Event.cpp
|
||||||
src/IdentityConverter.cpp
|
|
||||||
src/midi_util.cpp
|
src/midi_util.cpp
|
||||||
src/MIDIEvent.cpp
|
src/MIDIEvent.cpp
|
||||||
src/Note.cpp
|
src/Note.cpp
|
||||||
src/SMF.cpp
|
src/SMF.cpp
|
||||||
src/Sequence.cpp
|
src/Sequence.cpp
|
||||||
|
src/TimeConverter.cpp
|
||||||
src/debug.cpp
|
src/debug.cpp
|
||||||
src/types.cpp
|
src/types.cpp
|
||||||
'''
|
'''
|
||||||
|
|
Loading…
Reference in New Issue
Block a user