summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/modules/m_callerid.cpp6
-rw-r--r--win/inspircdVC80.vcproj12
2 files changed, 15 insertions, 3 deletions
diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index 6098ff9e9..4faa67945 100644
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -53,9 +53,9 @@ void RemoveFromAllAccepts(InspIRCd* ServerInstance, User* who)
callerid_data* dat = GetData(i->second, false);
if (!dat) continue;
std::set<User*>& accepting = dat->accepting;
- std::set<User*>::iterator i = accepting.find(who);
- if (i == accepting.end()) continue;
- accepting.erase(i);
+ std::set<User*>::iterator iter = accepting.find(who);
+ if (iter == accepting.end()) continue;
+ accepting.erase(iter);
}
}
diff --git a/win/inspircdVC80.vcproj b/win/inspircdVC80.vcproj
index 13baad2ed..0b03621d7 100644
--- a/win/inspircdVC80.vcproj
+++ b/win/inspircdVC80.vcproj
@@ -1014,6 +1014,18 @@
</FileConfiguration>
</File>
<File
+ RelativePath="..\src\modules\m_callerid.cpp"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ </File>
+ <File
RelativePath="..\src\modules\m_cban.cpp"
>
<FileConfiguration