ChangeLogTag: Thu Feb 15 05:41:11 UTC 2007 Iliyan Jeliazkov <iliyan@ociweb.com>

3 files changed, 27 insertions, 19 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 739d2692b4b..e9aaccb54fd 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,12 @@
+Thu Feb 15 05:41:11 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * ace/Service_Gestalt.inl:
+        * ace/Service_Gestalt.cpp:
+
+          Moved find off-line because it requires a full declaration of
+          ACE_Service_Repository, which is unavailable when the inl file
+          is compiled (inlining on)
+
 Wed Feb 14 23:05:16 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
 
         * ace/Service_Config.h:
diff --git a/ACE/ace/Service_Gestalt.cpp b/ACE/ace/Service_Gestalt.cpp
index 1658bc06d53..ea7d96dbd2b 100644
--- a/ACE/ace/Service_Gestalt.cpp
+++ b/ACE/ace/Service_Gestalt.cpp
@@ -400,6 +400,24 @@ ACE_Service_Gestalt::load_static_svcs (void)
 
 
 
+/// Searches for a service object declaration in the local repo, only
+
+int
+ACE_Service_Gestalt::find (const ACE_TCHAR name[],
+                           const ACE_Service_Type **srp,
+                           int ignore_suspended) const
+{
+  // Closing the gestalt will have disassociated it from the
+  // repository. If the repository used to be owned by the gestalt, it
+  // will also have been destroyed - so just check for repo_ before
+  // doing anything with it.
+  if (this->repo_ != 0)
+    return this->repo_->find (name, srp, ignore_suspended);
+
+  return 0;
+}
+
+
 /// Find a static service descriptor by name
 
 int
diff --git a/ACE/ace/Service_Gestalt.inl b/ACE/ace/Service_Gestalt.inl
index db9e9ad6d80..c6258728c65 100644
--- a/ACE/ace/Service_Gestalt.inl
+++ b/ACE/ace/Service_Gestalt.inl
@@ -48,23 +48,4 @@ ACE_Service_Gestalt::open (int argc,
                          ignore_debug_flag);
 }
 
-/// Searches for a service object declaration in the local repo, only
-
-ACE_INLINE int
-ACE_Service_Gestalt::find (const ACE_TCHAR name[],
-                           const ACE_Service_Type **srp,
-                           int ignore_suspended) const
-{
-  // Closing the gestalt will have disassociated it from the
-  // repository. If the repository used to be owned by the gestalt, it
-  // will also have been destroyed - so just check for repo_ before
-  // doing anything with it.
-  if (this->repo_ != 0)
-    return this->repo_->find (name, srp, ignore_suspended);
-
-  return 0;
-}
-
-
-
 ACE_END_VERSIONED_NAMESPACE_DECL