Win32 fixes

2 files changed, 274 insertions, 3 deletions

diff --git a/cpp/src/Transform/Data.cpp b/cpp/src/Transform/Data.cpp
index 0b62d6f0b5f..8793320aafe 100644
--- a/cpp/src/Transform/Data.cpp
+++ b/cpp/src/Transform/Data.cpp
@@ -1055,7 +1055,7 @@ Transform::IntegerData::doubleValue(bool convert) const
 {
     if(convert)
     {
-        return _value;
+        return static_cast<double>(_value);
     }
     else
     {
@@ -1509,7 +1509,7 @@ bool
 Transform::StringData::booleanValue(bool) const
 {
     _errorReporter->error("string cannot be converted to boolean");
-    return 0;
+    return false;
 }
 
 Ice::Long
@@ -2348,7 +2348,7 @@ Transform::EnumData::set(const DataPtr& value, DataInterceptor& interceptor, boo
         }
         else
         {
-            _value = v;
+            _value = static_cast<Ice::Int>(v);
             _name.clear();
         }
     }
diff --git a/cpp/src/Transform/transform.dsp b/cpp/src/Transform/transform.dsp
new file mode 100644
index 00000000000..e91305ce580
--- /dev/null
+++ b/cpp/src/Transform/transform.dsp
@@ -0,0 +1,271 @@
+# Microsoft Developer Studio Project File - Name="Transform" - Package Owner=<4>

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

+# ** DO NOT EDIT **

+

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

+

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

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

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

+!MESSAGE "Transform - 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)" == "Transform - 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 "_USRDLL" /D "TRANSFORM_API_EXPORTS" /D "NDEBUG" /D "_CONSOLE" /D "_UNICODE" /FD /c

+# SUBTRACT CPP /Fr /YX

+# 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 /nologo /dll /machine:I386 /out:"Release/transform12.dll" /implib:"Release/transform.lib" /libpath:"../../../lib"

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

+# Begin Special Build Tool

+OutDir=.\Release

+SOURCE="$(InputPath)"

+PostBuild_Cmds=copy $(OutDir)\transform.lib ..\..\lib	copy $(OutDir)\transform12.dll ..\..\bin

+# End Special Build Tool

+

+!ELSEIF  "$(CFG)" == "Transform - 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 "_USRDLL" /D "TRANSFORM_API_EXPORTS" /D "_DEBUG" /D "_CONSOLE" /D "_UNICODE" /FD /GZ /c

+# SUBTRACT CPP /Fr /YX

+# 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

+# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/transform12d.dll" /implib:"Debug/transformd.lib" /libpath:"../../../lib"

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+# Begin Special Build Tool

+OutDir=.\Debug

+SOURCE="$(InputPath)"

+PostBuild_Cmds=copy $(OutDir)\transformd.lib ..\..\lib	copy $(OutDir)\transform12d.pdb ..\..\bin	copy $(OutDir)\transform12d.dll ..\..\bin

+# End Special Build Tool

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Transform - Win32 Release"

+# Name "Transform - Win32 Debug"

+# Begin Group "Source Files"

+

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

+# Begin Source File

+

+SOURCE=.\Analyzer.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Data.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Error.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Exception.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Grammar.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Node.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Parser.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Scanner.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Transformer.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\TransformUtil.cpp

+# End Source File

+# End Group

+# Begin Group "Header Files"

+

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

+# Begin Source File

+

+SOURCE=..\..\include\Transform\Transformer.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\include\Transform\Exception.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Analyzer.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Data.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Error.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Grammar.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\GrammarUtil.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Node.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Parser.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\TransformUtil.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=.\Grammar.y

+

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

+

+# Begin Custom Build

+InputPath=.\Grammar.y

+

+BuildCmds= \

+	bison -dvt Grammar.y \

+	move Grammar.tab.c Grammar.cpp \

+	move Grammar.tab.h Grammar.h \

+	

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+# End Custom Build

+

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

+

+# Begin Custom Build

+InputPath=.\Grammar.y

+

+BuildCmds= \

+	bison -dvt Grammar.y \

+	move Grammar.tab.c Grammar.cpp \

+	move Grammar.tab.h Grammar.h \

+	

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+# End Custom Build

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=.\Scanner.l

+

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

+

+# Begin Custom Build

+InputPath=.\Scanner.l

+

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

+	flex Scanner.l 

+	echo #include "IceUtil/Config.h" > Scanner.cpp 

+	type lex.yy.c >> Scanner.cpp 

+	

+# End Custom Build

+

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

+

+# Begin Custom Build

+InputPath=.\Scanner.l

+

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

+	flex Scanner.l 

+	echo #include "IceUtil/Config.h" > Scanner.cpp 

+	type lex.yy.c >> Scanner.cpp 

+	

+# End Custom Build

+

+!ENDIF 

+

+# End Source File

+# End Group

+# End Target

+# End Project