diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-09-09 09:35:14 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-09-09 09:35:14 +0000 |
| commit | c3efbc7f642bfc5bbbc5dfa3f936af67bfc470af (patch) | |
| tree | 6d9f4e402723ba3e080b549079a78db541816f81 /ACE | |
| parent | 6dff767d910eda93c9b1e3f184019f94cb30efd6 (diff) | |
| download | ATCD-c3efbc7f642bfc5bbbc5dfa3f936af67bfc470af.tar.gz | |
Thu Sep 9 09:29:30 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/CDR_Base.h:
* ace/CDR_Base.cpp:
* ace/DEV.h:
* ace/FILE.h:
* ace/Global_Macros.h:
* ace/INET_Addr.inl:
* ace/Malloc_T.h:
* ace/Malloc_T.inl:
* ace/Malloc_T.cpp:
* ace/SOCK_Dgram_Bcast.cpp:
* ace/SSL/SSL_SOCK.h:
* ace/Shared_Memory_Pool.cpp:
* ace/Sock_Connect.cpp:
* ace/config-aix-5.x.h:
* ace/config-doxygen.h:
* ace/config-g++-common.h:
* ace/config-hpux-11.00.h:
* ace/config-icc-common.h:
* ace/config-integritySCA.h:
* ace/config-linux-common.h:
* ace/config-macros.h:
* ace/config-mvs.h:
* ace/config-openvms.h:
* ace/config-suncc-common.h:
* ace/config-sunos5.5.h:
* ace/config-sunos5.6.h:
* ace/config-tandem-nsk-mips-v2.h:
* ace/config-tandem-nsk-mips-v3.h:
* ace/config-win32-borland.h:
* ace/config-win32-dmc.h:
* ace/config-win32-ghs.h:
* ace/config-win32-msvc-10.h:
* ace/config-win32-msvc-7.h:
* ace/config-win32-msvc-8.h:
* ace/config-win32-msvc-9.h:
* examples/IOStream/server/iostream_server.h:
* examples/IPC_SAP/SOCK_SAP/C-inserver.cpp:
* examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp:
* examples/Reactor/Misc/test_event_handler_t.cpp:
* tests/Basic_Types_Test.cpp:
* tests/Conn_Test.cpp:
* tests/Message_Queue_Test.cpp:
* tests/SSL/Thread_Pool_Reactor_SSL_Test.h:
* tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp:
Cleanup, all compilers support templated typedefs
* ace/config-cray.h:
* ace/config-cxx-common.h:
Removed these files, obsolete
Diffstat (limited to 'ACE')
47 files changed, 80 insertions, 584 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index c02e84799e4..31bb248e2c1 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,55 @@ +Thu Sep 9 09:29:30 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/CDR_Base.h: + * ace/CDR_Base.cpp: + * ace/DEV.h: + * ace/FILE.h: + * ace/Global_Macros.h: + * ace/INET_Addr.inl: + * ace/Malloc_T.h: + * ace/Malloc_T.inl: + * ace/Malloc_T.cpp: + * ace/SOCK_Dgram_Bcast.cpp: + * ace/SSL/SSL_SOCK.h: + * ace/Shared_Memory_Pool.cpp: + * ace/Sock_Connect.cpp: + * ace/config-aix-5.x.h: + * ace/config-doxygen.h: + * ace/config-g++-common.h: + * ace/config-hpux-11.00.h: + * ace/config-icc-common.h: + * ace/config-integritySCA.h: + * ace/config-linux-common.h: + * ace/config-macros.h: + * ace/config-mvs.h: + * ace/config-openvms.h: + * ace/config-suncc-common.h: + * ace/config-sunos5.5.h: + * ace/config-sunos5.6.h: + * ace/config-tandem-nsk-mips-v2.h: + * ace/config-tandem-nsk-mips-v3.h: + * ace/config-win32-borland.h: + * ace/config-win32-dmc.h: + * ace/config-win32-ghs.h: + * ace/config-win32-msvc-10.h: + * ace/config-win32-msvc-7.h: + * ace/config-win32-msvc-8.h: + * ace/config-win32-msvc-9.h: + * examples/IOStream/server/iostream_server.h: + * examples/IPC_SAP/SOCK_SAP/C-inserver.cpp: + * examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp: + * examples/Reactor/Misc/test_event_handler_t.cpp: + * tests/Basic_Types_Test.cpp: + * tests/Conn_Test.cpp: + * tests/Message_Queue_Test.cpp: + * tests/SSL/Thread_Pool_Reactor_SSL_Test.h: + * tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp: + Cleanup, all compilers support templated typedefs + + * ace/config-cray.h: + * ace/config-cxx-common.h: + Removed these files, obsolete + Thu Sep 9 09:01:10 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> * ace/ACE.cpp: diff --git a/ACE/ace/CDR_Base.cpp b/ACE/ace/CDR_Base.cpp index ba3197008c3..ca32c9fc503 100644 --- a/ACE/ace/CDR_Base.cpp +++ b/ACE/ace/CDR_Base.cpp @@ -774,27 +774,4 @@ ACE_CDR::LongDouble::operator ACE_CDR::LongDouble::NativeImpl () const } #endif /* NONNATIVE_LONGDOUBLE */ -#if defined(_UNICOS) && !defined(_CRAYMPP) -// placeholders to get things compiling -ACE_CDR::Float::Float (void) -{ -} - -ACE_CDR::Float::Float (const float & /* init */) -{ -} - -ACE_CDR::Float & -ACE_CDR::Float::operator= (const float & /* rhs */) -{ - return *this; -} - -bool -ACE_CDR::Float::operator!= (const ACE_CDR::Float & /* rhs */) const -{ - return false; -} -#endif /* _UNICOS */ - ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/CDR_Base.h b/ACE/ace/CDR_Base.h index da0215327ac..d7bd2937be8 100644 --- a/ACE/ace/CDR_Base.h +++ b/ACE/ace/CDR_Base.h @@ -209,7 +209,7 @@ public: # if (defined (_MSC_VER)) || (defined (__BORLANDC__)) typedef __int64 LongLong; -# elif ACE_SIZEOF_LONG == 8 && !defined(_CRAYMPP) +# elif ACE_SIZEOF_LONG == 8 typedef long LongLong; # elif defined(__TANDEM) typedef long long LongLong; @@ -263,12 +263,6 @@ public: # else /* ACE_SIZEOF_INT != 4 */ // Applications will probably have trouble with this. char f[4]; -# if defined(_UNICOS) && !defined(_CRAYMPP) - Float (void); - Float (const float &init); - Float & operator= (const float &rhs); - bool operator!= (const Float &rhs) const; -# endif /* _UNICOS */ # endif /* ACE_SIZEOF_INT != 4 */ }; # endif /* ACE_SIZEOF_FLOAT != 4 */ diff --git a/ACE/ace/DEV.h b/ACE/ace/DEV.h index 8b0c585ddf7..bfc3d36c7a2 100644 --- a/ACE/ace/DEV.h +++ b/ACE/ace/DEV.h @@ -23,19 +23,6 @@ #include "ace/DEV_Addr.h" -// The following is necessary since many C++ compilers don't support -// typedef'd types inside of classes used as formal template -// arguments... ;-(. Luckily, using the C++ preprocessor I can hide -// most of this nastiness! - -#if defined (ACE_HAS_TEMPLATE_TYPEDEFS) -#define ACE_DEV_CONNECTOR ACE_DEV_Connector -#define ACE_DEV_STREAM ACE_DEV_IO -#else /* TEMPLATES are broken (must be a cfront-based compiler...) */ -#define ACE_DEV_CONNECTOR ACE_DEV_Connector, ACE_DEV_Addr -#define ACE_DEV_STREAM ACE_DEV_IO, ACE_DEV_Addr -#endif /* ACE_TEMPLATE_TYPEDEFS */ - ACE_BEGIN_VERSIONED_NAMESPACE_DECL /** diff --git a/ACE/ace/FILE.h b/ACE/ace/FILE.h index ba8c519990b..a88722b31d2 100644 --- a/ACE/ace/FILE.h +++ b/ACE/ace/FILE.h @@ -22,19 +22,6 @@ #include "ace/FILE_Addr.h" -// The following is necessary since many C++ compilers don't support -// typedef'd types inside of classes used as formal template -// arguments... ;-(. Luckily, using the C++ preprocessor I can hide -// most of this nastiness! - -#if defined (ACE_HAS_TEMPLATE_TYPEDEFS) -#define ACE_FILE_CONNECTOR ACE_FILE_Connector -#define ACE_FILE_STREAM ACE_FILE_IO -#else /* TEMPLATES are broken (must be a cfront-based compiler...) */ -#define ACE_FILE_CONNECTOR ACE_FILE_Connector, ACE_FILE_Addr -#define ACE_FILE_STREAM ACE_FILE_IO, ACE_FILE_Addr -#endif /* ACE_TEMPLATE_TYPEDEFS */ - ACE_BEGIN_VERSIONED_NAMESPACE_DECL /** diff --git a/ACE/ace/Global_Macros.h b/ACE/ace/Global_Macros.h index 814be2ee1f9..5d11f24ae0a 100644 --- a/ACE/ace/Global_Macros.h +++ b/ACE/ace/Global_Macros.h @@ -125,7 +125,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL ACE_Guard< MUTEX > OBJ (LOCK); \ if (OBJ.locked () != 0) { ACTION; } \ else { REACTION; } -#endif /* !ACE_GUARD_ACTION */ +#endif /* !ACE_GUARD_ACTION */ #if !defined (ACE_GUARD_REACTION) #define ACE_GUARD_REACTION(MUTEX, OBJ, LOCK, REACTION) \ ACE_GUARD_ACTION(MUTEX, OBJ, LOCK, ;, REACTION) @@ -137,7 +137,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #if !defined (ACE_GUARD_RETURN) #define ACE_GUARD_RETURN(MUTEX, OBJ, LOCK, RETURN) \ ACE_GUARD_REACTION(MUTEX, OBJ, LOCK, return RETURN) -#endif /* !ACE_GUARD_RETURN */ +#endif /* !ACE_GUARD_RETURN */ #if !defined (ACE_WRITE_GUARD) # define ACE_WRITE_GUARD(MUTEX,OBJ,LOCK) \ ACE_Write_Guard< MUTEX > OBJ (LOCK); \ @@ -157,7 +157,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL # define ACE_READ_GUARD_RETURN(MUTEX,OBJ,LOCK,RETURN) \ ACE_Read_Guard< MUTEX > OBJ (LOCK); \ if (OBJ.locked () == 0) return RETURN; -#endif /* !ACE_READ_GUARD_RETURN */ +#endif /* !ACE_READ_GUARD_RETURN */ // FUZZ: enable check_for_ACE_Guard // ---------------------------------------------------------------- @@ -997,10 +997,6 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC # define ACE_UPIPE_CONNECTOR ACE_UPIPE_Connector # define ACE_UPIPE_STREAM ACE_UPIPE_Stream -// Handle ACE_FILE_* -# define ACE_FILE_CONNECTOR ACE_FILE_Connector -# define ACE_FILE_STREAM ACE_FILE_IO - // Handle ACE_*_Memory_Pool. # define ACE_MMAP_MEMORY_POOL ACE_MMAP_Memory_Pool # define ACE_LITE_MMAP_MEMORY_POOL ACE_Lite_MMAP_Memory_Pool diff --git a/ACE/ace/INET_Addr.inl b/ACE/ace/INET_Addr.inl index ab98d632f4e..ff7d43e8691 100644 --- a/ACE/ace/INET_Addr.inl +++ b/ACE/ace/INET_Addr.inl @@ -71,14 +71,7 @@ ACE_INET_Addr::ip_addr_size (void) const else return static_cast<int> (sizeof this->inet_addr_.in6_.sin6_addr); #else - // These _UNICOS changes were picked up from pre-IPv6 code in - // get_host_name_i... the IPv6 section above may need something - // similar, so keep an eye out for it. -# if !defined(_UNICOS) return static_cast<int> (sizeof this->inet_addr_.in4_.sin_addr.s_addr); -# else /* _UNICOS */ - return static_cast<int> (sizeof this->inet_addr_.in4_.sin_addr); -# endif /* ! _UNICOS */ #endif /* ACE_HAS_IPV6 */ } diff --git a/ACE/ace/Malloc_T.cpp b/ACE/ace/Malloc_T.cpp index d0918128180..395666cb209 100644 --- a/ACE/ace/Malloc_T.cpp +++ b/ACE/ace/Malloc_T.cpp @@ -544,32 +544,6 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T (const ACE_TCHAR *p ACE_TEXT ("ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T"))); } -#if !defined (ACE_HAS_TEMPLATE_TYPEDEFS) -template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> -ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T (const ACE_TCHAR *pool_name, - const ACE_TCHAR *lock_name, - const void *options) - : cb_ptr_ (0), - memory_pool_ (pool_name, - (const ACE_MEM_POOL_OPTIONS *) options), - bad_flag_ (0) -{ - ACE_TRACE ("ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T"); - - this->lock_ = ACE_Malloc_Lock_Adapter_T<ACE_LOCK> ()(lock_name); - if (this->lock_ == 0) - return; - - this->delete_lock_ = true; - this->bad_flag_ = this->open (); - if (this->bad_flag_ == -1) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T"))); -} -#endif /* ACE_HAS_TEMPLATE_TYPEDEFS */ - - template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::~ACE_Malloc_T (void) { diff --git a/ACE/ace/Malloc_T.h b/ACE/ace/Malloc_T.h index 9cea14888c2..6089fbbf0e5 100644 --- a/ACE/ace/Malloc_T.h +++ b/ACE/ace/Malloc_T.h @@ -490,14 +490,6 @@ public: const ACE_MEM_POOL_OPTIONS *options, ACE_LOCK *lock); -#if !defined (ACE_HAS_TEMPLATE_TYPEDEFS) - /// This is necessary to work around template bugs with certain C++ - /// compilers. - ACE_Malloc_T (const ACE_TCHAR *pool_name, - const ACE_TCHAR *lock_name, - const void *options = 0); -#endif /* ACE_HAS_TEMPLATE_TYPEDEFS */ - /// Destructor ~ACE_Malloc_T (void); @@ -868,14 +860,6 @@ public: ACE_Malloc (const ACE_TCHAR *pool_name, const ACE_TCHAR *lock_name, const ACE_MEM_POOL_OPTIONS *options = 0); - -#if !defined (ACE_HAS_TEMPLATE_TYPEDEFS) - /// This is necessary to work around template bugs with certain C++ - /// compilers. - ACE_Malloc (const ACE_TCHAR *pool_name, - const ACE_TCHAR *lock_name, - const void *options = 0); -#endif /* ACE_HAS_TEMPLATE_TYPEDEFS */ }; template <ACE_MEM_POOL_1, class ACE_LOCK> diff --git a/ACE/ace/Malloc_T.inl b/ACE/ace/Malloc_T.inl index 078c0308ff5..9084234c80e 100644 --- a/ACE/ace/Malloc_T.inl +++ b/ACE/ace/Malloc_T.inl @@ -144,16 +144,6 @@ ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::ACE_Malloc (const ACE_TCHAR *pool_name, { } -#if !defined (ACE_HAS_TEMPLATE_TYPEDEFS) -template <ACE_MEM_POOL_1, class ACE_LOCK> ACE_INLINE -ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::ACE_Malloc (const ACE_TCHAR *pool_name, - const ACE_TCHAR *lock_name, - const void *options) - : ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_Control_Block> (pool_name, lock_name, options) -{ -} -#endif /* !ACE_HAS_TEMPLATE_TYPEDEFS */ - template <ACE_MEM_POOL_1, class ACE_LOCK> ACE_INLINE ACE_Malloc_LIFO_Iterator<ACE_MEM_POOL_2, ACE_LOCK>::ACE_Malloc_LIFO_Iterator (ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK> &malloc, const char *name) diff --git a/ACE/ace/SOCK_Dgram_Bcast.cpp b/ACE/ace/SOCK_Dgram_Bcast.cpp index f6c445826b8..07a1961eea8 100644 --- a/ACE/ace/SOCK_Dgram_Bcast.cpp +++ b/ACE/ace/SOCK_Dgram_Bcast.cpp @@ -151,18 +151,9 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name) if (hp == 0) return -1; else -#if defined(_UNICOS) - { - ACE_UINT64 haddr; // a place to put the address - char * haddrp = (char *) &haddr; // convert to char pointer - ACE_OS::memcpy(haddrp,(char *) hp->h_addr,hp->h_length); - host_addr.sin_addr.s_addr = haddr; - } -#else /* ! _UNICOS */ ACE_OS::memcpy ((char *) &host_addr.sin_addr.s_addr, (char *) hp->h_addr, hp->h_length); -#endif /* ! _UNICOS */ } diff --git a/ACE/ace/SSL/SSL_SOCK.h b/ACE/ace/SSL/SSL_SOCK.h index ad24db3a3cd..96552744c8d 100644 --- a/ACE/ace/SSL/SSL_SOCK.h +++ b/ACE/ace/SSL/SSL_SOCK.h @@ -24,16 +24,6 @@ #include "ace/SOCK.h" -#if defined (ACE_HAS_TEMPLATE_TYPEDEFS) -# define ACE_SSL_SOCK_ACCEPTOR ACE_SSL_SOCK_Acceptor -# define ACE_SSL_SOCK_CONNECTOR ACE_SSL_SOCK_Connector -# define ACE_SSL_SOCK_STREAM ACE_SSL_SOCK_Stream -#else -# define ACE_SSL_SOCK_ACCEPTOR ACE_SSL_SOCK_Acceptor, ACE_INET_Addr -# define ACE_SSL_SOCK_CONNECTOR ACE_SSL_SOCK_Connector, ACE_INET_Addr -# define ACE_SSL_SOCK_STREAM ACE_SSL_SOCK_Stream, ACE_INET_Addr -#endif /* ACE_HAS_TEMPLATE_TYPEDEFS */ - ACE_BEGIN_VERSIONED_NAMESPACE_DECL /** diff --git a/ACE/ace/Shared_Memory_Pool.cpp b/ACE/ace/Shared_Memory_Pool.cpp index 93114cf58f4..01bb2001637 100644 --- a/ACE/ace/Shared_Memory_Pool.cpp +++ b/ACE/ace/Shared_Memory_Pool.cpp @@ -168,7 +168,6 @@ ACE_Shared_Memory_Pool::handle_signal (int , siginfo_t *siginfo, ucontext_t *) ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n"), ACE_TEXT ("in_use"))); -#if !defined(_UNICOS) else if (!(siginfo->si_code == SEGV_MAPERR && siginfo->si_addr < (((char *) this->base_addr_) + offset) && siginfo->si_addr >= ((char *) this->base_addr_))) @@ -176,15 +175,6 @@ ACE_Shared_Memory_Pool::handle_signal (int , siginfo_t *siginfo, ucontext_t *) "(%P|%t) address %u out of range\n", siginfo->si_addr), -1); -#else /* ! _UNICOS */ - else if (!(siginfo->si_code == SEGV_MEMERR - && siginfo->si_addr < (((unsigned long) this->base_addr_) + offset) - && siginfo->si_addr >= ((unsigned long) this->base_addr_))) - ACE_ERROR_RETURN ((LM_ERROR, - "(%P|%t) address %u out of range\n", - siginfo->si_addr), - -1); -#endif /* ! _UNICOS */ } // The above if case will check to see that the address is in the @@ -194,11 +184,7 @@ ACE_Shared_Memory_Pool::handle_signal (int , siginfo_t *siginfo, ucontext_t *) size_t counter; // ret value to get shmid from the st table. -#if !defined(_UNICOS) if (this->find_seg (siginfo->si_addr, offset, counter) == -1) -#else /* ! _UNICOS */ - if (this->find_seg ((const void *)siginfo->si_addr, offset, counter) == -1) -#endif /* ! _UNICOS */ ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n"), ACE_TEXT ("in_use")), diff --git a/ACE/ace/Sock_Connect.cpp b/ACE/ace/Sock_Connect.cpp index ec56bbcc7b9..95e3cdffd52 100644 --- a/ACE/ace/Sock_Connect.cpp +++ b/ACE/ace/Sock_Connect.cpp @@ -242,29 +242,16 @@ ACE::get_bcast_addr (ACE_UINT32 &bcast_addr, if (hp == 0) return -1; else -#if !defined(_UNICOS) ACE_OS::memcpy ((char *) &ip_addr.sin_addr.s_addr, (char *) hp->h_addr, hp->h_length); -#else /* _UNICOS */ - { - ACE_UINT64 haddr; // a place to put the address - char * haddrp = (char *) &haddr; // convert to char pointer - ACE_OS::memcpy(haddrp,(char *) hp->h_addr,hp->h_length); - ip_addr.sin_addr.s_addr = haddr; - } -#endif /* ! _UNICOS */ } else { ACE_OS::memset ((void *) &ip_addr, 0, sizeof ip_addr); -#if !defined(_UNICOS) ACE_OS::memcpy ((void *) &ip_addr.sin_addr, (void*) &host_addr, sizeof ip_addr.sin_addr); -#else /* _UNICOS */ - ip_addr.sin_addr.s_addr = host_addr; // just copy to the bitfield -#endif /* ! _UNICOS */ } #if !defined(AIX) && !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined (__Lynx__) @@ -1279,7 +1266,6 @@ ACE::get_ip_interfaces (size_t &count, ACE_INET_Addr *&addrs) ) { -# if !defined(_UNICOS) struct sockaddr_in *addr = reinterpret_cast<sockaddr_in *> (&pcur->IFR_ADDR); @@ -1300,23 +1286,6 @@ ACE::get_ip_interfaces (size_t &count, ACE_INET_Addr *&addrs) addrs[count].set (addr, addrlen); ++count; } -# else /* ! _UNICOS */ - // need to explicitly copy on the Cray, since the bitfields kinda - // screw things up here - struct sockaddr_in inAddr; - - inAddr.sin_len = pcur->IFR_ADDR.sa_len; - inAddr.sin_family = pcur->IFR_ADDR.sa_family; - memcpy((void *)&(inAddr.sin_addr), - (const void *)&(pcur->IFR_ADDR.sa_data[8]), - sizeof(struct in_addr)); - - if (inAddr.sin_addr.s_addr != 0) - { - addrs[count].set(&inAddr, sizeof(struct sockaddr_in)); - ++count; - } -# endif /* ! _UNICOS */ } #if !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined (ACE_HAS_RTEMS) && !defined (__Lynx__) diff --git a/ACE/ace/config-aix-5.x.h b/ACE/ace/config-aix-5.x.h index 006aca64857..56cbe17ff14 100644 --- a/ACE/ace/config-aix-5.x.h +++ b/ACE/ace/config-aix-5.x.h @@ -78,7 +78,6 @@ # define ACE_HAS_STANDARD_CPP_LIBRARY 1 # define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 -# define ACE_HAS_TEMPLATE_TYPEDEFS # define ACE_HAS_CUSTOM_EXPORT_MACROS # define ACE_Proper_Export_Flag # define ACE_Proper_Import_Flag diff --git a/ACE/ace/config-cray.h b/ACE/ace/config-cray.h deleted file mode 100644 index ffad6ae9510..00000000000 --- a/ACE/ace/config-cray.h +++ /dev/null @@ -1,205 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -#ifndef ACE_CONFIG_CRAY_H -#define ACE_CONFIG_CRAY_H -#include /**/ "ace/pre.h" - -/* - The following predefined macros are used within ACE ifdefs. - These are defined when using the Cray compilers. _CRAYMPP - is defined, for example, if you are running on a Cray T3E - massively parallel machine. Moreover, in the case of the T3E, - _CRAYT3E will be defined. This is used to determine the - ACE_SIZEOF defines for primitive types. - - _UNICOS is defined as either the major version of UNICOS being run, - e.g. 9 or 10 on the vector machines (e.g. C90, T90, J90, YMP, ...) - or the major+minor+level UNICOS/mk version, e.g. 2.0.3 => 203, - being run on an MPP machine. - - Summary: - - _CRAYMPP (defined only if running on MPP machine, e.g. T3E, UNICOS/mk) - _CRAYT3E (defined specifically if compiling on a Cray T3E) - _UNICOS (defined if running UNICOS or UNICOS/mk) - - Tested on UNICOS 10.0.0.5, UNICOS/mk 2.0.4.57 - Compiles on UNICOS 9.0.2.8, but some tests deadlock - - Contributed by Doug Anderson <dla@home.com> -*/ - -#if defined (_UNICOS) && !defined (MAXPATHLEN) -#define MAXPATHLEN 1023 -#endif /* _UNICOS */ - -#define ACE_DEFAULT_CLOSE_ALL_HANDLES 0 - -// Defines the page size of the system. -#define ACE_PAGE_SIZE 4096 - -#define ACE_HAS_CPLUSPLUS_HEADERS - -#define ACE_HAS_SSIZE_T - -#define ACE_HAS_SYSV_IPC - -#define ACE_MT_SAFE 1 - -#define ACE_HAS_THREADS - -#define ACE_HAS_PTHREADS - -#define ACE_HAS_THREAD_SPECIFIC_STORAGE - -#define ACE_HAS_PTHREAD_MUTEXATTR_SETKIND_NP - -#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R - -#define ACE_HAS_POSIX_TIME - -#define ACE_HAS_TIMEZONE_GETTIMEOFDAY - -#define ACE_HAS_POSIX_NONBLOCK - -// Platform has POSIX terminal interface. -#define ACE_HAS_TERMIOS - -#define ACE_HAS_DIRENT - -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT - -#define ACE_HAS_IP_MULTICAST - -#define ACE_HAS_SOCKADDR_IN_SIN_LEN - -#define ACE_HAS_NONCONST_SELECT_TIMEVAL - -#define ACE_HAS_NONCONST_READLINK - -#define ACE_HAS_CHARPTR_SOCKOPT - -#define ACE_HAS_NONCONST_GETBY -#define ACE_HAS_NONCONST_INET_ADDR - -// has man pages, but links with missing symbols and I can't find lib yet -/* #define ACE_HAS_REGEX */ - -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES - -#if _UNICOS > 9 -# define ACE_HAS_SIGWAIT -#endif - -#define ACE_HAS_SIG_ATOMIC_T - -#define ACE_HAS_SIGISMEMBER_BUG - -#define ACE_HAS_MSG - -#define ACE_HAS_GPERF - -// Special modifications that apply to UNICOS/mk -#if defined(_CRAYMPP) - -# define ACE_HAS_SIGINFO_T -# define ACE_HAS_UCONTEXT_T - -#endif - -// The Cray T90 supposedly supports SYSV SHMEM, but I was unable to get it -// working. Of course, all other Cray PVP and MPP systems do NOT support it, -// so it's probably good to just define like this for consistency -#define ACE_LACKS_SYSV_SHMEM -#define ACE_LACKS_MMAP -#define ACE_LACKS_CONST_TIMESPEC_PTR -#define ACE_LACKS_SYSCALL -#define ACE_LACKS_STRRECVFD -#define ACE_LACKS_MADVISE -#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS -#define ACE_LACKS_LINEBUFFERED_STREAMBUF -#define ACE_LACKS_PTHREAD_CLEANUP -#define ACE_LACKS_CONDATTR_PSHARED -#define ACE_LACKS_THREAD_PROCESS_SCOPING - -#if !defined(_CRAYMPP) - -#define ACE_LACKS_PTHREAD_CANCEL -#define ACE_LACKS_PTHREAD_KILL - -#endif - -#define ACE_LACKS_MUTEXATTR_PSHARED -#define ACE_LACKS_RWLOCK_T -#define ACE_LACKS_PRI_T -#define ACE_LACKS_GETPGID -#define ACE_LACKS_SETPGID -#define ACE_LACKS_SETREGID -#define ACE_LACKS_SETREUID -#define ACE_LACKS_MPROTECT -#define ACE_LACKS_MSYNC -#define ACE_LACKS_READV -#define ACE_LACKS_RLIMIT - -// we probably want to fake not having this, since Cray memory mgmt is different -#define ACE_LACKS_SBRK - -#define ACE_LACKS_SETSCHED - -#define ACE_LACKS_SIGINFO_H - -#define ACE_LACKS_TIMESPEC_T - -#define ACE_LACKS_WRITEV - -// Cray vector machines are "word" oriented, and modern ones are hard 64-bit. -// "char" is somewhat of a special case. Most problems arise when code thinks -// it can address 32-bit quantities and the like. MPP crays are typically -// byte oriented, e.g. T3E uses Alpha processors, so we don't need as much -// special treatment. - -#ifndef _CRAYMPP - -# define ACE_SIZEOF_CHAR 1 -# define ACE_SIZEOF_SHORT 8 -# define ACE_SIZEOF_INT 8 -# define ACE_SIZEOF_LONG 8 -# define ACE_SIZEOF_LONG_LONG 8 -# define ACE_SIZEOF_FLOAT 8 -# define ACE_SIZEOF_DOUBLE 8 -# define ACE_SIZEOF_LONG_DOUBLE 16 -# define ACE_SIZEOF_VOID_P 8 - -#elif defined(_CRAYT3E) - -# define ACE_SIZEOF_CHAR 1 -# define ACE_SIZEOF_SHORT 4 -# define ACE_SIZEOF_INT 8 -# define ACE_SIZEOF_LONG 8 -# define ACE_SIZEOF_LONG_LONG 8 -# define ACE_SIZEOF_FLOAT 4 -# define ACE_SIZEOF_DOUBLE 8 -# define ACE_SIZEOF_LONG_DOUBLE 8 -# define ACE_SIZEOF_VOID_P 8 - -#endif - -// Ones to check out at some point - -// C++ Compiler stuff to verify -/* #define ACE_NEW_THROWS_EXCEPTIONS */ -/* #define ACE_HAS_TEMPLATE_TYPEDEFS */ - -// thread issues to check out -/* #define ACE_LACKS_TIMEDWAIT_PROTOTYPES */ - -// Cray does seem to support it, in -lnsl and has tiuser.h header -/* #define ACE_HAS_TLI */ -/* #define ACE_HAS_TIUSER_H */ -/* #define ACE_HAS_TLI_PROTOTYPES */ - -/* #define ACE_LACKS_NAMED_POSIX_SEM */ - -#include /**/ "ace/post.h" -#endif /* ACE_CONFIG_CRAY_H */ diff --git a/ACE/ace/config-cxx-common.h b/ACE/ace/config-cxx-common.h deleted file mode 100644 index b14dc8bc7bd..00000000000 --- a/ACE/ace/config-cxx-common.h +++ /dev/null @@ -1,79 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -#ifndef ACE_CXX_COMMON_H -#define ACE_CXX_COMMON_H -#include /**/ "ace/pre.h" - -#if !defined (ACE_CONFIG_INCLUDE_CXX_COMMON) -# error ace/config-cxx-common.h: ACE configuration error! Do not #include this file directly! -#endif - -#if defined (__DECCXX) -# if !defined (linux) -# define ACE_HAS_STRING_CLASS -# if (__DECCXX_VER >= 60090010) -# define ACE_HAS_STDCPP_STL_INCLUDES -# endif /* __DECCXX_VER < 60090010 */ -# endif /* ! linux */ - -# define DEC_CXX -# define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR -# define ACE_LACKS_LINEBUFFERED_STREAMBUF -# define ACE_LACKS_SIGNED_CHAR -# define ACE_HAS_CPLUSPLUS_HEADERS -# define ACE_TEMPLATES_REQUIRE_SOURCE -# if (__DECCXX_VER >= 60090010) - // DEC CXX 6.0 supports exceptions, etc., by default. Exceptions - // are enabled by platform_osf1_4.x.GNU/wrapper_macros.GNU. -# define ACE_NEW_THROWS_EXCEPTIONS -# define ACE_HAS_STANDARD_CPP_LIBRARY 1 -# define ACE_HAS_TEMPLATE_TYPEDEFS - -# define ACE_ENDLESS_LOOP \ - unsigned int ace_endless_loop____ = 0; if (ace_endless_loop____) break; - -# if defined (__USE_STD_IOSTREAM) -# define ACE_LACKS_CHAR_RIGHT_SHIFTS -# define ACE_LACKS_IOSTREAM_FX -# define ACE_LACKS_UNBUFFERED_STREAMBUF -# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 -# else /* ! __USE_STD_IOSTREAM */ -# define ACE_USES_OLD_IOSTREAMS -# endif /* ! __USE_STD_IOSTREAM */ - -// 9: nested comment not allowed. (/usr/include/pdsc.h!) (nestcomment) -// 177: variable was declared but never referenced (declbutnotref) -// 193: zero used for undefined preprocessing identifier (undpreid) -// 236: controlling expression is constant (boolexprconst) -// 401: base_class_with_nonvirtual_dtor (basclsnondto) -// 1016: expected type is incompatible with declared type of int (incint) -// 1136: conversion to smaller size integer could lose data (intconlosbit) - -# pragma message disable basclsnondto -# pragma message disable boolexprconst -# pragma message disable undpreid -# pragma message disable notusetmpfunprm -# pragma message disable bltinclnk - -# if (__DECCXX_VER >= 60190029) - // 6.1-029 and later support msg 1136. Disable it because it - // causes warnings from ACE and/or TAO. -# pragma message disable intconlosbit -# endif /* __DECCXX_VER >= 60190029 */ - -# if (__DECCXX_VER == 60190027) - // Seems that this version of cxx doesn't have reset -# define ACE_AUTO_PTR_LACKS_RESET -# endif /* __DECCXX_VER == 60190027 */ - -# else /* __DECCXX_VER < 60090010 */ -# define ACE_LACKS_PRAGMA_ONCE -# endif /* __DECCXX_VER < 60090010 */ -#else /* ! __DECCXX */ -# error ace/config-cxx-common.h can only be used with Compaq CXX! -#endif /* ! __DECCXX */ - -#include /**/ "ace/post.h" -#endif /* ACE_CXX_COMMON_H */ diff --git a/ACE/ace/config-doxygen.h b/ACE/ace/config-doxygen.h index 8c1b6768371..039abb3a090 100644 --- a/ACE/ace/config-doxygen.h +++ b/ACE/ace/config-doxygen.h @@ -90,9 +90,6 @@ /// Generate ACE_Dev_Poll_Reactor documentation #define ACE_HAS_DEV_POLL -/// Generate ACE_Event_Handler_T documentation -#define ACE_HAS_TEMPLATE_TYPEDEFS - /// Generate ACE_Log_Msg_NT_Event_Log documentation #define ACE_HAS_LOG_MSG_NT_EVENT_LOG diff --git a/ACE/ace/config-g++-common.h b/ACE/ace/config-g++-common.h index a6841fc49a8..738e0480024 100644 --- a/ACE/ace/config-g++-common.h +++ b/ACE/ace/config-g++-common.h @@ -12,7 +12,6 @@ #define ACE_HAS_CPLUSPLUS_HEADERS #define ACE_HAS_STDCPP_STL_INCLUDES -#define ACE_HAS_TEMPLATE_TYPEDEFS #define ACE_HAS_STANDARD_CPP_LIBRARY 1 #define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR #define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 diff --git a/ACE/ace/config-hpux-11.00.h b/ACE/ace/config-hpux-11.00.h index 36db80b553d..38982d17944 100644 --- a/ACE/ace/config-hpux-11.00.h +++ b/ACE/ace/config-hpux-11.00.h @@ -51,10 +51,6 @@ # define ACE_LACKS_NUMERIC_LIMITS # endif /* _HP_NAMESPACE_STD */ -// Compiler implements templates that support typedefs inside of classes -// used as formal arguments to a template class. -# define ACE_HAS_TEMPLATE_TYPEDEFS - # define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR // Platform lacks streambuf "linebuffered ()". diff --git a/ACE/ace/config-icc-common.h b/ACE/ace/config-icc-common.h index 5197c35135e..6d1f1ff58d3 100644 --- a/ACE/ace/config-icc-common.h +++ b/ACE/ace/config-icc-common.h @@ -8,7 +8,6 @@ # define ACE_HAS_CPLUSPLUS_HEADERS # define ACE_HAS_STDCPP_STL_INCLUDES -# define ACE_HAS_TEMPLATE_TYPEDEFS # define ACE_HAS_STANDARD_CPP_LIBRARY 1 # define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR # define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 diff --git a/ACE/ace/config-integritySCA.h b/ACE/ace/config-integritySCA.h index 4c9500f1334..15d0074d974 100644 --- a/ACE/ace/config-integritySCA.h +++ b/ACE/ace/config-integritySCA.h @@ -29,7 +29,6 @@ #define ACE_NEW_THROWS_EXCEPTIONS #define ACE_HAS_STANDARD_CPP_LIBRARY 1 #define ACE_TEMPLATES_REQUIRE_SOURCE 1 -#define ACE_HAS_TEMPLATE_TYPEDEFS #define TAO_USE_SEQUENCE_TEMPLATES #define ACE_NEEDS_FUNC_DEFINITIONS #define _REENTRANT diff --git a/ACE/ace/config-linux-common.h b/ACE/ace/config-linux-common.h index f8f764fc207..59947b46abb 100644 --- a/ACE/ace/config-linux-common.h +++ b/ACE/ace/config-linux-common.h @@ -172,16 +172,12 @@ #define ACE_CC_MAJOR_VERSION __GNUC__ #define ACE_CC_MINOR_VERSION __GNUC_MINOR__ //#define ACE_CC_BETA_VERSION 0 /* ??? */ -#elif defined (__DECCXX) -# define ACE_CONFIG_INCLUDE_CXX_COMMON -# include "ace/config-cxx-common.h" #elif defined (__SUNCC_PRO) || defined (__SUNPRO_CC) # include "ace/config-suncc-common.h" #elif defined (__PGI) // Portable group compiler # define ACE_HAS_CPLUSPLUS_HEADERS # define ACE_HAS_STDCPP_STL_INCLUDES -# define ACE_HAS_TEMPLATE_TYPEDEFS # define ACE_HAS_STANDARD_CPP_LIBRARY 1 # define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 # define ACE_LACKS_SWAB diff --git a/ACE/ace/config-macros.h b/ACE/ace/config-macros.h index 2aff0cdaa2f..3b30a4cb094 100644 --- a/ACE/ace/config-macros.h +++ b/ACE/ace/config-macros.h @@ -491,6 +491,10 @@ extern "C" u_long CLS##_Export _get_dll_unload_policy (void) \ # define ACE_GCC_DESTRUCTOR_ATTRIBUTE #endif +#ifndef ACE_HAS_TEMPLATE_TYPEDEFS +#define ACE_HAS_TEMPLATE_TYPEDEFS +#endif + #ifndef ACE_DEPRECATED # define ACE_DEPRECATED #endif diff --git a/ACE/ace/config-mvs.h b/ACE/ace/config-mvs.h index f5f7be3c110..3553951c65d 100644 --- a/ACE/ace/config-mvs.h +++ b/ACE/ace/config-mvs.h @@ -68,7 +68,6 @@ #define ACE_HAS_STRBUF_T #define ACE_HAS_STRINGS #define ACE_HAS_SYSV_IPC -#define ACE_HAS_TEMPLATE_TYPEDEFS #define ACE_HAS_THREADS #define ACE_HAS_THREAD_SPECIFIC_STORAGE #define ACE_HAS_THR_C_DEST diff --git a/ACE/ace/config-openvms.h b/ACE/ace/config-openvms.h index b5ae19117f2..61e31f7bcc0 100644 --- a/ACE/ace/config-openvms.h +++ b/ACE/ace/config-openvms.h @@ -178,7 +178,6 @@ #define ACE_HAS_STRING_CLASS 1 #define ACE_HAS_SVR4_DYNAMIC_LINKING 1 -#define ACE_HAS_TEMPLATE_TYPEDEFS 1 #define ACE_LACKS_NAMED_POSIX_SEM 1 #define ACE_LACKS_SYSV_SHMEM 1 #define ACE_LACKS_UNIX_DOMAIN_SOCKETS 1 diff --git a/ACE/ace/config-suncc-common.h b/ACE/ace/config-suncc-common.h index e7f7c107d54..6c72d03dd24 100644 --- a/ACE/ace/config-suncc-common.h +++ b/ACE/ace/config-suncc-common.h @@ -8,7 +8,6 @@ # define ACE_HAS_CPLUSPLUS_HEADERS # define ACE_HAS_STDCPP_STL_INCLUDES -# define ACE_HAS_TEMPLATE_TYPEDEFS # define ACE_HAS_STANDARD_CPP_LIBRARY 1 # define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR # define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 diff --git a/ACE/ace/config-sunos5.5.h b/ACE/ace/config-sunos5.5.h index fc3023dddde..95234ef2893 100644 --- a/ACE/ace/config-sunos5.5.h +++ b/ACE/ace/config-sunos5.5.h @@ -58,7 +58,6 @@ // If -compat=4 is turned on, the old 4.2 settings for iostreams are used, // but the newer, explicit instantiation is used (above) # if (__SUNPRO_CC_COMPAT >= 5) -# define ACE_HAS_TEMPLATE_TYPEDEFS # define ACE_HAS_STANDARD_CPP_LIBRARY 1 # define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 # define ACE_HAS_THR_C_DEST diff --git a/ACE/ace/config-sunos5.6.h b/ACE/ace/config-sunos5.6.h index dafaa0d42b0..6c317c54586 100644 --- a/ACE/ace/config-sunos5.6.h +++ b/ACE/ace/config-sunos5.6.h @@ -38,13 +38,7 @@ #ifndef ACE_TEMPLATES_REQUIRE_SOURCE #define ACE_TEMPLATES_REQUIRE_SOURCE 1 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ -#ifndef ACE_HAS_TEMPLATE_TYPEDEFS -#define ACE_HAS_TEMPLATE_TYPEDEFS 1 -#endif /* ACE_HAS_TEMPLATE_TYPEDEFS */ // Forte 7 seems to botch this one... -#if __SUNPRO_CC == 0x540 -#undef ACE_HAS_TEMPLATE_TYPEDEFS -#endif #ifndef ACE_HAS_THR_C_DEST #define ACE_HAS_THR_C_DEST 1 #endif /* ACE_HAS_THR_C_DEST */ diff --git a/ACE/ace/config-tandem-nsk-mips-v2.h b/ACE/ace/config-tandem-nsk-mips-v2.h index eeaacb34ad2..46bde60e5b0 100644 --- a/ACE/ace/config-tandem-nsk-mips-v2.h +++ b/ACE/ace/config-tandem-nsk-mips-v2.h @@ -352,10 +352,6 @@ typedef enum CMA_T_SCHED_POLICY { // .cpp files). #define ACE_TEMPLATES_REQUIRE_SOURCE -// Compiler implements templates that support typedefs inside -// of classes used as formal arguments to a template class. -#define ACE_HAS_TEMPLATE_TYPEDEFS - // Platform has its standard c++ library in the namespace std. #define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 diff --git a/ACE/ace/config-tandem-nsk-mips-v3.h b/ACE/ace/config-tandem-nsk-mips-v3.h index a89ce6959b1..fa745a45a95 100644 --- a/ACE/ace/config-tandem-nsk-mips-v3.h +++ b/ACE/ace/config-tandem-nsk-mips-v3.h @@ -387,10 +387,6 @@ typedef enum CMA_T_SCHED_POLICY { // .cpp files). #define ACE_TEMPLATES_REQUIRE_SOURCE -// Compiler implements templates that support typedefs inside -// of classes used as formal arguments to a template class. -#define ACE_HAS_TEMPLATE_TYPEDEFS - // Platform/Compiler supports a String class #define ACE_HAS_STRING_CLASS #define ACE_HAS_STDCPP_STL_INCLUDES diff --git a/ACE/ace/config-win32-borland.h b/ACE/ace/config-win32-borland.h index 6af4b729f6c..007fb36227f 100644 --- a/ACE/ace/config-win32-borland.h +++ b/ACE/ace/config-win32-borland.h @@ -115,7 +115,6 @@ #define ACE_HAS_STANDARD_CPP_LIBRARY 1 #define ACE_HAS_STDCPP_STL_INCLUDES 1 #define ACE_HAS_STRING_CLASS 1 -#define ACE_HAS_TEMPLATE_TYPEDEFS 1 #define ACE_HAS_USER_MODE_MASKS 1 #define ACE_LACKS_ACE_IOSTREAM 1 #define ACE_LACKS_LINEBUFFERED_STREAMBUF 1 diff --git a/ACE/ace/config-win32-dmc.h b/ACE/ace/config-win32-dmc.h index e3cd739860a..3251edd8ba1 100644 --- a/ACE/ace/config-win32-dmc.h +++ b/ACE/ace/config-win32-dmc.h @@ -46,24 +46,19 @@ #define ACE_WCSDUP_EQUIVALENT ::_wcsdup // This section above was extracted from config-win32-msvc -# define ACE_EXPORT_NESTED_CLASSES 1 -# define ACE_HAS_CPLUSPLUS_HEADERS 1 -# define ACE_HAS_NONCONST_SELECT_TIMEVAL 1 -# define ACE_HAS_SIG_ATOMIC_T 1 -# define ACE_HAS_STANDARD_CPP_LIBRARY 0 -# define ACE_HAS_STDCPP_STL_INCLUDES 1 -# define ACE_HAS_STRING_CLASS 1 -# define ACE_HAS_TEMPLATE_TYPEDEFS 1 -# define ACE_HAS_USER_MODE_MASKS 1 -//# define ACE_LACKS_LINEBUFFERED_STREAMBUF 1 -# define ACE_LACKS_STRPTIME 1 -//# define ACE_LACKS_PRAGMA_ONCE 1 -//# define ACE_NEW_THROWS_EXCEPTIONS 1 -# define ACE_SIZEOF_LONG_DOUBLE 10 -# define ACE_TEMPLATES_REQUIRE_SOURCE 1 -// Changed ACE_TEXT to ACE_TEXT in the following two lines -# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 -# define ACE_HAS_STRBUF_T +#define ACE_EXPORT_NESTED_CLASSES 1 +#define ACE_HAS_CPLUSPLUS_HEADERS 1 +#define ACE_HAS_NONCONST_SELECT_TIMEVAL 1 +#define ACE_HAS_SIG_ATOMIC_T 1 +#define ACE_HAS_STANDARD_CPP_LIBRARY 0 +#define ACE_HAS_STDCPP_STL_INCLUDES 1 +#define ACE_HAS_STRING_CLASS 1 +#define ACE_HAS_USER_MODE_MASKS 1 +#define ACE_LACKS_STRPTIME 1 +#define ACE_SIZEOF_LONG_DOUBLE 10 +#define ACE_TEMPLATES_REQUIRE_SOURCE 1 +#define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 +#define ACE_HAS_STRBUF_T #define ACE_HAS_3_PARAM_WCSTOK #define ACE_USES_OLD_IOSTREAMS #define ACE_LACKS_UCONTEXT_H diff --git a/ACE/ace/config-win32-ghs.h b/ACE/ace/config-win32-ghs.h index e25bc39d37a..f30722fc4f5 100644 --- a/ACE/ace/config-win32-ghs.h +++ b/ACE/ace/config-win32-ghs.h @@ -61,7 +61,6 @@ # define ACE_HAS_STANDARD_CPP_LIBRARY 1 # define ACE_HAS_STDCPP_STL_INCLUDES 1 # define ACE_HAS_STRING_CLASS 1 -# define ACE_HAS_TEMPLATE_TYPEDEFS 1 # define ACE_HAS_USER_MODE_MASKS 1 # define ACE_LACKS_ACE_IOSTREAM 1 //# define ACE_LACKS_LINEBUFFERED_STREAMBUF 1 diff --git a/ACE/ace/config-win32-msvc-10.h b/ACE/ace/config-win32-msvc-10.h index f7c3d69d170..026a4e358ca 100644 --- a/ACE/ace/config-win32-msvc-10.h +++ b/ACE/ace/config-win32-msvc-10.h @@ -78,7 +78,6 @@ #define ACE_LACKS_STRRECVFD #define ACE_HAS_CPLUSPLUS_HEADERS -#define ACE_HAS_TEMPLATE_TYPEDEFS #define ACE_TEMPLATES_REQUIRE_SOURCE // Platform provides ACE_TLI function prototypes. diff --git a/ACE/ace/config-win32-msvc-7.h b/ACE/ace/config-win32-msvc-7.h index bfc43d9ad72..09f1808bdd8 100644 --- a/ACE/ace/config-win32-msvc-7.h +++ b/ACE/ace/config-win32-msvc-7.h @@ -53,7 +53,6 @@ #define ACE_LACKS_STRRECVFD #define ACE_HAS_CPLUSPLUS_HEADERS -#define ACE_HAS_TEMPLATE_TYPEDEFS #define ACE_TEMPLATES_REQUIRE_SOURCE // Platform provides ACE_TLI function prototypes. diff --git a/ACE/ace/config-win32-msvc-8.h b/ACE/ace/config-win32-msvc-8.h index e44f377ed66..417b9b2ab12 100644 --- a/ACE/ace/config-win32-msvc-8.h +++ b/ACE/ace/config-win32-msvc-8.h @@ -82,7 +82,6 @@ #define ACE_LACKS_STRRECVFD #define ACE_HAS_CPLUSPLUS_HEADERS -#define ACE_HAS_TEMPLATE_TYPEDEFS #define ACE_TEMPLATES_REQUIRE_SOURCE // Platform provides ACE_TLI function prototypes. diff --git a/ACE/ace/config-win32-msvc-9.h b/ACE/ace/config-win32-msvc-9.h index 7e06a1717fe..9db9fc01a80 100644 --- a/ACE/ace/config-win32-msvc-9.h +++ b/ACE/ace/config-win32-msvc-9.h @@ -78,7 +78,6 @@ #define ACE_LACKS_STRRECVFD #define ACE_HAS_CPLUSPLUS_HEADERS -#define ACE_HAS_TEMPLATE_TYPEDEFS #define ACE_TEMPLATES_REQUIRE_SOURCE // Platform provides ACE_TLI function prototypes. diff --git a/ACE/examples/IOStream/server/iostream_server.h b/ACE/examples/IOStream/server/iostream_server.h index e5f4cbd63b9..2f0dab58085 100644 --- a/ACE/examples/IOStream/server/iostream_server.h +++ b/ACE/examples/IOStream/server/iostream_server.h @@ -19,14 +19,7 @@ typedef ACE_IOStream<ACE_SOCK_Stream> ACE_SOCK_IOStream; -// Need to handle brain-dead C++ compilers. -#if defined (ACE_HAS_TEMPLATE_TYPEDEFS) -#define ACE_SOCK_IOSTREAM ACE_SOCK_IOStream -#else -#define ACE_SOCK_IOSTREAM ACE_SOCK_IOStream, ACE_INET_Addr -#endif /* ACE_HAS_TYPENAME_KEYWORD */ - -class Handler : public ACE_Svc_Handler<ACE_SOCK_IOSTREAM, ACE_NULL_SYNCH> +class Handler : public ACE_Svc_Handler<ACE_SOCK_IOStream, ACE_NULL_SYNCH> // = TITLE // Extend the <ACE_Svc_Handler> template to do our bidding. // diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/C-inserver.cpp b/ACE/examples/IPC_SAP/SOCK_SAP/C-inserver.cpp index 8effbcf4d96..450e6e5ee8a 100644 --- a/ACE/examples/IPC_SAP/SOCK_SAP/C-inserver.cpp +++ b/ACE/examples/IPC_SAP/SOCK_SAP/C-inserver.cpp @@ -82,12 +82,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) continue; } -#if !defined(_UNICOS) int addr_len = sizeof cli_addr.sin_addr.s_addr; -#else /* ! _UNICOS */ - // sizeof on bitfield fails - int addr_len = sizeof cli_addr.sin_addr; // 32 bit biffield in UNICOS -#endif /* ! _UNICOS */ hp = ACE_OS::gethostbyaddr ((char *) &cli_addr.sin_addr, addr_len, AF_INET); diff --git a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp index 558f4a80868..0ed0aee86fa 100644 --- a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp +++ b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp @@ -57,7 +57,7 @@ private: // Oneway acceptor factory. }; -class Handler : public ACE_Svc_Handler<ACE_SSL_SOCK_STREAM, ACE_NULL_SYNCH> +class Handler : public ACE_Svc_Handler<ACE_SSL_SOCK_Stream, ACE_NULL_SYNCH> { // = TITLE // Base class for the oneway and twoway handlers. diff --git a/ACE/examples/Reactor/Misc/test_event_handler_t.cpp b/ACE/examples/Reactor/Misc/test_event_handler_t.cpp index 8ba50e46932..9eb4019e455 100644 --- a/ACE/examples/Reactor/Misc/test_event_handler_t.cpp +++ b/ACE/examples/Reactor/Misc/test_event_handler_t.cpp @@ -3,10 +3,6 @@ #include "ace/Event_Handler_T.h" #include "ace/Log_Msg.h" - - -#if defined (ACE_HAS_TEMPLATE_TYPEDEFS) - class ACE_Test_Sig_Handler { public: @@ -41,11 +37,3 @@ ACE_TMAIN (int, ACE_TCHAR *[]) &ACE_Test_Sig_Handler::signal_handler); return 0; } - -#else -int -ACE_TMAIN (int, ACE_TCHAR *[]) -{ - ACE_ERROR_RETURN ((LM_ERROR, "your platform does not support template typedefs\n"), 1); -} -#endif /* ACE_HAS_TEMPLATE_TYPEDEFS */ diff --git a/ACE/tests/Basic_Types_Test.cpp b/ACE/tests/Basic_Types_Test.cpp index 51eace2b93e..c3ff6dce504 100644 --- a/ACE/tests/Basic_Types_Test.cpp +++ b/ACE/tests/Basic_Types_Test.cpp @@ -237,31 +237,15 @@ run_main (int, ACE_TCHAR *[]) errors += check (ACE_TEXT ("ACE_SIZEOF_LONG_DOUBLE: %u%s"), sizeof (long double), ACE_SIZEOF_LONG_DOUBLE); -// Crays don't have 16-bit quantities, so don't even test for 16-bit values -#if !defined(_UNICOS) errors += check (ACE_TEXT ("sizeof (ACE_INT16) is %u%s"), sizeof (ACE_INT16), 2); errors += check (ACE_TEXT ("sizeof (ACE_UINT16) is %u%s"), sizeof (ACE_INT16), 2); -#else /* ! _UNICOS */ - errors += check (ACE_TEXT ("sizeof (ACE_INT16) is %u%s"), - sizeof (ACE_INT16), 8); - errors += check (ACE_TEXT ("sizeof (ACE_UINT16) is %u%s"), - sizeof (ACE_INT16), 8); -#endif /* ! _UNICOS */ -// MPP Crays do have 32-bit quantities (short), though vector Crays don't -#if !defined(_UNICOS) || defined(_CRAYMPP) errors += check (ACE_TEXT ("sizeof (ACE_INT32) is %u%s"), sizeof (ACE_INT32), 4); errors += check (ACE_TEXT ("sizeof (ACE_UINT32) is %u%s"), sizeof (ACE_INT32), 4); -#else /* ! _UNICOS */ - errors += check (ACE_TEXT ("sizeof (ACE_INT32) is %u%s"), - sizeof (ACE_INT32), 8); - errors += check (ACE_TEXT ("sizeof (ACE_UINT32) is %u%s"), - sizeof (ACE_INT32), 8); -#endif /* ! _UNICOS */ errors += check (ACE_TEXT ("sizeof (ACE_UINT64) is %u%s"), sizeof (ACE_UINT64), 8); diff --git a/ACE/tests/Conn_Test.cpp b/ACE/tests/Conn_Test.cpp index c68cbcb3ee5..a213786a7b7 100644 --- a/ACE/tests/Conn_Test.cpp +++ b/ACE/tests/Conn_Test.cpp @@ -76,14 +76,8 @@ static const char ACE_ALPHABET[] = "abcdefghijklmnopqrstuvwxyz"; # endif /* ACE_HAS_THREAD_SAFE_ACCEPT */ #endif /* ACE_LACKS_FORK */ -#if defined (ACE_HAS_TEMPLATE_TYPEDEFS) -#define LOCK_SOCK_ACCEPTOR ACE_LOCK_SOCK_Acceptor<ACCEPTOR_LOCKING> -#else -#define LOCK_SOCK_ACCEPTOR ACE_LOCK_SOCK_Acceptor<ACCEPTOR_LOCKING>, ACE_INET_Addr -#endif /* ACE_HAS_TEMPLATE_TYPEDEFS */ - typedef ACE_Oneshot_Acceptor<Svc_Handler, - LOCK_SOCK_ACCEPTOR> + ACE_LOCK_SOCK_Acceptor<ACCEPTOR_LOCKING>> ACCEPTOR; typedef ACE_Connector<Svc_Handler, ACE_SOCK_CONNECTOR> diff --git a/ACE/tests/Message_Queue_Test.cpp b/ACE/tests/Message_Queue_Test.cpp index db324b5fcf8..dc00c9cc2ca 100644 --- a/ACE/tests/Message_Queue_Test.cpp +++ b/ACE/tests/Message_Queue_Test.cpp @@ -327,13 +327,9 @@ iterator_test (void) // Use queue size from of 32 Kb (more if using wide-char), instead of the // default of 16 Kb (defined by ACE_Message_Queue_Base::DEFAULT_HWM), // so that the test runs on machines with 8Kb pagesizes. -#if !defined(_UNICOS) + // QUEUE queue (32 * 1024 * sizeof (ACE_TCHAR)); QUEUE queue (sizeof(buffer)); -#else - // this works on the Cray, where BUFSIZ is defined as 32Kb - QUEUE queue (ITERATIONS * BUFSIZ - 1); -#endif int i; diff --git a/ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp b/ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp index 2c97598f09e..5c2c4117342 100644 --- a/ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp +++ b/ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp @@ -55,7 +55,7 @@ #if defined (ACE_HAS_THREADS) #include "Thread_Pool_Reactor_SSL_Test.h" -typedef ACE_Strategy_Acceptor <Request_Handler, ACE_SSL_SOCK_ACCEPTOR> +typedef ACE_Strategy_Acceptor <Request_Handler, ACE_SSL_SOCK_Acceptor> ACCEPTOR; // Accepting end point. This is actually "localhost:10010", but some @@ -128,7 +128,7 @@ parse_arg (int argc, ACE_TCHAR *argv[]) } Request_Handler::Request_Handler (ACE_Thread_Manager *thr_mgr) - : ACE_Svc_Handler<ACE_SSL_SOCK_STREAM, ACE_MT_SYNCH> (thr_mgr), + : ACE_Svc_Handler<ACE_SSL_SOCK_Stream, ACE_MT_SYNCH> (thr_mgr), nr_msgs_rcvd_(0) { // Make sure we use TP_Reactor with this class (that's the whole diff --git a/ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.h b/ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.h index fca5a7f8432..88d89c89477 100644 --- a/ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.h +++ b/ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.h @@ -30,7 +30,7 @@ #include "ace/Svc_Handler.h" -class Request_Handler : public ACE_Svc_Handler<ACE_SSL_SOCK_STREAM, +class Request_Handler : public ACE_Svc_Handler<ACE_SSL_SOCK_Stream, ACE_MT_SYNCH> { // = TITLE |