From e921cb89c8cb3c167919344277009d54ae711255 Mon Sep 17 00:00:00 2001 From: Evan McCorkle Date: Wed, 18 Oct 2017 22:29:39 -0400 Subject: [PATCH] Allow default build with msvc-12.0. Fixes the appearance of C2536 (cannot specify explicit initializer for arrays). This was preventing a build with msvc_version=12.0. It was fixed using Visual Studio 2013 (12.0) Update 5. --- src/thermo/RedlichKwongMFTP.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/thermo/RedlichKwongMFTP.cpp b/src/thermo/RedlichKwongMFTP.cpp index 4efe62fcba..8da62d5a7c 100644 --- a/src/thermo/RedlichKwongMFTP.cpp +++ b/src/thermo/RedlichKwongMFTP.cpp @@ -10,6 +10,8 @@ #include +#include + using namespace std; namespace bmt = boost::math::tools; @@ -25,10 +27,10 @@ RedlichKwongMFTP::RedlichKwongMFTP() : m_b_current(0.0), m_a_current(0.0), NSolns_(0), - Vroot_{0.0, 0.0, 0.0}, dpdV_(0.0), dpdT_(0.0) { + fill_n(Vroot_, 3, 0.0); } RedlichKwongMFTP::RedlichKwongMFTP(const std::string& infile, const std::string& id_) : @@ -36,10 +38,10 @@ RedlichKwongMFTP::RedlichKwongMFTP(const std::string& infile, const std::string& m_b_current(0.0), m_a_current(0.0), NSolns_(0), - Vroot_{0.0, 0.0, 0.0}, dpdV_(0.0), dpdT_(0.0) { + fill_n(Vroot_, 3, 0.0); initThermoFile(infile, id_); } @@ -48,10 +50,10 @@ RedlichKwongMFTP::RedlichKwongMFTP(XML_Node& phaseRefRoot, const std::string& id m_b_current(0.0), m_a_current(0.0), NSolns_(0), - Vroot_{0.0, 0.0, 0.0}, dpdV_(0.0), dpdT_(0.0) { + fill_n(Vroot_, 3, 0.0); importPhase(phaseRefRoot, this); }