ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

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:
Paul Davis 2022-03-30 10:33:49 -06:00
parent e0fa447d29
commit ae3548c1da
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libs/temporal/tempo.cc
View File

@ -29,6 +29,7 @@
#include "temporal/debug.h"
#include "temporal/tempo.h"
#include "temporal/types_convert.h"
#include "pbd/i18n.h"

6
libs/temporal/temporal/tempo.h
View File

@ -1045,12 +1045,6 @@ class /*LIBTEMPORAL_API*/ TempoMap : public PBD::StatefulDestructible
#pragma warning(disable:4101)
#endif
namespace PBD {
DEFINE_ENUM_CONVERT(Temporal::Tempo::Type);
DEFINE_ENUM_CONVERT(Temporal::TimeDomain);
} /* namespace PBD */
namespace std {
LIBTEMPORAL_API std::ostream& operator<<(std::ostream& str, Temporal::TempoMapPoint const &);
LIBTEMPORAL_API std::ostream& operator<<(std::ostream& str, Temporal::Tempo const &);

2
libs/temporal/temporal/types_convert.h
View File

@ -26,9 +26,11 @@
#include "pbd/enum_convert.h"
#include "temporal/types.h"
#include "temporal/tempo.h"
namespace PBD {
DEFINE_ENUM_CONVERT(Temporal::Tempo::Type);
DEFINE_ENUM_CONVERT(Temporal::TimeDomain)
} // namespace PBD