ChangeLogTag: Wed Aug 18 08:32:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>

3 files changed, 11 insertions, 11 deletions

diff --git a/TAO/tao/PortableServer/ObjectReferenceTemplate_Adapter.h b/TAO/tao/PortableServer/ObjectReferenceTemplate_Adapter.h
index dda8c24f0bb..0724dfcd88d 100755
--- a/TAO/tao/PortableServer/ObjectReferenceTemplate_Adapter.h
+++ b/TAO/tao/PortableServer/ObjectReferenceTemplate_Adapter.h
@@ -13,6 +13,7 @@
 #define TAO_OBJECTREFERENCETEMPLATE_ADAPTER_H
 
 #include /**/ "ace/pre.h"
+#include "ace/Array_Base.h"
 #include "ace/Service_Object.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -36,7 +37,6 @@ namespace PortableInterceptor
 {
   class ObjectReferenceTemplate;
   class ObjectReferenceFactory;
-
 }
 
 /**
@@ -76,10 +76,10 @@ public:
   virtual void poa (TAO_POA * poa) = 0;
 
   /// Accessor methods to ObjectReferenceTemplate template
-  virtual PortableInterceptor::ObjectReferenceTemplate * get_adapter_template (void) = 0;
+  virtual PortableInterceptor::ObjectReferenceTemplate *get_adapter_template (void) = 0;
 
   /// Accessor methods to PortableInterceptor::ObjectReferenceFactory
-  virtual PortableInterceptor::ObjectReferenceFactory * get_obj_ref_factory (void) = 0;
+  virtual PortableInterceptor::ObjectReferenceFactory *get_obj_ref_factory (void) = 0;
 
   /**
    * @name PortableInterceptor::ObjectReferenceFactory Methods
@@ -98,5 +98,8 @@ public:
   //@}
 };
 
+typedef
+ACE_Array_Base<PortableInterceptor::ObjectReferenceTemplate*> TAO_ObjectReferenceTemplate_Array;
+
 #include /**/ "ace/post.h"
 #endif /* TAO_OBJECTREFERENCETEMPLATE_ADAPTER_H */
diff --git a/TAO/tao/PortableServer/ObjectReferenceTemplate_Adapter_Factory.h b/TAO/tao/PortableServer/ObjectReferenceTemplate_Adapter_Factory.h
index 0543518a385..17048f4c9ba 100644
--- a/TAO/tao/PortableServer/ObjectReferenceTemplate_Adapter_Factory.h
+++ b/TAO/tao/PortableServer/ObjectReferenceTemplate_Adapter_Factory.h
@@ -33,7 +33,7 @@ class TAO_ObjectReferenceTemplate_Adapter;
  * @brief TAO_ObjectReferenceTemplate_Adapter_Factory.
  *
  * Class that creates one instance of TAO_ObjectReferenceTemplate_Adapter per
- * POA on the POA's first usage of its objectreferencetemplate_adapter_.
+ * POA on the POA's first usage of its objectreferencetemplate_adapter.
  * This is a base class for the actual implementation in the
  * TAO_ObjectReferenceTemplate library.
  */
diff --git a/TAO/tao/PortableServer/POA.h b/TAO/tao/PortableServer/POA.h
index 89c893ff58e..9d45d1db9a1 100644
--- a/TAO/tao/PortableServer/POA.h
+++ b/TAO/tao/PortableServer/POA.h
@@ -56,6 +56,8 @@
 // OctetSeq
 #include "tao/OctetSeqC.h"
 
+#include "tao/PortableServer/ObjectReferenceTemplate_Adapter.h"
+
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
 #if defined(_MSC_VER)
@@ -131,13 +133,8 @@ protected:
 class ServerObject_i;
 class TAO_Acceptor_Filter;
 class TAO_Acceptor_Registry;
-class TAO_ObjectReferenceTemplate_Adapter;
 class TAO_ObjectReferenceTemplate_Adapter_Factory;
 
-typedef
-ACE_Array_Base<PortableInterceptor::ObjectReferenceTemplate*> TAO_ObjectReferenceTemplate_Array;
-
-
 namespace PortableInterceptor
 {
   class IORInfo;
@@ -274,10 +271,10 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Accessor methods to ObjectReferenceTemplate
-  PortableInterceptor::ObjectReferenceTemplate * get_adapter_template (void);
+  PortableInterceptor::ObjectReferenceTemplate *get_adapter_template (void);
 
   /// Accessor methods to PortableInterceptor::ObjectReferenceFactory
-  PortableInterceptor::ObjectReferenceFactory * get_obj_ref_factory (void);
+  PortableInterceptor::ObjectReferenceFactory *get_obj_ref_factory (void);
 
   /// Set the object reference factory
   void set_obj_ref_factory (