diff options
author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-10-03 16:45:38 +0000 |
---|---|---|
committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-10-03 16:45:38 +0000 |
commit | abe9a36a6cb211bb37c0aaebe9b95ad9281ad3b9 (patch) | |
tree | 5fc1cebc2568c09991a69d16a59f0ec3a947bb23 | |
parent | 205f27f94416c3a7b61e60249e200a0a2583d26e (diff) | |
download | ATCD-abe9a36a6cb211bb37c0aaebe9b95ad9281ad3b9.tar.gz |
*** empty log message ***
-rw-r--r-- | TAO/tao/Strategies.mpc | 2 | ||||
-rw-r--r-- | ace/ACE_Reactor_export.h | 58 | ||||
-rw-r--r-- | ace/Dev_Poll_Reactor.h | 11 | ||||
-rw-r--r-- | ace/MEM_Acceptor.h | 9 | ||||
-rw-r--r-- | ace/MEM_Addr.h | 9 | ||||
-rw-r--r-- | ace/MEM_Connector.h | 8 | ||||
-rw-r--r-- | ace/MEM_IO.h | 15 | ||||
-rw-r--r-- | ace/MEM_SAP.h | 11 | ||||
-rw-r--r-- | ace/MEM_Stream.h | 2 | ||||
-rw-r--r-- | ace/Msg_WFMO_Reactor.h | 9 | ||||
-rw-r--r-- | ace/Priority_Reactor.h | 10 | ||||
-rw-r--r-- | bin/MakeProjectCreator/config/acereactorlib_for_tao.mpb | 10 |
12 files changed, 136 insertions, 18 deletions
diff --git a/TAO/tao/Strategies.mpc b/TAO/tao/Strategies.mpc index 4e30d8c78ab..017db3d430c 100644 --- a/TAO/tao/Strategies.mpc +++ b/TAO/tao/Strategies.mpc @@ -1,6 +1,6 @@ //$Id$ -project : taolib, core, anytypecode { +project : taolib, core, acereactorlib_for_tao, acesocketslib_for_tao, acememorylib_for_tao, anytypecode { sharedname = TAO_Strategies dynamicflags = TAO_STRATEGIES_BUILD_DLL diff --git a/ace/ACE_Reactor_export.h b/ace/ACE_Reactor_export.h new file mode 100644 index 00000000000..8ec100011e8 --- /dev/null +++ b/ace/ACE_Reactor_export.h @@ -0,0 +1,58 @@ + +// -*- 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/Dev_Poll_Reactor.h b/ace/Dev_Poll_Reactor.h index 64e47880cb0..00a385d6e6e 100644 --- a/ace/Dev_Poll_Reactor.h +++ b/ace/Dev_Poll_Reactor.h @@ -6,7 +6,7 @@ * * $Id$ * - * @em Experimental @c /dev/poll (or Linux @c /dev/epoll) based + * @em Experimental @c /dev/poll (or Linux @c sys_epoll) based * Reactor implementation. * * @author Ossama Othman <ossama@dre.vanderbilt.edu> @@ -19,6 +19,13 @@ #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 */ + #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ @@ -465,7 +472,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_Export ACE_Dev_Poll_Reactor : public ACE_Reactor_Impl +class ACE_Reactor_Export ACE_Dev_Poll_Reactor : public ACE_Reactor_Impl { public: diff --git a/ace/MEM_Acceptor.h b/ace/MEM_Acceptor.h index d0d6edfc707..a33cb5f5dce 100644 --- a/ace/MEM_Acceptor.h +++ b/ace/MEM_Acceptor.h @@ -14,6 +14,13 @@ #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/SOCK_Acceptor.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -47,7 +54,7 @@ class ACE_Reactor; * if so desired. (Currently, using UNIX-domain sockets, i.e., * ACE_LSOCK_*, with this class will not work.) */ -class ACE_Export ACE_MEM_Acceptor : public ACE_SOCK_Acceptor +class ACE_Memory_Export ACE_MEM_Acceptor : public ACE_SOCK_Acceptor { public: // = Initialization methods. diff --git a/ace/MEM_Addr.h b/ace/MEM_Addr.h index c720eaa6e8a..497443de8d6 100644 --- a/ace/MEM_Addr.h +++ b/ace/MEM_Addr.h @@ -15,7 +15,12 @@ #define ACE_MEM_ADDR_H #include /**/ "ace/pre.h" -#include "ace/ACE_export.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 */ #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -31,7 +36,7 @@ * @brief Defines a C++ wrapper facade for the shared memory transport * address family format. */ -class ACE_Export ACE_MEM_Addr : public ACE_Addr +class ACE_Memory_Export ACE_MEM_Addr : public ACE_Addr { public: // = Initialization methods. diff --git a/ace/MEM_Connector.h b/ace/MEM_Connector.h index 434c94f2429..868cec68656 100644 --- a/ace/MEM_Connector.h +++ b/ace/MEM_Connector.h @@ -14,6 +14,12 @@ #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" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -31,7 +37,7 @@ * @brief Defines the format and interface for connecting to a peer * on a @c ACE_MEM_Stream object. */ -class ACE_Export ACE_MEM_Connector : public ACE_SOCK_Connector +class ACE_Memory_Export ACE_MEM_Connector : public ACE_SOCK_Connector { public: // = Initialization methods. diff --git a/ace/MEM_IO.h b/ace/MEM_IO.h index 213587e4346..ecf4588f2ba 100644 --- a/ace/MEM_IO.h +++ b/ace/MEM_IO.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -15,6 +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/SOCK.h" #include "ace/MEM_SAP.h" #include "ace/Memory_Pool.h" @@ -28,7 +35,7 @@ #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1) -class ACE_Export ACE_Reactive_MEM_IO : public ACE_MEM_SAP +class ACE_Memory_Export ACE_Reactive_MEM_IO : public ACE_MEM_SAP { public: ACE_Reactive_MEM_IO (void); @@ -71,7 +78,7 @@ public: }; #if defined (ACE_WIN32) || !defined (_ACE_USE_SV_SEM) -class ACE_Export ACE_MT_MEM_IO : public ACE_MEM_SAP +class ACE_Memory_Export ACE_MT_MEM_IO : public ACE_MEM_SAP { public: typedef struct @@ -163,7 +170,7 @@ private: * the other end. The receiving side then reverses the * procedures and copies the information into user buffer. */ -class ACE_Export ACE_MEM_IO : public ACE_SOCK +class ACE_Memory_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 5f89534ea3b..dcbad75b584 100644 --- a/ace/MEM_SAP.h +++ b/ace/MEM_SAP.h @@ -15,6 +15,13 @@ #define ACE_MEM_SAP_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/PI_Malloc.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -36,7 +43,7 @@ class ACE_MEM_IO; // Internal data structure // MEM_SAP uses to queue up // data. -class ACE_Export ACE_MEM_SAP_Node +class ACE_Memory_Export ACE_MEM_SAP_Node { public: // friend class ACE_MEM_SAP; @@ -73,7 +80,7 @@ public: * @brief Defines the methods of shared memory management for * shared memory transport. */ -class ACE_Export ACE_MEM_SAP +class ACE_Memory_Export ACE_MEM_SAP { public: // = Initialization and termination methods. diff --git a/ace/MEM_Stream.h b/ace/MEM_Stream.h index 41c41746242..e513be87387 100644 --- a/ace/MEM_Stream.h +++ b/ace/MEM_Stream.h @@ -48,7 +48,7 @@ class ACE_MEM_Connector; * @c ACE_MEM_Acceptor::init_buffer_size (size_t size); * before establishing a connection. */ -class ACE_Export ACE_MEM_Stream : public ACE_MEM_IO +class ACE_Memory_Export ACE_MEM_Stream : public ACE_MEM_IO { public: diff --git a/ace/Msg_WFMO_Reactor.h b/ace/Msg_WFMO_Reactor.h index 16e414ce1d2..af6c2bad214 100644 --- a/ace/Msg_WFMO_Reactor.h +++ b/ace/Msg_WFMO_Reactor.h @@ -16,7 +16,12 @@ #define ACE_MSG_WFMO_REACTOR_H #include /**/ "ace/pre.h" -#include "ace/config-all.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 */ #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -37,7 +42,7 @@ * its ability to react on Windows messages. It is needed when * the task should serve also as a COM/DCOM server. */ -class ACE_Export ACE_Msg_WFMO_Reactor : public ACE_WFMO_Reactor +class ACE_Reactor_Export ACE_Msg_WFMO_Reactor : public ACE_WFMO_Reactor { public: // = Initialization and termination methods. diff --git a/ace/Priority_Reactor.h b/ace/Priority_Reactor.h index e9f2809d583..dde598daa9e 100644 --- a/ace/Priority_Reactor.h +++ b/ace/Priority_Reactor.h @@ -14,13 +14,19 @@ #define ACE_PRIORITY_REACTOR_H #include /**/ "ace/pre.h" -#include "ace/Unbounded_Queue.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 */ #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Select_Reactor.h" +#include "ace/Unbounded_Queue.h" /** * @class ACE_Priority_Reactor @@ -31,7 +37,7 @@ * Select_Reactor by taking advantage of the priority method on * ACE_Event_Handler. */ -class ACE_Export ACE_Priority_Reactor : public ACE_Select_Reactor +class ACE_Reactor_Export ACE_Priority_Reactor : public ACE_Select_Reactor { public: // = Initialization and termination methods. diff --git a/bin/MakeProjectCreator/config/acereactorlib_for_tao.mpb b/bin/MakeProjectCreator/config/acereactorlib_for_tao.mpb new file mode 100644 index 00000000000..6196abac31a --- /dev/null +++ b/bin/MakeProjectCreator/config/acereactorlib_for_tao.mpb @@ -0,0 +1,10 @@ +// -*- MPC -*- +// +// $Id$ + +feature(ace_for_tao) { + + after += ACE_Reactor_FOR_TAO + libs += ACE_Reactor_FOR_TAO + +} |