From 5885aeaecd8753402cbaeba51851507e22d712c3 Mon Sep 17 00:00:00 2001
From: Harry Moffat <hkmoffa@sandia.gov>
Date: Tue, 1 Jan 2008 19:04:17 +0000
Subject: [PATCH] Fixed some compilation errors that arose from Interface.h,
 due to namespace changes.

Added xml.h to Cantera.h
---
 Cantera/cxx/include/Cantera.h   |  2 ++
 Cantera/cxx/include/Interface.h | 13 +++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/Cantera/cxx/include/Cantera.h b/Cantera/cxx/include/Cantera.h
index 0611576ab..f20dfe3d8 100755
--- a/Cantera/cxx/include/Cantera.h
+++ b/Cantera/cxx/include/Cantera.h
@@ -21,6 +21,8 @@
 // Include the timer
 #include "kernel/clockWC.h"
 
+#include "kernel/xml.h"
+
 #endif
 
 
diff --git a/Cantera/cxx/include/Interface.h b/Cantera/cxx/include/Interface.h
index c704c1976..fc759f33b 100644
--- a/Cantera/cxx/include/Interface.h
+++ b/Cantera/cxx/include/Interface.h
@@ -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:
     };