From 6d7fead899dd365b7bbfb27ce1d8524683e75779 Mon Sep 17 00:00:00 2001
From: Ian Bell <ian.bell@nist.gov>
Date: Tue, 26 Jul 2022 09:56:59 -0400
Subject: [PATCH] Two non-serious warnings from clang squelched
---
include/teqp/json_builder.hpp | 2 +-
include/teqp/models/multifluid_ancillaries.hpp | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/include/teqp/json_builder.hpp b/include/teqp/json_builder.hpp
index a7664cf..6f93d88 100644
--- a/include/teqp/json_builder.hpp
+++ b/include/teqp/json_builder.hpp
@@ -8,7 +8,7 @@
namespace teqp {
- static AllowedModels build_model(const nlohmann::json& json) {
+ inline AllowedModels build_model(const nlohmann::json& json) {
// Extract the name of the model and the model parameters
std::string kind = json.at("kind");
diff --git a/include/teqp/models/multifluid_ancillaries.hpp b/include/teqp/models/multifluid_ancillaries.hpp
index 5b3eb8f..445ef16 100644
--- a/include/teqp/models/multifluid_ancillaries.hpp
+++ b/include/teqp/models/multifluid_ancillaries.hpp
@@ -6,20 +6,21 @@
namespace teqp{
struct VLEAncillary{
- const double T_r, Tmax, Tmin, reducing_value;
+ const double T_r, Tmax, Tmin;
const std::string type, description;
const std::valarray<double> n, t;
+ const double reducing_value;
const bool using_tau_r, noexp;
VLEAncillary(const nlohmann::json &j) :
T_r(j.at("T_r")),
Tmax(j.at("Tmax")),
Tmin(j.at("Tmin")),
+ type(j.at("type")),
description(j.at("description")),
n(j.at("n").get<std::valarray<double>>()),
t(j.at("t").get<std::valarray<double>>()),
reducing_value(j.at("reducing_value")),
- type(j.at("type")),
using_tau_r(j.at("using_tau_r")),
noexp(type == "rhoLnoexp"){};
--
GitLab