summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2008-01-21 11:48:44 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2008-01-21 11:48:44 +0000
commite30f934cc03395194cd72472acc9cf4b05d9e64e (patch)
tree786fa49251c79113924786d1e4c7fc47dd94fdd9
parent94c3952d8e537fa67d18f58ecc001ed805c64735 (diff)
win32 compilation errors: shadowing of variable 'i' isnt a good idea
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8746 e03df62e-2008-0410-955e-edbf42e46eb7
-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