From c73fc4b2e9304235fad96c9703e4bc6db7d78eb8 Mon Sep 17 00:00:00 2001 From: David L Parkhurst Date: Mon, 2 Nov 2009 15:34:29 +0000 Subject: [PATCH] Modifications for Linux. git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@3736 1feff8c3-07ed-0310-ac33-dd36852eb9cd --- Makefile | 1 + ReadClass.cxx | 5 +---- dumper.cpp | 2 +- runner.h | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index ec0ea045..459029ad 100644 --- a/Makefile +++ b/Makefile @@ -180,6 +180,7 @@ COMMON_CXXOBJS = \ PPassemblage.o \ Reaction.o \ ReadClass.o \ + runner.o \ Solution.o \ SolutionIsotope.o \ SolutionIsotopeList.o \ diff --git a/ReadClass.cxx b/ReadClass.cxx index 01d092b4..6592682f 100644 --- a/ReadClass.cxx +++ b/ReadClass.cxx @@ -2334,11 +2334,8 @@ int run_as_cells(void) /* ---------------------------------------------------------------------- */ { - int count_steps, use_mix, m; - char token[2 * MAX_LENGTH]; struct save save_data; LDBLE kin_time; - struct kinetics *kinetics_ptr; state = REACTION; if (run_info.Get_cells().Get_numbers().size() == 0 || @@ -2404,4 +2401,4 @@ run_as_cells(void) /* free_model_allocs(); */ /* last_model.force_prep = TRUE; */ return (OK); -} \ No newline at end of file +} diff --git a/dumper.cpp b/dumper.cpp index 7d2d9628..2341296f 100644 --- a/dumper.cpp +++ b/dumper.cpp @@ -381,7 +381,7 @@ bool dumper::Read(CParser & parser) break; case 15: //append { - CParser::TOKEN_TYPE j = parser.copy_token(token, next_char); + parser.copy_token(token, next_char); //if (!(parser.get_iss() >> this->append)) this->append = true; if (token.c_str()[0] == 'f' || token.c_str()[0] == 'F') diff --git a/runner.h b/runner.h index 0b35a4f7..fb407ebd 100644 --- a/runner.h +++ b/runner.h @@ -20,4 +20,4 @@ protected: double start_time; StorageBinListItem cells; }; -#endif // !defined(RUNNER_H_INCLUDED) \ No newline at end of file +#endif // !defined(RUNNER_H_INCLUDED)