diff options
Diffstat (limited to 'cppe')
| -rw-r--r-- | cppe/CHANGES | 3 | ||||
| -rw-r--r-- | cppe/README | 8 | ||||
| -rw-r--r-- | cppe/src/IceE/Proxy.cpp | 16 |
3 files changed, 19 insertions, 8 deletions
diff --git a/cppe/CHANGES b/cppe/CHANGES index c018cc1096f..07d06568d99 100644 --- a/cppe/CHANGES +++ b/cppe/CHANGES @@ -1,6 +1,9 @@ Changes since version 1.0.0 --------------------------- +- Added blocking client side concurrency model. The use of this model is + controlled by the Ice.Blocking property. + - If a proxy is not configured with a -h paramater, Ice will now attempt to connect using all local interfaces. The loopback interface (127.0.0.1) will only be tried if it is the only local interface present. diff --git a/cppe/README b/cppe/README index eb93c28876b..59f4f6b861b 100644 --- a/cppe/README +++ b/cppe/README @@ -147,6 +147,14 @@ support for sending batch messages. This feature cannot be disabled in the server library. +Blocking Client Support +----------------------- + +If ICEE_PURE_BLOCKING_CLIENT is defined, the Ice-E client library will +include support only for the blocking client-side concurrency model. If +it is not defined or the server library is being used the blocking model +can still be chosen by setting the --Ice.Blocking property. + Installation ============ diff --git a/cppe/src/IceE/Proxy.cpp b/cppe/src/IceE/Proxy.cpp index 34b5ea238af..841b88a8c6c 100644 --- a/cppe/src/IceE/Proxy.cpp +++ b/cppe/src/IceE/Proxy.cpp @@ -201,7 +201,7 @@ IceProxy::Ice::Object::ice_isA(const string& __id, const Context& __context) { throw ::IceInternal::NonRepeatable(__ex); } -#if defined(_MSC_VER) && (_MSC_VER == 1201) && defined(_M_ARM) // EVC4 SP4 bug. +#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug. catch(...) { throw; @@ -217,7 +217,7 @@ IceProxy::Ice::Object::ice_isA(const string& __id, const Context& __context) { __handleException(__ex, __cnt); } -#if defined(_MSC_VER) && (_MSC_VER == 1201) && defined(_M_ARM) // EVC4 SP4 bug. +#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug. catch(...) { throw; @@ -260,7 +260,7 @@ IceProxy::Ice::Object::ice_ping(const Context& __context) { throw ::IceInternal::NonRepeatable(__ex); } -#if defined(_MSC_VER) && (_MSC_VER == 1201) && defined(_M_ARM) // EVC4 SP4 bug. +#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug. catch(...) { throw; @@ -276,7 +276,7 @@ IceProxy::Ice::Object::ice_ping(const Context& __context) { __handleException(__ex, __cnt); } -#if defined(_MSC_VER) && (_MSC_VER == 1201) && defined(_M_ARM) // EVC4 SP4 bug. +#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug. catch(...) { throw; @@ -322,7 +322,7 @@ IceProxy::Ice::Object::ice_ids(const Context& __context) { throw ::IceInternal::NonRepeatable(__ex); } -#if defined(_MSC_VER) && (_MSC_VER == 1201) && defined(_M_ARM) // EVC4 SP4 bug. +#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug. catch(...) { throw; @@ -338,7 +338,7 @@ IceProxy::Ice::Object::ice_ids(const Context& __context) { __handleException(__ex, __cnt); } -#if defined(_MSC_VER) && (_MSC_VER == 1201) && defined(_M_ARM) // EVC4 SP4 bug. +#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug. catch(...) { throw; @@ -384,7 +384,7 @@ IceProxy::Ice::Object::ice_id(const Context& __context) { throw ::IceInternal::NonRepeatable(__ex); } -#if defined(_MSC_VER) && (_MSC_VER == 1201) && defined(_M_ARM) // EVC4 SP4 bug. +#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug. catch(...) { throw; @@ -400,7 +400,7 @@ IceProxy::Ice::Object::ice_id(const Context& __context) { __handleException(__ex, __cnt); } -#if defined(_MSC_VER) && (_MSC_VER == 1201) && defined(_M_ARM) // EVC4 SP4 bug. +#if defined(_MSC_VER) && defined(_M_ARM) // ARM bug. catch(...) { throw; |