... before remove old files

cxx/mcc_generic_mount.h

@@ -32,6 +32,22 @@ struct MccPZoneWrapper {
     pz_inzone_func_t inZone;
     pz_timeto_func_t timeTo;
     pz_timefrom_func_t timeFrom;
+
+    MccPZoneWrapper(MccPZoneWrapper&& other)
+        : inZone(std::move(other.inZone)), timeTo(std::move(other.timeTo)), timeFrom(std::move(other.timeFrom)) {};
+
+    MccPZoneWrapper& operator=(MccPZoneWrapper&& other)
+    {
+        if (this != &other) {
+            inZone = std::move(other.inZone);
+            timeTo = std::move(other.timeTo);
+            timeFrom = std::move(other.timeFrom);
+        }
+
+        return *this;
+    };
+
+    MccPZoneWrapper() = default;
 };
 
 
@@ -56,24 +72,18 @@ public:
 
     static constexpr MccMountType mountType = pec_t::mountType;
 
-    template <traits::mcc_tuple_c ASTROM_ENGINE_CTOR_T,
-              traits::mcc_tuple_c HARDWARE_CTOR_T,
-              traits::mcc_tuple_c PEC_CTOR_T,
-              traits::mcc_tuple_c TELEMETRY_CTOR_T,
-              traits::mcc_tuple_c SLEWMODEL_CTOR_T,
-              traits::mcc_tuple_c GUIDINGMODEL_CTOR_T>
-    MccGenericMount(ASTROM_ENGINE_CTOR_T aengine_ctor_args,
-                    HARDWARE_CTOR_T hw_ctor_args,
-                    PEC_CTOR_T pec_ctor_args,
-                    TELEMETRY_CTOR_T t_ctor_args,
-                    SLEWMODEL_CTOR_T smodel_ctor_args,
-                    GUIDINGMODEL_CTOR_T gmodel_ctor_args)
-        : _astromEngine(std::make_from_tuple<ASTROM_ENGINE_T>(std::move(aengine_ctor_args))),
-          _hardware(std::make_from_tuple<HARDWARE_T>(std::move(hw_ctor_args))),
-          _pec(std::make_from_tuple<PEC_T>(std::move(pec_ctor_args))),
-          _telemetry(std::make_from_tuple<TELEMETRY_T>(std::move(t_ctor_args))),
-          _slewModel(std::make_from_tuple<SLEWMODEL_T>(std::move(smodel_ctor_args))),
-          _guidingModel(std::make_from_tuple<GUIDINGMODEL_T>(std::move(gmodel_ctor_args)))
+    MccGenericMount(ASTROM_ENGINE_T aengine,
+                    HARDWARE_T hw,
+                    PEC_T pec,
+                    TELEMETRY_T tmtry,
+                    SLEWMODEL_T smodel,
+                    GUIDINGMODEL_T gmodel)
+        : _astromEngine(std::move(aengine)),
+          _hardware(std::move(hw)),
+          _pec(std::move(pec)),
+          _telemetry(std::move(tmtry)),
+          _slewModel(std::move(smodel)),
+          _guidingModel(std::move(gmodel))
     {
     }