From ae3548c1da365f322f2799ea50acd8b7bce07eb2 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Wed, 30 Mar 2022 10:33:49 -0600
Subject: [PATCH] temporal: fix location of enum conversion decls

Without these changes, minor changes in include file
ordering or extent elsewhere can cause compiler errors.
---
 libs/temporal/tempo.cc                 | 1 +
 libs/temporal/temporal/tempo.h         | 6 ------
 libs/temporal/temporal/types_convert.h | 2 ++
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/libs/temporal/tempo.cc b/libs/temporal/tempo.cc
index c76de1463e..26171b26a5 100644
--- a/libs/temporal/tempo.cc
+++ b/libs/temporal/tempo.cc
@@ -29,6 +29,7 @@
 
 #include "temporal/debug.h"
 #include "temporal/tempo.h"
+#include "temporal/types_convert.h"
 
 #include "pbd/i18n.h"
 
diff --git a/libs/temporal/temporal/tempo.h b/libs/temporal/temporal/tempo.h
index 566cf2c108..a14bb6b45c 100644
--- a/libs/temporal/temporal/tempo.h
+++ b/libs/temporal/temporal/tempo.h
@@ -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 &);
diff --git a/libs/temporal/temporal/types_convert.h b/libs/temporal/temporal/types_convert.h
index a3afe773b1..dd2c884bb7 100644
--- a/libs/temporal/temporal/types_convert.h
+++ b/libs/temporal/temporal/types_convert.h
@@ -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