refactor: the evaluation order of constructor arguments is unspecified in C++

Author: markaren

export/src/fmu4cpp/fmu_base.cpp

@@ -67,35 +67,43 @@ namespace fmu4cpp {
     }
 
     IntVariable fmu_base::integer(const std::string &name, int *ptr, const std::function<void(int)> &onChange) {
-        return {name, static_cast<unsigned int>(numVariables_), ++numVariables_, ptr, onChange};
+        const auto vr = static_cast<unsigned int>(numVariables_++);
+        return {name, vr, numVariables_, ptr, onChange};
     }
 
     IntVariable fmu_base::integer(const std::string &name, const std::function<int()> &getter, const std::optional<std::function<void(int)>> &setter) {
-        return {name, static_cast<unsigned int>(numVariables_), ++numVariables_, getter, setter};
+        const auto vr = static_cast<unsigned int>(numVariables_++);
+        return {name, vr, numVariables_, getter, setter};
     }
 
     RealVariable fmu_base::real(const std::string &name, double *ptr, const std::function<void(double)> &onChange) {
-        return {name, static_cast<unsigned int>(numVariables_), ++numVariables_, ptr, onChange};
+        const auto vr = static_cast<unsigned int>(numVariables_++);
+        return {name, vr, numVariables_, ptr, onChange};
     }
 
     RealVariable fmu_base::real(const std::string &name, const std::function<double()> &getter, const std::optional<std::function<void(double)>> &setter) {
-        return {name, static_cast<unsigned int>(numVariables_), ++numVariables_, getter, setter};
+        const auto vr = static_cast<unsigned int>(numVariables_++);
+        return {name, vr, numVariables_, getter, setter};
     }
 
     BoolVariable fmu_base::boolean(const std::string &name, bool *ptr, const std::function<void(bool)> &onChange) {
-        return {name, static_cast<unsigned int>(numVariables_), ++numVariables_, ptr, onChange};
+        const auto vr = static_cast<unsigned int>(numVariables_++);
+        return {name, vr, numVariables_, ptr, onChange};
     }
 
     BoolVariable fmu_base::boolean(const std::string &name, const std::function<bool()> &getter, const std::optional<std::function<void(bool)>> &setter) {
-        return {name, static_cast<unsigned int>(numVariables_), ++numVariables_, getter, setter};
+        const auto vr = static_cast<unsigned int>(numVariables_++);
+        return {name, vr, numVariables_, getter, setter};
     }
 
     StringVariable fmu_base::string(const std::string &name, std::string *ptr, const std::function<void(std::string)> &onChange) {
-        return {name, static_cast<unsigned int>(numVariables_), ++numVariables_, ptr, onChange};
+        const auto vr = static_cast<unsigned int>(numVariables_++);
+        return {name, vr, numVariables_, ptr, onChange};
     }
 
     StringVariable fmu_base::string(const std::string &name, const std::function<std::string()> &getter, const std::optional<std::function<void(std::string)>> &setter) {
-        return {name, static_cast<unsigned int>(numVariables_), ++numVariables_, getter, setter};
+        const auto vr = static_cast<unsigned int>(numVariables_++);
+        return {name, vr, numVariables_, getter, setter};
     }
 
     void fmu_base::register_variable(IntVariable v) {