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

Remove CTML_VERSION macros

Browse source 
CTML_VERSION_1_4_1 was never used, and defining CTML_VERSION_1_4 broke reading
values written by the addInteger and addFloat functions with the getInteger and
getFloat functions, respectively.
This commit is contained in:
Ray Speth 2014-10-08 16:54:42 +00:00
parent 0db18ad0b1
commit c4a5f2667f
1 changed files with 0 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/base/ctml.cpp
View file

@ -5,9 +5,6 @@
// Copyright 2002 California Institute of Technology
#include "cantera/base/ctml.h"
#define CTML_VERSION_1_4_1
#include "cantera/base/stringUtils.h"
#include "cantera/base/Array.h"
@ -21,12 +18,7 @@ std::string FP_Format = "%23.15E";
void addInteger(Cantera::XML_Node& node, const std::string& title, const int val,
const std::string& units, const std::string& type)
{
#ifdef CTML_VERSION_1_4
XML_Node& f = node.addChild("integer", val);
f.addAttribute("title", title);
#else
XML_Node& f = node.addChild(title, val);
#endif
f.addAttribute("vtype", "integer");
if (type != "") {
f.addAttribute("type",type);
@ -41,12 +33,7 @@ void addFloat(Cantera::XML_Node& node, const std::string& title,
const std::string& type, const doublereal minval,
const doublereal maxval)
{
#ifdef CTML_VERSION_1_4
XML_Node& f = node.addChild("float", val, ctml::FP_Format);
f.addAttribute("title", title);
#else
XML_Node& f = node.addChild(title, val, ctml::FP_Format);
#endif
if (type != "") {
f.addAttribute("type",type);
}