Merge branch 'master' of https://git.winfor.ch/nicolas/Almond

Almond.h

@@ -55,7 +55,6 @@ public:
     mnd::MandelGenerator* currentGenerator;
 public:
     Almond(QWidget *parent = Q_NULLPTR);
-    Almond(Almond&&) = default;
     ~Almond(void);
 
     void submitBackgroundTask(BackgroundTask* task);

libmandel/include/Generators.h

@@ -163,7 +163,7 @@ class mnd::AdaptiveGenerator : public MandelGenerator
     std::map<Real, MandelGenerator*, std::greater<Real>> generators;
 public:
     AdaptiveGenerator(void);
-    AdaptiveGenerator(AdaptiveGenerator&) = default;
+    AdaptiveGenerator(AdaptiveGenerator&) = delete;
     AdaptiveGenerator(AdaptiveGenerator&&) = default;
     AdaptiveGenerator(MandelGenerator* floatGen, MandelGenerator* doubleGen);
     virtual ~AdaptiveGenerator(void) = default;

libmandel/include/IterationGenerator.h

@@ -44,7 +44,6 @@ public:
     NaiveGenerator(IterationFormula z0, IterationFormula zi,
             mnd::Precision prec,
             mnd::CpuExtension ex = mnd::CpuExtension::NONE);
-    NaiveGenerator(NaiveGenerator&&) = default;
 
     virtual void generate(const MandelInfo& info, float* data);
 private:
@@ -90,7 +89,6 @@ class mnd::CompiledClGenerator : public mnd::ClGeneratorFloat
 {
 public:
     CompiledClGenerator(MandelDevice& device, const std::string& code);
-    CompiledClGenerator(CompiledClGenerator&&) = default;
     virtual void generate(const MandelInfo& info, float* data) override;
 };
 
@@ -98,7 +96,6 @@ class mnd::CompiledClGeneratorDouble : public mnd::ClGeneratorDouble
 {
 public:
     CompiledClGeneratorDouble(MandelDevice& device, const std::string& code);
-    CompiledClGeneratorDouble(CompiledClGeneratorDouble&&) = default;
 };
 #endif // WITH_OPENCL
 

libmandel/include/NaiveIRGenerator.h

@@ -121,5 +121,9 @@ public:
     virtual void generate(const MandelInfo& info, float* data);
 };
 
+extern template class mnd::NaiveIRGenerator<float>;
+extern template class mnd::NaiveIRGenerator<double>;
+extern template class mnd::NaiveIRGenerator<mnd::DoubleDouble>;
+extern template class mnd::NaiveIRGenerator<mnd::QuadDouble>;
 
 #endif // MANDEL_NAIVEIRGENERATOR_H

libmandel/src/NaiveIRGenerator.cpp

@@ -4,14 +4,10 @@
 
 using mnd::NaiveIRGenerator;
 
-
-namespace mnd
-{
-    template class NaiveIRGenerator<float>;
-    template class NaiveIRGenerator<double>;
-    template class NaiveIRGenerator<mnd::DoubleDouble>;
-    template class NaiveIRGenerator<mnd::QuadDouble>;
-}
+template class mnd::NaiveIRGenerator<float>;
+template class mnd::NaiveIRGenerator<double>;
+template class mnd::NaiveIRGenerator<mnd::DoubleDouble>;
+template class mnd::NaiveIRGenerator<mnd::QuadDouble>;
 
 namespace mnd::eval
 {