diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2003-11-04 22:37:22 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2003-11-04 22:37:22 +0000 |
| commit | 04c880f9f380c17803f2aa4352cacca08b9d16ae (patch) | |
| tree | a4eba1495a945d707f156facaf7239e72cf33b28 /TAO/CIAO | |
| parent | 6e02ba45bab4555be32e3d4a04b3cf0176e83a37 (diff) | |
| download | ATCD-04c880f9f380c17803f2aa4352cacca08b9d16ae.tar.gz | |
ChangeLogTag:
Diffstat (limited to 'TAO/CIAO')
| -rw-r--r-- | TAO/CIAO/ChangeLog | 9 | ||||
| -rw-r--r-- | TAO/CIAO/ciao/Active_Objref_Map.h | 5 | ||||
| -rw-r--r-- | TAO/CIAO/ciao/Client_init.h | 7 | ||||
| -rw-r--r-- | TAO/CIAO/ciao/Object_Set_T.h | 2 | ||||
| -rw-r--r-- | TAO/CIAO/ciao/Server_init.h | 7 |
5 files changed, 25 insertions, 5 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index 163a0af83f7..5fa31a299ec 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1,3 +1,12 @@ +Tue Nov 4 16:34:45 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * ciao/Active_Objref_Map.h: + * ciao/Client_init.h: + * ciao/Object_Set_T.h: + * ciao/Server_init.h: + + Added new includes that are needed to get them compiling. + Wed Oct 29 16:39:48 2003 Jeff Parsons <j.parsons@vanderbilt.edu> * CIDLC/ServantSourceGenerator.cpp: diff --git a/TAO/CIAO/ciao/Active_Objref_Map.h b/TAO/CIAO/ciao/Active_Objref_Map.h index 34a3e7e708d..15a366f0969 100644 --- a/TAO/CIAO/ciao/Active_Objref_Map.h +++ b/TAO/CIAO/ciao/Active_Objref_Map.h @@ -17,13 +17,14 @@ #include /**/ "ace/pre.h" #include "ace/Active_Map_manager_T.h" -#include "ciao/CIAO_Container_Export.h" -#include "tao/corbafwd.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ciao/CIAO_Container_Export.h" +#include "tao/Object.h" + namespace CIAO { typedef ACE_Active_Map_Manager<CORBA::Object_var> Active_Objref_Map; diff --git a/TAO/CIAO/ciao/Client_init.h b/TAO/CIAO/ciao/Client_init.h index 545e2613604..065c1f2a280 100644 --- a/TAO/CIAO/ciao/Client_init.h +++ b/TAO/CIAO/ciao/Client_init.h @@ -12,13 +12,18 @@ #define CIAO_CLIENT_INIT_H #include /**/ "ace/pre.h" -#include "tao/corbafwd.h" #include "CIAO_Client_Export.h" #if !defined ACE_LACKS_PRAGMA_ONCE #pragma once #endif /* ! ACE_LACKS_PRAGMA_ONCE */ +namespace CORBA +{ + class ORB; + typedef ORB *ORB_ptr; +} + namespace CIAO { /** diff --git a/TAO/CIAO/ciao/Object_Set_T.h b/TAO/CIAO/ciao/Object_Set_T.h index 403930371a4..d5421dd442d 100644 --- a/TAO/CIAO/ciao/Object_Set_T.h +++ b/TAO/CIAO/ciao/Object_Set_T.h @@ -13,7 +13,7 @@ #define CIAO_OBJECT_SET_T_H #include /**/ "ace/pre.h" -#include "tao/corbafwd.h" +#include "tao/ORB_Constants.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/CIAO/ciao/Server_init.h b/TAO/CIAO/ciao/Server_init.h index 86fb2493033..d2cbfcc04f5 100644 --- a/TAO/CIAO/ciao/Server_init.h +++ b/TAO/CIAO/ciao/Server_init.h @@ -13,13 +13,18 @@ #define CIAO_SERVER_INIT_H #include /**/ "ace/pre.h" -#include "tao/corbafwd.h" #include "CIAO_Server_Export.h" #if !defined ACE_LACKS_PRAGMA_ONCE #pragma once #endif /* ! ACE_LACKS_PRAGMA_ONCE */ +namespace CORBA +{ + class ORB; + typedef ORB *ORB_ptr; +} + namespace CIAO { /** |