Fixed windows builds

6 files changed, 628 insertions, 38 deletions

diff --git a/cppe/src/IceE/ice.dsp b/cppe/src/IceE/ice.dsp
index 5604a0e53f9..73456202b47 100755
--- a/cppe/src/IceE/ice.dsp
+++ b/cppe/src/IceE/ice.dsp
@@ -116,8 +116,8 @@ PostBuild_Cmds=copy $(OutDir)\iceed.lib ..\..\lib\	copy $(OutDir)\icee11d.pdb ..
 # PROP Intermediate_Dir "ReleaseStatic"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-SLICE2CPPEFLAGS=-DICEE

 MTL=midl.exe

+SLICE2CPPEFLAGS=-DICEE

 CPP=cl.exe

 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_LIB" /Yu"stdafx.h" /FD /c

 # ADD CPP /nologo /MD /W3 /WX /GR /GX /O1 /I ".." /I "../../include" /D "NDEBUG" /D "ICEE_STATIC_LIBS" /D "_LIB" /D "WIN32_LEAN_AND_MEAN" /D FD_SETSIZE=1024 /D "_CONSOLE" /FD /c

@@ -133,7 +133,7 @@ LIB32=link.exe -lib
 # Begin Special Build Tool

 OutDir=.\ReleaseStatic

 SOURCE="$(InputPath)"

-PostBuild_Cmds=copy                                         $(OutDir)\icee.lib                                         ..\..\lib\ 

+PostBuild_Cmds=copy                                          $(OutDir)\icee.lib                                          ..\..\lib\ 

 # End Special Build Tool

 

 !ELSEIF  "$(CFG)" == "ice - Win32 Debug Static"

@@ -149,8 +149,8 @@ PostBuild_Cmds=copy                                         $(OutDir)\icee.lib
 # PROP Intermediate_Dir "DebugStatic"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-SLICE2CPPEFLAGS=-DICEE

 MTL=midl.exe

+SLICE2CPPEFLAGS=-DICEE

 CPP=cl.exe

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_LIB" /Yu"stdafx.h" /FD /GZ /c

 # ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I ".." /I "../../include" /D "_DEBUG" /D "ICEE_STATIC_LIBS" /D "_LIB" /D "WIN32_LEAN_AND_MEAN" /D FD_SETSIZE=1024 /D "_CONSOLE" /FD /GZ /c

@@ -166,7 +166,7 @@ LIB32=link.exe -lib
 # Begin Special Build Tool

 OutDir=.\DebugStatic

 SOURCE="$(InputPath)"

-PostBuild_Cmds=copy                                        $(OutDir)\iceed.lib                                        ..\..\lib\ 

+PostBuild_Cmds=copy                                         $(OutDir)\iceed.lib                                         ..\..\lib\ 

 # End Special Build Tool

 

 !ENDIF 

@@ -382,6 +382,10 @@ SOURCE=.\StaticMutex.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\StringConverter.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\StringUtil.cpp

 # End Source File

 # Begin Source File

diff --git a/cppe/src/IceE/ice.vcp b/cppe/src/IceE/ice.vcp
index 938d2839d56..6d67f0b278e 100755
--- a/cppe/src/IceE/ice.vcp
+++ b/cppe/src/IceE/ice.vcp
@@ -12430,51 +12430,338 @@ DEP_CPP_STATI=\
 # End Source File

 # Begin Source File

 

-SOURCE=.\StringUtil.cpp

+SOURCE=.\StringConverter.cpp

 

 !IF  "$(CFG)" == "ice - Win32 (WCE emulator) Release"

 

 DEP_CPP_STRIN=\

+	"..\..\include\IceE\AutoArray.h"\

+	"..\..\include\IceE\BasicStream.h"\

+	"..\..\include\IceE\Buffer.h"\

+	"..\..\include\IceE\BuiltinSequences.h"\

+	"..\..\include\IceE\CommunicatorF.h"\

 	"..\..\include\IceE\Config.h"\

+	"..\..\include\IceE\ConnectionF.h"\

+	"..\..\include\IceE\Exception.h"\

 	"..\..\include\IceE\ExceptionBase.h"\

-	"..\..\include\IceE\StringUtil.h"\

+	"..\..\include\IceE\Handle.h"\

+	"..\..\include\IceE\Identity.h"\

+	"..\..\include\IceE\LocalException.h"\

+	"..\..\include\IceE\LocalObject.h"\

+	"..\..\include\IceE\LocalObjectF.h"\

+	"..\..\include\IceE\Lock.h"\

+	"..\..\include\IceE\Mutex.h"\

+	"..\..\include\IceE\ObjectF.h"\

+	"..\..\include\IceE\OperationMode.h"\

+	"..\..\include\IceE\Outgoing.h"\

+	"..\..\include\IceE\Protocol.h"\

+	"..\..\include\IceE\Proxy.h"\

+	"..\..\include\IceE\ProxyF.h"\

+	"..\..\include\IceE\ProxyFactoryF.h"\

+	"..\..\include\IceE\ProxyHandle.h"\

+	"..\..\include\IceE\ReferenceF.h"\

+	"..\..\include\IceE\Shared.h"\

+	"..\..\include\IceE\StringConverter.h"\

+	"..\..\include\IceE\ThreadException.h"\

+	"..\..\include\IceE\UndefSysMacros.h"\

+	"..\..\include\IceE\Unicode.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ice - Win32 (WCE emulator) Debug"

 

 DEP_CPP_STRIN=\

+	"..\..\include\IceE\AutoArray.h"\

+	"..\..\include\IceE\BasicStream.h"\

+	"..\..\include\IceE\Buffer.h"\

+	"..\..\include\IceE\BuiltinSequences.h"\

+	"..\..\include\IceE\CommunicatorF.h"\

 	"..\..\include\IceE\Config.h"\

+	"..\..\include\IceE\ConnectionF.h"\

+	"..\..\include\IceE\Exception.h"\

 	"..\..\include\IceE\ExceptionBase.h"\

-	"..\..\include\IceE\StringUtil.h"\

+	"..\..\include\IceE\Handle.h"\

+	"..\..\include\IceE\Identity.h"\

+	"..\..\include\IceE\LocalException.h"\

+	"..\..\include\IceE\LocalObject.h"\

+	"..\..\include\IceE\LocalObjectF.h"\

+	"..\..\include\IceE\Lock.h"\

+	"..\..\include\IceE\Mutex.h"\

+	"..\..\include\IceE\ObjectF.h"\

+	"..\..\include\IceE\OperationMode.h"\

+	"..\..\include\IceE\Outgoing.h"\

+	"..\..\include\IceE\Protocol.h"\

+	"..\..\include\IceE\Proxy.h"\

+	"..\..\include\IceE\ProxyF.h"\

+	"..\..\include\IceE\ProxyFactoryF.h"\

+	"..\..\include\IceE\ProxyHandle.h"\

+	"..\..\include\IceE\ReferenceF.h"\

+	"..\..\include\IceE\Shared.h"\

+	"..\..\include\IceE\StringConverter.h"\

+	"..\..\include\IceE\ThreadException.h"\

+	"..\..\include\IceE\UndefSysMacros.h"\

+	"..\..\include\IceE\Unicode.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ice - Win32 (WCE ARMV4) Release"

 

 DEP_CPP_STRIN=\

+	"..\..\include\IceE\AutoArray.h"\

+	"..\..\include\IceE\BasicStream.h"\

+	"..\..\include\IceE\Buffer.h"\

+	"..\..\include\IceE\BuiltinSequences.h"\

+	"..\..\include\IceE\CommunicatorF.h"\

 	"..\..\include\IceE\Config.h"\

+	"..\..\include\IceE\ConnectionF.h"\

+	"..\..\include\IceE\Exception.h"\

 	"..\..\include\IceE\ExceptionBase.h"\

-	"..\..\include\IceE\StringUtil.h"\

+	"..\..\include\IceE\Handle.h"\

+	"..\..\include\IceE\Identity.h"\

+	"..\..\include\IceE\LocalException.h"\

+	"..\..\include\IceE\LocalObject.h"\

+	"..\..\include\IceE\LocalObjectF.h"\

+	"..\..\include\IceE\Lock.h"\

+	"..\..\include\IceE\Mutex.h"\

+	"..\..\include\IceE\ObjectF.h"\

+	"..\..\include\IceE\OperationMode.h"\

+	"..\..\include\IceE\Outgoing.h"\

+	"..\..\include\IceE\Protocol.h"\

+	"..\..\include\IceE\Proxy.h"\

+	"..\..\include\IceE\ProxyF.h"\

+	"..\..\include\IceE\ProxyFactoryF.h"\

+	"..\..\include\IceE\ProxyHandle.h"\

+	"..\..\include\IceE\ReferenceF.h"\

+	"..\..\include\IceE\Shared.h"\

+	"..\..\include\IceE\StringConverter.h"\

+	"..\..\include\IceE\ThreadException.h"\

+	"..\..\include\IceE\UndefSysMacros.h"\

+	"..\..\include\IceE\Unicode.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ice - Win32 (WCE ARMV4) Debug"

 

 DEP_CPP_STRIN=\

+	"..\..\include\IceE\AutoArray.h"\

+	"..\..\include\IceE\BasicStream.h"\

+	"..\..\include\IceE\Buffer.h"\

+	"..\..\include\IceE\BuiltinSequences.h"\

+	"..\..\include\IceE\CommunicatorF.h"\

 	"..\..\include\IceE\Config.h"\

+	"..\..\include\IceE\ConnectionF.h"\

+	"..\..\include\IceE\Exception.h"\

 	"..\..\include\IceE\ExceptionBase.h"\

-	"..\..\include\IceE\StringUtil.h"\

+	"..\..\include\IceE\Handle.h"\

+	"..\..\include\IceE\Identity.h"\

+	"..\..\include\IceE\LocalException.h"\

+	"..\..\include\IceE\LocalObject.h"\

+	"..\..\include\IceE\LocalObjectF.h"\

+	"..\..\include\IceE\Lock.h"\

+	"..\..\include\IceE\Mutex.h"\

+	"..\..\include\IceE\ObjectF.h"\

+	"..\..\include\IceE\OperationMode.h"\

+	"..\..\include\IceE\Outgoing.h"\

+	"..\..\include\IceE\Protocol.h"\

+	"..\..\include\IceE\Proxy.h"\

+	"..\..\include\IceE\ProxyF.h"\

+	"..\..\include\IceE\ProxyFactoryF.h"\

+	"..\..\include\IceE\ProxyHandle.h"\

+	"..\..\include\IceE\ReferenceF.h"\

+	"..\..\include\IceE\Shared.h"\

+	"..\..\include\IceE\StringConverter.h"\

+	"..\..\include\IceE\ThreadException.h"\

+	"..\..\include\IceE\UndefSysMacros.h"\

+	"..\..\include\IceE\Unicode.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ice - Win32 (WCE ARMV4) Debug Static"

 

 DEP_CPP_STRIN=\

+	"..\..\include\IceE\AutoArray.h"\

+	"..\..\include\IceE\BasicStream.h"\

+	"..\..\include\IceE\Buffer.h"\

+	"..\..\include\IceE\BuiltinSequences.h"\

+	"..\..\include\IceE\CommunicatorF.h"\

 	"..\..\include\IceE\Config.h"\

+	"..\..\include\IceE\ConnectionF.h"\

+	"..\..\include\IceE\Exception.h"\

 	"..\..\include\IceE\ExceptionBase.h"\

-	"..\..\include\IceE\StringUtil.h"\

+	"..\..\include\IceE\Handle.h"\

+	"..\..\include\IceE\Identity.h"\

+	"..\..\include\IceE\LocalException.h"\

+	"..\..\include\IceE\LocalObject.h"\

+	"..\..\include\IceE\LocalObjectF.h"\

+	"..\..\include\IceE\Lock.h"\

+	"..\..\include\IceE\Mutex.h"\

+	"..\..\include\IceE\ObjectF.h"\

+	"..\..\include\IceE\OperationMode.h"\

+	"..\..\include\IceE\Outgoing.h"\

+	"..\..\include\IceE\Protocol.h"\

+	"..\..\include\IceE\Proxy.h"\

+	"..\..\include\IceE\ProxyF.h"\

+	"..\..\include\IceE\ProxyFactoryF.h"\

+	"..\..\include\IceE\ProxyHandle.h"\

+	"..\..\include\IceE\ReferenceF.h"\

+	"..\..\include\IceE\Shared.h"\

+	"..\..\include\IceE\StringConverter.h"\

+	"..\..\include\IceE\ThreadException.h"\

+	"..\..\include\IceE\UndefSysMacros.h"\

+	"..\..\include\IceE\Unicode.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ice - Win32 (WCE ARMV4) Release Static"

 

 DEP_CPP_STRIN=\

+	"..\..\include\IceE\AutoArray.h"\

+	"..\..\include\IceE\BasicStream.h"\

+	"..\..\include\IceE\Buffer.h"\

+	"..\..\include\IceE\BuiltinSequences.h"\

+	"..\..\include\IceE\CommunicatorF.h"\

+	"..\..\include\IceE\Config.h"\

+	"..\..\include\IceE\ConnectionF.h"\

+	"..\..\include\IceE\Exception.h"\

+	"..\..\include\IceE\ExceptionBase.h"\

+	"..\..\include\IceE\Handle.h"\

+	"..\..\include\IceE\Identity.h"\

+	"..\..\include\IceE\LocalException.h"\

+	"..\..\include\IceE\LocalObject.h"\

+	"..\..\include\IceE\LocalObjectF.h"\

+	"..\..\include\IceE\Lock.h"\

+	"..\..\include\IceE\Mutex.h"\

+	"..\..\include\IceE\ObjectF.h"\

+	"..\..\include\IceE\OperationMode.h"\

+	"..\..\include\IceE\Outgoing.h"\

+	"..\..\include\IceE\Protocol.h"\

+	"..\..\include\IceE\Proxy.h"\

+	"..\..\include\IceE\ProxyF.h"\

+	"..\..\include\IceE\ProxyFactoryF.h"\

+	"..\..\include\IceE\ProxyHandle.h"\

+	"..\..\include\IceE\ReferenceF.h"\

+	"..\..\include\IceE\Shared.h"\

+	"..\..\include\IceE\StringConverter.h"\

+	"..\..\include\IceE\ThreadException.h"\

+	"..\..\include\IceE\UndefSysMacros.h"\

+	"..\..\include\IceE\Unicode.h"\

+	

+

+!ELSEIF  "$(CFG)" == "ice - Win32 (WCE emulator) Debug Static"

+

+DEP_CPP_STRIN=\

+	"..\..\include\IceE\AutoArray.h"\

+	"..\..\include\IceE\BasicStream.h"\

+	"..\..\include\IceE\Buffer.h"\

+	"..\..\include\IceE\BuiltinSequences.h"\

+	"..\..\include\IceE\CommunicatorF.h"\

+	"..\..\include\IceE\Config.h"\

+	"..\..\include\IceE\ConnectionF.h"\

+	"..\..\include\IceE\Exception.h"\

+	"..\..\include\IceE\ExceptionBase.h"\

+	"..\..\include\IceE\Handle.h"\

+	"..\..\include\IceE\Identity.h"\

+	"..\..\include\IceE\LocalException.h"\

+	"..\..\include\IceE\LocalObject.h"\

+	"..\..\include\IceE\LocalObjectF.h"\

+	"..\..\include\IceE\Lock.h"\

+	"..\..\include\IceE\Mutex.h"\

+	"..\..\include\IceE\ObjectF.h"\

+	"..\..\include\IceE\OperationMode.h"\

+	"..\..\include\IceE\Outgoing.h"\

+	"..\..\include\IceE\Protocol.h"\

+	"..\..\include\IceE\Proxy.h"\

+	"..\..\include\IceE\ProxyF.h"\

+	"..\..\include\IceE\ProxyFactoryF.h"\

+	"..\..\include\IceE\ProxyHandle.h"\

+	"..\..\include\IceE\ReferenceF.h"\

+	"..\..\include\IceE\Shared.h"\

+	"..\..\include\IceE\StringConverter.h"\

+	"..\..\include\IceE\ThreadException.h"\

+	"..\..\include\IceE\UndefSysMacros.h"\

+	"..\..\include\IceE\Unicode.h"\

+	

+

+!ELSEIF  "$(CFG)" == "ice - Win32 (WCE emulator) Release Static"

+

+DEP_CPP_STRIN=\

+	"..\..\include\IceE\AutoArray.h"\

+	"..\..\include\IceE\BasicStream.h"\

+	"..\..\include\IceE\Buffer.h"\

+	"..\..\include\IceE\BuiltinSequences.h"\

+	"..\..\include\IceE\CommunicatorF.h"\

+	"..\..\include\IceE\Config.h"\

+	"..\..\include\IceE\ConnectionF.h"\

+	"..\..\include\IceE\Exception.h"\

+	"..\..\include\IceE\ExceptionBase.h"\

+	"..\..\include\IceE\Handle.h"\

+	"..\..\include\IceE\Identity.h"\

+	"..\..\include\IceE\LocalException.h"\

+	"..\..\include\IceE\LocalObject.h"\

+	"..\..\include\IceE\LocalObjectF.h"\

+	"..\..\include\IceE\Lock.h"\

+	"..\..\include\IceE\Mutex.h"\

+	"..\..\include\IceE\ObjectF.h"\

+	"..\..\include\IceE\OperationMode.h"\

+	"..\..\include\IceE\Outgoing.h"\

+	"..\..\include\IceE\Protocol.h"\

+	"..\..\include\IceE\Proxy.h"\

+	"..\..\include\IceE\ProxyF.h"\

+	"..\..\include\IceE\ProxyFactoryF.h"\

+	"..\..\include\IceE\ProxyHandle.h"\

+	"..\..\include\IceE\ReferenceF.h"\

+	"..\..\include\IceE\Shared.h"\

+	"..\..\include\IceE\StringConverter.h"\

+	"..\..\include\IceE\ThreadException.h"\

+	"..\..\include\IceE\UndefSysMacros.h"\

+	"..\..\include\IceE\Unicode.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=.\StringUtil.cpp

+

+!IF  "$(CFG)" == "ice - Win32 (WCE emulator) Release"

+

+DEP_CPP_STRING=\

+	"..\..\include\IceE\Config.h"\

+	"..\..\include\IceE\ExceptionBase.h"\

+	"..\..\include\IceE\StringUtil.h"\

+	

+

+!ELSEIF  "$(CFG)" == "ice - Win32 (WCE emulator) Debug"

+

+DEP_CPP_STRING=\

+	"..\..\include\IceE\Config.h"\

+	"..\..\include\IceE\ExceptionBase.h"\

+	"..\..\include\IceE\StringUtil.h"\

+	

+

+!ELSEIF  "$(CFG)" == "ice - Win32 (WCE ARMV4) Release"

+

+DEP_CPP_STRING=\

+	"..\..\include\IceE\Config.h"\

+	"..\..\include\IceE\ExceptionBase.h"\

+	"..\..\include\IceE\StringUtil.h"\

+	

+

+!ELSEIF  "$(CFG)" == "ice - Win32 (WCE ARMV4) Debug"

+

+DEP_CPP_STRING=\

+	"..\..\include\IceE\Config.h"\

+	"..\..\include\IceE\ExceptionBase.h"\

+	"..\..\include\IceE\StringUtil.h"\

+	

+

+!ELSEIF  "$(CFG)" == "ice - Win32 (WCE ARMV4) Debug Static"

+

+DEP_CPP_STRING=\

+	"..\..\include\IceE\Config.h"\

+	"..\..\include\IceE\ExceptionBase.h"\

+	"..\..\include\IceE\StringUtil.h"\

+	

+

+!ELSEIF  "$(CFG)" == "ice - Win32 (WCE ARMV4) Release Static"

+

+DEP_CPP_STRING=\

 	"..\..\include\IceE\Config.h"\

 	"..\..\include\IceE\ExceptionBase.h"\

 	"..\..\include\IceE\StringUtil.h"\

@@ -12482,7 +12769,7 @@ DEP_CPP_STRIN=\
 

 !ELSEIF  "$(CFG)" == "ice - Win32 (WCE emulator) Debug Static"

 

-DEP_CPP_STRIN=\

+DEP_CPP_STRING=\

 	"..\..\include\IceE\Config.h"\

 	"..\..\include\IceE\ExceptionBase.h"\

 	"..\..\include\IceE\StringUtil.h"\

@@ -12490,7 +12777,7 @@ DEP_CPP_STRIN=\
 

 !ELSEIF  "$(CFG)" == "ice - Win32 (WCE emulator) Release Static"

 

-DEP_CPP_STRIN=\

+DEP_CPP_STRING=\

 	"..\..\include\IceE\Config.h"\

 	"..\..\include\IceE\ExceptionBase.h"\

 	"..\..\include\IceE\StringUtil.h"\

diff --git a/cppe/src/IceE/ice_CE.vcproj b/cppe/src/IceE/ice_CE.vcproj
index e45c5f5e995..2c5c3632031 100755
--- a/cppe/src/IceE/ice_CE.vcproj
+++ b/cppe/src/IceE/ice_CE.vcproj
@@ -4330,6 +4330,10 @@
 				</FileConfiguration>

 			</File>

 			<File

+				RelativePath=".\StringConverter.cpp"

+				>

+			</File>

+			<File

 				RelativePath="StringUtil.cpp"

 				>

 				<FileConfiguration

@@ -5115,11 +5119,11 @@
 				>

 			</File>

 			<File

-				RelativePath="..\..\include\IceE\Config.h"

+				RelativePath="..\..\include\IceUtil\Config.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\include\IceUtil\Config.h"

+				RelativePath="..\..\include\IceE\Config.h"

 				>

 			</File>

 			<File

@@ -5171,11 +5175,11 @@
 				>

 			</File>

 			<File

-				RelativePath="..\..\include\IceE\Exception.h"

+				RelativePath="..\..\include\IceUtil\Exception.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\include\IceUtil\Exception.h"

+				RelativePath="..\..\include\IceE\Exception.h"

 				>

 			</File>

 			<File

@@ -5191,19 +5195,19 @@
 				>

 			</File>

 			<File

-				RelativePath="..\..\include\IceE\Functional.h"

+				RelativePath="..\..\include\IceUtil\Functional.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\include\IceUtil\Functional.h"

+				RelativePath="..\..\include\IceE\Functional.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\include\IceE\Handle.h"

+				RelativePath="..\..\include\IceUtil\Handle.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\include\IceUtil\Handle.h"

+				RelativePath="..\..\include\IceE\Handle.h"

 				>

 			</File>

 			<File

diff --git a/cppe/src/IceEC/icec.dsp b/cppe/src/IceEC/icec.dsp
index 17a668a11e8..6aa44727402 100755
--- a/cppe/src/IceEC/icec.dsp
+++ b/cppe/src/IceEC/icec.dsp
@@ -116,8 +116,8 @@ PostBuild_Cmds=copy $(OutDir)\iceecd.lib ..\..\lib\	copy $(OutDir)\iceec11d.pdb
 # PROP Intermediate_Dir "ReleaseStatic"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-SLICE2CPPEFLAGS=-DICEE

 MTL=midl.exe

+SLICE2CPPEFLAGS=-DICEE

 CPP=cl.exe

 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_LIB" /Yu"stdafx.h" /FD /c

 # ADD CPP /nologo /MD /W3 /WX /GR /GX /O1 /I ".." /I "../../include" /D "NDEBUG" /D "ICEE_STATIC_LIBS" /D "_LIB" /D "WIN32_LEAN_AND_MEAN" /D FD_SETSIZE=1024 /D "_CONSOLE" /D "ICEE_PURE_CLIENT" /FD /c

@@ -133,7 +133,7 @@ LIB32=link.exe -lib
 # Begin Special Build Tool

 OutDir=.\ReleaseStatic

 SOURCE="$(InputPath)"

-PostBuild_Cmds=copy                                               $(OutDir)\iceec.lib                                               ..\..\lib\ 

+PostBuild_Cmds=copy                                                $(OutDir)\iceec.lib                                                ..\..\lib\ 

 # End Special Build Tool

 

 !ELSEIF  "$(CFG)" == "icec - Win32 Debug Static"

@@ -149,8 +149,8 @@ PostBuild_Cmds=copy                                               $(OutDir)\icee
 # PROP Intermediate_Dir "DebugStatic"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-SLICE2CPPEFLAGS=-DICEE

 MTL=midl.exe

+SLICE2CPPEFLAGS=-DICEE

 CPP=cl.exe

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_LIB" /Yu"stdafx.h" /FD /GZ /c

 # ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I ".." /I "../../include" /D "_DEBUG" /D "ICEE_STATIC_LIBS" /D "_LIB" /D "WIN32_LEAN_AND_MEAN" /D FD_SETSIZE=1024 /D "_CONSOLE" /D "ICEE_PURE_CLIENT" /FD /GZ /c

@@ -166,7 +166,7 @@ LIB32=link.exe -lib
 # Begin Special Build Tool

 OutDir=.\DebugStatic

 SOURCE="$(InputPath)"

-PostBuild_Cmds=copy                                              $(OutDir)\iceecd.lib                                              ..\..\lib\ 

+PostBuild_Cmds=copy                                               $(OutDir)\iceecd.lib                                               ..\..\lib\ 

 # End Special Build Tool

 

 !ENDIF 

@@ -350,6 +350,10 @@ SOURCE=..\IceE\StaticMutex.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=..\IceE\StringConverter.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=..\IceE\StringUtil.cpp

 # End Source File

 # Begin Source File

diff --git a/cppe/src/IceEC/icec.vcp b/cppe/src/IceEC/icec.vcp
index 37dd0cdc477..4759406e9fe 100755
--- a/cppe/src/IceEC/icec.vcp
+++ b/cppe/src/IceEC/icec.vcp
@@ -21251,15 +21251,302 @@ DEP_CPP_STATI=\
 # End Source File

 # Begin Source File

 

-SOURCE=..\IceE\StringUtil.cpp

+SOURCE=..\IceE\StringConverter.cpp

 

 !IF  "$(CFG)" == "icec - Win32 (WCE emulator) Release"

 

 DEP_CPP_STRIN=\

+	"..\..\include\IceE\AutoArray.h"\

+	"..\..\include\IceE\BasicStream.h"\

+	"..\..\include\IceE\Buffer.h"\

+	"..\..\include\IceE\BuiltinSequences.h"\

+	"..\..\include\IceE\CommunicatorF.h"\

+	"..\..\include\IceE\Config.h"\

+	"..\..\include\IceE\ConnectionF.h"\

+	"..\..\include\IceE\Exception.h"\

+	"..\..\include\IceE\ExceptionBase.h"\

+	"..\..\include\IceE\Handle.h"\

+	"..\..\include\IceE\Identity.h"\

+	"..\..\include\IceE\LocalException.h"\

+	"..\..\include\IceE\LocalObject.h"\

+	"..\..\include\IceE\LocalObjectF.h"\

+	"..\..\include\IceE\Lock.h"\

+	"..\..\include\IceE\Mutex.h"\

+	"..\..\include\IceE\ObjectF.h"\

+	"..\..\include\IceE\OperationMode.h"\

+	"..\..\include\IceE\Outgoing.h"\

+	"..\..\include\IceE\Protocol.h"\

+	"..\..\include\IceE\Proxy.h"\

+	"..\..\include\IceE\ProxyF.h"\

+	"..\..\include\IceE\ProxyFactoryF.h"\

+	"..\..\include\IceE\ProxyHandle.h"\

+	"..\..\include\IceE\ReferenceF.h"\

+	"..\..\include\IceE\Shared.h"\

+	"..\..\include\IceE\StringConverter.h"\

+	"..\..\include\IceE\ThreadException.h"\

+	"..\..\include\IceE\UndefSysMacros.h"\

+	"..\..\include\IceE\Unicode.h"\

+	

+

+!ELSEIF  "$(CFG)" == "icec - Win32 (WCE emulator) Debug"

+

+DEP_CPP_STRIN=\

+	"..\..\include\IceE\AutoArray.h"\

+	"..\..\include\IceE\BasicStream.h"\

+	"..\..\include\IceE\Buffer.h"\

+	"..\..\include\IceE\BuiltinSequences.h"\

+	"..\..\include\IceE\CommunicatorF.h"\

+	"..\..\include\IceE\Config.h"\

+	"..\..\include\IceE\ConnectionF.h"\

+	"..\..\include\IceE\Exception.h"\

+	"..\..\include\IceE\ExceptionBase.h"\

+	"..\..\include\IceE\Handle.h"\

+	"..\..\include\IceE\Identity.h"\

+	"..\..\include\IceE\LocalException.h"\

+	"..\..\include\IceE\LocalObject.h"\

+	"..\..\include\IceE\LocalObjectF.h"\

+	"..\..\include\IceE\Lock.h"\

+	"..\..\include\IceE\Mutex.h"\

+	"..\..\include\IceE\ObjectF.h"\

+	"..\..\include\IceE\OperationMode.h"\

+	"..\..\include\IceE\Outgoing.h"\

+	"..\..\include\IceE\Protocol.h"\

+	"..\..\include\IceE\Proxy.h"\

+	"..\..\include\IceE\ProxyF.h"\

+	"..\..\include\IceE\ProxyFactoryF.h"\

+	"..\..\include\IceE\ProxyHandle.h"\

+	"..\..\include\IceE\ReferenceF.h"\

+	"..\..\include\IceE\Shared.h"\

+	"..\..\include\IceE\StringConverter.h"\

+	"..\..\include\IceE\ThreadException.h"\

+	"..\..\include\IceE\UndefSysMacros.h"\

+	"..\..\include\IceE\Unicode.h"\

+	

+

+!ELSEIF  "$(CFG)" == "icec - Win32 (WCE ARMV4) Release"

+

+DEP_CPP_STRIN=\

+	"..\..\include\IceE\AutoArray.h"\

+	"..\..\include\IceE\BasicStream.h"\

+	"..\..\include\IceE\Buffer.h"\

+	"..\..\include\IceE\BuiltinSequences.h"\

+	"..\..\include\IceE\CommunicatorF.h"\

+	"..\..\include\IceE\Config.h"\

+	"..\..\include\IceE\ConnectionF.h"\

+	"..\..\include\IceE\Exception.h"\

+	"..\..\include\IceE\ExceptionBase.h"\

+	"..\..\include\IceE\Handle.h"\

+	"..\..\include\IceE\Identity.h"\

+	"..\..\include\IceE\LocalException.h"\

+	"..\..\include\IceE\LocalObject.h"\

+	"..\..\include\IceE\LocalObjectF.h"\

+	"..\..\include\IceE\Lock.h"\

+	"..\..\include\IceE\Mutex.h"\

+	"..\..\include\IceE\ObjectF.h"\

+	"..\..\include\IceE\OperationMode.h"\

+	"..\..\include\IceE\Outgoing.h"\

+	"..\..\include\IceE\Protocol.h"\

+	"..\..\include\IceE\Proxy.h"\

+	"..\..\include\IceE\ProxyF.h"\

+	"..\..\include\IceE\ProxyFactoryF.h"\

+	"..\..\include\IceE\ProxyHandle.h"\

+	"..\..\include\IceE\ReferenceF.h"\

+	"..\..\include\IceE\Shared.h"\

+	"..\..\include\IceE\StringConverter.h"\

+	"..\..\include\IceE\ThreadException.h"\

+	"..\..\include\IceE\UndefSysMacros.h"\

+	"..\..\include\IceE\Unicode.h"\

+	

+

+!ELSEIF  "$(CFG)" == "icec - Win32 (WCE ARMV4) Debug"

+

+DEP_CPP_STRIN=\

+	"..\..\include\IceE\AutoArray.h"\

+	"..\..\include\IceE\BasicStream.h"\

+	"..\..\include\IceE\Buffer.h"\

+	"..\..\include\IceE\BuiltinSequences.h"\

+	"..\..\include\IceE\CommunicatorF.h"\

+	"..\..\include\IceE\Config.h"\

+	"..\..\include\IceE\ConnectionF.h"\

+	"..\..\include\IceE\Exception.h"\

+	"..\..\include\IceE\ExceptionBase.h"\

+	"..\..\include\IceE\Handle.h"\

+	"..\..\include\IceE\Identity.h"\

+	"..\..\include\IceE\LocalException.h"\

+	"..\..\include\IceE\LocalObject.h"\

+	"..\..\include\IceE\LocalObjectF.h"\

+	"..\..\include\IceE\Lock.h"\

+	"..\..\include\IceE\Mutex.h"\

+	"..\..\include\IceE\ObjectF.h"\

+	"..\..\include\IceE\OperationMode.h"\

+	"..\..\include\IceE\Outgoing.h"\

+	"..\..\include\IceE\Protocol.h"\

+	"..\..\include\IceE\Proxy.h"\

+	"..\..\include\IceE\ProxyF.h"\

+	"..\..\include\IceE\ProxyFactoryF.h"\

+	"..\..\include\IceE\ProxyHandle.h"\

+	"..\..\include\IceE\ReferenceF.h"\

+	"..\..\include\IceE\Shared.h"\

+	"..\..\include\IceE\StringConverter.h"\

+	"..\..\include\IceE\ThreadException.h"\

+	"..\..\include\IceE\UndefSysMacros.h"\

+	"..\..\include\IceE\Unicode.h"\

+	

+

+!ELSEIF  "$(CFG)" == "icec - Win32 (WCE ARMV4) Debug Static"

+

+DEP_CPP_STRIN=\

+	"..\..\include\IceE\AutoArray.h"\

+	"..\..\include\IceE\BasicStream.h"\

+	"..\..\include\IceE\Buffer.h"\

+	"..\..\include\IceE\BuiltinSequences.h"\

+	"..\..\include\IceE\CommunicatorF.h"\

+	"..\..\include\IceE\Config.h"\

+	"..\..\include\IceE\ConnectionF.h"\

+	"..\..\include\IceE\Exception.h"\

+	"..\..\include\IceE\ExceptionBase.h"\

+	"..\..\include\IceE\Handle.h"\

+	"..\..\include\IceE\Identity.h"\

+	"..\..\include\IceE\LocalException.h"\

+	"..\..\include\IceE\LocalObject.h"\

+	"..\..\include\IceE\LocalObjectF.h"\

+	"..\..\include\IceE\Lock.h"\

+	"..\..\include\IceE\Mutex.h"\

+	"..\..\include\IceE\ObjectF.h"\

+	"..\..\include\IceE\OperationMode.h"\

+	"..\..\include\IceE\Outgoing.h"\

+	"..\..\include\IceE\Protocol.h"\

+	"..\..\include\IceE\Proxy.h"\

+	"..\..\include\IceE\ProxyF.h"\

+	"..\..\include\IceE\ProxyFactoryF.h"\

+	"..\..\include\IceE\ProxyHandle.h"\

+	"..\..\include\IceE\ReferenceF.h"\

+	"..\..\include\IceE\Shared.h"\

+	"..\..\include\IceE\StringConverter.h"\

+	"..\..\include\IceE\ThreadException.h"\

+	"..\..\include\IceE\UndefSysMacros.h"\

+	"..\..\include\IceE\Unicode.h"\

+	

+

+!ELSEIF  "$(CFG)" == "icec - Win32 (WCE ARMV4) Release Static"

+

+DEP_CPP_STRIN=\

+	"..\..\include\IceE\AutoArray.h"\

+	"..\..\include\IceE\BasicStream.h"\

+	"..\..\include\IceE\Buffer.h"\

+	"..\..\include\IceE\BuiltinSequences.h"\

+	"..\..\include\IceE\CommunicatorF.h"\

+	"..\..\include\IceE\Config.h"\

+	"..\..\include\IceE\ConnectionF.h"\

+	"..\..\include\IceE\Exception.h"\

+	"..\..\include\IceE\ExceptionBase.h"\

+	"..\..\include\IceE\Handle.h"\

+	"..\..\include\IceE\Identity.h"\

+	"..\..\include\IceE\LocalException.h"\

+	"..\..\include\IceE\LocalObject.h"\

+	"..\..\include\IceE\LocalObjectF.h"\

+	"..\..\include\IceE\Lock.h"\

+	"..\..\include\IceE\Mutex.h"\

+	"..\..\include\IceE\ObjectF.h"\

+	"..\..\include\IceE\OperationMode.h"\

+	"..\..\include\IceE\Outgoing.h"\

+	"..\..\include\IceE\Protocol.h"\

+	"..\..\include\IceE\Proxy.h"\

+	"..\..\include\IceE\ProxyF.h"\

+	"..\..\include\IceE\ProxyFactoryF.h"\

+	"..\..\include\IceE\ProxyHandle.h"\

+	"..\..\include\IceE\ReferenceF.h"\

+	"..\..\include\IceE\Shared.h"\

+	"..\..\include\IceE\StringConverter.h"\

+	"..\..\include\IceE\ThreadException.h"\

+	"..\..\include\IceE\UndefSysMacros.h"\

+	"..\..\include\IceE\Unicode.h"\

+	

+

+!ELSEIF  "$(CFG)" == "icec - Win32 (WCE emulator) Debug Static"

+

+DEP_CPP_STRIN=\

+	"..\..\include\IceE\AutoArray.h"\

+	"..\..\include\IceE\BasicStream.h"\

+	"..\..\include\IceE\Buffer.h"\

+	"..\..\include\IceE\BuiltinSequences.h"\

+	"..\..\include\IceE\CommunicatorF.h"\

+	"..\..\include\IceE\Config.h"\

+	"..\..\include\IceE\ConnectionF.h"\

+	"..\..\include\IceE\Exception.h"\

+	"..\..\include\IceE\ExceptionBase.h"\

+	"..\..\include\IceE\Handle.h"\

+	"..\..\include\IceE\Identity.h"\

+	"..\..\include\IceE\LocalException.h"\

+	"..\..\include\IceE\LocalObject.h"\

+	"..\..\include\IceE\LocalObjectF.h"\

+	"..\..\include\IceE\Lock.h"\

+	"..\..\include\IceE\Mutex.h"\

+	"..\..\include\IceE\ObjectF.h"\

+	"..\..\include\IceE\OperationMode.h"\

+	"..\..\include\IceE\Outgoing.h"\

+	"..\..\include\IceE\Protocol.h"\

+	"..\..\include\IceE\Proxy.h"\

+	"..\..\include\IceE\ProxyF.h"\

+	"..\..\include\IceE\ProxyFactoryF.h"\

+	"..\..\include\IceE\ProxyHandle.h"\

+	"..\..\include\IceE\ReferenceF.h"\

+	"..\..\include\IceE\Shared.h"\

+	"..\..\include\IceE\StringConverter.h"\

+	"..\..\include\IceE\ThreadException.h"\

+	"..\..\include\IceE\UndefSysMacros.h"\

+	"..\..\include\IceE\Unicode.h"\

+	

+

+!ELSEIF  "$(CFG)" == "icec - Win32 (WCE emulator) Release Static"

+

+DEP_CPP_STRIN=\

+	"..\..\include\IceE\AutoArray.h"\

+	"..\..\include\IceE\BasicStream.h"\

+	"..\..\include\IceE\Buffer.h"\

+	"..\..\include\IceE\BuiltinSequences.h"\

+	"..\..\include\IceE\CommunicatorF.h"\

+	"..\..\include\IceE\Config.h"\

+	"..\..\include\IceE\ConnectionF.h"\

+	"..\..\include\IceE\Exception.h"\

+	"..\..\include\IceE\ExceptionBase.h"\

+	"..\..\include\IceE\Handle.h"\

+	"..\..\include\IceE\Identity.h"\

+	"..\..\include\IceE\LocalException.h"\

+	"..\..\include\IceE\LocalObject.h"\

+	"..\..\include\IceE\LocalObjectF.h"\

+	"..\..\include\IceE\Lock.h"\

+	"..\..\include\IceE\Mutex.h"\

+	"..\..\include\IceE\ObjectF.h"\

+	"..\..\include\IceE\OperationMode.h"\

+	"..\..\include\IceE\Outgoing.h"\

+	"..\..\include\IceE\Protocol.h"\

+	"..\..\include\IceE\Proxy.h"\

+	"..\..\include\IceE\ProxyF.h"\

+	"..\..\include\IceE\ProxyFactoryF.h"\

+	"..\..\include\IceE\ProxyHandle.h"\

+	"..\..\include\IceE\ReferenceF.h"\

+	"..\..\include\IceE\Shared.h"\

+	"..\..\include\IceE\StringConverter.h"\

+	"..\..\include\IceE\ThreadException.h"\

+	"..\..\include\IceE\UndefSysMacros.h"\

+	"..\..\include\IceE\Unicode.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\IceE\StringUtil.cpp

+

+!IF  "$(CFG)" == "icec - Win32 (WCE emulator) Release"

+

+DEP_CPP_STRING=\

 	"..\..\include\IceE\Config.h"\

 	"..\..\include\IceE\StringUtil.h"\

 	

-NODEP_CPP_STRIN=\

+NODEP_CPP_STRING=\

 	"..\..\..\..\usr\include\pthread.h"\

 	".\onfig\_epilog.h"\

 	".\onfig\_msvc_warnings_off.h"\

@@ -21307,11 +21594,11 @@ NODEP_CPP_STRIN=\
 

 !ELSEIF  "$(CFG)" == "icec - Win32 (WCE emulator) Debug"

 

-DEP_CPP_STRIN=\

+DEP_CPP_STRING=\

 	"..\..\include\IceE\Config.h"\

 	"..\..\include\IceE\StringUtil.h"\

 	

-NODEP_CPP_STRIN=\

+NODEP_CPP_STRING=\

 	"..\..\..\..\usr\include\pthread.h"\

 	".\onfig\_epilog.h"\

 	".\onfig\_msvc_warnings_off.h"\

@@ -21359,11 +21646,11 @@ NODEP_CPP_STRIN=\
 

 !ELSEIF  "$(CFG)" == "icec - Win32 (WCE ARMV4) Release"

 

-DEP_CPP_STRIN=\

+DEP_CPP_STRING=\

 	"..\..\include\IceE\Config.h"\

 	"..\..\include\IceE\StringUtil.h"\

 	

-NODEP_CPP_STRIN=\

+NODEP_CPP_STRING=\

 	"..\..\..\..\usr\include\pthread.h"\

 	".\onfig\_epilog.h"\

 	".\onfig\_msvc_warnings_off.h"\

@@ -21411,11 +21698,11 @@ NODEP_CPP_STRIN=\
 

 !ELSEIF  "$(CFG)" == "icec - Win32 (WCE ARMV4) Debug"

 

-DEP_CPP_STRIN=\

+DEP_CPP_STRING=\

 	"..\..\include\IceE\Config.h"\

 	"..\..\include\IceE\StringUtil.h"\

 	

-NODEP_CPP_STRIN=\

+NODEP_CPP_STRING=\

 	"..\..\..\..\usr\include\pthread.h"\

 	".\onfig\_epilog.h"\

 	".\onfig\_msvc_warnings_off.h"\

@@ -21463,11 +21750,11 @@ NODEP_CPP_STRIN=\
 

 !ELSEIF  "$(CFG)" == "icec - Win32 (WCE ARMV4) Debug Static"

 

-DEP_CPP_STRIN=\

+DEP_CPP_STRING=\

 	"..\..\include\IceE\Config.h"\

 	"..\..\include\IceE\StringUtil.h"\

 	

-NODEP_CPP_STRIN=\

+NODEP_CPP_STRING=\

 	"..\..\..\..\usr\include\pthread.h"\

 	".\onfig\_epilog.h"\

 	".\onfig\_msvc_warnings_off.h"\

@@ -21515,18 +21802,18 @@ NODEP_CPP_STRIN=\
 

 !ELSEIF  "$(CFG)" == "icec - Win32 (WCE ARMV4) Release Static"

 

-DEP_CPP_STRIN=\

+DEP_CPP_STRING=\

 	"..\..\include\IceE\Config.h"\

 	"..\..\include\IceE\StringUtil.h"\

 	

 

 !ELSEIF  "$(CFG)" == "icec - Win32 (WCE emulator) Debug Static"

 

-DEP_CPP_STRIN=\

+DEP_CPP_STRING=\

 	"..\..\include\IceE\Config.h"\

 	"..\..\include\IceE\StringUtil.h"\

 	

-NODEP_CPP_STRIN=\

+NODEP_CPP_STRING=\

 	"..\..\..\..\usr\include\pthread.h"\

 	".\onfig\_epilog.h"\

 	".\onfig\_msvc_warnings_off.h"\

@@ -21574,7 +21861,7 @@ NODEP_CPP_STRIN=\
 

 !ELSEIF  "$(CFG)" == "icec - Win32 (WCE emulator) Release Static"

 

-DEP_CPP_STRIN=\

+DEP_CPP_STRING=\

 	"..\..\include\IceE\Config.h"\

 	"..\..\include\IceE\StringUtil.h"\

 	

diff --git a/cppe/src/IceEC/icec_CE.vcproj b/cppe/src/IceEC/icec_CE.vcproj
index 0970ccf9943..2d974158c62 100755
--- a/cppe/src/IceEC/icec_CE.vcproj
+++ b/cppe/src/IceEC/icec_CE.vcproj
@@ -3738,6 +3738,10 @@
 				</FileConfiguration>

 			</File>

 			<File

+				RelativePath="..\IceE\StringConverter.cpp"

+				>

+			</File>

+			<File

 				RelativePath="..\IceE\StringUtil.cpp"

 				>

 				<FileConfiguration