Removed PHREEQC_CPP and some PHREEQC_CLASS.

Will continue to remove PHREEQC_CLASS.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5711 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
David L Parkhurst 2011-10-20 20:06:32 +00:00
parent 05495494ec
commit 601d8515b8
11 changed files with 1 additions and 25 deletions

View File

@ -12,15 +12,10 @@
#include <fstream>
#include <math.h>
#include <iomanip>
#ifdef PHREEQC_CPP
#include "Phreeqc_class.h"
#endif
#ifdef PHREEQC_CLASS
#include "Phreeqc.h"
#endif
#include "phqalloc.h"
#include "phrqproto.h"
#include "output.h"
#include "Form1.h"
using namespace zdg_ui2;

View File

@ -9,17 +9,12 @@
#include <algorithm> // std::sort
#include "Utils.h" // define first
#if !defined(PHREEQC_CLASS)
#define EXTERNAL extern
#include "global.h"
#else
#include "Phreeqc.h"
#endif
#include "cxxMix.h"
#include "Exchange.h"
#include "phqalloc.h"
#include "phrqproto.h"
#include "output.h"
//////////////////////////////////////////////////////////////////////
// Construction/Destruction

View File

@ -19,8 +19,6 @@
#include "cxxMix.h"
#include "phqalloc.h"
#include "phrqproto.h"
#include "output.h"
//////////////////////////////////////////////////////////////////////
// Construction/Destruction

View File

@ -18,7 +18,6 @@
#include "ISolution.h"
#include "phqalloc.h"
#include "phrqproto.h"
#include "output.h"
//////////////////////////////////////////////////////////////////////
// Construction/Destruction

View File

@ -13,7 +13,6 @@
#include "ISolutionComp.h"
#include "phrqproto.h"
#include "phqalloc.h"
#include "output.h"
cxxISolutionComp::cxxISolutionComp(PHRQ_io *io):
PHRQ_base(io),

View File

@ -20,7 +20,6 @@
#include "Dictionary.h"
#include "phqalloc.h"
#include "phrqproto.h"
#include "output.h"
//////////////////////////////////////////////////////////////////////
// Construction/Destruction

View File

@ -18,8 +18,6 @@
#include "Dictionary.h"
#include "phqalloc.h"
#include "phrqproto.h"
#include "output.h"
//////////////////////////////////////////////////////////////////////
// Construction/Destruction

View File

@ -16,7 +16,6 @@
#include "Phreeqc.h"
#endif
#include "Parser.h"
#include "output.h"
#include "PHRQ_io.h"
//////////////////////////////////////////////////////////////////////

View File

@ -131,7 +131,6 @@ Phreeqc::Phreeqc(void)
{"pitzer", 0},
{"sit", 0},
{"equilibrium_phase", 0}
#ifdef PHREEQC_CPP
,
{"solution_raw", 0},
{"exchange_raw", 0},
@ -156,7 +155,6 @@ Phreeqc::Phreeqc(void)
{"reaction_modify", 0},
{"reaction_temperature_modify", 0},
{"solid_solution_modify", 0}
#endif
};
NKEYS = (sizeof(keyword_temp) / sizeof(struct const_key)); /* Number of valid keywords */

View File

@ -24,9 +24,6 @@
#include "cxxMix.h"
#include "phqalloc.h"
#include "phrqproto.h"
#include "output.h"
//////////////////////////////////////////////////////////////////////
// Construction/Destruction

View File

@ -18,7 +18,6 @@
#include "Dictionary.h"
#include "phqalloc.h"
#include "phrqproto.h"
#include "output.h"
//////////////////////////////////////////////////////////////////////
// Construction/Destruction