4651 - Inconsistent line endings

47 files changed, 1813 insertions, 1813 deletions

diff --git a/cpp/demo/Database/Oracle/occi/DbTypes.typ b/cpp/demo/Database/Oracle/occi/DbTypes.typ
index f682eb61adc..89a7a2a0a02 100755
--- a/cpp/demo/Database/Oracle/occi/DbTypes.typ
+++ b/cpp/demo/Database/Oracle/occi/DbTypes.typ
@@ -1,16 +1,16 @@
-# **********************************************************************

-#

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

-#

-# **********************************************************************

-#

-# Compile with:

-# ott userid=scott/tiger@orcl code=cpp hfile=DbTypes.h cppfile=DbTypes.cpp

-#     mapfile=DbTypesMap.cpp intype=DbTypes.typ outtype=DbTypesOut.typ 

-#     attraccess=private

-#

-TYPE DEPT_T

-TYPE EMP_T

+# **********************************************************************
+#
+# 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.
+#
+# **********************************************************************
+#
+# Compile with:
+# ott userid=scott/tiger@orcl code=cpp hfile=DbTypes.h cppfile=DbTypes.cpp
+#     mapfile=DbTypesMap.cpp intype=DbTypes.typ outtype=DbTypesOut.typ 
+#     attraccess=private
+#
+TYPE DEPT_T
+TYPE EMP_T
diff --git a/cpp/demo/Database/Oracle/occi/OCCIServantLocator.cpp b/cpp/demo/Database/Oracle/occi/OCCIServantLocator.cpp
index 58c4148376c..51a014dfb2a 100644
--- a/cpp/demo/Database/Oracle/occi/OCCIServantLocator.cpp
+++ b/cpp/demo/Database/Oracle/occi/OCCIServantLocator.cpp
@@ -6,75 +6,75 @@
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
-

-#include <OCCIServantLocator.h>

-#include <EmpI.h>

-#include <DeptI.h>

-#include <DbTypes.h>

-#include <Util.h>

-#include <occi.h>

-

-using namespace std;

-using namespace oracle::occi;

-

-OCCIServantLocator::OCCIServantLocator(const DeptFactoryIPtr& factory) :

-    _factory(factory)

-{}

-

-

-Ice::ObjectPtr 

-OCCIServantLocator::locate(const Ice::Current& current, Ice::LocalObjectPtr& cookie)

-{

-    ConnectionHolderPtr con = new ConnectionHolder(_factory->getConnectionPool());

-    RefAny ref = decodeRef(current.id.name, _factory->getEnv(), con->connection());

-

-    try

-    {

-        //

-        // Extract SQL type from target object

-        //

-        string sqlType = Ref<PObject>(ref)->getSQLTypeName();

-

-        //

-        // Create and return the servant, used only for this one operation

-        //

-        if(sqlType.find("EMP_T") != string::npos)

-        {

-            return new EmpI(ref, con, _factory);

-        }

-        else if(sqlType.find("DEPT_T") != string::npos)

-        {

-            return new DeptI(ref, con, _factory);

-        }

-        else

-        {

-            return 0;

-        }

-    }

-    catch(const SQLException& sqle)

-    {

-        if(sqle.getErrorCode() == 21700)

-        {

-            return 0;

-        }

-        else

-        {

-            throw;

-        }

-    }

-}

-

-void 

-OCCIServantLocator::finished(const Ice::Current&, const Ice::ObjectPtr&, const Ice::LocalObjectPtr&)

-{

-    //

-    // Nothing to do: if the connection was not yet released, it is released (and the tx rolled back)

-    // when the servant's last refcount goes away

-    //

-}

-

-void 

-OCCIServantLocator::deactivate(const string&)

-{

-}

-

+
+#include <OCCIServantLocator.h>
+#include <EmpI.h>
+#include <DeptI.h>
+#include <DbTypes.h>
+#include <Util.h>
+#include <occi.h>
+
+using namespace std;
+using namespace oracle::occi;
+
+OCCIServantLocator::OCCIServantLocator(const DeptFactoryIPtr& factory) :
+    _factory(factory)
+{}
+
+
+Ice::ObjectPtr 
+OCCIServantLocator::locate(const Ice::Current& current, Ice::LocalObjectPtr& cookie)
+{
+    ConnectionHolderPtr con = new ConnectionHolder(_factory->getConnectionPool());
+    RefAny ref = decodeRef(current.id.name, _factory->getEnv(), con->connection());
+
+    try
+    {
+        //
+        // Extract SQL type from target object
+        //
+        string sqlType = Ref<PObject>(ref)->getSQLTypeName();
+
+        //
+        // Create and return the servant, used only for this one operation
+        //
+        if(sqlType.find("EMP_T") != string::npos)
+        {
+            return new EmpI(ref, con, _factory);
+        }
+        else if(sqlType.find("DEPT_T") != string::npos)
+        {
+            return new DeptI(ref, con, _factory);
+        }
+        else
+        {
+            return 0;
+        }
+    }
+    catch(const SQLException& sqle)
+    {
+        if(sqle.getErrorCode() == 21700)
+        {
+            return 0;
+        }
+        else
+        {
+            throw;
+        }
+    }
+}
+
+void 
+OCCIServantLocator::finished(const Ice::Current&, const Ice::ObjectPtr&, const Ice::LocalObjectPtr&)
+{
+    //
+    // Nothing to do: if the connection was not yet released, it is released (and the tx rolled back)
+    // when the servant's last refcount goes away
+    //
+}
+
+void 
+OCCIServantLocator::deactivate(const string&)
+{
+}
+
diff --git a/cpp/demo/Database/Oracle/occi/OCCIServantLocator.h b/cpp/demo/Database/Oracle/occi/OCCIServantLocator.h
index f1d952b39f3..61fdc9784c4 100644
--- a/cpp/demo/Database/Oracle/occi/OCCIServantLocator.h
+++ b/cpp/demo/Database/Oracle/occi/OCCIServantLocator.h
@@ -6,26 +6,26 @@
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
-

-#ifndef OCCI_SERVANT_LOCATOR_H

-#define OCCI_SERVANT_LOCATOR_H

-

-#include <DeptFactoryI.h>

-#include <Ice/ServantLocator.h>

-#include <occi.h>

-

-class OCCIServantLocator : public Ice::ServantLocator

-{

-public:

-    

-    OCCIServantLocator(const DeptFactoryIPtr&);

-

-    virtual Ice::ObjectPtr locate(const Ice::Current&, Ice::LocalObjectPtr&);

-    virtual void finished(const Ice::Current&, const Ice::ObjectPtr&, const Ice::LocalObjectPtr&);

-    virtual void deactivate(const std::string&);

-  

-private:

-    DeptFactoryIPtr _factory;

-};

-

-#endif

+
+#ifndef OCCI_SERVANT_LOCATOR_H
+#define OCCI_SERVANT_LOCATOR_H
+
+#include <DeptFactoryI.h>
+#include <Ice/ServantLocator.h>
+#include <occi.h>
+
+class OCCIServantLocator : public Ice::ServantLocator
+{
+public:
+    
+    OCCIServantLocator(const DeptFactoryIPtr&);
+
+    virtual Ice::ObjectPtr locate(const Ice::Current&, Ice::LocalObjectPtr&);
+    virtual void finished(const Ice::Current&, const Ice::ObjectPtr&, const Ice::LocalObjectPtr&);
+    virtual void deactivate(const std::string&);
+  
+private:
+    DeptFactoryIPtr _factory;
+};
+
+#endif
diff --git a/cpp/demo/Database/Oracle/occi/createTypes.sql b/cpp/demo/Database/Oracle/occi/createTypes.sql
index 82fdc0fc025..3c8422d9764 100644
--- a/cpp/demo/Database/Oracle/occi/createTypes.sql
+++ b/cpp/demo/Database/Oracle/occi/createTypes.sql
@@ -1,54 +1,54 @@
-Rem

-Rem Copyright (c) 2006 ZeroC, Inc. All rights reserved.

-Rem

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

-Rem ICE_LICENSE file included in this distribution.

-

-Rem

-Rem Create object types and views for the DEPT and EMP tables

-Rem

-

-SET ECHO ON 

-

-CONNECT scott/tiger@orcl

-

-DROP VIEW EMP_VIEW;

-DROP VIEW DEPT_VIEW;

-DROP TYPE EMP_T;

-DROP TYPE DEPT_T;

-

-CREATE TYPE DEPT_T AS OBJECT(

-   DEPTNO NUMBER(2),

-   DNAME VARCHAR2(14),

-   LOC VARCHAR2(13));

-/

-

-CREATE TYPE EMP_T;

-/

-CREATE TYPE EMP_T AS OBJECT(

-   EMPNO NUMBER(4),

-   ENAME VARCHAR2(10),

-   JOB VARCHAR2(9),

-   MGRREF REF EMP_T,

-   HIREDATE DATE,

-   SAL NUMBER(7,2),

-   COMM NUMBER(7,2),

-   DEPTREF REF DEPT_T);

-/

-

-CREATE VIEW DEPT_VIEW OF DEPT_T WITH OBJECT IDENTIFIER(DEPTNO)

-   AS SELECT DEPTNO, DNAME, LOC FROM DEPT;

-

-Rem

-Rem Need to create the view in two steps since it references itself

-Rem

-CREATE VIEW EMP_VIEW OF EMP_T WITH OBJECT IDENTIFIER(EMPNO)

-   AS SELECT EMPNO, ENAME, JOB, NULL, HIREDATE, SAL, COMM, 

-             MAKE_REF(DEPT_VIEW, DEPTNO) FROM EMP;

-

-CREATE OR REPLACE VIEW EMP_VIEW OF EMP_T WITH OBJECT IDENTIFIER(EMPNO)

-   AS SELECT EMPNO, ENAME, JOB, MAKE_REF(EMP_VIEW, MGR), HIREDATE, SAL,

-             COMM, MAKE_REF(DEPT_VIEW, DEPTNO) FROM EMP;

-

-COMMIT;

-EXIT

+Rem
+Rem Copyright (c) 2006 ZeroC, Inc. All rights reserved.
+Rem
+Rem This copy of Ice is licensed to you under the terms described in the
+Rem ICE_LICENSE file included in this distribution.
+
+Rem
+Rem Create object types and views for the DEPT and EMP tables
+Rem
+
+SET ECHO ON 
+
+CONNECT scott/tiger@orcl
+
+DROP VIEW EMP_VIEW;
+DROP VIEW DEPT_VIEW;
+DROP TYPE EMP_T;
+DROP TYPE DEPT_T;
+
+CREATE TYPE DEPT_T AS OBJECT(
+   DEPTNO NUMBER(2),
+   DNAME VARCHAR2(14),
+   LOC VARCHAR2(13));
+/
+
+CREATE TYPE EMP_T;
+/
+CREATE TYPE EMP_T AS OBJECT(
+   EMPNO NUMBER(4),
+   ENAME VARCHAR2(10),
+   JOB VARCHAR2(9),
+   MGRREF REF EMP_T,
+   HIREDATE DATE,
+   SAL NUMBER(7,2),
+   COMM NUMBER(7,2),
+   DEPTREF REF DEPT_T);
+/
+
+CREATE VIEW DEPT_VIEW OF DEPT_T WITH OBJECT IDENTIFIER(DEPTNO)
+   AS SELECT DEPTNO, DNAME, LOC FROM DEPT;
+
+Rem
+Rem Need to create the view in two steps since it references itself
+Rem
+CREATE VIEW EMP_VIEW OF EMP_T WITH OBJECT IDENTIFIER(EMPNO)
+   AS SELECT EMPNO, ENAME, JOB, NULL, HIREDATE, SAL, COMM, 
+             MAKE_REF(DEPT_VIEW, DEPTNO) FROM EMP;
+
+CREATE OR REPLACE VIEW EMP_VIEW OF EMP_T WITH OBJECT IDENTIFIER(EMPNO)
+   AS SELECT EMPNO, ENAME, JOB, MAKE_REF(EMP_VIEW, MGR), HIREDATE, SAL,
+             COMM, MAKE_REF(DEPT_VIEW, DEPTNO) FROM EMP;
+
+COMMIT;
+EXIT
diff --git a/cpp/demo/Freeze/library/Scanner.cpp b/cpp/demo/Freeze/library/Scanner.cpp
index 89c9c00a3c2..909b2633081 100755
--- a/cpp/demo/Freeze/library/Scanner.cpp
+++ b/cpp/demo/Freeze/library/Scanner.cpp
@@ -1,4 +1,4 @@
-#include "IceUtil/Config.h" 

+#include "IceUtil/Config.h" 
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
diff --git a/cpp/demo/Freeze/phonebook/Scanner.cpp b/cpp/demo/Freeze/phonebook/Scanner.cpp
index ca723d09126..22fedb31aca 100755
--- a/cpp/demo/Freeze/phonebook/Scanner.cpp
+++ b/cpp/demo/Freeze/phonebook/Scanner.cpp
@@ -1,4 +1,4 @@
-#include "IceUtil/Config.h" 

+#include "IceUtil/Config.h" 
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
diff --git a/cpp/demo/Ice/MFC/client/HelloClient.h b/cpp/demo/Ice/MFC/client/HelloClient.h
index 2f5cef4faae..08a21097d1d 100644
--- a/cpp/demo/Ice/MFC/client/HelloClient.h
+++ b/cpp/demo/Ice/MFC/client/HelloClient.h
@@ -7,28 +7,28 @@
 //
 // **********************************************************************
 
-

-#ifndef HELLO_CLIENT_H

-#define HELLO_CLIENT_H

-

-#pragma once

-

-#ifndef __AFXWIN_H__

-    #error include 'stdafx.h' before including this file for PCH

-#endif

-

-#include "Resource.h"

-

-class CHelloClientApp : public CWinApp

-{

-public:

-    CHelloClientApp();

-

-    virtual BOOL InitInstance();

-

-    DECLARE_MESSAGE_MAP()

-};

-

-extern CHelloClientApp theApp;

-

-#endif

+
+#ifndef HELLO_CLIENT_H
+#define HELLO_CLIENT_H
+
+#pragma once
+
+#ifndef __AFXWIN_H__
+    #error include 'stdafx.h' before including this file for PCH
+#endif
+
+#include "Resource.h"
+
+class CHelloClientApp : public CWinApp
+{
+public:
+    CHelloClientApp();
+
+    virtual BOOL InitInstance();
+
+    DECLARE_MESSAGE_MAP()
+};
+
+extern CHelloClientApp theApp;
+
+#endif
diff --git a/cpp/demo/Ice/MFC/client/HelloClientDlg.cpp b/cpp/demo/Ice/MFC/client/HelloClientDlg.cpp
index c3f8f31ca74..fbb9dcc2a91 100644
--- a/cpp/demo/Ice/MFC/client/HelloClientDlg.cpp
+++ b/cpp/demo/Ice/MFC/client/HelloClientDlg.cpp
@@ -1,452 +1,452 @@
-// **********************************************************************

-//

-// 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.

-//

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

-

-#include "stdafx.h"

-#include "HelloClient.h"

-#include "HelloClientDlg.h"

-

-#include <iomanip>

-

-#ifdef _DEBUG

-#define new DEBUG_NEW

-#endif

-

-#define WM_AMI_CALLBACK             (WM_USER + 1)

-

-using namespace std;

-using namespace Demo;

-

-namespace

-{

-

-class Dispatcher : public Ice::Dispatcher

-{

-public:

-

-    Dispatcher(CHelloClientDlg* dialog) : _dialog(dialog)

-    {

-    }

-

-    virtual void 

-    dispatch(const Ice::DispatcherCallPtr& call, const Ice::ConnectionPtr&)

-    {

-        //

-        // Dispatch Ice AMI callbacks with the event loop thread.

-        //

-        _dialog->PostMessage(WM_AMI_CALLBACK, 0, reinterpret_cast<LPARAM>(new Ice::DispatcherCallPtr(call)));

-    }

-

-private:

-

-    CHelloClientDlg* _dialog;

-};

-

-class Callback : public IceUtil::Shared

-{

-public:

-

-    Callback(CHelloClientDlg* dialog) : _dialog(dialog)

-    {

-    }

-

-    void

-    sent(bool)

-    {

-        _dialog->sent();

-    }

-

-    void

-    response()

-    {

-        _dialog->response();

-    }

-

-    void

-    exception(const Ice::Exception& ex)

-    {

-        _dialog->exception(ex);

-    }

-

-    void

-    flushSent(bool)

-    {

-        _dialog->flushed();

-    }

-

-private:

-

-    CHelloClientDlg* _dialog;

-};

-typedef IceUtil::Handle<Callback> CallbackPtr;

-

-enum DeliveryMode

-{

-    TWOWAY,

-    TWOWAY_SECURE,

-    ONEWAY,

-    ONEWAY_SECURE,

-    ONEWAY_BATCH,

-    ONEWAY_SECURE_BATCH,

-    DATAGRAM,

-    DATAGRAM_BATCH

-};

-

-}

-

-BEGIN_MESSAGE_MAP(CHelloClientDlg, CDialog)

-    ON_WM_PAINT()

-    ON_WM_QUERYDRAGICON()

-    ON_WM_HSCROLL()

-    ON_BN_CLICKED(IDC_INVOKE, OnSayHello)

-    ON_BN_CLICKED(IDC_FLUSH, OnFlush)

-    ON_BN_CLICKED(IDC_SHUTDOWN, OnShutdown)

-    ON_MESSAGE(WM_AMI_CALLBACK, OnAMICallback)

-END_MESSAGE_MAP()

-

-

-CHelloClientDlg::CHelloClientDlg(CWnd* pParent /*=NULL*/) : CDialog(CHelloClientDlg::IDD, pParent)

-{

-    _hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);

-

-    //

-    // Create the communicator.

-    //

-    Ice::InitializationData initData;

-    initData.properties = Ice::createProperties();

-    initData.properties->load("config");

-    initData.dispatcher = new Dispatcher(this);

-    _communicator = Ice::initialize(initData);

-

-    //

-    // Create AMI callbacks.

-    // 

-    CallbackPtr cb = new Callback(this);

-    _sayHelloCallback = newCallback_Hello_sayHello(cb, &Callback::response, &Callback::exception, &Callback::sent);

-    _shutdownCallback = newCallback_Hello_shutdown(cb, &Callback::response, &Callback::exception);

-    _flushCallback = Ice::newCallback_Communicator_flushBatchRequests(cb, &Callback::exception, &Callback::flushSent);

-}

-

-void

-CHelloClientDlg::DoDataExchange(CDataExchange* pDX)

-{

-    CDialog::DoDataExchange(pDX);

-}

-

-

-BOOL

-CHelloClientDlg::OnInitDialog()

-{

-    CDialog::OnInitDialog();

-

-    // Set the icon for this dialog.  The framework does this automatically

-    // when the application's main window is not a dialog

-    SetIcon(_hIcon, TRUE);         // Set big icon

-    SetIcon(_hIcon, FALSE);        // Set small icon

-

-    //

-    // Retrieve the controls.

-    //

-    _host = (CEdit*)GetDlgItem(IDC_HOST);

-    _mode = (CComboBox*)GetDlgItem(IDC_MODE);

-    _timeout = (CSliderCtrl*)GetDlgItem(IDC_TIMEOUT_SLIDER);

-    _timeoutStatus = (CStatic*)GetDlgItem(IDC_TIMEOUT_STATUS);

-    _delay = (CSliderCtrl*)GetDlgItem(IDC_DELAY_SLIDER);

-    _delayStatus = (CStatic*)GetDlgItem(IDC_DELAY_STATUS);

-    _status = (CStatic*)GetDlgItem(IDC_STATUSBAR);

-    _flush = (CButton*)GetDlgItem(IDC_FLUSH);

-

-    //

-    // Use twoway mode as the initial default.

-    //

-    _mode->SetCurSel(TWOWAY);

-

-    //

-    // Disable flush

-    //

-    _flush->EnableWindow(FALSE);

-

-    //

-    // Set hostname

-    //

-    _host->SetWindowText(CString("127.0.0.1"));

-

-    //

-    // Initialize timeout slider

-    //

-    _timeout->SetRangeMin(0);

-    _timeout->SetRangeMax(50);

-    _timeoutStatus->SetWindowText(CString("0.0s"));

-

-    //

-    // Initialize delay slider

-    //

-    _delay->SetRangeMin(0);

-    _delay->SetRangeMax(50);

-    _delayStatus->SetWindowText(CString("0.0s"));

-

-    _status->SetWindowText(CString(" Ready"));

-

-    return TRUE;  // return TRUE  unless you set the focus to a control

-}

-

-void

-CHelloClientDlg::OnClose()

-{

-    //

-    // Destroy the communicator. If AMI calls are still in progress they will be

-    // interrupted with an Ice::CommunicatorDestroyedException.

-    //

-    try

-    {

-        _communicator->destroy();

-    }

-    catch(const IceUtil::Exception&)

-    {

-    }

-}

-

-// If you add a minimize button to your dialog, you will need the code below

-// to draw the icon.  For MFC applications using the document/view model,

-// this is automatically done for you by the framework.

-

-void

-CHelloClientDlg::OnPaint() 

-{

-    if(IsIconic())

-    {

-        CPaintDC dc(this); // device context for painting

-

-        SendMessage(WM_ICONERASEBKGND, reinterpret_cast<WPARAM>(dc.GetSafeHdc()), 0);

-

-        // Center icon in client rectangle

-        int cxIcon = GetSystemMetrics(SM_CXICON);

-        int cyIcon = GetSystemMetrics(SM_CYICON);

-        CRect rect;

-        GetClientRect(&rect);

-        int x = (rect.Width() - cxIcon + 1) / 2;

-        int y = (rect.Height() - cyIcon + 1) / 2;

-

-        // Draw the icon

-        dc.DrawIcon(x, y, _hIcon);

-    }

-    else

-    {

-        CDialog::OnPaint();

-    }

-}

-

-// The system calls this function to obtain the cursor to display while the user drags

-// the minimized window.

-HCURSOR

-CHelloClientDlg::OnQueryDragIcon()

-{

-    return static_cast<HCURSOR>(_hIcon);

-}

-

-void

-CHelloClientDlg::OnHScroll(UINT, UINT, CScrollBar* scroll)

-{

-    CSliderCtrl* slider = (CSliderCtrl*)scroll;

-    ostringstream s;

-    if(slider == _timeout)

-    {

-        s << setiosflags(ios::fixed) << setprecision(1) << (long)_timeout->GetPos()/10.0 << "s";

-        _timeoutStatus->SetWindowText(CString(s.str().c_str()));

-    }

-    else

-    {

-        s << setiosflags(ios::fixed) << setprecision(1) << (long)_delay->GetPos()/10.0 << "s";

-        _delayStatus->SetWindowText(CString(s.str().c_str()));

-    }

-}

-

-void

-CHelloClientDlg::OnSayHello()

-{

-    Demo::HelloPrx hello = createProxy();

-    if(!hello)

-    {

-        return;

-    }

-    int delay = _delay->GetPos() * 100;

-    try

-    {

-        if(!deliveryModeIsBatch())

-        {

-            _status->SetWindowText(CString(" Sending request"));

-            hello->begin_sayHello(delay, _sayHelloCallback);

-        }

-        else

-        {

-            _flush->EnableWindow(TRUE);

-            hello->sayHello(delay);

-            _status->SetWindowText(CString(" Queued sayHello request"));

-        }

-    }

-    catch(const IceUtil::Exception& ex)

-    {

-        handleException(ex);

-    }

-}

-

-void

-CHelloClientDlg::OnShutdown()

-{

-    Demo::HelloPrx hello = createProxy();

-    try

-    {

-        if(!deliveryModeIsBatch())

-        {

-            _status->SetWindowText(CString(" Sending request"));

-            CallbackPtr cb = new Callback(this);

-            hello->begin_shutdown(_shutdownCallback);

-        }

-        else

-        {

-            _flush->EnableWindow(TRUE);

-            hello->shutdown();

-            _status->SetWindowText(CString(" Queued shutdown request"));

-        }

-    }

-    catch(const IceUtil::Exception& ex)

-    {

-        handleException(ex);

-    }

-}

-

-void

-CHelloClientDlg::OnFlush()

-{

-    try

-    {

-        _communicator->begin_flushBatchRequests(_flushCallback);

-    }

-    catch(const IceUtil::Exception& ex)

-    {

-        handleException(ex);

-    }

-    _flush->EnableWindow(FALSE);

-}

-

-LRESULT

-CHelloClientDlg::OnAMICallback(WPARAM, LPARAM lParam)

-{

-    try

-    {

-        Ice::DispatcherCallPtr* call = reinterpret_cast<Ice::DispatcherCallPtr*>(lParam);

-        (*call)->run();

-        delete call;

-    }

-    catch(const Ice::Exception& ex)

-    {

-        handleException(ex);

-    }

-    return 0;

-}

-

-void

-CHelloClientDlg::sent()

-{

-    int mode = _mode->GetCurSel();

-    if(mode == TWOWAY || mode == TWOWAY_SECURE)

-    {

-        _status->SetWindowText(CString(" Waiting for response"));

-    }

-    else

-    {

-        _status->SetWindowText(CString(" Ready"));

-    }

-}

-

-void

-CHelloClientDlg::response()

-{

-    _status->SetWindowText(CString(" Ready"));

-}

-

-void

-CHelloClientDlg::exception(const Ice::Exception& ex)

-{

-    if(!dynamic_cast<const Ice::CommunicatorDestroyedException*>(&ex))

-    {

-        handleException(ex);

-    }

-}

-

-void

-CHelloClientDlg::flushed()

-{

-    _status->SetWindowText(CString(" Flushed batch requests"));

-}

-

-Demo::HelloPrx

-CHelloClientDlg::createProxy()

-{

-    CString h;

-    _host->GetWindowText(h);

-    string host = (LPCTSTR)h;

-    if(host.size() == 0)

-    {

-        _status->SetWindowText(CString(" No hostname"));

-    }

-

-    string s = "hello:tcp -h " + host + " -p 10000:ssl -h " + host + " -p 10001:udp -h " + host + " -p 10000";

-    Ice::ObjectPrx prx = _communicator->stringToProxy(s);

-

-    int mode = _mode->GetCurSel();

-    switch(mode)

-    {

-        case TWOWAY:

-            prx = prx->ice_twoway();

-            break;

-        case TWOWAY_SECURE:

-            prx = prx->ice_twoway()->ice_secure(true);;

-            break;

-        case ONEWAY:

-            prx = prx->ice_oneway();

-            break;

-        case ONEWAY_SECURE:

-            prx = prx->ice_oneway()->ice_secure(true);

-            break;

-        case ONEWAY_BATCH:

-            prx = prx->ice_batchOneway();

-            break;

-        case ONEWAY_SECURE_BATCH:

-            prx = prx->ice_batchOneway()->ice_secure(true);

-            break;

-        case DATAGRAM:

-            prx = prx->ice_datagram();

-            break;

-        case DATAGRAM_BATCH:

-            prx = prx->ice_batchDatagram();

-            break;

-    }

-

-    int timeout = _timeout->GetPos() * 100;

-    if(timeout != 0)

-    {

-        prx = prx->ice_timeout(timeout);

-    }

-

-    return Demo::HelloPrx::uncheckedCast(prx);

-}

-

-BOOL 

-CHelloClientDlg::deliveryModeIsBatch()

-{

-    return _mode->GetCurSel() == ONEWAY_BATCH ||

-           _mode->GetCurSel() == ONEWAY_SECURE_BATCH ||

-           _mode->GetCurSel() == DATAGRAM_BATCH;

-}

-

-void

-CHelloClientDlg::handleException(const IceUtil::Exception& ex)

-{

-    _status->SetWindowText(CString(ex.ice_name().c_str()));

-}

+// **********************************************************************
+//
+// 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.
+//
+// **********************************************************************
+
+#include "stdafx.h"
+#include "HelloClient.h"
+#include "HelloClientDlg.h"
+
+#include <iomanip>
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#endif
+
+#define WM_AMI_CALLBACK             (WM_USER + 1)
+
+using namespace std;
+using namespace Demo;
+
+namespace
+{
+
+class Dispatcher : public Ice::Dispatcher
+{
+public:
+
+    Dispatcher(CHelloClientDlg* dialog) : _dialog(dialog)
+    {
+    }
+
+    virtual void 
+    dispatch(const Ice::DispatcherCallPtr& call, const Ice::ConnectionPtr&)
+    {
+        //
+        // Dispatch Ice AMI callbacks with the event loop thread.
+        //
+        _dialog->PostMessage(WM_AMI_CALLBACK, 0, reinterpret_cast<LPARAM>(new Ice::DispatcherCallPtr(call)));
+    }
+
+private:
+
+    CHelloClientDlg* _dialog;
+};
+
+class Callback : public IceUtil::Shared
+{
+public:
+
+    Callback(CHelloClientDlg* dialog) : _dialog(dialog)
+    {
+    }
+
+    void
+    sent(bool)
+    {
+        _dialog->sent();
+    }
+
+    void
+    response()
+    {
+        _dialog->response();
+    }
+
+    void
+    exception(const Ice::Exception& ex)
+    {
+        _dialog->exception(ex);
+    }
+
+    void
+    flushSent(bool)
+    {
+        _dialog->flushed();
+    }
+
+private:
+
+    CHelloClientDlg* _dialog;
+};
+typedef IceUtil::Handle<Callback> CallbackPtr;
+
+enum DeliveryMode
+{
+    TWOWAY,
+    TWOWAY_SECURE,
+    ONEWAY,
+    ONEWAY_SECURE,
+    ONEWAY_BATCH,
+    ONEWAY_SECURE_BATCH,
+    DATAGRAM,
+    DATAGRAM_BATCH
+};
+
+}
+
+BEGIN_MESSAGE_MAP(CHelloClientDlg, CDialog)
+    ON_WM_PAINT()
+    ON_WM_QUERYDRAGICON()
+    ON_WM_HSCROLL()
+    ON_BN_CLICKED(IDC_INVOKE, OnSayHello)
+    ON_BN_CLICKED(IDC_FLUSH, OnFlush)
+    ON_BN_CLICKED(IDC_SHUTDOWN, OnShutdown)
+    ON_MESSAGE(WM_AMI_CALLBACK, OnAMICallback)
+END_MESSAGE_MAP()
+
+
+CHelloClientDlg::CHelloClientDlg(CWnd* pParent /*=NULL*/) : CDialog(CHelloClientDlg::IDD, pParent)
+{
+    _hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);
+
+    //
+    // Create the communicator.
+    //
+    Ice::InitializationData initData;
+    initData.properties = Ice::createProperties();
+    initData.properties->load("config");
+    initData.dispatcher = new Dispatcher(this);
+    _communicator = Ice::initialize(initData);
+
+    //
+    // Create AMI callbacks.
+    // 
+    CallbackPtr cb = new Callback(this);
+    _sayHelloCallback = newCallback_Hello_sayHello(cb, &Callback::response, &Callback::exception, &Callback::sent);
+    _shutdownCallback = newCallback_Hello_shutdown(cb, &Callback::response, &Callback::exception);
+    _flushCallback = Ice::newCallback_Communicator_flushBatchRequests(cb, &Callback::exception, &Callback::flushSent);
+}
+
+void
+CHelloClientDlg::DoDataExchange(CDataExchange* pDX)
+{
+    CDialog::DoDataExchange(pDX);
+}
+
+
+BOOL
+CHelloClientDlg::OnInitDialog()
+{
+    CDialog::OnInitDialog();
+
+    // Set the icon for this dialog.  The framework does this automatically
+    // when the application's main window is not a dialog
+    SetIcon(_hIcon, TRUE);         // Set big icon
+    SetIcon(_hIcon, FALSE);        // Set small icon
+
+    //
+    // Retrieve the controls.
+    //
+    _host = (CEdit*)GetDlgItem(IDC_HOST);
+    _mode = (CComboBox*)GetDlgItem(IDC_MODE);
+    _timeout = (CSliderCtrl*)GetDlgItem(IDC_TIMEOUT_SLIDER);
+    _timeoutStatus = (CStatic*)GetDlgItem(IDC_TIMEOUT_STATUS);
+    _delay = (CSliderCtrl*)GetDlgItem(IDC_DELAY_SLIDER);
+    _delayStatus = (CStatic*)GetDlgItem(IDC_DELAY_STATUS);
+    _status = (CStatic*)GetDlgItem(IDC_STATUSBAR);
+    _flush = (CButton*)GetDlgItem(IDC_FLUSH);
+
+    //
+    // Use twoway mode as the initial default.
+    //
+    _mode->SetCurSel(TWOWAY);
+
+    //
+    // Disable flush
+    //
+    _flush->EnableWindow(FALSE);
+
+    //
+    // Set hostname
+    //
+    _host->SetWindowText(CString("127.0.0.1"));
+
+    //
+    // Initialize timeout slider
+    //
+    _timeout->SetRangeMin(0);
+    _timeout->SetRangeMax(50);
+    _timeoutStatus->SetWindowText(CString("0.0s"));
+
+    //
+    // Initialize delay slider
+    //
+    _delay->SetRangeMin(0);
+    _delay->SetRangeMax(50);
+    _delayStatus->SetWindowText(CString("0.0s"));
+
+    _status->SetWindowText(CString(" Ready"));
+
+    return TRUE;  // return TRUE  unless you set the focus to a control
+}
+
+void
+CHelloClientDlg::OnClose()
+{
+    //
+    // Destroy the communicator. If AMI calls are still in progress they will be
+    // interrupted with an Ice::CommunicatorDestroyedException.
+    //
+    try
+    {
+        _communicator->destroy();
+    }
+    catch(const IceUtil::Exception&)
+    {
+    }
+}
+
+// If you add a minimize button to your dialog, you will need the code below
+// to draw the icon.  For MFC applications using the document/view model,
+// this is automatically done for you by the framework.
+
+void
+CHelloClientDlg::OnPaint() 
+{
+    if(IsIconic())
+    {
+        CPaintDC dc(this); // device context for painting
+
+        SendMessage(WM_ICONERASEBKGND, reinterpret_cast<WPARAM>(dc.GetSafeHdc()), 0);
+
+        // Center icon in client rectangle
+        int cxIcon = GetSystemMetrics(SM_CXICON);
+        int cyIcon = GetSystemMetrics(SM_CYICON);
+        CRect rect;
+        GetClientRect(&rect);
+        int x = (rect.Width() - cxIcon + 1) / 2;
+        int y = (rect.Height() - cyIcon + 1) / 2;
+
+        // Draw the icon
+        dc.DrawIcon(x, y, _hIcon);
+    }
+    else
+    {
+        CDialog::OnPaint();
+    }
+}
+
+// The system calls this function to obtain the cursor to display while the user drags
+// the minimized window.
+HCURSOR
+CHelloClientDlg::OnQueryDragIcon()
+{
+    return static_cast<HCURSOR>(_hIcon);
+}
+
+void
+CHelloClientDlg::OnHScroll(UINT, UINT, CScrollBar* scroll)
+{
+    CSliderCtrl* slider = (CSliderCtrl*)scroll;
+    ostringstream s;
+    if(slider == _timeout)
+    {
+        s << setiosflags(ios::fixed) << setprecision(1) << (long)_timeout->GetPos()/10.0 << "s";
+        _timeoutStatus->SetWindowText(CString(s.str().c_str()));
+    }
+    else
+    {
+        s << setiosflags(ios::fixed) << setprecision(1) << (long)_delay->GetPos()/10.0 << "s";
+        _delayStatus->SetWindowText(CString(s.str().c_str()));
+    }
+}
+
+void
+CHelloClientDlg::OnSayHello()
+{
+    Demo::HelloPrx hello = createProxy();
+    if(!hello)
+    {
+        return;
+    }
+    int delay = _delay->GetPos() * 100;
+    try
+    {
+        if(!deliveryModeIsBatch())
+        {
+            _status->SetWindowText(CString(" Sending request"));
+            hello->begin_sayHello(delay, _sayHelloCallback);
+        }
+        else
+        {
+            _flush->EnableWindow(TRUE);
+            hello->sayHello(delay);
+            _status->SetWindowText(CString(" Queued sayHello request"));
+        }
+    }
+    catch(const IceUtil::Exception& ex)
+    {
+        handleException(ex);
+    }
+}
+
+void
+CHelloClientDlg::OnShutdown()
+{
+    Demo::HelloPrx hello = createProxy();
+    try
+    {
+        if(!deliveryModeIsBatch())
+        {
+            _status->SetWindowText(CString(" Sending request"));
+            CallbackPtr cb = new Callback(this);
+            hello->begin_shutdown(_shutdownCallback);
+        }
+        else
+        {
+            _flush->EnableWindow(TRUE);
+            hello->shutdown();
+            _status->SetWindowText(CString(" Queued shutdown request"));
+        }
+    }
+    catch(const IceUtil::Exception& ex)
+    {
+        handleException(ex);
+    }
+}
+
+void
+CHelloClientDlg::OnFlush()
+{
+    try
+    {
+        _communicator->begin_flushBatchRequests(_flushCallback);
+    }
+    catch(const IceUtil::Exception& ex)
+    {
+        handleException(ex);
+    }
+    _flush->EnableWindow(FALSE);
+}
+
+LRESULT
+CHelloClientDlg::OnAMICallback(WPARAM, LPARAM lParam)
+{
+    try
+    {
+        Ice::DispatcherCallPtr* call = reinterpret_cast<Ice::DispatcherCallPtr*>(lParam);
+        (*call)->run();
+        delete call;
+    }
+    catch(const Ice::Exception& ex)
+    {
+        handleException(ex);
+    }
+    return 0;
+}
+
+void
+CHelloClientDlg::sent()
+{
+    int mode = _mode->GetCurSel();
+    if(mode == TWOWAY || mode == TWOWAY_SECURE)
+    {
+        _status->SetWindowText(CString(" Waiting for response"));
+    }
+    else
+    {
+        _status->SetWindowText(CString(" Ready"));
+    }
+}
+
+void
+CHelloClientDlg::response()
+{
+    _status->SetWindowText(CString(" Ready"));
+}
+
+void
+CHelloClientDlg::exception(const Ice::Exception& ex)
+{
+    if(!dynamic_cast<const Ice::CommunicatorDestroyedException*>(&ex))
+    {
+        handleException(ex);
+    }
+}
+
+void
+CHelloClientDlg::flushed()
+{
+    _status->SetWindowText(CString(" Flushed batch requests"));
+}
+
+Demo::HelloPrx
+CHelloClientDlg::createProxy()
+{
+    CString h;
+    _host->GetWindowText(h);
+    string host = (LPCTSTR)h;
+    if(host.size() == 0)
+    {
+        _status->SetWindowText(CString(" No hostname"));
+    }
+
+    string s = "hello:tcp -h " + host + " -p 10000:ssl -h " + host + " -p 10001:udp -h " + host + " -p 10000";
+    Ice::ObjectPrx prx = _communicator->stringToProxy(s);
+
+    int mode = _mode->GetCurSel();
+    switch(mode)
+    {
+        case TWOWAY:
+            prx = prx->ice_twoway();
+            break;
+        case TWOWAY_SECURE:
+            prx = prx->ice_twoway()->ice_secure(true);;
+            break;
+        case ONEWAY:
+            prx = prx->ice_oneway();
+            break;
+        case ONEWAY_SECURE:
+            prx = prx->ice_oneway()->ice_secure(true);
+            break;
+        case ONEWAY_BATCH:
+            prx = prx->ice_batchOneway();
+            break;
+        case ONEWAY_SECURE_BATCH:
+            prx = prx->ice_batchOneway()->ice_secure(true);
+            break;
+        case DATAGRAM:
+            prx = prx->ice_datagram();
+            break;
+        case DATAGRAM_BATCH:
+            prx = prx->ice_batchDatagram();
+            break;
+    }
+
+    int timeout = _timeout->GetPos() * 100;
+    if(timeout != 0)
+    {
+        prx = prx->ice_timeout(timeout);
+    }
+
+    return Demo::HelloPrx::uncheckedCast(prx);
+}
+
+BOOL 
+CHelloClientDlg::deliveryModeIsBatch()
+{
+    return _mode->GetCurSel() == ONEWAY_BATCH ||
+           _mode->GetCurSel() == ONEWAY_SECURE_BATCH ||
+           _mode->GetCurSel() == DATAGRAM_BATCH;
+}
+
+void
+CHelloClientDlg::handleException(const IceUtil::Exception& ex)
+{
+    _status->SetWindowText(CString(ex.ice_name().c_str()));
+}
diff --git a/cpp/demo/Ice/MFC/client/HelloClientDlg.h b/cpp/demo/Ice/MFC/client/HelloClientDlg.h
index 167b1571063..ce692b457cf 100644
--- a/cpp/demo/Ice/MFC/client/HelloClientDlg.h
+++ b/cpp/demo/Ice/MFC/client/HelloClientDlg.h
@@ -1,70 +1,70 @@
-// **********************************************************************

-//

-// 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.

-//

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

-

-

-#ifndef HELLO_CLIENT_DLG_H

-#define HELLO_CLIENT_DLG_H

-

-#include "Hello.h"

-

-#pragma once

-

-class CHelloClientDlg : public CDialog

-{

-public:

-

-    CHelloClientDlg(CWnd* = NULL);

-

-    enum { IDD = IDD_HELLOCLIENT_DIALOG };

-

-    afx_msg void OnCbnSelchangeMode();

-

-    void exception(const Ice::Exception&);

-    void response();;

-    void sent();

-    void flushed();

-

-protected:

-

-    virtual void DoDataExchange(CDataExchange*);    // DDX/DDV support

-

-    Ice::CommunicatorPtr _communicator;

-    Demo::Callback_Hello_sayHelloPtr _sayHelloCallback;

-    Demo::Callback_Hello_shutdownPtr _shutdownCallback;

-    Ice::Callback_Communicator_flushBatchRequestsPtr _flushCallback;

-    CEdit* _host;

-    CComboBox* _mode;

-    CSliderCtrl* _timeout;

-    CStatic* _timeoutStatus;

-    CSliderCtrl* _delay;

-    CStatic* _delayStatus;

-    CStatic* _status;

-    CButton* _flush;

-    HICON _hIcon;

-

-    // Generated message map functions

-    virtual BOOL OnInitDialog();

-    afx_msg void OnClose();

-    afx_msg void OnPaint();

-    afx_msg HCURSOR OnQueryDragIcon();

-    afx_msg void OnHScroll(UINT, UINT, CScrollBar*);

-    afx_msg void OnSayHello();

-    afx_msg void OnFlush();

-    afx_msg void OnShutdown();

-    afx_msg LRESULT OnAMICallback(WPARAM, LPARAM);

-    DECLARE_MESSAGE_MAP()

-

-private:

-

-    Demo::HelloPrx createProxy();

-    BOOL deliveryModeIsBatch();

-    void handleException(const IceUtil::Exception&);

-};

-

-#endif

+// **********************************************************************
+//
+// 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.
+//
+// **********************************************************************
+
+
+#ifndef HELLO_CLIENT_DLG_H
+#define HELLO_CLIENT_DLG_H
+
+#include "Hello.h"
+
+#pragma once
+
+class CHelloClientDlg : public CDialog
+{
+public:
+
+    CHelloClientDlg(CWnd* = NULL);
+
+    enum { IDD = IDD_HELLOCLIENT_DIALOG };
+
+    afx_msg void OnCbnSelchangeMode();
+
+    void exception(const Ice::Exception&);
+    void response();;
+    void sent();
+    void flushed();
+
+protected:
+
+    virtual void DoDataExchange(CDataExchange*);    // DDX/DDV support
+
+    Ice::CommunicatorPtr _communicator;
+    Demo::Callback_Hello_sayHelloPtr _sayHelloCallback;
+    Demo::Callback_Hello_shutdownPtr _shutdownCallback;
+    Ice::Callback_Communicator_flushBatchRequestsPtr _flushCallback;
+    CEdit* _host;
+    CComboBox* _mode;
+    CSliderCtrl* _timeout;
+    CStatic* _timeoutStatus;
+    CSliderCtrl* _delay;
+    CStatic* _delayStatus;
+    CStatic* _status;
+    CButton* _flush;
+    HICON _hIcon;
+
+    // Generated message map functions
+    virtual BOOL OnInitDialog();
+    afx_msg void OnClose();
+    afx_msg void OnPaint();
+    afx_msg HCURSOR OnQueryDragIcon();
+    afx_msg void OnHScroll(UINT, UINT, CScrollBar*);
+    afx_msg void OnSayHello();
+    afx_msg void OnFlush();
+    afx_msg void OnShutdown();
+    afx_msg LRESULT OnAMICallback(WPARAM, LPARAM);
+    DECLARE_MESSAGE_MAP()
+
+private:
+
+    Demo::HelloPrx createProxy();
+    BOOL deliveryModeIsBatch();
+    void handleException(const IceUtil::Exception&);
+};
+
+#endif
diff --git a/cpp/demo/Ice/MFC/client/Resource.h b/cpp/demo/Ice/MFC/client/Resource.h
index 7075a527802..b35407d15ec 100755
--- a/cpp/demo/Ice/MFC/client/Resource.h
+++ b/cpp/demo/Ice/MFC/client/Resource.h
@@ -1,33 +1,33 @@
-//{{NO_DEPENDENCIES}}

-// Microsoft Visual C++ generated include file.

-// Used by HelloClient.rc

-//

-#define IDD_HELLOCLIENT_DIALOG          101

-#define IDR_MAINFRAME                   128

-#define IDC_MODELABEL                   1000

-#define IDC_MODE                        1001

-#define IDC_TIMEOUTLABEL                1002

-#define IDC_DELAYLABEL                  1003

-#define IDC_INVOKE                      1004

-#define IDC_FLUSH                       1005

-#define IDC_SHUTDOWN                    1006

-#define IDC_STATUSBAR                   1007

-#define IDC_TIMEOUT_STATUS              1008

-#define IDC_HOST                        1009

-#define IDC_HOSTNAME                    1010

-#define IDC_HOSTLABEL                   1010

-#define IDC_TIMEOUT_SLIDER              1011

-#define IDC_DELAY_SLIDER                1012

-#define IDC_STATUSBAR3                  1013

-#define IDC_DELAY_STATUS                1013

-

-// Next default values for new objects

-// 

-#ifdef APSTUDIO_INVOKED

-#ifndef APSTUDIO_READONLY_SYMBOLS

-#define _APS_NEXT_RESOURCE_VALUE        130

-#define _APS_NEXT_COMMAND_VALUE         32771

-#define _APS_NEXT_CONTROL_VALUE         1012

-#define _APS_NEXT_SYMED_VALUE           101

-#endif

-#endif

+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by HelloClient.rc
+//
+#define IDD_HELLOCLIENT_DIALOG          101
+#define IDR_MAINFRAME                   128
+#define IDC_MODELABEL                   1000
+#define IDC_MODE                        1001
+#define IDC_TIMEOUTLABEL                1002
+#define IDC_DELAYLABEL                  1003
+#define IDC_INVOKE                      1004
+#define IDC_FLUSH                       1005
+#define IDC_SHUTDOWN                    1006
+#define IDC_STATUSBAR                   1007
+#define IDC_TIMEOUT_STATUS              1008
+#define IDC_HOST                        1009
+#define IDC_HOSTNAME                    1010
+#define IDC_HOSTLABEL                   1010
+#define IDC_TIMEOUT_SLIDER              1011
+#define IDC_DELAY_SLIDER                1012
+#define IDC_STATUSBAR3                  1013
+#define IDC_DELAY_STATUS                1013
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        130
+#define _APS_NEXT_COMMAND_VALUE         32771
+#define _APS_NEXT_CONTROL_VALUE         1012
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff --git a/cpp/demo/Ice/MFC/client/stdafx.cpp b/cpp/demo/Ice/MFC/client/stdafx.cpp
index c73265a887b..1e840966688 100644
--- a/cpp/demo/Ice/MFC/client/stdafx.cpp
+++ b/cpp/demo/Ice/MFC/client/stdafx.cpp
@@ -7,11 +7,11 @@
 //
 // **********************************************************************
 
-

-// stdafx.cpp : source file that includes just the standard includes

-// HelloClient.pch will be the pre-compiled header

-// stdafx.obj will contain the pre-compiled type information

-

-#include "stdafx.h"

-

-

+
+// stdafx.cpp : source file that includes just the standard includes
+// HelloClient.pch will be the pre-compiled header
+// stdafx.obj will contain the pre-compiled type information
+
+#include "stdafx.h"
+
+
diff --git a/cpp/demo/Ice/MFC/server/HelloServer.h b/cpp/demo/Ice/MFC/server/HelloServer.h
index 14944e3ae13..198a0d1acba 100644
--- a/cpp/demo/Ice/MFC/server/HelloServer.h
+++ b/cpp/demo/Ice/MFC/server/HelloServer.h
@@ -7,28 +7,28 @@
 //
 // **********************************************************************
 
-

-#ifndef HELLO_SERVER_H

-#define HELLO_SERVER_H

-

-#pragma once

-

-#ifndef __AFXWIN_H__

-    #error include 'stdafx.h' before including this file for PCH

-#endif

-

-#include "Resource.h"

-

-class CHelloServerApp : public CWinApp

-{

-public:

-    CHelloServerApp();

-

-    virtual BOOL InitInstance();

-

-    DECLARE_MESSAGE_MAP()

-};

-

-extern CHelloServerApp theApp;

-

-#endif

+
+#ifndef HELLO_SERVER_H
+#define HELLO_SERVER_H
+
+#pragma once
+
+#ifndef __AFXWIN_H__
+    #error include 'stdafx.h' before including this file for PCH
+#endif
+
+#include "Resource.h"
+
+class CHelloServerApp : public CWinApp
+{
+public:
+    CHelloServerApp();
+
+    virtual BOOL InitInstance();
+
+    DECLARE_MESSAGE_MAP()
+};
+
+extern CHelloServerApp theApp;
+
+#endif
diff --git a/cpp/demo/Ice/MFC/server/HelloServerDlg.h b/cpp/demo/Ice/MFC/server/HelloServerDlg.h
index 4082629ae07..eaa70fe876b 100644
--- a/cpp/demo/Ice/MFC/server/HelloServerDlg.h
+++ b/cpp/demo/Ice/MFC/server/HelloServerDlg.h
@@ -7,39 +7,39 @@
 //
 // **********************************************************************
 
-

-#ifndef HELLO_SERVER_DLG_H

-#define HELLO_SERVER_DLG_H

-

-#pragma once

-

-#include "LogI.h"

-

-class CHelloServerDlg : public CDialog

-{

-public:

-    CHelloServerDlg(const Ice::CommunicatorPtr&, const LogIPtr&, CWnd* = NULL);

-

-    enum { IDD = IDD_HELLOSERVER_DIALOG };

-

-protected:

-    virtual void DoDataExchange(CDataExchange*);    // DDX/DDV support

-

-protected:

-    Ice::CommunicatorPtr _communicator;

-    LogIPtr _log;

-    CEdit* _edit;

-    HICON _hIcon;

-

-    // Generated message map functions

-    virtual BOOL OnInitDialog();

-    virtual void OnCancel();

-    afx_msg void OnPaint();

-    afx_msg HCURSOR OnQueryDragIcon();

-    afx_msg void OnShutdown();

-    afx_msg void OnClear();

+
+#ifndef HELLO_SERVER_DLG_H
+#define HELLO_SERVER_DLG_H
+
+#pragma once
+
+#include "LogI.h"
+
+class CHelloServerDlg : public CDialog
+{
+public:
+    CHelloServerDlg(const Ice::CommunicatorPtr&, const LogIPtr&, CWnd* = NULL);
+
+    enum { IDD = IDD_HELLOSERVER_DIALOG };
+
+protected:
+    virtual void DoDataExchange(CDataExchange*);    // DDX/DDV support
+
+protected:
+    Ice::CommunicatorPtr _communicator;
+    LogIPtr _log;
+    CEdit* _edit;
+    HICON _hIcon;
+
+    // Generated message map functions
+    virtual BOOL OnInitDialog();
+    virtual void OnCancel();
+    afx_msg void OnPaint();
+    afx_msg HCURSOR OnQueryDragIcon();
+    afx_msg void OnShutdown();
+    afx_msg void OnClear();
     afx_msg LRESULT OnLog(WPARAM, LPARAM);
-    DECLARE_MESSAGE_MAP()

-};

-

-#endif

+    DECLARE_MESSAGE_MAP()
+};
+
+#endif
diff --git a/cpp/demo/Ice/MFC/server/Resource.h b/cpp/demo/Ice/MFC/server/Resource.h
index aa36843484c..fd2966fc9b1 100644
--- a/cpp/demo/Ice/MFC/server/Resource.h
+++ b/cpp/demo/Ice/MFC/server/Resource.h
@@ -1,20 +1,20 @@
-//{{NO_DEPENDENCIES}}

-// Microsoft Developer Studio generated include file.

-// Used by HelloServer.rc

-//

-#define IDD_HELLOSERVER_DIALOG          101

-#define IDR_MAINFRAME                   128

-#define IDC_SHUTDOWN                    1001

-#define IDC_CLEAR                       1002

-#define IDC_LOG                         1003

-

-// Next default values for new objects

-// 

-#ifdef APSTUDIO_INVOKED

-#ifndef APSTUDIO_READONLY_SYMBOLS

-#define _APS_NEXT_RESOURCE_VALUE        130

-#define _APS_NEXT_COMMAND_VALUE         32771

-#define _APS_NEXT_CONTROL_VALUE         1004

-#define _APS_NEXT_SYMED_VALUE           101

-#endif

-#endif

+//{{NO_DEPENDENCIES}}
+// Microsoft Developer Studio generated include file.
+// Used by HelloServer.rc
+//
+#define IDD_HELLOSERVER_DIALOG          101
+#define IDR_MAINFRAME                   128
+#define IDC_SHUTDOWN                    1001
+#define IDC_CLEAR                       1002
+#define IDC_LOG                         1003
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        130
+#define _APS_NEXT_COMMAND_VALUE         32771
+#define _APS_NEXT_CONTROL_VALUE         1004
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff --git a/cpp/demo/Ice/MFC/server/stdafx.cpp b/cpp/demo/Ice/MFC/server/stdafx.cpp
index e46a30ff629..59971dfb70f 100644
--- a/cpp/demo/Ice/MFC/server/stdafx.cpp
+++ b/cpp/demo/Ice/MFC/server/stdafx.cpp
@@ -7,11 +7,11 @@
 //
 // **********************************************************************
 
-

-// stdafx.cpp : source file that includes just the standard includes

-// HelloServer.pch will be the pre-compiled header

-// stdafx.obj will contain the pre-compiled type information

-

-#include "stdafx.h"

-

-

+
+// stdafx.cpp : source file that includes just the standard includes
+// HelloServer.pch will be the pre-compiled header
+// stdafx.obj will contain the pre-compiled type information
+
+#include "stdafx.h"
+
+
diff --git a/cpp/demo/IceGrid/icebox/application.xml b/cpp/demo/IceGrid/icebox/application.xml
index dd5e29675c0..7322dc8ae46 100644
--- a/cpp/demo/IceGrid/icebox/application.xml
+++ b/cpp/demo/IceGrid/icebox/application.xml
@@ -1,56 +1,56 @@
-<?xml version="1.0" encoding="UTF-8" ?>

-<!-- This file was written by IceGrid Admin -->

-<icegrid>

-   <application name="HelloSimpsons">

-      <service-template id="HelloService">

-         <parameter name="name"/>

-         <service name="${name}" entry="HelloService:create">

-            <description>A very simple service named after ${name}</description>

-            <properties>

-               <property name="Hello.Identity" value="hello"/>

-            </properties>

-            <adapter name="Hello-${name}" endpoints="default" id="Hello-${name}" replica-group="HelloGroup" server-lifetime="false"/>

-         </service>

-      </service-template>

-      <server-template id="Glacier2">

-         <parameter name="instance-name" default="${application}.Glacier2"/>

-         <parameter name="client-endpoints"/>

-         <parameter name="server-endpoints"/>

-         <parameter name="session-timeout" default="0"/>

-         <server id="${instance-name}" activation="manual" exe="glacier2router">

-            <properties>

-               <property name="Ice.Admin.Endpoints" value="tcp -h 127.0.0.1"/>

-               <property name="Glacier2.Client.Endpoints" value="${client-endpoints}"/>

-               <property name="Glacier2.Server.Endpoints" value="${server-endpoints}"/>

-               <property name="Glacier2.InstanceName" value="${instance-name}"/>

-               <property name="Glacier2.SessionTimeout" value="${session-timeout}"/>

-            </properties>

-         </server>

-      </server-template>

-      <replica-group id="HelloGroup">

-         <load-balancing type="round-robin" n-replicas="1"/>

-         <object identity="hello" type="::Demo::Hello"/>

-      </replica-group>

-      <node name="node1">

-         <server-instance template="Glacier2" instance-name="DemoGlacier2" client-endpoints="tcp -h localhost -p 4063" server-endpoints="tcp">

-            <properties>

-               <property name="Glacier2.SessionManager" value="DemoIceGrid/AdminSessionManager"/>

-               <property name="Glacier2.PermissionsVerifier" value="DemoGlacier2/NullPermissionsVerifier"/>

-            </properties>

-         </server-instance>

-         <icebox id="IceBox" activation="on-demand" exe="icebox">

-            <description>A sample IceBox server</description>

-            <properties>

-               <property name="Ice.Admin.Endpoints" value="tcp -h 127.0.0.1"/>

-               <property name="IceBox.InstanceName" value="${server}"/>

-               <property name="IceBox.Trace.ServiceObserver" value="1"/>

-            </properties>

-            <service-instance template="HelloService" name="Homer"/>

-            <service-instance template="HelloService" name="Marge"/>

-            <service-instance template="HelloService" name="Bart"/>

-            <service-instance template="HelloService" name="Lisa"/>

-            <service-instance template="HelloService" name="Maggie"/>

-         </icebox>

-      </node>

-   </application>

-</icegrid>

+<?xml version="1.0" encoding="UTF-8" ?>
+<!-- This file was written by IceGrid Admin -->
+<icegrid>
+   <application name="HelloSimpsons">
+      <service-template id="HelloService">
+         <parameter name="name"/>
+         <service name="${name}" entry="HelloService:create">
+            <description>A very simple service named after ${name}</description>
+            <properties>
+               <property name="Hello.Identity" value="hello"/>
+            </properties>
+            <adapter name="Hello-${name}" endpoints="default" id="Hello-${name}" replica-group="HelloGroup" server-lifetime="false"/>
+         </service>
+      </service-template>
+      <server-template id="Glacier2">
+         <parameter name="instance-name" default="${application}.Glacier2"/>
+         <parameter name="client-endpoints"/>
+         <parameter name="server-endpoints"/>
+         <parameter name="session-timeout" default="0"/>
+         <server id="${instance-name}" activation="manual" exe="glacier2router">
+            <properties>
+               <property name="Ice.Admin.Endpoints" value="tcp -h 127.0.0.1"/>
+               <property name="Glacier2.Client.Endpoints" value="${client-endpoints}"/>
+               <property name="Glacier2.Server.Endpoints" value="${server-endpoints}"/>
+               <property name="Glacier2.InstanceName" value="${instance-name}"/>
+               <property name="Glacier2.SessionTimeout" value="${session-timeout}"/>
+            </properties>
+         </server>
+      </server-template>
+      <replica-group id="HelloGroup">
+         <load-balancing type="round-robin" n-replicas="1"/>
+         <object identity="hello" type="::Demo::Hello"/>
+      </replica-group>
+      <node name="node1">
+         <server-instance template="Glacier2" instance-name="DemoGlacier2" client-endpoints="tcp -h localhost -p 4063" server-endpoints="tcp">
+            <properties>
+               <property name="Glacier2.SessionManager" value="DemoIceGrid/AdminSessionManager"/>
+               <property name="Glacier2.PermissionsVerifier" value="DemoGlacier2/NullPermissionsVerifier"/>
+            </properties>
+         </server-instance>
+         <icebox id="IceBox" activation="on-demand" exe="icebox">
+            <description>A sample IceBox server</description>
+            <properties>
+               <property name="Ice.Admin.Endpoints" value="tcp -h 127.0.0.1"/>
+               <property name="IceBox.InstanceName" value="${server}"/>
+               <property name="IceBox.Trace.ServiceObserver" value="1"/>
+            </properties>
+            <service-instance template="HelloService" name="Homer"/>
+            <service-instance template="HelloService" name="Marge"/>
+            <service-instance template="HelloService" name="Bart"/>
+            <service-instance template="HelloService" name="Lisa"/>
+            <service-instance template="HelloService" name="Maggie"/>
+         </icebox>
+      </node>
+   </application>
+</icegrid>
diff --git a/cpp/demo/IcePatch2/MFC/README b/cpp/demo/IcePatch2/MFC/README
index cfc206a063b..78c1ffbf286 100644
--- a/cpp/demo/IcePatch2/MFC/README
+++ b/cpp/demo/IcePatch2/MFC/README
@@ -1,41 +1,41 @@
-This demo illustrates how to use MFC to create a simple IcePatch2

-client application.

-

-In order to use this demo, you must first prepare a sample data

-directory for the IcePatch2 server. The contents of the data

-directory are what the client will receive during the patch process.

-For convenience, this example uses its own source files as the data

-to be patched.

-

-Assuming that your current working directory is demo/IcePatch2/MFC,

-you can prepare the data files with the following command:

-

-> icepatch2calc .

-

-Next, start the IcePatch2 server. Note that the trailing "." argument

-in the following command is required and directs the server to use the

-current directory as its data directory:

-

-> icepatch2server --IcePatch2.Endpoints="tcp -h 127.0.0.1 -p 10000" .

-

-Before we start the patch client, we must first create an empty

-directory where the downloaded files will be placed. For example, open

-a new command window and execute this command:

-

-> mkdir C:\icepatch_download

-

-Now you can start the IcePatch2 client (You will also need to pass an

-argument that defines IcePatch2.Endpoints if you use an endpoint other

-than the one shown above when you start icepatch2server):

-

-> client

-

-Click the "..." button to the right of the Patch Directory field and

-select the empty directory you just created. Then click the "Patch"

-button to begin the patch process. The first time you click this

-button you will be prompted to confirm that you want to perform a

-thorough patch (because the target download directory is empty).

-

-If you add files or delete files from the data directory or make

-changes to existing files, you must stop the server, run icepatch2calc

-again to update the data files, and then restart the IcePatch2 server.

+This demo illustrates how to use MFC to create a simple IcePatch2
+client application.
+
+In order to use this demo, you must first prepare a sample data
+directory for the IcePatch2 server. The contents of the data
+directory are what the client will receive during the patch process.
+For convenience, this example uses its own source files as the data
+to be patched.
+
+Assuming that your current working directory is demo/IcePatch2/MFC,
+you can prepare the data files with the following command:
+
+> icepatch2calc .
+
+Next, start the IcePatch2 server. Note that the trailing "." argument
+in the following command is required and directs the server to use the
+current directory as its data directory:
+
+> icepatch2server --IcePatch2.Endpoints="tcp -h 127.0.0.1 -p 10000" .
+
+Before we start the patch client, we must first create an empty
+directory where the downloaded files will be placed. For example, open
+a new command window and execute this command:
+
+> mkdir C:\icepatch_download
+
+Now you can start the IcePatch2 client (You will also need to pass an
+argument that defines IcePatch2.Endpoints if you use an endpoint other
+than the one shown above when you start icepatch2server):
+
+> client
+
+Click the "..." button to the right of the Patch Directory field and
+select the empty directory you just created. Then click the "Patch"
+button to begin the patch process. The first time you click this
+button you will be prompted to confirm that you want to perform a
+thorough patch (because the target download directory is empty).
+
+If you add files or delete files from the data directory or make
+changes to existing files, you must stop the server, run icepatch2calc
+again to update the data files, and then restart the IcePatch2 server.
diff --git a/cpp/demo/IcePatch2/MFC/resource.h b/cpp/demo/IcePatch2/MFC/resource.h
index d97e574378b..3f5dfd7febc 100644
--- a/cpp/demo/IcePatch2/MFC/resource.h
+++ b/cpp/demo/IcePatch2/MFC/resource.h
@@ -1,36 +1,36 @@
-//{{NO_DEPENDENCIES}}

-// Microsoft Developer Studio generated include file.

-// Used by PatchClient.rc

-//

-#define IDD_PATCHCLIENT_DIALOG          101

-#define IDR_MAINFRAME                   128

-#define IDC_MODELABEL                   1000

-#define IDC_MODE                        1001

-#define IDC_SECURE                      1002

-#define IDC_TIMEOUT                     1003

-#define IDC_INVOKE                      1004

-#define IDC_FLUSH                       1005

-#define IDC_SHUTDOWN                    1006

-#define IDC_STATUSBAR                   1007

-#define IDC_PROGRESS                    1008

-#define IDC_PERCENT                     1009

-#define IDC_STARTPATCH                  1010

-#define IDC_CANCELPATCH                 1011

-#define IDC_THOROUGH                    1015

-#define IDC_PATH                        1016

-#define IDC_SELECTDIR                   1017

-#define IDC_ORPHAN                      1018

-#define IDC_FILE                        1023

-#define IDC_TOTAL                       1024

-#define IDC_SPEED                       1025

-

-// Next default values for new objects

-// 

-#ifdef APSTUDIO_INVOKED

-#ifndef APSTUDIO_READONLY_SYMBOLS

-#define _APS_NEXT_RESOURCE_VALUE        130

-#define _APS_NEXT_COMMAND_VALUE         32771

-#define _APS_NEXT_CONTROL_VALUE         1026

-#define _APS_NEXT_SYMED_VALUE           101

-#endif

-#endif

+//{{NO_DEPENDENCIES}}
+// Microsoft Developer Studio generated include file.
+// Used by PatchClient.rc
+//
+#define IDD_PATCHCLIENT_DIALOG          101
+#define IDR_MAINFRAME                   128
+#define IDC_MODELABEL                   1000
+#define IDC_MODE                        1001
+#define IDC_SECURE                      1002
+#define IDC_TIMEOUT                     1003
+#define IDC_INVOKE                      1004
+#define IDC_FLUSH                       1005
+#define IDC_SHUTDOWN                    1006
+#define IDC_STATUSBAR                   1007
+#define IDC_PROGRESS                    1008
+#define IDC_PERCENT                     1009
+#define IDC_STARTPATCH                  1010
+#define IDC_CANCELPATCH                 1011
+#define IDC_THOROUGH                    1015
+#define IDC_PATH                        1016
+#define IDC_SELECTDIR                   1017
+#define IDC_ORPHAN                      1018
+#define IDC_FILE                        1023
+#define IDC_TOTAL                       1024
+#define IDC_SPEED                       1025
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        130
+#define _APS_NEXT_COMMAND_VALUE         32771
+#define _APS_NEXT_CONTROL_VALUE         1026
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff --git a/cpp/demo/book/evictor_filesystem/Scanner.cpp b/cpp/demo/book/evictor_filesystem/Scanner.cpp
index 4a6a9c0ab78..7b654a5b6ca 100755
--- a/cpp/demo/book/evictor_filesystem/Scanner.cpp
+++ b/cpp/demo/book/evictor_filesystem/Scanner.cpp
@@ -1,4 +1,4 @@
-#include "IceUtil/Config.h" 

+#include "IceUtil/Config.h" 
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
diff --git a/cpp/demo/book/lifecycle/Scanner.cpp b/cpp/demo/book/lifecycle/Scanner.cpp
index 4a6a9c0ab78..7b654a5b6ca 100755
--- a/cpp/demo/book/lifecycle/Scanner.cpp
+++ b/cpp/demo/book/lifecycle/Scanner.cpp
@@ -1,4 +1,4 @@
-#include "IceUtil/Config.h" 

+#include "IceUtil/Config.h" 
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
diff --git a/cpp/demo/book/map_filesystem/Scanner.cpp b/cpp/demo/book/map_filesystem/Scanner.cpp
index 4a6a9c0ab78..7b654a5b6ca 100644
--- a/cpp/demo/book/map_filesystem/Scanner.cpp
+++ b/cpp/demo/book/map_filesystem/Scanner.cpp
@@ -1,4 +1,4 @@
-#include "IceUtil/Config.h" 

+#include "IceUtil/Config.h" 
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
diff --git a/cpp/doc/slicefiles b/cpp/doc/slicefiles
index 19f89c2f283..40e577bcf82 100755
--- a/cpp/doc/slicefiles
+++ b/cpp/doc/slicefiles
@@ -1,68 +1,68 @@
-SLICEFILES = ..\..\slice\Freeze\BackgroundSaveEvictor.ice \

-             ..\..\slice\Freeze\CatalogData.ice \

-             ..\..\slice\Freeze\Connection.ice \

-             ..\..\slice\Freeze\ConnectionF.ice \

-             ..\..\slice\Freeze\DB.ice \

-             ..\..\slice\Freeze\Evictor.ice \

-             ..\..\slice\Freeze\EvictorF.ice \

-             ..\..\slice\Freeze\EvictorStorage.ice \

-             ..\..\slice\Freeze\Exception.ice \

-             ..\..\slice\Freeze\Transaction.ice \

-             ..\..\slice\Freeze\TransactionalEvictor.ice \

-             ..\..\slice\Glacier2\PermissionsVerifier.ice \

-             ..\..\slice\Glacier2\PermissionsVerifierF.ice \

-             ..\..\slice\Glacier2\Router.ice \

-             ..\..\slice\Glacier2\RouterF.ice \

-             ..\..\slice\Glacier2\Session.ice \

-             ..\..\slice\Glacier2\SSLInfo.ice \

-             ..\..\slice\Ice\BuiltinSequences.ice \

-             ..\..\slice\Ice\Communicator.ice \

-             ..\..\slice\Ice\CommunicatorF.ice \

-             ..\..\slice\Ice\Connection.ice \

-             ..\..\slice\Ice\ConnectionF.ice \

-             ..\..\slice\Ice\Current.ice \

-             ..\..\slice\Ice\Endpoint.ice \

-             ..\..\slice\Ice\EndpointF.ice \

-             ..\..\slice\Ice\EndpointTypes.ice \

-             ..\..\slice\Ice\FacetMap.ice \

-             ..\..\slice\Ice\Identity.ice \

-             ..\..\slice\Ice\ImplicitContext.ice \

-             ..\..\slice\Ice\ImplicitContextF.ice \

-             ..\..\slice\Ice\LocalException.ice \

-             ..\..\slice\Ice\Locator.ice \

-             ..\..\slice\Ice\LocatorF.ice \

-             ..\..\slice\Ice\Logger.ice \

-             ..\..\slice\Ice\LoggerF.ice \

-             ..\..\slice\Ice\ObjectAdapter.ice \

-             ..\..\slice\Ice\ObjectAdapterF.ice \

-             ..\..\slice\Ice\ObjectFactory.ice \

-             ..\..\slice\Ice\ObjectFactoryF.ice \

-             ..\..\slice\Ice\Plugin.ice \

-             ..\..\slice\Ice\PluginF.ice \

-             ..\..\slice\Ice\Process.ice \

-             ..\..\slice\Ice\ProcessF.ice \

-             ..\..\slice\Ice\Properties.ice \

-             ..\..\slice\Ice\PropertiesF.ice \

-             ..\..\slice\Ice\Router.ice \

-             ..\..\slice\Ice\RouterF.ice \

-             ..\..\slice\Ice\ServantLocator.ice \

-             ..\..\slice\Ice\ServantLocatorF.ice \

-             ..\..\slice\Ice\SliceChecksumDict.ice \

-             ..\..\slice\Ice\Stats.ice \

-             ..\..\slice\Ice\StatsF.ice \

-             ..\..\slice\IceBox\IceBox.ice \

-             ..\..\slice\IceGrid\Admin.ice \

-             ..\..\slice\IceGrid\Descriptor.ice \

-             ..\..\slice\IceGrid\Exception.ice \

-             ..\..\slice\IceGrid\FileParser.ice \

-             ..\..\slice\IceGrid\Locator.ice \

-             ..\..\slice\IceGrid\Observer.ice \

-             ..\..\slice\IceGrid\Query.ice \

-             ..\..\slice\IceGrid\Registry.ice \

-             ..\..\slice\IceGrid\Session.ice \

-             ..\..\slice\IceGrid\UserAccountMapper.ice \

-             ..\..\slice\IcePatch2\FileInfo.ice \

-             ..\..\slice\IcePatch2\FileServer.ice \

-             ..\..\slice\IceSSL\Endpoint.ice \

-             ..\..\slice\IceStorm\IceStorm.ice 

-

+SLICEFILES = ..\..\slice\Freeze\BackgroundSaveEvictor.ice \
+             ..\..\slice\Freeze\CatalogData.ice \
+             ..\..\slice\Freeze\Connection.ice \
+             ..\..\slice\Freeze\ConnectionF.ice \
+             ..\..\slice\Freeze\DB.ice \
+             ..\..\slice\Freeze\Evictor.ice \
+             ..\..\slice\Freeze\EvictorF.ice \
+             ..\..\slice\Freeze\EvictorStorage.ice \
+             ..\..\slice\Freeze\Exception.ice \
+             ..\..\slice\Freeze\Transaction.ice \
+             ..\..\slice\Freeze\TransactionalEvictor.ice \
+             ..\..\slice\Glacier2\PermissionsVerifier.ice \
+             ..\..\slice\Glacier2\PermissionsVerifierF.ice \
+             ..\..\slice\Glacier2\Router.ice \
+             ..\..\slice\Glacier2\RouterF.ice \
+             ..\..\slice\Glacier2\Session.ice \
+             ..\..\slice\Glacier2\SSLInfo.ice \
+             ..\..\slice\Ice\BuiltinSequences.ice \
+             ..\..\slice\Ice\Communicator.ice \
+             ..\..\slice\Ice\CommunicatorF.ice \
+             ..\..\slice\Ice\Connection.ice \
+             ..\..\slice\Ice\ConnectionF.ice \
+             ..\..\slice\Ice\Current.ice \
+             ..\..\slice\Ice\Endpoint.ice \
+             ..\..\slice\Ice\EndpointF.ice \
+             ..\..\slice\Ice\EndpointTypes.ice \
+             ..\..\slice\Ice\FacetMap.ice \
+             ..\..\slice\Ice\Identity.ice \
+             ..\..\slice\Ice\ImplicitContext.ice \
+             ..\..\slice\Ice\ImplicitContextF.ice \
+             ..\..\slice\Ice\LocalException.ice \
+             ..\..\slice\Ice\Locator.ice \
+             ..\..\slice\Ice\LocatorF.ice \
+             ..\..\slice\Ice\Logger.ice \
+             ..\..\slice\Ice\LoggerF.ice \
+             ..\..\slice\Ice\ObjectAdapter.ice \
+             ..\..\slice\Ice\ObjectAdapterF.ice \
+             ..\..\slice\Ice\ObjectFactory.ice \
+             ..\..\slice\Ice\ObjectFactoryF.ice \
+             ..\..\slice\Ice\Plugin.ice \
+             ..\..\slice\Ice\PluginF.ice \
+             ..\..\slice\Ice\Process.ice \
+             ..\..\slice\Ice\ProcessF.ice \
+             ..\..\slice\Ice\Properties.ice \
+             ..\..\slice\Ice\PropertiesF.ice \
+             ..\..\slice\Ice\Router.ice \
+             ..\..\slice\Ice\RouterF.ice \
+             ..\..\slice\Ice\ServantLocator.ice \
+             ..\..\slice\Ice\ServantLocatorF.ice \
+             ..\..\slice\Ice\SliceChecksumDict.ice \
+             ..\..\slice\Ice\Stats.ice \
+             ..\..\slice\Ice\StatsF.ice \
+             ..\..\slice\IceBox\IceBox.ice \
+             ..\..\slice\IceGrid\Admin.ice \
+             ..\..\slice\IceGrid\Descriptor.ice \
+             ..\..\slice\IceGrid\Exception.ice \
+             ..\..\slice\IceGrid\FileParser.ice \
+             ..\..\slice\IceGrid\Locator.ice \
+             ..\..\slice\IceGrid\Observer.ice \
+             ..\..\slice\IceGrid\Query.ice \
+             ..\..\slice\IceGrid\Registry.ice \
+             ..\..\slice\IceGrid\Session.ice \
+             ..\..\slice\IceGrid\UserAccountMapper.ice \
+             ..\..\slice\IcePatch2\FileInfo.ice \
+             ..\..\slice\IcePatch2\FileServer.ice \
+             ..\..\slice\IceSSL\Endpoint.ice \
+             ..\..\slice\IceStorm\IceStorm.ice 
+
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

diff --git a/cpp/test/Freeze/fileLock/run.py b/cpp/test/Freeze/fileLock/run.py
index 3e743ae91c7..73defbe6c19 100755
--- a/cpp/test/Freeze/fileLock/run.py
+++ b/cpp/test/Freeze/fileLock/run.py
@@ -46,4 +46,4 @@ clientExe.sendline('go')
 clientExe.expect('File lock released.')
 clientExe.waitTestSuccess()
 
-print "ok"
\ No newline at end of file
+print "ok"
diff --git a/cpp/test/Ice/interceptor/TestI.cpp b/cpp/test/Ice/interceptor/TestI.cpp
index 4cd1f54ea2a..e5e74ae0015 100644
--- a/cpp/test/Ice/interceptor/TestI.cpp
+++ b/cpp/test/Ice/interceptor/TestI.cpp
@@ -6,20 +6,20 @@
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
-

+
 #ifndef INTERCEPTOR_TEST_API_EXPORTS
 #   define INTERCEPTOR_TEST_API_EXPORTS
 #endif
-#include <Ice/Ice.h>

-#include <Test.h>

-#include <iostream>

-

-using namespace IceUtil; 

-using namespace std;

-

-void

-Test::RetryException::ice_print(ostream& out) const

-{

-    Exception::ice_print(out);

-    out << ":\nretry dispatch";

-}

+#include <Ice/Ice.h>
+#include <Test.h>
+#include <iostream>
+
+using namespace IceUtil; 
+using namespace std;
+
+void
+Test::RetryException::ice_print(ostream& out) const
+{
+    Exception::ice_print(out);
+    out << ":\nretry dispatch";
+}
diff --git a/cpp/test/IceBox/configuration/config.service1-2 b/cpp/test/IceBox/configuration/config.service1-2
index 76064138212..c173914db2a 100644
--- a/cpp/test/IceBox/configuration/config.service1-2
+++ b/cpp/test/IceBox/configuration/config.service1-2
@@ -8,4 +8,4 @@ OverrideMe=2
 UnsetMe=
 
 
-Ice.PrintAdapterReady=0
\ No newline at end of file
+Ice.PrintAdapterReady=0
diff --git a/cpp/test/IceGrid/replication/useraccounts.txt b/cpp/test/IceGrid/replication/useraccounts.txt
index de136797a01..98b9109d438 100644
--- a/cpp/test/IceGrid/replication/useraccounts.txt
+++ b/cpp/test/IceGrid/replication/useraccounts.txt
@@ -1,2 +1,2 @@
-dummy1 Dummy User Account1
-dummy2 Dummy User Account2
\ No newline at end of file
+dummy1 Dummy User Account1

+dummy2 Dummy User Account2

diff --git a/cpp/test/IceUtil/fileLock/Makefile.mak b/cpp/test/IceUtil/fileLock/Makefile.mak
index 15e910f44db..02b98eb081d 100644
--- a/cpp/test/IceUtil/fileLock/Makefile.mak
+++ b/cpp/test/IceUtil/fileLock/Makefile.mak
@@ -40,4 +40,4 @@ $(CLIENTF): $(OBJFS)
 clean::

 	del /q run.pid

 

-!include .depend.mak
+!include .depend.mak

diff --git a/cpp/test/IceUtil/fileLock/run.py b/cpp/test/IceUtil/fileLock/run.py
index e84ffa2ee09..9232b4b2448 100755
--- a/cpp/test/IceUtil/fileLock/run.py
+++ b/cpp/test/IceUtil/fileLock/run.py
@@ -53,4 +53,4 @@ clientExe.expect('File lock acquired.\.*')
 clientExe.sendline('go')
 clientExe.expect('File lock released.')
 clientExe.waitTestSuccess()
-print "ok"
\ No newline at end of file
+print "ok"
diff --git a/cpp/test/IceUtil/unicode/LICENSE b/cpp/test/IceUtil/unicode/LICENSE
index 06484a8c158..7b66698dba5 100755
--- a/cpp/test/IceUtil/unicode/LICENSE
+++ b/cpp/test/IceUtil/unicode/LICENSE
@@ -1,3 +1,3 @@
-The content of the *.utf* files comes from Wikipedia and is licensed

-under the GNU Free Document License version 1.2 (see FDL file).

-

+The content of the *.utf* files comes from Wikipedia and is licensed
+under the GNU Free Document License version 1.2 (see FDL file).
+
diff --git a/cpp/test/IceUtil/unicode/filename.txt b/cpp/test/IceUtil/unicode/filename.txt
index e6373bde83b..269631e158c 100644
--- a/cpp/test/IceUtil/unicode/filename.txt
+++ b/cpp/test/IceUtil/unicode/filename.txt
@@ -1 +1 @@
-cœur.txt
\ No newline at end of file
+cœur.txt

diff --git a/cpp/test/Slice/errorDetection/IllegalLocal.err b/cpp/test/Slice/errorDetection/IllegalLocal.err
index fa56f466c01..3acc9aa5e5c 100644
--- a/cpp/test/Slice/errorDetection/IllegalLocal.err
+++ b/cpp/test/Slice/errorDetection/IllegalLocal.err
@@ -1,23 +1,23 @@
-IllegalLocal.ice:17: local interface `i2' cannot have non-local base interface `i1'

-IllegalLocal.ice:19: non-local interface `i3' cannot have local base interface `i2'

-IllegalLocal.ice:25: non-local class `c2' cannot have local base interface `i2'

-IllegalLocal.ice:31: non-local interface `i' cannot have operation `op' throwing local exception `le'

-IllegalLocal.ice:34: non-local exception `le2' cannot have local base exception `le'

-IllegalLocal.ice:40: non-local class`c3' cannot contain local member `lo1'

-IllegalLocal.ice:41: cannot create proxy for local interface `i2'

-IllegalLocal.ice:41: non-local class`c3' cannot contain local member `lo2'

-IllegalLocal.ice:42: non-local class`c3' cannot contain local member `lo3'

-IllegalLocal.ice:43: non-local class`c3' cannot contain local member `ls'

-IllegalLocal.ice:48: non-local struct`s1' cannot contain local member `ls'

-IllegalLocal.ice:53: non-local exception`e3' cannot contain local member `ls'

-IllegalLocal.ice:56: non-local sequence `los' cannot have local element type

-IllegalLocal.ice:59: warning: use of sequences in dictionary keys has been deprecated

-IllegalLocal.ice:59: non-local dictionary `d1' cannot have local key type

-IllegalLocal.ice:60: non-local dictionary `d2' cannot have local value type

-IllegalLocal.ice:61: warning: use of sequences in dictionary keys has been deprecated

-IllegalLocal.ice:61: non-local dictionary `d3' cannot have local key type

-IllegalLocal.ice:61: non-local dictionary `d3' cannot have local value type

-IllegalLocal.ice:66: non-local struct`s2' cannot contain local member `m'

-IllegalLocal.ice:72: non-local struct`s3' cannot contain local member `e'

-IllegalLocal.ice:77: non-local interface `i5' cannot have local parameter `p' in operation `op'

-IllegalLocal.ice:78: non-local interface `i5' cannot have operation `op2' with local return type

+IllegalLocal.ice:17: local interface `i2' cannot have non-local base interface `i1'
+IllegalLocal.ice:19: non-local interface `i3' cannot have local base interface `i2'
+IllegalLocal.ice:25: non-local class `c2' cannot have local base interface `i2'
+IllegalLocal.ice:31: non-local interface `i' cannot have operation `op' throwing local exception `le'
+IllegalLocal.ice:34: non-local exception `le2' cannot have local base exception `le'
+IllegalLocal.ice:40: non-local class`c3' cannot contain local member `lo1'
+IllegalLocal.ice:41: cannot create proxy for local interface `i2'
+IllegalLocal.ice:41: non-local class`c3' cannot contain local member `lo2'
+IllegalLocal.ice:42: non-local class`c3' cannot contain local member `lo3'
+IllegalLocal.ice:43: non-local class`c3' cannot contain local member `ls'
+IllegalLocal.ice:48: non-local struct`s1' cannot contain local member `ls'
+IllegalLocal.ice:53: non-local exception`e3' cannot contain local member `ls'
+IllegalLocal.ice:56: non-local sequence `los' cannot have local element type
+IllegalLocal.ice:59: warning: use of sequences in dictionary keys has been deprecated
+IllegalLocal.ice:59: non-local dictionary `d1' cannot have local key type
+IllegalLocal.ice:60: non-local dictionary `d2' cannot have local value type
+IllegalLocal.ice:61: warning: use of sequences in dictionary keys has been deprecated
+IllegalLocal.ice:61: non-local dictionary `d3' cannot have local key type
+IllegalLocal.ice:61: non-local dictionary `d3' cannot have local value type
+IllegalLocal.ice:66: non-local struct`s2' cannot contain local member `m'
+IllegalLocal.ice:72: non-local struct`s3' cannot contain local member `e'
+IllegalLocal.ice:77: non-local interface `i5' cannot have local parameter `p' in operation `op'
+IllegalLocal.ice:78: non-local interface `i5' cannot have operation `op2' with local return type
diff --git a/cpp/test/Slice/parser/Makefile.mak b/cpp/test/Slice/parser/Makefile.mak
index 9a49c02162e..f917a6c74d9 100644
--- a/cpp/test/Slice/parser/Makefile.mak
+++ b/cpp/test/Slice/parser/Makefile.mak
@@ -1,28 +1,28 @@
-# **********************************************************************
-#
-# 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	= ..\..\..
-
-TARGETS		= $(OBJS)
-
-OBJS		= CircularA.obj \
-		  CircularB.obj
-
-SRCS		= $(OBJS:.obj=.cpp)
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-SLICE2CPPFLAGS	= -I. $(SLICE2CPPFLAGS)
-CPPFLAGS	= -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-
-clean::
-	del /q CircularA.cpp CircularA.h
-	del /q CircularB.cpp CircularB.h
-
-!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	= ..\..\..

+

+TARGETS		= $(OBJS)

+

+OBJS		= CircularA.obj \

+		  CircularB.obj

+

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

+

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

+

+SLICE2CPPFLAGS	= -I. $(SLICE2CPPFLAGS)

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

+

+clean::

+	del /q CircularA.cpp CircularA.h

+	del /q CircularB.cpp CircularB.h

+

+!include .depend.mak