diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-03-12 16:18:58 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-03-12 16:18:58 +0000 |
| commit | 311d9d74b593b8b8856151e3e1358df3f00feb0f (patch) | |
| tree | bf1c5cdcd20e3d61ed9d590adfaef8b5fce061df /TAO/tao/ORB.h | |
| parent | f5bacbe21762d818bb4e4f70961040e26061e840 (diff) | |
| download | ATCD-311d9d74b593b8b8856151e3e1358df3f00feb0f.tar.gz | |
ChangeLogTag: Wed Mar 12 09:49:00 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
Diffstat (limited to 'TAO/tao/ORB.h')
| -rw-r--r-- | TAO/tao/ORB.h | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h index f9b1e992ac7..7f80cd78514 100644 --- a/TAO/tao/ORB.h +++ b/TAO/tao/ORB.h @@ -25,8 +25,9 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "Exception.h" -#include "Services.h" +#include "ServicesC.h" #include "CORBA_String.h" +#include "ObjectIdListC.h" #include "objectid.h" // IRIX needs this for the throw specs @@ -60,6 +61,11 @@ class TAO_ValueFactory_Map; namespace CORBA { + class EnumMemberSeq; + class StructMemberSeq; + class UnionMemberSeq; + class ValueMemberSeq; + class ORB_ObjectIdList; class ORB_ObjectIdList_var; class ORB_ObjectIdList_out; @@ -407,8 +413,9 @@ namespace CORBA void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA::Object_ptr resolve_initial_references ( - const char *name - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + const char *name + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); /** * This method acts as a mini-bootstrapping Naming Service, which is @@ -498,11 +505,10 @@ namespace CORBA /// Factory method that creates an ORB. static CORBA::ORB_ptr _tao_make_ORB (TAO_ORB_Core * orb_core); -#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8 // Useful for template programming. typedef ORB_ptr _ptr_type; typedef ORB_var _var_type; -#endif /* __GNUC__ */ + /// Get the Timeout value ACE_Time_Value *get_timeout (void); @@ -614,7 +620,6 @@ namespace CORBA private: CORBA::ORB_ptr ptr_; - }; /** @@ -640,7 +645,6 @@ namespace CORBA private: CORBA::ORB_ptr &ptr_; }; - } // End namespace CORBA #if defined (__ACE_INLINE__) |