Merge branch 'R3_3_branch' of ssh://cvs.zeroc.com/home/git/ice into R3_3_branch

4 files changed, 368 insertions, 0 deletions

diff --git a/cpp/demo/Ice/nrvo/Ice.nrvo.client.dsp b/cpp/demo/Ice/nrvo/Ice.nrvo.client.dsp
new file mode 100755
index 00000000000..438db2d9d81
--- /dev/null
+++ b/cpp/demo/Ice/nrvo/Ice.nrvo.client.dsp
@@ -0,0 +1,165 @@
+# Microsoft Developer Studio Project File - Name="Ice.nrvo.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.nrvo.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 

+!MESSAGE NMAKE /f "Ice.nrvo.client.mak".

+!MESSAGE 

+!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.nrvo.client.mak" CFG="Ice.nrvo.client.exe - Win32 Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Ice.nrvo.client.exe - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Ice.nrvo.client.exe - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+CPP=cl.exe

+RSC=rc.exe

+

+!IF  "$(CFG)" == "Ice.nrvo.client.exe - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "Release"

+# PROP BASE Intermediate_Dir "Release"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "Release"

+# PROP Intermediate_Dir "Release"

+# 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/stlport" /D "_CONSOLE" /D "NDEBUG" /D "WIN32_LEAN_AND_MEAN" /FD /c

+# SUBTRACT CPP /Fr /YX

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# 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 /IGNORE:4089

+# SUBTRACT LINK32 /debug /nodefaultlib

+

+!ELSEIF  "$(CFG)" == "Ice.nrvo.client.exe - Win32 Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "Debug"

+# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "Debug"

+# PROP Intermediate_Dir "Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c

+# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I "." /I "../../../include" /I "../../../include/stlport" /D "_CONSOLE" /D "_DEBUG" /D "WIN32_LEAN_AND_MEAN" /FD /GZ /c

+# SUBTRACT CPP /Fr /YX

+# ADD BASE RSC /l 0x409 /d "_DEBUG"

+# ADD RSC /l 0x409 /d "_DEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# 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 /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 Iced.lib IceUtild.lib setargv.obj /nologo /subsystem:console /debug /machine:I386 /out:"client.exe" /pdbtype:sept /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /pdb:none

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Ice.nrvo.client.exe - Win32 Release"

+# Name "Ice.nrvo.client.exe - Win32 Debug"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

+# Begin Source File

+

+SOURCE=.\Client.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\MyStringSeq.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Nrvo.cpp

+# End Source File

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter "h;hpp;hxx;hm;inl"

+# Begin Source File

+

+SOURCE=.\MyStringSeq.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Nrvo.h

+# End Source File

+# End Group

+# Begin Group "Resource Files"

+

+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

+# Begin Source File

+

+SOURCE=.\Nrvo.ice

+

+!IF  "$(CFG)" == "Ice.nrvo.client.exe - Win32 Release"

+

+USERDEP__NRVO_="..\..\..\bin\slice2cpp.exe"	"..\..\..\lib\slice.lib"	

+# Begin Custom Build

+InputPath=.\Nrvo.ice

+

+BuildCmds= \

+	..\..\..\bin\slice2cpp.exe Nrvo.ice

+

+"Nrvo.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"Nrvo.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

+!ELSEIF  "$(CFG)" == "Ice.nrvo.client.exe - Win32 Debug"

+

+USERDEP__NRVO_="..\..\..\bin\slice2cpp.exe"	"..\..\..\lib\sliced.lib"	

+# Begin Custom Build

+InputPath=.\Nrvo.ice

+

+BuildCmds= \

+	..\..\..\bin\slice2cpp.exe Nrvo.ice

+

+"Nrvo.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"Nrvo.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

+!ENDIF 

+

+# End Source File

+# End Group

+# Begin Source File

+

+SOURCE=.\README

+# End Source File

+# End Target

+# End Project

diff --git a/cpp/demo/Ice/nrvo/Ice.nrvo.server.dsp b/cpp/demo/Ice/nrvo/Ice.nrvo.server.dsp
new file mode 100755
index 00000000000..7a8be43bde1
--- /dev/null
+++ b/cpp/demo/Ice/nrvo/Ice.nrvo.server.dsp
@@ -0,0 +1,169 @@
+# Microsoft Developer Studio Project File - Name="Ice.nrvo.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.nrvo.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 

+!MESSAGE NMAKE /f "Ice.nrvo.server.mak".

+!MESSAGE 

+!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.nrvo.server.mak" CFG="Ice.nrvo.server.exe - Win32 Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Ice.nrvo.server.exe - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Ice.nrvo.server.exe - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+CPP=cl.exe

+RSC=rc.exe

+

+!IF  "$(CFG)" == "Ice.nrvo.server.exe - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "Release"

+# PROP BASE Intermediate_Dir "Release"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "Release"

+# PROP Intermediate_Dir "Release"

+# 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/stlport" /D "_CONSOLE" /D "NDEBUG" /D "WIN32_LEAN_AND_MEAN" /FD /c

+# SUBTRACT CPP /Fr /YX

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# 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 /IGNORE:4089

+# SUBTRACT LINK32 /debug /nodefaultlib

+

+!ELSEIF  "$(CFG)" == "Ice.nrvo.server.exe - Win32 Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "Debug"

+# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "Debug"

+# PROP Intermediate_Dir "Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c

+# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I "." /I "../../../include" /I "../../../include/stlport" /D "_CONSOLE" /D "_DEBUG" /D "WIN32_LEAN_AND_MEAN" /FD /GZ /c

+# SUBTRACT CPP /Fr /YX

+# ADD BASE RSC /l 0x409 /d "_DEBUG"

+# ADD RSC /l 0x409 /d "_DEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# 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 /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 Iced.lib IceUtild.lib setargv.obj /nologo /subsystem:console /debug /machine:I386 /out:"server.exe" /pdbtype:sept /libpath:"../../../lib" /FIXED:no

+# SUBTRACT LINK32 /pdb:none

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Ice.nrvo.server.exe - Win32 Release"

+# Name "Ice.nrvo.server.exe - Win32 Debug"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

+# Begin Source File

+

+SOURCE=.\MyStringSeq.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Nrvo.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\NrvoI.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Server.cpp

+# End Source File

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter "h;hpp;hxx;hm;inl"

+# Begin Source File

+

+SOURCE=.\Nrvo.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\NrvoI.h

+# End Source File

+# End Group

+# Begin Group "Resource Files"

+

+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

+# Begin Source File

+

+SOURCE=.\Nrvo.ice

+

+!IF  "$(CFG)" == "Ice.nrvo.server.exe - Win32 Release"

+

+USERDEP__NRVO_="..\..\..\bin\slice2cpp.exe"	"..\..\..\lib\slice.lib"	

+# Begin Custom Build

+InputPath=.\Nrvo.ice

+

+BuildCmds= \

+	..\..\..\bin\slice2cpp.exe Nrvo.ice

+

+"Nrvo.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"Nrvo.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

+!ELSEIF  "$(CFG)" == "Ice.nrvo.server.exe - Win32 Debug"

+

+USERDEP__NRVO_="..\..\..\bin\slice2cpp.exe"	"..\..\..\lib\sliced.lib"	

+# Begin Custom Build

+InputPath=.\Nrvo.ice

+

+BuildCmds= \

+	..\..\..\bin\slice2cpp.exe Nrvo.ice

+

+"Nrvo.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"Nrvo.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

+!ENDIF 

+

+# End Source File

+# End Group

+# Begin Source File

+

+SOURCE=.\README

+# End Source File

+# End Target

+# End Project

diff --git a/cpp/demo/Ice/nrvo/MyStringSeq.h b/cpp/demo/Ice/nrvo/MyStringSeq.h
index 888abfb78d0..54e057a7836 100644
--- a/cpp/demo/Ice/nrvo/MyStringSeq.h
+++ b/cpp/demo/Ice/nrvo/MyStringSeq.h
@@ -10,6 +10,7 @@
 #ifndef MY_STRING_SEQ
 #define MY_STRING_SEQ
 
+#include <IceUtil/Config.h>
 #include <vector>
 #include <string>
 
diff --git a/cpp/demo/demo.dsw b/cpp/demo/demo.dsw
index 25c13066c27..4afb0d16369 100755
--- a/cpp/demo/demo.dsw
+++ b/cpp/demo/demo.dsw
@@ -585,6 +585,33 @@ Package=<4>
 

 ###############################################################################

 

+Project: "Ice.nrvo.client.exe"=.\Ice\nrvo\Ice.nrvo.client.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name Ice.nrvo.server.exe

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Ice.nrvo.server.exe"=.\Ice\nrvo\Ice.nrvo.server.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

 Project: "Ice.session.client.exe"=.\Ice\session\Ice.session.client.dsp - Package Owner=<4>

 

 Package=<5>

@@ -1238,6 +1265,12 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name IceUtil.workqueue.exe

     End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name Ice.nrvo.client.exe

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name Ice.nrvo.server.exe

+    End Project Dependency

 }}}

 

 ###############################################################################