Merge pull request #94 from acolwell/fix_build_for_c++20

Fixes to allow building with C++20.
NatronGitHub · Mar 17, 2024 · 294ca3e · 294ca3e
2 parents 15d4f5e + 10a17f8
commit 294ca3e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
+1 −1		HostSupport/src/ofxhImageEffect.cpp
+1 −1		Support/include/ofxsImageEffect.h