diff options
| -rw-r--r-- | ACE/ChangeLog | 7 | ||||
| -rw-r--r-- | ACE/netsvcs/lib/Name_Handler.cpp | 10 | ||||
| -rw-r--r-- | ACE/netsvcs/lib/Name_Handler.h | 8 |
3 files changed, 21 insertions, 4 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index e7d33eb287b..d8bf130f77d 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,10 @@ +Mon Dec 3 14:57:36 UTC 2007 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * netsvcs/lib/Name_Handler.h: Moved the inline methods to the + Name_Handler.cpp file. Also, zapped the unnecessary virtual + method for naming_context(). Thanks to Johnny for catching + this. + Mon Dec 3 14:21:20 UTC 2007 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> * netsvcs/lib/Name_Handler.{h,cpp}: Check the return value from diff --git a/ACE/netsvcs/lib/Name_Handler.cpp b/ACE/netsvcs/lib/Name_Handler.cpp index e7281d39705..8e992987412 100644 --- a/ACE/netsvcs/lib/Name_Handler.cpp +++ b/ACE/netsvcs/lib/Name_Handler.cpp @@ -619,6 +619,16 @@ ACE_Name_Handler::lists_entries (void) return 0; } +ACE_Name_Handler::naming_context (void) +{ + return naming_context_; +} + +ACE_Name_Acceptor::naming_context (void) +{ + return &naming_context_; +} + ACE_Name_Handler::~ACE_Name_Handler (void) { ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::~ACE_Name_Handler")); diff --git a/ACE/netsvcs/lib/Name_Handler.h b/ACE/netsvcs/lib/Name_Handler.h index 83fa95ef143..d41751145fe 100644 --- a/ACE/netsvcs/lib/Name_Handler.h +++ b/ACE/netsvcs/lib/Name_Handler.h @@ -144,9 +144,9 @@ private: ACE_INET_Addr addr_; /// Naming Context - ACE_Naming_Context* naming_context_; + ACE_Naming_Context *naming_context_; - ACE_Naming_Context* naming_context() { return naming_context_; } + ACE_Naming_Context *naming_context (void); /// Handle binds. int bind (void); @@ -196,13 +196,13 @@ public: int parse_args (int argc, ACE_TCHAR *argv[]); /// Naming context for acceptor /for the listening port/ - virtual ACE_Naming_Context* naming_context() { return &naming_context_;} + ACE_Naming_Context *naming_context (void); private: /// The scheduling strategy is designed for Reactive services. ACE_Schedule_All_Reactive_Strategy<ACE_Name_Handler> scheduling_strategy_; - //The Naming Context + /// The Naming Context ACE_Naming_Context naming_context_; }; |