From 721be95ac5437bbacd7ac8440459fccf72bb36f5 Mon Sep 17 00:00:00 2001
From: Andy Cedilnik <andy.cedilnik@kitware.com>
Date: Sun, 16 Jul 2006 21:11:50 -0400
Subject: [PATCH] COMP: Remove some warnings
---
testCommandLineArguments.cxx | 8 +++++++-
testCommandLineArguments1.cxx | 6 +++++-
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/testCommandLineArguments.cxx b/testCommandLineArguments.cxx
index 9eb43e29..40387ffb 100644
--- a/testCommandLineArguments.cxx
+++ b/testCommandLineArguments.cxx
@@ -89,7 +89,7 @@ int main(int argc, char* argv[])
bool valid_bools[] = { true, true, false };
kwsys_stl::vector<char*> strings_argument;
- char* valid_strings[] = { "andy", "bill", "brad", "ken" };
+ const char* valid_strings[] = { "andy", "bill", "brad", "ken" };
kwsys_stl::vector<kwsys_stl::string> stl_strings_argument;
kwsys_stl::string valid_stl_strings[] = { "ken", "brad", "bill", "andy" };
@@ -176,5 +176,11 @@ int main(int argc, char* argv[])
kwsys_ios::cout << "bool_arg1 variable was set to: " << bool_arg1 << kwsys_ios::endl;
kwsys_ios::cout << "bool_arg2 variable was set to: " << bool_arg2 << kwsys_ios::endl;
kwsys_ios::cout << kwsys_ios::endl;
+
+ for ( cc = 0; cc < strings_argument.size(); ++ cc )
+ {
+ delete [] strings_argument[cc];
+ strings_argument[cc] = 0;
+ }
return res;
}
diff --git a/testCommandLineArguments1.cxx b/testCommandLineArguments1.cxx
index f443ccdb..77836ec5 100644
--- a/testCommandLineArguments1.cxx
+++ b/testCommandLineArguments1.cxx
@@ -63,12 +63,16 @@ int main(int argc, char* argv[])
kwsys_ios::cout << "Value of N: " << n << kwsys_ios::endl;
kwsys_ios::cout << "Value of M: " << m << kwsys_ios::endl;
kwsys_ios::cout << "Value of P: " << p.c_str() << kwsys_ios::endl;
+ if ( m )
+ {
+ delete [] m;
+ }
char** newArgv = 0;
int newArgc = 0;
arg.GetUnusedArguments(&newArgc, &newArgv);
int cc;
- char* valid_unused_args[9] = {
+ const char* valid_unused_args[9] = {
0, "--ignored", "--second-ignored", "third-ignored",
"some", "junk", "at", "the", "end"
};
--
GitLab