ChangeLogTag: Fri Dec 23 09:56:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

8 files changed, 6 insertions, 53 deletions

diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Details.cpp b/TAO/tao/IORInterceptor/IORInterceptor_Details.cpp
index 90fcd105861..c619ca9039f 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Details.cpp
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Details.cpp
@@ -1,10 +1,6 @@
 #include "IORInterceptor_Details.h"
 
-#if !defined (__ACE_INLINE__)
-#include "IORInterceptor_Details.inl"
-#endif /* defined INLINE */
-
-ACE_RCSID (PI,
+ACE_RCSID (IORInterceptor,
            IORInterceptor_Details,
            "$Id$")
 
@@ -16,11 +12,10 @@ namespace TAO
 {
   void
   IORInterceptor_Details::apply_policies (
-      const CORBA::PolicyList &policies
+      const CORBA::PolicyList &/*policies*/
       ACE_ENV_ARG_DECL)
   {
     // There are currently no policies that apply to IOR Interceptors.
-    ACE_UNUSED_ARG (policies);
     ACE_THROW (CORBA::INV_POLICY ());
   }
 }
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Details.h b/TAO/tao/IORInterceptor/IORInterceptor_Details.h
index f9587e88693..cb6849f8cce 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Details.h
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Details.h
@@ -51,10 +51,6 @@ namespace TAO
   class IORInterceptor_Details
   {
   public:
-
-    IORInterceptor_Details (void);
-    ~IORInterceptor_Details (void);
-
     void apply_policies (const CORBA::PolicyList& policies
                          ACE_ENV_ARG_DECL);
   };
@@ -62,10 +58,6 @@ namespace TAO
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (__ACE_INLINE__)
-#include "IORInterceptor_Details.inl"
-#endif  /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_IOR_INTERCEPTOR_DETAILS_H */
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Details.inl b/TAO/tao/IORInterceptor/IORInterceptor_Details.inl
deleted file mode 100644
index a82589f3410..00000000000
--- a/TAO/tao/IORInterceptor/IORInterceptor_Details.inl
+++ /dev/null
@@ -1,20 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-  ACE_INLINE
-  IORInterceptor_Details::IORInterceptor_Details (void)
-  {
-  }
-
-  ACE_INLINE
-  IORInterceptor_Details::~IORInterceptor_Details (void)
-  {
-  }
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am
index 632c539c7f1..66b91924037 100644
--- a/TAO/tao/Makefile.am
+++ b/TAO/tao/Makefile.am
@@ -2343,7 +2343,6 @@ nobase_include_HEADERS += \
   IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h \
   IORInterceptor/IORInterceptor_Adapter_Impl.h \
   IORInterceptor/IORInterceptor_Details.h \
-  IORInterceptor/IORInterceptor_Details.inl \
   IORInterceptor/iorinterceptor_export.h
 
 pkgconfig_DATA += \
diff --git a/TAO/tao/PI/ClientRequestDetails.h b/TAO/tao/PI/ClientRequestDetails.h
index 59c551f8b93..b8623c26662 100644
--- a/TAO/tao/PI/ClientRequestDetails.h
+++ b/TAO/tao/PI/ClientRequestDetails.h
@@ -22,12 +22,12 @@
 
 #include /**/ "ace/pre.h"
 
+#include "tao/orbconf.h"
+
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/orbconf.h"
-
 #if TAO_HAS_INTERCEPTORS == 1
 
 #include "ProcessingModePolicyC.h"
@@ -53,7 +53,6 @@ namespace TAO
   public:
 
     ClientRequestDetails (void);
-    ~ClientRequestDetails (void);
 
     void apply_policies (const CORBA::PolicyList& policies
                          ACE_ENV_ARG_DECL);
diff --git a/TAO/tao/PI/ClientRequestDetails.inl b/TAO/tao/PI/ClientRequestDetails.inl
index 7ea1ecbb12f..f568bb9fafb 100644
--- a/TAO/tao/PI/ClientRequestDetails.inl
+++ b/TAO/tao/PI/ClientRequestDetails.inl
@@ -13,11 +13,6 @@ namespace TAO
   }
 
   ACE_INLINE
-  ClientRequestDetails::~ClientRequestDetails (void)
-  {
-  }
-
-  ACE_INLINE
   bool
   ClientRequestDetails::should_be_processed (bool is_remote_request) const
   {
diff --git a/TAO/tao/PI_Server/ServerRequestDetails.h b/TAO/tao/PI_Server/ServerRequestDetails.h
index 8f7aa99ad7d..9839b30459a 100644
--- a/TAO/tao/PI_Server/ServerRequestDetails.h
+++ b/TAO/tao/PI_Server/ServerRequestDetails.h
@@ -22,12 +22,12 @@
 
 #include /**/ "ace/pre.h"
 
+#include "tao/orbconf.h"
+
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/orbconf.h"
-
 #if TAO_HAS_INTERCEPTORS == 1
 
 #include "tao/PI/ProcessingModePolicyC.h"
@@ -51,9 +51,7 @@ namespace TAO
   class ServerRequestDetails
   {
   public:
-
     ServerRequestDetails (void);
-    ~ServerRequestDetails (void);
 
     void apply_policies (const CORBA::PolicyList& policies
                          ACE_ENV_ARG_DECL);
diff --git a/TAO/tao/PI_Server/ServerRequestDetails.inl b/TAO/tao/PI_Server/ServerRequestDetails.inl
index dd05eeb04d5..f653264bdac 100644
--- a/TAO/tao/PI_Server/ServerRequestDetails.inl
+++ b/TAO/tao/PI_Server/ServerRequestDetails.inl
@@ -13,11 +13,6 @@ namespace TAO
   }
 
   ACE_INLINE
-  ServerRequestDetails::~ServerRequestDetails (void)
-  {
-  }
-
-  ACE_INLINE
   bool
   ServerRequestDetails::should_be_processed (bool is_remote_request) const
   {