summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-04-07 18:45:50 +0000
committernanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-04-07 18:45:50 +0000
commit558c3d0b572d315add72a01fa02dc96da0d68af1 (patch)
treeeb3b8e31e415fc3d520bea712777e89a5adc960c
parent82787c3344fa128bfde008a0db77780fe9a64f5d (diff)
downloadATCD-558c3d0b572d315add72a01fa02dc96da0d68af1.tar.gz
Added fini_called().
-rw-r--r--ace/Service_Object.h3
-rw-r--r--ace/Service_Object.i27
2 files changed, 20 insertions, 10 deletions
diff --git a/ace/Service_Object.h b/ace/Service_Object.h
index 0c73e2c20af..e6e9817345b 100644
--- a/ace/Service_Object.h
+++ b/ace/Service_Object.h
@@ -98,6 +98,9 @@ public:
void fini (void);
// Calls fini() on <type_>
+ int fini_called (void) const;
+ // Check if the service has been fini'ed.
+
void dump (void) const;
// Dump the state of an object.
diff --git a/ace/Service_Object.i b/ace/Service_Object.i
index c69670b5444..7dea95999e2 100644
--- a/ace/Service_Object.i
+++ b/ace/Service_Object.i
@@ -4,20 +4,20 @@
// Service_Object.i
ACE_INLINE ACE_Service_Object_Ptr::ACE_Service_Object_Ptr (ACE_Service_Object *so)
- : service_object_ (so)
+ : service_object_ (so)
{
}
-ACE_INLINE ACE_Service_Object_Ptr::~ACE_Service_Object_Ptr (void)
-{
+ACE_INLINE ACE_Service_Object_Ptr::~ACE_Service_Object_Ptr (void)
+{
this->service_object_->fini ();
delete this->service_object_;
}
ACE_INLINE ACE_Service_Object *
-ACE_Service_Object_Ptr::operator-> ()
-{
- return this->service_object_;
+ACE_Service_Object_Ptr::operator-> ()
+{
+ return this->service_object_;
}
ACE_INLINE const ASYS_TCHAR *
@@ -51,7 +51,7 @@ ACE_Service_Type::handle (void) const
return this->handle_;
}
-ACE_INLINE void
+ACE_INLINE void
ACE_Service_Type::name (const ASYS_TCHAR *n)
{
ACE_TRACE ("ACE_Service_Type::name");
@@ -64,7 +64,7 @@ ACE_Service_Type::name (const ASYS_TCHAR *n)
#endif /* !ACE_HAS_MOSTLY_UNICODE_APIS */
}
-ACE_INLINE void
+ACE_INLINE void
ACE_Service_Type::type (const ACE_Service_Type_Impl *o, int enabled)
{
ACE_TRACE ("ACE_Service_Type::type");
@@ -72,14 +72,14 @@ ACE_Service_Type::type (const ACE_Service_Type_Impl *o, int enabled)
((ACE_Service_Type *) this)->active_ = enabled;
}
-ACE_INLINE void
+ACE_INLINE void
ACE_Service_Type::handle (const ACE_SHLIB_HANDLE h)
{
ACE_TRACE ("ACE_Service_Type::handle");
this->handle_ = h;
}
-ACE_INLINE int
+ACE_INLINE int
ACE_Service_Type::active (void) const
{
ACE_TRACE ("ACE_Service_Type::active");
@@ -92,3 +92,10 @@ ACE_Service_Type::active (int turnon)
ACE_TRACE ("ACE_Service_Type::active");
this->active_ = turnon;
}
+
+ACE_INLINE int
+ACE_Service_Type::fini_called (void) const
+{
+ ACE_TRACE ("ACE_Service_TYpe::fini_called");
+ return this->fini_already_called_;
+}