diff options
| author | Michi Henning <michi@zeroc.com> | 2007-09-19 11:22:45 +1000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2007-09-19 11:22:45 +1000 |
| commit | cd0338e842b7751c423f5384d247202d3c981be4 (patch) | |
| tree | 2b2965f974c3f7f0dda3b94ed4d7c1c49175d375 /cpp/src/Ice/ObjectAdapterI.h | |
| parent | Added more tests. Changed stack marshaling to reverse order during (diff) | |
| parent | Added missing facet (diff) | |
| download | ice-cd0338e842b7751c423f5384d247202d3c981be4.tar.bz2 ice-cd0338e842b7751c423f5384d247202d3c981be4.tar.xz ice-cd0338e842b7751c423f5384d247202d3c981be4.zip | |
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.
Diffstat (limited to 'cpp/src/Ice/ObjectAdapterI.h')
| -rw-r--r-- | cpp/src/Ice/ObjectAdapterI.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/cpp/src/Ice/ObjectAdapterI.h b/cpp/src/Ice/ObjectAdapterI.h index b0e567837c3..84322f3a495 100644 --- a/cpp/src/Ice/ObjectAdapterI.h +++ b/cpp/src/Ice/ObjectAdapterI.h @@ -27,7 +27,6 @@ #include <Ice/LocatorInfoF.h> #include <Ice/ThreadPoolF.h> #include <Ice/Exception.h> -#include <Ice/Process.h> #include <Ice/BuiltinSequences.h> #include <list> @@ -130,20 +129,6 @@ private: bool _threadPerConnection; size_t _threadPerConnectionStackSize; Identity _processId; - - class ProcessI : public Process - { - public: - - ProcessI(const CommunicatorPtr&); - - virtual void shutdown(const Current&); - virtual void writeMessage(const std::string&, Int, const Current&); - - private: - - const CommunicatorPtr _communicator; - }; }; } |