Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice

Conflicts:

	cs/src/Ice/Instance.cs

Removed conflicts. Added more tests. Changed stack
marshaling to reverse order during marshaling instead
of during unmarshaling.

1 files changed, 0 insertions, 28 deletions

diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp
index 3de824796c8..9d7cf4c7d5c 100644
--- a/cpp/src/Ice/ObjectAdapterI.cpp
+++ b/cpp/src/Ice/ObjectAdapterI.cpp
@@ -1322,31 +1322,3 @@ Ice::ObjectAdapterI::filterProperties(StringSeq& unknownProps)
     return noProps;
 }
 
-Ice::ObjectAdapterI::ProcessI::ProcessI(const CommunicatorPtr& communicator) :
-    _communicator(communicator)
-{
-}
-
-void
-Ice::ObjectAdapterI::ProcessI::shutdown(const Current&)
-{
-    _communicator->shutdown();
-}
-
-void
-Ice::ObjectAdapterI::ProcessI::writeMessage(const string& message, Int fd, const Current&)
-{
-    switch(fd)
-    {
-        case 1:
-        {
-            cout << message << endl;
-            break;
-        }
-        case 2:
-        {
-            cerr << message << endl;
-            break;
-        }
-    }
-}