changes

14 files changed, 335 insertions, 305 deletions

diff --git a/cpp/src/Freeze/Application.cpp b/cpp/src/Freeze/Application.cpp
index c162daf4937..06ca83de335 100644
--- a/cpp/src/Freeze/Application.cpp
+++ b/cpp/src/Freeze/Application.cpp
@@ -73,6 +73,7 @@ Freeze::Application::run(int argc, char* argv[])
 	    cerr << appName() << ": unknown exception" << endl;
 	    status = EXIT_FAILURE;
 	}
+	dbEnv = 0;
     }
 
     defaultInterrupt();
diff --git a/cpp/src/Freeze/DBI.cpp b/cpp/src/Freeze/DBI.cpp
index f9bd68dff7f..74a38553ff7 100644
--- a/cpp/src/Freeze/DBI.cpp
+++ b/cpp/src/Freeze/DBI.cpp
@@ -63,7 +63,6 @@ Freeze::checkBerkeleyDBReturn(int ret, const string& prefix, const string& op)
 
 Freeze::DBEnvironmentI::DBEnvironmentI(const CommunicatorPtr& communicator, const string& name) :
     _communicator(communicator),
-    _logger(communicator->getLogger()),
     _trace(0),
     _dbEnv(0),
     _name(name)
@@ -85,7 +84,7 @@ Freeze::DBEnvironmentI::DBEnvironmentI(const CommunicatorPtr& communicator, cons
     {
 	ostringstream s;
 	s << "opening database environment \"" << _name << "\"";
-	_logger->trace("DB", s.str());
+	_communicator->getLogger()->trace("DB", s.str());
     }
 
     checkBerkeleyDBReturn(_dbEnv->open(_dbEnv, _name.c_str(),
@@ -175,7 +174,7 @@ Freeze::DBEnvironmentI::close()
     {
 	ostringstream s;
 	s << "closing database environment \"" << _name << "\"";
-	_logger->trace("DB", s.str());
+	_communicator->getLogger()->trace("DB", s.str());
     }
 
     checkBerkeleyDBReturn(_dbEnv->close(_dbEnv, 0), _errorPrefix, "DB_ENV->close");
@@ -207,7 +206,6 @@ Freeze::initialize(const CommunicatorPtr& communicator, const string& name)
 
 Freeze::DBTransactionI::DBTransactionI(const CommunicatorPtr& communicator, ::DB_ENV* dbEnv, const string& name) :
     _communicator(communicator),
-    _logger(communicator->getLogger()),
     _trace(0),
     _tid(0),
     _name(name)
@@ -227,7 +225,7 @@ Freeze::DBTransactionI::DBTransactionI(const CommunicatorPtr& communicator, ::DB
     {
 	ostringstream s;
 	s << "starting transaction for environment \"" << _name << "\"";
-	_logger->trace("DB", s.str());
+	_communicator->getLogger()->trace("DB", s.str());
     }
     
     checkBerkeleyDBReturn(txn_begin(dbEnv, 0, &_tid, 0), _errorPrefix, "txn_begin");
@@ -261,7 +259,7 @@ Freeze::DBTransactionI::commit()
     {
 	ostringstream s;
 	s << "committing transaction for environment \"" << _name << "\"";
-	_logger->trace("DB", s.str());
+	_communicator->getLogger()->trace("DB", s.str());
     }
     
     checkBerkeleyDBReturn(txn_commit(_tid, 0), _errorPrefix, "txn_commit");
@@ -287,7 +285,7 @@ Freeze::DBTransactionI::abort()
     {
 	ostringstream s;
 	s << "aborting transaction for environment \"" << _name << "\" due to deadlock";
-	_logger->trace("DB", s.str());
+	_communicator->getLogger()->trace("DB", s.str());
     }
     
     checkBerkeleyDBReturn(txn_abort(_tid), _errorPrefix, "txn_abort");
@@ -298,7 +296,6 @@ Freeze::DBTransactionI::abort()
 Freeze::DBI::DBI(const CommunicatorPtr& communicator, const DBEnvironmentIPtr& dbEnvObj, ::DB* db,
 		 const string& name) :
     _communicator(communicator),
-    _logger(communicator->getLogger()),
     _trace(0),
     _dbEnvObj(dbEnvObj),
     _db(db),
@@ -319,7 +316,7 @@ Freeze::DBI::DBI(const CommunicatorPtr& communicator, const DBEnvironmentIPtr& d
     {
 	ostringstream s;
 	s << "opening database \"" << _name << "\" in environment \"" << _dbEnvObj->getName() << "\"";
-	_logger->trace("DB", s.str());
+	_communicator->getLogger()->trace("DB", s.str());
     }
     
     checkBerkeleyDBReturn(_db->open(_db, _name.c_str(), 0, DB_BTREE, DB_CREATE, FREEZE_DB_MODE), _errorPrefix,
@@ -338,13 +335,6 @@ Freeze::DBI::~DBI()
     }
 }
 
-CommunicatorPtr
-Freeze::DBI::getCommunicator()
-{
-    // No mutex lock necessary, _communicator is immutable
-    return _communicator;
-}
-
 string
 Freeze::DBI::getName()
 {
@@ -352,6 +342,13 @@ Freeze::DBI::getName()
     return _name;
 }
 
+CommunicatorPtr
+Freeze::DBI::getCommunicator()
+{
+    // No mutex lock necessary, _communicator is immutable
+    return _communicator;
+}
+
 void
 Freeze::DBI::put(const Key& key, const Value& value)
 {
@@ -378,7 +375,7 @@ Freeze::DBI::put(const Key& key, const Value& value)
     {
 	ostringstream s;
 	s << "writing value in database \"" << _name << "\"";
-	_logger->trace("DB", s.str());
+	_communicator->getLogger()->trace("DB", s.str());
     }
 
     checkBerkeleyDBReturn(_db->put(_db, 0, &dbKey, &dbData, 0), _errorPrefix, "DB->put");
@@ -387,7 +384,9 @@ Freeze::DBI::put(const Key& key, const Value& value)
 Value
 Freeze::DBI::get(const Key& key)
 {
+    cout << "xxx" << endl;
     JTCSyncT<JTCMutex> sync(*this);
+    cout << "yyy" << endl;
 
     if (!_db)
     {
@@ -408,7 +407,7 @@ Freeze::DBI::get(const Key& key)
     {
 	ostringstream s;
 	s << "reading value from database \"" << _name << "\"";
-	_logger->trace("DB", s.str());
+	_communicator->getLogger()->trace("DB", s.str());
     }
     
     checkBerkeleyDBReturn(_db->get(_db, 0, &dbKey, &dbData, 0), _errorPrefix, "DB->get");
@@ -439,7 +438,7 @@ Freeze::DBI::del(const Key& key)
     {
 	ostringstream s;
 	s << "deleting value from database \"" << _name << "\"";
-	_logger->trace("DB", s.str());
+	_communicator->getLogger()->trace("DB", s.str());
     }
     
     checkBerkeleyDBReturn(_db->del(_db, 0, &dbKey, 0), _errorPrefix, "DB->del");
@@ -480,7 +479,7 @@ Freeze::DBI::putServant(const string& identity, const ObjectPtr& servant)
     {
 	ostringstream s;
 	s << "writing Servant for identity \"" << identity << "\" in database \"" << _name << "\"";
-	_logger->trace("DB", s.str());
+	_communicator->getLogger()->trace("DB", s.str());
     }
     
     checkBerkeleyDBReturn(_db->put(_db, 0, &dbKey, &dbData, 0), _errorPrefix, "DB->put");
@@ -510,7 +509,7 @@ Freeze::DBI::getServant(const string& identity)
     {
 	ostringstream s;
 	s << "reading Servant for identity \"" << identity << "\" from database \"" << _name << "\"";
-	_logger->trace("DB", s.str());
+	_communicator->getLogger()->trace("DB", s.str());
     }
     
     checkBerkeleyDBReturn(_db->get(_db, 0, &dbKey, &dbData, 0), _errorPrefix, "DB->get");
@@ -555,7 +554,7 @@ Freeze::DBI::delServant(const string& identity)
     {
 	ostringstream s;
 	s << "deleting Servant for identity \"" << identity << "\" from database \"" << _name << "\"";
-	_logger->trace("DB", s.str());
+	_communicator->getLogger()->trace("DB", s.str());
     }
     
     checkBerkeleyDBReturn(_db->del(_db, 0, &dbKey, 0), _errorPrefix, "DB->del");
@@ -575,7 +574,7 @@ Freeze::DBI::close()
     {
 	ostringstream s;
 	s << "closing database \"" << _name << "\"";
-	_logger->trace("DB", s.str());
+	_communicator->getLogger()->trace("DB", s.str());
     }
     
     checkBerkeleyDBReturn(_db->close(_db, 0), _errorPrefix, "DB->close");
@@ -599,5 +598,5 @@ Freeze::DBI::createEvictor(EvictorPersistenceMode persistenceMode)
 	throw ex;
     }
 
-    return new EvictorI(this, _communicator, persistenceMode);
+    return new EvictorI(this, persistenceMode);
 }
diff --git a/cpp/src/Freeze/DBI.h b/cpp/src/Freeze/DBI.h
index d6cedd10664..6afe2d63cc4 100644
--- a/cpp/src/Freeze/DBI.h
+++ b/cpp/src/Freeze/DBI.h
@@ -35,8 +35,8 @@ public:
     DBEnvironmentI(const ::Ice::CommunicatorPtr&, const std::string&);
     virtual ~DBEnvironmentI();
 
-    virtual ::Ice::CommunicatorPtr getCommunicator();
     virtual std::string getName();
+    virtual ::Ice::CommunicatorPtr getCommunicator();
 
     virtual DBPtr openDB(const std::string&);
 
@@ -52,7 +52,6 @@ private:
     void remove(const std::string&);
 
     ::Ice::CommunicatorPtr _communicator;
-    ::Ice::LoggerPtr _logger;
     int _trace;
 
     ::DB_ENV* _dbEnv;
@@ -76,7 +75,6 @@ public:
 private:
 
     ::Ice::CommunicatorPtr _communicator;
-    ::Ice::LoggerPtr _logger;
     int _trace;
 
     ::DB_TXN* _tid;
@@ -92,8 +90,8 @@ public:
     DBI(const ::Ice::CommunicatorPtr&, const DBEnvironmentIPtr&, ::DB*, const std::string&);
     virtual ~DBI();
 
-    virtual ::Ice::CommunicatorPtr getCommunicator();
     virtual std::string getName();
+    virtual ::Ice::CommunicatorPtr getCommunicator();
 
     virtual void put(const Key&, const Value&);
     virtual Value get(const Key&);
@@ -110,7 +108,6 @@ public:
 private:
 
     ::Ice::CommunicatorPtr _communicator;
-    ::Ice::LoggerPtr _logger;
     int _trace;
 
     DBEnvironmentIPtr _dbEnvObj;
diff --git a/cpp/src/Freeze/EvictorI.cpp b/cpp/src/Freeze/EvictorI.cpp
index ab433977c24..5df9efffa9e 100644
--- a/cpp/src/Freeze/EvictorI.cpp
+++ b/cpp/src/Freeze/EvictorI.cpp
@@ -15,15 +15,14 @@ using namespace std;
 using namespace Ice;
 using namespace Freeze;
 
-Freeze::EvictorI::EvictorI(const DBPtr& db, const CommunicatorPtr& communicator,
-			   EvictorPersistenceMode persistenceMode) :
-    _db(db),
+Freeze::EvictorI::EvictorI(const DBPtr& db, EvictorPersistenceMode persistenceMode) :
     _evictorSize(10),
+    _deactivated(false),
+    _db(db),
     _persistenceMode(persistenceMode),
-    _logger(communicator->getLogger()),
     _trace(0)
 {
-    PropertiesPtr properties = communicator->getProperties();
+    PropertiesPtr properties = _db->getCommunicator()->getProperties();
     string value;
 
     value = properties->getProperty("Freeze.Trace.Evictor");
@@ -33,13 +32,24 @@ Freeze::EvictorI::EvictorI(const DBPtr& db, const CommunicatorPtr& communicator,
     }
 }
 
+Freeze::EvictorI::~EvictorI()
+{
+    if (!_deactivated)
+    {
+	_db->getCommunicator()->getLogger()->warning("evictor has not been deactivated");
+    }
+}
+
 DBPtr
 Freeze::EvictorI::getDB()
 {
-    //
-    // No synchronizaton necessary, _db is immutable once the Evictor
-    // has been created
-    //
+    JTCSyncT<JTCMutex> sync(*this);
+
+    if (_deactivated)
+    {
+	throw EvictorDeactivatedException();
+    }
+
     return _db;
 }
 
@@ -48,6 +58,11 @@ Freeze::EvictorI::setSize(Int evictorSize)
 {
     JTCSyncT<JTCMutex> sync(*this);
 
+    if (_deactivated)
+    {
+	throw EvictorDeactivatedException();
+    }
+
     //
     // Ignore requests to set the evictor size to values smaller than zero.
     //
@@ -72,6 +87,11 @@ Freeze::EvictorI::getSize()
 {
     JTCSyncT<JTCMutex> sync(*this);
 
+    if (_deactivated)
+    {
+	throw EvictorDeactivatedException();
+    }
+
     return static_cast<Int>(_evictorSize);
 }
 
@@ -80,6 +100,11 @@ Freeze::EvictorI::createObject(const string& identity, const ObjectPtr& servant)
 {
     JTCSyncT<JTCMutex> sync(*this);
 
+    if (_deactivated)
+    {
+	throw EvictorDeactivatedException();
+    }
+
     //
     // Save the new Ice Object to the database.
     //
@@ -90,7 +115,7 @@ Freeze::EvictorI::createObject(const string& identity, const ObjectPtr& servant)
     {
 	ostringstream s;
 	s << "created \"" << identity << "\"";
-	_logger->trace("Evictor", s.str());
+	_db->getCommunicator()->getLogger()->trace("Evictor", s.str());
     }
 
     //
@@ -104,6 +129,11 @@ Freeze::EvictorI::destroyObject(const string& identity)
 {
     JTCSyncT<JTCMutex> sync(*this);
 
+    if (_deactivated)
+    {
+	throw EvictorDeactivatedException();
+    }
+
     //
     // Delete the Ice Object from the database.
     //
@@ -114,7 +144,7 @@ Freeze::EvictorI::destroyObject(const string& identity)
     {
 	ostringstream s;
 	s << "destroyed \"" << identity << "\"";
-	_logger->trace("Evictor", s.str());
+	_db->getCommunicator()->getLogger()->trace("Evictor", s.str());
     }
 }
 
@@ -123,6 +153,11 @@ Freeze::EvictorI::installServantInitializer(const ServantInitializerPtr& initial
 {
     JTCSyncT<JTCMutex> sync(*this);
 
+    if (_deactivated)
+    {
+	throw EvictorDeactivatedException();
+    }
+
     _initializer = initializer;
 }
 
@@ -132,6 +167,12 @@ Freeze::EvictorI::locate(const ObjectAdapterPtr& adapter, const string& identity
 {
     JTCSyncT<JTCMutex> sync(*this);
 
+    //
+    // If this operation is called on a deactivated servant locator,
+    // it's a bug in Ice.
+    //
+    assert(!_deactivated);
+
     EvictorElementPtr element;
 
     map<string, EvictorElementPtr>::iterator p = _evictorMap.find(identity);
@@ -141,7 +182,7 @@ Freeze::EvictorI::locate(const ObjectAdapterPtr& adapter, const string& identity
 	{
 	    ostringstream s;
 	    s << "found \"" << identity << "\" in the queue";
-	    _logger->trace("Evictor", s.str());
+	    _db->getCommunicator()->getLogger()->trace("Evictor", s.str());
 	}
 
 	//
@@ -160,7 +201,7 @@ Freeze::EvictorI::locate(const ObjectAdapterPtr& adapter, const string& identity
 	    ostringstream s;
 	    s << "couldn't find \"" << identity << "\" in the queue\n"
 	      << "loading \"" << identity << "\" from the database";
-	    _logger->trace("Evictor", s.str());
+	    _db->getCommunicator()->getLogger()->trace("Evictor", s.str());
 	}
 
 	//
@@ -217,6 +258,12 @@ Freeze::EvictorI::finished(const ObjectAdapterPtr&, const string& identity, cons
     assert(servant);
 
     //
+    // It's possible that the locator has been deactivated already. In
+    // this case, _evictorSize is set to zero.
+    //
+    assert(!_deactivated || _evictorSize);
+
+    //
     // Decrease the usage count of the evictor queue element.
     //
     EvictorElementPtr element = EvictorElementPtr::dynamicCast(cookie);
@@ -247,32 +294,20 @@ Freeze::EvictorI::deactivate()
 {
     JTCSyncT<JTCMutex> sync(*this);
 
-    if (_trace >= 1)
-    {
-	ostringstream s;
-	s << "deactivating, saving all Ice Objects in the queue to the database";
-	_logger->trace("Evictor", s.str());
-    }
-
-    for (map<string, EvictorElementPtr>::iterator p = _evictorMap.begin(); p != _evictorMap.end(); ++p)
+    if (!_deactivated)
     {
-	assert(p->second->usageCount == 0); // If the Servant is still in use, something is broken.
-
-	//
-	// If we are not in SaveAfterMutatingOperation mode, we must save
-	// all Ice Objects in the database upon deactivation.
-	//
-	if (_persistenceMode != SaveAfterMutatingOperation)
+	_deactivated = true;
+	
+	if (_trace >= 1)
 	{
-	    _db->putServant(*(p->second->position), p->second->servant);
+	    ostringstream s;
+	    s << "deactivating, saving unsaved Ice Objects in the queue to the database";
+	    _db->getCommunicator()->getLogger()->trace("Evictor", s.str());
 	}
-    }
 
-    //
-    // We must clear the evictor queue upon deactivation.
-    //
-    _evictorMap.clear();
-    _evictorList.clear();
+	_evictorSize = 0;
+	evict();
+    }
 }
 
 void
@@ -331,7 +366,7 @@ Freeze::EvictorI::evict()
 	    ostringstream s;
 	    s << "evicted \"" << identity << "\" from the queue\n"
 	      << "number of elements in the queue: " << _evictorMap.size();
-	    _logger->trace("Evictor", s.str());
+	    _db->getCommunicator()->getLogger()->trace("Evictor", s.str());
 	}
     }
 }
diff --git a/cpp/src/Freeze/EvictorI.h b/cpp/src/Freeze/EvictorI.h
index 72b7ddf79d8..2bb418e8e9d 100644
--- a/cpp/src/Freeze/EvictorI.h
+++ b/cpp/src/Freeze/EvictorI.h
@@ -24,7 +24,8 @@ class EvictorI : public Evictor, public JTCMutex
 {
 public:
 
-    EvictorI(const Freeze::DBPtr&, const Ice::CommunicatorPtr&, EvictorPersistenceMode);
+    EvictorI(const Freeze::DBPtr&, EvictorPersistenceMode);
+    virtual ~EvictorI();
 
     virtual DBPtr getDB();
 
@@ -56,17 +57,14 @@ private:
     EvictorElementPtr add(const std::string&, const Ice::ObjectPtr&);
     void remove(const std::string&);
     
-    Freeze::DBPtr _db;
-
     std::map<std::string, EvictorElementPtr> _evictorMap;
     std::list<std::string> _evictorList;
     std::map<std::string, EvictorElementPtr>::size_type _evictorSize;
 
+    bool _deactivated;
+    Freeze::DBPtr _db;
     EvictorPersistenceMode _persistenceMode;
-
     ServantInitializerPtr _initializer;
-
-    ::Ice::LoggerPtr _logger;
     int _trace;
 };
 
diff --git a/cpp/src/Freeze/freeze.dsp b/cpp/src/Freeze/freeze.dsp
index 5de074cd2fc..e35815729cb 100644
--- a/cpp/src/Freeze/freeze.dsp
+++ b/cpp/src/Freeze/freeze.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

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

-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I ".." /I "../../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_USRDLL" /D "FREEZE_API_EXPORTS" /YX /FD /c

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

 # SUBTRACT CPP /Fr

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

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

@@ -76,7 +76,7 @@ PostBuild_Cmds=copy Release\freeze001.* ..\..\lib
 # PROP Target_Dir ""

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

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

-# SUBTRACT CPP /Fr

+# SUBTRACT CPP /WX /Fr

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

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

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

diff --git a/cpp/src/Ice/ice.dsp b/cpp/src/Ice/ice.dsp
index 82e23ec6b1d..78d278add26 100644
--- a/cpp/src/Ice/ice.dsp
+++ b/cpp/src/Ice/ice.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

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

-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I ".." /I "../../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_USRDLL" /D "ICE_API_EXPORTS" /YX /FD /c

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

 # SUBTRACT CPP /Fr

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

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

@@ -76,7 +76,7 @@ PostBuild_Cmds=copy Release\ice001.* ..\..\lib
 # PROP Target_Dir ""

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

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

-# SUBTRACT CPP /Fr

+# SUBTRACT CPP /WX /Fr

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

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

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -112,6 +112,10 @@ SOURCE=.\Application.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\BasicStream.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\Collector.cpp

 # End Source File

 # Begin Source File

@@ -144,15 +148,15 @@ SOURCE=.\EventHandler.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Incoming.cpp

+SOURCE=.\Exception.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Instance.cpp

+SOURCE=.\Incoming.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Exception.cpp

+SOURCE=.\Instance.cpp

 # End Source File

 # Begin Source File

 

@@ -172,14 +176,6 @@ SOURCE=.\LoggerI.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Stream.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\StreamI.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\Network.cpp

 # End Source File

 # Begin Source File

@@ -192,10 +188,6 @@ SOURCE=.\ObjectAdapter.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\ServantLocator.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\ObjectAdapterFactory.cpp

 # End Source File

 # Begin Source File

@@ -236,11 +228,7 @@ SOURCE=.\ServantFactoryManager.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\UserExceptionFactory.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\UserExceptionFactoryManager.cpp

+SOURCE=.\ServantLocator.cpp

 # End Source File

 # Begin Source File

 

@@ -256,7 +244,11 @@ SOURCE=.\SslTransceiver.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\BasicStream.cpp

+SOURCE=.\Stream.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\StreamI.cpp

 # End Source File

 # Begin Source File

 

@@ -290,6 +282,14 @@ SOURCE=.\Transceiver.cpp
 

 SOURCE=.\UdpTransceiver.cpp

 # End Source File

+# Begin Source File

+

+SOURCE=.\UserExceptionFactory.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\UserExceptionFactoryManager.cpp

+# End Source File

 # End Group

 # Begin Group "Header Files"

 

@@ -308,6 +308,10 @@ SOURCE=..\..\include\Ice\Application.h
 # End Source File

 # Begin Source File

 

+SOURCE=..\..\include\Ice\BasicStream.h

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\include\Ice\Buffer.h

 # End Source File

 # Begin Source File

@@ -372,6 +376,10 @@ SOURCE=.\Ice\EventHandlerF.h
 # End Source File

 # Begin Source File

 

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

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\include\Ice\Functional.h

 # End Source File

 # Begin Source File

@@ -400,10 +408,6 @@ SOURCE=..\..\include\Ice\InstanceF.h
 # End Source File

 # Begin Source File

 

-SOURCE=..\..\include\Ice\Exception.h

-# End Source File

-# Begin Source File

-

 SOURCE=..\..\include\Ice\LocalException.h

 # End Source File

 # Begin Source File

@@ -428,18 +432,6 @@ SOURCE=.\Ice\LoggerI.h
 # End Source File

 # Begin Source File

 

-SOURCE=..\..\include\Ice\Stream.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\Ice\StreamF.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Ice\StreamI.h

-# End Source File

-# Begin Source File

-

 SOURCE=..\..\include\Ice\Native.h

 # End Source File

 # Begin Source File

@@ -452,14 +444,6 @@ SOURCE=..\..\include\Ice\Object.h
 # End Source File

 # Begin Source File

 

-SOURCE=..\..\include\Ice\ServantLocator.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\Ice\ServantLocatorF.h

-# End Source File

-# Begin Source File

-

 SOURCE=..\..\include\Ice\ObjectAdapter.h

 # End Source File

 # Begin Source File

@@ -548,35 +532,35 @@ SOURCE=.\Ice\ServantFactoryManagerF.h
 # End Source File

 # Begin Source File

 

-SOURCE=..\..\include\Ice\UserExceptionFactory.h

+SOURCE=..\..\include\Ice\ServantLocator.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\include\Ice\UserExceptionFactoryF.h

+SOURCE=..\..\include\Ice\ServantLocatorF.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Ice\UserExceptionFactoryManager.h

+SOURCE=.\Ice\SslAcceptor.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Ice\UserExceptionFactoryManagerF.h

+SOURCE=.\Ice\SslConnector.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Ice\SslAcceptor.h

+SOURCE=.\Ice\SslTransceiver.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Ice\SslConnector.h

+SOURCE=..\..\include\Ice\Stream.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Ice\SslTransceiver.h

+SOURCE=..\..\include\Ice\StreamF.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\include\Ice\BasicStream.h

+SOURCE=.\Ice\StreamI.h

 # End Source File

 # Begin Source File

 

@@ -622,53 +606,26 @@ SOURCE=.\Ice\TransceiverF.h
 

 SOURCE=.\Ice\UdpTransceiver.h

 # End Source File

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

 # Begin Source File

 

-SOURCE=..\..\slice\Ice\LocalException.ice

-

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

-

-# Begin Custom Build

-InputPath=..\..\slice\Ice\LocalException.ice

-

-BuildCmds= \

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

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

-	move LocalException.h ..\..\include\Ice \

-	

-

-"..\..\include\Ice\LocalException.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"LocalException.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

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

-

-# Begin Custom Build

-InputPath=..\..\slice\Ice\LocalException.ice

-

-BuildCmds= \

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

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

-	move LocalException.h ..\..\include\Ice \

-	

-

-"..\..\include\Ice\LocalException.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

+SOURCE=..\..\include\Ice\UserExceptionFactory.h

+# End Source File

+# Begin Source File

 

-"LocalException.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

+SOURCE=..\..\include\Ice\UserExceptionFactoryF.h

+# End Source File

+# Begin Source File

 

-!ENDIF 

+SOURCE=.\Ice\UserExceptionFactoryManager.h

+# End Source File

+# Begin Source File

 

+SOURCE=.\Ice\UserExceptionFactoryManagerF.h

 # End Source File

+# End Group

+# Begin Group "Resource Files"

+

+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

 # Begin Source File

 

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

@@ -747,6 +704,49 @@ InputPath=..\..\slice\Ice\CommunicatorF.ice
 # End Source File

 # Begin Source File

 

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

+

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

+

+# Begin Custom Build

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

+

+BuildCmds= \

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

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

+	move LocalException.h ..\..\include\Ice \

+	

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+# End Custom Build

+

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

+

+# Begin Custom Build

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

+

+BuildCmds= \

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

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

+	move LocalException.h ..\..\include\Ice \

+	

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+# End Custom Build

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\slice\Ice\Logger.ice

 

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

@@ -823,41 +823,41 @@ InputPath=..\..\slice\Ice\LoggerF.ice
 # End Source File

 # Begin Source File

 

-SOURCE=..\..\slice\Ice\Stream.ice

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

 

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

 

 # Begin Custom Build

-InputPath=..\..\slice\Ice\Stream.ice

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

 

 BuildCmds= \

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

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

-	move Stream.h ..\..\include\Ice \

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

+	move ObjectAdapter.h ..\..\include\Ice \

 	

 

-"..\..\include\Ice\Stream.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

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

    $(BuildCmds)

 

-"Stream.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

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

    $(BuildCmds)

 # End Custom Build

 

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

 

 # Begin Custom Build

-InputPath=..\..\slice\Ice\Stream.ice

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

 

 BuildCmds= \

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

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

-	move Stream.h ..\..\include\Ice \

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

+	move ObjectAdapter.h ..\..\include\Ice \

 	

 

-"..\..\include\Ice\Stream.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

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

    $(BuildCmds)

 

-"Stream.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

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

    $(BuildCmds)

 # End Custom Build

 

@@ -866,31 +866,31 @@ BuildCmds= \
 # End Source File

 # Begin Source File

 

-SOURCE=..\..\slice\Ice\StreamF.ice

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

 

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

 

 # Begin Custom Build

-InputPath=..\..\slice\Ice\StreamF.ice

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

 

-"..\..\include\Ice\StreamF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

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

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

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

-	move StreamF.h ..\..\include\Ice 

-	del StreamF.cpp 

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

+	move ObjectAdapterF.h ..\..\include\Ice 

+	del ObjectAdapterF.cpp 

 	

 # End Custom Build

 

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

 

 # Begin Custom Build

-InputPath=..\..\slice\Ice\StreamF.ice

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

 

-"..\..\include\Ice\StreamF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

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

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

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

-	move StreamF.h ..\..\include\Ice 

-	del StreamF.cpp 

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

+	move ObjectAdapterF.h ..\..\include\Ice 

+	del ObjectAdapterF.cpp 

 	

 # End Custom Build

 

@@ -899,41 +899,41 @@ InputPath=..\..\slice\Ice\StreamF.ice
 # End Source File

 # Begin Source File

 

-SOURCE=..\..\slice\Ice\ObjectAdapter.ice

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

 

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

 

 # Begin Custom Build

-InputPath=..\..\slice\Ice\ObjectAdapter.ice

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

 

 BuildCmds= \

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

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

-	move ObjectAdapter.h ..\..\include\Ice \

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

+	move Properties.h ..\..\include\Ice \

 	

 

-"..\..\include\Ice\ObjectAdapter.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

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

    $(BuildCmds)

 

-"ObjectAdapter.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

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

    $(BuildCmds)

 # End Custom Build

 

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

 

 # Begin Custom Build

-InputPath=..\..\slice\Ice\ObjectAdapter.ice

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

 

 BuildCmds= \

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

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

-	move ObjectAdapter.h ..\..\include\Ice \

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

+	move Properties.h ..\..\include\Ice \

 	

 

-"..\..\include\Ice\ObjectAdapter.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

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

    $(BuildCmds)

 

-"ObjectAdapter.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

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

    $(BuildCmds)

 # End Custom Build

 

@@ -942,31 +942,31 @@ BuildCmds= \
 # End Source File

 # Begin Source File

 

-SOURCE=..\..\slice\Ice\ObjectAdapterF.ice

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

 

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

 

 # Begin Custom Build

-InputPath=..\..\slice\Ice\ObjectAdapterF.ice

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

 

-"..\..\include\Ice\ObjectAdapterF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

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

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

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

-	move ObjectAdapterF.h ..\..\include\Ice 

-	del ObjectAdapterF.cpp 

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

+	move PropertiesF.h ..\..\include\Ice 

+	del PropertiesF.cpp 

 	

 # End Custom Build

 

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

 

 # Begin Custom Build

-InputPath=..\..\slice\Ice\ObjectAdapterF.ice

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

 

-"..\..\include\Ice\ObjectAdapterF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

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

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

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

-	move ObjectAdapterF.h ..\..\include\Ice 

-	del ObjectAdapterF.cpp 

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

+	move PropertiesF.h ..\..\include\Ice 

+	del PropertiesF.cpp 

 	

 # End Custom Build

 

@@ -975,41 +975,41 @@ InputPath=..\..\slice\Ice\ObjectAdapterF.ice
 # End Source File

 # Begin Source File

 

-SOURCE=..\..\slice\Ice\ServantLocator.ice

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

 

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

 

 # Begin Custom Build

-InputPath=..\..\slice\Ice\ServantLocator.ice

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

 

 BuildCmds= \

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

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

-	move ServantLocator.h ..\..\include\Ice \

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

+	move ServantFactory.h ..\..\include\Ice \

 	

 

-"..\..\include\Ice\ServantLocator.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

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

    $(BuildCmds)

 

-"ServantLocator.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

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

    $(BuildCmds)

 # End Custom Build

 

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

 

 # Begin Custom Build

-InputPath=..\..\slice\Ice\ServantLocator.ice

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

 

 BuildCmds= \

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

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

-	move ServantLocator.h ..\..\include\Ice \

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

+	move ServantFactory.h ..\..\include\Ice \

 	

 

-"..\..\include\Ice\ServantLocator.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

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

    $(BuildCmds)

 

-"ServantLocator.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

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

    $(BuildCmds)

 # End Custom Build

 

@@ -1018,31 +1018,31 @@ BuildCmds= \
 # End Source File

 # Begin Source File

 

-SOURCE=..\..\slice\Ice\ServantLocatorF.ice

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

 

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

 

 # Begin Custom Build

-InputPath=..\..\slice\Ice\ServantLocatorF.ice

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

 

-"..\..\include\Ice\ServantLocatorF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

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

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

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

-	move ServantLocatorF.h ..\..\include\Ice 

-	del ServantLocatorF.cpp 

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

+	move ServantFactoryF.h ..\..\include\Ice 

+	del ServantFactoryF.cpp 

 	

 # End Custom Build

 

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

 

 # Begin Custom Build

-InputPath=..\..\slice\Ice\ServantLocatorF.ice

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

 

-"..\..\include\Ice\ServantLocatorF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

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

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

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

-	move ServantLocatorF.h ..\..\include\Ice 

-	del ServantLocatorF.cpp 

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

+	move ServantFactoryF.h ..\..\include\Ice 

+	del ServantFactoryF.cpp 

 	

 # End Custom Build

 

@@ -1051,41 +1051,41 @@ InputPath=..\..\slice\Ice\ServantLocatorF.ice
 # End Source File

 # Begin Source File

 

-SOURCE=..\..\slice\Ice\Properties.ice

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

 

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

 

 # Begin Custom Build

-InputPath=..\..\slice\Ice\Properties.ice

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

 

 BuildCmds= \

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

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

-	move Properties.h ..\..\include\Ice \

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

+	move ServantLocator.h ..\..\include\Ice \

 	

 

-"..\..\include\Ice\Properties.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

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

    $(BuildCmds)

 

-"Properties.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

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

    $(BuildCmds)

 # End Custom Build

 

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

 

 # Begin Custom Build

-InputPath=..\..\slice\Ice\Properties.ice

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

 

 BuildCmds= \

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

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

-	move Properties.h ..\..\include\Ice \

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

+	move ServantLocator.h ..\..\include\Ice \

 	

 

-"..\..\include\Ice\Properties.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

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

    $(BuildCmds)

 

-"Properties.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

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

    $(BuildCmds)

 # End Custom Build

 

@@ -1094,31 +1094,31 @@ BuildCmds= \
 # End Source File

 # Begin Source File

 

-SOURCE=..\..\slice\Ice\PropertiesF.ice

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

 

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

 

 # Begin Custom Build

-InputPath=..\..\slice\Ice\PropertiesF.ice

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

 

-"..\..\include\Ice\PropertiesF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

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

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

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

-	move PropertiesF.h ..\..\include\Ice 

-	del PropertiesF.cpp 

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

+	move ServantLocatorF.h ..\..\include\Ice 

+	del ServantLocatorF.cpp 

 	

 # End Custom Build

 

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

 

 # Begin Custom Build

-InputPath=..\..\slice\Ice\PropertiesF.ice

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

 

-"..\..\include\Ice\PropertiesF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

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

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

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

-	move PropertiesF.h ..\..\include\Ice 

-	del PropertiesF.cpp 

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

+	move ServantLocatorF.h ..\..\include\Ice 

+	del ServantLocatorF.cpp 

 	

 # End Custom Build

 

@@ -1127,41 +1127,41 @@ InputPath=..\..\slice\Ice\PropertiesF.ice
 # End Source File

 # Begin Source File

 

-SOURCE=..\..\slice\Ice\ServantFactory.ice

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

 

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

 

 # Begin Custom Build

-InputPath=..\..\slice\Ice\ServantFactory.ice

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

 

 BuildCmds= \

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

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

-	move ServantFactory.h ..\..\include\Ice \

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

+	move Stream.h ..\..\include\Ice \

 	

 

-"..\..\include\Ice\ServantFactory.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

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

    $(BuildCmds)

 

-"ServantFactory.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

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

    $(BuildCmds)

 # End Custom Build

 

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

 

 # Begin Custom Build

-InputPath=..\..\slice\Ice\ServantFactory.ice

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

 

 BuildCmds= \

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

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

-	move ServantFactory.h ..\..\include\Ice \

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

+	move Stream.h ..\..\include\Ice \

 	

 

-"..\..\include\Ice\ServantFactory.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

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

    $(BuildCmds)

 

-"ServantFactory.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

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

    $(BuildCmds)

 # End Custom Build

 

@@ -1170,31 +1170,31 @@ BuildCmds= \
 # End Source File

 # Begin Source File

 

-SOURCE=..\..\slice\Ice\ServantFactoryF.ice

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

 

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

 

 # Begin Custom Build

-InputPath=..\..\slice\Ice\ServantFactoryF.ice

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

 

-"..\..\include\Ice\ServantFactoryF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

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

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

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

-	move ServantFactoryF.h ..\..\include\Ice 

-	del ServantFactoryF.cpp 

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

+	move StreamF.h ..\..\include\Ice 

+	del StreamF.cpp 

 	

 # End Custom Build

 

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

 

 # Begin Custom Build

-InputPath=..\..\slice\Ice\ServantFactoryF.ice

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

 

-"..\..\include\Ice\ServantFactoryF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

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

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

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

-	move ServantFactoryF.h ..\..\include\Ice 

-	del ServantFactoryF.cpp 

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

+	move StreamF.h ..\..\include\Ice 

+	del StreamF.cpp 

 	

 # End Custom Build

 

diff --git a/cpp/src/IcePack/icepack.dsp b/cpp/src/IcePack/icepack.dsp
index 43c9bc83e20..763996e7a9f 100644
--- a/cpp/src/IcePack/icepack.dsp
+++ b/cpp/src/IcePack/icepack.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

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

-# ADD CPP /nologo /MD /Ze /W3 /GR /GX /O2 /I ".." /I "../../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_USRDLL" /D "ICE_PACK_API_EXPORTS" /YX /FD /c

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

 # SUBTRACT CPP /Fr

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

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

@@ -75,8 +75,8 @@ PostBuild_Cmds=copy Release\icepack001.* ..\..\lib
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

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

-# ADD CPP /nologo /MDd /Ze /W3 /Gm /GR /GX /Zi /Od /I ".." /I "../../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_USRDLL" /D "ICE_PACK_API_EXPORTS" /YX /FD /GZ /c

-# SUBTRACT CPP /Fr

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

+# SUBTRACT CPP /WX /Fr

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

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

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

diff --git a/cpp/src/IcePack/icepackC.dsp b/cpp/src/IcePack/icepackC.dsp
index 698f89df295..c1a3a9135ec 100644
--- a/cpp/src/IcePack/icepackC.dsp
+++ b/cpp/src/IcePack/icepackC.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /Ze /W3 /GR /GX /O2 /I ".." /I "../../include" /I "dummyinclude" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c

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

 # SUBTRACT CPP /Fr

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -67,8 +67,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c

-# ADD CPP /nologo /MDd /Ze /W3 /Gm /GR /GX /Zi /Od /I ".." /I "../../include" /I "dummyinclude" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /GZ /c

-# SUBTRACT CPP /Fr

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

+# SUBTRACT CPP /WX /Fr

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

diff --git a/cpp/src/IcePack/icepackS.dsp b/cpp/src/IcePack/icepackS.dsp
index b3a3b686a13..50c43a29945 100644
--- a/cpp/src/IcePack/icepackS.dsp
+++ b/cpp/src/IcePack/icepackS.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I ".." /I "../../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c

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

 # SUBTRACT CPP /Fr

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c

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

-# SUBTRACT CPP /Fr

+# SUBTRACT CPP /WX /Fr

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

diff --git a/cpp/src/Slice/slice.dsp b/cpp/src/Slice/slice.dsp
index 886df264e30..c4287ed3a4f 100644
--- a/cpp/src/Slice/slice.dsp
+++ b/cpp/src/Slice/slice.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

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

-# ADD CPP /nologo /MD /Ze /W3 /GR /GX /O2 /I ".." /I "../../include" /I "dummyinclude" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_USRDLL" /D "SLICE_API_EXPORTS" /YX /FD /c

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

 # SUBTRACT CPP /Fr

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

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

@@ -75,8 +75,8 @@ PostBuild_Cmds=copy Release\slice001.* ..\..\lib
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

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

-# ADD CPP /nologo /MDd /Ze /W3 /Gm /GR /GX /Zi /Od /I ".." /I "../../include" /I "dummyinclude" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_USRDLL" /D "SLICE_API_EXPORTS" /YX /FD /GZ /c

-# SUBTRACT CPP /Fr

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

+# SUBTRACT CPP /WX /Fr

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

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

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -104,15 +104,15 @@ PostBuild_Cmds=copy Debug\slice001d.* ..\..\lib
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

 # Begin Source File

 

-SOURCE=.\Grammar.cpp

+SOURCE=.\CPlusPlusUtil.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\OutputUtil.cpp

+SOURCE=.\Grammar.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\CPlusPlusUtil.cpp

+SOURCE=.\OutputUtil.cpp

 # End Source File

 # Begin Source File

 

@@ -128,19 +128,19 @@ SOURCE=.\Scanner.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"

 # Begin Source File

 

-SOURCE=.\Grammar.h

+SOURCE=..\..\incluce\Slice\CPlusPlusUtil.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\GrammarUtil.h

+SOURCE=.\Grammar.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\incluce\Slice\OutputUtil.h

+SOURCE=.\GrammarUtil.h

 # End Source File

 # Begin Source File

 

-SOURCE=..\..\incluce\Slice\CPlusPlusUtil.h

+SOURCE=..\..\incluce\Slice\OutputUtil.h

 # End Source File

 # Begin Source File

 

diff --git a/cpp/src/slice2cpp/slice2cpp.dsp b/cpp/src/slice2cpp/slice2cpp.dsp
index 23790b1ea0f..2b7e66cbb20 100644
--- a/cpp/src/slice2cpp/slice2cpp.dsp
+++ b/cpp/src/slice2cpp/slice2cpp.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /Ze /W3 /GR /GX /O2 /I "." /I "../../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c

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

 # SUBTRACT CPP /Fr

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -67,8 +67,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c

-# ADD CPP /nologo /MDd /Ze /W3 /Gm /GR /GX /Zi /Od /I "." /I "../../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /GZ /c

-# SUBTRACT CPP /Fr

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

+# SUBTRACT CPP /WX /Fr

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

diff --git a/cpp/src/slice2docbook/slice2docbook.dsp b/cpp/src/slice2docbook/slice2docbook.dsp
index bbe6caf4a60..e5a9cd61ac2 100644
--- a/cpp/src/slice2docbook/slice2docbook.dsp
+++ b/cpp/src/slice2docbook/slice2docbook.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /Ze /W3 /GR /GX /O2 /I "." /I "../../include" /I "../parser" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c

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

 # SUBTRACT CPP /Fr

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -67,8 +67,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c

-# ADD CPP /nologo /MDd /Ze /W3 /Gm /GR /GX /Zi /Od /I "." /I "../../include" /I "../parser" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /GZ /c

-# SUBTRACT CPP /Fr

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

+# SUBTRACT CPP /WX /Fr

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

diff --git a/cpp/src/slice2freeze/slice2freeze.dsp b/cpp/src/slice2freeze/slice2freeze.dsp
index 4f19630e7dc..f2fe1660e4a 100644
--- a/cpp/src/slice2freeze/slice2freeze.dsp
+++ b/cpp/src/slice2freeze/slice2freeze.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "." /I "../../include" /I "../parser" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c

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

 # SUBTRACT CPP /Fr

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c

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

-# SUBTRACT CPP /Fr

+# SUBTRACT CPP /WX /Fr

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe