From fc05538d0a400fcc89844d9f61f5f1e2aaaa59d4 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Wed, 8 Aug 2012 22:18:04 +0000 Subject: [PATCH] Removed old copy of Cantera.h that snuck back in --- include/cantera/Cantera.h | 36 ------------------- .../PecosTransport/PecosTransport.cpp | 1 - .../statmech/statmech_properties.cpp | 1 - 3 files changed, 38 deletions(-) delete mode 100644 include/cantera/Cantera.h diff --git a/include/cantera/Cantera.h b/include/cantera/Cantera.h deleted file mode 100644 index e01b711aa..000000000 --- a/include/cantera/Cantera.h +++ /dev/null @@ -1,36 +0,0 @@ -#ifndef CANTERA_H_INCL -#define CANTERA_H_INCL - -// Current 'Cantera.h' header - - -// definitions -#ifndef CANTERA_APP -#define CANTERA_APP -#endif - -namespace Cantera_CXX{ } - -using namespace Cantera_CXX; - -#include "base/ct_defs.h" - -// some useful functions -#include "base/global.h" - -// the CanteraError exception class -#include "base/ctexceptions.h" - -// The Cantera logger class -#include "base/logger.h" - -// Include the timer -#include "base/clockWC.h" - -// Include routines for reading and writing XML files -#include "base/xml.h" - -// Include string utility routines -#include "base/stringUtils.h" - -#endif diff --git a/test_problems/PecosTransport/PecosTransport.cpp b/test_problems/PecosTransport/PecosTransport.cpp index 25c3fa6d0..3040dd218 100644 --- a/test_problems/PecosTransport/PecosTransport.cpp +++ b/test_problems/PecosTransport/PecosTransport.cpp @@ -36,7 +36,6 @@ using namespace std; #include "cantera/IdealGasMix.h" #include "cantera/transport/TransportFactory.h" -//#include "Cantera.h" //#include "transport.h" //#include "IdealGasMix.h" diff --git a/test_problems/statmech/statmech_properties.cpp b/test_problems/statmech/statmech_properties.cpp index 38fa68052..41459338c 100644 --- a/test_problems/statmech/statmech_properties.cpp +++ b/test_problems/statmech/statmech_properties.cpp @@ -19,7 +19,6 @@ using namespace std; /*****************************************************************/ /*****************************************************************/ -#include "Cantera.h" #include "transport.h" #include "IdealGasMix.h" #include "equil.h"