Fix two warnings, one serious about not returning

usnistgov · Mar 18, 2024 · f44f553 · f44f553
1 parent 0dfb76a
commit f44f553
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/include/teqp/models/multifluid.hpp b/include/teqp/models/multifluid.hpp
@@ -1049,7 +1049,7 @@ inline auto multifluidfactory(const nlohmann::json& spec) {
                     else if (j.is_string()){
                         const std::string& s = j;
                         if (s.find("PATH::") == 0){
-                            load_a_JSON_file(s.substr(6, s.size()-6));
+                            return load_a_JSON_file(s.substr(6));
                         }
                         else{
                             try{

diff --git a/src/tests/catch_test_multifluid_RPinterop.cxx b/src/tests/catch_test_multifluid_RPinterop.cxx
@@ -108,7 +108,8 @@ TEST_CASE("Check RPinterop conversion Fij instead of F in BIP", "[RPinterop]") {
 }
 
 TEST_CASE("Check RPinterop departure present but empty", "[RPinterop]") {
-    auto [BIP, DEP] = RPinterop::HMXBNCfile("../doc/source/models/HMX.BNC").make_jsons();
+    nlohmann::json BIP, DEP;
+    std::tie(BIP, DEP) = RPinterop::HMXBNCfile("../doc/source/models/HMX.BNC").make_jsons();
     auto get_w_dep = [&](nlohmann::json dep){
         nlohmann::json model = {
             {"components", {