2 files changed, 2 insertions, 48 deletions
diff --git a/cpp/src/IceGrid/NodeI.cpp b/cpp/src/IceGrid/NodeI.cpp
index 1f5d6b4fd18..119fe61a7b8 100644
--- a/cpp/src/IceGrid/NodeI.cpp
+++ b/cpp/src/IceGrid/NodeI.cpp
@@ -786,7 +786,8 @@ NodeI::addServer(const ServerIPtr& server)
     map<string, set<ServerIPtr> >::iterator p = _serversByApplication.find(server->getApplication());
     if(p == _serversByApplication.end())
     {
-	p = _serversByApplication.insert(p, make_pair(server->getApplication(), set<ServerIPtr>()));
+        map<string, set<ServerIPtr> >::value_type v(server->getApplication(), set<ServerIPtr>());
+        p = _serversByApplication.insert(p, v);
     }
     p->second.insert(server);
 }
diff --git a/cpp/src/IceGrid/icegrid.dsp b/cpp/src/IceGrid/icegrid.dsp
index db80461a1c4..10e8cdc27a6 100644
--- a/cpp/src/IceGrid/icegrid.dsp
+++ b/cpp/src/IceGrid/icegrid.dsp
@@ -122,10 +122,6 @@ SOURCE=.\Observer.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\PerfTypes.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\Query.cpp
 # End Source File
 # End Group
@@ -322,49 +318,6 @@ BuildCmds= \
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\slice\icegrid\PerfTypes.ice
-
-!IF  "$(CFG)" == "icegrid - Win32 Release"
-
-USERDEP__PERFT="..\..\bin\slice2cpp.exe"	"..\..\lib\slice.lib"	
-# Begin Custom Build
-InputPath=..\..\slice\icegrid\PerfTypes.ice
-
-BuildCmds= \
-	..\..\bin\slice2cpp.exe --ice --checksum --dll-export ICE_GRID_API --include-dir icegrid -I../../slice ../../slice/IceGrid/PerfTypes.ice \
-	move PerfTypes.h ..\..\include\icegrid \
-	
-
-"..\..\include\icegrid\PerfTypes.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"PerfTypes.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "icegrid - Win32 Debug"
-
-USERDEP__PERFT="..\..\bin\slice2cpp.exe"	"..\..\lib\sliced.lib"	
-# Begin Custom Build
-InputPath=..\..\slice\icegrid\PerfTypes.ice
-
-BuildCmds= \
-	..\..\bin\slice2cpp.exe --ice --checksum --dll-export ICE_GRID_API --include-dir icegrid -I../../slice ../../slice/IceGrid/PerfTypes.ice \
-	move PerfTypes.h ..\..\include\icegrid \
-	
-
-"..\..\include\icegrid\PerfTypes.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"PerfTypes.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-# End Custom Build
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\slice\icegrid\Query.ice
 
 !IF  "$(CFG)" == "icegrid - Win32 Release"