Merge branch 'getkey_to_getName' of https://github.com/GMLC-TDC/HELICS …

…into getkey_to_getName
GMLC-TDC · Apr 22, 2021 · 5f0ab12 · 5f0ab12
2 parents 336ce09 + 93b9617
commit 5f0ab12
Show file tree

Hide file tree

Showing 2 changed files with 176 additions and 203 deletions.
diff --git a/src/helics/application_api/ValueFederate.cpp b/src/helics/application_api/ValueFederate.cpp
@@ -184,7 +184,7 @@ template<class Inp, class Obj>
 static void loadOptions(ValueFederate* fed, const Inp& data, Obj& objUpdate)
 {
     using fileops::getOrDefault;
-    
+
     addTargets(data, "flags", [&objUpdate](const std::string& target) {
         if (target.front() != '-') {
             objUpdate.setOption(getOptionIndex(target), 1);
@@ -282,8 +282,8 @@ void ValueFederate::registerValueInterfacesJson(const std::string& jsonString)
 void ValueFederate::registerValueInterfacesToml(const std::string& tomlString)
 {
     using fileops::getOrDefault;
-    using fileops::replaceIfMember;
     using fileops::isMember;
+    using fileops::replaceIfMember;
 
     toml::value doc;
     try {