research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove extraneous constructor for XML_Node

Browse source
This commit is contained in:
Ray Speth 2013-06-13 22:50:35 +00:00
parent 77ed000090
commit 496dfe31ce
3 changed files with 2 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
include/cantera/base/xml.h
View file

@ -100,15 +100,6 @@ public:
class XML_Node
{
public:
//! Default constructor for XML_Node, representing a tree structure
/*!
* Constructor for an XML_Node, which is a node in a tree-like structure
* representing an XML file.
*
* @param cnm Name of the node. The default name of the node is "`--`"
*/
XML_Node(const char* cnm = 0);
//! Constructor for XML_Node, representing a tree structure
/*!
* @param nm Name of the node.
@ -116,7 +107,7 @@ public:
* @param parent Pointer to the parent for this node in the tree.
* A value of 0 indicates this is the top of the tree.
*/
XML_Node(const std::string& nm, XML_Node* const parent);
explicit XML_Node(const std::string& nm="--", XML_Node* const parent=0);
XML_Node(const XML_Node& right);
XML_Node& operator=(const XML_Node& right);

2
include/cantera/transport/LiquidTranInteraction.h
View file

@ -120,7 +120,7 @@ public:
* @param compModelNode `<compositionDependence>` XML node
* @param thermo Pointer to thermo object
*/
virtual void init(const XML_Node& compModelNode = 0,
virtual void init(const XML_Node& compModelNode = XML_Node(),
thermo_t* thermo = 0);
virtual void setParameters(LiquidTransportParams& trParam) {

18
src/base/xml.cpp
View file

@ -309,24 +309,6 @@ std::string XML_Reader::readValue()
////////////////////////// XML_Node /////////////////////////////////
XML_Node::XML_Node(const char* cnm) :
m_name(""),
m_value(""),
m_parent(0),
m_root(0),
m_locked(false),
m_nchildren(0),
m_iscomment(false) ,
m_linenum(0)
{
if (! cnm) {
m_name = "--";
} else {
m_name = cnm;
}
m_root = this;
}
XML_Node::XML_Node(const std::string& nm, XML_Node* const parent_) :
m_name(nm),
m_value(""),