diff options
110 files changed, 467 insertions, 721 deletions
diff --git a/ChangeLog b/ChangeLog index 44e1c532024..0f38e64eaf6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,136 @@ +Fri Nov 25 19:04:10 2005 Ossama Othman <ossama@dre.vanderbilt.edu> + + * NEWS: + + Updated with latest versioned namespace information. + + * ace/ACE_Codecs_export.h: + * ace/ACE_Memory_export.h: + * ace/ACE_Reactor_export.h: + * ace/ACE_Sockets_export.h: + * ace/ACE_Threads_export.h: + * ace/ace.mwc: + * bin/MakeProjectCreator/config/acecodecslib_for_tao.mpb: + * bin/MakeProjectCreator/config/acememorylib_for_tao.mpb: + * bin/MakeProjectCreator/config/acereactorlib_for_tao.mpb: + * bin/MakeProjectCreator/config/acesocketslib_for_tao.mpb: + * bin/MakeProjectCreator/config/acethreadslib_for_tao.mpb: + * bin/MakeProjectCreator/config/acetimerlib_for_tao.mpb: + + Removed smaller ace_for_tao subsets. Only a single ace_for_tao + subset library was originally intended. + + * ace/Activation_Queue.h: + * ace/Barrier.h: + * ace/Based_Pointer_Repository.h: + * ace/Codecs.h: + * ace/Dev_Poll_Reactor.h: + * ace/File_Lock.h: + * ace/LSOCK.h: + * ace/LSOCK_Acceptor.h: + * ace/LSOCK_CODgram.h: + * ace/LSOCK_Connector.h: + * ace/LSOCK_Dgram.h: + * ace/LSOCK_Stream.h: + * ace/MEM_Acceptor.h: + * ace/MEM_Addr.h: + * ace/MEM_Connector.h: + * ace/MEM_IO.h: + * ace/MEM_SAP.h: + * ace/MEM_Stream.h: + * ace/MMAP_Memory_Pool.h: + * ace/Mem_Map.h: + * ace/Method_Request.h: + * ace/Msg_WFMO_Reactor.h: + * ace/Multihomed_INET_Addr.h: + * ace/PI_Malloc.h: + * ace/Pagefile_Memory_Pool.h: + * ace/Priority_Reactor.h: + * ace/Process.h: + * ace/Process_Manager.h: + * ace/Process_Semaphore.h: + * ace/RW_Process_Mutex.h: + * ace/SOCK_CODgram.h: + * ace/SOCK_Dgram_Bcast.h: + * ace/SOCK_Dgram_Mcast.h: + * ace/SOCK_SEQPACK_Acceptor.h: + * ace/SOCK_SEQPACK_Association.h: + * ace/SOCK_SEQPACK_Connector.h: + * ace/SV_Shared_Memory.h: + * ace/Sbrk_Memory_Pool.h: + * ace/Shared_Memory.h: + * ace/Shared_Memory_MM.h: + * ace/Shared_Memory_Pool.h: + * ace/Shared_Memory_SV.h: + * ace/Thread_Semaphore.h: + * ace/UNIX_Addr.h: + + Removed ace_for_tao subset-specific export macro calls and + include directives. They are no longer needed. + + * ace/ace_for_tao.mpc: + + Added a number of source files required to build the + Notification Service and its tests. + + * Kokyu/tests/DSRT_MIF/DSRT_MIF.mpc: + * ace/QoS/qos.mpc: + * apps/soreduce/soreduce.mpc: + * bin/MakeProjectCreator/config/ftclientorb.mpb: + * bin/MakeProjectCreator/config/htbp.mpb: + * bin/MakeProjectCreator/config/ifrservice.mpb: + * bin/MakeProjectCreator/config/naming_serv.mpb: + * bin/MakeProjectCreator/config/portablegroup.mpb: + * bin/MakeProjectCreator/config/rtevent_serv.mpb: + * bin/MakeProjectCreator/config/ssl.mpb: + * bin/MakeProjectCreator/config/strategies.mpb: + * bin/MakeProjectCreator/config/tmcast.mpb: + * examples/APG/Active_Objects/active_objects.mpc: + * examples/APG/Config/config.mpc: + * examples/APG/Misc_IPC/misc_ipc.mpc: + * examples/APG/Naming/naming.mpc: + * examples/APG/Proactor/proactor.mpc: + * examples/APG/Processes/processes.mpc: + * examples/APG/Shared_Memory/shared_memory.mpc: + * examples/APG/Streams/streams.mpc: + * examples/APG/Svc_Config/svc_config.mpc: + * examples/APG/ThreadPools/threadpools.mpc: + * examples/APG/ThreadSafety/threadsafety.mpc: + * examples/ASX/Event_Server/Event_Server/Event.mpc: + * examples/ASX/UPIPE_Event_Server/UPIPE_Event.mpc: + * examples/C++NPv1/C++NPv1.mpc: + * examples/C++NPv2/C++NPv2.mpc: + * examples/Connection/blocking/Connection_Blocking.mpc: + * examples/Connection/misc/Connection_Misc.mpc: + * examples/Connection/non_blocking/Connection_Non_Blocking.mpc: + * examples/IPC_SAP/DEV_SAP/reader/dev_sap_reader.mpc: + * examples/IPC_SAP/DEV_SAP/writer/dev_sap_writer.mpc: + * examples/IPC_SAP/FIFO_SAP/fifo_sap.mpc: + * examples/IPC_SAP/FILE_SAP/file_sap_client.mpc: + * examples/IPC_SAP/SOCK_SAP/sock_sap.mpc: + * examples/IPC_SAP/UPIPE_SAP/UPIPE_SAP.mpc: + * examples/Mem_Map/IO-tests/Mem_Map_IO_Tests.mpc: + * examples/Mem_Map/file-reverse/Mem_Map_File_Reverse.mpc: + * examples/Misc/Misc.mpc: + * examples/Naming/Naming.mpc: + * examples/OS/Process/OS_Process.mpc: + * examples/Reactor/Dgram/Reactor_Dgram.mpc: + * examples/Reactor/FIFO/Reactor_FIFO.mpc: + * examples/Reactor/Proactor/Proactor.mpc: + * examples/Service_Configurator/IPC-tests/client/Svc_Cfg_IPC_Client.mpc: + * examples/Shared_Malloc/Shared_Malloc.mpc: + * examples/Shared_Memory/Shared_Memory.mpc: + * examples/Synch/Synch.mpc: + * examples/System_V_IPC/SV_Message_Queues/SV_Message_Queues.mpc: + * examples/System_V_IPC/SV_Semaphores/SV_Semaphores.mpc: + * examples/Threads/Threads.mpc: + * performance-tests/SCTP/SCTP.mpc: + * tests/tests.mpc: + + Added "avoids += ace_for_tao" to projects that require features + of ACE not found in the ace_for_tao subset. Addresses link-time + errors. + Fri Nov 25 12:45:20 2005 Steve Huston <shuston@riverace.com> * tests/Proactor_Test.cpp: @@ -20,10 +20,11 @@ USER VISIBLE CHANGES BETWEEN ACE-5.4.7 and ACE-5.4.8 . Support for Intel C++ 9.0 on Windows and Linux -. Support for Microsoft Visual Studio 2005 (aka VC8) for Win32 as well as the - Windows CE platforms Pocket PC 2003 and Windows Mobile 5. Solution/project - files are generated with an appended "_vc8" for Win32 and "_WinCE" for - the CE platforms. See ACE_wrappers/docs/CE-status.txt for more information. +. Support for Microsoft Visual Studio 2005 (aka VC8) for Win32 as well + as the Windows CE platforms Pocket PC 2003 and Windows Mobile 5. + Solution/project files are generated with an appended "_vc8" for + Win32 and "_WinCE" for the CE platforms. See + ACE_wrappers/docs/CE-status.txt for more information. . Completed implementation of ACE_Dev_Poll_Reactor using the Linux epoll facility; tested on Red Hat Enterprise Linux 4. @@ -37,14 +38,22 @@ USER VISIBLE CHANGES BETWEEN ACE-5.4.7 and ACE-5.4.8 demarshaling. . Developed Feature Oriented Customizer (FOCUS) tool to enable - specialization of middleware frameworks such as Reactor and Protocol framework. - FOCUS provides an XML based transformation engine, where the transformations to - specialize the components are captured in XML file and a weaver specializes the - code. - -. Added support for unrolling ACE_OS::memcpy copy loop where applicable to improve - performance. Autoconf tests empirically determine whether loop unrolling - is at least 10% better than default version. + specialization of middleware frameworks such as Reactor and Protocol + framework. FOCUS provides an XML based transformation engine, where + the transformations to specialize the components are captured in XML + file and a weaver specializes the code. + +. Added support for unrolling ACE_OS::memcpy copy loop where + applicable to improve performance. Autoconf tests empirically + determine whether loop unrolling is at least 10% better than default + version. + +. Added support for an ACE "versioned" namespace. When enabled, ACE + library sources will be placed within a namespace of the user's + choice or a namespace of the form ACE_5_4_7 by default, where + "5_4_7" is the ACE major, minor and beta versions. The default may + be overridden by defining the ACE_VERSIONED_NAMESPACE_NAME + preprocessor symbol. USER VISIBLE CHANGES BETWEEN ACE-5.4.6 and ACE-5.4.7 ==================================================== diff --git a/ace/ACE_Codecs_export.h b/ace/ACE_Codecs_export.h deleted file mode 100644 index 9999c5270ab..00000000000 --- a/ace/ACE_Codecs_export.h +++ /dev/null @@ -1,54 +0,0 @@ - -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl ACE_Codecs -// ------------------------------ -#ifndef ACE_CODECS_EXPORT_H -#define ACE_CODECS_EXPORT_H - -#include "ace/config-all.h" - -#if !defined (ACE_CODECS_HAS_DLL) -# define ACE_CODECS_HAS_DLL 1 -#endif /* ! ACE_CODECS_HAS_DLL */ - -#if defined (ACE_CODECS_HAS_DLL) && (ACE_CODECS_HAS_DLL == 1) -# if defined (ACE_CODECS_BUILD_DLL) -# define ACE_Codecs_Export ACE_Proper_Export_Flag -# define ACE_CODECS_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define ACE_CODECS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* ACE_CODECS_BUILD_DLL */ -# define ACE_Codecs_Export ACE_Proper_Import_Flag -# define ACE_CODECS_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define ACE_CODECS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* ACE_CODECS_BUILD_DLL */ -#else /* ACE_CODECS_HAS_DLL == 1 */ -# define ACE_Codecs_Export -# define ACE_CODECS_SINGLETON_DECLARATION(T) -# define ACE_CODECS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* ACE_CODECS_HAS_DLL == 1 */ - -// Set ACE_CODECS_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (ACE_CODECS_NTRACE) -# if (ACE_NTRACE == 1) -# define ACE_CODECS_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define ACE_CODECS_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !ACE_CODECS_NTRACE */ - -#if (ACE_CODECS_NTRACE == 1) -# define ACE_CODECS_TRACE(X) -#else /* (ACE_CODECS_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define ACE_CODECS_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (ACE_CODECS_NTRACE == 1) */ - -#endif /* ACE_CODECS_EXPORT_H */ - -// End of auto generated file. diff --git a/ace/ACE_Memory_export.h b/ace/ACE_Memory_export.h deleted file mode 100644 index 20edd951d96..00000000000 --- a/ace/ACE_Memory_export.h +++ /dev/null @@ -1,58 +0,0 @@ - -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl -s ACE_Memory -// ------------------------------ -#ifndef ACE_MEMORY_EXPORT_H -#define ACE_MEMORY_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (ACE_MEMORY_HAS_DLL) -# define ACE_MEMORY_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && ACE_MEMORY_HAS_DLL */ - -#if !defined (ACE_MEMORY_HAS_DLL) -# define ACE_MEMORY_HAS_DLL 1 -#endif /* ! ACE_MEMORY_HAS_DLL */ - -#if defined (ACE_MEMORY_HAS_DLL) && (ACE_MEMORY_HAS_DLL == 1) -# if defined (ACE_MEMORY_BUILD_DLL) -# define ACE_Memory_Export ACE_Proper_Export_Flag -# define ACE_MEMORY_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define ACE_MEMORY_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* ACE_MEMORY_BUILD_DLL */ -# define ACE_Memory_Export ACE_Proper_Import_Flag -# define ACE_MEMORY_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define ACE_MEMORY_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* ACE_MEMORY_BUILD_DLL */ -#else /* ACE_MEMORY_HAS_DLL == 1 */ -# define ACE_Memory_Export -# define ACE_MEMORY_SINGLETON_DECLARATION(T) -# define ACE_MEMORY_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* ACE_MEMORY_HAS_DLL == 1 */ - -// Set ACE_MEMORY_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (ACE_MEMORY_NTRACE) -# if (ACE_NTRACE == 1) -# define ACE_MEMORY_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define ACE_MEMORY_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !ACE_MEMORY_NTRACE */ - -#if (ACE_MEMORY_NTRACE == 1) -# define ACE_MEMORY_TRACE(X) -#else /* (ACE_MEMORY_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define ACE_MEMORY_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (ACE_MEMORY_NTRACE == 1) */ - -#endif /* ACE_MEMORY_EXPORT_H */ - -// End of auto generated file. diff --git a/ace/ACE_Reactor_export.h b/ace/ACE_Reactor_export.h deleted file mode 100644 index 8ec100011e8..00000000000 --- a/ace/ACE_Reactor_export.h +++ /dev/null @@ -1,58 +0,0 @@ - -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl -s ACE_Reactor -// ------------------------------ -#ifndef ACE_REACTOR_EXPORT_H -#define ACE_REACTOR_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (ACE_REACTOR_HAS_DLL) -# define ACE_REACTOR_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && ACE_REACTOR_HAS_DLL */ - -#if !defined (ACE_REACTOR_HAS_DLL) -# define ACE_REACTOR_HAS_DLL 1 -#endif /* ! ACE_REACTOR_HAS_DLL */ - -#if defined (ACE_REACTOR_HAS_DLL) && (ACE_REACTOR_HAS_DLL == 1) -# if defined (ACE_REACTOR_BUILD_DLL) -# define ACE_Reactor_Export ACE_Proper_Export_Flag -# define ACE_REACTOR_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define ACE_REACTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* ACE_REACTOR_BUILD_DLL */ -# define ACE_Reactor_Export ACE_Proper_Import_Flag -# define ACE_REACTOR_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define ACE_REACTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* ACE_REACTOR_BUILD_DLL */ -#else /* ACE_REACTOR_HAS_DLL == 1 */ -# define ACE_Reactor_Export -# define ACE_REACTOR_SINGLETON_DECLARATION(T) -# define ACE_REACTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* ACE_REACTOR_HAS_DLL == 1 */ - -// Set ACE_REACTOR_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (ACE_REACTOR_NTRACE) -# if (ACE_NTRACE == 1) -# define ACE_REACTOR_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define ACE_REACTOR_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !ACE_REACTOR_NTRACE */ - -#if (ACE_REACTOR_NTRACE == 1) -# define ACE_REACTOR_TRACE(X) -#else /* (ACE_REACTOR_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define ACE_REACTOR_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (ACE_REACTOR_NTRACE == 1) */ - -#endif /* ACE_REACTOR_EXPORT_H */ - -// End of auto generated file. diff --git a/ace/ACE_Sockets_export.h b/ace/ACE_Sockets_export.h deleted file mode 100644 index 1c57c959dc9..00000000000 --- a/ace/ACE_Sockets_export.h +++ /dev/null @@ -1,58 +0,0 @@ - -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl -s ACE_Sockets -// ------------------------------ -#ifndef ACE_SOCKETS_EXPORT_H -#define ACE_SOCKETS_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (ACE_SOCKETS_HAS_DLL) -# define ACE_SOCKETS_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && ACE_SOCKETS_HAS_DLL */ - -#if !defined (ACE_SOCKETS_HAS_DLL) -# define ACE_SOCKETS_HAS_DLL 1 -#endif /* ! ACE_SOCKETS_HAS_DLL */ - -#if defined (ACE_SOCKETS_HAS_DLL) && (ACE_SOCKETS_HAS_DLL == 1) -# if defined (ACE_SOCKETS_BUILD_DLL) -# define ACE_Sockets_Export ACE_Proper_Export_Flag -# define ACE_SOCKETS_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define ACE_SOCKETS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* ACE_SOCKETS_BUILD_DLL */ -# define ACE_Sockets_Export ACE_Proper_Import_Flag -# define ACE_SOCKETS_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define ACE_SOCKETS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* ACE_SOCKETS_BUILD_DLL */ -#else /* ACE_SOCKETS_HAS_DLL == 1 */ -# define ACE_Sockets_Export -# define ACE_SOCKETS_SINGLETON_DECLARATION(T) -# define ACE_SOCKETS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* ACE_SOCKETS_HAS_DLL == 1 */ - -// Set ACE_SOCKETS_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (ACE_SOCKETS_NTRACE) -# if (ACE_NTRACE == 1) -# define ACE_SOCKETS_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define ACE_SOCKETS_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !ACE_SOCKETS_NTRACE */ - -#if (ACE_SOCKETS_NTRACE == 1) -# define ACE_SOCKETS_TRACE(X) -#else /* (ACE_SOCKETS_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define ACE_SOCKETS_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (ACE_SOCKETS_NTRACE == 1) */ - -#endif /* ACE_SOCKETS_EXPORT_H */ - -// End of auto generated file. diff --git a/ace/ACE_Threads_export.h b/ace/ACE_Threads_export.h deleted file mode 100644 index d19193d9127..00000000000 --- a/ace/ACE_Threads_export.h +++ /dev/null @@ -1,58 +0,0 @@ - -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl -s ACE_Threads -// ------------------------------ -#ifndef ACE_THREADS_EXPORT_H -#define ACE_THREADS_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (ACE_THREADS_HAS_DLL) -# define ACE_THREADS_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && ACE_THREADS_HAS_DLL */ - -#if !defined (ACE_THREADS_HAS_DLL) -# define ACE_THREADS_HAS_DLL 1 -#endif /* ! ACE_THREADS_HAS_DLL */ - -#if defined (ACE_THREADS_HAS_DLL) && (ACE_THREADS_HAS_DLL == 1) -# if defined (ACE_THREADS_BUILD_DLL) -# define ACE_Threads_Export ACE_Proper_Export_Flag -# define ACE_THREADS_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define ACE_THREADS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* ACE_THREADS_BUILD_DLL */ -# define ACE_Threads_Export ACE_Proper_Import_Flag -# define ACE_THREADS_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define ACE_THREADS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* ACE_THREADS_BUILD_DLL */ -#else /* ACE_THREADS_HAS_DLL == 1 */ -# define ACE_Threads_Export -# define ACE_THREADS_SINGLETON_DECLARATION(T) -# define ACE_THREADS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* ACE_THREADS_HAS_DLL == 1 */ - -// Set ACE_THREADS_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (ACE_THREADS_NTRACE) -# if (ACE_NTRACE == 1) -# define ACE_THREADS_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define ACE_THREADS_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !ACE_THREADS_NTRACE */ - -#if (ACE_THREADS_NTRACE == 1) -# define ACE_THREADS_TRACE(X) -#else /* (ACE_THREADS_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define ACE_THREADS_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (ACE_THREADS_NTRACE == 1) */ - -#endif /* ACE_THREADS_EXPORT_H */ - -// End of auto generated file. diff --git a/ace/Activation_Queue.h b/ace/Activation_Queue.h index c1ae425a302..9da5894c1f9 100644 --- a/ace/Activation_Queue.h +++ b/ace/Activation_Queue.h @@ -16,13 +16,7 @@ #include /**/ "ace/pre.h" -#ifdef ACE_THREADS_BUILD_DLL -# include "ace/ACE_Threads_export.h" -#else -# include "ace/ACE_export.h" -# define ACE_Threads_Export ACE_Export -#endif /* ACE_THREADS_BUILD_DLL */ - +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -53,7 +47,7 @@ class ACE_Method_Request; * * @sa ACE_Method_Request */ -class ACE_Threads_Export ACE_Activation_Queue +class ACE_Export ACE_Activation_Queue { public: // = Initialization and termination methods. diff --git a/ace/Barrier.h b/ace/Barrier.h index 95a7ae3fe5f..56532801a65 100644 --- a/ace/Barrier.h +++ b/ace/Barrier.h @@ -16,12 +16,7 @@ #define ACE_BARRIER_H #include /**/ "ace/pre.h" -#ifdef ACE_THREADS_BUILD_DLL -# include "ace/ACE_Threads_export.h" -#else -# include "ace/ACE_export.h" -# define ACE_Threads_Export ACE_Export -#endif /* ACE_THREADS_BUILD_DLL */ +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -41,7 +36,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * * @brief This is a no-op to make ACE "syntactically consistent." */ -class ACE_Threads_Export ACE_Barrier +class ACE_Export ACE_Barrier { public: ACE_Barrier (unsigned int, const ACE_TCHAR * = 0, void * = 0) {} @@ -58,7 +53,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL ACE_BEGIN_VERSIONED_NAMESPACE_DECL -struct ACE_Threads_Export ACE_Sub_Barrier +struct ACE_Export ACE_Sub_Barrier { // = Initialization. ACE_Sub_Barrier (unsigned int count, @@ -98,7 +93,7 @@ struct ACE_Threads_Export ACE_Sub_Barrier * SunOpsis Vol. 4, No. 1 by Richard Marejka * (Richard.Marejka@canada.sun.com). */ -class ACE_Threads_Export ACE_Barrier +class ACE_Export ACE_Barrier { public: /// Initialize the barrier to synchronize @a count threads. @@ -157,7 +152,7 @@ private: * This class is just a simple wrapper for ACE_Barrier that * selects the USYNC_PROCESS variant for the locks. */ -class ACE_Threads_Export ACE_Process_Barrier : public ACE_Barrier +class ACE_Export ACE_Process_Barrier : public ACE_Barrier { public: /// Create a Process_Barrier, passing in the optional <name>. @@ -179,7 +174,7 @@ public: * This class is just a simple wrapper for ACE_Barrier that * selects the USYNC_THREAD variant for the locks. */ -class ACE_Threads_Export ACE_Thread_Barrier : public ACE_Barrier +class ACE_Export ACE_Thread_Barrier : public ACE_Barrier { public: /// Create a Thread_Barrier, passing in the optional @a name. diff --git a/ace/Based_Pointer_Repository.h b/ace/Based_Pointer_Repository.h index f55a0963088..9e37f7524e6 100644 --- a/ace/Based_Pointer_Repository.h +++ b/ace/Based_Pointer_Repository.h @@ -16,13 +16,7 @@ #include /**/ "ace/pre.h" -#ifdef ACE_MEMORY_BUILD_DLL -# include "ace/ACE_Memory_export.h" -#else -# include "ace/ACE_export.h" -# define ACE_Memory_Export ACE_Export -# define ACE_MEMORY_SINGLETON_DECLARE ACE_SINGLETON_DECLARE -#endif /* ACE_MEMORY_BUILD_DLL */ +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -44,7 +38,7 @@ class ACE_Based_Pointer_Repository_Rep; * @brief Maps pointers to the base address of the region to which each * pointer belongs. */ -class ACE_Memory_Export ACE_Based_Pointer_Repository +class ACE_Export ACE_Based_Pointer_Repository { public: // = Use <ACE_Null_Mutex> to allow locking while iterating. @@ -82,9 +76,9 @@ private: // ---------------------------------- /// Declare a process wide singleton -ACE_MEMORY_SINGLETON_DECLARE (ACE_Singleton, - ACE_Based_Pointer_Repository, - ACE_SYNCH_RW_MUTEX) +ACE_SINGLETON_DECLARE (ACE_Singleton, + ACE_Based_Pointer_Repository, + ACE_SYNCH_RW_MUTEX) /// Provide a Singleton access point to the based pointer repository. typedef ACE_Singleton<ACE_Based_Pointer_Repository, ACE_SYNCH_RW_MUTEX> diff --git a/ace/Codecs.h b/ace/Codecs.h index 23d6bf38456..3159a312c95 100644 --- a/ace/Codecs.h +++ b/ace/Codecs.h @@ -21,13 +21,7 @@ #include /**/ "ace/pre.h" -#ifdef ACE_THREADS_BUILD_DLL -# include "ace/ACE_Codecs_export.h" -#else -# include "ace/ACE_export.h" -# define ACE_Codecs_Export ACE_Export -#endif /* ACE_THREADS_BUILD_DLL */ - +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -49,7 +43,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * canonical form before encoding. * */ -class ACE_Codecs_Export ACE_Base64 +class ACE_Export ACE_Base64 { public: diff --git a/ace/Dev_Poll_Reactor.h b/ace/Dev_Poll_Reactor.h index 4b0a94c873e..109d548c128 100644 --- a/ace/Dev_Poll_Reactor.h +++ b/ace/Dev_Poll_Reactor.h @@ -19,12 +19,7 @@ #include /**/ "ace/pre.h" -#ifdef ACE_REACTOR_BUILD_DLL -# include "ace/ACE_Reactor_export.h" -#else -# include "ace/ACE_export.h" -# define ACE_Reactor_Export ACE_Export -#endif /* ACE_REACTOR_BUILD_DLL */ +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -476,7 +471,7 @@ typedef ACE_Noop_Token ACE_DEV_POLL_TOKEN; #endif /* ACE_MT_SAFE && ACE_MT_SAFE != 0 */ typedef ACE_Reactor_Token_T<ACE_DEV_POLL_TOKEN> ACE_Dev_Poll_Reactor_Token; -class ACE_Reactor_Export ACE_Dev_Poll_Reactor : public ACE_Reactor_Impl +class ACE_Export ACE_Dev_Poll_Reactor : public ACE_Reactor_Impl { public: diff --git a/ace/File_Lock.h b/ace/File_Lock.h index aaa9ac67699..c30f8e83e97 100644 --- a/ace/File_Lock.h +++ b/ace/File_Lock.h @@ -14,12 +14,7 @@ #define ACE_FILE_LOCK_H #include /**/ "ace/pre.h" -#ifdef ACE_THREADS_BUILD_DLL -# include "ace/ACE_Threads_export.h" -#else -# include "ace/ACE_export.h" -# define ACE_Threads_Export ACE_Export -#endif /* ACE_THREADS_BUILD_DLL */ +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -37,7 +32,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * Allows us to "adapt" the UNIX file locking mechanisms to work * with all of our Guard stuff... */ -class ACE_Threads_Export ACE_File_Lock +class ACE_Export ACE_File_Lock { public: /** diff --git a/ace/LSOCK.h b/ace/LSOCK.h index 0db791efa9d..fc9183a604d 100644 --- a/ace/LSOCK.h +++ b/ace/LSOCK.h @@ -16,12 +16,7 @@ #include /**/ "ace/pre.h" -#ifdef ACE_SOCKETS_BUILD_DLL -# include "ace/ACE_Sockets_export.h" -#else -# include "ace/ACE_export.h" -# define ACE_Sockets_Export ACE_Export -#endif /* ACE_SOCKETS_BUILD_DLL */ +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -39,7 +34,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * @brief Create a Local ACE_SOCK, which is used for passing file * descriptors. */ -class ACE_Sockets_Export ACE_LSOCK +class ACE_Export ACE_LSOCK { public: #if defined (ACE_HAS_MSG) diff --git a/ace/LSOCK_Acceptor.h b/ace/LSOCK_Acceptor.h index 94a52f05581..8fec44e0f22 100644 --- a/ace/LSOCK_Acceptor.h +++ b/ace/LSOCK_Acceptor.h @@ -38,7 +38,7 @@ class ACE_Reactor; * @brief Defines the format and interface for the acceptor side of the * local ACE_SOCK ACE_Stream. */ -class ACE_Sockets_Export ACE_LSOCK_Acceptor : public ACE_SOCK_Acceptor +class ACE_Export ACE_LSOCK_Acceptor : public ACE_SOCK_Acceptor { public: // = Initialization methods. diff --git a/ace/LSOCK_CODgram.h b/ace/LSOCK_CODgram.h index f3d8e1e54c3..3f017e8816b 100644 --- a/ace/LSOCK_CODgram.h +++ b/ace/LSOCK_CODgram.h @@ -35,7 +35,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * @brief Defines the member functions for the <ACE_LSOCK> connected * datagram abstraction. */ -class ACE_Sockets_Export ACE_LSOCK_CODgram : public ACE_SOCK_CODgram, public ACE_LSOCK +class ACE_Export ACE_LSOCK_CODgram : public ACE_SOCK_CODgram, public ACE_LSOCK { public: // = Initialization methods. diff --git a/ace/LSOCK_Connector.h b/ace/LSOCK_Connector.h index af8856ae5b8..a362a1587d4 100644 --- a/ace/LSOCK_Connector.h +++ b/ace/LSOCK_Connector.h @@ -34,7 +34,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * @brief Defines the format and interface for the connector side of * the <ACE_LSOCK_Stream>. */ -class ACE_Sockets_Export ACE_LSOCK_Connector : public ACE_SOCK_Connector +class ACE_Export ACE_LSOCK_Connector : public ACE_SOCK_Connector { public: // = Initialization methods. diff --git a/ace/LSOCK_Dgram.h b/ace/LSOCK_Dgram.h index fd9bc9509cf..4a1b43eaf8c 100644 --- a/ace/LSOCK_Dgram.h +++ b/ace/LSOCK_Dgram.h @@ -33,7 +33,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * * @brief Create a Local ACE_SOCK datagram. */ -class ACE_Sockets_Export ACE_LSOCK_Dgram : public ACE_SOCK_Dgram, public ACE_LSOCK +class ACE_Export ACE_LSOCK_Dgram : public ACE_SOCK_Dgram, public ACE_LSOCK { public: // = Initialization methods. diff --git a/ace/LSOCK_Stream.h b/ace/LSOCK_Stream.h index 47e2038ca06..68c43a4c221 100644 --- a/ace/LSOCK_Stream.h +++ b/ace/LSOCK_Stream.h @@ -34,7 +34,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * * @brief Create a Local ACE_SOCK stream. */ -class ACE_Sockets_Export ACE_LSOCK_Stream : public ACE_SOCK_Stream, public ACE_LSOCK +class ACE_Export ACE_LSOCK_Stream : public ACE_SOCK_Stream, public ACE_LSOCK { public: // = Send/recv methods. diff --git a/ace/MEM_Acceptor.h b/ace/MEM_Acceptor.h index 7445ec7d585..7b085f825ca 100644 --- a/ace/MEM_Acceptor.h +++ b/ace/MEM_Acceptor.h @@ -14,12 +14,7 @@ #define ACE_MEM_ACCEPTOR_H #include /**/ "ace/pre.h" -#ifdef ACE_MEMORY_BUILD_DLL -# include "ace/ACE_Memory_export.h" -#else -# include "ace/ACE_export.h" -# define ACE_Memory_Export ACE_Export -#endif /* ACE_MEMORY_BUILD_DLL */ +#include "ace/ACE_export.h" #include "ace/SOCK_Acceptor.h" @@ -56,7 +51,7 @@ class ACE_Reactor; * if so desired. (Currently, using UNIX-domain sockets, i.e., * ACE_LSOCK_*, with this class will not work.) */ -class ACE_Memory_Export ACE_MEM_Acceptor : public ACE_SOCK_Acceptor +class ACE_Export ACE_MEM_Acceptor : public ACE_SOCK_Acceptor { public: // = Initialization methods. diff --git a/ace/MEM_Addr.h b/ace/MEM_Addr.h index e263121e281..b14d1dd4d23 100644 --- a/ace/MEM_Addr.h +++ b/ace/MEM_Addr.h @@ -15,12 +15,7 @@ #define ACE_MEM_ADDR_H #include /**/ "ace/pre.h" -#ifdef ACE_MEMORY_BUILD_DLL -# include "ace/ACE_Memory_export.h" -#else -# include "ace/ACE_export.h" -# define ACE_Memory_Export ACE_Export -#endif /* ACE_MEMORY_BUILD_DLL */ +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -38,7 +33,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * @brief Defines a C++ wrapper facade for the shared memory transport * address family format. */ -class ACE_Memory_Export ACE_MEM_Addr : public ACE_Addr +class ACE_Export ACE_MEM_Addr : public ACE_Addr { public: // = Initialization methods. diff --git a/ace/MEM_Connector.h b/ace/MEM_Connector.h index a4caa391813..78fae54d0c1 100644 --- a/ace/MEM_Connector.h +++ b/ace/MEM_Connector.h @@ -14,13 +14,7 @@ #define ACE_MEM_CONNECTOR_H #include /**/ "ace/pre.h" -#ifdef ACE_MEMORY_BUILD_DLL -# include "ace/ACE_Memory_export.h" -#else -# include "ace/ACE_export.h" -# define ACE_Memory_Export ACE_Export -#endif /* ACE_MEMORY_BUILD_DLL */ -#include "ace/SOCK_Connector.h" +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -28,6 +22,7 @@ #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1) +#include "ace/SOCK_Connector.h" #include "ace/MEM_Stream.h" #include "ace/MEM_Addr.h" @@ -39,7 +34,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * @brief Defines the format and interface for connecting to a peer * on a @c ACE_MEM_Stream object. */ -class ACE_Memory_Export ACE_MEM_Connector : public ACE_SOCK_Connector +class ACE_Export ACE_MEM_Connector : public ACE_SOCK_Connector { public: // = Initialization methods. diff --git a/ace/MEM_IO.h b/ace/MEM_IO.h index bb611b76a2a..9fda4512af3 100644 --- a/ace/MEM_IO.h +++ b/ace/MEM_IO.h @@ -15,12 +15,13 @@ #define ACE_MEM_IO_H #include /**/ "ace/pre.h" -#ifdef ACE_MEMORY_BUILD_DLL -# include "ace/ACE_Memory_export.h" -#else -# include "ace/ACE_export.h" -# define ACE_Memory_Export ACE_Export -#endif /* ACE_MEMORY_BUILD_DLL */ +#include "ace/ACE_export.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1) #include "ace/SOCK.h" #include "ace/MEM_SAP.h" @@ -28,15 +29,10 @@ #include "ace/Process_Semaphore.h" #include "ace/Process_Mutex.h" -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1) ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Memory_Export ACE_Reactive_MEM_IO : public ACE_MEM_SAP +class ACE_Export ACE_Reactive_MEM_IO : public ACE_MEM_SAP { public: ACE_Reactive_MEM_IO (void); @@ -79,7 +75,7 @@ public: }; #if defined (ACE_WIN32) || !defined (_ACE_USE_SV_SEM) -class ACE_Memory_Export ACE_MT_MEM_IO : public ACE_MEM_SAP +class ACE_Export ACE_MT_MEM_IO : public ACE_MEM_SAP { public: typedef struct @@ -171,7 +167,7 @@ private: * the other end. The receiving side then reverses the * procedures and copies the information into user buffer. */ -class ACE_Memory_Export ACE_MEM_IO : public ACE_SOCK +class ACE_Export ACE_MEM_IO : public ACE_SOCK { public: // = Initialization and termination methods. diff --git a/ace/MEM_SAP.h b/ace/MEM_SAP.h index 7104ff6ed6b..05704655567 100644 --- a/ace/MEM_SAP.h +++ b/ace/MEM_SAP.h @@ -15,14 +15,7 @@ #include /**/ "ace/pre.h" -#ifdef ACE_MEMORY_BUILD_DLL -# include "ace/ACE_Memory_export.h" -#else -# include "ace/ACE_export.h" -# define ACE_Memory_Export ACE_Export -#endif /* ACE_MEMORY_BUILD_DLL */ - -#include "ace/PI_Malloc.h" +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -31,6 +24,7 @@ // MEM_SAP requries position independent pointers to work #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1) +#include "ace/PI_Malloc.h" #include "ace/Malloc_T.h" #include "ace/MMAP_Memory_Pool.h" #include "ace/Process_Mutex.h" @@ -45,7 +39,7 @@ class ACE_MEM_IO; // Internal data structure // MEM_SAP uses to queue up // data. -class ACE_Memory_Export ACE_MEM_SAP_Node +class ACE_Export ACE_MEM_SAP_Node { public: // friend class ACE_MEM_SAP; @@ -82,7 +76,7 @@ public: * @brief Defines the methods of shared memory management for * shared memory transport. */ -class ACE_Memory_Export ACE_MEM_SAP +class ACE_Export ACE_MEM_SAP { public: // = Initialization and termination methods. diff --git a/ace/MEM_Stream.h b/ace/MEM_Stream.h index fad77f06b06..1a8e4325116 100644 --- a/ace/MEM_Stream.h +++ b/ace/MEM_Stream.h @@ -50,7 +50,7 @@ class ACE_MEM_Connector; * @c ACE_MEM_Acceptor::init_buffer_size (size_t size); * before establishing a connection. */ -class ACE_Memory_Export ACE_MEM_Stream : public ACE_MEM_IO +class ACE_Export ACE_MEM_Stream : public ACE_MEM_IO { public: diff --git a/ace/MMAP_Memory_Pool.h b/ace/MMAP_Memory_Pool.h index f1f33a4bd89..0b81e015896 100644 --- a/ace/MMAP_Memory_Pool.h +++ b/ace/MMAP_Memory_Pool.h @@ -16,12 +16,7 @@ #include /**/ "ace/pre.h" -#ifdef ACE_MEMORY_BUILD_DLL -# include "ace/ACE_Memory_export.h" -#else -# include "ace/ACE_export.h" -# define ACE_Memory_Export ACE_Export -#endif /* ACE_MEMORY_BUILD_DLL */ +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -42,7 +37,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * This should be a nested class, but that breaks too many * compilers. */ -class ACE_Memory_Export ACE_MMAP_Memory_Pool_Options +class ACE_Export ACE_MMAP_Memory_Pool_Options { public: enum @@ -130,7 +125,7 @@ private: * @brief Make a memory pool that is based on @c mmap(2). This * implementation allows memory to be shared between processes. */ -class ACE_Memory_Export ACE_MMAP_Memory_Pool : public ACE_Event_Handler +class ACE_Export ACE_MMAP_Memory_Pool : public ACE_Event_Handler { public: typedef ACE_MMAP_Memory_Pool_Options OPTIONS; @@ -281,7 +276,7 @@ protected: * every update. Naturally, this trades off increased * performance for less reliability if the machine crashes. */ -class ACE_Memory_Export ACE_Lite_MMAP_Memory_Pool : public ACE_MMAP_Memory_Pool +class ACE_Export ACE_Lite_MMAP_Memory_Pool : public ACE_MMAP_Memory_Pool { public: /// Initialize the pool. diff --git a/ace/Mem_Map.h b/ace/Mem_Map.h index 3163730a0d0..80c7e88fb87 100644 --- a/ace/Mem_Map.h +++ b/ace/Mem_Map.h @@ -15,12 +15,7 @@ #include /**/ "ace/pre.h" -#ifdef ACE_MEMORY_BUILD_DLL -# include "ace/ACE_Memory_export.h" -#else -# include "ace/ACE_export.h" -# define ACE_Memory_Export ACE_Export -#endif /* ACE_MEMORY_BUILD_DLL */ +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -42,7 +37,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * This class works with both the mmap(2) UNIX system and the * Win32 family of memory mapping system calls. */ -class ACE_Memory_Export ACE_Mem_Map +class ACE_Export ACE_Mem_Map { public: // = Initialization and termination methods. diff --git a/ace/Method_Request.h b/ace/Method_Request.h index 93adf76b8b7..e6b4564f91b 100644 --- a/ace/Method_Request.h +++ b/ace/Method_Request.h @@ -17,12 +17,7 @@ #include /**/ "ace/pre.h" -#ifdef ACE_THREADS_BUILD_DLL -# include "ace/ACE_Threads_export.h" -#else -# include "ace/ACE_export.h" -# define ACE_Threads_Export ACE_Export -#endif /* ACE_THREADS_BUILD_DLL */ +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -47,7 +42,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * * @sa ACE_Activation_Queue */ -class ACE_Threads_Export ACE_Method_Request +class ACE_Export ACE_Method_Request { public: // = Initialization and termination methods. diff --git a/ace/Msg_WFMO_Reactor.h b/ace/Msg_WFMO_Reactor.h index 84bea304297..633d91562cb 100644 --- a/ace/Msg_WFMO_Reactor.h +++ b/ace/Msg_WFMO_Reactor.h @@ -16,12 +16,7 @@ #define ACE_MSG_WFMO_REACTOR_H #include /**/ "ace/pre.h" -#ifdef ACE_REACTOR_BUILD_DLL -# include "ace/ACE_Reactor_export.h" -#else -# include "ace/ACE_export.h" -# define ACE_Reactor_Export ACE_Export -#endif /* ACE_REACTOR_BUILD_DLL */ +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -44,7 +39,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * its ability to react on Windows messages. It is needed when * the task should serve also as a COM/DCOM server. */ -class ACE_Reactor_Export ACE_Msg_WFMO_Reactor : public ACE_WFMO_Reactor +class ACE_Export ACE_Msg_WFMO_Reactor : public ACE_WFMO_Reactor { public: // = Initialization and termination methods. diff --git a/ace/Multihomed_INET_Addr.h b/ace/Multihomed_INET_Addr.h index 07dc27d33e2..a7a838395db 100644 --- a/ace/Multihomed_INET_Addr.h +++ b/ace/Multihomed_INET_Addr.h @@ -15,12 +15,7 @@ #include /**/ "ace/pre.h" -#ifdef ACE_SOCKETS_BUILD_DLL -# include "ace/ACE_Sockets_export.h" -#else -# include "ace/ACE_export.h" -# define ACE_Sockets_Export ACE_Export -#endif /* ACE_SOCKETS_BUILD_DLL */ +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -37,7 +32,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * @brief Extends ACE_INET_Addr with support for multi-homed * addresses. */ -class ACE_Sockets_Export ACE_Multihomed_INET_Addr : public ACE_INET_Addr +class ACE_Export ACE_Multihomed_INET_Addr : public ACE_INET_Addr { public: // = Initialization methods. diff --git a/ace/PI_Malloc.h b/ace/PI_Malloc.h index 5c5c0532d60..19adac76d6b 100644 --- a/ace/PI_Malloc.h +++ b/ace/PI_Malloc.h @@ -16,12 +16,7 @@ #include /**/ "ace/pre.h" -#ifdef ACE_MEMORY_BUILD_DLL -# include "ace/ACE_Memory_export.h" -#else -# include "ace/ACE_export.h" -# define ACE_Memory_Export ACE_Export -#endif /* ACE_MEMORY_BUILD_DLL */ +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -46,7 +41,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * processes sharing the memory. The tradoff of this flexibility * is more expensive malloc/free operations. */ -class ACE_Memory_Export ACE_PI_Control_Block +class ACE_Export ACE_PI_Control_Block { public: class ACE_Malloc_Header; @@ -63,7 +58,7 @@ public: * to keep track of each chunk of data when it's in the free * list or in use. */ - class ACE_Memory_Export ACE_Malloc_Header + class ACE_Export ACE_Malloc_Header { public: ACE_Malloc_Header (void); @@ -104,7 +99,7 @@ public: * it easy to iterate over the items in the list in both FIFO * and LIFO order. */ - class ACE_Memory_Export ACE_Name_Node + class ACE_Export ACE_Name_Node { public: // = Initialization methods. diff --git a/ace/Pagefile_Memory_Pool.h b/ace/Pagefile_Memory_Pool.h index 6033698d305..eab04d23849 100644 --- a/ace/Pagefile_Memory_Pool.h +++ b/ace/Pagefile_Memory_Pool.h @@ -16,12 +16,7 @@ #include /**/ "ace/pre.h" -#ifdef ACE_MEMORY_BUILD_DLL -# include "ace/ACE_Memory_export.h" -#else -# include "ace/ACE_export.h" -# define ACE_Memory_Export ACE_Export -#endif /* ACE_MEMORY_BUILD_DLL */ +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -42,12 +37,13 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * This should be a nested class, but that breaks too many * compilers. */ -class ACE_Memory_Export ACE_Pagefile_Memory_Pool_Options +class ACE_Export ACE_Pagefile_Memory_Pool_Options { public: /// Initialization method. - ACE_Pagefile_Memory_Pool_Options (void *base_addr = ACE_DEFAULT_PAGEFILE_POOL_BASE, - size_t max_size = ACE_DEFAULT_PAGEFILE_POOL_SIZE); + ACE_Pagefile_Memory_Pool_Options ( + void *base_addr = ACE_DEFAULT_PAGEFILE_POOL_BASE, + size_t max_size = ACE_DEFAULT_PAGEFILE_POOL_SIZE); /// Base address of the memory-mapped backing store. void *base_addr_; @@ -62,7 +58,7 @@ public: * @brief Make a memory pool that is based on "anonymous" memory * regions allocated from the Win32 page file. */ -class ACE_Memory_Export ACE_Pagefile_Memory_Pool +class ACE_Export ACE_Pagefile_Memory_Pool { public: typedef ACE_Pagefile_Memory_Pool_Options OPTIONS; diff --git a/ace/Priority_Reactor.h b/ace/Priority_Reactor.h index 3c4bc2917e5..24a04166d88 100644 --- a/ace/Priority_Reactor.h +++ b/ace/Priority_Reactor.h @@ -14,12 +14,7 @@ #define ACE_PRIORITY_REACTOR_H #include /**/ "ace/pre.h" -#ifdef ACE_REACTOR_BUILD_DLL -# include "ace/ACE_Reactor_export.h" -#else -# include "ace/ACE_export.h" -# define ACE_Reactor_Export ACE_Export -#endif /* ACE_REACTOR_BUILD_DLL */ +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -39,7 +34,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * Select_Reactor by taking advantage of the priority method on * ACE_Event_Handler. */ -class ACE_Reactor_Export ACE_Priority_Reactor : public ACE_Select_Reactor +class ACE_Export ACE_Priority_Reactor : public ACE_Select_Reactor { public: // = Initialization and termination methods. diff --git a/ace/Process.h b/ace/Process.h index 8c0e55ac224..7a14097e154 100644 --- a/ace/Process.h +++ b/ace/Process.h @@ -15,12 +15,7 @@ #include /**/ "ace/pre.h" -#ifdef ACE_THREADS_BUILD_DLL -# include "ace/ACE_Threads_export.h" -#else -# include "ace/ACE_export.h" -# define ACE_Threads_Export ACE_Export -#endif /* ACE_THREADS_BUILD_DLL */ +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -54,7 +49,7 @@ class ACE_Time_Value; * then, the <spawn> is using the <execvp> which searches for the * program file in the PATH variable. */ -class ACE_Threads_Export ACE_Process_Options +class ACE_Export ACE_Process_Options { public: enum @@ -442,7 +437,7 @@ protected: * then, the <spawn> is using the <execvp> which searches for the * program file in the PATH variable. */ -class ACE_Threads_Export ACE_Process +class ACE_Export ACE_Process { public: friend class ACE_Process_Manager; @@ -589,7 +584,7 @@ protected: * @arg unmanage() method that deletes the instance. * This class is only valid for use as a dynamically-allocated object! */ -class ACE_Threads_Export ACE_Managed_Process : public ACE_Process +class ACE_Export ACE_Managed_Process : public ACE_Process { public: diff --git a/ace/Process_Manager.h b/ace/Process_Manager.h index 29bade963f2..0166c5e0402 100644 --- a/ace/Process_Manager.h +++ b/ace/Process_Manager.h @@ -15,12 +15,7 @@ #include /**/ "ace/pre.h" -#ifdef ACE_THREADS_BUILD_DLL -# include "ace/ACE_Threads_export.h" -#else -# include "ace/ACE_export.h" -# define ACE_Threads_Export ACE_Export -#endif /* ACE_THREADS_BUILD_DLL */ +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -44,7 +39,7 @@ class ACE_Reactor; * @brief Information describing each process that's controlled by an * \<ACE_Process_Manager\>. */ -class ACE_Threads_Export ACE_Process_Descriptor +class ACE_Export ACE_Process_Descriptor { private: friend class ACE_Process_Manager; @@ -126,7 +121,7 @@ private: * + The <handle_input> method collects all available exit * statuses. */ -class ACE_Threads_Export ACE_Process_Manager : protected ACE_Event_Handler +class ACE_Export ACE_Process_Manager : protected ACE_Event_Handler { public: friend class ACE_Process_Control; diff --git a/ace/Process_Semaphore.h b/ace/Process_Semaphore.h index 7ab286e423e..d9b813b4d4d 100644 --- a/ace/Process_Semaphore.h +++ b/ace/Process_Semaphore.h @@ -18,13 +18,7 @@ #include /**/ "ace/pre.h" -#ifdef ACE_THREADS_BUILD_DLL -# include "ace/ACE_Threads_export.h" -#else -# include "ace/ACE_export.h" -# define ACE_Threads_Export ACE_Export -#endif /* ACE_THREADS_BUILD_DLL */ - +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -44,7 +38,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * @brief Wrapper for Dijkstra style general semaphores that work * across processes. */ -class ACE_Threads_Export ACE_Process_Semaphore +class ACE_Export ACE_Process_Semaphore { public: /// Initialize the semaphore, with an initial value of @a count and a @@ -157,7 +151,7 @@ template <class T> class ACE_Malloc_Lock_Adapter_T; * the standard form used by other lock strategy classes. */ template<> -class ACE_Threads_Export ACE_Malloc_Lock_Adapter_T<ACE_Process_Semaphore> +class ACE_Export ACE_Malloc_Lock_Adapter_T<ACE_Process_Semaphore> { public: ACE_Process_Semaphore * operator () (const ACE_TCHAR *name); diff --git a/ace/QoS/qos.mpc b/ace/QoS/qos.mpc index 6d352dd3662..cf50f96b557 100644 --- a/ace/QoS/qos.mpc +++ b/ace/QoS/qos.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(QoS) : acelib, acesocketslib_for_tao, core { +project(QoS) : acelib, core { requires += qos sharedname = ACE_QoS dynamicflags = ACE_QoS_BUILD_DLL diff --git a/ace/RW_Process_Mutex.h b/ace/RW_Process_Mutex.h index 828a003fdac..a34b6f9f404 100644 --- a/ace/RW_Process_Mutex.h +++ b/ace/RW_Process_Mutex.h @@ -39,7 +39,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * \todo For systems with pthread_rwlockattr_setpshared one * may consider using them to make the mutex faster. */ -class ACE_Threads_Export ACE_RW_Process_Mutex +class ACE_Export ACE_RW_Process_Mutex { public: /// Create a readers/writer <Process_Mutex>, passing in the optional diff --git a/ace/SOCK_CODgram.h b/ace/SOCK_CODgram.h index 9027bd518bc..007f7352c97 100644 --- a/ace/SOCK_CODgram.h +++ b/ace/SOCK_CODgram.h @@ -15,13 +15,7 @@ #define ACE_SOCK_CODGRAM_H #include /**/ "ace/pre.h" -#ifdef ACE_SOCKETS_BUILD_DLL -# include "ace/ACE_Sockets_export.h" -#else -# include "ace/ACE_export.h" -# define ACE_Sockets_Export ACE_Export -#endif /* ACE_SOCKETS_BUILD_DLL */ - +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -39,7 +33,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * @brief Defines the member functions for the ACE_SOCK connected * datagram abstraction. */ -class ACE_Sockets_Export ACE_SOCK_CODgram : public ACE_SOCK_IO +class ACE_Export ACE_SOCK_CODgram : public ACE_SOCK_IO { public: // = Initialization methods. diff --git a/ace/SOCK_Dgram_Bcast.h b/ace/SOCK_Dgram_Bcast.h index 4ad28109d95..de0c80cb9e9 100644 --- a/ace/SOCK_Dgram_Bcast.h +++ b/ace/SOCK_Dgram_Bcast.h @@ -15,12 +15,7 @@ #define ACE_SOCK_DGRAM_BCAST_H #include /**/ "ace/pre.h" -#ifdef ACE_SOCKETS_BUILD_DLL -# include "ace/ACE_Sockets_export.h" -#else -# include "ace/ACE_export.h" -# define ACE_Sockets_Export ACE_Export -#endif /* ACE_SOCKETS_BUILD_DLL */ +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -36,7 +31,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * * @brief Linked list of broadcast interfaces. */ -class ACE_Sockets_Export ACE_Bcast_Node +class ACE_Export ACE_Bcast_Node { public: /// Default constructor. @@ -59,7 +54,7 @@ public: * @brief Defines the member functions for the ACE_SOCK datagram * abstraction. */ -class ACE_Sockets_Export ACE_SOCK_Dgram_Bcast : public ACE_SOCK_Dgram +class ACE_Export ACE_SOCK_Dgram_Bcast : public ACE_SOCK_Dgram { public: // = Initialization and termination methods. diff --git a/ace/SOCK_Dgram_Mcast.h b/ace/SOCK_Dgram_Mcast.h index 1019b1d6dd0..30960a72bf2 100644 --- a/ace/SOCK_Dgram_Mcast.h +++ b/ace/SOCK_Dgram_Mcast.h @@ -19,12 +19,7 @@ #include /**/ "ace/pre.h" -#ifdef ACE_SOCKETS_BUILD_DLL -# include "ace/ACE_Sockets_export.h" -#else -# include "ace/ACE_export.h" -# define ACE_Sockets_Export ACE_Export -#endif /* ACE_SOCKETS_BUILD_DLL */ +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -96,7 +91,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * alphanumeric form and <subscribe> will convert them into numbers via * <ACE_OS::atoi>. */ -class ACE_Sockets_Export ACE_SOCK_Dgram_Mcast : public ACE_SOCK_Dgram +class ACE_Export ACE_SOCK_Dgram_Mcast : public ACE_SOCK_Dgram { public: diff --git a/ace/SOCK_SEQPACK_Acceptor.h b/ace/SOCK_SEQPACK_Acceptor.h index 921bcc86d0c..10d626e03d8 100644 --- a/ace/SOCK_SEQPACK_Acceptor.h +++ b/ace/SOCK_SEQPACK_Acceptor.h @@ -18,20 +18,15 @@ #include /**/ "ace/pre.h" -#ifdef ACE_SOCKETS_BUILD_DLL -# include "ace/ACE_Sockets_export.h" -#else -# include "ace/ACE_export.h" -# define ACE_Sockets_Export ACE_Export -#endif /* ACE_SOCKETS_BUILD_DLL */ - -#include "ace/SOCK_SEQPACK_Association.h" -#include "ace/Multihomed_INET_Addr.h" +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/SOCK_SEQPACK_Association.h" +#include "ace/Multihomed_INET_Addr.h" + ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Time_Value; @@ -47,7 +42,7 @@ class ACE_Time_Value; * Therefore, by inheriting from <ACE_SOCK>, <ACE_SOCK_SEQPACK_Acceptor> * gets its very own socket. */ -class ACE_Sockets_Export ACE_SOCK_SEQPACK_Acceptor : public ACE_SOCK +class ACE_Export ACE_SOCK_SEQPACK_Acceptor : public ACE_SOCK { public: // = Initialization and termination methods. diff --git a/ace/SOCK_SEQPACK_Association.h b/ace/SOCK_SEQPACK_Association.h index f0295275c07..0574c7c2918 100644 --- a/ace/SOCK_SEQPACK_Association.h +++ b/ace/SOCK_SEQPACK_Association.h @@ -20,19 +20,13 @@ #include /**/ "ace/pre.h" -#ifdef ACE_SOCKETS_BUILD_DLL -# include "ace/ACE_Sockets_export.h" -#else -# include "ace/ACE_export.h" -# define ACE_Sockets_Export ACE_Export -#endif /* ACE_SOCKETS_BUILD_DLL */ - -#include "ace/SOCK_IO.h" +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/SOCK_IO.h" #include "ace/Multihomed_INET_Addr.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -81,7 +75,7 @@ class ACE_Message_Block; * will result in <send> getting called on Win32 platforms, and * <write> getting called on non-Win32 platforms. */ -class ACE_Sockets_Export ACE_SOCK_SEQPACK_Association : public ACE_SOCK_IO +class ACE_Export ACE_SOCK_SEQPACK_Association : public ACE_SOCK_IO { public: // Initialization and termination methods. diff --git a/ace/SOCK_SEQPACK_Connector.h b/ace/SOCK_SEQPACK_Connector.h index ae5f0c7573a..7a567c47ec0 100644 --- a/ace/SOCK_SEQPACK_Connector.h +++ b/ace/SOCK_SEQPACK_Connector.h @@ -19,12 +19,7 @@ #include /**/ "ace/pre.h" -#ifdef ACE_SOCKETS_BUILD_DLL -# include "ace/ACE_Sockets_export.h" -#else -# include "ace/ACE_export.h" -# define ACE_Sockets_Export ACE_Export -#endif /* ACE_SOCKETS_BUILD_DLL */ +#include "ace/ACE_export.h" #include "ace/SOCK_SEQPACK_Association.h" #include "ace/Multihomed_INET_Addr.h" @@ -53,7 +48,7 @@ class ACE_Time_Value; * this is that @c ACE_SOCK_SEQPACK_Connector objects do not store state so * they can be used reentrantly in multithreaded programs. */ -class ACE_Sockets_Export ACE_SOCK_SEQPACK_Connector +class ACE_Export ACE_SOCK_SEQPACK_Connector { public: // = Initialization and termination methods. diff --git a/ace/SV_Shared_Memory.h b/ace/SV_Shared_Memory.h index b65b5452a58..4f4da514c45 100644 --- a/ace/SV_Shared_Memory.h +++ b/ace/SV_Shared_Memory.h @@ -15,12 +15,7 @@ #include /**/ "ace/pre.h" -#ifdef ACE_MEMORY_BUILD_DLL -# include "ace/ACE_Memory_export.h" -#else -# include "ace/ACE_export.h" -# define ACE_Memory_Export ACE_Export -#endif /* ACE_MEMORY_BUILD_DLL */ +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -37,7 +32,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * * @brief This is a wrapper for System V shared memory. */ -class ACE_Memory_Export ACE_SV_Shared_Memory +class ACE_Export ACE_SV_Shared_Memory { public: enum diff --git a/ace/Sbrk_Memory_Pool.h b/ace/Sbrk_Memory_Pool.h index ed291fe2f46..092099e9e34 100644 --- a/ace/Sbrk_Memory_Pool.h +++ b/ace/Sbrk_Memory_Pool.h @@ -16,12 +16,7 @@ #include /**/ "ace/pre.h" -#ifdef ACE_MEMORY_BUILD_DLL -# include "ace/ACE_Memory_export.h" -#else -# include "ace/ACE_export.h" -# define ACE_Memory_Export ACE_Export -#endif /* ACE_MEMORY_BUILD_DLL */ +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -43,7 +38,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * This should be a nested class, but that breaks too many * compilers. */ -class ACE_Memory_Export ACE_Sbrk_Memory_Pool_Options +class ACE_Export ACE_Sbrk_Memory_Pool_Options { }; @@ -52,7 +47,7 @@ class ACE_Memory_Export ACE_Sbrk_Memory_Pool_Options * * @brief Make a memory pool that is based on <sbrk(2)>. */ -class ACE_Memory_Export ACE_Sbrk_Memory_Pool +class ACE_Export ACE_Sbrk_Memory_Pool { public: typedef ACE_Sbrk_Memory_Pool_Options OPTIONS; diff --git a/ace/Shared_Memory.h b/ace/Shared_Memory.h index 1000cbd5412..2ebc8b79d36 100644 --- a/ace/Shared_Memory.h +++ b/ace/Shared_Memory.h @@ -16,12 +16,7 @@ #include /**/ "ace/pre.h" -#ifdef ACE_MEMORY_BUILD_DLL -# include "ace/ACE_Memory_export.h" -#else -# include "ace/ACE_export.h" -# define ACE_Memory_Export ACE_Export -#endif /* ACE_MEMORY_BUILD_DLL */ +#include "ace/ACE_export.h" #include "ace/os_include/os_stddef.h" @@ -42,7 +37,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * memory. For a much more sophisticated version, please check * out the <ACE_Malloc> class. */ -class ACE_Memory_Export ACE_Shared_Memory +class ACE_Export ACE_Shared_Memory { public: virtual ~ACE_Shared_Memory (void); diff --git a/ace/Shared_Memory_MM.h b/ace/Shared_Memory_MM.h index 70602aa6521..810133e5a68 100644 --- a/ace/Shared_Memory_MM.h +++ b/ace/Shared_Memory_MM.h @@ -34,7 +34,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * manager. For more a powerful memory allocator please see * <ACE_Malloc>. */ -class ACE_Memory_Export ACE_Shared_Memory_MM : public ACE_Shared_Memory +class ACE_Export ACE_Shared_Memory_MM : public ACE_Shared_Memory { public: // = Initialization and termination methods. diff --git a/ace/Shared_Memory_Pool.h b/ace/Shared_Memory_Pool.h index 66b35d3b1e4..996cde2b490 100644 --- a/ace/Shared_Memory_Pool.h +++ b/ace/Shared_Memory_Pool.h @@ -16,12 +16,7 @@ #include /**/ "ace/pre.h" -#ifdef ACE_MEMORY_BUILD_DLL -# include "ace/ACE_Memory_export.h" -#else -# include "ace/ACE_export.h" -# define ACE_Memory_Export ACE_Export -#endif /* ACE_MEMORY_BUILD_DLL */ +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -44,7 +39,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * This should be a nested class, but that breaks too many * compilers. */ -class ACE_Memory_Export ACE_Shared_Memory_Pool_Options +class ACE_Export ACE_Shared_Memory_Pool_Options { public: /// Initialization method. @@ -83,7 +78,7 @@ public: * provides more powerful features, such as persistent backing store * and greatly scalability. */ -class ACE_Memory_Export ACE_Shared_Memory_Pool : public ACE_Event_Handler +class ACE_Export ACE_Shared_Memory_Pool : public ACE_Event_Handler { public: typedef ACE_Shared_Memory_Pool_Options OPTIONS; diff --git a/ace/Shared_Memory_SV.h b/ace/Shared_Memory_SV.h index 48fe99a5606..b633dd4cff1 100644 --- a/ace/Shared_Memory_SV.h +++ b/ace/Shared_Memory_SV.h @@ -34,7 +34,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * manager. For more a powerful memory allocator please see * <ACE_Malloc>. */ -class ACE_Memory_Export ACE_Shared_Memory_SV : public ACE_Shared_Memory +class ACE_Export ACE_Shared_Memory_SV : public ACE_Shared_Memory { public: enum diff --git a/ace/Thread_Semaphore.h b/ace/Thread_Semaphore.h index 204bfd0a85b..096dce3e93c 100644 --- a/ace/Thread_Semaphore.h +++ b/ace/Thread_Semaphore.h @@ -16,12 +16,7 @@ #define ACE_THREAD_SEMAPHORE_H #include /**/ "ace/pre.h" -#ifdef ACE_THREADS_BUILD_DLL -# include "ace/ACE_Threads_export.h" -#else -# include "ace/ACE_export.h" -# define ACE_Threads_Export ACE_Export -#endif /* ACE_THREADS_BUILD_DLL */ +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -42,7 +37,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * @brief Wrapper for Dijkstra style general semaphores that work * only within one process. */ -class ACE_Threads_Export ACE_Thread_Semaphore : public ACE_Semaphore +class ACE_Export ACE_Thread_Semaphore : public ACE_Semaphore { public: /// Initialize the semaphore, with an initial value of @a count, @@ -76,7 +71,7 @@ template <class T> class ACE_Malloc_Lock_Adapter_T; * the standard form used by other lock strategy classes. */ template<> -class ACE_Threads_Export ACE_Malloc_Lock_Adapter_T<ACE_Thread_Semaphore> +class ACE_Export ACE_Malloc_Lock_Adapter_T<ACE_Thread_Semaphore> { public: ACE_Thread_Semaphore * operator () (const ACE_TCHAR *name); diff --git a/ace/UNIX_Addr.h b/ace/UNIX_Addr.h index 956bcc7d8cc..fcd6ed9bf46 100644 --- a/ace/UNIX_Addr.h +++ b/ace/UNIX_Addr.h @@ -16,12 +16,7 @@ #include /**/ "ace/pre.h" -#ifdef ACE_SOCKETS_BUILD_DLL -# include "ace/ACE_Sockets_export.h" -#else -# include "ace/ACE_export.h" -# define ACE_Sockets_Export ACE_Export -#endif /* ACE_SOCKETS_BUILD_DLL */ +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -41,7 +36,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * * @brief Defines the ``UNIX domain address family'' address format. */ -class ACE_Sockets_Export ACE_UNIX_Addr : public ACE_Addr +class ACE_Export ACE_UNIX_Addr : public ACE_Addr { public: // = Initialization methods. diff --git a/ace/ace.mwc b/ace/ace.mwc index cb71d5ecbff..60eecba03e4 100644 --- a/ace/ace.mwc +++ b/ace/ace.mwc @@ -5,11 +5,6 @@ workspace { ace.mpc ace_for_tao.mpc - ace_codecs_for_tao.mpc - ace_memory_for_tao.mpc - ace_reactor_for_tao.mpc - ace_sockets_for_tao.mpc - ace_threads_for_tao.mpc ace_flreactor.mpc ace_qtreactor.mpc ace_tkreactor.mpc diff --git a/ace/ace_for_tao.mpc b/ace/ace_for_tao.mpc index e734fb1a169..57775f2cc3d 100644 --- a/ace/ace_for_tao.mpc +++ b/ace/ace_for_tao.mpc @@ -17,7 +17,9 @@ project(ACE_FOR_TAO) : acedefaults, core, svcconf, pkgconfig { Argv_Type_Converter.cpp Atomic_Op.cpp Auto_Event.cpp + Barrier.cpp // Required by orbsvcs/tests/Notify/lib Base_Thread_Adapter.cpp + Basic_Stats.cpp // Required by ace/Stats Basic_Types.cpp CDR_Base.cpp CDR_Stream.cpp @@ -44,6 +46,7 @@ project(ACE_FOR_TAO) : acedefaults, core, svcconf, pkgconfig { Handle_Ops.cpp Handle_Set.cpp Hashable.cpp + High_Res_Timer.cpp // Required by orbsvcs/tests/Notify/lib INET_Addr.cpp Init_ACE.cpp IO_SAP.cpp @@ -112,6 +115,7 @@ project(ACE_FOR_TAO) : acedefaults, core, svcconf, pkgconfig { OS_TLI.cpp Parse_Node.cpp Pipe.cpp + Process.cpp Reactor.cpp Reactor_Impl.cpp Reactor_Notification_Strategy.cpp @@ -130,6 +134,7 @@ project(ACE_FOR_TAO) : acedefaults, core, svcconf, pkgconfig { Sock_Connect.cpp SOCK_Connector.cpp SOCK_Dgram.cpp + SOCK_Dgram_Mcast.cpp SOCK_IO.cpp SOCK_Stream.cpp SPIPE.cpp @@ -138,6 +143,7 @@ project(ACE_FOR_TAO) : acedefaults, core, svcconf, pkgconfig { SPIPE_Addr.cpp SPIPE_Stream.cpp SString.cpp + Stats.cpp // Required by orbsvcs/tests/Notify String_Base_Const.cpp Synch_Options.cpp Task.cpp diff --git a/bin/MakeProjectCreator/config/acecodecslib_for_tao.mpb b/bin/MakeProjectCreator/config/acecodecslib_for_tao.mpb deleted file mode 100644 index 6b8fbc0034e..00000000000 --- a/bin/MakeProjectCreator/config/acecodecslib_for_tao.mpb +++ /dev/null @@ -1,10 +0,0 @@ -// -*- MPC -*- -// -// $Id$ - -feature(ace_for_tao) { - - after += ACE_Codecs_FOR_TAO - libs += ACE_Codecs_FOR_TAO - -} diff --git a/bin/MakeProjectCreator/config/acememorylib_for_tao.mpb b/bin/MakeProjectCreator/config/acememorylib_for_tao.mpb deleted file mode 100644 index 150837a66c2..00000000000 --- a/bin/MakeProjectCreator/config/acememorylib_for_tao.mpb +++ /dev/null @@ -1,10 +0,0 @@ -// -*- MPC -*- -// -// $Id$ - -feature(ace_for_tao) { - - after += ACE_Memory_FOR_TAO - libs += ACE_Memory_FOR_TAO - -} diff --git a/bin/MakeProjectCreator/config/acereactorlib_for_tao.mpb b/bin/MakeProjectCreator/config/acereactorlib_for_tao.mpb deleted file mode 100644 index 6196abac31a..00000000000 --- a/bin/MakeProjectCreator/config/acereactorlib_for_tao.mpb +++ /dev/null @@ -1,10 +0,0 @@ -// -*- MPC -*- -// -// $Id$ - -feature(ace_for_tao) { - - after += ACE_Reactor_FOR_TAO - libs += ACE_Reactor_FOR_TAO - -} diff --git a/bin/MakeProjectCreator/config/acesocketslib_for_tao.mpb b/bin/MakeProjectCreator/config/acesocketslib_for_tao.mpb deleted file mode 100644 index 6e499cc334b..00000000000 --- a/bin/MakeProjectCreator/config/acesocketslib_for_tao.mpb +++ /dev/null @@ -1,10 +0,0 @@ -// -*- MPC -*- -// -// $Id$ - -feature(ace_for_tao) { - - after += ACE_Sockets_FOR_TAO - libs += ACE_Sockets_FOR_TAO - -} diff --git a/bin/MakeProjectCreator/config/acethreadslib_for_tao.mpb b/bin/MakeProjectCreator/config/acethreadslib_for_tao.mpb deleted file mode 100644 index 9a9516fe510..00000000000 --- a/bin/MakeProjectCreator/config/acethreadslib_for_tao.mpb +++ /dev/null @@ -1,10 +0,0 @@ -// -*- MPC -*- -// -// $Id$ - -feature(ace_for_tao) { - - after += ACE_Threads_FOR_TAO - libs += ACE_Threads_FOR_TAO - -} diff --git a/bin/MakeProjectCreator/config/acetimerlib_for_tao.mpb b/bin/MakeProjectCreator/config/acetimerlib_for_tao.mpb deleted file mode 100644 index d812f71f7fd..00000000000 --- a/bin/MakeProjectCreator/config/acetimerlib_for_tao.mpb +++ /dev/null @@ -1,10 +0,0 @@ -// -*- MPC -*- -// -// $Id$ - -feature(ace_for_tao) { - - after += ACE_Timer_FOR_TAO - libs += ACE_Timer_FOR_TAO - -} diff --git a/bin/MakeProjectCreator/config/ftclientorb.mpb b/bin/MakeProjectCreator/config/ftclientorb.mpb index f3f70ab90dd..126330da041 100644 --- a/bin/MakeProjectCreator/config/ftclientorb.mpb +++ b/bin/MakeProjectCreator/config/ftclientorb.mpb @@ -2,6 +2,7 @@ // $Id$ project : ftorbutils, pi, interceptors { + avoids += ace_for_tao // Requires ace/UUID after += FT_ClientORB libs += TAO_FT_ClientORB requires += ace_uuid diff --git a/bin/MakeProjectCreator/config/htbp.mpb b/bin/MakeProjectCreator/config/htbp.mpb index 3b81e61a600..60c9236de26 100644 --- a/bin/MakeProjectCreator/config/htbp.mpb +++ b/bin/MakeProjectCreator/config/htbp.mpb @@ -2,6 +2,7 @@ // $Id$ project : acelib { + avoids += ace_for_tao // Requires ACE_Configuration_Heap after += HTBP libs += ACE_HTBP includes += $(ACE_ROOT)/protocols diff --git a/bin/MakeProjectCreator/config/ifrservice.mpb b/bin/MakeProjectCreator/config/ifrservice.mpb index c8494b989b0..a580d2d0660 100644 --- a/bin/MakeProjectCreator/config/ifrservice.mpb +++ b/bin/MakeProjectCreator/config/ifrservice.mpb @@ -2,6 +2,7 @@ // $Id$ project : iortable, svc_utils, typecodefactory, pi_server, minimum_corba { + avoids += ace_for_tao // Requires ace/Configuration after += IFRService libs += TAO_IFRService tagchecks += IFRService diff --git a/bin/MakeProjectCreator/config/naming_serv.mpb b/bin/MakeProjectCreator/config/naming_serv.mpb index 1beb907e7dc..5bf9a17f6cb 100644 --- a/bin/MakeProjectCreator/config/naming_serv.mpb +++ b/bin/MakeProjectCreator/config/naming_serv.mpb @@ -2,6 +2,7 @@ // $Id$ project : orbsvcslib, naming_skel, iortable, messaging_optional, svc_utils { + avoids += ace_for_tao // Requires MMAP_Memory_Pool after += CosNaming_Serv libs += TAO_CosNaming_Serv tagchecks += Naming diff --git a/bin/MakeProjectCreator/config/portablegroup.mpb b/bin/MakeProjectCreator/config/portablegroup.mpb index dee9ba50647..351cbcb67c1 100644 --- a/bin/MakeProjectCreator/config/portablegroup.mpb +++ b/bin/MakeProjectCreator/config/portablegroup.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : naming, messaging, minimum_corba, iormanip, acesocketslib_for_tao { +project : naming, messaging, minimum_corba, iormanip { libs += TAO_PortableGroup after += PortableGroup tagchecks += PortableGroup diff --git a/bin/MakeProjectCreator/config/rtevent_serv.mpb b/bin/MakeProjectCreator/config/rtevent_serv.mpb index 9cbd6c5e452..80cfa96b3ce 100644 --- a/bin/MakeProjectCreator/config/rtevent_serv.mpb +++ b/bin/MakeProjectCreator/config/rtevent_serv.mpb @@ -2,6 +2,7 @@ // $Id$ project : orbsvcslib, rtevent_skel { + avoids += ace_for_tao // Requires ACE_crc32 after += RTEvent_Serv libs += TAO_RTEvent_Serv tagchecks += RTEvent diff --git a/bin/MakeProjectCreator/config/ssl.mpb b/bin/MakeProjectCreator/config/ssl.mpb index 2b3ba326a8f..f0dfa798e7b 100644 --- a/bin/MakeProjectCreator/config/ssl.mpb +++ b/bin/MakeProjectCreator/config/ssl.mpb @@ -5,6 +5,7 @@ // by creating a new xyzssl.mpb similar to openssl.mpb. // You would then derive the following project from this base. project : acelib, ace_openssl { + avoids += ace_for_tao // Requires ACE asynch streams after += SSL libs += ACE_SSL requires += ssl diff --git a/bin/MakeProjectCreator/config/strategies.mpb b/bin/MakeProjectCreator/config/strategies.mpb index d5e01739d73..c087499d5fd 100644 --- a/bin/MakeProjectCreator/config/strategies.mpb +++ b/bin/MakeProjectCreator/config/strategies.mpb @@ -1,6 +1,7 @@ // -*- MPC -*- // $Id$ project : taolib, anytypecode { + avoids += ace_for_tao // Requires Unix domain sockets and MEM stuff after += Strategies libs += TAO_Strategies } diff --git a/bin/MakeProjectCreator/config/tmcast.mpb b/bin/MakeProjectCreator/config/tmcast.mpb index 124a243dd1f..4283f27902f 100644 --- a/bin/MakeProjectCreator/config/tmcast.mpb +++ b/bin/MakeProjectCreator/config/tmcast.mpb @@ -2,6 +2,7 @@ // $Id$ project: acelib, exceptions, threads { + avoids += ace_for_tao after += TMCast libs += ACE_TMCast includes += $(ACE_ROOT)/protocols diff --git a/examples/APG/Active_Objects/active_objects.mpc b/examples/APG/Active_Objects/active_objects.mpc index 88cdc88a6a7..44fe88bfd30 100644 --- a/examples/APG/Active_Objects/active_objects.mpc +++ b/examples/APG/Active_Objects/active_objects.mpc @@ -1,14 +1,16 @@ // -*- MPC -*- // $Id$ -project(AO) : aceexe, acethreadslib_for_tao { +project(AO) : aceexe { + avoids += ace_for_tao exename = AO Source_Files { AO.cpp } } -project(AO2) : aceexe, acethreadslib_for_tao { +project(AO2) : aceexe { + avoids += ace_for_tao exename = AO2 Source_Files { AO2.cpp diff --git a/examples/APG/Config/config.mpc b/examples/APG/Config/config.mpc index bd2aa0fcb99..5b705d144bc 100644 --- a/examples/APG/Config/config.mpc +++ b/examples/APG/Config/config.mpc @@ -2,6 +2,7 @@ // $Id$ project(*HA Status) : aceexe { + avoids += ace_for_tao exename = HA_Status Source_Files { HA_Status.cpp diff --git a/examples/APG/Misc_IPC/misc_ipc.mpc b/examples/APG/Misc_IPC/misc_ipc.mpc index 8bd71a7aeba..47e1c34758b 100644 --- a/examples/APG/Misc_IPC/misc_ipc.mpc +++ b/examples/APG/Misc_IPC/misc_ipc.mpc @@ -1,21 +1,23 @@ // -*- MPC -*- // $Id$ -project(UDP Broadcast) : aceexe, acesocketslib_for_tao { +project(UDP Broadcast) : aceexe { + avoids += ace_for_tao exename = UDP_Broadcast Source_Files { UDP_Broadcast.cpp } } -project(UDP Multicast) : aceexe, acesocketslib_for_tao { +project(UDP Multicast) : aceexe { exename = UDP_Multicast Source_Files { UDP_Multicast.cpp } } -project(UDP Unicast) : aceexe, acesocketslib_for_tao { +project(UDP Unicast) : aceexe { + avoids += ace_for_tao exename = UDP_Unicast Source_Files { UDP_Unicast.cpp diff --git a/examples/APG/Naming/naming.mpc b/examples/APG/Naming/naming.mpc index 5c32cb1d641..fda823954fc 100644 --- a/examples/APG/Naming/naming.mpc +++ b/examples/APG/Naming/naming.mpc @@ -2,6 +2,7 @@ // $Id$ project(Netlocal) : aceexe { + avoids += ace_for_tao exename = Netlocal Source_Files { Netlocal.cpp @@ -10,6 +11,7 @@ project(Netlocal) : aceexe { } project(Netlocal Reader) : aceexe { + avoids += ace_for_tao exename = Netlocal_reader Source_Files { Netlocal_reader.cpp @@ -19,6 +21,7 @@ project(Netlocal Reader) : aceexe { } project(Nodelocal) : aceexe { + avoids += ace_for_tao exename = Nodelocal Source_Files { Nodelocal.cpp @@ -27,6 +30,7 @@ project(Nodelocal) : aceexe { } project(Nodelocal Shared) : aceexe { + avoids += ace_for_tao exename = Nodelocal_shared Source_Files { Nodelocal_shared.cpp @@ -35,6 +39,7 @@ project(Nodelocal Shared) : aceexe { } project(Nodelocal Shared Reader) : aceexe { + avoids += ace_for_tao exename = Nodelocal_shared_reader Source_Files { Nodelocal_shared_reader.cpp diff --git a/examples/APG/Proactor/proactor.mpc b/examples/APG/Proactor/proactor.mpc index 2d3237b176a..85ef950ae66 100644 --- a/examples/APG/Proactor/proactor.mpc +++ b/examples/APG/Proactor/proactor.mpc @@ -2,6 +2,7 @@ // $Id$ project(HA Proactive Status) : aceexe { + avoids += ace_for_tao exename = HA_Proactive_Status Source_Files { HA_Proactive_Status.cpp diff --git a/examples/APG/Processes/processes.mpc b/examples/APG/Processes/processes.mpc index 91c0e28c935..a7cb01040bb 100644 --- a/examples/APG/Processes/processes.mpc +++ b/examples/APG/Processes/processes.mpc @@ -2,6 +2,7 @@ // $Id$ project(Process Manager Death) : aceexe { + avoids += ace_for_tao exename = Process_Manager_Death Source_Files { Process_Manager_Death.cpp @@ -9,6 +10,7 @@ project(Process Manager Death) : aceexe { } project(Process Manager Spawn) : aceexe { + avoids += ace_for_tao exename = Process_Manager_Spawn Source_Files { Process_Manager_Spawn.cpp @@ -16,6 +18,7 @@ project(Process Manager Spawn) : aceexe { } project(Process Mutex) : aceexe { + avoids += ace_for_tao exename = Process_Mutex Source_Files { Process_Mutex.cpp @@ -23,6 +26,7 @@ project(Process Mutex) : aceexe { } project(Spawn) : aceexe { + avoids += ace_for_tao exename = Spawn Source_Files { Spawn.cpp diff --git a/examples/APG/Shared_Memory/shared_memory.mpc b/examples/APG/Shared_Memory/shared_memory.mpc index 26b68e3e146..2cf2400ef8e 100644 --- a/examples/APG/Shared_Memory/shared_memory.mpc +++ b/examples/APG/Shared_Memory/shared_memory.mpc @@ -1,7 +1,8 @@ // -*- MPC -*- // $Id$ -project(*Hash Map) : aceexe, acethreadslib_for_tao, acememorylib_for_tao { +project(*Hash Map) : aceexe { + avoids += ace_for_tao exename = Hash_Map Source_Files { Hash_Map.cpp @@ -9,6 +10,7 @@ project(*Hash Map) : aceexe, acethreadslib_for_tao, acememorylib_for_tao { } project(Malloc) : aceexe { + avoids += ace_for_tao exename = Malloc Source_Files { Malloc.cpp @@ -16,6 +18,7 @@ project(Malloc) : aceexe { } project(Mem Map) : aceexe { + avoids += ace_for_tao exename = Mem_Map Source_Files { Mem_Map.cpp @@ -23,13 +26,15 @@ project(Mem Map) : aceexe { } project(PI Malloc) : aceexe { + avoids += ace_for_tao exename = PI_Malloc Source_Files { PI_Malloc.cpp } } -project(Pool Growth) : aceexe, acethreadslib_for_tao, acememorylib_for_tao { +project(Pool Growth) : aceexe { + avoids += ace_for_tao exename = Pool_Growth Source_Files { Pool_Growth.cpp diff --git a/examples/APG/Streams/streams.mpc b/examples/APG/Streams/streams.mpc index 3b180f448a3..df74b446031 100644 --- a/examples/APG/Streams/streams.mpc +++ b/examples/APG/Streams/streams.mpc @@ -2,6 +2,7 @@ // $Id$ project(Answerer) : aceexe { + avoids += ace_for_tao exename = Answerer requires += threads Source_Files { diff --git a/examples/APG/Svc_Config/svc_config.mpc b/examples/APG/Svc_Config/svc_config.mpc index 933842648e5..3e35b115aea 100644 --- a/examples/APG/Svc_Config/svc_config.mpc +++ b/examples/APG/Svc_Config/svc_config.mpc @@ -17,6 +17,7 @@ project(HA Configurable Server Dynamic) : aceexe { } project(HA Configurable Server Static) : aceexe { + avoids += ace_for_tao exename = HA_Configurable_Server_Static Source_Files { HA_Configurable_Server_Static.cpp diff --git a/examples/APG/ThreadPools/threadpools.mpc b/examples/APG/ThreadPools/threadpools.mpc index 150458ac0d0..1bb9a860920 100644 --- a/examples/APG/ThreadPools/threadpools.mpc +++ b/examples/APG/ThreadPools/threadpools.mpc @@ -1,7 +1,8 @@ // -*- MPC -*- // $Id$ -project(Futures) : aceexe, acethreadslib_for_tao { +project(Futures) : aceexe { + avoids += ace_for_tao exename = Futures Source_Files { Futures.cpp diff --git a/examples/APG/ThreadSafety/threadsafety.mpc b/examples/APG/ThreadSafety/threadsafety.mpc index abee2826972..8045301b6a4 100644 --- a/examples/APG/ThreadSafety/threadsafety.mpc +++ b/examples/APG/ThreadSafety/threadsafety.mpc @@ -8,7 +8,7 @@ project(Atomic Op) : aceexe { } } -project(Barrier) : aceexe, acethreadslib_for_tao { +project(Barrier) : aceexe { exename = Barrier Source_Files { Barrier.cpp @@ -29,7 +29,8 @@ project(RW Lock) : aceexe { } } -project(Semaphore) : aceexe, acethreadslib_for_tao { +project(Semaphore) : aceexe { + avoids += ace_for_tao exename = Semaphore Source_Files { Semaphore.cpp diff --git a/examples/ASX/Event_Server/Event_Server/Event.mpc b/examples/ASX/Event_Server/Event_Server/Event.mpc index 8f25cd16c2c..f99e912ce04 100644 --- a/examples/ASX/Event_Server/Event_Server/Event.mpc +++ b/examples/ASX/Event_Server/Event_Server/Event.mpc @@ -1,7 +1,8 @@ // -*- MPC -*- // $Id$ -project(*Server) : aceexe, acetimerlib_for_tao { +project(*Server) : aceexe { + avoids += ace_for_tao exename = Event_Server Source_Files { Consumer_Router.cpp diff --git a/examples/ASX/UPIPE_Event_Server/UPIPE_Event.mpc b/examples/ASX/UPIPE_Event_Server/UPIPE_Event.mpc index b272b2465bf..a4c93dc1fdb 100644 --- a/examples/ASX/UPIPE_Event_Server/UPIPE_Event.mpc +++ b/examples/ASX/UPIPE_Event_Server/UPIPE_Event.mpc @@ -2,6 +2,7 @@ // $Id$ project(*Server) : aceexe { + avoids += ace_for_tao exename = UPIPE_Event_Server Source_Files { Consumer_Router.cpp diff --git a/examples/C++NPv1/C++NPv1.mpc b/examples/C++NPv1/C++NPv1.mpc index f7d3f626ff4..2cc6967e831 100644 --- a/examples/C++NPv1/C++NPv1.mpc +++ b/examples/C++NPv1/C++NPv1.mpc @@ -2,7 +2,7 @@ // $Id$ project(*Iterative_Logging_Server) : aceexe { - avoids += uses_wchar + avoids += uses_wchar ace_for_tao exename = iterative_logging_server Source_Files { Iterative_Logging_Server.cpp @@ -20,7 +20,7 @@ project(*Logging_Client) : aceexe { } project(*PPC_Logging_Server) : aceexe { - avoids += uses_wchar + avoids += uses_wchar ace_for_tao exename = ppc_logging_server Source_Files { Process_Per_Connection_Logging_Server.cpp @@ -30,7 +30,7 @@ project(*PPC_Logging_Server) : aceexe { } project(*Reactive_Logging_Server) : aceexe { - avoids += uses_wchar + avoids += uses_wchar ace_for_tao exename = reactive_logging_server Source_Files { Reactive_Logging_Server.cpp @@ -40,7 +40,7 @@ project(*Reactive_Logging_Server) : aceexe { } project(*Reactive_Logging_Server_Ex) : aceexe { - avoids += uses_wchar + avoids += uses_wchar ace_for_tao exename = reactive_logging_server_ex Source_Files { Reactive_Logging_Server_Ex.cpp @@ -50,7 +50,7 @@ project(*Reactive_Logging_Server_Ex) : aceexe { } project(*RTTPC_Logging_Server) : aceexe { - avoids += uses_wchar + avoids += uses_wchar ace_for_tao exename = RTTPC_logging_server Source_Files { RT_Thread_Per_Connection_Logging_Server.cpp @@ -60,7 +60,7 @@ project(*RTTPC_Logging_Server) : aceexe { } project(*TPC_Logging_Server) : aceexe { - avoids += uses_wchar + avoids += uses_wchar ace_for_tao exename = tpc_logging_server Source_Files { Thread_Per_Connection_Logging_Server.cpp diff --git a/examples/C++NPv2/C++NPv2.mpc b/examples/C++NPv2/C++NPv2.mpc index ca1b40b4034..515a21dbbbd 100644 --- a/examples/C++NPv2/C++NPv2.mpc +++ b/examples/C++NPv2/C++NPv2.mpc @@ -50,6 +50,7 @@ project(*Configurable_Log_Server) : aceexe { } project(*Display_Logfile) : aceexe { + avoids += ace_for_tao exename = display_logfile Source_Files { display_logfile.cpp @@ -57,7 +58,7 @@ project(*Display_Logfile) : aceexe { } project(*Reactor_Log_Server) : aceexe { - avoids += uses_wchar + avoids += uses_wchar ace_for_tao exename = reactor_logging_server Source_Files { Logging_Acceptor.cpp @@ -69,7 +70,7 @@ project(*Reactor_Log_Server) : aceexe { } project(*Select_Reactor_Log_Server) : aceexe { - avoids += uses_wchar + avoids += uses_wchar ace_for_tao exename = select_reactor_logging_server specific(gnuace) { after += *Reactor_Log_Server @@ -124,7 +125,7 @@ project(*SR_Configurable_Log_Server) : aceexe { } project(*TP_Reactor_Log_Server) : aceexe { - avoids += uses_wchar + avoids += uses_wchar ace_for_tao exename = tp_reactor_logging_server specific(gnuace) { after += *Reactor_Log_Server diff --git a/examples/Connection/blocking/Connection_Blocking.mpc b/examples/Connection/blocking/Connection_Blocking.mpc index 01cf9ceaf10..758e2bfbf95 100644 --- a/examples/Connection/blocking/Connection_Blocking.mpc +++ b/examples/Connection/blocking/Connection_Blocking.mpc @@ -2,6 +2,7 @@ // $Id$ project(*acceptor) : aceexe { + avoids += ace_for_tao exename = acceptor Source_Files { SPIPE-acceptor.cpp @@ -10,6 +11,7 @@ project(*acceptor) : aceexe { } project(*connector) : aceexe { + avoids += ace_for_tao exename = connector Source_Files { SPIPE-connector.cpp diff --git a/examples/Connection/misc/Connection_Misc.mpc b/examples/Connection/misc/Connection_Misc.mpc index 8e10826ad51..a960e604338 100644 --- a/examples/Connection/misc/Connection_Misc.mpc +++ b/examples/Connection/misc/Connection_Misc.mpc @@ -9,8 +9,9 @@ project (*Handler) : aceexe { } project (*test_upipe) : aceexe { + avoids += ace_for_tao exename = test_upipe Source_Files { test_upipe.cpp } -}
\ No newline at end of file +} diff --git a/examples/Connection/non_blocking/Connection_Non_Blocking.mpc b/examples/Connection/non_blocking/Connection_Non_Blocking.mpc index 1b56fdc76f8..de9ecaea5e0 100644 --- a/examples/Connection/non_blocking/Connection_Non_Blocking.mpc +++ b/examples/Connection/non_blocking/Connection_Non_Blocking.mpc @@ -18,6 +18,7 @@ project (*SockServer) : aceexe { } project (*LSockClient) : aceexe { + avoids += ace_for_tao exename = lsock_client Source_Files { CPP-connector.cpp @@ -26,6 +27,7 @@ project (*LSockClient) : aceexe { } project (*LSockServer) : aceexe { + avoids += ace_for_tao exename = lsock_server Source_Files { CPP-acceptor.cpp @@ -63,4 +65,4 @@ project (*TLIServer) : aceexe { CPP-acceptor.cpp test_tli_acceptor.cpp } -}
\ No newline at end of file +} diff --git a/examples/IPC_SAP/DEV_SAP/reader/dev_sap_reader.mpc b/examples/IPC_SAP/DEV_SAP/reader/dev_sap_reader.mpc index a213dbd8942..a6535c82e82 100644 --- a/examples/IPC_SAP/DEV_SAP/reader/dev_sap_reader.mpc +++ b/examples/IPC_SAP/DEV_SAP/reader/dev_sap_reader.mpc @@ -2,6 +2,7 @@ // $Id$ project : aceexe { + avoids += ace_for_tao exename = reader Source_Files { reader.cpp diff --git a/examples/IPC_SAP/DEV_SAP/writer/dev_sap_writer.mpc b/examples/IPC_SAP/DEV_SAP/writer/dev_sap_writer.mpc index dc5d3c39ad7..75486584b6d 100644 --- a/examples/IPC_SAP/DEV_SAP/writer/dev_sap_writer.mpc +++ b/examples/IPC_SAP/DEV_SAP/writer/dev_sap_writer.mpc @@ -2,6 +2,7 @@ // $Id$ project : aceexe { + avoids += ace_for_tao exename = writer Source_Files { writer.cpp diff --git a/examples/IPC_SAP/FIFO_SAP/fifo_sap.mpc b/examples/IPC_SAP/FIFO_SAP/fifo_sap.mpc index 7d836016858..1e6d04447e5 100644 --- a/examples/IPC_SAP/FIFO_SAP/fifo_sap.mpc +++ b/examples/IPC_SAP/FIFO_SAP/fifo_sap.mpc @@ -2,6 +2,7 @@ // $Id$ project(*client) : aceexe { + avoids += ace_for_tao exename = FIFO-client Source_Files { FIFO-client.cpp @@ -9,6 +10,7 @@ project(*client) : aceexe { } project(*server) : aceexe { + avoids += ace_for_tao exename = FIFO-server Source_Files { FIFO-server.cpp @@ -30,6 +32,7 @@ project(*Msg_Server) : aceexe { } project(*test) : aceexe { + avoids += ace_for_tao exename = FIFO-test Source_Files { FIFO-test.cpp diff --git a/examples/IPC_SAP/FILE_SAP/file_sap_client.mpc b/examples/IPC_SAP/FILE_SAP/file_sap_client.mpc index 634c32de441..24f9a2b3a61 100644 --- a/examples/IPC_SAP/FILE_SAP/file_sap_client.mpc +++ b/examples/IPC_SAP/FILE_SAP/file_sap_client.mpc @@ -2,6 +2,7 @@ // $Id$ project : aceexe { + avoids += ace_for_tao exename = client Source_Files { client.cpp diff --git a/examples/IPC_SAP/SOCK_SAP/sock_sap.mpc b/examples/IPC_SAP/SOCK_SAP/sock_sap.mpc index 6ea1307c4fb..814280a515c 100644 --- a/examples/IPC_SAP/SOCK_SAP/sock_sap.mpc +++ b/examples/IPC_SAP/SOCK_SAP/sock_sap.mpc @@ -23,6 +23,7 @@ project(*CPP_inclient) : aceexe { } project(*CPP_inserver) : aceexe { + avoids += ace_for_tao exename = CPP-inserver Source_Files { CPP-inserver.cpp @@ -30,6 +31,7 @@ project(*CPP_inserver) : aceexe { } project(*CPP_memclient) : aceexe { + avoids += ace_for_tao exename = CPP-memclient Source_Files { CPP-memclient.cpp @@ -37,6 +39,7 @@ project(*CPP_memclient) : aceexe { } project(*CPP_memserver) : aceexe { + avoids += ace_for_tao exename = CPP-memserver Source_Files { CPP-memserver.cpp @@ -44,6 +47,7 @@ project(*CPP_memserver) : aceexe { } project(*FD_unclient) : aceexe { + avoids += ace_for_tao exename = FD-unclient Source_Files { FD-unclient.cpp @@ -51,6 +55,7 @@ project(*FD_unclient) : aceexe { } project(*CPP_unclient) : aceexe { + avoids += ace_for_tao exename = CPP-unclient Source_Files { CPP-unclient.cpp @@ -58,6 +63,7 @@ project(*CPP_unclient) : aceexe { } project(*CPP_unserver) : aceexe { + avoids += ace_for_tao exename = CPP-unserver Source_Files { CPP-unserver.cpp diff --git a/examples/IPC_SAP/UPIPE_SAP/UPIPE_SAP.mpc b/examples/IPC_SAP/UPIPE_SAP/UPIPE_SAP.mpc index cb90595e2ae..d34d8671735 100644 --- a/examples/IPC_SAP/UPIPE_SAP/UPIPE_SAP.mpc +++ b/examples/IPC_SAP/UPIPE_SAP/UPIPE_SAP.mpc @@ -2,6 +2,7 @@ // $Id$ project(*ex1) : aceexe { + avoids += ace_for_tao exename = ex1 Source_Files { ex1.cpp @@ -9,6 +10,7 @@ project(*ex1) : aceexe { } project(*ex2) : aceexe { + avoids += ace_for_tao exename = ex2 Source_Files { ex2.cpp @@ -16,6 +18,7 @@ project(*ex2) : aceexe { } project(*ex3) : aceexe { + avoids += ace_for_tao exename = ex3 Source_Files { ex3.cpp diff --git a/examples/Mem_Map/IO-tests/Mem_Map_IO_Tests.mpc b/examples/Mem_Map/IO-tests/Mem_Map_IO_Tests.mpc index ca6b8ee6622..6e2bcc9f3aa 100644 --- a/examples/Mem_Map/IO-tests/Mem_Map_IO_Tests.mpc +++ b/examples/Mem_Map/IO-tests/Mem_Map_IO_Tests.mpc @@ -2,4 +2,5 @@ // $Id$ project : aceexe { -}
\ No newline at end of file + avoids += ace_for_tao +} diff --git a/examples/Mem_Map/file-reverse/Mem_Map_File_Reverse.mpc b/examples/Mem_Map/file-reverse/Mem_Map_File_Reverse.mpc index d648c60da40..368866edb73 100644 --- a/examples/Mem_Map/file-reverse/Mem_Map_File_Reverse.mpc +++ b/examples/Mem_Map/file-reverse/Mem_Map_File_Reverse.mpc @@ -2,5 +2,6 @@ // $Id$ project : aceexe { + avoids += ace_for_tao exename = file-reverse -}
\ No newline at end of file +} diff --git a/examples/Misc/Misc.mpc b/examples/Misc/Misc.mpc index 86d377dc224..b0ed858efbd 100644 --- a/examples/Misc/Misc.mpc +++ b/examples/Misc/Misc.mpc @@ -16,6 +16,7 @@ project(*test_get_opt) : aceexe { } project(*test_profile_timer) : aceexe { + avoids += ace_for_tao exename = test_profile_timer Source_Files { test_profile_timer.cpp diff --git a/examples/Naming/Naming.mpc b/examples/Naming/Naming.mpc index 4d97e9282e8..f8365ffe07d 100644 --- a/examples/Naming/Naming.mpc +++ b/examples/Naming/Naming.mpc @@ -2,6 +2,7 @@ // $Id$ project(*multiple_contexts) : aceexe { + avoids += ace_for_tao exename = multiple_contexts Source_Files { test_multiple_contexts.cpp @@ -9,6 +10,7 @@ project(*multiple_contexts) : aceexe { } project(*non_existent) : aceexe { + avoids += ace_for_tao exename = non_existent Source_Files { test_non_existent.cpp @@ -16,6 +18,7 @@ project(*non_existent) : aceexe { } project(*writers) : aceexe { + avoids += ace_for_tao exename = writers Source_Files { test_writers.cpp @@ -23,6 +26,7 @@ project(*writers) : aceexe { } project(*open) : aceexe { + avoids += ace_for_tao exename = open Source_Files { test_open.cpp diff --git a/examples/OS/Process/OS_Process.mpc b/examples/OS/Process/OS_Process.mpc index 6e40f8dfcd9..082f7133301 100644 --- a/examples/OS/Process/OS_Process.mpc +++ b/examples/OS/Process/OS_Process.mpc @@ -2,6 +2,7 @@ // $Id$ project(*imore) : aceexe { + avoids += ace_for_tao exename = imore Source_Files { imore.cpp diff --git a/examples/Reactor/Dgram/Reactor_Dgram.mpc b/examples/Reactor/Dgram/Reactor_Dgram.mpc index 419261076cd..1040aedc184 100644 --- a/examples/Reactor/Dgram/Reactor_Dgram.mpc +++ b/examples/Reactor/Dgram/Reactor_Dgram.mpc @@ -2,6 +2,7 @@ // $Id$ project(*CO) : aceexe { + avoids += ace_for_tao exename = codgram Source_Files { CODgram.cpp diff --git a/examples/Reactor/FIFO/Reactor_FIFO.mpc b/examples/Reactor/FIFO/Reactor_FIFO.mpc index 6beaee6489b..072ec5412b8 100644 --- a/examples/Reactor/FIFO/Reactor_FIFO.mpc +++ b/examples/Reactor/FIFO/Reactor_FIFO.mpc @@ -2,6 +2,7 @@ // $Id$ project(*client) : aceexe { + avoids += ace_for_tao exename = client Source_Files { client.cpp @@ -9,6 +10,7 @@ project(*client) : aceexe { } project(*server) : aceexe { + avoids += ace_for_tao exename = server Source_Files { server.cpp diff --git a/examples/Reactor/Proactor/Proactor.mpc b/examples/Reactor/Proactor/Proactor.mpc index 038babf2a74..a6da6681f51 100644 --- a/examples/Reactor/Proactor/Proactor.mpc +++ b/examples/Reactor/Proactor/Proactor.mpc @@ -2,6 +2,7 @@ // $Id$ project(*cancel) : aceexe { + avoids += ace_for_tao exename = test_cancel Source_Files { test_cancel.cpp @@ -9,6 +10,7 @@ project(*cancel) : aceexe { } project(*end_event_loops) : aceexe { + avoids += ace_for_tao exename = test_end_event_loop Source_Files { test_end_event_loop.cpp @@ -23,6 +25,7 @@ project(*multiple_loops) : aceexe { } project(*post_completions) : aceexe { + avoids += ace_for_tao exename = test_post_completions Source_Files { post_completions.cpp @@ -30,6 +33,7 @@ project(*post_completions) : aceexe { } project(*proactor) : aceexe { + avoids += ace_for_tao exename = test_proactor Source_Files { test_proactor.cpp @@ -37,6 +41,7 @@ project(*proactor) : aceexe { } project(*timeout) : aceexe { + avoids += ace_for_tao exename = test_timeout Source_Files { test_timeout.cpp @@ -44,6 +49,7 @@ project(*timeout) : aceexe { } project(*udp_proactor) : aceexe { + avoids += ace_for_tao exename = test_udp_proactor Source_Files { test_udp_proactor.cpp diff --git a/examples/Service_Configurator/IPC-tests/client/Svc_Cfg_IPC_Client.mpc b/examples/Service_Configurator/IPC-tests/client/Svc_Cfg_IPC_Client.mpc index 11fa3ae9fe7..6876c4aac4d 100644 --- a/examples/Service_Configurator/IPC-tests/client/Svc_Cfg_IPC_Client.mpc +++ b/examples/Service_Configurator/IPC-tests/client/Svc_Cfg_IPC_Client.mpc @@ -2,18 +2,21 @@ // $Id$ project(*loc dgram) : aceexe { + avoids += ace_for_tao exename = local_dgram_test Source_Files { local_dgram_client_test.cpp } } project(*loc fifo) : aceexe { + avoids += ace_for_tao exename = local_fifo_test Source_Files { local_fifo_client_test.cpp } } project(*loc pipe) : aceexe { + avoids += ace_for_tao exename = local_pipe_test Source_Files { local_pipe_client_test.cpp @@ -26,12 +29,14 @@ project(*loc spipe) : aceexe { } } project(*loc stream) : aceexe { + avoids += ace_for_tao exename = local_stream_test Source_Files { local_stream_client_test.cpp } } project(*rem dgram) : aceexe { + avoids += ace_for_tao exename = remote_dgram_test Source_Files { remote_dgram_client_test.cpp @@ -44,6 +49,7 @@ project(*rem svc dir) : aceexe { } } project(*rem stream) : aceexe { + avoids += ace_for_tao exename = remote_stream_test Source_Files { remote_stream_client_test.cpp @@ -56,6 +62,7 @@ project(*rem thr_stream) : aceexe { } } project(*bcast) : aceexe { + avoids += ace_for_tao exename = remote_broadcast_test Source_Files { broadcast_client_test.cpp diff --git a/examples/Shared_Malloc/Shared_Malloc.mpc b/examples/Shared_Malloc/Shared_Malloc.mpc index f4102049f59..42753246815 100644 --- a/examples/Shared_Malloc/Shared_Malloc.mpc +++ b/examples/Shared_Malloc/Shared_Malloc.mpc @@ -2,6 +2,7 @@ // $Id$ project : aceexe { + avoids += ace_for_tao exename = malloc Source_Files { Malloc.cpp @@ -10,6 +11,7 @@ project : aceexe { } } project(*multiple) : aceexe { + avoids += ace_for_tao exename = multiple Source_Files { Malloc.cpp @@ -18,12 +20,14 @@ project(*multiple) : aceexe { } } project(*persistence) : aceexe { + avoids += ace_for_tao exename = persistence Source_Files { test_persistence.cpp } } project(*posind) : aceexe { + avoids += ace_for_tao exename = posind Source_Files { Malloc.cpp diff --git a/examples/Shared_Memory/Shared_Memory.mpc b/examples/Shared_Memory/Shared_Memory.mpc index 5c566e1d690..f0ee256597b 100644 --- a/examples/Shared_Memory/Shared_Memory.mpc +++ b/examples/Shared_Memory/Shared_Memory.mpc @@ -2,12 +2,14 @@ // $Id$ project(*MM) : aceexe { + avoids += ace_for_tao exename = testmm Source_Files { test_MM.cpp } } project(*SV) : aceexe { + avoids += ace_for_tao exename = testsv Source_Files { test_SV.cpp diff --git a/examples/Synch/Synch.mpc b/examples/Synch/Synch.mpc index 5e8c6c115af..024e8459803 100644 --- a/examples/Synch/Synch.mpc +++ b/examples/Synch/Synch.mpc @@ -2,5 +2,6 @@ // $Id$ project : aceexe { + avoids += ace_for_tao exename = proc_sema } diff --git a/examples/System_V_IPC/SV_Message_Queues/SV_Message_Queues.mpc b/examples/System_V_IPC/SV_Message_Queues/SV_Message_Queues.mpc index 0795ff7443e..62cb7a0a819 100644 --- a/examples/System_V_IPC/SV_Message_Queues/SV_Message_Queues.mpc +++ b/examples/System_V_IPC/SV_Message_Queues/SV_Message_Queues.mpc @@ -2,24 +2,28 @@ // $Id$ project(*MQ Client) : aceexe { + avoids += ace_for_tao exename = mqclient Source_Files { MQ_Client.cpp } } project(*MQ Server) : aceexe { + avoids += ace_for_tao exename = mqserver Source_Files { MQ_Server.cpp } } project(*TMQ Client) : aceexe { + avoids += ace_for_tao exename = tmqclient Source_Files { TMQ_Client.cpp } } project(*TMQ Server) : aceexe { + avoids += ace_for_tao exename = tmqserver Source_Files { TMQ_Server.cpp diff --git a/examples/System_V_IPC/SV_Semaphores/SV_Semaphores.mpc b/examples/System_V_IPC/SV_Semaphores/SV_Semaphores.mpc index fd2e931886f..647e4a4cf5a 100644 --- a/examples/System_V_IPC/SV_Semaphores/SV_Semaphores.mpc +++ b/examples/System_V_IPC/SV_Semaphores/SV_Semaphores.mpc @@ -2,12 +2,14 @@ // $Id$ project(*1) : aceexe { + avoids += ace_for_tao exename = sem1 Source_Files { Semaphores_1.cpp } } project(*2) : aceexe { + avoids += ace_for_tao exename = sem2 Source_Files { Semaphores_2.cpp diff --git a/examples/Threads/Threads.mpc b/examples/Threads/Threads.mpc index eba2a99d254..2c57feda243 100644 --- a/examples/Threads/Threads.mpc +++ b/examples/Threads/Threads.mpc @@ -7,7 +7,7 @@ project(*auto_event) : aceexe { auto_event.cpp } } -project(*barrier1) : aceexe, acethreadslib_for_tao { +project(*barrier1) : aceexe { exename = barrier1 Source_Files { barrier1.cpp @@ -25,13 +25,15 @@ project(*cancel) : aceexe { cancel.cpp } } -project(*future1) : aceexe, acethreadslib_for_tao { +project(*future1) : aceexe { + avoids += ace_for_tao exename = future1 Source_Files { future1.cpp } } -project(*future2) : aceexe, acethreadslib_for_tao { +project(*future2) : aceexe { + avoids += ace_for_tao exename = future2 Source_Files { future2.cpp @@ -44,12 +46,14 @@ project(*manual_event) : aceexe { } } project(*process_mutex) : aceexe { + avoids += ace_for_tao exename = process_mutex Source_Files { process_mutex.cpp } } -project(*process_semaphore) : aceexe, acethreadslib_for_tao { +project(*process_semaphore) : aceexe { + avoids += ace_for_tao exename = process_semaphore Source_Files { process_semaphore.cpp @@ -91,7 +95,7 @@ project(*task_two) : aceexe { task_two.cpp } } -project(*task_one) : aceexe, acethreadslib_for_tao { +project(*task_one) : aceexe { exename = task_one Source_Files { task_one.cpp diff --git a/performance-tests/SCTP/SCTP.mpc b/performance-tests/SCTP/SCTP.mpc index ae8b4e27746..cba52013c32 100644 --- a/performance-tests/SCTP/SCTP.mpc +++ b/performance-tests/SCTP/SCTP.mpc @@ -43,7 +43,8 @@ project(*SOCK_SEQPACK_clt) : aceexe { } } -project(*SOCK_SEQPACK_srv) : aceexe, acesocketslib_for_tao { +project(*SOCK_SEQPACK_srv) : aceexe { + avoids += ace_for_tao exename = SOCK_SEQPACK_srv source_files { SOCK_SEQPACK_srv.cpp @@ -51,7 +52,8 @@ project(*SOCK_SEQPACK_srv) : aceexe, acesocketslib_for_tao { } } -project(*SOCK_SEQPACK_Association_Test) : aceexe, acesocketslib_for_tao { +project(*SOCK_SEQPACK_Association_Test) : aceexe { + avoids += ace_for_tao exename = SOCK_SEQPACK_Association_Test source_files { SOCK_SEQPACK_Association_Test.cpp diff --git a/tests/tests.mpc b/tests/tests.mpc index e023e9f2ac9..1cf7518f81c 100644 --- a/tests/tests.mpc +++ b/tests/tests.mpc @@ -64,7 +64,8 @@ project(DLL Test Lib) : acelib, dll_test_parent_lib { } } -project(Based Pointer Test Lib) : acelib, acememorylib_for_tao { +project(Based Pointer Test Lib) : acelib { + avoids += ace_for_tao sharedname = Based_Pointer_Test_Lib dynamicflags = ACE_SVC_BUILD_DLL @@ -153,7 +154,7 @@ project(Auto IncDec Test) : acetest { } } -project(Barrier Test) : acetest, acethreadslib_for_tao { +project(Barrier Test) : acetest { exename = Barrier_Test Source_Files { Barrier_Test.cpp @@ -167,7 +168,8 @@ project(Basic Types Test) : acetest { } } -project(Bound Ptr Test) : acetest, acethreadslib_for_tao { +project(Bound Ptr Test) : acetest { + avoids += ace_for_tao exename = Bound_Ptr_Test Source_Files { Bound_Ptr_Test.cpp @@ -332,14 +334,16 @@ project(Env Value Test) : acetest { } } -project(Future Test) : acetest, acethreadslib_for_tao { +project(Future Test) : acetest { + avoids += ace_for_tao exename = Future_Test Source_Files { Future_Test.cpp } } -project(Future Set Test) : acetest, acethreadslib_for_tao { +project(Future Set Test) : acetest { + avoids += ace_for_tao exename = Future_Set_Test Source_Files { Future_Set_Test.cpp @@ -419,7 +423,8 @@ project(Logging Strategy Test) : acetest { } } -project(Malloc Test) : acetest, acememorylib_for_tao, acethreadslib_for_tao { +project(Malloc Test) : acetest { + avoids += ace_for_tao exename = Malloc_Test Source_Files { Malloc_Test.cpp @@ -442,6 +447,7 @@ project(Map Test) : acetest { } project(Map Manager Test) : acetest { + avoids += ace_for_tao exename = Map_Manager_Test Source_Files { Map_Manager_Test.cpp @@ -455,21 +461,24 @@ project(Max Default Port Test) : acetest { } } -project(MEM Stream Test) : acetest, acememorylib_for_tao, acethreadslib_for_tao { +project(MEM Stream Test) : acetest { + avoids += ace_for_tao exename = MEM_Stream_Test Source_Files { MEM_Stream_Test.cpp } } -project(Mem Map Test) : acetest, acememorylib_for_tao { +project(Mem Map Test) : acetest { + avoids += ace_for_tao exename = Mem_Map_Test Source_Files { Mem_Map_Test.cpp } } -project(MM Shared Memory Test) : acetest, acememorylib_for_tao, acethreadslib_for_tao { +project(MM Shared Memory Test) : acetest { + avoids += ace_for_tao exename = MM_Shared_Memory_Test Source_Files { MM_Shared_Memory_Test.cpp @@ -497,7 +506,8 @@ project(MT SOCK Test) : acetest { } } -project(Message Block Test) : acetest, acethreadslib_for_tao { +project(Message Block Test) : acetest { + avoids += ace_for_tao exename = Message_Block_Test Source_Files { Message_Block_Test.cpp @@ -527,7 +537,7 @@ project(Message Queue Notifications Test) : acetest { } } -project(Multicast Test) : acetest, acesocketslib_for_tao { +project(Multicast Test) : acetest { exename = Multicast_Test Source_Files { Multicast_Test.cpp @@ -535,6 +545,7 @@ project(Multicast Test) : acetest, acesocketslib_for_tao { } project(Multihomed INET Addr Test) : acetest { + avoids += ace_for_tao exename = Multihomed_INET_Addr_Test Source_Files { Multihomed_INET_Addr_Test.cpp @@ -556,6 +567,7 @@ project(New Fail Test) : acetest { } project(Notify Performance Test) : acetest { + avoids += ace_for_tao exename = Notify_Performance_Test Source_Files { Notify_Performance_Test.cpp @@ -614,28 +626,31 @@ project(Proactor Timer Test) : acetest { } } -project(Process Manual Event Test) : acetest, acethreadslib_for_tao { +project(Process Manual Event Test) : acetest { exename = Process_Manual_Event_Test Source_Files { Process_Manual_Event_Test.cpp } } -project(Process Mutex Test) : acetest, acethreadslib_for_tao { +project(Process Mutex Test) : acetest { + avoids += ace_for_tao exename = Process_Mutex_Test Source_Files { Process_Mutex_Test.cpp } } -project(Process Semaphore Test) : acetest, acethreadslib_for_tao { +project(Process Semaphore Test) : acetest { + avoids += ace_for_tao exename = Process_Semaphore_Test Source_Files { Process_Semaphore_Test.cpp } } -project(Process Strategy Test) : acetest, acethreadslib_for_tao { +project(Process Strategy Test) : acetest { + avoids += ace_for_tao // Requires ace/File_Lock exename = Process_Strategy_Test Source_Files { Process_Strategy_Test.cpp @@ -663,21 +678,23 @@ project(Priority Task Test) : acetest { } } -project(Priority Reactor Test) : acetest, acereactorlib_for_tao { +project(Priority Reactor Test) : acetest { + avoids += ace_for_tao exename = Priority_Reactor_Test Source_Files { Priority_Reactor_Test.cpp } } -project(Process Manager Test) : acetest, acethreadslib_for_tao { +project(Process Manager Test) : acetest { + avoids += ace_for_tao exename = Process_Manager_Test Source_Files { Process_Manager_Test.cpp } } -project(Pipe Test) : acetest, acethreadslib_for_tao { +project(Pipe Test) : acetest { exename = Pipe_Test Source_Files { Pipe_Test.cpp @@ -705,7 +722,8 @@ project(Reactor Exceptions Test) : acetest { } } -project(Reactor Notify Test) : acetest, acethreadslib_for_tao { +project(Reactor Notify Test) : acetest { + avoids += ace_for_tao exename = Reactor_Notify_Test Source_Files { Reactor_Notify_Test.cpp @@ -770,7 +788,8 @@ project(Recursive Mutex Test) : acetest { } } -project(Refcounted Auto Ptr Test) : acetest, acethreadslib_for_tao { +project(Refcounted Auto Ptr Test) : acetest { + avoids += ace_for_tao exename = Refcounted_Auto_Ptr_Test Source_Files { Refcounted_Auto_Ptr_Test.cpp @@ -785,6 +804,7 @@ project(Reverse Lock Test) : acetest { } project(Semaphore Test) : acetest { + avoids += ace_for_tao exename = Semaphore_Test Source_Files { Semaphore_Test.cpp @@ -856,6 +876,7 @@ project(SString Test) : acetest { } project(SV Shared Memory Test) : acetest { + avoids += ace_for_tao exename = SV_Shared_Memory_Test Source_Files { SV_Shared_Memory_Test.cpp @@ -927,6 +948,7 @@ project(Time Value Test) : acetest { } project(Timer Queue Test) : acetest { + avoids += ace_for_tao exename = Timer_Queue_Test Source_Files { Timer_Queue_Test.cpp @@ -940,7 +962,8 @@ project(Token Strategy Test) : acetest { } } -project(TP Reactor Test) : acetest, acethreadslib_for_tao { +project(TP Reactor Test) : acetest { + avoids += ace_for_tao exename = TP_Reactor_Test Source_Files { TP_Reactor_Test.cpp @@ -976,6 +999,7 @@ project(UPIPE SAP Test) : acetest { } project(Upgradable RW Test) : acetest { + avoids += ace_for_tao exename = Upgradable_RW_Test Source_Files { Upgradable_RW_Test.cpp @@ -1041,7 +1065,8 @@ project(TkReactor Test) : acetest,ace_tkreactor { } } -project(Codecs Test) : acetest, acecodecslib_for_tao { +project(Codecs Test) : acetest { + avoids += ace_for_tao exename = Codecs_Test requires += ace_codecs @@ -1084,6 +1109,7 @@ project(Framework Component Test) : acetest { } project(FIFO Test) : acetest { + avoids += ace_for_tao exename = FIFO_Test Source_Files { FIFO_Test.cpp @@ -1165,6 +1191,7 @@ project(Reactor Registration Test) : acetest { } project(UUIDTest) : acetest { + avoids += ace_for_tao exename = UUIDTest requires += ace_uuid Source_Files { @@ -1193,15 +1220,16 @@ project(Max Default Port Test IPV6) : acetest { } } -project(Multicast Test IPV6) : acetest, acesocketslib_for_tao { +project(Multicast Test IPV6) : acetest { exename = Multicast_Test_IPV6 Source_Files { Multicast_Test_IPV6.cpp } } -project(Multihomed INET Addr Test IPV6) : acetest, acesocketslib_for_tao { - exename = Multihomed_INET_Addr_Test_IPV6 +project(Multihomed INET Addr Test IPV6) : acetest { + avoids += ace_for_tao + exename = Multihomed_INET_Addr_Test_IPV6 Source_Files { Multihomed_INET_Addr_Test_IPV6.cpp } @@ -1229,14 +1257,16 @@ project(SOCK Test IPv6) : acetest { } } -project(SOCK_Dgram_Bcast_Test) : acetest, acesocketslib_for_tao, acethreadslib_for_tao { +project(SOCK_Dgram_Bcast_Test) : acetest { + avoids += ace_for_tao exename = SOCK_Dgram_Bcast_Test Source_Files { SOCK_Dgram_Bcast_Test.cpp } } -project(SOCK_SEQPACK_SCTP_Test) : acetest, acesocketslib_for_tao { +project(SOCK_SEQPACK_SCTP_Test) : acetest { + avoids += ace_for_tao exename = SOCK_SEQPACK_SCTP_Test Source_Files { SOCK_SEQPACK_SCTP_Test.cpp @@ -1254,7 +1284,8 @@ project(QtReactor Test) : acetest, ace_qtreactor { } } -project(Based Pointer Test) : acetest, acememorylib_for_tao { +project(Based Pointer Test) : acetest { + avoids += ace_for_tao after += Based_Pointer_Test_Lib exename = Based_Pointer_Test Source_Files { |