From 1aa28f9310b7bb3f48315eb56592275c8d2a9bf9 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Sun, 27 Mar 2016 21:48:04 -0400 Subject: [PATCH] Let the constructor for std::string do its job --- include/cantera/equil/MultiPhaseEquil.h | 2 +- include/cantera/kinetics/ReactionPath.h | 2 +- include/cantera/numerics/RootFind.h | 3 +-- include/cantera/oneD/Domain1D.h | 1 - samples/cxx/bvp/BoundaryValueProblem.h | 2 +- src/base/xml.cpp | 2 +- src/equil/vcs_solve.cpp | 4 ++-- 7 files changed, 7 insertions(+), 9 deletions(-) diff --git a/include/cantera/equil/MultiPhaseEquil.h b/include/cantera/equil/MultiPhaseEquil.h index 5d1d69c93..bfb6a60d2 100644 --- a/include/cantera/equil/MultiPhaseEquil.h +++ b/include/cantera/equil/MultiPhaseEquil.h @@ -67,7 +67,7 @@ public: doublereal error(); std::string reactionString(size_t j) { - return std::string(""); + return ""; } void setInitialMixMoles(int loglevel = 0) { setInitialMoles(loglevel); diff --git a/include/cantera/kinetics/ReactionPath.h b/include/cantera/kinetics/ReactionPath.h index 835b14c8e..cca45846c 100644 --- a/include/cantera/kinetics/ReactionPath.h +++ b/include/cantera/kinetics/ReactionPath.h @@ -26,7 +26,7 @@ class SpeciesNode { public: /// Default constructor - SpeciesNode() : number(npos), name(""), value(0.0), + SpeciesNode() : number(npos), value(0.0), visible(false), m_in(0.0), m_out(0.0) {} /// Destructor diff --git a/include/cantera/numerics/RootFind.h b/include/cantera/numerics/RootFind.h index fa1af6ee0..0aa0f6f52 100644 --- a/include/cantera/numerics/RootFind.h +++ b/include/cantera/numerics/RootFind.h @@ -410,8 +410,7 @@ protected: foundNeg(0), deltaXConverged(-1.0E300), deltaFConverged(-1.0E300), - delX(-1.0E300), - reasoning("") { + delX(-1.0E300) { }; //@} }; diff --git a/include/cantera/oneD/Domain1D.h b/include/cantera/oneD/Domain1D.h index 43a6727c4..252cbded1 100644 --- a/include/cantera/oneD/Domain1D.h +++ b/include/cantera/oneD/Domain1D.h @@ -54,7 +54,6 @@ public: m_jstart(0), m_left(0), m_right(0), - m_id(""), m_desc(""), m_bw(-1) { resize(nv, points); } diff --git a/samples/cxx/bvp/BoundaryValueProblem.h b/samples/cxx/bvp/BoundaryValueProblem.h index 5b4a74ebc..58f7e2a50 100644 --- a/samples/cxx/bvp/BoundaryValueProblem.h +++ b/samples/cxx/bvp/BoundaryValueProblem.h @@ -38,7 +38,7 @@ public: * Constructor. Sets default values. */ Component() : lower(0.0), upper(1.0), rtol(1.0e-9), atol(1.0e-12), - refine(true), name("") {} + refine(true) {} }; /** diff --git a/src/base/xml.cpp b/src/base/xml.cpp index c0a2025f4..382cc4d36 100644 --- a/src/base/xml.cpp +++ b/src/base/xml.cpp @@ -433,7 +433,7 @@ std::string XML_Node::id() const if (hasAttrib("id")) { return attrib("id"); } - return std::string(""); + return ""; } void XML_Node::addValue(const std::string& val) diff --git a/src/equil/vcs_solve.cpp b/src/equil/vcs_solve.cpp index d2e0d4027..8ef199853 100644 --- a/src/equil/vcs_solve.cpp +++ b/src/equil/vcs_solve.cpp @@ -139,8 +139,8 @@ void VCS_SOLVE::vcs_initSizes(const size_t nspecies0, const size_t nelements, m_SSPhase.resize(2*nspecies0, 0); m_phaseID.resize(nspecies0, 0); m_numElemConstraints = nelements; - m_elementName.resize(nelements, std::string("")); - m_speciesName.resize(nspecies0, std::string("")); + m_elementName.resize(nelements); + m_speciesName.resize(nspecies0); m_elType.resize(nelements, VCS_ELEM_TYPE_ABSPOS); m_elementActive.resize(nelements, 1);