diff options
Diffstat (limited to 'TAO/tao/params.h')
| -rw-r--r-- | TAO/tao/params.h | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/TAO/tao/params.h b/TAO/tao/params.h index 3d5d51ff3ef..ef7593e3ab3 100644 --- a/TAO/tao/params.h +++ b/TAO/tao/params.h @@ -24,10 +24,8 @@ #include "ace/SString.h" -#include "tao/objectid.h" -#include "tao/CORBA_String.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "objectid.h" +#include "CORBA_String.h" // Forward decls. @@ -40,6 +38,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL typedef ACE_Unbounded_Queue<ACE_CString> TAO_EndpointSet; typedef ACE_Unbounded_Queue_Const_Iterator<ACE_CString> TAO_EndpointSetIterator; + // ------------------------------------------------------------------- /** @@ -85,10 +84,6 @@ public: int nodelay (void) const; void nodelay (int); - /// Set/Get whether we should set SO_KEEPALIVE on the socket or not. - int sock_keepalive (void); - void sock_keepalive (int); - /** * Octet sequences are marshalled without doing any copies, we * simply append a block to the CDR message block chain. When the @@ -231,9 +226,6 @@ private: /// 1 if we're using TCP_NODELAY and 0 otherwise. int nodelay_; - /// 1 if we're using SO_KEEPALIV and 0 otherwise (default 0). - int sock_keepalive_; - /// Control the strategy for copying vs. appeding octet sequences in /// CDR streams. int cdr_memcpy_tradeoff_; @@ -321,8 +313,6 @@ private: bool negotiate_codesets_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) # include "tao/params.i" #endif /* __ACE_INLINE__ */ |