summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Source/cmAbstractFilesCommand.cxx2
-rw-r--r--Source/cmCommand.h5
-rw-r--r--Source/cmCommands.h60
-rw-r--r--Source/cmConfigureFileNoAutoconf.h2
-rw-r--r--Source/cmFindIncludeCommand.cxx4
-rw-r--r--Source/cmFindLibraryCommand.cxx4
-rw-r--r--Source/cmFindProgramCommand.cxx2
-rw-r--r--Source/cmMakefile.cxx4
-rw-r--r--Source/cmUnixMakefileGenerator.cxx2
9 files changed, 45 insertions, 40 deletions
diff --git a/Source/cmAbstractFilesCommand.cxx b/Source/cmAbstractFilesCommand.cxx
index 2e8ed2f3e2..7950befe80 100644
--- a/Source/cmAbstractFilesCommand.cxx
+++ b/Source/cmAbstractFilesCommand.cxx
@@ -27,7 +27,7 @@ bool cmAbstractFilesCommand::Invoke(std::vector<std::string>& args)
j != args.end(); ++j)
{
std::vector<cmClassFile>& Classes = m_Makefile->GetClasses();
- for(int i = 0; i < Classes.size(); i++)
+ for(unsigned int i = 0; i < Classes.size(); i++)
{
if(Classes[i].m_ClassName == (*j))
{
diff --git a/Source/cmCommand.h b/Source/cmCommand.h
index 72f08dc667..aefd757bd0 100644
--- a/Source/cmCommand.h
+++ b/Source/cmCommand.h
@@ -39,6 +39,11 @@ public:
{m_Makefile = 0; m_Enabled = true;}
/**
+ * Need virtual destructor to destroy real command type.
+ */
+ virtual ~cmCommand() {}
+
+ /**
* Specify the makefile.
*/
void SetMakefile(cmMakefile*m)
diff --git a/Source/cmCommands.h b/Source/cmCommands.h
index f006063def..ab712228b8 100644
--- a/Source/cmCommands.h
+++ b/Source/cmCommands.h
@@ -1,30 +1,30 @@
- /*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile$
- Language: C++
- Date: $Date$
- Version: $Revision$
-
-
- Copyright (c) 2000 National Library of Medicine
- All rights reserved.
-
- See COPYRIGHT.txt for copyright details.
-
-=========================================================================*/
-#ifndef cmCommands_h
-#define cmCommands_h
-#include "cmStandardIncludes.h"
-
-class cmCommand;
-/**
- * Global function to return all compiled in commands.
- * To add a new command edit cmCommands.cxx and add your command.
- * It is up to the caller to delete the commands created by this
- * call.
- */
-void GetPredefinedCommands(std::list<cmCommand*>& commands);
-
-
-#endif
+/*=========================================================================
+
+ Program: Insight Segmentation & Registration Toolkit
+ Module: $RCSfile$
+ Language: C++
+ Date: $Date$
+ Version: $Revision$
+
+
+ Copyright (c) 2000 National Library of Medicine
+ All rights reserved.
+
+ See COPYRIGHT.txt for copyright details.
+
+=========================================================================*/
+#ifndef cmCommands_h
+#define cmCommands_h
+#include "cmStandardIncludes.h"
+
+class cmCommand;
+/**
+ * Global function to return all compiled in commands.
+ * To add a new command edit cmCommands.cxx and add your command.
+ * It is up to the caller to delete the commands created by this
+ * call.
+ */
+void GetPredefinedCommands(std::list<cmCommand*>& commands);
+
+
+#endif
diff --git a/Source/cmConfigureFileNoAutoconf.h b/Source/cmConfigureFileNoAutoconf.h
index 42a3e3ae53..d279e97e90 100644
--- a/Source/cmConfigureFileNoAutoconf.h
+++ b/Source/cmConfigureFileNoAutoconf.h
@@ -55,7 +55,7 @@ public:
"CONFIGURE_HEADER(InputFile OutputFile)\n"
"The Input and Ouput files have to have full paths.\n"
"They can also use variables like CMAKE_BINARY_DIR,CMAKE_SOURCE_DIR.\n"
- "This command is only run if configure was not used. In other\n";
+ "This command is only run if configure was not used. In other\n"
"words it is only run for non UNIX style builds.\n";
}
diff --git a/Source/cmFindIncludeCommand.cxx b/Source/cmFindIncludeCommand.cxx
index b1f095e002..ec33f4d5d9 100644
--- a/Source/cmFindIncludeCommand.cxx
+++ b/Source/cmFindIncludeCommand.cxx
@@ -35,7 +35,7 @@ bool cmFindIncludeCommand::Invoke(std::vector<std::string>& args)
}
std::vector<std::string> path;
// add any user specified paths
- for (int j = 2; j < args.size(); j++)
+ for (unsigned int j = 2; j < args.size(); j++)
{
// expand variables
std::string exp = args[j];
@@ -46,7 +46,7 @@ bool cmFindIncludeCommand::Invoke(std::vector<std::string>& args)
// add the standard path
cmSystemTools::GetPath(path);
- for(int k=0; k < path.size(); k++)
+ for(unsigned int k=0; k < path.size(); k++)
{
std::string tryPath = path[k];
tryPath += "/";
diff --git a/Source/cmFindLibraryCommand.cxx b/Source/cmFindLibraryCommand.cxx
index e241f50dc2..16c3ed8a5c 100644
--- a/Source/cmFindLibraryCommand.cxx
+++ b/Source/cmFindLibraryCommand.cxx
@@ -35,7 +35,7 @@ bool cmFindLibraryCommand::Invoke(std::vector<std::string>& args)
}
std::vector<std::string> path;
// add any user specified paths
- for (int j = 2; j < args.size(); j++)
+ for (unsigned int j = 2; j < args.size(); j++)
{
// expand variables
std::string exp = args[j];
@@ -46,7 +46,7 @@ bool cmFindLibraryCommand::Invoke(std::vector<std::string>& args)
// add the standard path
cmSystemTools::GetPath(path);
- for(int k=0; k < path.size(); k++)
+ for(unsigned int k=0; k < path.size(); k++)
{
std::string tryPath = path[k];
tryPath += "/";
diff --git a/Source/cmFindProgramCommand.cxx b/Source/cmFindProgramCommand.cxx
index 81678b3b37..66d3f173d7 100644
--- a/Source/cmFindProgramCommand.cxx
+++ b/Source/cmFindProgramCommand.cxx
@@ -45,7 +45,7 @@ bool cmFindProgramCommand::Invoke(std::vector<std::string>& args)
cmSystemTools::GetPath(path);
for(; i != args.end(); ++i)
{
- for(int k=0; k < path.size(); k++)
+ for(unsigned int k=0; k < path.size(); k++)
{
std::string tryPath = path[k];
tryPath += "/";
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 7c8f7e01ac..90bbc742c8 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -54,7 +54,7 @@ void cmMakefile::AddDefaultCommands()
cmMakefile::~cmMakefile()
{
- for(int i=0; i < m_UsedCommands.size(); i++)
+ for(unsigned int i=0; i < m_UsedCommands.size(); i++)
{
delete m_UsedCommands[i];
}
@@ -517,7 +517,7 @@ void cmMakefile::GenerateCacheOnly()
{
std::vector<cmMakefile*> makefiles;
this->FindSubDirectoryCMakeListsFiles(makefiles);
- for(int i =0; i < makefiles.size(); ++i)
+ for(unsigned int i =0; i < makefiles.size(); ++i)
{
delete makefiles[i];
}
diff --git a/Source/cmUnixMakefileGenerator.cxx b/Source/cmUnixMakefileGenerator.cxx
index e1bcb8facc..58ac54859b 100644
--- a/Source/cmUnixMakefileGenerator.cxx
+++ b/Source/cmUnixMakefileGenerator.cxx
@@ -105,7 +105,7 @@ void cmUnixMakefileGenerator::OutputDependLibraries(std::ostream& fout)
{
std::vector<std::string>& libs = m_Makefile->GetLinkLibraries();
std::vector<std::string>& libdirs = m_Makefile->GetLinkDirectories();
- std::vector<std::string>::iterator dir, lib, endlibs, enddirs;
+ std::vector<std::string>::iterator dir, lib;
// Search the list of libraries that will be linked into
// the executable
for(lib = libs.begin(); lib != libs.end(); ++lib)
View Lorry Controller Status