From 5ddde370b61364cc75df36cd27d566778b3368af Mon Sep 17 00:00:00 2001 From: Harry Moffat Date: Tue, 10 Aug 2004 01:11:20 +0000 Subject: [PATCH] MSVC experienced an error on this code. fixed it. --- examples/cxx/example_utils.h | 5 +++-- examples/cxx/examples.cpp | 11 ++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/examples/cxx/example_utils.h b/examples/cxx/example_utils.h index 2857fafc2..33984c84d 100755 --- a/examples/cxx/example_utils.h +++ b/examples/cxx/example_utils.h @@ -17,8 +17,9 @@ void saveSoln(int i, double time, const G& gas, A& soln) { template void saveSoln(double time, const G& gas, A& soln) { - soln.resize(soln.nRows(), soln.nColumns() + 1); - int back = soln.nColumns() - 1; + soln.resize(static_cast(soln.nRows()), + static_cast(soln.nColumns()) + 1); + int back = static_cast(soln.nColumns()) - 1; soln(0,back) = time; soln(1,back) = gas.temperature(); soln(2,back) = gas.density(); diff --git a/examples/cxx/examples.cpp b/examples/cxx/examples.cpp index 60920bfeb..c06489471 100755 --- a/examples/cxx/examples.cpp +++ b/examples/cxx/examples.cpp @@ -17,11 +17,11 @@ int transport_example2(int job); int equil_example1(int job); int rxnpath_example1(int job); -typedef int (*exfun)(int n=2); +typedef int (*exfun)(int n); -int run_example(int n, exfun f) { +int run_example(int n, exfun f, int job = 2) { cout << "\n\n\n\n>>>>> example " << n+1 << "\n\nDescription: "; - int i = f(); + int i = f(job); showErrors(cout); return i; } @@ -62,14 +62,15 @@ int main(int argc, char** argv) { try { int i = 0; + int job = 2; if (example_num == 0) { int j; for (j = 0; j < NUM_EXAMPLES; j++) { - i = run_example(j, fex[j]); + i = run_example(j, fex[j], 2); } } else if (example_num > 0 && example_num <= NUM_EXAMPLES) - i = run_example(example_num-1, fex[example_num-1]); + i = run_example(example_num-1, fex[example_num-1], 2); return 0; }