Some missing from merge.

Signed-off-by: Salja <salja2012@hotmail.de>
This commit is contained in:
Salja 2012-08-05 14:54:07 +02:00 committed by Antz
parent ec939a5bce
commit f4be15a7af
1895 changed files with 160408 additions and 53601 deletions

View file

@ -4,6 +4,8 @@
/**
* @file DLL_Manager.h
*
* $Id: DLL_Manager.h 97888 2014-09-11 10:29:17Z mcorino $
*
* @author Don Hinton <dhinton@ieee.org>
*/
//=============================================================================
@ -18,6 +20,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
#include "ace/Auto_Ptr.h"
#include "ace/Containers_T.h"
#include "ace/SString.h"
#include "ace/os_include/os_dlfcn.h"
@ -49,6 +52,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
* Most of this class came from the original ACE_DLL class. ACE_DLL
* is now just an interface that passed all it's calls either directly
* or via ACE_DLL_Manager to this class for execution.
*
*/
class ACE_Export ACE_DLL_Handle
{
@ -138,8 +142,6 @@ public:
*/
ACE_SHLIB_HANDLE get_handle (bool become_owner = false);
ACE_ALLOC_HOOK_DECLARE;
private:
/// Returns a string explaining why <symbol> or <open>
@ -154,31 +156,6 @@ private:
void get_dll_names (const ACE_TCHAR *dll_name,
ACE_Array<ACE_TString> &try_names);
/**
* This method opens and dynamically links a library/DLL.
* @param dll_name The filename or path of the DLL to load.
* @param open_mode Flags to alter the actions taken when loading the DLL.
* The possible values are:
* @li @c RTLD_LAZY (this the default): loads identifier symbols but
* not the symbols for functions, which are loaded dynamically
* on demand.
* @li @c RTLD_NOW: performs all necessary relocations when
* @a dll_name is first loaded
* @li @c RTLD_GLOBAL: makes symbols available for relocation
* processing of any other DLLs.
* @retval false On failure
* @retval true On success.
*/
bool open_i (const ACE_TCHAR *dll_name, int open_mode);
/**
* This method logs error of opening the DLL.
* @param dll_name The filename or path of the DLL to load.
* @param errors Optional address of an error stack to collect any errors
* encountered.
*/
void log_error (const ACE_TCHAR *dll_name, ERROR_STACK *errors);
/// Disallow copying and assignment since we don't handle them.
ACE_DLL_Handle (const ACE_DLL_Handle &);
void operator= (const ACE_DLL_Handle &);
@ -240,6 +217,7 @@ class ACE_Framework_Repository;
*
* ACE_DLL_UNLOAD_POLICY_DEFAULT - Default policy allows dlls to control
* their own destinies, but will unload those that don't make a choice eagerly.
*
*/
class ACE_Export ACE_DLL_Manager
{
@ -273,8 +251,6 @@ public:
/// refcounts.
void unload_policy (u_long unload_policy);
ACE_ALLOC_HOOK_DECLARE;
protected:
/// Default constructor.