*Massive cleanup redux.
--HG-- branch : trunk
This commit is contained in:
@@ -72,7 +72,6 @@ ACE_Service_Type_Dynamic_Guard::ACE_Service_Type_Dynamic_Guard
|
||||
ACE_ASSERT (this->name_ != 0); // No name?
|
||||
}
|
||||
|
||||
|
||||
/// Destructor
|
||||
|
||||
ACE_Service_Type_Dynamic_Guard::~ACE_Service_Type_Dynamic_Guard (void)
|
||||
@@ -130,8 +129,6 @@ ACE_Service_Type_Dynamic_Guard::~ACE_Service_Type_Dynamic_Guard (void)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
// ----------------------------------------
|
||||
|
||||
ACE_Service_Gestalt::Processed_Static_Svc::
|
||||
@@ -169,7 +166,6 @@ ACE_Service_Gestalt::intrusive_remove_ref (ACE_Service_Gestalt* g)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
ACE_Service_Gestalt::~ACE_Service_Gestalt (void)
|
||||
{
|
||||
|
||||
@@ -289,7 +285,6 @@ ACE_Service_Gestalt::init_i (void)
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
// Add the default statically-linked services to the Service
|
||||
// Repository.
|
||||
|
||||
@@ -315,8 +310,6 @@ ACE_Service_Gestalt::load_static_svcs (void)
|
||||
|
||||
} /* load_static_svcs () */
|
||||
|
||||
|
||||
|
||||
/// Find a static service descriptor by name
|
||||
|
||||
int
|
||||
@@ -364,8 +357,6 @@ ACE_Service_Gestalt::find_processed_static_svc (const ACE_TCHAR* name)
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/// @brief Captures a list of the direcives processed (explicitely) for this
|
||||
/// Gestalt so that services can be replicated in other repositories
|
||||
/// upon their first initialization.
|
||||
@@ -420,7 +411,6 @@ ACE_Service_Gestalt::add_processed_static_svc
|
||||
assd->name_));
|
||||
}
|
||||
|
||||
|
||||
/// Queues a static service object descriptor which, during open()
|
||||
/// will be given to process_directive() to create the Service
|
||||
/// Object. Normally, only called from static initializers, prior to
|
||||
@@ -437,10 +427,8 @@ ACE_Service_Gestalt::insert (ACE_Static_Svc_Descriptor *stsd)
|
||||
return this->static_svcs_->insert (stsd);
|
||||
}
|
||||
|
||||
|
||||
ACE_ALLOC_HOOK_DEFINE (ACE_Service_Gestalt)
|
||||
|
||||
|
||||
void
|
||||
ACE_Service_Gestalt::dump (void) const
|
||||
{
|
||||
@@ -449,8 +437,6 @@ ACE_Service_Gestalt::dump (void) const
|
||||
#endif /* ACE_HAS_DUMP */
|
||||
}
|
||||
|
||||
|
||||
|
||||
///
|
||||
|
||||
int
|
||||
@@ -516,7 +502,6 @@ ACE_Service_Gestalt::initialize (const ACE_TCHAR *svc_name,
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
#if (ACE_USES_CLASSIC_SVC_CONF == 1)
|
||||
int
|
||||
ACE_Service_Gestalt::initialize (const ACE_Service_Type_Factory *stf,
|
||||
@@ -601,7 +586,6 @@ ACE_Service_Gestalt::initialize (const ACE_Service_Type_Factory *stf,
|
||||
}
|
||||
#endif /* (ACE_USES_CLASSIC_SVC_CONF == 1) */
|
||||
|
||||
|
||||
// Dynamically link the shared object file and retrieve a pointer to
|
||||
// the designated shared object in this file.
|
||||
// @note This is obsolete (and error-prone) in the presense of dynamic
|
||||
@@ -732,7 +716,6 @@ ACE_Service_Gestalt::resume (const ACE_TCHAR svc_name[])
|
||||
return this->repo_->resume (svc_name);
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
ACE_Service_Gestalt::process_directive (const ACE_Static_Svc_Descriptor &ssd,
|
||||
bool force_replace)
|
||||
@@ -761,7 +744,6 @@ ACE_Service_Gestalt::process_directive_i (const ACE_Static_Svc_Descriptor &ssd,
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
ACE_Service_Object_Exterminator gobbler;
|
||||
void *sym = (ssd.alloc_)(&gobbler);
|
||||
|
||||
@@ -993,7 +975,6 @@ ACE_Service_Gestalt::process_directive (const ACE_TCHAR directive[])
|
||||
|
||||
} /* process_directive () */
|
||||
|
||||
|
||||
int
|
||||
ACE_Service_Gestalt::init_svc_conf_file_queue (void)
|
||||
{
|
||||
@@ -1018,7 +999,6 @@ ACE_Service_Gestalt::init_svc_conf_file_queue (void)
|
||||
|
||||
} /* init_svc_conf_file_queue () */
|
||||
|
||||
|
||||
int
|
||||
ACE_Service_Gestalt::open_i (const ACE_TCHAR /*program_name*/[],
|
||||
const ACE_TCHAR* /*logger_key*/,
|
||||
@@ -1079,7 +1059,6 @@ ACE_Service_Gestalt::open_i (const ACE_TCHAR /*program_name*/[],
|
||||
result = this->process_directives (ignore_default_svc_conf_file);
|
||||
}
|
||||
|
||||
|
||||
// Reset debugging back to the way it was when we came into
|
||||
// into <open_i>.
|
||||
{
|
||||
@@ -1096,7 +1075,6 @@ ACE_Service_Gestalt::open_i (const ACE_TCHAR /*program_name*/[],
|
||||
return result;
|
||||
} /* open_i () */
|
||||
|
||||
|
||||
int
|
||||
ACE_Service_Gestalt::is_opened (void)
|
||||
{
|
||||
@@ -1132,7 +1110,6 @@ ACE_Service_Gestalt::process_commandline_directives (void)
|
||||
|
||||
} /* process_commandline_directives () */
|
||||
|
||||
|
||||
int
|
||||
ACE_Service_Gestalt::parse_args (int argc, ACE_TCHAR *argv[])
|
||||
{
|
||||
@@ -1210,8 +1187,6 @@ ACE_Service_Gestalt::parse_args_i (int argc,
|
||||
return 0;
|
||||
} /* parse_args_i () */
|
||||
|
||||
|
||||
|
||||
// Process service configuration directives from the files queued for
|
||||
// processing
|
||||
int
|
||||
@@ -1285,7 +1260,6 @@ ACE_Service_Gestalt::close (void)
|
||||
return 0;
|
||||
} /* close () */
|
||||
|
||||
|
||||
ACE_END_VERSIONED_NAMESPACE_DECL
|
||||
|
||||
#if !defined (__ACE_INLINE__)
|
||||
|
||||
Reference in New Issue
Block a user