diff options
| author | gthaker <gthaker@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-10-30 20:41:47 +0000 |
|---|---|---|
| committer | gthaker <gthaker@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-10-30 20:41:47 +0000 |
| commit | 34cfcc25236282579d0220307462d69406b6120c (patch) | |
| tree | c5e060e3de02c021dd2c1c40e98532284051a9d4 | |
| parent | cd887b0bdee1cd8b0b5378a5f11822c65ab217b9 (diff) | |
| download | ATCD-34cfcc25236282579d0220307462d69406b6120c.tar.gz | |
ChangeLogTag: Thu Oct 30 20:30:00 UTC 2003 Gautam Thaker <gthaker@atl.lmco.com>
| -rw-r--r-- | TAO/ChangeLog | 14 | ||||
| -rw-r--r-- | TAO/tao/Strategies/SCIOP_Acceptor.cpp | 9 | ||||
| -rw-r--r-- | TAO/tao/Strategies/SCIOP_Acceptor.h | 9 | ||||
| -rw-r--r-- | TAO/tao/Strategies/SCIOP_Endpoint.cpp | 2 | ||||
| -rw-r--r-- | TAO/tao/Strategies/SCIOP_Lite_Factory.h | 4 |
5 files changed, 28 insertions, 10 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 648c0d0a407..84b07b6e535 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,17 @@ +Thu Oct 30 20:30:00 UTC 2003 Gautam Thaker <gthaker@atl.lmco.com> + + Please direct all queries regarding this commit to + Jason Cohen <jcohen@atl.lmco.com> + + * tao/Strategies/SCIOP_Acceptor.cpp: + * tao/Strategies/SCIOP_Acceptor.h: + * tao/Strategies/SCIOP_Endpoint.cpp: + * tao/Strategies/SCIOP_Lite_Factory.h: + + Moved include files which are suspected to have been + refactored upstream. The previous problems only affected + the SCTP enabled TAO build. + Thu Oct 30 13:50:50 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> * tao/DynamicInterface/DII_Invocation.cpp: diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.cpp b/TAO/tao/Strategies/SCIOP_Acceptor.cpp index 8db58669b5a..a726a502c50 100644 --- a/TAO/tao/Strategies/SCIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/SCIOP_Acceptor.cpp @@ -1,16 +1,17 @@ #include "SCIOP_Acceptor.h" +#include "SCIOP_Profile.h" #if TAO_HAS_SCIOP == 1 -#include "SCIOP_Profile.h" #include "tao/MProfile.h" -#include "tao/ORB_Core.h" -#include "tao/Server_Strategy_Factory.h" +/* //#include "tao/ORB_Core.h" */ +/* //#include "tao/Server_Strategy_Factory.h" */ #include "tao/debug.h" #include "tao/Protocols_Hooks.h" #include "tao/Codeset_Manager.h" +#include "tao/Transport.h" -#include "ace/Auto_Ptr.h" +/* //#include "ace/Auto_Ptr.h" */ #if !defined(__ACE_INLINE__) #include "SCIOP_Acceptor.i" diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.h b/TAO/tao/Strategies/SCIOP_Acceptor.h index 231d86732c3..e14232a231c 100644 --- a/TAO/tao/Strategies/SCIOP_Acceptor.h +++ b/TAO/tao/Strategies/SCIOP_Acceptor.h @@ -17,8 +17,9 @@ #ifndef TAO_SCIOP_ACCEPTOR_H #define TAO_SCIOP_ACCEPTOR_H #include /**/ "ace/pre.h" +#include "ace/Acceptor.h" -#include "tao/Transport_Acceptor.h" +#include "tao/orbconf.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -26,11 +27,11 @@ #if TAO_HAS_SCIOP == 1 +#include "ace/SOCK_SEQPACK_Acceptor.h" + +#include "tao/Transport_Acceptor.h" #include "SCIOP_Connection_Handler.h" #include "tao/Acceptor_Impl.h" - -#include "ace/Acceptor.h" -#include "ace/SOCK_SEQPACK_Acceptor.h" #include "tao/GIOP_Message_Version.h" // TAO SCIOP_Acceptor concrete call defination diff --git a/TAO/tao/Strategies/SCIOP_Endpoint.cpp b/TAO/tao/Strategies/SCIOP_Endpoint.cpp index 94e5c30c9bf..1141e590b8c 100644 --- a/TAO/tao/Strategies/SCIOP_Endpoint.cpp +++ b/TAO/tao/Strategies/SCIOP_Endpoint.cpp @@ -4,7 +4,7 @@ #include "tao/debug.h" #include "ace/Synch_T.h" -#include "tao/ORB_Endpoints.h" +#include "tao/ORB_Constants.h" ACE_RCSID (tao, IIOP_Endpoint, diff --git a/TAO/tao/Strategies/SCIOP_Lite_Factory.h b/TAO/tao/Strategies/SCIOP_Lite_Factory.h index 597929572fb..cdade7a16e9 100644 --- a/TAO/tao/Strategies/SCIOP_Lite_Factory.h +++ b/TAO/tao/Strategies/SCIOP_Lite_Factory.h @@ -15,7 +15,7 @@ #define TAO_SCIOP_LITE_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,8 @@ #include "strategies_export.h" #include "ace/Service_Config.h" +#include "tao/Protocol_Factory.h" + class TAO_Acceptor; class TAO_Connector; |