[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-853-g375ac89
Ben Boeckel
ben.boeckel at kitware.com
Tue Mar 11 13:13:31 EDT 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 375ac8941803ddb8517dc1b907b3172823de344c (commit)
via f011e70359907b99ae6fcf6287e8f0c0c8d9dd8f (commit)
via 672aa1307e12ba9527f3e516653e5370c90a069f (commit)
via 844f49b858aa196cdb872ebe2d0ea10f8d4d751c (commit)
via 19c9bead77c76a04fb0716be8eaa653a2c308d50 (commit)
via fd2f6f2267f6432731089ef7278a08eb25e93fd4 (commit)
via 9bb8ff678ac18b26a5171871a8893e9ccc89a86c (commit)
via 7814626829cb7bbc716b290c5b5042a5d356fdbe (commit)
from 7b5da6892d5b716c5382295d416232af3c1ba2c3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=375ac8941803ddb8517dc1b907b3172823de344c
commit 375ac8941803ddb8517dc1b907b3172823de344c
Merge: 7b5da68 f011e70
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Tue Mar 11 13:13:28 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 11 13:13:28 2014 -0400
Merge topic 'dev/update-style-guidelines' into next
f011e703 docs: Enforce size_t usage
672aa130 docs: Remove std::set::insert(begin, end) guideline
844f49b8 docs: Enforce std::algorithm implicit cast guideline
19c9bead docs: Remove std::set::find == std::set::end guideline
fd2f6f22 docs: Update std::string::append usage guidelines
9bb8ff67 docs: Enforce .at() guideline
78146268 Remove cmStdString from developer examples
diff --cc Source/cmForEachCommand.cxx
index e3f66c1,1cbe2db..9fd7299
--- a/Source/cmForEachCommand.cxx
+++ b/Source/cmForEachCommand.cxx
@@@ -47,10 -47,10 +47,10 @@@ IsFunctionBlocked(const cmListFileFunct
for( ; j != this->Args.end(); ++j)
{
// set the variable to the loop value
- mf.AddDefinition(this->Args[0].c_str(),j->c_str());
+ mf.AddDefinition(this->Args[0],j->c_str());
// Invoke all the functions that were collected in the block.
cmExecutionStatus status;
- for(unsigned int c = 0; c < this->Functions.size(); ++c)
+ for(size_t c = 0; c < this->Functions.size(); ++c)
{
status.Clear();
mf.ExecuteCommand(this->Functions[c],status);
diff --cc Source/cmFunctionCommand.cxx
index 3ff527d,e74a71c..c57d6c0
--- a/Source/cmFunctionCommand.cxx
+++ b/Source/cmFunctionCommand.cxx
@@@ -119,9 -119,9 +119,9 @@@ bool cmFunctionHelperCommand::InvokeIni
}
// define the formal arguments
- for (unsigned int j = 1; j < this->Args.size(); ++j)
+ for (size_t j = 1; j < this->Args.size(); ++j)
{
- this->Makefile->AddDefinition(this->Args[j].c_str(),
+ this->Makefile->AddDefinition(this->Args[j],
expandedArgs[j-1].c_str());
}
diff --cc Source/cmSetSourceFilesPropertiesCommand.cxx
index 19c6819,98ec7eb..5ebd14e
--- a/Source/cmSetSourceFilesPropertiesCommand.cxx
+++ b/Source/cmSetSourceFilesPropertiesCommand.cxx
@@@ -158,10 -158,10 +158,10 @@@ bool cmSetSourceFilesPropertiesComman
if(sf)
{
// now loop through all the props and set them
- unsigned int k;
+ size_t k;
for (k = 0; k < propertyPairs.size(); k = k + 2)
{
- sf->SetProperty(propertyPairs[k].c_str(),propertyPairs[k+1].c_str());
+ sf->SetProperty(propertyPairs[k],propertyPairs[k+1].c_str());
}
}
}
diff --cc Source/cmSetTargetPropertiesCommand.cxx
index bf3519c,6d48a36..a4be3dc
--- a/Source/cmSetTargetPropertiesCommand.cxx
+++ b/Source/cmSetTargetPropertiesCommand.cxx
@@@ -98,12 -98,12 +98,12 @@@ bool cmSetTargetPropertiesComman
if(cmTarget* target = mf->FindTargetToUse(tname))
{
// now loop through all the props and set them
- unsigned int k;
+ size_t k;
for (k = 0; k < propertyPairs.size(); k = k + 2)
{
- target->SetProperty(propertyPairs[k].c_str(),
+ target->SetProperty(propertyPairs[k],
propertyPairs[k+1].c_str());
- target->CheckProperty(propertyPairs[k].c_str(), mf);
+ target->CheckProperty(propertyPairs[k], mf);
}
}
// if file is not already in the makefile, then add it
diff --cc Source/cmSetTestsPropertiesCommand.cxx
index b026ff3,27ce6dc..4820beb
--- a/Source/cmSetTestsPropertiesCommand.cxx
+++ b/Source/cmSetTestsPropertiesCommand.cxx
@@@ -98,10 -98,10 +98,10 @@@ bool cmSetTestsPropertiesComman
if(cmTest* test = mf->GetTest(tname))
{
// now loop through all the props and set them
- unsigned int k;
+ size_t k;
for (k = 0; k < propertyPairs.size(); k = k + 2)
{
- test->SetProperty(propertyPairs[k].c_str(),
+ test->SetProperty(propertyPairs[k],
propertyPairs[k+1].c_str());
}
}
diff --cc Source/cmVariableRequiresCommand.cxx
index 80c1286,ae97d16..0b10217
--- a/Source/cmVariableRequiresCommand.cxx
+++ b/Source/cmVariableRequiresCommand.cxx
@@@ -34,9 -34,9 +34,9 @@@ bool cmVariableRequiresComman
bool requirementsMet = true;
std::string notSet;
bool hasAdvanced = false;
- for(unsigned int i = 2; i < args.size(); ++i)
+ for(size_t i = 2; i < args.size(); ++i)
{
- if(!this->Makefile->IsOn(args[i].c_str()))
+ if(!this->Makefile->IsOn(args[i]))
{
requirementsMet = false;
notSet += args[i];
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f011e70359907b99ae6fcf6287e8f0c0c8d9dd8f
commit f011e70359907b99ae6fcf6287e8f0c0c8d9dd8f
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Mon Mar 10 15:56:35 2014 -0400
Commit: Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Tue Mar 11 13:12:18 2014 -0400
docs: Enforce size_t usage
diff --git a/Source/CTest/cmCTestBuildAndTestHandler.cxx b/Source/CTest/cmCTestBuildAndTestHandler.cxx
index 0fac136..cba5feb 100644
--- a/Source/CTest/cmCTestBuildAndTestHandler.cxx
+++ b/Source/CTest/cmCTestBuildAndTestHandler.cxx
@@ -350,7 +350,7 @@ int cmCTestBuildAndTestHandler::RunCMakeAndTest(std::string* outstring)
<< this->TestCommand << "\n";
out << "tried to find it in these places:\n";
out << fullPath.c_str() << "\n";
- for(unsigned int i=0; i < failed.size(); ++i)
+ for(size_t i=0; i < failed.size(); ++i)
{
out << failed[i] << "\n";
}
diff --git a/Source/CTest/cmCTestHG.cxx b/Source/CTest/cmCTestHG.cxx
index 0f79d68..6854cb7 100644
--- a/Source/CTest/cmCTestHG.cxx
+++ b/Source/CTest/cmCTestHG.cxx
@@ -233,7 +233,7 @@ private:
else if(!this->CData.empty() && name == "files")
{
std::vector<std::string> paths = this->SplitCData();
- for(unsigned int i = 0; i < paths.size(); ++i)
+ for(size_t i = 0; i < paths.size(); ++i)
{
// Updated by default, will be modified using file_adds and
// file_dels.
@@ -245,7 +245,7 @@ private:
else if(!this->CData.empty() && name == "file_adds")
{
std::string added_paths(this->CData.begin(), this->CData.end());
- for(unsigned int i = 0; i < this->Changes.size(); ++i)
+ for(size_t i = 0; i < this->Changes.size(); ++i)
{
if(added_paths.find(this->Changes[i].Path) != std::string::npos)
{
@@ -256,7 +256,7 @@ private:
else if(!this->CData.empty() && name == "file_dels")
{
std::string added_paths(this->CData.begin(), this->CData.end());
- for(unsigned int i = 0; i < this->Changes.size(); ++i)
+ for(size_t i = 0; i < this->Changes.size(); ++i)
{
if(added_paths.find(this->Changes[i].Path) != std::string::npos)
{
@@ -271,7 +271,7 @@ private:
{
std::vector<std::string> output;
std::string currPath;
- for(unsigned int i=0; i < this->CData.size(); ++i)
+ for(size_t i=0; i < this->CData.size(); ++i)
{
if(this->CData[i] != ' ')
{
diff --git a/Source/CTest/cmCTestHandlerCommand.cxx b/Source/CTest/cmCTestHandlerCommand.cxx
index 2e2feb0..b7c09ea 100644
--- a/Source/CTest/cmCTestHandlerCommand.cxx
+++ b/Source/CTest/cmCTestHandlerCommand.cxx
@@ -40,7 +40,7 @@ bool cmCTestHandlerCommand
// Process input arguments.
this->ArgumentDoing = ArgumentDoingNone;
- for(unsigned int i=0; i < args.size(); ++i)
+ for(size_t i=0; i < args.size(); ++i)
{
// Check this argument.
if(!this->CheckArgumentKeyword(args[i]) &&
@@ -162,7 +162,7 @@ bool cmCTestHandlerCommand::CheckArgumentKeyword(std::string const& arg)
}
// Check for a keyword in our argument/value table.
- for(unsigned int k=0; k < this->Arguments.size(); ++k)
+ for(size_t k=0; k < this->Arguments.size(); ++k)
{
if(this->Arguments[k] && arg == this->Arguments[k])
{
diff --git a/Source/CTest/cmCTestScriptHandler.cxx b/Source/CTest/cmCTestScriptHandler.cxx
index 7f13855..0200c60 100644
--- a/Source/CTest/cmCTestScriptHandler.cxx
+++ b/Source/CTest/cmCTestScriptHandler.cxx
@@ -942,7 +942,7 @@ int cmCTestScriptHandler::RunConfigurationDashboard()
std::vector<std::string> ctestCommands;
cmSystemTools::ExpandListArgument(this->CTestCmd,ctestCommands);
// for each variable/argument do a putenv
- for (unsigned i = 0; i < ctestCommands.size(); ++i)
+ for (size_t i = 0; i < ctestCommands.size(); ++i)
{
command = ctestCommands[i];
output = "";
diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx
index 5970656..9f55ba3 100644
--- a/Source/CTest/cmCTestTestHandler.cxx
+++ b/Source/CTest/cmCTestTestHandler.cxx
@@ -552,7 +552,7 @@ int cmCTestTestHandler::ProcessHandler()
clock_finish = cmSystemTools::GetTime();
- total = int(passed.size()) + int(failed.size());
+ total = int(passed.size() + failed.size());
if (total == 0)
{
@@ -1476,7 +1476,7 @@ std::string cmCTestTestHandler
// try any extra paths
if (filepath.size() == 0)
{
- for (unsigned int i = 0; i < extraPaths.size(); ++i)
+ for (size_t i = 0; i < extraPaths.size(); ++i)
{
std::string filepathExtra =
cmSystemTools::GetFilenamePath(extraPaths[i]);
@@ -1493,7 +1493,7 @@ std::string cmCTestTestHandler
std::string fullPath;
// now look in the paths we specified above
- for(unsigned int ai=0;
+ for(size_t ai=0;
ai < attempted.size() && fullPath.size() == 0; ++ai)
{
// first check without exe extension
diff --git a/Source/CursesDialog/ccmake.cxx b/Source/CursesDialog/ccmake.cxx
index 2d1ef5c..7e5d443 100644
--- a/Source/CursesDialog/ccmake.cxx
+++ b/Source/CursesDialog/ccmake.cxx
@@ -104,7 +104,7 @@ int main(int argc, char const* const* argv)
}
bool debug = false;
- unsigned int i;
+ size_t i;
int j;
std::vector<std::string> args;
for(j =0; j < argc; ++j)
diff --git a/Source/QtDialog/QCMakeCacheView.cxx b/Source/QtDialog/QCMakeCacheView.cxx
index bae6a30..cfa1cfa 100644
--- a/Source/QtDialog/QCMakeCacheView.cxx
+++ b/Source/QtDialog/QCMakeCacheView.cxx
@@ -297,8 +297,8 @@ void QCMakeCacheModel::setProperties(const QCMakePropertyList& props)
parentItems[1]->setData(1, GroupRole);
root->appendRow(parentItems);
- int num = props2.size();
- for(int i=0; i<num; i++)
+ size_t num = props2.size();
+ for(size_t i=0; i<num; i++)
{
QCMakeProperty prop = props2[i];
QList<QStandardItem*> items;
@@ -318,8 +318,8 @@ void QCMakeCacheModel::setProperties(const QCMakePropertyList& props)
root->appendRow(parentItem);
parentItem->setData(1, GroupRole);
- int num = props2.size();
- for(int i=0; i<num; i++)
+ size_t num = props2.size();
+ for(size_t i=0; i<num; i++)
{
QCMakeProperty prop = props2[i];
QList<QStandardItem*> items;
diff --git a/Source/QtDialog/QCMakeWidgets.cxx b/Source/QtDialog/QCMakeWidgets.cxx
index a0c5e17..af75574 100644
--- a/Source/QtDialog/QCMakeWidgets.cxx
+++ b/Source/QtDialog/QCMakeWidgets.cxx
@@ -43,7 +43,7 @@ QCMakePathEditor::QCMakePathEditor(QWidget* p, const QString& var)
void QCMakeFileEditor::resizeEvent(QResizeEvent* e)
{
// make the tool button fit on the right side
- int h = e->size().height();
+ size_t h = e->size().height();
// move the line edit to make room for the tool button
this->setContentsMargins(0, 0, h, 0);
// put the tool button in its place
diff --git a/Source/QtDialog/QMacInstallDialog.cxx b/Source/QtDialog/QMacInstallDialog.cxx
index 8b8c531..c88c710 100644
--- a/Source/QtDialog/QMacInstallDialog.cxx
+++ b/Source/QtDialog/QMacInstallDialog.cxx
@@ -52,7 +52,7 @@ void QMacInstallDialog::DoInstall()
QDir cmExecDir(QApplication::applicationDirPath());
cmExecDir.cd("../bin");
QFileInfoList list = cmExecDir.entryInfoList();
- for (int i = 0; i < list.size(); ++i)
+ for (size_t i = 0; i < list.size(); ++i)
{
QFileInfo fileInfo = list.at(i);
QString filename = fileInfo.fileName();
diff --git a/Source/cmAddCustomCommandCommand.cxx b/Source/cmAddCustomCommandCommand.cxx
index 3de04f5..24162a0 100644
--- a/Source/cmAddCustomCommandCommand.cxx
+++ b/Source/cmAddCustomCommandCommand.cxx
@@ -63,7 +63,7 @@ bool cmAddCustomCommandCommand
tdoing doing = doing_nothing;
- for (unsigned int j = 0; j < args.size(); ++j)
+ for (size_t j = 0; j < args.size(); ++j)
{
std::string const& copy = args[j];
diff --git a/Source/cmAddCustomTargetCommand.cxx b/Source/cmAddCustomTargetCommand.cxx
index ef62523..bf259b9 100644
--- a/Source/cmAddCustomTargetCommand.cxx
+++ b/Source/cmAddCustomTargetCommand.cxx
@@ -76,7 +76,7 @@ bool cmAddCustomTargetCommand
}
// Parse the rest of the arguments.
- for(unsigned int j = start; j < args.size(); ++j)
+ for(size_t j = start; j < args.size(); ++j)
{
std::string const& copy = args[j];
diff --git a/Source/cmAddTestCommand.cxx b/Source/cmAddTestCommand.cxx
index a9165f5..adbb53f 100644
--- a/Source/cmAddTestCommand.cxx
+++ b/Source/cmAddTestCommand.cxx
@@ -86,7 +86,7 @@ bool cmAddTestCommand::HandleNameMode(std::vector<std::string> const& args)
DoingNone
};
Doing doing = DoingName;
- for(unsigned int i=1; i < args.size(); ++i)
+ for(size_t i=1; i < args.size(); ++i)
{
if(args[i] == "COMMAND")
{
diff --git a/Source/cmBuildCommand.cxx b/Source/cmBuildCommand.cxx
index 780ffa8..847cb3d 100644
--- a/Source/cmBuildCommand.cxx
+++ b/Source/cmBuildCommand.cxx
@@ -47,7 +47,7 @@ bool cmBuildCommand
std::string target;
enum Doing { DoingNone, DoingConfiguration, DoingProjectName, DoingTarget };
Doing doing = DoingNone;
- for(unsigned int i=1; i < args.size(); ++i)
+ for(size_t i=1; i < args.size(); ++i)
{
if(args[i] == "CONFIGURATION")
{
diff --git a/Source/cmCMakeMinimumRequired.cxx b/Source/cmCMakeMinimumRequired.cxx
index 6e2ca64..487bd89 100644
--- a/Source/cmCMakeMinimumRequired.cxx
+++ b/Source/cmCMakeMinimumRequired.cxx
@@ -20,7 +20,7 @@ bool cmCMakeMinimumRequired
// Process arguments.
std::string version_string;
bool doing_version = false;
- for(unsigned int i=0; i < args.size(); ++i)
+ for(size_t i=0; i < args.size(); ++i)
{
if(args[i] == "VERSION")
{
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index ee9b664..a2007cb 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -1312,7 +1312,7 @@ int cmCTest::RunTest(std::vector<const char*> argv,
inst.SetStreams(&oss, &oss);
std::vector<std::string> args;
- for(unsigned int i =0; i < argv.size(); ++i)
+ for(size_t i =0; i < argv.size(); ++i)
{
if(argv[i])
{
diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index 2d1da55..c726496 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -667,7 +667,7 @@ void cmComputeLinkDepends::InferDependencies()
// The inferred dependency sets for each item list the possible
// dependencies. The intersection of the sets for one item form its
// inferred dependencies.
- for(unsigned int depender_index=0;
+ for(size_t depender_index=0;
depender_index < this->InferredDependSets.size(); ++depender_index)
{
// Skip items for which dependencies do not need to be inferred or
@@ -720,7 +720,7 @@ void cmComputeLinkDepends::DisplayConstraintGraph()
{
// Display the graph nodes and their edges.
cmOStringStream e;
- for(unsigned int i=0; i < this->EntryConstraintGraph.size(); ++i)
+ for(size_t i=0; i < this->EntryConstraintGraph.size(); ++i)
{
EdgeList const& nl = this->EntryConstraintGraph[i];
e << "item " << i << " is [" << this->EntryList[i].Item << "]\n";
@@ -789,7 +789,7 @@ cmComputeLinkDepends::DisplayComponents()
{
fprintf(stderr, "The strongly connected components are:\n");
std::vector<NodeList> const& components = this->CCG->GetComponents();
- for(unsigned int c=0; c < components.size(); ++c)
+ for(size_t c=0; c < components.size(); ++c)
{
fprintf(stderr, "Component (%u):\n", c);
NodeList const& nl = components[c];
diff --git a/Source/cmComputeTargetDepends.cxx b/Source/cmComputeTargetDepends.cxx
index 5c739b8..35fd514 100644
--- a/Source/cmComputeTargetDepends.cxx
+++ b/Source/cmComputeTargetDepends.cxx
@@ -169,7 +169,7 @@ void cmComputeTargetDepends::CollectTargets()
// Collect all targets from all generators.
std::vector<cmLocalGenerator*> const& lgens =
this->GlobalGenerator->GetLocalGenerators();
- for(unsigned int i = 0; i < lgens.size(); ++i)
+ for(size_t i = 0; i < lgens.size(); ++i)
{
const cmTargets& targets = lgens[i]->GetMakefile()->GetTargets();
for(cmTargets::const_iterator ti = targets.begin();
@@ -190,7 +190,7 @@ void cmComputeTargetDepends::CollectDepends()
this->InitialGraph.resize(this->Targets.size());
// Compute each dependency list.
- for(unsigned int i=0; i < this->Targets.size(); ++i)
+ for(size_t i=0; i < this->Targets.size(); ++i)
{
this->CollectTargetDepends(i);
}
diff --git a/Source/cmConfigureFileCommand.cxx b/Source/cmConfigureFileCommand.cxx
index f8ec642..e125ae9 100644
--- a/Source/cmConfigureFileCommand.cxx
+++ b/Source/cmConfigureFileCommand.cxx
@@ -75,7 +75,7 @@ bool cmConfigureFileCommand
this->EscapeQuotes = false;
this->AtOnly = false;
- for(unsigned int i=2;i < args.size();++i)
+ for(size_t i=2;i < args.size();++i)
{
if(args[i] == "COPYONLY")
{
diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index ab7b024..e869ea9 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -653,7 +653,7 @@ void cmCoreTryCompile::FindOutputFile(const std::string& targetName)
cmOStringStream emsg;
emsg << "Unable to find the executable at any of:\n";
- for (unsigned int i = 0; i < searchDirs.size(); ++i)
+ for (size_t i = 0; i < searchDirs.size(); ++i)
{
emsg << " " << this->BinaryDirectory << searchDirs[i]
<< tmpOutputFile << "\n";
diff --git a/Source/cmCustomCommandGenerator.cxx b/Source/cmCustomCommandGenerator.cxx
index d8a756d..ef90193 100644
--- a/Source/cmCustomCommandGenerator.cxx
+++ b/Source/cmCustomCommandGenerator.cxx
@@ -56,7 +56,7 @@ cmCustomCommandGenerator
::AppendArguments(unsigned int c, std::string& cmd) const
{
cmCustomCommandLine const& commandLine = this->CC.GetCommandLines()[c];
- for(unsigned int j=1;j < commandLine.size(); ++j)
+ for(size_t j=1;j < commandLine.size(); ++j)
{
std::string arg = this->GE->Parse(commandLine[j])->Evaluate(this->Makefile,
this->Config);
diff --git a/Source/cmDefinePropertyCommand.cxx b/Source/cmDefinePropertyCommand.cxx
index 1ad98af..4a08b70 100644
--- a/Source/cmDefinePropertyCommand.cxx
+++ b/Source/cmDefinePropertyCommand.cxx
@@ -66,7 +66,7 @@ bool cmDefinePropertyCommand
bool inherited = false;
enum Doing { DoingNone, DoingProperty, DoingBrief, DoingFull };
Doing doing = DoingNone;
- for(unsigned int i=1; i < args.size(); ++i)
+ for(size_t i=1; i < args.size(); ++i)
{
if(args[i] == "PROPERTY")
{
diff --git a/Source/cmELF.cxx b/Source/cmELF.cxx
index bc1c25b..8f67fcd 100644
--- a/Source/cmELF.cxx
+++ b/Source/cmELF.cxx
@@ -575,7 +575,7 @@ unsigned int cmELFInternalImpl<Types>::GetDynamicEntryCount()
{
return 0;
}
- for(unsigned int i = 0; i < this->DynamicSectionEntries.size(); ++i)
+ for(size_t i = 0; i < this->DynamicSectionEntries.size(); ++i)
{
if(this->DynamicSectionEntries[i].d_tag == DT_NULL)
{
diff --git a/Source/cmExecuteProcessCommand.cxx b/Source/cmExecuteProcessCommand.cxx
index 994c170..9484b5c 100644
--- a/Source/cmExecuteProcessCommand.cxx
+++ b/Source/cmExecuteProcessCommand.cxx
@@ -211,7 +211,7 @@ bool cmExecuteProcessCommand
this->SetError(" called with no COMMAND argument.");
return false;
}
- for(unsigned int i=0; i < cmds.size(); ++i)
+ for(size_t i=0; i < cmds.size(); ++i)
{
if(cmds[i].empty())
{
@@ -240,7 +240,7 @@ bool cmExecuteProcessCommand
cmsysProcess* cp = cmsysProcess_New();
// Set the command sequence.
- for(unsigned int i=0; i < cmds.size(); ++i)
+ for(size_t i=0; i < cmds.size(); ++i)
{
cmsysProcess_AddCommand(cp, &*cmds[i].begin());
}
diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index f991f45..7c42c5d 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -221,7 +221,7 @@ cmExportBuildFileGenerator::HandleMissingTarget(
const std::string name = dependee->GetName();
std::vector<std::string> namespaces = this->FindNamespaces(mf, name);
- int targetOccurrences = (int)namespaces.size();
+ size_t targetOccurrences = namespaces.size();
if (targetOccurrences == 1)
{
std::string missingTarget = namespaces[0];
diff --git a/Source/cmExportCommand.cxx b/Source/cmExportCommand.cxx
index bda8dda..74d235d 100644
--- a/Source/cmExportCommand.cxx
+++ b/Source/cmExportCommand.cxx
@@ -255,7 +255,7 @@ bool cmExportCommand::HandlePackage(std::vector<std::string> const& args)
enum Doing { DoingNone, DoingPackage };
Doing doing = DoingPackage;
std::string package;
- for(unsigned int i=1; i < args.size(); ++i)
+ for(size_t i=1; i < args.size(); ++i)
{
if(doing == DoingPackage)
{
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 3c3c6df..9983282 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -1050,7 +1050,7 @@ void cmExportFileGenerator::GenerateMissingTargetsCheckCode(std::ostream& os,
"unset(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE_targets)\n"
"foreach(_target ";
std::set<std::string> emitted;
- for(unsigned int i=0; i<missingTargets.size(); ++i)
+ for(size_t i=0; i<missingTargets.size(); ++i)
{
if (emitted.insert(missingTargets[i]).second)
{
diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
index 5e7d5e4..53051a1 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@ -435,7 +435,7 @@ cmExportInstallFileGenerator::HandleMissingTarget(
{
const std::string name = dependee->GetName();
std::vector<std::string> namespaces = this->FindNamespaces(mf, name);
- int targetOccurrences = (int)namespaces.size();
+ size_t targetOccurrences = namespaces.size();
if (targetOccurrences == 1)
{
std::string missingTarget = namespaces[0];
@@ -470,7 +470,7 @@ cmExportInstallFileGenerator
exportSet->GetTargetExports();
bool containsTarget = false;
- for(unsigned int i=0; i<targets->size(); i++)
+ for(size_t i=0; i<targets->size(); i++)
{
if (name == (*targets)[i]->Target->GetName())
{
@@ -483,7 +483,7 @@ cmExportInstallFileGenerator
{
std::vector<cmInstallExportGenerator const*> const* installs =
exportSet->GetInstallations();
- for(unsigned int i=0; i<installs->size(); i++)
+ for(size_t i=0; i<installs->size(); i++)
{
namespaces.push_back((*installs)[i]->GetNamespace());
}
diff --git a/Source/cmExportSet.cxx b/Source/cmExportSet.cxx
index 33b0630..5e93b69 100644
--- a/Source/cmExportSet.cxx
+++ b/Source/cmExportSet.cxx
@@ -15,7 +15,7 @@
cmExportSet::~cmExportSet()
{
- for(unsigned int i = 0; i < this->TargetExports.size(); ++ i)
+ for(size_t i = 0; i < this->TargetExports.size(); ++ i)
{
delete this->TargetExports[i];
}
diff --git a/Source/cmFLTKWrapUICommand.cxx b/Source/cmFLTKWrapUICommand.cxx
index dd99c43..3221199 100644
--- a/Source/cmFLTKWrapUICommand.cxx
+++ b/Source/cmFLTKWrapUICommand.cxx
@@ -135,7 +135,7 @@ void cmFLTKWrapUICommand::FinalPass()
std::vector<cmSourceFile*> srcs;
target->GetSourceFiles(srcs);
bool found = false;
- for (unsigned int i = 0; i < srcs.size(); ++i)
+ for (size_t i = 0; i < srcs.size(); ++i)
{
if (srcs[i]->GetFullPath() ==
this->GeneratedSourcesClasses[0]->GetFullPath())
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index e79bc6c..abe2a44 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -437,7 +437,7 @@ bool cmFileCommand::HandleStringsCommand(std::vector<std::string> const& args)
bool newline_consume = false;
bool hex_conversion_enabled = true;
int arg_mode = arg_none;
- for(unsigned int i=3; i < args.size(); ++i)
+ for(size_t i=3; i < args.size(); ++i)
{
if(args[i] == "LIMIT_INPUT")
{
@@ -698,7 +698,7 @@ bool cmFileCommand::HandleStringsCommand(std::vector<std::string> const& args)
// Store the string in the output, but escape semicolons to
// make sure it is a list.
std::string const& sr = *si;
- for(unsigned int i=0; i < sr.size(); ++i)
+ for(size_t i=0; i < sr.size(); ++i)
{
if(sr[i] == ';')
{
@@ -901,7 +901,7 @@ cmFileCommand::HandleDifferentCommand(std::vector<std::string> const& args)
const char* var = 0;
enum Doing { DoingNone, DoingVar, DoingFileLHS, DoingFileRHS };
Doing doing = DoingVar;
- for(unsigned int i=1; i < args.size(); ++i)
+ for(size_t i=1; i < args.size(); ++i)
{
if(args[i] == "FILES")
{
@@ -1162,7 +1162,7 @@ protected:
bool cmFileCopier::Parse(std::vector<std::string> const& args)
{
this->Doing = DoingFiles;
- for(unsigned int i=1; i < args.size(); ++i)
+ for(size_t i=1; i < args.size(); ++i)
{
// Check this argument.
if(!this->CheckKeyword(args[i]) &&
@@ -2085,7 +2085,7 @@ cmFileCommand::HandleRPathChangeCommand(std::vector<std::string> const& args)
const char* newRPath = 0;
enum Doing { DoingNone, DoingFile, DoingOld, DoingNew };
Doing doing = DoingNone;
- for(unsigned int i=1; i < args.size(); ++i)
+ for(size_t i=1; i < args.size(); ++i)
{
if(args[i] == "OLD_RPATH")
{
@@ -2188,7 +2188,7 @@ cmFileCommand::HandleRPathRemoveCommand(std::vector<std::string> const& args)
const char* file = 0;
enum Doing { DoingNone, DoingFile };
Doing doing = DoingNone;
- for(unsigned int i=1; i < args.size(); ++i)
+ for(size_t i=1; i < args.size(); ++i)
{
if(args[i] == "FILE")
{
@@ -2260,7 +2260,7 @@ cmFileCommand::HandleRPathCheckCommand(std::vector<std::string> const& args)
const char* rpath = 0;
enum Doing { DoingNone, DoingFile, DoingRPath };
Doing doing = DoingNone;
- for(unsigned int i=1; i < args.size(); ++i)
+ for(size_t i=1; i < args.size(); ++i)
{
if(args[i] == "RPATH")
{
diff --git a/Source/cmFindBase.cxx b/Source/cmFindBase.cxx
index 86fd54b..4bb8ae8 100644
--- a/Source/cmFindBase.cxx
+++ b/Source/cmFindBase.cxx
@@ -87,7 +87,7 @@ bool cmFindBase::ParseArguments(std::vector<std::string> const& argsIn)
enum Doing { DoingNone, DoingNames, DoingPaths, DoingPathSuffixes,
DoingHints };
Doing doing = DoingNames; // assume it starts with a name
- for (unsigned int j = 1; j < args.size(); ++j)
+ for (size_t j = 1; j < args.size(); ++j)
{
if(args[j] == "NAMES")
{
@@ -167,7 +167,7 @@ bool cmFindBase::ParseArguments(std::vector<std::string> const& argsIn)
else
{
this->VariableDocumentation += "one of the " + this->Names[0];
- for (unsigned int j = 1; j < this->Names.size() - 1; ++j)
+ for (size_t j = 1; j < this->Names.size() - 1; ++j)
{
this->VariableDocumentation += ", " + this->Names[j];
}
@@ -184,7 +184,7 @@ bool cmFindBase::ParseArguments(std::vector<std::string> const& argsIn)
std::vector<std::string> shortArgs = this->Names;
this->Names.clear(); // clear out any values in Names
this->Names.push_back(shortArgs[0]);
- for(unsigned int j = 1; j < shortArgs.size(); ++j)
+ for(size_t j = 1; j < shortArgs.size(); ++j)
{
this->AddUserPath(shortArgs[j], this->UserPaths);
}
@@ -444,20 +444,20 @@ void cmFindBase::PrintFindStuff()
std::cerr << "EnvironmentPath " << this->EnvironmentPath << "\n";
std::cerr << "CMakePathName " << this->CMakePathName << "\n";
std::cerr << "Names ";
- for(unsigned int i =0; i < this->Names.size(); ++i)
+ for(size_t i =0; i < this->Names.size(); ++i)
{
std::cerr << this->Names[i] << " ";
}
std::cerr << "\n";
std::cerr << "\n";
std::cerr << "SearchPathSuffixes ";
- for(unsigned int i =0; i < this->SearchPathSuffixes.size(); ++i)
+ for(size_t i =0; i < this->SearchPathSuffixes.size(); ++i)
{
std::cerr << this->SearchPathSuffixes[i] << "\n";
}
std::cerr << "\n";
std::cerr << "SearchPaths\n";
- for(unsigned int i =0; i < this->SearchPaths.size(); ++i)
+ for(size_t i =0; i < this->SearchPaths.size(); ++i)
{
std::cerr << "[" << this->SearchPaths[i] << "]\n";
}
diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index 7a4e7f4..7c7ef6a 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -114,7 +114,7 @@ bool cmFindPackageCommand
bool haveVersion = false;
std::set<unsigned int> configArgs;
std::set<unsigned int> moduleArgs;
- for(unsigned int i=1; i < args.size(); ++i)
+ for(size_t i=1; i < args.size(); ++i)
{
if(args[i] == "QUIET")
{
@@ -282,7 +282,7 @@ bool cmFindPackageCommand
{
cmOStringStream e;
e << "called with components that are both required and optional:\n";
- for(unsigned int i=0; i<doubledComponents.size(); ++i)
+ for(size_t i=0; i<doubledComponents.size(); ++i)
{
e << " " << doubledComponents[i] << "\n";
}
diff --git a/Source/cmForEachCommand.cxx b/Source/cmForEachCommand.cxx
index d697067..1cbe2db 100644
--- a/Source/cmForEachCommand.cxx
+++ b/Source/cmForEachCommand.cxx
@@ -50,7 +50,7 @@ IsFunctionBlocked(const cmListFileFunction& lff, cmMakefile &mf,
mf.AddDefinition(this->Args[0].c_str(),j->c_str());
// Invoke all the functions that were collected in the block.
cmExecutionStatus status;
- for(unsigned int c = 0; c < this->Functions.size(); ++c)
+ for(size_t c = 0; c < this->Functions.size(); ++c)
{
status.Clear();
mf.ExecuteCommand(this->Functions[c],status);
@@ -210,7 +210,7 @@ bool cmForEachCommand::HandleInMode(std::vector<std::string> const& args)
enum Doing { DoingNone, DoingLists, DoingItems };
Doing doing = DoingNone;
- for(unsigned int i=2; i < args.size(); ++i)
+ for(size_t i=2; i < args.size(); ++i)
{
if(doing == DoingItems)
{
diff --git a/Source/cmFunctionCommand.cxx b/Source/cmFunctionCommand.cxx
index 9b981a3..e74a71c 100644
--- a/Source/cmFunctionCommand.cxx
+++ b/Source/cmFunctionCommand.cxx
@@ -109,7 +109,7 @@ bool cmFunctionHelperCommand::InvokeInitialPass
this->Makefile->MarkVariableAsUsed("ARGC");
// set the values for ARGV0 ARGV1 ...
- for (unsigned int t = 0; t < expandedArgs.size(); ++t)
+ for (size_t t = 0; t < expandedArgs.size(); ++t)
{
cmOStringStream tmpStream;
tmpStream << "ARGV" << t;
@@ -119,7 +119,7 @@ bool cmFunctionHelperCommand::InvokeInitialPass
}
// define the formal arguments
- for (unsigned int j = 1; j < this->Args.size(); ++j)
+ for (size_t j = 1; j < this->Args.size(); ++j)
{
this->Makefile->AddDefinition(this->Args[j].c_str(),
expandedArgs[j-1].c_str());
@@ -154,7 +154,7 @@ bool cmFunctionHelperCommand::InvokeInitialPass
// Invoke all the functions that were collected in the block.
// for each function
- for(unsigned int c = 0; c < this->Functions.size(); ++c)
+ for(size_t c = 0; c < this->Functions.size(); ++c)
{
cmExecutionStatus status;
if (!this->Makefile->ExecuteCommand(this->Functions[c],status) ||
@@ -209,9 +209,9 @@ IsFunctionBlocked(const cmListFileFunction& lff, cmMakefile &mf,
// Set the FilePath on the arguments to match the function since it is
// not stored and the original values may be freed
- for (unsigned int i = 0; i < f->Functions.size(); ++i)
+ for (size_t i = 0; i < f->Functions.size(); ++i)
{
- for (unsigned int j = 0; j < f->Functions[i].Arguments.size(); ++j)
+ for (size_t j = 0; j < f->Functions[i].Arguments.size(); ++j)
{
f->Functions[i].Arguments[j].FilePath =
f->Functions[i].FilePath.c_str();
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx
index 43c1794..11fc9db 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -60,7 +60,7 @@ struct cmGeneratorExpressionNode
virtual bool AcceptsArbitraryContentParameter() const
{ return false; }
- virtual int NumExpectedParameters() const { return 1; }
+ virtual size_t NumExpectedParameters() const { return 1; }
virtual std::string Evaluate(const std::vector<std::string> ¶meters,
cmGeneratorExpressionContext *context,
@@ -114,7 +114,7 @@ static const struct ZeroNode installInterfaceNode;
static const struct OP ## Node : public cmGeneratorExpressionNode \
{ \
OP ## Node () {} \
- virtual int NumExpectedParameters() const { return OneOrMoreParameters; } \
+ virtual size_t NumExpectedParameters() const {return OneOrMoreParameters;} \
\
std::string Evaluate(const std::vector<std::string> ¶meters, \
cmGeneratorExpressionContext *context, \
@@ -170,7 +170,7 @@ static const struct BoolNode : public cmGeneratorExpressionNode
{
BoolNode() {}
- virtual int NumExpectedParameters() const { return 1; }
+ virtual size_t NumExpectedParameters() const { return 1; }
std::string Evaluate(const std::vector<std::string> ¶meters,
cmGeneratorExpressionContext *,
@@ -186,7 +186,7 @@ static const struct StrEqualNode : public cmGeneratorExpressionNode
{
StrEqualNode() {}
- virtual int NumExpectedParameters() const { return 2; }
+ virtual size_t NumExpectedParameters() const { return 2; }
std::string Evaluate(const std::vector<std::string> ¶meters,
cmGeneratorExpressionContext *,
@@ -202,7 +202,7 @@ static const struct EqualNode : public cmGeneratorExpressionNode
{
EqualNode() {}
- virtual int NumExpectedParameters() const { return 2; }
+ virtual size_t NumExpectedParameters() const { return 2; }
std::string Evaluate(const std::vector<std::string> ¶meters,
cmGeneratorExpressionContext *context,
@@ -336,7 +336,7 @@ static const struct Angle_RNode : public cmGeneratorExpressionNode
{
Angle_RNode() {}
- virtual int NumExpectedParameters() const { return 0; }
+ virtual size_t NumExpectedParameters() const { return 0; }
std::string Evaluate(const std::vector<std::string> &,
cmGeneratorExpressionContext *,
@@ -352,7 +352,7 @@ static const struct CommaNode : public cmGeneratorExpressionNode
{
CommaNode() {}
- virtual int NumExpectedParameters() const { return 0; }
+ virtual size_t NumExpectedParameters() const { return 0; }
std::string Evaluate(const std::vector<std::string> &,
cmGeneratorExpressionContext *,
@@ -368,7 +368,7 @@ static const struct SemicolonNode : public cmGeneratorExpressionNode
{
SemicolonNode() {}
- virtual int NumExpectedParameters() const { return 0; }
+ virtual size_t NumExpectedParameters() const { return 0; }
std::string Evaluate(const std::vector<std::string> &,
cmGeneratorExpressionContext *,
@@ -384,7 +384,7 @@ struct CompilerIdNode : public cmGeneratorExpressionNode
{
CompilerIdNode() {}
- virtual int NumExpectedParameters() const { return OneOrZeroParameters; }
+ virtual size_t NumExpectedParameters() const { return OneOrZeroParameters; }
std::string EvaluateWithLanguage(const std::vector<std::string> ¶meters,
cmGeneratorExpressionContext *context,
@@ -491,7 +491,7 @@ struct CompilerVersionNode : public cmGeneratorExpressionNode
{
CompilerVersionNode() {}
- virtual int NumExpectedParameters() const { return OneOrZeroParameters; }
+ virtual size_t NumExpectedParameters() const { return OneOrZeroParameters; }
std::string EvaluateWithLanguage(const std::vector<std::string> ¶meters,
cmGeneratorExpressionContext *context,
@@ -576,7 +576,7 @@ struct PlatformIdNode : public cmGeneratorExpressionNode
{
PlatformIdNode() {}
- virtual int NumExpectedParameters() const { return OneOrZeroParameters; }
+ virtual size_t NumExpectedParameters() const { return OneOrZeroParameters; }
std::string Evaluate(const std::vector<std::string> ¶meters,
cmGeneratorExpressionContext *context,
@@ -609,7 +609,7 @@ static const struct VersionGreaterNode : public cmGeneratorExpressionNode
{
VersionGreaterNode() {}
- virtual int NumExpectedParameters() const { return 2; }
+ virtual size_t NumExpectedParameters() const { return 2; }
std::string Evaluate(const std::vector<std::string> ¶meters,
cmGeneratorExpressionContext *,
@@ -627,7 +627,7 @@ static const struct VersionLessNode : public cmGeneratorExpressionNode
{
VersionLessNode() {}
- virtual int NumExpectedParameters() const { return 2; }
+ virtual size_t NumExpectedParameters() const { return 2; }
std::string Evaluate(const std::vector<std::string> ¶meters,
cmGeneratorExpressionContext *,
@@ -645,7 +645,7 @@ static const struct VersionEqualNode : public cmGeneratorExpressionNode
{
VersionEqualNode() {}
- virtual int NumExpectedParameters() const { return 2; }
+ virtual size_t NumExpectedParameters() const { return 2; }
std::string Evaluate(const std::vector<std::string> ¶meters,
cmGeneratorExpressionContext *,
@@ -681,7 +681,7 @@ static const struct ConfigurationNode : public cmGeneratorExpressionNode
{
ConfigurationNode() {}
- virtual int NumExpectedParameters() const { return 0; }
+ virtual size_t NumExpectedParameters() const { return 0; }
std::string Evaluate(const std::vector<std::string> &,
cmGeneratorExpressionContext *context,
@@ -698,7 +698,7 @@ static const struct ConfigurationTestNode : public cmGeneratorExpressionNode
{
ConfigurationTestNode() {}
- virtual int NumExpectedParameters() const { return OneOrZeroParameters; }
+ virtual size_t NumExpectedParameters() const { return OneOrZeroParameters; }
std::string Evaluate(const std::vector<std::string> ¶meters,
cmGeneratorExpressionContext *context,
@@ -765,7 +765,7 @@ static const struct JoinNode : public cmGeneratorExpressionNode
{
JoinNode() {}
- virtual int NumExpectedParameters() const { return 2; }
+ virtual size_t NumExpectedParameters() const { return 2; }
virtual bool AcceptsArbitraryContentParameter() const { return true; }
@@ -868,7 +868,7 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
TargetPropertyNode() {}
// This node handles errors on parameter count itself.
- virtual int NumExpectedParameters() const { return OneOrMoreParameters; }
+ virtual size_t NumExpectedParameters() const { return OneOrMoreParameters; }
std::string Evaluate(const std::vector<std::string> ¶meters,
cmGeneratorExpressionContext *context,
@@ -1235,7 +1235,7 @@ static const struct TargetNameNode : public cmGeneratorExpressionNode
return parameters.front();
}
- virtual int NumExpectedParameters() const { return 1; }
+ virtual size_t NumExpectedParameters() const { return 1; }
} targetNameNode;
@@ -1288,7 +1288,7 @@ static const struct TargetPolicyNode : public cmGeneratorExpressionNode
{
TargetPolicyNode() {}
- virtual int NumExpectedParameters() const { return 1; }
+ virtual size_t NumExpectedParameters() const { return 1; }
std::string Evaluate(const std::vector<std::string> ¶meters,
cmGeneratorExpressionContext *context ,
@@ -1351,7 +1351,7 @@ static const struct InstallPrefixNode : public cmGeneratorExpressionNode
InstallPrefixNode() {}
virtual bool GeneratesContent() const { return true; }
- virtual int NumExpectedParameters() const { return 0; }
+ virtual size_t NumExpectedParameters() const { return 0; }
std::string Evaluate(const std::vector<std::string> &,
cmGeneratorExpressionContext *context,
@@ -1476,7 +1476,7 @@ struct TargetFilesystemArtifact : public cmGeneratorExpressionNode
{
TargetFilesystemArtifact() {}
- virtual int NumExpectedParameters() const { return 1; }
+ virtual size_t NumExpectedParameters() const { return 1; }
std::string Evaluate(const std::vector<std::string> ¶meters,
cmGeneratorExpressionContext *context,
@@ -1743,7 +1743,7 @@ std::string GeneratorExpressionContent::EvaluateParameters(
cmGeneratorExpressionDAGChecker *dagChecker,
std::vector<std::string> ¶meters) const
{
- const int numExpected = node->NumExpectedParameters();
+ const size_t numExpected = node->NumExpectedParameters();
{
std::vector<std::vector<cmGeneratorExpressionEvaluator*> >::const_iterator
pit = this->ParamChildren.begin();
@@ -1785,7 +1785,7 @@ std::string GeneratorExpressionContent::EvaluateParameters(
}
if ((numExpected > cmGeneratorExpressionNode::DynamicParameters
- && (unsigned int)numExpected != parameters.size()))
+ && numExpected != parameters.size()))
{
if (numExpected == 0)
{
diff --git a/Source/cmGetFilenameComponentCommand.cxx b/Source/cmGetFilenameComponentCommand.cxx
index 1d7fefc..20f2a61 100644
--- a/Source/cmGetFilenameComponentCommand.cxx
+++ b/Source/cmGetFilenameComponentCommand.cxx
@@ -68,7 +68,7 @@ bool cmGetFilenameComponentCommand
}
else if (args[2] == "PROGRAM")
{
- for(unsigned int i=2; i < args.size(); ++i)
+ for(size_t i=2; i < args.size(); ++i)
{
if(args[i] == "PROGRAM_ARGS")
{
diff --git a/Source/cmGetPropertyCommand.cxx b/Source/cmGetPropertyCommand.cxx
index 30bec16..d41e2c2 100644
--- a/Source/cmGetPropertyCommand.cxx
+++ b/Source/cmGetPropertyCommand.cxx
@@ -80,7 +80,7 @@ bool cmGetPropertyCommand
// Parse remaining arguments.
enum Doing { DoingNone, DoingName, DoingProperty, DoingType };
Doing doing = DoingName;
- for(unsigned int i=2; i < args.size(); ++i)
+ for(size_t i=2; i < args.size(); ++i)
{
if(args[i] == "PROPERTY")
{
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index faed66a..01c8ea3 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1168,7 +1168,7 @@ void cmGlobalGenerator::Generate()
#endif
// For each existing cmLocalGenerator
- unsigned int i;
+ size_t i;
// Put a copy of each global target in every directory.
cmTargets globalTargets;
@@ -1313,7 +1313,7 @@ bool cmGlobalGenerator::ComputeTargetDepends()
void cmGlobalGenerator::CreateQtAutoGeneratorsTargets(AutogensType &autogens)
{
#ifdef CMAKE_BUILD_WITH_CMAKE
- for(unsigned int i=0; i < this->LocalGenerators.size(); ++i)
+ for(size_t i=0; i < this->LocalGenerators.size(); ++i)
{
cmTargets& targets =
this->LocalGenerators[i]->GetMakefile()->GetTargets();
@@ -1350,7 +1350,7 @@ void cmGlobalGenerator::CreateQtAutoGeneratorsTargets(AutogensType &autogens)
void cmGlobalGenerator::FinalizeTargetCompileInfo()
{
// Construct per-target generator information.
- for(unsigned int i=0; i < this->LocalGenerators.size(); ++i)
+ for(size_t i=0; i < this->LocalGenerators.size(); ++i)
{
cmMakefile *mf = this->LocalGenerators[i]->GetMakefile();
@@ -1426,7 +1426,7 @@ void cmGlobalGenerator::CreateGeneratorTargets(cmMakefile *mf)
void cmGlobalGenerator::CreateGeneratorTargets()
{
// Construct per-target generator information.
- for(unsigned int i=0; i < this->LocalGenerators.size(); ++i)
+ for(size_t i=0; i < this->LocalGenerators.size(); ++i)
{
this->CreateGeneratorTargets(this->LocalGenerators[i]->GetMakefile());
}
@@ -1436,7 +1436,7 @@ void cmGlobalGenerator::CreateGeneratorTargets()
void cmGlobalGenerator::ComputeGeneratorTargetObjects()
{
// Construct per-target generator information.
- for(unsigned int i=0; i < this->LocalGenerators.size(); ++i)
+ for(size_t i=0; i < this->LocalGenerators.size(); ++i)
{
cmMakefile *mf = this->LocalGenerators[i]->GetMakefile();
cmGeneratorTargetsType targets = mf->GetGeneratorTargets();
@@ -1482,7 +1482,7 @@ void cmGlobalGenerator::ClearGeneratorMembers()
}
this->BuildExportSets.clear();
- for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i)
+ for (size_t i = 0; i < this->LocalGenerators.size(); ++i)
{
delete this->LocalGenerators[i];
}
@@ -1526,7 +1526,7 @@ void cmGlobalGenerator::CheckLocalGenerators()
// std::set<std::string> notFoundMap;
// after it is all done do a ConfigureFinalPass
cmCacheManager* manager = 0;
- for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i)
+ for (size_t i = 0; i < this->LocalGenerators.size(); ++i)
{
manager = this->LocalGenerators[i]->GetMakefile()->GetCacheManager();
this->LocalGenerators[i]->ConfigureFinalPass();
@@ -1987,7 +1987,7 @@ int cmGlobalGenerator::GetLinkerPreference(const std::string& lang) const
void cmGlobalGenerator::FillProjectMap()
{
this->ProjectMap.clear(); // make sure we start with a clean map
- unsigned int i;
+ size_t i;
for(i = 0; i < this->LocalGenerators.size(); ++i)
{
// for each local generator add all projects
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 84ab349..03c9852 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -613,7 +613,7 @@ void cmGlobalNinjaGenerator::AddRule(const std::string& name,
restat,
generator);
- this->RuleCmdLength[name] = (int) command.size();
+ this->RuleCmdLength[name] = command.size();
}
bool cmGlobalNinjaGenerator::HasRule(const std::string &name)
diff --git a/Source/cmGlobalNinjaGenerator.h b/Source/cmGlobalNinjaGenerator.h
index 7725cf3..5bae0b0 100644
--- a/Source/cmGlobalNinjaGenerator.h
+++ b/Source/cmGlobalNinjaGenerator.h
@@ -294,7 +294,7 @@ public:
bool IsExcluded(cmLocalGenerator* root, cmTarget& target) {
return cmGlobalGenerator::IsExcluded(root, target); }
- int GetRuleCmdLength(const std::string& name) {
+ size_t GetRuleCmdLength(const std::string& name) {
return RuleCmdLength[name]; }
void AddTargetAlias(const std::string& alias, cmTarget* target);
@@ -354,7 +354,7 @@ private:
RulesSetType Rules;
/// Length of rule command, used by rsp file evaluation
- std::map<std::string, int> RuleCmdLength;
+ std::map<std::string, size_t> RuleCmdLength;
/// The set of dependencies to add to the "all" target.
cmNinjaDeps AllDependencies;
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 2cdc976..1d11e73 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -171,7 +171,7 @@ void cmGlobalUnixMakefileGenerator3::Generate()
{
pmi->second.WriteProgressVariables(total, current);
}
- for(unsigned int i = 0; i < this->LocalGenerators.size(); ++i)
+ for(size_t i = 0; i < this->LocalGenerators.size(); ++i)
{
cmLocalUnixMakefileGenerator3 *lg =
static_cast<cmLocalUnixMakefileGenerator3 *>(this->LocalGenerators[i]);
@@ -280,7 +280,7 @@ void cmGlobalUnixMakefileGenerator3::WriteMainMakefile2()
lg->WriteSpecialTargetsTop(makefileStream);
// write the target convenience rules
- unsigned int i;
+ size_t i;
for (i = 0; i < this->LocalGenerators.size(); ++i)
{
lg =
@@ -327,7 +327,7 @@ void cmGlobalUnixMakefileGenerator3::WriteMainCMakefile()
// for each cmMakefile get its list of dependencies
std::vector<std::string> lfiles;
- for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i)
+ for (size_t i = 0; i < this->LocalGenerators.size(); ++i)
{
lg =
static_cast<cmLocalUnixMakefileGenerator3 *>(this->LocalGenerators[i]);
@@ -403,7 +403,7 @@ void cmGlobalUnixMakefileGenerator3::WriteMainCMakefile()
// add in all the directory information files
std::string tmpStr;
- for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i)
+ for (size_t i = 0; i < this->LocalGenerators.size(); ++i)
{
lg =
static_cast<cmLocalUnixMakefileGenerator3 *>(this->LocalGenerators[i]);
@@ -433,7 +433,7 @@ void cmGlobalUnixMakefileGenerator3
<< "# Dependency information for all targets:\n";
cmakefileStream
<< "set(CMAKE_DEPEND_INFO_FILES\n";
- for (unsigned int i = 0; i < lGenerators.size(); ++i)
+ for (size_t i = 0; i < lGenerators.size(); ++i)
{
lg = static_cast<cmLocalUnixMakefileGenerator3 *>(lGenerators[i]);
// for all of out targets
@@ -634,7 +634,7 @@ cmGlobalUnixMakefileGenerator3
depends.push_back("cmake_check_build_system");
// write the target convenience rules
- unsigned int i;
+ size_t i;
cmLocalUnixMakefileGenerator3 *lg;
for (i = 0; i < this->LocalGenerators.size(); ++i)
{
@@ -1060,7 +1060,7 @@ void cmGlobalUnixMakefileGenerator3::WriteHelpRule
std::set<std::string> emittedTargets;
// for each local generator
- unsigned int i;
+ size_t i;
cmLocalUnixMakefileGenerator3 *lg2;
for (i = 0; i < this->LocalGenerators.size(); ++i)
{
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 320b440..26f901e 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -297,7 +297,7 @@ void cmGlobalVisualStudio7Generator::GenerateConfigurations(cmMakefile* mf)
// Reset the entry to have a semi-colon separated list.
std::string configs = this->Configurations[0];
- for(unsigned int i=1; i < this->Configurations.size(); ++i)
+ for(size_t i=1; i < this->Configurations.size(); ++i)
{
configs += ";";
configs += this->Configurations[i];
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index ab4380c..be9c3e7 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -276,7 +276,7 @@ bool cmGlobalVisualStudio8Generator::AddCheckTarget()
// Collect the input files used to generate all targets in this
// project.
std::vector<std::string> listFiles;
- for(unsigned int j = 0; j < generators.size(); ++j)
+ for(size_t j = 0; j < generators.size(); ++j)
{
cmMakefile* lmf = generators[j]->GetMakefile();
listFiles.insert(listFiles.end(), lmf->GetListFiles().begin(),
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 30a2a1e..d17068c 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -549,7 +549,7 @@ void cmGlobalXCodeGenerator::CreateReRunCMakeFile(
void cmGlobalXCodeGenerator::ClearXCodeObjects()
{
this->TargetDoneSet.clear();
- for(unsigned int i = 0; i < this->XCodeObjects.size(); ++i)
+ for(size_t i = 0; i < this->XCodeObjects.size(); ++i)
{
delete this->XCodeObjects[i];
}
@@ -2488,7 +2488,7 @@ std::string cmGlobalXCodeGenerator::AddConfigurations(cmXCodeObject* target,
configlist->SetComment(comment.c_str());
target->AddAttribute("buildConfigurationList",
this->CreateObjectReference(configlist));
- for(unsigned int i = 0; i < configVector.size(); ++i)
+ for(size_t i = 0; i < configVector.size(); ++i)
{
cmXCodeObject* config =
this->CreateObject(cmXCodeObject::XCBuildConfiguration);
@@ -3136,7 +3136,7 @@ void cmGlobalXCodeGenerator
}
else
{
- for(unsigned int i = 0; i < this->CurrentConfigurationTypes.size(); ++i)
+ for(size_t i = 0; i < this->CurrentConfigurationTypes.size(); ++i)
{
cmXCodeObject* buildStyle =
this->CreateObject(cmXCodeObject::PBXBuildStyle);
@@ -3259,7 +3259,7 @@ void cmGlobalXCodeGenerator
}
else
{
- for(unsigned int i = 0; i < this->CurrentConfigurationTypes.size(); ++i)
+ for(size_t i = 0; i < this->CurrentConfigurationTypes.size(); ++i)
{
const char* name = this->CurrentConfigurationTypes[i].c_str();
if (0 == i)
diff --git a/Source/cmIfCommand.cxx b/Source/cmIfCommand.cxx
index bd12327..6c16b92 100644
--- a/Source/cmIfCommand.cxx
+++ b/Source/cmIfCommand.cxx
@@ -57,7 +57,7 @@ IsFunctionBlocked(const cmListFileFunction& lff,
// execute the functions for the true parts of the if statement
cmExecutionStatus status;
int scopeDepth = 0;
- for(unsigned int c = 0; c < this->Functions.size(); ++c)
+ for(size_t c = 0; c < this->Functions.size(); ++c)
{
// keep track of scope depth
if (!cmSystemTools::Strucmp(this->Functions[c].Name.c_str(),"if"))
@@ -851,7 +851,7 @@ bool cmIfCommand::IsTrue(const std::vector<std::string> &args,
std::list<std::string> newArgs;
// copy to the list structure
- for(unsigned int i = 0; i < args.size(); ++i)
+ for(size_t i = 0; i < args.size(); ++i)
{
newArgs.push_back(args[i]);
}
diff --git a/Source/cmIncludeCommand.cxx b/Source/cmIncludeCommand.cxx
index e8ee33f..eb0934d 100644
--- a/Source/cmIncludeCommand.cxx
+++ b/Source/cmIncludeCommand.cxx
@@ -27,7 +27,7 @@ bool cmIncludeCommand
std::string fname = args[0];
std::string resultVarName;
- for (unsigned int i=1; i<args.size(); i++)
+ for (size_t i=1; i<args.size(); i++)
{
if (args[i] == "OPTIONAL")
{
diff --git a/Source/cmIncludeExternalMSProjectCommand.cxx b/Source/cmIncludeExternalMSProjectCommand.cxx
index d40d8fe..8c7d8fe 100644
--- a/Source/cmIncludeExternalMSProjectCommand.cxx
+++ b/Source/cmIncludeExternalMSProjectCommand.cxx
@@ -34,7 +34,7 @@ bool cmIncludeExternalMSProjectCommand
std::string platformMapping;
std::vector<std::string> depends;
- for (unsigned int i=2; i<args.size(); ++i)
+ for (size_t i=2; i<args.size(); ++i)
{
if (args[i] == "TYPE")
{
diff --git a/Source/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx
index 94d2091..546f393 100644
--- a/Source/cmInstallCommand.cxx
+++ b/Source/cmInstallCommand.cxx
@@ -918,7 +918,7 @@ cmInstallCommand::HandleDirectoryMode(std::vector<std::string> const& args)
std::vector<std::string> configurations;
std::string component = this->DefaultComponentName;
std::string literal_args;
- for(unsigned int i=1; i < args.size(); ++i)
+ for(size_t i=1; i < args.size(); ++i)
{
if(args[i] == "DESTINATION")
{
diff --git a/Source/cmLoadCacheCommand.cxx b/Source/cmLoadCacheCommand.cxx
index 806d821..9de1b53 100644
--- a/Source/cmLoadCacheCommand.cxx
+++ b/Source/cmLoadCacheCommand.cxx
@@ -110,7 +110,7 @@ bool cmLoadCacheCommand::ReadWithPrefix(std::vector<std::string> const& args)
// Prepare the table of variables to read.
this->Prefix = args[2];
- for(unsigned int i=3; i < args.size(); ++i)
+ for(size_t i=3; i < args.size(); ++i)
{
this->VariablesToRead.insert(args[i]);
}
diff --git a/Source/cmLoadCommandCommand.cxx b/Source/cmLoadCommandCommand.cxx
index 36e9980..b82cc77 100644
--- a/Source/cmLoadCommandCommand.cxx
+++ b/Source/cmLoadCommandCommand.cxx
@@ -212,7 +212,7 @@ bool cmLoadCommandCommand
// search for the file
std::vector<std::string> path;
- for (unsigned int j = 1; j < args.size(); j++)
+ for (size_t j = 1; j < args.size(); j++)
{
// expand variables
std::string exp = args[j];
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 761db48..cebd1c0 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2767,7 +2767,7 @@ cmLocalGenerator::ConvertToRelativePath(const std::vector<std::string>& local,
// path and the local path.
std::vector<std::string> remote;
cmSystemTools::SplitPath(in_remote.c_str(), remote);
- unsigned int common=0;
+ size_t common=0;
while(common < remote.size() &&
common < local.size() &&
cmSystemTools::ComparePath(remote[common].c_str(),
@@ -2805,7 +2805,7 @@ cmLocalGenerator::ConvertToRelativePath(const std::vector<std::string>& local,
// of the path. Leave off the trailing slash. Note that the last
// component of local will never be empty because local should never
// have a trailing slash.
- for(unsigned int i=common; i < local.size(); ++i)
+ for(size_t i=common; i < local.size(); ++i)
{
relative += "..";
if(i < local.size()-1)
@@ -2820,7 +2820,7 @@ cmLocalGenerator::ConvertToRelativePath(const std::vector<std::string>& local,
// trailing slash in the input then the last iteration of the loop
// will add a slash followed by an empty string which will preserve
// the trailing slash in the output.
- for(unsigned int i=common; i < remote.size(); ++i)
+ for(size_t i=common; i < remote.size(); ++i)
{
if(relative.size() > 0)
{
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 935da57..b52cc8f 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -2166,7 +2166,7 @@ cmLocalUnixMakefileGenerator3::ConvertToQuotedOutputPath(const char* p)
// Now add the rest of the components separated by the proper slash
// direction for this platform.
bool first = true;
- for(unsigned int i=1; i < components.size(); ++i)
+ for(size_t i=1; i < components.size(); ++i)
{
// Only the last component can be empty to avoid double slashes.
if(components[i].length() > 0 || (i == (components.size()-1)))
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index f1fd994..cd26132 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -547,7 +547,7 @@ void cmLocalVisualStudio6Generator
std::vector<cmSourceGroup> const& children = sg->GetGroupChildren();
- for(unsigned int i=0;i<children.size();++i)
+ for(size_t i=0;i<children.size();++i)
{
this->WriteGroup(&children[i], target, fout, libName);
}
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 4491140..744a03c 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -1419,7 +1419,7 @@ void cmLocalVisualStudio7Generator::WriteVCProjFile(std::ostream& fout,
// Loop through every source group.
- for(unsigned int i = 0; i < sourceGroups.size(); ++i)
+ for(size_t i = 0; i < sourceGroups.size(); ++i)
{
cmSourceGroup sg = sourceGroups[i];
this->WriteGroup(&sg, target, fout, libName, configs);
@@ -1638,7 +1638,7 @@ bool cmLocalVisualStudio7Generator
// Write the children to temporary output.
bool hasChildrenWithSources = false;
cmOStringStream tmpOut;
- for(unsigned int i=0;i<children.size();++i)
+ for(size_t i=0;i<children.size();++i)
{
if(this->WriteGroup(&children[i], target, tmpOut, libName, configs))
{
diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index 9d253b8..536d307 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -123,7 +123,7 @@ bool cmMacroHelperCommand::InvokeInitialPass
// Invoke all the functions that were collected in the block.
cmListFileFunction newLFF;
// for each function
- for(unsigned int c = 0; c < this->Functions.size(); ++c)
+ for(size_t c = 0; c < this->Functions.size(); ++c)
{
// Replace the formal arguments and then invoke the command.
newLFF.Arguments.clear();
@@ -148,7 +148,7 @@ bool cmMacroHelperCommand::InvokeInitialPass
{
tmps = k->Value;
// replace formal arguments
- for (unsigned int j = 1; j < this->Args.size(); ++j)
+ for (size_t j = 1; j < this->Args.size(); ++j)
{
variable = "${";
variable += this->Args[j];
@@ -206,7 +206,7 @@ bool cmMacroHelperCommand::InvokeInitialPass
cmSystemTools::ReplaceString(tmps, "${ARGV}", argvDef.c_str());
// also replace the ARGV1 ARGV2 ... etc
- for (unsigned int t = 0; t < expandedArgs.size(); ++t)
+ for (size_t t = 0; t < expandedArgs.size(); ++t)
{
sprintf(argvName,"${ARGV%i}",t);
cmSystemTools::ReplaceString(tmps, argvName,
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 92177c8..855db7c 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -214,7 +214,7 @@ cmMakefile::~cmMakefile()
{
delete *i;
}
- for(unsigned int i=0; i < this->FinalPassCommands.size(); i++)
+ for(size_t i=0; i < this->FinalPassCommands.size(); i++)
{
delete this->FinalPassCommands[i];
}
@@ -2134,7 +2134,7 @@ cmMakefile::GetSourceGroup(const std::vector<std::string>&name) const
if(sg != 0)
{
// iterate through its children to find match source group
- for(unsigned int i=1; i<name.size(); ++i)
+ for(size_t i=1; i<name.size(); ++i)
{
sg = sg->LookupChild(name[i].c_str());
if(sg == 0)
@@ -2995,7 +2995,7 @@ void cmMakefile::SetArgcArgv(const std::vector<std::string>& args)
this->AddDefinition("CMAKE_ARGC", strStream.str().c_str());
//this->MarkVariableAsUsed("CMAKE_ARGC");
- for (unsigned int t = 0; t < args.size(); ++t)
+ for (size_t t = 0; t < args.size(); ++t)
{
cmOStringStream tmpStream;
tmpStream << "CMAKE_ARGV" << t;
@@ -3056,7 +3056,7 @@ void cmMakefile::ExpandSourceListArguments(
std::vector<std::string>& newargs, unsigned int /* start */) const
{
// now expand the args
- unsigned int i;
+ size_t i;
for(i = 0; i < arguments.size(); ++i)
{
// List expansion will have been done already.
@@ -3704,7 +3704,7 @@ const char *cmMakefile::GetProperty(const std::string& prop,
cacheonly = 1;
}
std::vector<std::string> vars = this->GetDefinitions(cacheonly);
- for (unsigned int cc = 0; cc < vars.size(); cc ++ )
+ for (size_t cc = 0; cc < vars.size(); cc ++ )
{
if ( cc > 0 )
{
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 28a8f04..4194d4c 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -1904,7 +1904,7 @@ cmMakefileTargetGenerator
// Write a response file for each string.
const char* sep = "";
- for(unsigned int i = 0; i < object_strings.size(); ++i)
+ for(size_t i = 0; i < object_strings.size(); ++i)
{
// Number the response files.
char rsp[32];
diff --git a/Source/cmMarkAsAdvancedCommand.cxx b/Source/cmMarkAsAdvancedCommand.cxx
index 4236d10..98ae194 100644
--- a/Source/cmMarkAsAdvancedCommand.cxx
+++ b/Source/cmMarkAsAdvancedCommand.cxx
@@ -21,7 +21,7 @@ bool cmMarkAsAdvancedCommand
return false;
}
- unsigned int i =0;
+ size_t i =0;
const char* value = "1";
bool overwrite = false;
if(args[0] == "CLEAR" || args[0] == "FORCE")
diff --git a/Source/cmOrderDirectories.cxx b/Source/cmOrderDirectories.cxx
index 79677e3..8f5ba48 100644
--- a/Source/cmOrderDirectories.cxx
+++ b/Source/cmOrderDirectories.cxx
@@ -68,7 +68,7 @@ public:
void FindConflicts(unsigned int index)
{
- for(unsigned int i=0; i < this->OD->OriginalDirectories.size(); ++i)
+ for(size_t i=0; i < this->OD->OriginalDirectories.size(); ++i)
{
// Check if this directory conflicts with the entry.
std::string const& dir = this->OD->OriginalDirectories[i];
@@ -86,7 +86,7 @@ public:
void FindImplicitConflicts(cmOStringStream& w)
{
bool first = true;
- for(unsigned int i=0; i < this->OD->OriginalDirectories.size(); ++i)
+ for(size_t i=0; i < this->OD->OriginalDirectories.size(); ++i)
{
// Check if this directory conflicts with the entry.
std::string const& dir = this->OD->OriginalDirectories[i];
@@ -431,7 +431,7 @@ void cmOrderDirectories::CollectOriginalDirectories()
this->AddOriginalDirectories(this->UserDirectories);
// Add directories containing constraints.
- for(unsigned int i=0; i < this->ConstraintEntries.size(); ++i)
+ for(size_t i=0; i < this->ConstraintEntries.size(); ++i)
{
this->ConstraintEntries[i]->AddDirectory();
}
@@ -506,7 +506,7 @@ void cmOrderDirectories::FindConflicts()
this->DirectoryVisited.resize(this->OriginalDirectories.size(), 0);
// Find directories conflicting with each entry.
- for(unsigned int i=0; i < this->ConstraintEntries.size(); ++i)
+ for(size_t i=0; i < this->ConstraintEntries.size(); ++i)
{
this->ConstraintEntries[i]->FindConflicts(i);
}
@@ -536,7 +536,7 @@ void cmOrderDirectories::FindImplicitConflicts()
// Check for items in implicit link directories that have conflicts
// in the explicit directories.
cmOStringStream conflicts;
- for(unsigned int i=0; i < this->ImplicitDirEntries.size(); ++i)
+ for(size_t i=0; i < this->ImplicitDirEntries.size(); ++i)
{
this->ImplicitDirEntries[i]->FindImplicitConflicts(conflicts);
}
@@ -568,7 +568,7 @@ void cmOrderDirectories::OrderDirectories()
this->WalkId = 0;
// Iterate through the directories in the original order.
- for(unsigned int i=0; i < this->OriginalDirectories.size(); ++i)
+ for(size_t i=0; i < this->OriginalDirectories.size(); ++i)
{
// Start a new DFS from this node.
++this->WalkId;
@@ -624,7 +624,7 @@ void cmOrderDirectories::DiagnoseCycle()
<< " because there is a cycle in the constraint graph:\n";
// Display the conflict graph.
- for(unsigned int i=0; i < this->ConflictGraph.size(); ++i)
+ for(size_t i=0; i < this->ConflictGraph.size(); ++i)
{
ConflictList const& clist = this->ConflictGraph[i];
e << " dir " << i << " is [" << this->OriginalDirectories[i] << "]\n";
diff --git a/Source/cmRemoveCommand.cxx b/Source/cmRemoveCommand.cxx
index bcb8564..c459c48 100644
--- a/Source/cmRemoveCommand.cxx
+++ b/Source/cmRemoveCommand.cxx
@@ -39,7 +39,7 @@ bool cmRemoveCommand
// check for REMOVE(VAR v1 v2 ... vn)
std::vector<std::string> argsExpanded;
std::vector<std::string> temp;
- for(unsigned int j = 1; j < args.size(); ++j)
+ for(size_t j = 1; j < args.size(); ++j)
{
temp.push_back(args[j]);
}
@@ -47,10 +47,10 @@ bool cmRemoveCommand
// now create the new value
std::string value;
- for(unsigned int j = 0; j < varArgsExpanded.size(); ++j)
+ for(size_t j = 0; j < varArgsExpanded.size(); ++j)
{
int found = 0;
- for(unsigned int k = 0; k < argsExpanded.size(); ++k)
+ for(size_t k = 0; k < argsExpanded.size(); ++k)
{
if (varArgsExpanded[j] == argsExpanded[k])
{
diff --git a/Source/cmSeparateArgumentsCommand.cxx b/Source/cmSeparateArgumentsCommand.cxx
index 6f62091..83669f3 100644
--- a/Source/cmSeparateArgumentsCommand.cxx
+++ b/Source/cmSeparateArgumentsCommand.cxx
@@ -27,7 +27,7 @@ bool cmSeparateArgumentsCommand
Mode mode = ModeOld;
enum Doing { DoingNone, DoingVariable, DoingMode, DoingCommand };
Doing doing = DoingVariable;
- for(unsigned int i=0; i < args.size(); ++i)
+ for(size_t i=0; i < args.size(); ++i)
{
if(doing == DoingVariable)
{
diff --git a/Source/cmSetSourceFilesPropertiesCommand.cxx b/Source/cmSetSourceFilesPropertiesCommand.cxx
index 619dfc5..98ec7eb 100644
--- a/Source/cmSetSourceFilesPropertiesCommand.cxx
+++ b/Source/cmSetSourceFilesPropertiesCommand.cxx
@@ -158,7 +158,7 @@ bool cmSetSourceFilesPropertiesCommand
if(sf)
{
// now loop through all the props and set them
- unsigned int k;
+ size_t k;
for (k = 0; k < propertyPairs.size(); k = k + 2)
{
sf->SetProperty(propertyPairs[k].c_str(),propertyPairs[k+1].c_str());
diff --git a/Source/cmSetTargetPropertiesCommand.cxx b/Source/cmSetTargetPropertiesCommand.cxx
index fa5aafe..6d48a36 100644
--- a/Source/cmSetTargetPropertiesCommand.cxx
+++ b/Source/cmSetTargetPropertiesCommand.cxx
@@ -98,7 +98,7 @@ bool cmSetTargetPropertiesCommand
if(cmTarget* target = mf->FindTargetToUse(tname))
{
// now loop through all the props and set them
- unsigned int k;
+ size_t k;
for (k = 0; k < propertyPairs.size(); k = k + 2)
{
target->SetProperty(propertyPairs[k].c_str(),
diff --git a/Source/cmSetTestsPropertiesCommand.cxx b/Source/cmSetTestsPropertiesCommand.cxx
index c725d35..27ce6dc 100644
--- a/Source/cmSetTestsPropertiesCommand.cxx
+++ b/Source/cmSetTestsPropertiesCommand.cxx
@@ -98,7 +98,7 @@ bool cmSetTestsPropertiesCommand
if(cmTest* test = mf->GetTest(tname))
{
// now loop through all the props and set them
- unsigned int k;
+ size_t k;
for (k = 0; k < propertyPairs.size(); k = k + 2)
{
test->SetProperty(propertyPairs[k].c_str(),
diff --git a/Source/cmSourceGroupCommand.cxx b/Source/cmSourceGroupCommand.cxx
index 9cb80f6..88c1498 100644
--- a/Source/cmSourceGroupCommand.cxx
+++ b/Source/cmSourceGroupCommand.cxx
@@ -53,7 +53,7 @@ bool cmSourceGroupCommand
// Process arguments.
bool doingFiles = false;
- for(unsigned int i=1; i < args.size(); ++i)
+ for(size_t i=1; i < args.size(); ++i)
{
if(args[i] == "REGULAR_EXPRESSION")
{
diff --git a/Source/cmStringCommand.cxx b/Source/cmStringCommand.cxx
index f9b69e3..3734e15 100644
--- a/Source/cmStringCommand.cxx
+++ b/Source/cmStringCommand.cxx
@@ -212,7 +212,7 @@ bool cmStringCommand::HandleConfigureCommand(
// Parse options.
bool escapeQuotes = false;
bool atOnly = false;
- for(unsigned int i = 3; i < args.size(); ++i)
+ for(size_t i = 3; i < args.size(); ++i)
{
if(args[i] == "@ONLY")
{
@@ -296,7 +296,7 @@ bool cmStringCommand::RegexMatch(std::vector<std::string> const& args)
// Concatenate all the last arguments together.
std::string input = args[4];
- for(unsigned int i=5; i < args.size(); ++i)
+ for(size_t i=5; i < args.size(); ++i)
{
input += args[i];
}
@@ -345,7 +345,7 @@ bool cmStringCommand::RegexMatchAll(std::vector<std::string> const& args)
// Concatenate all the last arguments together.
std::string input = args[4];
- for(unsigned int i=5; i < args.size(); ++i)
+ for(size_t i=5; i < args.size(); ++i)
{
input += args[i];
}
@@ -449,7 +449,7 @@ bool cmStringCommand::RegexReplace(std::vector<std::string> const& args)
// Concatenate all the last arguments together.
std::string input = args[5];
- for(unsigned int i=6; i < args.size(); ++i)
+ for(size_t i=6; i < args.size(); ++i)
{
input += args[i];
}
@@ -488,7 +488,7 @@ bool cmStringCommand::RegexReplace(std::vector<std::string> const& args)
}
// Concatenate the replacement for the match.
- for(unsigned int i=0; i < replacement.size(); ++i)
+ for(size_t i=0; i < replacement.size(); ++i)
{
if(replacement[i].number < 0)
{
@@ -697,7 +697,7 @@ bool cmStringCommand::HandleReplaceCommand(std::vector<std::string> const&
const std::string& variableName = args[3];
std::string input = args[4];
- for(unsigned int i=5; i < args.size(); ++i)
+ for(size_t i=5; i < args.size(); ++i)
{
input += args[i];
}
@@ -782,7 +782,7 @@ bool cmStringCommand
std::string const& variableName = args[1];
std::string value;
- for(unsigned int i = 2; i < args.size(); ++i)
+ for(size_t i = 2; i < args.size(); ++i)
{
value += args[i];
}
diff --git a/Source/cmTargetLinkLibrariesCommand.cxx b/Source/cmTargetLinkLibrariesCommand.cxx
index 8dc407b..ad89057 100644
--- a/Source/cmTargetLinkLibrariesCommand.cxx
+++ b/Source/cmTargetLinkLibrariesCommand.cxx
@@ -148,7 +148,7 @@ bool cmTargetLinkLibrariesCommand
// add libraries, note that there is an optional prefix
// of debug and optimized that can be used
- for(unsigned int i=1; i < args.size(); ++i)
+ for(size_t i=1; i < args.size(); ++i)
{
if(args[i] == "LINK_INTERFACE_LIBRARIES")
{
diff --git a/Source/cmTargetPropCommandBase.cxx b/Source/cmTargetPropCommandBase.cxx
index 1a1cfa0..0e83968 100644
--- a/Source/cmTargetPropCommandBase.cxx
+++ b/Source/cmTargetPropCommandBase.cxx
@@ -56,7 +56,7 @@ bool cmTargetPropCommandBase
}
bool system = false;
- unsigned int argIndex = 1;
+ size_t argIndex = 1;
if ((flags & PROCESS_SYSTEM) && args[argIndex] == "SYSTEM")
{
@@ -126,7 +126,7 @@ bool cmTargetPropCommandBase
std::vector<std::string> content;
- for(unsigned int i=argIndex; i < args.size(); ++i, ++argIndex)
+ for(size_t i=argIndex; i < args.size(); ++i, ++argIndex)
{
if(args[i] == "PUBLIC"
|| args[i] == "PRIVATE"
diff --git a/Source/cmTryRunCommand.cxx b/Source/cmTryRunCommand.cxx
index cfedaa5..6fd1acf 100644
--- a/Source/cmTryRunCommand.cxx
+++ b/Source/cmTryRunCommand.cxx
@@ -41,7 +41,7 @@ bool cmTryRunCommand
this->CompileOutputVariable = "";
std::string runArgs;
- unsigned int i;
+ size_t i;
for (i = 1; i < argv.size(); ++i)
{
if (argv[i] == "ARGS")
diff --git a/Source/cmVariableRequiresCommand.cxx b/Source/cmVariableRequiresCommand.cxx
index ddb4003..ae97d16 100644
--- a/Source/cmVariableRequiresCommand.cxx
+++ b/Source/cmVariableRequiresCommand.cxx
@@ -34,7 +34,7 @@ bool cmVariableRequiresCommand
bool requirementsMet = true;
std::string notSet;
bool hasAdvanced = false;
- for(unsigned int i = 2; i < args.size(); ++i)
+ for(size_t i = 2; i < args.size(); ++i)
{
if(!this->Makefile->IsOn(args[i].c_str()))
{
diff --git a/Source/cmWhileCommand.cxx b/Source/cmWhileCommand.cxx
index 7d2eead..2e5bd3c 100644
--- a/Source/cmWhileCommand.cxx
+++ b/Source/cmWhileCommand.cxx
@@ -46,7 +46,7 @@ IsFunctionBlocked(const cmListFileFunction& lff, cmMakefile &mf,
if (errorString.size())
{
std::string err = "had incorrect arguments: ";
- unsigned int i;
+ size_t i;
for(i =0; i < this->Args.size(); ++i)
{
err += (this->Args[i].Delim?"\"":"");
@@ -66,7 +66,7 @@ IsFunctionBlocked(const cmListFileFunction& lff, cmMakefile &mf,
}
// Invoke all the functions that were collected in the block.
- for(unsigned int c = 0; c < this->Functions.size(); ++c)
+ for(size_t c = 0; c < this->Functions.size(); ++c)
{
cmExecutionStatus status;
mf.ExecuteCommand(this->Functions[c],status);
diff --git a/Source/cmXCodeObject.cxx b/Source/cmXCodeObject.cxx
index 3302a8d..fa1d53c 100644
--- a/Source/cmXCodeObject.cxx
+++ b/Source/cmXCodeObject.cxx
@@ -126,7 +126,7 @@ void cmXCodeObject::Print(std::ostream& out)
if(object->TypeValue == OBJECT_LIST)
{
out << i->first << " = (" << separator;
- for(unsigned int k = 0; k < i->second->List.size(); k++)
+ for(size_t k = 0; k < i->second->List.size(); k++)
{
cmXCodeObject::Indent(4*indentFactor, out);
out << i->second->List[k]->Id << " ";
@@ -156,7 +156,7 @@ void cmXCodeObject::Print(std::ostream& out)
{
cmXCodeObject::PrintString(out,j->first);
out << " = (";
- for(unsigned int k = 0; k < j->second->List.size(); k++)
+ for(size_t k = 0; k < j->second->List.size(); k++)
{
if(j->second->List[k]->TypeValue == STRING)
{
@@ -215,7 +215,7 @@ void cmXCodeObject::PrintList(std::vector<cmXCodeObject*> const& objs,
{
cmXCodeObject::Indent(1, out);
out << "objects = {\n";
- for(unsigned int i = 0; i < objs.size(); ++i)
+ for(size_t i = 0; i < objs.size(); ++i)
{
if(objs[i]->TypeValue == OBJECT)
{
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index d37bd94..b5527b0 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -314,7 +314,7 @@ void cmake::RemoveUnscriptableCommands()
bool cmake::SetCacheArgs(const std::vector<std::string>& args)
{
bool findPackageMode = false;
- for(unsigned int i=1; i < args.size(); ++i)
+ for(size_t i=1; i < args.size(); ++i)
{
std::string arg = args[i];
if(arg.find("-D",0) == 0)
@@ -627,7 +627,7 @@ void cmake::SetArgs(const std::vector<std::string>& args,
{
bool directoriesSet = directoriesSetBefore;
bool haveToolset = false;
- for(unsigned int i=1; i < args.size(); ++i)
+ for(size_t i=1; i < args.size(); ++i)
{
std::string arg = args[i];
if(arg.find("-H",0) == 0)
@@ -2292,7 +2292,7 @@ int cmake::GetSystemInformation(std::vector<std::string>& args)
// process the arguments
bool writeToStdout = true;
- for(unsigned int i=1; i < args.size(); ++i)
+ for(size_t i=1; i < args.size(); ++i)
{
std::string arg = args[i];
if(arg.find("-V",0) == 0)
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index 047f09d..4620321 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -166,7 +166,7 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
// Echo string
else if (args[1] == "echo" )
{
- unsigned int cc;
+ size_t cc;
const char* space = "";
for ( cc = 2; cc < args.size(); cc ++ )
{
@@ -180,7 +180,7 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
// Echo string no new line
else if (args[1] == "echo_append" )
{
- unsigned int cc;
+ size_t cc;
const char* space = "";
for ( cc = 2; cc < args.size(); cc ++ )
{
@@ -460,7 +460,7 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
}
fclose(progFile);
}
- unsigned int i;
+ size_t i;
for (i = 3; i < args.size(); ++i)
{
fName = dirName;
@@ -857,7 +857,7 @@ int cmcmd::ExecuteEchoColor(std::vector<std::string>& args)
bool enabled = true;
int color = cmsysTerminal_Color_Normal;
bool newline = true;
- for(unsigned int i=2; i < args.size(); ++i)
+ for(size_t i=2; i < args.size(); ++i)
{
if(args[i].find("--switch=") == 0)
{
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=672aa1307e12ba9527f3e516653e5370c90a069f
commit 672aa1307e12ba9527f3e516653e5370c90a069f
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Mon Mar 10 15:23:41 2014 -0400
Commit: Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Tue Mar 11 13:12:18 2014 -0400
docs: Remove std::set::insert(begin, end) guideline
Usage of this has been around:
Source/cmComputeLinkDepends.cxx:874
Source/cmComputeLinkDepends.cxx:944
introduced in:
commit 816ee0f83cd9775e3b378fe3b074efe06d6b29a6
Author: Brad King <brad.king at kitware.com>
Date: Wed Aug 27 10:21:57 2008 -0400
ENH: New link line item ordering algorithm
also:
Source/cmFindCommon.cxx:266
Source/cmFindCommon.cxx:475
from:
commit 1221581aa8de2b4bb06e09894940dba6ff90caa1
Author: Todd Gamblin <tgamblin at llnl.gov>
Date: Thu Aug 12 15:20:47 2010 -0700
Teach find_* commands to ignore some paths
and more.
diff --git a/Help/manual/cmake-developer.7.rst b/Help/manual/cmake-developer.7.rst
index 22a6f35..ad66123 100644
--- a/Help/manual/cmake-developer.7.rst
+++ b/Help/manual/cmake-developer.7.rst
@@ -102,29 +102,6 @@ A loop must be used instead:
theVector.push_back(*li);
}
-std::set::insert
-----------------
-
-Use of ``std::set::insert`` is not allowed with any source container:
-
-.. code-block:: c++
-
- std::set<cmTarget*> theSet;
- theSet.insert(targets.begin(), targets.end()); // Wrong
-
-A loop must be used instead:
-
-.. code-block:: c++
-
- ConstIterator it = targets.begin();
- const ConstIterator end = targets.end();
- for ( ; it != end; ++it)
- {
- theSet.insert(*it);
- }
-
-.. MSVC6, SunCC 5.9
-
Template Parameter Defaults
---------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=844f49b858aa196cdb872ebe2d0ea10f8d4d751c
commit 844f49b858aa196cdb872ebe2d0ea10f8d4d751c
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Mon Mar 10 13:18:27 2014 -0400
Commit: Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Tue Mar 11 13:12:18 2014 -0400
docs: Enforce std::algorithm implicit cast guideline
There were only two instances (out of many) where it wasn't followed, so
enforce the rule.
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 785b902..84ab349 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -532,7 +532,8 @@ void cmGlobalNinjaGenerator
UsingMinGW = true;
this->EnableMinGWLanguage(makefile);
}
- if (std::find(langs.begin(), langs.end(), "Fortran") != langs.end())
+ if (std::find(langs.begin(), langs.end(), std::string("Fortran"))
+ != langs.end())
{
cmSystemTools::Error("The Ninja generator does not support Fortran yet.");
}
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 4432244..533a68c 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1738,9 +1738,10 @@ cmTarget::GetIncludeDirectories(const std::string& config) const
std::set<std::string> uniqueIncludes;
cmListFileBacktrace lfbt;
+ static std::string includeDirectories = "INCLUDE_DIRECTORIES";
cmGeneratorExpressionDAGChecker dagChecker(lfbt,
this->GetName(),
- "INCLUDE_DIRECTORIES", 0, 0);
+ includeDirectories, 0, 0);
std::vector<std::string> debugProperties;
const char *debugProp =
@@ -1753,7 +1754,7 @@ cmTarget::GetIncludeDirectories(const std::string& config) const
bool debugIncludes = !this->DebugIncludesDone
&& std::find(debugProperties.begin(),
debugProperties.end(),
- "INCLUDE_DIRECTORIES")
+ includeDirectories)
!= debugProperties.end();
if (this->Makefile->IsGeneratingBuildSystem())
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=19c9bead77c76a04fb0716be8eaa653a2c308d50
commit 19c9bead77c76a04fb0716be8eaa653a2c308d50
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Mon Mar 10 13:13:21 2014 -0400
Commit: Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Tue Mar 11 13:06:43 2014 -0400
docs: Remove std::set::find == std::set::end guideline
It has been in use for a while in multiple places including:
Source/CPack/cmCPackDebGenerator.cxx:429
since:
commit 12ba1e9b208a25a8d4b5a97177e1fd6e4d4e5afa
Author: Alexander Neundorf <neundorf at kde.org>
Date: Fri Mar 28 20:23:01 2008 -0400
BUG: fix packaging of files installed to absolute paths, works only when
used with SET(CPACK_SET_DESTDIR "ON")
and:
Source/CPack/cmCPackPackageMakerGenerator.cxx:993
from:
commit b2f041f6a899b2592477c98da0d060cc7c983a91
Author: David Cole <david.cole at kitware.com>
Date: Wed Jul 30 13:28:17 2008 -0400
BUG: Fix issue #7414 - do not crash when given components with circular dependencies. Thanks to Doug Gregor for the patch.
Other locations:
Source/CPack/WiX/cmCPackWIXGenerator.cxx:883
Source/CPack/cmCPackNSISGenerator.cxx:540
Source/CTest/cmCTestMultiProcessHandler.cxx:476
Source/CTest/cmCTestTestHandler.cxx:854
Source/CTest/cmCTestTestHandler.cxx:864
Source/CTest/cmCTestTestHandler.cxx:895
Source/cmAuxSourceDirectoryCommand.cxx:65
Source/cmExportBuildFileGenerator.cxx:281
Source/cmGeneratorExpressionEvaluator.cxx:754
Source/cmGlobalNinjaGenerator.cxx:535
Source/cmGlobalVisualStudio7Generator.cxx:283
Source/cmGlobalXCodeGenerator.cxx:1272
Source/cmLocalGenerator.cxx:1583
Source/cmMakefile.cxx:1550
Source/cmQtAutoGenerators.cxx:1341
Source/cmSourceFileLocation.cxx:97
Source/cmSourceFileLocation.cxx:98
Source/cmSourceFileLocation.cxx:176
Source/cmSourceFileLocation.cxx:181
Source/cmTarget.cxx:571
Source/cmTarget.cxx:1168
Source/cmTarget.cxx:1754
Source/cmTarget.cxx:1982
Source/cmTarget.cxx:2094
Source/cmTarget.cxx:4448
Source/cmXCodeObject.h:65
Source/cmXCodeObject.h:70
diff --git a/Help/manual/cmake-developer.7.rst b/Help/manual/cmake-developer.7.rst
index 5594856..22a6f35 100644
--- a/Help/manual/cmake-developer.7.rst
+++ b/Help/manual/cmake-developer.7.rst
@@ -42,39 +42,13 @@ may not be used. Use ``operator+=`` and ``operator=`` instead:
.. code-block:: c++
std::string stringBuilder;
- const char* begin = someString.c_str();
+ const char* begin = /*...*/;
stringBuilder.append(begin, begin + 3); // Wrong
stringBuilder.clear(); // Wrong
stringBuilder.append(begin, 3); // Ok
stringBuilder += "chunk"; // Ok
stringBuilder = ""; // Ok
-std::set const iterators
-------------------------
-
-The ``find()`` member function of a ``const`` ``std::set`` instance may not be
-used in a comparison with the iterator returned by ``end()``:
-
-.. code-block:: c++
-
- const std::set<std::string someSet = getSet();
- if (someSet.find("needle") == someSet.end()) // Wrong
- {
- // ...
- }
-
-The return value of ``find()`` must be assigned to an intermediate
-``const_iterator`` for comparison:
-
-.. code-block:: c++
-
- const std::set<std::string someSet;
- const std::set<std::string i = someSet.find("needle");
- if (i != propSet.end()) // Ok
- {
- // ...
- }
-
Char Array to ``string`` Conversions with Algorithms
----------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fd2f6f2267f6432731089ef7278a08eb25e93fd4
commit fd2f6f2267f6432731089ef7278a08eb25e93fd4
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Mon Mar 10 13:09:47 2014 -0400
Commit: Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Tue Mar 11 13:05:31 2014 -0400
docs: Update std::string::append usage guidelines
Usage of std::string::append has been around for a while:
Source/CTest/cmCTestSubmitHandler.cxx:448
introduced in:
commit 61b488021e7ac0321238ba1ba491478d58163b23
Author: Andy Cedilnik <andy.cedilnik at kitware.com>
Date: Thu Jan 16 12:30:02 2003 -0500
Improve submtitting using http
However, the Borland compiler does not like the iterator-range signature
of std::string::append, so explicitly mention that usage.
diff --git a/Help/manual/cmake-developer.7.rst b/Help/manual/cmake-developer.7.rst
index abf1656..5594856 100644
--- a/Help/manual/cmake-developer.7.rst
+++ b/Help/manual/cmake-developer.7.rst
@@ -36,14 +36,16 @@ The ``at()`` member function of ``std::vector`` may not be used. Use
std::string::append and std::string::clear
------------------------------------------
-The ``append()`` and ``clear()`` member functions of ``std::string`` may not
-be used. Use ``operator+=`` and ``operator=`` instead:
+The ``append(begin, end)`` and ``clear()`` member functions of ``std::string``
+may not be used. Use ``operator+=`` and ``operator=`` instead:
.. code-block:: c++
std::string stringBuilder;
- stringBuilder.append("chunk"); // Wrong
+ const char* begin = someString.c_str();
+ stringBuilder.append(begin, begin + 3); // Wrong
stringBuilder.clear(); // Wrong
+ stringBuilder.append(begin, 3); // Ok
stringBuilder += "chunk"; // Ok
stringBuilder = ""; // Ok
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9bb8ff678ac18b26a5171871a8893e9ccc89a86c
commit 9bb8ff678ac18b26a5171871a8893e9ccc89a86c
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Mon Mar 10 12:59:42 2014 -0400
Commit: Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Tue Mar 11 13:05:13 2014 -0400
docs: Enforce .at() guideline
It is used in the following places:
Source/CPack/WiX/cmCPackWIXGenerator.cxx:117
introduced in:
commit 85baac1503c638756211ba07c4c25128e6d3d845
Author: Nils Gladitz <gladitz at scivis.de>
Date: Wed Oct 3 16:08:49 2012 +0200
CPack: Add a WiX Generator (#11575)
It's the only use of std::vector::at(), so enforce the guideline.
diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
index a385e40..d12e362 100644
--- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx
+++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
@@ -114,7 +114,7 @@ bool cmCPackWIXGenerator::RunLightCommand(std::string const& objectFiles)
std::stringstream command;
command << QuotePath(executable);
command << " -nologo";
- command << " -out " << QuotePath(packageFileNames.at(0));
+ command << " -out " << QuotePath(packageFileNames[0]);
for(extension_set_t::const_iterator i = this->LightExtensions.begin();
i != this->LightExtensions.end(); ++i)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7814626829cb7bbc716b290c5b5042a5d356fdbe
commit 7814626829cb7bbc716b290c5b5042a5d356fdbe
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Mon Mar 10 12:58:23 2014 -0400
Commit: Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Tue Mar 11 13:02:18 2014 -0400
Remove cmStdString from developer examples
diff --git a/Help/manual/cmake-developer.7.rst b/Help/manual/cmake-developer.7.rst
index 376b56c..abf1656 100644
--- a/Help/manual/cmake-developer.7.rst
+++ b/Help/manual/cmake-developer.7.rst
@@ -55,7 +55,7 @@ used in a comparison with the iterator returned by ``end()``:
.. code-block:: c++
- const std::set<cmStdString>& someSet = getSet();
+ const std::set<std::string someSet = getSet();
if (someSet.find("needle") == someSet.end()) // Wrong
{
// ...
@@ -66,8 +66,8 @@ The return value of ``find()`` must be assigned to an intermediate
.. code-block:: c++
- const std::set<cmStdString>& someSet;
- const std::set<cmStdString>::const_iterator i = someSet.find("needle");
+ const std::set<std::string someSet;
+ const std::set<std::string i = someSet.find("needle");
if (i != propSet.end()) // Ok
{
// ...
@@ -110,7 +110,7 @@ conversion is not allowed:
.. code-block:: c++
- std::set<cmStdString> theSet;
+ std::set<const char*> theSet;
std::vector<std::string> theVector;
theVector.insert(theVector.end(), theSet.begin(), theSet.end()); // Wrong
@@ -118,9 +118,9 @@ A loop must be used instead:
.. code-block:: c++
- std::set<cmStdString> theSet;
+ std::set<const char*> theSet;
std::vector<std::string> theVector;
- for(std::set<cmStdString>::iterator li = theSet.begin();
+ for(std::set<const char*>::iterator li = theSet.begin();
li != theSet.end(); ++li)
{
theVector.push_back(*li);
-----------------------------------------------------------------------
Summary of changes:
Help/manual/cmake-developer.7.rst | 63 ++++----------------------
Source/CPack/WiX/cmCPackWIXGenerator.cxx | 2 +-
Source/CTest/cmCTestBuildAndTestHandler.cxx | 2 +-
Source/CTest/cmCTestHG.cxx | 8 ++--
Source/CTest/cmCTestHandlerCommand.cxx | 4 +-
Source/CTest/cmCTestScriptHandler.cxx | 2 +-
Source/CTest/cmCTestTestHandler.cxx | 6 +--
Source/CursesDialog/ccmake.cxx | 2 +-
Source/QtDialog/QCMakeCacheView.cxx | 8 ++--
Source/QtDialog/QCMakeWidgets.cxx | 2 +-
Source/QtDialog/QMacInstallDialog.cxx | 2 +-
Source/cmAddCustomCommandCommand.cxx | 2 +-
Source/cmAddCustomTargetCommand.cxx | 2 +-
Source/cmAddTestCommand.cxx | 2 +-
Source/cmBuildCommand.cxx | 2 +-
Source/cmCMakeMinimumRequired.cxx | 2 +-
Source/cmCTest.cxx | 2 +-
Source/cmComputeLinkDepends.cxx | 6 +--
Source/cmComputeTargetDepends.cxx | 4 +-
Source/cmConfigureFileCommand.cxx | 2 +-
Source/cmCoreTryCompile.cxx | 2 +-
Source/cmCustomCommandGenerator.cxx | 2 +-
Source/cmDefinePropertyCommand.cxx | 2 +-
Source/cmELF.cxx | 2 +-
Source/cmExecuteProcessCommand.cxx | 4 +-
Source/cmExportBuildFileGenerator.cxx | 2 +-
Source/cmExportCommand.cxx | 2 +-
Source/cmExportFileGenerator.cxx | 2 +-
Source/cmExportInstallFileGenerator.cxx | 6 +--
Source/cmExportSet.cxx | 2 +-
Source/cmFLTKWrapUICommand.cxx | 2 +-
Source/cmFileCommand.cxx | 14 +++---
Source/cmFindBase.cxx | 12 ++---
Source/cmFindPackageCommand.cxx | 4 +-
Source/cmForEachCommand.cxx | 4 +-
Source/cmFunctionCommand.cxx | 10 ++--
Source/cmGeneratorExpressionEvaluator.cxx | 48 ++++++++++----------
Source/cmGetFilenameComponentCommand.cxx | 2 +-
Source/cmGetPropertyCommand.cxx | 2 +-
Source/cmGlobalGenerator.cxx | 16 +++----
Source/cmGlobalNinjaGenerator.cxx | 5 +-
Source/cmGlobalNinjaGenerator.h | 4 +-
Source/cmGlobalUnixMakefileGenerator3.cxx | 14 +++---
Source/cmGlobalVisualStudio7Generator.cxx | 2 +-
Source/cmGlobalVisualStudio8Generator.cxx | 2 +-
Source/cmGlobalXCodeGenerator.cxx | 8 ++--
Source/cmIfCommand.cxx | 4 +-
Source/cmIncludeCommand.cxx | 2 +-
Source/cmIncludeExternalMSProjectCommand.cxx | 2 +-
Source/cmInstallCommand.cxx | 2 +-
Source/cmLoadCacheCommand.cxx | 2 +-
Source/cmLoadCommandCommand.cxx | 2 +-
Source/cmLocalGenerator.cxx | 6 +--
Source/cmLocalUnixMakefileGenerator3.cxx | 2 +-
Source/cmLocalVisualStudio6Generator.cxx | 2 +-
Source/cmLocalVisualStudio7Generator.cxx | 4 +-
Source/cmMacroCommand.cxx | 6 +--
Source/cmMakefile.cxx | 10 ++--
Source/cmMakefileTargetGenerator.cxx | 2 +-
Source/cmMarkAsAdvancedCommand.cxx | 2 +-
Source/cmOrderDirectories.cxx | 14 +++---
Source/cmRemoveCommand.cxx | 6 +--
Source/cmSeparateArgumentsCommand.cxx | 2 +-
Source/cmSetSourceFilesPropertiesCommand.cxx | 2 +-
Source/cmSetTargetPropertiesCommand.cxx | 2 +-
Source/cmSetTestsPropertiesCommand.cxx | 2 +-
Source/cmSourceGroupCommand.cxx | 2 +-
Source/cmStringCommand.cxx | 14 +++---
Source/cmTarget.cxx | 5 +-
Source/cmTargetLinkLibrariesCommand.cxx | 2 +-
Source/cmTargetPropCommandBase.cxx | 4 +-
Source/cmTryRunCommand.cxx | 2 +-
Source/cmVariableRequiresCommand.cxx | 2 +-
Source/cmWhileCommand.cxx | 4 +-
Source/cmXCodeObject.cxx | 6 +--
Source/cmake.cxx | 6 +--
Source/cmcmd.cxx | 8 ++--
77 files changed, 193 insertions(+), 238 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list