diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2006-02-20 19:07:12 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2006-02-20 19:07:12 +0000 |
| commit | 99a1e439a69d09563d10cf9f098214636fd1c714 (patch) | |
| tree | 8912fc8fa3208aa8f39f4b98f5105af56f01bc2a /cppe/include | |
| parent | Changes for VS2005 support (diff) | |
| download | ice-99a1e439a69d09563d10cf9f098214636fd1c714.tar.bz2 ice-99a1e439a69d09563d10cf9f098214636fd1c714.tar.xz ice-99a1e439a69d09563d10cf9f098214636fd1c714.zip | |
- Socket timeout fixes.
- Removed unused code for collocation optimization.
Diffstat (limited to 'cppe/include')
| -rw-r--r-- | cppe/include/IceE/Config.h | 10 | ||||
| -rwxr-xr-x | cppe/include/IceE/ObjectAdapter.h | 2 |
2 files changed, 10 insertions, 2 deletions
diff --git a/cppe/include/IceE/Config.h b/cppe/include/IceE/Config.h index 1831da8312d..5452199f420 100644 --- a/cppe/include/IceE/Config.h +++ b/cppe/include/IceE/Config.h @@ -38,6 +38,7 @@ // //#define ICEE_PURE_BLOCKING_CLIENT + // *********************************************************************** // // User should not change anything below this line! @@ -67,6 +68,15 @@ #endif // +// On Windows CE, socket timeouts (SO_SNDTIMEO and SO_RCVTIMEO) are +// not supported so we use select()/WSAEventSelect to implement +// timeouts. +// +#if defined(_WIN32_WCE) +# define ICE_USE_SELECT_FOR_TIMEOUTS +#endif + +// // Only supported/needed with VC6; Totally undocumented! And if you // set it lower than 512 bytes, the program crashes. Either leave at // 0x200 or 0x1000 diff --git a/cppe/include/IceE/ObjectAdapter.h b/cppe/include/IceE/ObjectAdapter.h index 6ab7bde48e4..f598d9cc5ff 100755 --- a/cppe/include/IceE/ObjectAdapter.h +++ b/cppe/include/IceE/ObjectAdapter.h @@ -82,8 +82,6 @@ public: void setLocator(const LocatorPrx&);
#endif
- bool isLocal(const ObjectPrx&) const;
-
void flushBatchRequests();
void incDirectCount();
|