temporal: fix location of enum conversion decls
Without these changes, minor changes in include file ordering or extent elsewhere can cause compiler errors.
This commit is contained in:
parent
e0fa447d29
commit
ae3548c1da
@ -29,6 +29,7 @@
|
|||||||
|
|
||||||
#include "temporal/debug.h"
|
#include "temporal/debug.h"
|
||||||
#include "temporal/tempo.h"
|
#include "temporal/tempo.h"
|
||||||
|
#include "temporal/types_convert.h"
|
||||||
|
|
||||||
#include "pbd/i18n.h"
|
#include "pbd/i18n.h"
|
||||||
|
|
||||||
|
@ -1045,12 +1045,6 @@ class /*LIBTEMPORAL_API*/ TempoMap : public PBD::StatefulDestructible
|
|||||||
#pragma warning(disable:4101)
|
#pragma warning(disable:4101)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
namespace PBD {
|
|
||||||
DEFINE_ENUM_CONVERT(Temporal::Tempo::Type);
|
|
||||||
DEFINE_ENUM_CONVERT(Temporal::TimeDomain);
|
|
||||||
} /* namespace PBD */
|
|
||||||
|
|
||||||
|
|
||||||
namespace std {
|
namespace std {
|
||||||
LIBTEMPORAL_API std::ostream& operator<<(std::ostream& str, Temporal::TempoMapPoint const &);
|
LIBTEMPORAL_API std::ostream& operator<<(std::ostream& str, Temporal::TempoMapPoint const &);
|
||||||
LIBTEMPORAL_API std::ostream& operator<<(std::ostream& str, Temporal::Tempo const &);
|
LIBTEMPORAL_API std::ostream& operator<<(std::ostream& str, Temporal::Tempo const &);
|
||||||
|
@ -26,9 +26,11 @@
|
|||||||
#include "pbd/enum_convert.h"
|
#include "pbd/enum_convert.h"
|
||||||
|
|
||||||
#include "temporal/types.h"
|
#include "temporal/types.h"
|
||||||
|
#include "temporal/tempo.h"
|
||||||
|
|
||||||
namespace PBD {
|
namespace PBD {
|
||||||
|
|
||||||
|
DEFINE_ENUM_CONVERT(Temporal::Tempo::Type);
|
||||||
DEFINE_ENUM_CONVERT(Temporal::TimeDomain)
|
DEFINE_ENUM_CONVERT(Temporal::TimeDomain)
|
||||||
|
|
||||||
} // namespace PBD
|
} // namespace PBD
|
||||||
|
Loading…
Reference in New Issue
Block a user