1 files changed, 24 insertions, 22 deletions

diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.h b/TAO/tao/RTPortableServer/RTPortableServerC.h
index aed88a4420f..3db70339310 100644
--- a/TAO/tao/RTPortableServer/RTPortableServerC.h
+++ b/TAO/tao/RTPortableServer/RTPortableServerC.h
@@ -30,7 +30,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/RTCORBA/RTCORBA.h"
+#define TAO_RTCORBA_SAFE_INCLUDE
+#include "tao/RTCORBA/RTCORBAC.h"
+#undef TAO_RTCORBA_SAFE_INCLUDE
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -63,7 +65,7 @@ TAO_NAMESPACE  RTPortableServer
 
   class POA;
   typedef POA *POA_ptr;
-  
+
 #endif /* end #if !defined */
 
 
@@ -74,31 +76,31 @@ 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 tao_duplicate (POA_ptr);
-    static void tao_release (POA_ptr);
-    static POA_ptr tao_nil (void);
-    static POA_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
-    static CORBA::Object * tao_upcast (void *);
-  
+    static POA_ptr duplicate (POA_ptr);
+    static void release (POA_ptr);
+    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 +127,7 @@ TAO_NAMESPACE  RTPortableServer
     operator POA_ptr &();
     POA_ptr &ptr (void);
     POA_ptr operator-> (void);
-  
+
   private:
     POA_ptr &ptr_;
   };
@@ -151,12 +153,12 @@ class TAO_RTPortableServer_Export POA: public virtual PortableServer::POA
     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)
@@ -167,7 +169,7 @@ class TAO_RTPortableServer_Export POA: public virtual PortableServer::POA
     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 ((
@@ -179,7 +181,7 @@ class TAO_RTPortableServer_Export POA: public virtual PortableServer::POA
         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 ((
@@ -190,7 +192,7 @@ class TAO_RTPortableServer_Export POA: public virtual PortableServer::POA
     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 ((
@@ -203,7 +205,7 @@ class TAO_RTPortableServer_Export POA: public virtual PortableServer::POA
         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 ((
@@ -214,12 +216,12 @@ class TAO_RTPortableServer_Export POA: public virtual PortableServer::POA
       )) = 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 &);