summaryrefslogtreecommitdiff
path: root/TAO/tao/PortableServer/RTPortableServerC.h
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao/PortableServer/RTPortableServerC.h')
-rw-r--r--TAO/tao/PortableServer/RTPortableServerC.h39
1 files changed, 21 insertions, 18 deletions
diff --git a/TAO/tao/PortableServer/RTPortableServerC.h b/TAO/tao/PortableServer/RTPortableServerC.h
index a7302fe4d3c..a7c2c357441 100644
--- a/TAO/tao/PortableServer/RTPortableServerC.h
+++ b/TAO/tao/PortableServer/RTPortableServerC.h
@@ -23,13 +23,14 @@
#define _TAO_IDL_RTPORTABLESERVERC_H_
#include "ace/pre.h"
-#include "tao/corba.h"
+#include "PortableServerC.h"
+
+#if (TAO_HAS_RT_CORBA == 1)
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "PortableServerC.h"
#include "tao/RTCORBAC.h"
#if defined (TAO_EXPORT_MACRO)
@@ -63,7 +64,7 @@ TAO_NAMESPACE RTPortableServer
class POA;
typedef POA *POA_ptr;
-
+
#endif /* end #if !defined */
@@ -74,23 +75,23 @@ TAO_NAMESPACE RTPortableServer
{
public:
POA_var (void); // default constructor
- POA_var (POA_ptr p) : ptr_ (p) {}
+ POA_var (POA_ptr p) : ptr_ (p) {}
POA_var (const POA_var &); // copy constructor
~POA_var (void); // destructor
-
+
POA_var &operator= (POA_ptr);
POA_var &operator= (const POA_var &);
POA_ptr operator-> (void) const;
-
+
operator const POA_ptr &() const;
operator POA_ptr &();
- // in, inout, out, _retn
+ // in, inout, out, _retn
POA_ptr in (void) const;
POA_ptr &inout (void);
POA_ptr &out (void);
POA_ptr _retn (void);
POA_ptr ptr (void) const;
-
+
// Hooks used by template sequence and object manager classes
// for non-defined forward declared interfaces.
static POA_ptr duplicate (POA_ptr);
@@ -98,7 +99,7 @@ TAO_NAMESPACE RTPortableServer
static POA_ptr nil (void);
static POA_ptr narrow (CORBA::Object *, CORBA::Environment &);
static CORBA::Object * upcast (void *);
-
+
private:
POA_ptr ptr_;
// Unimplemented - prevents widening assignment.
@@ -125,7 +126,7 @@ TAO_NAMESPACE RTPortableServer
operator POA_ptr &();
POA_ptr &ptr (void);
POA_ptr operator-> (void);
-
+
private:
POA_ptr &ptr_;
};
@@ -149,12 +150,12 @@ TAO_NAMESPACE RTPortableServer
static POA_ptr _duplicate (POA_ptr obj);
static POA_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static POA_ptr _unchecked_narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static POA_ptr _nil (void)
@@ -165,7 +166,7 @@ TAO_NAMESPACE RTPortableServer
virtual CORBA::Object_ptr create_reference_with_priority (
const char * intf,
RTCORBA::Priority priority,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -177,7 +178,7 @@ TAO_NAMESPACE RTPortableServer
const PortableServer::ObjectId & oid,
const char * intf,
RTCORBA::Priority priority,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -188,7 +189,7 @@ TAO_NAMESPACE RTPortableServer
virtual PortableServer::ObjectId * activate_object_with_priority (
PortableServer::Servant p_servant,
RTCORBA::Priority priority,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -201,7 +202,7 @@ TAO_NAMESPACE RTPortableServer
const PortableServer::ObjectId & oid,
PortableServer::Servant p_servant,
RTCORBA::Priority priority,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -212,12 +213,12 @@ TAO_NAMESPACE RTPortableServer
)) = 0;
virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+
virtual const char* _interface_repository_id (void) const;
protected:
POA ();
-
+
virtual ~POA (void);
private:
POA (const POA &);
@@ -250,5 +251,7 @@ TAO_NAMESPACE_CLOSE // module RTPortableServer
#pragma option pop
#endif /* __BORLANDC__ */
+#endif /* TAO_HAS_RT_CORBA */
+
#include "ace/post.h"
#endif /* ifndef */