diff options
author | Michi Henning <michi@zeroc.com> | 2005-07-20 04:07:08 +0000 |
---|---|---|
committer | Michi Henning <michi@zeroc.com> | 2005-07-20 04:07:08 +0000 |
commit | 544741283baaed48f8ef64737ebf6284dd5781c8 (patch) | |
tree | ee0c377812095448dbf02982be218e69d7a087a3 /cppe/src/IceE/Instance.cpp | |
parent | Did a make depend. (diff) | |
download | ice-544741283baaed48f8ef64737ebf6284dd5781c8.tar.bz2 ice-544741283baaed48f8ef64737ebf6284dd5781c8.tar.xz ice-544741283baaed48f8ef64737ebf6284dd5781c8.zip |
Added ice_communicator() and ice_toString() to proxies.
Diffstat (limited to 'cppe/src/IceE/Instance.cpp')
-rw-r--r-- | cppe/src/IceE/Instance.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/cppe/src/IceE/Instance.cpp b/cppe/src/IceE/Instance.cpp index 4c53df751a2..3b70ed648a6 100644 --- a/cppe/src/IceE/Instance.cpp +++ b/cppe/src/IceE/Instance.cpp @@ -33,8 +33,8 @@ #include <stdio.h> -#ifdef _WIN32
-# include <winsock2.h>
+#ifdef _WIN32 +# include <winsock2.h> #else # include <signal.h> # include <pwd.h> @@ -60,6 +60,12 @@ extern bool ICEE_API nullHandleAbort; void IceInternal::incRef(Instance* p) { p->__incRef(); } void IceInternal::decRef(Instance* p) { p->__decRef(); } +CommunicatorPtr +IceInternal::Instance::communicator() const +{ + return _communicator; +} + PropertiesPtr IceInternal::Instance::properties() const { @@ -266,6 +272,7 @@ IceInternal::Instance::getDefaultContext() const } IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const PropertiesPtr& properties) : + _communicator(communicator.get()), _destroyed(false), _properties(properties), _messageSizeMax(0), |