summaryrefslogtreecommitdiff
path: root/TAO/tao/IORInterceptor
diff options
context:
space:
mode:
authorOssama Othman <ossama-othman@users.noreply.github.com>2005-11-03 17:38:46 +0000
committerOssama Othman <ossama-othman@users.noreply.github.com>2005-11-03 17:38:46 +0000
commitf14a01b8fbabdbf58e4bbc74cc5a84d672b20dfc (patch)
treeb8adf3c7f0f24648d2298f4e62ad003dc221b1c3 /TAO/tao/IORInterceptor
parent759d626f579791e15c91b2bc847b9d4ef7adee29 (diff)
downloadATCD-f14a01b8fbabdbf58e4bbc74cc5a84d672b20dfc.tar.gz
ChangeLogTag:Thu Nov 3 09:26:21 2005 Ossama Othman <ossama@dre.vanderbilt.edu>
Diffstat (limited to 'TAO/tao/IORInterceptor')
-rw-r--r--TAO/tao/IORInterceptor/IORInfo.cpp5
-rw-r--r--TAO/tao/IORInterceptor/IORInfo.h14
-rw-r--r--TAO/tao/IORInterceptor/IORInfo.inl7
-rw-r--r--TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp5
-rw-r--r--TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h9
-rw-r--r--TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp4
-rw-r--r--TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h6
7 files changed, 38 insertions, 12 deletions
diff --git a/TAO/tao/IORInterceptor/IORInfo.cpp b/TAO/tao/IORInterceptor/IORInfo.cpp
index ca0a10a1038..873b0d8426b 100644
--- a/TAO/tao/IORInterceptor/IORInfo.cpp
+++ b/TAO/tao/IORInterceptor/IORInfo.cpp
@@ -14,10 +14,11 @@ ACE_RCSID (IORInterceptor,
# include "IORInfo.inl"
#endif /* __ACE_INLINE__ */
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
TAO_IORInfo::TAO_IORInfo (TAO_Root_POA *poa)
: poa_ (poa),
- components_established_ (0)
+ components_established_ (false)
{
}
@@ -190,3 +191,5 @@ TAO_IORInfo::check_validity (ACE_ENV_SINGLE_ARG_DECL)
CORBA::COMPLETED_NO));
}
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IORInterceptor/IORInfo.h b/TAO/tao/IORInterceptor/IORInfo.h
index c377ff1c994..c7e7978eb9d 100644
--- a/TAO/tao/IORInterceptor/IORInfo.h
+++ b/TAO/tao/IORInterceptor/IORInfo.h
@@ -31,10 +31,11 @@
#endif /* _MSC_VER */
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
/// Forward declarations.
class TAO_Root_POA;
-
/**
* @class TAO_IORInfo
*
@@ -112,7 +113,7 @@ public:
/// IORInterceptor::components_established() interception point has
/// been called.
/**
- * This method is used so to inform the IORInfo when the
+ * This method is used to inform the IORInfo object when the
* add_ior_component() and add_ior_component_to_profile() methods
* are invalid. They are only valid in the
* IORInterceptor::establish_components() interception point.
@@ -137,14 +138,13 @@ private:
/// Prevent copying through the copy constructor and the assignment
/// operator.
- ACE_UNIMPLEMENTED_FUNC (
- TAO_IORInfo (const TAO_IORInfo &))
- ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_IORInfo &))
+ TAO_IORInfo (const TAO_IORInfo &);
+ void operator= (const TAO_IORInfo &);
private:
/// Pointer to POA
- TAO_Root_POA *poa_;
+ TAO_Root_POA * poa_;
/// True if the IORInterceptor::components_established()
/// interception point was called. False otherwise.
@@ -158,6 +158,8 @@ private:
};
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#if defined (__ACE_INLINE__)
# include "IORInfo.inl"
#endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/IORInterceptor/IORInfo.inl b/TAO/tao/IORInterceptor/IORInfo.inl
index 3a94b482656..dfb66194baf 100644
--- a/TAO/tao/IORInterceptor/IORInfo.inl
+++ b/TAO/tao/IORInterceptor/IORInfo.inl
@@ -2,6 +2,9 @@
//
// $Id$
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
ACE_INLINE void
TAO_IORInfo::invalidate (void)
{
@@ -11,5 +14,7 @@ TAO_IORInfo::invalidate (void)
ACE_INLINE void
TAO_IORInfo::components_established (void)
{
- this->components_established_ = 1;
+ this->components_established_ = true;
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp
index 8dfe90401cf..3fd442c9c49 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp
@@ -9,6 +9,8 @@ ACE_RCSID (IORInterceptor,
IORInterceptor_Adapter_Factory_Impl,
"$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
TAO_IORInterceptor_Adapter_Factory_Impl::~TAO_IORInterceptor_Adapter_Factory_Impl (void)
{
}
@@ -21,6 +23,7 @@ TAO_IORInterceptor_Adapter_Factory_Impl::create (ACE_ENV_SINGLE_ARG_DECL)
ACE_NEW_THROW_EX (nia,
TAO_IORInterceptor_Adapter_Impl (),
CORBA::NO_MEMORY ());
+ ACE_CHECK_RETURN (nia);
return nia;
}
@@ -43,6 +46,8 @@ TAO_IORInterceptor_Adapter_Factory_Impl::Initializer (void)
);
}
+TAO_END_VERSIONED_NAMESPACE_DECL
+
ACE_STATIC_SVC_DEFINE (
TAO_IORInterceptor_Adapter_Factory_Impl,
ACE_TEXT ("Concrete_IORInterceptor_Adapter_Factory"),
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h
index f41d267a92f..26f6bcc90ca 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h
@@ -25,6 +25,7 @@
#include "tao/IORInterceptor_Adapter_Factory.h"
#include "ace/Service_Config.h"
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
class TAO_IORInterceptor_Adapter;
@@ -51,13 +52,15 @@ public:
static int Initializer (void);
};
-ACE_STATIC_SVC_DECLARE (TAO_IORInterceptor_Adapter_Factory_Impl)
-ACE_FACTORY_DECLARE (TAO_IORInterceptor, TAO_IORInterceptor_Adapter_Factory_Impl)
-
static int
TAO_Requires_IORInterceptor_Initializer =
TAO_IORInterceptor_Adapter_Factory_Impl::Initializer ();
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_STATIC_SVC_DECLARE (TAO_IORInterceptor_Adapter_Factory_Impl)
+ACE_FACTORY_DECLARE (TAO_IORInterceptor, TAO_IORInterceptor_Adapter_Factory_Impl)
+
#define TAO_IORINTERCEPTOR_SAFE_INCLUDE
#include "tao/IORInterceptor/IORInterceptorC.h"
#undef TAO_IORINTERCEPTOR_SAFE_INCLUDE
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
index cc823c2c9a2..0124de24c1e 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
@@ -13,6 +13,8 @@ ACE_RCSID (IORInterceptor,
"$Id$")
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
TAO_IORInterceptor_Adapter_Impl::~TAO_IORInterceptor_Adapter_Impl (void)
{
}
@@ -235,3 +237,5 @@ TAO_IORInterceptor_Adapter_Impl::adapter_manager_state_changed (
}
}
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h
index 50d4a0eaa11..d9d0bfd7a3e 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h
@@ -26,6 +26,8 @@
#include "tao/IORInterceptor_Adapter.h"
#include "tao/PI/Interceptor_List_T.h"
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
namespace TAO
{
typedef Interceptor_List< ::PortableInterceptor::IORInterceptor>
@@ -43,7 +45,7 @@ class TAO_Root_POA;
* interfaces IORInfo and IORInterceptor. This is the derived class
* that contains the actual implementations.
*/
-class TAO_IORInterceptor_Export TAO_IORInterceptor_Adapter_Impl
+class TAO_IORInterceptor_Adapter_Impl
: public TAO_IORInterceptor_Adapter
{
public:
@@ -81,6 +83,8 @@ private:
TAO::IORInterceptor_List ior_interceptor_list_;
};
+TAO_END_VERSIONED_NAMESPACE_DECL
+
#include /**/ "ace/post.h"
#endif /* TAO_IORINTERCEPTOR_ADAPTER_IMPL_H */