|
@@ -115,8 +115,7 @@ bool cmVisualStudioGeneratorOptions::IsDebug() const
|
|
|
if (this->CurrentTool != CSharpCompiler) {
|
|
|
return this->FlagMap.find("DebugInformationFormat") != this->FlagMap.end();
|
|
|
}
|
|
|
- std::map<std::string, FlagValue>::const_iterator i =
|
|
|
- this->FlagMap.find("DebugType");
|
|
|
+ auto i = this->FlagMap.find("DebugType");
|
|
|
if (i != this->FlagMap.end()) {
|
|
|
if (i->second.size() == 1) {
|
|
|
return i->second[0] != "none";
|
|
@@ -267,8 +266,7 @@ void cmVisualStudioGeneratorOptions::ParseFinish()
|
|
|
}
|
|
|
|
|
|
if (this->CurrentTool == CudaCompiler) {
|
|
|
- std::map<std::string, FlagValue>::iterator i =
|
|
|
- this->FlagMap.find("CudaRuntime");
|
|
|
+ auto i = this->FlagMap.find("CudaRuntime");
|
|
|
if (i != this->FlagMap.end() && i->second.size() == 1) {
|
|
|
std::string& cudaRuntime = i->second[0];
|
|
|
if (cudaRuntime == "static") {
|
|
@@ -285,7 +283,7 @@ void cmVisualStudioGeneratorOptions::ParseFinish()
|
|
|
void cmVisualStudioGeneratorOptions::PrependInheritedString(
|
|
|
std::string const& key)
|
|
|
{
|
|
|
- std::map<std::string, FlagValue>::iterator i = this->FlagMap.find(key);
|
|
|
+ auto i = this->FlagMap.find(key);
|
|
|
if (i == this->FlagMap.end() || i->second.size() != 1) {
|
|
|
return;
|
|
|
}
|
|
@@ -295,7 +293,7 @@ void cmVisualStudioGeneratorOptions::PrependInheritedString(
|
|
|
|
|
|
void cmVisualStudioGeneratorOptions::Reparse(std::string const& key)
|
|
|
{
|
|
|
- std::map<std::string, FlagValue>::iterator i = this->FlagMap.find(key);
|
|
|
+ auto i = this->FlagMap.find(key);
|
|
|
if (i == this->FlagMap.end() || i->second.size() != 1) {
|
|
|
return;
|
|
|
}
|
|
@@ -339,7 +337,7 @@ cmIDEOptions::FlagValue cmVisualStudioGeneratorOptions::TakeFlag(
|
|
|
std::string const& key)
|
|
|
{
|
|
|
FlagValue value;
|
|
|
- std::map<std::string, FlagValue>::iterator i = this->FlagMap.find(key);
|
|
|
+ auto i = this->FlagMap.find(key);
|
|
|
if (i != this->FlagMap.end()) {
|
|
|
value = i->second;
|
|
|
this->FlagMap.erase(i);
|
|
@@ -373,8 +371,7 @@ void cmVisualStudioGeneratorOptions::OutputPreprocessorDefinitions(
|
|
|
if (this->Version != cmGlobalVisualStudioGenerator::VSVersion::VS9) {
|
|
|
oss << "%(" << tag << ")";
|
|
|
}
|
|
|
- std::vector<std::string>::const_iterator de =
|
|
|
- cmRemoveDuplicates(this->Defines);
|
|
|
+ auto de = cmRemoveDuplicates(this->Defines);
|
|
|
for (std::string const& di : cmMakeRange(this->Defines.cbegin(), de)) {
|
|
|
// Escape the definition for the compiler.
|
|
|
std::string define;
|