5 files changed, 8 insertions, 32 deletions
diff --git a/cpp/src/Freeze/freeze.dsp b/cpp/src/Freeze/freeze.dsp
index c2c616e87a5..20658116876 100644
--- a/cpp/src/Freeze/freeze.dsp
+++ b/cpp/src/Freeze/freeze.dsp
@@ -116,10 +116,6 @@ SOURCE=.\Evictor.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\EvictorF.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\EvictorI.cpp
 # End Source File
 # End Group
@@ -294,7 +290,7 @@ InputPath=..\..\slice\Freeze\EvictorF.ice
 	set PATH=%PATH%;..\..\lib 
 	..\..\bin\slice2cpp.exe --dll-export FREEZE_API --include-dir Freeze -I../../slice ../../slice/Freeze/EvictorF.ice 
 	move EvictorF.h ..\..\include\Freeze 
-	del EvcitorF.cpp 
+	del EvictorF.cpp 
 	
 # End Custom Build
 
@@ -307,7 +303,7 @@ InputPath=..\..\slice\Freeze\EvictorF.ice
 	set PATH=%PATH%;..\..\lib 
 	..\..\bin\slice2cpp.exe --dll-export FREEZE_API --include-dir Freeze -I../../slice ../../slice/Freeze/EvictorF.ice 
 	move EvictorF.h ..\..\include\Freeze 
-	del EvcitorF.cpp 
+	del EvictorF.cpp 
 	
 # End Custom Build
 
diff --git a/cpp/src/IcePack/Parser.cpp b/cpp/src/IcePack/Parser.cpp
index 4f174bb1246..eeb73637a69 100644
--- a/cpp/src/IcePack/Parser.cpp
+++ b/cpp/src/IcePack/Parser.cpp
@@ -404,7 +404,7 @@ IcePack::Parser::parse(const std::string& commands, bool debug)
     assert(!_commands.empty());
     yyin = 0;
 
-    _currentFile.clear();
+    _currentFile = "";
     _currentLine = 0;
     _continue = false;
     nextLine();
diff --git a/cpp/src/Slice/Parser.cpp b/cpp/src/Slice/Parser.cpp
index c2580ba2e78..3aa831637bb 100644
--- a/cpp/src/Slice/Parser.cpp
+++ b/cpp/src/Slice/Parser.cpp
@@ -11,16 +11,6 @@
 #include <IceUtil/Functional.h>
 #include <Slice/Parser.h>
 
-//
-// Stupid Visual C++ defines min and max as macros :-(
-//
-#ifdef min
-#   undef min
-#endif
-#ifdef max
-#   undef max
-#endif
-
 using namespace std;
 using namespace Slice;
 
@@ -2046,8 +2036,8 @@ Slice::Unit::parse(FILE* file, bool debug)
     _currentComment = "";
     _currentLine = 1;
     _currentIncludeLevel = 0;
-    _currentFile.clear();
-    _topLevelFile.clear();
+    _currentFile = "";
+    _topLevelFile = "";
     _includeFiles.clear();
     pushContainer(this);
 
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
index ffc3c1f346c..79375e7f16c 100644
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -13,16 +13,6 @@
 #include <GenUtil.h>
 #include <limits>
 
-//
-// Stupid Visual C++ defines min and max as macros :-(
-//
-#ifdef min
-#   undef min
-#endif
-#ifdef max
-#   undef max
-#endif
-
 using namespace std;
 using namespace Slice;
 
diff --git a/cpp/src/slice2docbook/Gen.cpp b/cpp/src/slice2docbook/Gen.cpp
index f14fcc7c63b..c3d16d4d726 100644
--- a/cpp/src/slice2docbook/Gen.cpp
+++ b/cpp/src/slice2docbook/Gen.cpp
@@ -886,12 +886,12 @@ Slice::Gen::containedToId(const ContainedPtr& contained)
     {
 	if (scoped[i] == ':')
 	{
-	    id.push_back('.');
+	    id += '.';
 	    ++i;
 	}
 	else
 	{
-	    id.push_back(scoped[i]);
+	    id += scoped[i];
 	}
     }
 
@@ -904,7 +904,7 @@ Slice::Gen::containedToId(const ContainedPtr& contained)
 	id.erase(1 + 44);
     }
 
-    id.push_back('"');
+    id += '"';
     return id;
 }