Wed Jul 21 02:30:45 UTC 2010 Phil Mesnier <mesnier_p@ociweb.com>

        * ace/Service_Gestalt.h:
        * ace/Service_Gestalt.inl:
        * ace/Service_Gestalt.cpp:
        
          Add a specialized open method to be called by TAO. TAO depends
          on a modified order of directive evaluation.

1 files changed, 29 insertions, 1 deletions

diff --git a/ACE/ace/Service_Gestalt.inl b/ACE/ace/Service_Gestalt.inl
index 873a930ceab..c2b0c14f595 100644
--- a/ACE/ace/Service_Gestalt.inl
+++ b/ACE/ace/Service_Gestalt.inl
@@ -49,7 +49,35 @@ ACE_Service_Gestalt::open (int argc,
                        logger_key,
                        this->no_static_svcs_,
                        ignore_default_svc_conf,
-                       ignore_debug_flag);
+                       ignore_debug_flag,
+		       false);
+}
+
+ACE_INLINE int
+ACE_Service_Gestalt::open_for_TAO (int argc,
+				   ACE_TCHAR *argv[],
+				   const ACE_TCHAR *logger_key,
+				   bool ignore_static_svcs,
+				   bool ignore_default_svc_conf,
+				   bool ignore_debug_flag)
+{
+  ACE_TRACE ("ACE_Service_Gestalt::open");
+
+  // Parsing argv may change no_static_svcs_ so set the default here, then
+  // parse, then pass the final value to open_i().
+  this->no_static_svcs_ = ignore_static_svcs;
+
+  if (this->parse_args_i (argc,
+                          argv,
+                          ignore_default_svc_conf) == -1)
+    return -1;
+
+  return this->open_i (argv == 0 ? 0 : argv[0],
+                       logger_key,
+                       this->no_static_svcs_,
+                       ignore_default_svc_conf,
+                       ignore_debug_flag,
+		       true);
 }
 
 /// Searches for a service object declaration in the local repo, only