Merge pull request #93 from Slicer/RemoveUnusedVariableWarning

hjmjohnson · web-flow · commit 6f2b1251ccec · 2018-01-03T07:29:06.000-06:00
Remove unused variable warning
diff --git a/GenerateCLP/GenerateCLP.cxx b/GenerateCLP/GenerateCLP.cxx
@@ -1923,7 +1923,6 @@ void GenerateTCLAPAssignment(std::ostream & sout, const ModuleDescription & modu
         sout << pit->GetName() << "Temp.size(); _i++)" << EOL << std::endl;
         sout << "        {" << EOL << std::endl;
         sout << "        std::vector<std::string> words;" << EOL << std::endl;
-        sout << "        std::vector<" << pit->GetArgType() << "> elements;" << EOL << std::endl;
         sout << "        words.clear();" << EOL << std::endl;
         if ((*pit).GetTag() == "file")
           {
@@ -1936,6 +1935,7 @@ void GenerateTCLAPAssignment(std::ostream & sout, const ModuleDescription & modu
           }
         if (IsVectorOfVectors(*pit))
           {
+          sout << "        std::vector<" << pit->GetArgType() << "> elements;" << EOL << std::endl;
           sout << "        for (unsigned int _j= 0; _j < words.size(); _j++)" << EOL << std::endl;
           sout << "          {" << EOL << std::endl;
           sout << "          elements.push_back("
diff --git a/ModuleDescriptionParser/ModuleProcessInformation.h b/ModuleDescriptionParser/ModuleProcessInformation.h
@@ -40,8 +40,8 @@ extern "C" {
 
     ModuleProcessInformation()
       {
-        ProgressCallbackFunction = 0;
-        ProgressCallbackClientData = 0;
+        ProgressCallbackFunction = NULL;
+        ProgressCallbackClientData = NULL;
         Initialize();
       }
 
diff --git a/ModuleDescriptionParser/Testing/TestData/parameter-file-with-pointfile-slicer-issue2979.params b/ModuleDescriptionParser/Testing/TestData/parameter-file-with-pointfile-slicer-issue2979.params
@@ -0,0 +1,2 @@
+Input Fiducial File = input.fcsv
+Output Fiducial File = output.fcsv

Original file line number	Diff line number	Diff line change
`@@ -1923,7 +1923,6 @@ void GenerateTCLAPAssignment(std::ostream & sout, const ModuleDescription & modu`
`1923`	`1923`	`sout << pit->GetName() << "Temp.size(); _i++)" << EOL << std::endl;`
`1924`	`1924`	`sout << " {" << EOL << std::endl;`
`1925`	`1925`	`sout << " std::vector<std::string> words;" << EOL << std::endl;`
`1926`		`- sout << " std::vector<" << pit->GetArgType() << "> elements;" << EOL << std::endl;`
`1927`	`1926`	`sout << " words.clear();" << EOL << std::endl;`
`1928`	`1927`	`if ((*pit).GetTag() == "file")`
`1929`	`1928`	`{`
`@@ -1936,6 +1935,7 @@ void GenerateTCLAPAssignment(std::ostream & sout, const ModuleDescription & modu`
`1936`	`1935`	`}`
`1937`	`1936`	`if (IsVectorOfVectors(*pit))`
`1938`	`1937`	`{`
	`1938`	`+ sout << " std::vector<" << pit->GetArgType() << "> elements;" << EOL << std::endl;`
`1939`	`1939`	`sout << " for (unsigned int _j= 0; _j < words.size(); _j++)" << EOL << std::endl;`
`1940`	`1940`	`sout << " {" << EOL << std::endl;`
`1941`	`1941`	`sout << " elements.push_back("`
Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,8 @@ extern "C" {`
`40`	`40`
`41`	`41`	`ModuleProcessInformation()`
`42`	`42`	`{`
`43`		`- ProgressCallbackFunction = 0;`
`44`		`- ProgressCallbackClientData = 0;`
	`43`	`+ ProgressCallbackFunction = NULL;`
	`44`	`+ ProgressCallbackClientData = NULL;`
`45`	`45`	`Initialize();`
`46`	`46`	`}`
`47`	`47`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Input Fiducial File = input.fcsv`
	`2`	`+Output Fiducial File = output.fcsv`