diff options
| author | bala <bala@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-10-29 18:17:22 +0000 |
|---|---|---|
| committer | bala <bala@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-10-29 18:17:22 +0000 |
| commit | 1aaf41e3851a8d8a207cafee966ce8ad87e86252 (patch) | |
| tree | 33fe73b95d42550ab683849b93b060c020a77134 /TAO/tao | |
| parent | b00ad48f20767a534631d0dcba42df6d43f28c01 (diff) | |
| download | ATCD-1aaf41e3851a8d8a207cafee966ce8ad87e86252.tar.gz | |
ChangeLogTag:Wed Oct 29 12:15:35 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
Diffstat (limited to 'TAO/tao')
| -rw-r--r-- | TAO/tao/IIOP_Transport.cpp | 1 | ||||
| -rw-r--r-- | TAO/tao/Strategies/SCIOP_Endpoint.cpp | 6 | ||||
| -rw-r--r-- | TAO/tao/Strategies/SCIOP_Endpoint.h | 4 | ||||
| -rw-r--r-- | TAO/tao/Strategies/SCIOP_Factory.h | 3 | ||||
| -rw-r--r-- | TAO/tao/Strategies/SCIOP_Transport.cpp | 7 |
5 files changed, 14 insertions, 7 deletions
diff --git a/TAO/tao/IIOP_Transport.cpp b/TAO/tao/IIOP_Transport.cpp index 1a416444694..c193bc8b5d4 100644 --- a/TAO/tao/IIOP_Transport.cpp +++ b/TAO/tao/IIOP_Transport.cpp @@ -6,6 +6,7 @@ #include "Wait_Strategy.h" #include "debug.h" #include "GIOP_Message_Base.h" +// #include "GIOP_Message_Lite.h" #include "Protocols_Hooks.h" #if !defined (__ACE_INLINE__) diff --git a/TAO/tao/Strategies/SCIOP_Endpoint.cpp b/TAO/tao/Strategies/SCIOP_Endpoint.cpp index 5362851a0e8..94e5c30c9bf 100644 --- a/TAO/tao/Strategies/SCIOP_Endpoint.cpp +++ b/TAO/tao/Strategies/SCIOP_Endpoint.cpp @@ -1,9 +1,11 @@ #include "SCIOP_Endpoint.h" -#include "tao/debug.h" -#include "ace/Synch_T.h" #if TAO_HAS_SCIOP == 1 +#include "tao/debug.h" +#include "ace/Synch_T.h" +#include "tao/ORB_Endpoints.h" + ACE_RCSID (tao, IIOP_Endpoint, "$Id$") diff --git a/TAO/tao/Strategies/SCIOP_Endpoint.h b/TAO/tao/Strategies/SCIOP_Endpoint.h index d312b772500..d664dcfdd81 100644 --- a/TAO/tao/Strategies/SCIOP_Endpoint.h +++ b/TAO/tao/Strategies/SCIOP_Endpoint.h @@ -19,14 +19,14 @@ #include /**/ "ace/pre.h" -#include "tao/Endpoint.h" +#include "tao/orbconf.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #if TAO_HAS_SCIOP == 1 - +#include "tao/Endpoint.h" #include "strategies_export.h" #include "tao/CORBA_String.h" #include "ace/INET_Addr.h" diff --git a/TAO/tao/Strategies/SCIOP_Factory.h b/TAO/tao/Strategies/SCIOP_Factory.h index a5753ac045c..7b4a30aab29 100644 --- a/TAO/tao/Strategies/SCIOP_Factory.h +++ b/TAO/tao/Strategies/SCIOP_Factory.h @@ -15,7 +15,7 @@ #define TAO_SCIOP_FACTORY_H #include /**/ "ace/pre.h" -#include "tao/Protocol_Factory.h" +#include "tao/orbconf.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -25,6 +25,7 @@ #include "strategies_export.h" #include "ace/Service_Config.h" +#include "tao/Protocol_Factory.h" class TAO_Acceptor; class TAO_Connector; diff --git a/TAO/tao/Strategies/SCIOP_Transport.cpp b/TAO/tao/Strategies/SCIOP_Transport.cpp index d29f71344f9..c888ec4e1d1 100644 --- a/TAO/tao/Strategies/SCIOP_Transport.cpp +++ b/TAO/tao/Strategies/SCIOP_Transport.cpp @@ -19,7 +19,7 @@ #include "tao/ORB_Core.h" #include "tao/debug.h" #include "tao/GIOP_Message_Base.h" -#include "tao/GIOP_Message_Lite.h" +// #include "tao/GIOP_Message_Lite.h" #include "tao/Protocols_Hooks.h" #include "tao/Adapter.h" @@ -35,12 +35,14 @@ ACE_RCSID (tao, TAO_SCIOP_Transport::TAO_SCIOP_Transport (TAO_SCIOP_Connection_Handler *handler, TAO_ORB_Core *orb_core, - CORBA::Boolean flag) + CORBA::Boolean ) : TAO_Transport (TAO_TAG_SCIOP_PROFILE, orb_core) , connection_handler_ (handler) , messaging_object_ (0) { +#if 0 + // First step in deprecating this. if (flag) { // Use the lite version of the protocol @@ -48,6 +50,7 @@ TAO_SCIOP_Transport::TAO_SCIOP_Transport (TAO_SCIOP_Connection_Handler *handler, TAO_GIOP_Message_Lite (orb_core)); } else +#endif /*if 0*/ { // Use the normal GIOP object ACE_NEW (this->messaging_object_, |