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

Fixed some compilation errors that arose from Interface.h, due to

Browse source 
namespace changes.

Added xml.h to Cantera.h
This commit is contained in:
Harry Moffat 2008-01-01 19:04:17 +00:00
parent 10e862e8ab
commit 5885aeaecd
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cantera/cxx/include/Cantera.h
View file

@ -21,6 +21,8 @@
// Include the timer
#include "kernel/clockWC.h"
#include "kernel/xml.h"
#endif

13
Cantera/cxx/include/Interface.h
View file

@ -1,8 +1,17 @@
/**
* @file Interface.h
* Declaration and Definition for the class Interface, part of
* Cantera's Cantera_CXX namespace.
*/
/*
* $Id$
*/
#ifndef CXX_INTERFACE
#define CXX_INTERFACE
#include <string>
#include "Cantera.h"
#include "thermo.h"
#include "kernel/SurfPhase.h"
#include "kernel/InterfaceKinetics.h"
@ -43,7 +52,7 @@ namespace Cantera_CXX {
m_r = Cantera::get_XML_File(infile);
if (id == "-") id = "";
XML_Node* x = Cantera::get_XML_Node("#"+id, m_r);
Cantera::XML_Node* x = Cantera::get_XML_Node("#"+id, m_r);
if (!x)
throw Cantera::CanteraError("Interface","error in get_XML_Node");
@ -61,7 +70,7 @@ namespace Cantera_CXX {
protected:
bool m_ok;
XML_Node* m_r;
Cantera::XML_Node* m_r;
private:
};