WIN32 updates.

5 files changed, 195 insertions, 7 deletions

diff --git a/cpp/all.dsw b/cpp/all.dsw
index 77fdf0e7b19..79ee9e270e9 100644
--- a/cpp/all.dsw
+++ b/cpp/all.dsw
@@ -198,6 +198,24 @@ Package=<4>
 

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

 

+Project: "IceXML"=.\src\IceXML\IceXML.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name Ice

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name IceUtil

+    End Project Dependency

+}}}

+

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

+

 Project: "Slice"=.\src\Slice\Slice.dsp - Package Owner=<4>

 

 Package=<5>

diff --git a/cpp/include/IceXML/StreamI.h b/cpp/include/IceXML/StreamI.h
index aff7adf872b..00c4bc9fca1 100644
--- a/cpp/include/IceXML/StreamI.h
+++ b/cpp/include/IceXML/StreamI.h
@@ -36,10 +36,10 @@ namespace IceXML
 //
 struct StreamInputImpl;
 
-class ICE_XML_API StreamI : public Ice::Stream
+class ICE_XML_API StreamI : public ::Ice::Stream
 {
     StreamI();
-    StreamI(const Stream&);
+    StreamI(const StreamI&);
     void operator=(const StreamI&);
 
 public:
diff --git a/cpp/src/Ice/ice.dsp b/cpp/src/Ice/ice.dsp
index 4f934328839..c20cd525ea3 100644
--- a/cpp/src/Ice/ice.dsp
+++ b/cpp/src/Ice/ice.dsp
@@ -356,10 +356,6 @@ SOURCE=.\Stream.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\StreamI.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\SUdpClient.cpp

 # End Source File

 # Begin Source File

@@ -928,6 +924,49 @@ SOURCE=.\UserExceptionFactoryManagerF.h
 # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

 # Begin Source File

 

+SOURCE=..\..\slice\Ice\BuiltinSequences.ice

+

+!IF  "$(CFG)" == "Ice - Win32 Release"

+

+# Begin Custom Build

+InputPath=..\..\slice\Ice\BuiltinSequences.ice

+

+BuildCmds= \

+	set PATH=%PATH%;..\..\lib \

+	..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/BuiltinSequences.ice \

+	move BuiltinSequences.h. ..\..\include\Ice \

+	

+

+"..\..\include\Ice\BuiltinSequences.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+# End Custom Build

+

+!ELSEIF  "$(CFG)" == "Ice - Win32 Debug"

+

+# Begin Custom Build

+InputPath=..\..\slice\Ice\BuiltinSequences.ice

+

+BuildCmds= \

+	set PATH=%PATH%;..\..\lib \

+	..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/BuiltinSequences.ice \

+	move BuiltinSequences.h. ..\..\include\Ice \

+	

+

+"..\..\include\Ice\BuiltinSequences.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+# End Custom Build

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\slice\Ice\Communicator.ice

 

 !IF  "$(CFG)" == "Ice - Win32 Release"

diff --git a/cpp/src/IceXML/StreamI.cpp b/cpp/src/IceXML/StreamI.cpp
index 82f30514ca7..5123b9749e2 100644
--- a/cpp/src/IceXML/StreamI.cpp
+++ b/cpp/src/IceXML/StreamI.cpp
@@ -837,7 +837,7 @@ IceXML::StreamI::readFloat(const string& name, ::Ice::Float& value)
     }
 
     string s = toString(child.getNodeValue());
-    value = atof(s.c_str());
+    value = (::Ice::Float)atof(s.c_str());
 
     endRead();
 }
diff --git a/cpp/src/IceXML/icexml.dsp b/cpp/src/IceXML/icexml.dsp
new file mode 100644
index 00000000000..6c08eadb5be
--- /dev/null
+++ b/cpp/src/IceXML/icexml.dsp
@@ -0,0 +1,131 @@
+# Microsoft Developer Studio Project File - Name="IceXML" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

+

+CFG=IceXML - 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 "IceXML.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 "IceXML.mak" CFG="IceXML - Win32 Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "IceXML - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "IceXML - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+CPP=cl.exe

+MTL=midl.exe

+RSC=rc.exe

+

+!IF  "$(CFG)" == "IceXML - 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 /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBRARY_EXPORTS" /Yu"stdafx.h" /FD /c

+# ADD CPP /nologo /MD /W3 /WX /GR /GX /O2 /I ".." /I "../../include" /D "WIN32" /D "_UNICODE" /D "NDEBUG" /D "_CONSOLE" /D "_USRDLL" /D "ICE_XML_API_EXPORTS" /YX /FD /c

+# SUBTRACT CPP /Fr

+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

+# 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 /nologo /dll /machine:I386

+# ADD LINK32 xerces-c_1.lib /nologo /dll /machine:I386 /out:"Release/icexml001.dll"

+# SUBTRACT LINK32 /pdb:none /debug /nodefaultlib

+# Begin Special Build Tool

+SOURCE="$(InputPath)"

+PostBuild_Cmds=copy Release\icexml001.* ..\..\lib

+# End Special Build Tool

+

+!ELSEIF  "$(CFG)" == "IceXML - 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 /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBRARY_EXPORTS" /Yu"stdafx.h" /FD /GZ /c

+# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I ".." /I "../../include" /D "WIN32" /D "_UNICODE" /D "_DEBUG" /D "_CONSOLE" /D "_USRDLL" /D "ICE_XML_API_EXPORTS" /YX /FD /GZ /c

+# SUBTRACT CPP /Fr

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

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

+# ADD LINK32 xerces-c_1D.lib /nologo /dll /debug /machine:I386 /out:"Debug/icexml001d.dll" /pdbtype:sept

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+# Begin Special Build Tool

+SOURCE="$(InputPath)"

+PostBuild_Cmds=copy Debug\icexml001d.* ..\..\lib

+# End Special Build Tool

+

+!ENDIF 

+

+# Begin Target

+

+# Name "IceXML - Win32 Release"

+# Name "IceXML - Win32 Debug"

+# Begin Group "Source Files"

+

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

+# Begin Source File

+

+SOURCE=.\Output.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\StreamI.cpp

+# End Source File

+# End Group

+# Begin Group "Header Files"

+

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

+# Begin Source File

+

+SOURCE=..\..\include\IceXML\Output.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\include\IceXML\StreamI.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"

+# End Group

+# End Target

+# End Project