1 files changed, 19 insertions, 23 deletions
diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h
index 9fc3181c25b..93f624821e0 100644
--- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h
+++ b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h
@@ -27,9 +27,7 @@
 #include "tao/ObjRefTemplate/ObjectReferenceTemplate_i.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -44,7 +42,9 @@ namespace TAO
     : public ORT_Adapter
   {
   public:
-    ORT_Adapter_Impl (void);
+
+    /// Destructor
+    virtual ~ORT_Adapter_Impl (void);
 
     /// Activate this adapter
     virtual int activate (const char *server_id,
@@ -53,17 +53,22 @@ namespace TAO
                           PortableServer::POA_ptr poa
                           ACE_ENV_ARG_DECL);
 
-    /// Set a different ort_factory to be used.
-    virtual int set_obj_ref_factory (
-      PortableInterceptor::ObjectReferenceFactory *current_factory
-      ACE_ENV_ARG_DECL);
-
     /// Accessor methods to ObjectReferenceTemplate template
     virtual PortableInterceptor::ObjectReferenceTemplate *get_adapter_template (void);
 
     /// Accessor methods to PortableInterceptor::ObjectReferenceFactory
     virtual PortableInterceptor::ObjectReferenceFactory * get_obj_ref_factory (void);
 
+    /// Set a different ort_factory to be used.
+    virtual int set_obj_ref_factory (
+      PortableInterceptor::ObjectReferenceFactory * current_factory
+      ACE_ENV_ARG_DECL);
+
+    /**
+     * @see @c TAO::ORT_Adapter for details.
+     */
+    virtual void release (PortableInterceptor::ObjectReferenceTemplate * ort);
+
     /**
      * @name Adapter methods for PortableInterceptor::ObjectReferenceTemplate
      * Methods
@@ -94,29 +99,20 @@ namespace TAO
     ACE_THROW_SPEC ((CORBA::SystemException));
     //@}
 
-  protected:
-
-    /// Destructor
-    /**
-     * Protected destructor to enforce proper memory management via
-     * reference counting.
-     */
-    virtual ~ORT_Adapter_Impl (void);
-
   private:
-    /// The ORT Template, this is the factory and its identify
+
+    /// The ORT Template, this is the factory and its identity.
     PortableInterceptor::ObjectReferenceTemplate_var ort_template_;
 
-    /// The ORT Factory
+    /// The ORT Factory.
     PortableInterceptor::ObjectReferenceFactory_var ort_factory_;
 
-    /// TAO specific ORT Template
-    ObjectReferenceTemplate* tao_ort_template_;
   };
 
 }
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-#pragma warning(pop)
+
+#if defined(_MSC_VER)
+# pragma warning(pop)
 #endif /* _MSC_VER */
 
 #include /**/ "ace/post.h"