4651 - Inconsistent line endings

15 files changed, 691 insertions, 691 deletions

diff --git a/cpp/src/Ice/EventLoggerMsg.h b/cpp/src/Ice/EventLoggerMsg.h
index ef3d9132286..75756db548f 100755
--- a/cpp/src/Ice/EventLoggerMsg.h
+++ b/cpp/src/Ice/EventLoggerMsg.h
@@ -1,53 +1,53 @@
- // **********************************************************************

- //

- // Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.

- //

- // This copy of Ice is licensed to you under the terms described in the

- // ICE_LICENSE file included in this distribution.

- //

- // **********************************************************************

-//

-//  Values are 32 bit values laid out as follows:

-//

-//   3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1

-//   1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0

-//  +---+-+-+-----------------------+-------------------------------+

-//  |Sev|C|R|     Facility          |               Code            |

-//  +---+-+-+-----------------------+-------------------------------+

-//

-//  where

-//

-//      Sev - is the severity code

-//

-//          00 - Success

-//          01 - Informational

-//          10 - Warning

-//          11 - Error

-//

-//      C - is the Customer code flag

-//

-//      R - is a reserved bit

-//

-//      Facility - is the facility code

-//

-//      Code - is the facility's status code

-//

-//

-// Define the facility codes

-//

-

-

-//

-// Define the severity codes

-//

-

-

-//

-// MessageId: EVENT_LOGGER_MSG

-//

-// MessageText:

-//

-// %1

-//

-#define EVENT_LOGGER_MSG                 0x00000000L

-

+ // **********************************************************************
+ //
+ // Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
+ //
+ // This copy of Ice is licensed to you under the terms described in the
+ // ICE_LICENSE file included in this distribution.
+ //
+ // **********************************************************************
+//
+//  Values are 32 bit values laid out as follows:
+//
+//   3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1
+//   1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
+//  +---+-+-+-----------------------+-------------------------------+
+//  |Sev|C|R|     Facility          |               Code            |
+//  +---+-+-+-----------------------+-------------------------------+
+//
+//  where
+//
+//      Sev - is the severity code
+//
+//          00 - Success
+//          01 - Informational
+//          10 - Warning
+//          11 - Error
+//
+//      C - is the Customer code flag
+//
+//      R - is a reserved bit
+//
+//      Facility - is the facility code
+//
+//      Code - is the facility's status code
+//
+//
+// Define the facility codes
+//
+
+
+//
+// Define the severity codes
+//
+
+
+//
+// MessageId: EVENT_LOGGER_MSG
+//
+// MessageText:
+//
+// %1
+//
+#define EVENT_LOGGER_MSG                 0x00000000L
+
diff --git a/cpp/src/IceDB/IceDB.rc b/cpp/src/IceDB/IceDB.rc
index 3cde3536999..af10fc5f736 100644
--- a/cpp/src/IceDB/IceDB.rc
+++ b/cpp/src/IceDB/IceDB.rc
@@ -1,38 +1,38 @@
-#include "winver.h"
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,4,0,0
- PRODUCTVERSION 3,4,0,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icedb34d\0"
- #define ORIGINALFILENAME "icedb34d.dll\0"
-#else
- FILEFLAGS 0x0L
- #define INTERNALNAME "icedb34\0"
- #define ORIGINALFILENAME "icedb34.dll\0"
-#endif
- FILEOS 0x4L
- FILETYPE VFT_DLL
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904e4"
-        BEGIN
-            VALUE "CompanyName", "ZeroC, Inc.\0"
-            VALUE "FileDescription", "IceDB DLL\0"
-            VALUE "FileVersion", "3.4.0\0"
-            VALUE "InternalName", INTERNALNAME
-            VALUE "LegalCopyright", "Copyright (c) 2003-2010 ZeroC, Inc.  All rights reserved.\0"
-            VALUE "OriginalFilename", ORIGINALFILENAME
-            VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.4.0\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1252
-    END
-END
+#include "winver.h"

+

+VS_VERSION_INFO VERSIONINFO

+ FILEVERSION 3,4,0,0

+ PRODUCTVERSION 3,4,0,0

+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

+#ifdef _DEBUG

+ FILEFLAGS VS_FF_DEBUG

+ #define INTERNALNAME "icedb34d\0"

+ #define ORIGINALFILENAME "icedb34d.dll\0"

+#else

+ FILEFLAGS 0x0L

+ #define INTERNALNAME "icedb34\0"

+ #define ORIGINALFILENAME "icedb34.dll\0"

+#endif

+ FILEOS 0x4L

+ FILETYPE VFT_DLL

+ FILESUBTYPE 0x0L

+BEGIN

+    BLOCK "StringFileInfo"

+    BEGIN

+        BLOCK "040904e4"

+        BEGIN

+            VALUE "CompanyName", "ZeroC, Inc.\0"

+            VALUE "FileDescription", "IceDB DLL\0"

+            VALUE "FileVersion", "3.4.0\0"

+            VALUE "InternalName", INTERNALNAME

+            VALUE "LegalCopyright", "Copyright (c) 2003-2010 ZeroC, Inc.  All rights reserved.\0"

+            VALUE "OriginalFilename", ORIGINALFILENAME

+            VALUE "ProductName", "Ice\0"

+            VALUE "ProductVersion", "3.4.0\0"

+        END

+    END

+    BLOCK "VarFileInfo"

+    BEGIN

+        VALUE "Translation", 0x409, 1252

+    END

+END

diff --git a/cpp/src/IceDB/Makefile.mak b/cpp/src/IceDB/Makefile.mak
index ec00899c93b..d8ef1f37817 100644
--- a/cpp/src/IceDB/Makefile.mak
+++ b/cpp/src/IceDB/Makefile.mak
@@ -1,66 +1,66 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ..\..
- 
-LIBNAME		= $(top_srcdir)\lib\icedb$(LIBSUFFIX).lib
-DLLNAME		= $(top_srcdir)\bin\icedb$(COMPSUFFIX)$(SOVERSION)$(LIBSUFFIX).dll
-
-TARGETS		= $(LIBNAME) $(DLLNAME)
-
-OBJS		= IceDB.obj
-
-SRCS		= $(OBJS:.obj=.cpp)
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS	= -I.. $(CPPFLAGS) -DICE_DB_API_EXPORTS -DWIN32_LEAN_AND_MEAN
-
-LINKWITH        = $(BASELIBS)
-
-!if "$(GENERATE_PDB)" == "yes"
-PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)
-!endif
-
-!if "$(BCPLUSPLUS)" == "yes"
-RES_FILE        = ,, IceDB.res
-!else
-RES_FILE        = IceDB.res
-!endif
-
-$(LIBNAME): $(DLLNAME)
-
-$(DLLNAME): $(OBJS) IceDB.res
-	$(LINK) $(BASE):0x28000000 $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) $(RES_FILE)
-	move $(DLLNAME:.dll=.lib) $(LIBNAME)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-	@if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
-
-clean::
-	-del /q IceDB.res
-
-install:: all
-	copy $(LIBNAME) "$(install_libdir)"
-	copy $(DLLNAME) "$(install_bindir)"
-
-
-!if "$(BCPLUSPLUS)" == "yes" && "$(OPTIMIZE)" != "yes"
-
-install:: all
-	copy $(DLLNAME:.dll=.tds) "$(install_bindir)"
-
-!elseif "$(GENERATE_PDB)" == "yes"
-
-install:: all
-	copy $(DLLNAME:.dll=.pdb) "$(install_bindir)"
-
-!endif
-
-!include .depend.mak
+# **********************************************************************

+#

+# Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.

+#

+# This copy of Ice is licensed to you under the terms described in the

+# ICE_LICENSE file included in this distribution.

+#

+# **********************************************************************

+

+top_srcdir	= ..\..

+ 

+LIBNAME		= $(top_srcdir)\lib\icedb$(LIBSUFFIX).lib

+DLLNAME		= $(top_srcdir)\bin\icedb$(COMPSUFFIX)$(SOVERSION)$(LIBSUFFIX).dll

+

+TARGETS		= $(LIBNAME) $(DLLNAME)

+

+OBJS		= IceDB.obj

+

+SRCS		= $(OBJS:.obj=.cpp)

+

+!include $(top_srcdir)/config/Make.rules.mak

+

+CPPFLAGS	= -I.. $(CPPFLAGS) -DICE_DB_API_EXPORTS -DWIN32_LEAN_AND_MEAN

+

+LINKWITH        = $(BASELIBS)

+

+!if "$(GENERATE_PDB)" == "yes"

+PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)

+!endif

+

+!if "$(BCPLUSPLUS)" == "yes"

+RES_FILE        = ,, IceDB.res

+!else

+RES_FILE        = IceDB.res

+!endif

+

+$(LIBNAME): $(DLLNAME)

+

+$(DLLNAME): $(OBJS) IceDB.res

+	$(LINK) $(BASE):0x28000000 $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) $(RES_FILE)

+	move $(DLLNAME:.dll=.lib) $(LIBNAME)

+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \

+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest

+	@if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)

+

+clean::

+	-del /q IceDB.res

+

+install:: all

+	copy $(LIBNAME) "$(install_libdir)"

+	copy $(DLLNAME) "$(install_bindir)"

+

+

+!if "$(BCPLUSPLUS)" == "yes" && "$(OPTIMIZE)" != "yes"

+

+install:: all

+	copy $(DLLNAME:.dll=.tds) "$(install_bindir)"

+

+!elseif "$(GENERATE_PDB)" == "yes"

+

+install:: all

+	copy $(DLLNAME:.dll=.pdb) "$(install_bindir)"

+

+!endif

+

+!include .depend.mak

diff --git a/cpp/src/IceGrid/FileParserI.h b/cpp/src/IceGrid/FileParserI.h
index ca6e9855c46..51e5765bf42 100644
--- a/cpp/src/IceGrid/FileParserI.h
+++ b/cpp/src/IceGrid/FileParserI.h
@@ -6,18 +6,18 @@
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
-

-#ifndef ICE_GRID_FILE_PARSERI_H

-#define ICE_GRID_FILE_PARSERI_H

-

-#include <IceGrid/FileParser.h>

-

-class FileParserI : public IceGrid::FileParser

-{

-public:

-

-    IceGrid::ApplicationDescriptor

-    parse(const std::string& file, const IceGrid::AdminPrx& admin, const Ice::Current&);

-};

-

-#endif

+
+#ifndef ICE_GRID_FILE_PARSERI_H
+#define ICE_GRID_FILE_PARSERI_H
+
+#include <IceGrid/FileParser.h>
+
+class FileParserI : public IceGrid::FileParser
+{
+public:
+
+    IceGrid::ApplicationDescriptor
+    parse(const std::string& file, const IceGrid::AdminPrx& admin, const Ice::Current&);
+};
+
+#endif
diff --git a/cpp/src/IceGrid/FreezeDB/IceGridFreezeDB.rc b/cpp/src/IceGrid/FreezeDB/IceGridFreezeDB.rc
index 8514d02e19c..394cfee03cf 100644
--- a/cpp/src/IceGrid/FreezeDB/IceGridFreezeDB.rc
+++ b/cpp/src/IceGrid/FreezeDB/IceGridFreezeDB.rc
@@ -1,38 +1,38 @@
-#include "winver.h"
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,4,0,0
- PRODUCTVERSION 3,4,0,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icestormfreezedb34d\0"
- #define ORIGINALFILENAME "icestormfreezedb34d.dll\0"
-#else
- FILEFLAGS 0x0L
- #define INTERNALNAME "icegridfreezedb34\0"
- #define ORIGINALFILENAME "icegridfreezedb34.dll\0"
-#endif
- FILEOS 0x4L
- FILETYPE VFT_DLL
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904e4"
-        BEGIN
-            VALUE "CompanyName", "ZeroC, Inc.\0"
-            VALUE "FileDescription", "IceGrid Freeze DB DLL\0"
-            VALUE "FileVersion", "3.4.0\0"
-            VALUE "InternalName", INTERNALNAME
-            VALUE "LegalCopyright", "Copyright (c) 2003-2010 ZeroC, Inc.  All rights reserved.\0"
-            VALUE "OriginalFilename", ORIGINALFILENAME
-            VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.4.0\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1252
-    END
-END
+#include "winver.h"

+

+VS_VERSION_INFO VERSIONINFO

+ FILEVERSION 3,4,0,0

+ PRODUCTVERSION 3,4,0,0

+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

+#ifdef _DEBUG

+ FILEFLAGS VS_FF_DEBUG

+ #define INTERNALNAME "icestormfreezedb34d\0"

+ #define ORIGINALFILENAME "icestormfreezedb34d.dll\0"

+#else

+ FILEFLAGS 0x0L

+ #define INTERNALNAME "icegridfreezedb34\0"

+ #define ORIGINALFILENAME "icegridfreezedb34.dll\0"

+#endif

+ FILEOS 0x4L

+ FILETYPE VFT_DLL

+ FILESUBTYPE 0x0L

+BEGIN

+    BLOCK "StringFileInfo"

+    BEGIN

+        BLOCK "040904e4"

+        BEGIN

+            VALUE "CompanyName", "ZeroC, Inc.\0"

+            VALUE "FileDescription", "IceGrid Freeze DB DLL\0"

+            VALUE "FileVersion", "3.4.0\0"

+            VALUE "InternalName", INTERNALNAME

+            VALUE "LegalCopyright", "Copyright (c) 2003-2010 ZeroC, Inc.  All rights reserved.\0"

+            VALUE "OriginalFilename", ORIGINALFILENAME

+            VALUE "ProductName", "Ice\0"

+            VALUE "ProductVersion", "3.4.0\0"

+        END

+    END

+    BLOCK "VarFileInfo"

+    BEGIN

+        VALUE "Translation", 0x409, 1252

+    END

+END

diff --git a/cpp/src/IceGrid/FreezeDB/Makefile.mak b/cpp/src/IceGrid/FreezeDB/Makefile.mak
index 542f830b8a6..495b64e42ba 100644
--- a/cpp/src/IceGrid/FreezeDB/Makefile.mak
+++ b/cpp/src/IceGrid/FreezeDB/Makefile.mak
@@ -1,92 +1,92 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ..\..\..
-
-LIBNAME		= $(top_srcdir)\lib\icegridfreezedb$(LIBSUFFIX).lib
-DLLNAME		= $(top_srcdir)\bin\icegridfreezedb$(COMPSUFFIX)$(SOVERSION)$(LIBSUFFIX).dll
-
-TARGETS         = $(LIBNAME) $(DLLNAME)
-
-OBJS   		= StringApplicationInfoDict.obj \
-		  IdentityObjectInfoDict.obj \
-		  StringAdapterInfoDict.obj \
-		  FreezeDB.obj
-
-DB_OBJS		= FreezeTypes.obj
-
-{$(top_srcdir)\src\IceDB\}.cpp.obj::
-    $(CXX) /c $(CPPFLAGS) $(CXXFLAGS) $<
-
-SRCS		= $(OBJS:.obj=.cpp) \
-		  $(top_srcdir)\src\IceDB\FreezeTypes.cpp
-
-HDIR		= $(headerdir)/IceGrid
-SDIR		= $(slicedir)/IceGrid
-
-SLICE2FREEZECMD = $(SLICE2FREEZE) -I..\.. --ice --include-dir IceGrid\FreezeDB $(ICECPPFLAGS)
-
-!include $(top_srcdir)\config\Make.rules.mak
-
-CPPFLAGS	= -I..\.. -Idummyinclude $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-SLICE2CPPFLAGS	= -I..\.. --ice --include-dir IceGrid\FreezeDB $(SLICE2CPPFLAGS)
-
-LINKWITH 	= icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib icedb$(LIBSUFFIX).lib freeze$(LIBSUFFIX).lib $(LIBS)
-MLINKWITH 	= freeze$(LIBSUFFIX).lib icegrid$(LIBSUFFIX).lib icegriddb$(LIBSUFFIX).lib $(LIBS)
-
-!if "$(GENERATE_PDB)" == "yes"
-PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)
-!endif
-
-RES_FILE        = IceGridFreezeDB.res
-
-$(LIBNAME): $(DLLNAME)
-
-$(DLLNAME): $(OBJS) $(DB_OBJS) IceGridFreezeDB.res
-	$(LINK) /base:0x2E000000 $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(DB_OBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) \
-		$(RES_FILE)
-	move $(DLLNAME:.dll=.lib) $(LIBNAME)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-	@if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
-
-StringApplicationInfoDict.h StringApplicationInfoDict.cpp: $(SDIR)\Admin.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
-	del /q StringApplicationInfoDict.h StringApplicationInfoDict.cpp
-	$(SLICE2FREEZECMD) --dict IceGrid::StringApplicationInfoDict,string,IceGrid::ApplicationInfo \
-	StringApplicationInfoDict $(SDIR)\Admin.ice
-
-IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp: $(slicedir)\Ice\Identity.ice $(SDIR)\Admin.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
-	del /q IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp
-	$(SLICE2FREEZECMD) --dict IceGrid::IdentityObjectInfoDict,Ice::Identity,IceGrid::ObjectInfo \
-	--dict-index IceGrid::IdentityObjectInfoDict,type \
-	IdentityObjectInfoDict $(slicedir)\Ice\Identity.ice $(SDIR)\Admin.ice
-
-StringAdapterInfoDict.h StringAdapterInfoDict.cpp: $(SDIR)\Admin.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
-	del /q StringAdapterInfoDict.h StringAdapterInfoDict.cpp
-	$(SLICE2FREEZECMD) --dict IceGrid::StringAdapterInfoDict,string,IceGrid::AdapterInfo \
-	--dict-index IceGrid::StringAdapterInfoDict,replicaGroupId StringAdapterInfoDict $(SDIR)\Admin.ice
-
-clean::
-	-del /q StringApplicationInfoDict.h StringApplicationInfoDict.cpp
-	-del /q StringAdapterInfoDict.h StringAdapterInfoDict.cpp
-	-del /q IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp
-	-del /q IceGridFreezeDB.res IceGridMigrate.res
-
-install:: all
-	copy $(LIBNAME) "$(install_libdir)"
-	copy $(DLLNAME) "$(install_bindir)"
-
-!if "$(GENERATE_PDB)" == "yes"
-
-install:: all
-	copy $(DLLNAME:.dll=.pdb) "$(install_bindir)"
-
-!endif
-
-!include .depend.mak
+# **********************************************************************

+#

+# Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.

+#

+# This copy of Ice is licensed to you under the terms described in the

+# ICE_LICENSE file included in this distribution.

+#

+# **********************************************************************

+

+top_srcdir	= ..\..\..

+

+LIBNAME		= $(top_srcdir)\lib\icegridfreezedb$(LIBSUFFIX).lib

+DLLNAME		= $(top_srcdir)\bin\icegridfreezedb$(COMPSUFFIX)$(SOVERSION)$(LIBSUFFIX).dll

+

+TARGETS         = $(LIBNAME) $(DLLNAME)

+

+OBJS   		= StringApplicationInfoDict.obj \

+		  IdentityObjectInfoDict.obj \

+		  StringAdapterInfoDict.obj \

+		  FreezeDB.obj

+

+DB_OBJS		= FreezeTypes.obj

+

+{$(top_srcdir)\src\IceDB\}.cpp.obj::

+    $(CXX) /c $(CPPFLAGS) $(CXXFLAGS) $<

+

+SRCS		= $(OBJS:.obj=.cpp) \

+		  $(top_srcdir)\src\IceDB\FreezeTypes.cpp

+

+HDIR		= $(headerdir)/IceGrid

+SDIR		= $(slicedir)/IceGrid

+

+SLICE2FREEZECMD = $(SLICE2FREEZE) -I..\.. --ice --include-dir IceGrid\FreezeDB $(ICECPPFLAGS)

+

+!include $(top_srcdir)\config\Make.rules.mak

+

+CPPFLAGS	= -I..\.. -Idummyinclude $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN

+SLICE2CPPFLAGS	= -I..\.. --ice --include-dir IceGrid\FreezeDB $(SLICE2CPPFLAGS)

+

+LINKWITH 	= icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib icedb$(LIBSUFFIX).lib freeze$(LIBSUFFIX).lib $(LIBS)

+MLINKWITH 	= freeze$(LIBSUFFIX).lib icegrid$(LIBSUFFIX).lib icegriddb$(LIBSUFFIX).lib $(LIBS)

+

+!if "$(GENERATE_PDB)" == "yes"

+PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)

+!endif

+

+RES_FILE        = IceGridFreezeDB.res

+

+$(LIBNAME): $(DLLNAME)

+

+$(DLLNAME): $(OBJS) $(DB_OBJS) IceGridFreezeDB.res

+	$(LINK) /base:0x2E000000 $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(DB_OBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) \

+		$(RES_FILE)

+	move $(DLLNAME:.dll=.lib) $(LIBNAME)

+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \

+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest

+	@if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)

+

+StringApplicationInfoDict.h StringApplicationInfoDict.cpp: $(SDIR)\Admin.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)

+	del /q StringApplicationInfoDict.h StringApplicationInfoDict.cpp

+	$(SLICE2FREEZECMD) --dict IceGrid::StringApplicationInfoDict,string,IceGrid::ApplicationInfo \

+	StringApplicationInfoDict $(SDIR)\Admin.ice

+

+IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp: $(slicedir)\Ice\Identity.ice $(SDIR)\Admin.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)

+	del /q IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp

+	$(SLICE2FREEZECMD) --dict IceGrid::IdentityObjectInfoDict,Ice::Identity,IceGrid::ObjectInfo \

+	--dict-index IceGrid::IdentityObjectInfoDict,type \

+	IdentityObjectInfoDict $(slicedir)\Ice\Identity.ice $(SDIR)\Admin.ice

+

+StringAdapterInfoDict.h StringAdapterInfoDict.cpp: $(SDIR)\Admin.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)

+	del /q StringAdapterInfoDict.h StringAdapterInfoDict.cpp

+	$(SLICE2FREEZECMD) --dict IceGrid::StringAdapterInfoDict,string,IceGrid::AdapterInfo \

+	--dict-index IceGrid::StringAdapterInfoDict,replicaGroupId StringAdapterInfoDict $(SDIR)\Admin.ice

+

+clean::

+	-del /q StringApplicationInfoDict.h StringApplicationInfoDict.cpp

+	-del /q StringAdapterInfoDict.h StringAdapterInfoDict.cpp

+	-del /q IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp

+	-del /q IceGridFreezeDB.res IceGridMigrate.res

+

+install:: all

+	copy $(LIBNAME) "$(install_libdir)"

+	copy $(DLLNAME) "$(install_bindir)"

+

+!if "$(GENERATE_PDB)" == "yes"

+

+install:: all

+	copy $(DLLNAME:.dll=.pdb) "$(install_bindir)"

+

+!endif

+

+!include .depend.mak

diff --git a/cpp/src/IceGrid/SqlDB/IceGridSqlDB.rc b/cpp/src/IceGrid/SqlDB/IceGridSqlDB.rc
index 6eb838f2f5f..ac8af830401 100644
--- a/cpp/src/IceGrid/SqlDB/IceGridSqlDB.rc
+++ b/cpp/src/IceGrid/SqlDB/IceGridSqlDB.rc
@@ -1,38 +1,38 @@
-#include "winver.h"
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,4,0,0
- PRODUCTVERSION 3,4,0,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icegridsqldb34d\0"
- #define ORIGINALFILENAME "icegridsqldb34d.dll\0"
-#else
- FILEFLAGS 0x0L
- #define INTERNALNAME "icegridsqldb34\0"
- #define ORIGINALFILENAME "icegridsqldb34.dll\0"
-#endif
- FILEOS 0x4L
- FILETYPE VFT_DLL
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904e4"
-        BEGIN
-            VALUE "CompanyName", "ZeroC, Inc.\0"
-            VALUE "FileDescription", "IceGrid Sql DB DLL\0"
-            VALUE "FileVersion", "3.4.0\0"
-            VALUE "InternalName", INTERNALNAME
-            VALUE "LegalCopyright", "Copyright (c) 2003-2010 ZeroC, Inc.  All rights reserved.\0"
-            VALUE "OriginalFilename", ORIGINALFILENAME
-            VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.4.0\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1252
-    END
-END
+#include "winver.h"

+

+VS_VERSION_INFO VERSIONINFO

+ FILEVERSION 3,4,0,0

+ PRODUCTVERSION 3,4,0,0

+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

+#ifdef _DEBUG

+ FILEFLAGS VS_FF_DEBUG

+ #define INTERNALNAME "icegridsqldb34d\0"

+ #define ORIGINALFILENAME "icegridsqldb34d.dll\0"

+#else

+ FILEFLAGS 0x0L

+ #define INTERNALNAME "icegridsqldb34\0"

+ #define ORIGINALFILENAME "icegridsqldb34.dll\0"

+#endif

+ FILEOS 0x4L

+ FILETYPE VFT_DLL

+ FILESUBTYPE 0x0L

+BEGIN

+    BLOCK "StringFileInfo"

+    BEGIN

+        BLOCK "040904e4"

+        BEGIN

+            VALUE "CompanyName", "ZeroC, Inc.\0"

+            VALUE "FileDescription", "IceGrid Sql DB DLL\0"

+            VALUE "FileVersion", "3.4.0\0"

+            VALUE "InternalName", INTERNALNAME

+            VALUE "LegalCopyright", "Copyright (c) 2003-2010 ZeroC, Inc.  All rights reserved.\0"

+            VALUE "OriginalFilename", ORIGINALFILENAME

+            VALUE "ProductName", "Ice\0"

+            VALUE "ProductVersion", "3.4.0\0"

+        END

+    END

+    BLOCK "VarFileInfo"

+    BEGIN

+        VALUE "Translation", 0x409, 1252

+    END

+END

diff --git a/cpp/src/IceGrid/SqlDB/Makefile.mak b/cpp/src/IceGrid/SqlDB/Makefile.mak
index 4eb40cdf1bf..d7ee6759a1d 100644
--- a/cpp/src/IceGrid/SqlDB/Makefile.mak
+++ b/cpp/src/IceGrid/SqlDB/Makefile.mak
@@ -1,66 +1,66 @@
-
-#
-# Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ..\..\..
-
-LIBNAME		= $(top_srcdir)\lib\icegridsqldb$(LIBSUFFIX).lib
-DLLNAME		= $(top_srcdir)\bin\icegridsqldb$(COMPSUFFIX)$(SOVERSION)$(LIBSUFFIX).dll
-
-TARGETS         = $(LIBNAME) $(DLLNAME)
-
-OBJS  		= SqlStringApplicationInfoDict.obj \
-		  SqlIdentityObjectInfoDict.obj \
-		  SqlStringAdapterInfoDict.obj \
-		  SqlDB.obj
-
-DB_OBJS		= SqlTypes.obj
-
-{$(top_srcdir)\src\IceDB\}.cpp.obj::
-    $(CXX) /c $(CPPFLAGS) $(CXXFLAGS) $<
-
-SRCS		= $(OBJS:.obj=.cpp) \
-		  $(top_srcdir)\src\IceDB\SqlTypes.cpp
-
-!include $(top_srcdir)\config\Make.rules.mak
-
-CPPFLAGS	= -I..\.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-
-LINKWITH 	= $(QT_LIBS) icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib icedb$(LIBSUFFIX).lib $(LIBS)
-
-!if "$(GENERATE_PDB)" == "yes"
-PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)
-!endif
-
-RES_FILE        = IceGridSqlDB.res
-
-$(LIBNAME): $(DLLNAME)
-
-$(DLLNAME): $(OBJS) $(DB_OBJS) IceGridSqlDB.res
-	$(LINK) /base:0x2E000000 $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(DB_OBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) \
-		$(RES_FILE)
-	move $(DLLNAME:.dll=.lib) $(LIBNAME)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-	@if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
-
-clean::
-	-del /q IceGridSqlDB.res
-
-install:: all
-	copy $(LIBNAME) "$(install_libdir)"
-	copy $(DLLNAME) "$(install_bindir)"
-
-!if "$(GENERATE_PDB)" == "yes"
-
-install:: all
-	copy $(DLLNAME:.dll=.pdb) "$(install_bindir)"
-
-!endif
-
-!include .depend.mak
+

+#

+# Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.

+#

+# This copy of Ice is licensed to you under the terms described in the

+# ICE_LICENSE file included in this distribution.

+#

+# **********************************************************************

+

+top_srcdir	= ..\..\..

+

+LIBNAME		= $(top_srcdir)\lib\icegridsqldb$(LIBSUFFIX).lib

+DLLNAME		= $(top_srcdir)\bin\icegridsqldb$(COMPSUFFIX)$(SOVERSION)$(LIBSUFFIX).dll

+

+TARGETS         = $(LIBNAME) $(DLLNAME)

+

+OBJS  		= SqlStringApplicationInfoDict.obj \

+		  SqlIdentityObjectInfoDict.obj \

+		  SqlStringAdapterInfoDict.obj \

+		  SqlDB.obj

+

+DB_OBJS		= SqlTypes.obj

+

+{$(top_srcdir)\src\IceDB\}.cpp.obj::

+    $(CXX) /c $(CPPFLAGS) $(CXXFLAGS) $<

+

+SRCS		= $(OBJS:.obj=.cpp) \

+		  $(top_srcdir)\src\IceDB\SqlTypes.cpp

+

+!include $(top_srcdir)\config\Make.rules.mak

+

+CPPFLAGS	= -I..\.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN

+

+LINKWITH 	= $(QT_LIBS) icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib icedb$(LIBSUFFIX).lib $(LIBS)

+

+!if "$(GENERATE_PDB)" == "yes"

+PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)

+!endif

+

+RES_FILE        = IceGridSqlDB.res

+

+$(LIBNAME): $(DLLNAME)

+

+$(DLLNAME): $(OBJS) $(DB_OBJS) IceGridSqlDB.res

+	$(LINK) /base:0x2E000000 $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(DB_OBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) \

+		$(RES_FILE)

+	move $(DLLNAME:.dll=.lib) $(LIBNAME)

+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \

+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest

+	@if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)

+

+clean::

+	-del /q IceGridSqlDB.res

+

+install:: all

+	copy $(LIBNAME) "$(install_libdir)"

+	copy $(DLLNAME) "$(install_bindir)"

+

+!if "$(GENERATE_PDB)" == "yes"

+

+install:: all

+	copy $(DLLNAME:.dll=.pdb) "$(install_bindir)"

+

+!endif

+

+!include .depend.mak

diff --git a/cpp/src/IcePatch2/security.manifest b/cpp/src/IcePatch2/security.manifest
index 7bb8cb7b12c..3b17a575a95 100644
--- a/cpp/src/IcePatch2/security.manifest
+++ b/cpp/src/IcePatch2/security.manifest
@@ -1,11 +1,11 @@
-<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>

-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">

-    <security>

-      <requestedPrivileges>

-        <requestedExecutionLevel

-          level="asInvoker"

-          uiAccess="false"/>

-        </requestedPrivileges>

-       </security>

-  </trustInfo>

-</assembly>

+<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel
+          level="asInvoker"
+          uiAccess="false"/>
+        </requestedPrivileges>
+       </security>
+  </trustInfo>
+</assembly>
diff --git a/cpp/src/IcePatch2Lib/security.manifest b/cpp/src/IcePatch2Lib/security.manifest
index 7bb8cb7b12c..3b17a575a95 100644
--- a/cpp/src/IcePatch2Lib/security.manifest
+++ b/cpp/src/IcePatch2Lib/security.manifest
@@ -1,11 +1,11 @@
-<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>

-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">

-    <security>

-      <requestedPrivileges>

-        <requestedExecutionLevel

-          level="asInvoker"

-          uiAccess="false"/>

-        </requestedPrivileges>

-       </security>

-  </trustInfo>

-</assembly>

+<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel
+          level="asInvoker"
+          uiAccess="false"/>
+        </requestedPrivileges>
+       </security>
+  </trustInfo>
+</assembly>
diff --git a/cpp/src/IceStorm/FreezeDB/IceStormFreezeDB.rc b/cpp/src/IceStorm/FreezeDB/IceStormFreezeDB.rc
index 12ade539c57..c2b90616a6a 100644
--- a/cpp/src/IceStorm/FreezeDB/IceStormFreezeDB.rc
+++ b/cpp/src/IceStorm/FreezeDB/IceStormFreezeDB.rc
@@ -1,38 +1,38 @@
-#include "winver.h"
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,4,0,0
- PRODUCTVERSION 3,4,0,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icestormfreezedb34d\0"
- #define ORIGINALFILENAME "icestormfreezedb34d.dll\0"
-#else
- FILEFLAGS 0x0L
- #define INTERNALNAME "icestormfreezedb34\0"
- #define ORIGINALFILENAME "icestormfreezedb34.dll\0"
-#endif
- FILEOS 0x4L
- FILETYPE VFT_DLL
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904e4"
-        BEGIN
-            VALUE "CompanyName", "ZeroC, Inc.\0"
-            VALUE "FileDescription", "IceStorm Freeze DB DLL\0"
-            VALUE "FileVersion", "3.4.0\0"
-            VALUE "InternalName", INTERNALNAME
-            VALUE "LegalCopyright", "Copyright (c) 2003-2010 ZeroC, Inc.  All rights reserved.\0"
-            VALUE "OriginalFilename", ORIGINALFILENAME
-            VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.4.0\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1252
-    END
-END
+#include "winver.h"

+

+VS_VERSION_INFO VERSIONINFO

+ FILEVERSION 3,4,0,0

+ PRODUCTVERSION 3,4,0,0

+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

+#ifdef _DEBUG

+ FILEFLAGS VS_FF_DEBUG

+ #define INTERNALNAME "icestormfreezedb34d\0"

+ #define ORIGINALFILENAME "icestormfreezedb34d.dll\0"

+#else

+ FILEFLAGS 0x0L

+ #define INTERNALNAME "icestormfreezedb34\0"

+ #define ORIGINALFILENAME "icestormfreezedb34.dll\0"

+#endif

+ FILEOS 0x4L

+ FILETYPE VFT_DLL

+ FILESUBTYPE 0x0L

+BEGIN

+    BLOCK "StringFileInfo"

+    BEGIN

+        BLOCK "040904e4"

+        BEGIN

+            VALUE "CompanyName", "ZeroC, Inc.\0"

+            VALUE "FileDescription", "IceStorm Freeze DB DLL\0"

+            VALUE "FileVersion", "3.4.0\0"

+            VALUE "InternalName", INTERNALNAME

+            VALUE "LegalCopyright", "Copyright (c) 2003-2010 ZeroC, Inc.  All rights reserved.\0"

+            VALUE "OriginalFilename", ORIGINALFILENAME

+            VALUE "ProductName", "Ice\0"

+            VALUE "ProductVersion", "3.4.0\0"

+        END

+    END

+    BLOCK "VarFileInfo"

+    BEGIN

+        VALUE "Translation", 0x409, 1252

+    END

+END

diff --git a/cpp/src/IceStorm/FreezeDB/Makefile.mak b/cpp/src/IceStorm/FreezeDB/Makefile.mak
index 26fab1277d1..fc7f639b73f 100644
--- a/cpp/src/IceStorm/FreezeDB/Makefile.mak
+++ b/cpp/src/IceStorm/FreezeDB/Makefile.mak
@@ -1,120 +1,120 @@
-
-#
-# Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ..\..\..
-
-LIBNAME		= $(top_srcdir)\lib\icestormfreezedb$(LIBSUFFIX).lib
-DLLNAME		= $(top_srcdir)\bin\icestormfreezedb$(COMPSUFFIX)$(SOVERSION)$(LIBSUFFIX).dll
-
-MIGRATE		= $(top_srcdir)\bin\icestormmigrate.exe
-
-TARGETS         = $(LIBNAME) $(DLLNAME) $(MIGRATE)
-
-OBJS   		= LLUMap.obj \
-                  SubscriberMap.obj \
-		  FreezeDB.obj
-
-DB_OBJS		= FreezeTypes.obj
-
-MOBJS		= Migrate.obj \
-                  SubscriberMap.obj \
-                  LLUMap.obj \
-		  LinkRecord.obj \
-		  V32FormatDB.obj \
-		  V31FormatDB.obj \
-		  V32Format.obj \
-		  V31Format.obj
-
-{$(top_srcdir)\src\IceDB\}.cpp.obj::
-    $(CXX) /c $(CPPFLAGS) $(CXXFLAGS) $<
-
-SRCS		= $(OBJS:.obj=.cpp) \
-		  $(MOBJS:.obj=.cpp) \
-		  $(top_srcdir)\src\IceDB\FreezeTypes.cpp
-
-HDIR		= $(headerdir)/IceStorm
-SDIR		= $(slicedir)/IceStorm
-
-SLICE2FREEZECMD = $(SLICE2FREEZE) -I..\.. --ice --include-dir IceStorm\FreezeDB $(ICECPPFLAGS)
-
-!include $(top_srcdir)\config\Make.rules.mak
-
-CPPFLAGS	= -I..\.. -Idummyinclude $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-SLICE2CPPFLAGS	= -I..\.. --ice --include-dir IceStorm\FreezeDB $(SLICE2CPPFLAGS)
-
-LINKWITH 	= icestormservice$(LIBSUFFIX).lib icestorm$(LIBSUFFIX).lib icedb$(LIBSUFFIX).lib freeze$(LIBSUFFIX).lib $(LIBS)
-MLINKWITH 	= freeze$(LIBSUFFIX).lib icestormservice$(LIBSUFFIX).lib icestorm$(LIBSUFFIX).lib $(LIBS)
-
-!if "$(GENERATE_PDB)" == "yes"
-PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)
-MPDBFLAGS       = /pdb:$(MIGRATE:.exe=.pdb)
-!endif
-
-RES_FILE        = IceStormFreezeDB.res
-MRES_FILE       = IceStormMigrate.res
-
-$(LIBNAME): $(DLLNAME)
-
-$(DLLNAME): $(OBJS) $(DB_OBJS) IceStormFreezeDB.res
-	$(LINK) /base:0x2D000000 $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(DB_OBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) \
-		$(RES_FILE)
-	move $(DLLNAME:.dll=.lib) $(LIBNAME)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-	@if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
-
-$(MIGRATE): $(MOBJS) IceStormMigrate.res
-	$(LINK) $(LD_EXEFLAGS) $(MPDBFLAGS) $(MOBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS)$(MLINKWITH) $(MRES_FILE)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-
-LLUMap.h LLUMap.cpp: ..\..\IceStorm\LLURecord.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
-	del /q LLUMap.h LLUMap.cpp
-	$(SLICE2FREEZECMD) --dict IceStorm::LLUMap,string,IceStormElection::LogUpdate LLUMap ..\..\IceStorm\LLURecord.ice
-
-SubscriberMap.h SubscriberMap.cpp: ..\..\IceStorm\SubscriberRecord.ice $(slicedir)\Ice\Identity.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
-	del /q SubscriberMap.h SubscriberMap.cpp
-	$(SLICE2FREEZECMD) \
-	--dict IceStorm::SubscriberMap,IceStorm::SubscriberRecordKey,IceStorm::SubscriberRecord,sort \
-	SubscriberMap ..\..\IceStorm\SubscriberRecord.ice
-
-# Needed for migration.
-V32FormatDB.h V32FormatDB.cpp: V32Format.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
-	del /q V32FormatDB.h V32FormatDB.cpp
-	$(SLICE2FREEZECMD) --dict IceStorm::V32Format,Ice::Identity,IceStorm::LinkRecordSeq \
-	V32FormatDB V32Format.ice
-
-V31FormatDB.h V31FormatDB.cpp: V31Format.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
-	del /q V31FormatDB.h V31FormatDB.cpp
-	$(SLICE2FREEZECMD) --dict IceStorm::V31Format,string,IceStorm::LinkRecordDict \
-	V31FormatDB V31Format.ice
-
-clean::
-	-del /q LLUMap.h LLUMap.cpp
-	-del /q SubscriberMap.h SubscriberMap.cpp
-	-del /q V32FormatDB.cpp V31FormatDB.cpp V31FormatDB.h V31FormatDB.h
-	-del /q V32Migrate.cpp V32Migrate.h
-	-del /q V31Migrate.cpp V31Migrate.h
-	-del /q $(MIGRATE:.exe=.*)
-	-del /q IceStormFreezeDB.res IceStormMigrate.res
-
-install:: all
-	copy $(LIBNAME) "$(install_libdir)"
-	copy $(DLLNAME) "$(install_bindir)"
-	copy $(MIGRATE) "$(install_bindir)"
-
-!if "$(GENERATE_PDB)" == "yes"
-
-install:: all
-	copy $(DLLNAME:.dll=.pdb) "$(install_bindir)"
-	copy $(MIGRATE:.exe=.pdb) "$(install_bindir)"
-
-!endif
-
-!include .depend.mak
+

+#

+# Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.

+#

+# This copy of Ice is licensed to you under the terms described in the

+# ICE_LICENSE file included in this distribution.

+#

+# **********************************************************************

+

+top_srcdir	= ..\..\..

+

+LIBNAME		= $(top_srcdir)\lib\icestormfreezedb$(LIBSUFFIX).lib

+DLLNAME		= $(top_srcdir)\bin\icestormfreezedb$(COMPSUFFIX)$(SOVERSION)$(LIBSUFFIX).dll

+

+MIGRATE		= $(top_srcdir)\bin\icestormmigrate.exe

+

+TARGETS         = $(LIBNAME) $(DLLNAME) $(MIGRATE)

+

+OBJS   		= LLUMap.obj \

+                  SubscriberMap.obj \

+		  FreezeDB.obj

+

+DB_OBJS		= FreezeTypes.obj

+

+MOBJS		= Migrate.obj \

+                  SubscriberMap.obj \

+                  LLUMap.obj \

+		  LinkRecord.obj \

+		  V32FormatDB.obj \

+		  V31FormatDB.obj \

+		  V32Format.obj \

+		  V31Format.obj

+

+{$(top_srcdir)\src\IceDB\}.cpp.obj::

+    $(CXX) /c $(CPPFLAGS) $(CXXFLAGS) $<

+

+SRCS		= $(OBJS:.obj=.cpp) \

+		  $(MOBJS:.obj=.cpp) \

+		  $(top_srcdir)\src\IceDB\FreezeTypes.cpp

+

+HDIR		= $(headerdir)/IceStorm

+SDIR		= $(slicedir)/IceStorm

+

+SLICE2FREEZECMD = $(SLICE2FREEZE) -I..\.. --ice --include-dir IceStorm\FreezeDB $(ICECPPFLAGS)

+

+!include $(top_srcdir)\config\Make.rules.mak

+

+CPPFLAGS	= -I..\.. -Idummyinclude $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN

+SLICE2CPPFLAGS	= -I..\.. --ice --include-dir IceStorm\FreezeDB $(SLICE2CPPFLAGS)

+

+LINKWITH 	= icestormservice$(LIBSUFFIX).lib icestorm$(LIBSUFFIX).lib icedb$(LIBSUFFIX).lib freeze$(LIBSUFFIX).lib $(LIBS)

+MLINKWITH 	= freeze$(LIBSUFFIX).lib icestormservice$(LIBSUFFIX).lib icestorm$(LIBSUFFIX).lib $(LIBS)

+

+!if "$(GENERATE_PDB)" == "yes"

+PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)

+MPDBFLAGS       = /pdb:$(MIGRATE:.exe=.pdb)

+!endif

+

+RES_FILE        = IceStormFreezeDB.res

+MRES_FILE       = IceStormMigrate.res

+

+$(LIBNAME): $(DLLNAME)

+

+$(DLLNAME): $(OBJS) $(DB_OBJS) IceStormFreezeDB.res

+	$(LINK) /base:0x2D000000 $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(DB_OBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) \

+		$(RES_FILE)

+	move $(DLLNAME:.dll=.lib) $(LIBNAME)

+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \

+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest

+	@if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)

+

+$(MIGRATE): $(MOBJS) IceStormMigrate.res

+	$(LINK) $(LD_EXEFLAGS) $(MPDBFLAGS) $(MOBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS)$(MLINKWITH) $(MRES_FILE)

+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \

+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest

+

+LLUMap.h LLUMap.cpp: ..\..\IceStorm\LLURecord.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)

+	del /q LLUMap.h LLUMap.cpp

+	$(SLICE2FREEZECMD) --dict IceStorm::LLUMap,string,IceStormElection::LogUpdate LLUMap ..\..\IceStorm\LLURecord.ice

+

+SubscriberMap.h SubscriberMap.cpp: ..\..\IceStorm\SubscriberRecord.ice $(slicedir)\Ice\Identity.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)

+	del /q SubscriberMap.h SubscriberMap.cpp

+	$(SLICE2FREEZECMD) \

+	--dict IceStorm::SubscriberMap,IceStorm::SubscriberRecordKey,IceStorm::SubscriberRecord,sort \

+	SubscriberMap ..\..\IceStorm\SubscriberRecord.ice

+

+# Needed for migration.

+V32FormatDB.h V32FormatDB.cpp: V32Format.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)

+	del /q V32FormatDB.h V32FormatDB.cpp

+	$(SLICE2FREEZECMD) --dict IceStorm::V32Format,Ice::Identity,IceStorm::LinkRecordSeq \

+	V32FormatDB V32Format.ice

+

+V31FormatDB.h V31FormatDB.cpp: V31Format.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)

+	del /q V31FormatDB.h V31FormatDB.cpp

+	$(SLICE2FREEZECMD) --dict IceStorm::V31Format,string,IceStorm::LinkRecordDict \

+	V31FormatDB V31Format.ice

+

+clean::

+	-del /q LLUMap.h LLUMap.cpp

+	-del /q SubscriberMap.h SubscriberMap.cpp

+	-del /q V32FormatDB.cpp V31FormatDB.cpp V31FormatDB.h V31FormatDB.h

+	-del /q V32Migrate.cpp V32Migrate.h

+	-del /q V31Migrate.cpp V31Migrate.h

+	-del /q $(MIGRATE:.exe=.*)

+	-del /q IceStormFreezeDB.res IceStormMigrate.res

+

+install:: all

+	copy $(LIBNAME) "$(install_libdir)"

+	copy $(DLLNAME) "$(install_bindir)"

+	copy $(MIGRATE) "$(install_bindir)"

+

+!if "$(GENERATE_PDB)" == "yes"

+

+install:: all

+	copy $(DLLNAME:.dll=.pdb) "$(install_bindir)"

+	copy $(MIGRATE:.exe=.pdb) "$(install_bindir)"

+

+!endif

+

+!include .depend.mak

diff --git a/cpp/src/IceStorm/LLURecord.ice b/cpp/src/IceStorm/LLURecord.ice
index a3e23830109..23cebf0fd7b 100644
--- a/cpp/src/IceStorm/LLURecord.ice
+++ b/cpp/src/IceStorm/LLURecord.ice
@@ -26,4 +26,4 @@ struct LogUpdate
 
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/cpp/src/IceStorm/SqlDB/IceStormSqlDB.rc b/cpp/src/IceStorm/SqlDB/IceStormSqlDB.rc
index eafc50e59d5..d8bafb2524c 100644
--- a/cpp/src/IceStorm/SqlDB/IceStormSqlDB.rc
+++ b/cpp/src/IceStorm/SqlDB/IceStormSqlDB.rc
@@ -1,38 +1,38 @@
-#include "winver.h"
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,4,0,0
- PRODUCTVERSION 3,4,0,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icestormsqldb34d\0"
- #define ORIGINALFILENAME "icestormsqldb34d.dll\0"
-#else
- FILEFLAGS 0x0L
- #define INTERNALNAME "icestormsqldb34\0"
- #define ORIGINALFILENAME "icestormsqldb34.dll\0"
-#endif
- FILEOS 0x4L
- FILETYPE VFT_DLL
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904e4"
-        BEGIN
-            VALUE "CompanyName", "ZeroC, Inc.\0"
-            VALUE "FileDescription", "IceStorm Sql DB DLL\0"
-            VALUE "FileVersion", "3.4.0\0"
-            VALUE "InternalName", INTERNALNAME
-            VALUE "LegalCopyright", "Copyright (c) 2003-2010 ZeroC, Inc.  All rights reserved.\0"
-            VALUE "OriginalFilename", ORIGINALFILENAME
-            VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.4.0\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1252
-    END
-END
+#include "winver.h"

+

+VS_VERSION_INFO VERSIONINFO

+ FILEVERSION 3,4,0,0

+ PRODUCTVERSION 3,4,0,0

+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

+#ifdef _DEBUG

+ FILEFLAGS VS_FF_DEBUG

+ #define INTERNALNAME "icestormsqldb34d\0"

+ #define ORIGINALFILENAME "icestormsqldb34d.dll\0"

+#else

+ FILEFLAGS 0x0L

+ #define INTERNALNAME "icestormsqldb34\0"

+ #define ORIGINALFILENAME "icestormsqldb34.dll\0"

+#endif

+ FILEOS 0x4L

+ FILETYPE VFT_DLL

+ FILESUBTYPE 0x0L

+BEGIN

+    BLOCK "StringFileInfo"

+    BEGIN

+        BLOCK "040904e4"

+        BEGIN

+            VALUE "CompanyName", "ZeroC, Inc.\0"

+            VALUE "FileDescription", "IceStorm Sql DB DLL\0"

+            VALUE "FileVersion", "3.4.0\0"

+            VALUE "InternalName", INTERNALNAME

+            VALUE "LegalCopyright", "Copyright (c) 2003-2010 ZeroC, Inc.  All rights reserved.\0"

+            VALUE "OriginalFilename", ORIGINALFILENAME

+            VALUE "ProductName", "Ice\0"

+            VALUE "ProductVersion", "3.4.0\0"

+        END

+    END

+    BLOCK "VarFileInfo"

+    BEGIN

+        VALUE "Translation", 0x409, 1252

+    END

+END

diff --git a/cpp/src/IceStorm/SqlDB/Makefile.mak b/cpp/src/IceStorm/SqlDB/Makefile.mak
index 3a78f92f0e0..c739fc3efa1 100644
--- a/cpp/src/IceStorm/SqlDB/Makefile.mak
+++ b/cpp/src/IceStorm/SqlDB/Makefile.mak
@@ -1,66 +1,66 @@
-
-#
-# Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ..\..\..
-
-LIBNAME		= $(top_srcdir)\lib\icestormsqldb$(LIBSUFFIX).lib
-DLLNAME		= $(top_srcdir)\bin\icestormsqldb$(COMPSUFFIX)$(SOVERSION)$(LIBSUFFIX).dll
-
-TARGETS         = $(LIBNAME) $(DLLNAME)
-
-OBJS  		= SqlLLU.obj \
-                  SqlSubscriberMap.obj \
-		  SqlDB.obj
-
-DB_OBJS		= SqlTypes.obj
-
-{$(top_srcdir)\src\IceDB\}.cpp.obj::
-    $(CXX) /c $(CPPFLAGS) $(CXXFLAGS) $<
-
-SRCS		= $(OBJS:.obj=.cpp) \
-		  $(MOBJS:.obj=.cpp) \
-		  $(top_srcdir)\src\IceDB\SqlTypes.cpp
-
-!include $(top_srcdir)\config\Make.rules.mak
-
-CPPFLAGS	= -I..\.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-
-LINKWITH 	= $(QT_LIBS) icestormservice$(LIBSUFFIX).lib icestorm$(LIBSUFFIX).lib icedb$(LIBSUFFIX).lib $(LIBS)
-
-!if "$(GENERATE_PDB)" == "yes"
-PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)
-!endif
-
-RES_FILE        = IceStormSqlDB.res
-
-$(LIBNAME): $(DLLNAME)
-
-$(DLLNAME): $(OBJS) $(DB_OBJS) IceStormSqlDB.res
-	$(LINK) /base:0x2D000000 $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(DB_OBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) \
-		$(RES_FILE)
-	move $(DLLNAME:.dll=.lib) $(LIBNAME)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-	@if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
-
-clean::
-	-del /q IceStormSqlDB.res
-
-install:: all
-	copy $(LIBNAME) "$(install_libdir)"
-	copy $(DLLNAME) "$(install_bindir)"
-
-!if "$(GENERATE_PDB)" == "yes"
-
-install:: all
-	copy $(DLLNAME:.dll=.pdb) "$(install_bindir)"
-
-!endif
-
-!include .depend.mak
+

+#

+# Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.

+#

+# This copy of Ice is licensed to you under the terms described in the

+# ICE_LICENSE file included in this distribution.

+#

+# **********************************************************************

+

+top_srcdir	= ..\..\..

+

+LIBNAME		= $(top_srcdir)\lib\icestormsqldb$(LIBSUFFIX).lib

+DLLNAME		= $(top_srcdir)\bin\icestormsqldb$(COMPSUFFIX)$(SOVERSION)$(LIBSUFFIX).dll

+

+TARGETS         = $(LIBNAME) $(DLLNAME)

+

+OBJS  		= SqlLLU.obj \

+                  SqlSubscriberMap.obj \

+		  SqlDB.obj

+

+DB_OBJS		= SqlTypes.obj

+

+{$(top_srcdir)\src\IceDB\}.cpp.obj::

+    $(CXX) /c $(CPPFLAGS) $(CXXFLAGS) $<

+

+SRCS		= $(OBJS:.obj=.cpp) \

+		  $(MOBJS:.obj=.cpp) \

+		  $(top_srcdir)\src\IceDB\SqlTypes.cpp

+

+!include $(top_srcdir)\config\Make.rules.mak

+

+CPPFLAGS	= -I..\.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN

+

+LINKWITH 	= $(QT_LIBS) icestormservice$(LIBSUFFIX).lib icestorm$(LIBSUFFIX).lib icedb$(LIBSUFFIX).lib $(LIBS)

+

+!if "$(GENERATE_PDB)" == "yes"

+PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)

+!endif

+

+RES_FILE        = IceStormSqlDB.res

+

+$(LIBNAME): $(DLLNAME)

+

+$(DLLNAME): $(OBJS) $(DB_OBJS) IceStormSqlDB.res

+	$(LINK) /base:0x2D000000 $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(DB_OBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) \

+		$(RES_FILE)

+	move $(DLLNAME:.dll=.lib) $(LIBNAME)

+	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \

+	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest

+	@if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)

+

+clean::

+	-del /q IceStormSqlDB.res

+

+install:: all

+	copy $(LIBNAME) "$(install_libdir)"

+	copy $(DLLNAME) "$(install_bindir)"

+

+!if "$(GENERATE_PDB)" == "yes"

+

+install:: all

+	copy $(DLLNAME:.dll=.pdb) "$(install_bindir)"

+

+!endif

+

+!include .depend.mak