diff options
Diffstat (limited to 'ACE/ace/Service_Config.cpp')
| -rw-r--r-- | ACE/ace/Service_Config.cpp | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/ACE/ace/Service_Config.cpp b/ACE/ace/Service_Config.cpp index 3ceb1ebd9f7..cae4ad4058a 100644 --- a/ACE/ace/Service_Config.cpp +++ b/ACE/ace/Service_Config.cpp @@ -89,10 +89,10 @@ ACE_Service_Config::parse_args_i (int argc, ACE_TCHAR *argv[]) { ACE_TRACE ("ACE_Service_Config::parse_args_i"); - // Using PERMUTE_ARGS (default) in order to have all - // unrecognized options and their value arguments moved - // to the end of the argument vector. We'll pick them up - // after processing our options and pass them on to the + // Using PERMUTE_ARGS (default) in order to have all + // unrecognized options and their value arguments moved + // to the end of the argument vector. We'll pick them up + // after processing our options and pass them on to the // base class for further parsing. ACE_Get_Opt getopt (argc, argv, @@ -101,7 +101,7 @@ ACE_Service_Config::parse_args_i (int argc, ACE_TCHAR *argv[]) 0, // Do not report errors ACE_Get_Opt::RETURN_IN_ORDER); - // Keep a list of all unknown arguments, begin with the + // Keep a list of all unknown arguments, begin with the // executable's name ACE_ARGV superargv; superargv.add (argv[0]); @@ -140,7 +140,7 @@ ACE_Service_Config::parse_args_i (int argc, ACE_TCHAR *argv[]) for (int c = getopt.opt_ind (); c < argc; c++) superargv.add (argv[c-1]); - return ACE_Service_Gestalt::parse_args_i (superargv.argc (), + return ACE_Service_Gestalt::parse_args_i (superargv.argc (), superargv.argv ()); } /* parse_args_i () */ @@ -338,7 +338,7 @@ ACE_Service_Config::impl_ (void) TSS_Service_Gestalt_Ptr, 0); } - + return instance_; } @@ -450,8 +450,8 @@ ACE_Service_Config::ACE_Service_Config (int ignore_static_svcs, ACE_Service_Config::signum_ = signum; - // Make sure ACE_OS_Object_Manager is initialized. - (void)ACE_OS_Object_Manager::instance (); + // Initialize the Service Repository. + // ACE_Service_Repository::instance (static_cast<int> (size)); // Initialize the ACE_Reactor (the ACE_Reactor should be the same // size as the ACE_Service_Repository). @@ -579,13 +579,7 @@ ACE_Service_Config::reconfigure (void) int ACE_Service_Config::close (void) { - int result1 = ACE_Service_Config::current ()->close (); - - // Delete the service repository. All the objects inside the - // service repository should already have been finalized. - int result2 = ACE_Service_Config::close_svcs (); - - return (result1 | result2); + return ACE_Service_Config::current ()->close (); } int |