From 10a17f861c3c9ac197ac6dba7151e4e2e51e4164 Mon Sep 17 00:00:00 2001
From: Aaron Colwell <300262+acolwell@users.noreply.github.com>
Date: Sun, 17 Mar 2024 15:30:08 -0700
Subject: [PATCH] Fixes to allow building with C++20.

---
 CImg/Matrix/CImgMatrix.cpp | 4 ++--
 Distortion/Distortion.cpp  | 4 ++--
 Merge/Merge.cpp            | 4 ++--
 openfx                     | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CImg/Matrix/CImgMatrix.cpp b/CImg/Matrix/CImgMatrix.cpp
index 76c8cc75..9e4f59da 100644
--- a/CImg/Matrix/CImgMatrix.cpp
+++ b/CImg/Matrix/CImgMatrix.cpp
@@ -266,8 +266,8 @@ class CImgMatrixPluginFactory
 : public PluginFactoryHelper<CImgMatrixPluginFactory<dim> >
 {
 public:
-    CImgMatrixPluginFactory<dim>(const std::string & id, unsigned int verMaj, unsigned int verMin)
-    : PluginFactoryHelper<CImgMatrixPluginFactory>(id, verMaj, verMin)
+    CImgMatrixPluginFactory(const std::string & id, unsigned int verMaj, unsigned int verMin)
+    : PluginFactoryHelper<CImgMatrixPluginFactory<dim> >(id, verMaj, verMin)
     {
     }
 
diff --git a/Distortion/Distortion.cpp b/Distortion/Distortion.cpp
index f6e81d44..0dfcd0bb 100644
--- a/Distortion/Distortion.cpp
+++ b/Distortion/Distortion.cpp
@@ -3390,8 +3390,8 @@ class DistortionPluginFactory
     : public PluginFactoryHelper<DistortionPluginFactory<plugin, majorVersion> >
 {
 public:
-    DistortionPluginFactory<plugin, majorVersion>(const std::string & id, unsigned int verMaj, unsigned int verMin)
-    : PluginFactoryHelper<DistortionPluginFactory>(id, verMaj, verMin)
+    DistortionPluginFactory(const std::string & id, unsigned int verMaj, unsigned int verMin)
+    : PluginFactoryHelper<DistortionPluginFactory<plugin, majorVersion> >(id, verMaj, verMin)
     {
     }
     virtual void load() OVERRIDE FINAL {ofxsThreadSuiteCheck();}
diff --git a/Merge/Merge.cpp b/Merge/Merge.cpp
index d7a2198e..fe1859fb 100644
--- a/Merge/Merge.cpp
+++ b/Merge/Merge.cpp
@@ -1407,8 +1407,8 @@ class MergePluginFactory
 : public PluginFactoryHelper<MergePluginFactory<majorVersion,plugin> >
 {
 public:
-    MergePluginFactory<majorVersion,plugin>(const std::string & id, unsigned int verMaj, unsigned int verMin)
-    : PluginFactoryHelper<MergePluginFactory>(id, verMaj, verMin)
+    MergePluginFactory(const std::string & id, unsigned int verMaj, unsigned int verMin)
+    : PluginFactoryHelper<MergePluginFactory<majorVersion,plugin> >(id, verMaj, verMin)
     {
     }
 
diff --git a/openfx b/openfx
index c7637189..2303ff81 160000
--- a/openfx
+++ b/openfx
@@ -1 +1 @@
-Subproject commit c763718935edb60746ec2261869f5a5a7d65df65
+Subproject commit 2303ff811bee3ffe085287602f684fe5fe5357e0