ChangeLogTag:Wed May 18 16:23:01 2005 Ossama Othman <ossama@dre.vanderbilt.edu>

6 files changed, 13 insertions, 18 deletions

diff --git a/TAO/tao/ObjRefTemplate/Default_ORTC.cpp b/TAO/tao/ObjRefTemplate/Default_ORTC.cpp
index d94d059670b..f44925afb77 100644
--- a/TAO/tao/ObjRefTemplate/Default_ORTC.cpp
+++ b/TAO/tao/ObjRefTemplate/Default_ORTC.cpp
@@ -97,6 +97,9 @@ TAO_Default_ORT::ObjectReferenceTemplate::_tao_any_destructor (void *_tao_void_p
   CORBA::remove_ref (_tao_tmp_pointer);
 }
 
+TAO_Default_ORT::ObjectReferenceTemplate::~ObjectReferenceTemplate (void)
+{}
+
 CORBA::Boolean TAO_Default_ORT::ObjectReferenceTemplate::_tao_marshal_v (TAO_OutputCDR & strm) const
 {
   return this->_tao_marshal__TAO_Default_ORT_ObjectReferenceTemplate (strm);
diff --git a/TAO/tao/ObjRefTemplate/Default_ORTC.inl b/TAO/tao/ObjRefTemplate/Default_ORTC.inl
index 2b7e7fb7098..990533dd1e9 100644
--- a/TAO/tao/ObjRefTemplate/Default_ORTC.inl
+++ b/TAO/tao/ObjRefTemplate/Default_ORTC.inl
@@ -33,10 +33,6 @@ ACE_INLINE
 TAO_Default_ORT::ObjectReferenceTemplate::ObjectReferenceTemplate (void)
 {}
 
-ACE_INLINE
-TAO_Default_ORT::ObjectReferenceTemplate::~ObjectReferenceTemplate (void)
-{}
-
 ACE_INLINE const char* 
 TAO_Default_ORT::ObjectReferenceTemplate::_tao_obv_static_repository_id ()
 {
diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp b/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp
index c2de1429fdd..5ca97d9d64b 100644
--- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp
+++ b/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp
@@ -34,8 +34,7 @@ namespace TAO
     TAO_Root_POA::ort_adapter_factory_name ("Concrete_ORT_Adapter_Factory"
       );
 
-    return
-      ACE_Service_Config::process_directive (
+    return ACE_Service_Config::process_directive (
           ace_svc_desc_ORT_Adapter_Factory_Impl
         );
   }
diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h b/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h
index a13ce37a4c8..765ff32d331 100644
--- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h
+++ b/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h
@@ -61,11 +61,10 @@ static TAO_Module_Initializer
   TAO_Requires_ORTFactory_Initializer =
     &TAO::ORT_Adapter_Factory_Impl::Initializer;
 
-  #else
+#else
 
-  static int
-  TAO_Requires_ORTFactory_Initializer =
-    TAO::ORT_Adapter_Factory_Impl::Initializer ();
+static int TAO_Requires_ORTFactory_Initializer =
+  TAO::ORT_Adapter_Factory_Impl::Initializer ();
 
 #endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
 
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp
index 16cd912fcba..3c6be414aa1 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp
@@ -122,6 +122,9 @@ PortableInterceptor::ObjectReferenceFactory::_tao_any_destructor (void *_tao_voi
   CORBA::remove_ref (_tao_tmp_pointer);
 }
 
+PortableInterceptor::ObjectReferenceFactory::~ObjectReferenceFactory (void)
+{}
+
 CORBA::Boolean PortableInterceptor::ObjectReferenceFactory::_tao_unmarshal (
     TAO_InputCDR &strm,
     ObjectReferenceFactory *&new_object
@@ -212,6 +215,9 @@ PortableInterceptor::ObjectReferenceTemplate::_tao_any_destructor (void *_tao_vo
   CORBA::remove_ref (_tao_tmp_pointer);
 }
 
+PortableInterceptor::ObjectReferenceTemplate::~ObjectReferenceTemplate (void)
+{}
+
 CORBA::Boolean PortableInterceptor::ObjectReferenceTemplate::_tao_unmarshal (
     TAO_InputCDR &strm,
     ObjectReferenceTemplate *&new_object
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.inl b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.inl
index c900a647347..18ca86135e7 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.inl
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.inl
@@ -33,10 +33,6 @@ ACE_INLINE
 PortableInterceptor::ObjectReferenceFactory::ObjectReferenceFactory (void)
 {}
 
-ACE_INLINE
-PortableInterceptor::ObjectReferenceFactory::~ObjectReferenceFactory (void)
-{}
-
 ACE_INLINE const char* 
 PortableInterceptor::ObjectReferenceFactory::_tao_obv_static_repository_id ()
 {
@@ -50,10 +46,6 @@ ACE_INLINE
 PortableInterceptor::ObjectReferenceTemplate::ObjectReferenceTemplate (void)
 {}
 
-ACE_INLINE
-PortableInterceptor::ObjectReferenceTemplate::~ObjectReferenceTemplate (void)
-{}
-
 ACE_INLINE const char* 
 PortableInterceptor::ObjectReferenceTemplate::_tao_obv_static_repository_id ()
 {