Removed OutgoingM

11 files changed, 306 insertions, 1339 deletions

diff --git a/cppe/src/IceE/Connection.cpp b/cppe/src/IceE/Connection.cpp
index c4e57f4644a..89ac9eda507 100755
--- a/cppe/src/IceE/Connection.cpp
+++ b/cppe/src/IceE/Connection.cpp
@@ -28,6 +28,8 @@
 #   include <IceE/Incoming.h>
 #endif
 
+#include <iostream>
+
 using namespace std;
 using namespace Ice;
 using namespace IceInternal;
@@ -357,28 +359,27 @@ Ice::Connection::sendRequest(BasicStream* os)
 #ifdef ICEE_BLOCKING_CLIENT
 
 void
-Ice::Connection::sendBlockingRequest(BasicStream* os, BasicStream* is, Outgoing* out)
+Ice::Connection::sendBlockingRequest(BasicStream* os, Outgoing* out)
 {
     Int requestId;
-
     {
-	IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
+        IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
 
-	if(_exception.get())
-	{
-	    _exception->ice_throw();
-	}
+        if(_exception.get())
+        {
+            _exception->ice_throw();
+        }
 
-	assert(_state > StateNotValidated);
-	assert(_state < StateClosing);
+        assert(_state > StateNotValidated);
+        assert(_state < StateClosing);
 
-	//
-	// Fill in request id if it is a twoway call.
-	//
-	if(out)
-	{
-	    requestId = fillRequestId(os);
-	}
+        //
+        // Fill in request id if it is a twoway call.
+        //
+        if(out)
+        {
+            requestId = fillRequestId(os);
+        }
     }
 
     try
@@ -389,13 +390,14 @@ Ice::Connection::sendBlockingRequest(BasicStream* os, BasicStream* is, Outgoing*
 
 	    if(out)
 	    {
-		readStream(*is);
+	        os->reset();
+		readStream(*os);
  	    }
 	}
 
 	if(out)
 	{
-	    IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
+            IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
 
 	    if(_state != StateClosed)
 	    {
@@ -404,9 +406,9 @@ Ice::Connection::sendBlockingRequest(BasicStream* os, BasicStream* is, Outgoing*
 	        ServantManager* servantManager;
 	        ObjectAdapter* adapter;
 
-	        parseMessage(*is, requestId, invokeNum, servantManager, adapter);
+	        parseMessage(*os, requestId, invokeNum, servantManager, adapter);
 #else
-	        parseMessage(*is, requestId);
+	        parseMessage(*os, requestId);
 #endif
 	    }
 
@@ -431,7 +433,7 @@ Ice::Connection::sendBlockingRequest(BasicStream* os, BasicStream* is, Outgoing*
     }
     catch(const LocalException& ex)
     {
-	IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
+        IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
 	setState(StateClosed, ex);
 	assert(_exception.get());
 	_exception->ice_throw();
@@ -443,43 +445,84 @@ Ice::Connection::sendBlockingRequest(BasicStream* os, BasicStream* is, Outgoing*
 #ifndef ICEE_PURE_BLOCKING_CLIENT
 
 void
-Ice::Connection::sendRequest(BasicStream* os, OutgoingM* out)
+Ice::Connection::sendRequest(BasicStream* os, Outgoing* out)
 {
     Int requestId;
-
     {
-	IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
+        IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
 
-	if(_exception.get())
-	{
-	    _exception->ice_throw();
-	}
+        if(_exception.get())
+        {
+            _exception->ice_throw();
+        }
 
-	assert(_state > StateNotValidated);
-	assert(_state < StateClosing);
+        assert(_state > StateNotValidated);
+        assert(_state < StateClosing);
 
-	//
-	// Only add to the request map if this is a twoway call.
-	//
-	if(out)
-	{
-	    requestId = fillRequestId(os);
+        //
+        // Only add to the request map if this is a twoway call.
+        //
+        if(out)
+        {
+            requestId = fillRequestId(os);
 
-	    //
-	    // Add to the requests map.
-	    //
-	    _requestsHint = _requests.insert(_requests.end(), pair<const Int, OutgoingM*>(requestId, out));
-	}
+            //
+            // Add to the requests map.
+            //
+            _requestsHint = _requests.insert(_requests.end(), pair<const Int, Outgoing*>(requestId, out));
+        }
     }
 
+    bool timedOut = false;
     try
     {
-	IceUtil::Mutex::Lock sendSync(_sendMutex);
-	sendRequest(os);
+        {
+	    IceUtil::Mutex::Lock sendSync(_sendMutex);
+	    sendRequest(os);
+	}
+
+	if(out)
+	{
+            IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
+
+            //
+            // Wait until the request has completed, or until the
+            // request times out.
+            //
+            Int tout = timeout();
+	    IceUtil::Time expireTime;
+	    if(tout >= 0)
+	    {
+	        expireTime = IceUtil::Time::now() + IceUtil::Time::milliSeconds(tout);
+	    }
+            while(out->state() == Outgoing::StateInProgress && !timedOut)
+            {
+                if(tout >= 0)
+                {           
+		    IceUtil::Time now = IceUtil::Time::now();
+		    if(now < expireTime)
+		    {
+                        timedWait(expireTime - now);
+		    }
+            
+	    	    //
+		    // Make sure we woke up because of timeout and not another response.
+		    //
+                    if(out->state() == Outgoing::StateInProgress && IceUtil::Time::now() > expireTime)
+                    {
+                        timedOut = true;
+                    }
+                }
+                else
+                {
+                    wait();
+                }
+            }
+	}
     }
     catch(const LocalException& ex)
     {
-	IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
+        IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
 	setState(StateClosed, ex);
 	assert(_exception.get());
 
@@ -499,11 +542,11 @@ Ice::Connection::sendRequest(BasicStream* os, OutgoingM* out)
 	    // very elaborate and complex design, which would be bad
 	    // for performance.
 	    //
-	    map<Int, OutgoingM*>::iterator p = _requests.find(requestId);
+	    map<Int, Outgoing*>::iterator p = _requests.find(requestId);
 	    if(p != _requests.end())
 	    {
 		if(p == _requestsHint)
-		{
+	    	{
 		    _requests.erase(p++);
 		    _requestsHint = p;
 		}
@@ -520,6 +563,26 @@ Ice::Connection::sendRequest(BasicStream* os, OutgoingM* out)
 	    _exception->ice_throw();
 	}
     }
+
+    if(timedOut)
+    {
+        //
+        // Must be called outside the synchronization of this
+        // object.
+        //
+        exception(TimeoutException(__FILE__, __LINE__));
+
+        IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
+
+        //
+        // We must wait until the exception has propagted
+	// back to the Outgoing object.
+        //
+	while(out->state() == Outgoing::StateInProgress)
+	{
+	    wait();
+	}
+    }
 }
 
 #endif
@@ -1575,7 +1638,7 @@ Ice::Connection::parseMessage(BasicStream& stream, Int& requestId
 	    
 		    stream.read(requestId);
 	    
-		    map<Int, OutgoingM*>::iterator p = _requests.end();
+		    map<Int, Outgoing*>::iterator p = _requests.end();
 	        
 		    if(_requestsHint != _requests.end())
 		    {
@@ -1608,6 +1671,7 @@ Ice::Connection::parseMessage(BasicStream& stream, Int& requestId
 		        {
 			    _requests.erase(p);
 		        }
+			notifyAll(); // Wake up threads waiting in sendRequest()
 		    }
 	    
 		    break;
@@ -1867,7 +1931,7 @@ Ice::Connection::run()
 	readStream(stream);
 	
 	auto_ptr<LocalException> exception;	
-	map<Int, OutgoingM*> requests;
+	map<Int, Outgoing*> requests;
 
 	{
 	    IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
@@ -1934,9 +1998,15 @@ Ice::Connection::run()
 #ifndef ICEE_PURE_CLIENT
 	invokeAll(in, invokeNum, requestId, servantManager, adapter);
 #endif
-	for(map<Int, OutgoingM*>::iterator p = requests.begin(); p != requests.end(); ++p)
+	if(requests.size() != 0)
 	{
-	    p->second->finished(*_exception.get()); // The exception is immutable at this point.
+	    IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
+
+	    for(map<Int, Outgoing*>::iterator p = requests.begin(); p != requests.end(); ++p)
+	    {
+	        p->second->finished(*_exception.get()); // The exception is immutable at this point.
+	    }
+    	    notifyAll(); // Wake up threads waiting in sendRequest()
 	}
 	
 	if(exception.get())
diff --git a/cppe/src/IceE/Makefile b/cppe/src/IceE/Makefile
index c9a6cb149fe..e12b7c3ab02 100644
--- a/cppe/src/IceE/Makefile
+++ b/cppe/src/IceE/Makefile
@@ -60,7 +60,6 @@ LOCAL_OBJS	= BasicStream.o \
 		  ObjectAdapterFactory.o \
 		  OperationMode.o \
 		  Outgoing.o \
-		  OutgoingM.o \
 		  OutgoingConnectionFactory.o \
 		  Properties.o \
 		  Proxy.o \
diff --git a/cppe/src/IceE/Outgoing.cpp b/cppe/src/IceE/Outgoing.cpp
index d3f54129c34..ed015cfd0f5 100644
--- a/cppe/src/IceE/Outgoing.cpp
+++ b/cppe/src/IceE/Outgoing.cpp
@@ -39,22 +39,21 @@ IceInternal::Outgoing::Outgoing(Connection* connection, Reference* ref, const st
     _connection(connection),
     _reference(ref),
     _state(StateUnsent),
-    _is(ref->getInstance().get()),
-    _os(ref->getInstance().get())
+    _stream(ref->getInstance().get())
 {
     switch(_reference->getMode())
     {
 	case Reference::ModeTwoway:
 	case Reference::ModeOneway:
 	{
-	    _connection->prepareRequest(&_os);
+	    _connection->prepareRequest(&_stream);
 	    break;
 	}
 
 	case Reference::ModeBatchOneway:
 #ifdef ICEE_HAS_BATCH
 	{
-	    _connection->prepareBatchRequest(&_os);
+	    _connection->prepareBatchRequest(&_stream);
 	    break;
 	}
 #endif
@@ -66,31 +65,31 @@ IceInternal::Outgoing::Outgoing(Connection* connection, Reference* ref, const st
 	}
     }
 
-    _reference->getIdentity().__write(&_os);
+    _reference->getIdentity().__write(&_stream);
 
     //
     // For compatibility with the old FacetPath.
     //
     if(_reference->getFacet().empty())
     {
-	_os.write(static_cast<string*>(0), static_cast<string*>(0));
+	_stream.write(static_cast<string*>(0), static_cast<string*>(0));
     }
     else
     {
 	string facet = _reference->getFacet();
-	_os.write(&facet, &facet + 1);
+	_stream.write(&facet, &facet + 1);
     }
 
-    _os.write(operation);
+    _stream.write(operation);
 
-    _os.write(static_cast<Byte>(mode));
+    _stream.write(static_cast<Byte>(mode));
 
-    _os.writeSize(Int(context.size()));
+    _stream.writeSize(Int(context.size()));
     Context::const_iterator p;
     for(p = context.begin(); p != context.end(); ++p)
     {
-	_os.write(p->first);
-	_os.write(p->second);
+	_stream.write(p->first);
+	_stream.write(p->second);
     }
     
     //
@@ -98,28 +97,49 @@ IceInternal::Outgoing::Outgoing(Connection* connection, Reference* ref, const st
     // encapsulation, which makes it possible to forward requests as
     // blobs.
     //
-    _os.startWriteEncaps();
+    _stream.startWriteEncaps();
 }
 
 bool
 IceInternal::Outgoing::invoke()
 {
-#ifdef ICEE_BLOCKING_CLIENT
     assert(_state == StateUnsent);
+    _state = StateInProgress;
 
-    _os.endWriteEncaps();
+    _stream.endWriteEncaps();
     
     switch(_reference->getMode())
     {
 	case Reference::ModeTwoway:
 	{
+#ifndef ICEE_PURE_BLOCKING_CLIENT
+#ifdef ICEE_BLOCKING_CLIENT
+	    if(!_connection->blocking())
+#endif
+	    {
+	        //
+	        // We let all exceptions raised by sending directly
+	        // propagate to the caller, because they can be retried
+	        // without violating "at-most-once". In case of such
+	        // exceptions, the connection object does not call back on
+	        // this object, so we don't need to lock the mutex, keep
+	        // track of state, or save exceptions.
+	        //
+	        _connection->sendRequest(&_stream, this);
+	    }
+#ifdef ICEE_BLOCKING_CLIENT
+	    else
+#endif
+#endif
+#ifdef ICEE_BLOCKING_CLIENT
+	    {
 	        //
 		// For blocking sends the reply is written directly
 		// into the incoming stream.
 		//
 		try
 		{
-	            _connection->sendBlockingRequest(&_os, &_is, this);
+	            _connection->sendBlockingRequest(&_stream, this);
 		    finishedInternal();
 		}
 		catch(const LocalException& ex)
@@ -127,7 +147,8 @@ IceInternal::Outgoing::invoke()
     		    _state = StateLocalException;
     		    _exception.reset(dynamic_cast<LocalException*>(ex.ice_clone()));
 		}
-
+	    }
+#endif
 	    if(_exception.get())
 	    {
 		//
@@ -174,8 +195,11 @@ IceInternal::Outgoing::invoke()
 	    // caller, because such exceptions can be retried without
 	    // violating "at-most-once".
 	    //
-	    _state = StateInProgress;
-	    _connection->sendBlockingRequest(&_os, 0, 0);
+#ifdef ICEE_BLOCKING_CLIENT
+	    _connection->sendBlockingRequest(&_stream, 0);
+#else
+	    _connection->sendRequest(&_stream, 0);
+#endif
 	    break;
 	}
 
@@ -187,8 +211,7 @@ IceInternal::Outgoing::invoke()
 	    // regular oneways (see comment above)
 	    // apply.
 	    //
-	    _state = StateInProgress;
-	    _connection->finishBatchRequest(&_os);
+	    _connection->finishBatchRequest(&_stream);
 	    break;
 	}
 #endif
@@ -201,10 +224,6 @@ IceInternal::Outgoing::invoke()
     }
 
     return true;
-#else
-    assert(false);
-    return false;
-#endif
 }
 
 void
@@ -234,11 +253,23 @@ IceInternal::Outgoing::abort(const LocalException& ex)
     ex.ice_throw();
 }
 
+#ifndef ICEE_PURE_BLOCKING_CLIENT
+void
+IceInternal::Outgoing::finished(BasicStream& is)
+{
+    assert(_reference->getMode() == Reference::ModeTwoway); // Can only be called for twoways.
+    assert(_state <= StateInProgress);
+
+    _stream.swap(is);
+    finishedInternal();
+}
+#endif
+
 void
 IceInternal::Outgoing::finishedInternal()
 {
     Byte status;
-    _is.read(status);
+    _stream.read(status);
     
     switch(static_cast<DispatchStatus>(status))
     {
@@ -249,7 +280,7 @@ IceInternal::Outgoing::finishedInternal()
 	    // encapsulation, which makes it possible to forward
 	    // oneway requests as blobs.
 	    //
-	    _is.startReadEncaps();
+	    _stream.startReadEncaps();
 	    _state = StateOK; // The state must be set last, in case there is an exception.
 	    break;
 	}
@@ -261,7 +292,7 @@ IceInternal::Outgoing::finishedInternal()
 	    // encapsulation, which makes it possible to forward
 	    // oneway requests as blobs.
 	    //
-	    _is.startReadEncaps();
+	    _stream.startReadEncaps();
 	    _state = StateUserException; // The state must be set last, in case there is an exception.
 	    break;
 	}
@@ -276,13 +307,13 @@ IceInternal::Outgoing::finishedInternal()
 	    // exception, you will have a memory leak.
 	    //
 	    Identity ident;
-	    ident.__read(&_is);
+	    ident.__read(&_stream);
 
 	    //
 	    // For compatibility with the old FacetPath.
 	    //
 	    vector<string> facetPath;
-	    _is.read(facetPath);
+	    _stream.read(facetPath);
 	    string facet;
 	    if(!facetPath.empty())
 	    {
@@ -294,7 +325,7 @@ IceInternal::Outgoing::finishedInternal()
 	    }
 
 	    string operation;
-	    _is.read(operation);
+	    _stream.read(operation);
 	    
 	    RequestFailedException* ex;
 	    switch(static_cast<DispatchStatus>(status))
@@ -344,7 +375,7 @@ IceInternal::Outgoing::finishedInternal()
 	    // exception, you will have a memory leak.
 	    //
 	    string unknown;
-	    _is.read(unknown);
+	    _stream.read(unknown);
 	    
 	    UnknownException* ex;
 	    switch(static_cast<DispatchStatus>(status))
@@ -390,3 +421,17 @@ IceInternal::Outgoing::finishedInternal()
 	}
     }
 }
+
+#ifndef ICEE_PURE_BLOCKING_CLIENT
+
+void
+IceInternal::Outgoing::finished(const LocalException& ex)
+{
+    assert(_reference->getMode() == Reference::ModeTwoway); // Can only be called for twoways.
+    assert(_state <= StateInProgress);
+    
+    _state = StateLocalException;
+    _exception.reset(dynamic_cast<LocalException*>(ex.ice_clone()));
+}
+
+#endif
diff --git a/cppe/src/IceE/OutgoingM.cpp b/cppe/src/IceE/OutgoingM.cpp
deleted file mode 100644
index 6325be93545..00000000000
--- a/cppe/src/IceE/OutgoingM.cpp
+++ /dev/null
@@ -1,216 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice-E is licensed to you under the terms described in the
-// ICEE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#include <IceE/Config.h>
-
-#ifndef ICEE_PURE_BLOCKING_CLIENT
-
-#include <IceE/Outgoing.h>
-#include <IceE/DispatchStatus.h>
-#include <IceE/Connection.h>
-#include <IceE/Reference.h>
-#include <IceE/LocalException.h>
-
-using namespace std;
-using namespace Ice;
-using namespace IceInternal;
-
-IceInternal::OutgoingM::OutgoingM(Connection* connection, Reference* ref, const string& operation,
-				  OperationMode mode, const Context& context) :
-    Outgoing(connection, ref, operation, mode, context)
-{
-}
-
-bool
-IceInternal::OutgoingM::invoke()
-{
-    assert(_state == StateUnsent);
-
-    _os.endWriteEncaps();
-    
-    switch(_reference->getMode())
-    {
-	case Reference::ModeTwoway:
-	{
-	        //
-	        // We let all exceptions raised by sending directly
-	        // propagate to the caller, because they can be retried
-	        // without violating "at-most-once". In case of such
-	        // exceptions, the connection object does not call back on
-	        // this object, so we don't need to lock the mutex, keep
-	        // track of state, or save exceptions.
-	        //
-	        _connection->sendRequest(&_os, this);
-	    
-	        //
-	        // Wait until the request has completed, or until the
-	        // request times out.
-	        //
-
-	        bool timedOut = false;
-
-	        {
-		    IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
-
-		    //
-                    // It's possible that the request has already
-                    // completed, due to a regular response, or because of
-                    // an exception. So we only change the state to "in
-                    // progress" if it is still "unsent".
-		    //
-		    if(_state == StateUnsent)
-		    {
-		        _state = StateInProgress;
-		    }
-		
-		    Int timeout = _connection->timeout();
-		    while(_state == StateInProgress && !timedOut)
-		    {
-		        if(timeout >= 0)
-		        {	
-			    timedWait(IceUtil::Time::milliSeconds(timeout));
-			
-			    if(_state == StateInProgress)
-			    {
-			        timedOut = true;
-			    }
-		        }
-		        else
-		        {
-			    wait();
-		        }
-		    }
-	        }
-
-	        if(timedOut)
-	        {
-		    //
-		    // Must be called outside the synchronization of this
-		    // object.
-		    //
-		    _connection->exception(TimeoutException(__FILE__, __LINE__));
-
-		    //
-		    // We must wait until the exception set above has
-		    // propagated to this Outgoing object.
-		    //
-		    {
-		        IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
-		    
-		        while(_state == StateInProgress)
-		        {
-			    wait();
-		        }
-		    }
-	        }
-
-	    if(_exception.get())
-	    {
-		//
-		// A CloseConnectionException indicates graceful
-		// server shutdown, and is therefore always repeatable
-		// without violating "at-most-once". That's because by
-		// sending a close connection message, the server
-		// guarantees that all outstanding requests can safely
-		// be repeated.
-		//
-		// An ObjectNotExistException can always be retried as
-		// well without violating "at-most-once".
-		//
-		if(dynamic_cast<CloseConnectionException*>(_exception.get()) ||
-		   dynamic_cast<ObjectNotExistException*>(_exception.get()))
-		{
-		    _exception->ice_throw();
-		}
-		
-		//
-		// Throw the exception wrapped in a NonRepeatable, to
-		// indicate that the request cannot be resent without
-		// potentially violating the "at-most-once" principle.
-		//
-		throw NonRepeatable(*_exception.get());
-	    }
-	    
-	    if(_state == StateUserException)
-	    {
-		return false;
-	    }
-
-	    assert(_state == StateOK);
-	    break;
-	}
-	
-	case Reference::ModeOneway:
-	{
-	    //
-	    // For oneway requests, the connection object
-	    // never calls back on this object. Therefore we don't
-	    // need to lock the mutex or save exceptions. We simply
-	    // let all exceptions from sending propagate to the
-	    // caller, because such exceptions can be retried without
-	    // violating "at-most-once".
-	    //
-	    _state = StateInProgress;
-	    _connection->sendRequest(&_os, 0);
-	    break;
-	}
-
-	case Reference::ModeBatchOneway:
-#ifdef ICEE_HAS_BATCH
-	{
-	    //
-	    // For batch oneways, the same rules as for
-	    // regular oneways (see comment above)
-	    // apply.
-	    //
-	    _state = StateInProgress;
-	    _connection->finishBatchRequest(&_os);
-	    break;
-	}
-#endif
-	case Reference::ModeDatagram:
-	case Reference::ModeBatchDatagram:
-	{
-	    assert(false);
-	    return false;
-	}
-    }
-
-    return true;
-}
-
-void
-IceInternal::OutgoingM::finished(BasicStream& is)
-{
-    IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
-
-    assert(_reference->getMode() == Reference::ModeTwoway); // Can only be called for twoways.
-
-    assert(_state <= StateInProgress);
-
-    _is.swap(is);
-    finishedInternal();
-    notify();
-}
-
-void
-IceInternal::OutgoingM::finished(const LocalException& ex)
-{
-    IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
-    
-    assert(_reference->getMode() == Reference::ModeTwoway); // Can only be called for twoways.
-
-    assert(_state <= StateInProgress);
-    
-    _state = StateLocalException;
-    _exception.reset(dynamic_cast<LocalException*>(ex.ice_clone()));
-     notify();
-}
-
-#endif
diff --git a/cppe/src/IceE/Proxy.cpp b/cppe/src/IceE/Proxy.cpp
index 206180f720c..34b5ea238af 100644
--- a/cppe/src/IceE/Proxy.cpp
+++ b/cppe/src/IceE/Proxy.cpp
@@ -173,24 +173,41 @@ IceProxy::Ice::Object::ice_isA(const string& __id, const Context& __context)
 	    __checkTwowayOnly("ice_isA");
 	    static const string __operation("ice_isA");
 	    ConnectionPtr __connection = ice_connection();
-#ifdef ICEE_BLOCKING_CLIENT
-#  ifndef ICEE_PURE_BLOCKING_CLIENT
-            if(__connection->blocking())
-#  endif
+            Outgoing __og(__connection.get(), _reference.get(), __operation, ::Ice::Nonmutating, __context);
+            BasicStream* __stream = __og.stream();
+            try
             {
-                Outgoing __og(__connection.get(), _reference.get(), __operation, ::Ice::Nonmutating, __context);
-                return __ice_isA(__id, __og);
+                __stream->write(__id);
             }
-#  ifndef ICEE_PURE_BLOCKING_CLIENT
-            else
-#  endif
-#endif
-#ifndef ICEE_PURE_BLOCKING_CLIENT
+            catch(const ::Ice::LocalException& __ex)
+            {
+                __og.abort(__ex);
+            }
+            bool __ret;
+            bool __ok = __og.invoke();
+            try
+            {
+                if(!__ok)
+                {
+                    __stream->throwException();
+                }
+                __stream->read(__ret);
+            }
+            catch(const ::Ice::UserException&)
+            {
+                throw ::Ice::UnknownUserException(__FILE__, __LINE__);
+            }
+            catch(const ::Ice::LocalException& __ex)
             {
-                OutgoingM __og(__connection.get(), _reference.get(), __operation, ::Ice::Nonmutating, __context);
-                return __ice_isA(__id, __og);
+                throw ::IceInternal::NonRepeatable(__ex);
+            }
+#if defined(_MSC_VER) && (_MSC_VER == 1201) && defined(_M_ARM) // EVC4 SP4 bug.
+            catch(...)
+            {
+                throw;
             }
 #endif
+            return __ret;
 	}
 	catch(const NonRepeatable& __ex)
 	{
@@ -209,46 +226,6 @@ IceProxy::Ice::Object::ice_isA(const string& __id, const Context& __context)
     }
 }
 
-bool
-IceProxy::Ice::Object::__ice_isA(const string& __id, Outgoing& __og)
-{
-    try
-    {
-        BasicStream* __os = __og.os();
-        __os->write(__id);
-    }
-    catch(const ::Ice::LocalException& __ex)
-    {
-        __og.abort(__ex);
-    }
-    bool __ret;
-    bool __ok = __og.invoke();
-    try
-    {
-        BasicStream* __is = __og.is();
-        if(!__ok)
-        {
-            __is->throwException();
-        }
-        __is->read(__ret);
-    }
-    catch(const ::Ice::UserException&)
-    {
-        throw ::Ice::UnknownUserException(__FILE__, __LINE__);
-    }
-    catch(const ::Ice::LocalException& __ex)
-    {
-        throw ::IceInternal::NonRepeatable(__ex);
-    }
-#if defined(_MSC_VER) && (_MSC_VER == 1201) && defined(_M_ARM) // EVC4 SP4 bug.
-    catch(...)
-    {
-        throw;
-    }
-#endif
-    return __ret;
-}
-
 void
 IceProxy::Ice::Object::ice_ping()
 {
@@ -265,22 +242,28 @@ IceProxy::Ice::Object::ice_ping(const Context& __context)
 	{
             static const string __operation("ice_ping");
 	    ConnectionPtr __connection = ice_connection();
-#ifdef ICEE_BLOCKING_CLIENT
-#  ifndef ICEE_PURE_BLOCKING_CLIENT
-            if(__connection->blocking())
-#  endif
+            Outgoing __og(__connection.get(), _reference.get(), __operation, ::Ice::Nonmutating, __context);
+            bool __ok = __og.invoke();
+            try
             {
-                Outgoing __og(__connection.get(), _reference.get(), __operation, ::Ice::Nonmutating, __context);
-                __ice_ping(__og);
+                BasicStream* __is = __og.stream();
+                if(!__ok)
+                {
+                    __is->throwException();
+                }
             }
-#  ifndef ICEE_PURE_BLOCKING_CLIENT
-            else
-#  endif
-#endif
-#ifndef ICEE_PURE_BLOCKING_CLIENT
+            catch(const ::Ice::UserException&)
             {
-                OutgoingM __og(__connection.get(), _reference.get(), __operation, ::Ice::Nonmutating, __context);
-                __ice_ping(__og);
+                throw ::Ice::UnknownUserException(__FILE__, __LINE__);
+            }
+            catch(const ::Ice::LocalException& __ex)
+            {
+                throw ::IceInternal::NonRepeatable(__ex);
+            }
+#if defined(_MSC_VER) && (_MSC_VER == 1201) && defined(_M_ARM) // EVC4 SP4 bug.
+            catch(...)
+            {
+                throw;
             }
 #endif
 	    return;
@@ -302,36 +285,6 @@ IceProxy::Ice::Object::ice_ping(const Context& __context)
     }
 }
 
-void
-IceProxy::Ice::Object::__ice_ping(Outgoing& __og)
-{
-    bool __ok = __og.invoke();
-    try
-    {
-        BasicStream* __is = __og.is();
-        if(!__ok)
-        {
-            __is->throwException();
-        }
-    }
-    catch(const ::Ice::UserException&)
-    {
-        throw ::Ice::UnknownUserException(__FILE__, __LINE__);
-    }
-    catch(const ::Ice::LocalException& __ex)
-    {
-        throw ::IceInternal::NonRepeatable(__ex);
-    }
-#if defined(_MSC_VER) && (_MSC_VER == 1201) && defined(_M_ARM) // EVC4 SP4 bug.
-    catch(...)
-    {
-        throw;
-    }
-#endif
-}
-
-
-
 vector<string>
 IceProxy::Ice::Object::ice_ids()
 {
@@ -349,24 +302,33 @@ IceProxy::Ice::Object::ice_ids(const Context& __context)
 	    __checkTwowayOnly("ice_ids");
             static const string __operation("ice_ids");
 	    ConnectionPtr __connection = ice_connection();
-#ifdef ICEE_BLOCKING_CLIENT
-#  ifndef ICEE_PURE_BLOCKING_CLIENT
-            if(__connection->blocking())
-#  endif
+            Outgoing __og(__connection.get(), _reference.get(), __operation, ::Ice::Nonmutating, __context);
+            vector<string> __ret;
+            bool __ok = __og.invoke();
+            try
             {
-                Outgoing __og(__connection.get(), _reference.get(), __operation, ::Ice::Nonmutating, __context);
-                return __ice_ids(__og);
+                BasicStream* __is = __og.stream();
+                if(!__ok)
+                {
+                    __is->throwException();
+                }
+                __is->read(__ret);
             }
-#  ifndef ICEE_PURE_BLOCKING_CLIENT
-            else
-#  endif
-#endif
-#ifndef ICEE_PURE_BLOCKING_CLIENT
+            catch(const ::Ice::UserException&)
+            {
+                throw ::Ice::UnknownUserException(__FILE__, __LINE__);
+            }
+            catch(const ::Ice::LocalException& __ex)
             {
-                OutgoingM __og(__connection.get(), _reference.get(), __operation, ::Ice::Nonmutating, __context);
-                return __ice_ids(__og);
+                throw ::IceInternal::NonRepeatable(__ex);
+            }
+#if defined(_MSC_VER) && (_MSC_VER == 1201) && defined(_M_ARM) // EVC4 SP4 bug.
+            catch(...)
+            {
+                throw;
             }
 #endif
+            return __ret;
 	}
 	catch(const NonRepeatable& __ex)
 	{
@@ -385,37 +347,6 @@ IceProxy::Ice::Object::ice_ids(const Context& __context)
     }
 }
 
-vector<string>
-IceProxy::Ice::Object::__ice_ids(Outgoing& __og)
-{
-    vector<string> __ret;
-    bool __ok = __og.invoke();
-    try
-    {
-        BasicStream* __is = __og.is();
-        if(!__ok)
-        {
-            __is->throwException();
-        }
-        __is->read(__ret);
-    }
-    catch(const ::Ice::UserException&)
-    {
-        throw ::Ice::UnknownUserException(__FILE__, __LINE__);
-    }
-    catch(const ::Ice::LocalException& __ex)
-    {
-        throw ::IceInternal::NonRepeatable(__ex);
-    }
-#if defined(_MSC_VER) && (_MSC_VER == 1201) && defined(_M_ARM) // EVC4 SP4 bug.
-    catch(...)
-    {
-        throw;
-    }
-#endif
-    return __ret;
-}
-
 string
 IceProxy::Ice::Object::ice_id()
 {
@@ -433,24 +364,33 @@ IceProxy::Ice::Object::ice_id(const Context& __context)
 	    __checkTwowayOnly("ice_id");
             static const string __operation("ice_id");
 	    ConnectionPtr __connection = ice_connection();
-#ifdef ICEE_BLOCKING_CLIENT
-#ifndef ICEE_PURE_BLOCKING_CLIENT
-            if(__connection->blocking())
-#endif
+            Outgoing __og(__connection.get(), _reference.get(), __operation, ::Ice::Nonmutating, __context);
+            string __ret;
+            bool __ok = __og.invoke();
+            try
             {
-                Outgoing __og(__connection.get(), _reference.get(), __operation, ::Ice::Nonmutating, __context);
-                return __ice_id(__og);
+                BasicStream* __is = __og.stream();
+                if(!__ok)
+                {
+                    __is->throwException();
+                }
+                __is->read(__ret);
             }
-#  ifndef ICEE_PURE_BLOCKING_CLIENT
-            else
-#  endif
-#endif
-#ifndef ICEE_PURE_BLOCKING_CLIENT
+            catch(const ::Ice::UserException&)
             {
-                OutgoingM __og(__connection.get(), _reference.get(), __operation, ::Ice::Nonmutating, __context);
-                return __ice_id(__og);
+                throw ::Ice::UnknownUserException(__FILE__, __LINE__);
+            }
+            catch(const ::Ice::LocalException& __ex)
+            {
+                throw ::IceInternal::NonRepeatable(__ex);
+            }
+#if defined(_MSC_VER) && (_MSC_VER == 1201) && defined(_M_ARM) // EVC4 SP4 bug.
+            catch(...)
+            {
+                throw;
             }
 #endif
+            return __ret;
 	}
 	catch(const NonRepeatable& __ex)
 	{
@@ -469,38 +409,6 @@ IceProxy::Ice::Object::ice_id(const Context& __context)
     }
 }
 
-string
-IceProxy::Ice::Object::__ice_id(Outgoing& __og)
-{
-    string __ret;
-    bool __ok = __og.invoke();
-    try
-    {
-        BasicStream* __is = __og.is();
-        if(!__ok)
-        {
-            __is->throwException();
-        }
-        __is->read(__ret);
-    }
-    catch(const ::Ice::UserException&)
-    {
-        throw ::Ice::UnknownUserException(__FILE__, __LINE__);
-    }
-    catch(const ::Ice::LocalException& __ex)
-    {
-        throw ::IceInternal::NonRepeatable(__ex);
-    }
-#if defined(_MSC_VER) && (_MSC_VER == 1201) && defined(_M_ARM) // EVC4 SP4 bug.
-    catch(...)
-    {
-        throw;
-    }
-#endif
-    return __ret;
-}
-
-
 Context
 IceProxy::Ice::Object::ice_getContext() const
 {
diff --git a/cppe/src/IceE/Reference.cpp b/cppe/src/IceE/Reference.cpp
index 234ec78dd71..702f27e2210 100644
--- a/cppe/src/IceE/Reference.cpp
+++ b/cppe/src/IceE/Reference.cpp
@@ -365,26 +365,26 @@ IceInternal::Reference::operator<(const Reference& r) const
 
 IceInternal::Reference::Reference(const InstancePtr& inst, const CommunicatorPtr& com, const Identity& ident,
 				  const Context& ctx, const string& fs, Mode md, bool sec) :
+    _hashInitialized(false),
     _instance(inst),
     _communicator(com),
     _mode(md),
     _secure(sec),
     _identity(ident),
     _context(ctx),
-    _facet(fs),
-    _hashInitialized(false)
+    _facet(fs)
 {
 }
 
 IceInternal::Reference::Reference(const Reference& r) :
+    _hashInitialized(false),
     _instance(r._instance),
     _communicator(r._communicator),
     _mode(r._mode),
     _secure(r._secure),
     _identity(r._identity),
     _context(r._context),
-    _facet(r._facet),
-    _hashInitialized(false)
+    _facet(r._facet)
 {
 }
 
diff --git a/cppe/src/IceE/ice.dsp b/cppe/src/IceE/ice.dsp
index d6dfd176259..1d622cff96c 100755
--- a/cppe/src/IceE/ice.dsp
+++ b/cppe/src/IceE/ice.dsp
@@ -46,7 +46,7 @@ SLICE2CPPEFLAGS=-DICEE
 CPP=cl.exe

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

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

-# SUBTRACT CPP /Z<none> /Fr /YX

+# SUBTRACT CPP /Fr /YX

 MTL=midl.exe

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

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

@@ -116,12 +116,12 @@ PostBuild_Cmds=copy $(OutDir)\iceed.lib ..\..\lib\	copy $(OutDir)\icee11d.pdb ..
 # PROP Intermediate_Dir "ReleaseStatic"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-MTL=midl.exe

 SLICE2CPPEFLAGS=-DICEE

+MTL=midl.exe

 CPP=cl.exe

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

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

-# SUBTRACT CPP /Z<none> /Fr /YX

+# SUBTRACT CPP /Fr /YX

 RSC=rc.exe

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

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

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

 OutDir=.\ReleaseStatic

 SOURCE="$(InputPath)"

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

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

 # End Special Build Tool

 

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

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

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-MTL=midl.exe

 SLICE2CPPEFLAGS=-DICEE

+MTL=midl.exe

 CPP=cl.exe

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

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

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

 OutDir=.\DebugStatic

 SOURCE="$(InputPath)"

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

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

 # End Special Build Tool

 

 !ENDIF 

@@ -322,10 +322,6 @@ SOURCE=.\OutgoingConnectionFactory.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\OutgoingM.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\Properties.cpp

 # End Source File

 # Begin Source File

diff --git a/cppe/src/IceE/ice.vcp b/cppe/src/IceE/ice.vcp
index 064c87d0427..ffd7e751ccc 100755
--- a/cppe/src/IceE/ice.vcp
+++ b/cppe/src/IceE/ice.vcp
@@ -20992,413 +20992,6 @@ NODEP_CPP_OUTGOI=\
 # End Source File

 # Begin Source File

 

-SOURCE=.\OutgoingM.cpp

-

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

-

-DEP_CPP_OUTGOIN=\

-	"..\..\include\IceE\AutoArray.h"\

-	"..\..\include\IceE\BasicStream.h"\

-	"..\..\include\IceE\Buffer.h"\

-	"..\..\include\IceE\BuiltinSequences.h"\

-	"..\..\include\IceE\CommunicatorF.h"\

-	"..\..\include\IceE\Cond.h"\

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

-	"..\..\include\IceE\Connection.h"\

-	"..\..\include\IceE\ConnectionF.h"\

-	"..\..\include\IceE\DispatchStatus.h"\

-	"..\..\include\IceE\EndpointF.h"\

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

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

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

-	"..\..\include\IceE\Identity.h"\

-	"..\..\include\IceE\IncomingConnectionFactoryF.h"\

-	"..\..\include\IceE\InstanceF.h"\

-	"..\..\include\IceE\LocalException.h"\

-	"..\..\include\IceE\LocalObject.h"\

-	"..\..\include\IceE\LocalObjectF.h"\

-	"..\..\include\IceE\LocatorF.h"\

-	"..\..\include\IceE\Lock.h"\

-	"..\..\include\IceE\LoggerF.h"\

-	"..\..\include\IceE\Monitor.h"\

-	"..\..\include\IceE\Mutex.h"\

-	"..\..\include\IceE\ObjectAdapterF.h"\

-	"..\..\include\IceE\ObjectF.h"\

-	"..\..\include\IceE\OperationMode.h"\

-	"..\..\include\IceE\Outgoing.h"\

-	"..\..\include\IceE\OutgoingConnectionFactoryF.h"\

-	"..\..\include\IceE\Proxy.h"\

-	"..\..\include\IceE\ProxyF.h"\

-	"..\..\include\IceE\ProxyFactoryF.h"\

-	"..\..\include\IceE\ProxyHandle.h"\

-	"..\..\include\IceE\ReferenceF.h"\

-	"..\..\include\IceE\RouterF.h"\

-	"..\..\include\IceE\ServantManagerF.h"\

-	"..\..\include\IceE\Shared.h"\

-	"..\..\include\IceE\Thread.h"\

-	"..\..\include\IceE\ThreadException.h"\

-	"..\..\include\IceE\Time.h"\

-	"..\..\include\IceE\TraceLevelsF.h"\

-	"..\..\include\IceE\TransceiverF.h"\

-	"..\..\include\IceE\UndefSysMacros.h"\

-	".\Reference.h"\

-	

-

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

-

-DEP_CPP_OUTGOIN=\

-	"..\..\include\IceE\AutoArray.h"\

-	"..\..\include\IceE\BasicStream.h"\

-	"..\..\include\IceE\Buffer.h"\

-	"..\..\include\IceE\BuiltinSequences.h"\

-	"..\..\include\IceE\CommunicatorF.h"\

-	"..\..\include\IceE\Cond.h"\

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

-	"..\..\include\IceE\Connection.h"\

-	"..\..\include\IceE\ConnectionF.h"\

-	"..\..\include\IceE\DispatchStatus.h"\

-	"..\..\include\IceE\EndpointF.h"\

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

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

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

-	"..\..\include\IceE\Identity.h"\

-	"..\..\include\IceE\IncomingConnectionFactoryF.h"\

-	"..\..\include\IceE\InstanceF.h"\

-	"..\..\include\IceE\LocalException.h"\

-	"..\..\include\IceE\LocalObject.h"\

-	"..\..\include\IceE\LocalObjectF.h"\

-	"..\..\include\IceE\LocatorF.h"\

-	"..\..\include\IceE\Lock.h"\

-	"..\..\include\IceE\LoggerF.h"\

-	"..\..\include\IceE\Monitor.h"\

-	"..\..\include\IceE\Mutex.h"\

-	"..\..\include\IceE\ObjectAdapterF.h"\

-	"..\..\include\IceE\ObjectF.h"\

-	"..\..\include\IceE\OperationMode.h"\

-	"..\..\include\IceE\Outgoing.h"\

-	"..\..\include\IceE\OutgoingConnectionFactoryF.h"\

-	"..\..\include\IceE\Proxy.h"\

-	"..\..\include\IceE\ProxyF.h"\

-	"..\..\include\IceE\ProxyFactoryF.h"\

-	"..\..\include\IceE\ProxyHandle.h"\

-	"..\..\include\IceE\ReferenceF.h"\

-	"..\..\include\IceE\RouterF.h"\

-	"..\..\include\IceE\ServantManagerF.h"\

-	"..\..\include\IceE\Shared.h"\

-	"..\..\include\IceE\Thread.h"\

-	"..\..\include\IceE\ThreadException.h"\

-	"..\..\include\IceE\Time.h"\

-	"..\..\include\IceE\TraceLevelsF.h"\

-	"..\..\include\IceE\TransceiverF.h"\

-	"..\..\include\IceE\UndefSysMacros.h"\

-	".\Reference.h"\

-	

-

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

-

-DEP_CPP_OUTGOIN=\

-	"..\..\include\IceE\AutoArray.h"\

-	"..\..\include\IceE\BasicStream.h"\

-	"..\..\include\IceE\Buffer.h"\

-	"..\..\include\IceE\BuiltinSequences.h"\

-	"..\..\include\IceE\CommunicatorF.h"\

-	"..\..\include\IceE\Cond.h"\

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

-	"..\..\include\IceE\Connection.h"\

-	"..\..\include\IceE\ConnectionF.h"\

-	"..\..\include\IceE\DispatchStatus.h"\

-	"..\..\include\IceE\EndpointF.h"\

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

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

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

-	"..\..\include\IceE\Identity.h"\

-	"..\..\include\IceE\IncomingConnectionFactoryF.h"\

-	"..\..\include\IceE\InstanceF.h"\

-	"..\..\include\IceE\LocalException.h"\

-	"..\..\include\IceE\LocalObject.h"\

-	"..\..\include\IceE\LocalObjectF.h"\

-	"..\..\include\IceE\LocatorF.h"\

-	"..\..\include\IceE\Lock.h"\

-	"..\..\include\IceE\LoggerF.h"\

-	"..\..\include\IceE\Monitor.h"\

-	"..\..\include\IceE\Mutex.h"\

-	"..\..\include\IceE\ObjectAdapterF.h"\

-	"..\..\include\IceE\ObjectF.h"\

-	"..\..\include\IceE\OperationMode.h"\

-	"..\..\include\IceE\Outgoing.h"\

-	"..\..\include\IceE\OutgoingConnectionFactoryF.h"\

-	"..\..\include\IceE\Proxy.h"\

-	"..\..\include\IceE\ProxyF.h"\

-	"..\..\include\IceE\ProxyFactoryF.h"\

-	"..\..\include\IceE\ProxyHandle.h"\

-	"..\..\include\IceE\ReferenceF.h"\

-	"..\..\include\IceE\RouterF.h"\

-	"..\..\include\IceE\ServantManagerF.h"\

-	"..\..\include\IceE\Shared.h"\

-	"..\..\include\IceE\Thread.h"\

-	"..\..\include\IceE\ThreadException.h"\

-	"..\..\include\IceE\Time.h"\

-	"..\..\include\IceE\TraceLevelsF.h"\

-	"..\..\include\IceE\TransceiverF.h"\

-	"..\..\include\IceE\UndefSysMacros.h"\

-	".\Reference.h"\

-	

-

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

-

-DEP_CPP_OUTGOIN=\

-	"..\..\include\IceE\AutoArray.h"\

-	"..\..\include\IceE\BasicStream.h"\

-	"..\..\include\IceE\Buffer.h"\

-	"..\..\include\IceE\BuiltinSequences.h"\

-	"..\..\include\IceE\CommunicatorF.h"\

-	"..\..\include\IceE\Cond.h"\

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

-	"..\..\include\IceE\Connection.h"\

-	"..\..\include\IceE\ConnectionF.h"\

-	"..\..\include\IceE\DispatchStatus.h"\

-	"..\..\include\IceE\EndpointF.h"\

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

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

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

-	"..\..\include\IceE\Identity.h"\

-	"..\..\include\IceE\IncomingConnectionFactoryF.h"\

-	"..\..\include\IceE\InstanceF.h"\

-	"..\..\include\IceE\LocalException.h"\

-	"..\..\include\IceE\LocalObject.h"\

-	"..\..\include\IceE\LocalObjectF.h"\

-	"..\..\include\IceE\LocatorF.h"\

-	"..\..\include\IceE\Lock.h"\

-	"..\..\include\IceE\LoggerF.h"\

-	"..\..\include\IceE\Monitor.h"\

-	"..\..\include\IceE\Mutex.h"\

-	"..\..\include\IceE\ObjectAdapterF.h"\

-	"..\..\include\IceE\ObjectF.h"\

-	"..\..\include\IceE\OperationMode.h"\

-	"..\..\include\IceE\Outgoing.h"\

-	"..\..\include\IceE\OutgoingConnectionFactoryF.h"\

-	"..\..\include\IceE\Proxy.h"\

-	"..\..\include\IceE\ProxyF.h"\

-	"..\..\include\IceE\ProxyFactoryF.h"\

-	"..\..\include\IceE\ProxyHandle.h"\

-	"..\..\include\IceE\ReferenceF.h"\

-	"..\..\include\IceE\RouterF.h"\

-	"..\..\include\IceE\ServantManagerF.h"\

-	"..\..\include\IceE\Shared.h"\

-	"..\..\include\IceE\Thread.h"\

-	"..\..\include\IceE\ThreadException.h"\

-	"..\..\include\IceE\Time.h"\

-	"..\..\include\IceE\TraceLevelsF.h"\

-	"..\..\include\IceE\TransceiverF.h"\

-	"..\..\include\IceE\UndefSysMacros.h"\

-	".\Reference.h"\

-	

-

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

-

-DEP_CPP_OUTGOIN=\

-	"..\..\include\IceE\AutoArray.h"\

-	"..\..\include\IceE\BasicStream.h"\

-	"..\..\include\IceE\Buffer.h"\

-	"..\..\include\IceE\BuiltinSequences.h"\

-	"..\..\include\IceE\CommunicatorF.h"\

-	"..\..\include\IceE\Cond.h"\

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

-	"..\..\include\IceE\Connection.h"\

-	"..\..\include\IceE\ConnectionF.h"\

-	"..\..\include\IceE\DispatchStatus.h"\

-	"..\..\include\IceE\EndpointF.h"\

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

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

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

-	"..\..\include\IceE\Identity.h"\

-	"..\..\include\IceE\IncomingConnectionFactoryF.h"\

-	"..\..\include\IceE\InstanceF.h"\

-	"..\..\include\IceE\LocalException.h"\

-	"..\..\include\IceE\LocalObject.h"\

-	"..\..\include\IceE\LocalObjectF.h"\

-	"..\..\include\IceE\LocatorF.h"\

-	"..\..\include\IceE\Lock.h"\

-	"..\..\include\IceE\LoggerF.h"\

-	"..\..\include\IceE\Monitor.h"\

-	"..\..\include\IceE\Mutex.h"\

-	"..\..\include\IceE\ObjectAdapterF.h"\

-	"..\..\include\IceE\ObjectF.h"\

-	"..\..\include\IceE\OperationMode.h"\

-	"..\..\include\IceE\Outgoing.h"\

-	"..\..\include\IceE\OutgoingConnectionFactoryF.h"\

-	"..\..\include\IceE\Proxy.h"\

-	"..\..\include\IceE\ProxyF.h"\

-	"..\..\include\IceE\ProxyFactoryF.h"\

-	"..\..\include\IceE\ProxyHandle.h"\

-	"..\..\include\IceE\ReferenceF.h"\

-	"..\..\include\IceE\RouterF.h"\

-	"..\..\include\IceE\ServantManagerF.h"\

-	"..\..\include\IceE\Shared.h"\

-	"..\..\include\IceE\Thread.h"\

-	"..\..\include\IceE\ThreadException.h"\

-	"..\..\include\IceE\Time.h"\

-	"..\..\include\IceE\TraceLevelsF.h"\

-	"..\..\include\IceE\TransceiverF.h"\

-	"..\..\include\IceE\UndefSysMacros.h"\

-	".\Reference.h"\

-	

-

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

-

-DEP_CPP_OUTGOIN=\

-	"..\..\include\IceE\AutoArray.h"\

-	"..\..\include\IceE\BasicStream.h"\

-	"..\..\include\IceE\Buffer.h"\

-	"..\..\include\IceE\BuiltinSequences.h"\

-	"..\..\include\IceE\CommunicatorF.h"\

-	"..\..\include\IceE\Cond.h"\

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

-	"..\..\include\IceE\Connection.h"\

-	"..\..\include\IceE\ConnectionF.h"\

-	"..\..\include\IceE\DispatchStatus.h"\

-	"..\..\include\IceE\EndpointF.h"\

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

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

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

-	"..\..\include\IceE\Identity.h"\

-	"..\..\include\IceE\IncomingConnectionFactoryF.h"\

-	"..\..\include\IceE\InstanceF.h"\

-	"..\..\include\IceE\LocalException.h"\

-	"..\..\include\IceE\LocalObject.h"\

-	"..\..\include\IceE\LocalObjectF.h"\

-	"..\..\include\IceE\LocatorF.h"\

-	"..\..\include\IceE\Lock.h"\

-	"..\..\include\IceE\LoggerF.h"\

-	"..\..\include\IceE\Monitor.h"\

-	"..\..\include\IceE\Mutex.h"\

-	"..\..\include\IceE\ObjectAdapterF.h"\

-	"..\..\include\IceE\ObjectF.h"\

-	"..\..\include\IceE\OperationMode.h"\

-	"..\..\include\IceE\Outgoing.h"\

-	"..\..\include\IceE\OutgoingConnectionFactoryF.h"\

-	"..\..\include\IceE\Proxy.h"\

-	"..\..\include\IceE\ProxyF.h"\

-	"..\..\include\IceE\ProxyFactoryF.h"\

-	"..\..\include\IceE\ProxyHandle.h"\

-	"..\..\include\IceE\ReferenceF.h"\

-	"..\..\include\IceE\RouterF.h"\

-	"..\..\include\IceE\ServantManagerF.h"\

-	"..\..\include\IceE\Shared.h"\

-	"..\..\include\IceE\Thread.h"\

-	"..\..\include\IceE\ThreadException.h"\

-	"..\..\include\IceE\Time.h"\

-	"..\..\include\IceE\TraceLevelsF.h"\

-	"..\..\include\IceE\TransceiverF.h"\

-	"..\..\include\IceE\UndefSysMacros.h"\

-	".\Reference.h"\

-	

-

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

-

-DEP_CPP_OUTGOIN=\

-	"..\..\include\IceE\AutoArray.h"\

-	"..\..\include\IceE\BasicStream.h"\

-	"..\..\include\IceE\Buffer.h"\

-	"..\..\include\IceE\BuiltinSequences.h"\

-	"..\..\include\IceE\CommunicatorF.h"\

-	"..\..\include\IceE\Cond.h"\

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

-	"..\..\include\IceE\Connection.h"\

-	"..\..\include\IceE\ConnectionF.h"\

-	"..\..\include\IceE\DispatchStatus.h"\

-	"..\..\include\IceE\EndpointF.h"\

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

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

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

-	"..\..\include\IceE\Identity.h"\

-	"..\..\include\IceE\IncomingConnectionFactoryF.h"\

-	"..\..\include\IceE\InstanceF.h"\

-	"..\..\include\IceE\LocalException.h"\

-	"..\..\include\IceE\LocalObject.h"\

-	"..\..\include\IceE\LocalObjectF.h"\

-	"..\..\include\IceE\LocatorF.h"\

-	"..\..\include\IceE\Lock.h"\

-	"..\..\include\IceE\LoggerF.h"\

-	"..\..\include\IceE\Monitor.h"\

-	"..\..\include\IceE\Mutex.h"\

-	"..\..\include\IceE\ObjectAdapterF.h"\

-	"..\..\include\IceE\ObjectF.h"\

-	"..\..\include\IceE\OperationMode.h"\

-	"..\..\include\IceE\Outgoing.h"\

-	"..\..\include\IceE\OutgoingConnectionFactoryF.h"\

-	"..\..\include\IceE\Proxy.h"\

-	"..\..\include\IceE\ProxyF.h"\

-	"..\..\include\IceE\ProxyFactoryF.h"\

-	"..\..\include\IceE\ProxyHandle.h"\

-	"..\..\include\IceE\ReferenceF.h"\

-	"..\..\include\IceE\RouterF.h"\

-	"..\..\include\IceE\ServantManagerF.h"\

-	"..\..\include\IceE\Shared.h"\

-	"..\..\include\IceE\Thread.h"\

-	"..\..\include\IceE\ThreadException.h"\

-	"..\..\include\IceE\Time.h"\

-	"..\..\include\IceE\TraceLevelsF.h"\

-	"..\..\include\IceE\TransceiverF.h"\

-	"..\..\include\IceE\UndefSysMacros.h"\

-	".\Reference.h"\

-	

-

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

-

-DEP_CPP_OUTGOIN=\

-	"..\..\include\IceE\AutoArray.h"\

-	"..\..\include\IceE\BasicStream.h"\

-	"..\..\include\IceE\Buffer.h"\

-	"..\..\include\IceE\BuiltinSequences.h"\

-	"..\..\include\IceE\CommunicatorF.h"\

-	"..\..\include\IceE\Cond.h"\

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

-	"..\..\include\IceE\Connection.h"\

-	"..\..\include\IceE\ConnectionF.h"\

-	"..\..\include\IceE\DispatchStatus.h"\

-	"..\..\include\IceE\EndpointF.h"\

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

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

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

-	"..\..\include\IceE\Identity.h"\

-	"..\..\include\IceE\IncomingConnectionFactoryF.h"\

-	"..\..\include\IceE\InstanceF.h"\

-	"..\..\include\IceE\LocalException.h"\

-	"..\..\include\IceE\LocalObject.h"\

-	"..\..\include\IceE\LocalObjectF.h"\

-	"..\..\include\IceE\LocatorF.h"\

-	"..\..\include\IceE\Lock.h"\

-	"..\..\include\IceE\LoggerF.h"\

-	"..\..\include\IceE\Monitor.h"\

-	"..\..\include\IceE\Mutex.h"\

-	"..\..\include\IceE\ObjectAdapterF.h"\

-	"..\..\include\IceE\ObjectF.h"\

-	"..\..\include\IceE\OperationMode.h"\

-	"..\..\include\IceE\Outgoing.h"\

-	"..\..\include\IceE\OutgoingConnectionFactoryF.h"\

-	"..\..\include\IceE\Proxy.h"\

-	"..\..\include\IceE\ProxyF.h"\

-	"..\..\include\IceE\ProxyFactoryF.h"\

-	"..\..\include\IceE\ProxyHandle.h"\

-	"..\..\include\IceE\ReferenceF.h"\

-	"..\..\include\IceE\RouterF.h"\

-	"..\..\include\IceE\ServantManagerF.h"\

-	"..\..\include\IceE\Shared.h"\

-	"..\..\include\IceE\Thread.h"\

-	"..\..\include\IceE\ThreadException.h"\

-	"..\..\include\IceE\Time.h"\

-	"..\..\include\IceE\TraceLevelsF.h"\

-	"..\..\include\IceE\TransceiverF.h"\

-	"..\..\include\IceE\UndefSysMacros.h"\

-	".\Reference.h"\

-	

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

 SOURCE=.\Properties.cpp

 

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

diff --git a/cppe/src/IceEC/Makefile b/cppe/src/IceEC/Makefile
index 3025b780cc4..dd337703b86 100644
--- a/cppe/src/IceEC/Makefile
+++ b/cppe/src/IceEC/Makefile
@@ -45,7 +45,6 @@ ICE_OBJS	= BasicStream.o \
 		  Network.o \
 		  OperationMode.o \
 		  Outgoing.o \
-		  OutgoingM.o \
 		  OutgoingConnectionFactory.o \
 		  Properties.o \
 		  Proxy.o \
diff --git a/cppe/src/IceEC/icec.dsp b/cppe/src/IceEC/icec.dsp
index 3190f705294..f31b71c08a0 100755
--- a/cppe/src/IceEC/icec.dsp
+++ b/cppe/src/IceEC/icec.dsp
@@ -46,7 +46,7 @@ SLICE2CPPEFLAGS=-DICEE
 CPP=cl.exe

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

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

-# SUBTRACT CPP /Z<none> /Fr /YX

+# SUBTRACT CPP /Fr /YX

 MTL=midl.exe

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

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

@@ -116,12 +116,12 @@ PostBuild_Cmds=copy $(OutDir)\iceecd.lib ..\..\lib\	copy $(OutDir)\iceec11d.pdb
 # PROP Intermediate_Dir "ReleaseStatic"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-MTL=midl.exe

 SLICE2CPPEFLAGS=-DICEE

+MTL=midl.exe

 CPP=cl.exe

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

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

-# SUBTRACT CPP /Z<none> /Fr /YX

+# SUBTRACT CPP /Fr /YX

 RSC=rc.exe

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

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

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

 OutDir=.\ReleaseStatic

 SOURCE="$(InputPath)"

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

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

 # End Special Build Tool

 

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

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

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-MTL=midl.exe

 SLICE2CPPEFLAGS=-DICEE

+MTL=midl.exe

 CPP=cl.exe

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

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

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

 OutDir=.\DebugStatic

 SOURCE="$(InputPath)"

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

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

 # End Special Build Tool

 

 !ENDIF 

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

 # Begin Source File

 

-SOURCE=..\IceE\OutgoingM.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=..\IceE\Properties.cpp

 # End Source File

 # Begin Source File

diff --git a/cppe/src/IceEC/icec.vcp b/cppe/src/IceEC/icec.vcp
index 60726f11ddf..13e72044c1f 100755
--- a/cppe/src/IceEC/icec.vcp
+++ b/cppe/src/IceEC/icec.vcp
@@ -14637,429 +14637,6 @@ NODEP_CPP_OUTGOI=\
 # End Source File

 # Begin Source File

 

-SOURCE=..\IceE\OutgoingM.cpp

-

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

-

-DEP_CPP_OUTGOIN=\

-	"..\..\include\IceE\AutoArray.h"\

-	"..\..\include\IceE\BasicStream.h"\

-	"..\..\include\IceE\Buffer.h"\

-	"..\..\include\IceE\BuiltinSequences.h"\

-	"..\..\include\IceE\CommunicatorF.h"\

-	"..\..\include\IceE\Cond.h"\

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

-	"..\..\include\IceE\Connection.h"\

-	"..\..\include\IceE\ConnectionF.h"\

-	"..\..\include\IceE\DispatchStatus.h"\

-	"..\..\include\IceE\EndpointF.h"\

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

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

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

-	"..\..\include\IceE\Identity.h"\

-	"..\..\include\IceE\IncomingConnectionFactoryF.h"\

-	"..\..\include\IceE\InstanceF.h"\

-	"..\..\include\IceE\LocalException.h"\

-	"..\..\include\IceE\LocalObject.h"\

-	"..\..\include\IceE\LocalObjectF.h"\

-	"..\..\include\IceE\LocatorF.h"\

-	"..\..\include\IceE\LocatorInfoF.h"\

-	"..\..\include\IceE\Lock.h"\

-	"..\..\include\IceE\LoggerF.h"\

-	"..\..\include\IceE\Monitor.h"\

-	"..\..\include\IceE\Mutex.h"\

-	"..\..\include\IceE\ObjectAdapterF.h"\

-	"..\..\include\IceE\ObjectF.h"\

-	"..\..\include\IceE\OperationMode.h"\

-	"..\..\include\IceE\Outgoing.h"\

-	"..\..\include\IceE\OutgoingConnectionFactoryF.h"\

-	"..\..\include\IceE\Proxy.h"\

-	"..\..\include\IceE\ProxyF.h"\

-	"..\..\include\IceE\ProxyFactoryF.h"\

-	"..\..\include\IceE\ProxyHandle.h"\

-	"..\..\include\IceE\ReferenceF.h"\

-	"..\..\include\IceE\RouterF.h"\

-	"..\..\include\IceE\RouterInfoF.h"\

-	"..\..\include\IceE\ServantManagerF.h"\

-	"..\..\include\IceE\Shared.h"\

-	"..\..\include\IceE\Thread.h"\

-	"..\..\include\IceE\ThreadException.h"\

-	"..\..\include\IceE\Time.h"\

-	"..\..\include\IceE\TraceLevelsF.h"\

-	"..\..\include\IceE\TransceiverF.h"\

-	"..\..\include\IceE\UndefSysMacros.h"\

-	"..\IceE\Reference.h"\

-	

-

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

-

-DEP_CPP_OUTGOIN=\

-	"..\..\include\IceE\AutoArray.h"\

-	"..\..\include\IceE\BasicStream.h"\

-	"..\..\include\IceE\Buffer.h"\

-	"..\..\include\IceE\BuiltinSequences.h"\

-	"..\..\include\IceE\CommunicatorF.h"\

-	"..\..\include\IceE\Cond.h"\

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

-	"..\..\include\IceE\Connection.h"\

-	"..\..\include\IceE\ConnectionF.h"\

-	"..\..\include\IceE\DispatchStatus.h"\

-	"..\..\include\IceE\EndpointF.h"\

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

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

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

-	"..\..\include\IceE\Identity.h"\

-	"..\..\include\IceE\IncomingConnectionFactoryF.h"\

-	"..\..\include\IceE\InstanceF.h"\

-	"..\..\include\IceE\LocalException.h"\

-	"..\..\include\IceE\LocalObject.h"\

-	"..\..\include\IceE\LocalObjectF.h"\

-	"..\..\include\IceE\LocatorF.h"\

-	"..\..\include\IceE\LocatorInfoF.h"\

-	"..\..\include\IceE\Lock.h"\

-	"..\..\include\IceE\LoggerF.h"\

-	"..\..\include\IceE\Monitor.h"\

-	"..\..\include\IceE\Mutex.h"\

-	"..\..\include\IceE\ObjectAdapterF.h"\

-	"..\..\include\IceE\ObjectF.h"\

-	"..\..\include\IceE\OperationMode.h"\

-	"..\..\include\IceE\Outgoing.h"\

-	"..\..\include\IceE\OutgoingConnectionFactoryF.h"\

-	"..\..\include\IceE\Proxy.h"\

-	"..\..\include\IceE\ProxyF.h"\

-	"..\..\include\IceE\ProxyFactoryF.h"\

-	"..\..\include\IceE\ProxyHandle.h"\

-	"..\..\include\IceE\ReferenceF.h"\

-	"..\..\include\IceE\RouterF.h"\

-	"..\..\include\IceE\RouterInfoF.h"\

-	"..\..\include\IceE\ServantManagerF.h"\

-	"..\..\include\IceE\Shared.h"\

-	"..\..\include\IceE\Thread.h"\

-	"..\..\include\IceE\ThreadException.h"\

-	"..\..\include\IceE\Time.h"\

-	"..\..\include\IceE\TraceLevelsF.h"\

-	"..\..\include\IceE\TransceiverF.h"\

-	"..\..\include\IceE\UndefSysMacros.h"\

-	"..\IceE\Reference.h"\

-	

-

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

-

-DEP_CPP_OUTGOIN=\

-	"..\..\include\IceE\AutoArray.h"\

-	"..\..\include\IceE\BasicStream.h"\

-	"..\..\include\IceE\Buffer.h"\

-	"..\..\include\IceE\BuiltinSequences.h"\

-	"..\..\include\IceE\CommunicatorF.h"\

-	"..\..\include\IceE\Cond.h"\

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

-	"..\..\include\IceE\Connection.h"\

-	"..\..\include\IceE\ConnectionF.h"\

-	"..\..\include\IceE\DispatchStatus.h"\

-	"..\..\include\IceE\EndpointF.h"\

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

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

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

-	"..\..\include\IceE\Identity.h"\

-	"..\..\include\IceE\IncomingConnectionFactoryF.h"\

-	"..\..\include\IceE\InstanceF.h"\

-	"..\..\include\IceE\LocalException.h"\

-	"..\..\include\IceE\LocalObject.h"\

-	"..\..\include\IceE\LocalObjectF.h"\

-	"..\..\include\IceE\LocatorF.h"\

-	"..\..\include\IceE\LocatorInfoF.h"\

-	"..\..\include\IceE\Lock.h"\

-	"..\..\include\IceE\LoggerF.h"\

-	"..\..\include\IceE\Monitor.h"\

-	"..\..\include\IceE\Mutex.h"\

-	"..\..\include\IceE\ObjectAdapterF.h"\

-	"..\..\include\IceE\ObjectF.h"\

-	"..\..\include\IceE\OperationMode.h"\

-	"..\..\include\IceE\Outgoing.h"\

-	"..\..\include\IceE\OutgoingConnectionFactoryF.h"\

-	"..\..\include\IceE\Proxy.h"\

-	"..\..\include\IceE\ProxyF.h"\

-	"..\..\include\IceE\ProxyFactoryF.h"\

-	"..\..\include\IceE\ProxyHandle.h"\

-	"..\..\include\IceE\ReferenceF.h"\

-	"..\..\include\IceE\RouterF.h"\

-	"..\..\include\IceE\RouterInfoF.h"\

-	"..\..\include\IceE\ServantManagerF.h"\

-	"..\..\include\IceE\Shared.h"\

-	"..\..\include\IceE\Thread.h"\

-	"..\..\include\IceE\ThreadException.h"\

-	"..\..\include\IceE\Time.h"\

-	"..\..\include\IceE\TraceLevelsF.h"\

-	"..\..\include\IceE\TransceiverF.h"\

-	"..\..\include\IceE\UndefSysMacros.h"\

-	"..\IceE\Reference.h"\

-	

-

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

-

-DEP_CPP_OUTGOIN=\

-	"..\..\include\IceE\AutoArray.h"\

-	"..\..\include\IceE\BasicStream.h"\

-	"..\..\include\IceE\Buffer.h"\

-	"..\..\include\IceE\BuiltinSequences.h"\

-	"..\..\include\IceE\CommunicatorF.h"\

-	"..\..\include\IceE\Cond.h"\

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

-	"..\..\include\IceE\Connection.h"\

-	"..\..\include\IceE\ConnectionF.h"\

-	"..\..\include\IceE\DispatchStatus.h"\

-	"..\..\include\IceE\EndpointF.h"\

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

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

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

-	"..\..\include\IceE\Identity.h"\

-	"..\..\include\IceE\IncomingConnectionFactoryF.h"\

-	"..\..\include\IceE\InstanceF.h"\

-	"..\..\include\IceE\LocalException.h"\

-	"..\..\include\IceE\LocalObject.h"\

-	"..\..\include\IceE\LocalObjectF.h"\

-	"..\..\include\IceE\LocatorF.h"\

-	"..\..\include\IceE\LocatorInfoF.h"\

-	"..\..\include\IceE\Lock.h"\

-	"..\..\include\IceE\LoggerF.h"\

-	"..\..\include\IceE\Monitor.h"\

-	"..\..\include\IceE\Mutex.h"\

-	"..\..\include\IceE\ObjectAdapterF.h"\

-	"..\..\include\IceE\ObjectF.h"\

-	"..\..\include\IceE\OperationMode.h"\

-	"..\..\include\IceE\Outgoing.h"\

-	"..\..\include\IceE\OutgoingConnectionFactoryF.h"\

-	"..\..\include\IceE\Proxy.h"\

-	"..\..\include\IceE\ProxyF.h"\

-	"..\..\include\IceE\ProxyFactoryF.h"\

-	"..\..\include\IceE\ProxyHandle.h"\

-	"..\..\include\IceE\ReferenceF.h"\

-	"..\..\include\IceE\RouterF.h"\

-	"..\..\include\IceE\RouterInfoF.h"\

-	"..\..\include\IceE\ServantManagerF.h"\

-	"..\..\include\IceE\Shared.h"\

-	"..\..\include\IceE\Thread.h"\

-	"..\..\include\IceE\ThreadException.h"\

-	"..\..\include\IceE\Time.h"\

-	"..\..\include\IceE\TraceLevelsF.h"\

-	"..\..\include\IceE\TransceiverF.h"\

-	"..\..\include\IceE\UndefSysMacros.h"\

-	"..\IceE\Reference.h"\

-	

-

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

-

-DEP_CPP_OUTGOIN=\

-	"..\..\include\IceE\AutoArray.h"\

-	"..\..\include\IceE\BasicStream.h"\

-	"..\..\include\IceE\Buffer.h"\

-	"..\..\include\IceE\BuiltinSequences.h"\

-	"..\..\include\IceE\CommunicatorF.h"\

-	"..\..\include\IceE\Cond.h"\

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

-	"..\..\include\IceE\Connection.h"\

-	"..\..\include\IceE\ConnectionF.h"\

-	"..\..\include\IceE\DispatchStatus.h"\

-	"..\..\include\IceE\EndpointF.h"\

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

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

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

-	"..\..\include\IceE\Identity.h"\

-	"..\..\include\IceE\IncomingConnectionFactoryF.h"\

-	"..\..\include\IceE\InstanceF.h"\

-	"..\..\include\IceE\LocalException.h"\

-	"..\..\include\IceE\LocalObject.h"\

-	"..\..\include\IceE\LocalObjectF.h"\

-	"..\..\include\IceE\LocatorF.h"\

-	"..\..\include\IceE\LocatorInfoF.h"\

-	"..\..\include\IceE\Lock.h"\

-	"..\..\include\IceE\LoggerF.h"\

-	"..\..\include\IceE\Monitor.h"\

-	"..\..\include\IceE\Mutex.h"\

-	"..\..\include\IceE\ObjectAdapterF.h"\

-	"..\..\include\IceE\ObjectF.h"\

-	"..\..\include\IceE\OperationMode.h"\

-	"..\..\include\IceE\Outgoing.h"\

-	"..\..\include\IceE\OutgoingConnectionFactoryF.h"\

-	"..\..\include\IceE\Proxy.h"\

-	"..\..\include\IceE\ProxyF.h"\

-	"..\..\include\IceE\ProxyFactoryF.h"\

-	"..\..\include\IceE\ProxyHandle.h"\

-	"..\..\include\IceE\ReferenceF.h"\

-	"..\..\include\IceE\RouterF.h"\

-	"..\..\include\IceE\RouterInfoF.h"\

-	"..\..\include\IceE\ServantManagerF.h"\

-	"..\..\include\IceE\Shared.h"\

-	"..\..\include\IceE\Thread.h"\

-	"..\..\include\IceE\ThreadException.h"\

-	"..\..\include\IceE\Time.h"\

-	"..\..\include\IceE\TraceLevelsF.h"\

-	"..\..\include\IceE\TransceiverF.h"\

-	"..\..\include\IceE\UndefSysMacros.h"\

-	"..\IceE\Reference.h"\

-	

-

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

-

-DEP_CPP_OUTGOIN=\

-	"..\..\include\IceE\AutoArray.h"\

-	"..\..\include\IceE\BasicStream.h"\

-	"..\..\include\IceE\Buffer.h"\

-	"..\..\include\IceE\BuiltinSequences.h"\

-	"..\..\include\IceE\CommunicatorF.h"\

-	"..\..\include\IceE\Cond.h"\

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

-	"..\..\include\IceE\Connection.h"\

-	"..\..\include\IceE\ConnectionF.h"\

-	"..\..\include\IceE\DispatchStatus.h"\

-	"..\..\include\IceE\EndpointF.h"\

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

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

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

-	"..\..\include\IceE\Identity.h"\

-	"..\..\include\IceE\IncomingConnectionFactoryF.h"\

-	"..\..\include\IceE\InstanceF.h"\

-	"..\..\include\IceE\LocalException.h"\

-	"..\..\include\IceE\LocalObject.h"\

-	"..\..\include\IceE\LocalObjectF.h"\

-	"..\..\include\IceE\LocatorF.h"\

-	"..\..\include\IceE\LocatorInfoF.h"\

-	"..\..\include\IceE\Lock.h"\

-	"..\..\include\IceE\LoggerF.h"\

-	"..\..\include\IceE\Monitor.h"\

-	"..\..\include\IceE\Mutex.h"\

-	"..\..\include\IceE\ObjectAdapterF.h"\

-	"..\..\include\IceE\ObjectF.h"\

-	"..\..\include\IceE\OperationMode.h"\

-	"..\..\include\IceE\Outgoing.h"\

-	"..\..\include\IceE\OutgoingConnectionFactoryF.h"\

-	"..\..\include\IceE\Proxy.h"\

-	"..\..\include\IceE\ProxyF.h"\

-	"..\..\include\IceE\ProxyFactoryF.h"\

-	"..\..\include\IceE\ProxyHandle.h"\

-	"..\..\include\IceE\ReferenceF.h"\

-	"..\..\include\IceE\RouterF.h"\

-	"..\..\include\IceE\RouterInfoF.h"\

-	"..\..\include\IceE\ServantManagerF.h"\

-	"..\..\include\IceE\Shared.h"\

-	"..\..\include\IceE\Thread.h"\

-	"..\..\include\IceE\ThreadException.h"\

-	"..\..\include\IceE\Time.h"\

-	"..\..\include\IceE\TraceLevelsF.h"\

-	"..\..\include\IceE\TransceiverF.h"\

-	"..\..\include\IceE\UndefSysMacros.h"\

-	"..\IceE\Reference.h"\

-	

-

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

-

-DEP_CPP_OUTGOIN=\

-	"..\..\include\IceE\AutoArray.h"\

-	"..\..\include\IceE\BasicStream.h"\

-	"..\..\include\IceE\Buffer.h"\

-	"..\..\include\IceE\BuiltinSequences.h"\

-	"..\..\include\IceE\CommunicatorF.h"\

-	"..\..\include\IceE\Cond.h"\

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

-	"..\..\include\IceE\Connection.h"\

-	"..\..\include\IceE\ConnectionF.h"\

-	"..\..\include\IceE\DispatchStatus.h"\

-	"..\..\include\IceE\EndpointF.h"\

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

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

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

-	"..\..\include\IceE\Identity.h"\

-	"..\..\include\IceE\IncomingConnectionFactoryF.h"\

-	"..\..\include\IceE\InstanceF.h"\

-	"..\..\include\IceE\LocalException.h"\

-	"..\..\include\IceE\LocalObject.h"\

-	"..\..\include\IceE\LocalObjectF.h"\

-	"..\..\include\IceE\LocatorF.h"\

-	"..\..\include\IceE\LocatorInfoF.h"\

-	"..\..\include\IceE\Lock.h"\

-	"..\..\include\IceE\LoggerF.h"\

-	"..\..\include\IceE\Monitor.h"\

-	"..\..\include\IceE\Mutex.h"\

-	"..\..\include\IceE\ObjectAdapterF.h"\

-	"..\..\include\IceE\ObjectF.h"\

-	"..\..\include\IceE\OperationMode.h"\

-	"..\..\include\IceE\Outgoing.h"\

-	"..\..\include\IceE\OutgoingConnectionFactoryF.h"\

-	"..\..\include\IceE\Proxy.h"\

-	"..\..\include\IceE\ProxyF.h"\

-	"..\..\include\IceE\ProxyFactoryF.h"\

-	"..\..\include\IceE\ProxyHandle.h"\

-	"..\..\include\IceE\ReferenceF.h"\

-	"..\..\include\IceE\RouterF.h"\

-	"..\..\include\IceE\RouterInfoF.h"\

-	"..\..\include\IceE\ServantManagerF.h"\

-	"..\..\include\IceE\Shared.h"\

-	"..\..\include\IceE\Thread.h"\

-	"..\..\include\IceE\ThreadException.h"\

-	"..\..\include\IceE\Time.h"\

-	"..\..\include\IceE\TraceLevelsF.h"\

-	"..\..\include\IceE\TransceiverF.h"\

-	"..\..\include\IceE\UndefSysMacros.h"\

-	"..\IceE\Reference.h"\

-	

-

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

-

-DEP_CPP_OUTGOIN=\

-	"..\..\include\IceE\AutoArray.h"\

-	"..\..\include\IceE\BasicStream.h"\

-	"..\..\include\IceE\Buffer.h"\

-	"..\..\include\IceE\BuiltinSequences.h"\

-	"..\..\include\IceE\CommunicatorF.h"\

-	"..\..\include\IceE\Cond.h"\

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

-	"..\..\include\IceE\Connection.h"\

-	"..\..\include\IceE\ConnectionF.h"\

-	"..\..\include\IceE\DispatchStatus.h"\

-	"..\..\include\IceE\EndpointF.h"\

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

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

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

-	"..\..\include\IceE\Identity.h"\

-	"..\..\include\IceE\IncomingConnectionFactoryF.h"\

-	"..\..\include\IceE\InstanceF.h"\

-	"..\..\include\IceE\LocalException.h"\

-	"..\..\include\IceE\LocalObject.h"\

-	"..\..\include\IceE\LocalObjectF.h"\

-	"..\..\include\IceE\LocatorF.h"\

-	"..\..\include\IceE\LocatorInfoF.h"\

-	"..\..\include\IceE\Lock.h"\

-	"..\..\include\IceE\LoggerF.h"\

-	"..\..\include\IceE\Monitor.h"\

-	"..\..\include\IceE\Mutex.h"\

-	"..\..\include\IceE\ObjectAdapterF.h"\

-	"..\..\include\IceE\ObjectF.h"\

-	"..\..\include\IceE\OperationMode.h"\

-	"..\..\include\IceE\Outgoing.h"\

-	"..\..\include\IceE\OutgoingConnectionFactoryF.h"\

-	"..\..\include\IceE\Proxy.h"\

-	"..\..\include\IceE\ProxyF.h"\

-	"..\..\include\IceE\ProxyFactoryF.h"\

-	"..\..\include\IceE\ProxyHandle.h"\

-	"..\..\include\IceE\ReferenceF.h"\

-	"..\..\include\IceE\RouterF.h"\

-	"..\..\include\IceE\RouterInfoF.h"\

-	"..\..\include\IceE\ServantManagerF.h"\

-	"..\..\include\IceE\Shared.h"\

-	"..\..\include\IceE\Thread.h"\

-	"..\..\include\IceE\ThreadException.h"\

-	"..\..\include\IceE\Time.h"\

-	"..\..\include\IceE\TraceLevelsF.h"\

-	"..\..\include\IceE\TransceiverF.h"\

-	"..\..\include\IceE\UndefSysMacros.h"\

-	"..\IceE\Reference.h"\

-	

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

 SOURCE=..\IceE\Properties.cpp

 

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