3 files changed, 13 insertions, 24 deletions
diff --git a/cpp/demo/IceBox/hello/helloiceboxS.dsp b/cpp/demo/IceBox/hello/helloiceboxS.dsp
index 5d7517b7ff7..6ef48cd1bd6 100644
--- a/cpp/demo/IceBox/hello/helloiceboxS.dsp
+++ b/cpp/demo/IceBox/hello/helloiceboxS.dsp
@@ -104,15 +104,15 @@ PostBuild_Cmds=copy Debug\helloservice001d.* .
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=.\HelloI.cpp
+SOURCE=.\Hello.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\HelloServiceI.cpp
+SOURCE=.\HelloI.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\Hello.cpp
+SOURCE=.\HelloServiceI.cpp
 # End Source File
 # End Group
 # Begin Group "Header Files"
@@ -130,27 +130,11 @@ SOURCE=.\Hello.h
 
 SOURCE=.\Hello.ice
 
-!IF  "$(CFG)" == "helloIceBoxC - Win32 Release"
-
-USERDEP__HELLO="../../../bin/slice2cpp.exe"	
-# Begin Custom Build
-InputPath=.\Hello.ice
-
-BuildCmds= \
-	set PATH=%PATH%;..\..\..\lib \
-	..\..\..\bin\slice2cpp.exe Hello.ice \
-	
-
-"Hello.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"Hello.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-# End Custom Build
+!IF  "$(CFG)" == "helloIceBoxS - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "helloIceBoxC - Win32 Debug"
+!ELSEIF  "$(CFG)" == "helloIceBoxS - Win32 Debug"
 
-USERDEP__HELLO="../../../bin/slice2cpp.exe"	
+USERDEP__HELLO="../../../bin/slice2cpp.exe"	"../../../bin/slice2cpp.exe"	
 # Begin Custom Build
 InputPath=.\Hello.ice
 
diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp
index 18323a23ac8..6c14a545006 100644
--- a/cpp/src/Ice/Proxy.cpp
+++ b/cpp/src/Ice/Proxy.cpp
@@ -1075,6 +1075,7 @@ IceDelegateD::Ice::Object::ice_isA(const string& __id, const Context& __context)
 	    throw UnknownException(__FILE__, __LINE__);
 	}
     }
+    return false; // To keep VC++ compiler happy.
 }
 
 void
@@ -1130,6 +1131,7 @@ IceDelegateD::Ice::Object::ice_ids(const ::Ice::Context& __context)
 	    throw UnknownException(__FILE__, __LINE__);
 	}
     }
+    return false; // To keep VC++ compiler happy.
 }
 
 string
@@ -1157,6 +1159,7 @@ IceDelegateD::Ice::Object::ice_id(const ::Ice::Context& __context)
 	    throw UnknownException(__FILE__, __LINE__);
 	}
     }
+    return false; // To keep VC++ compiler happy.
 }
 
 vector<string>
@@ -1184,6 +1187,7 @@ IceDelegateD::Ice::Object::ice_facets(const ::Ice::Context& __context)
 	    throw UnknownException(__FILE__, __LINE__);
 	}
     }
+    return false; // To keep VC++ compiler happy.
 }
 
 bool
@@ -1222,6 +1226,7 @@ IceDelegateD::Ice::Object::ice_invoke(const string& operation,
 	    throw UnknownException(__FILE__, __LINE__);
 	}
     }
+    return false; // To keep VC++ compiler happy.
 }
 
 void
diff --git a/cpp/test/IceUtil/inputUtil/inpututil.dsp b/cpp/test/IceUtil/inputUtil/inpututil.dsp
index 306475db558..455c3da2224 100644
--- a/cpp/test/IceUtil/inputUtil/inpututil.dsp
+++ b/cpp/test/IceUtil/inputUtil/inpututil.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /WX /GR /GX /O2 /I "." /I "../../../include" /I "../../include" /D "NDEBUG" /D "_CONSOLE" /D "_inputUtil" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /WX /GR /GX /O2 /I "." /I "../../../include" /I "../../include" /D "NDEBUG" /D "_CONSOLE" /D "_UNICODE" /YX /FD /c
 # SUBTRACT CPP /Fr
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -52,7 +52,7 @@ BSC32=bscmake.exe
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
 # ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"client.exe" /libpath:"../../../lib"
-# SUBTRACT LINK32 /nodefaultlib
+# SUBTRACT LINK32 /incremental:yes /debug /nodefaultlib
 
 !ELSEIF  "$(CFG)" == "inputUtil - Win32 Debug"