Fix some more warnings

Fixes a warning regarding copies in for loops with auto variables when iterating over a std::map. Also fixes a warning regarding return value optimization due to a std::move.
cadet · Jun 7, 2021 · cb14767 · cb14767
1 parent 6289c31
commit cb14767
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/libcadet/model/ModelSystemImpl.cpp b/src/libcadet/model/ModelSystemImpl.cpp
@@ -1104,7 +1104,7 @@ std::unordered_map<ParameterId, double> ModelSystem::getAllParameterValues() con
 	for (IUnitOperation* m : _models)
 	{
 		const std::unordered_map<ParameterId, double> localData = m->getAllParameterValues();
-		for (const std::pair<ParameterId, double>& val : localData)
+		for (const std::pair<const ParameterId, double>& val : localData)
 			data[val.first] = val.second;
 	}
 

diff --git a/src/libcadet/model/ModelUtils.hpp b/src/libcadet/model/ModelUtils.hpp
@@ -134,7 +134,7 @@ void getAllParameterValues(std::unordered_map<ParameterId, double>& data, const
 			return;
 
 		const std::unordered_map<ParameterId, double> localData = items[0]->getAllParameterValues();
-		for (const std::pair<ParameterId, double>& val : localData)
+		for (const std::pair<const ParameterId, double>& val : localData)
 			data[val.first] = val.second;
 	}
 	else
@@ -145,7 +145,7 @@ void getAllParameterValues(std::unordered_map<ParameterId, double>& data, const
                 continue;
 
             const std::unordered_map<ParameterId, double> localData = bm->getAllParameterValues();
-			for (const std::pair<ParameterId, double>& val : localData)
+			for (const std::pair<const ParameterId, double>& val : localData)
 				data[val.first] = val.second;
 		}
 	}

diff --git a/src/libcadet/model/binding/ExtendedMobilePhaseModulatorLangmuirBinding.cpp b/src/libcadet/model/binding/ExtendedMobilePhaseModulatorLangmuirBinding.cpp
@@ -109,7 +109,7 @@ class ExtendedMobilePhaseModulatorLangmuirBindingBase : public ParamHandlerBindi
 	{
 		const bool res = BindingModelBase::configureModelDiscretization(paramProvider, nComp, nBound, boundOffset);
 
-		_mode = std::move(paramProvider.getIntArray("EMPM_COMP_MODE"));
+		_mode = paramProvider.getIntArray("EMPM_COMP_MODE");
 		if (_mode.size() < nComp)
 			throw InvalidParameterException("Not enough elements in EMPM_COMP_MODE (expected " + std::to_string(nComp) + ", got " + std::to_string(_mode.size()) + ")");