diff options
author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-10-02 09:25:50 +0000 |
---|---|---|
committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-10-02 09:25:50 +0000 |
commit | 205f27f94416c3a7b61e60249e200a0a2583d26e (patch) | |
tree | 0d8802414e7fbcbff82791352a53c151142f47ad | |
parent | 16598b52292ec20307be13268e29094695b96ccc (diff) | |
download | ATCD-205f27f94416c3a7b61e60249e200a0a2583d26e.tar.gz |
*** empty log message ***
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Svc_Utils.mpc | 2 | ||||
-rw-r--r-- | TAO/tao/Strategies/advanced_resource.cpp | 4 | ||||
-rw-r--r-- | ace/ACE_Sockets_export.h | 58 | ||||
-rw-r--r-- | ace/LSOCK.h | 12 | ||||
-rw-r--r-- | ace/LSOCK_Acceptor.h | 2 | ||||
-rw-r--r-- | ace/LSOCK_CODgram.h | 2 | ||||
-rw-r--r-- | ace/LSOCK_Connector.h | 2 | ||||
-rw-r--r-- | ace/LSOCK_Dgram.h | 2 | ||||
-rw-r--r-- | ace/LSOCK_Stream.h | 2 | ||||
-rw-r--r-- | ace/MEM_SAP.h | 2 | ||||
-rw-r--r-- | ace/Multihomed_INET_Addr.h | 18 | ||||
-rw-r--r-- | ace/SOCK_Dgram_Bcast.h | 14 | ||||
-rw-r--r-- | ace/SOCK_Dgram_Mcast.h | 13 | ||||
-rw-r--r-- | ace/SOCK_SEQPACK_Acceptor.h | 9 | ||||
-rw-r--r-- | ace/SOCK_SEQPACK_Association.h | 13 | ||||
-rw-r--r-- | ace/SOCK_SEQPACK_Connector.h | 13 | ||||
-rw-r--r-- | ace/UNIX_Addr.h | 10 | ||||
-rw-r--r-- | bin/MakeProjectCreator/config/acesocketslib_for_tao.mpb | 10 |
18 files changed, 154 insertions, 34 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc b/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc index 967b1e3eeb0..8cf1f9a2feb 100644 --- a/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc +++ b/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(Svc_Utils) : orbsvcslib, core, portableserver { +project(Svc_Utils) : orbsvcslib, acesocketslib_for_tao, core, portableserver { sharedname = TAO_Svc_Utils idlflags += -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=orbsvcs/svc_utils_export.h dynamicflags = TAO_SVC_UTILS_BUILD_DLL diff --git a/TAO/tao/Strategies/advanced_resource.cpp b/TAO/tao/Strategies/advanced_resource.cpp index cf5c37af8cc..9d55507eb56 100644 --- a/TAO/tao/Strategies/advanced_resource.cpp +++ b/TAO/tao/Strategies/advanced_resource.cpp @@ -30,9 +30,9 @@ #include "ace/WFMO_Reactor.h" #include "ace/Msg_WFMO_Reactor.h" #include "ace/TP_Reactor.h" -#include "ace/Memory_Pool.h" +#include "ace/Malloc_T.h" +#include "ace/Local_Memory_Pool.h" #include "ace/Null_Mutex.h" -#include "ace/Malloc.h" #include "ace/OS_NS_strings.h" ACE_RCSID(Strategies, advanced_resource, "$Id$") diff --git a/ace/ACE_Sockets_export.h b/ace/ACE_Sockets_export.h new file mode 100644 index 00000000000..1c57c959dc9 --- /dev/null +++ b/ace/ACE_Sockets_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_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/LSOCK.h b/ace/LSOCK.h index fbc6bf6dd0c..18921ef6d2f 100644 --- a/ace/LSOCK.h +++ b/ace/LSOCK.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -13,9 +13,15 @@ #ifndef ACE_LOCAL_SOCK_H #define ACE_LOCAL_SOCK_H + #include /**/ "ace/pre.h" -#include "ace/config-all.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 */ #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -31,7 +37,7 @@ * @brief Create a Local ACE_SOCK, which is used for passing file * descriptors. */ -class ACE_Export ACE_LSOCK +class ACE_Sockets_Export ACE_LSOCK { public: #if defined (ACE_HAS_MSG) diff --git a/ace/LSOCK_Acceptor.h b/ace/LSOCK_Acceptor.h index bc95a866bbb..cc7c1dca103 100644 --- a/ace/LSOCK_Acceptor.h +++ b/ace/LSOCK_Acceptor.h @@ -36,7 +36,7 @@ class ACE_Reactor; * @brief Defines the format and interface for the acceptor side of the * local ACE_SOCK ACE_Stream. */ -class ACE_Export ACE_LSOCK_Acceptor : public ACE_SOCK_Acceptor +class ACE_Sockets_Export ACE_LSOCK_Acceptor : public ACE_SOCK_Acceptor { public: // = Initialization methods. diff --git a/ace/LSOCK_CODgram.h b/ace/LSOCK_CODgram.h index 637cc227917..e0c8cfc6dfb 100644 --- a/ace/LSOCK_CODgram.h +++ b/ace/LSOCK_CODgram.h @@ -33,7 +33,7 @@ * @brief Defines the member functions for the <ACE_LSOCK> connected * datagram abstraction. */ -class ACE_Export ACE_LSOCK_CODgram : public ACE_SOCK_CODgram, public ACE_LSOCK +class ACE_Sockets_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 f0e1b4460fd..558fc4a8f81 100644 --- a/ace/LSOCK_Connector.h +++ b/ace/LSOCK_Connector.h @@ -32,7 +32,7 @@ * @brief Defines the format and interface for the connector side of * the <ACE_LSOCK_Stream>. */ -class ACE_Export ACE_LSOCK_Connector : public ACE_SOCK_Connector +class ACE_Sockets_Export ACE_LSOCK_Connector : public ACE_SOCK_Connector { public: // = Initialization methods. diff --git a/ace/LSOCK_Dgram.h b/ace/LSOCK_Dgram.h index ad762ede13d..4d6939e1c73 100644 --- a/ace/LSOCK_Dgram.h +++ b/ace/LSOCK_Dgram.h @@ -32,7 +32,7 @@ * * @brief Create a Local ACE_SOCK datagram. */ -class ACE_Export ACE_LSOCK_Dgram : public ACE_SOCK_Dgram, public ACE_LSOCK +class ACE_Sockets_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 a2b2663f269..639047db334 100644 --- a/ace/LSOCK_Stream.h +++ b/ace/LSOCK_Stream.h @@ -32,7 +32,7 @@ * * @brief Create a Local ACE_SOCK stream. */ -class ACE_Export ACE_LSOCK_Stream : public ACE_SOCK_Stream, public ACE_LSOCK +class ACE_Sockets_Export ACE_LSOCK_Stream : public ACE_SOCK_Stream, public ACE_LSOCK { public: // = Send/recv methods. diff --git a/ace/MEM_SAP.h b/ace/MEM_SAP.h index e92a156991b..5f89534ea3b 100644 --- a/ace/MEM_SAP.h +++ b/ace/MEM_SAP.h @@ -24,6 +24,8 @@ // MEM_SAP requries position independent pointers to work #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1) +#include "ace/Malloc_T.h" +#include "ace/MMAP_Memory_Pool.h" #include "ace/Process_Mutex.h" class ACE_MEM_SAP; diff --git a/ace/Multihomed_INET_Addr.h b/ace/Multihomed_INET_Addr.h index 86bbef04cdf..0d9e2657709 100644 --- a/ace/Multihomed_INET_Addr.h +++ b/ace/Multihomed_INET_Addr.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -12,22 +12,31 @@ #ifndef ACE_MULTIHOMED_INET_ADDR_H #define ACE_MULTIHOMED_INET_ADDR_H + #include /**/ "ace/pre.h" -#include "ace/INET_Addr.h" -#include "ace/Containers_T.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 */ #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/INET_Addr.h" +#include "ace/Containers_T.h" + + /** * @class ACE_Multihomed_INET_Addr * * @brief Extends ACE_INET_Addr with support for multi-homed * addresses. */ -class ACE_Export ACE_Multihomed_INET_Addr : public ACE_INET_Addr +class ACE_Sockets_Export ACE_Multihomed_INET_Addr : public ACE_INET_Addr { public: // = Initialization methods. @@ -187,4 +196,5 @@ private: #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" + #endif /* ACE_MULTIHOMED_INET_ADDR_H */ diff --git a/ace/SOCK_Dgram_Bcast.h b/ace/SOCK_Dgram_Bcast.h index d5ed848e1e9..c9a7662ffb7 100644 --- a/ace/SOCK_Dgram_Bcast.h +++ b/ace/SOCK_Dgram_Bcast.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -15,20 +15,26 @@ #define ACE_SOCK_DGRAM_BCAST_H #include /**/ "ace/pre.h" -#include "ace/INET_Addr.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 */ #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/SOCK_Dgram.h" +#include "ace/INET_Addr.h" /** * @class ACE_Bcast_Node * * @brief Linked list of broadcast interfaces. */ -class ACE_Export ACE_Bcast_Node +class ACE_Sockets_Export ACE_Bcast_Node { public: /// Default constructor. @@ -51,7 +57,7 @@ public: * @brief Defines the member functions for the ACE_SOCK datagram * abstraction. */ -class ACE_Export ACE_SOCK_Dgram_Bcast : public ACE_SOCK_Dgram +class ACE_Sockets_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 8bc0cd96c4c..bfd47c52f36 100644 --- a/ace/SOCK_Dgram_Mcast.h +++ b/ace/SOCK_Dgram_Mcast.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -16,14 +16,21 @@ #ifndef ACE_SOCK_DGRAM_MCAST_H #define ACE_SOCK_DGRAM_MCAST_H + #include /**/ "ace/pre.h" -#include "ace/SOCK_Dgram.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 */ #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/SOCK_Dgram.h" #include "ace/INET_Addr.h" #if defined (ACE_SOCK_DGRAM_MCAST_DUMPABLE) @@ -87,7 +94,7 @@ * alphanumeric form and <subscribe> will convert them into numbers via * <ACE_OS::atoi>. */ -class ACE_Export ACE_SOCK_Dgram_Mcast : public ACE_SOCK_Dgram +class ACE_Sockets_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 45d7a9c9361..ae04541b404 100644 --- a/ace/SOCK_SEQPACK_Acceptor.h +++ b/ace/SOCK_SEQPACK_Acceptor.h @@ -18,7 +18,12 @@ #include /**/ "ace/pre.h" -#include "ace/ACE_export.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" @@ -41,7 +46,7 @@ class ACE_Time_Value; * Therefore, by inheriting from <ACE_SOCK>, <ACE_SOCK_SEQPACK_Acceptor> * gets its very own socket. */ -class ACE_Export ACE_SOCK_SEQPACK_Acceptor : public ACE_SOCK +class ACE_Sockets_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 0320c90a7dd..c2b25065827 100644 --- a/ace/SOCK_SEQPACK_Association.h +++ b/ace/SOCK_SEQPACK_Association.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -19,8 +19,13 @@ #define ACE_SOCK_SEQPACK_ASSOCIATION_H #include /**/ "ace/pre.h" -#include "ace/config-all.h" -#include "ace/ACE_export.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" @@ -74,7 +79,7 @@ class ACE_Message_Block; * will result in <send> getting called on Win32 platforms, and * <write> getting called on non-Win32 platforms. */ -class ACE_Export ACE_SOCK_SEQPACK_Association : public ACE_SOCK_IO +class ACE_Sockets_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 26139d10eee..3c913d3ff82 100644 --- a/ace/SOCK_SEQPACK_Connector.h +++ b/ace/SOCK_SEQPACK_Connector.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -18,8 +18,13 @@ #define ACE_SOCK_SEQPACK_CONNECTOR_H #include /**/ "ace/pre.h" -#include "ace/config-all.h" -#include "ace/ACE_export.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" @@ -46,7 +51,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_Export ACE_SOCK_SEQPACK_Connector +class ACE_Sockets_Export ACE_SOCK_SEQPACK_Connector { public: // = Initialization and termination methods. diff --git a/ace/UNIX_Addr.h b/ace/UNIX_Addr.h index 7825bac26f5..36a040e4ec2 100644 --- a/ace/UNIX_Addr.h +++ b/ace/UNIX_Addr.h @@ -13,9 +13,15 @@ #ifndef ACE_UNIX_ADDR_H #define ACE_UNIX_ADDR_H + #include /**/ "ace/pre.h" -#include "ace/config-all.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 */ #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -33,7 +39,7 @@ * * @brief Defines the ``UNIX domain address family'' address format. */ -class ACE_Export ACE_UNIX_Addr : public ACE_Addr +class ACE_Sockets_Export ACE_UNIX_Addr : public ACE_Addr { public: // = Initialization methods. diff --git a/bin/MakeProjectCreator/config/acesocketslib_for_tao.mpb b/bin/MakeProjectCreator/config/acesocketslib_for_tao.mpb new file mode 100644 index 00000000000..6e499cc334b --- /dev/null +++ b/bin/MakeProjectCreator/config/acesocketslib_for_tao.mpb @@ -0,0 +1,10 @@ +// -*- MPC -*- +// +// $Id$ + +feature(ace_for_tao) { + + after += ACE_Sockets_FOR_TAO + libs += ACE_Sockets_FOR_TAO + +} |