diff options
author | tradke <> | 2004-06-14 08:50:00 +0000 |
---|---|---|
committer | tradke <> | 2004-06-14 08:50:00 +0000 |
commit | 962181e7e8f11d4ca488b9f36ff4b6fe4e70fc89 (patch) | |
tree | 55352c00a61697213760394d93e670640ce6d138 | |
parent | bf7e3296fcec1787a57885f62153acdffc314f3d (diff) |
Implement strict parameter parsing at startup.
Fixed a few g++ compiler warnings.
darcs-hash:20040614085006-1d9bf-2ed91c527b44f4098f20ecce96b43e7e0ae43d52.gz
-rw-r--r-- | Carpet/CarpetIOScalar/src/ioscalar.cc | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/Carpet/CarpetIOScalar/src/ioscalar.cc b/Carpet/CarpetIOScalar/src/ioscalar.cc index 0ae33441a..0ad1ab3f7 100644 --- a/Carpet/CarpetIOScalar/src/ioscalar.cc +++ b/Carpet/CarpetIOScalar/src/ioscalar.cc @@ -18,7 +18,7 @@ extern "C" { - static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetIOScalar/src/ioscalar.cc,v 1.2 2004/06/14 06:59:26 schnetter Exp $"; + static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetIOScalar/src/ioscalar.cc,v 1.3 2004/06/14 10:50:06 tradke Exp $"; CCTK_FILEVERSION(Carpet_CarpetIOScalar_ioscalar_cc); } @@ -123,6 +123,12 @@ namespace CarpetIOScalar { SetupGH (tFleshConfig* const fc, int const convLevel, cGH* const cctkGH) { DECLARE_CCTK_PARAMETERS; + const void *dummy; + + dummy = &fc; + dummy = &convLevel; + dummy = &cctkGH; + dummy = &dummy; // Truncate all files if this is not a restart do_truncate.resize (CCTK_NumVars(), true); @@ -422,13 +428,18 @@ namespace CarpetIOScalar { static int output_variables_iteration = -1; if (cctk_iteration > output_variables_iteration) { - output_variables_iteration = cctk_iteration; - output_variables.resize (CCTK_NumVars()); const char* const varlist = outScalar_vars; - CCTK_TraverseString - (varlist, SetFlag, &output_variables, CCTK_GROUP_OR_VAR); + if (CCTK_TraverseString (varlist, SetFlag, &output_variables, + CCTK_GROUP_OR_VAR) < 0) + { + CCTK_WARN (output_variables_iteration < 0 && strict_io_parameter_check ? + 0 : 1, + "error while parsing parameter 'IOScalar::outScalar_vars'"); + } + + output_variables_iteration = cctk_iteration; } if (! output_variables.at(vindex)) return 0; @@ -476,6 +487,11 @@ namespace CarpetIOScalar { void SetFlag (int const index, const char * const optstring, void * const arg) { + const void *dummy; + + dummy = &optstring; + dummy = &dummy; + vector<bool>& flags = *(vector<bool>*)arg; flags.at(index) = true; } |