From 7cd3905875ec598e9a5e7467ece3eb07b65ff5b5 Mon Sep 17 00:00:00 2001
From: Eric Mehl <eric@thinkhypothetical.com>
Date: Tue, 22 Jun 2021 17:05:06 -0400
Subject: [PATCH] FormatData : define type description in Format.cpp instead of
 FormatData.cpp IS THIS NEEDED AFTER CORTEX FIX?

- Including Context.h and TypedData.inl causes problems with explicit template instantiation
---
 src/GafferImage/Format.cpp     | 5 +++++
 src/GafferImage/FormatData.cpp | 9 ---------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/GafferImage/Format.cpp b/src/GafferImage/Format.cpp
index 2a9e78ba752..b7be4c97ea2 100644
--- a/src/GafferImage/Format.cpp
+++ b/src/GafferImage/Format.cpp
@@ -35,6 +35,9 @@
 //////////////////////////////////////////////////////////////////////////
 
 #include "GafferImage/Format.h"
+#include "GafferImage/FormatData.h"
+
+#include "Gaffer/Context.h"
 
 #include <map>
 
@@ -43,6 +46,8 @@ using namespace GafferImage;
 namespace
 {
 
+Gaffer::Context::TypeDescription<GafferImage::FormatData> g_formatDataTypeDescription;
+
 typedef std::map<std::string, Format> FormatMap;
 
 FormatMap &formatMap()
diff --git a/src/GafferImage/FormatData.cpp b/src/GafferImage/FormatData.cpp
index ab5c604da99..ea39d71e63d 100644
--- a/src/GafferImage/FormatData.cpp
+++ b/src/GafferImage/FormatData.cpp
@@ -39,20 +39,11 @@
 #include "GafferImage/Export.h"
 #include "GafferImage/TypeIds.h"
 
-#include "Gaffer/Context.h"
-
 #include "IECore/TypedData.h"
 #include "IECore/TypedData.inl"
 
 using namespace Imath;
 
-namespace
-{
-
-Gaffer::Context::TypeDescription<GafferImage::FormatData> g_formatDataTypeDescription;
-
-} // namespace
-
 namespace IECore
 {