3 files changed, 25 insertions, 25 deletions
diff --git a/cpp/demo/Ice/nested/Ice.nested.client.dsp b/cpp/demo/Ice/nested/Ice.nested.client.dsp
index 9bba3e9fd6d..1cf88e4cef0 100644
--- a/cpp/demo/Ice/nested/Ice.nested.client.dsp
+++ b/cpp/demo/Ice/nested/Ice.nested.client.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="Ice.nested.client" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="Ice.nested.client.exe" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Console Application" 0x0103
 
-CFG=Ice.nested.client - Win32 Debug
+CFG=Ice.nested.client.exe - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,12 +13,12 @@ CFG=Ice.nested.client - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "Ice.nested.client.mak" CFG="Ice.nested.client - Win32 Debug"
+!MESSAGE NMAKE /f "Ice.nested.client.mak" CFG="Ice.nested.client.exe - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "Ice.nested.client - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Ice.nested.client - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Ice.nested.client.exe - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Ice.nested.client.exe - Win32 Debug" (based on "Win32 (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
@@ -28,7 +28,7 @@ CFG=Ice.nested.client - Win32 Debug
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "Ice.nested.client - Win32 Release"
+!IF  "$(CFG)" == "Ice.nested.client.exe - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -51,10 +51,10 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 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 Ice.lib IceUtil.lib setargv.obj /nologo /subsystem:console /pdb:none /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no
+# ADD LINK32 Ice.lib IceUtil.lib setargv.obj /nologo /subsystem:console /pdb:none /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no /IGNORE:4089
 # SUBTRACT LINK32 /debug /nodefaultlib
 
-!ELSEIF  "$(CFG)" == "Ice.nested.client - Win32 Debug"
+!ELSEIF  "$(CFG)" == "Ice.nested.client.exe - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -84,8 +84,8 @@ LINK32=link.exe
 
 # Begin Target
 
-# Name "Ice.nested.client - Win32 Release"
-# Name "Ice.nested.client - Win32 Debug"
+# Name "Ice.nested.client.exe - Win32 Release"
+# Name "Ice.nested.client.exe - Win32 Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -121,7 +121,7 @@ SOURCE=.\NestedI.h
 
 SOURCE=.\Nested.ice
 
-!IF  "$(CFG)" == "Ice.nested.client - Win32 Release"
+!IF  "$(CFG)" == "Ice.nested.client.exe - Win32 Release"
 
 USERDEP__NESTE="..\..\..\bin\slice2cpp.exe"	"..\..\..\lib\slice.lib"	
 # Begin Custom Build
@@ -137,7 +137,7 @@ BuildCmds= \
    $(BuildCmds)
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "Ice.nested.client - Win32 Debug"
+!ELSEIF  "$(CFG)" == "Ice.nested.client.exe - Win32 Debug"
 
 USERDEP__NESTE="..\..\..\bin\slice2cpp.exe"	"..\..\..\lib\sliced.lib"	
 # Begin Custom Build
diff --git a/cpp/demo/Ice/nested/Ice.nested.server.dsp b/cpp/demo/Ice/nested/Ice.nested.server.dsp
index 3c9a7a5ca3c..b78d7dcc4c9 100644
--- a/cpp/demo/Ice/nested/Ice.nested.server.dsp
+++ b/cpp/demo/Ice/nested/Ice.nested.server.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="Ice.nested.server" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="Ice.nested.server.exe" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Console Application" 0x0103
 
-CFG=Ice.nested.server - Win32 Debug
+CFG=Ice.nested.server.exe - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,12 +13,12 @@ CFG=Ice.nested.server - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "Ice.nested.server.mak" CFG="Ice.nested.server - Win32 Debug"
+!MESSAGE NMAKE /f "Ice.nested.server.mak" CFG="Ice.nested.server.exe - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "Ice.nested.server - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Ice.nested.server - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Ice.nested.server.exe - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Ice.nested.server.exe - Win32 Debug" (based on "Win32 (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
@@ -28,7 +28,7 @@ CFG=Ice.nested.server - Win32 Debug
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "Ice.nested.server - Win32 Release"
+!IF  "$(CFG)" == "Ice.nested.server.exe - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -51,10 +51,10 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 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 Ice.lib IceUtil.lib setargv.obj /nologo /subsystem:console /pdb:none /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no
+# ADD LINK32 Ice.lib IceUtil.lib setargv.obj /nologo /subsystem:console /pdb:none /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no /IGNORE:4089
 # SUBTRACT LINK32 /debug /nodefaultlib
 
-!ELSEIF  "$(CFG)" == "Ice.nested.server - Win32 Debug"
+!ELSEIF  "$(CFG)" == "Ice.nested.server.exe - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -84,8 +84,8 @@ LINK32=link.exe
 
 # Begin Target
 
-# Name "Ice.nested.server - Win32 Release"
-# Name "Ice.nested.server - Win32 Debug"
+# Name "Ice.nested.server.exe - Win32 Release"
+# Name "Ice.nested.server.exe - Win32 Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -121,7 +121,7 @@ SOURCE=.\NestedI.h
 
 SOURCE=.\Nested.ice
 
-!IF  "$(CFG)" == "Ice.nested.server - Win32 Release"
+!IF  "$(CFG)" == "Ice.nested.server.exe - Win32 Release"
 
 USERDEP__NESTE="..\..\..\bin\slice2cpp.exe"	"..\..\..\lib\slice.lib"	
 # Begin Custom Build
@@ -137,7 +137,7 @@ BuildCmds= \
    $(BuildCmds)
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "Ice.nested.server - Win32 Debug"
+!ELSEIF  "$(CFG)" == "Ice.nested.server.exe - Win32 Debug"
 
 USERDEP__NESTE="..\..\..\bin\slice2cpp.exe"	"..\..\..\lib\sliced.lib"	
 # Begin Custom Build
diff --git a/cpp/demo/Ice/nested/NestedI.cpp b/cpp/demo/Ice/nested/NestedI.cpp
index fb79d2995fd..33fba93ae44 100644
--- a/cpp/demo/Ice/nested/NestedI.cpp
+++ b/cpp/demo/Ice/nested/NestedI.cpp
@@ -25,6 +25,6 @@ NestedI::nestedCall(Int level, const NestedPrx& proxy, const Ice::Current& curre
     cout << level << endl;
     if(--level > 0)
     {
-        proxy->nestedCall(level, _self, current.ctx);
+        proxy->nestedCall(level, _self);
     }
 }