Skip to content
Snippets Groups Projects
Commit 82615e09 authored by Martin Killenberg's avatar Martin Killenberg
Browse files

fixed typo in variable name

parent 25efa04d
No related branches found
Tags 00.12.00
No related merge requests found
......@@ -29,7 +29,7 @@ namespace ChimeraTK {
std::list<std::shared_ptr<PropertyDescription>> getPropertiesInLocation(std::string location) const;
std::list<std::shared_ptr<PropertyDescription>> const& getAllProperties() const;
std::unordered_set<std::string> getAllLocations() const;
std::map<std::string, int> getLocationAndCode() const { return _inputLocationAandCode; }
std::map<std::string, int> getLocationAndCode() const { return _inputLocationAndCode; }
VariableMapper(VariableMapper&) = delete;
void operator=(VariableMapper const&) = delete;
......@@ -54,7 +54,7 @@ namespace ChimeraTK {
protected:
VariableMapper() = default;
std::map<std::string, int> _inputLocationAandCode; // map of location and fct_code,
std::map<std::string, int> _inputLocationAndCode; // map of location and fct_code,
// from location tag of the mapping xml file
std::set<std::string> _inputVariables;
std::set<std::string> _usedInputVariables; // For tracing which variables are
......
......@@ -391,7 +391,7 @@ namespace ChimeraTK {
void VariableMapper::processCode(xmlpp::Element const* location, std::string locationName) {
// If the the code is set in the location tag of the mapping xml file,
// this function adds the location and fct_code to a map _inputLocationAandCode.
// this function adds the location and fct_code to a map _inputLocationAndCode.
// It throws an exeption if the code is not an integer. The code must be greater than 1,
// because 1 is reserved for the server. And the code must be consistent.
auto locationCodeAttribute = location->get_attribute("code");
......@@ -409,7 +409,7 @@ namespace ChimeraTK {
locationCodeAttribute->get_value() + "' must be > 1, in doocs 1 is reserved for server");
}
auto result = _inputLocationAandCode.insert(std::pair<std::string, int>(locationName, locationCode));
auto result = _inputLocationAndCode.insert(std::pair<std::string, int>(locationName, locationCode));
if(result.second == false) { //test if pair is already in map
if(result.first->second != locationCode) { //and test if code is the same like before
// maybe an exection is too much and a warning is enough?
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment