diff options
| author | cbeaulac <cbeaulac@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-11-16 13:26:29 +0000 |
|---|---|---|
| committer | cbeaulac <cbeaulac@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-11-16 13:26:29 +0000 |
| commit | 74ecc8e816845e04603510542916f01537b843f8 (patch) | |
| tree | 8270210a2ab732c1745d85a12a750795f527ba87 | |
| parent | b1ffba9464ea7ca0c555562519a0921df5656aec (diff) | |
| download | ATCD-74ecc8e816845e04603510542916f01537b843f8.tar.gz | |
Mon Nov 16 13:26:25 UTC 2009 Chad Beaulac <chad@objectivesolutions.com>
* ace/Service_Types.h
* ace/Service_Types.cpp
* ace/Service_Types.inl
Added public keyword for inheritance of ACE_Module_Container
for ACE_Stream_Type.
Made module_container methods in ACE_Module_Type inline.
Commit for Bugzilla #3334.
| -rw-r--r-- | ace/Service_Types.cpp | 14 | ||||
| -rw-r--r-- | ace/Service_Types.h | 2 | ||||
| -rw-r--r-- | ace/Service_Types.inl | 14 |
3 files changed, 15 insertions, 15 deletions
diff --git a/ace/Service_Types.cpp b/ace/Service_Types.cpp index 38ab04d6f63..6bce8fdc4b0 100644 --- a/ace/Service_Types.cpp +++ b/ace/Service_Types.cpp @@ -300,20 +300,6 @@ ACE_Module_Type::link (void) const return this->link_; } -void -ACE_Module_Type::module_container (ACE_Module_Container *n) -{ - ACE_TRACE ("ACE_Module_Type::module_container"); - this->module_container_ = n; -} - -ACE_Module_Container * -ACE_Module_Type::module_container (void) const -{ - ACE_TRACE ("ACE_Module_Type::module_container"); - return this->module_container_; -} - ACE_ALLOC_HOOK_DEFINE(ACE_Stream_Type) void diff --git a/ace/Service_Types.h b/ace/Service_Types.h index 34e6c91ef54..c0677c111d3 100644 --- a/ace/Service_Types.h +++ b/ace/Service_Types.h @@ -178,7 +178,7 @@ private: * @brief Define the methods for handling the configuration of * ACE_Streams. */ -class ACE_Export ACE_Stream_Type : public ACE_Service_Type_Impl, ACE_Module_Container +class ACE_Export ACE_Stream_Type : public ACE_Service_Type_Impl, public ACE_Module_Container { public: // = Initialization method. diff --git a/ace/Service_Types.inl b/ace/Service_Types.inl index 9ebfd705ced..28eec6ffab0 100644 --- a/ace/Service_Types.inl +++ b/ace/Service_Types.inl @@ -29,4 +29,18 @@ ACE_Service_Type_Impl::name (const ACE_TCHAR *n) this->name_ = ACE::strnew (n); } +ACE_INLINE void +ACE_Module_Type::module_container (ACE_Module_Container *n) +{ + ACE_TRACE ("ACE_Module_Type::module_container"); + this->module_container_ = n; +} + +ACE_INLINE ACE_Module_Container * +ACE_Module_Type::module_container (void) const +{ + ACE_TRACE ("ACE_Module_Type::module_container"); + return this->module_container_; +} + ACE_END_VERSIONED_NAMESPACE_DECL |