diff options
| author | Erik Sohns <erik.sohns@posteo.de> | 2023-04-05 17:37:54 +0200 |
|---|---|---|
| committer | Erik Sohns <erik.sohns@posteo.de> | 2023-04-05 17:37:54 +0200 |
| commit | 761e24b54d7fda41ed58a6e2f41ba905e43bf3d9 (patch) | |
| tree | 69171a8ba215e125cf273ab6bbe4641313df6e6a | |
| parent | 3e44fb91cf724aeb48b38169482a4878de316afc (diff) | |
| parent | 9e18d338ec598e1a8da6d32a0fba5a20c76978f7 (diff) | |
| download | ATCD-761e24b54d7fda41ed58a6e2f41ba905e43bf3d9.tar.gz | |
Merge branch 'message_queue_ex_get_queue' of https://github.com/esohns/ACE_TAO into message_queue_ex_get_queue
926 files changed, 2030 insertions, 16940 deletions
diff --git a/ACE/ACE-INSTALL.html b/ACE/ACE-INSTALL.html index df575bdd555..185fe6d9d52 100644 --- a/ACE/ACE-INSTALL.html +++ b/ACE/ACE-INSTALL.html @@ -181,11 +181,11 @@ document</a>.</p><p> <td>Maintains ACE on many platforms required for their ACE and TAO service offerings. We support AIX, Embarcadero C++ Builder, - Windows CE, MinGW, Microsoft Visual C++, GCC, - Cygwin, VxWorks 6.x (kernel and rtp), OpenVMS on IA64, + MinGW, Microsoft Visual C++, GCC, + Cygwin, VxWorks 6.x (kernel and rtp), BlueCAT Linux, RedHat Linux, Fedora, MacOSX, Solaris, - SuSE Linux on IA32/EM64T/IA64, RTEMS, QNX, LynxOS, - HPUX on IA64, and Android. + SuSE Linux on IA32/EM64T/IA64, QNX, LynxOS, + and Android. The Intel C++ compiler is supported on Windows 32/64bit, Linux IA32/EM64T/IA64, MacOSX. </td> @@ -284,7 +284,6 @@ The following sections explain how to build ACE on: <li><a href="#win32">Windows (including MinGW and Cygwin)</a></li> <li><a href="#vxworks">VxWorks</a></li> <li><a href="#android">Android</a></li> -<li><a href="#rtems">RTEMS</a></li> </ul> <h2>General Rules</h2> @@ -2065,87 +2064,6 @@ libraries. Please see the <a href="#NonStaticObjectManager">Non-static ACE_Object_Manager</a> discussion below.</p><p> - </p></li><li><b>Windows CE</b><p> - - Take a look at (<a href="docs/CE-status.txt">CE-status.txt</a>) for - up-to-date information about ACE on Windows CE and Windows Mobile. - - </p></li><li><b> Solaris 7, 8, 9, and 10 using Sun ONE Studio 8 (C++ 5.5) - or higher, Centerline C++ 2.x, GNU gcc 2.95 and - later.</b><p> - - All the source code and tests should build and run without any - problems on Solaris 7, 8, and 9 platforms using the above - Sun C++ compilers. - - There are likely to be build problems with older versions or - different patchlevels of Sun C++. Likewise, on - Solaris with g++ you may need to use GNU as instead of - /usr/ccs/bin/as, if you want -gstabs+ and -pipe support. - - Thanks to Susan Liebeskind <shl@janis.gtri.gatech.edu> - for providing the following useful information:</p><p> - - By default, ACE uses both the Solaris and POSIX thread - interface. To disable use of the Solaris thread interface, add - <code>-D_POSIX_PTHREAD_SEMANTICS</code> to the - <code>CFLAGS</code> in your - <code>$(ACE_ROOT)/include/makeinclude/platform_macros.GNU</code>. - See the Solaris Intro (3) man page for more information.</p><p> - - To disable ACE thread support completely, build with the - <code>threads=0</code> make flag. See the <a href="#flags">Makefile Flags</a> section below for more - information on make flags.</p><p> - - If you use g++ on Solaris 7, you might need to rebuild - it on a SunOS 5.7 (Solaris 7) host. Some versions of g++ - provide replacements for system header files. The - replacements on older SunOS systems are not compatible with the - SunOS 5.7 system headers. </P> - - </li><li><b>AIX</b><p> - - ACE is currently supported on AIX 5.2 and higher using IBM's - Visual Age C++ 6 and XL C++ 7 compilers as well as g++ 3.2.</p><p> - - The <code>ace/config-aix-5.x.h</code> file is recommended for all - compilers on all AIX 5L versions. The Asynchronous I/O functionality - is disabled by default because its use requires the system administrator - to explicitly enable it in the kernel using SMIT. If this has been - done and you want to enable asynchronous I/O support in ACE, add: - <code>#define ACE_HAS_AIO_CALLS</code> to your <code>config.h</code> - file before including <code>ace/config-aix-5.x.h</code>.</p><p> - - The Visual Age 6.0.0.3 and 6.0.0.4 do have some bugs that makes - them unusable for building TAO. TAO has been tested with 6.0.0.12 and - had no problems with that version.</p><p> - - For your <code>platform_macros.GNU</code> file, you should use - <code>platform_aix_ibm.GNU</code> when building ACE with any of the - IBM compilers and <code>platform_aix_g++.GNU</code> when building ACE - with g++.</p><p> - - BTW, here's a technique from Rob Jordan <<a href="mailto:jordan@hursley.ibm.com">jordan@hursley.ibm.com</a>> - that can reduce the size of the ACE libraries by about one - third, and can also be applied to applications. It works by - optimising the sharing of template functions, which are created - in an "unusual" way under AIX. It also speeds up - compilation.</p><p> - - Here's how to optimise the ACE library generation:</p><p> - - Look at the <a href="ace/GNUmakefile.ACE">ace/GNUmakefile.ACE</a> - in <code>$ACE_ROOT/ace</code>. Create a file called - <code>ACE_All_Src.cpp</code>, and add a line to #include - each of the source files - listed under <code>FILES=</code> in the GNUmakefile. Create a - file called <code>ACE_All_Tmp.h</code> - and add a line to #include each of the .h files listed under - <code>TEMPLATE_FILES=</code> in the GNUmakefile. Now update the - GNUmakefile so that - <code>FILES=ACE_All_Src</code> and - <code>TEMPLATE_FILES=ACE_All_Tmp</code>.</p><p> - </p></li><li><b><a name="Linux">Linux</a></b><p> ACE has been ported to Linux on @@ -2437,24 +2355,6 @@ libraries. Under the current version of QNX RTP ACE fails if compiled with inline=0 . </p><p> - </p></li><li><strong><a name="rtems">RTEMS</a></strong><p> - - The support for RTEMS has been revived from version x.5.4. This version - was the first version that build again out of the box on RTEMS. Compilation - and testing was done for RTEMS with and without networking support. The - ACE GNU makefiles do automatically detect whether networking support - is available or not. - - Besides the standard config.h/platform_macros.GNU file you will need - to set <code>RTEMS_MAKEFILE_PATH</code> to point to the location - of your RTEMS installation, see below for an example.</p> - <p><code>export RTEMS_MAKEFILE_PATH=/opt/rtems/CPU-rtems/BSP</code></p> - <p> - When building without network support you will need the ace_for_tao - subsetting functionality enabled. For this add <code>ace_for_tao = 1</code> - to your <code>bin/MakeProjectCreator/config</code> file and regenerate the - GNU makefiles as described <a href="#power">here</a>.</p><p> - </p></li><li><strong>PharLap ETS</strong><p> ACE has been ported to Ardence's @@ -2586,14 +2486,6 @@ If you use the GNU GCC g++ compiler please note the following: <code>--prefix</code> option to <code>configure</code> instead of hacking its output.<p> - </p></li><li>If you are getting weird link errors when building libACE - on Solaris you are probably using the GNU linker. Try using the - Sun linker (/usr/ccs/bin/ld) instead. Note that gcc first looks - for the GNU linker if it is installed along with gcc. The only - way to not use the GNU linker is to delete it from the - installation or to build your own compiler with no linker. Be - aware that you still need the libraries and includes of gcc.<p> - NOTE: if you do use the GNU linker, you might need to change the <code>-G</code> flag to <code>-shared</code> in the <code>SOFLAGS</code> definition in your @@ -3004,7 +2896,6 @@ include_env Support old-style ACE_TRY_ENV declarations in methods. parameters when using include_env=1. If possible, do not use it, but instead change your TAO applications to use the ACE_ENV_ARG macros. -fast Enable -fast option, e.g., with Sun C++. inline Enable ACE inlining. Some platforms enable inlining by default, others do not. optimize Enable optimization; see OCFLAGS and OCCFLAGS. diff --git a/ACE/ASNMP/README b/ACE/ASNMP/README index 3d543a3d658..39d65c1d94b 100644 --- a/ACE/ASNMP/README +++ b/ACE/ASNMP/README @@ -23,8 +23,7 @@ Is HP SNMP++ compatible with ASNMP? with the HP interface as well as locking down valid() semantics, etc. What platforms have the test programs been verified on? - Solaris 2.4, 2.5.1 using SUN C++ 4.1,4.2 compiler. Linux/GCC - fixes are now in as well. + Linux/GCC fixes are now in as well. Why use this version? The SNMP++ version ships only for HP-UX and for Windows. @@ -144,7 +143,7 @@ readme.txt ( this file) src Directory Contents: -------------------------------------------------------------------- -Makefile - make file for ACE/Solaris 2. build +Makefile - make file for ACE. build target.cpp - Collection of attributes(address, timeout, etc) used to define a command session snmp.cpp - A logical session between NM app and agent diff --git a/ACE/Kokyu/DSRT_CV_Dispatcher_Impl_T.h b/ACE/Kokyu/DSRT_CV_Dispatcher_Impl_T.h index ccb663c7d9f..1fcf16d5cee 100644 --- a/ACE/Kokyu/DSRT_CV_Dispatcher_Impl_T.h +++ b/ACE/Kokyu/DSRT_CV_Dispatcher_Impl_T.h @@ -66,17 +66,7 @@ namespace Kokyu }; } -#if !defined (__ACE_INLINE__) -//#include "DSRT_CV_Dispatcher_Impl_T.i" -#endif /* __ACE_INLINE__ */ - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "DSRT_CV_Dispatcher_Impl_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("DSRT_CV_Dispatcher_Impl_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* DSRT_DIRECT_DISPATCHER_IMPL_T_H */ diff --git a/ACE/Kokyu/DSRT_Direct_Dispatcher_Impl_T.h b/ACE/Kokyu/DSRT_Direct_Dispatcher_Impl_T.h index 20452b8ae49..b7aa5d00e70 100644 --- a/ACE/Kokyu/DSRT_Direct_Dispatcher_Impl_T.h +++ b/ACE/Kokyu/DSRT_Direct_Dispatcher_Impl_T.h @@ -72,17 +72,7 @@ namespace Kokyu }; } -#if !defined (__ACE_INLINE__) -//#include "DSRT_Direct_Dispatcher_Impl_T.i" -#endif /* __ACE_INLINE__ */ - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "DSRT_Direct_Dispatcher_Impl_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("DSRT_Direct_Dispatcher_Impl_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* DSRT_DIRECT_DISPATCHER_IMPL_T_H */ diff --git a/ACE/Kokyu/DSRT_Dispatch_Item_T.h b/ACE/Kokyu/DSRT_Dispatch_Item_T.h index 7a74b8d8437..d719f5ec8ff 100644 --- a/ACE/Kokyu/DSRT_Dispatch_Item_T.h +++ b/ACE/Kokyu/DSRT_Dispatch_Item_T.h @@ -88,13 +88,7 @@ namespace Kokyu #include "DSRT_Dispatch_Item_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "DSRT_Dispatch_Item_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("DSRT_Dispatch_Item_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* DSRT_DISPATCH_ITEM_H */ diff --git a/ACE/Kokyu/DSRT_Dispatcher_Impl_T.h b/ACE/Kokyu/DSRT_Dispatcher_Impl_T.h index 319ac475991..e56454d7ef6 100644 --- a/ACE/Kokyu/DSRT_Dispatcher_Impl_T.h +++ b/ACE/Kokyu/DSRT_Dispatcher_Impl_T.h @@ -192,13 +192,7 @@ namespace Kokyu #include "DSRT_Dispatcher_Impl_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "DSRT_Dispatcher_Impl_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("DSRT_Dispatcher_Impl_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* DSRT_DISPATCHER_IMPL_H */ diff --git a/ACE/Kokyu/DSRT_Sched_Queue_T.h b/ACE/Kokyu/DSRT_Sched_Queue_T.h index 8953b2a8f38..6cdb0abf177 100644 --- a/ACE/Kokyu/DSRT_Sched_Queue_T.h +++ b/ACE/Kokyu/DSRT_Sched_Queue_T.h @@ -208,17 +208,7 @@ namespace Kokyu }; } -#if !defined (__ACE_INLINE__) -//#include "DSRT_Sched_Queue_T.i" -#endif /* __ACE_INLINE__ */ - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "DSRT_Sched_Queue_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("DSRT_Sched_Queue_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* DSRT_SCHED_QUEUE_T_H */ diff --git a/ACE/Kokyu/Kokyu_dsrt.h b/ACE/Kokyu/Kokyu_dsrt.h index bda65df470c..e96d6619722 100644 --- a/ACE/Kokyu/Kokyu_dsrt.h +++ b/ACE/Kokyu/Kokyu_dsrt.h @@ -157,13 +157,7 @@ namespace Kokyu #include "Kokyu_dsrt.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Kokyu_dsrt.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Kokyu_dsrt.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* KOKYU_DSRT_H */ @@ -1,5 +1,8 @@ -USER VISIBLE CHANGES BETWEEN ACE-7.0.11 and ACE-7.0.12 -====================================================== +USER VISIBLE CHANGES BETWEEN ACE-7.0.11 and ACE-7.1.0 +===================================================== + +. Removed support for Windows CE, OpenVMS, HPUX, AIX, RTEMS, + and Solaris USER VISIBLE CHANGES BETWEEN ACE-7.0.10 and ACE-7.0.11 ====================================================== diff --git a/ACE/README b/ACE/README index a579f924d87..eba289c4301 100644 --- a/ACE/README +++ b/ACE/README @@ -18,9 +18,9 @@ The ADAPTIVE Communication Environment (ACE) is an object-oriented communication software. ACE provides a rich set of reusable C++ wrappers and frameworks that perform common communication software tasks across a range of OS platforms, including Win32/Win64, most -versions of UNIX (e.g., SunOS, HP-UX , AIX, Linux, NetBSD, and FreeBSD), +versions of UNIX (e.g., SunOS, Linux, NetBSD, and FreeBSD), real-time operating systems (e.g., VxWorks, Chorus, LynxOS, and QNX), -OpenVMS, and MVS OpenEdition. A single source tree is used for all +and MVS OpenEdition. A single source tree is used for all these platforms and porting ACE to other platforms is relatively easy. The communication software components provided by ACE include event @@ -62,8 +62,7 @@ interfaces: WaitForMultipleObjects and I/O completion ports; . Multi-threading and synchronization - -- e.g., Solaris threads, POSIX Pthreads, and Win32 - threads; + -- e.g., POSIX Pthreads, and Win32 threads; . Explicit dynamic linking -- e.g., dlopen/dlsym on UNIX and LoadLibrary/GetProc diff --git a/ACE/ace/ACE.cpp b/ACE/ace/ACE.cpp index 2376de0f58d..06b0289b89a 100644 --- a/ACE/ace/ACE.cpp +++ b/ACE/ace/ACE.cpp @@ -59,9 +59,6 @@ ACE::out_of_handles (int error) #if defined (ACE_WIN32) // On Win32, we need to check for ENOBUFS also. error == ENOBUFS || -#elif defined (HPUX) - // On HPUX, we need to check for EADDRNOTAVAIL also. - error == EADDRNOTAVAIL || #elif defined (ACE_LINUX) // On linux, we need to check for ENOENT also. error == ENOENT || @@ -69,11 +66,6 @@ ACE::out_of_handles (int error) error == EINVAL || // Without threads check for EOPNOTSUPP error == EOPNOTSUPP || -#elif defined (sun) - // On sun, we need to check for ENOSR also. - error == ENOSR || - // Without threads check for ENOTSUP - error == ENOTSUP || #elif defined (__FreeBSD__) // On FreeBSD we need to check for EOPNOTSUPP (LinuxThreads) or // ENOSYS (libc_r threads) also. diff --git a/ACE/ace/ACE.inl b/ACE/ace/ACE.inl index 4e7a77e5d87..5c7b15e4072 100644 --- a/ACE/ace/ACE.inl +++ b/ACE/ace/ACE.inl @@ -216,7 +216,7 @@ ACE::sendv_n (ACE_HANDLE handle, ACE_INLINE ssize_t ACE::send_i (ACE_HANDLE handle, const void *buf, size_t len) { -#if defined (ACE_WIN32) || defined (HPUX) || defined (ACE_MQX) +#if defined (ACE_WIN32) || defined (ACE_MQX) return ACE_OS::send (handle, (const char *) buf, len); #else return ACE_OS::write (handle, (const char *) buf, len); @@ -226,7 +226,7 @@ ACE::send_i (ACE_HANDLE handle, const void *buf, size_t len) ACE_INLINE ssize_t ACE::recv_i (ACE_HANDLE handle, void *buf, size_t len) { -#if defined (ACE_WIN32) || defined (ACE_OPENVMS) || defined (ACE_MQX) +#if defined (ACE_WIN32) || defined (ACE_MQX) return ACE_OS::recv (handle, (char *) buf, len); #else return ACE_OS::read (handle, (char *) buf, len); diff --git a/ACE/ace/ARGV.h b/ACE/ace/ARGV.h index f45f176a97c..eb03fc776f4 100644 --- a/ACE/ace/ARGV.h +++ b/ACE/ace/ARGV.h @@ -320,13 +320,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/ARGV.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/ARGV.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("ARGV.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_ARGUMENT_VECTOR_H */ diff --git a/ACE/ace/Abstract_Timer_Queue.h b/ACE/ace/Abstract_Timer_Queue.h index cd17f28d0ef..23e46afc4c1 100644 --- a/ACE/ace/Abstract_Timer_Queue.h +++ b/ACE/ace/Abstract_Timer_Queue.h @@ -218,13 +218,7 @@ public: ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Abstract_Timer_Queue.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Abstract_Timer_Queue.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_ABSTRACT_TIMER_QUEUE_H */ diff --git a/ACE/ace/Acceptor.h b/ACE/ace/Acceptor.h index e0dc84ee258..5ebbeeb5fa7 100644 --- a/ACE/ace/Acceptor.h +++ b/ACE/ace/Acceptor.h @@ -684,13 +684,7 @@ private: ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Acceptor.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Acceptor.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Active_Map_Manager_T.h b/ACE/ace/Active_Map_Manager_T.h index 78dd7a3f991..be1e78ad596 100644 --- a/ACE/ace/Active_Map_Manager_T.h +++ b/ACE/ace/Active_Map_Manager_T.h @@ -192,13 +192,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Active_Map_Manager_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Active_Map_Manager_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Active_Map_Manager_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_ACTIVE_MAP_MANAGER_T_H */ diff --git a/ACE/ace/Arg_Shifter.h b/ACE/ace/Arg_Shifter.h index 547d772e12d..c714b992ecb 100644 --- a/ACE/ace/Arg_Shifter.h +++ b/ACE/ace/Arg_Shifter.h @@ -226,13 +226,7 @@ typedef ACE_Arg_Shifter_T<ACE_TCHAR> ACE_Arg_Shifter; ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Arg_Shifter.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Arg_Shifter.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Array_Base.h b/ACE/ace/Array_Base.h index c2020aae474..13b71310509 100644 --- a/ACE/ace/Array_Base.h +++ b/ACE/ace/Array_Base.h @@ -55,8 +55,8 @@ public: typedef value_type const * const_pointer; typedef ptrdiff_t difference_type; typedef ACE_Allocator::size_type size_type; - - ACE_DECLARE_STL_REVERSE_ITERATORS + typedef std::reverse_iterator<iterator> reverse_iterator; + typedef std::reverse_iterator<const_iterator> const_reverse_iterator; /// Dynamically create an uninitialized array. ACE_Array_Base (size_type size = 0, @@ -236,13 +236,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Array_Base.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Array_Base.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Array_Base.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Array_Map.h b/ACE/ace/Array_Map.h index 4feefe97066..3e12910f74d 100644 --- a/ACE/ace/Array_Map.h +++ b/ACE/ace/Array_Map.h @@ -33,13 +33,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -#if defined __SUNPRO_CC && !defined _RWSTD_ALLOCATOR -# define ACE_ARRAY_MAP_DEFAULT_ALLOCATOR(K, V) std::allocator_interface< \ - std::allocator<void>, \ - std::pair<K, V> > -#else -# define ACE_ARRAY_MAP_DEFAULT_ALLOCATOR(K, V) std::allocator<std::pair<K, V> > -#endif +#define ACE_ARRAY_MAP_DEFAULT_ALLOCATOR(K, V) std::allocator<std::pair<K, V> > /** * @class ACE_Array_Map @@ -92,7 +86,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * -# operator= */ template<typename Key, typename Value, class EqualTo = std::equal_to<Key>, - class Alloc = ACE_ARRAY_MAP_DEFAULT_ALLOCATOR (Key, Value) > + class Alloc = std::allocator<std::pair<Key,Value>>> class ACE_Array_Map { public: @@ -110,7 +104,8 @@ public: typedef value_type const * const_iterator; typedef ptrdiff_t difference_type; typedef size_t size_type; - ACE_DECLARE_STL_REVERSE_ITERATORS + typedef std::reverse_iterator<iterator> reverse_iterator; + typedef std::reverse_iterator<const_iterator> const_reverse_iterator; /// Default Constructor. /** @@ -287,13 +282,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL # include "ace/Array_Map.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -# include "ace/Array_Map.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Array_Map.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ +#include "ace/Array_Map.cpp" #include /**/ "ace/post.h" diff --git a/ACE/ace/Asynch_Acceptor.h b/ACE/ace/Asynch_Acceptor.h index 7760ba53d5c..16f4edb0dc3 100644 --- a/ACE/ace/Asynch_Acceptor.h +++ b/ACE/ace/Asynch_Acceptor.h @@ -260,13 +260,7 @@ private: ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Asynch_Acceptor.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Asynch_Acceptor.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Asynch_Connector.cpp b/ACE/ace/Asynch_Connector.cpp index 480c24b9551..5d9d5fdd16e 100644 --- a/ACE/ace/Asynch_Connector.cpp +++ b/ACE/ace/Asynch_Connector.cpp @@ -7,7 +7,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if (defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS)) && !defined(ACE_HAS_WINCE) +#if defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS) // This only works on platforms that support async I/O. #include "ace/OS_NS_sys_socket.h" diff --git a/ACE/ace/Asynch_Connector.h b/ACE/ace/Asynch_Connector.h index ad09d0a1879..aa1f763411a 100644 --- a/ACE/ace/Asynch_Connector.h +++ b/ACE/ace/Asynch_Connector.h @@ -18,7 +18,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if (defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS)) && !defined(ACE_HAS_WINCE) +#if defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS) // This only works on platforms that support async i/o. #include "ace/Asynch_IO.h" @@ -154,13 +154,7 @@ private: ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Asynch_Connector.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Asynch_Connector.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* ACE_WIN32 || ACE_HAS_AIO_CALLS */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Asynch_IO.cpp b/ACE/ace/Asynch_IO.cpp index b745791a118..5502dd2191c 100644 --- a/ACE/ace/Asynch_IO.cpp +++ b/ACE/ace/Asynch_IO.cpp @@ -432,7 +432,7 @@ ACE_Asynch_Read_File::read (ACE_Message_Block &message_block, signal_number); } -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) +#if defined (ACE_WIN32) int ACE_Asynch_Read_File::readv (ACE_Message_Block &message_block, size_t bytes_to_read, @@ -455,7 +455,7 @@ ACE_Asynch_Read_File::readv (ACE_Message_Block &message_block, priority, signal_number); } -#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ +#endif /* defined (ACE_WIN32) */ ACE_Asynch_Operation_Impl * ACE_Asynch_Read_File::implementation () const @@ -540,7 +540,7 @@ ACE_Asynch_Write_File::write (ACE_Message_Block &message_block, signal_number); } -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) +#if defined (ACE_WIN32) int ACE_Asynch_Write_File::writev (ACE_Message_Block &message_block, size_t bytes_to_write, @@ -563,7 +563,7 @@ ACE_Asynch_Write_File::writev (ACE_Message_Block &message_block, priority, signal_number); } -#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ +#endif /* defined (ACE_WIN32) */ ACE_Asynch_Operation_Impl * ACE_Asynch_Write_File::implementation () const diff --git a/ACE/ace/Asynch_IO.h b/ACE/ace/Asynch_IO.h index 677c814d201..c528be4188e 100644 --- a/ACE/ace/Asynch_IO.h +++ b/ACE/ace/Asynch_IO.h @@ -4,9 +4,8 @@ /** * @file Asynch_IO.h * - * This works on Win32 (defined (ACE_WIN32) && !defined - * (ACE_HAS_WINCE)) platforms and on POSIX4 platforms with {aio_*} - * routines (defined (ACE_HAS_AIO_CALLS)) + * This works on Win32 (defined (ACE_WIN32)) platforms and on + * POSIX4 platforms with {aio_*} routines (defined (ACE_HAS_AIO_CALLS)) * * On Win32 platforms, the implementation of * {ACE_Asynch_Transmit_File} and {ACE_Asynch_Accept} are only @@ -639,7 +638,7 @@ public: int priority = 0, int signal_number = ACE_SIGRTMIN); -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) +#if defined (ACE_WIN32) /** * Same as above but with scatter support, through chaining of composite * message blocks using the continuation field. @@ -653,7 +652,7 @@ public: const void *act = 0, int priority = 0, int signal_number = ACE_SIGRTMIN); -#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ +#endif /* defined (ACE_WIN32) */ /// Return the underlying implementation class. // (this should be protected...) @@ -774,7 +773,7 @@ public: int priority = 0, int signal_number = ACE_SIGRTMIN); -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) +#if defined (ACE_WIN32) /** * Same as above but with gather support, through chaining of composite * message blocks using the continuation field. @@ -788,7 +787,7 @@ public: const void *act = 0, int priority = 0, int signal_number = ACE_SIGRTMIN); -#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ +#endif /* defined (ACE_WIN32) */ /// Return the underlying implementation class. // (this should be protected...) diff --git a/ACE/ace/Asynch_IO_Impl.h b/ACE/ace/Asynch_IO_Impl.h index 2f7e952ad15..40e79e25de6 100644 --- a/ACE/ace/Asynch_IO_Impl.h +++ b/ACE/ace/Asynch_IO_Impl.h @@ -160,7 +160,7 @@ public: int priority, int signal_number) = 0; -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) +#if defined (ACE_WIN32) /** * Same as above but with scatter support, through chaining of composite * message blocks using the continuation field. @@ -170,7 +170,7 @@ public: const void *act, int priority, int signal_number) = 0; -#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ +#endif /* defined (ACE_WIN32) */ protected: /// Do-nothing constructor. @@ -224,7 +224,7 @@ public: int priority, int signal_number) = 0; -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) +#if defined (ACE_WIN32) /** * Same as above but with gather support, through chaining of composite * message blocks using the continuation field. @@ -234,7 +234,7 @@ public: const void *act, int priority, int signal_number) = 0; -#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ +#endif /* defined (ACE_WIN32) */ protected: /// Do-nothing constructor. @@ -293,7 +293,7 @@ public: int priority, int signal_number) = 0; -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) +#if defined (ACE_WIN32) /** * Same as above but with scatter support, through chaining of composite * message blocks using the continuation field. @@ -307,7 +307,7 @@ public: const void *act, int priority, int signal_number) = 0; -#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ +#endif /* defined (ACE_WIN32) */ /// This starts off an asynchronous read. Upto @a bytes_to_read will /// be read and stored in the @a message_block. @@ -317,7 +317,7 @@ public: int priority, int signal_number) = 0; -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) +#if defined (ACE_WIN32) /** * Same as above but with scatter support, through chaining of composite * message blocks using the continuation field. @@ -327,7 +327,7 @@ public: const void *act, int priority, int signal_number) = 0; -#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ +#endif /* defined (ACE_WIN32) */ protected: /// Do-nothing constructor. @@ -376,7 +376,7 @@ public: int priority, int signal_number) = 0; -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) +#if defined (ACE_WIN32) /** * Same as above but with gather support, through chaining of composite * message blocks using the continuation field. @@ -390,7 +390,7 @@ public: const void *act, int priority, int signal_number) = 0; -#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ +#endif /* defined (ACE_WIN32) */ /// This starts off an asynchronous write. Upto @a bytes_to_write /// will be written from the @a message_block. @@ -400,7 +400,7 @@ public: int priority, int signal_number) = 0; -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) +#if defined (ACE_WIN32) /** * Same as above but with gather support, through chaining of composite * message blocks using the continuation field. @@ -410,7 +410,7 @@ public: const void *act, int priority, int signal_number) = 0; -#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ +#endif /* defined (ACE_WIN32) */ protected: /// Do-nothing constructor. diff --git a/ACE/ace/Atomic_Op.cpp b/ACE/ace/Atomic_Op.cpp index 4b16b311743..52394cd01a3 100644 --- a/ACE/ace/Atomic_Op.cpp +++ b/ACE/ace/Atomic_Op.cpp @@ -7,10 +7,6 @@ #if defined (ACE_HAS_BUILTIN_ATOMIC_OP) -#if defined (ACE_INCLUDE_ATOMIC_OP_SPARC) -# include "ace/Atomic_Op_Sparc.h" -#endif /* ACE_INCLUDE_ATOMIC_OP_SPARC */ - namespace { #if defined (_MSC_VER) // Disable "no return value" warning, as we will be putting @@ -27,10 +23,6 @@ single_cpu_increment (volatile long *value) unsigned long addr = reinterpret_cast<unsigned long> (value); asm( "xadd %0, (%1)" : "+r"(tmp) : "r"(addr) ); return tmp + 1; -#elif !defined (ACE_HAS_SOLARIS_ATOMIC_LIB) && (defined (sun) || \ - (defined (__SUNPRO_CC) && (defined (__i386) || defined (__x86_64)))) - return ace_atomic_add_long ( - reinterpret_cast<volatile unsigned long*> (value), 1); #elif defined(__GNUC__) && defined(__PPC__) long tmp; asm("lwz %0,%1" : "=r" (tmp) : "m" (*value) ); @@ -51,10 +43,6 @@ single_cpu_decrement (volatile long *value) unsigned long addr = reinterpret_cast<unsigned long> (value); asm( "xadd %0, (%1)" : "+r"(tmp) : "r"(addr) ); return tmp - 1; -#elif !defined (ACE_HAS_SOLARIS_ATOMIC_LIB) && (defined (sun) || \ - (defined (__SUNPRO_CC) && (defined (__i386) || defined (__x86_64)))) - return ace_atomic_add_long ( - reinterpret_cast<volatile unsigned long*> (value), -1); #elif defined(__GNUC__) && defined(__PPC__) long tmp; asm("lwz %0,%1" : "=r" (tmp) : "m" (*value) ); @@ -74,10 +62,6 @@ single_cpu_exchange (volatile long *value, long rhs) unsigned long addr = reinterpret_cast<unsigned long> (value); asm( "xchg %0, (%1)" : "+r"(rhs) : "r"(addr) ); return rhs; -#elif !defined (ACE_HAS_SOLARIS_ATOMIC_LIB) && (defined (sun) || \ - (defined (__SUNPRO_CC) && (defined (__i386) || defined (__x86_64)))) - return ace_atomic_swap_long ( - reinterpret_cast<volatile unsigned long*> (value), rhs); #elif defined(__GNUC__) && defined(__PPC__) long tmp; asm("lwz %0,%1" : "=r" (tmp) : "m" (rhs) ); @@ -97,10 +81,6 @@ single_cpu_exchange_add (volatile long *value, long rhs) unsigned long addr = reinterpret_cast<unsigned long> (value); asm( "xadd %0, (%1)" : "+r"(rhs) : "r"(addr) ); return rhs; -#elif !defined (ACE_HAS_SOLARIS_ATOMIC_LIB) && (defined (sun) || \ - (defined (__SUNPRO_CC) && (defined (__i386) || defined (__x86_64)))) - return ace_atomic_swap_add_long ( - reinterpret_cast<volatile unsigned long*> (value), rhs); #elif defined(__GNUC__) && defined(__PPC__) long tmp; asm("add %0,%1,%2" : "=r" (tmp) : "r" (*value), "r" (rhs) ); @@ -140,10 +120,6 @@ multi_cpu_increment (volatile long *value) unsigned long addr = reinterpret_cast<unsigned long> (value); asm( "lock ; xadd %0, (%1)" : "+r"(tmp) : "r"(addr) ); return tmp + 1; -#elif !defined (ACE_HAS_SOLARIS_ATOMIC_LIB) && (defined (sun) || \ - (defined (__SUNPRO_CC) && (defined (__i386) || defined (__x86_64)))) - return ace_atomic_add_long ( - reinterpret_cast<volatile unsigned long*> (value), 1); #else /* ACE_HAS_INTEL_ASSEMBLY*/ ACE_UNUSED_ARG (value); ACE_NOTSUP_RETURN (-1); @@ -158,10 +134,6 @@ multi_cpu_decrement (volatile long *value) unsigned long addr = reinterpret_cast<unsigned long> (value); asm( "lock ; xadd %0, (%1)" : "+r"(tmp) : "r"(addr) ); return tmp - 1; -#elif !defined (ACE_HAS_SOLARIS_ATOMIC_LIB) && (defined (sun) || \ - (defined (__SUNPRO_CC) && (defined (__i386) || defined (__x86_64)))) - return ace_atomic_add_long ( - reinterpret_cast<volatile unsigned long*> (value), -1); #else /* ACE_HAS_INTEL_ASSEMBLY*/ ACE_UNUSED_ARG (value); ACE_NOTSUP_RETURN (-1); @@ -176,10 +148,6 @@ multi_cpu_exchange (volatile long *value, long rhs) // The XCHG instruction automatically follows LOCK semantics asm( "xchg %0, (%1)" : "+r"(rhs) : "r"(addr) ); return rhs; -#elif !defined (ACE_HAS_SOLARIS_ATOMIC_LIB) && (defined (sun) || \ - (defined (__SUNPRO_CC) && (defined (__i386) || defined (__x86_64)))) - return ace_atomic_swap_long ( - reinterpret_cast<volatile unsigned long*> (value), rhs); #else /* ACE_HAS_INTEL_ASSEMBLY*/ ACE_UNUSED_ARG (value); ACE_UNUSED_ARG (rhs); @@ -194,10 +162,6 @@ multi_cpu_exchange_add (volatile long *value, long rhs) unsigned long addr = reinterpret_cast<unsigned long> (value); asm( "lock ; xadd %0, (%1)" : "+r"(rhs) : "r"(addr) ); return rhs; -#elif !defined (ACE_HAS_SOLARIS_ATOMIC_LIB) && (defined (sun) || \ - (defined (__SUNPRO_CC) && (defined (__i386) || defined (__x86_64)))) - return ace_atomic_swap_add_long ( - reinterpret_cast<volatile unsigned long*> (value), rhs); #elif defined (WIN32) && !defined (ACE_HAS_INTERLOCKED_EXCHANGEADD) # if defined (_MSC_VER) __asm diff --git a/ACE/ace/Atomic_Op.h b/ACE/ace/Atomic_Op.h index 3534c1bef0c..0c505666976 100644 --- a/ACE/ace/Atomic_Op.h +++ b/ACE/ace/Atomic_Op.h @@ -43,8 +43,6 @@ # define ACE_HAS_BUILTIN_ATOMIC_OP # elif defined (ACE_HAS_VXATOMICLIB) # define ACE_HAS_BUILTIN_ATOMIC_OP -# elif defined (ACE_HAS_SOLARIS_ATOMIC_LIB) && !defined (ACE_HAS_BUILTIN_ATOMIC_OP) -# define ACE_HAS_BUILTIN_ATOMIC_OP # endif /* WIN32 */ #endif /* ACE_HAS_THREADS */ diff --git a/ACE/ace/Atomic_Op.inl b/ACE/ace/Atomic_Op.inl index 517e3ca7d0e..12fb795946e 100644 --- a/ACE/ace/Atomic_Op.inl +++ b/ACE/ace/Atomic_Op.inl @@ -8,10 +8,6 @@ # include <vxAtomicLib.h> #endif -#if defined (ACE_HAS_SOLARIS_ATOMIC_LIB) -# include <atomic.h> -#endif - ACE_BEGIN_VERSIONED_NAMESPACE_DECL #if defined (ACE_HAS_BUILTIN_ATOMIC_OP) @@ -44,8 +40,6 @@ ACE_Atomic_Op<ACE_Thread_Mutex, long>::operator++ () return ::InterlockedIncrement (const_cast<long *> (&this->value_)); #elif defined (ACE_HAS_VXATOMICLIB) return ::vxAtomicInc (reinterpret_cast <atomic_t*>(const_cast<long *> (&this->value_))) + 1; -#elif defined (ACE_HAS_SOLARIS_ATOMIC_LIB) - return ::atomic_inc_ulong_nv (reinterpret_cast<volatile unsigned long*>(&this->value_)); #else /* WIN32 */ return (*increment_fn_) (&this->value_); #endif /* WIN32 */ @@ -66,8 +60,6 @@ ACE_Atomic_Op<ACE_Thread_Mutex, long>::operator-- () return ::InterlockedDecrement (const_cast<long *> (&this->value_)); #elif defined (ACE_HAS_VXATOMICLIB) return ::vxAtomicDec (reinterpret_cast <atomic_t*>(const_cast<long *> (&this->value_))) - 1; -#elif defined (ACE_HAS_SOLARIS_ATOMIC_LIB) - return ::atomic_dec_ulong_nv (reinterpret_cast<volatile unsigned long*>(&this->value_)); #else /* WIN32 */ return (*decrement_fn_) (&this->value_); #endif /* WIN32 */ @@ -90,8 +82,6 @@ ACE_Atomic_Op<ACE_Thread_Mutex, long>::operator+= (long rhs) rhs) + rhs; #elif defined (ACE_HAS_VXATOMICLIB) return ::vxAtomicAdd (reinterpret_cast <atomic_t*>(const_cast<long *> (&this->value_)), rhs) + rhs; -#elif defined (ACE_HAS_SOLARIS_ATOMIC_LIB) - return ::atomic_add_long_nv (reinterpret_cast<volatile unsigned long*>(&this->value_), rhs); #else /* WIN32 && ACE_HAS_INTERLOCKED_EXCHANGEADD */ return (*exchange_add_fn_) (&this->value_, rhs) + rhs; #endif /* WIN32 && ACE_HAS_INTERLOCKED_EXCHANGEADD */ @@ -108,8 +98,6 @@ ACE_Atomic_Op<ACE_Thread_Mutex, long>::operator-= (long rhs) -rhs) - rhs; #elif defined (ACE_HAS_VXATOMICLIB) return ::vxAtomicSub (reinterpret_cast <atomic_t*>(const_cast<long *> (&this->value_)), rhs) - rhs; -#elif defined (ACE_HAS_SOLARIS_ATOMIC_LIB) - return ::atomic_add_long_nv (reinterpret_cast<volatile unsigned long*>(&this->value_), -rhs); #else /* WIN32 && ACE_HAS_INTERLOCKED_EXCHANGEADD */ return (*exchange_add_fn_) (&this->value_, -rhs) - rhs; #endif /* WIN32 && ACE_HAS_INTERLOCKED_EXCHANGEADD */ @@ -160,8 +148,6 @@ ACE_Atomic_Op<ACE_Thread_Mutex, long>::operator= (long rhs) ::InterlockedExchange (const_cast<long *> (&this->value_), rhs); #elif defined (ACE_HAS_VXATOMICLIB) ::vxAtomicSet (reinterpret_cast <atomic_t*>(const_cast<long *> (&this->value_)), rhs); -#elif defined (ACE_HAS_SOLARIS_ATOMIC_LIB) - ::atomic_swap_ulong (reinterpret_cast<volatile unsigned long*>(&this->value_), rhs); #else /* WIN32 */ (*exchange_fn_) (&this->value_, rhs); #endif /* WIN32 */ @@ -178,8 +164,6 @@ ACE_Atomic_Op<ACE_Thread_Mutex, long>::operator= ( ::InterlockedExchange (const_cast<long *> (&this->value_), rhs.value_); #elif defined (ACE_HAS_VXATOMICLIB) ::vxAtomicSet (reinterpret_cast <atomic_t*>(const_cast<long *> (&this->value_)), rhs.value_); -#elif defined (ACE_HAS_SOLARIS_ATOMIC_LIB) - ::atomic_swap_ulong (reinterpret_cast<volatile unsigned long*>(&this->value_), rhs.value_); #else /* WIN32 */ (*exchange_fn_) (&this->value_, rhs.value_); #endif /* WIN32 */ @@ -195,8 +179,6 @@ ACE_Atomic_Op<ACE_Thread_Mutex, long>::exchange (long newval) return ::InterlockedExchange (const_cast<long *> (&this->value_), newval); #elif defined (ACE_HAS_VXATOMICLIB) return ::vxAtomicSet (reinterpret_cast <atomic_t*>(const_cast<long *> (&this->value_)), newval); -#elif defined (ACE_HAS_SOLARIS_ATOMIC_LIB) - return ::atomic_swap_ulong (reinterpret_cast<volatile unsigned long*>(&this->value_), newval); #else /* WIN32 */ return (*exchange_fn_) (&this->value_, newval); #endif /* WIN32 */ @@ -243,8 +225,6 @@ ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::operator++ () return static_cast<unsigned long> (::InterlockedIncrement (const_cast<long *> (reinterpret_cast<volatile long *>(&this->value_)))); #elif defined (ACE_HAS_VXATOMICLIB) return static_cast<unsigned long> (::vxAtomicInc (reinterpret_cast <atomic_t*>(const_cast<long *> (reinterpret_cast<volatile long *>(&this->value_))))) + 1; -#elif defined (ACE_HAS_SOLARIS_ATOMIC_LIB) - return ::atomic_inc_ulong_nv (&this->value_); #else /* WIN32 */ return static_cast<unsigned long> ((*increment_fn_) (reinterpret_cast<volatile long *> (&this->value_))); #endif /* WIN32 */ @@ -265,8 +245,6 @@ ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::operator-- () return static_cast<unsigned long> (::InterlockedDecrement (const_cast<long *> (reinterpret_cast<volatile long *>(&this->value_)))); #elif defined (ACE_HAS_VXATOMICLIB) return static_cast<unsigned long> (::vxAtomicDec (reinterpret_cast <atomic_t*>(const_cast<long *> (reinterpret_cast<volatile long *>(&this->value_))))) - 1; -#elif defined (ACE_HAS_SOLARIS_ATOMIC_LIB) - return ::atomic_dec_ulong_nv (&this->value_); #else /* WIN32 */ return static_cast<unsigned long> ((*decrement_fn_) (reinterpret_cast<volatile long *> (&this->value_))); #endif /* WIN32 */ @@ -289,8 +267,6 @@ ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::operator+= (unsigned long rhs) rhs)) + rhs; #elif defined (ACE_HAS_VXATOMICLIB) return static_cast<unsigned long> (::vxAtomicAdd (reinterpret_cast <atomic_t*>(const_cast<long *> (reinterpret_cast<volatile long *>(&this->value_))), rhs)) + rhs; -#elif defined (ACE_HAS_SOLARIS_ATOMIC_LIB) - return ::atomic_add_long_nv (&this->value_, rhs); #else /* WIN32 && ACE_HAS_INTERLOCKED_EXCHANGEADD */ return static_cast<unsigned long> ((*exchange_add_fn_) (reinterpret_cast<volatile long *> (&this->value_), rhs)) + rhs; #endif /* WIN32 && ACE_HAS_INTERLOCKED_EXCHANGEADD */ @@ -307,8 +283,6 @@ ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::operator-= (unsigned long rhs) -static_cast<long>(rhs))) - rhs; #elif defined (ACE_HAS_VXATOMICLIB) return static_cast<unsigned long> (::vxAtomicSub (reinterpret_cast <atomic_t*>(const_cast<long *> (reinterpret_cast<volatile long *>(&this->value_))), rhs)) - rhs; -#elif defined (ACE_HAS_SOLARIS_ATOMIC_LIB) - return ::atomic_add_long_nv (&this->value_, -rhs); #else /* WIN32 && ACE_HAS_INTERLOCKED_EXCHANGEADD */ long l_rhs = static_cast<long> (rhs); return static_cast<unsigned long> ((*exchange_add_fn_) (reinterpret_cast<volatile long *> (&this->value_), -l_rhs)) - rhs; @@ -360,8 +334,6 @@ ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::operator= (unsigned long rhs) ::InterlockedExchange (const_cast<long *> (reinterpret_cast<volatile long*> (&this->value_)), rhs); #elif defined (ACE_HAS_VXATOMICLIB) ::vxAtomicSet (reinterpret_cast <atomic_t*>(const_cast<long *> (reinterpret_cast<volatile long*> (&this->value_))), rhs); -#elif defined (ACE_HAS_SOLARIS_ATOMIC_LIB) - ::atomic_swap_ulong (&this->value_, rhs); #else /* WIN32 */ (*exchange_fn_) (reinterpret_cast<volatile long *> (&this->value_), rhs); #endif /* WIN32 */ @@ -378,8 +350,6 @@ ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::operator= ( ::InterlockedExchange (const_cast<long *> (reinterpret_cast<volatile long*> (&this->value_)), rhs.value_); #elif defined (ACE_HAS_VXATOMICLIB) ::vxAtomicSet (reinterpret_cast <atomic_t*>(const_cast<long *> (reinterpret_cast<volatile long*> (&this->value_))), rhs.value_); -#elif defined (ACE_HAS_SOLARIS_ATOMIC_LIB) - ::atomic_swap_ulong (&this->value_, rhs.value_); #else /* WIN32 */ (*exchange_fn_) (reinterpret_cast<volatile long *> (&this->value_), rhs.value_); #endif /* WIN32 */ @@ -395,8 +365,6 @@ ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::exchange (unsigned long newval) return ::InterlockedExchange (const_cast<long *> (reinterpret_cast<volatile long*> (&this->value_)), newval); #elif defined (ACE_HAS_VXATOMICLIB) return ::vxAtomicSet (reinterpret_cast <atomic_t*>(const_cast<long *> (reinterpret_cast<volatile long*> (&this->value_))), newval); -#elif defined (ACE_HAS_SOLARIS_ATOMIC_LIB) - return ::atomic_swap_ulong (&this->value_, newval); #else /* WIN32 */ return (*exchange_fn_) (reinterpret_cast<volatile long *> (&this->value_), newval); #endif /* WIN32 */ diff --git a/ACE/ace/Atomic_Op_GCC_T.h b/ACE/ace/Atomic_Op_GCC_T.h index 13d363163ea..751387f9ce7 100644 --- a/ACE/ace/Atomic_Op_GCC_T.h +++ b/ACE/ace/Atomic_Op_GCC_T.h @@ -120,14 +120,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Atomic_Op_GCC_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Atomic_Op_GCC_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Atomic_Op_GCC_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - #endif /* ACE_HAS_GCC_ATOMIC_BUILTINS */ diff --git a/ACE/ace/Atomic_Op_Sparc.c b/ACE/ace/Atomic_Op_Sparc.c deleted file mode 100644 index 9e59864ae8a..00000000000 --- a/ACE/ace/Atomic_Op_Sparc.c +++ /dev/null @@ -1,187 +0,0 @@ -/* - * - * This is a C file for a reason. The Sun C++ compiler does not accept - * inline assembler. - * - * Portions of this code are based on atomic operations found in the - * linux kernel source code. - */ - -#if defined (ACE_INCLUDE_ATOMIC_OP_SPARC) - -#if defined(__i386) && defined(__SUNPRO_C) -static void -__sunpro_asm_code() { - __asm("\n\ - .globl ace_atomic_add_long \n\ - .type ace_atomic_add_long,@function \n\ - .align 4 \n\ -ace_atomic_add_long: \n\ - movl 0x00000004(%esp), %edx \n\ - movl 0x00000008(%esp), %eax \n\ - lock; xadd %eax, (%edx) \n\ - addl 0x00000008(%esp), %eax \n\ - ret \n\ - "); - - __asm("\n\ - .globl ace_atomic_swap_long \n\ - .type ace_atomic_swap_long,@function \n\ - .align 4 \n\ -ace_atomic_swap_long: \n\ - movl 0x00000004(%esp), %edx \n\ - movl 0x00000008(%esp), %eax \n\ - xchg %eax, (%edx) \n\ - ret \n\ - "); - - __asm("\n\ - .globl ace_atomic_swap_add_long \n\ - .type ace_atomic_swap_add_long,@function \n\ - .align 4 \n\ -ace_atomic_swap_add_long: \n\ - movl 0x00000004(%esp), %edx \n\ - movl 0x00000008(%esp), %eax \n\ - lock; xadd %eax, (%edx) \n\ - ret \n\ - "); -} - -#elif defined(__x86_64) && defined(__SUNPRO_C) - -static void -__sunpro_asm_code() { - __asm("\n\ - .globl ace_atomic_add_long \n\ - .type ace_atomic_add_long,@function \n\ - .align 16 \n\ -ace_atomic_add_long: \n\ - movq %rsi, %rax \n\ - lock; xaddq %rax, (%rdi) \n\ - addq %rsi, %rax \n\ - ret \n\ - "); - - __asm("\n\ - .globl ace_atomic_swap_long \n\ - .type ace_atomic_swap_long,@function \n\ - .align 16 \n\ -ace_atomic_swap_long: \n\ - xchgq %rsi, (%rdi) \n\ - movq %rsi, %rax \n\ - ret \n\ - "); - - __asm("\n\ - .globl ace_atomic_swap_add_long \n\ - .type ace_atomic_swap_add_long,@function \n\ - .align 16 \n\ -ace_atomic_swap_add_long: \n\ - lock; xaddq %rsi, (%rdi) \n\ - movq %rsi, %rax \n\ - ret \n\ - "); -} - -#elif defined (__sparcv9) - -unsigned long -ace_atomic_add_long (volatile unsigned long *dest, long rhs) -{ - __asm ("restore\n" - "ldx [%o0], %o2\n" - ".again_add:\n" - "add %o2, %o1, %o3\n" - "casx [%o0], %o2, %o3\n" - "cmp %o2, %o3\n" - "bne,pn %xcc, .again_add\n" - "mov %o3, %o2\n" - "retl\n" - "add %o2, %o1, %o0\n"); -} - -unsigned long -ace_atomic_swap_long (volatile unsigned long *dest, unsigned long rhs) -{ - __asm ("restore\n" - "ldx [%o0], %o2\n" - ".again_swap:\n" - "mov %o1, %o3\n" - "casx [%o0], %o2, %o3\n" - "cmp %o2, %o3\n" - "bne,pn %xcc, .again_swap\n" - "mov %o3, %o2\n" - "retl\n" - "mov %o3, %o0\n"); -} - -unsigned long -ace_atomic_swap_add_long (volatile unsigned long *dest, long rhs) -{ - __asm ("restore\n" - "ldx [%o0], %o2\n" - ".again_swap_add:\n" - "mov %o2, %o4\n" - "add %o2, %o1, %o3\n" - "casx [%o0], %o2, %o3\n" - "cmp %o2, %o3\n" - "bne,pn %xcc, .again_swap_add\n" - "mov %o3, %o2\n" - "retl\n" - "mov %o4, %o0\n"); -} - -#else - -unsigned long -ace_atomic_add_long (volatile unsigned long *dest, long rhs) -{ - __asm ("restore\n" - "ld [%o0], %o2\n" - ".again_add:\n" - "add %o2, %o1, %o3\n" - "cas [%o0], %o2, %o3\n" - "cmp %o2, %o3\n" - "bne,pn %icc, .again_add\n" - "mov %o3, %o2\n" - "retl\n" - "add %o2, %o1, %o0\n"); -} - -unsigned long -ace_atomic_swap_long (volatile unsigned long *dest, unsigned long rhs) -{ - __asm ("restore\n" - "ld [%o0], %o2\n" - ".again_swap:\n" - "mov %o1, %o3\n" - "cas [%o0], %o2, %o3\n" - "cmp %o2, %o3\n" - "bne,pn %icc, .again_swap\n" - "mov %o3, %o2\n" - "retl\n" - "mov %o3, %o0\n"); -} - -unsigned long -ace_atomic_swap_add_long (volatile unsigned long *dest, long rhs) -{ - __asm ("restore\n" - "ld [%o0], %o2\n" - ".again_swap_add:\n" - "mov %o2, %o4\n" - "add %o2, %o1, %o3\n" - "cas [%o0], %o2, %o3\n" - "cmp %o2, %o3\n" - "bne,pn %icc, .again_swap_add\n" - "mov %o3, %o2\n" - "retl\n" - "mov %o4, %o0\n"); -} - -# endif /* __sparcv9 */ - -#elif !defined (__GNUC__) && !defined (__INTEL_COMPILER) -/* Make compilers stop complaining about an empty translation unit */ -static int shut_up_compiler = 0; -#endif /* ACE_INCLUDE_ATOMIC_OP_SPARC */ diff --git a/ACE/ace/Atomic_Op_Sparc.h b/ACE/ace/Atomic_Op_Sparc.h deleted file mode 100644 index 3c4d883c2af..00000000000 --- a/ACE/ace/Atomic_Op_Sparc.h +++ /dev/null @@ -1,12 +0,0 @@ -/* -*- C++ -*- */ -#ifndef ACE_ATOMIC_OP_SPARC_H -#define ACE_ATOMIC_OP_SPARC_H - -extern "C" -{ - unsigned long ace_atomic_add_long (volatile unsigned long *dest, long rhs); - unsigned long ace_atomic_swap_long (volatile unsigned long *dest, unsigned long rhs); - unsigned long ace_atomic_swap_add_long (volatile unsigned long *dest, long rhs); -} - -#endif /* ACE_ATOMIC_OP_SPARC_H */ diff --git a/ACE/ace/Atomic_Op_T.h b/ACE/ace/Atomic_Op_T.h index 599ae7075b6..e3752ccbd4c 100644 --- a/ACE/ace/Atomic_Op_T.h +++ b/ACE/ace/Atomic_Op_T.h @@ -344,13 +344,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Atomic_Op_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Atomic_Op_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Atomic_Op_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /*ACE_ATOMIC_OP_T_H*/ diff --git a/ACE/ace/Auto_Event.h b/ACE/ace/Auto_Event.h index 324eb20ad25..c71e46c17be 100644 --- a/ACE/ace/Auto_Event.h +++ b/ACE/ace/Auto_Event.h @@ -92,13 +92,7 @@ public: ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Auto_Event.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Auto_Event.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_AUTO_EVENT_H */ diff --git a/ACE/ace/Auto_Functor.h b/ACE/ace/Auto_Functor.h index cbf4827b6a4..e64bcdf6bb3 100644 --- a/ACE/ace/Auto_Functor.h +++ b/ACE/ace/Auto_Functor.h @@ -109,9 +109,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL # include "ace/Auto_Functor.inl" #endif /* __ACE_INLINE__ */ -#if defined(ACE_TEMPLATES_REQUIRE_SOURCE) -# include "ace/Auto_Functor.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ +#include "ace/Auto_Functor.cpp" #include /**/ "ace/post.h" #endif /* ACE_AUTO_FUNCTOR_H*/ diff --git a/ACE/ace/Auto_IncDec_T.h b/ACE/ace/Auto_IncDec_T.h index dde2b427a93..afbde550e51 100644 --- a/ACE/ace/Auto_IncDec_T.h +++ b/ACE/ace/Auto_IncDec_T.h @@ -65,13 +65,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Auto_IncDec_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Auto_IncDec_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Auto_IncDec_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Auto_Ptr.h b/ACE/ace/Auto_Ptr.h index 01236ce8198..43b704e02bb 100644 --- a/ACE/ace/Auto_Ptr.h +++ b/ACE/ace/Auto_Ptr.h @@ -192,13 +192,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Auto_Ptr.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Auto_Ptr.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Auto_Ptr.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #if defined (_MSC_VER) // Restore the warning state to what it was before entry. diff --git a/ACE/ace/Based_Pointer_T.h b/ACE/ace/Based_Pointer_T.h index 902e90f2a36..254371f305e 100644 --- a/ACE/ace/Based_Pointer_T.h +++ b/ACE/ace/Based_Pointer_T.h @@ -176,13 +176,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Based_Pointer_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Based_Pointer_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Based_Pointer_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Basic_Types.h b/ACE/ace/Basic_Types.h index fce2426fd5c..cccde07113f 100644 --- a/ACE/ace/Basic_Types.h +++ b/ACE/ace/Basic_Types.h @@ -266,12 +266,12 @@ ACE_END_VERSIONED_NAMESPACE_DECL #else /* ! BYTE_ORDER && ! __BYTE_ORDER */ // We weren't explicitly told, so we have to figure it out . . . // Note that Itanium hardware (IA64) can run in either byte order. It's - // selected by the OS when loading; Windows runs little, HP-UX runs big. + // selected by the OS when loading; Windows runs little. # if defined (i386) || defined (__i386__) || defined (_M_IX86) || \ defined (vax) || defined (__LITTLE_ENDIAN__) || \ defined (ARM) || defined (_M_IA64) || defined (_M_AMD64) || \ defined (__amd64) || \ - ((defined (__ia64__) || defined (__ia64)) && !defined (__hpux)) + ((defined (__ia64__) || defined (__ia64))) // We know these are little endian. # define ACE_LITTLE_ENDIAN 0x0123 # define ACE_BYTE_ORDER ACE_LITTLE_ENDIAN diff --git a/ACE/ace/Bound_Ptr.h b/ACE/ace/Bound_Ptr.h index 0464ef030dd..3b736a14942 100644 --- a/ACE/ace/Bound_Ptr.h +++ b/ACE/ace/Bound_Ptr.h @@ -366,13 +366,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Bound_Ptr.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Bound_Ptr.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Bound_Ptr.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/ACE/ace/CDR_Base.cpp b/ACE/ace/CDR_Base.cpp index 9fbc28b305f..f2213f379eb 100644 --- a/ACE/ace/CDR_Base.cpp +++ b/ACE/ace/CDR_Base.cpp @@ -811,7 +811,7 @@ ACE_CDR::Fixed ACE_CDR::Fixed::from_integer (ACE_CDR::ULongLong val) ACE_CDR::Fixed ACE_CDR::Fixed::from_floating (LongDouble val) { -#if defined ACE_OPENVMS || (defined ACE_VXWORKS && !defined __RTP__) +#if defined ACE_VXWORKS && !defined __RTP__ typedef double BigFloat; #elif defined NONNATIVE_LONGDOUBLE typedef LongDouble::NativeImpl BigFloat; diff --git a/ACE/ace/CDR_Base.h b/ACE/ace/CDR_Base.h index 84085cf4482..2e2ce3bdf10 100644 --- a/ACE/ace/CDR_Base.h +++ b/ACE/ace/CDR_Base.h @@ -264,7 +264,7 @@ public: // VxWorks' compiler (gcc 2.96) gets confused by the operator long // double, so we avoid using long double as the NativeImpl. // Linux's x86 long double format (12 or 16 bytes) is incompatible - // with Windows, Solaris, AIX, MacOS X and HP-UX (and probably others) + // with Windows, and MacOS X (and probably others) // long double format (8 or 16 bytes). If you need 32-bit Linux to // inter-operate with 64-bit Linux you will want to define this // macro to 0 so that "long double" is used. Otherwise, do not define diff --git a/ACE/ace/CE_Screen_Output.cpp b/ACE/ace/CE_Screen_Output.cpp deleted file mode 100644 index 8711f1e57c4..00000000000 --- a/ACE/ace/CE_Screen_Output.cpp +++ /dev/null @@ -1,156 +0,0 @@ -#include "ace/CE_Screen_Output.h" -#if defined (ACE_HAS_WINCE) - -#include "ace/Log_Category.h" - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - -ACE_CE_Screen_Output::ACE_CE_Screen_Output(HWND hEdit) -: handler_(hEdit) -, pFile_(0) -{ -} - -ACE_CE_Screen_Output::ACE_CE_Screen_Output() -: handler_(0) -, pFile_(0) -{ -} - -ACE_CE_Screen_Output::~ACE_CE_Screen_Output() -{ - if (pFile_ != 0) { - fclose(pFile_); - } -} - -void ACE_CE_Screen_Output::log(ACE_Log_Record &log_record) -{ - ACE_TCHAR verbose_msg[ACE_Log_Record::MAXVERBOSELOGMSGLEN]; - int result = log_record.format_msg (ACE_TEXT("WindozeCE"), // host name - 0, // verbose flag - verbose_msg); - - if (result == 0) - { - verbose_msg[ ACE_OS::strlen(verbose_msg) - 1 ] = 0; // CE does not like '\n' by itself. - *this << verbose_msg << endl; - } -} - -void ACE_CE_Screen_Output::SetOutputWindow(HWND hEdit) -{ - handler_ = hEdit; -} - -void ACE_CE_Screen_Output::clear() -{ - SetWindowText(handler_, 0); -} - -ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (ACE_TCHAR* output) -{ - int length = GetWindowTextLength(handler_); - SendMessage(handler_, EM_SETSEL, length, length); - SendMessage(handler_, EM_REPLACESEL, 0, (LPARAM)output); - - if (pFile_ != 0) - { - fwprintf(pFile_, L"%s", output); - } - - return *this; -} - -ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (const ACE_TCHAR* output) -{ - ACE_TCHAR* buffer = ACE_OS::strdup(output); - if (buffer != 0) - { - *this << buffer; - delete buffer; - } - return *this; -} - -ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (ACE_ANTI_TCHAR* output) -{ - *this << ACE_TEXT_CHAR_TO_TCHAR(output); - return *this; -} - -ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (const ACE_ANTI_TCHAR* output) -{ - *this << ACE_TEXT_CHAR_TO_TCHAR(output); - return *this; -} - -ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (char output) -{ - *this << (int)output; - return *this; -} - -ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (unsigned char output) -{ - *this << (int)output; - return *this; -} - -ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (unsigned short output) -{ - ACE_TCHAR buffer[20]; - wsprintf(buffer, ACE_TEXT("%u"), output); - *this << buffer; - return *this; -} - -ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (int output) -{ - ACE_TCHAR buffer[20]; - wsprintf(buffer, ACE_TEXT("%d"), output); - *this << buffer; - return *this; -} - -ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (unsigned int output) -{ - ACE_TCHAR buffer[20]; - wsprintf(buffer, ACE_TEXT("%du"), output); - *this << buffer; - return *this; -} - -ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (float output) -{ - ACE_TCHAR buffer[20]; - swprintf(buffer, ACE_TEXT("%f"), output); - *this << buffer; - return *this; -} - -ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (long output) -{ - ACE_TCHAR buffer[20]; - wsprintf(buffer, ACE_TEXT("%l"), output); - *this << buffer; - return *this; -} - -ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (unsigned long output) -{ - ACE_TCHAR buffer[20]; - wsprintf(buffer, ACE_TEXT("%lu"), output); - *this << buffer; - return *this; -} - -ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (FILE* pFile) -{ - pFile_ = pFile; - return *this; -} - -ACE_END_VERSIONED_NAMESPACE_DECL - -#endif // ACE_HAS_WINCE diff --git a/ACE/ace/CE_Screen_Output.h b/ACE/ace/CE_Screen_Output.h deleted file mode 100644 index 032f03924b6..00000000000 --- a/ACE/ace/CE_Screen_Output.h +++ /dev/null @@ -1,104 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file CE_Screen_Output.h - * - * @author Si Mong Park <spark@ociweb.com> - */ -//============================================================================= - -#ifndef ACE_CE_SCREEN_OUTPUT_H -#define ACE_CE_SCREEN_OUTPUT_H - -#include /**/ "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if defined (ACE_HAS_WINCE) - -#include "ace/Log_Msg_Callback.h" -#include "ace/Log_Record.h" - -namespace -{ - const ACE_TCHAR endl[] = ACE_TEXT("\r\n"); - const ACE_TCHAR tab[] = ACE_TEXT("\t"); -} - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - -/** - * @class ACE_CE_Screen_Output - * - * @brief Replacement of text output for Windows CE. - * - * This class allows standard text output to be displayed on - * text window for Windows CE. Generally, all ACE output will - * go through under CE if and only if user uses Windows CE - * implementation by using main_ce instead of main. - * Also, for the easier debugging purpose, object pointer of - * this class can be gotten from ACE_Log_Msg::msg_callback() - * and then can be used directly by user just like cout stream. - */ -class ACE_Export ACE_CE_Screen_Output : public ACE_Log_Msg_Callback -{ -public: - ACE_CE_Screen_Output (HWND hEdit); - - ACE_CE_Screen_Output (); - - virtual ~ACE_CE_Screen_Output(); - - /// Implementation of pure virtual function from ACE_Log_Msg_Callback. - virtual void log (ACE_Log_Record &log_record); - - /// Interface to specify active window handle. - void SetOutputWindow (HWND hWnd); - - void clear (); - - /// Stream insertion operator that performs actual print out. - /** - * @note This is the only one operator that performs output. All - * other perators convert the type and use this operator - * underneath. - */ - ACE_CE_Screen_Output& operator << (ACE_TCHAR*); - ACE_CE_Screen_Output& operator << (const ACE_TCHAR*); - - ACE_CE_Screen_Output& operator << (ACE_ANTI_TCHAR* output); - ACE_CE_Screen_Output& operator << (const ACE_ANTI_TCHAR* output); - - ACE_CE_Screen_Output& operator << (char output); - ACE_CE_Screen_Output& operator << (unsigned char output); - - ACE_CE_Screen_Output& operator << (unsigned short output); - - ACE_CE_Screen_Output& operator << (int output); - ACE_CE_Screen_Output& operator << (unsigned int output); - - ACE_CE_Screen_Output& operator << (float output); - - ACE_CE_Screen_Output& operator << (long output); - ACE_CE_Screen_Output& operator << (unsigned long output); - - ACE_CE_Screen_Output& operator << (FILE* pFile); - -private: - ACE_CE_Screen_Output (ACE_CE_Screen_Output&); - -private: - HWND handler_; - - /// FILE pointer that used to save output to file. This class does - /// not own the file handler pointer. - FILE* pFile_; -}; - -ACE_END_VERSIONED_NAMESPACE_DECL - -#endif // ACE_HAS_WINCE -#endif // ACE_CE_SCREEN_OUTPUT_H diff --git a/ACE/ace/Cache_Map_Manager_T.h b/ACE/ace/Cache_Map_Manager_T.h index 10490c2167e..ce8016af06e 100644 --- a/ACE/ace/Cache_Map_Manager_T.h +++ b/ACE/ace/Cache_Map_Manager_T.h @@ -384,13 +384,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Cache_Map_Manager_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Cache_Map_Manager_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Cache_Map_Manager_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Cached_Connect_Strategy_T.h b/ACE/ace/Cached_Connect_Strategy_T.h index dd7ac7d3da2..dd762faa2eb 100644 --- a/ACE/ace/Cached_Connect_Strategy_T.h +++ b/ACE/ace/Cached_Connect_Strategy_T.h @@ -247,13 +247,7 @@ protected: ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Cached_Connect_Strategy_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Cached_Connect_Strategy_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* CACHED_CONNECT_STRATEGY_T_H */ diff --git a/ACE/ace/Caching_Strategies_T.h b/ACE/ace/Caching_Strategies_T.h index 7cbad12d5d8..8960ddd937b 100644 --- a/ACE/ace/Caching_Strategies_T.h +++ b/ACE/ace/Caching_Strategies_T.h @@ -538,13 +538,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Caching_Strategies_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Caching_Strategies_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Caching_Strategies_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Caching_Utility_T.h b/ACE/ace/Caching_Utility_T.h index a8d4755541b..66ba434c9dd 100644 --- a/ACE/ace/Caching_Utility_T.h +++ b/ACE/ace/Caching_Utility_T.h @@ -288,13 +288,7 @@ protected: ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Caching_Utility_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Caching_Utility_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Cleanup_Strategies_T.h b/ACE/ace/Cleanup_Strategies_T.h index 65a67cb3143..9ec2afcdb6e 100644 --- a/ACE/ace/Cleanup_Strategies_T.h +++ b/ACE/ace/Cleanup_Strategies_T.h @@ -130,13 +130,7 @@ public: ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Cleanup_Strategies_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Cleanup_Strategies_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* CLEANUP_STRATEGIES_H */ diff --git a/ACE/ace/Condition_T.cpp b/ACE/ace/Condition_T.cpp index 3c16a20201f..539bdf1232b 100644 --- a/ACE/ace/Condition_T.cpp +++ b/ACE/ace/Condition_T.cpp @@ -128,10 +128,9 @@ ACE_Condition<MUTEX>::wait (MUTEX &mutex, } } -// Peform an "alertable" timed wait. If the argument ABSTIME == 0 -// then we do a regular cond_wait(), else we do a timed wait for up to -// ABSTIME using the Solaris cond_timedwait() function. - +/// Peform an "alertable" timed wait. If @a abstime == 0 +/// then we do a regular cond_wait(), else we do a timed wait for up to +/// @a abstime template <class MUTEX> int ACE_Condition<MUTEX>::wait (const ACE_Time_Value *abstime) { diff --git a/ACE/ace/Condition_T.h b/ACE/ace/Condition_T.h index 34523edb875..f70ea1dad13 100644 --- a/ACE/ace/Condition_T.h +++ b/ACE/ace/Condition_T.h @@ -152,13 +152,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Condition_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Condition_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Condition_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* ACE_HAS_THREADS */ diff --git a/ACE/ace/Configuration.cpp b/ACE/ace/Configuration.cpp index 01e10fc9c0c..56cb81fd8ea 100644 --- a/ACE/ace/Configuration.cpp +++ b/ACE/ace/Configuration.cpp @@ -966,11 +966,7 @@ ACE_Configuration_Win32Registry::resolve_key (HKEY hKey, HKEY result = 0; // Make a copy of hKey int errnum; -#if defined (ACE_HAS_WINCE) - if ((errnum = RegOpenKeyEx (hKey, 0, 0, 0, &result)) != ERROR_SUCCESS) -#else if ((errnum = RegOpenKey (hKey, 0, &result)) != ERROR_SUCCESS) -#endif // ACE_HAS_WINCE { errno = errnum; return 0; @@ -994,17 +990,9 @@ ACE_Configuration_Win32Registry::resolve_key (HKEY hKey, // Open the key HKEY subkey; -#if defined (ACE_HAS_WINCE) - if ((errnum = ACE_TEXT_RegOpenKeyEx (result, - temp, - 0, - 0, - &subkey)) != ERROR_SUCCESS) -#else if ((errnum = ACE_TEXT_RegOpenKey (result, temp, &subkey)) != ERROR_SUCCESS) -#endif // ACE_HAS_WINCE { // try creating it if (!create || (errnum = ACE_TEXT_RegCreateKeyEx (result, diff --git a/ACE/ace/Connector.h b/ACE/ace/Connector.h index 11617eeb870..2903ad6a750 100644 --- a/ACE/ace/Connector.h +++ b/ACE/ace/Connector.h @@ -564,13 +564,7 @@ protected: ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Connector.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Connector.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Containers_T.cpp b/ACE/ace/Containers_T.cpp index c4ac4b5e2da..1b3b6b144bc 100644 --- a/ACE/ace/Containers_T.cpp +++ b/ACE/ace/Containers_T.cpp @@ -1396,7 +1396,7 @@ ACE_Bounded_Set_Iterator<T>::done () const { ACE_TRACE ("ACE_Bounded_Set_Iterator<T>::done"); - return static_cast<ACE_CAST_CONST size_t> (this->next_) >= + return static_cast<size_t> (this->next_) >= this->s_.cur_size_; } diff --git a/ACE/ace/Containers_T.h b/ACE/ace/Containers_T.h index d52a970921a..533a48924bb 100644 --- a/ACE/ace/Containers_T.h +++ b/ACE/ace/Containers_T.h @@ -986,18 +986,6 @@ template <class T> class ACE_DLList_Reverse_Iterator; typedef ACE_Double_Linked_List<ACE_DLList_Node> ACE_DLList_Base; -//typedef ACE_Double_Linked_List_Iterator <ACE_DLList_Node> -// ACE_DLList_Iterator_Base; -//typedef ACE_Double_Linked_List_Reverse_Iterator <ACE_DLList_Node> -// ACE_DLList_Reverse_Iterator_Base; -//@@ These two typedefs (inherited from James Hu's original design) -// have been removed because Sun CC 4.2 had problems with it. I guess -// having the DLList_Iterators inheriting from a class which is -// actually a typedef leads to problems. #define'ing rather than -// typedef'ing worked, but as per Carlos's reccomendation, I'm just -// replacing all references to the base classes with their actual -// type. Matt Braun (6/15/99) - /** * @class ACE_DLList * @@ -2019,13 +2007,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Containers_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Containers_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Containers_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Countdown_Time_T.h b/ACE/ace/Countdown_Time_T.h index d3817db8c44..86bbf224f7e 100644 --- a/ACE/ace/Countdown_Time_T.h +++ b/ACE/ace/Countdown_Time_T.h @@ -89,13 +89,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Countdown_Time_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Countdown_Time_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Countdown_Time_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - #endif /* ACE_COUNTDOWN_TIME_T_H */ diff --git a/ACE/ace/DLL_Manager.cpp b/ACE/ace/DLL_Manager.cpp index 7eddc0484fe..ec1a2a0e1b2 100644 --- a/ACE/ace/DLL_Manager.cpp +++ b/ACE/ace/DLL_Manager.cpp @@ -123,44 +123,6 @@ ACE_DLL_Handle::open (const ACE_TCHAR *dll_name, { if (this->open_i (name->c_str (), open_mode, errors)) break; - -#if defined (AIX) -# define SHR_O ACE_TEXT("(shr.o)") -# define SHR_O_LEN (sizeof (SHR_O) / sizeof(ACE_TCHAR) - 1) - // AIX often puts the shared library file (most often named - // shr.o) inside an archive library. If this is an archive - // library name, then try appending [shr.o] and retry. - if (ACE_TString::npos != name->strstr (ACE_TEXT (".a"))) - { - ACE_TCHAR aix_pathname[MAXPATHLEN + 1]; - if (name->length () + SHR_O_LEN <= MAXPATHLEN) - { - ACE_OS::strcpy (aix_pathname, name->c_str()); - ACE_OS::strcat (aix_pathname, SHR_O); - } - else - { - if (errors) - { - errors->push ("path is too long"); - } - - if (ACE::debug ()) - { - ACELIB_ERROR ((LM_ERROR, - ACE_TEXT ("ACE (%P|%t) DLL_Handle::open: ") - ACE_TEXT ("('%s(shr.o)') is too long\n"), - name->c_str())); - } - - return -1; - } - open_mode |= RTLD_MEMBER; - - if (this->open_i (aix_pathname, open_mode, errors)) - break; - } -#endif /* AIX */ } if (this->handle_ == ACE_SHLIB_INVALID_HANDLE) @@ -286,11 +248,7 @@ ACE_DLL_Handle::symbol (const ACE_TCHAR *sym_name, bool ignore_errors, ACE_TStri // BTW. Handle lifecycle management is a little crazy in ACE if (this->handle_ != ACE_SHLIB_INVALID_HANDLE) { -#if defined (ACE_OPENVMS) - void *sym = ACE::ldsymbol (this->handle_, auto_name.get ()); -#else void *sym = ACE_OS::dlsym (this->handle_, auto_name.get ()); -#endif // Linux says that the symbol could be null and that it isn't an // error. So you should check the error message also, but since @@ -758,13 +716,7 @@ ACE_DLL_Manager::unload_dll (ACE_DLL_Handle *dll_handle, int force_unload) void * const unload_policy_ptr = dll_handle->symbol (ACE_TEXT ("_get_dll_unload_policy"), 1); -#if defined (ACE_OPENVMS) && (!defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64)) - int const temp_p = - reinterpret_cast<int> (unload_policy_ptr); -#else - intptr_t const temp_p = - reinterpret_cast<intptr_t> (unload_policy_ptr); -#endif + intptr_t const temp_p = reinterpret_cast<intptr_t> (unload_policy_ptr); dll_unload_policy const the_policy = reinterpret_cast<dll_unload_policy> (temp_p); diff --git a/ACE/ace/Date_Time.inl b/ACE/ace/Date_Time.inl index ef2a39b4d3e..25bb2e2e0db 100644 --- a/ACE/ace/Date_Time.inl +++ b/ACE/ace/Date_Time.inl @@ -9,22 +9,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE void ACE_Date_Time::update (const ACE_Time_Value& timevalue) { -#if defined (ACE_HAS_WINCE) - // CE doesn't do localtime(). - FILETIME file_time = timevalue; - FILETIME local_file_time; - SYSTEMTIME sys_time; - ::FileTimeToLocalFileTime (&file_time, &local_file_time); - ::FileTimeToSystemTime (&local_file_time, &sys_time); - this->day_ = sys_time.wDay; - this->month_ = sys_time.wMonth; - this->year_ = sys_time.wYear; - this->hour_ = sys_time.wHour; - this->minute_ = sys_time.wMinute; - this->second_ = sys_time.wSecond; - this->microsec_ = sys_time.wMilliseconds * 1000; - this->wday_ = sys_time.wDayOfWeek; -#else time_t time = timevalue.sec (); struct tm tm_time; ACE_OS::localtime_r (&time, &tm_time); @@ -36,7 +20,6 @@ ACE_Date_Time::update (const ACE_Time_Value& timevalue) this->second_ = tm_time.tm_sec; this->microsec_ = timevalue.usec (); this->wday_ = tm_time.tm_wday; -#endif /* ACE_HAS_WINCE */ } ACE_INLINE void diff --git a/ACE/ace/Dev_Poll_Reactor.cpp b/ACE/ace/Dev_Poll_Reactor.cpp index f1e3e03342e..6ac51473285 100644 --- a/ACE/ace/Dev_Poll_Reactor.cpp +++ b/ACE/ace/Dev_Poll_Reactor.cpp @@ -13,8 +13,6 @@ # if defined (ACE_HAS_DEV_POLL) # if defined (ACE_LINUX) # include /**/ <linux/devpoll.h> -# elif defined (HPUX_VERS) && HPUX_VERS < 1123 -# include /**/ <devpoll.h> # else # include /**/ <sys/devpoll.h> # endif /* ACE_LINUX */ @@ -2337,24 +2335,7 @@ ACE_Dev_Poll_Reactor::mask_ops_i (ACE_HANDLE handle, { short const events = this->reactor_mask_to_poll_event (new_mask); -#if defined (sun) - // Apparently events cannot be updated on-the-fly on Solaris so - // remove the existing events, and then add the new ones. - struct pollfd pfd[2]; - - pfd[0].fd = handle; - pfd[0].events = POLLREMOVE; - pfd[0].revents = 0; - pfd[1].fd = (events == POLLREMOVE ? ACE_INVALID_HANDLE : handle); - pfd[1].events = events; - pfd[1].revents = 0; - - // Change the events associated with the given file descriptor. - if (ACE_OS::write (this->poll_fd_, - pfd, - sizeof (pfd)) != sizeof (pfd)) - return -1; -#elif defined (ACE_HAS_EVENT_POLL) +#if defined (ACE_HAS_EVENT_POLL) struct epoll_event epev; ACE_OS::memset (&epev, 0, sizeof (epev)); diff --git a/ACE/ace/Dump_T.h b/ACE/ace/Dump_T.h index ead87898acf..3d1cc3650ac 100644 --- a/ACE/ace/Dump_T.h +++ b/ACE/ace/Dump_T.h @@ -68,13 +68,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL ((void *) this); #endif /* ACE_NDEBUG */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Dump_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Dump_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_DUMP_T_H */ diff --git a/ACE/ace/Dynamic_Service.h b/ACE/ace/Dynamic_Service.h index 713a5aac98f..ed866b3f78e 100644 --- a/ACE/ace/Dynamic_Service.h +++ b/ACE/ace/Dynamic_Service.h @@ -74,13 +74,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Dynamic_Service.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) # include "ace/Dynamic_Service.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -# pragma implementation ("Dynamic_Service.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/ACE/ace/ETCL/ETCL_l.cpp b/ACE/ace/ETCL/ETCL_l.cpp index b4fcaace55e..1addcb5319e 100644 --- a/ACE/ace/ETCL/ETCL_l.cpp +++ b/ACE/ace/ETCL/ETCL_l.cpp @@ -1529,18 +1529,7 @@ FILE *file; b->yy_input_file = file; b->yy_fill_buffer = 1; -#if defined (ACE_HAS_WINCE) - // Mimic the behavior as WinCE does not have isatty(). - if ((file != 0) && (file == ACE_OS::fileno(file))) { - b->yy_is_interactive = 1; - } - else { - b->yy_is_interactive = 0; - } -#else b->yy_is_interactive = file ? (ACE_OS::isatty( ACE_OS::fileno(file) ) > 0) : 0; -#endif // ACE_HAS_WINCE - } diff --git a/ACE/ace/ETCL/ETCL_y.cpp b/ACE/ace/ETCL/ETCL_y.cpp index 15e2c0116c2..37321652c84 100644 --- a/ACE/ace/ETCL/ETCL_y.cpp +++ b/ACE/ace/ETCL/ETCL_y.cpp @@ -351,13 +351,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL #pragma alloca #define YYSTACK_USE_ALLOCA #else /* not MSDOS, or __TURBOC__, or _AIX */ -#if 0 -#ifdef __hpux /* haible@ilog.fr says this works for HPUX 9.05 and up, - and on HPUX 10. Eventually we can turn this on. */ -#define YYSTACK_USE_ALLOCA -#define alloca __builtin_alloca -#endif /* __hpux */ -#endif #endif /* not _AIX */ #endif /* not MSDOS, or __TURBOC__ */ #endif /* not sparc */ diff --git a/ACE/ace/Env_Value_T.h b/ACE/ace/Env_Value_T.h index 6e97e3602d7..e080cafcec6 100644 --- a/ACE/ace/Env_Value_T.h +++ b/ACE/ace/Env_Value_T.h @@ -78,9 +78,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Env_Value_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Env_Value_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -151,9 +149,5 @@ ACE_Convert (const ACE_TCHAR *s, T &t) ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Env_Value_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - #include /**/ "ace/post.h" #endif /* ACE_ENV_VALUE_T_H */ diff --git a/ACE/ace/Event.h b/ACE/ace/Event.h index 78682631d9d..f0727003f53 100644 --- a/ACE/ace/Event.h +++ b/ACE/ace/Event.h @@ -77,13 +77,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Event.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Event.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Event.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_EVENT_H */ diff --git a/ACE/ace/Event_Handler_T.h b/ACE/ace/Event_Handler_T.h index a222459388e..c4597926762 100644 --- a/ACE/ace/Event_Handler_T.h +++ b/ACE/ace/Event_Handler_T.h @@ -173,13 +173,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Event_Handler_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Event_Handler_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Event_Handler_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_EVENT_HANDLER_H */ diff --git a/ACE/ace/Framework_Component_T.h b/ACE/ace/Framework_Component_T.h index a4e7d4ee356..e23f11889f5 100644 --- a/ACE/ace/Framework_Component_T.h +++ b/ACE/ace/Framework_Component_T.h @@ -57,13 +57,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL ACE_Framework_Repository::instance ()->register_component \ (new ACE_Framework_Component_T<CLASS> (INSTANCE)); -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Framework_Component_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Framework_Component_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_FRAMEWORK_COMPONENT_T_H */ diff --git a/ACE/ace/Free_List.h b/ACE/ace/Free_List.h index 38e30e6c1b0..a6252fe85ed 100644 --- a/ACE/ace/Free_List.h +++ b/ACE/ace/Free_List.h @@ -137,13 +137,7 @@ private: ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Free_List.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Free_List.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_FREE_LIST_H */ diff --git a/ACE/ace/Functor_T.h b/ACE/ace/Functor_T.h index efa33f879b6..4a9fb185dd2 100644 --- a/ACE/ace/Functor_T.h +++ b/ACE/ace/Functor_T.h @@ -180,13 +180,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Functor_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Functor_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Functor_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_FUNCTOR_T_H */ diff --git a/ACE/ace/Future.h b/ACE/ace/Future.h index 4858bcad6f8..e07756fc880 100644 --- a/ACE/ace/Future.h +++ b/ACE/ace/Future.h @@ -362,13 +362,7 @@ private: ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Future.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Future.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* ACE_HAS_THREADS */ diff --git a/ACE/ace/Future_Set.h b/ACE/ace/Future_Set.h index abee861e31c..ed1eb0999bf 100644 --- a/ACE/ace/Future_Set.h +++ b/ACE/ace/Future_Set.h @@ -126,13 +126,7 @@ private: ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Future_Set.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Future_Set.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* ACE_HAS_THREADS */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Global_Macros.h b/ACE/ace/Global_Macros.h index e8e64b20a6c..bc9b20a4962 100644 --- a/ACE/ace/Global_Macros.h +++ b/ACE/ace/Global_Macros.h @@ -559,27 +559,7 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC */ # define ACE_Local_Service_Export -#if defined (ACE_OPENVMS) -# define ACE_PREPROC_STRINGIFY(A) #A -# define ACE_MAKE_SVC_REGISTRAR_ARG(A) ACE_PREPROC_STRINGIFY(A), (void*)&A -# define ACE_FACTORY_DEFINE(CLS,SERVICE_CLASS) \ -void ACE_MAKE_SVC_CONFIG_GOBBLER_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (void *p) { \ - ACE_VERSIONED_NAMESPACE_NAME::ACE_Service_Object * _p = \ - static_cast< ACE_VERSIONED_NAMESPACE_NAME::ACE_Service_Object *> (p); \ - ACE_ASSERT (_p != 0); \ - delete _p; } \ -extern "C" CLS##_Export ACE_VERSIONED_NAMESPACE_NAME::ACE_Service_Object *\ -ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (ACE_Service_Object_Exterminator *gobbler) \ -{ \ - ACE_TRACE (#SERVICE_CLASS); \ - if (gobbler != 0) \ - *gobbler = (ACE_Service_Object_Exterminator) ACE_MAKE_SVC_CONFIG_GOBBLER_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS); \ - return new SERVICE_CLASS; \ -} \ -ACE_Dynamic_Svc_Registrar ace_svc_reg_##SERVICE_CLASS \ - (ACE_MAKE_SVC_REGISTRAR_ARG(ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS))); -#else -# define ACE_FACTORY_DEFINE(CLS,SERVICE_CLASS) \ +#define ACE_FACTORY_DEFINE(CLS,SERVICE_CLASS) \ void ACE_MAKE_SVC_CONFIG_GOBBLER_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (void *p) { \ ACE_VERSIONED_NAMESPACE_NAME::ACE_Service_Object * _p = \ static_cast< ACE_VERSIONED_NAMESPACE_NAME::ACE_Service_Object *> (p); \ @@ -593,7 +573,6 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC *gobbler = (ACE_Service_Object_Exterminator) ACE_MAKE_SVC_CONFIG_GOBBLER_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS); \ return new SERVICE_CLASS; \ } -#endif /** * For service classes scoped within namespaces, use this macro in @@ -621,27 +600,7 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC * this will ensure unique generated signatures for the various C * style functions. */ -#if defined (ACE_OPENVMS) -# define ACE_PREPROC_STRINGIFY(A) #A -# define ACE_MAKE_SVC_REGISTRAR_ARG(A) ACE_PREPROC_STRINGIFY(A), (void*)&A -# define ACE_FACTORY_NAMESPACE_DEFINE(CLS,SERVICE_CLASS,NAMESPACE_CLASS) \ -void ACE_MAKE_SVC_CONFIG_GOBBLER_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (void *p) { \ - ACE_VERSIONED_NAMESPACE_NAME::ACE_Service_Object * _p = \ - static_cast< ACE_VERSIONED_NAMESPACE_NAME::ACE_Service_Object *> (p); \ - ACE_ASSERT (_p != 0); \ - delete _p; } \ -extern "C" CLS##_Export ACE_VERSIONED_NAMESPACE_NAME::ACE_Service_Object *\ -ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (ACE_Service_Object_Exterminator *gobbler) \ -{ \ - ACE_TRACE (#SERVICE_CLASS); \ - if (gobbler != 0) \ - *gobbler = (ACE_Service_Object_Exterminator) ACE_MAKE_SVC_CONFIG_GOBBLER_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS); \ - return new NAMESPACE_CLASS; \ -} \ -ACE_Dynamic_Svc_Registrar ace_svc_reg_##SERVICE_CLASS \ - (ACE_MAKE_SVC_REGISTRAR_ARG(ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS))); -#else -# define ACE_FACTORY_NAMESPACE_DEFINE(CLS,SERVICE_CLASS,NAMESPACE_CLASS) \ +#define ACE_FACTORY_NAMESPACE_DEFINE(CLS,SERVICE_CLASS,NAMESPACE_CLASS) \ void ACE_MAKE_SVC_CONFIG_GOBBLER_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (void *p) { \ ACE_VERSIONED_NAMESPACE_NAME::ACE_Service_Object * _p = \ static_cast< ACE_VERSIONED_NAMESPACE_NAME::ACE_Service_Object *> (p); \ @@ -655,7 +614,6 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC *gobbler = (ACE_Service_Object_Exterminator) ACE_MAKE_SVC_CONFIG_GOBBLER_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS); \ return new NAMESPACE_CLASS; \ } -#endif /// The canonical name for a service factory method # define ACE_SVC_NAME(SERVICE_CLASS) ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) @@ -676,20 +634,7 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC # define ACE_SVC_FACTORY_DEFINE(X) ACE_FACTORY_DEFINE (ACE_Svc, X) //@} -#if defined (ACE_WIN32) -// These are used in SPIPE_Acceptor/Connector, but are ignored at runtime. -# if defined (ACE_HAS_WINCE) -# if !defined (PIPE_TYPE_MESSAGE) -# define PIPE_TYPE_MESSAGE 0 -# endif -# if !defined (PIPE_READMODE_MESSAGE) -# define PIPE_READMODE_MESSAGE 0 -# endif -# if !defined (PIPE_WAIT) -# define PIPE_WAIT 0 -# endif -# endif /* ACE_HAS_WINCE */ -#else /* !ACE_WIN32 */ +#if !defined (ACE_WIN32) // Add some typedefs and macros to enhance Win32 conformance... # if !defined (LPSECURITY_ATTRIBUTES) # define LPSECURITY_ATTRIBUTES int @@ -736,8 +681,7 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC # if !defined(PIPE_TYPE_MESSAGE) # define PIPE_TYPE_MESSAGE 0 # endif /* !defined PIPE_TYPE_MESSAGE */ -#endif /* ACE_WIN32 */ - +#endif /* !ACE_WIN32 */ // Some useful abstractions for expressions involving // ACE_Allocator.malloc (). The difference between ACE_NEW_MALLOC* diff --git a/ACE/ace/Guard_T.h b/ACE/ace/Guard_T.h index d7ffa9cd7af..b73346b6b4e 100644 --- a/ACE/ace/Guard_T.h +++ b/ACE/ace/Guard_T.h @@ -378,13 +378,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Guard_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Guard_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Guard_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_GUARD_T_H */ diff --git a/ACE/ace/Handle_Set.inl b/ACE/ace/Handle_Set.inl index 60e31a21a9c..49fb76559a3 100644 --- a/ACE/ace/Handle_Set.inl +++ b/ACE/ace/Handle_Set.inl @@ -1,7 +1,6 @@ // -*- C++ -*- #include "ace/Log_Category.h" -// AIX defines bzero() in this odd file... used by FD_ZERO #if defined (ACE_HAS_STRINGS) # include "ace/os_include/os_strings.h" #endif /* ACE_HAS_STRINGS */ diff --git a/ACE/ace/Hash_Cache_Map_Manager_T.h b/ACE/ace/Hash_Cache_Map_Manager_T.h index e8abfbcb464..9b94124afab 100644 --- a/ACE/ace/Hash_Cache_Map_Manager_T.h +++ b/ACE/ace/Hash_Cache_Map_Manager_T.h @@ -196,13 +196,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Hash_Cache_Map_Manager_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Hash_Cache_Map_Manager_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Hash_Cache_Map_Manager_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Hash_Map_Manager_T.h b/ACE/ace/Hash_Map_Manager_T.h index 6960498bfe7..045c2935020 100644 --- a/ACE/ace/Hash_Map_Manager_T.h +++ b/ACE/ace/Hash_Map_Manager_T.h @@ -1281,13 +1281,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL # include "ace/Hash_Map_Manager_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Hash_Map_Manager_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Hash_Map_Manager_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_HASH_MAP_MANAGER_T_H */ diff --git a/ACE/ace/Hash_Map_With_Allocator_T.h b/ACE/ace/Hash_Map_With_Allocator_T.h index 21eaec5f6ba..eb8473305d6 100644 --- a/ACE/ace/Hash_Map_With_Allocator_T.h +++ b/ACE/ace/Hash_Map_With_Allocator_T.h @@ -97,14 +97,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Hash_Map_With_Allocator_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Hash_Map_With_Allocator_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Hash_Map_With_Allocator_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - #include /**/ "ace/post.h" #endif /* ACE_HASH_MAP_WITH_ALLOCATOR_T_H */ diff --git a/ACE/ace/Hash_Multi_Map_Manager_T.h b/ACE/ace/Hash_Multi_Map_Manager_T.h index c3e446e1876..dfa34ea9c5f 100644 --- a/ACE/ace/Hash_Multi_Map_Manager_T.h +++ b/ACE/ace/Hash_Multi_Map_Manager_T.h @@ -946,13 +946,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL # include "ace/Hash_Multi_Map_Manager_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Hash_Multi_Map_Manager_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Hash_Multi_Map_Manager_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_HASH_MULTI_MAP_MANAGER_T_H */ diff --git a/ACE/ace/High_Res_Timer.cpp b/ACE/ace/High_Res_Timer.cpp index ef30f0833fb..1546cd03d07 100644 --- a/ACE/ace/High_Res_Timer.cpp +++ b/ACE/ace/High_Res_Timer.cpp @@ -227,7 +227,7 @@ ACE_High_Res_Timer::global_scale_factor () #endif /* (ACE_WIN32 || ACE_HAS_POWERPC_TIMER || \ ACE_HAS_PENTIUM) && \ ! ACE_HAS_HI_RES_TIMER && - ((WIN32 && ! WINCE) || ghs || __GNUG__) */ + ((WIN32) || ghs || __GNUG__) */ return ACE_High_Res_Timer::global_scale_factor_; } diff --git a/ACE/ace/High_Res_Timer.h b/ACE/ace/High_Res_Timer.h index ff4d544159b..6c94f3566d3 100644 --- a/ACE/ace/High_Res_Timer.h +++ b/ACE/ace/High_Res_Timer.h @@ -29,7 +29,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * * @brief A high resolution timer class wrapper that encapsulates * OS-specific high-resolution timers, such as those found on - * Solaris, AIX, Win32/Pentium, and VxWorks. + * Win32/Pentium, and VxWorks. * * Most of the member functions don't return values. The only * reason that one would fail is if high-resolution time isn't @@ -58,9 +58,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * This is probably not a problem profiling code, but could be * on if the high resolution timer class is used to initiate * actions after a "long" timeout. - * On Solaris, a scale factor of 1000 should be used because its - * high-resolution timer returns nanoseconds. However, on Intel - * platforms, we use RDTSC which returns the number of clock + * On Intel platforms, we use RDTSC which returns the number of clock * ticks since system boot. For a 200MHz cpu, each clock tick * is 1/200 of a microsecond; the global_scale_factor_ should * therefore be 200 or 200000 if it's in unit/millisecond. @@ -75,8 +73,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * you query for your @c timer.stop() value might not be the one * you queried for @c timer.start(). Its not clear how much * divergence there would be, if any. - * This issue is not mentioned in the Solaris 2.5.1 gethrtime - * man page. * A RDTSC NOTE: RDTSC is the Intel Pentium read-time stamp counter * and is actualy a 64 bit clock cycle counter, which is increased * with every cycle. It has a low overhead and can be read within @@ -109,7 +105,7 @@ public: * global_scale_factor_. This allows applications to set the scale * factor just once for all High_Res_Timers. Check * High_Res_Timer.cpp for the default global_scale_factors for - * several platforms. For many platforms (e.g., Solaris), the + * several platforms. For many platforms the * global_scale_factor_ is set to 1000 so that <scale_factor> need * not be set. Careful, a <scale_factor> of 0 will cause division * by zero exceptions. diff --git a/ACE/ace/IOStream.h b/ACE/ace/IOStream.h index ca5e831bc9b..38ebe090593 100644 --- a/ACE/ace/IOStream.h +++ b/ACE/ace/IOStream.h @@ -343,16 +343,6 @@ typedef ostream& (*__omanip_)(ostream&); // operators. Notice how the <ipfx> and <isfx> functions are used. #define GET_SIG(MT,DT) inline virtual MT& operator>> (DT v) -# if (defined (__SUNPRO_CC) && __SUNPRO_CC > 0x510) -#define GET_CODE { \ - if (ipfx (0)) \ - { \ - (*((istream*)this)) >> (v); \ - } \ - isfx (); \ - return *this; \ - } -# else #define GET_CODE { \ if (ipfx (0)) \ { \ @@ -361,7 +351,6 @@ typedef ostream& (*__omanip_)(ostream&); isfx (); \ return *this; \ } -# endif #define GET_PROT(MT,DT,CODE) GET_SIG(MT,DT) CODE #define GET_FUNC(MT,DT) GET_PROT(MT,DT,GET_CODE) @@ -370,16 +359,6 @@ typedef ostream& (*__omanip_)(ostream&); // operators. Notice how the <opfx> and <osfx> functions are used. #define PUT_SIG(MT,DT) inline virtual MT& operator<< (DT v) -# if (defined (__SUNPRO_CC) && __SUNPRO_CC > 0x510) -#define PUT_CODE { \ - if (opfx ()) \ - { \ - (*((ostream *) this)) << (v); \ - } \ - osfx (); \ - return *this; \ - } -# else #define PUT_CODE { \ if (opfx ()) \ { \ @@ -388,7 +367,6 @@ typedef ostream& (*__omanip_)(ostream&); osfx (); \ return *this; \ } -# endif #define PUT_PROT(MT,DT,CODE) PUT_SIG(MT,DT) CODE #define PUT_FUNC(MT,DT) PUT_PROT(MT,DT,PUT_CODE) @@ -442,10 +420,6 @@ typedef ostream& (*__omanip_)(ostream&); inline virtual MT& operator<<(__omanip_ func) CODE2 \ inline virtual MT& operator<<(__manip_ func) CODE2 -# if defined (ACE_LACKS_SIGNED_CHAR) - #define GET_FUNC_SET1(MT,CODE,CODE2) GET_FUNC_SET0(MT,CODE,CODE2) - #define PUT_FUNC_SET1(MT,CODE,CODE2) PUT_FUNC_SET0(MT,CODE,CODE2) -# else #define GET_FUNC_SET1(MT,CODE,CODE2) \ GET_PROT(MT,signed char &,CODE) \ GET_PROT(MT,signed char *,CODE) \ @@ -455,7 +429,6 @@ typedef ostream& (*__omanip_)(ostream&); PUT_FUNC(MT,signed char) \ PUT_FUNC(MT,const signed char *) \ PUT_FUNC_SET0(MT,CODE,CODE2) -# endif /* ACE_LACKS_SIGNED_CHAR */ #define GET_MANIP_CODE { if (ipfx ()) { (*func) (*this); } isfx (); return *this; } #define PUT_MANIP_CODE { if (opfx ()) { (*func) (*this); } osfx (); return *this; } diff --git a/ACE/ace/IOStream_T.h b/ACE/ace/IOStream_T.h index c65a42a18b5..0ac556978a5 100644 --- a/ACE/ace/IOStream_T.h +++ b/ACE/ace/IOStream_T.h @@ -266,18 +266,11 @@ protected: ACE_END_VERSIONED_NAMESPACE_DECL -# if defined (__ACE_INLINE__) -# include "ace/IOStream_T.inl" -# endif /* __ACE_INLINE__ */ - -# if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -# include "ace/IOStream_T.cpp" -# endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -# if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -# pragma implementation ("IOStream_T.cpp") -# endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ -#endif /* ACE_LACKS_ACE_IOSTREAM */ +#if defined (__ACE_INLINE__) +# include "ace/IOStream_T.inl" +#endif /* __ACE_INLINE__ */ + +#include "ace/IOStream_T.cpp" #include /**/ "ace/post.h" #endif /* ACE_IOSTREAM_T_H */ diff --git a/ACE/ace/Intrusive_Auto_Ptr.h b/ACE/ace/Intrusive_Auto_Ptr.h index 7757e6d5c0c..88357cf0215 100644 --- a/ACE/ace/Intrusive_Auto_Ptr.h +++ b/ACE/ace/Intrusive_Auto_Ptr.h @@ -140,13 +140,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Intrusive_Auto_Ptr.inl" #endif /* __ACE_INLINE __ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Intrusive_Auto_Ptr.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Intrusive_Auto_Ptr.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Intrusive_List.h b/ACE/ace/Intrusive_List.h index c5017cd730c..58a820a840b 100644 --- a/ACE/ace/Intrusive_List.h +++ b/ACE/ace/Intrusive_List.h @@ -124,13 +124,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Intrusive_List.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Intrusive_List.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Intrusive_List.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_INTRUSIVE_LIST_H */ diff --git a/ACE/ace/Intrusive_List_Node.h b/ACE/ace/Intrusive_List_Node.h index 8fe5c40b205..73506d48ba7 100644 --- a/ACE/ace/Intrusive_List_Node.h +++ b/ACE/ace/Intrusive_List_Node.h @@ -70,13 +70,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Intrusive_List_Node.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Intrusive_List_Node.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Intrusive_List_Node.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_INTRUSIVE_LIST_NODE_H */ diff --git a/ACE/ace/LOCK_SOCK_Acceptor.h b/ACE/ace/LOCK_SOCK_Acceptor.h index b4e099ba285..07d3a46210a 100644 --- a/ACE/ace/LOCK_SOCK_Acceptor.h +++ b/ACE/ace/LOCK_SOCK_Acceptor.h @@ -26,11 +26,11 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * * @brief Specialize ACE_SOCK_Acceptor to lock around <accept>; * - * This class is necessary since some OS platforms (e.g., - * Solaris 2.5) do not allow multiple threads/processes to - * simultaneously call <accept> on the same listen-mode - * port/socket. Thus, we need to protect against multiple - * concurrent accesses by using the appropriate type of lock. + * This class is necessary since some OS platforms do not allow + * multiple threads/processes to simultaneously call @c accept + * on the same listen-mode port/socket. Thus, we need to + * protect against multiple concurrent accesses by using + * the appropriate type of lock. */ template <class ACE_LOCK> class ACE_LOCK_SOCK_Acceptor : public ACE_SOCK_Acceptor @@ -53,13 +53,7 @@ protected: ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/LOCK_SOCK_Acceptor.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("LOCK_SOCK_Acceptor.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_LOCK_SOCK_ACCEPTOR_H */ diff --git a/ACE/ace/Lib_Find.cpp b/ACE/ace/Lib_Find.cpp index a5918e499d9..085ed0b938e 100644 --- a/ACE/ace/Lib_Find.cpp +++ b/ACE/ace/Lib_Find.cpp @@ -16,101 +16,6 @@ # include "ace/OS_NS_strings.h" #endif /* ACE_WIN32 */ -#if defined (ACE_OPENVMS) -#include "ace/RB_Tree.h" -#include "ace/Thread_Mutex.h" -#include "ace/Singleton.h" - -#include /**/ "descrip.h" -#include /**/ "chfdef.h" -#include /**/ "stsdef.h" -#include /**/ "libdef.h" - -extern "C" int LIB$FIND_IMAGE_SYMBOL(...); - -/** - * @internal - * - * Implements a class to register symbols and addresses for use with DLL - * symbol retrieval. - * - * OpenVMS restricts symbol length to 31 characters encoding any symbols - * longer than that. In these cases dlsym() only works with the encoded - * names. - * This creates serious problems for the service configurator framework - * where the factory method names often exceed 31 chars and where loading - * is based on retrieval of method pointers using the *full* name. - * For OpenVMS we therefor added this singleton class and the - * ACE_Dynamic_Svc_Registrar class which registers full names and function - * pointers with this singleton at the time the static ACE_Dynamic_Svc_Registrar - * object is created in a (service) DLL. - * By forcing the DLL to load using a common symbol ("NULL") we trigger static - * object creation *before* the full names are referenced. - * Symbol references will be resolved as follows on OpenVMS: - * - first try directly from DLL using the RTL dlsym() function and if that fails; - * - try to find symbol in singleton registry. - */ -class ACE_LD_Symbol_Registry -{ -public: - typedef ACE_RB_Tree<const ACE_TCHAR*, - void*, - ACE_Less_Than<const ACE_TCHAR*>, - ACE_Thread_Mutex> - TREE; - - void register_symbol (const ACE_TCHAR* symname, void* symaddr); - - void* find_symbol (const ACE_TCHAR* symname); - - ACE_LD_Symbol_Registry () = default; - -private: - TREE symbol_registry_; -}; - -void -ACE_LD_Symbol_Registry::register_symbol (const ACE_TCHAR* symname, - void* symaddr) -{ - int const result = symbol_registry_.bind (symname, symaddr); - if (result == 1) - { - ACELIB_DEBUG((LM_INFO, ACE_TEXT ("ACE_LD_Symbol_Registry:") - ACE_TEXT (" duplicate symbol %s registered\n"), - ACE_TEXT_ALWAYS_CHAR (symname))); - } - else if (result == -1) - { - ACELIB_ERROR((LM_ERROR, ACE_TEXT ("ACE_LD_Symbol_Registry:") - ACE_TEXT (" failed to register symbol %s\n"), - ACE_TEXT_ALWAYS_CHAR (symname))); - } -} - -void* -ACE_LD_Symbol_Registry::find_symbol (const ACE_TCHAR* symname) -{ - void* symaddr = 0; - int const result = symbol_registry_.find (symname, symaddr); - - return (result == 0 ? symaddr : 0); -} - -/// Declare a process wide singleton -ACE_SINGLETON_DECLARE (ACE_Singleton, - ACE_LD_Symbol_Registry, - ACE_Thread_Mutex) - -typedef ACE_Singleton<ACE_LD_Symbol_Registry, ACE_Thread_Mutex> - ACE_LD_SYMBOL_REGISTRY; - -ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, ACE_LD_Symbol_Registry, ACE_SYNCH_MUTEX); - - -#endif - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL int @@ -119,86 +24,15 @@ ACE::ldfind (const ACE_TCHAR* filename, size_t maxpathnamelen) { ACE_TRACE ("ACE::ldfind"); -#if defined (ACE_OPENVMS) - if (ACE_OS::strlen (filename) >= maxpathnamelen) - { - errno = ENOMEM; - return -1; - } - - dsc$descriptor nameDsc; - nameDsc.dsc$b_class = DSC$K_CLASS_S; - nameDsc.dsc$b_dtype = DSC$K_DTYPE_T; - nameDsc.dsc$w_length = ACE_OS::strlen (filename); - nameDsc.dsc$a_pointer = (char*)filename; - - char symbol[] = "NULL"; - dsc$descriptor symbolDsc; - symbolDsc.dsc$b_class = DSC$K_CLASS_S; - symbolDsc.dsc$b_dtype = DSC$K_DTYPE_T; - symbolDsc.dsc$w_length = ACE_OS::strlen (symbol); - symbolDsc.dsc$a_pointer = symbol; - - int symbolValue; - int result; - try - { - result = LIB$FIND_IMAGE_SYMBOL (&nameDsc, &symbolDsc, &symbolValue, 0, 0); - } - catch (chf$signal_array &sig) - { - result = sig.chf$l_sig_name; - } - - int severity = result & STS$M_SEVERITY; - int conditionId = result & STS$M_COND_ID; - if (severity == STS$K_SUCCESS || severity == STS$K_WARNING || severity == STS$K_INFO || - (severity == STS$K_ERROR && conditionId == (LIB$_KEYNOTFOU & STS$M_COND_ID))) - { - ACE_OS::strcpy (pathname, filename); - return 0; - } - - if (ACE_OS::strlen (filename) + ACE_OS::strlen (ACE_DLL_PREFIX) >= maxpathnamelen) - { - errno = ENOMEM; - return -1; - } - - - ACE_OS::strcpy (pathname, ACE_DLL_PREFIX); - ACE_OS::strcat (pathname, filename); - nameDsc.dsc$w_length = ACE_OS::strlen (pathname); - nameDsc.dsc$a_pointer = pathname; - try - { - result = LIB$FIND_IMAGE_SYMBOL (&nameDsc, &symbolDsc, &symbolValue, 0, 0); - } - catch (chf$signal_array &sig) - { - result = sig.chf$l_sig_name; - } - - severity = result & STS$M_SEVERITY; - conditionId = result & STS$M_COND_ID; - if (severity == STS$K_SUCCESS || severity == STS$K_WARNING || severity == STS$K_INFO || - (severity == STS$K_ERROR && conditionId == (LIB$_KEYNOTFOU & STS$M_COND_ID))) - { - return 0; - } - errno = ENOENT; - return -1; -#endif /* ACE_OPENVMS */ -#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && \ - !defined (ACE_HAS_PHARLAP) +#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP) ACE_TCHAR expanded_filename[MAXPATHLEN]; if (ACE_TEXT_ExpandEnvironmentStrings (filename, expanded_filename, sizeof expanded_filename / sizeof (ACE_TCHAR))) filename = expanded_filename; -#endif /* ACE_WIN32 && !ACE_HAS_WINCE && !ACE_HAS_PHARLAP */ +#endif /* ACE_WIN32 && !ACE_HAS_PHARLAP */ ACE_TCHAR tempcopy[MAXPATHLEN + 1]; ACE_TCHAR searchpathname[MAXPATHLEN + 1]; @@ -338,7 +172,7 @@ ACE::ldfind (const ACE_TCHAR* filename, // OS platform). else { -#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) +#if defined (ACE_WIN32) ACE_TCHAR *file_component = 0; DWORD pathlen = ACE_TEXT_SearchPath (0, @@ -389,29 +223,6 @@ ACE::ldfind (const ACE_TCHAR* filename, # endif /* ACE_WIN32 || !ACE_USES_WCHAR */ # endif /* ACE_DEFAULT_LD_SEARCH_PATH */ -#if defined (ACE_HAS_WINCE) - ACE_TCHAR *ld_path_temp = 0; - if (ld_path != 0) - { - ld_path_temp = (ACE_TCHAR *) - ACE_OS::malloc ((ACE_OS::strlen (ld_path) + 2) - * sizeof (ACE_TCHAR)); - if (ld_path_temp != 0) - { - ACE_OS::strcpy (ld_path_temp, - ACE_LD_SEARCH_PATH_SEPARATOR_STR); - - ACE_OS::strcat (ld_path_temp, ld_path); - ld_path = ld_path_temp; - } - else - { - ACE_OS::free ((void *) ld_path_temp); - ld_path = ld_path_temp = 0; - } - } -#endif /* ACE_HAS_WINCE */ - if (ld_path != 0 && (ld_path = ACE_OS::strdup (ld_path)) != 0) { @@ -492,10 +303,6 @@ ACE::ldfind (const ACE_TCHAR* filename, nextholder); } -#if defined (ACE_HAS_WINCE) - if (ld_path_temp != 0) - ACE_OS::free (ld_path_temp); -#endif /* ACE_HAS_WINCE */ #if defined (ACE_HAS_ALLOC_HOOKS) ACE_Allocator::instance()->free ((void *) ld_path); #else @@ -506,7 +313,7 @@ ACE::ldfind (const ACE_TCHAR* filename, #endif /* ACE_LD_DECORATOR_STR && !ACE_DISABLE_DEBUG_DLL_CHECK */ return result; } -#endif /* ACE_WIN32 && !ACE_HAS_WINCE */ +#endif /* ACE_WIN32 */ } #if defined (ACE_LD_DECORATOR_STR) && !defined (ACE_DISABLE_DEBUG_DLL_CHECK) } @@ -572,29 +379,6 @@ ACE::ldname (const ACE_TCHAR *entry_point) #endif /* ACE_NEEDS_DL_UNDERSCORE */ } -#if defined (ACE_OPENVMS) -void -ACE::ldregister (const ACE_TCHAR *entry_point, - void* entry_addr) -{ - ACE_LD_SYMBOL_REGISTRY::instance ()->register_symbol (entry_point, - entry_addr); -} - -void * -ACE::ldsymbol (ACE_SHLIB_HANDLE sh, const ACE_TCHAR *entry_point) -{ - void* symaddr = ACE_OS::dlsym (sh, entry_point); - // if not found through dlsym() try registry - if (!symaddr) - { - symaddr = ACE_LD_SYMBOL_REGISTRY::instance ()->find_symbol (entry_point); - } - - return symaddr; -} -#endif - int ACE::get_temp_dir (ACE_TCHAR *buffer, size_t buffer_len) { diff --git a/ACE/ace/Lib_Find.h b/ACE/ace/Lib_Find.h index 3c72a1fc572..6496a93dc4d 100644 --- a/ACE/ace/Lib_Find.h +++ b/ACE/ace/Lib_Find.h @@ -16,9 +16,6 @@ #include /**/ "ace/config-all.h" #include /**/ "ace/ACE_export.h" #include "ace/os_include/os_stdio.h" -#if defined (ACE_OPENVMS) -# include "ace/OS_NS_dlfcn.h" -#endif ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -57,26 +54,6 @@ namespace ACE */ extern ACE_Export ACE_TCHAR *ldname (const ACE_TCHAR *entry_point); - -#if defined (ACE_OPENVMS) - /** - * Registers an @a entry_point and its address for later retrieval - * through the ACE::ldsymbol () method. - * For use in cases where the OS compiler encodes long symbolnames. - */ - extern ACE_Export void ldregister (const ACE_TCHAR *entry_point, - void* entry_addr); - - /** - * Looks up an @a entry_point address either from previously registered - * symbols or through ACE_OS::dlsym (). - * Returns 0 in case the entry_point is not found, otherwise nonzero. - * For use in cases where the OS compiler encodes long symbolnames. - */ - extern ACE_Export void *ldsymbol (ACE_SHLIB_HANDLE sh, - const ACE_TCHAR *entry_point); -#endif - /** * Returns the temporary directory including the trailing slash in * @a buffer. Returns -1 for an error or if the buffer_len is not diff --git a/ACE/ace/Local_Name_Space_T.h b/ACE/ace/Local_Name_Space_T.h index 6a65c22448e..04dc0e5acd2 100644 --- a/ACE/ace/Local_Name_Space_T.h +++ b/ACE/ace/Local_Name_Space_T.h @@ -254,13 +254,7 @@ private: ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Local_Name_Space_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Local_Name_Space_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_LOCAL_NAME_SPACE_T_H */ diff --git a/ACE/ace/Lock_Adapter_T.h b/ACE/ace/Lock_Adapter_T.h index 360f2d02479..dbc02adb6bb 100644 --- a/ACE/ace/Lock_Adapter_T.h +++ b/ACE/ace/Lock_Adapter_T.h @@ -107,13 +107,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Lock_Adapter_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Lock_Adapter_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Lock_Adapter_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_LOCK_ADAPTER_T_H */ diff --git a/ACE/ace/Log_Msg.cpp b/ACE/ace/Log_Msg.cpp index 88f584c2ed1..dd7e904b36e 100644 --- a/ACE/ace/Log_Msg.cpp +++ b/ACE/ace/Log_Msg.cpp @@ -80,11 +80,11 @@ public: }; #endif /* ACE_MT_SAFE */ -#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && !defined (ACE_HAS_PHARLAP) +#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP) # define ACE_LOG_MSG_SYSLOG_BACKEND ACE_Log_Msg_NT_Event_Log #elif defined (ACE_ANDROID) # define ACE_LOG_MSG_SYSLOG_BACKEND ACE_Log_Msg_Android_Logcat -#elif !defined (ACE_LACKS_UNIX_SYSLOG) && !defined (ACE_HAS_WINCE) +#elif !defined (ACE_LACKS_UNIX_SYSLOG) # define ACE_LOG_MSG_SYSLOG_BACKEND ACE_Log_Msg_UNIX_Syslog #endif @@ -1262,12 +1262,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, break; case 'P': // Process ID -#if defined (ACE_OPENVMS) - // Print the process id in hex on OpenVMS. - ACE_OS::strcpy (fp, ACE_TEXT ("x")); -#else ACE_OS::strcpy (fp, ACE_TEXT ("d")); -#endif if (can_check) this_len = ACE_OS::snprintf (bp, bspace, format, @@ -1400,11 +1395,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, # if defined (ACE_WIN32) // Windows uses 'c' for a wide character ACE_OS::strcpy (fp, ACE_TEXT ("c")); # else // Other platforms behave differently -# if defined (HPUX) // HP-Unix compatible - ACE_OS::strcpy (fp, ACE_TEXT ("C")); -# else // Other ACE_OS::strcpy (fp, ACE_TEXT ("lc")); -# endif /* HPUX */ # endif # else /* ACE_USES_WCHAR */ @@ -1822,9 +1813,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, { #if defined (ACE_HAS_WCHAR) wchar_t *wchar_str = va_arg (argp, wchar_t *); -# if defined (HPUX) - ACE_OS::strcpy (fp, ACE_TEXT ("S")); -# elif defined (ACE_WIN32) +# if defined (ACE_WIN32) # if defined (ACE_USES_WCHAR) ACE_OS::strcpy (fp, ACE_TEXT ("s")); # else /* ACE_USES_WCHAR */ @@ -1832,7 +1821,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, # endif /* ACE_USES_WCHAR */ # else ACE_OS::strcpy (fp, ACE_TEXT ("ls")); -# endif /* HPUX */ +# endif /* ACE_HAS_WCHAR */ if (can_check) this_len = ACE_OS::snprintf (bp, bspace, format, wchar_str ? wchar_str : ACE_TEXT_WIDE("(null)")); @@ -1858,11 +1847,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, this_len = ACE_OS::sprintf (bp, format, va_arg (argp, int)); #elif defined (ACE_USES_WCHAR) -# if defined (HPUX) - ACE_OS::strcpy (fp, ACE_TEXT ("C")); -# else ACE_OS::strcpy (fp, ACE_TEXT ("lc")); -# endif /* HPUX */ if (can_check) this_len = ACE_OS::snprintf (bp, bspace, format, va_arg (argp, wint_t)); @@ -1894,11 +1879,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, ACE_OS::strcpy (fp, ACE_TEXT ("C")); # endif /* ACE_USES_WCHAR */ #elif defined (ACE_USES_WCHAR) -# if defined (HPUX) - ACE_OS::strcpy (fp, ACE_TEXT ("C")); -# else ACE_OS::strcpy (fp, ACE_TEXT ("lc")); -# endif /* HPUX */ #else /* ACE_WIN32 */ ACE_OS::strcpy (fp, ACE_TEXT ("u")); #endif /* ACE_WIN32 */ @@ -1941,11 +1922,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, ACE_OS::strcpy (fp, ACE_TEXT ("S")); # endif /* ACE_USES_WCHAR */ #elif defined (ACE_HAS_WCHAR) -# if defined (HPUX) - ACE_OS::strcpy (fp, ACE_TEXT ("S")); -# else ACE_OS::strcpy (fp, ACE_TEXT ("ls")); -# endif /* HPUX */ #endif /* ACE_WIN32 / ACE_HAS_WCHAR */ if (can_check) this_len = ACE_OS::snprintf @@ -2518,7 +2495,7 @@ bool ACE_Log_Formatter::process_conversion () ACE_OS::strcpy (this->fp_, "ls"); return false; case 'Z': -#if (defined ACE_WIN32 && !defined ACE_USES_WCHAR) || defined HPUX +#if (defined ACE_WIN32 && !defined ACE_USES_WCHAR) ACE_OS::strcpy (this->fp_, "S"); #elif defined ACE_WIN32 ACE_OS::strcpy (this->fp_, "s"); diff --git a/ACE/ace/Log_Msg.h b/ACE/ace/Log_Msg.h index b36fc903eca..2608b6c0eb2 100644 --- a/ACE/ace/Log_Msg.h +++ b/ACE/ace/Log_Msg.h @@ -374,10 +374,6 @@ public: /// restarted. bool restart () const; - // = Notice that the following two function is equivalent to - // "void msg_ostream (HANDLE)" and "HANDLE msg_ostream ()" - // on Windows CE. There is no <iostream.h> support on CE. - /// Update the ostream without overwriting the delete_ostream_ flag. void msg_ostream (ACE_OSTREAM_TYPE *); diff --git a/ACE/ace/Log_Record.h b/ACE/ace/Log_Record.h index 0cca3bfe113..152e2940eb4 100644 --- a/ACE/ace/Log_Record.h +++ b/ACE/ace/Log_Record.h @@ -73,11 +73,11 @@ public: /// FILE if the corresponding type is enabled. int print (const ACE_TCHAR host_name[], u_long verbose_flag, -#if !defined (ACE_HAS_WINCE) && !defined (ACE_LACKS_STDERR) +#if !defined (ACE_LACKS_STDERR) FILE *fp = stderr); #else FILE *fp); -#endif /* ACE_HAS_WINCE */ +#endif /* ACE_LACKS_STDERR */ #if !defined (ACE_LACKS_IOSTREAM_TOTALLY) /// Write the contents of the logging record to the appropriate diff --git a/ACE/ace/MEM_Acceptor.h b/ACE/ace/MEM_Acceptor.h index 2ee834409cf..eebc834e5f6 100644 --- a/ACE/ace/MEM_Acceptor.h +++ b/ACE/ace/MEM_Acceptor.h @@ -24,10 +24,7 @@ #include "ace/MEM_Stream.h" #include "ace/MEM_Addr.h" - -#if !defined (ACE_HAS_WINCE) #include "ace/OS_QoS.h" -#endif // ACE_HAS_WINCE ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -151,14 +148,12 @@ protected: bool restart = true, bool reset_new_handle = false) const; -#if !defined (ACE_HAS_WINCE) int accept (ACE_SOCK_Stream &new_stream, ACE_Accept_QoS_Params qos_params, ACE_Addr *remote_addr = 0, ACE_Time_Value *timeout = 0, bool restart = true, bool reset_new_handle = false) const; -#endif // ACE_HAS_WINCE private: /// The filename prefix of the created mmap files. It should diff --git a/ACE/ace/MEM_Acceptor.inl b/ACE/ace/MEM_Acceptor.inl index 4d31ef56f20..35b2d9adaa2 100644 --- a/ACE/ace/MEM_Acceptor.inl +++ b/ACE/ace/MEM_Acceptor.inl @@ -27,7 +27,6 @@ ACE_MEM_Acceptor::accept (ACE_SOCK_Stream &new_stream, (new_stream, remote_addr, timeout, restart, reset_new_handle); } -#if !defined (ACE_HAS_WINCE) ACE_INLINE int ACE_MEM_Acceptor::accept (ACE_SOCK_Stream &new_stream, ACE_Accept_QoS_Params qos_params, @@ -39,7 +38,6 @@ ACE_MEM_Acceptor::accept (ACE_SOCK_Stream &new_stream, return this->ACE_SOCK_Acceptor::accept (new_stream, qos_params, remote_addr, timeout, restart, reset_new_handle); } -#endif // ACE_HAS_WINCE ACE_INLINE int ACE_MEM_Acceptor::get_local_addr (ACE_MEM_Addr &sap) const diff --git a/ACE/ace/MMAP_Memory_Pool.cpp b/ACE/ace/MMAP_Memory_Pool.cpp index ea1c432895e..a2689104e79 100644 --- a/ACE/ace/MMAP_Memory_Pool.cpp +++ b/ACE/ace/MMAP_Memory_Pool.cpp @@ -255,10 +255,6 @@ ACE_MMAP_Memory_Pool::commit_backing_store_name (size_t rounded_bytes, -1); } -#if defined (ACE_OPENVMS) - ::fsync(this->mmap_.handle()); -#endif - // Increment by one to put us at the beginning of the next chunk... ++map_size; #endif /* __Lynx__ */ @@ -294,11 +290,7 @@ ACE_MMAP_Memory_Pool::map_file (size_t map_size) 0, this->sa_) == -1 || (this->base_addr_ != 0 -#ifdef ACE_HAS_WINCE - && this->mmap_.addr () == 0)) // WinCE does not allow users to specify alloc addr. -#else && this->mmap_.addr () != this->base_addr_)) -#endif // ACE_HAS_WINCE { #if 0 ACELIB_ERROR ((LM_ERROR, diff --git a/ACE/ace/Malloc_T.cpp b/ACE/ace/Malloc_T.cpp index c336a0d8fde..23f2558de3a 100644 --- a/ACE/ace/Malloc_T.cpp +++ b/ACE/ace/Malloc_T.cpp @@ -476,17 +476,7 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::open () 0, this->cb_ptr_); - // Why aC++ in 64-bit mode can't grok this, I have no - // idea... but it ends up with an extra bit set which makes - // size_ really big without this hack. -#if defined (__hpux) && defined (__LP64__) - size_t hpux11_hack = (rounded_bytes - sizeof *this->cb_ptr_) - / sizeof (MALLOC_HEADER); - p->size_ = hpux11_hack; -#else - p->size_ = (rounded_bytes - sizeof *this->cb_ptr_) - / sizeof (MALLOC_HEADER); -#endif /* (__hpux) && defined (__LP64__) */ + p->size_ = (rounded_bytes - sizeof *this->cb_ptr_) / sizeof (MALLOC_HEADER); ACE_MALLOC_STATS (++this->cb_ptr_->malloc_stats_.nchunks_); ACE_MALLOC_STATS (++this->cb_ptr_->malloc_stats_.nblocks_); diff --git a/ACE/ace/Malloc_T.h b/ACE/ace/Malloc_T.h index c519caff0ed..273bb013dcb 100644 --- a/ACE/ace/Malloc_T.h +++ b/ACE/ace/Malloc_T.h @@ -881,13 +881,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Malloc_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Malloc_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Malloc_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_MALLOC_H */ diff --git a/ACE/ace/Managed_Object.h b/ACE/ace/Managed_Object.h index c038a617167..d18863842af 100644 --- a/ACE/ace/Managed_Object.h +++ b/ACE/ace/Managed_Object.h @@ -100,6 +100,9 @@ template <class TYPE> class ACE_Managed_Object { public: + /// Get the preallocated object identified by "id". Returns a + /// pointer to the object. Beware: no error indication is provided, + /// because it can _only_ be used for accessing preallocated objects. static TYPE *get_preallocated_object (ACE_Object_Manager::Preallocated_Object identifier) { // The preallocated objects are in a separate, "read-only" array so @@ -112,12 +115,9 @@ public: return &((ACE_Cleanup_Adapter<TYPE> *) ACE_Object_Manager::preallocated_object[identifier])->object (); } - // Get the preallocated object identified by "id". Returns a - // pointer to the object. Beware: no error indication is provided, - // because it can _only_ be used for accessing preallocated objects. - // @note The function definition is inlined here so that it compiles - // on AIX 4.1 w/xlC v. 3.01. - + /// Get the preallocated array identified by "id". Returns a + /// pointer to the array. Beware: no error indication is provided, + /// because it can _only_ be used for accessing preallocated arrays. static TYPE *get_preallocated_array (ACE_Object_Manager::Preallocated_Array identifier) { // The preallocated array are in a separate, "read-only" array so @@ -130,11 +130,6 @@ public: return &((ACE_Cleanup_Adapter<TYPE> *) ACE_Object_Manager::preallocated_array[identifier])->object (); } - // Get the preallocated array identified by "id". Returns a - // pointer to the array. Beware: no error indication is provided, - // because it can _only_ be used for accessing preallocated arrays. - // @note The function definition is inlined here so that it compiles - // on AIX 4.1 w/xlC v. 3.01. protected: // Disallow instantiation of this class. @@ -151,13 +146,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Managed_Object.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Managed_Object.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Managed_Object.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Manual_Event.h b/ACE/ace/Manual_Event.h index e3e8e14e38c..b4754c49194 100644 --- a/ACE/ace/Manual_Event.h +++ b/ACE/ace/Manual_Event.h @@ -88,13 +88,7 @@ public: ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Manual_Event.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Manual_Event.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_MANUAL_EVENT_H */ diff --git a/ACE/ace/Map_Manager.h b/ACE/ace/Map_Manager.h index 0fa8735c88e..0c887a412a9 100644 --- a/ACE/ace/Map_Manager.h +++ b/ACE/ace/Map_Manager.h @@ -696,13 +696,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Map_Manager.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Map_Manager.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Map_Manager.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Map_T.h b/ACE/ace/Map_T.h index 4773818d113..3e6d29fa145 100644 --- a/ACE/ace/Map_T.h +++ b/ACE/ace/Map_T.h @@ -1552,13 +1552,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Map_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Map_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Map_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_MAP_T_H */ diff --git a/ACE/ace/Mem_Map.cpp b/ACE/ace/Mem_Map.cpp index 47fa9b2b3d2..e44677922f0 100644 --- a/ACE/ace/Mem_Map.cpp +++ b/ACE/ace/Mem_Map.cpp @@ -188,8 +188,6 @@ ACE_Mem_Map::open (const ACE_TCHAR *file_name, #if defined (INTEGRITY) || defined (__QNXNTO__) || defined (ACE_VXWORKS) this->handle_ = ACE_OS::shm_open (file_name, flags, perms, sa); -#elif defined (ACE_OPENVMS) - ACE_OSCALL (::open (file_name, flags, perms, "shr=get,put,upd"), ACE_HANDLE, this->handle_); #else this->handle_ = ACE_OS::open (file_name, flags, perms, sa); #endif /* INTEGRITY */ diff --git a/ACE/ace/Message_Block_T.h b/ACE/ace/Message_Block_T.h index dc7f3e0ed50..0265992931c 100644 --- a/ACE/ace/Message_Block_T.h +++ b/ACE/ace/Message_Block_T.h @@ -73,13 +73,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Message_Block_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Message_Block_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Message_Block_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_MESSAGE_BLOCK_T_H */ diff --git a/ACE/ace/Message_Queue_T.h b/ACE/ace/Message_Queue_T.h index 5c9473fdb78..f4be9145dde 100644 --- a/ACE/ace/Message_Queue_T.h +++ b/ACE/ace/Message_Queue_T.h @@ -1566,13 +1566,7 @@ protected: ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Message_Queue_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Message_Queue_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Metrics_Cache_T.h b/ACE/ace/Metrics_Cache_T.h index 46ba0333fe2..9488c81b7ae 100644 --- a/ACE/ace/Metrics_Cache_T.h +++ b/ACE/ace/Metrics_Cache_T.h @@ -222,13 +222,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Metrics_Cache_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Metrics_Cache_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Metrics_Cache_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* defined (ACE_COMPILE_TIMEPROBES) */ diff --git a/ACE/ace/Module.h b/ACE/ace/Module.h index 881d4076616..bb5f31578d2 100644 --- a/ACE/ace/Module.h +++ b/ACE/ace/Module.h @@ -201,13 +201,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Module.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Module.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Module.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Monitor_Control/Bytes_Received_Monitor.cpp b/ACE/ace/Monitor_Control/Bytes_Received_Monitor.cpp index 9ed53f08b30..9524a483c64 100644 --- a/ACE/ace/Monitor_Control/Bytes_Received_Monitor.cpp +++ b/ACE/ace/Monitor_Control/Bytes_Received_Monitor.cpp @@ -16,12 +16,10 @@ namespace ACE #if defined (ACE_HAS_WIN32_PDH) , Windows_Multi_Instance_Monitor ( ACE_TEXT ("\\Network Interface(*)\\Bytes Received/sec")) -#elif defined (ACE_LINUX) || defined (AIX) +#elif defined (ACE_LINUX) , Linux_Network_Interface_Monitor ( " %*[^:]: %lu %*u %*u %*u %*u %*u %*u %*u %*u %*u") /// Scan format for /proc/net/dev -#elif defined (ACE_HAS_KSTAT) - , Solaris_Network_Interface_Monitor (ACE_TEXT ("rbytes")) #elif defined (__NetBSD__) || defined (__OpenBSD__) , BSD_Network_Interface_Monitor (ACE_TEXT ("ibytes")) #elif defined (__FreeBSD__) || defined (__Lynx__) diff --git a/ACE/ace/Monitor_Control/Bytes_Received_Monitor.h b/ACE/ace/Monitor_Control/Bytes_Received_Monitor.h index cecc79da264..de3158513d3 100644 --- a/ACE/ace/Monitor_Control/Bytes_Received_Monitor.h +++ b/ACE/ace/Monitor_Control/Bytes_Received_Monitor.h @@ -23,10 +23,8 @@ #if defined (ACE_HAS_PDH_H) && !defined (ACE_LACKS_PDH_H) #include "ace/Monitor_Control/Windows_Multi_Instance_Monitor.h" -#elif defined (ACE_LINUX) || defined (AIX) +#elif defined (ACE_LINUX) #include "ace/Monitor_Control/Linux_Network_Interface_Monitor.h" -#elif defined (ACE_HAS_KSTAT) -#include "ace/Monitor_Control/Solaris_Network_Interface_Monitor.h" #elif defined (__FreeBSD__) || defined (__Lynx__) #include "ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.h" #elif defined (__NetBSD__) || defined (__OpenBSD__) @@ -52,10 +50,8 @@ namespace ACE : public Monitor_Base #if defined (ACE_HAS_WIN32_PDH) , public Windows_Multi_Instance_Monitor -#elif defined (ACE_LINUX) || defined (AIX) +#elif defined (ACE_LINUX) , public Linux_Network_Interface_Monitor -#elif defined (ACE_HAS_KSTAT) - , public Solaris_Network_Interface_Monitor #elif defined (__NetBSD__) || defined (__OpenBSD__) , public BSD_Network_Interface_Monitor #elif defined (__FreeBSD__) || defined (__Lynx__) diff --git a/ACE/ace/Monitor_Control/Bytes_Sent_Monitor.cpp b/ACE/ace/Monitor_Control/Bytes_Sent_Monitor.cpp index 98a05b365ed..b196f2f01f5 100644 --- a/ACE/ace/Monitor_Control/Bytes_Sent_Monitor.cpp +++ b/ACE/ace/Monitor_Control/Bytes_Sent_Monitor.cpp @@ -16,12 +16,10 @@ namespace ACE #if defined (ACE_HAS_WIN32_PDH) , Windows_Multi_Instance_Monitor ( ACE_TEXT ("\\Network Interface(*)\\Bytes Sent/sec")) -#elif defined (ACE_LINUX) || defined (AIX) +#elif defined (ACE_LINUX) , Linux_Network_Interface_Monitor ( " %*[^:]: %*u %*u %*u %*u %*u %*u %*u %*u %lu %*u") /// Scan format for /proc/net/dev -#elif defined (ACE_HAS_KSTAT) - , Solaris_Network_Interface_Monitor (ACE_TEXT ("obytes")) #elif defined (__FreeBSD__) || defined (__Lynx__) , FreeBSD_Network_Interface_Monitor (ACE_TEXT ("obytes")) #elif defined (__NetBSD__) || defined (__OpenBSD__) diff --git a/ACE/ace/Monitor_Control/Bytes_Sent_Monitor.h b/ACE/ace/Monitor_Control/Bytes_Sent_Monitor.h index 132b6d74004..8672d6749bf 100644 --- a/ACE/ace/Monitor_Control/Bytes_Sent_Monitor.h +++ b/ACE/ace/Monitor_Control/Bytes_Sent_Monitor.h @@ -23,10 +23,8 @@ #if defined (ACE_HAS_PDH_H) && !defined (ACE_LACKS_PDH_H) #include "ace/Monitor_Control/Windows_Multi_Instance_Monitor.h" -#elif defined (ACE_LINUX) || defined (AIX) +#elif defined (ACE_LINUX) #include "ace/Monitor_Control/Linux_Network_Interface_Monitor.h" -#elif defined (ACE_HAS_KSTAT) -#include "ace/Monitor_Control/Solaris_Network_Interface_Monitor.h" #elif defined (__FreeBSD__) || defined (__Lynx__) #include "ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.h" #elif defined (__NetBSD__) || defined (__OpenBSD__) @@ -52,10 +50,8 @@ namespace ACE : public Monitor_Base #if defined (ACE_HAS_WIN32_PDH) , public Windows_Multi_Instance_Monitor -#elif defined (ACE_LINUX) || defined (AIX) +#elif defined (ACE_LINUX) , public Linux_Network_Interface_Monitor -#elif defined (ACE_HAS_KSTAT) - , public Solaris_Network_Interface_Monitor #elif defined (__NetBSD__) || defined (__OpenBSD__) , public BSD_Network_Interface_Monitor #elif defined (__FreeBSD__) || defined (__Lynx__) diff --git a/ACE/ace/Monitor_Control/CPU_Load_Monitor.cpp b/ACE/ace/Monitor_Control/CPU_Load_Monitor.cpp index 60ca87f76c4..af3bfe97163 100644 --- a/ACE/ace/Monitor_Control/CPU_Load_Monitor.cpp +++ b/ACE/ace/Monitor_Control/CPU_Load_Monitor.cpp @@ -2,10 +2,6 @@ #if defined (ACE_HAS_MONITOR_FRAMEWORK) && (ACE_HAS_MONITOR_FRAMEWORK == 1) -#if defined (ACE_HAS_KSTAT) -#include <sys/sysinfo.h> -#endif - #if defined (ACE_LINUX) #include "ace/OS_NS_stdio.h" #endif @@ -27,7 +23,7 @@ namespace ACE #if defined (ACE_HAS_WIN32_PDH) , Windows_Monitor (ACE_TEXT("\\Processor(_Total)\\% Processor Time")) #endif -#if defined (ACE_LINUX) || defined (ACE_HAS_KSTAT) +#if defined (ACE_LINUX) , user_ (0) , wait_ (0) , kernel_ (0) @@ -37,10 +33,6 @@ namespace ACE #endif #if defined (ACE_LINUX) , file_ptr_ (0) -#elif defined (ACE_HAS_KSTAT) - , kstats_ (0) - , kstat_ (0) - , kstat_id_ (0) #endif { this->init (); @@ -58,7 +50,7 @@ namespace ACE this->access_kstats (&this->idle_); #endif -#if defined (ACE_LINUX) || defined (ACE_HAS_KSTAT) +#if defined (ACE_LINUX) double delta_idle = this->idle_ - this->prev_idle_; double total = this->user_ + this->wait_ + this->kernel_ + this->idle_; @@ -109,12 +101,6 @@ namespace ACE this->prev_total_ = this->user_ + this->wait_ + this->kernel_ + this->prev_idle_; -#elif defined (ACE_HAS_KSTAT) - /// Stored similarly to Linux, in a system file. - this->access_kstats (&this->prev_idle_); - - this->prev_total_ = - this->user_ + this->wait_ + this->kernel_ + this->prev_idle_; #endif } @@ -160,93 +146,6 @@ namespace ACE ACE_OS::fclose (this->file_ptr_); } #endif - -#if defined (ACE_HAS_KSTAT) - void - CPU_Load_Monitor::access_kstats (unsigned long *which_idle) - { - this->kstats_ = kstat_open (); - - if (this->kstats_ == 0) - { - ACELIB_ERROR ((LM_ERROR, - ACE_TEXT ("opening kstats file failed\n"))); - return; - } - - this->kstat_id_ = this->kstats_->kc_chain_id; - - while (true) - { - this->kernel_ = 0UL; - this->wait_ = 0UL; - this->user_ = 0UL; - (*which_idle) = 0UL; - - /// Unlike Linux's "/proc/stat", there is no entry for total CPU - /// stats, so we have to sum them manually. - for (this->kstat_ = this->kstats_->kc_chain; - this->kstat_ != 0; - this->kstat_ = this->kstat_->ks_next) - { - int result = ACE_OS::strncmp (this->kstat_->ks_name, - "cpu_stat", - ACE_OS::strlen ("cpu_stat")); - - if (result == 0) - { - /// Because the kstat chain can change dynamically, - /// watch the chain ID and restart the walk if the ID - /// differs from what we saw during the walk. The restart - /// is done by breaking from the cycle with kstat_ not 0. - - kid_t kstat_id = kstat_read (this->kstats_, this->kstat_, 0); - - if (kstat_id != this->kstat_id_) - { - break; - } - - cpu_stat_t &kstat_cpu = - *((cpu_stat_t *) this->kstat_->ks_data); - - this->kernel_ += kstat_cpu.cpu_sysinfo.cpu[CPU_KERNEL]; - this->wait_ += kstat_cpu.cpu_sysinfo.cpu[CPU_WAIT]; - this->user_ += kstat_cpu.cpu_sysinfo.cpu[CPU_USER]; - (*which_idle) += kstat_cpu.cpu_sysinfo.cpu[CPU_IDLE]; - } - } - - if (this->kstat_ != 0) - { - /// The ID changed underneath us, so get the new one and - /// start again. - this->kstat_id_ = kstat_chain_update (this->kstats_); - - if (! this->kstat_id_ > 0) - { - ACELIB_ERROR ((LM_ERROR, - ACE_TEXT ("kstat chain update ") - ACE_TEXT ("returned null id\n"))); - return; - } - } - else - { - /// Clean run, exit the WHILE loop. - break; - } - } - - int status = kstat_close (this->kstats_); - - if (status != 0) - { - ACELIB_ERROR ((LM_ERROR, - ACE_TEXT ("closing kstats file failed\n"))); - } - } -#endif } } diff --git a/ACE/ace/Monitor_Control/CPU_Load_Monitor.h b/ACE/ace/Monitor_Control/CPU_Load_Monitor.h index 037cb5d19b2..f286478039b 100644 --- a/ACE/ace/Monitor_Control/CPU_Load_Monitor.h +++ b/ACE/ace/Monitor_Control/CPU_Load_Monitor.h @@ -23,8 +23,6 @@ #if defined (ACE_HAS_PDH_H) && !defined (ACE_LACKS_PDH_H) #include "ace/Monitor_Control/Windows_Monitor.h" -#elif defined (ACE_HAS_KSTAT) -#include "ace/os_include/os_kstat.h" #endif #include "ace/Monitor_Control/Monitor_Control_export.h" @@ -67,15 +65,11 @@ namespace ACE void access_proc_stat (unsigned long *which_idle); #endif -#if defined (ACE_HAS_KSTAT) - void access_kstats (unsigned long *which_idle); -#endif - private: static const char* default_name_; - /// Common to Linux and Solaris implementations. -#if defined (ACE_LINUX) || defined (ACE_HAS_KSTAT) + /// Linux implementation +#if defined (ACE_LINUX) unsigned long user_; unsigned long wait_; unsigned long kernel_; @@ -86,10 +80,6 @@ namespace ACE #if defined (ACE_LINUX) FILE *file_ptr_; char buf_[1024]; -#elif defined (ACE_HAS_KSTAT) - kstat_ctl_t *kstats_; - kstat_t *kstat_; - kid_t kstat_id_; #endif }; } diff --git a/ACE/ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp b/ACE/ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp index b0534ca00be..1ba3229d9e7 100644 --- a/ACE/ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp +++ b/ACE/ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp @@ -1,6 +1,6 @@ #include "ace/Monitor_Control/Linux_Network_Interface_Monitor.h" -#if defined (ACE_LINUX) || defined (AIX) +#if defined (ACE_LINUX) #include "ace/Log_Category.h" #include "ace/OS_NS_stdio.h" @@ -119,4 +119,4 @@ namespace ACE ACE_END_VERSIONED_NAMESPACE_DECL -#endif /* defined (ACE_LINUX) || defined (AIX) */ +#endif /* defined (ACE_LINUX) */ diff --git a/ACE/ace/Monitor_Control/Linux_Network_Interface_Monitor.h b/ACE/ace/Monitor_Control/Linux_Network_Interface_Monitor.h index 5622c7138f3..e60e8c5fcad 100644 --- a/ACE/ace/Monitor_Control/Linux_Network_Interface_Monitor.h +++ b/ACE/ace/Monitor_Control/Linux_Network_Interface_Monitor.h @@ -21,7 +21,7 @@ #include "ace/Monitor_Control/Monitor_Control_export.h" -#if defined (ACE_LINUX) || defined (AIX) +#if defined (ACE_LINUX) ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -67,7 +67,7 @@ namespace ACE ACE_END_VERSIONED_NAMESPACE_DECL -#endif /* defined (ACE_LINUX) || defined (AIX) */ +#endif /* defined (ACE_LINUX) */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Monitor_Control/Memory_Usage_Monitor.cpp b/ACE/ace/Monitor_Control/Memory_Usage_Monitor.cpp index 49593fee95c..ab288a05dfa 100644 --- a/ACE/ace/Monitor_Control/Memory_Usage_Monitor.cpp +++ b/ACE/ace/Monitor_Control/Memory_Usage_Monitor.cpp @@ -1,7 +1,3 @@ -#if defined (ACE_HAS_KSTAT) -#include <sys/sysinfo.h> -#endif - #include "ace/Monitor_Control/Memory_Usage_Monitor.h" #if defined (ACE_HAS_MONITOR_FRAMEWORK) && (ACE_HAS_MONITOR_FRAMEWORK == 1) @@ -41,15 +37,6 @@ namespace ACE double percent_mem_usage = used_ram / this->sysinfo_.totalram * 100.0; this->receive (percent_mem_usage); -#elif defined (ACE_HAS_KSTAT) - unsigned long page_size = sysconf (_SC_PAGE_SIZE); - unsigned long total = sysconf (_SC_PHYS_PAGES) * page_size; - unsigned long free = sysconf (_SC_AVPHYS_PAGES) * page_size; - - double used = total - free; - double percent_mem_usage = used / total * 100.0; - - this->receive (percent_mem_usage); #endif } diff --git a/ACE/ace/Monitor_Control/Monitor_Control.mpc b/ACE/ace/Monitor_Control/Monitor_Control.mpc index 11366c50ada..5073b019163 100644 --- a/ACE/ace/Monitor_Control/Monitor_Control.mpc +++ b/ACE/ace/Monitor_Control/Monitor_Control.mpc @@ -2,7 +2,6 @@ project(Monitor_Control) : acelib, ace_etcl_parser, ace_output, install { dynamicflags += MONITOR_CONTROL_BUILD_DLL sharedname = ACE_Monitor_Control - avoids += wince Source_Files { Auto_Update_Starter.cpp @@ -21,7 +20,6 @@ project(Monitor_Control) : acelib, ace_etcl_parser, ace_output, install { Num_Threads_Monitor.cpp Packets_Received_Monitor.cpp Packets_Sent_Monitor.cpp - Solaris_Network_Interface_Monitor.cpp Windows_Monitor.cpp Windows_Multi_Instance_Monitor.cpp } diff --git a/ACE/ace/Monitor_Control/Num_Threads_Monitor.h b/ACE/ace/Monitor_Control/Num_Threads_Monitor.h index 422a71c79ea..7a20d2d0b78 100644 --- a/ACE/ace/Monitor_Control/Num_Threads_Monitor.h +++ b/ACE/ace/Monitor_Control/Num_Threads_Monitor.h @@ -23,14 +23,6 @@ #if defined (ACE_HAS_PDH_H) && !defined (ACE_LACKS_PDH_H) #include "ace/Monitor_Control/Windows_Monitor.h" -#elif defined (ACE_HAS_KSTAT) -/// There is apparently no way to query the number of threads on the -/// Solaris platform. The only benchmark I've seen had to put hooks -/// in the thread creation functions to keep track of the highest -/// thread ID, then check all the IDs less than that to see if the -/// threads still exist. Since we don't have that option in this -/// framework, which is to be used by existing applications, this -/// particular OS monitor is left unimplemented on Solaris. #endif #include "ace/Monitor_Control/Monitor_Control_export.h" diff --git a/ACE/ace/Monitor_Control/Packets_Received_Monitor.cpp b/ACE/ace/Monitor_Control/Packets_Received_Monitor.cpp index c01091eacce..4d222b86514 100644 --- a/ACE/ace/Monitor_Control/Packets_Received_Monitor.cpp +++ b/ACE/ace/Monitor_Control/Packets_Received_Monitor.cpp @@ -16,12 +16,10 @@ namespace ACE #if defined (ACE_HAS_WIN32_PDH) , Windows_Multi_Instance_Monitor ( ACE_TEXT ("\\Network Interface(*)\\Packets Received/sec")) -#elif defined (ACE_LINUX) || defined (AIX) +#elif defined (ACE_LINUX) , Linux_Network_Interface_Monitor ( " %*[^:]: %*u %lu %*u %*u %*u %*u %*u %*u %*u %*u") /// Scan format for /proc/net/dev -#elif defined (ACE_HAS_KSTAT) - , Solaris_Network_Interface_Monitor (ACE_TEXT ("ipackets")) #elif defined (__FreeBSD__) || defined (__Lynx__) , FreeBSD_Network_Interface_Monitor (ACE_TEXT ("ipackets")) #elif defined (__NetBSD__) || defined (__OpenBSD__) diff --git a/ACE/ace/Monitor_Control/Packets_Received_Monitor.h b/ACE/ace/Monitor_Control/Packets_Received_Monitor.h index d7f80a1491d..d0338dfde6b 100644 --- a/ACE/ace/Monitor_Control/Packets_Received_Monitor.h +++ b/ACE/ace/Monitor_Control/Packets_Received_Monitor.h @@ -23,10 +23,8 @@ #if defined (ACE_HAS_PDH_H) && !defined (ACE_LACKS_PDH_H) #include "ace/Monitor_Control/Windows_Multi_Instance_Monitor.h" -#elif defined (ACE_LINUX) || defined (AIX) +#elif defined (ACE_LINUX) #include "ace/Monitor_Control/Linux_Network_Interface_Monitor.h" -#elif defined (ACE_HAS_KSTAT) -#include "ace/Monitor_Control/Solaris_Network_Interface_Monitor.h" #elif defined (__FreeBSD__) || defined (__Lynx__) #include "ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.h" #elif defined (__NetBSD__) || defined (__OpenBSD__) @@ -52,10 +50,8 @@ namespace ACE : public Monitor_Base #if defined (ACE_HAS_WIN32_PDH) , public Windows_Multi_Instance_Monitor -#elif defined (ACE_LINUX) || defined (AIX) +#elif defined (ACE_LINUX) , public Linux_Network_Interface_Monitor -#elif defined (ACE_HAS_KSTAT) - , public Solaris_Network_Interface_Monitor #elif defined (__NetBSD__) || defined (__OpenBSD__) , public BSD_Network_Interface_Monitor #elif defined (__FreeBSD__) || defined (__Lynx__) diff --git a/ACE/ace/Monitor_Control/Packets_Sent_Monitor.cpp b/ACE/ace/Monitor_Control/Packets_Sent_Monitor.cpp index fc880ed7ae0..5c3046c0e3e 100644 --- a/ACE/ace/Monitor_Control/Packets_Sent_Monitor.cpp +++ b/ACE/ace/Monitor_Control/Packets_Sent_Monitor.cpp @@ -16,12 +16,10 @@ namespace ACE #if defined (ACE_HAS_WIN32_PDH) , Windows_Multi_Instance_Monitor ( ACE_TEXT ("\\Network Interface(*)\\Packets Sent/sec")) -#elif defined (ACE_LINUX) || defined (AIX) +#elif defined (ACE_LINUX) , Linux_Network_Interface_Monitor ( " %*[^:]: %*u %*u %*u %*u %*u %*u %*u %*u %*u %lu") /// Scan format for /proc/net/dev -#elif defined (ACE_HAS_KSTAT) - , Solaris_Network_Interface_Monitor (ACE_TEXT ("opackets")) #elif defined (__NetBSD__) || defined (__OpenBSD__) , BSD_Network_Interface_Monitor (ACE_TEXT ("opackets")) #elif defined (__FreeBSD__) || defined (__Lynx__) diff --git a/ACE/ace/Monitor_Control/Packets_Sent_Monitor.h b/ACE/ace/Monitor_Control/Packets_Sent_Monitor.h index c547434b46a..85de0ca1d63 100644 --- a/ACE/ace/Monitor_Control/Packets_Sent_Monitor.h +++ b/ACE/ace/Monitor_Control/Packets_Sent_Monitor.h @@ -23,10 +23,8 @@ #if defined (ACE_HAS_PDH_H) && !defined (ACE_LACKS_PDH_H) #include "ace/Monitor_Control/Windows_Multi_Instance_Monitor.h" -#elif defined (ACE_LINUX) || defined (AIX) +#elif defined (ACE_LINUX) #include "ace/Monitor_Control/Linux_Network_Interface_Monitor.h" -#elif defined (ACE_HAS_KSTAT) -#include "ace/Monitor_Control/Solaris_Network_Interface_Monitor.h" #elif defined (__FreeBSD__) || defined (__Lynx__) #include "ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.h" #elif defined (__NetBSD__) || defined (__OpenBSD__) @@ -52,10 +50,8 @@ namespace ACE : public Monitor_Base #if defined (ACE_HAS_WIN32_PDH) , public Windows_Multi_Instance_Monitor -#elif defined (ACE_LINUX) || defined (AIX) +#elif defined (ACE_LINUX) , public Linux_Network_Interface_Monitor -#elif defined (ACE_HAS_KSTAT) - , public Solaris_Network_Interface_Monitor #elif defined (__NetBSD__) || defined (__OpenBSD__) , public BSD_Network_Interface_Monitor #elif defined (__FreeBSD__) || defined (__Lynx__) diff --git a/ACE/ace/Monitor_Control/Solaris_Network_Interface_Monitor.cpp b/ACE/ace/Monitor_Control/Solaris_Network_Interface_Monitor.cpp deleted file mode 100644 index a3e09a8afa2..00000000000 --- a/ACE/ace/Monitor_Control/Solaris_Network_Interface_Monitor.cpp +++ /dev/null @@ -1,221 +0,0 @@ -#include "ace/Monitor_Control/Solaris_Network_Interface_Monitor.h" - -#if defined (ACE_HAS_KSTAT) - -#include "ace/Log_Category.h" -#include "ace/OS_NS_stdio.h" - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace ACE -{ - namespace Monitor_Control - { - Solaris_Network_Interface_Monitor::Solaris_Network_Interface_Monitor ( - const ACE_TCHAR *lookup_str) - : value_ (0UL), - start_ (0UL), - lookup_str_ (lookup_str) - { - this->init (); - } - - void - Solaris_Network_Interface_Monitor::update_i () - { - this->access_kstats (this->value_); - this->value_ -= this->start_; - } - - void - Solaris_Network_Interface_Monitor::clear_impl () - { - this->init (); - } - - void - Solaris_Network_Interface_Monitor::init () - { - unsigned long i; - - for (i = 0UL; i < MAX_LO_INTERFACES; ++i) - { - this->value_array_lo_[i] = 0UL; - } - - for (i = 0UL; i < MAX_HME_INTERFACES; ++i) - { - this->value_array_hme_[i] = 0UL; - } - - this->access_kstats (this->start_); - } - - void - Solaris_Network_Interface_Monitor::access_kstats ( - ACE_UINT64 &which_member) - { - this->kstats_ = kstat_open (); - - if (this->kstats_ == 0) - { - ACELIB_ERROR ((LM_ERROR, - ACE_TEXT ("opening kstats file failed\n"))); - return; - } - - this->kstat_id_ = this->kstats_->kc_chain_id; - int status = 0; - - while (true) - { - /// We have to sum the network interfaces manually. - for (this->kstat_ = this->kstats_->kc_chain; - this->kstat_ != 0; - this->kstat_ = this->kstat_->ks_next) - { - if (ACE_OS::strcmp (this->kstat_->ks_class, "net") != 0) - { - continue; - } - - unsigned long ks_instance = this->kstat_->ks_instance; - - if (ACE_OS::strcmp (this->kstat_->ks_module, "lo") == 0) - { - /// Interfaces 'lo' have only packet counters. - if (this->lookup_str_ == ACE_TEXT ("obytes") - || this->lookup_str_ == ACE_TEXT ("rbytes")) - { - continue; - } - - status = this->check_ks_module (ks_instance, - MAX_LO_INTERFACES, - "MAX_LO_INTERFACES", - this->value_array_lo_, - which_member); - - if (status == -1) - { - /// Unrecoverable error, diagnostic already output. - (void) kstat_close (this->kstats_); - return; - } - else if (status == 1) - { - /// The kstat_id changed underneath us, start over. - break; - } - } - else if (ACE_OS::strcmp (this->kstat_->ks_module, "hme") == 0 - || ACE_OS::strcmp (this->kstat_->ks_module, "bge") == 0) - { - status = this->check_ks_module (ks_instance, - MAX_HME_INTERFACES, - "MAX_HME_INTERFACES", - this->value_array_hme_, - which_member); - - if (status == -1) - { - /// Unrecoverable error, diagnostic already output. - (void) kstat_close (this->kstats_); - return; - } - else if (status == 1) - { - /// The kstat_id changed underneath us, start over. - break; - } - } - } - - if (this->kstat_) - { - this->kstat_id_ = kstat_chain_update (this->kstats_); - - if (! this->kstat_id_ > 0) - { - ACELIB_ERROR ((LM_ERROR, "kstat is is not > 0.\n")); - break; - } - } - else - { - break; - } - } - - status = kstat_close (this->kstats_); - - if (status != 0) - { - ACELIB_ERROR ((LM_ERROR, - ACE_TEXT ("closing kstats file failed\n"))); - } - } - - int - Solaris_Network_Interface_Monitor::check_ks_module ( - const unsigned long ks_instance, - const unsigned long which_max, - const char *max_str, - ACE_UINT64 *value_array, - ACE_UINT64 &which_member) - { - if (! (ks_instance < which_max)) - { - ACELIB_ERROR_RETURN ((LM_ERROR, - "%s exceeded.\n", - max_str), - -1); - } - - /// Because the kstat chain can change dynamically, - /// watch the chain ID and restart the walk if the ID - /// differs from what we saw during the walk. The restart - /// is done by breaking from the cycle with kstat_ not 0. - - kid_t kstat_id = - kstat_read (this->kstats_, this->kstat_, 0); - - if (kstat_id != this->kstat_id_) - { - /// This return value restarts the walk as described above. - return 1; - } - - kstat_named_t *value = - (kstat_named_t *) kstat_data_lookup ( - this->kstat_, - ACE_TEXT_ALWAYS_CHAR (this->lookup_str_.rep ())); - - if (value == 0) - { - /// Just return and let the calling FOR loop advance. - return 0; - } - - if (value->data_type != KSTAT_DATA_UINT32) - { - ACELIB_ERROR_RETURN ((LM_ERROR, - "Wrong data type.\n"), - -1); - } - - /// Guard against overflow. - value_array[ks_instance] += - value->value.ui32 - - static_cast<ACE_UINT32> (value_array[ks_instance]); - - which_member += value_array[ks_instance]; - - return 0; - } - } -} - -ACE_END_VERSIONED_NAMESPACE_DECL - -#endif /* defined (ACE_HAS_KSTAT) */ diff --git a/ACE/ace/Monitor_Control/Solaris_Network_Interface_Monitor.h b/ACE/ace/Monitor_Control/Solaris_Network_Interface_Monitor.h deleted file mode 100644 index 15dbc9c50e1..00000000000 --- a/ACE/ace/Monitor_Control/Solaris_Network_Interface_Monitor.h +++ /dev/null @@ -1,89 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Solaris_Network_Interface_Monitor.h - * - * @author Jeff Parsons <j.parsons@vanderbilt.edu> - */ -//============================================================================= - -#ifndef SOLARIS_NETWORK_INTERFACE_MONITOR_H -#define SOLARIS_NETWORK_INTERFACE_MONITOR_H - -#include /**/ "ace/pre.h" - -#include "ace/SString.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Monitor_Control/Monitor_Control_export.h" - -#if defined (ACE_HAS_KSTAT) - -#include "ace/os_include/os_kstat.h" - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace ACE -{ - namespace Monitor_Control - { - /** - * @class Solaris_Network_Interface_Monitor - * - * @brief Mixin class for network interface monitors compiled on - * Solaris machines. - */ - class MONITOR_CONTROL_Export Solaris_Network_Interface_Monitor - { - protected: - /// The kstat interface can access a wealth of - /// network information about the system. To get the specific - /// value we want to monitor, we just vary the lookup string. - Solaris_Network_Interface_Monitor (const ACE_TCHAR *lookup_str); - - /// Platform-specific implementation. - void update_i (); - - /// Platform-specific reset. - void clear_impl (); - - protected: - ACE_UINT64 value_; - - private: - /// Common code. - - void init (); - void access_kstats (ACE_UINT64 &which_member); - int check_ks_module (const unsigned long ks_instance, - const unsigned long which_max, - const char *max_str, - ACE_UINT64 *value_array, - ACE_UINT64 &which_member); - - - private: - static const unsigned long MAX_LO_INTERFACES = 5UL; - static const unsigned long MAX_HME_INTERFACES = 10UL; - ACE_UINT64 value_array_lo_[MAX_LO_INTERFACES]; - ACE_UINT64 value_array_hme_[MAX_HME_INTERFACES]; - ACE_UINT64 start_; - ACE_TString lookup_str_; - kstat_ctl_t *kstats_; - kstat_t *kstat_; - kid_t kstat_id_; - }; - } -} - -ACE_END_VERSIONED_NAMESPACE_DECL - -#endif /* defined (ACE_HAS_KSTAT) */ - -#include /**/ "ace/post.h" - -#endif // SOLARIS_NETWORK_INTERFACE_MONITOR_H diff --git a/ACE/ace/Mutex.h b/ACE/ace/Mutex.h index ba784f63b7f..16950c71872 100644 --- a/ACE/ace/Mutex.h +++ b/ACE/ace/Mutex.h @@ -161,7 +161,7 @@ public: # define ACE_MUTEX_PROCESS_LOCK_IS_SEMA ACE_sema_t process_sema_; typedef ACE_sema_t Process_Lock; -#elif defined ACE_HAS_PTHREADS || defined ACE_HAS_STHREADS +#elif defined ACE_HAS_PTHREADS # define ACE_MUTEX_USE_PROCESS_LOCK # define ACE_MUTEX_PROCESS_LOCK_IS_MUTEX typedef ACE_mutex_t Process_Lock; diff --git a/ACE/ace/Node.h b/ACE/ace/Node.h index ca0c8b422e1..523cbec4b35 100644 --- a/ACE/ace/Node.h +++ b/ACE/ace/Node.h @@ -70,13 +70,7 @@ private: ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Node.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Node.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_NODE_H */ diff --git a/ACE/ace/OS_Errno.cpp b/ACE/ace/OS_Errno.cpp index 065eb39e133..8c082487b73 100644 --- a/ACE/ace/OS_Errno.cpp +++ b/ACE/ace/OS_Errno.cpp @@ -1,11 +1,9 @@ // -*- C++ -*- #include "ace/OS_Errno.h" -// Inlining this class on debug builds with gcc on Solaris can cause -// deadlocks during static initialization. On non debug builds it -// causes compilation errors. -#if !defined (ACE_HAS_INLINED_OSCALLS) || \ - (defined (__GNUG__) && defined (__sun__)) +// Inlining this class on debug builds with gcc deadlocks during static +// initialization. On non debug builds it causes compilation errors. +#if !defined (ACE_HAS_INLINED_OSCALLS) # if defined (ACE_INLINE) # undef ACE_INLINE # endif /* ACE_INLINE */ @@ -13,31 +11,3 @@ # include "ace/OS_Errno.inl" #endif /* ACE_HAS_INLINED_OSCALLS */ -#if defined (ACE_HAS_WINCE_BROKEN_ERRNO) - -#include "ace/OS_Memory.h" - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - -ACE_CE_Errno *ACE_CE_Errno::instance_ = 0; -DWORD ACE_CE_Errno::errno_key_ = 0xffffffff; - -void -ACE_CE_Errno::init () -{ - ACE_NEW (ACE_CE_Errno::instance_, - ACE_CE_Errno ()); - ACE_CE_Errno::errno_key_ = TlsAlloc (); -} - -void -ACE_CE_Errno::fini () -{ - TlsFree (ACE_CE_Errno::errno_key_); - delete ACE_CE_Errno::instance_; - ACE_CE_Errno::instance_ = 0; -} - -ACE_END_VERSIONED_NAMESPACE_DECL - -#endif /* ACE_HAS_WINCE_BROKEN_ERRNO */ diff --git a/ACE/ace/OS_Errno.h b/ACE/ace/OS_Errno.h index d50463c9b68..3f2555b3fb5 100644 --- a/ACE/ace/OS_Errno.h +++ b/ACE/ace/OS_Errno.h @@ -55,18 +55,13 @@ public: /// Reset the value of @c errno to <error>. ~ACE_Errno_Guard (); -#if defined (ACE_HAS_WINCE_BROKEN_ERRNO) - /// Assign @a errno_ref to <error_>. - int operator= (const ACE_ERRNO_TYPE &errno_ref); -#endif /* ACE_HAS_WINCE_BROKEN_ERRNO */ - - /// Assign <error> to <error_>. + /// Assign @a erro> to error_. int operator= (int error); - /// Compare <error> with <error_> for equality. + /// Compare @a error with error_ for equality. bool operator== (int error); - /// Compare <error> with <error_> for inequality. + /// Compare @a error with error_ for inequality. bool operator!= (int error); private: @@ -81,11 +76,10 @@ private: ACE_END_VERSIONED_NAMESPACE_DECL -// Inlining this class on debug builds with gcc on Solaris can cause +// Inlining this class on debug builds with can cause // deadlocks during static initialization. On non debug builds it // causes compilation errors. -#if defined (ACE_HAS_INLINED_OSCALLS) && \ - (!defined (__GNUG__) || !defined (__sun__)) +#if defined (ACE_HAS_INLINED_OSCALLS) # if defined (ACE_INLINE) # undef ACE_INLINE # endif /* ACE_INLINE */ diff --git a/ACE/ace/OS_Errno.inl b/ACE/ace/OS_Errno.inl index 0a7fa0f4ff2..32d9ea284bd 100644 --- a/ACE/ace/OS_Errno.inl +++ b/ACE/ace/OS_Errno.inl @@ -35,14 +35,6 @@ ACE_Errno_Guard::~ACE_Errno_Guard () #endif /* ACE_MT_SAFE */ } -#if defined (ACE_HAS_WINCE_BROKEN_ERRNO) -ACE_INLINE int -ACE_Errno_Guard::operator= (const ACE_ERRNO_TYPE &error) -{ - return this->error_ = error; -} -#endif /* ACE_HAS_WINCE_BROKEN_ERRNO */ - ACE_INLINE int ACE_Errno_Guard::operator= (int error) { diff --git a/ACE/ace/OS_Memory.h b/ACE/ace/OS_Memory.h index fd8262de6ae..eec0b65df8f 100644 --- a/ACE/ace/OS_Memory.h +++ b/ACE/ace/OS_Memory.h @@ -123,40 +123,13 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * @param ptr the base pointer * @param alignment the required alignment */ -#if defined (ACE_OPENVMS) && (!defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64)) -inline unsigned int -ACE_align_binary (unsigned int ptr, unsigned int alignment) -{ - unsigned int const tmp = alignment - 1; - return (ptr + tmp) & (~tmp); -} -#else inline uintptr_t ACE_align_binary (uintptr_t ptr, uintptr_t alignment) { uintptr_t const tmp = alignment - 1; return (ptr + tmp) & (~tmp); } -#endif -#if defined (ACE_OPENVMS) && (!defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64)) -/// Return the next address aligned to a required boundary -inline char * -ACE_ptr_align_binary (char const * ptr, unsigned int alignment) -{ - return - reinterpret_cast<char *> ( - ACE_align_binary (reinterpret_cast<unsigned int> (ptr), alignment)); -} - -/// Return the next address aligned to a required boundary -inline char * -ACE_ptr_align_binary (unsigned char const * ptr, unsigned int alignment) -{ - return - ACE_ptr_align_binary (reinterpret_cast<char const *> (ptr), alignment); -} -#else /// Return the next address aligned to a required boundary inline char * ACE_ptr_align_binary (char const * ptr, uintptr_t alignment) @@ -173,7 +146,6 @@ ACE_ptr_align_binary (unsigned char const * ptr, uintptr_t alignment) return ACE_ptr_align_binary (reinterpret_cast<char const *> (ptr), alignment); } -#endif /* ACE_OPENVMS && __INITIAL_POINTER_SIZE < 64 */ //@} ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/OS_NS_Thread.cpp b/ACE/ace/OS_NS_Thread.cpp index a99cdd35ef2..d4e3c82b253 100644 --- a/ACE/ace/OS_NS_Thread.cpp +++ b/ACE/ace/OS_NS_Thread.cpp @@ -30,9 +30,6 @@ ACE_MUTEX_LOCK_CLEANUP_ADAPTER_NAME (void *args) #if !defined(ACE_WIN32) && defined (__IBMCPP__) && (__IBMCPP__ >= 400) # define ACE_BEGINTHREADEX(STACK, STACKSIZE, ENTRY_POINT, ARGS, FLAGS, THR_ID) \ (*THR_ID = ::_beginthreadex ((void(_Optlink*)(void*))ENTRY_POINT, STACK, STACKSIZE, ARGS), *THR_ID) -#elif defined (ACE_HAS_WINCE) -# define ACE_BEGINTHREADEX(STACK, STACKSIZE, ENTRY_POINT, ARGS, FLAGS, THR_ID) \ - CreateThread (0, STACKSIZE, (unsigned long (__stdcall *) (void *)) ENTRY_POINT, ARGS, (FLAGS) & (CREATE_SUSPENDED | STACK_SIZE_PARAM_IS_A_RESERVATION), (unsigned long *) THR_ID) #elif defined(ACE_HAS_WTHREADS) // Green Hills compiler gets confused when __stdcall is embedded in // parameter list, so we define the type ACE_WIN32THRFUNC_T and use it @@ -1466,13 +1463,7 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv, // Wait to be awakened by a ACE_OS::signal() or // ACE_OS::broadcast(). # if defined (ACE_WIN32) -# if !defined (ACE_USES_WINCE_SEMA_SIMULATION) result = ::WaitForSingleObject (cv->sema_, msec_timeout); -# else /* ACE_USES_WINCE_SEMA_SIMULATION */ - // Can't use Win32 API on our simulated semaphores. - result = ACE_OS::sema_wait (&cv->sema_, - timeout); -# endif /* ACE_USES_WINCE_SEMA_SIMULATION */ # elif defined (ACE_VXWORKS) // Inline the call to ACE_OS::sema_wait () because it takes an // ACE_Time_Value argument. Avoid the cost of that conversion . . . @@ -1657,16 +1648,7 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv, return -1; // Wait to be awakened by a ACE_OS::signal() or ACE_OS::broadcast(). -# if defined (ACE_USES_WINCE_SEMA_SIMULATION) - // Can't use Win32 API on simulated semaphores. - result = ACE_OS::sema_wait (&cv->sema_, - timeout); - - if (result == -1 && errno == ETIME) - result = WAIT_TIMEOUT; -# else result = ::WaitForSingleObject (cv->sema_, msec_timeout); -# endif /* ACE_USES_WINCE_SEMA_SIMULATION */ // Reacquire lock to avoid race conditions. if (ACE_OS::thread_mutex_lock (&cv->waiters_lock_) != 0) @@ -1748,16 +1730,7 @@ ACE_OS::cond_wait (ACE_cond_t *cv, // Wait to be awakened by a ACE_OS::cond_signal() or // ACE_OS::cond_broadcast(). -# if !defined (ACE_USES_WINCE_SEMA_SIMULATION) result = ::WaitForSingleObject (cv->sema_, INFINITE); -# else - // Can't use Win32 API on simulated semaphores. - result = ACE_OS::sema_wait (&cv->sema_); - - if (result != WAIT_OBJECT_0 && errno == ETIME) - result = WAIT_TIMEOUT; - -# endif /* ACE_USES_WINCE_SEMA_SIMULATION */ // Reacquire lock to avoid race conditions. if (ACE_OS::thread_mutex_lock (&cv->waiters_lock_) != 0) @@ -1904,14 +1877,6 @@ ACE_OS::mutex_init (ACE_mutex_t *m, ::pthread_mutexattr_destroy (&l_attributes); return result; -# elif defined (ACE_HAS_STHREADS) - ACE_UNUSED_ARG (name); - ACE_UNUSED_ARG (sa); - ACE_UNUSED_ARG (lock_type); - int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::mutex_init (m, lock_scope, attributes), - result), - int); # elif defined (ACE_HAS_WTHREADS) m->type_ = lock_scope; @@ -1920,20 +1885,11 @@ ACE_OS::mutex_init (ACE_mutex_t *m, switch (lock_scope) { case USYNC_PROCESS: -# if defined (ACE_HAS_WINCE) - // @@todo (brunsch) This idea should be moved into ACE_OS_Win32. - m->proc_mutex_ = - ::CreateMutexW (ACE_OS::default_win32_security_attributes_r - (sa, &sa_buffer, &sd_buffer), - FALSE, - ACE_Ascii_To_Wide (name).wchar_rep ()); -# else /* ACE_HAS_WINCE */ m->proc_mutex_ = - ::CreateMutexA (ACE_OS::default_win32_security_attributes_r - (sa, &sa_buffer, &sd_buffer), - FALSE, - name); -# endif /* ACE_HAS_WINCE */ + ::CreateMutexA (ACE_OS::default_win32_security_attributes_r + (sa, &sa_buffer, &sd_buffer), + FALSE, + name); if (m->proc_mutex_ == 0) ACE_FAIL_RETURN (-1); else @@ -1985,9 +1941,6 @@ ACE_OS::mutex_destroy (ACE_mutex_t *m) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_mutex_destroy (m), result), int); # endif /* ACE_LACKS_PTHREAD_MUTEX_DESTROY */ -# elif defined (ACE_HAS_STHREADS) - int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::mutex_destroy (m), result), int); # elif defined (ACE_HAS_WTHREADS) switch (m->type_) { @@ -2069,9 +2022,6 @@ ACE_OS::mutex_lock (ACE_mutex_t *m) // Note, don't use "::" here since the following call is often a macro. int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_mutex_lock (m), result), int); -# elif defined (ACE_HAS_STHREADS) - int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::mutex_lock (m), result), int); # elif defined (ACE_HAS_WTHREADS) switch (m->type_) { @@ -2243,9 +2193,6 @@ ACE_OS::mutex_trylock (ACE_mutex_t *m) // Note, don't use "::" here since the following call is often a macro. int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_mutex_trylock (m), result), int); -# elif defined (ACE_HAS_STHREADS) - int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::mutex_trylock (m), result), int); # elif defined (ACE_HAS_WTHREADS) switch (m->type_) { @@ -2344,9 +2291,6 @@ ACE_OS::mutex_unlock (ACE_mutex_t *m) // Note, don't use "::" here since the following call is often a macro. int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_mutex_unlock (m), result), int); -# elif defined (ACE_HAS_STHREADS) - int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::mutex_unlock (m), result), int); # elif defined (ACE_HAS_WTHREADS) switch (m->type_) { @@ -2587,20 +2531,11 @@ ACE_OS::event_init (ACE_event_t *event, ACE_UNUSED_ARG (arg); SECURITY_ATTRIBUTES sa_buffer; SECURITY_DESCRIPTOR sd_buffer; -# if defined (ACE_HAS_WINCE) - // @@todo (brunsch) This idea should be moved into ACE_OS_Win32. - *event = ::CreateEventW (ACE_OS::default_win32_security_attributes_r - (sa, &sa_buffer, &sd_buffer), - manual_reset, - initial_state, - ACE_Ascii_To_Wide (name).wchar_rep ()); -# else /* ACE_HAS_WINCE */ *event = ::CreateEventA (ACE_OS::default_win32_security_attributes_r (sa, &sa_buffer, &sd_buffer), manual_reset, initial_state, name); -# endif /* ACE_HAS_WINCE */ if (*event == 0) ACE_FAIL_RETURN (-1); else @@ -3055,72 +2990,15 @@ ACE_OS::event_timedwait (ACE_event_t *event, int ACE_OS::lwp_getparams (ACE_Sched_Params &sched_params) { -#if defined (ACE_HAS_STHREADS) || defined (sun) - // Get the class TS and RT class IDs. - ACE_id_t rt_id; - ACE_id_t ts_id; - if (ACE_OS::scheduling_class ("RT", rt_id) == -1 - || ACE_OS::scheduling_class ("TS", ts_id) == -1) - return -1; - - // Get this LWP's scheduling parameters. - pcparms_t pcparms; - // The following is just to avoid Purify warnings about unitialized - // memory reads. - ACE_OS::memset (&pcparms, 0, sizeof pcparms); - pcparms.pc_cid = PC_CLNULL; - - if (ACE_OS::priority_control (P_LWPID, - P_MYID, - PC_GETPARMS, - (char *) &pcparms) == -1) - return -1; - else if (pcparms.pc_cid == rt_id) - { - // RT class. - rtparms_t rtparms; - ACE_OS::memcpy (&rtparms, pcparms.pc_clparms, sizeof rtparms); - - sched_params.policy (ACE_SCHED_FIFO); - sched_params.priority (rtparms.rt_pri); - sched_params.scope (ACE_SCOPE_THREAD); - ACE_Time_Value quantum (rtparms.rt_tqsecs, - rtparms.rt_tqnsecs == RT_TQINF - ? 0 : rtparms.rt_tqnsecs * 1000); - sched_params.quantum (quantum); - return 0; - } - else if (pcparms.pc_cid == ts_id) - { - /* TS class */ - tsparms_t tsparms; - ACE_OS::memcpy (&tsparms, pcparms.pc_clparms, sizeof tsparms); - - sched_params.policy (ACE_SCHED_OTHER); - sched_params.priority (tsparms.ts_upri); - sched_params.scope (ACE_SCOPE_THREAD); - return 0; - } - else - return -1; - -#else /* ! ACE_HAS_STHREADS && ! sun */ ACE_UNUSED_ARG (sched_params); ACE_NOTSUP_RETURN (-1); -#endif /* ! ACE_HAS_STHREADS && ! sun */ } int ACE_OS::lwp_setparams (const ACE_Sched_Params &sched_params) { -#if defined (ACE_HAS_STHREADS) || defined (sun) - ACE_Sched_Params lwp_params (sched_params); - lwp_params.scope (ACE_SCOPE_LWP); - return ACE_OS::sched_params (lwp_params); -#else /* ! ACE_HAS_STHREADS && ! sun */ ACE_UNUSED_ARG (sched_params); ACE_NOTSUP_RETURN (-1); -#endif /* ! ACE_HAS_STHREADS && ! sun */ } #if defined ACE_HAS_THREADS && defined ACE_LACKS_RWLOCK_T @@ -3250,9 +3128,7 @@ ACE_OS::sched_params (const ACE_Sched_Params &sched_params, ACE_id_t id) { ACE_OS_TRACE ("ACE_OS::sched_params"); -#if defined (ACE_HAS_STHREADS) - return ACE_OS::set_scheduling_params (sched_params, id); -#elif defined (ACE_HAS_PTHREADS) && \ +#if defined (ACE_HAS_PTHREADS) && \ (!defined (ACE_LACKS_SETSCHED) || \ defined (ACE_HAS_PTHREAD_SCHEDPARAM)) if (sched_params.quantum () != ACE_Time_Value::zero) @@ -3293,20 +3169,13 @@ ACE_OS::sched_params (const ACE_Sched_Params &sched_params, result), int); } -# if defined (sun) - // We need to be able to set LWP priorities on Suns, even without - // ACE_HAS_STHREADS, to obtain preemption. - else if (sched_params.scope () == ACE_SCOPE_LWP) - return ACE_OS::set_scheduling_params (sched_params, id); -# endif /* sun */ else // sched_params.scope () == ACE_SCOPE_LWP, which isn't POSIX { errno = EINVAL; return -1; } -#elif defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) - +#elif defined (ACE_WIN32) // PharLap ETS can act on the current thread - it can set the // quantum also, unlike Win32. All this only works on the RT // version. @@ -3318,16 +3187,13 @@ ACE_OS::sched_params (const ACE_Sched_Params &sched_params, if (sched_params.quantum() != ACE_Time_Value::zero) EtsSetTimeSlice (sched_params.quantum().msec()); # endif - # else - if (sched_params.quantum () != ACE_Time_Value::zero) { // I don't know of a way to set the quantum on Win32. errno = EINVAL; return -1; } - # endif /* ACE_HAS_PHARLAP_RT */ if (sched_params.scope () == ACE_SCOPE_THREAD) @@ -3415,132 +3281,19 @@ ACE_OS::sched_params (const ACE_Sched_Params &sched_params, ACE_UNUSED_ARG (sched_params); ACE_UNUSED_ARG (id); ACE_NOTSUP_RETURN (-1); -#endif /* ACE_HAS_STHREADS */ +#endif /* ACE_HAS_PTHREADS */ } int -ACE_OS::scheduling_class (const char *class_name, ACE_id_t &id) +ACE_OS::scheduling_class (const char */*class_name*/, ACE_id_t &/*id*/) { -#if defined (ACE_HAS_PRIOCNTL) - // Get the priority class ID. - pcinfo_t pcinfo; - // The following is just to avoid Purify warnings about unitialized - // memory reads. - ACE_OS::memset (&pcinfo, 0, sizeof pcinfo); - - ACE_OS::strcpy (pcinfo.pc_clname, class_name); - if (ACE_OS::priority_control (P_ALL /* ignored */, - P_MYID /* ignored */, - PC_GETCID, - (char *) &pcinfo) == -1) - { - return -1; - } - else - { - id = pcinfo.pc_cid; - return 0; - } -#else /* ! ACE_HAS_PRIOCNTL */ - ACE_UNUSED_ARG (class_name); - ACE_UNUSED_ARG (id); ACE_NOTSUP_RETURN (-1); -#endif /* ! ACE_HAS_PRIOCNTL */ } int -ACE_OS::set_scheduling_params (const ACE_Sched_Params &sched_params, - ACE_id_t id) +ACE_OS::set_scheduling_params (const ACE_Sched_Params &/*sched_params*/, ACE_id_t /*id*/) { -#if defined (ACE_HAS_PRIOCNTL) - // Set priority class, priority, and quantum of this LWP or process as - // specified in sched_params. - - // Get the priority class ID. - ACE_id_t class_id; - if (ACE_OS::scheduling_class (sched_params.policy() == ACE_SCHED_OTHER ? - "TS" : - "RT", class_id) == -1) - { - return -1; - } - - pcparms_t pcparms; - // The following is just to avoid Purify warnings about unitialized - // memory reads. - ACE_OS::memset (&pcparms, 0, sizeof pcparms); - - pcparms.pc_cid = class_id; - - if (sched_params.policy () == ACE_SCHED_OTHER && - sched_params.quantum () == ACE_Time_Value::zero) - // SunOS doesn't support non-zero quantums in time-sharing class: use - // real-time class instead. - { - tsparms_t tsparms; - // The following is just to avoid Purify warnings about unitialized - // memory reads. - ACE_OS::memset (&tsparms, 0, sizeof tsparms); - - // Don't change ts_uprilim (user priority limit) - tsparms.ts_uprilim = TS_NOCHANGE; - tsparms.ts_upri = sched_params.priority (); - - // Package up the TS class ID and parameters for the - // priority_control () call. - ACE_OS::memcpy (pcparms.pc_clparms, &tsparms, sizeof tsparms); - } - else if (sched_params.policy () == ACE_SCHED_FIFO || - (sched_params.policy () == ACE_SCHED_RR && - sched_params.quantum () != ACE_Time_Value::zero)) - // must have non-zero quantum for RR, to make it meaningful - // A zero quantum with FIFO has special significance: it actually - // means infinite time quantum, i.e., run-to-completion. - { - rtparms_t rtparms; - // The following is just to avoid Purify warnings about unitialized - // memory reads. - ACE_OS::memset (&rtparms, 0, sizeof rtparms); - - rtparms.rt_pri = sched_params.priority (); - - if (sched_params.quantum () == ACE_Time_Value::zero) - { - // rtparms.rt_tqsecs is ignored with RT_TQINF - rtparms.rt_tqnsecs = RT_TQINF; - } - else - { - rtparms.rt_tqsecs = (ulong) sched_params.quantum ().sec (); - rtparms.rt_tqnsecs = sched_params.quantum ().usec () * 1000; - } - - // Package up the RT class ID and parameters for the - // priority_control () call. - ACE_OS::memcpy (pcparms.pc_clparms, &rtparms, sizeof rtparms); - } - else - { - errno = EINVAL; - return -1; - } - - if (ACE_OS::priority_control ((idtype_t) (sched_params.scope () == ACE_SCOPE_THREAD - ? ACE_SCOPE_PROCESS - : sched_params.scope ()), - id, - PC_SETPARMS, - (char *) &pcparms) < 0) - { - return ACE_OS::last_error (); - } - - return 0; -#else /* ! ACE_HAS_PRIOCNTL */ - ACE_UNUSED_ARG (sched_params); - ACE_UNUSED_ARG (id); ACE_NOTSUP_RETURN (-1); -#endif /* ! ACE_HAS_PRIOCNTL */ } int @@ -3719,9 +3472,6 @@ ACE_OS::thr_create (ACE_THR_FUNC func, # if defined (ACE_HAS_ONLY_SCHED_OTHER) // SunOS, thru version 5.6, only supports SCHED_OTHER. spolicy = SCHED_OTHER; -# elif defined (ACE_HAS_ONLY_SCHED_FIFO) - // NonStop OSS standard pthread supports only SCHED_FIFO. - spolicy = SCHED_FIFO; # else // Make sure to enable explicit scheduling, in case we didn't // enable it above (for non-default priority). @@ -3782,7 +3532,7 @@ ACE_OS::thr_create (ACE_THR_FUNC func, # if defined (PTHREAD_MAX_PRIORITY) && !defined(ACE_HAS_PTHREADS) /* For MIT pthreads... */ sparam.prio = ACE_MIN (priority, PTHREAD_MAX_PRIORITY); -# elif defined(ACE_HAS_PTHREADS) && !defined (ACE_HAS_STHREADS) +# elif defined(ACE_HAS_PTHREADS) // The following code forces priority into range. if (ACE_BIT_ENABLED (flags, THR_SCHED_FIFO)) sparam.sched_priority = @@ -3804,20 +3554,12 @@ ACE_OS::thr_create (ACE_THR_FUNC func, # endif /* PTHREAD_MAX_PRIORITY */ { -# if defined (sun) && defined (ACE_HAS_ONLY_SCHED_OTHER) - // SunOS, through 5.6, POSIX only allows priorities > 0 to - // ::pthread_attr_setschedparam. If a priority of 0 was - // requested, set the thread priority after creating it, below. - if (priority > 0) -# endif /* sun && ACE_HAS_ONLY_SCHED_OTHER */ + (void) ACE_ADAPT_RETVAL(::pthread_attr_setschedparam (&attr, &sparam), + result); + if (result != 0) { - (void) ACE_ADAPT_RETVAL(::pthread_attr_setschedparam (&attr, &sparam), - result); - if (result != 0) - { - ::pthread_attr_destroy (&attr); - return -1; - } + ::pthread_attr_destroy (&attr); + return -1; } } } @@ -3885,7 +3627,6 @@ ACE_OS::thr_create (ACE_THR_FUNC func, } # endif /* !ACE_HAS_PTHREAD_ATTR_SETCREATESUSPEND_NP */ -# if ! defined(ACE_LACKS_THR_CONCURRENCY_FUNCS) if (ACE_BIT_ENABLED (flags, THR_NEW_LWP)) { // Increment the number of LWPs by one to emulate the @@ -3912,7 +3653,6 @@ ACE_OS::thr_create (ACE_THR_FUNC func, return -1; } } -# endif /* ! ACE_LACKS_THR_CONCURRENCY_FUNCS */ } ACE_OSCALL (ACE_ADAPT_RETVAL (::pthread_create (thr_id, @@ -3929,75 +3669,6 @@ ACE_OS::thr_create (ACE_THR_FUNC func, if (result != -1) *thr_handle = *thr_id; -# if defined (sun) && defined (ACE_HAS_ONLY_SCHED_OTHER) - // SunOS prior to 5.7: - - // If the priority is 0, then we might have to set it now because we - // couldn't set it with ::pthread_attr_setschedparam, as noted - // above. This doesn't provide strictly correct behavior, because - // the thread was created (above) with the priority of its parent. - // (That applies regardless of the inherit_sched attribute: if it - // was PTHREAD_INHERIT_SCHED, then it certainly inherited its - // parent's priority. If it was PTHREAD_EXPLICIT_SCHED, then "attr" - // was initialized by the SunOS ::pthread_attr_init () to contain - // NULL for the priority, which indicated to SunOS ::pthread_create - // () to inherit the parent priority.) - if (priority == 0) - { - // Check the priority of this thread, which is the parent - // of the newly created thread. If it is 0, then the - // newly created thread will have inherited the priority - // of 0, so there's no need to explicitly set it. - struct sched_param sparam; - int policy = 0; - ACE_OSCALL (ACE_ADAPT_RETVAL (::pthread_getschedparam (thr_self (), - &policy, - &sparam), - result), int, - result); - - // The only policy supported by by SunOS, thru version 5.6, - // is SCHED_OTHER, so that's hard-coded here. - policy = ACE_SCHED_OTHER; - - if (sparam.sched_priority != 0) - { - ACE_OS::memset ((void *) &sparam, 0, sizeof sparam); - // The memset to 0 sets the priority to 0, so we don't need - // to explicitly set sparam.sched_priority. - - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_setschedparam (*thr_id, - policy, - &sparam), - result), - int); - } - } - -# if defined (ACE_NEEDS_LWP_PRIO_SET) -# if 0 - // It would be useful if we could make this work. But, it requires - // a mechanism for determining the ID of an LWP to which another - // thread is bound. Is there a way to do that? Instead, just rely - // on the code in ACE_Thread_Adapter::invoke () to set the LWP - // priority. - - // If the thread is bound, then set the priority on its LWP. - if (ACE_BIT_ENABLED (flags, THR_BOUND)) - { - ACE_Sched_Params sched_params (ACE_BIT_ENABLED (flags, THR_SCHED_FIFO) || - ACE_BIT_ENABLED (flags, THR_SCHED_RR) ? - ACE_SCHED_FIFO : - ACE_SCHED_OTHER, - priority); - result = ACE_OS::lwp_setparams (sched_params, - /* ? How do we find the ID of the LWP - to which *thr_id is bound? */); - } -# endif /* 0 */ -# endif /* ACE_NEEDS_LWP_PRIO_SET */ - -# endif /* sun && ACE_HAS_ONLY_SCHED_OTHER */ auto_thread_args.release (); // *** Set pthread name (second try) @@ -4016,51 +3687,6 @@ ACE_OS::thr_create (ACE_THR_FUNC func, # endif /* !ACE_HAS_PTHREAD_ATTR_SETNAME */ return result; -# elif defined (ACE_HAS_STHREADS) - int result; - int start_suspended = ACE_BIT_ENABLED (flags, THR_SUSPENDED); - - if (priority != ACE_DEFAULT_THREAD_PRIORITY) - // If we need to set the priority, then we need to start the - // thread in a suspended mode. - ACE_SET_BITS (flags, THR_SUSPENDED); - - ACE_OSCALL (ACE_ADAPT_RETVAL (::thr_create (stack, stacksize, - thread_args->entry_point (), - thread_args, - flags, thr_id), result), - int, result); - - if (result != -1) - { - // With SunOS threads, ACE_thread_t and ACE_hthread_t are the same. - *thr_handle = *thr_id; - - if (priority != ACE_DEFAULT_THREAD_PRIORITY) - { - // Set the priority of the new thread and then let it - // continue, but only if the user didn't start it suspended - // in the first place! - result = ACE_OS::thr_setprio (*thr_id, priority); - if (result != 0) - { - errno = result; - return -1; - } - - if (start_suspended == 0) - { - result = ACE_OS::thr_continue (*thr_id); - if (result != 0) - { - errno = result; - return -1; - } - } - } - } - auto_thread_args.release (); - return result; # elif defined (ACE_HAS_WTHREADS) ACE_UNUSED_ARG (thr_name); ACE_UNUSED_ARG (stack); @@ -4075,7 +3701,6 @@ ACE_OS::thr_create (ACE_THR_FUNC func, flags | THR_SUSPENDED); // Have to duplicate the handle because // CWinThread::~CWinThread() closes the original handle. -# if !defined (ACE_HAS_WINCE) (void) ::DuplicateHandle (::GetCurrentProcess (), cwin_thread->m_hThread, ::GetCurrentProcess (), @@ -4083,7 +3708,6 @@ ACE_OS::thr_create (ACE_THR_FUNC func, 0, TRUE, DUPLICATE_SAME_ACCESS); -# endif /* ! ACE_HAS_WINCE */ *thr_id = cwin_thread->m_nThreadID; if (ACE_BIT_ENABLED (flags, THR_SUSPENDED) == 0) @@ -4220,7 +3844,7 @@ ACE_OS::thr_create (ACE_THR_FUNC func, return 0; } -# endif /* ACE_HAS_STHREADS */ +# endif /* ACE_HAS_PTHREADS */ #else ACE_UNUSED_ARG (func); ACE_UNUSED_ARG (args); @@ -4242,8 +3866,6 @@ ACE_OS::thr_exit (ACE_THR_FUNC_RETURN status) #if defined (ACE_HAS_THREADS) # if defined (ACE_HAS_PTHREADS) && !defined (ACE_LACKS_PTHREAD_EXIT) ::pthread_exit (status); -# elif defined (ACE_HAS_STHREADS) - ::thr_exit (status); # elif defined (ACE_HAS_WTHREADS) // Can't call it here because on NT, the thread is exited // directly by ACE_Thread_Adapter::invoke (). @@ -4519,11 +4141,6 @@ ACE_OS::thr_keycreate_native (ACE_OS_thread_key_t *key, ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_key_create (key, dest), result), int); -# elif defined (ACE_HAS_STHREADS) - int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_keycreate (key, dest), - result), - int); # elif defined (ACE_HAS_WTHREADS) ACE_UNUSED_ARG (dest); *key = ::TlsAlloc (); @@ -4531,7 +4148,7 @@ ACE_OS::thr_keycreate_native (ACE_OS_thread_key_t *key, if (*key == ACE_SYSCALL_FAILED) ACE_FAIL_RETURN (-1); return 0; -# endif /* ACE_HAS_STHREADS */ +# endif /* ACE_HAS_PTHREADS */ # else ACE_UNUSED_ARG (key); ACE_UNUSED_ARG (dest); @@ -4625,9 +4242,6 @@ ACE_OS::thr_keyfree_native (ACE_OS_thread_key_t key) # endif /* ACE_LACKS_PTHREAD_KEY_DELETE */ # elif defined (ACE_HAS_THR_KEYDELETE) return ::thr_keydelete (key); -# elif defined (ACE_HAS_STHREADS) - ACE_UNUSED_ARG (key); - ACE_NOTSUP_RETURN (-1); # elif defined (ACE_HAS_WTHREADS) ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::TlsFree (key), ace_result_), int, -1); # else @@ -4684,36 +4298,7 @@ ACE_OS::thr_setprio (const ACE_Sched_Priority prio) ACE_hthread_t my_thread_id; ACE_OS::thr_self (my_thread_id); - int const status = ACE_OS::thr_setprio (my_thread_id, prio); - -#if defined (ACE_NEEDS_LWP_PRIO_SET) - // If the thread is in the RT class, then set the priority on its - // LWP. (Instead of doing this if the thread is in the RT class, it - // should be done for all bound threads. But, there doesn't appear - // to be an easy way to determine if the thread is bound.) - - if (status == 0) - { - // Find what scheduling class the thread's LWP is in. - ACE_Sched_Params sched_params (ACE_SCHED_OTHER, 0); - if (ACE_OS::lwp_getparams (sched_params) == -1) - { - return -1; - } - else if (sched_params.policy () == ACE_SCHED_FIFO || - sched_params.policy () == ACE_SCHED_RR) - { - // This thread's LWP is in the RT class, so we need to set - // its priority. - sched_params.priority (prio); - return ACE_OS::lwp_setparams (sched_params); - } - // else this is not an RT thread. Nothing more needs to be - // done. - } -#endif /* ACE_NEEDS_LWP_PRIO_SET */ - - return status; + return ACE_OS::thr_setprio (my_thread_id, prio); } # if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) @@ -4727,17 +4312,14 @@ ACE_OS::thr_setspecific_native (ACE_OS_thread_key_t key, void *data) ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_setspecific (key, data), result), int); -# elif defined (ACE_HAS_STHREADS) - int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_setspecific (key, data), result), int); # elif defined (ACE_HAS_WTHREADS) ::TlsSetValue (key, data); return 0; -# else /* ACE_HAS_STHREADS */ +# else /* ACE_HAS_PTHREADS */ ACE_UNUSED_ARG (key); ACE_UNUSED_ARG (data); ACE_NOTSUP_RETURN (-1); -# endif /* ACE_HAS_STHREADS */ +# endif /* ACE_HAS_PTHREADS */ # else ACE_UNUSED_ARG (key); ACE_UNUSED_ARG (data); diff --git a/ACE/ace/OS_NS_Thread.h b/ACE/ace/OS_NS_Thread.h index 8ae8f7141aa..18d38698efa 100644 --- a/ACE/ace/OS_NS_Thread.h +++ b/ACE/ace/OS_NS_Thread.h @@ -45,18 +45,6 @@ # endif # define ACE_EXPORT_MACRO ACE_Export -# if defined (ACE_HAS_PRIOCNTL) - // Need to #include thread.h before #defining THR_BOUND, etc., - // when building without threads on SunOS 5.x. -# if defined (sun) -# include /**/ <thread.h> -# endif /* sun */ - - // Need to #include these before #defining USYNC_PROCESS on SunOS 5.x. -# include /**/ <sys/rtpriocntl.h> -# include /**/ <sys/tspriocntl.h> -# endif /* ACE_HAS_PRIOCNTL */ - ACE_BEGIN_VERSIONED_NAMESPACE_DECL # if defined (ACE_WIN32) @@ -88,17 +76,9 @@ extern "C" { # if defined (ACE_HAS_THREADS) -# if defined (ACE_HAS_STHREADS) -# include /**/ <synch.h> -# include /**/ <thread.h> -# define ACE_SCOPE_PROCESS P_PID -# define ACE_SCOPE_LWP P_LWPID -# define ACE_SCOPE_THREAD (ACE_SCOPE_LWP + 1) -# else -# define ACE_SCOPE_PROCESS 0 -# define ACE_SCOPE_LWP 1 -# define ACE_SCOPE_THREAD 2 -# endif /* ACE_HAS_STHREADS */ +# define ACE_SCOPE_PROCESS 0 +# define ACE_SCOPE_LWP 1 +# define ACE_SCOPE_THREAD 2 # if !defined (ACE_HAS_PTHREADS) # define ACE_SCHED_OTHER 0 @@ -106,57 +86,7 @@ extern "C" { # define ACE_SCHED_RR 2 # endif /* ! ACE_HAS_PTHREADS */ -# if defined (ACE_HAS_PTHREADS) -// moved to pthread.h -# elif defined (ACE_HAS_STHREADS) - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - -// Solaris threads, without PTHREADS. -// Typedefs to help compatibility with Windows NT and Pthreads. -typedef thread_t ACE_thread_t; -// Native TSS key type (not for general use) -typedef thread_key_t ACE_OS_thread_key_t; -// Application TSS key type (use this type except in TSS Emulation) -# if defined (ACE_HAS_TSS_EMULATION) - typedef u_int ACE_thread_key_t; -# else /* ! ACE_HAS_TSS_EMULATION */ - typedef ACE_OS_thread_key_t ACE_thread_key_t; -# endif /* ! ACE_HAS_TSS_EMULATION */ -typedef mutex_t ACE_mutex_t; -# if !defined (ACE_LACKS_RWLOCK_T) -typedef rwlock_t ACE_rwlock_t; -# endif /* !ACE_LACKS_RWLOCK_T */ -# if !defined (ACE_HAS_POSIX_SEM) && !defined (ACE_USES_FIFO_SEM) -typedef sema_t ACE_sema_t; -# endif /* !ACE_HAS_POSIX_SEM */ - -typedef cond_t ACE_cond_t; -struct ACE_Export ACE_condattr_t -{ - int type; -}; -struct ACE_Export ACE_mutexattr_t -{ - int type; -}; -typedef ACE_thread_t ACE_hthread_t; -typedef ACE_mutex_t ACE_thread_mutex_t; - -ACE_END_VERSIONED_NAMESPACE_DECL - -# define THR_CANCEL_DISABLE 0 -# define THR_CANCEL_ENABLE 0 -# define THR_CANCEL_DEFERRED 0 -# define THR_CANCEL_ASYNCHRONOUS 0 -# define THR_JOINABLE 0 -# define THR_SCHED_FIFO 0 -# define THR_SCHED_RR 0 -# define THR_SCHED_DEFAULT 0 -# define THR_INHERIT_SCHED 0 -# define THR_SCOPE_PROCESS 0 - -# elif defined (ACE_VXWORKS) +# if defined (ACE_VXWORKS) # include /**/ <sysLib.h> // for sysClkRateGet() # include /**/ <types/vxTypes.h> # if !defined (__RTP__) @@ -230,8 +160,8 @@ typedef struct typedef ACE_VX_TASK_ID ACE_thread_t; typedef ACE_VX_TASK_ID ACE_hthread_t; // Key type: the ACE TSS emulation requires the key type be unsigned, -// for efficiency. (Current POSIX and Solaris TSS implementations also -// use u_int, so the ACE TSS emulation is compatible with them.) +// for efficiency. (Current POSIX implementation use u_int, so the +// ACE TSS emulation is compatible with them.) // Native TSS key type typedef u_int ACE_OS_thread_key_t; // Application TSS key type (use this type except in TSS Emulation) @@ -264,31 +194,7 @@ typedef struct typedef HANDLE ACE_event_t; # if defined (ACE_WIN32) -//@@ ACE_USES_WINCE_SEMA_SIMULATION is used to debug -// semaphore simulation on WinNT. It should be -// changed to ACE_USES_HAS_WINCE at some later point. -# if !defined (ACE_USES_WINCE_SEMA_SIMULATION) typedef HANDLE ACE_sema_t; -# else -/** - * @class ACE_sema_t - * - * @brief Semaphore simulation for Windows CE. - */ -class ACE_Export ACE_sema_t -{ -public: - /// Serializes access to @c count_. - ACE_thread_mutex_t lock_; - - /// This event is signaled whenever the count becomes non-zero. - ACE_event_t count_nonzero_; - - /// Current count of the semaphore. - u_int count_; -}; - -# endif /* ACE_USES_WINCE_SEMA_SIMULATION */ # endif /* defined (ACE_WIN32) */ ACE_END_VERSIONED_NAMESPACE_DECL @@ -448,11 +354,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL ACE_BEGIN_VERSIONED_NAMESPACE_DECL typedef pthread_rwlock_t ACE_rwlock_t; ACE_END_VERSIONED_NAMESPACE_DECL -# elif defined (ACE_HAS_STHREADS) -# include /**/ <synch.h> -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -typedef rwlock_t ACE_rwlock_t; -ACE_END_VERSIONED_NAMESPACE_DECL # endif /* ACE_LACKS_RWLOCK_T */ // Define some default thread priorities on all threaded platforms, if @@ -767,23 +668,10 @@ typedef DWORD ACE_id_t; typedef int ACE_pri_t; # define ACE_SELF (0) #else /* !defined (ACE_WIN32) */ -# if defined (ACE_HAS_IDTYPE_T) - typedef idtype_t ACE_idtype_t; -# else typedef int ACE_idtype_t; -# endif /* ACE_HAS_IDTYPE_T */ -# if defined (ACE_HAS_STHREADS) -# if defined (ACE_LACKS_PRI_T) - typedef int pri_t; -# endif /* ACE_LACKS_PRI_T */ - typedef id_t ACE_id_t; -# define ACE_SELF P_MYID - typedef pri_t ACE_pri_t; -# else /* ! ACE_HAS_STHREADS */ typedef long ACE_id_t; # define ACE_SELF (-1) typedef short ACE_pri_t; -# endif /* ! ACE_HAS_STHREADS */ #endif /* !defined (ACE_WIN32) */ # if defined (ACE_HAS_TSS_EMULATION) @@ -1055,10 +943,6 @@ extern "C" ACE_Export void ACE_MUTEX_LOCK_CLEANUP_ADAPTER_NAME (void *args); # define ACE_PTHREAD_CLEANUP_PUSH(A) pthread_cleanup_push (ACE_MUTEX_LOCK_CLEANUP_ADAPTER_NAME, (void *) A); # define ACE_PTHREAD_CLEANUP_POP(A) pthread_cleanup_pop(A) # elif defined (ACE_HAS_PTHREADS) && !defined (ACE_LACKS_PTHREAD_CLEANUP) -// Though we are defining a extern "C" function to match the prototype of -// pthread_cleanup_push, it is undone by the Solaris header file -// /usr/include/pthread.h. So this macro generates a warning under Solaris -// with SunCC. This is a bug in the Solaris header file. extern "C" ACE_Export void ACE_MUTEX_LOCK_CLEANUP_ADAPTER_NAME (void *args); # define ACE_PTHREAD_CLEANUP_PUSH(A) pthread_cleanup_push (ACE_MUTEX_LOCK_CLEANUP_ADAPTER_NAME, (void *) A); # define ACE_PTHREAD_CLEANUP_POP(A) pthread_cleanup_pop(A) @@ -1359,10 +1243,6 @@ namespace ACE_OS { //@} /// Low-level interface to @c priocntl(2). - /** - * Can't call the following priocntl, because that's a macro on - * Solaris. - */ ACE_NAMESPACE_INLINE_FUNCTION long priority_control (ACE_idtype_t, ACE_id_t, int, void *); diff --git a/ACE/ace/OS_NS_Thread.inl b/ACE/ace/OS_NS_Thread.inl index 0219e6dc1c6..a33b50b076f 100644 --- a/ACE/ace/OS_NS_Thread.inl +++ b/ACE/ace/OS_NS_Thread.inl @@ -16,10 +16,6 @@ # include "ace/Handle_Set.h" # endif /* ACE_USES_FIFO_SEM */ -#if defined (ACE_HAS_PRIOCNTL) -# include /**/ <sys/priocntl.h> -#endif /* ACE_HAS_PRIOCNTL */ - #if defined (ACE_HAS_ALLOC_HOOKS) # include "ace/Malloc_Base.h" #endif /* ACE_HAS_ALLOC_HOOKS */ @@ -247,15 +243,10 @@ ACE_OS::cond_broadcast (ACE_cond_t *cv) ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_cond_broadcast (cv), result), int); -# elif defined (ACE_HAS_STHREADS) - int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::cond_broadcast (cv), - result), - int); # elif defined (ACE_HAS_WTHREADS) && defined (ACE_HAS_WTHREADS_CONDITION_VARIABLE) ::WakeAllConditionVariable (cv); return 0; -# endif /* ACE_HAS_STHREADS */ +# endif /* ACE_HAS_PTHREADS */ # else ACE_UNUSED_ARG (cv); ACE_NOTSUP_RETURN (-1); @@ -270,13 +261,10 @@ ACE_OS::cond_destroy (ACE_cond_t *cv) # if defined (ACE_HAS_PTHREADS) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_cond_destroy (cv), result), int); -# elif defined (ACE_HAS_STHREADS) - int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::cond_destroy (cv), result), int); # elif defined (ACE_HAS_WTHREADS) && defined (ACE_HAS_WTHREADS_CONDITION_VARIABLE) // Windows doesn't have a destroy return 0; -# endif /* ACE_HAS_STHREADS */ +# endif /* ACE_HAS_PTHREADS */ # else ACE_UNUSED_ARG (cv); ACE_NOTSUP_RETURN (-1); @@ -312,17 +300,10 @@ ACE_OS::cond_init (ACE_cond_t *cv, result = -1; // ACE_ADAPT_RETVAL used it for intermediate status return result; -# elif defined (ACE_HAS_STHREADS) - int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::cond_init (cv, - attributes.type, - arg), - result), - int); # elif defined (ACE_HAS_WTHREADS) && defined (ACE_HAS_WTHREADS_CONDITION_VARIABLE) ::InitializeConditionVariable (cv); return 0; -# endif /* ACE_HAS_PTHREADS vs. ACE_HAS_STHREADS */ +# endif /* ACE_HAS_PTHREADS */ # else ACE_UNUSED_ARG (cv); ACE_UNUSED_ARG (attributes); @@ -360,13 +341,10 @@ ACE_OS::cond_signal (ACE_cond_t *cv) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_cond_signal (cv), result), int); -# elif defined (ACE_HAS_STHREADS) - int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::cond_signal (cv), result), int); # elif defined (ACE_HAS_WTHREADS) && defined (ACE_HAS_WTHREADS_CONDITION_VARIABLE) ::WakeConditionVariable (cv); return 0; -# endif /* ACE_HAS_STHREADS */ +# endif /* ACE_HAS_PTHREADS */ # else ACE_UNUSED_ARG (cv); ACE_NOTSUP_RETURN (-1); @@ -383,10 +361,6 @@ ACE_OS::cond_wait (ACE_cond_t *cv, int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_cond_wait (cv, external_mutex), result), int); -# elif defined (ACE_HAS_STHREADS) - int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::cond_wait (cv, external_mutex), result), - int); # elif defined (ACE_HAS_WTHREADS) && defined (ACE_HAS_WTHREADS_CONDITION_VARIABLE) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::SleepConditionVariableCS (cv, &external_mutex->thr_mutex_, INFINITE), result), @@ -420,20 +394,12 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv, (ACE_TIMESPEC_PTR) &ts), result), int, result); - // We need to adjust this to make the POSIX and Solaris return - // values consistent. EAGAIN is from Pthreads DRAFT4 (HP-UX 10.20 and down) + // We need to adjust this to make the POSIX return + // values consistent. EAGAIN is from Pthreads DRAFT4 if (result == -1 && (errno == ETIMEDOUT || errno == EAGAIN)) errno = ETIME; -# elif defined (ACE_HAS_STHREADS) - ACE_OSCALL (ACE_ADAPT_RETVAL (timeout == 0 - ? ::cond_wait (cv, external_mutex) - : ::cond_timedwait (cv, - external_mutex, - (timestruc_t*)&ts), - result), - int, result); # elif defined (ACE_HAS_WTHREADS) && defined (ACE_HAS_WTHREADS_CONDITION_VARIABLE) int msec_timeout = 0; if (timeout != 0) @@ -450,7 +416,7 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv, int, result); return result; -# endif /* ACE_HAS_STHREADS */ +# endif /* ACE_HAS_PTHREADS */ if (timeout != 0) timeout->set (ts); // Update the time value before returning. @@ -568,18 +534,10 @@ ACE_OS::event_init (ACE_event_t *event, #endif /* ACE_HAS_WCHAR */ ACE_INLINE long -ACE_OS::priority_control (ACE_idtype_t idtype, ACE_id_t identifier, int cmd, void *arg) +ACE_OS::priority_control (ACE_idtype_t /*idtype*/, ACE_id_t /*identifier*/, int /*cmd*/, void */*arg*/) { ACE_OS_TRACE ("ACE_OS::priority_control"); -#if defined (ACE_HAS_PRIOCNTL) - return priocntl (idtype, identifier, cmd, static_cast<caddr_t> (arg)); -#else /* ! ACE_HAS_PRIOCNTL*/ - ACE_UNUSED_ARG (idtype); - ACE_UNUSED_ARG (identifier); - ACE_UNUSED_ARG (cmd); - ACE_UNUSED_ARG (arg); ACE_NOTSUP_RETURN (-1); -#endif /* ! ACE_HAS_PRIOCNTL*/ } // This method is used to prepare the recursive mutex for releasing @@ -609,15 +567,7 @@ ACE_OS::recursive_mutex_cond_unlock (ACE_recursive_thread_mutex_t *m, // Windows variants that depend on existing values and limits. state.relock_count_ = 0; - while ( -# if !defined (ACE_HAS_WINCE) - m->LockCount > 0 && m->RecursionCount > 1 -# else - // WinCE doesn't have RecursionCount and the LockCount semantic - // Mobile 5 has it 1-indexed. - m->LockCount > 1 -# endif /* ACE_HAS_WINCE */ - ) + while (m->LockCount > 0 && m->RecursionCount > 1) { // This may fail if the current thread doesn't own the mutex. If it // does fail, it'll be on the first try, so don't worry about resetting @@ -1028,7 +978,7 @@ ACE_OS::rw_rdlock (ACE_rwlock_t *rw) ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_rwlock_rdlock (rw), result), int); -# else /* Solaris */ +# else /* ACE_HAS_PTHREADS_UNIX98_EXT */ int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rw_rdlock (rw), result), int); # endif /* ACE_HAS_PTHREADS_UNIX98_EXT */ @@ -1079,7 +1029,7 @@ ACE_OS::rw_tryrdlock (ACE_rwlock_t *rw) ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_rwlock_tryrdlock (rw), result), int); -# else /* Solaris */ +# else /* ACE_HAS_PTHREADS_UNIX98_EXT */ int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rw_tryrdlock (rw), result), int); # endif /* ACE_HAS_PTHREADS_UNIX98_EXT */ @@ -1122,7 +1072,7 @@ ACE_OS::rw_trywrlock (ACE_rwlock_t *rw) ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_rwlock_trywrlock (rw), result), int); -# else /* Solaris */ +# else /* ACE_HAS_PTHREADS_UNIX98_EXT */ int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rw_trywrlock (rw), result), int); # endif /* ACE_HAS_PTHREADS_UNIX98_EXT */ @@ -1171,8 +1121,7 @@ ACE_OS::rw_trywrlock_upgrade (ACE_rwlock_t *rw) result), int); # elif !defined (ACE_LACKS_RWLOCK_T) - // Some native rwlocks, such as those on Solaris, don't - // support the upgrade feature . . . + // Some native rwlocks ACE_UNUSED_ARG (rw); ACE_NOTSUP_RETURN (-1); # else /* NT, POSIX, and VxWorks don't support this natively. */ @@ -1243,7 +1192,7 @@ ACE_OS::rw_unlock (ACE_rwlock_t *rw) ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_rwlock_unlock (rw), result), int); -# else /* Solaris */ +# else /* ACE_HAS_PTHREADS_UNIX98_EXT */ int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rw_unlock (rw), result), int); # endif /* ACE_HAS_PTHREADS_UNIX98_EXT */ @@ -1302,7 +1251,7 @@ ACE_OS::rw_wrlock (ACE_rwlock_t *rw) ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_rwlock_wrlock (rw), result), int); -# else /* Solaris */ +# else /* ACE_HAS_PTHREADS_UNIX98_EXT */ int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rw_wrlock (rw), result), int); # endif /* ACE_HAS_PTHREADS_UNIX98_EXT */ @@ -1355,7 +1304,7 @@ ACE_OS::rwlock_destroy (ACE_rwlock_t *rw) ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_rwlock_destroy (rw), result), int); -# else /* Solaris */ +# else /* ACE_HAS_PTHREADS_UNIX98_EXT */ int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rwlock_destroy (rw), result), int); # endif /* ACE_HAS_PTHREADS_UNIX98_EXT */ @@ -1364,7 +1313,7 @@ ACE_OS::rwlock_destroy (ACE_rwlock_t *rw) ACE_OS::cond_destroy (&rw->waiting_readers_); ACE_OS::cond_destroy (&rw->waiting_important_writer_); return ACE_OS::cond_destroy (&rw->waiting_writers_); -# endif /* ACE_HAS_STHREADS && !defined (ACE_LACKS_RWLOCK_T) */ +# endif /* !defined (ACE_LACKS_RWLOCK_T) */ #else ACE_UNUSED_ARG (rw); ACE_NOTSUP_RETURN (-1); @@ -1474,28 +1423,18 @@ ACE_OS::sema_destroy (ACE_sema_t *s) int r2 = ACE_OS::close (s->fd_[1]); /* ignore error */ return r0 != 0 || r1 != 0 || r2 != 0 ? -1 : 0; #elif defined (ACE_HAS_THREADS) -# if defined (ACE_HAS_STHREADS) - int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::sema_destroy (s), result), int); -# elif defined (ACE_HAS_PTHREADS) +# if defined (ACE_HAS_PTHREADS) int r1 = ACE_OS::mutex_destroy (&s->lock_); int r2 = ACE_OS::cond_destroy (&s->count_nonzero_); return r1 != 0 || r2 != 0 ? -1 : 0; # elif defined (ACE_HAS_WTHREADS) -# if !defined (ACE_USES_WINCE_SEMA_SIMULATION) ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::CloseHandle (*s), ace_result_), int, -1); -# else /* ACE_USES_WINCE_SEMA_SIMULATION */ - // Free up underlying objects of the simulated semaphore. - int const r1 = ACE_OS::thread_mutex_destroy (&s->lock_); - int const r2 = ACE_OS::event_destroy (&s->count_nonzero_); - return r1 != 0 || r2 != 0 ? -1 : 0; -# endif /* ACE_USES_WINCE_SEMA_SIMULATION */ # elif defined (ACE_VXWORKS) int result; ACE_OSCALL (::semDelete (s->sema_), int, result); s->sema_ = 0; return result; -# endif /* ACE_HAS_STHREADS */ +# endif /* ACE_HAS_PTHREADS */ #else ACE_UNUSED_ARG (s); ACE_NOTSUP_RETURN (-1); @@ -1504,7 +1443,6 @@ ACE_OS::sema_destroy (ACE_sema_t *s) // NOTE: The previous four function definitions must appear before // ACE_OS::sema_init (). - ACE_INLINE int ACE_OS::sema_init (ACE_sema_t *s, u_int count, @@ -1616,23 +1554,6 @@ ACE_OS::sema_init (ACE_sema_t *s, # else if (name) { -# if defined (sun) || defined (HPUX) - // Solaris and HP-UX require the name to start with a slash. Solaris - // further requires that there be no other slashes than the first. - const char *last_slash = ACE_OS::strrchr (name, '/'); - char name2[MAXPATHLEN]; - if (0 == last_slash) - { - ACE_OS::strcpy (name2, "/"); - ACE_OS::strcat (name2, name); - name = name2; - } -# if defined (sun) - else - name = last_slash; // Chop off chars preceding last slash -# endif /* sun */ -# endif /* sun || HPUX */ - ACE_ALLOCATOR_RETURN (s->name_, ACE_OS::strdup (name), -1); @@ -1755,15 +1676,7 @@ ACE_OS::sema_init (ACE_sema_t *s, return 0; #elif defined (ACE_HAS_THREADS) -# if defined (ACE_HAS_STHREADS) - ACE_UNUSED_ARG (name); - ACE_UNUSED_ARG (max); - ACE_UNUSED_ARG (sa); - ACE_UNUSED_ARG (attributes); - int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::sema_init (s, count, type, arg), result), - int); -# elif defined (ACE_HAS_PTHREADS) +# if defined (ACE_HAS_PTHREADS) ACE_UNUSED_ARG (max); ACE_UNUSED_ARG (sa); int result = -1; @@ -1790,7 +1703,6 @@ ACE_OS::sema_init (ACE_sema_t *s, return result; # elif defined (ACE_HAS_WTHREADS) ACE_UNUSED_ARG (attributes); -# if ! defined (ACE_USES_WINCE_SEMA_SIMULATION) ACE_UNUSED_ARG (type); ACE_UNUSED_ARG (arg); // Create the semaphore with its value initialized to <count> and @@ -1812,40 +1724,6 @@ ACE_OS::sema_init (ACE_sema_t *s, ACE_OS::set_errno_to_last_error (); return 0; } -# else /* ACE_USES_WINCE_SEMA_SIMULATION */ - int result = -1; - - // Initialize internal object for semaphore simulation. - // Grab the lock as soon as possible when we initializing - // the semaphore count. Notice that we initialize the - // event object as "manually reset" so we can amortize the - // cost for singling/reseting the event. - // @@ I changed the mutex type to thread_mutex. Notice that this - // is basically a CriticalSection object and doesn't not has - // any security attribute whatsoever. However, since this - // semaphore implementation only works within a process, there - // shouldn't any security issue at all. - if (ACE_OS::thread_mutex_init (&s->lock_, type, name, (ACE_mutexattr_t *)arg) == 0 - && ACE_OS::event_init (&s->count_nonzero_, 1, - count > 0, type, name, arg, sa) == 0 - && ACE_OS::thread_mutex_lock (&s->lock_) == 0) - { - s->count_ = count; - - if (ACE_OS::thread_mutex_unlock (&s->lock_) == 0) - result = 0; - } - - // Destroy the internal objects if we didn't initialize - // either of them successfully. Don't bother to check - // for errors. - if (result == -1) - { - ACE_OS::thread_mutex_destroy (&s->lock_); - ACE_OS::event_destroy (&s->count_nonzero_); - } - return result; -# endif /* ACE_USES_WINCE_SEMA_SIMULATION */ # elif defined (ACE_VXWORKS) ACE_UNUSED_ARG (attributes); ACE_UNUSED_ARG (name); @@ -1855,7 +1733,7 @@ ACE_OS::sema_init (ACE_sema_t *s, s->name_ = 0; s->sema_ = ::semCCreate (type, count); return s->sema_ ? 0 : -1; -# endif /* ACE_HAS_STHREADS */ +# endif /* ACE_HAS_PTHREADS */ #else ACE_UNUSED_ARG (s); ACE_UNUSED_ARG (count); @@ -1895,7 +1773,6 @@ ACE_OS::sema_init (ACE_sema_t *s, { # if defined (ACE_HAS_WTHREADS) ACE_UNUSED_ARG (attributes); -# if ! defined (ACE_USES_WINCE_SEMA_SIMULATION) ACE_UNUSED_ARG (type); ACE_UNUSED_ARG (arg); // Create the semaphore with its value initialized to <count> and @@ -1917,40 +1794,6 @@ ACE_OS::sema_init (ACE_sema_t *s, ACE_OS::set_errno_to_last_error (); return 0; } -# else /* ACE_USES_WINCE_SEMA_SIMULATION */ - int result = -1; - - // Initialize internal object for semaphore simulation. - // Grab the lock as soon as possible when we initializing - // the semaphore count. Notice that we initialize the - // event object as "manually reset" so we can amortize the - // cost for singling/reseting the event. - // @@ I changed the mutex type to thread_mutex. Notice that this - // is basically a CriticalSection object and doesn't not has - // any security attribute whatsoever. However, since this - // semaphore implementation only works within a process, there - // shouldn't any security issue at all. - if (ACE_OS::thread_mutex_init (&s->lock_, type, name, (ACE_mutexattr_t *)arg) == 0 - && ACE_OS::event_init (&s->count_nonzero_, 1, - count > 0, type, name, arg, sa) == 0 - && ACE_OS::thread_mutex_lock (&s->lock_) == 0) - { - s->count_ = count; - - if (ACE_OS::thread_mutex_unlock (&s->lock_) == 0) - result = 0; - } - - // Destroy the internal objects if we didn't initialize - // either of them successfully. Don't bother to check - // for errors. - if (result == -1) - { - ACE_OS::thread_mutex_destroy (&s->lock_); - ACE_OS::event_destroy (&s->count_nonzero_); - } - return result; -# endif /* ACE_USES_WINCE_SEMA_SIMULATION */ # else /* ACE_HAS_WTHREADS */ // Just call the normal char version. return ACE_OS::sema_init (s, count, type, attributes, ACE_Wide_To_Ascii (name).char_rep (), arg, max, sa); @@ -2005,10 +1848,7 @@ ACE_OS::sema_post (ACE_sema_t *s) return 0; return -1; # elif defined (ACE_HAS_THREADS) -# if defined (ACE_HAS_STHREADS) - int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::sema_post (s), result), int); -# elif defined (ACE_HAS_PTHREADS) +# if defined (ACE_HAS_PTHREADS) int result = -1; if (ACE_OS::mutex_lock (&s->lock_) == 0) @@ -2024,32 +1864,12 @@ ACE_OS::sema_post (ACE_sema_t *s) } return result; # elif defined (ACE_HAS_WTHREADS) -# if !defined (ACE_USES_WINCE_SEMA_SIMULATION) ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::ReleaseSemaphore (*s, 1, 0), ace_result_), int, -1); -# else /* ACE_USES_WINCE_SEMA_SIMULATION */ - int result = -1; - - // Since we are simulating semaphores, we need to update semaphore - // count manually. Grab the lock to prevent race condition first. - if (ACE_OS::thread_mutex_lock (&s->lock_) == 0) - { - // Check the original state of event object. Single the event - // object in transition from semaphore not available to - // semaphore available. - if (s->count_++ <= 0) - result = ACE_OS::event_signal (&s->count_nonzero_); - else - result = 0; - - ACE_OS::thread_mutex_unlock (&s->lock_); - } - return result; -# endif /* ACE_USES_WINCE_SEMA_SIMULATION */ # elif defined (ACE_VXWORKS) return ::semGive (s->sema_); -# endif /* ACE_HAS_STHREADS */ +# endif /* ACE_HAS_PTHREADS */ # else ACE_UNUSED_ARG (s); ACE_NOTSUP_RETURN (-1); @@ -2059,16 +1879,16 @@ ACE_OS::sema_post (ACE_sema_t *s) ACE_INLINE int ACE_OS::sema_post (ACE_sema_t *s, u_int release_count) { -#if defined (ACE_WIN32) && !defined (ACE_USES_WINCE_SEMA_SIMULATION) +#if defined (ACE_WIN32) // Win32 supports this natively. ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::ReleaseSemaphore (*s, release_count, 0), ace_result_), int, -1); #else // On POSIX platforms we need to emulate this ourselves. // @@ We can optimize on this implementation. However, - // the semaphore promitive on Win32 doesn't allow one + // the semaphore primitive on Win32 doesn't allow one // to increase a semaphore to more than the count it was - // first initialized. Posix and solaris don't seem to have + // first initialized. Posix doesn't seem to have // this restriction. Should we impose the restriction in // our semaphore simulation? for (size_t i = 0; i < release_count; i++) @@ -2109,14 +1929,7 @@ ACE_OS::sema_trywait (ACE_sema_t *s) return rc == 1 ? 0 : (-1); # elif defined (ACE_HAS_THREADS) -# if defined (ACE_HAS_STHREADS) - // STHREADS semaphores set errno to EBUSY if trywait fails. - int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::sema_trywait (s), - result), - int); -# elif defined (ACE_HAS_PTHREADS) - +# if defined (ACE_HAS_PTHREADS) int result = -1; if (ACE_OS::mutex_lock (&s->lock_) == 0) @@ -2133,7 +1946,6 @@ ACE_OS::sema_trywait (ACE_sema_t *s) } return result; # elif defined (ACE_HAS_WTHREADS) -# if !defined (ACE_USES_WINCE_SEMA_SIMULATION) DWORD result = ::WaitForSingleObject (*s, 0); if (result == WAIT_OBJECT_0) @@ -2147,41 +1959,6 @@ ACE_OS::sema_trywait (ACE_sema_t *s) // This is a hack, we need to find an appropriate mapping... return -1; } -# else /* ACE_USES_WINCE_SEMA_SIMULATION */ - // Check the status of semaphore first. Return immediately - // if the semaphore is not available and avoid grabing the - // lock. - DWORD result = ::WaitForSingleObject (s->count_nonzero_, 0); - - if (result == WAIT_OBJECT_0) // Proceed when it is available. - { - ACE_OS::thread_mutex_lock (&s->lock_); - - // Need to double check if the semaphore is still available. - // The double checking scheme will slightly affect the - // efficiency if most of the time semaphores are not blocked. - result = ::WaitForSingleObject (s->count_nonzero_, 0); - if (result == WAIT_OBJECT_0) - { - // Adjust the semaphore count. Only update the event - // object status when the state changed. - s->count_--; - if (s->count_ <= 0) - ACE_OS::event_reset (&s->count_nonzero_); - result = 0; - } - - ACE_OS::thread_mutex_unlock (&s->lock_); - } - - // Translate error message to errno used by ACE. - if (result == WAIT_TIMEOUT) - errno = EBUSY; - else - ACE_OS::set_errno_to_last_error (); - // This is taken from the hack above. ;) - return -1; -# endif /* ACE_USES_WINCE_SEMA_SIMULATION */ # elif defined (ACE_VXWORKS) if (::semTake (s->sema_, NO_WAIT) == ERROR) if (errno == S_objLib_OBJ_UNAVAILABLE) @@ -2196,7 +1973,7 @@ ACE_OS::sema_trywait (ACE_sema_t *s) else // got the semaphore return 0; -# endif /* ACE_HAS_STHREADS */ +# endif /* ACE_HAS_PTHREADS */ # else ACE_UNUSED_ARG (s); ACE_NOTSUP_RETURN (-1); @@ -2215,10 +1992,7 @@ ACE_OS::sema_wait (ACE_sema_t *s) return 0; return -1; # elif defined (ACE_HAS_THREADS) -# if defined (ACE_HAS_STHREADS) - int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::sema_wait (s), result), int); -# elif defined (ACE_HAS_PTHREADS) +# if defined (ACE_HAS_PTHREADS) int result = 0; ACE_PTHREAD_CLEANUP_PUSH (&s->lock_); @@ -2252,7 +2026,6 @@ ACE_OS::sema_wait (ACE_sema_t *s) return result < 0 ? -1 : result; # elif defined (ACE_HAS_WTHREADS) -# if !defined (ACE_USES_WINCE_SEMA_SIMULATION) switch (::WaitForSingleObject (*s, INFINITE)) { case WAIT_OBJECT_0: @@ -2263,49 +2036,9 @@ ACE_OS::sema_wait (ACE_sema_t *s) return -1; } /* NOTREACHED */ -# else /* ACE_USES_WINCE_SEMA_SIMULATION */ - // Timed wait. - int result = -1; - for (;;) - // Check if the semaphore is avialable or not and wait forever. - // Don't bother to grab the lock if it is not available (to avoid - // deadlock.) - switch (::WaitForSingleObject (s->count_nonzero_, INFINITE)) - { - case WAIT_OBJECT_0: - ACE_OS::thread_mutex_lock (&s->lock_); - - // Need to double check if the semaphore is still available. - // This time, we shouldn't wait at all. - if (::WaitForSingleObject (s->count_nonzero_, 0) == WAIT_OBJECT_0) - { - // Decrease the internal counter. Only update the event - // object's status when the state changed. - s->count_--; - if (s->count_ <= 0) - ACE_OS::event_reset (&s->count_nonzero_); - result = 0; - } - - ACE_OS::thread_mutex_unlock (&s->lock_); - // if we didn't get a hold on the semaphore, the result won't - // be 0 and thus, we'll start from the beginning again. - if (result == 0) - return 0; - break; - - default: - // Since we wait indefinitely, anything other than - // WAIT_OBJECT_O indicates an error. - ACE_OS::set_errno_to_last_error (); - // This is taken from the hack above. ;) - return -1; - } - /* NOTREACHED */ -# endif /* ACE_USES_WINCE_SEMA_SIMULATION */ # elif defined (ACE_VXWORKS) return ::semTake (s->sema_, WAIT_FOREVER); -# endif /* ACE_HAS_STHREADS */ +# endif /* ACE_HAS_PTHREADS */ # else ACE_UNUSED_ARG (s); ACE_NOTSUP_RETURN (-1); @@ -2410,11 +2143,7 @@ ACE_OS::sema_wait (ACE_sema_t *s, ACE_Time_Value &tv) return -1; # elif defined (ACE_HAS_THREADS) -# if defined (ACE_HAS_STHREADS) - ACE_UNUSED_ARG (s); - ACE_UNUSED_ARG (tv); - ACE_NOTSUP_RETURN (-1); -# elif defined (ACE_HAS_PTHREADS) +# if defined (ACE_HAS_PTHREADS) int result = 0; ACE_Errno_Guard error (errno); @@ -2455,7 +2184,6 @@ ACE_OS::sema_wait (ACE_sema_t *s, ACE_Time_Value &tv) ACE_PTHREAD_CLEANUP_POP (0); return result < 0 ? -1 : result; # elif defined (ACE_HAS_WTHREADS) -# if !defined (ACE_USES_WINCE_SEMA_SIMULATION) int msec_timeout; if (tv == ACE_Time_Value::zero) @@ -2489,78 +2217,6 @@ ACE_OS::sema_wait (ACE_sema_t *s, ACE_Time_Value &tv) return -1; } /* NOTREACHED */ -# else /* ACE_USES_WINCE_SEMA_SIMULATION */ - // Note that in this mode, the acquire is done in two steps, and - // we may get signaled but cannot grab the semaphore before - // timeout. In that case, we'll need to restart the process with - // updated timeout value. - - // tv is an absolute time, but we need relative to work with the Windows - // API. Also, some users have become accustomed to using a 0 time value - // as a shortcut for "now", which works on non-Windows because 0 is - // always earlier than now. However, the need to convert to relative time - // means we need to watch out for this case. - ACE_Time_Value relative_time (ACE_Time_Value::zero); - if (tv != ACE_Time_Value::zero) - relative_time = tv.to_relative_time (); - int result = -1; - - // While we are not timeout yet. >= 0 will let this go through once - // and if not able to get the object, it should hit WAIT_TIMEOUT - // right away. - while (relative_time >= ACE_Time_Value::zero) - { - // Wait for our turn to get the object. - switch (::WaitForSingleObject (s->count_nonzero_, relative_time.msec ())) - { - case WAIT_OBJECT_0: - ACE_OS::thread_mutex_lock (&s->lock_); - - // Need to double check if the semaphore is still available. - // We can only do a "try lock" styled wait here to avoid - // blocking threads that want to signal the semaphore. - if (::WaitForSingleObject (s->count_nonzero_, 0) == WAIT_OBJECT_0) - { - // As before, only reset the object when the semaphore - // is no longer available. - s->count_--; - if (s->count_ <= 0) - ACE_OS::event_reset (&s->count_nonzero_); - result = 0; - } - - ACE_OS::thread_mutex_unlock (&s->lock_); - - // Only return when we successfully get the semaphore. - if (result == 0) - { - tv = tv.now (); // Update to time acquired - return 0; - } - break; - - // We have timed out. - case WAIT_TIMEOUT: - errno = ETIME; - return -1; - - // What? - default: - ACE_OS::set_errno_to_last_error (); - // This is taken from the hack above. ;) - return -1; - }; - - // Haven't been able to get the semaphore yet, update the - // timeout value to reflect the remaining time we want to wait. - // in case of tv == 0 relative_time will now be < 0 and we will be out of time - relative_time = tv.to_relative_time (); - } - - // We have timed out. - errno = ETIME; - return -1; -# endif /* ACE_USES_WINCE_SEMA_SIMULATION */ # elif defined (ACE_VXWORKS) // Note that we must convert between absolute time (which is // passed as a parameter) and relative time (which is what @@ -2586,7 +2242,7 @@ ACE_OS::sema_wait (ACE_sema_t *s, ACE_Time_Value &tv) tv = tv.now (); // Update to time acquired return 0; } -# endif /* ACE_HAS_STHREADS */ +# endif /* ACE_HAS_PTHREADS */ # else ACE_UNUSED_ARG (s); ACE_UNUSED_ARG (tv); @@ -2682,14 +2338,6 @@ ACE_OS::sigwait (sigset_t *sset, int *sig) # if (defined (__FreeBSD__) && (__FreeBSD__ < 3)) ACE_UNUSED_ARG (sset); ACE_NOTSUP_RETURN (-1); -# elif defined (ACE_HAS_STHREADS) - # if (_POSIX_C_SOURCE - 0 >= 199506L) || defined (_POSIX_PTHREAD_SEMANTICS) - errno = ::sigwait (sset, sig); - return errno == 0 ? *sig : -1; - #else - *sig = ::sigwait (sset); - return *sig; - #endif /* _POSIX_C_SOURCE - 0 >= 199506L || _POSIX_PTHREAD_SEMANTICS */ # elif defined (ACE_HAS_PTHREADS) # if defined (CYGWIN32) // Cygwin has sigwait definition, but it is not implemented @@ -2777,10 +2425,7 @@ ACE_OS::thr_continue (ACE_hthread_t target_thread) { ACE_OS_TRACE ("ACE_OS::thr_continue"); #if defined (ACE_HAS_THREADS) -# if defined (ACE_HAS_STHREADS) - int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_continue (target_thread), result), int); -# elif defined (ACE_HAS_PTHREADS) +# if defined (ACE_HAS_PTHREADS) # if defined (ACE_HAS_PTHREAD_CONTINUE) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_continue (target_thread), @@ -2808,7 +2453,7 @@ ACE_OS::thr_continue (ACE_hthread_t target_thread) return 0; # elif defined (ACE_HAS_VXTHREADS) return ::taskResume (target_thread); -# endif /* ACE_HAS_STHREADS */ +# endif /* ACE_HAS_PTHREADS */ #else ACE_UNUSED_ARG (target_thread); ACE_NOTSUP_RETURN (-1); @@ -2820,13 +2465,11 @@ ACE_OS::thr_getconcurrency () { ACE_OS_TRACE ("ACE_OS::thr_getconcurrency"); #if defined (ACE_HAS_THREADS) -# if defined (ACE_HAS_STHREADS) - return ::thr_getconcurrency (); -# elif defined (ACE_HAS_PTHREADS) && defined (ACE_HAS_PTHREAD_GETCONCURRENCY) +# if defined (ACE_HAS_PTHREADS) && defined (ACE_HAS_PTHREAD_GETCONCURRENCY) return pthread_getconcurrency (); # else ACE_NOTSUP_RETURN (-1); -# endif /* ACE_HAS_STHREADS */ +# endif /* ACE_HAS_PTHREADS */ #else ACE_NOTSUP_RETURN (-1); #endif /* ACE_HAS_THREADS */ @@ -2849,17 +2492,9 @@ ACE_OS::thr_getprio (ACE_hthread_t ht_id, int &priority, int &policy) result); priority = param.sched_priority; return result; -# elif defined (ACE_HAS_STHREADS) - int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_getprio (ht_id, &priority), result), int); # elif defined (ACE_HAS_WTHREADS) ACE_Errno_Guard error (errno); - -# if defined (ACE_HAS_WINCE) && !defined (ACE_LACKS_CE_THREAD_PRIORITY) - priority = ::CeGetThreadPriority (ht_id); -# else priority = ::GetThreadPriority (ht_id); -# endif /* defined (ACE_HAS_WINCE) && !defined (ACE_LACKS_CE_THREAD_PRIORITY) */ # if defined (ACE_HAS_PHARLAP) # if defined (ACE_PHARLAP_LABVIEW_RT) @@ -2868,14 +2503,12 @@ ACE_OS::thr_getprio (ACE_hthread_t ht_id, int &priority, int &policy) DWORD timeslice = ::EtsGetTimeSlice (); policy = timeslice == 0 ? ACE_SCHED_OTHER : ACE_SCHED_FIFO; # endif /* ACE_PHARLAP_LABVIEW_RT */ -# elif !defined (ACE_HAS_WINCE) - DWORD priority_class = ::GetPriorityClass (::GetCurrentProcess ()); +# else + DWORD const priority_class = ::GetPriorityClass (::GetCurrentProcess ()); if (priority_class == 0 && (error = ::GetLastError ()) != NO_ERROR) ACE_FAIL_RETURN (-1); - policy = - (priority_class == - REALTIME_PRIORITY_CLASS) ? ACE_SCHED_FIFO : ACE_SCHED_OTHER; + policy = (priority_class == REALTIME_PRIORITY_CLASS) ? ACE_SCHED_FIFO : ACE_SCHED_OTHER; # endif /* ACE_HAS_PHARLAP */ return 0; @@ -2885,7 +2518,7 @@ ACE_OS::thr_getprio (ACE_hthread_t ht_id, int &priority, int &policy) ACE_UNUSED_ARG (ht_id); ACE_UNUSED_ARG (priority); ACE_NOTSUP_RETURN (-1); -# endif /* ACE_HAS_STHREADS */ +# endif /* ACE_HAS_PTHREADS */ #else ACE_UNUSED_ARG (ht_id); ACE_UNUSED_ARG (priority); @@ -2909,9 +2542,6 @@ ACE_OS::thr_getspecific_native (ACE_OS_thread_key_t key, void **data) # if defined (ACE_HAS_PTHREADS) *data = pthread_getspecific (key); return 0; -# elif defined (ACE_HAS_STHREADS) - int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_getspecific (key, data), result), int); # elif defined (ACE_HAS_WTHREADS) *data = ::TlsGetValue (key); if (*data == 0 && ::GetLastError () != NO_ERROR) @@ -2967,11 +2597,7 @@ ACE_OS::thr_join (ACE_hthread_t thr_handle, { ACE_OS_TRACE ("ACE_OS::thr_join"); #if defined (ACE_HAS_THREADS) -# if defined (ACE_HAS_STHREADS) - int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_join (thr_handle, 0, status), result), - int); -# elif defined (ACE_HAS_PTHREADS) +# if defined (ACE_HAS_PTHREADS) # if defined (ACE_LACKS_PTHREAD_JOIN) ACE_UNUSED_ARG (thr_handle); ACE_UNUSED_ARG (status); @@ -3016,7 +2642,7 @@ ACE_OS::thr_join (ACE_hthread_t thr_handle, ACE_UNUSED_ARG (thr_handle); ACE_UNUSED_ARG (status); ACE_NOTSUP_RETURN (-1); -# endif /* ACE_HAS_STHREADS */ +# endif /* ACE_HAS_PTHREADS */ #else ACE_UNUSED_ARG (thr_handle); ACE_UNUSED_ARG (status); @@ -3031,11 +2657,7 @@ ACE_OS::thr_join (ACE_thread_t waiter_id, { ACE_OS_TRACE ("ACE_OS::thr_join"); #if defined (ACE_HAS_THREADS) -# if defined (ACE_HAS_STHREADS) - int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_join (waiter_id, thr_id, status), result), - int); -# elif defined (ACE_HAS_PTHREADS) +# if defined (ACE_HAS_PTHREADS) # if defined (ACE_LACKS_PTHREAD_JOIN) ACE_UNUSED_ARG (waiter_id); ACE_UNUSED_ARG (thr_id); @@ -3055,7 +2677,7 @@ ACE_OS::thr_join (ACE_thread_t waiter_id, // This could be implemented if the DLL-Main function or the // task exit base class some log the threads which have exited ACE_NOTSUP_RETURN (-1); -# endif /* ACE_HAS_STHREADS */ +# endif /* ACE_HAS_PTHREADS */ #else ACE_UNUSED_ARG (waiter_id); ACE_UNUSED_ARG (thr_id); @@ -3081,11 +2703,6 @@ ACE_OS::thr_kill (ACE_thread_t thr_id, int signum) result), int); # endif /* ACE_LACKS_PTHREAD_KILL */ -# elif defined (ACE_HAS_STHREADS) - int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_kill (thr_id, signum), - result), - int); # elif defined (ACE_HAS_VXTHREADS) //FUZZ: disable check_for_lack_ACE_OS return ::kill (thr_id, signum); @@ -3094,7 +2711,7 @@ ACE_OS::thr_kill (ACE_thread_t thr_id, int signum) ACE_UNUSED_ARG (thr_id); ACE_UNUSED_ARG (signum); ACE_NOTSUP_RETURN (-1); -# endif /* ACE_HAS_STHREADS */ +# endif /* ACE_HAS_PTHREADS */ #else ACE_UNUSED_ARG (thr_id); ACE_UNUSED_ARG (signum); @@ -3107,14 +2724,7 @@ ACE_OS::thr_min_stack () { ACE_OS_TRACE ("ACE_OS::thr_min_stack"); #if defined (ACE_HAS_THREADS) -# if defined (ACE_HAS_STHREADS) -# if defined (ACE_HAS_THR_MINSTACK) - // Tandem did some weirdo mangling of STHREAD names... - return ::thr_minstack (); -# else - return ::thr_min_stack (); -# endif /* !ACE_HAS_THR_MINSTACK */ -# elif defined (ACE_HAS_PTHREADS) +# if defined (ACE_HAS_PTHREADS) # if defined (_SC_THREAD_STACK_MIN) return (size_t) ACE_OS::sysconf (_SC_THREAD_STACK_MIN); # elif defined (PTHREAD_STACK_MIN) @@ -3136,7 +2746,7 @@ ACE_OS::thr_min_stack () return status == OK ? taskDesc.td_stackSize : 0; # else /* Should not happen... */ ACE_NOTSUP_RETURN (0); -# endif /* ACE_HAS_STHREADS */ +# endif /* ACE_HAS_PTHREADS */ #else ACE_NOTSUP_RETURN (0); #endif /* ACE_HAS_THREADS */ @@ -3192,13 +2802,11 @@ ACE_OS::thr_self () # if defined (ACE_HAS_PTHREADS) // Note, don't use "::" here since the following call is often a macro. return pthread_self (); -# elif defined (ACE_HAS_STHREADS) - return ::thr_self (); # elif defined (ACE_HAS_WTHREADS) return ::GetCurrentThreadId (); # elif defined (ACE_HAS_VXTHREADS) return ::taskIdSelf (); -# endif /* ACE_HAS_STHREADS */ +# endif /* ACE_HAS_PTHREADS */ #else return 1; // Might as well make it the first thread ;-) #endif /* ACE_HAS_THREADS */ @@ -3228,13 +2836,11 @@ ACE_OS::thr_self (ACE_hthread_t &self) self = pthread_self (); # elif defined (ACE_HAS_THREAD_SELF) self = ::thread_self (); -# elif defined (ACE_HAS_STHREADS) - self = ::thr_self (); # elif defined (ACE_HAS_WTHREADS) self = ::GetCurrentThread (); # elif defined (ACE_HAS_VXTHREADS) self = ::taskIdSelf (); -# endif /* ACE_HAS_STHREADS */ +# endif /* ACE_HAS_PTHREADS */ #else self = 1; // Might as well make it the main thread ;-) #endif /* ACE_HAS_THREADS */ @@ -3276,10 +2882,6 @@ ACE_OS::thr_setcancelstate (int new_state, int *old_state) break; } return result; -# elif defined (ACE_HAS_STHREADS) - ACE_UNUSED_ARG (new_state); - ACE_UNUSED_ARG (old_state); - ACE_NOTSUP_RETURN (-1); # elif defined (ACE_HAS_WTHREADS) ACE_UNUSED_ARG (new_state); ACE_UNUSED_ARG (old_state); @@ -3349,18 +2951,13 @@ ACE_OS::thr_setconcurrency (int hint) { ACE_OS_TRACE ("ACE_OS::thr_setconcurrency"); #if defined (ACE_HAS_THREADS) -# if defined (ACE_HAS_STHREADS) - int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_setconcurrency (hint), - result), - int); -# elif defined (ACE_HAS_PTHREADS) && defined (ACE_HAS_PTHREAD_SETCONCURRENCY) +# if defined (ACE_HAS_PTHREADS) && defined (ACE_HAS_PTHREAD_SETCONCURRENCY) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_setconcurrency (hint), result), int); # else ACE_UNUSED_ARG (hint); ACE_NOTSUP_RETURN (-1); -# endif /* ACE_HAS_STHREADS */ +# endif /* ACE_HAS_PTHREADS */ #else ACE_UNUSED_ARG (hint); ACE_NOTSUP_RETURN (-1); @@ -3397,21 +2994,10 @@ ACE_OS::thr_setprio (ACE_hthread_t ht_id, int priority, int policy) ¶m), result), int); -# elif defined (ACE_HAS_STHREADS) - int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_setprio (ht_id, priority), result), int); # elif defined (ACE_HAS_WTHREADS) - -# if defined (ACE_HAS_WINCE) && !defined (ACE_LACKS_CE_THREAD_PRIORITY) - ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::CeSetThreadPriority (ht_id, priority), - ace_result_), - int, -1); -# else ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::SetThreadPriority (ht_id, priority), ace_result_), int, -1); -# endif /* defined (ACE_HAS_WINCE) && !defined (ACE_LACKS_CE_THREAD_PRIORITY) */ - # elif defined (ACE_HAS_VXTHREADS) ACE_OSCALL_RETURN (::taskPrioritySet (ht_id, priority), int); # else @@ -3419,7 +3005,7 @@ ACE_OS::thr_setprio (ACE_hthread_t ht_id, int priority, int policy) ACE_UNUSED_ARG (ht_id); ACE_UNUSED_ARG (priority); ACE_NOTSUP_RETURN (-1); -# endif /* ACE_HAS_STHREADS */ +# endif /* ACE_HAS_PTHREADS */ #else ACE_UNUSED_ARG (ht_id); ACE_UNUSED_ARG (priority); @@ -3435,7 +3021,7 @@ ACE_OS::thr_sigsetmask (int how, ACE_OS_TRACE ("ACE_OS::thr_sigsetmask"); #if defined (ACE_HAS_THREADS) # if defined (ACE_LACKS_PTHREAD_THR_SIGSETMASK) - // DCE threads and Solaris 2.4 have no such function. + // DCE threads ACE_UNUSED_ARG (osm); ACE_UNUSED_ARG (nsm); ACE_UNUSED_ARG (how); @@ -3444,9 +3030,6 @@ ACE_OS::thr_sigsetmask (int how, # elif defined (ACE_HAS_SIGTHREADMASK) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::sigthreadmask (how, nsm, osm), result), int); -# elif defined (ACE_HAS_STHREADS) - int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_sigsetmask (how, nsm, osm), result), int); # elif defined (ACE_HAS_PTHREADS) # if !defined (ACE_LACKS_PTHREAD_SIGMASK) int result; @@ -3511,10 +3094,7 @@ ACE_OS::thr_suspend (ACE_hthread_t target_thread) { ACE_OS_TRACE ("ACE_OS::thr_suspend"); #if defined (ACE_HAS_THREADS) -# if defined (ACE_HAS_STHREADS) - int result; - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_suspend (target_thread), result), int, -1); -# elif defined (ACE_HAS_PTHREADS) +# if defined (ACE_HAS_PTHREADS) # if defined (ACE_HAS_PTHREAD_SUSPEND) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_suspend (target_thread), result), int); @@ -3533,7 +3113,7 @@ ACE_OS::thr_suspend (ACE_hthread_t target_thread) /* NOTREACHED */ # elif defined (ACE_HAS_VXTHREADS) return ::taskSuspend (target_thread); -# endif /* ACE_HAS_STHREADS */ +# endif /* ACE_HAS_PTHREADS */ #else ACE_UNUSED_ARG (target_thread); ACE_NOTSUP_RETURN (-1); @@ -3547,9 +3127,6 @@ ACE_OS::thr_testcancel () #if defined (ACE_HAS_THREADS) # if defined (ACE_HAS_PTHREADS) && !defined (ACE_LACKS_PTHREAD_CANCEL) pthread_testcancel (); -# elif defined (ACE_HAS_STHREADS) -# elif defined (ACE_HAS_WTHREADS) -# elif defined (ACE_HAS_VXTHREADS) # else // no-op: can't use ACE_NOTSUP_RETURN because there is no return value # endif /* ACE_HAS_PTHREADS */ @@ -3564,8 +3141,6 @@ ACE_OS::thr_yield () #if defined (ACE_HAS_THREADS) # if defined (ACE_HAS_PTHREADS) ::sched_yield (); -# elif defined (ACE_HAS_STHREADS) - ::thr_yield (); # elif defined (ACE_HAS_WTHREADS) ::Sleep (0); # elif defined (ACE_HAS_VXTHREADS) @@ -3574,7 +3149,7 @@ ACE_OS::thr_yield () // Now, it does seem to work. The context_switch_time test // works fine with task_delay set to 0. ::taskDelay (0); -# endif /* ACE_HAS_STHREADS */ +# endif /* ACE_HAS_PTHREADS */ #else ; #endif /* ACE_HAS_THREADS */ @@ -3622,13 +3197,13 @@ ACE_OS::thread_mutex_init (ACE_thread_mutex_t *m, } return 0; -# elif defined (ACE_HAS_STHREADS) || defined (ACE_HAS_PTHREADS) +# elif defined (ACE_HAS_PTHREADS) // Force the use of USYNC_THREAD! return ACE_OS::mutex_init (m, USYNC_THREAD, name, arg, 0, lock_type); # elif defined (ACE_HAS_VXTHREADS) return mutex_init (m, lock_type, name, arg); -# endif /* ACE_HAS_STHREADS || ACE_HAS_PTHREADS */ +# endif /* ACE_HAS_PTHREADS */ #else ACE_UNUSED_ARG (m); @@ -3665,12 +3240,12 @@ ACE_OS::thread_mutex_init (ACE_thread_mutex_t *m, } return 0; -# elif defined (ACE_HAS_STHREADS) || defined (ACE_HAS_PTHREADS) +# elif defined (ACE_HAS_PTHREADS) // Force the use of USYNC_THREAD! return ACE_OS::mutex_init (m, USYNC_THREAD, name, arg, 0, lock_type); # elif defined (ACE_HAS_VXTHREADS) return mutex_init (m, lock_type, name, arg); -# endif /* ACE_HAS_STHREADS || ACE_HAS_PTHREADS */ +# endif /* ACE_HAS_PTHREADS */ #else ACE_UNUSED_ARG (m); ACE_UNUSED_ARG (lock_type); @@ -3753,7 +3328,7 @@ ACE_OS::thread_mutex_trylock (ACE_thread_mutex_t *m) ACE_UNUSED_ARG (m); ACE_NOTSUP_RETURN (-1); # endif /* ACE_HAS_WIN32_TRYLOCK */ -# elif defined (ACE_HAS_STHREADS) || defined (ACE_HAS_PTHREADS) || defined (ACE_VXWORKS) +# elif defined (ACE_HAS_PTHREADS) || defined (ACE_VXWORKS) return ACE_OS::mutex_trylock (m); #endif /* Threads variety case */ diff --git a/ACE/ace/OS_NS_dirent.h b/ACE/ace/OS_NS_dirent.h index 98298083e24..5d0a3f5addd 100644 --- a/ACE/ace/OS_NS_dirent.h +++ b/ACE/ace/OS_NS_dirent.h @@ -42,9 +42,6 @@ extern "C" { typedef int (*ACE_SCANDIR_OS_COMPARATOR)(const void *f1, const void *f2); #endif /* ACE_SCANDIR_CMP_USES_VOIDPTR */ typedef int (*ACE_SCANDIR_COMPARATOR)(const ACE_DIRENT **f1, const ACE_DIRENT **f2); -#if defined (ACE_SCANDIR_SEL_LACKS_CONST) - typedef int (*ACE_SCANDIR_OS_SELECTOR)(ACE_DIRENT *filename); -#endif /* ACE_SCANDIR_SEL_LACKS_CONST */ typedef int (*ACE_SCANDIR_SELECTOR)(const ACE_DIRENT *filename); } diff --git a/ACE/ace/OS_NS_dirent.inl b/ACE/ace/OS_NS_dirent.inl index f55ec13406e..88a5154e0a5 100644 --- a/ACE/ace/OS_NS_dirent.inl +++ b/ACE/ace/OS_NS_dirent.inl @@ -37,8 +37,6 @@ opendir (const ACE_TCHAR *filename) return ::ACE_OS::opendir_emulation (filename); # elif defined (ACE_HAS_WOPENDIR) && defined (ACE_USES_WCHAR) return ::wopendir (filename); -# elif defined (ACE_HAS_NONCONST_OPENDIR) - return ::opendir (const_cast<char *> (filename)); # else /* ! ACE_WIN32 && ACE_LACKS_OPENDIR */ return ::opendir (ACE_TEXT_ALWAYS_CHAR (filename)); # endif /* ACE_WIN32 && ACE_LACKS_OPENDIR */ @@ -88,11 +86,7 @@ scandir (const ACE_TCHAR *dirname, #if defined (ACE_HAS_SCANDIR) return ::scandir (ACE_TEXT_ALWAYS_CHAR (dirname), namelist, -# if defined (ACE_SCANDIR_SEL_LACKS_CONST) - reinterpret_cast<ACE_SCANDIR_OS_SELECTOR> (selector), -# else selector, -# endif /* ACE_SCANDIR_SEL_LACKS_CONST */ # if defined (ACE_SCANDIR_CMP_USES_VOIDPTR) || \ defined (ACE_SCANDIR_CMP_USES_CONST_VOIDPTR) reinterpret_cast<ACE_SCANDIR_OS_COMPARATOR> (comparator)); diff --git a/ACE/ace/OS_NS_dlfcn.inl b/ACE/ace/OS_NS_dlfcn.inl index 840ef48e1bb..b9928e2936a 100644 --- a/ACE/ace/OS_NS_dlfcn.inl +++ b/ACE/ace/OS_NS_dlfcn.inl @@ -40,22 +40,6 @@ ACE_OS::dlclose (ACE_SHLIB_HANDLE handle) return ::dlclose (handle); #elif defined (ACE_WIN32) ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::FreeLibrary (handle), ace_result_), int, -1); -#elif defined (__hpux) - // HP-UX 10.x and 32-bit 11.00 do not pay attention to the ref count - // when unloading a dynamic lib. So, if the ref count is more than - // 1, do not unload the lib. This will cause a library loaded more - // than once to not be unloaded until the process runs down, but - // that's life. It's better than unloading a library that's in use. - // So far as I know, there's no way to decrement the refcnt that the - // kernel is looking at - the shl_descriptor is a copy of what the - // kernel has, not the actual struct. On 64-bit HP-UX using dlopen, - // this problem has been fixed. - struct shl_descriptor desc; - if (shl_gethandle_r (handle, &desc) == -1) - return -1; - if (desc.ref_count > 1) - return 0; - return ::shl_unload (handle); #else ACE_UNUSED_ARG (handle); ACE_NOTSUP_RETURN (-1); @@ -79,7 +63,7 @@ ACE_OS::dlerror () # else return const_cast <char *> (err); # endif /* ACE_USES_WCHAR */ -# elif defined (__hpux) || defined (ACE_VXWORKS) +# elif defined (ACE_VXWORKS) //FUZZ: disable check_for_lack_ACE_OS return ::strerror(errno); //FUZZ: enable check_for_lack_ACE_OS @@ -133,8 +117,6 @@ ACE_OS::dlopen (const ACE_TCHAR *fname, ACE_UNUSED_ARG (mode); ACE_WIN32CALL_RETURN (ACE_TEXT_LoadLibrary (fname), ACE_SHLIB_HANDLE, 0); -# elif defined (__hpux) - return ::shl_load(fname, mode, 0L); # elif defined (ACE_VXWORKS) && !defined (__RTP__) ACE_UNUSED_ARG (mode); MODULE* handle = 0; @@ -182,25 +164,14 @@ ACE_OS::dlsym (ACE_SHLIB_HANDLE handle, return nullptr; // Get the correct OS type. -#if defined (ACE_HAS_WINCE) - // CE (at least thru Pocket PC 2003) offers GetProcAddressW, not ...A, so - // we always need a wide-char string. - const wchar_t *symbolname = 0; -# if defined (ACE_USES_WCHAR) - symbolname = sname; -# else - ACE_Ascii_To_Wide sname_xlate (sname); - symbolname = sname_xlate.wchar_rep (); -# endif /* ACE_USES_WCHAR */ -#elif defined (ACE_USES_WCHAR) - // WinCE is WCHAR always; other platforms need a char * symbol name +#if defined (ACE_USES_WCHAR) ACE_Wide_To_Ascii w_sname (sname); char *symbolname = w_sname.char_rep (); #elif defined (ACE_VXWORKS) char *symbolname = const_cast<char *> (sname); #else const char *symbolname = sname; -#endif /* ACE_HAS_WINCE */ +#endif /* ACE_USES_WCHAR */ # if defined (ACE_HAS_SVR4_DYNAMIC_LINKING) @@ -217,21 +188,9 @@ ACE_OS::dlsym (ACE_SHLIB_HANDLE handle, # else return ::dlsym (handle, symbolname); # endif /* ACE_USES_ASM_SYMBOL_IN_DLSYM */ - # elif defined (ACE_WIN32) - ACE_WIN32CALL_RETURN (::GetProcAddress (handle, symbolname), void *, 0); - -# elif defined (__hpux) - - void *value {}; - int status = 0; - shl_t _handle = handle; - ACE_OSCALL (::shl_findsym(&_handle, symbolname, TYPE_UNDEFINED, &value), int, status); - return status == 0 ? value : nullptr; - # elif defined (ACE_VXWORKS) && !defined (__RTP__) - // For now we use the VxWorks global symbol table // which resolves the most recently loaded symbols, which resolve // mostly what we want.. diff --git a/ACE/ace/OS_NS_errno.h b/ACE/ace/OS_NS_errno.h index d953d61552a..eedece4661d 100644 --- a/ACE/ace/OS_NS_errno.h +++ b/ACE/ace/OS_NS_errno.h @@ -50,44 +50,10 @@ namespace ACE_OS { } /* namespace ACE_OS */ -#if defined (ACE_HAS_WINCE_BROKEN_ERRNO) -/** - * @class ACE_CE_Errno - * - * Some versions of CE don't support @c errno and some versions' - * implementations are busted. So we implement our own. - * Our implementation takes up one Tls key, however, it does not - * allocate memory from the heap so there's no problem with cleaning - * up the errno when a thread exit. - */ -class ACE_Export ACE_CE_Errno -{ -public: - ACE_CE_Errno () = default; - static void init (); - static void fini (); - static ACE_CE_Errno *instance (); - - operator int () const; - int operator= (int); - -private: - static ACE_CE_Errno *instance_; - static DWORD errno_key_; -}; - -# define errno (* (ACE_CE_Errno::instance ())) -#endif /* ACE_HAS_WINCE_BROKEN_ERRNO */ - -#if defined (ACE_HAS_WINCE_BROKEN_ERRNO) -# define ACE_ERRNO_TYPE ACE_CE_Errno -# define ACE_ERRNO_GET ACE_CE_Errno::instance ()->operator int() -#else -# if !defined (ACE_ERRNO_TYPE) -# define ACE_ERRNO_TYPE int -# endif /* !ACE_ERRNO_TYPE */ -# define ACE_ERRNO_GET errno -#endif /* ACE_HAS_WINCE_BROKEN_ERRNO */ +#if !defined (ACE_ERRNO_TYPE) +# define ACE_ERRNO_TYPE int +#endif /* !ACE_ERRNO_TYPE */ +#define ACE_ERRNO_GET errno ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/OS_NS_errno.inl b/ACE/ace/OS_NS_errno.inl index 9dcbe998360..d77546fe3f9 100644 --- a/ACE/ace/OS_NS_errno.inl +++ b/ACE/ace/OS_NS_errno.inl @@ -52,29 +52,4 @@ ACE_OS::set_errno_to_wsa_last_error () # endif /* defined(ACE_WIN32) */ } -#if defined (ACE_HAS_WINCE_BROKEN_ERRNO) - -ACE_INLINE ACE_CE_Errno * -ACE_CE_Errno::instance () -{ - // This should be inlined. - return ACE_CE_Errno::instance_; -} - -ACE_INLINE -ACE_CE_Errno::operator int () const -{ - return (int) TlsGetValue (ACE_CE_Errno::errno_key_); -} - -ACE_INLINE int -ACE_CE_Errno::operator= (int x) -{ - // error checking? - TlsSetValue (ACE_CE_Errno::errno_key_, (void *) x); - return x; -} - -#endif /* ACE_HAS_WINCE_BROKEN_ERRNO */ - ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/OS_NS_fcntl.cpp b/ACE/ace/OS_NS_fcntl.cpp index f462b0d75dd..ab6bd35fef2 100644 --- a/ACE/ace/OS_NS_fcntl.cpp +++ b/ACE/ace/OS_NS_fcntl.cpp @@ -76,16 +76,6 @@ ACE_OS::open (const char *filename, SECURITY_ATTRIBUTES sa_buffer; SECURITY_DESCRIPTOR sd_buffer; -#if defined (ACE_HAS_WINCE) - ACE_HANDLE h = ::CreateFileW (ACE_Ascii_To_Wide (filename).wchar_rep (), - access, - shared_mode, - ACE_OS::default_win32_security_attributes_r - (sa, &sa_buffer, &sd_buffer), - creation, - flags, - 0); -#else /* ACE_HAS_WINCE */ ACE_HANDLE h = ::CreateFileA (filename, access, shared_mode, @@ -94,7 +84,6 @@ ACE_OS::open (const char *filename, creation, flags, 0); -#endif /* ACE_HAS_WINCE */ if (ACE_BIT_ENABLED (mode, _O_APPEND)) { diff --git a/ACE/ace/OS_NS_macros.h b/ACE/ace/OS_NS_macros.h index e901019ddb0..ac1c5e2f941 100644 --- a/ACE/ace/OS_NS_macros.h +++ b/ACE/ace/OS_NS_macros.h @@ -76,7 +76,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL LONG -inline ACE_High_Part (ACE_OFF_T value) +inline ACE_High_Part (LONGLONG value) { LARGE_INTEGER new_value; new_value.QuadPart = value; @@ -102,6 +102,18 @@ ACE_END_VERSIONED_NAMESPACE_DECL # endif /* _FILE_OFFSET_BITS==64 */ #endif /* ACE_WIN32 */ +// 64-bit quad-word definitions. +#if defined (ACE_WIN32) +# if defined (_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64) +ACE_BEGIN_VERSIONED_NAMESPACE_DECL +typedef unsigned __int64 ACE_QWORD; +inline ACE_QWORD ACE_Make_QWORD (DWORD lo, DWORD hi) { return ACE_QWORD (lo) | (ACE_QWORD (hi) << 32); } +inline DWORD ACE_Low_DWORD (ACE_QWORD q) { return (DWORD) q; } +inline DWORD ACE_High_DWORD (ACE_QWORD q) { return (DWORD) (q >> 32); } +ACE_END_VERSIONED_NAMESPACE_DECL +# endif /* _FILE_OFFSET_BITS==64 */ +#endif /* ACE_WIN32 */ + # include /**/ "ace/post.h" #endif /* ACE_OS_NS_MACROS_H */ diff --git a/ACE/ace/OS_NS_math.h b/ACE/ace/OS_NS_math.h index de6d2e1516c..ede8de33bd1 100644 --- a/ACE/ace/OS_NS_math.h +++ b/ACE/ace/OS_NS_math.h @@ -91,16 +91,6 @@ namespace ACE_OS return std::floor (x); } -#if defined (ACE_HAS_WINCE) - /// Windows CE has an intrinsic floor for float - template <> - inline - float floor (float x) - { - return std::floorf (x); - } -#endif - /// This method computes the smallest integral value not less than x. template <typename T> inline @@ -109,16 +99,6 @@ namespace ACE_OS return std::ceil (x); } -#if defined (ACE_HAS_WINCE) - /// Windows CE has an intrinsic ceil for float - template <> - inline - float ceil (float x) - { - return std::ceilf (x); - } -#endif - /// This method computes the base-2 logarithm of x. ACE_NAMESPACE_INLINE_FUNCTION double log2 (double x); diff --git a/ACE/ace/OS_NS_netdb.cpp b/ACE/ace/OS_NS_netdb.cpp index e60ac8a418e..6ede9036026 100644 --- a/ACE/ace/OS_NS_netdb.cpp +++ b/ACE/ace/OS_NS_netdb.cpp @@ -34,12 +34,6 @@ # include "ace/Malloc_Base.h" #endif -// Include if_arp so that getmacaddr can use the -// arp structure. -#if defined (sun) -# include /**/ <net/if_arp.h> -#endif - #include <algorithm> ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -49,7 +43,7 @@ ACE_OS::getmacaddress (struct macaddr_node_t *node) { ACE_OS_TRACE ("ACE_OS::getmacaddress"); -#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) +#if defined (ACE_WIN32) # if !defined (ACE_HAS_PHARLAP) /** Define a structure for use with the netbios routine */ struct ADAPTERSTAT @@ -131,58 +125,6 @@ ACE_OS::getmacaddress (struct macaddr_node_t *node) ACE_NOTSUP_RETURN (-1); # endif /* ACE_HAS_PHARLAP_RT */ # endif /* ACE_HAS_PHARLAP */ -#elif defined (sun) - - /** obtain the local host name */ - char hostname [MAXHOSTNAMELEN]; - ACE_OS::hostname (hostname, sizeof (hostname)); - - /** Get the hostent to use with ioctl */ - struct hostent *phost = - ACE_OS::gethostbyname (hostname); - - if (phost == 0) - return -1; - - ACE_HANDLE handle = - ACE_OS::socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP); - - if (handle == ACE_INVALID_HANDLE) - return -1; - - char **paddrs = phost->h_addr_list; - - struct arpreq ar; - - struct sockaddr_in *psa = - (struct sockaddr_in *)&(ar.arp_pa); - - ACE_OS::memset (&ar, - 0, - sizeof (struct arpreq)); - - psa->sin_family = AF_INET; - - ACE_OS::memcpy (&(psa->sin_addr), - *paddrs, - sizeof (struct in_addr)); - - if (ACE_OS::ioctl (handle, - SIOCGARP, - &ar) == -1) - { - ACE_OS::close (handle); - return -1; - } - - ACE_OS::close (handle); - - ACE_OS::memcpy (node->node, - ar.arp_ha.sa_data, - 6); - - return 0; - #elif defined (ACE_LINUX) && !defined (ACE_LACKS_NETWORKING) // It's easiest to know the first MAC-using interface. Use the BSD diff --git a/ACE/ace/OS_NS_netdb.inl b/ACE/ace/OS_NS_netdb.inl index b00f6cdff78..0bedbe2a2d0 100644 --- a/ACE/ace/OS_NS_netdb.inl +++ b/ACE/ace/OS_NS_netdb.inl @@ -4,7 +4,7 @@ #include "ace/OS_NS_errno.h" #if defined (ACE_LACKS_NETDB_REENTRANT_FUNCTIONS) -# if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) && !defined (HPUX_11) +# if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) # define ACE_NETDBCALL_RETURN(OP,TYPE,FAILVALUE,TARGET,SIZE) \ do \ { \ @@ -22,7 +22,7 @@ return ace_result_; \ } \ } while(0) -# else /* ! (ACE_MT_SAFE && ACE_MT_SAFE != 0 && !HPUX_11) */ +# else /* ! (ACE_MT_SAFE && ACE_MT_SAFE != 0) */ # define ACE_NETDBCALL_RETURN(OP,TYPE,FAILVALUE,TARGET,SIZE) \ do \ { \ @@ -104,20 +104,7 @@ ACE_OS::gethostbyaddr_r (const char *addr, if (0 == addr || '\0' == addr[0]) return 0; -# if defined (AIX) - ACE_OS::memset (buffer, 0, sizeof (ACE_HOSTENT_DATA)); - - //FUZZ: disable check_for_lack_ACE_OS - if (::gethostbyaddr_r ((char *) addr, length, type, result, - (struct hostent_data *) buffer)== 0) - return result; - //FUZZ: enable check_for_lack_ACE_OS - else - { - *h_errnop = h_errno; - return (struct hostent *) 0; - } -# elif defined (__GLIBC__) +# if defined (__GLIBC__) // GNU C library has a different signature ACE_OS::memset (buffer, 0, sizeof (ACE_HOSTENT_DATA)); @@ -199,7 +186,7 @@ ACE_OS::gethostbyaddr_r (const char *addr, struct hostent *, 0); //FUZZ: enable check_for_lack_ACE_OS # endif /* ACE_LACKS_NETDB_REENTRANT_FUNCTIONS */ -# endif /* defined (AIX) */ +# endif /* defined (__GLIBC__) */ # elif defined (ACE_HAS_NONCONST_GETBY) ACE_UNUSED_ARG (result); ACE_UNUSED_ARG (buffer); @@ -283,29 +270,7 @@ ACE_OS::gethostbyname_r (const char *name, if (0 == name || '\0' == name[0]) return (struct hostent *)0; -# if (defined (ACE_AIX_MINOR_VERS) && (ACE_AIX_MINOR_VERS > 2)) - ACE_UNUSED_ARG (result); - ACE_UNUSED_ARG (buffer); - ACE_UNUSED_ARG (h_errnop); - - // gethostbyname returns thread-specific storage on Digital Unix and - // AIX 4.3 - //FUZZ: disable check_for_lack_ACE_OS - ACE_SOCKCALL_RETURN (::gethostbyname (name), struct hostent *, 0); - //FUZZ: enable check_for_lack_ACE_OS -# elif defined (AIX) - ACE_OS::memset (buffer, 0, sizeof (ACE_HOSTENT_DATA)); - - //FUZZ: disable check_for_lack_ACE_OS - if (::gethostbyname_r (name, result, (struct hostent_data *) buffer) == 0) - return result; - //FUZZ: enable check_for_lack_ACE_OS - else - { - *h_errnop = h_errno; - return (struct hostent *) 0; - } -# elif defined (__GLIBC__) +# if defined (__GLIBC__) // GNU C library has a different signature ACE_OS::memset (buffer, 0, sizeof (ACE_HOSTENT_DATA)); @@ -386,7 +351,7 @@ ACE_OS::gethostbyname_r (const char *name, 0); //FUZZ: enable check_for_lack_ACE_OS # endif /* ACE_LACKS_NETDB_REENTRANT_FUNCTIONS */ -# endif /* defined (AIX) */ +# endif /* defined (__GLIBC__) */ # elif defined (ACE_HAS_NONCONST_GETBY) ACE_UNUSED_ARG (result); ACE_UNUSED_ARG (buffer); @@ -512,14 +477,7 @@ ACE_OS::getprotobyname_r (const char *name, ACE_UNUSED_ARG (buffer); ACE_NOTSUP_RETURN (0); #elif defined (ACE_HAS_REENTRANT_FUNCTIONS) -# if defined (AIX) - //FUZZ: disable check_for_lack_ACE_OS - if (::getprotobyname_r (name, result, (struct protoent_data *) buffer) == 0) - return result; - else - return 0; - //FUZZ: enable check_for_lack_ACE_OS -# elif defined (__GLIBC__) +#if defined (__GLIBC__) // GNU C library has a different signature //FUZZ: disable check_for_lack_ACE_OS if (::getprotobyname_r (name, @@ -548,7 +506,7 @@ ACE_OS::getprotobyname_r (const char *name, struct protoent *, 0); //FUZZ: enable check_for_lack_ACE_OS # endif /* ACE_LACKS_NETDB_REENTRANT_FUNCTIONS */ -# endif /* defined (AIX) */ +# endif /* defined (__GLIBC__) */ #elif defined (ACE_HAS_NONCONST_GETBY) ACE_UNUSED_ARG (result); ACE_UNUSED_ARG (buffer); @@ -593,14 +551,7 @@ ACE_OS::getprotobynumber_r (int proto, ACE_UNUSED_ARG (buffer); ACE_NOTSUP_RETURN (0); #elif defined (ACE_HAS_REENTRANT_FUNCTIONS) -# if defined (AIX) - //FUZZ: disable check_for_lack_ACE_OS - if (::getprotobynumber_r (proto, result, (struct protoent_data *) buffer) == 0) - return result; - //FUZZ: enable check_for_lack_ACE_OS - else - return 0; -# elif defined (__GLIBC__) +# if defined (__GLIBC__) // GNU C library has a different signature //FUZZ: disable check_for_lack_ACE_OS if (::getprotobynumber_r (proto, @@ -626,7 +577,7 @@ ACE_OS::getprotobynumber_r (int proto, struct protoent *, 0); //FUZZ: enable check_for_lack_ACE_OS # endif /* ACE_LACKS_NETDB_REENTRANT_FUNCTIONS */ -# endif /* defined (AIX) */ +# endif /* defined (__GLIBC__) */ #else ACE_UNUSED_ARG (buffer); ACE_UNUSED_ARG (result); @@ -677,16 +628,7 @@ ACE_OS::getservbyname_r (const char *svc, ACE_UNUSED_ARG (buf); ACE_NOTSUP_RETURN (0); #elif defined (ACE_HAS_REENTRANT_FUNCTIONS) -# if defined (AIX) - ACE_OS::memset (buf, 0, sizeof (ACE_SERVENT_DATA)); - - //FUZZ: disable check_for_lack_ACE_OS - if (::getservbyname_r (svc, proto, result, (struct servent_data *) buf) == 0) - return result; - //FUZZ: enable check_for_lack_ACE_OS - else - return (struct servent *) 0; -# elif defined (__GLIBC__) +# if defined (__GLIBC__) // GNU C library has a different signature ACE_OS::memset (buf, 0, sizeof (ACE_SERVENT_DATA)); @@ -716,7 +658,7 @@ ACE_OS::getservbyname_r (const char *svc, struct servent *, 0); //FUZZ: enable check_for_lack_ACE_OS # endif /* ACE_LACKS_NETDB_REENTRANT_FUNCTIONS */ -# endif /* defined (AIX) */ +# endif /* defined (__GLIBC__) */ #elif defined (ACE_HAS_NONCONST_GETBY) ACE_UNUSED_ARG (buf); ACE_UNUSED_ARG (result); @@ -738,7 +680,6 @@ ACE_OS::getservbyname_r (const char *svc, #endif /* defined (ACE_HAS_REENTRANT_FUNCTIONS) */ } - ACE_INLINE int ACE_OS::getaddrinfo (const char *name, const char *service, const addrinfo *hints, addrinfo **result) diff --git a/ACE/ace/OS_NS_pwd.inl b/ACE/ace/OS_NS_pwd.inl index 3353f649469..74eae66e517 100644 --- a/ACE/ace/OS_NS_pwd.inl +++ b/ACE/ace/OS_NS_pwd.inl @@ -48,14 +48,6 @@ ACE_OS::getpwnam_r (const char *name, ACE_UNUSED_ARG (bufsize); ACE_UNUSED_ARG (result); ACE_NOTSUP_RETURN (0); -#elif defined (ACE_HAS_STHREADS) - if (::getpwnam_r (name, pwd, buffer, bufsize) != 0) - { - *result = 0; - return -1; - } - *result = pwd; - return 0; #else return ::getpwnam_r (name, pwd, buffer, bufsize, result); #endif /* ACE_LACKS_PWD_FUNCTIONS */ diff --git a/ACE/ace/OS_NS_signal.inl b/ACE/ace/OS_NS_signal.inl index 4f40510368c..5211a0730e2 100644 --- a/ACE/ace/OS_NS_signal.inl +++ b/ACE/ace/OS_NS_signal.inl @@ -56,7 +56,7 @@ sigaction (int signum, const ACE_SIGACTION *nsa, ACE_SIGACTION *osa) ACE_OS_TRACE ("ACE_OS::sigaction"); if (signum == 0) return 0; -#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) +#if defined (ACE_WIN32) struct sigaction sa; if (osa == 0) @@ -78,7 +78,7 @@ sigaction (int signum, const ACE_SIGACTION *nsa, ACE_SIGACTION *osa) return ::sigaction (signum, const_cast<ACE_SIGACTION*> (nsa), osa); #else return ::sigaction (signum, nsa, osa); -#endif /* ACE_WIN32 !ACE_HAS_WINCE */ +#endif /* ACE_WIN32 */ } ACE_INLINE int @@ -190,15 +190,14 @@ signal (int signum, ACE_SignalHandler func) return 0; else { -#if (defined ACE_WIN32 && !defined ACE_HAS_WINCE) || \ +#if (defined ACE_WIN32) || \ (!defined ACE_LACKS_UNIX_SIGNALS && !defined ACE_LACKS_SIGNAL) return ::signal (signum, func); #else - // @@ WINCE: Don't know how to implement signal on WinCE (yet.) ACE_UNUSED_ARG (signum); ACE_UNUSED_ARG (func); - ACE_NOTSUP_RETURN (0); // Should return SIG_ERR but it is not defined on WinCE. -#endif /* defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) || !defined (ACE_LACKS_UNIX_SIGNALS) */ + ACE_NOTSUP_RETURN (0); // Should return SIG_ERR but maybe not defined on all platforms +#endif /* defined (ACE_WIN32) || !defined (ACE_LACKS_UNIX_SIGNALS) */ } } diff --git a/ACE/ace/OS_NS_stdio.cpp b/ACE/ace/OS_NS_stdio.cpp index 1b271b703fc..76db871d18d 100644 --- a/ACE/ace/OS_NS_stdio.cpp +++ b/ACE/ace/OS_NS_stdio.cpp @@ -26,7 +26,7 @@ ACE_TEXT_OSVERSIONINFO ACE_OS::win32_versioninfo_; HINSTANCE ACE_OS::win32_resource_module_; ACE_END_VERSIONED_NAMESPACE_DECL -# if defined (ACE_HAS_DLL) && (ACE_HAS_DLL == 1) && !defined (ACE_HAS_WINCE) +# if defined (ACE_HAS_DLL) && (ACE_HAS_DLL == 1) // This function is called by the OS when the ACE DLL is loaded. We // use it to determine the default module containing ACE's resources. extern "C" BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID) @@ -86,7 +86,7 @@ ace_flock_t::dump () const /*****************************************************************************/ -#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) +#if defined (ACE_WIN32) namespace { /// Translate fopen's mode char to open's mode. This helper function diff --git a/ACE/ace/OS_NS_stdio.h b/ACE/ace/OS_NS_stdio.h index 3a4e6bdf91c..3d592c526f7 100644 --- a/ACE/ace/OS_NS_stdio.h +++ b/ACE/ace/OS_NS_stdio.h @@ -27,12 +27,11 @@ #include "ace/os_include/os_errno.h" #include /**/ "ace/ACE_export.h" -/* OPENVMS needs unistd for cuserid() */ -#if defined (CYGWIN32) || defined (ACE_OPENVMS) +#if defined (CYGWIN32) # include "ace/os_include/os_unistd.h" -#endif /* CYGWIN32 || ACE_OPENVMS */ +#endif /* CYGWIN32 */ -#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) +#if defined (ACE_WIN32) # include "io.h" #endif @@ -135,10 +134,9 @@ inline char *ace_cuserid(char *user) #endif /* !ACE_LACKS_CUSERID && !ACE_HAS_ALT_CUSERID && ... */ # if defined (ACE_LACKS_FILELOCKS) -# if ! defined (ACE_VXWORKS) && ! defined (ACE_HAS_RTEMS) && !defined (INTEGRITY) +# if ! defined (ACE_VXWORKS) && !defined (INTEGRITY) // VxWorks defines struct flock in sys/fcntlcom.h. But it doesn't -// appear to support flock (). RTEMS defines struct flock but -// currently does not support locking. +// appear to support flock (). struct flock { short l_type; @@ -299,7 +297,7 @@ namespace ACE_OS { ACE_NAMESPACE_INLINE_FUNCTION ACE_HANDLE fileno (FILE *stream); -#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) +#if defined (ACE_WIN32) extern ACE_Export #else ACE_NAMESPACE_INLINE_FUNCTION @@ -307,19 +305,19 @@ namespace ACE_OS { FILE *fopen (const char *filename, const char *mode); #if defined (ACE_HAS_WCHAR) -#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) +#if defined (ACE_WIN32) extern ACE_Export #else ACE_NAMESPACE_INLINE_FUNCTION #endif /* ACE_WIN32 */ FILE *fopen (const char *filename, const wchar_t *mode); -# if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) +# if defined (ACE_WIN32) extern ACE_Export # else ACE_NAMESPACE_INLINE_FUNCTION # endif /* ACE_WIN32 */ FILE *fopen (const wchar_t *filename, const wchar_t *mode); -# if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) +# if defined (ACE_WIN32) extern ACE_Export # else ACE_NAMESPACE_INLINE_FUNCTION diff --git a/ACE/ace/OS_NS_stdio.inl b/ACE/ace/OS_NS_stdio.inl index b97adfdbbc9..6066165912e 100644 --- a/ACE/ace/OS_NS_stdio.inl +++ b/ACE/ace/OS_NS_stdio.inl @@ -364,7 +364,7 @@ ACE_OS::cuserid (char *user, size_t maxlen) ::remCurIdGet (user, 0); return user; } -#elif defined (ACE_HAS_PHARLAP) || defined (ACE_HAS_WINCE) +#elif defined (ACE_HAS_PHARLAP) ACE_UNUSED_ARG (user); ACE_UNUSED_ARG (maxlen); ACE_NOTSUP_RETURN (0); @@ -458,11 +458,7 @@ ACE_OS::cuserid (char *user, size_t maxlen) ACE_INLINE wchar_t * ACE_OS::cuserid (wchar_t *user, size_t maxlen) { -# if defined (ACE_HAS_WINCE) - ACE_UNUSED_ARG (user); - ACE_UNUSED_ARG (maxlen); - ACE_NOTSUP_RETURN (0); -# elif defined (ACE_WIN32) +# if defined (ACE_WIN32) BOOL const result = GetUserNameW (user, (u_long *) &maxlen); if (result == FALSE) ACE_FAIL_RETURN (0); @@ -499,13 +495,7 @@ ACE_INLINE FILE * ACE_OS::fdopen (ACE_HANDLE handle, const ACE_TCHAR *mode) { ACE_OS_TRACE ("ACE_OS::fdopen"); -#if defined (ACE_HAS_WINCE) -# if defined (ACE_HAS_NONCONST_WFDOPEN) - return ::_wfdopen ((int)handle, const_cast <ACE_TCHAR*> (ACE_TEXT_ALWAYS_WCHAR (mode))); -# else - return ::_wfdopen (handle, ACE_TEXT_ALWAYS_WCHAR (mode)); -# endif -#elif defined (ACE_WIN32) +#if defined (ACE_WIN32) // kernel file handle -> FILE* conversion... // Options: _O_APPEND, _O_RDONLY and _O_TEXT are lost @@ -534,7 +524,7 @@ ACE_OS::fdopen (ACE_HANDLE handle, const ACE_TCHAR *mode) ACE_NOTSUP_RETURN (0); #else return ::fdopen (handle, ACE_TEXT_ALWAYS_CHAR (mode)); -#endif /* ACE_HAS_WINCE */ +#endif /* ACE_WIN32 */ } ACE_INLINE int @@ -612,7 +602,7 @@ ACE_OS::fileno (FILE *stream) #endif } -#if !(defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) +#if !defined (ACE_WIN32) // Win32 PC implementation of fopen () is in OS_NS_stdio.cpp. ACE_INLINE FILE * ACE_OS::fopen (const char *filename, const char *mode) @@ -636,28 +626,20 @@ ACE_INLINE FILE * ACE_OS::fopen (const wchar_t *filename, const wchar_t *mode) { ACE_OS_TRACE ("ACE_OS::fopen"); -#if defined (ACE_HAS_WINCE) - return ::_wfopen (filename, mode); -#else // Non-Windows doesn't use wchar_t file systems. ACE_Wide_To_Ascii n_filename (filename); ACE_Wide_To_Ascii n_mode (mode); return ::fopen (n_filename.char_rep (), n_mode.char_rep ()); -#endif /* ACE_HAS_WINCE */ } + // Win32 PC implementation of fopen () is in OS_NS_stdio.cpp. ACE_INLINE FILE * ACE_OS::fopen (const wchar_t *filename, const char *mode) { ACE_OS_TRACE ("ACE_OS::fopen"); -#if defined (ACE_HAS_WINCE) - ACE_Ascii_To_Wide n_mode (mode); - return ::_wfopen (filename, n_mode.wchar_rep ()); -#else // Non-Windows doesn't use wchar_t file systems. ACE_Wide_To_Ascii n_filename (filename); return ::fopen (n_filename.char_rep (), mode); -#endif /* ACE_HAS_WINCE */ } #endif /* ACE_HAS_WCHAR */ @@ -803,7 +785,7 @@ ACE_OS::perror (const char *s) ACE_UNUSED_ARG (s); #else ::perror (s); -#endif /* ACE_HAS_WINCE */ +#endif /* ACE_LACKS_PERROR */ } #if defined (ACE_HAS_WCHAR) @@ -859,13 +841,6 @@ ACE_OS::rename (const char *old_name, ACE_UNUSED_ARG (new_name); ACE_UNUSED_ARG (flags); ACE_NOTSUP_RETURN (-1); -# elif defined (ACE_HAS_WINCE) - // Win CE is always wide-char. - ACE_UNUSED_ARG (flags); - if (0 == ::MoveFile (ACE_TEXT_CHAR_TO_TCHAR (old_name), - ACE_TEXT_CHAR_TO_TCHAR (new_name))) - ACE_FAIL_RETURN (-1); - return 0; # elif defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_MOVEFILEEX) // NT4 (and up) provides a way to rename/move a file with similar semantics // to what's usually done on UNIX - if there's an existing file with @@ -881,7 +856,7 @@ ACE_OS::rename (const char *old_name, # else ACE_UNUSED_ARG (flags); return ::rename (old_name, new_name); -# endif /* ACE_HAS_WINCE */ +# endif /* ACE_LACKS_RENAME */ } #if defined (ACE_HAS_WCHAR) @@ -895,11 +870,6 @@ ACE_OS::rename (const wchar_t *old_name, ACE_UNUSED_ARG (new_name); ACE_UNUSED_ARG (flags); ACE_NOTSUP_RETURN (-1); -# elif defined (ACE_HAS_WINCE) - ACE_UNUSED_ARG (flags); - if (::MoveFileW (old_name, new_name) == 0) - ACE_FAIL_RETURN (-1); - return 0; # elif defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_MOVEFILEEX) // NT4 (and up) provides a way to rename/move a file with similar semantics // to what's usually done on UNIX - if there's an existing file with @@ -917,14 +887,14 @@ ACE_OS::rename (const wchar_t *old_name, ACE_Wide_To_Ascii nold_name (old_name); ACE_Wide_To_Ascii nnew_name (new_name); return ACE_OS::rename (nold_name.char_rep (), nnew_name.char_rep (), flags); -# endif /* ACE_HAS_WINCE */ +# endif /* ACE_LACKS_RENAME */ } #endif /* ACE_HAS_WCHAR */ ACE_INLINE void ACE_OS::rewind (FILE *fp) { -#if !defined (ACE_HAS_WINCE) && !defined (ACE_MQX) +#if !defined (ACE_MQX) ACE_OS_TRACE ("ACE_OS::rewind"); # if defined (ACE_LACKS_REWIND) ACE_UNUSED_ARG (fp); @@ -933,9 +903,9 @@ ACE_OS::rewind (FILE *fp) # endif /* ACE_LACKS_REWIND */ #else // This isn't perfect since it doesn't reset EOF, but it's probably - // the closest we can get on WINCE. + // the closest we can get on MQX. (void) std::fseek (fp, 0L, SEEK_SET); -#endif /* ACE_HAS_WINCE */ +#endif /* !ACE_MQX */ } #if !defined (ACE_DISABLE_TEMPNAM) @@ -1098,9 +1068,8 @@ ACE_INLINE int ACE_OS::vsprintf (wchar_t *buffer, const wchar_t *format, va_list argptr) { # if (defined _XOPEN_SOURCE && (_XOPEN_SOURCE - 0) >= 500) || \ - (defined (sun) && !(defined(_XOPEN_SOURCE) && (_XOPEN_VERSION-0==4))) || \ defined (ACE_HAS_VSWPRINTF) || \ - (defined (_MSC_VER) && !defined (ACE_HAS_WINCE)) + (defined (_MSC_VER)) // The XPG4/UNIX98/C99 signature of the wide-char sprintf has a // maxlen argument. Since this method doesn't supply one, pass in @@ -1178,10 +1147,8 @@ ACE_INLINE int ACE_OS::vsnprintf (wchar_t *buffer, size_t maxlen, const wchar_t *format, va_list ap) { # if (defined _XOPEN_SOURCE && (_XOPEN_SOURCE - 0) >= 500) || \ - (defined (sun) && !(defined(_XOPEN_SOURCE) && (_XOPEN_VERSION-0==4))) || \ defined (ACE_HAS_VSWPRINTF) || \ defined (ACE_WIN32) - int result; # if defined (ACE_WIN32) && !defined (ACE_HAS_C99_VSNWPRINTF) diff --git a/ACE/ace/OS_NS_stdlib.cpp b/ACE/ace/OS_NS_stdlib.cpp index ad6ed536954..1bef126ab39 100644 --- a/ACE/ace/OS_NS_stdlib.cpp +++ b/ACE/ace/OS_NS_stdlib.cpp @@ -37,13 +37,7 @@ ACE_EXIT_HOOK ACE_OS::exit_hook_ = 0; void * ACE_OS::calloc (size_t elements, size_t sizeof_elements) { -#if !defined (ACE_HAS_WINCE) return ACE_CALLOC_FUNC (elements, sizeof_elements); -#else - // @@ This will probably not work since it doesn't consider - // alignment properly. - return ACE_MALLOC_FUNC (elements * sizeof_elements); -#endif /* ACE_HAS_WINCE */ } void @@ -51,13 +45,13 @@ ACE_OS::exit (int status) { ACE_OS_TRACE ("ACE_OS::exit"); -#if defined (ACE_HAS_NONSTATIC_OBJECT_MANAGER) && !defined (ACE_HAS_WINCE) && !defined (ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER) +#if defined (ACE_HAS_NONSTATIC_OBJECT_MANAGER) && !defined (ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER) // Shut down the ACE_Object_Manager, if it had registered its exit_hook. // With ACE_HAS_NONSTATIC_OBJECT_MANAGER, the ACE_Object_Manager is // instantiated on the main's stack. ::exit () doesn't destroy it. if (exit_hook_) (*exit_hook_) (); -#endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER && !ACE_HAS_WINCE && !ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER */ +#endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER && !ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER */ #if defined (ACE_WIN32) ::ExitProcess ((UINT) status); @@ -90,9 +84,7 @@ ACE_OS::free (void *ptr) ACE_TCHAR * ACE_OS::getenvstrings () { -#if defined (ACE_LACKS_GETENVSTRINGS) - ACE_NOTSUP_RETURN (0); -#elif defined (ACE_WIN32) +#if defined (ACE_WIN32) # if defined (ACE_USES_WCHAR) return ::GetEnvironmentStringsW (); # else /* ACE_USES_WCHAR */ @@ -110,13 +102,6 @@ ACE_OS::getenvstrings () ACE_TCHAR * ACE_OS::strenvdup (const ACE_TCHAR *str) { -#if defined (ACE_HAS_WINCE) - // WinCE doesn't have environment variables so we just skip it. - return ACE_OS::strdup (str); -#elif defined (ACE_LACKS_STRENVDUP) - ACE_UNUSED_ARG (str); - ACE_NOTSUP_RETURN (0); -#else const ACE_TCHAR * start = 0; if ((start = ACE_OS::strchr (str, ACE_TEXT ('$'))) != 0) { @@ -170,7 +155,6 @@ ACE_OS::strenvdup (const ACE_TCHAR *str) } else return ACE_OS::strdup (str); -#endif /* ACE_HAS_WINCE */ } #if !defined (ACE_HAS_ITOA) diff --git a/ACE/ace/OS_NS_stdlib.inl b/ACE/ace/OS_NS_stdlib.inl index b76ee71c5bd..d40c139c860 100644 --- a/ACE/ace/OS_NS_stdlib.inl +++ b/ACE/ace/OS_NS_stdlib.inl @@ -19,8 +19,6 @@ ACE_OS::_exit (int status) ACE_OS_TRACE ("ACE_OS::_exit"); #if defined (ACE_VXWORKS) ::exit (status); -#elif defined (ACE_HAS_WINCE) - ::TerminateProcess (::GetCurrentProcess (), status); #elif defined (ACE_MQX) _mqx_exit (status); #elif !defined (ACE_LACKS__EXIT) @@ -110,12 +108,6 @@ ACE_OS::atop (const char *s) ACE_TRACE ("ACE_OS::atop"); #if defined (ACE_WIN64) intptr_t ip = ::_atoi64 (s); -#elif defined (ACE_OPENVMS) -# if !defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64) - int ip = ::atoi (s); -# else - intptr_t ip = ::atoi (s); -# endif #else intptr_t ip = ::atoi (s); #endif /* ACE_WIN64 */ @@ -129,12 +121,6 @@ ACE_OS::atop (const wchar_t *s) { # if defined (ACE_WIN64) intptr_t ip = ::_wtoi64 (s); -# elif defined (ACE_OPENVMS) -# if !defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64) - int ip = ACE_OS::atoi (s); -# else - intptr_t ip = ACE_OS::atoi (s); -# endif # else intptr_t ip = ACE_OS::atoi (s); # endif /* ACE_WIN64 */ @@ -336,7 +322,7 @@ ACE_OS::putenv (const char *string) ACE_NOTSUP_RETURN (0); #elif defined (ACE_PUTENV_EQUIVALENT) return ACE_PUTENV_EQUIVALENT (const_cast <char *> (string)); -#else /* ! ACE_HAS_WINCE */ +#else return ACE_STD_NAMESPACE::putenv (const_cast <char *> (string)); #endif /* ACE_LACKS_PUTENV && ACE_HAS_SETENV */ } @@ -430,7 +416,7 @@ ACE_OS::rand_r (unsigned int *seed) # endif /* ACE_LACKS_RAND_R */ } -# if !defined (ACE_LACKS_REALPATH) +#if !defined (ACE_LACKS_REALPATH) ACE_INLINE char * ACE_OS::realpath (const char *file_name, char *resolved_name) @@ -462,7 +448,7 @@ ACE_OS::realpath (const wchar_t *file_name, # endif /* ! ACE_WIN32 */ } # endif /* ACE_HAS_WCHAR */ -#endif /* ACE_HAS_WINCE */ +#endif /* !ACE_LACKS_REALPATH */ ACE_INLINE ACE_EXIT_HOOK ACE_OS::set_exit_hook (ACE_EXIT_HOOK exit_hook) diff --git a/ACE/ace/OS_NS_string.inl b/ACE/ace/OS_NS_string.inl index 94f0380ea43..f58a30520bc 100644 --- a/ACE/ace/OS_NS_string.inl +++ b/ACE/ace/OS_NS_string.inl @@ -403,8 +403,6 @@ ACE_OS::strstr (const wchar_t *s, const wchar_t *t) { # if defined (ACE_LACKS_WCSSTR) return ACE_OS::wcsstr_emulation (s, t); -# elif defined (HPUX) - return const_cast <const wchar_t *> (::wcswcs (s, t)); # else /* ACE_LACKS_WCSSTR */ return const_cast <const wchar_t *> (::wcsstr (s, t)); # endif /* ACE_LACKS_WCSSTR */ @@ -423,8 +421,6 @@ ACE_OS::strstr (wchar_t *s, const wchar_t *t) { # if defined (ACE_LACKS_WCSSTR) return ACE_OS::wcsstr_emulation (s, t); -# elif defined (HPUX) - return ::wcswcs (s, t); # else /* ACE_LACKS_WCSSTR */ return ::wcsstr (s, t); # endif /* ACE_LACKS_WCSSTR */ diff --git a/ACE/ace/OS_NS_stropts.inl b/ACE/ace/OS_NS_stropts.inl index 547a80cb3d5..203e090a19d 100644 --- a/ACE/ace/OS_NS_stropts.inl +++ b/ACE/ace/OS_NS_stropts.inl @@ -13,11 +13,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -#if defined (ACE_LACKS_CONST_STRBUF_PTR) -typedef struct strbuf *ACE_STRBUF_TYPE; -#else typedef const struct strbuf *ACE_STRBUF_TYPE; -#endif /* ACE_LACKS_CONST_STRBUF_PTR */ ACE_INLINE ACE_Str_Buf::ACE_Str_Buf (void *b, int l, int max) diff --git a/ACE/ace/OS_NS_sys_mman.inl b/ACE/ace/OS_NS_sys_mman.inl index 905b0b5e08a..5ff514997b5 100644 --- a/ACE/ace/OS_NS_sys_mman.inl +++ b/ACE/ace/OS_NS_sys_mman.inl @@ -45,15 +45,6 @@ ACE_OS::mmap (void *addr, #endif /* !defined (ACE_WIN32) || defined (ACE_HAS_PHARLAP) */ #if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP) - -# if defined(ACE_HAS_WINCE) - ACE_UNUSED_ARG (addr); - if (ACE_BIT_ENABLED (flags, MAP_FIXED)) // not supported - { - errno = EINVAL; - return MAP_FAILED; - } -# else if (!ACE_BIT_ENABLED (flags, MAP_FIXED)) addr = 0; else if (addr == 0) // can not map to address 0 @@ -61,7 +52,6 @@ ACE_OS::mmap (void *addr, errno = EINVAL; return MAP_FAILED; } -# endif int nt_flags = 0; ACE_HANDLE local_handle = ACE_INVALID_HANDLE; @@ -72,14 +62,8 @@ ACE_OS::mmap (void *addr, if (ACE_BIT_ENABLED (flags, MAP_PRIVATE)) { -# if defined(ACE_HAS_WINCE) - // PAGE_WRITECOPY is not avaible on CE, but this should be the same - // as PAGE_READONLY according to MSDN - nt_flags = FILE_MAP_ALL_ACCESS; -# else prot = PAGE_WRITECOPY; nt_flags = FILE_MAP_COPY; -# endif // ACE_HAS_WINCE } else if (ACE_BIT_ENABLED (flags, MAP_SHARED)) { @@ -124,20 +108,12 @@ ACE_OS::mmap (void *addr, DWORD low_off = ACE_LOW_PART (off); DWORD high_off = ACE_HIGH_PART (off); -# if defined (ACE_HAS_WINCE) - void *addr_mapping = ::MapViewOfFile (*file_mapping, - nt_flags, - high_off, - low_off, - len); -# else void *addr_mapping = ::MapViewOfFileEx (*file_mapping, nt_flags, high_off, low_off, len, addr); -# endif /* ACE_HAS_WINCE */ // Only close this down if we used the temporary. if (file_mapping == &local_handle) @@ -154,11 +130,6 @@ ACE_OS::mmap (void *addr, flags |= ACE_OS_EXTRA_MMAP_FLAGS; # endif /* ACE_OS_EXTRA_MMAP_FLAGS */ ACE_UNUSED_ARG (file_mapping); -# if defined (ACE_OPENVMS) - //FUZZ: disable check_for_lack_ACE_OS - ::fsync(file_handle); - //FUZZ: enable check_for_lack_ACE_OS -# endif //FUZZ: disable check_for_lack_ACE_OS ACE_OSCALL_RETURN ((void *) ::mmap ((ACE_MMAP_TYPE) addr, len, @@ -264,10 +235,6 @@ ACE_OS::shm_open (const ACE_TCHAR *filename, filename = buf; #endif return ::shm_open (ACE_TEXT_ALWAYS_CHAR(filename), mode, perms); -#elif defined (ACE_OPENVMS) - //FUZZ: disable check_for_lack_ACE_OS - return ::open (filename, mode, perms, ACE_TEXT("shr=get,put,upd")); - //FUZZ: enable check_for_lack_ACE_OS #else /* ! ACE_HAS_SHM_OPEN */ // Just use ::open. return ACE_OS::open (filename, mode, perms, sa); diff --git a/ACE/ace/OS_NS_sys_resource.inl b/ACE/ace/OS_NS_sys_resource.inl index dad59017602..ede0171928b 100644 --- a/ACE/ace/OS_NS_sys_resource.inl +++ b/ACE/ace/OS_NS_sys_resource.inl @@ -31,11 +31,6 @@ ACE_OS::getrusage (int who, struct rusage *ru) #if defined (ACE_HAS_GETRUSAGE) # if defined (ACE_WIN32) ACE_UNUSED_ARG (who); - -# if defined (ACE_LACKS_GETPROCESSTIMES) - ACE_UNUSED_ARG (ru); - ACE_NOTSUP_RETURN (-1); -# else FILETIME dummy_1; FILETIME dummy_2; ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::GetProcessTimes (::GetCurrentProcess(), @@ -45,7 +40,6 @@ ACE_OS::getrusage (int who, struct rusage *ru) &ru->ru_utime), ace_result_), int, -1); -# endif /* ACE_LACKS_WIN32_GETPROCESSTIMES */ # else # if defined (ACE_HAS_RUSAGE_WHO_ENUM) return ::getrusage ((ACE_HAS_RUSAGE_WHO_ENUM) who, ru); diff --git a/ACE/ace/OS_NS_sys_sendfile.cpp b/ACE/ace/OS_NS_sys_sendfile.cpp index a47fce717fd..6b744fd8ad1 100644 --- a/ACE/ace/OS_NS_sys_sendfile.cpp +++ b/ACE/ace/OS_NS_sys_sendfile.cpp @@ -1,9 +1,9 @@ #include "ace/OS_NS_sys_sendfile.h" #include "ace/OS_NS_sys_mman.h" -#if defined (ACE_WIN32) || defined (HPUX) +#if defined (ACE_WIN32) # include "ace/OS_NS_sys_socket.h" -#endif /* ACE_WIN32 || HPUX */ +#endif /* ACE_WIN32 */ #include "ace/OS_NS_unistd.h" @@ -50,7 +50,7 @@ ACE_OS::sendfile_emulation (ACE_HANDLE out_fd, else if (buf == MAP_FAILED) return -1; -#if defined (ACE_WIN32) || defined (HPUX) +#if defined (ACE_WIN32) ssize_t const r = ACE_OS::send (out_fd, static_cast<const char *> (buf), count); #else diff --git a/ACE/ace/OS_NS_sys_socket.cpp b/ACE/ace/OS_NS_sys_socket.cpp index e7a6a0647bb..0661b44b2b5 100644 --- a/ACE/ace/OS_NS_sys_socket.cpp +++ b/ACE/ace/OS_NS_sys_socket.cpp @@ -104,19 +104,12 @@ ACE_OS::socket_init (int version_high, int version_low) int error = WSAStartup (version_requested, &wsa_data); if (error != 0) -# if defined (ACE_HAS_WINCE) { - ACE_TCHAR fmt[] = ACE_TEXT ("%s failed, WSAGetLastError returned %d"); - ACE_TCHAR buf[80]; // @@ Eliminate magic number. - ACE_OS::snprintf (buf, 80, fmt, ACE_TEXT ("WSAStartup %d"), error); - ::MessageBox (0, buf, ACE_TEXT ("WSAStartup failed!"), MB_OK); + ACE_OS::fprintf (stderr, + "ACE_OS::socket_init; WSAStartup failed, " + "WSAGetLastError returned %d\n", + error); } -# else - ACE_OS::fprintf (stderr, - "ACE_OS::socket_init; WSAStartup failed, " - "WSAGetLastError returned %d\n", - error); -# endif /* ACE_HAS_WINCE */ ACE_OS::socket_initialized_ = 1; } @@ -136,17 +129,10 @@ ACE_OS::socket_fini () if (WSACleanup () != 0) { int error = ::WSAGetLastError (); -# if defined (ACE_HAS_WINCE) - ACE_TCHAR fmt[] = ACE_TEXT ("%s failed, WSAGetLastError returned %d"); - ACE_TCHAR buf[80]; // @@ Eliminate magic number. - ACE_OS::snprintf (buf, 80, fmt, ACE_TEXT ("WSACleanup %d"), error); - ::MessageBox (0, buf , ACE_TEXT ("WSACleanup failed!"), MB_OK); -# else ACE_OS::fprintf (stderr, "ACE_OS::socket_fini; WSACleanup failed, " "WSAGetLastError returned %d\n", error); -# endif /* ACE_HAS_WINCE */ } ACE_OS::socket_initialized_ = 0; } diff --git a/ACE/ace/OS_NS_sys_stat.h b/ACE/ace/OS_NS_sys_stat.h index 77296ab106b..3891f716b26 100644 --- a/ACE/ace/OS_NS_sys_stat.h +++ b/ACE/ace/OS_NS_sys_stat.h @@ -37,7 +37,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL typedef struct stati64 ACE_stat; # define ACE_STAT_FUNC_NAME ::_stati64 # define ACE_WSTAT_FUNC_NAME ::_wstati64 -# elif !defined (ACE_HAS_WINCE) && defined (_MSC_VER) +# elif defined (_MSC_VER) typedef struct _stat64 ACE_stat; # define ACE_STAT_FUNC_NAME ::_stat64 # define ACE_WSTAT_FUNC_NAME ::_wstat64 @@ -52,7 +52,7 @@ typedef struct stat ACE_stat; # endif /**/ # else // Default file offset case. -# if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) +# if defined (ACE_WIN32) typedef struct _stat ACE_stat; # define ACE_STAT_FUNC_NAME ::_stat # define ACE_WSTAT_FUNC_NAME ::_wstat diff --git a/ACE/ace/OS_NS_sys_stat.inl b/ACE/ace/OS_NS_sys_stat.inl index b8f7c9fc829..b3a7d38e142 100644 --- a/ACE/ace/OS_NS_sys_stat.inl +++ b/ACE/ace/OS_NS_sys_stat.inl @@ -28,12 +28,7 @@ namespace ACE_OS fstat (ACE_HANDLE handle, ACE_stat *stp) { ACE_OS_TRACE ("ACE_OS::fstat"); -#if defined (ACE_HAS_X86_STAT_MACROS) - // Solaris for intel uses an macro for fstat(), this is a wrapper - // for _fxstat() use of the macro. - // causes compile and runtime problems. - return ::_fxstat (_STAT_VER, handle, stp); -#elif defined (ACE_WIN32) +#if defined (ACE_WIN32) BY_HANDLE_FILE_INFORMATION fdata; if (::GetFileInformationByHandle (handle, &fdata) == FALSE) @@ -64,13 +59,8 @@ namespace ACE_OS #elif defined (ACE_MQX) return MQX_Filesystem::inst ().fstat (handle, stp); #else -# if defined (ACE_OPENVMS) - //FUZZ: disable check_for_lack_ACE_OS - ::fsync(handle); - //FUZZ: enable check_for_lack_ACE_OS -# endif return ::fstat (handle, stp); -#endif /* !ACE_HAS_X86_STAT_MACROS */ +#endif /* !ACE_WIN32 */ } // This function returns the number of bytes in the file referenced by @@ -128,11 +118,7 @@ namespace ACE_OS ACE_OS_TRACE ("ACE_OS::lstat"); # if defined (ACE_LACKS_LSTAT) return ACE_OS::stat (file, stp); -# elif defined (ACE_HAS_X86_STAT_MACROS) - // Solaris for intel uses an macro for lstat(), this macro is a - // wrapper for _lxstat(). - return ::_lxstat (_STAT_VER, file, stp); -# else /* !ACE_HAS_X86_STAT_MACROS */ +# else /* !ACE_LACKS_LSTAT */ return ::lstat (file, stp); # endif /* ACE_LACKS_LSTAT */ } @@ -153,12 +139,7 @@ namespace ACE_OS ACE_INLINE int mkdir (const char *path, mode_t mode) { -#if defined (ACE_HAS_WINCE) - ACE_UNUSED_ARG (mode); - ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::CreateDirectory (ACE_TEXT_CHAR_TO_TCHAR (path), 0), - ace_result_), - int, -1); -#elif defined (ACE_MKDIR_LACKS_MODE) +#if defined (ACE_MKDIR_LACKS_MODE) ACE_UNUSED_ARG (mode); # if defined (ACE_MKDIR_EQUIVALENT) return ACE_MKDIR_EQUIVALENT (path); @@ -175,17 +156,12 @@ namespace ACE_OS ACE_INLINE int mkdir (const wchar_t *path, mode_t mode) { -#if defined (ACE_HAS_WINCE) - ACE_UNUSED_ARG (mode); - ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (CreateDirectoryW (path, 0), - ace_result_), - int, -1); -#elif defined (ACE_WIN32) && defined (ACE_USES_WCHAR) +#if defined (ACE_WIN32) && defined (ACE_USES_WCHAR) ACE_UNUSED_ARG (mode); return ::_wmkdir (path); #else return ACE_OS::mkdir (ACE_Wide_To_Ascii (path).char_rep (), mode); -#endif /* ACE_HAS_WINCE */ +#endif /* ACE_WIN32 && ACE_USES_WCHAR */ } #endif /* ACE_HAS_WCHAR */ @@ -207,45 +183,13 @@ namespace ACE_OS stat (const char *file, ACE_stat *stp) { ACE_OS_TRACE ("ACE_OS::stat"); -#if defined (ACE_HAS_NONCONST_STAT) - return ::stat (const_cast <char *> (file), stp); -#elif defined (ACE_LACKS_STAT) +#if defined (ACE_LACKS_STAT) ACE_NOTSUP_RETURN (-1); -#elif defined (ACE_HAS_WINCE) - ACE_TEXT_WIN32_FIND_DATA fdata; - - int rc = 0; - HANDLE const fhandle = ::FindFirstFile (ACE_TEXT_CHAR_TO_TCHAR (file), &fdata); - if (fhandle == INVALID_HANDLE_VALUE) - { - ACE_OS::set_errno_to_last_error (); - return -1; - } - else if (fdata.nFileSizeHigh != 0) - { - errno = EINVAL; - rc = -1; - } - else - { - stp->st_mode = static_cast<mode_t>(fdata.dwFileAttributes); - stp->st_size = fdata.nFileSizeLow; - stp->st_atime = ACE_Time_Value (fdata.ftLastAccessTime).sec (); - stp->st_mtime = ACE_Time_Value (fdata.ftLastWriteTime).sec (); - stp->st_ctime = ACE_Time_Value (fdata.ftCreationTime).sec (); - } - - ::FindClose (fhandle); - return rc; -#elif defined (ACE_HAS_X86_STAT_MACROS) - // Solaris for intel uses an macro for stat(), this macro is a - // wrapper for _xstat(). - return ::_xstat (_STAT_VER, file, stp); #elif defined (ACE_MQX) return MQX_Filesystem::inst ().stat (file, stp); #else return ACE_STAT_FUNC_NAME (file, stp); -#endif /* ACE_HAS_NONCONST_STAT */ +#endif /* ACE_LACKS_STAT */ } #if defined (ACE_HAS_WCHAR) @@ -253,40 +197,14 @@ namespace ACE_OS stat (const wchar_t *file, ACE_stat *stp) { ACE_OS_TRACE ("ACE_OS::stat"); -#if defined (ACE_HAS_WINCE) - WIN32_FIND_DATAW fdata; - - int rc = 0; - HANDLE const fhandle = ::FindFirstFileW (file, &fdata); - if (fhandle == INVALID_HANDLE_VALUE) - { - ACE_OS::set_errno_to_last_error (); - return -1; - } - else if (fdata.nFileSizeHigh != 0) - { - errno = EINVAL; - rc = -1; - } - else - { - stp->st_mode = static_cast<mode_t>(fdata.dwFileAttributes); - stp->st_size = fdata.nFileSizeLow; - stp->st_atime = ACE_Time_Value (fdata.ftLastAccessTime).sec (); - stp->st_mtime = ACE_Time_Value (fdata.ftLastWriteTime).sec (); - stp->st_ctime = ACE_Time_Value (fdata.ftCreationTime).sec (); - } - - ::FindClose (fhandle); - return rc; -#elif defined (__BORLANDC__) \ - || defined (_MSC_VER) \ - || (defined (__MINGW32__) && !defined (__MINGW64_VERSION_MAJOR)) +#if defined (__BORLANDC__) \ + || defined (_MSC_VER) \ + || (defined (__MINGW32__) && !defined (__MINGW64_VERSION_MAJOR)) return ACE_WSTAT_FUNC_NAME (file, stp); -#else /* ACE_HAS_WINCE */ +#else ACE_Wide_To_Ascii nfile (file); return ACE_OS::stat (nfile.char_rep (), stp); -#endif /* ACE_HAS_WINCE */ +#endif /* __BORLANDC__ */ } #endif /* ACE_HAS_WCHAR */ diff --git a/ACE/ace/OS_NS_sys_time.inl b/ACE/ace/OS_NS_sys_time.inl index ba9ec109a7b..8ebfb405853 100644 --- a/ACE/ace/OS_NS_sys_time.inl +++ b/ACE/ace/OS_NS_sys_time.inl @@ -26,25 +26,10 @@ ACE_OS::gettimeofday () } return ACE_Time_Value (ts); - -#elif defined (ACE_WIN32) && defined (ACE_LACKS_GETSYSTEMTIMEASFILETIME) - SYSTEMTIME tsys; - FILETIME tfile; - ::GetSystemTime (&tsys); - ::SystemTimeToFileTime (&tsys, &tfile); - return ACE_Time_Value (tfile); #elif defined (ACE_WIN32) FILETIME tfile; ::GetSystemTimeAsFileTime (&tfile); return ACE_Time_Value (tfile); -#elif defined (ACE_HAS_AIX_HI_RES_TIMER) - timebasestruct_t tb; - - ::read_real_time (&tb, TIMEBASE_SZ); - ::time_base_to_time (&tb, TIMEBASE_SZ); - - tv.tv_sec = tb.tb_high; - tv.tv_usec = tb.tb_low / 1000L; #else # if defined (ACE_HAS_TIMEZONE_GETTIMEOFDAY) || \ defined (ACE_HAS_VOIDPTR_GETTIMEOFDAY) || \ diff --git a/ACE/ace/OS_NS_sys_utsname.cpp b/ACE/ace/OS_NS_sys_utsname.cpp index b073a641a59..604947b5825 100644 --- a/ACE/ace/OS_NS_sys_utsname.cpp +++ b/ACE/ace/OS_NS_sys_utsname.cpp @@ -164,8 +164,6 @@ ACE_OS::uname (ACE_utsname *name) # endif case PROCESSOR_ARCHITECTURE_UNKNOWN: default: - // @@ We could provide WinCE specific info here. But let's - // defer that to some later point. ACE_OS::strcpy (processor, "Unknown"); break; } diff --git a/ACE/ace/OS_NS_time.cpp b/ACE/ace/OS_NS_time.cpp index 526507eeb1b..3303e0588b4 100644 --- a/ACE/ace/OS_NS_time.cpp +++ b/ACE/ace/OS_NS_time.cpp @@ -11,212 +11,8 @@ #include "ace/OS_NS_Thread.h" #include "ace/Object_Manager_Base.h" -#if defined (ACE_HAS_WINCE) -# include "ace/OS_NS_stdio.h" /* Need ACE_OS::sprintf() */ - -namespace -{ - ACE_TCHAR const * const ACE_OS_day_of_week_name[] = - { - ACE_TEXT ("Sun"), - ACE_TEXT ("Mon"), - ACE_TEXT ("Tue"), - ACE_TEXT ("Wed"), - ACE_TEXT ("Thu"), - ACE_TEXT ("Fri"), - ACE_TEXT ("Sat") - }; - - ACE_TCHAR const * const ACE_OS_month_name[] = - { - ACE_TEXT ("Jan"), - ACE_TEXT ("Feb"), - ACE_TEXT ("Mar"), - ACE_TEXT ("Apr"), - ACE_TEXT ("May"), - ACE_TEXT ("Jun"), - ACE_TEXT ("Jul"), - ACE_TEXT ("Aug"), - ACE_TEXT ("Sep"), - ACE_TEXT ("Oct"), - ACE_TEXT ("Nov"), - ACE_TEXT ("Dec") - }; - - static ACE_TCHAR const ACE_OS_CTIME_R_FMTSTR[] = ACE_TEXT ("%3s %3s %02d %02d:%02d:%02d %04d\n"); -} /* end blank namespace */ -#endif /* ACE_HAS_WINCE */ - ACE_BEGIN_VERSIONED_NAMESPACE_DECL -# if defined (ACE_HAS_WINCE) -ACE_TCHAR * -ACE_OS::ctime_r (const time_t *clock, ACE_TCHAR *buf, int buflen) -{ - // buflen must be at least 26 wchar_t long. - if (buflen < 26) // Again, 26 is a magic number. - { - errno = ERANGE; - return 0; - } - // This is really stupid, converting FILETIME to timeval back and - // forth. It assumes FILETIME and DWORDLONG are the same structure - // internally. - ULARGE_INTEGER _100ns; - _100ns.QuadPart = (DWORDLONG) *clock * 10000 * 1000 - + ACE_Time_Value::FILETIME_to_timval_skew; - FILETIME file_time; - file_time.dwLowDateTime = _100ns.LowPart; - file_time.dwHighDateTime = _100ns.HighPart; - - FILETIME localtime; - SYSTEMTIME systime; - FileTimeToLocalFileTime (&file_time, &localtime); - FileTimeToSystemTime (&localtime, &systime); - ACE_OS::snprintf (buf, buflen, ACE_OS_CTIME_R_FMTSTR, - ACE_OS_day_of_week_name[systime.wDayOfWeek], - ACE_OS_month_name[systime.wMonth - 1], - systime.wDay, - systime.wHour, - systime.wMinute, - systime.wSecond, - systime.wYear); - return buf; -} -# endif /* ACE_HAS_WINCE */ - -# if defined (ACE_LACKS_DIFFTIME) -double -ACE_OS::difftime (time_t t1, time_t t0) -{ - /* return t1 - t0 in seconds */ - struct tm tms[2], *ptms[2], temp; - double seconds; - int swap = 0; - - /* extract the tm structure from time_t */ - ptms[1] = ::gmtime_r (&t1, &tms[1]); - if (ptms[1] == 0) return 0.0; - - ptms[0] = ::gmtime_r (&t0, &tms[0]); - if (ptms[0] == 0) return 0.0; - - /* make sure t1 is > t0 */ - if (tms[1].tm_year < tms[0].tm_year) - swap = 1; - else if (tms[1].tm_year == tms[0].tm_year) - { - if (tms[1].tm_yday < tms[0].tm_yday) - swap = 1; - else if (tms[1].tm_yday == tms[0].tm_yday) - { - if (tms[1].tm_hour < tms[0].tm_hour) - swap = 1; - else if (tms[1].tm_hour == tms[0].tm_hour) - { - if (tms[1].tm_min < tms[0].tm_min) - swap = 1; - else if (tms[1].tm_min == tms[0].tm_min) - { - if (tms[1].tm_sec < tms[0].tm_sec) - swap = 1; - } - } - } - } - - if (swap) - temp = tms[0], tms[0] = tms[1], tms[1] = temp; - - seconds = 0.0; - if (tms[1].tm_year > tms[0].tm_year) - { - // Accumulate the time until t[0] catches up to t[1]'s year. - seconds = 60 - tms[0].tm_sec; - tms[0].tm_sec = 0; - tms[0].tm_min += 1; - seconds += 60 * (60 - tms[0].tm_min); - tms[0].tm_min = 0; - tms[0].tm_hour += 1; - seconds += 60*60 * (24 - tms[0].tm_hour); - tms[0].tm_hour = 0; - tms[0].tm_yday += 1; - -# define ISLEAPYEAR(y) ((y)&3u?0:(y)%25u?1:(y)/25u&12?0:1) - - if (ISLEAPYEAR(tms[0].tm_year)) - seconds += 60*60*24 * (366 - tms[0].tm_yday); - else - seconds += 60*60*24 * (365 - tms[0].tm_yday); - - tms[0].tm_yday = 0; - tms[0].tm_year += 1; - - while (tms[1].tm_year > tms[0].tm_year) - { - if (ISLEAPYEAR(tms[0].tm_year)) - seconds += 60*60*24 * 366; - else - seconds += 60*60*24 * 365; - - tms[0].tm_year += 1; - } - -# undef ISLEAPYEAR - - } - else - { - // Normalize - if (tms[1].tm_sec < tms[0].tm_sec) - { - if (tms[1].tm_min == 0) - { - if (tms[1].tm_hour == 0) - { - tms[1].tm_yday -= 1; - tms[1].tm_hour += 24; - } - tms[1].tm_hour -= 1; - tms[1].tm_min += 60; - } - tms[1].tm_min -= 1; - tms[1].tm_sec += 60; - } - tms[1].tm_sec -= tms[0].tm_sec; - - if (tms[1].tm_min < tms[0].tm_min) - { - if (tms[1].tm_hour == 0) - { - tms[1].tm_yday -= 1; - tms[1].tm_hour += 24; - } - tms[1].tm_hour -= 1; - tms[1].tm_min += 60; - } - tms[1].tm_min -= tms[0].tm_min; - - if (tms[1].tm_hour < tms[0].tm_hour) - { - tms[1].tm_yday -= 1; - tms[1].tm_hour += 24; - } - tms[1].tm_hour -= tms[0].tm_hour; - - tms[1].tm_yday -= tms[0].tm_yday; - } - - // accumulate the seconds - seconds += tms[1].tm_sec; - seconds += 60 * tms[1].tm_min; - seconds += 60*60 * tms[1].tm_hour; - seconds += 60*60*24 * tms[1].tm_yday; - - return seconds; -} -# endif /* ACE_LACKS_DIFFTIME */ - struct tm * ACE_OS::localtime_r (const time_t *t, struct tm *res) { @@ -224,51 +20,6 @@ ACE_OS::localtime_r (const time_t *t, struct tm *res) #if defined (ACE_HAS_TR24731_2005_CRT) ACE_SECURECRTCALL (localtime_s (res, t), struct tm *, 0, res); return res; -#elif defined (ACE_HAS_WINCE) - // This is really stupid, converting FILETIME to timeval back and - // forth. It assumes FILETIME and DWORDLONG are the same structure - // internally. - - TIME_ZONE_INFORMATION pTz; - - const unsigned short int __mon_yday[2][13] = - { - /* Normal years. */ - { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365 }, - /* Leap years. */ - { 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366 } - }; - - ULARGE_INTEGER _100ns; - ::GetTimeZoneInformation (&pTz); - - _100ns.QuadPart = (DWORDLONG) *t * 10000 * 1000 + ACE_Time_Value::FILETIME_to_timval_skew; - FILETIME file_time; - file_time.dwLowDateTime = _100ns.LowPart; - file_time.dwHighDateTime = _100ns.HighPart; - - FILETIME localtime; - SYSTEMTIME systime; - FileTimeToLocalFileTime (&file_time, &localtime); - FileTimeToSystemTime (&localtime, &systime); - - res->tm_hour = systime.wHour; - res->tm_isdst = pTz.DaylightBias != 0; - - int iLeap; - iLeap = (res->tm_year % 4 == 0 && (res->tm_year% 100 != 0 || res->tm_year % 400 == 0)); - // based on leap select which group to use - - res->tm_mday = systime.wDay; - res->tm_min = systime.wMinute; - res->tm_mon = systime.wMonth - 1; - res->tm_sec = systime.wSecond; - res->tm_wday = systime.wDayOfWeek; - res->tm_yday = __mon_yday[iLeap][systime.wMonth] + systime.wDay; - res->tm_year = systime.wYear;// this the correct year but bias the value to start at the 1900 - res->tm_year = res->tm_year - 1900; - - return res; #elif defined (ACE_LACKS_LOCALTIME_R) ACE_OS_GUARD @@ -291,28 +42,11 @@ time_t ACE_OS::mktime (struct tm *t) { ACE_OS_TRACE ("ACE_OS::mktime"); -# if defined (ACE_HAS_WINCE) - SYSTEMTIME t_sys; - FILETIME t_file; - t_sys.wSecond = t->tm_sec; - t_sys.wMinute = t->tm_min; - t_sys.wHour = t->tm_hour; - t_sys.wDay = t->tm_mday; - t_sys.wMonth = t->tm_mon + 1; // SYSTEMTIME is 1-indexed, tm is 0-indexed - t_sys.wYear = t->tm_year + 1900; // SYSTEMTIME is real; tm is since 1900 - t_sys.wDayOfWeek = t->tm_wday; // Ignored in below function call. - t_sys.wMilliseconds = 0; - if (SystemTimeToFileTime (&t_sys, &t_file) == 0) - return -1; - ACE_Time_Value tv (t_file); - return tv.sec (); -# else -# if defined (ACE_HAS_THREADS) && !defined (ACE_HAS_MT_SAFE_MKTIME) +#if defined (ACE_HAS_THREADS) && !defined (ACE_HAS_MT_SAFE_MKTIME) ACE_OS_GUARD -# endif /* ACE_HAS_THREADS && ! ACE_HAS_MT_SAFE_MKTIME */ +#endif /* ACE_HAS_THREADS && ! ACE_HAS_MT_SAFE_MKTIME */ return std::mktime (t); -# endif /* ACE_HAS_WINCE */ } #if defined (ACE_LACKS_STRPTIME) diff --git a/ACE/ace/OS_NS_time.h b/ACE/ace/OS_NS_time.h index d155dc3636f..615d591c424 100644 --- a/ACE/ace/OS_NS_time.h +++ b/ACE/ace/OS_NS_time.h @@ -116,17 +116,6 @@ inline struct tm *ace_localtime_r_helper (const time_t *clock, struct tm *res) } #endif /* !ACE_LACKS_LOCALTIME_R */ -#if !defined (ACE_LACKS_DIFFTIME) -# if defined (_WIN32_WCE) && ((_WIN32_WCE >= 0x600) && (_WIN32_WCE <= 0x700)) && !defined (_USE_32BIT_TIME_T) \ - && defined (_MSC_VER) - // The WinCE 6.0/7.0 SDK ships with a diff_time that uses __time32_t as type - // not time_t. This resolves in compilation warnings because time_t - // can be 64bit. Disable at this moment the warning for just this method - // else we get two compile warnings on each source file that includes - // this file. -# pragma warning (push) -# pragma warning (disable: 4244) -# endif /// Helper for the ACE_OS::difftime() function /** * We moved the difftime code that used to be in ACE_OS::difftime() @@ -140,19 +129,9 @@ inline double ace_difftime(time_t t1, time_t t0) { return difftime (t1, t0); } -# if defined (_WIN32_WCE) && ((_WIN32_WCE >= 0x600) && (_WIN32_WCE <= 0x700)) && !defined (_USE_32BIT_TIME_T) \ - && defined (_MSC_VER) -# pragma warning (pop) -# endif -#endif /* !ACE_LACKS_DIFFTIME */ # if defined (ACE_WIN32) -// 64-bit quad-word definitions. -typedef unsigned __int64 ACE_QWORD; typedef unsigned __int64 ACE_hrtime_t; -inline ACE_QWORD ACE_MAKE_QWORD (DWORD lo, DWORD hi) { return ACE_QWORD (lo) | (ACE_QWORD (hi) << 32); } -inline DWORD ACE_LOW_DWORD (ACE_QWORD q) { return (DWORD) q; } -inline DWORD ACE_HIGH_DWORD (ACE_QWORD q) { return (DWORD) (q >> 32); } # elif defined (_TNS_R_TARGET) typedef long long ACE_hrtime_t; # else /* !ACE_WIN32 */ @@ -197,18 +176,10 @@ namespace ACE_OS ACE_NAMESPACE_INLINE_FUNCTION ACE_TCHAR *ctime (const time_t *t); -#if defined (ACE_HAS_WINCE) && !defined (_DEBUG) - extern ACE_EXPORT_MACRO -#else ACE_NAMESPACE_INLINE_FUNCTION -#endif ACE_TCHAR *ctime_r (const time_t *clock, ACE_TCHAR *buf, int buflen); -#if !defined (ACE_LACKS_DIFFTIME) ACE_NAMESPACE_INLINE_FUNCTION -#else - extern ACE_Export -#endif /* ! ACE_LACKS_DIFFTIME */ double difftime (time_t t1, time_t t0); diff --git a/ACE/ace/OS_NS_time.inl b/ACE/ace/OS_NS_time.inl index 97be63ace24..a41b805d4d0 100644 --- a/ACE/ace/OS_NS_time.inl +++ b/ACE/ace/OS_NS_time.inl @@ -94,11 +94,6 @@ ACE_OS::ctime (const time_t *t) #if defined (ACE_LACKS_CTIME) ACE_UNUSED_ARG (t); ACE_NOTSUP_RETURN (0); -#elif defined (ACE_HAS_WINCE) - static ACE_TCHAR buf [ctime_buf_size]; - return ACE_OS::ctime_r (t, - buf, - ctime_buf_size); #elif defined (ACE_WIN32) && defined (ACE_USES_WCHAR) return ::_wctime (t); #else @@ -119,10 +114,9 @@ ACE_OS::ctime (const time_t *t) # else return ::ctime (t); # endif /* ACE_USES_WCHAR */ -# endif /* ACE_HAS_WINCE */ +# endif /* ACE_LACKS_CTIME */ } -#if !defined (ACE_HAS_WINCE) /* CE version in OS.cpp */ ACE_INLINE ACE_TCHAR * ACE_OS::ctime_r (const time_t *t, ACE_TCHAR *buf, int buflen) { @@ -198,7 +192,6 @@ ACE_OS::ctime_r (const time_t *t, ACE_TCHAR *buf, int buflen) return buf; #endif /* ACE_HAS_REENTRANT_FUNCTIONS */ } -#endif /* !ACE_HAS_WINCE */ #if defined (ACE_USES_ULONG_FOR_STAT_TIME) ACE_INLINE ACE_TCHAR * @@ -242,13 +235,11 @@ ACE_OS::localtime_r (const unsigned long *clock, #endif -#if !defined (ACE_LACKS_DIFFTIME) ACE_INLINE double ACE_OS::difftime (time_t t1, time_t t0) { return ::ace_difftime (t1, t0); } -#endif /* ! ACE_LACKS_DIFFTIME */ ACE_INLINE ACE_hrtime_t ACE_OS::gethrtime (const ACE_HRTimer_Op op) @@ -257,14 +248,6 @@ ACE_OS::gethrtime (const ACE_HRTimer_Op op) #if defined (ACE_HAS_HI_RES_TIMER) ACE_UNUSED_ARG (op); return ::gethrtime (); -#elif defined (ACE_HAS_AIX_HI_RES_TIMER) - ACE_UNUSED_ARG (op); - timebasestruct_t tb; - - ::read_real_time(&tb, TIMEBASE_SZ); - ::time_base_to_time(&tb, TIMEBASE_SZ); - - return ACE_hrtime_t(tb.tb_high) * ACE_ONE_SECOND_IN_NSECS + tb.tb_low; #elif defined (ACE_WIN32) ACE_UNUSED_ARG(op); LARGE_INTEGER freq; @@ -398,8 +381,7 @@ ACE_OS::nanosleep (const struct timespec *requested, #if defined (ACE_HAS_CLOCK_GETTIME) // ::nanosleep () is POSIX 1003.1b. So is ::clock_gettime (). So, // if ACE_HAS_CLOCK_GETTIME is defined, then ::nanosleep () should - // be available on the platform. On Solaris 2.x, both functions - // require linking with -lposix4. + // be available on the platform return ::nanosleep ((ACE_TIMESPEC_PTR) requested, remaining); #else ACE_UNUSED_ARG (remaining); diff --git a/ACE/ace/OS_NS_unistd.cpp b/ACE/ace/OS_NS_unistd.cpp index edc64725a6f..49b5736f970 100644 --- a/ACE/ace/OS_NS_unistd.cpp +++ b/ACE/ace/OS_NS_unistd.cpp @@ -52,10 +52,6 @@ ACE_OS::argv_to_string (int argc, bool substitute_env_args, bool quote_args) { -#if defined (ACE_LACKS_STRENVDUP) - ACE_UNUSED_ARG (substitute_env_args); -#endif /* ACE_LACKS_STRENVDUP */ - if (argc <= 0 || argv == 0 || argv[0] == 0) return 0; @@ -67,7 +63,6 @@ ACE_OS::argv_to_string (int argc, for (int i = 0; i < argc; ++i) { -#if !defined (ACE_LACKS_STRENVDUP) // Account for environment variables. if (substitute_env_args && ACE_OS::strchr (argv[i], ACE_TEXT ('$')) != 0) @@ -98,7 +93,6 @@ ACE_OS::argv_to_string (int argc, return 0; } } -#endif /* ACE_LACKS_STRENVDUP */ // If must quote, we only do it if the arg contains spaces, or // is empty. Perhaps a check for other c | ord(c) <= 32 is in // order? @@ -261,12 +255,7 @@ ACE_OS::fork (const ACE_TCHAR *program_name) ACE_UNUSED_ARG (program_name); ACE_NOTSUP_RETURN (pid_t (-1)); # else - pid_t const pid = -# if defined (ACE_HAS_STHREADS) - ::fork1 (); -#else - ::fork (); -#endif /* ACE_HAS_STHREADS */ + pid_t const pid = ::fork (); #if !defined (ACE_HAS_MINIMAL_ACE_OS) && !defined (ACE_HAS_THREADS) @@ -308,7 +297,6 @@ ACE_OS::fork_exec (ACE_TCHAR *argv[]) if (ACE_OS::argv_to_string (argv, buf) != -1) { PROCESS_INFORMATION process_info; -# if !defined (ACE_HAS_WINCE) ACE_TEXT_STARTUPINFO startup_info; ACE_OS::memset ((void *) &startup_info, 0, @@ -325,18 +313,6 @@ ACE_OS::fork_exec (ACE_TCHAR *argv[]) 0, // No current directory. &startup_info, &process_info)) -# else - if (ACE_TEXT_CreateProcess (0, - buf, - 0, // No process attributes. - 0, // No thread attributes. - FALSE, // Can's inherit handles on CE - 0, // Don't create a new console window. - 0, // No environment. - 0, // No current directory. - 0, // Can't use startup info on CE - &process_info)) -# endif /* ! ACE_HAS_WINCE */ { // Free resources allocated in kernel. ACE_OS::close (process_info.hThread); @@ -422,12 +398,6 @@ ACE_OS::num_processors () return num_processors; else return -1; -#elif defined (__hpux) - struct pst_dynamic psd; - if (::pstat_getdynamic (&psd, sizeof (psd), (size_t) 1, 0) != -1) - return psd.psd_max_proc_cnt; - else - return -1; #else ACE_NOTSUP_RETURN (-1); #endif @@ -476,12 +446,6 @@ ACE_OS::num_processors_online () return num_processors; else return -1; -#elif defined (__hpux) - struct pst_dynamic psd; - if (::pstat_getdynamic (&psd, sizeof (psd), (size_t) 1, 0) != -1) - return psd.psd_proc_cnt; - else - return -1; #else ACE_NOTSUP_RETURN (-1); #endif @@ -792,10 +756,6 @@ ACE_OS::string_to_argv (ACE_TCHAR *buf, ACE_TCHAR **&argv, bool substitute_env_args) { -#if defined (ACE_LACKS_STRENVDUP) - ACE_UNUSED_ARG (substitute_env_args); -#endif /* ACE_LACKS_STRENVDUP */ - // Reset the number of arguments argc = 0; @@ -901,7 +861,6 @@ ACE_OS::string_to_argv (ACE_TCHAR *buf, *cp = ACE_TEXT ('\0'); -#if !defined (ACE_LACKS_STRENVDUP) // Check for environment variable substitution here. if (substitute_env_args) { argv[i] = ACE_OS::strenvdup (argp); @@ -919,7 +878,6 @@ ACE_OS::string_to_argv (ACE_TCHAR *buf, } } else -#endif /* ACE_LACKS_STRENVDUP */ { argv[i] = ACE_OS::strdup (argp); diff --git a/ACE/ace/OS_NS_unistd.h b/ACE/ace/OS_NS_unistd.h index a8a8fc3b979..6d4f270d132 100644 --- a/ACE/ace/OS_NS_unistd.h +++ b/ACE/ace/OS_NS_unistd.h @@ -119,8 +119,8 @@ namespace ACE_OS char *const argv[]); //@{ - /// Forks and exec's a process in a manner that works on Solaris and - /// NT. argv[0] must be the full path name to the executable. + /// Forks and exec's a process in a manner that works Windows. + /// argv[0] must be the full path name to the executable. ACE_NAMESPACE_INLINE_FUNCTION pid_t fork (); diff --git a/ACE/ace/OS_NS_unistd.inl b/ACE/ace/OS_NS_unistd.inl index 5c249d1fe59..8c5d2834ade 100644 --- a/ACE/ace/OS_NS_unistd.inl +++ b/ACE/ace/OS_NS_unistd.inl @@ -16,10 +16,6 @@ # include "ace/OS_NS_stdio.h" #endif /* ACE_LACKS_ACCESS */ -#if defined (ACE_HAS_ACCESS_EMULATION) -# include "ace/os_include/os_unistd.h" -#endif /* ACE_HAS_ACCESS_EMULATION */ - #if defined (ACE_VXWORKS) && (ACE_VXWORKS <= 0x690) # if defined (__RTP__) # include "ace/os_include/os_strings.h" @@ -39,23 +35,9 @@ ACE_OS::access (const char *path, int amode) { ACE_OS_TRACE ("ACE_OS::access"); #if defined (ACE_LACKS_ACCESS) -# if defined (ACE_HAS_ACCESS_EMULATION) - // @@ WINCE: There should be a Win32 API that can do this. - // Hard coded read access here. - ACE_UNUSED_ARG (amode); - FILE* handle = ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(path), - ACE_TEXT ("r")); - if (handle != 0) - { - ACE_OS::fclose (handle); - return 0; - } - return -1; -# else ACE_UNUSED_ARG (path); ACE_UNUSED_ARG (amode); ACE_NOTSUP_RETURN (-1); -# endif /* ACE_HAS_ACCESS_EMULATION */ #elif defined(ACE_WIN32) // Windows doesn't support checking X_OK(6) # if defined (ACE_ACCESS_EQUIVALENT) @@ -73,11 +55,11 @@ ACE_OS::access (const char *path, int amode) ACE_INLINE int ACE_OS::access (const wchar_t *path, int amode) { -#if defined (ACE_WIN32) && !defined (ACE_LACKS__WACCESS) +#if defined (ACE_WIN32) return ::_waccess (path, amode); -#else /* ACE_WIN32 && !ACE_HAS_WINCE */ +#else /* ACE_WIN32 */ return ACE_OS::access (ACE_Wide_To_Ascii (path).char_rep (), amode); -#endif /* ACE_WIN32 && !ACE_LACKS__WACCESS */ +#endif /* ACE_WIN32 */ } #endif /* ACE_HAS_WCHAR */ @@ -101,7 +83,7 @@ ACE_OS::getpagesize () SYSTEM_INFO sys_info; ::GetSystemInfo (&sys_info); return (long) sys_info.dwPageSize; -#elif defined (_SC_PAGESIZE) && !defined (ACE_HAS_NOTSUP_SC_PAGESIZE) +#elif defined (_SC_PAGESIZE) return ::sysconf (_SC_PAGESIZE); #elif defined (ACE_HAS_GETPAGESIZE) return ::getpagesize (); @@ -127,26 +109,18 @@ ACE_INLINE int ACE_OS::chdir (const char *path) { ACE_OS_TRACE ("ACE_OS::chdir"); -#if defined (ACE_LACKS_CHDIR) - ACE_UNUSED_ARG (path); - ACE_NOTSUP_RETURN (-1); -#elif defined (ACE_HAS_NONCONST_CHDIR) - return ::chdir (const_cast<char *> (path)); -#elif defined (ACE_CHDIR_EQUIVALENT) +#if defined (ACE_CHDIR_EQUIVALENT) return ACE_CHDIR_EQUIVALENT (path); #else return ::chdir (path); -#endif /* ACE_HAS_NONCONST_CHDIR */ +#endif /* ACE_CHDIR_EQUIVALENT */ } #if defined (ACE_HAS_WCHAR) ACE_INLINE int ACE_OS::chdir (const wchar_t *path) { -#if defined (ACE_LACKS_CHDIR) - ACE_UNUSED_ARG (path); - ACE_NOTSUP_RETURN (-1); -#elif defined (ACE_WIN32) +#if defined (ACE_WIN32) return ::_wchdir (path); #else /* ACE_WIN32 */ return ACE_OS::chdir (ACE_Wide_To_Ascii (path).char_rep ()); @@ -157,11 +131,7 @@ ACE_OS::chdir (const wchar_t *path) ACE_INLINE int ACE_OS::rmdir (const char *path) { -#if defined (ACE_HAS_WINCE) - ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::RemoveDirectory (ACE_TEXT_CHAR_TO_TCHAR(path)), - ace_result_), - int, -1); -#elif defined (ACE_RMDIR_EQUIVALENT) +#if defined (ACE_RMDIR_EQUIVALENT) return ACE_RMDIR_EQUIVALENT (path); #else return ::rmdir (path); @@ -172,16 +142,12 @@ ACE_OS::rmdir (const char *path) ACE_INLINE int ACE_OS::rmdir (const wchar_t *path) { -#if defined (ACE_HAS_WINCE) - ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::RemoveDirectoryW (path), - ace_result_), - int, -1); -#elif defined (ACE_WIN32) +#if defined (ACE_WIN32) return ::_wrmdir (path); #else ACE_Wide_To_Ascii n_path (path); return ACE_OS::rmdir (n_path.char_rep ()); -#endif /* ACE_HAS_WINCE */ +#endif /* ACE_WIN32 */ } #endif /* ACE_HAS_WCHAR */ @@ -257,7 +223,7 @@ ACE_OS::dup(ACE_HANDLE handle, pid_t pid) #else ACE_UNUSED_ARG (pid); return ::dup(handle); -#endif /*ACE_WIN32 && !ACE_HAS_WINCE*/ +#endif /* ACE_LACKS_DUP */ } ACE_INLINE int @@ -414,11 +380,7 @@ ACE_INLINE char * ACE_OS::getcwd (char *buf, size_t size) { ACE_OS_TRACE ("ACE_OS::getcwd"); -#if defined (ACE_LACKS_GETCWD) - ACE_UNUSED_ARG (buf); - ACE_UNUSED_ARG (size); - ACE_NOTSUP_RETURN (0); -#elif defined (ACE_GETCWD_EQUIVALENT) +#if defined (ACE_GETCWD_EQUIVALENT) return ACE_GETCWD_EQUIVALENT (buf, static_cast<int> (size)); #elif defined (ACE_WIN32) return ::getcwd (buf, static_cast<int> (size)); @@ -431,11 +393,7 @@ ACE_OS::getcwd (char *buf, size_t size) ACE_INLINE wchar_t * ACE_OS::getcwd (wchar_t *buf, size_t size) { -# if defined (ACE_HAS_WINCE) - ACE_UNUSED_ARG (buf); - ACE_UNUSED_ARG (size); - ACE_NOTSUP_RETURN (0); -# elif defined (ACE_WIN32) +# if defined (ACE_WIN32) return ::_wgetcwd (buf, static_cast<int> (size)); # else char *narrow_buf = new char[size]; @@ -566,7 +524,7 @@ ACE_OS::hostname (char name[], size_t maxnamelen) ACE_UNUSED_ARG (maxnamelen); ACE_NOTSUP_RETURN (-1); # endif /* ACE_HAS_PHARLAP_RT */ -#elif defined (ACE_VXWORKS) || defined (ACE_HAS_WINCE) +#elif defined (ACE_VXWORKS) return ::gethostname (name, maxnamelen); #elif defined (ACE_WIN32) if (::gethostname (name, ACE_Utils::truncate_cast<int> (maxnamelen)) == 0) @@ -607,11 +565,11 @@ ACE_OS::hostname (char name[], size_t maxnamelen) ACE_INLINE int ACE_OS::hostname (wchar_t name[], size_t maxnamelen) { -#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) +#if defined (ACE_WIN32) ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (GetComputerNameW (name, LPDWORD (&maxnamelen)), ace_result_), int, -1); -#else /* ACE_WIN32 && !ACE_HAS_WINCE */ +#else /* ACE_WIN32 */ // Emulate using the char version char *char_name = 0; @@ -622,7 +580,7 @@ ACE_OS::hostname (wchar_t name[], size_t maxnamelen) delete [] char_name; return result; -#endif /* ACE_WIN32 && !ACE_HAS_WINCE */ +#endif /* ACE_WIN32 */ } #endif /* ACE_HAS_WCHAR */ @@ -1097,18 +1055,10 @@ ACE_OS::sysconf (int name) } ACE_INLINE long -ACE_OS::sysinfo (int cmd, char *buf, long count) +ACE_OS::sysinfo (int /*cmd*/, char */*buf*/, long /*count*/) { ACE_OS_TRACE ("ACE_OS::sysinfo"); -#if defined (ACE_HAS_SYSV_SYSINFO) - return ::sysinfo (cmd, buf, count); -#else - ACE_UNUSED_ARG (cmd); - ACE_UNUSED_ARG (buf); - ACE_UNUSED_ARG (count); - ACE_NOTSUP_RETURN (0); -#endif /* ACE_HAS_SYSV_SYSINFO */ } ACE_INLINE int @@ -1214,20 +1164,14 @@ ACE_INLINE int ACE_OS::unlink (const char *path) { ACE_OS_TRACE ("ACE_OS::unlink"); -# if defined (ACE_HAS_NONCONST_UNLINK) - return ::unlink (const_cast<char *> (path)); -# elif defined (ACE_HAS_WINCE) - // @@ The problem is, DeleteFile is not actually equals to unlink. ;( - ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::DeleteFile (ACE_TEXT_CHAR_TO_TCHAR (path)), ace_result_), - int, -1); -# elif defined (ACE_LACKS_UNLINK) +#if defined (ACE_LACKS_UNLINK) ACE_UNUSED_ARG (path); ACE_NOTSUP_RETURN (-1); -# elif defined (ACE_UNLINK_EQUIVALENT) +#elif defined (ACE_UNLINK_EQUIVALENT) return ACE_UNLINK_EQUIVALENT (path); -# else +#else return ::unlink (path); -# endif /* ACE_HAS_NONCONST_UNLINK */ +#endif /* ACE_LACKS_UNLINK */ } #if defined (ACE_HAS_WCHAR) @@ -1235,16 +1179,12 @@ ACE_INLINE int ACE_OS::unlink (const wchar_t *path) { ACE_OS_TRACE ("ACE_OS::unlink"); -# if defined (ACE_HAS_WINCE) - // @@ The problem is, DeleteFile is not actually equals to unlink. ;( - ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::DeleteFileW (path), ace_result_), - int, -1); -# elif defined (ACE_WIN32) +# if defined (ACE_WIN32) return ::_wunlink (path); # else ACE_Wide_To_Ascii npath (path); return ACE_OS::unlink (npath.char_rep ()); -# endif /* ACE_HAS_WINCE */ +# endif /* ACE_WIN32 */ } #endif /* ACE_HAS_WCHAR */ diff --git a/ACE/ace/OS_TLI.h b/ACE/ace/OS_TLI.h index 07b8ace2fa2..ab9fb5f3724 100644 --- a/ACE/ace/OS_TLI.h +++ b/ACE/ace/OS_TLI.h @@ -39,20 +39,8 @@ struct t_uderr { }; struct netbuf { }; # else /* !(ACE_HAS_TLI || ACE_HAS_XTI) */ - -# if defined (ACE_HAS_CONFLICTING_XTI_MACROS) - // Make sure tcp.h gets included before sys/xti.h. -# include "ace/os_include/netinet/os_tcp.h" -# undef TCP_NODELAY -# undef TCP_MAXSEG -# endif /* ACE_HAS_CONFLICTING_XTI_MACROS */ - # if defined (ACE_HAS_XTI) -# if defined (ACE_HAS_SYS_XTI_H) /* Nonstandard header placement */ -# define class ace_xti_class -# include /**/ <sys/xti.h> -# undef class -# elif defined (ACE_HAS_FORE_ATM_XTI) +# if defined (ACE_HAS_FORE_ATM_XTI) # include /**/ <fore_xti/xti_user_types.h> # include /**/ <fore_xti/xti.h> # include /**/ <fore_xti/xti_atm.h> @@ -68,7 +56,6 @@ struct netbuf { }; // desired, local or peer, while t_getprotaddr() gets both at once. // t_getname() has values defined for the type, so these aren't defined // for XTI systems. So, define them here for ACE API users to use. - // These values were taken from sys/tiuser.h on Solaris. # if !defined (LOCALNAME) # define LOCALNAME 0 # endif @@ -113,18 +100,6 @@ extern "C" } # endif /* !ACE_HAS_TLI_PROTOTYPES */ -# if defined (ACE_HAS_TIUSER_H) -# include /**/ <tiuser.h> -# else - /* What to do here??? Is there a tli.h? */ -# endif /* ACE_HAS_TIUSER_H */ - -# if defined (ACE_HAS_SVR4_TLI) - // t_getname is a TLI extension added by some platforms before XTI - // was widely available. However, it's not often in the system's - // header files. Sun OS, for example, is like this. - extern "C" int t_getname (int, struct netbuf *, int); -# endif /* ACE_HAS_SVR4_TLI */ # endif /* !ACE_HAS_XTI */ # endif /* ACE_HAS_XTI || ACE_HAS_TLI */ diff --git a/ACE/ace/OS_TLI.inl b/ACE/ace/OS_TLI.inl index e2bc18c830f..48d55ccc646 100644 --- a/ACE/ace/OS_TLI.inl +++ b/ACE/ace/OS_TLI.inl @@ -87,11 +87,7 @@ ACE_INLINE void t_error (const char *errmsg) { #if defined (ACE_HAS_TLI) -#if defined (ACE_HAS_BROKEN_T_ERROR) - ::t_error (const_cast<char *> (errmsg)); -#else ::t_error (errmsg); -#endif /* ACE_HAS_BROKEN_T_ERROR */ #else ACE_UNUSED_ARG (errmsg); #endif /* ACE_HAS_TLI */ @@ -163,16 +159,13 @@ t_getname (ACE_HANDLE handle, struct netbuf *namep, int type) else namep->len = peer.addr.len; return 0; - -#elif defined (ACE_HAS_SVR4_TLI) - return ::t_getname (handle, namep, type); #else ACE_UNUSED_ARG (handle); ACE_UNUSED_ARG (namep); ACE_UNUSED_ARG (type); ACE_NOTSUP_RETURN (-1); -#endif /* ACE_HAS_SVR4_TLI */ +#endif /* ACE_HAS_XTI */ } ACE_INLINE int diff --git a/ACE/ace/OS_Thread_Adapter.cpp b/ACE/ace/OS_Thread_Adapter.cpp index 514cc692a40..bdf52d7fd50 100644 --- a/ACE/ace/OS_Thread_Adapter.cpp +++ b/ACE/ace/OS_Thread_Adapter.cpp @@ -57,23 +57,6 @@ ACE_OS_Thread_Adapter::invoke () // not to access <this> anywhere below this point. delete this; -#if defined (ACE_NEEDS_LWP_PRIO_SET) - // On SunOS, the LWP priority needs to be set in order to get - // preemption when running in the RT class. This is the ACE way to - // do that . . . - ACE_hthread_t thr_handle; - ACE_OS::thr_self (thr_handle); - int prio; - - // thr_getprio () on the current thread should never fail. - ACE_OS::thr_getprio (thr_handle, prio); - - // ACE_OS::thr_setprio () has the special logic to set the LWP priority, - // if running in the RT class. - ACE_OS::thr_setprio (prio); - -#endif /* ACE_NEEDS_LWP_PRIO_SET */ - if (cancel_flags != 0) { // If both flags are set, ignore this. diff --git a/ACE/ace/OS_main.cpp b/ACE/ace/OS_main.cpp index 74b917da9f7..1fbacb1ba93 100644 --- a/ACE/ace/OS_main.cpp +++ b/ACE/ace/OS_main.cpp @@ -51,7 +51,7 @@ ace_os_main_i (int argc, char *argv[]) /* user's entry point, e.g., main */ ACE_END_VERSIONED_NAMESPACE_DECL -# elif !defined (ACE_HAS_WINCE) +# else ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -94,60 +94,9 @@ ace_os_main_i (ACE_Main_Base &mbase, int argc, char *argv[]) /* user's entry poi ACE_END_VERSIONED_NAMESPACE_DECL -# else /* ACE_HAS_WINCE */ +# endif /* !ACE_WIN32 */ -// CE only gets a command line string; no argv. So we need to convert it -// when the main entrypoint expects argc/argv. ACE_ARGV supports this. -# include "ace/OS_NS_string.h" -# include "ace/OS_NS_ctype.h" -# include "ace/ACE.h" -# include "ace/ARGV.h" - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - -ACE_Main_Base::~ACE_Main_Base () -{ -} - -int ACE_Main_Base::run (HINSTANCE, - HINSTANCE, - LPWSTR lpCmdLine, - int) -{ - ACE_TCHAR cmdline[1024]; - ACE_TCHAR msg_file [MAXPATHLEN]; - if (ACE_TEXT_GetModuleFileName (0, msg_file, MAXPATHLEN)) - { - bool quote = false; - for (size_t i(0); !quote && msg_file[i]; ++i) - { - if (ACE_OS::ace_isspace (msg_file[i])) quote = true; - } - ACE_TCHAR *cmd_iter = cmdline; - if (quote) - { - *cmd_iter++ = ACE_TEXT ('"'); - } - ACE_OS::strcpy (cmd_iter, msg_file); - ACE_OS::strcat (cmd_iter, quote ? ACE_TEXT ("\" ") : ACE_TEXT (" ")); - } - else - { - ACE_OS::strcpy (cmdline, ACE_TEXT ("program ")); - } - ACE_OS::strcat (cmdline, ACE_TEXT_WCHAR_TO_TCHAR (lpCmdLine)); - ACE_ARGV ce_argv (cmdline); - ACE::init (); - ACE_MAIN_OBJECT_MANAGER - int const i = this->run_i (ce_argv.argc (), ce_argv.argv ()); - ACE::fini (); - return i; -} -ACE_END_VERSIONED_NAMESPACE_DECL - -# endif /* !ACE_HAS_WINCE */ - -#endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER && !ACE_HAS_WINCE && !ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER */ +#endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER && !ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER */ #endif /* ACE_DOESNT_DEFINE_MAIN */ diff --git a/ACE/ace/OS_main.h b/ACE/ace/OS_main.h index 982875accbb..873e4e0ecb4 100644 --- a/ACE/ace/OS_main.h +++ b/ACE/ace/OS_main.h @@ -27,10 +27,6 @@ # if !defined (ACE_DOESNT_DEFINE_MAIN) -# if defined (ACE_HAS_RTEMS) -extern char* rtems_progname; -# endif /* ACE_HAS_RTEMS */ - #if defined (ACE_VXWORKS) && (ACE_VXWORKS <= 0x640) && defined (__RTP__) # include <resolvLib.h> #endif @@ -101,25 +97,6 @@ ACE_MAIN (int argc, char *argv[]) /* user's entry point, e.g., main */ \ int \ ace_main_i -# elif defined (ACE_HAS_RTEMS) - -# define main \ -ACE_MAIN (int, char *[]); /* forward decl to gobble up the 'int' if there is one */ \ -ACE_BEGIN_VERSIONED_NAMESPACE_DECL \ -int ace_os_main_i (int, char *[]); \ -ACE_END_VERSIONED_NAMESPACE_DECL \ -int \ -ACE_MAIN (int argc, char *argv[]) /* user's entry point, e.g., main */ \ -{ \ - if ((argc > 0) && argv && argv[0]) \ - rtems_progname = argv[0]; \ - else \ - rtems_progname = "RTEMS"; \ - return ace_os_main_i (argc, argv); /* what the user calls "main" */ \ -} \ -int \ -ace_main_i - # elif defined (ACE_VXWORKS) && (ACE_VXWORKS <= 0x640) && defined (__RTP__) # define main \ @@ -151,7 +128,7 @@ ACE_MAIN (int argc, char *argv[]) /* user's entry point, e.g., main */ \ ACE_Proper_Export_Flag int \ ace_main_i -# elif !defined (ACE_HAS_WINCE) +# else # if defined (ACE_WIN32) && defined (ACE_USES_WCHAR) @@ -230,78 +207,8 @@ int \ ace_main_i # endif /* ACE_WIN32 && ACE_USES_WCHAR */ - -# else /* ACE_HAS_WINCE */ - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - -class ACE_Export ACE_Main_Base -{ -public: - virtual ~ACE_Main_Base (); - int run (HINSTANCE, HINSTANCE, LPWSTR, int); - virtual int run_i (int, ACE_TCHAR *[]) = 0; -}; - -ACE_END_VERSIONED_NAMESPACE_DECL - -# if defined (ACE_TMAIN) // Use WinMain on CE; others give warning/error. -# undef ACE_TMAIN -# endif // ACE_TMAIN - -// Support for ACE_TMAIN, which is a recommended way. It would be nice if -// CE had CommandLineToArgvW()... but it's only on NT3.5 and up. - -# define ACE_TMAIN \ -ace_tmain_i (int, ACE_TCHAR *[]); \ -class ACE_Main : public ACE_Main_Base {int run_i (int argc, ACE_TCHAR *argv[]);}; \ -inline int ACE_Main::run_i (int argc, ACE_TCHAR *argv[]) \ -{ \ - return ace_tmain_i (argc, argv); \ -} \ -int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nCmdShow) \ -{ \ - ACE_Main m; \ - return m.run (hInstance, hPrevInstance, lpCmdLine, nCmdShow); \ -} \ -int ace_tmain_i - -// Support for wchar_t but still can't fit to CE because of the command -// line parameters. -# define wmain \ -ace_wmain_i (int, ACE_TCHAR *[]); \ -ACE_Export int ace_os_winwmain_i (ACE_Main_Base&, hInstance, hPrevInstance, lpCmdLine, nCmdShow); /* forward declaration */ \ -class ACE_Main : public ACE_Main_Base {int run_i (int argc, ACE_TCHAR *argv[]);}; \ -inline int ACE_Main::run_i (int argc, ACE_TCHAR *argv[]) \ -{ \ - return ace_wmain_i (argc, argv); \ -} \ -int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nCmdShow) \ -{ \ - return ace_os_winwmain_i (hInstance, hPrevInstance, lpCmdLine, nCmdShow); \ -} \ -int ace_wmain_i - -// Supporting legacy 'main' is A LOT easier for users than changing existing -// code on WinCE. Unfortunately, evc 3 can't grok a #include within the macro -// expansion, so it needs to go out here. -# include "ace/Argv_Type_Converter.h" -# define main \ -ace_main_i (int, ACE_TCHAR *[]); \ -ACE_Export int ace_os_winmain_i (ACE_Main_Base&, hInstance, hPrevInstance, lpCmdLine, nCmdShow); /* forward declaration */ \ -class ACE_Main : public ACE_Main_Base {int run_i (int argc, ACE_TCHAR *argv[]);}; \ -inline int ACE_Main::run_i (int argc, ACE_TCHAR *argv[]) \ -{ \ - return ace_main_i (argc, argv); \ -} \ -int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nCmdShow) \ -{ \ - return ace_os_winmain_i (hInstance, hPrevInstance, lpCmdLine, nCmdShow); \ -} \ -int ace_main_i - # endif -# endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER && !ACE_HAS_WINCE && !ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER */ +# endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER && !ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER */ # ifdef ACE_MQX # include <iar_dynamic_init.h> diff --git a/ACE/ace/Object_Manager.cpp b/ACE/ace/Object_Manager.cpp index 56edf6ec314..55701947175 100644 --- a/ACE/ace/Object_Manager.cpp +++ b/ACE/ace/Object_Manager.cpp @@ -28,7 +28,7 @@ #include "ace/Null_Mutex.h" #include "ace/Mutex.h" #include "ace/RW_Thread_Mutex.h" -#if defined (ACE_DISABLE_WIN32_ERROR_WINDOWS) && !defined (ACE_HAS_WINCE) +#if defined (ACE_DISABLE_WIN32_ERROR_WINDOWS) # include "ace/OS_NS_stdlib.h" # include /**/ <crtdbg.h> #endif // ACE_DISABLE_WIN32_ERROR_WINDOWS @@ -53,7 +53,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL // Note the following fix was derived from that proposed by Jochen Kalmbach // http://blog.kalmbachnet.de/?postid=75 -#if defined (ACE_DISABLE_WIN32_ERROR_WINDOWS) && !defined (ACE_HAS_WINCE) +#if defined (ACE_DISABLE_WIN32_ERROR_WINDOWS) LPTOP_LEVEL_EXCEPTION_FILTER WINAPI ACEdisableSetUnhandledExceptionFilter ( LPTOP_LEVEL_EXCEPTION_FILTER /*lpTopLevelExceptionFilter*/) { @@ -257,7 +257,7 @@ ACE_Object_Manager::init () } # endif /* ACE_HAS_TSS_EMULATION */ -#if defined (ACE_DISABLE_WIN32_ERROR_WINDOWS) && !defined (ACE_HAS_WINCE) +#if defined (ACE_DISABLE_WIN32_ERROR_WINDOWS) #if defined (_DEBUG) && (defined (_MSC_VER) || defined (__INTEL_COMPILER) || defined (__MINGW32__)) _CrtSetReportMode( _CRT_ERROR, _CRTDBG_MODE_FILE ); _CrtSetReportFile( _CRT_ERROR, _CRTDBG_FILE_STDERR ); diff --git a/ACE/ace/Object_Manager_Base.cpp b/ACE/ace/Object_Manager_Base.cpp index 0a1c0767186..3db3504db52 100644 --- a/ACE/ace/Object_Manager_Base.cpp +++ b/ACE/ace/Object_Manager_Base.cpp @@ -216,26 +216,20 @@ ACE_OS_Object_Manager::init () if (this == instance_) { # if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) -# if defined (ACE_HAS_WINCE_BROKEN_ERRNO) - ACE_CE_Errno::init (); -# endif /* ACE_HAS_WINCE_BROKEN_ERRNO */ ACE_OS_PREALLOCATE_OBJECT (ACE_thread_mutex_t, ACE_OS_MONITOR_LOCK) if (ACE_OS::thread_mutex_init - // This line must not be broken to avoid tickling a bug with SunC++'s preprocessor. (reinterpret_cast <ACE_thread_mutex_t *> (ACE_OS_Object_Manager::preallocated_object[ACE_OS_MONITOR_LOCK])) != 0) ACE_OS_Object_Manager::print_error_message ( __LINE__, ACE_TEXT ("ACE_OS_MONITOR_LOCK")); ACE_OS_PREALLOCATE_OBJECT (ACE_recursive_thread_mutex_t, ACE_TSS_CLEANUP_LOCK) if (ACE_OS::recursive_mutex_init - // This line must not be broken to avoid tickling a bug with SunC++'s preprocessor. (reinterpret_cast <ACE_recursive_thread_mutex_t *> (ACE_OS_Object_Manager::preallocated_object[ACE_TSS_CLEANUP_LOCK])) != 0) ACE_OS_Object_Manager::print_error_message ( __LINE__, ACE_TEXT ("ACE_TSS_CLEANUP_LOCK")); ACE_OS_PREALLOCATE_OBJECT (ACE_thread_mutex_t, ACE_LOG_MSG_INSTANCE_LOCK) if (ACE_OS::thread_mutex_init - // This line must not be broken to avoid tickling a bug with SunC++'s preprocessor. (reinterpret_cast <ACE_thread_mutex_t *> (ACE_OS_Object_Manager::preallocated_object[ACE_LOG_MSG_INSTANCE_LOCK])) != 0) ACE_OS_Object_Manager::print_error_message ( __LINE__, ACE_TEXT ("ACE_LOG_MSG_INSTANCE_LOCK")); @@ -243,7 +237,6 @@ ACE_OS_Object_Manager::init () ACE_OS_PREALLOCATE_OBJECT (ACE_recursive_thread_mutex_t, ACE_TSS_KEY_LOCK) if (ACE_OS::recursive_mutex_init - // This line must not be broken to avoid tickling a bug with SunC++'s preprocessor. (reinterpret_cast <ACE_recursive_thread_mutex_t *> (ACE_OS_Object_Manager::preallocated_object[ACE_TSS_KEY_LOCK])) != 0) ACE_OS_Object_Manager::print_error_message ( __LINE__, ACE_TEXT ("ACE_TSS_KEY_LOCK")); @@ -251,7 +244,6 @@ ACE_OS_Object_Manager::init () ACE_OS_PREALLOCATE_OBJECT (ACE_recursive_thread_mutex_t, ACE_TSS_BASE_LOCK) if (ACE_OS::recursive_mutex_init - // This line must not be broken to avoid tickling a bug with SunC++'s preprocessor. (reinterpret_cast <ACE_recursive_thread_mutex_t *> (ACE_OS_Object_Manager::preallocated_object[ACE_TSS_BASE_LOCK])) != 0) ACE_OS_Object_Manager::print_error_message ( __LINE__, ACE_TEXT ("ACE_TSS_BASE_LOCK")); @@ -343,7 +335,6 @@ ACE_OS_Object_Manager::fini () # if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) # if !defined(ACE_HAS_BROKEN_PREALLOCATED_OBJECTS_AFTER_FORK) if (ACE_OS::thread_mutex_destroy - // This line must not be broken to avoid tickling a bug with SunC++'s preprocessor. (reinterpret_cast <ACE_thread_mutex_t *> (ACE_OS_Object_Manager::preallocated_object[ACE_OS_MONITOR_LOCK])) != 0) # ifdef ACE_LACKS_PTHREAD_MUTEX_DESTROY if (errno != ENOTSUP) @@ -355,7 +346,6 @@ ACE_OS_Object_Manager::fini () ACE_OS_MONITOR_LOCK) # if !defined(ACE_HAS_BROKEN_PREALLOCATED_OBJECTS_AFTER_FORK) if (ACE_OS::recursive_mutex_destroy - // This line must not be broken to avoid tickling a bug with SunC++'s preprocessor. (reinterpret_cast <ACE_recursive_thread_mutex_t *> (ACE_OS_Object_Manager::preallocated_object[ACE_TSS_CLEANUP_LOCK])) != 0) # ifdef ACE_LACKS_PTHREAD_MUTEX_DESTROY if (errno != ENOTSUP) @@ -367,7 +357,6 @@ ACE_OS_Object_Manager::fini () ACE_TSS_CLEANUP_LOCK) # if !defined(ACE_HAS_BROKEN_PREALLOCATED_OBJECTS_AFTER_FORK) if (ACE_OS::thread_mutex_destroy - // This line must not be broken to avoid tickling a bug with SunC++'s preprocessor. (reinterpret_cast <ACE_thread_mutex_t *> (ACE_OS_Object_Manager::preallocated_object [ACE_LOG_MSG_INSTANCE_LOCK])) != 0) # ifdef ACE_LACKS_PTHREAD_MUTEX_DESTROY if (errno != ENOTSUP) @@ -380,7 +369,6 @@ ACE_OS_Object_Manager::fini () # if defined (ACE_HAS_TSS_EMULATION) # if !defined(ACE_HAS_BROKEN_PREALLOCATED_OBJECTS_AFTER_FORK) if (ACE_OS::recursive_mutex_destroy - // This line must not be broken to avoid tickling a bug with SunC++'s preprocessor. (reinterpret_cast <ACE_recursive_thread_mutex_t *> (ACE_OS_Object_Manager::preallocated_object[ACE_TSS_KEY_LOCK])) != 0) ACE_OS_Object_Manager::print_error_message ( __LINE__, ACE_TEXT ("ACE_TSS_KEY_LOCK")); @@ -390,7 +378,6 @@ ACE_OS_Object_Manager::fini () # if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) # if !defined(ACE_HAS_BROKEN_PREALLOCATED_OBJECTS_AFTER_FORK) if (ACE_OS::recursive_mutex_destroy - // This line must not be broken to avoid tickling a bug with SunC++'s preprocessor. (reinterpret_cast <ACE_recursive_thread_mutex_t *> (ACE_OS_Object_Manager::preallocated_object[ACE_TSS_BASE_LOCK])) != 0) ACE_OS_Object_Manager::print_error_message ( __LINE__, ACE_TEXT ("ACE_TSS_BASE_LOCK")); @@ -399,9 +386,6 @@ ACE_OS_Object_Manager::fini () ACE_TSS_BASE_LOCK) # endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE */ # endif /* ACE_HAS_TSS_EMULATION */ -# if defined (ACE_HAS_WINCE_BROKEN_ERRNO) - ACE_CE_Errno::fini (); -# endif /* ACE_HAS_WINCE_BROKEN_ERRNO */ # endif /* ACE_MT_SAFE */ #endif /* ! ACE_HAS_STATIC_PREALLOCATION */ } @@ -443,39 +427,17 @@ ACE_OS_Object_Manager::print_error_message (unsigned int line_number, const ACE_TCHAR *message) { // To avoid duplication of these const strings in OS.o. -#if !defined (ACE_HAS_WINCE) -# ifndef ACE_LACKS_STDERR +#ifndef ACE_LACKS_STDERR fprintf (stderr, "ace/Object_Manager_Base.cpp, line %u: %s ", line_number, ACE_TEXT_ALWAYS_CHAR (message)); -# else - ACE_UNUSED_ARG (line_number); - ACE_UNUSED_ARG (message); -# endif -# if !defined (ACE_LACKS_PERROR) - perror ("failed"); -# endif /* ACE_LACKS_PERROR */ #else - // @@ Need to use the following information. ACE_UNUSED_ARG (line_number); ACE_UNUSED_ARG (message); - - ACE_TCHAR *lpMsgBuf = 0; - ::FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER | - FORMAT_MESSAGE_FROM_SYSTEM, - 0, - ::GetLastError (), - MAKELANGID (LANG_NEUTRAL, - SUBLANG_DEFAULT), - // Default language - (ACE_TCHAR *) &lpMsgBuf, - 0, - 0); - ::MessageBox (0, - lpMsgBuf, - ACE_TEXT ("ACE_OS error"), - MB_OK); #endif +#if !defined (ACE_LACKS_PERROR) + perror ("failed"); +#endif /* ACE_LACKS_PERROR */ } int diff --git a/ACE/ace/Obstack_T.h b/ACE/ace/Obstack_T.h index 5de08a1669f..27d08d37976 100644 --- a/ACE/ace/Obstack_T.h +++ b/ACE/ace/Obstack_T.h @@ -114,13 +114,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Obstack_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Obstack_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Obstack_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_OBSTACK_T_H */ diff --git a/ACE/ace/POSIX_Proactor.cpp b/ACE/ace/POSIX_Proactor.cpp index 11308f32efd..e720c06dbe7 100644 --- a/ACE/ace/POSIX_Proactor.cpp +++ b/ACE/ace/POSIX_Proactor.cpp @@ -6,10 +6,6 @@ #include "ace/POSIX_Proactor.inl" #endif /* __ACE_INLINE__ */ -# if defined (ACE_HAS_SYS_SYSTEMINFO_H) -# include /**/ <sys/systeminfo.h> -# endif /* ACE_HAS_SYS_SYSTEMINFO_H */ - #include "ace/ACE.h" #include "ace/Flag_Manip.h" #include "ace/Task_T.h" @@ -19,10 +15,6 @@ #include "ace/OS_NS_signal.h" #include "ace/OS_NS_unistd.h" -#if defined (sun) -# include "ace/OS_NS_strings.h" -#endif /* sun */ - // ********************************************************************* ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -59,31 +51,8 @@ public: ACE_POSIX_Proactor::ACE_POSIX_Proactor () : os_id_ (ACE_OS_UNDEFINED) { -#if defined(sun) - - os_id_ = ACE_OS_SUN; // set family - - char Buf [32]; - - ::memset(Buf,0,sizeof(Buf)); - - ACE_OS::sysinfo (SI_RELEASE , Buf, sizeof(Buf)-1); - - if (ACE_OS::strcasecmp (Buf , "5.6") == 0) - os_id_ = ACE_OS_SUN_56; - else if (ACE_OS::strcasecmp (Buf , "5.7") == 0) - os_id_ = ACE_OS_SUN_57; - else if (ACE_OS::strcasecmp (Buf , "5.8") == 0) - os_id_ = ACE_OS_SUN_58; - -#elif defined(HPUX) - - os_id_ = ACE_OS_HPUX; // set family - -#elif defined(__OpenBSD) - +#if defined(__OpenBSD) os_id_ = ACE_OS_OPENBSD; // set family - // do the same //#else defined (LINUX, __FreeBSD__ ...) @@ -935,16 +904,12 @@ void ACE_POSIX_AIOCB_Proactor::check_max_aio_num () aiocb_list_max_size_ = max_os_aio_num; #endif -#if defined (HPUX) || defined (__FreeBSD__) - // Although HPUX 11.00 allows to start 2048 AIO's for all process in - // system it has a limit 256 max elements for aio_suspend () It is a - // pity, but ... - +#if defined (__FreeBSD__) long max_os_listio_num = ACE_OS::sysconf (_SC_AIO_LISTIO_MAX); if (max_os_listio_num > 0 && aiocb_list_max_size_ > (unsigned long) max_os_listio_num) aiocb_list_max_size_ = max_os_listio_num; -#endif /* HPUX || __FreeBSD__ */ +#endif /* __FreeBSD__ */ // check for user-defined value // ACE_AIO_MAX_SIZE if defined in POSIX_Proactor.h @@ -1857,7 +1822,7 @@ ACE_POSIX_SIG_Proactor::handle_events_i (const ACE_Time_Value *timeout) int error_status = 0; size_t transfer_count = 0; - if (sig_info.si_code == SI_ASYNCIO || this->os_id_ == ACE_OS_SUN_56) + if (sig_info.si_code == SI_ASYNCIO) { flg_aio = 1; // AIO signal received // define index to start @@ -1867,21 +1832,6 @@ ACE_POSIX_SIG_Proactor::handle_events_i (const ACE_Time_Value *timeout) #else index = static_cast<size_t> (sig_info.si_value.sival_int); #endif /* ACE_HAS_SIGVAL_SIGVAL_INT */ - // Assume we have a correctly-functioning implementation, and that - // there is one I/O to process, and it's correctly specified in the - // siginfo received. There are, however, some special situations - // where this isn't true... - if (os_id_ == ACE_OS_SUN_56) // Solaris 6 - { - // 1. Solaris 6 always loses any RT signal, - // if it has more SIGQUEMAX=32 pending signals - // so we should scan the whole aiocb list - // 2. Moreover,it has one more bad habit - // to notify aio completion - // with SI_QUEUE code instead of SI_ASYNCIO, hence the - // OS_SUN_56 addition to the si_code check, above. - count = aiocb_list_max_size_; - } } else if (sig_info.si_code != SI_QUEUE) { diff --git a/ACE/ace/POSIX_Proactor.h b/ACE/ace/POSIX_Proactor.h index a16d6ff76f0..143e16b269b 100644 --- a/ACE/ace/POSIX_Proactor.h +++ b/ACE/ace/POSIX_Proactor.h @@ -64,9 +64,6 @@ public: /// Signals notifications PROACTOR_SIG = 2, - /// SUN specific aiowait() - PROACTOR_SUN = 3, - /// Callback notifications PROACTOR_CB = 4 }; @@ -78,13 +75,6 @@ public: ACE_OS_WIN = 0x0100, // for future ACE_OS_WIN_NT = ACE_OS_WIN | 0x0001, ACE_OS_WIN_2000 = ACE_OS_WIN | 0x0002, - ACE_OS_SUN = 0x0200, // Sun Solaris family - ACE_OS_SUN_55 = ACE_OS_SUN | 0x0001, - ACE_OS_SUN_56 = ACE_OS_SUN | 0x0002, - ACE_OS_SUN_57 = ACE_OS_SUN | 0x0004, - ACE_OS_SUN_58 = ACE_OS_SUN | 0x0008, - ACE_OS_HPUX = 0x0400, // HPUX family - ACE_OS_HPUX_11 = ACE_OS_HPUX | 0x0001, ACE_OS_LINUX = 0x0800, // Linux family ACE_OS_FREEBSD = 0x1000, // FreeBSD family ACE_OS_IRIX = 0x2000, // SGI IRIX family diff --git a/ACE/ace/Pagefile_Memory_Pool.cpp b/ACE/ace/Pagefile_Memory_Pool.cpp index 19516cea601..8af6e554b66 100644 --- a/ACE/ace/Pagefile_Memory_Pool.cpp +++ b/ACE/ace/Pagefile_Memory_Pool.cpp @@ -20,13 +20,8 @@ #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */ #if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP) -#if !defined (ACE_HAS_WINCE) -#define ACE_MAP_FILE(_hnd, _access, _offHigh, _offLow, _nBytes, _baseAdd)\ +#define ACE_MAP_FILE(_hnd, _access, _offHigh, _offLow, _nBytes, _baseAdd) \ MapViewOfFileEx (_hnd, _access, _offHigh, _offLow, _nBytes, _baseAdd) -#else //if !defined (ACE_HAS_WINCE) -#define ACE_MAP_FILE(_hnd, _access, _offHigh, _offLow, _nBytes, _baseAdd)\ - MapViewOfFile (_hnd, _access, _offHigh, _offLow, _nBytes) -#endif /* !ACE_HAS_WINCE */ ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -55,26 +50,22 @@ ACE_Pagefile_Memory_Pool::ACE_Pagefile_Memory_Pool (const ACE_TCHAR *backing_sto { this->local_cb_.req_base_ = options->base_addr_; this->local_cb_.mapped_base_ = 0; - this->local_cb_.sh_.max_size_ = - options->max_size_; + this->local_cb_.sh_.max_size_ = options->max_size_; this->local_cb_.sh_.mapped_size_ = 0; - this->local_cb_.sh_.free_offset_ = - this->local_cb_.sh_.mapped_size_; + this->local_cb_.sh_.free_offset_ = this->local_cb_.sh_.mapped_size_; this->local_cb_.sh_.free_size_ = 0; } else { this->local_cb_.req_base_ = 0; this->local_cb_.mapped_base_ = 0; - this->local_cb_.sh_.max_size_ = - this->round_to_chunk_size (page_size_) ; + this->local_cb_.sh_.max_size_ = this->round_to_chunk_size (page_size_) ; this->local_cb_.sh_.mapped_size_ = 0; - this->local_cb_.sh_.free_offset_ = - this->local_cb_.sh_.mapped_size_; + this->local_cb_.sh_.free_offset_ = this->local_cb_.sh_.mapped_size_; this->local_cb_.sh_.free_size_ = 0; } - int update_backing_store_name = backing_store_name == 0 ? 0 : 1; + int const update_backing_store_name = backing_store_name == 0 ? 0 : 1; if (backing_store_name == 0) // Only create a new unique filename for the backing store file if diff --git a/ACE/ace/Pair_T.h b/ACE/ace/Pair_T.h index 36c32500e37..ac352ef5d54 100644 --- a/ACE/ace/Pair_T.h +++ b/ACE/ace/Pair_T.h @@ -63,13 +63,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Pair_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Pair_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Pair_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_PAIR_T_H */ diff --git a/ACE/ace/Parse_Node.cpp b/ACE/ace/Parse_Node.cpp index 295d3160a90..76b763da3df 100644 --- a/ACE/ace/Parse_Node.cpp +++ b/ACE/ace/Parse_Node.cpp @@ -700,14 +700,9 @@ ACE_Function_Node::symbol (ACE_Service_Gestalt *, return 0; } -#if defined (ACE_OPENVMS) && (!defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64)) - int const temp_p = reinterpret_cast<int> (func_p); -#else intptr_t const temp_p = reinterpret_cast<intptr_t> (func_p); -#endif - ACE_Service_Factory_Ptr func = - reinterpret_cast<ACE_Service_Factory_Ptr> (temp_p); + ACE_Service_Factory_Ptr func = reinterpret_cast<ACE_Service_Factory_Ptr> (temp_p); // Invoke the factory function and record it's return value. this->symbol_ = (*func) (gobbler); diff --git a/ACE/ace/Pipe.cpp b/ACE/ace/Pipe.cpp index 6946b436619..dc6aa4c7ddf 100644 --- a/ACE/ace/Pipe.cpp +++ b/ACE/ace/Pipe.cpp @@ -228,21 +228,6 @@ ACE_Pipe::open (int buffer_size) return -1; } # endif /* ! ACE_LACKS_SO_SNDBUF */ -# if defined (ACE_OPENVMS) && !defined (ACE_LACKS_TCP_NODELAY) - int one = 1; - // OpenVMS implements socketpair(AF_UNIX...) by returning AF_INET sockets. - // Since these are plagued by Nagle as any other INET socket we need to set - // TCP_NODELAY on the write handle. - if (ACE_OS::setsockopt (this->handles_[1], - ACE_IPPROTO_TCP, - TCP_NODELAY, - reinterpret_cast <const char *> (&one), - sizeof (one)) == -1) - { - this->close (); - return -1; - } -# endif /* ACE_OPENVMS && !ACE_LACKS_TCP_NODELAY */ #endif /* ! ACE_LACKS_SOCKETPAIR && ! ACE_HAS_STREAM_PIPES */ // Point both the read and write HANDLES to the appropriate socket // HANDLEs. diff --git a/ACE/ace/Proactor.cpp b/ACE/ace/Proactor.cpp index 3d4206e0010..f3230148e5c 100644 --- a/ACE/ace/Proactor.cpp +++ b/ACE/ace/Proactor.cpp @@ -9,9 +9,9 @@ #include "ace/Object_Manager.h" #include "ace/Task_T.h" -#if !defined (ACE_HAS_WINCE) && !defined (ACE_LACKS_ACE_SVCCONF) +#if !defined (ACE_LACKS_ACE_SVCCONF) # include "ace/Service_Config.h" -#endif /* !ACE_HAS_WINCE && !ACE_LACKS_ACE_SVCCONF */ +#endif /* !ACE_LACKS_ACE_SVCCONF */ #include "ace/Task_T.h" #include "ace/Log_Category.h" @@ -336,7 +336,7 @@ ACE_Proactor::ACE_Proactor (ACE_Proactor_Impl *implementation, # endif /* ACE_HAS_POSIX_REALTIME_SIGNALS */ # endif /* !ACE_HAS_BROKEN_SIGEVENT_STRUCT */ # endif /* ACE_POSIX_AIOCB_PROACTOR */ -#elif (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) +#elif defined (ACE_WIN32) // WIN_Proactor. ACE_NEW (implementation, ACE_WIN32_Proactor); @@ -437,13 +437,13 @@ ACE_Proactor::name () int ACE_Proactor::check_reconfiguration (ACE_Proactor *) { -#if !defined (ACE_HAS_WINCE) && !defined (ACE_LACKS_ACE_SVCCONF) +#if !defined (ACE_LACKS_ACE_SVCCONF) if (ACE_Service_Config::reconfig_occurred ()) { ACE_Service_Config::reconfigure (); return 1; } -#endif /* ! ACE_HAS_WINCE || ! ACE_LACKS_ACE_SVCCONF */ +#endif /* !ACE_LACKS_ACE_SVCCONF */ return 0; } diff --git a/ACE/ace/Process.cpp b/ACE/ace/Process.cpp index 3a52b8bb9a4..afa7a0da98d 100644 --- a/ACE/ace/Process.cpp +++ b/ACE/ace/Process.cpp @@ -137,31 +137,7 @@ ACE_Process::spawn (ACE_Process_Options &options) } } -#if defined (ACE_HAS_WINCE) - // Note that WinCE does not have process name included in the command line as argv[0] - // like other OS environment. Therefore, it is user's whole responsibility to call - // 'ACE_Process_Options::process_name(const ACE_TCHAR *name)' to set the proper - // process name (the execution file name with path if needed). - BOOL fork_result = - ACE_TEXT_CreateProcess (options.process_name(), - options.command_line_buf(), - options.get_process_attributes(), // must be NULL in CE - options.get_thread_attributes(), // must be NULL in CE - options.handle_inheritance(), // must be false in CE - options.creation_flags(), // must be NULL in CE - options.env_buf(), // environment variables, must be NULL in CE - options.working_directory(), // must be NULL in CE - options.startup_info(), // must be NULL in CE - &this->process_info_); - - if (fork_result) - { - parent (this->getpid ()); - return this->getpid (); - } - return ACE_INVALID_PID; - -#elif defined (ACE_WIN32) +#if defined (ACE_WIN32) void* env_buf = options.env_buf (); DWORD flags = options.creation_flags (); # if defined (ACE_HAS_WCHAR) && !defined (ACE_USES_WCHAR) @@ -214,67 +190,6 @@ ACE_Process::spawn (ACE_Process_Options &options) return this->getpid (); } return ACE_INVALID_PID; - -#elif defined(ACE_OPENVMS) - if (ACE_BIT_ENABLED (options.creation_flags (), - ACE_Process_Options::NO_EXEC)) - ACE_NOTSUP_RETURN (ACE_INVALID_PID); - - int saved_stdin = ACE_STDIN; - int saved_stdout = ACE_STDOUT; - int saved_stderr = ACE_STDERR; - // Save STD file descriptors and redirect - if (options.get_stdin () != ACE_INVALID_HANDLE) { - if ((saved_stdin = ACE_OS::dup (ACE_STDIN)) == -1 && errno != EBADF) - ACE_OS::exit (errno); - if (ACE_OS::dup2 (options.get_stdin (), ACE_STDIN) == -1) - ACE_OS::exit (errno); - } - if (options.get_stdout () != ACE_INVALID_HANDLE) { - if ((saved_stdout = ACE_OS::dup (ACE_STDOUT)) == -1 && errno != EBADF) - ACE_OS::exit (errno); - if (ACE_OS::dup2 (options.get_stdout (), ACE_STDOUT) == -1) - ACE_OS::exit (errno); - } - if (options.get_stderr () != ACE_INVALID_HANDLE) { - if ((saved_stderr = ACE_OS::dup (ACE_STDERR)) == -1 && errno != EBADF) - ACE_OS::exit (errno); - if (ACE_OS::dup2 (options.get_stderr (), ACE_STDERR) == -1) - ACE_OS::exit (errno); - } - - if (options.working_directory () != 0) - ACE_NOTSUP_RETURN (ACE_INVALID_PID); - - this->child_id_ = vfork(); - if (this->child_id_ == 0) { - ACE_OS::execvp (options.process_name (), - options.command_line_argv ()); - // something went wrong - this->child_id_ = ACE_INVALID_PID; - } - - // restore STD file descriptors (if necessary) - if (options.get_stdin () != ACE_INVALID_HANDLE) { - if (saved_stdin == -1) - ACE_OS::close (ACE_STDIN); - else - ACE_OS::dup2 (saved_stdin, ACE_STDIN); - } - if (options.get_stdout () != ACE_INVALID_HANDLE) { - if (saved_stdout == -1) - ACE_OS::close (ACE_STDOUT); - else - ACE_OS::dup2 (saved_stdout, ACE_STDOUT); - } - if (options.get_stderr () != ACE_INVALID_HANDLE) { - if (saved_stderr == -1) - ACE_OS::close (ACE_STDERR); - else - ACE_OS::dup2 (saved_stderr, ACE_STDERR); - } - - return this->child_id_; #elif defined (ACE_VXWORKS) && defined (__RTP__) if (ACE_BIT_ENABLED (options.creation_flags (), ACE_Process_Options::NO_EXEC)) @@ -761,8 +676,7 @@ ACE_Process::close_passed_handles () } #if defined (ACE_WIN32) && \ - defined (ACE_HAS_WCHAR) && !defined (ACE_USES_WCHAR) && \ - !defined (ACE_HAS_WINCE) + defined (ACE_HAS_WCHAR) && !defined (ACE_USES_WCHAR) wchar_t* ACE_Process::convert_env_buffer (const char* env) const { @@ -818,12 +732,9 @@ ACE_Process_Options::ACE_Process_Options (bool inherit_environment, size_t max_env_args, size_t max_cmdline_args) : -#if !defined (ACE_HAS_WINCE) inherit_environment_ (inherit_environment), -#endif /* ACE_HAS_WINCE */ creation_flags_ (0), avoid_zombies_ (0), -#if !defined (ACE_HAS_WINCE) #if defined (ACE_WIN32) environment_inherited_ (0), process_attributes_ (0), @@ -847,7 +758,6 @@ ACE_Process_Options::ACE_Process_Options (bool inherit_environment, environment_buf_len_ (env_buf_len), max_environment_args_ (max_env_args), max_environ_argv_index_ (max_env_args - 1), -#endif /* !ACE_HAS_WINCE */ command_line_argv_calculated_ (false), command_line_buf_ (0), command_line_copy_ (0), @@ -867,13 +777,6 @@ ACE_Process_Options::ACE_Process_Options (bool inherit_environment, command_line_buf_[0] = '\0'; process_name_[0] = '\0'; -#if defined (ACE_HAS_WINCE) - ACE_UNUSED_ARG(inherit_environment); - ACE_UNUSED_ARG(env_buf_len); - ACE_UNUSED_ARG(max_env_args); -#endif - -#if !defined (ACE_HAS_WINCE) working_directory_[0] = '\0'; #if defined (ACE_HAS_ALLOC_HOOKS) ACE_ALLOCATOR (environment_buf_, @@ -897,7 +800,6 @@ ACE_Process_Options::ACE_Process_Options (bool inherit_environment, sizeof this->startup_info_); this->startup_info_.cb = sizeof this->startup_info_; #endif /* ACE_WIN32 */ -#endif /* !ACE_HAS_WINCE */ #if defined (ACE_HAS_ALLOC_HOOKS) ACE_ALLOCATOR (command_line_argv_, static_cast<ACE_TCHAR**>(ACE_Allocator::instance()->malloc(sizeof(ACE_TCHAR*) * max_cmdline_args))); @@ -907,7 +809,6 @@ ACE_Process_Options::ACE_Process_Options (bool inherit_environment, #endif /* ACE_HAS_ALLOC_HOOKS */ } -#if !defined (ACE_HAS_WINCE) #if defined (ACE_WIN32) void ACE_Process_Options::inherit_environment () @@ -975,7 +876,6 @@ ACE_Process_Options::env_argv () { return environment_argv_; } - #endif /* ACE_WIN32 */ int @@ -1229,12 +1129,9 @@ ACE_Process_Options::release_handles () set_handles_called_ = 0; } } -#endif /* !ACE_HAS_WINCE */ - ACE_Process_Options::~ACE_Process_Options () { -#if !defined (ACE_HAS_WINCE) release_handles(); #if defined (ACE_HAS_ALLOC_HOOKS) ACE_Allocator::instance()->free(environment_buf_); @@ -1243,7 +1140,6 @@ ACE_Process_Options::~ACE_Process_Options () delete [] environment_buf_; delete [] environment_argv_; #endif /* ACE_HAS_ALLOC_HOOKS */ -#endif /* !ACE_HAS_WINCE */ #if defined (ACE_HAS_ALLOC_HOOKS) ACE_Allocator::instance()->free(command_line_buf_); #else @@ -1326,11 +1222,7 @@ ACE_Process_Options::command_line (const ACE_TCHAR *format, ...) return 0; } -#if defined (ACE_HAS_WCHAR) && !defined (ACE_HAS_WINCE) -/** - * @note Not available on Windows CE because it doesn't have a char version of - * vsprintf. - */ +#if defined (ACE_HAS_WCHAR) int ACE_Process_Options::command_line (const ACE_ANTI_TCHAR *format, ...) { @@ -1357,20 +1249,16 @@ ACE_Process_Options::command_line (const ACE_ANTI_TCHAR *format, ...) command_line_argv_calculated_ = false; return 0; } -#endif /* ACE_HAS_WCHAR && !ACE_HAS_WINCE */ +#endif /* ACE_HAS_WCHAR */ #endif // ACE_LACKS_VA_FUNCTIONS ACE_TCHAR * ACE_Process_Options::env_buf () { -#if !defined (ACE_HAS_WINCE) if (environment_buf_[0] == '\0') return 0; else return environment_buf_; -#else - return 0; -#endif /* !ACE_HAS_WINCE */ } ACE_TCHAR * const * @@ -1411,12 +1299,8 @@ ACE_Process_Options::command_line_argv () int ACE_Process_Options::pass_handle (ACE_HANDLE h) { -#if defined (ACE_HAS_WINCE) - ACE_NOTSUP_RETURN (-1); -#else this->handles_passed_.set_bit (h); return 0; -#endif /* ACE_HAS_WINCE */ } // Get a copy of the handles the ACE_Process_Options duplicated diff --git a/ACE/ace/Process.h b/ACE/ace/Process.h index 7e00b3dc975..70aa7c2f0d3 100644 --- a/ACE/ace/Process.h +++ b/ACE/ace/Process.h @@ -35,11 +35,6 @@ class ACE_Time_Value; * * This class controls the options passed to <CreateProcess> (or <fork> * and <exec>). - * Notice that on Windows CE, creating a process merely means - * instantiating a new process. You can't set the handles (since - * there's no stdin, stdout and stderr,) specify process/thread - * options, set environment,... So, basically, this class only - * set the command line and nothing else. * Notice that on UNIX platforms, if the <setenv> is used, the * <spawn> is using the <execve> system call. It means that the * <command_line> should include a full path to the program file @@ -169,10 +164,10 @@ public: #endif /* !ACE_USES_WCHAR */ ; -#if defined (ACE_HAS_WCHAR) && !defined (ACE_HAS_WINCE) +#if defined (ACE_HAS_WCHAR) /// Anti-TChar version of command_line () int command_line (const ACE_ANTI_TCHAR *format, ...); -#endif /* ACE_HAS_WCHAR && !ACE_HAS_WINCE */ +#endif /* ACE_HAS_WCHAR */ #endif // ACE_LACKS_VA_FUNCTIONS /// Same as above in argv format. @a argv must be null terminated. @@ -365,7 +360,6 @@ public: void inherit_environment (bool nv); #endif /* ACE_WIN32 */ protected: -#if !defined (ACE_HAS_WINCE) /// Add @a assignment to environment_buf_ and adjust /// environment_argv_. @a len is the strlen of @a assignment. int setenv_i (ACE_TCHAR *assignment, size_t len); @@ -373,7 +367,6 @@ protected: /// Whether the child process inherits the current process /// environment. bool inherit_environment_; -#endif /* !ACE_HAS_WINCE */ /// Default 0. u_long creation_flags_; @@ -381,7 +374,7 @@ protected: /// Avoid zombies for spawned processes. int avoid_zombies_; -#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) +#if defined (ACE_WIN32) /// Helper function to grab win32 environment and stick it in /// environment_buf_ using this->setenv_i. void inherit_environment (); @@ -424,7 +417,6 @@ protected: /// Default true. bool handle_inheritance_; -#if !defined (ACE_HAS_WINCE) /// Is 1 if stdhandles was called. int set_handles_called_; @@ -452,7 +444,6 @@ protected: /// The current working directory. ACE_TCHAR working_directory_[MAXPATHLEN + 1]; -#endif /* !ACE_HAS_WINCE */ /// Ensures command_line_argv is only calculated once. bool command_line_argv_calculated_; @@ -667,9 +658,7 @@ protected: ACE_Handle_Set dup_handles_; private: -#if defined (ACE_WIN32) && \ - defined (ACE_HAS_WCHAR) && !defined (ACE_USES_WCHAR) && \ - !defined (ACE_HAS_WINCE) +#if defined (ACE_WIN32) && defined (ACE_HAS_WCHAR) && !defined (ACE_USES_WCHAR) wchar_t* convert_env_buffer (const char* env) const; #endif }; diff --git a/ACE/ace/Process.inl b/ACE/ace/Process.inl index b982366b526..4b742af07e4 100644 --- a/ACE/ace/Process.inl +++ b/ACE/ace/Process.inl @@ -115,7 +115,7 @@ ACE_Process::exit_code (ACE_exitcode code) ACE_INLINE u_long ACE_Process_Options::creation_flags () const { -#if defined (ACE_USES_WCHAR) && defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) +#if defined (ACE_USES_WCHAR) && defined (ACE_WIN32) return creation_flags_ | CREATE_UNICODE_ENVIRONMENT; #else return creation_flags_; @@ -170,53 +170,33 @@ ACE_Process_Options::avoid_zombies (int avoid_zombies) ACE_INLINE ACE_TEXT_STARTUPINFO * ACE_Process_Options::startup_info () { -#if !defined (ACE_HAS_WINCE) return &startup_info_; -#else - return 0; -#endif /* !ACE_HAS_WINCE */ } ACE_INLINE LPSECURITY_ATTRIBUTES ACE_Process_Options::get_process_attributes () const { -#if !defined (ACE_HAS_WINCE) return process_attributes_; -#else - return 0; -#endif /* !ACE_HAS_WINCE */ } ACE_INLINE LPSECURITY_ATTRIBUTES ACE_Process_Options::set_process_attributes () { -#if !defined (ACE_HAS_WINCE) process_attributes_ = &security_buf1_; return process_attributes_; -#else - return 0; -#endif /* !ACE_HAS_WINCE */ } ACE_INLINE LPSECURITY_ATTRIBUTES ACE_Process_Options::get_thread_attributes () const { -#if !defined (ACE_HAS_WINCE) return thread_attributes_; -#else - return 0; -#endif /* !ACE_HAS_WINCE */ } ACE_INLINE LPSECURITY_ATTRIBUTES ACE_Process_Options::set_thread_attributes () { -#if !defined (ACE_HAS_WINCE) thread_attributes_ = &security_buf2_; return thread_attributes_; -#else - return 0; -#endif /* !ACE_HAS_WINCE */ } ACE_INLINE HANDLE ACE_Process_Options::get_user_token () const @@ -338,35 +318,23 @@ ACE_Process_Options::command_line_buf (size_t *max_lenp) ACE_INLINE ACE_TCHAR * ACE_Process_Options::working_directory () { -#if !defined (ACE_HAS_WINCE) if (working_directory_[0] == '\0') return 0; else return working_directory_; -#else - return 0; -#endif /* !ACE_HAS_WINCE */ } ACE_INLINE void ACE_Process_Options::working_directory (const char *wd) { -#if !defined(ACE_HAS_WINCE) ACE_OS::strcpy (working_directory_, ACE_TEXT_CHAR_TO_TCHAR (wd)); -#else - ACE_UNUSED_ARG (wd); -#endif /* !ACE_HAS_WINCE */ } #if defined (ACE_HAS_WCHAR) ACE_INLINE void ACE_Process_Options::working_directory (const wchar_t *wd) { -#if !defined(ACE_HAS_WINCE) ACE_OS::strcpy (working_directory_, ACE_TEXT_WCHAR_TO_TCHAR (wd)); -#else - ACE_UNUSED_ARG (wd); -#endif /* !ACE_HAS_WINCE */ } #endif /* ACE_HAS_WCHAR */ @@ -385,38 +353,4 @@ ACE_Process_Options::process_name () return this->process_name_; } -#if defined (ACE_HAS_WINCE) -// Here is a collection of inline functions which are defined only -// under CE. They are not empty on most other platforms. - -ACE_INLINE int -ACE_Process_Options::setenv (ACE_TCHAR * /* envp */[]) -{ - return -1; -} - -ACE_INLINE int -ACE_Process_Options::setenv (const ACE_TCHAR * /* format */, ...) -{ - return -1; -} - -ACE_INLINE int -ACE_Process_Options::setenv (const ACE_TCHAR * /* variable_name */, - const ACE_TCHAR * /* format */, - ...) -{ - return -1; -} - -ACE_INLINE int -ACE_Process_Options::set_handles (ACE_HANDLE /* std_in */, - ACE_HANDLE /* std_out */, - ACE_HANDLE /* std_err */) -{ - return -1; -} - -#endif /* ACE_HAS_WINCE */ - ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Profile_Timer.cpp b/ACE/ace/Profile_Timer.cpp index 8893443c98a..838e7860b8a 100644 --- a/ACE/ace/Profile_Timer.cpp +++ b/ACE/ace/Profile_Timer.cpp @@ -7,12 +7,7 @@ #include "ace/Log_Category.h" #include "ace/OS_NS_string.h" -#if defined (ACE_HAS_PRUSAGE_T) -#include "ace/OS_NS_fcntl.h" -#include "ace/OS_NS_unistd.h" -#endif - -#if (defined (ACE_HAS_PRUSAGE_T) || defined (ACE_HAS_GETRUSAGE)) && !defined (ACE_WIN32) +#if defined (ACE_HAS_GETRUSAGE) && !defined (ACE_WIN32) #include "ace/OS_NS_stdio.h" #if defined (ACE_HAS_ALLOC_HOOKS) @@ -40,32 +35,17 @@ ACE_Profile_Timer::ACE_Profile_Timer () ACE_OS::memset (&this->begin_usage_, 0, sizeof this->begin_usage_); ACE_OS::memset (&this->last_usage_, 0, sizeof this->last_usage_); -# if defined (ACE_HAS_PRUSAGE_T) - ACE_OS::memset (&this->last_usage_, 0, sizeof this->last_usage_); - char buf[20]; - ACE_OS::sprintf (buf, 20, "/proc/%d", static_cast<int> (ACE_OS::getpid ())); - - this->proc_handle_ = ACE_OS::open (buf, O_RDONLY, 0); - if (this->proc_handle_ == -1) - ACELIB_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - buf)); -# elif defined (ACE_HAS_GETRUSAGE) +# if defined (ACE_HAS_GETRUSAGE) ACE_OS::memset (&this->begin_time_, 0, sizeof this->begin_time_); ACE_OS::memset (&this->end_time_, 0, sizeof this->end_time_); ACE_OS::memset (&this->last_time_, 0, sizeof this->last_time_); -# endif /* ACE_HAS_PRUSAGE_T */ +# endif /* ACE_HAS_GETRUSAGE */ } // Terminate the interval timer. ACE_Profile_Timer::~ACE_Profile_Timer () { ACE_TRACE ("ACE_Profile_Timer::~ACE_Profile_Timer"); -# if defined (ACE_HAS_PRUSAGE_T) - if (ACE_OS::close (this->proc_handle_) == -1) - ACELIB_ERROR ((LM_ERROR, - ACE_TEXT ("ACE_Profile_Timer::~ACE_Profile_Timer"))); -# endif /* ACE_HAS_PRUSAGE_T */ } // Return the resource utilization. @@ -77,92 +57,7 @@ ACE_Profile_Timer::get_rusage (ACE_Profile_Timer::Rusage &usage) usage = this->end_usage_; } -# if defined (ACE_HAS_PRUSAGE_T) - -// Compute the amount of resource utilization since the start time. - -void -ACE_Profile_Timer::elapsed_rusage (ACE_Profile_Timer::Rusage &rusage) -{ - ACE_TRACE ("ACE_Profile_Timer::elapsed_rusage"); - rusage.pr_lwpid = - this->end_usage_.pr_lwpid - this->last_usage_.pr_lwpid; - rusage.pr_count = - this->end_usage_.pr_count - this->last_usage_.pr_count; - rusage.pr_minf = - this->end_usage_.pr_minf - this->last_usage_.pr_minf; - rusage.pr_majf = - this->end_usage_.pr_majf - this->last_usage_.pr_majf; - rusage.pr_inblk = - this->end_usage_.pr_inblk - this->last_usage_.pr_inblk; - rusage.pr_oublk = - this->end_usage_.pr_oublk - this->last_usage_.pr_oublk; - rusage.pr_msnd = - this->end_usage_.pr_msnd - this->last_usage_.pr_msnd; - rusage.pr_mrcv = - this->end_usage_.pr_mrcv - this->last_usage_.pr_mrcv; - rusage.pr_sigs = - this->end_usage_.pr_sigs - this->last_usage_.pr_sigs; - this->subtract (rusage.pr_wtime, - this->end_usage_.pr_wtime, - this->last_usage_.pr_wtime); - this->subtract (rusage.pr_ltime, - this->end_usage_.pr_ltime, - this->last_usage_.pr_ltime); - this->subtract (rusage.pr_slptime, - this->end_usage_.pr_slptime, - this->last_usage_.pr_slptime); - rusage.pr_vctx = - this->end_usage_.pr_vctx - this->last_usage_.pr_vctx; - rusage.pr_ictx = - this->end_usage_.pr_ictx - this->last_usage_.pr_ictx; - rusage.pr_sysc = - this->end_usage_.pr_sysc - this->last_usage_.pr_sysc; - rusage.pr_ioch = - this->end_usage_.pr_ioch - this->last_usage_.pr_ioch; -} - -// Compute the elapsed time. - -void -ACE_Profile_Timer::compute_times (ACE_Elapsed_Time &et) -{ - ACE_TRACE ("ACE_Profile_Timer::compute_times"); - timespec_t td; - - ACE_Profile_Timer::Rusage &end = this->end_usage_; - ACE_Profile_Timer::Rusage &begin = this->begin_usage_; - - this->subtract (td, end.pr_tstamp, begin.pr_tstamp); - // Convert nanoseconds into seconds. - et.real_time = td.tv_sec + ((double) td.tv_nsec) / ACE_ONE_SECOND_IN_NSECS; - this->subtract (td, end.pr_utime, begin.pr_utime); - // Convert nanoseconds into seconds. - et.user_time = td.tv_sec + ((double) td.tv_nsec) / ACE_ONE_SECOND_IN_NSECS; - this->subtract (td, end.pr_stime, begin.pr_stime); - // Convert nanoseconds into seconds. - et.system_time = td.tv_sec + ((double) td.tv_nsec) / ACE_ONE_SECOND_IN_NSECS; -} - -// Determine the difference between T1 and T2. - -void -ACE_Profile_Timer::subtract (timespec_t &tdiff, timespec_t &t1, timespec_t &t0) -{ - ACE_TRACE ("ACE_Profile_Timer::subtract"); - tdiff.tv_sec = t1.tv_sec - t0.tv_sec; - tdiff.tv_nsec = t1.tv_nsec - t0.tv_nsec; - - // Normalize the time. - - while (tdiff.tv_nsec < 0) - { - tdiff.tv_sec--; - tdiff.tv_nsec += ACE_ONE_SECOND_IN_NSECS; - } -} - -# elif defined (ACE_HAS_GETRUSAGE) +# if defined (ACE_HAS_GETRUSAGE) // Compute the amount of resource utilization since the start time. void @@ -255,7 +150,7 @@ ACE_Profile_Timer::subtract (timeval &tdiff, timeval &t1, timeval &t0) } } -# endif /* ACE_HAS_PRUSAGE_T */ +# endif /* ACE_HAS_GETRUSAGE */ // Compute the amount of time that has elapsed between start and stop. @@ -269,7 +164,7 @@ ACE_Profile_Timer::elapsed_time (ACE_Elapsed_Time &et) ACE_END_VERSIONED_NAMESPACE_DECL -#elif defined (ACE_WIN32) /* defined (ACE_HAS_PRUSAGE_T) || defined (ACE_HAS_GETRUSAGE) */ +#elif defined (ACE_WIN32) ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -433,5 +328,4 @@ ACE_Profile_Timer::elapsed_rusage (ACE_Profile_Timer::Rusage &usage) ACE_END_VERSIONED_NAMESPACE_DECL -#endif /* defined (ACE_HAS_PRUSAGE_T) || - defined (ACE_HAS_GETRUSAGE) && !defined (ACE_WIN32) */ +#endif /* defined (ACE_HAS_GETRUSAGE) && !defined (ACE_WIN32) */ diff --git a/ACE/ace/Profile_Timer.h b/ACE/ace/Profile_Timer.h index 6d682b72c50..9419f19c505 100644 --- a/ACE/ace/Profile_Timer.h +++ b/ACE/ace/Profile_Timer.h @@ -96,14 +96,7 @@ private: /// Keep track of the last rusage for incremental timing. ACE_Profile_Timer::Rusage last_usage_; -#if defined (ACE_HAS_PRUSAGE_T) - /// Subtract two timestructs and store their difference. - void subtract (timespec_t &tdiff, timespec_t &t0, timespec_t &t1); - - /// I/O handle for /proc file system. - ACE_HANDLE proc_handle_; - -#elif defined (ACE_HAS_GETRUSAGE) +#if defined (ACE_HAS_GETRUSAGE) /// Subtract two timestructs and store their difference. void subtract (timeval &tdiff, timeval &t0, @@ -117,12 +110,12 @@ private: /// Keep track of the last time for incremental timing. timeval last_time_; -#endif /* ACE_HAS_PRUSAGE_T */ +#endif /* ACE_HAS_GETRUSAGE */ -#if defined (ACE_WIN32) || (!defined (ACE_HAS_PRUSAGE_T) && !defined (ACE_HAS_GETRUSAGE)) +#if defined (ACE_WIN32) || !defined (ACE_HAS_GETRUSAGE) /// The high resolution timer ACE_High_Res_Timer timer_; -#endif /* ACE_WIN32 || !ACE_HAS_PRUSAGE_T && !ACE_HAS_GETRUSAGE */ +#endif /* ACE_WIN32 || !ACE_HAS_GETRUSAGE */ }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Profile_Timer.inl b/ACE/ace/Profile_Timer.inl index d0fd3afc58f..f4be327fac8 100644 --- a/ACE/ace/Profile_Timer.inl +++ b/ACE/ace/Profile_Timer.inl @@ -3,35 +3,8 @@ #include "ace/OS_NS_sys_resource.h" #include "ace/Global_Macros.h" -#if (defined (ACE_HAS_PRUSAGE_T) || defined (ACE_HAS_GETRUSAGE)) && !defined (ACE_WIN32) - -# if defined (ACE_HAS_PRUSAGE_T) -# include "ace/OS_NS_stropts.h" - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - -ACE_INLINE int -ACE_Profile_Timer::start () -{ - ACE_TRACE ("ACE_Profile_Timer::start"); - return ACE_OS::ioctl (this->proc_handle_, - PIOCUSAGE, - &this->begin_usage_); -} - -ACE_INLINE int -ACE_Profile_Timer::stop () -{ - ACE_TRACE ("ACE_Profile_Timer::stop"); - this->last_usage_ = this->end_usage_; - return ACE_OS::ioctl (this->proc_handle_, - PIOCUSAGE, - &this->end_usage_); -} - -ACE_END_VERSIONED_NAMESPACE_DECL - -# elif defined (ACE_HAS_GETRUSAGE) +#if defined (ACE_HAS_GETRUSAGE) && !defined (ACE_WIN32) +# if defined (ACE_HAS_GETRUSAGE) ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -59,7 +32,7 @@ ACE_Profile_Timer::stop () ACE_END_VERSIONED_NAMESPACE_DECL -# endif /* ACE_HAS_PRUSAGE_T */ +# endif /* ACE_HAS_GETRUSAGE */ #elif defined (ACE_WIN32) @@ -123,4 +96,4 @@ ACE_Profile_Timer::~ACE_Profile_Timer () ACE_END_VERSIONED_NAMESPACE_DECL -#endif /* defined (ACE_HAS_PRUSAGE_T) || defined (ACE_HAS_GETRUSAGE) */ +#endif /* defined (ACE_HAS_GETRUSAGE) */ diff --git a/ACE/ace/RB_Tree.h b/ACE/ace/RB_Tree.h index 03fb77f2a60..0bf1f40d9a7 100644 --- a/ACE/ace/RB_Tree.h +++ b/ACE/ace/RB_Tree.h @@ -118,11 +118,9 @@ public: /** * @note This method is inlined here rather than in RB_Tree.inl * since that file may be included multiple times when - * inlining is disabled and on platforms where - * @c ACE_TEMPLATES_REQUIRE_SOURCE is defined. In those - * platform/configuration combinations, multiple definitions - * of this method occurred. Placing the definition inline in - * the header avoids such errors. + * inlining is disabled. In those platform/configuration + * combinations, multiple definitions of this method occurred. + * Placing the definition inline in the header avoids such errors. */ ACE_Allocator * allocator () const { return this->allocator_; } @@ -871,13 +869,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/RB_Tree.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/RB_Tree.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("RB_Tree.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ! defined (ACE_RB_TREE_H) */ diff --git a/ACE/ace/README b/ACE/ace/README index d43ec628884..99d94841674 100644 --- a/ACE/ace/README +++ b/ACE/ace/README @@ -20,9 +20,6 @@ ACE_HAS_DUMP Used to enable the dump() out in order to reduce footprint. By default, it is not defined. -ACE_CAST_CONST Used to work around broken - SunCC ANSI casts that require - an extra const. ACE_DEFINES_DEFAULT_WIN32_SECURITY_ATTRIBUTES Win32 only. Users want to use a predefined security @@ -79,13 +76,6 @@ ACE_HAS_TRACE Defined when ACE_NTRACE=0 to ACE_PAGE_SIZE Defines the page size of the system (not used on Win32 or with ACE_HAS_GETPAGESIZE). -ACE_TEMPLATES_REQUIRE_PRAGMA Compiler's template mechanism - must use a pragma This is used - for AIX's C++ compiler. -ACE_TEMPLATES_REQUIRE_SOURCE Compiler's template mechanim - must see source code (i.e., - .cpp files). This is used for - GNU G++. ACE_TIMEPROBE_ASSERTS_FIXED_SIZE If enabled then ACE_Timeprobe_Ex<>::timeprobe() will assert if the end of the buffer is reached. If disabled, the @@ -145,7 +135,6 @@ ACE_DEFAULT_LD_SEARCH_PATH Specify the platform default search paths. This macro should only be defined on platforms that don't support environment variables at all - (i.e., Windows CE.) ACE_THREADS_DONT_INHERIT_LOG_MSG Specify this if you don't want threads to inherit parent thread's ACE_Log_Msg @@ -156,7 +145,6 @@ ACE_THREAD_MANAGER_USES_SAFE_SPAWN Disable the "check before lock" feature on platforms with aggressive read/write reordering. ACE_HAS_CPU_SET_T Platform delivers cpu_set_t. -ACE_HAS_PRIOCNTL OS has priocntl (2). ACE_HAS_RECURSIVE_MUTEXES Mutexes are inherently recursive (e.g., Win32) ACE_HAS_NONRECURSIVE_MUTEXES In addition to recursive mutexes, @@ -187,8 +175,6 @@ ACE_SCANDIR_CMP_USES_VOIDPTR The OS's scandir() comparator function ACE_SCANDIR_CMP_USES_CONST_VOIDPTR The OS's scandir() comparator function is int (*compare)(const void*, const void*). -ACE_SCANDIR_SEL_LACKS_CONST The OS's scandir() selector function - is int (*selector)(ACE_DIRENT*) ACE_HAS_STDARG_THR_DEST Platform has void (*)(...) prototype for pthread_key_create() @@ -199,13 +185,6 @@ ACE_HAS_4_4BSD_SENDMSG_RECVMSG Platform has BSD 4.4 sendmsg()/recvmsg() APIs. ACE_HAS_P_READ_WRITE Platform has pread() and pwrite() support -ACE_HAS_AIX_BROKEN_SOCKET_HEADER Platform, such as AIX4, needs - to wrap #include of - sys/socket.h with - #undef/#define of - __cplusplus. -ACE_HAS_AIX_HI_RES_TIMER Platform has AIX4 - ::read_real_time () ACE_HAS_ALLOCA Compiler/platform supports alloca() ACE_HAS_ALLOCA_H Compiler/platform has @@ -232,12 +211,6 @@ ACE_HAS_BROKEN_MMAP_H HP/UX does not wrap the ACE_HAS_BROKEN_NESTED_TEMPLATES MSVC has trouble with defining STL containers for nested structs and classes -ACE_HAS_BROKEN_POSIX_TIME Platform defines struct - timespec in <sys/timers.h> -ACE_HAS_BROKEN_T_ERROR Compiler/platform has the wrong - prototype for t_error(), i.e., - t_error(char *) rather than - t_error(const char *). ACE_HAS_BYTESEX_H Platform has <bytesex.h>. ACE_HAS_CANCEL_IO Platform supports the Win32 CancelIO() function (WinNT 4.0 @@ -254,10 +227,6 @@ ACE_HAS_CLOCK_GETTIME_MONOTONIC Platform supports POSIX.1b clock_gettime () with the clock-id CLOCK_MONOTONIC ACE_HAS_CLOCK_SETTIME Platform supports POSIX.1b clock_settime () -ACE_HAS_CONFLICTING_XTI_MACROS OS's XTI header file defines some - TCP-related macros that netinet/tcp.h - also defines, but they conflict - (only seen on HP-UX 11). ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES Prototypes for both signal() and struct sigaction are consistent. @@ -272,7 +241,7 @@ ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT When a base-class is a then this class template must be explicitly exported ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION For the GCC compiler - on AIX, HPUX and VxWorks we have to + on VxWorks we have to explicitly instantiate static template members else we get multiple instances of the same static. @@ -301,8 +270,6 @@ ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT Optimize ACE_HAS_LLSEEK Platform supports llseek. ACE_HAS_HI_RES_TIMER Compiler/platform supports SunOS high resolution timers -ACE_HAS_IDTYPE_T Compiler/platform supports - idtype_t. ACE_HAS_INLINED_OSCALLS Inline all the static class OS methods to remove call overhead @@ -310,8 +277,6 @@ ACE_HAS_INT_SWAB Platform's swab function has length argument of type int, not ssize_t. ACE_HAS_IP_MULTICAST Platform supports IP multicast ACE_HAS_IPV6 Platform supports IPv6. -ACE_HAS_BROKEN_GETHOSTBYADDR_V4MAPPED gethostbyaddr does not handle - IPv6-mapped-IPv4 addresses ACE_USES_IPV4_IPV6_MIGRATION Enable IPv6 support in ACE on platforms that don't have IPv6 turned on by default. @@ -321,9 +286,6 @@ ACE_HAS_NONSTATIC_OBJECT_MANAGER Causes the ACE_Object_Manager a static (global) instance. ACE_HAS_THR_KEYDELETE Platform supports thr_keydelete (e.g,. UNIXWARE) -ACE_HAS_THR_MINSTACK Platform calls thr_minstack() - rather than thr_min_stack() - (e.g., Tandem). ACE_HAS_LIMITED_RUSAGE_T The rusage_t structure has only two fields. ACE_HAS_LINUX_NPTL Linux platform (with kernel >= 2.6.x) @@ -335,8 +297,6 @@ ACE_HAS_LINUX_NPTL Linux platform (with kernel >= 2.6.x) ACE_HAS_LOG_MSG_NT_EVENT_LOG Platform supports Windows NT event log so we can create an ACE_Log_Msg_Backend to log to it. -ACE_HAS_LONG_MAP_FAILED Platform defines MAP_FAILED as - a long constant. ACE_HAS_MALLOC_STATS Enabled malloc statistics collection. ACE_HAS_MEMCHR Use native implementation of memchr. @@ -351,15 +311,9 @@ ACE_HAS_MT_SAFE_MKTIME Platform supports MT safe ACE_HAS_MUTEX_TIMEOUTS Compiler supports timed mutex acquisitions (e.g. pthread_mutex_timedlock()). -ACE_HAS_NONCONST_CHDIR Platform uses non-const char * - in call to chdir ACE_HAS_NONCONST_CLOCK_SETTIME Platform uses non-const struct timespec * in call to clock_settime -ACE_HAS_NONCONST_OPENDIR Platform uses non-const char * - in call to opendir -ACE_HAS_NONCONST_UNLINK Platform uses non-const char * - in call to unlink ACE_HAS_NONCONST_GETBY Platform uses non-const char * in calls to gethostbyaddr, gethostbyname, getservbyname @@ -376,26 +330,15 @@ ACE_HAS_NONCONST_SENDMSG Platform omits const qualifier ACE_HAS_NONCONST_SETRLIMIT Platform omits const qualifier from rlimit parameter in setrlimit() prototype. -ACE_HAS_NONCONST_STAT Platform's stat function has non const - name argument ACE_HAS_NONCONST_SWAB Platform's swab function has non const src argument ACE_HAS_NONCONST_WRITEV Platform omits const qualifier from iovec parameter in writev() prototype. -ACE_HAS_OLD_MALLOC Compiler/platform uses old - malloc()/free() prototypes - (ugh) -ACE_HAS_ONLY_SCHED_FIFO Platform, e.g., HP NonStop OSS, - only supports SCHED_FIFO - POSIX scheduling policy. -ACE_HAS_ONLY_SCHED_OTHER Platform, e.g., Solaris 2.5, - only supports SCHED_OTHER +ACE_HAS_ONLY_SCHED_OTHER Platform, only supports SCHED_OTHER POSIX scheduling policy. ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R Uses ctime_r & asctime_r with only two parameters vs. three. -ACE_HAS_OSF_TIMOD_H Platform supports the OSF TLI - timod STREAMS module ACE_HAS_3_PARAM_WCSTOK Platform has 3-parameter version of wcstok(), which was added in 1994 in the ISO C standard Normative @@ -417,7 +360,7 @@ ACE_HAS_POSIX_REALTIME_SIGNALS Platform supports POSIX RT signals. constant in <unistd.h>. ACE_HAS_POSIX_SEM Platform supports POSIX real-time semaphores (e.g., - VxWorks and Solaris). Corresponds + VxWorks). Corresponds to _POSIX_SEMAPHORES constant in <unistd.h> ACE_HAS_POSIX_SEM_TIMEOUT Platform supports timed wait operation @@ -429,8 +372,6 @@ ACE_HAS_PROC_FS Platform supports the /proc in <sys/procfs.h> ACE_HAS_POWERPC_TIMER Platform supports PowerPC time-base register. -ACE_HAS_PRUSAGE_T Platform supports the - prusage_t struct ACE_HAS_PTHREADS Platform supports POSIX Pthreads, of one form or another. This macro says the @@ -461,7 +402,6 @@ ACE_HAS_QUANTIFY Quantify'ing. Set by wrapper_macros.GNU ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS Platform will recurse infinitely on thread exits from TSS cleanup routines - (e.g., AIX). ACE_HAS_REENTRANT_FUNCTIONS Platform supports reentrant functions (i.e., all the POSIX *_r functions). @@ -481,8 +421,6 @@ ACE_USE_SELECT_REACTOR_FOR_REACTOR_IMPL For Win32: Use Select_Reactor ACE_HAS_SEMUN Compiler/platform defines a union semun for SysV shared memory -ACE_HAS_SET_T_ERRNO Platform has a function to set - t_errno (e.g., Tandem). ACE_HAS_SIGACTION_CONSTP2 Platform's sigaction() function takes const sigaction* as 2nd parameter. ACE_HAS_SIGINFO_T Platform supports SVR4 @@ -499,9 +437,6 @@ ACE_HAS_SIG_ATOMIC_T Compiler/platform defines the sig_atomic_t typedef ACE_HAS_SIG_C_FUNC Compiler requires extern "C" functions for signals. -ACE_HAS_SIZET_SOCKET_LEN OS/compiler uses size_t * - rather than int * for socket - lengths ACE_HAS_SOCKADDR_IN_SIN_LEN Platform has sin_len member in struct sockaddr_in. ACE_HAS_SOCKADDR_IN6_SIN_LEN Platform has sin6_len member in struct @@ -514,13 +449,8 @@ ACE_HAS_SOCKLEN_T Platform provides socklen_t glibc2. ACE_HAS_SOCK_BUF_SIZE_MAX Platform limits the maximum socket message size. -ACE_HAS_SPARCWORKS_401_SIGNALS Compiler has brain-damaged - SPARCwork SunOS 4.x signal - prototype... ACE_HAS_SSIZE_T Compiler supports the ssize_t typedef -ACE_HAS_STHREADS Platform supports Solaris - threads ACE_HAS_STRBUF_T Compiler/platform supports struct strbuf ACE_HAS_STRDUP_EMULATION Use ACE's strdup() emulation (even @@ -538,26 +468,16 @@ ACE_HAS_STRICT Use the STRICT compilation mode on Win32 ACE_HAS_STRUCT_NETDB_DATA Compiler/platform has strange hostent API for socket *_r() calls -ACE_HAS_SUNOS4_SIGNAL_T Compiler has horrible SunOS - 4.x signal handlers... ACE_HAS_SVR4_DYNAMIC_LINKING Compiler/platform supports SVR4 dynamic linking semantics ACE_HAS_SVR4_GETTIMEOFDAY Compiler/platform supports SVR4 gettimeofday() prototype ACE_HAS_SVR4_SIGNAL_T Compiler/platform supports SVR4 signal typedef -ACE_HAS_SVR4_TLI Compiler/platform supports - SVR4 TLI; that is, TLI with extensions - like t_getname(). This is sometimes - used as a pseudonym for TLI on SunOS4. - This is a modifier to ACE_HAS_TLI and - isn't used if ACE_HAS_XTI is set. ACE_HAS_SYSCALL_GETRUSAGE HP/UX has an undefined syscall for GETRUSAGE... ACE_HAS_SYSENT_H Platform provides <sysent.h> header -ACE_HAS_SYSV_SYSINFO Platform supports system - configuration information ACE_HAS_SYSV_IPC Platform supports System V IPC (most versions of UNIX, but not Win32) @@ -597,7 +517,7 @@ ACE_HAS_THREAD_SAFE_ACCEPT Platform allows multiple the same port (e.g., WinNT). ACE_HAS_THREAD_SELF Platform has thread_self() rather than pthread_self() - (e.g., DCETHREADS and AIX) + (e.g., DCETHREADS) ACE_HAS_THREAD_SPECIFIC_STORAGE Compiler/platform has thread-specific storage ACE_HAS_THR_C_DEST The pthread_keycreate() @@ -611,10 +531,6 @@ ACE_HAS_TIMEZONE Platform/compiler supports ACE_HAS_TIMEZONE_GETTIMEOFDAY Platform/compiler supports timezone * as second parameter to gettimeofday() -ACE_HAS_TIMOD_H Platform supports TLI timod - STREAMS module -ACE_HAS_TIUSER_H Platform provides TLI tiuser.h - header file. ACE_HAS_TLI Platform supports TLI. Also see ACE_TLI_TCP_DEVICE. If the platform supports XTI, set ACE_HAS_XTI @@ -649,8 +565,6 @@ ACE_HAS_VERSIONED_NAMESPACE Wrap all library code within a defining preprocessor symbol ACE_VERSIONED_NAMESPACE_NAME to desired name. -ACE_LACKS_INTMAX_T Platform lacks the intmax_t type -ACE_LACKS_UINTMAX_T Platform lacks the uintmax_t type. ACE_LACKS_INTPTR_T Platform lacks the intptr_t type ACE_LACKS_UINTPTR_T Platform lacks the uintptr_t type. @@ -721,9 +635,6 @@ ACE_HAS_XTI Platform has XTI ACE_INITIALIZE_MEMORY_BEFORE_USE Memory is explicitly initialized before use. Useful when using a profiler like purify or valgrind -ACE_HRTIME_T_IS_BASIC_TYPE ACE_hrtime_t is a basic type that - doesn't require ACE_U64_TO_U32 - conversion ACE_LACKS_ACCESS Platform lacks access() (e.g., VxWorks) ACE_LACKS_ACE_IOSTREAM Platform can not build @@ -745,9 +656,6 @@ ACE_LACKS_READDIR Platform lacks readdir and the readdir ACE_LACKS_COND_TIMEDWAIT_RESET pthread_cond_timedwait does *not* reset the time argument when the lock is acquired. -ACE_LACKS_CONST_STRBUF_PTR Platform uses struct strbuf * - rather than const struct - strbuf * (e.g., HP/UX 10.x) ACE_LACKS_CONST_TIMESPEC_PTR Platform forgot const in cond_timewait (e.g., HP/UX). ACE_LACKS_COND_T Platform lacks condition @@ -758,7 +666,6 @@ ACE_LACKS_CONDATTR_PSHARED Platform has no implementation pthread_condattr_setpshared(), even though it supports pthreads! -ACE_LACKS_DIFFTIME Platform lacks difftime() implementation ACE_LACKS_DUP2 Platform lacks dup2(). ACE_LACKS_FCNTL Platform lacks POSIX-style fcntl (). ACE_LACKS_FSYNC Platform lacks fsync(). @@ -833,8 +740,6 @@ ACE_LACKS_PERFECT_MULTICAST_FILTERING Platform lacks IGMPv3 "perfect" filterin socket, and all future joins on that socket will fail with an error. ACE_LACKS_PRAGMA_ONCE Compiler complains about #pragma once -ACE_LACKS_PRI_T Platform lacks pri_t (e.g., - Tandem NonStop UNIX). ACE_LACKS_PTHREAD_CANCEL Platform lacks pthread_cancel(). ACE_LACKS_PTHREAD_SCOPE_PROCESS Platform lacks support for @@ -858,9 +763,6 @@ ACE_LACKS_RENAME Platform lacks rename(). ACE_LACKS_RLIMIT Platform/compiler lacks {get,set}rlimit() function (e.g., VxWorks) -ACE_LACKS_RLIMIT_PROTOTYPE Platform/compiler lacks - {get,set}rlimit() prototypes - (e.g., Tandem) ACE_LACKS_READDIR_R Platform uses ACE_HAS_DIRENT but does not have readdir_r (). @@ -891,8 +793,6 @@ ACE_LACKS_SETSCHED Platform lacks (e.g. MVS) ACE_LACKS_SIGACTION Platform lacks struct sigaction (e.g., Win32) -ACE_LACKS_SIGNED_CHAR Platform lacks "signed char" - type (broken!) ACE_LACKS_SIGSET Platform lacks signal sets (e.g., Win32) ACE_LACKS_STRPTIME Platform/compiler lacks the strptime() @@ -935,17 +835,6 @@ ACE_LACKS_TELLDIR Platform uses ACE_HAS_DIRENT ACE_LACKS_THREAD_STACK_SIZE Platform lacks pthread_attr_setstacksize() (e.g., Linux pthreads) -ACE_LACKS_THR_CONCURRENCY_FUNCS (ONLY APPLIES TO SOLARIS) - Platform does not support - thr_getconcurrency/thr_setconcurrency - functions, or their implementation - is effectively a "no-op". This - notably applies for Solaris >= 5.9. - Note that if you build on Solaris 8 - and run on Solaris 9+, you can - encounter thread creation errors - unless you rebuild on the target - platform. ACE_LACKS_TIMEDWAIT_PROTOTYPES MIT pthreads platform lacks the timedwait prototypes ACE_LACKS_TIMESPEC_T Platform does not define @@ -953,9 +842,6 @@ ACE_LACKS_TIMESPEC_T Platform does not define struct timespec. ACE_LACKS_TRUNCATE Platform doesn't have truncate() (e.g., vxworks) -ACE_LACKS_UALARM_PROTOTYPE Platform/compiler lacks the - ualarm() prototype (e.g., - Solaris) ACE_LACKS_CHAR_RIGHT_SHIFTS Compiler does not have any istream operator>> for chars, u_chars, or signed chars. @@ -988,16 +874,8 @@ ACE_LACKS_WIN32_SECURITY_DESCRIPTORS The Windows platform doesn't have security descriptor support. ACE_LACKS_WRITEV Platform doesn't define writev, so use our own - -ACE_NEEDS_DEV_IO_CONVERSION Necessary with some compilers - to pass ACE_TTY_IO as - parameter to DEV_Connector. ACE_NEEDS_HUGE_THREAD_STACKSIZE Required by platforms with small default stacks. -ACE_NEEDS_LWP_PRIO_SET OS has LWPs, and when the - priority of a bound thread is - set, then the LWP priority - must be set also. ACE_NEEDS_SCHED_H Platform needs to #include <sched.h> to get thread scheduling @@ -1088,13 +966,6 @@ A returns. Note: if the allocated block is beyond the current stack limit, the resulting behavior is undefined. - In HPUX: - no equivalent. - - Notes: - in HPUX it has to do new and delete. Affects performance. - - ACE_HAS_AUTOMATIC_INIT_FINI: ---------------------------- @@ -1113,15 +984,6 @@ ACE_HAS_AUTOMATIC_INIT_FINI: _init() and _fini() to be executed as is: dlsym ((char *) handle, "_fini"). - In HPUX: - don't set. - Maybe have to look into shl_load( ), shl_definesym( ), - shl_findsym( ), shl_gethandle( ), shl_getsymbols( ), - shl_unload( ), shl_get( )(3X) - explicit load of shared libraries - Means Service Configurator won't be available. - TBA. - - ACE_HAS_HI_RES_TIMER: --------------------- @@ -1137,10 +999,6 @@ ACE_HAS_HI_RES_TIMER: in the past; it is not correlated in any way to the time of day, and thus is not subject to resetting, drifting, etc. - In HPUX - look into: getclock(), reltimer(), getitimer() - maybe even vtimes structure vm_utime, vm_stime ? - Notes: TBA @@ -1151,9 +1009,6 @@ ACE_LACKS_T_ERRNO: Used In: ace/OS.h - HPUX: - set it. - Notes: if set, adds: extern int t_errno; @@ -1165,9 +1020,6 @@ ACE_HAS_POSIX_NONBLOCK: Used in: ace/OS.h - HPUX: - set it. - Notes: if defined, sets ACE_NONBLOCK and O_NONBLOCK O_NONBLOCK is used in libsrc/Misc/misc.C to do a @@ -1192,13 +1044,6 @@ ACE_HAS_PROC_FS: procfs.h defines things for the prpsinfo structure (basically to do a "ps" from inside a program). - HPUX: - don't set: obviously a different mechanism. - Look into /usr/include/sys/proc.h. The structure is proc. The - pointer to the kernel's proc table may be obtained by - extern struct proc *proc, *procNPROC; - extern int nproc; - ACE_HAS_PRUSAGE_T: ------------------ @@ -1213,10 +1058,6 @@ ACE_HAS_PRUSAGE_T: an interval. This stuff is highly non-portable. - HPUX: - don't set - - ACE_HAS_SEMUN: -------------- @@ -1231,14 +1072,6 @@ ACE_HAS_SEMUN: ushort *array; /* array for GETALL & SETALL */ }; - HPUX: - don't set. - in /usr/include/sem.h: - /* The fourth argument to semctl() varies depending on the value of - its first argument. If desired, "union semun" can be declared - by the user, but this is not necessary since the individual - member can just be passed as the argument. */ - ACE_HAS_SIG_ATOMIC_T: --------------------- @@ -1251,12 +1084,6 @@ ACE_HAS_SIG_ATOMIC_T: typedef int sig_atomic_t; This is used in the Reactor and service configurator. - HPUX: - set it. - in /usr/include/sys/signal.h: - typedef unsigned int sig_atomic_t; - - ACE_HAS_SSIZE_T: ---------------- @@ -1268,11 +1095,6 @@ ACE_HAS_SSIZE_T: typedef int ssize_t; used mostly in IPC_SAP. (don't confuse with size_t). - HPUX: - set it. - in /usr/include/sys/types.h - - ACE_HAS_STRBUF_T: ----------------- @@ -1295,10 +1117,6 @@ ACE_HAS_STRBUF_T: int putmsg(int fildes, const struct strbuf *ctlptr, const struct strbuf *dataptr, int flags); - HPUX: - don't set. - no SYS V.4 streams. - ACE_HAS_STREAMS: ---------------- @@ -1310,10 +1128,6 @@ ACE_HAS_STREAMS: Notes: if defined, includes <stropts.h> - HPUX: - don't set. - no SYS V.4 streams. - ACE_HAS_STREAM_PIPES: --------------------- @@ -1336,10 +1150,6 @@ ACE_HAS_STREAM_PIPES: if not set, won't be able to use the SPIPE class (IPC_SAP) with rendezvous handles. - HPUX: - don't set. - No sysV.4 streams. - ACE_HAS_SVR4_DYNAMIC_LINKING: ----------------------------- @@ -1352,12 +1162,6 @@ ACE_HAS_SVR4_DYNAMIC_LINKING: if defined, includes <dlfcn.h> with dlopen(), dlsym(), etc.. - HPUX: - don't set. - has its own: - shl_findsym( ), shl_gethandle( ), shl_getsymbols( ), - shl_unload( ), shl_get( )(3X) - explicit load of shared libraries - ACE_HAS_SVR4_GETTIMEOFDAY: -------------------------- @@ -1372,16 +1176,6 @@ ACE_HAS_SVR4_GETTIMEOFDAY: Solaris: gettimeofday (struct timeval *tp) - HPUX: - don't set. - it has gettimeofday (struct timeval *tp, struct timezone *tzp); - most calls do a: - #if defined (ACE_HAS_SVR4_GETTIMEOFDAY) - ::gettimeofday (&cur_time); - #else - ::gettimeofday (&cur_time, 0); - #endif /* ACE_HAS_SVR4_GETTIMEOFDAY */ - ACE_HAS_POLL: ------------ @@ -1402,9 +1196,6 @@ ACE_USE_POLL_IMPLEMENTATION: Notes: Use the poll() event demultiplexor rather than select(). - HPUX: - set it. - ACE_HAS_SVR4_SIGNAL_T: ---------------------- @@ -1424,26 +1215,6 @@ ACE_HAS_SVR4_SIGNAL_T: typedef void (*SignalHandlerV)(...); #endif /* ACE_HAS_SVR4_SIGNAL_T */ - HPUX: - set it. - - -ACE_HAS_SVR4_TLI: ------------------ - - Used in: - libsrc/IPC_SAP/TLI_SAP/TLI.C - libsrc/IPC_SAP/TLI_SAP/TLI.h - libsrc/IPC_SAP/TLI_SAP/TLI_Stream.C - - Notes: - TLI is the transport layer calls as in: t_bind(), t_open(), t_unbind(), - t_optmgmt(), ... in SunOS and Solaris. - - HPUX: - don't set. - Not supported. - ACE_HAS_SYS_FILIO_H: -------------------- @@ -1464,12 +1235,6 @@ ACE_HAS_SYS_FILIO_H: * in the future OS releases. */ - HPUX: - <sys/ioctl.h> defines FIOASYNC and some other ones, - <sgtty.h> defines some like FIOCLEX. - some are never defined. - use #ifdef HP-UX to modify sysincludes.h - ACE_HAS_TEMPLATE_TYPEDEFS: -------------------------- @@ -1512,30 +1277,6 @@ ACE_HAS_THREADS: We use Message_List.h even in a non-threaded environment. our XOMessageList.h does this by #ifdefs around Threaded things. - HPUX: - not until 10.0. - - -ACE_HAS_TIMOD_H: ----------------- - - Used in: - ace/OS.h - - Notes: - if defined, include <sys/timod.h> - - Solaris: - timod is a STREAMS module for use with the Transport Inter- - face (TI) functions of the Network Services library. The - timod module converts a set of ioctl(2) calls into STREAMS - messages that may be consumed by a transport protocol pro- - vider that supports the Transport Interface. This allows a - user to initiate certain TI functions as atomic operations. - - HPUX: - don't set. - ACE_HAS_TIUSER_H: ----------------- @@ -1549,9 +1290,6 @@ ACE_HAS_TIUSER_H: Solaris: in conjunction with t_bind, t_accept, etc.. transport layer. - HPUX: - don't set. - ACE_USE_POLL_IMPLEMENTATION: ---------------------------- diff --git a/ACE/ace/Reactor.cpp b/ACE/ace/Reactor.cpp index e08c9b9d141..d969f84f277 100644 --- a/ACE/ace/Reactor.cpp +++ b/ACE/ace/Reactor.cpp @@ -169,13 +169,13 @@ ACE_Reactor::name () int ACE_Reactor::check_reconfiguration (ACE_Reactor *) { -#if !defined (ACE_HAS_WINCE) && !defined (ACE_LACKS_ACE_SVCCONF) +#if !defined (ACE_LACKS_ACE_SVCCONF) if (ACE_Service_Config::reconfig_occurred ()) { ACE_Service_Config::reconfigure (); return 1; } -#endif /* ! ACE_HAS_WINCE || ! ACE_LACKS_ACE_SVCCONF */ +#endif /* !ACE_LACKS_ACE_SVCCONF */ return 0; } diff --git a/ACE/ace/Reactor_Token_T.h b/ACE/ace/Reactor_Token_T.h index 3f9adec8e80..2d7933fb834 100644 --- a/ACE/ace/Reactor_Token_T.h +++ b/ACE/ace/Reactor_Token_T.h @@ -79,13 +79,7 @@ private: ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Reactor_Token_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Reactor_Token_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_REACTOR_TOKEN_T_H */ diff --git a/ACE/ace/Read_Buffer.cpp b/ACE/ace/Read_Buffer.cpp index e3667a66b07..ba174065181 100644 --- a/ACE/ace/Read_Buffer.cpp +++ b/ACE/ace/Read_Buffer.cpp @@ -41,7 +41,6 @@ ACE_Read_Buffer::ACE_Read_Buffer (FILE *fp, this->allocator_ = ACE_Allocator::instance (); } -#if !defined (ACE_HAS_WINCE) ACE_Read_Buffer::ACE_Read_Buffer (ACE_HANDLE handle, bool close_on_delete, ACE_Allocator *alloc) @@ -56,7 +55,6 @@ ACE_Read_Buffer::ACE_Read_Buffer (ACE_HANDLE handle, if (this->allocator_ == 0) this->allocator_ = ACE_Allocator::instance (); } -#endif // ACE_HAS_WINCE ACE_Read_Buffer::~ACE_Read_Buffer () { diff --git a/ACE/ace/Read_Buffer.h b/ACE/ace/Read_Buffer.h index d91adb95f37..ee3a96133b0 100644 --- a/ACE/ace/Read_Buffer.h +++ b/ACE/ace/Read_Buffer.h @@ -49,14 +49,10 @@ public: bool close_on_delete = false, ACE_Allocator * = 0); -#if !defined (ACE_HAS_WINCE) - // Note that ACE_HANDLE = FILE under CE. - /// Read from an open HANDLE. ACE_Read_Buffer (ACE_HANDLE handle, bool close_on_delete = false, ACE_Allocator * = 0); -#endif // ACE_HAS_WINCE /// Closes the FILE *. ~ACE_Read_Buffer (); diff --git a/ACE/ace/Recursive_Thread_Mutex.cpp b/ACE/ace/Recursive_Thread_Mutex.cpp index 398f56bff1e..1f7b2dc8129 100644 --- a/ACE/ace/Recursive_Thread_Mutex.cpp +++ b/ACE/ace/Recursive_Thread_Mutex.cpp @@ -79,7 +79,7 @@ int ACE_Recursive_Thread_Mutex::get_nesting_level () { // ACE_TRACE ("ACE_Recursive_Thread_Mutex::get_nesting_level"); -#if defined (ACE_HAS_VXTHREADS) || defined (ACE_HAS_PHARLAP) || defined (ACE_HAS_WINCE) +#if defined (ACE_HAS_VXTHREADS) || defined (ACE_HAS_PHARLAP) ACE_NOTSUP_RETURN (-1); #elif defined (ACE_HAS_RECURSIVE_MUTEXES) # if defined (ACE_WIN32) @@ -99,7 +99,7 @@ ACE_Recursive_Thread_Mutex::get_nesting_level () nesting_level = this->lock_.nesting_level_; ACE_OS::mutex_unlock (&this->lock_.nesting_mutex_); return nesting_level; -#endif /* !ACE_HAS_WINCE */ +#endif /* ACE_HAS_VXTHREADS || ACE_HAS_PHARLAP */ } void diff --git a/ACE/ace/Refcountable_T.h b/ACE/ace/Refcountable_T.h index 73b6d04021e..5dab2e6e540 100644 --- a/ACE/ace/Refcountable_T.h +++ b/ACE/ace/Refcountable_T.h @@ -54,13 +54,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Refcountable_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Refcountable_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Refcountable_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /*ACE_REFCOUNTABLE_T_H*/ diff --git a/ACE/ace/Refcounted_Auto_Ptr.h b/ACE/ace/Refcounted_Auto_Ptr.h index f5d18f1f029..e63af3a0481 100644 --- a/ACE/ace/Refcounted_Auto_Ptr.h +++ b/ACE/ace/Refcounted_Auto_Ptr.h @@ -183,13 +183,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Refcounted_Auto_Ptr.inl" -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Refcounted_Auto_Ptr.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Refcounted_Auto_Ptr.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Registry.cpp b/ACE/ace/Registry.cpp index 4e7a2aa78e2..ddd8e77923e 100644 --- a/ACE/ace/Registry.cpp +++ b/ACE/ace/Registry.cpp @@ -1071,12 +1071,6 @@ ACE_Predefined_Naming_Contexts::connect (ACE_Registry::Naming_Context &naming_co HKEY predefined, const ACE_TCHAR *machine_name) { -#if defined (ACE_HAS_WINCE) - ACE_UNUSED_ARG(naming_context); - ACE_UNUSED_ARG(predefined); - ACE_UNUSED_ARG(machine_name); - return -1; -#else long result = -1; if (machine_name != 0 && ACE_OS::strcmp (ACE_TEXT ("localhost"), machine_name) == 0) @@ -1101,10 +1095,9 @@ ACE_Predefined_Naming_Contexts::connect (ACE_Registry::Naming_Context &naming_co } ACE_REGISTRY_CALL_RETURN (result); -#endif // ACE_HAS_WINCE } -// Check if <machine_name> is the local host +/// Check if @a machine_name is the local host /* static */ int ACE_Predefined_Naming_Contexts::is_local_host (const ACE_TCHAR *machine_name) diff --git a/ACE/ace/Reverse_Lock_T.h b/ACE/ace/Reverse_Lock_T.h index 3348c837b6f..9f0d2ae659f 100644 --- a/ACE/ace/Reverse_Lock_T.h +++ b/ACE/ace/Reverse_Lock_T.h @@ -122,13 +122,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Reverse_Lock_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Reverse_Lock_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Reverse_Lock_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_REVERSE_LOCK_T_H */ diff --git a/ACE/ace/Rtems_init.c b/ACE/ace/Rtems_init.c deleted file mode 100644 index 389169d7a32..00000000000 --- a/ACE/ace/Rtems_init.c +++ /dev/null @@ -1,216 +0,0 @@ - -#if defined (ACE_HAS_RTEMS) - -#define RTEMS_BSP_NETWORK_DRIVER_NAME "ne1" -#define RTEMS_BSP_NETWORK_DRIVER_ATTACH rtems_ne_driver_attach -#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 256 - -#define CONFIGURE_MAXIMUM_POSIX_THREADS 100 -#define CONFIGURE_MAXIMUM_POSIX_MUTEXES 300 -#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES 300 -#define CONFIGURE_MAXIMUM_POSIX_KEYS 100 -#define CONFIGURE_MAXIMUM_POSIX_TIMERS 100 -#define CONFIGURE_MAXIMUM_POSIX_QUEUED_SIGNALS 10 -#define CONFIGURE_MAXIMUM_POSIX_SEMAPHORES 300 -#define CONFIGURE_POSIX_INIT_THREAD_TABLE -#define CONFIGURE_POSIX_INIT_THREAD_ENTRY_POINT Init -#define CONFIGURE_MEMORY_FOR_POSIX (10*1024) -#define CONFIGURE_POSIX_INIT_THREAD_STACK_SIZE (10*1024) - -#define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER - -#define CONFIGURE_EXECUTIVE_RAM_SIZE (512*1024) - -#define CONFIGURE_MICROSECONDS_PER_TICK 10000 - -#define CONFIGURE_MAXIMUM_SEMAPHORES 100 -#define CONFIGURE_MAXIMUM_TASKS 100 -#define CONFIGURE_INIT_TASK_PRIORITY 120 -#define CONFIGURE_INIT_TASK_INITIAL_MODES (RTEMS_PREEMPT | \ - RTEMS_NO_TIMESLICE | \ - RTEMS_NO_ASR | \ - RTEMS_INTERRUPT_LEVEL(0)) - -#include <bsp.h> - -char *rtems_progname; - -#define CONFIGURE_INIT - -rtems_task Init (rtems_task_argument argument); - -#include <confdefs.h> - -#include <stdio.h> - -#if !defined (ACE_LACKS_NETWORKING) - -#include <rtems/rtems_bsdnet.h> - -/* - * Network configuration - * - ************************************************************ - * EDIT THIS FILE TO REFLECT YOUR NETWORK CONFIGURATION * - * BEFORE RUNNING ANY RTEMS PROGRAMS WHICH USE THE NETWORK! * - ************************************************************ - */ - -#ifndef _RTEMS_NETWORKCONFIG_H_ -#define _RTEMS_NETWORKCONFIG_H_ - -#ifndef RTEMS_BSP_NETWORK_DRIVER_NAME -#warning "RTEMS_BSP_NETWORK_DRIVER_NAME is not defined" -#define RTEMS_BSP_NETWORK_DRIVER_NAME "no_network1" -#endif - -#ifndef RTEMS_BSP_NETWORK_DRIVER_ATTACH -#warning "RTEMS_BSP_NETWORK_DRIVER_ATTACH is not defined" -#define RTEMS_BSP_NETWORK_DRIVER_ATTACH 0 -#endif - -/* #define RTEMS_USE_BOOTP */ - -#include <bsp.h> - -/* - * Define RTEMS_SET_ETHERNET_ADDRESS if you want to specify the - * Ethernet address here. If RTEMS_SET_ETHERNET_ADDRESS is not - * defined the driver will choose an address. - */ -#define RTEMS_SET_ETHERNET_ADDRESS -#if (defined (RTEMS_SET_ETHERNET_ADDRESS)) -static char ethernet_address[6] = { 0x00, 0x80, 0x7F, 0x22, 0x61, 0x77 }; - -#endif - -#define RTEMS_USE_LOOPBACK - -#ifdef RTEMS_USE_LOOPBACK -/* - * Loopback interface - */ -int rtems_bsdnet_loopattach(struct rtems_bsdnet_ifconfig *, int); - -#ifdef RTEMS_USE_LOOPBACK_ONLY -static struct rtems_bsdnet_ifconfig netdriver_config = { -#else -static struct rtems_bsdnet_ifconfig loopback_config = { -#endif - "lo0", /* name */ - rtems_bsdnet_loopattach, /* attach function */ - 0, /* link to next interface */ - "127.0.0.1", /* IP address */ - "255.0.0.0", /* IP net mask */ -}; -#endif - -/* - * Default network interface - */ -#ifndef RTEMS_USE_LOOPBACK_ONLY -static struct rtems_bsdnet_ifconfig netdriver_config = { - RTEMS_BSP_NETWORK_DRIVER_NAME, /* name */ - RTEMS_BSP_NETWORK_DRIVER_ATTACH, /* attach function */ - -#ifdef RTEMS_USE_LOOPBACK - &loopback_config, /* link to next interface */ -#else - 0, /* No more interfaces */ -#endif - -#if (defined (RTEMS_USE_BOOTP)) - 0, /* BOOTP supplies IP address */ - 0, /* BOOTP supplies IP net mask */ -#else - "XXX.YYY.ZZZ.XYZ", /* IP address */ - "255.255.255.0", /* IP net mask */ -#endif /* !RTEMS_USE_BOOTP */ - -#if (defined (RTEMS_SET_ETHERNET_ADDRESS)) - ethernet_address, /* Ethernet hardware address */ -#else - 0, /* Driver supplies hardware address */ -#endif - 0 /* Use default driver parameters */ -}; -#endif - -/* - * Network configuration - */ -struct rtems_bsdnet_config rtems_bsdnet_config = { - &netdriver_config, - -#if (defined (RTEMS_USE_BOOTP)) - rtems_bsdnet_do_bootp, -#else - 0, -#endif - - 0, /* Default network task priority */ - 0, /* Default mbuf capacity */ - 0, /* Default mbuf cluster capacity */ - -#if (!defined (RTEMS_USE_BOOTP)) - "rtems_host", /* Host name */ - "nodomain.com", /* Domain name */ - "XXX.YYY.ZZZ.1", /* Gateway */ - "XXX.YYY.ZZZ.1", /* Log host */ - {"XXX.YYY.ZZZ.1" }, /* Name server(s) */ - {"XXX.YYY.ZZZ.1" }, /* NTP server(s) */ - - /* - * A real example -- DO NOT USE THIS YOURSELF!!! - */ - -#if 0 - "dy4", /* Host name */ - "NOT_oarcorp.com", /* Domain name */ - "192.168.1.2", /* Gateway */ - "192.168.1.2", /* Log host */ - {"192.168.1.2" }, /* Name server(s) */ - {"192.168.1.2" }, /* NTP server(s) */ -#endif -#endif /* !RTEMS_USE_BOOTP */ - -}; - -/* - * For TFTP test application - */ -#if (defined (RTEMS_USE_BOOTP)) -#define RTEMS_TFTP_TEST_HOST_NAME "BOOTP_HOST" -#define RTEMS_TFTP_TEST_FILE_NAME "BOOTP_FILE" -#else -#define RTEMS_TFTP_TEST_HOST_NAME "XXX.YYY.ZZZ.XYZ" -#define RTEMS_TFTP_TEST_FILE_NAME "tftptest" -#endif - -#endif /* _RTEMS_NETWORKCONFIG_H_ */ - -#endif /* ACE_LACKS_NETWORKING */ - -extern int main (int, char *[]); - -/* - * RTEMS Startup Task - */ -rtems_task -Init (rtems_task_argument not_used) -{ - int retval = 0; -#if !defined (ACE_LACKS_NETWORKING) - retval = rtems_bsdnet_initialize_network (); -#endif /* ACE_LACKS_NETWORKING */ - if (retval == 0) - { - retval = main (0, 0); - } -} - -#elif !defined (__GNUC__) && !defined (__INTEL_COMPILER) -/* Make compilers stop complaining about an empty translation unit */ -static int shut_up_compiler = 0; -#endif /* ACE_HAS_RTEMS */ diff --git a/ACE/ace/SOCK_Acceptor.cpp b/ACE/ace/SOCK_Acceptor.cpp index 19af145fa81..b0c62030d7e 100644 --- a/ACE/ace/SOCK_Acceptor.cpp +++ b/ACE/ace/SOCK_Acceptor.cpp @@ -13,9 +13,7 @@ #include "ace/SOCK_Acceptor.inl" #endif /* __ACE_INLINE__ */ -#if !defined (ACE_HAS_WINCE) #include "ace/OS_QoS.h" -#endif // ACE_HAS_WINCE ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -154,7 +152,6 @@ ACE_SOCK_Acceptor::accept (ACE_SOCK_Stream &new_stream, reset_new_handle); } -#if !defined (ACE_HAS_WINCE) int ACE_SOCK_Acceptor::accept (ACE_SOCK_Stream &new_stream, ACE_Accept_QoS_Params qos_params, @@ -206,7 +203,6 @@ ACE_SOCK_Acceptor::accept (ACE_SOCK_Stream &new_stream, in_blocking_mode, reset_new_handle); } -#endif // ACE_HAS_WINCE void ACE_SOCK_Acceptor::dump () const diff --git a/ACE/ace/SOCK_Acceptor.h b/ACE/ace/SOCK_Acceptor.h index 1dc947fb9cf..a4035fcd92d 100644 --- a/ACE/ace/SOCK_Acceptor.h +++ b/ACE/ace/SOCK_Acceptor.h @@ -119,7 +119,6 @@ public: bool restart = true, bool reset_new_handle = false) const; -#if !defined (ACE_HAS_WINCE) /** * Accept a new ACE_SOCK_Stream connection using the QoS * information in @a qos_params. A @a timeout of 0 means block @@ -136,7 +135,6 @@ public: ACE_Time_Value *timeout = 0, bool restart = true, bool reset_new_handle = false) const; -#endif // ACE_HAS_WINCE // = Meta-type info typedef ACE_INET_Addr PEER_ADDR; diff --git a/ACE/ace/SOCK_Connector.cpp b/ACE/ace/SOCK_Connector.cpp index cba9987fa0e..df7cb39adc4 100644 --- a/ACE/ace/SOCK_Connector.cpp +++ b/ACE/ace/SOCK_Connector.cpp @@ -8,9 +8,7 @@ # include "ace/Malloc_Base.h" #endif /* ACE_HAS_ALLOC_HOOKS */ -#if !defined (ACE_HAS_WINCE) #include "ace/OS_QoS.h" -#endif // ACE_HAS_WINCE #if !defined (__ACE_INLINE__) #include "ace/SOCK_Connector.inl" @@ -216,7 +214,6 @@ ACE_SOCK_Connector::connect (ACE_SOCK_Stream &new_stream, return this->shared_connect_finish (new_stream, timeout, result); } -#if !defined (ACE_HAS_WINCE) int ACE_SOCK_Connector::connect (ACE_SOCK_Stream &new_stream, const ACE_Addr &remote_sap, @@ -264,10 +261,8 @@ ACE_SOCK_Connector::connect (ACE_SOCK_Stream &new_stream, return this->shared_connect_finish (new_stream, timeout, result); } -#endif // ACE_HAS_WINCE // Try to complete a non-blocking connection. - int ACE_SOCK_Connector::complete (ACE_SOCK_Stream &new_stream, ACE_Addr *remote_sap, @@ -344,7 +339,6 @@ ACE_SOCK_Connector::ACE_SOCK_Connector (ACE_SOCK_Stream &new_stream, ACE_TEXT ("ACE_SOCK_Connector::ACE_SOCK_Connector"))); } -#if !defined (ACE_HAS_WINCE) ACE_SOCK_Connector::ACE_SOCK_Connector (ACE_SOCK_Stream &new_stream, const ACE_Addr &remote_sap, ACE_QoS_Params qos_params, @@ -374,6 +368,5 @@ ACE_SOCK_Connector::ACE_SOCK_Connector (ACE_SOCK_Stream &new_stream, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_SOCK_Connector::ACE_SOCK_Connector"))); } -#endif // ACE_HAS_WINCE ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/SOCK_Connector.h b/ACE/ace/SOCK_Connector.h index 2a7dde20db4..ddf4e324434 100644 --- a/ACE/ace/SOCK_Connector.h +++ b/ACE/ace/SOCK_Connector.h @@ -90,7 +90,6 @@ public: int perms = 0, int protocol = 0); -#if !defined (ACE_HAS_WINCE) /** * Actively connect to a peer, producing a connected @c ACE_SOCK_Stream * object if the connection succeeds. @@ -139,7 +138,6 @@ public: u_long flags = 0, int reuse_addr = 0, int perms = 0); -#endif // ACE_HAS_WINCE /** * Actively connect to a peer, producing a connected @c ACE_SOCK_Stream @@ -191,7 +189,6 @@ public: int perms = 0, int protocol = 0); -#if !defined (ACE_HAS_WINCE) /** * Actively connect to a peer, producing a connected @c ACE_SOCK_Stream * object if the connection succeeds. @@ -244,7 +241,6 @@ public: u_long flags = 0, int reuse_addr = 0, int perms = 0); -#endif // ACE_HAS_WINCE /// Default destructor. ~ACE_SOCK_Connector (); diff --git a/ACE/ace/SOCK_Dgram.cpp b/ACE/ace/SOCK_Dgram.cpp index 8c03e610fb0..d23422f4225 100644 --- a/ACE/ace/SOCK_Dgram.cpp +++ b/ACE/ace/SOCK_Dgram.cpp @@ -419,8 +419,8 @@ ACE_SOCK_Dgram::send (const iovec iov[], // Determine the total length of all the buffers in <iov>. for (i = 0; i < n; i++) -#if ! (defined(ACE_LACKS_IOVEC) || defined(ACE_LINUX) || defined(ACE_HAS_RTEMS)) - // The iov_len is unsigned on Linux, RTEMS and when using the ACE iovec struct. If we go +#if ! (defined(ACE_LACKS_IOVEC) || defined(ACE_LINUX)) + // The iov_len is unsigned on Linux and when using the ACE iovec struct. If we go // ahead and try the if, it will emit a warning. if (iov[i].iov_len < 0) return -1; @@ -480,8 +480,8 @@ ACE_SOCK_Dgram::recv (iovec iov[], ACE_UNUSED_ARG (to_addr); for (i = 0; i < n; i++) -#if ! (defined(ACE_LACKS_IOVEC) || defined(ACE_LINUX) || defined(ACE_HAS_RTEMS)) - // The iov_len is unsigned on Linux, RTEMS and when using the ACE iovec struct. If we go +#if ! (defined(ACE_LACKS_IOVEC) || defined(ACE_LINUX)) + // The iov_len is unsigned on Linux and when using the ACE iovec struct. If we go // ahead and try the if, it will emit a warning. if (iov[i].iov_len < 0) return -1; diff --git a/ACE/ace/SOCK_Dgram_Bcast.cpp b/ACE/ace/SOCK_Dgram_Bcast.cpp index 903bfd742ea..129fcdce25b 100644 --- a/ACE/ace/SOCK_Dgram_Bcast.cpp +++ b/ACE/ace/SOCK_Dgram_Bcast.cpp @@ -162,7 +162,7 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name) } -#if !defined(AIX) && !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined (ACE_VXWORKS) && !defined(__APPLE__) +#if !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined (ACE_VXWORKS) && !defined(__APPLE__) for (int n = ifc.ifc_len / sizeof (struct ifreq) ; n > 0; n--, ifr++) #else @@ -180,7 +180,7 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name) ifr = (struct ifreq *) ((caddr_t) &ifr->ifr_addr + ifr->ifr_addr.sa_len)) : (nbytes -= sizeof (struct ifreq), ifr++))) -#endif /* !defined(AIX) && !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined (ACE_VXWORKS) && !defined(__APPLE__) */ +#endif /* !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined (ACE_VXWORKS) && !defined(__APPLE__) */ { #if defined (__QNX__) || defined (ACE_VXWORKS) // Silently skip link interfaces diff --git a/ACE/ace/SOCK_SEQPACK_Association.cpp b/ACE/ace/SOCK_SEQPACK_Association.cpp index 4fa2da226f0..700c046f455 100644 --- a/ACE/ace/SOCK_SEQPACK_Association.cpp +++ b/ACE/ace/SOCK_SEQPACK_Association.cpp @@ -90,11 +90,7 @@ ACE_SOCK_SEQPACK_Association::get_local_addrs (ACE_INET_Addr *addrs, size_t &siz int err = 0; size_t len = 0; -#ifndef ACE_HAS_VOID_PTR_SCTP_GETLADDRS err = sctp_getladdrs(this->get_handle(), 0, &laddrs); -#else - err = sctp_getladdrs(this->get_handle(), 0, reinterpret_cast<void**>(&laddrs)); -#endif /* ACE_HAS_VOID_PTR_SCTP_GETPADDRS */ if (err > 0) { len = err; diff --git a/ACE/ace/SPIPE_Connector.cpp b/ACE/ace/SPIPE_Connector.cpp index 2f8e4a96269..c507b47ee92 100644 --- a/ACE/ace/SPIPE_Connector.cpp +++ b/ACE/ace/SPIPE_Connector.cpp @@ -67,8 +67,7 @@ ACE_SPIPE_Connector::connect (ACE_SPIPE_Stream &new_io, ACE_HANDLE handle; ACE_UNUSED_ARG (pipe_mode); -#if defined (ACE_WIN32) && \ - !defined (ACE_HAS_PHARLAP) && !defined (ACE_HAS_WINCE) +#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP) // We need to allow for more than one attempt to connect, // calculate the absolute time at which we give up. ACE_Time_Value absolute_time; @@ -148,7 +147,7 @@ ACE_SPIPE_Connector::connect (ACE_SPIPE_Stream &new_io, handle = ACE::handle_timed_open (timeout, remote_sap.get_path_name (), flags, perms, sa); -#endif /* !ACE_WIN32 || ACE_HAS_PHARLAP || ACE_HAS_WINCE */ +#endif /* !ACE_WIN32 || ACE_HAS_PHARLAP */ new_io.set_handle (handle); new_io.remote_addr_ = remote_sap; // class copy. diff --git a/ACE/ace/SPIPE_Stream.inl b/ACE/ace/SPIPE_Stream.inl index 08b9071b2fa..6f78a4fe5cd 100644 --- a/ACE/ace/SPIPE_Stream.inl +++ b/ACE/ace/SPIPE_Stream.inl @@ -102,9 +102,7 @@ ACE_SPIPE_Stream::send_handle (ACE_HANDLE handle) const ACE_TRACE ("ACE_SPIPE_Stream::send_handle"); #if defined (ACE_HAS_STREAM_PIPES) return ACE_OS::ioctl (this->get_handle (), I_SENDFD, (void *) handle); -#elif defined (ACE_WIN32) && \ - (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) && \ - !defined (ACE_HAS_WINCE) /* CE4 has WS2 but not WSADuplicateSocket */ +#elif defined (ACE_WIN32) && (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) DWORD procID; WSAPROTOCOL_INFO protInfo; ssize_t res = this->recv(&procID, sizeof(procID)); diff --git a/ACE/ace/SSL/SSL_Asynch_BIO.cpp b/ACE/ace/SSL/SSL_Asynch_BIO.cpp index 64aa14c6ab9..0faa775fc0f 100644 --- a/ACE/ace/SSL/SSL_Asynch_BIO.cpp +++ b/ACE/ace/SSL/SSL_Asynch_BIO.cpp @@ -1,7 +1,7 @@ // -*- C++ -*- #include "SSL_Asynch_BIO.h" -#if OPENSSL_VERSION_NUMBER > 0x0090581fL && ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS))) +#if OPENSSL_VERSION_NUMBER > 0x0090581fL && (defined (ACE_WIN32) || (defined (ACE_HAS_AIO_CALLS))) #include "SSL_Asynch_Stream.h" #include "ace/OS_NS_string.h" diff --git a/ACE/ace/SSL/SSL_Asynch_BIO.h b/ACE/ace/SSL/SSL_Asynch_BIO.h index 70b1a0fcc00..1d5aec2ff5d 100644 --- a/ACE/ace/SSL/SSL_Asynch_BIO.h +++ b/ACE/ace/SSL/SSL_Asynch_BIO.h @@ -25,7 +25,7 @@ #include <openssl/bio.h> -#if OPENSSL_VERSION_NUMBER > 0x0090581fL && ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS))) +#if OPENSSL_VERSION_NUMBER > 0x0090581fL && (defined (ACE_WIN32) || (defined (ACE_HAS_AIO_CALLS))) ACE_BEGIN_VERSIONED_NAMESPACE_DECL extern BIO * ACE_SSL_make_BIO (void * ssl_asynch_stream); diff --git a/ACE/ace/SSL/SSL_Asynch_Stream.cpp b/ACE/ace/SSL/SSL_Asynch_Stream.cpp index a673b6f371a..ed5a1e1f440 100644 --- a/ACE/ace/SSL/SSL_Asynch_Stream.cpp +++ b/ACE/ace/SSL/SSL_Asynch_Stream.cpp @@ -1,7 +1,7 @@ #include "SSL_Asynch_Stream.h" // This only works on platforms with Asynchronous IO support. -#if OPENSSL_VERSION_NUMBER > 0x0090581fL && ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS))) +#if OPENSSL_VERSION_NUMBER > 0x0090581fL && (defined (ACE_WIN32) || (defined (ACE_HAS_AIO_CALLS))) #if defined (ACE_WIN32) # include "ace/WIN32_Proactor.h" diff --git a/ACE/ace/SSL/SSL_Asynch_Stream.h b/ACE/ace/SSL/SSL_Asynch_Stream.h index 39fb2bb46e2..db86bf1f9f8 100644 --- a/ACE/ace/SSL/SSL_Asynch_Stream.h +++ b/ACE/ace/SSL/SSL_Asynch_Stream.h @@ -18,7 +18,7 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if OPENSSL_VERSION_NUMBER > 0x0090581fL && ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS))) +#if OPENSSL_VERSION_NUMBER > 0x0090581fL && (defined (ACE_WIN32) || (defined (ACE_HAS_AIO_CALLS))) #include "SSL_Asynch_BIO.h" diff --git a/ACE/ace/SSL/SSL_Context.cpp b/ACE/ace/SSL/SSL_Context.cpp index 09020466e73..9313dc5717f 100644 --- a/ACE/ace/SSL/SSL_Context.cpp +++ b/ACE/ace/SSL/SSL_Context.cpp @@ -516,10 +516,10 @@ ACE_SSL_Context::load_trusted_ca (const char* ca_file, } // SSL_add_dir_cert_subjects_to_stack is defined at 0.9.8a (but not - // on OpenVMS or Mac Classic); it may be available earlier. Change + // on Mac Classic); it may be available earlier. Change // this comparison if so. It's still (1.0.1g) broken on windows too. #if defined (OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x0090801fL) -# if !defined (OPENSSL_SYS_VMS) && !defined (OPENSSL_SYS_MACINTOSH_CLASSIC) +# if !defined (OPENSSL_SYS_MACINTOSH_CLASSIC) # if !defined (OPENSSL_SYS_WIN32) if (ca_dir != 0) @@ -542,7 +542,7 @@ ACE_SSL_Context::load_trusted_ca (const char* ca_file, } } # endif /* !OPENSSL_SYS_WIN32 */ -# endif /* !OPENSSL_SYS_VMS && !OPENSSL_SYS_MACINTOSH_CLASSIC */ +# endif /* !OPENSSL_SYS_MACINTOSH_CLASSIC */ #endif /* OPENSSL_VERSION_NUMBER >= 0.9.8a release */ } diff --git a/ACE/ace/SSL/SSL_Context.h b/ACE/ace/SSL/SSL_Context.h index 97eae945e62..91903f788c3 100644 --- a/ACE/ace/SSL/SSL_Context.h +++ b/ACE/ace/SSL/SSL_Context.h @@ -57,7 +57,7 @@ private: // **************************************************************** -// NOTE: Solaris studio compilers amongst others will issue warnings if the +// NOTE: Some compilers will issue warnings if the // the correct type of function pointer (i.e. extern "C" ) is not stored/used // of the form: // Warning (Anachronism): Formal argument callback of type diff --git a/ACE/ace/SString.inl b/ACE/ace/SString.inl index 75b261a34c2..1757425725c 100644 --- a/ACE/ace/SString.inl +++ b/ACE/ace/SString.inl @@ -1,7 +1,5 @@ // -*- C++ -*- -// Include ACE.h only if it hasn't already been included, e.g., if -// ACE_TEMPLATES_REQUIRE_SOURCE, ACE.h won't have been pulled in by -// String_Base.cpp. +// Include ACE.h only if it hasn't already been included #ifndef ACE_ACE_H # include "ace/ACE.h" #endif /* !ACE_ACE_H */ diff --git a/ACE/ace/SUN_Proactor.cpp b/ACE/ace/SUN_Proactor.cpp deleted file mode 100644 index 6caf2858d67..00000000000 --- a/ACE/ace/SUN_Proactor.cpp +++ /dev/null @@ -1,314 +0,0 @@ -#include "ace/SUN_Proactor.h" - -#if defined (ACE_HAS_AIO_CALLS) && defined (sun) - -#include "ace/Task_T.h" -#include "ace/Log_Category.h" -#include "ace/Object_Manager.h" - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - -ACE_SUN_Proactor::ACE_SUN_Proactor (size_t max_aio_operations) - : ACE_POSIX_AIOCB_Proactor (max_aio_operations, - ACE_POSIX_Proactor::PROACTOR_SUN), - condition_ (mutex_) -{ - // To provide correct virtual calls. - create_notify_manager (); - - // we should start pseudo-asynchronous accept task - // one per all future acceptors - - this->get_asynch_pseudo_task ().start (); -} - -// Destructor. -ACE_SUN_Proactor::~ACE_SUN_Proactor () -{ - this->close (); -} - -int -ACE_SUN_Proactor::handle_events (ACE_Time_Value &wait_time) -{ - // Decrement <wait_time> with the amount of time spent in the method - ACE_Countdown_Time countdown (&wait_time); - return this->handle_events_i (&wait_time); -} - -int -ACE_SUN_Proactor::handle_events () -{ - return this->handle_events_i (0); -} - -int ACE_SUN_Proactor::wait_for_start (ACE_Time_Value * abstime) -{ -#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) - - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, mutex_, -1)); - - if (this->num_started_aio_ != 0) // double check - return 0; - - return this->condition_.wait (abstime); - -#else - - return 0; // or -1 ??? - -#endif /* ACE_MT_SAFE */ -} - -int -ACE_SUN_Proactor::handle_events_i (ACE_Time_Value *delta) -{ - int retval = 0; - aio_result_t *result = 0; - - if (0 == delta) - { - if (this->num_started_aio_ == 0) - this->wait_for_start (0); - - result = aiowait (0); - } - else - { - if (this->num_started_aio_ == 0) - { - // Decrement delta with the amount of time spent waiting - ACE_Countdown_Time countdown (delta); - ACE_Time_Value tv (*delta); - tv += ACE_OS::gettimeofday (); - if (this->wait_for_start (&tv) == -1) - return -1; - } - struct timeval delta_tv = *delta; - result = aiowait (&delta_tv); - } - - if (result == 0) - { - // timeout, do nothing, - // we should process "post_completed" queue - } - else if (reinterpret_cast<long> (result) == -1) - { - // Check errno for EINVAL,EAGAIN,EINTR ?? - switch (errno) - { - case EINTR : // aiowait() was interrupted by a signal. - case EINVAL: // there are no outstanding asynchronous I/O requests. - break; // we should process "post_completed" queue - - default: // EFAULT - ACELIB_ERROR_RETURN ((LM_ERROR, - ACE_TEXT("%N:%l:(%P | %t)::%p \nNumAIO=%d\n"), - ACE_TEXT("ACE_SUN_Proactor::handle_events: aiowait failed"), - num_started_aio_), - -1); - } - } - else - { - int error_status = 0; - size_t transfer_count = 0; - - ACE_POSIX_Asynch_Result *asynch_result = - find_completed_aio (result, - error_status, - transfer_count); - - if (asynch_result != 0) - { - // Call the application code. - this->application_specific_code (asynch_result, - transfer_count, - 0, // No completion key. - error_status); // Error - retval++; - } - } - - // process post_completed results - retval += this->process_result_queue (); - - return retval > 0 ? 1 : 0 ; -} - -int -ACE_SUN_Proactor::get_result_status (ACE_POSIX_Asynch_Result* asynch_result, - int &error_status, - size_t &transfer_count) -{ - // Get the error status of the aio_ operation. - error_status = asynch_result->aio_resultp.aio_errno; - ssize_t op_return = asynch_result->aio_resultp.aio_return; - - // ****** from Sun man pages ********************* - // Upon completion of the operation both aio_return and aio_errno - // are set to reflect the result of the operation. - // AIO_INPROGRESS is not a value used by the system - // so the client may detect a change in state - // by initializing aio_return to this value. - - if (error_status == EINPROGRESS || op_return == AIO_INPROGRESS) - return 0; // not completed - - if (op_return < 0) - transfer_count = 0; // zero bytes transferred - else - transfer_count = static_cast<size_t> (op_return); - - return 1; // completed -} - -ACE_POSIX_Asynch_Result * -ACE_SUN_Proactor::find_completed_aio (aio_result_t *result, - int &error_status, - size_t &transfer_count) -{ - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, mutex_, 0)); - - size_t ai; - error_status = -1; - transfer_count = 0; - - // we call find_completed_aio always with result != 0 - - for (ai = 0; ai < aiocb_list_max_size_; ai++) - if (aiocb_list_[ai] != 0 && //check for non zero - result == &aiocb_list_[ai]->aio_resultp) - break; - - if (ai >= aiocb_list_max_size_) // not found - return 0; // means somebody else uses aio directly!!! - - ACE_POSIX_Asynch_Result *asynch_result = result_list_[ai]; - - if (this->get_result_status (asynch_result, - error_status, - transfer_count) == 0) - { // should never be - ACELIB_ERROR ((LM_ERROR, - ACE_TEXT("%N:%l:(%P | %t)::%p\n"), - ACE_TEXT("ACE_SUN_Proactor::find_completed_aio:") - ACE_TEXT("should never be !!!\n"))); - return 0; - } - - aiocb_list_[ai] = 0; - result_list_[ai] = 0; - aiocb_list_cur_size_--; - - num_started_aio_--; - - start_deferred_aio (); - //make attempt to start deferred AIO - //It is safe as we are protected by mutex_ - - return asynch_result; -} - -// start_aio_i has new return codes -// 0 successful start -// 1 try later, OS queue overflow -// -1 invalid request and other errors - -int -ACE_SUN_Proactor::start_aio_i (ACE_POSIX_Asynch_Result *result) -{ - ACE_TRACE ("ACE_SUN_Proactor::start_aio_i"); - - int ret_val; - const ACE_TCHAR *ptype; - - // ****** from Sun man pages ********************* - // Upon completion of the operation both aio_return and aio_errno - // are set to reflect the result of the operation. - // AIO_INPROGRESS is not a value used by the system - // so the client may detect a change in state - // by initializing aio_return to this value. - result->aio_resultp.aio_return = AIO_INPROGRESS; - result->aio_resultp.aio_errno = EINPROGRESS; - - // Start IO - switch (result->aio_lio_opcode) - { - case LIO_READ : - ptype = ACE_TEXT ("read"); - ret_val = aioread (result->aio_fildes, - (char *) result->aio_buf, - result->aio_nbytes, - result->aio_offset, - SEEK_SET, - &result->aio_resultp); - break; - - case LIO_WRITE : - ptype = ACE_TEXT ("write"); - ret_val = aiowrite (result->aio_fildes, - (char *) result->aio_buf, - result->aio_nbytes, - result->aio_offset, - SEEK_SET, - &result->aio_resultp); - break; - - default: - ptype = ACE_TEXT ("?????"); - ret_val = -1; - break; - } - - if (ret_val == 0) - { - this->num_started_aio_++; - if (this->num_started_aio_ == 1) // wake up condition - this->condition_.broadcast (); - } - else // if (ret_val == -1) - { - if (errno == EAGAIN || errno == ENOMEM) // Defer - retry this later. - ret_val = 1; - else - ACELIB_ERROR ((LM_ERROR, - ACE_TEXT ("%N:%l:(%P | %t)::start_aio: aio%s %p\n"), - ptype, - ACE_TEXT ("queueing failed\n"))); - } - - return ret_val; -} - -int -ACE_SUN_Proactor::cancel_aiocb (ACE_POSIX_Asynch_Result *result) -{ - ACE_TRACE ("ACE_SUN_Proactor::cancel_aiocb"); - int rc = ::aiocancel (&result->aio_resultp); - if (rc == 0) // AIO_CANCELED - { - // after aiocancel Sun does not notify us - // so we should send notification - // to save POSIX behavoir. - // Also we should do this for deffered aio's - - result->set_error (ECANCELED); - result->set_bytes_transferred (0); - this->putq_result (result); - return 0; - } - - return 2; -} - -ACE_POSIX_Proactor::Proactor_Type -ACE_SUN_Proactor::get_impl_type () -{ - return PROACTOR_SUN; -} - -ACE_END_VERSIONED_NAMESPACE_DECL - -#endif /* ACE_HAS_AIO_CALLS && sun */ diff --git a/ACE/ace/SUN_Proactor.h b/ACE/ace/SUN_Proactor.h deleted file mode 100644 index 376a9cdf60a..00000000000 --- a/ACE/ace/SUN_Proactor.h +++ /dev/null @@ -1,123 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file SUN_Proactor.h - * - * @author Alexander Libman <alibman@baltimore.com> - */ -//============================================================================= - -#ifndef ACE_SUN_PROACTOR_H -#define ACE_SUN_PROACTOR_H - -#include /**/ "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if defined (ACE_HAS_AIO_CALLS) && defined (sun) - -#include "ace/POSIX_Proactor.h" -#include /**/ <sys/asynch.h> // Sun native aio calls - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - -/** - * @class ACE_SUN_Proactor - * - * @brief Implementation of the fast and reliable Proactor - * for SunOS 5.6, 5.7, etc. - * - * This proactor, based on ACE_POSIX_AIOCB_Proactor, - * works with Sun native interface for aio calls. - * POSIX_API Native SUN_API - * aio_read aioread - * aio_write aiowrite - * aio_suspend aiowait - * aio_error aio_result_t.errno - * aio_return aio_result_t.return - * On Solaris, the Sun <aio*()> native implementation is more - * reliable and efficient than POSIX <aio_*()> implementation. - * There is a problem of lost RT signals with POSIX, if we start - * more than SIGQUEUEMAX asynchronous operations at the same - * time. - * The Sun <aiocb> it is not the standard POSX <aiocb>, instead, - * it has the following structure: - * typedef struct aiocb - * { - * int aio_fildes; File descriptor - * void *aio_buf; buffer location - * size_t aio_nbytes; length of transfer - * off_t aio_offset; file offset - * int aio_reqprio; request priority offset - * sigevent aio_sigevent; signal number and offset - * int aio_lio_opcode; listio operation - * aio_result_t aio_resultp; results - * int aio_state; state flag for List I/O - * int aio__pad[1]; extension padding - * }; - */ -class ACE_Export ACE_SUN_Proactor : public ACE_POSIX_AIOCB_Proactor -{ -public: - virtual Proactor_Type get_impl_type (); - - /// Destructor. - virtual ~ACE_SUN_Proactor (); - - /// Constructor defines max number asynchronous operations that can - /// be started at the same time. - ACE_SUN_Proactor (size_t max_aio_operations = ACE_AIO_DEFAULT_SIZE); - -protected: - /** - * Dispatch a single set of events. If @a wait_time elapses before - * any events occur, return 0. Return 1 on success i.e., when a - * completion is dispatched, non-zero (-1) on errors and errno is - * set accordingly. - */ - virtual int handle_events (ACE_Time_Value &wait_time); - - /** - * Block indefinitely until at least one event is dispatched. - * Dispatch a single set of events. Return 1 on success i.e., when a - * completion is dispatched, non-zero (-1) on errors and errno is - * set accordingly. - */ - virtual int handle_events (); - - /// Internal completion detection and dispatching. - int handle_events_i (ACE_Time_Value *delta); - - /// Initiate an aio operation. - virtual int start_aio_i (ACE_POSIX_Asynch_Result *result); - - /// Check AIO for completion, error and result status - /// Return: 1 - AIO completed , 0 - not completed yet - virtual int get_result_status (ACE_POSIX_Asynch_Result* asynch_result, - int &error_status, - size_t &transfer_count); - - /// Extract the results of aio. - ACE_POSIX_Asynch_Result *find_completed_aio (aio_result_t *result, - int &error_status, - size_t &transfer_count); - - /// From ACE_POSIX_AIOCB_Proactor. - /// Attempt to cancel running request - virtual int cancel_aiocb (ACE_POSIX_Asynch_Result *result); - - /// Specific Sun aiowait - int wait_for_start (ACE_Time_Value * abstime); - - /// Condition variable . - /// used to wait the first AIO start - ACE_SYNCH_CONDITION condition_; -}; - -ACE_END_VERSIONED_NAMESPACE_DECL - -#endif /* ACE_HAS_AIO_CALLS && sun */ -#endif /* ACE_SUN_PROACTOR_H*/ diff --git a/ACE/ace/Sched_Params.cpp b/ACE/ace/Sched_Params.cpp index 8f63c093432..409e7120ac5 100644 --- a/ACE/ace/Sched_Params.cpp +++ b/ACE/ace/Sched_Params.cpp @@ -13,73 +13,13 @@ #include "ace/Sched_Params.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_HAS_PRIOCNTL) && defined (ACE_HAS_STHREADS) -# include "ace/OS_NS_string.h" -# include /**/ <sys/priocntl.h> -#endif /* ACE_HAS_PRIOCNTL && ACE_HAS_THREADS */ - ACE_BEGIN_VERSIONED_NAMESPACE_DECL int ACE_Sched_Params::priority_min (const Policy policy, const int scope) { -#if defined (ACE_HAS_PRIOCNTL) && defined (ACE_HAS_STHREADS) - ACE_UNUSED_ARG (scope); - - // Assume that ACE_SCHED_OTHER indicates TS class, and that other - // policies indicate RT class. - - // Call ACE_OS::priority_control only for processes (lightweight - // or otherwise). Calling ACE_OS::priority_control for thread - // priorities gives incorrect results. - if (scope == ACE_SCOPE_PROCESS || scope == ACE_SCOPE_LWP) - { - if (policy == ACE_SCHED_OTHER) - { - // Get the priority class ID and attributes. - pcinfo_t pcinfo; - // The following is just to avoid Purify warnings about unitialized - // memory reads. - ACE_OS::memset (&pcinfo, 0, sizeof pcinfo); - ACE_OS::strcpy (pcinfo.pc_clname, "TS"); - - if (ACE_OS::priority_control (P_ALL /* ignored */, - P_MYID /* ignored */, - PC_GETCID, - (char *) &pcinfo) == -1) - // Just hope that priority range wasn't configured from -1 - // .. 1 - return -1; - - // OK, now we've got the class ID in pcinfo.pc_cid. In - // addition, the maximum configured time-share priority is in - // ((tsinfo_t *) pcinfo.pc_clinfo)->ts_maxupri. The minimum - // priority is just the negative of that. - - return -((tsinfo_t *) pcinfo.pc_clinfo)->ts_maxupri; - } - else - return 0; - } - else - { - // Here we handle the case for ACE_SCOPE_THREAD. Calling - // ACE_OS::priority_control for thread scope gives incorrect - // results. - switch (policy) - { - case ACE_SCHED_FIFO: - return ACE_THR_PRI_FIFO_MIN; - case ACE_SCHED_RR: - return ACE_THR_PRI_RR_MIN; - case ACE_SCHED_OTHER: - default: - return ACE_THR_PRI_OTHER_MIN; - } - } -#elif defined(ACE_HAS_PTHREADS) && \ - (!defined(ACE_LACKS_SETSCHED)) +#if defined(ACE_HAS_PTHREADS) && !defined(ACE_LACKS_SETSCHED) switch (scope) { case ACE_SCOPE_THREAD: @@ -108,14 +48,10 @@ ACE_Sched_Params::priority_min (const Policy policy, } } -#elif defined (ACE_HAS_WTHREADS) && !defined (ACE_HAS_WINCE) +#elif defined (ACE_HAS_WTHREADS) ACE_UNUSED_ARG (policy); ACE_UNUSED_ARG (scope); return THREAD_PRIORITY_IDLE; -#elif defined (ACE_HAS_WTHREADS) && defined (ACE_HAS_WINCE) - ACE_UNUSED_ARG (policy); - ACE_UNUSED_ARG (scope); - return 255; #elif defined (ACE_VXWORKS) ACE_UNUSED_ARG (policy); ACE_UNUSED_ARG (scope); @@ -128,63 +64,14 @@ ACE_Sched_Params::priority_min (const Policy policy, ACE_UNUSED_ARG (policy); ACE_UNUSED_ARG (scope); ACE_NOTSUP_RETURN (-1); -#endif /* ACE_HAS_PRIOCNTL && defined (ACE_HAS_STHREADS) */ +#endif /* ACE_HAS_PTHREADS */ } int ACE_Sched_Params::priority_max (const Policy policy, const int scope) { -#if defined (ACE_HAS_PRIOCNTL) && defined (ACE_HAS_STHREADS) - ACE_UNUSED_ARG (scope); - - // Call ACE_OS::priority_control only for processes (lightweight - // or otherwise). Calling ACE_OS::priority_control for thread - // priorities gives incorrect results. - if (scope == ACE_SCOPE_PROCESS || scope == ACE_SCOPE_LWP) - { - // Assume that ACE_SCHED_OTHER indicates TS class, and that other - // policies indicate RT class. - - // Get the priority class ID and attributes. - pcinfo_t pcinfo; - // The following is just to avoid Purify warnings about unitialized - // memory reads. - ACE_OS::memset (&pcinfo, 0, sizeof pcinfo); - ACE_OS::strcpy (pcinfo.pc_clname, - policy == ACE_SCHED_OTHER ? "TS" : "RT"); - - if (ACE_OS::priority_control (P_ALL /* ignored */, - P_MYID /* ignored */, - PC_GETCID, - (char *) &pcinfo) == -1) - return -1; - - // OK, now we've got the class ID in pcinfo.pc_cid. In addition, - // the maximum configured real-time priority is in ((rtinfo_t *) - // pcinfo.pc_clinfo)->rt_maxpri, or similarly for the TS class. - - return policy == ACE_SCHED_OTHER - ? ((tsinfo_t *) pcinfo.pc_clinfo)->ts_maxupri - : ((rtinfo_t *) pcinfo.pc_clinfo)->rt_maxpri; - } - else - { - // Here we handle the case for ACE_SCOPE_THREAD. Calling - // ACE_OS::priority_control for thread scope gives incorrect - // results. - switch (policy) - { - case ACE_SCHED_FIFO: - return ACE_THR_PRI_FIFO_MAX; - case ACE_SCHED_RR: - return ACE_THR_PRI_RR_MAX; - case ACE_SCHED_OTHER: - default: - return ACE_THR_PRI_OTHER_MAX; - } - } -#elif defined(ACE_HAS_PTHREADS) && \ +#if defined(ACE_HAS_PTHREADS) && \ (!defined(ACE_LACKS_SETSCHED) || \ defined (ACE_HAS_PTHREAD_SCHEDPARAM)) @@ -216,14 +103,10 @@ ACE_Sched_Params::priority_max (const Policy policy, } } -#elif defined (ACE_HAS_WTHREADS) && !defined (ACE_HAS_WINCE) +#elif defined (ACE_HAS_WTHREADS) ACE_UNUSED_ARG (policy); ACE_UNUSED_ARG (scope); return THREAD_PRIORITY_TIME_CRITICAL; -#elif defined (ACE_HAS_WTHREADS) && defined (ACE_HAS_WINCE) - ACE_UNUSED_ARG (policy); - ACE_UNUSED_ARG (scope); - return 0; #elif defined (ACE_VXWORKS) ACE_UNUSED_ARG (policy); ACE_UNUSED_ARG (scope); @@ -236,7 +119,7 @@ ACE_Sched_Params::priority_max (const Policy policy, ACE_UNUSED_ARG (policy); ACE_UNUSED_ARG (scope); ACE_NOTSUP_RETURN (-1); -#endif /* ACE_HAS_PRIOCNTL && defined (ACE_HAS_STHREADS) */ +#endif /* ACE_HAS_PTHREADS */ } int @@ -244,7 +127,7 @@ ACE_Sched_Params::next_priority (const Policy policy, const int priority, const int scope) { -#if defined (ACE_HAS_WTHREADS) && !defined (ACE_HAS_WINCE) +#if defined (ACE_HAS_WTHREADS) ACE_UNUSED_ARG (policy); ACE_UNUSED_ARG (scope); switch (priority) @@ -272,7 +155,7 @@ ACE_Sched_Params::next_priority (const Policy policy, // including STHREADS, and PTHREADS int const max = priority_max (policy, scope); return priority < max ? priority + 1 : max; -#elif defined (ACE_VXWORKS) || defined (ACE_HAS_WINCE) +#elif defined (ACE_VXWORKS) int const max = priority_max (policy, scope); return priority > max ? priority - 1 : max; #else @@ -288,7 +171,7 @@ ACE_Sched_Params::previous_priority (const Policy policy, const int priority, const int scope) { -#if defined (ACE_HAS_WTHREADS) && !defined (ACE_HAS_WINCE) +#if defined (ACE_HAS_WTHREADS) ACE_UNUSED_ARG (policy); ACE_UNUSED_ARG (scope); switch (priority) @@ -316,7 +199,7 @@ ACE_Sched_Params::previous_priority (const Policy policy, // including STHREADS and PTHREADS int const min = priority_min (policy, scope); return priority > min ? priority - 1 : min; -#elif defined (ACE_VXWORKS) || defined (ACE_HAS_WINCE) +#elif defined (ACE_VXWORKS) int const min = priority_min (policy, scope); return priority < min ? priority + 1 : min; #else diff --git a/ACE/ace/Sched_Params.h b/ACE/ace/Sched_Params.h index 7ca200bbf46..5058f17e60a 100644 --- a/ACE/ace/Sched_Params.h +++ b/ACE/ace/Sched_Params.h @@ -36,10 +36,9 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * (ACE_SCHED_OTHER), to which many systems default; priority; * and a time-slice quantum for round-robin scheduling. A * "scope" parameter specifies whether the ACE_Sched_Params - * applies to the current process, current lightweight process - * (LWP) (on Solaris), or current thread. Please see the "NOTE" - * below about not all combinations of parameters being legal on - * a particular platform. + * applies to the current process, or current thread. Please + * see the "NOTE" below about not all combinations of parameters + * being legal on a particular platform. * For the case of thread priorities, it is intended that * <ACE_OS::sched_params> usually be called from <main> before * any threads have been spawned. If spawned threads inherit @@ -57,11 +56,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL */ class ACE_Export ACE_Sched_Params { - // NOTE: Solaris 2.5.x threads in the RT class must set the - // priority of their LWP. The only way to do that through ACE is - // for the RT thread itself to call <ACE_OS::thr_setprio> with - // it's own priority. - // OS Scheduling parameters are complicated and often confusing. // Many thanks to Thilo Kielmann // <kielmann@informatik.uni-siegen.de> for his careful review of @@ -142,8 +136,6 @@ private: * process, and the process priority. On some platforms, * such as Win32, the scheduling policy can _only_ be * set at process scope. - * ACE_SCOPE_LWP: lightweight process scope, only used with - * Solaris threads. * ACE_SCOPE_THREAD: sets the scheduling policy for the thread, * if the OS supports it, such as with Posix threads, and the * thread priority. diff --git a/ACE/ace/Select_Reactor_T.h b/ACE/ace/Select_Reactor_T.h index 2b53af44ea1..e515bc756b0 100644 --- a/ACE/ace/Select_Reactor_T.h +++ b/ACE/ace/Select_Reactor_T.h @@ -696,13 +696,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Select_Reactor_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Select_Reactor_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Select_Reactor_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_SELECT_REACTOR_T_H */ diff --git a/ACE/ace/Semaphore.h b/ACE/ace/Semaphore.h index fc46aac8a64..a0c6f964dd6 100644 --- a/ACE/ace/Semaphore.h +++ b/ACE/ace/Semaphore.h @@ -60,13 +60,6 @@ public: * is assumed to be in "absolute" rather than "relative" time. The * value of @a tv is updated upon return to show the actual * (absolute) acquisition time. - * - * @note Solaris threads do not support timed semaphores. - * Therefore, if you're running on Solaris you might want to - * consider using the ACE POSIX pthreads implementation instead, - * which can be enabled by compiling ACE with - * -DACE_HAS_PTHREADS, rather than -DACE_HAS_STHREADS or - * -DACE_HAS_POSIX_SEM. */ int acquire (ACE_Time_Value &tv); @@ -78,13 +71,7 @@ public: * <*tv> is assumed to be in "absolute" rather than "relative" time. * The value of <*tv> is updated upon return to show the actual * (absolute) acquisition time. - * - * @note Solaris threads do not support timed semaphores. - * Therefore, if you're running on Solaris you might want to - * consider using the ACE POSIX pthreads implementation instead, - * which can be enabled by compiling ACE with - * -DACE_HAS_PTHREADS, rather than -DACE_HAS_STHREADS or - * -DACE_HAS_POSIX_SEM. */ + */ int acquire (ACE_Time_Value *tv); /** diff --git a/ACE/ace/Service_Config.h b/ACE/ace/Service_Config.h index d77fc253625..a3a785bad42 100644 --- a/ACE/ace/Service_Config.h +++ b/ACE/ace/Service_Config.h @@ -542,16 +542,6 @@ private: /// from the ACE_Reactor, and unlinking it if necessary. static int remove (const ACE_TCHAR svc_name[]); -#if defined (ACE_HAS_WINCE) && defined (ACE_USES_WCHAR) - // We must provide these function to bridge the Svc_Conf parser - // with ACE. - static int initialize (const ACE_Service_Type *, ACE_ANTI_TCHAR []); - static int initialize (const char svc_name[], ACE_ANTI_TCHAR parameters[]); - static int resume (const ACE_ANTI_TCHAR svc_name[]); - static int suspend (const ACE_ANTI_TCHAR svc_name[]); - static int remove (const ACE_ANTI_TCHAR svc_name[]); -#endif /* ACE_HAS_WINCE */ - /// Dump the state of an object. void dump () const; diff --git a/ACE/ace/Service_Config.inl b/ACE/ace/Service_Config.inl index 4f187015bcc..eeb2911af6f 100644 --- a/ACE/ace/Service_Config.inl +++ b/ACE/ace/Service_Config.inl @@ -166,40 +166,4 @@ ACE_Service_Config::process_directive (const ACE_Static_Svc_Descriptor &ssd, return ACE_Service_Config::current ()->process_directive (ssd, force_replace); } - -#if defined (ACE_HAS_WINCE) && defined (ACE_USES_WCHAR) -// We must provide these function to bridge Svc_Conf parser with ACE. - -ACE_INLINE int -ACE_Service_Config::initialize (const ACE_Service_Type *sp, ACE_ANTI_TCHAR parameters[]) -{ - return ACE_Service_Config::initialize (sp, ACE_TEXT_ANTI_TO_TCHAR (parameters)); -} - -ACE_INLINE int -ACE_Service_Config::initialize (const ACE_ANTI_TCHAR svc_name[], ACE_ANTI_TCHAR parameters[]) -{ - return ACE_Service_Config::initialize (ACE_TEXT_ANTI_TO_TCHAR (svc_name), - ACE_TEXT_ANTI_TO_TCHAR (parameters)); -} - -ACE_INLINE int -ACE_Service_Config::resume (const ACE_ANTI_TCHAR svc_name[]) -{ - return ACE_Service_Config::resume (ACE_TEXT_ANTI_TO_TCHAR (svc_name)); -} - -ACE_INLINE int -ACE_Service_Config::suspend (const ACE_ANTI_TCHAR svc_name[]) -{ - return ACE_Service_Config::suspend (ACE_TEXT_ANTI_TO_TCHAR (svc_name)); -} - -ACE_INLINE int -ACE_Service_Config::remove (const ACE_ANTI_TCHAR svc_name[]) -{ - return ACE_Service_Config::remove (ACE_TEXT_ANTI_TO_TCHAR (svc_name)); -} -#endif /* ACE_HAS_WINCE && !ACE_USES_WCHAR */ - ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Service_Gestalt.cpp b/ACE/ace/Service_Gestalt.cpp index fe41085324d..bc82751959c 100644 --- a/ACE/ace/Service_Gestalt.cpp +++ b/ACE/ace/Service_Gestalt.cpp @@ -819,14 +819,8 @@ ACE_Service_Gestalt::get_xml_svc_conf (ACE_DLL &xmldll) ACE_TEXT("ACE_Service_Config::get_xml_svc_conf")), 0); - void * foo = - xmldll.symbol (ACE_TEXT ("_ACEXML_create_XML_Svc_Conf_Object")); - -#if defined (ACE_OPENVMS) && (!defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64)) - int const temp_p = reinterpret_cast<int> (foo); -#else + void * foo = xmldll.symbol (ACE_TEXT ("_ACEXML_create_XML_Svc_Conf_Object")); intptr_t const temp_p = reinterpret_cast<intptr_t> (foo); -#endif ACE_XML_Svc_Conf::Factory factory = reinterpret_cast<ACE_XML_Svc_Conf::Factory> (temp_p); diff --git a/ACE/ace/Service_Object.cpp b/ACE/ace/Service_Object.cpp index c7429cfb075..79060626410 100644 --- a/ACE/ace/Service_Object.cpp +++ b/ACE/ace/Service_Object.cpp @@ -14,9 +14,6 @@ #include "ace/DLL.h" #include "ace/ACE.h" #include "ace/Log_Category.h" -#if defined (ACE_OPENVMS) -# include "ace/Lib_Find.h" -#endif ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -177,13 +174,4 @@ ACE_Service_Type::name (const ACE_TCHAR *n) this->name_ = ACE::strnew (n); } -#if defined (ACE_OPENVMS) -ACE_Dynamic_Svc_Registrar::ACE_Dynamic_Svc_Registrar (const ACE_TCHAR* alloc_name, - void* svc_allocator) -{ - // register service allocator function by full name in ACE singleton registry - ACE::ldregister (alloc_name, svc_allocator); -} -#endif - ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Service_Object.h b/ACE/ace/Service_Object.h index 4f123319c2e..287391e5202 100644 --- a/ACE/ace/Service_Object.h +++ b/ACE/ace/Service_Object.h @@ -180,20 +180,6 @@ private: ACE_Service_Object *service_object_; }; -#if defined (ACE_OPENVMS) -/** - * @class ACE_Dynamic_Svc_Registrar - * - * @brief Used to register Service allocator function by its full name. - */ -class ACE_Dynamic_Svc_Registrar -{ -public: - ACE_Dynamic_Svc_Registrar (const ACE_TCHAR* alloc_name, - void* svc_allocator); -}; -#endif - ACE_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) diff --git a/ACE/ace/Singleton.h b/ACE/ace/Singleton.h index 41a954dc22a..c8c7f7de56d 100644 --- a/ACE/ace/Singleton.h +++ b/ACE/ace/Singleton.h @@ -324,13 +324,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Singleton.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Singleton.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Singleton.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_SINGLETON_H */ diff --git a/ACE/ace/Sock_Connect.cpp b/ACE/ace/Sock_Connect.cpp index 6f19185c439..37e8ea1a339 100644 --- a/ACE/ace/Sock_Connect.cpp +++ b/ACE/ace/Sock_Connect.cpp @@ -7,11 +7,6 @@ #include "ace/OS_Memory.h" #include "ace/OS_NS_stdio.h" #include "ace/ACE.h" - -#if defined (sparc) -# include "ace/OS_NS_fcntl.h" -#endif // sparc - #include "ace/OS_NS_stdlib.h" #include "ace/OS_NS_string.h" #include "ace/OS_NS_sys_socket.h" @@ -22,9 +17,6 @@ #if defined (ACE_HAS_IPV6) # include "ace/Guard_T.h" # include "ace/Recursive_Thread_Mutex.h" -# if defined (_AIX) -# include /**/ <netinet/in6_var.h> -# endif /* _AIX */ #endif /* ACE_HAS_IPV6 */ #if defined (ACE_HAS_GETIFADDRS) @@ -38,15 +30,6 @@ const struct in6_addr in6addr_linklocal_allnodes = IN6ADDR_LINKLOCAL_ALLNODES_IN const struct in6_addr in6addr_linklocal_allrouters = IN6ADDR_LINKLOCAL_ALLROUTERS_INIT; #endif /* ACE_VXWORKS <= 0x670 && __RTP__ && ACE_HAS_IPV6 */ -#if defined (ACE_HAS_WINCE) -#include /**/ <iphlpapi.h> -# if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) && (_WIN32_WCE < 0x600) && defined (ACE_HAS_IPV6) -# include /**/ <ws2tcpip.h> -const struct in6_addr in6addr_any = IN6ADDR_ANY_INIT; -const struct in6_addr in6addr_loopback = IN6ADDR_LOOPBACK_INIT; -# endif -#endif // ACE_HAS_WINCE - #if defined (ACE_WIN32) && defined (ACE_HAS_PHARLAP) # include "ace/OS_NS_stdio.h" #endif @@ -58,18 +41,6 @@ const struct in6_addr in6addr_loopback = IN6ADDR_LOOPBACK_INIT; # if defined (SIOCGLIFCONF) # define SIOCGIFCONF_CMD SIOCGLIFCONF -# if defined (__hpux) -# define IFREQ if_laddrreq -# define IFCONF if_laddrconf -# define IFC_REQ iflc_req -# define IFC_LEN iflc_len -# define IFC_BUF iflc_buf -# define IFR_ADDR iflr_addr -# define IFR_NAME iflr_name -# define IFR_FLAGS iflr_flags -# undef SETFAMILY -# define SA_FAMILY sa_family -# else # define IFREQ lifreq # define IFCONF lifconf # define IFC_REQ lifc_req @@ -82,7 +53,6 @@ const struct in6_addr in6addr_loopback = IN6ADDR_LOOPBACK_INIT; # define IFC_FAMILY lifc_family # define IFC_FLAGS lifc_flags # define SA_FAMILY ss_family -# endif # else # define SIOCGIFCONF_CMD SIOCGIFCONF # define IFREQ ifreq @@ -227,7 +197,7 @@ ACE::get_bcast_addr (ACE_UINT32 &bcast_addr, sizeof ip_addr.sin_addr); } -#if !defined(AIX) && !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined (__Lynx__) +#if !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined (__Lynx__) for (int n = ifc.ifc_len / sizeof (struct ifreq) ; n > 0; n--, ifr++) #else @@ -240,7 +210,7 @@ ACE::get_bcast_addr (ACE_UINT32 &bcast_addr, ifr = (struct ifreq *) ((caddr_t) &ifr->ifr_addr + ifr->ifr_addr.sa_len)) : (nbytes -= sizeof (struct ifreq), ifr++))) -#endif /* !defined(AIX) && !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined (__Lynx__) */ +#endif /* !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined (__Lynx__) */ { struct sockaddr_in if_addr; @@ -468,105 +438,7 @@ static int get_ip_interfaces_win32 (size_t &count, ACE_INET_Addr *&addrs) { -# if defined (ACE_HAS_WINCE) && defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) - // moved the ACE_HAS_WINCE impl ahaid of ACE_HAS_WINSOCK2 because - // WINCE in fact has winsock2, but doesn't properly support the - // WSAIoctl for obtaining IPv6 address info. - PIP_ADAPTER_ADDRESSES AdapterAddresses = 0; - ULONG OutBufferLength = 0; - ULONG RetVal = 0; - unsigned char *octet_buffer = 0; - - RetVal = - GetAdaptersAddresses(AF_UNSPEC, - 0, - 0, - AdapterAddresses, - &OutBufferLength); - - if (RetVal != ERROR_BUFFER_OVERFLOW) - { - return -1; - } - - ACE_NEW_RETURN (octet_buffer, unsigned char[OutBufferLength],-1); - AdapterAddresses = (IP_ADAPTER_ADDRESSES *)octet_buffer; - - RetVal = - GetAdaptersAddresses(AF_UNSPEC, - 0, - 0, - AdapterAddresses, - &OutBufferLength); - - if (RetVal != NO_ERROR) - { - delete [] octet_buffer; - return -1; - } - - // If successful, output some information from the data we received - PIP_ADAPTER_ADDRESSES AdapterList = AdapterAddresses; - while (AdapterList) - { - if (AdapterList->OperStatus == IfOperStatusUp) - { - if (AdapterList->IfIndex != 0) - ++count; - if (AdapterList->Ipv6IfIndex != 0) - ++count; - } - AdapterList = AdapterList->Next; - } - - AdapterList = AdapterAddresses; - - ACE_NEW_RETURN (addrs, ACE_INET_Addr[count],-1); - count = 0; - for (AdapterList = AdapterAddresses; - AdapterList != 0; - AdapterList = AdapterList->Next) - { - if (AdapterList->OperStatus != IfOperStatusUp) - continue; - - IP_ADAPTER_UNICAST_ADDRESS *uni = 0; - if (AdapterList->IfIndex != 0) - for (uni = AdapterList->FirstUnicastAddress; - uni != 0; - uni = uni->Next) - { - SOCKET_ADDRESS *sa_addr = &uni->Address; - if (sa_addr->lpSockaddr->sa_family == AF_INET) - { - sockaddr_in *sin = (sockaddr_in*)sa_addr->lpSockaddr; - addrs[count].set(sin,sa_addr->iSockaddrLength); - ++count; - break; - } - } - if (AdapterList->Ipv6IfIndex != 0) - { - for (uni = AdapterList->FirstUnicastAddress; - uni != 0; - uni = uni->Next) - { - SOCKET_ADDRESS *sa_addr = &uni->Address; - if (sa_addr->lpSockaddr->sa_family == AF_INET6) - { - sockaddr_in *sin = (sockaddr_in*)sa_addr->lpSockaddr; - addrs[count].set(sin,sa_addr->iSockaddrLength); - ++count; - break; - } - } - } - } - - delete [] octet_buffer; - return 0; - -# elif defined (ACE_HAS_PHARLAP) +# if defined (ACE_HAS_PHARLAP) // PharLap ETS has its own kernel routines to rummage through the device // configs and extract the interface info, but only for Pharlap RT. # if !defined (ACE_HAS_PHARLAP_RT) @@ -766,7 +638,7 @@ get_ip_interfaces_win32 (size_t &count, return 0; -# endif /* ACE_HAS_WINCE */ +# endif /* ACE_HAS_PHARLAP */ } #elif defined (ACE_HAS_GETIFADDRS) @@ -845,258 +717,7 @@ get_ip_interfaces_getifaddrs (size_t &count, return 0; } -#elif defined (__hpux) -static int -get_ip_interfaces_hpux (size_t &count, - ACE_INET_Addr *&addrs) -{ - size_t num_ifs = 0; - size_t num_ifs_found = 0; - - // Call specific routine as necessary. - ACE_HANDLE handle = ACE_OS::socket (PF_INET, SOCK_DGRAM, 0); - ACE_HANDLE handle_ipv6 = ACE_INVALID_HANDLE; - - if (handle == ACE_INVALID_HANDLE) - ACELIB_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE::get_ip_interfaces:open")), - -1); - - int result = 0; - int tmp_how_many = 0; - - result = ACE_OS::ioctl (handle, - SIOCGIFNUM, - (caddr_t) &tmp_how_many); - if (result != -1) - num_ifs = (size_t)tmp_how_many; - -# if defined (ACE_HAS_IPV6) - tmp_how_many = 0; - handle_ipv6 = ACE_OS::socket (PF_INET6, SOCK_DGRAM, 0); - result = ACE_OS::ioctl (handle_ipv6, - SIOCGLIFNUM, - (caddr_t) &tmp_how_many); - if (result != -1) - num_ifs += (size_t)tmp_how_many; -# endif - - if (num_ifs == 0) - { - ACE_OS::close (handle); - ACE_OS::close (handle_ipv6); - return -1; - } - - // ioctl likes to have an extra IFREQ structure to mark the end of - // what it returned, so increase the num_ifs by one. - ++num_ifs; - - //HPUX requires two passes, First for IPv4, then for IPv6 - - struct ifreq *ifs = 0; - ACE_NEW_RETURN (ifs, - struct ifreq[num_ifs], - -1); - ACE_OS::memset (ifs, 0, num_ifs * sizeof (struct ifreq)); - - ACE_Auto_Array_Ptr<struct ifreq> p_ifs (ifs); - - if (p_ifs.get() == 0) - { - ACE_OS::close (handle); - ACE_OS::close (handle_ipv6); - errno = ENOMEM; - return -1; - } - - struct ifconf ifcfg; - ACE_OS::memset (&ifcfg, 0, sizeof (struct ifconf)); - - ifcfg.ifc_req = p_ifs.get (); - ifcfg.ifc_len = num_ifs * sizeof (struct ifreq); - - if (ACE_OS::ioctl (handle, - SIOCGIFCONF, - (char *) &ifcfg) == -1) - { - ACE_OS::close (handle); - ACELIB_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE::get_ip_interfaces:") - ACE_TEXT ("ioctl - SIOCGIFCONF failed")), - -1); - } - - ACE_OS::close (handle); - - // Now create and initialize output array. - - ACE_NEW_RETURN (addrs, - ACE_INET_Addr[num_ifs], - -1); // caller must free - - struct ifreq *pcur = p_ifs.get (); - num_ifs_found = ifcfg.ifc_len / sizeof (struct ifreq); // get the number of returned ifs - - for (size_t i = 0; - i < num_ifs_found; - i++) - { - struct sockaddr_in *addr = - reinterpret_cast<sockaddr_in *> (&pcur->ifr_addr); - if (addr->sin_addr.s_addr != 0) - { - addrs[count].set ((u_short) 0, - addr->sin_addr.s_addr, - 0); - ++count; - } - ++pcur; - } - -# if defined (ACE_HAS_IPV6) - - if (handle_ipv6 != ACE_INVALID_HANDLE) - { - struct if_laddrreq *lifs = 0; - ACE_NEW_RETURN (lifs, - struct if_laddrreq[num_ifs], - -1); - ACE_OS::memset (lifs, 0, num_ifs * sizeof (struct if_laddrreq)); - - ACE_Auto_Array_Ptr<struct if_laddrreq> p_lifs (lifs); - - if (p_lifs.get() == 0) - { - ACE_OS::close (handle); - ACE_OS::close (handle_ipv6); - errno = ENOMEM; - return -1; - } - - struct if_laddrconf lifcfg; - ACE_OS::memset (&lifcfg, 0, sizeof (struct if_laddrconf)); - - lifcfg.iflc_req = p_lifs.get (); - lifcfg.iflc_len = num_ifs * sizeof (struct if_laddrreq); - - if (ACE_OS::ioctl (handle_ipv6, - SIOCGLIFCONF, - (char *) &lifcfg) == -1) - { - ACE_OS::close (handle); - ACELIB_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE::get_ip_interfaces:") - ACE_TEXT ("ioctl - SIOCGLIFCONF failed")), - -1); - } - - ACE_OS::close (handle_ipv6); - - struct if_laddrreq *plcur = p_lifs.get (); - num_ifs_found = lifcfg.iflc_len / sizeof (struct if_laddrreq); - - for (size_t i = 0; - i < num_ifs_found; - i++) - { - struct sockaddr_in *addr = - reinterpret_cast<sockaddr_in *> (&plcur->iflr_addr); - if (!IN6_IS_ADDR_UNSPECIFIED(&reinterpret_cast<sockaddr_in6 *>(addr)->sin6_addr)) - { - addrs[count].set(addr, sizeof(struct sockaddr_in6)); - ++count; - } - ++plcur; - } - } -# endif /* ACE_HAS_IPV6 */ - return 0; -} -#elif defined (_AIX) -static int -get_ip_interfaces_aix (size_t &count, - ACE_INET_Addr *&addrs) -{ - ACE_HANDLE handle = ACE::get_handle(); - size_t num_ifs = 0; - struct ifconf ifc; - - if (handle == ACE_INVALID_HANDLE) - ACELIB_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE::get_ip_interfaces_aix:")), - -1); - - if (ACE_OS::ioctl (handle, - SIOCGSIZIFCONF, - (caddr_t)&ifc.ifc_len) == -1) - { - ACE_OS::close (handle); - ACELIB_ERROR_RETURN((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("get ifconf size")), - -1); - } - - ACE_NEW_RETURN (ifc.ifc_buf,char [ifc.ifc_len], -1); - - ACE_Auto_Array_Ptr<char> safe_buf (ifc.ifc_buf); - ACE_OS::memset (safe_buf.get(), 0, ifc.ifc_len); - - if (ACE_OS::ioctl(handle, SIOCGIFCONF, (caddr_t)&ifc) == -1) - { - ACE_OS::close (handle); - ACELIB_ERROR_RETURN((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("get ifconf")), - -1); - } - - ACE_OS::close (handle); - - char *buf_start = safe_buf.get(); - char *buf_end = buf_start + ifc.ifc_len; - - num_ifs = 0; - for (char *ptr = buf_start; ptr < buf_end; ) - { - struct ifreq *req = reinterpret_cast<struct ifreq *>(ptr); - ptr += IFNAMSIZ; - ptr += req->ifr_addr.sa_len; - if (req->ifr_addr.sa_family == AF_INET -# if defined (ACE_HAS_IPV6) - || req->ifr_addr.sa_family == AF_INET6 -# endif - ) - ++num_ifs; - } - ACE_NEW_RETURN (addrs,ACE_INET_Addr[num_ifs], -1); - - for (char * ptr = buf_start; ptr < buf_end; ) - { - struct ifreq *req = reinterpret_cast<struct ifreq *>(ptr); - // skip the interface name - ptr += IFNAMSIZ; - if (req->ifr_addr.sa_family == AF_INET -# if defined (ACE_HAS_IPV6) - || req->ifr_addr.sa_family == AF_INET6 -# endif - ) - { - sockaddr_in *addr = (sockaddr_in*)&req->ifr_addr; - addrs[count++].set(addr, addr->sin_len); - } - ptr += req->ifr_addr.sa_len; - } - - return 0; -} - -#endif // ACE_WIN32 || ACE_HAS_GETIFADDRS || __hpux || _AIX +#endif // ACE_WIN32 || ACE_HAS_GETIFADDRS // return an array of all configured IP interfaces on this host, count @@ -1115,11 +736,7 @@ ACE::get_ip_interfaces (size_t &count, ACE_INET_Addr *&addrs) return get_ip_interfaces_win32 (count, addrs); #elif defined (ACE_HAS_GETIFADDRS) return get_ip_interfaces_getifaddrs (count, addrs); -#elif defined (__hpux) - return get_ip_interfaces_hpux (count, addrs); -#elif defined (_AIX) - return get_ip_interfaces_aix (count, addrs); -#elif (defined (__unix) || defined (__unix__) || defined (ACE_OPENVMS) || (defined (ACE_VXWORKS) && !defined (ACE_HAS_GETIFADDRS)) || defined (ACE_HAS_RTEMS)) && !defined (ACE_LACKS_NETWORKING) +#elif (defined (__unix) || defined (__unix__) || (defined (ACE_VXWORKS) && !defined (ACE_HAS_GETIFADDRS))) && !defined (ACE_LACKS_NETWORKING) // COMMON (SVR4 and BSD) UNIX CODE // Call specific routine as necessary. @@ -1231,7 +848,7 @@ ACE::get_ip_interfaces (size_t &count, ACE_INET_Addr *&addrs) } } -#if !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined (ACE_HAS_RTEMS) && !defined (__Lynx__) +#if !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined (__Lynx__) ++pcur; #else if (pcur->ifr_addr.sa_len <= sizeof (struct sockaddr)) @@ -1243,7 +860,7 @@ ACE::get_ip_interfaces (size_t &count, ACE_INET_Addr *&addrs) pcur = (struct ifreq *) (pcur->ifr_addr.sa_len + (caddr_t) &pcur->ifr_addr); } -#endif /* !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined (ACE_HAS_RTEMS) && !defined (__Lynx__) */ +#endif /* !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined (__Lynx__) */ } # if defined (ACE_HAS_IPV6) && !defined (ACE_LACKS_FSCANF) @@ -1309,7 +926,7 @@ int ACE::count_interfaces (ACE_HANDLE handle, size_t &how_many) { #if defined (SIOCGIFNUM) -# if defined (SIOCGLIFNUM) && !defined (ACE_LACKS_STRUCT_LIFNUM) +# if defined (SIOCGLIFNUM) int cmd = SIOCGLIFNUM; struct lifnum if_num = {AF_UNSPEC,0,0}; # else @@ -1322,16 +939,16 @@ ACE::count_interfaces (ACE_HANDLE handle, size_t &how_many) ACE_TEXT ("ACE::count_interfaces:") ACE_TEXT ("ioctl - SIOCGLIFNUM failed")), -1); -# if defined (SIOCGLIFNUM) && !defined (ACE_LACKS_STRUCT_LIFNUM) +# if defined (SIOCGLIFNUM) how_many = if_num.lifn_count; # else how_many = if_num; # endif /* SIOCGLIFNUM */ return 0; -#elif (defined (__unix) || defined (__unix__) || defined (ACE_OPENVMS) || defined (ACE_HAS_RTEMS) || (defined (ACE_VXWORKS) && !defined (ACE_HAS_GETIFADDRS))) && !defined (ACE_LACKS_NETWORKING) +#elif (defined (__unix) || defined (__unix__) || (defined (ACE_VXWORKS) && !defined (ACE_HAS_GETIFADDRS))) && !defined (ACE_LACKS_NETWORKING) // Note: DEC CXX doesn't define "unix". BSD compatible OS: HP UX, - // AIX, SunOS 4.x perform some ioctls to retrieve ifconf list of + // SunOS 4.x perform some ioctls to retrieve ifconf list of // ifreq structs no SIOCGIFNUM on SunOS 4.x, so use guess and scan // algorithm @@ -1395,7 +1012,7 @@ return 0; break; ++if_count; -# if !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined (ACE_HAS_RTEMS) && !defined (__Lynx__) +# if !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined (__Lynx__) ++p_ifs; # else if (p_ifs->ifr_addr.sa_len <= sizeof (struct sockaddr)) @@ -1407,7 +1024,7 @@ return 0; p_ifs = (struct ifreq *) (p_ifs->ifr_addr.sa_len + (caddr_t) &p_ifs->ifr_addr); } -# endif /* !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined (ACE_HAS_RTEMS) && !defined (__Lynx__) */ +# endif /* !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined (__Lynx__) */ } #if defined (ACE_HAS_ALLOC_HOOKS) @@ -1440,24 +1057,17 @@ return 0; } // Routine to return a handle from which ioctl() requests can be made. - ACE_HANDLE ACE::get_handle () { - // Solaris 2.x ACE_HANDLE handle = ACE_INVALID_HANDLE; -#if defined (sparc) - handle = ACE_OS::open ("/dev/udp", O_RDONLY); -#elif defined (__unix) || defined (__unix__) || defined (_AIX) || defined (__hpux) || (defined (ACE_VXWORKS) && (ACE_VXWORKS >= 0x600)) || defined (ACE_OPENVMS) || defined (ACE_HAS_RTEMS) - // Note: DEC CXX doesn't define "unix" BSD compatible OS: HP UX, - // AIX, SunOS 4.x - +#if defined (__unix) || defined (__unix__) || (defined (ACE_VXWORKS) && (ACE_VXWORKS >= 0x600)) + // Note: DEC CXX doesn't define "unix" BSD compatible OS: SunOS 4.x handle = ACE_OS::socket (PF_INET, SOCK_DGRAM, 0); -#endif /* sparc */ +#endif /* __unux */ return handle; } - #if defined (ACE_HAS_IPV6) static int ip_check (int &ipvn_enabled, int pf) diff --git a/ACE/ace/Stack_Trace.cpp b/ACE/ace/Stack_Trace.cpp index 3cf26a354fd..52e994cf471 100644 --- a/ACE/ace/Stack_Trace.cpp +++ b/ACE/ace/Stack_Trace.cpp @@ -10,9 +10,6 @@ * and is adapted from examples shown in relevant documentation * and repeated elsewhere, e.g., * http://www.linuxselfhelp.com/gnu/glibc/html_chapter/libc_33.html - * - the Solaris stack generation is adapted from a 1995 post on - * comp.unix.solaris by Bart Smaalders, - * http://groups.google.com/group/comp.unix.solaris/browse_thread/thread/8b9f3de8be288f1c/31550f93a48231d5?lnk=gst&q=how+to+get+stack+trace+on+solaris+group:comp.unix.solaris#31550f93a48231d5 * - VxWorks kernel-mode stack tracing is adapted from a code example * in the VxWorks FAQ at http://www.xs4all.nl/~borkhuis/vxworks/vxw_pt5.html * although the undocumented functions it uses are also mentioned in @@ -302,157 +299,6 @@ ACE_Stack_Trace::generate_trace (ssize_t starting_frame_offset, pc = prevPc; } } - -#elif defined(sun) -/* - * walks up call stack, printing library:routine+offset for each routine - */ - -# include <dlfcn.h> -# include <setjmp.h> -# include <sys/types.h> -# include <sys/reg.h> -# include <sys/frame.h> -# define ACE_STACK_TRACE_BIAS 0 - -# if defined(sparc) || defined(__sparc) -# define ACE_STACK_TRACE_FLUSHWIN() asm("ta 3"); -# define ACE_STACK_TRACE_FRAME_PTR_INDEX 1 -# define ACE_STACK_TRACE_SKIP_FRAMES 0 -# if defined(__sparcv9) -# undef ACE_STACK_TRACE_BIAS -# define ACE_STACK_TRACE_BIAS 2047 -# endif -# endif - -# if defined(i386) || defined(__i386) -# define ACE_STACK_TRACE_FLUSHWIN() -# define ACE_STACK_TRACE_FRAME_PTR_INDEX 3 -# define ACE_STACK_TRACE_SKIP_FRAMES 0 -# endif - -# if defined(__amd64) || defined(__x86_64) -# define ACE_STACK_TRACE_FLUSHWIN() -# define ACE_STACK_TRACE_FRAME_PTR_INDEX 5 -# define ACE_STACK_TRACE_SKIP_FRAMES 0 -# endif - -# if defined(ppc) || defined(__ppc) -# define ACE_STACK_TRACE_FLUSHWIN() -# define ACE_STACK_TRACE_FRAME_PTR_INDEX 0 -# define ACE_STACK_TRACE_SKIP_FRAMES 2 -# endif - -static frame* -cs_frame_adjust(frame* sp) -{ - unsigned char* sp_byte = (unsigned char*)sp; - sp_byte += ACE_STACK_TRACE_BIAS; - return (frame*) sp_byte; -} - -/* - this function walks up call stack, calling user-supplied - function once for each stack frame, passing the pc and the user-supplied - usrarg as the argument. - */ - -static int -cs_operate(int (*func)(void *, void *), void * usrarg, - size_t starting_frame, size_t num_frames_arg) -{ - ACE_STACK_TRACE_FLUSHWIN(); - - jmp_buf env; - setjmp(env); - frame* sp = cs_frame_adjust((frame*) env[ACE_STACK_TRACE_FRAME_PTR_INDEX]); - - // make a copy of num_frames_arg to eliminate the following warning on some - // solaris platforms: - // Stack_Trace.cpp:318: warning: argument `size_t num_frames' might be clobbered by `longjmp' or `vfork' - size_t num_frames = num_frames_arg; - - // I would like to use ACE_MAX below rather than ?:, but - // I get linker relocation errors such as the following when - // I use it: - // ld: fatal: relocation error: file: .shobj/Stack_Trace.o section: - // .rela.debug_line symbol: : relocation against a discarded symbol, - // symbol is part of discarded section: - // .text%const __type_0&ace_max<unsig\ned>(const __type_0&,const __type_0&) - // - const size_t starting_skip = starting_frame - 1; -#if ACE_STACK_TRACE_SKIP_FRAMES == 0 - size_t skip_frames = starting_skip; -#else - size_t skip_frames = - ACE_STACK_TRACE_SKIP_FRAMES > starting_skip ? - ACE_STACK_TRACE_SKIP_FRAMES : starting_skip; -#endif /* ACE_STACK_TRACE_SKIP_FRAMES == 0 */ - size_t i; - for (i = 0; i < skip_frames && sp; ++i) - { - sp = cs_frame_adjust((frame*) sp->fr_savfp); - } - - i = 0; - - while ( sp - && sp->fr_savpc - && ++i - && --num_frames - && (*func)((void*)sp->fr_savpc, usrarg)) - { - sp = cs_frame_adjust((frame*) sp->fr_savfp); - } - - return(i); -} - -static int -add_frame_to_buf (void* pc, void* usrarg) -{ - char* buf = (char*)usrarg; - Dl_info info; - const char* func = "??"; - const char* lib = "??"; - - if(dladdr(pc, & info) != 0) - { - lib = (const char *) info.dli_fname; - func = (const char *) info.dli_sname; - } - - (void) ACE_OS::snprintf(buf, - ACE_Stack_Trace::SYMBUFSIZ, - "%s%s:%s+0x%x\n", - buf, - lib, - func, - //@@ Should the arithmetic on the following - //line be done with two void* ptrs? The result - //would be ptrdiff_t, and what is the correct - //sprintf() conversion character for that? - (size_t)pc - (size_t)info.dli_saddr); - - return(1); -} - -void -ACE_Stack_Trace::generate_trace (ssize_t starting_frame_offset, - size_t num_frames) -{ - const size_t MAX_FRAMES = 128; - const ssize_t INITIAL_FRAME = 3; - - if (num_frames == 0) - num_frames = MAX_FRAMES; - - size_t starting_frame = - determine_starting_frame (INITIAL_FRAME, starting_frame_offset); - - cs_operate (&add_frame_to_buf, &this->buf_[0], starting_frame, num_frames); -} - #elif defined(ACE_WIN64) && (_WIN32_WINNT <= _WIN32_WINNT_WIN2K) # if defined(_MSC_VER) # define STRING2(X) #X @@ -470,8 +316,7 @@ ACE_Stack_Trace::generate_trace (ssize_t, size_t) "ACE is built with _WIN32_WINNT set to 0x501 or above>"); } -#elif defined(ACE_WIN32) && !defined(ACE_HAS_WINCE) && !defined (__MINGW32__) \ - && !defined(__BORLANDC__) +#elif defined(ACE_WIN32) && !defined (__MINGW32__) && !defined(__BORLANDC__) # include <windows.h> # include <Dbghelp.h> diff --git a/ACE/ace/Stack_Trace.h b/ACE/ace/Stack_Trace.h index 14cdcc0126b..476319e22cc 100644 --- a/ACE/ace/Stack_Trace.h +++ b/ACE/ace/Stack_Trace.h @@ -52,8 +52,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * - Any platform using glibc as its runtime library, or where ACE_HAS_EXECINFO_H is defined * (this covers Linux and Mac) and gcc version >= 3.3. * - VxWorks, both kernel and RTP - * - Solaris - * - Windows 32 and 64 bit (Visual C++, excluding WinCE/mobile) + * - Windows 32 and 64 bit (Visual C++) * * @note Since stack trace buffer size has limitation(@c ACE_STACK_TRACE_SYMBUFSIZ), you will not * get a complete stack trace if @c ACE_STACK_TRACE_SYMBUFSIZ value is less than actual stack diff --git a/ACE/ace/Strategies_T.cpp b/ACE/ace/Strategies_T.cpp index 1ada5a8543d..3ae02a406eb 100644 --- a/ACE/ace/Strategies_T.cpp +++ b/ACE/ace/Strategies_T.cpp @@ -16,9 +16,6 @@ #include "ace/OS_NS_string.h" #include "ace/OS_Errno.h" #include "ace/Svc_Handler.h" -#if defined (ACE_OPENVMS) -# include "ace/Lib_Find.h" -#endif #if !defined (__ACE_INLINE__) #include "ace/Strategies_T.inl" @@ -118,15 +115,8 @@ ACE_DLL_Strategy<SVC_HANDLER>::make_svc_handler (SVC_HANDLER *&sh) ACE_SHLIB_HANDLE handle = ACE_OS::dlopen (this->dll_name_); // Extract the factory function. -#if defined (ACE_OPENVMS) SVC_HANDLER *(*factory)(void) = - (SVC_HANDLER *(*)(void)) ACE::ldsymbol (handle, - this->factory_function_); -#else - SVC_HANDLER *(*factory)(void) = - (SVC_HANDLER *(*)(void)) ACE_OS::dlsym (handle, - this->factory_function_); -#endif + (SVC_HANDLER *(*)(void)) ACE_OS::dlsym (handle, this->factory_function_); // Call the factory function to obtain the new SVC_Handler (should // use RTTI here when it becomes available...) diff --git a/ACE/ace/Strategies_T.h b/ACE/ace/Strategies_T.h index 7cc0ad7341a..4b7b7f00510 100644 --- a/ACE/ace/Strategies_T.h +++ b/ACE/ace/Strategies_T.h @@ -1032,13 +1032,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Strategies_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Strategies_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Strategies_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Stream.h b/ACE/ace/Stream.h index 3e7998b68cd..09e2f0f3335 100644 --- a/ACE/ace/Stream.h +++ b/ACE/ace/Stream.h @@ -237,13 +237,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Stream.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Stream.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Stream.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Stream_Modules.h b/ACE/ace/Stream_Modules.h index e3b12d8e06c..f3812e0fa86 100644 --- a/ACE/ace/Stream_Modules.h +++ b/ACE/ace/Stream_Modules.h @@ -152,13 +152,7 @@ public: ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Stream_Modules.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Stream_Modules.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_STREAM_MODULES */ diff --git a/ACE/ace/String_Base.h b/ACE/ace/String_Base.h index 8a0ca6d57e8..6231151de70 100644 --- a/ACE/ace/String_Base.h +++ b/ACE/ace/String_Base.h @@ -876,13 +876,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/String_Base.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/String_Base.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("String_Base.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/ACE/ace/String_Base_Const.cpp b/ACE/ace/String_Base_Const.cpp index 12169d66a39..b16349b7edf 100644 --- a/ACE/ace/String_Base_Const.cpp +++ b/ACE/ace/String_Base_Const.cpp @@ -4,15 +4,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_String_Base_Const::size_type const ACE_String_Base_Const::npos = -#if defined (AIX) //&& (defined (__xlC__) || defined (__IBMCPP__)) - // Under some mixed shared/static linking conditions, this constant - // will not be initialized at run-time if the - // std::numeric_limits<>::max() trait is used on AIX/XLC++. - // Workaround that problem by making it easier for the compiler to - // realize it can set the constant at compile-time. - static_cast<ACE_String_Base_Const::size_type> (-1); -#else ACE_Numeric_Limits<ACE_String_Base_Const::size_type>::max (); -#endif /* AIX */ ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Svc_Handler.h b/ACE/ace/Svc_Handler.h index c17e8223a95..176ab2ba328 100644 --- a/ACE/ace/Svc_Handler.h +++ b/ACE/ace/Svc_Handler.h @@ -337,13 +337,7 @@ protected: ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Svc_Handler.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Svc_Handler.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/ACE/ace/TLI.cpp b/ACE/ace/TLI.cpp index cdfa1db8514..d0fbd289f3c 100644 --- a/ACE/ace/TLI.cpp +++ b/ACE/ace/TLI.cpp @@ -30,25 +30,6 @@ ACE_TLI::dump () const ACE_TLI::ACE_TLI () { ACE_TRACE ("ACE_TLI::ACE_TLI"); -#if defined (ACE_HAS_SVR4_TLI) -// Solaris 2.4 ACE_TLI option handling is broken. Thus, we must do -// the memory allocation ourselves... Thanks to John P. Hearn -// (jph@ccrl.nj.nec.com) for the help. - - this->so_opt_req.opt.maxlen = sizeof (opthdr) + sizeof (long); - ACE_NEW (this->so_opt_req.opt.buf, - char[this->so_opt_req.opt.maxlen]); - - this->so_opt_ret.opt.maxlen = sizeof (opthdr) + sizeof (long); - ACE_NEW (this->so_opt_ret.opt.buf, - char[this->so_opt_ret.opt.maxlen]); - - if (this->so_opt_ret.opt.buf == 0) - { - delete [] this->so_opt_req.opt.buf; - this->so_opt_req.opt.buf = 0; - } -#endif /* ACE_HAS_SVR4_TLI */ } ACE_HANDLE @@ -65,15 +46,6 @@ ACE_TLI::open (const char device[], int oflag, struct t_info *info) ACE_TLI::~ACE_TLI () { ACE_TRACE ("ACE_TLI::~ACE_TLI"); -#if defined (ACE_HAS_SVR4_TLI) - if (this->so_opt_req.opt.buf) - { - delete [] this->so_opt_req.opt.buf; - delete [] this->so_opt_ret.opt.buf; - this->so_opt_req.opt.buf = 0; - this->so_opt_ret.opt.buf = 0; - } -#endif /* ACE_HAS_SVR4_TLI */ } ACE_TLI::ACE_TLI (const char device[], int oflag, struct t_info *info) @@ -147,39 +119,13 @@ ACE_TLI::set_option (int level, int option, void *optval, int optlen) opthdr->len = req.opt.len; // We only request one option at a time. ACE_OS::memcpy (&opthdr[1], optval, optlen); return ACE_OS::t_optmgmt (this->get_handle (), &req, &ret); - -#elif defined (ACE_HAS_SVR4_TLI) - struct opthdr *opthdr = 0; /* See <sys/socket.h> for info on this format */ - - this->so_opt_req.flags = T_NEGOTIATE; - this->so_opt_req.opt.len = sizeof *opthdr + OPTLEN (optlen); - - if (this->so_opt_req.opt.len > this->so_opt_req.opt.maxlen) - { -# if !defined (ACE_HAS_SET_T_ERRNO) - t_errno = TBUFOVFLW; -# else - set_t_errno (TBUFOVFLW); -# endif /* ACE_HAS_SET_T_ERRNO */ - return -1; - } - - opthdr = reinterpret_cast<struct opthdr *> (this->so_opt_req.opt.buf); - opthdr->level = level; - opthdr->name = option; - opthdr->len = OPTLEN (optlen); - ACE_OS::memcpy (OPTVAL (opthdr), optval, optlen); - - return ACE_OS::t_optmgmt (this->get_handle (), - &this->so_opt_req, - &this->so_opt_ret); #else ACE_UNUSED_ARG (level); ACE_UNUSED_ARG (option); ACE_UNUSED_ARG (optval); ACE_UNUSED_ARG (optlen); return -1; -#endif /* ACE_HAS_XTI, else ACE_HAS_SVR4_TLI */ +#endif /* ACE_HAS_XTI */ } int @@ -226,41 +172,13 @@ ACE_TLI::get_option (int level, int option, void *optval, int &optlen) return 0; } } - -#elif defined (ACE_HAS_SVR4_TLI) - struct opthdr *opthdr = 0; /* See <sys/socket.h> for details on this format */ - - this->so_opt_req.flags = T_CHECK; - this->so_opt_ret.opt.len = sizeof *opthdr + OPTLEN (optlen); - - if (this->so_opt_ret.opt.len > this->so_opt_ret.opt.maxlen) - { -#if !defined (ACE_HAS_SET_T_ERRNO) - t_errno = TBUFOVFLW; -#else - set_t_errno (TBUFOVFLW); -#endif /* ACE_HAS_SET_T_ERRNO */ - return -1; - } - - opthdr = (struct opthdr *) this->so_opt_req.opt.buf; - opthdr->level = level; - opthdr->name = option; - opthdr->len = OPTLEN (optlen); - if (ACE_OS::t_optmgmt (this->get_handle (), &this->so_opt_req, &this->so_opt_ret) == -1) - return -1; - else - { - ACE_OS::memcpy (optval, OPTVAL (opthdr), optlen); - return 0; - } #else ACE_UNUSED_ARG (level); ACE_UNUSED_ARG (option); ACE_UNUSED_ARG (optval); ACE_UNUSED_ARG (optlen); return -1; -#endif /* ACE_HAS_SVR4_TLI */ +#endif /* ACE_HAS_XTI */ } ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/TLI.h b/ACE/ace/TLI.h index bfa0e19584c..006b3a95a51 100644 --- a/ACE/ace/TLI.h +++ b/ACE/ace/TLI.h @@ -93,13 +93,6 @@ protected: /// Initialize a TLI endpoint. ACE_TLI (const char device[], int oflag = O_RDWR, struct t_info *info = 0); - -private: -#if defined (ACE_HAS_SVR4_TLI) - // XTI/TLI option management. - struct t_optmgmt so_opt_req; - struct t_optmgmt so_opt_ret; -#endif /* ACE_HAS_SVR4_TLI */ }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/TLI_Connector.cpp b/ACE/ace/TLI_Connector.cpp index c8781000a78..5a8fe11bd0c 100644 --- a/ACE/ace/TLI_Connector.cpp +++ b/ACE/ace/TLI_Connector.cpp @@ -221,7 +221,7 @@ ACE_TLI_Connector::complete (ACE_TLI_Stream &new_stream, { if (remote_sap != 0) { -#if defined (ACE_HAS_XTI) || defined (ACE_HAS_SVR4_TLI) +#if defined (ACE_HAS_XTI) struct netbuf name; name.maxlen = remote_sap->get_size (); @@ -230,9 +230,9 @@ ACE_TLI_Connector::complete (ACE_TLI_Stream &new_stream, if (ACE_OS::t_getname (new_stream.get_handle (), &name, REMOTENAME) == -1) -#else /* SunOS4 */ +#else /* ACE_HAS_XTI */ if (0) -#endif /* ACE_HAS_XTI || ACE_HAS_SVR4_TLI */ +#endif /* ACE_HAS_XTI */ { new_stream.close (); return -1; diff --git a/ACE/ace/TSS_T.cpp b/ACE/ace/TSS_T.cpp index 9d3444c0793..c483d468db3 100644 --- a/ACE/ace/TSS_T.cpp +++ b/ACE/ace/TSS_T.cpp @@ -156,15 +156,10 @@ ACE_TSS<TYPE>::ACE_TSS (TYPE *ts_obj) // Save/restore errno. ACE_Errno_Guard error (errno); // What should we do if this call fails?! -#if defined (ACE_HAS_WINCE) - ::MessageBox (0, - ACE_TEXT ("ACE_Thread::keycreate() failed!"), - ACE_TEXT ("ACE_TSS::ACE_TSS"), - MB_OK); -#elif !defined (ACE_LACKS_VA_FUNCTIONS) +#if !defined (ACE_LACKS_VA_FUNCTIONS) ACE_OS::fprintf (stderr, "ACE_Thread::keycreate() failed!"); -#endif /* ACE_HAS_WINCE */ +#endif /* !ACE_LACKS_VA_FUNCTIONS */ return; } diff --git a/ACE/ace/TSS_T.h b/ACE/ace/TSS_T.h index a0f8ee32451..af13d17b733 100644 --- a/ACE/ace/TSS_T.h +++ b/ACE/ace/TSS_T.h @@ -252,13 +252,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/TSS_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/TSS_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("TSS_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_TSS_T_H */ diff --git a/ACE/ace/TTY_IO.cpp b/ACE/ace/TTY_IO.cpp index e18f5e6d107..f94aa9e98c5 100644 --- a/ACE/ace/TTY_IO.cpp +++ b/ACE/ace/TTY_IO.cpp @@ -724,11 +724,4 @@ int ACE_TTY_IO::control (Control_Mode cmd, Serial_Params *arg) const #endif /* ACE_HAS_TERMIOS || ACE_HAS_TERMIO */ } -#if defined (ACE_NEEDS_DEV_IO_CONVERSION) -ACE_TTY_IO::operator ACE_DEV_IO &() -{ - return static_cast<ACE_DEV_IO &>(*this); -} -#endif /* ACE_NEEDS_DEV_IO_CONVERSION */ - ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/TTY_IO.h b/ACE/ace/TTY_IO.h index 323e310f78c..45ea6601b2d 100644 --- a/ACE/ace/TTY_IO.h +++ b/ACE/ace/TTY_IO.h @@ -104,11 +104,6 @@ public: /** Interface for reading/writing serial device parameters. */ int control (Control_Mode cmd, Serial_Params *arg) const; - -#if defined (ACE_NEEDS_DEV_IO_CONVERSION) - /** This is necessary to pass ACE_TTY_IO as parameter to DEV_Connector. */ - operator ACE_DEV_IO &(); -#endif /* ACE_NEEDS_DEV_IO_CONVERSION */ }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Task_Ex_T.h b/ACE/ace/Task_Ex_T.h index 70cd1d7d9e7..744bbff9122 100644 --- a/ACE/ace/Task_Ex_T.h +++ b/ACE/ace/Task_Ex_T.h @@ -180,13 +180,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Task_Ex_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Task_Ex_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Task_Ex_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_TASK_EX_H */ diff --git a/ACE/ace/Task_T.h b/ACE/ace/Task_T.h index 013fba49c35..701b96b88e6 100644 --- a/ACE/ace/Task_T.h +++ b/ACE/ace/Task_T.h @@ -183,13 +183,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Task_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Task_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Task_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_TASK_T_H */ diff --git a/ACE/ace/Test_and_Set.h b/ACE/ace/Test_and_Set.h index 69a32502bbe..c174ca3d4da 100644 --- a/ACE/ace/Test_and_Set.h +++ b/ACE/ace/Test_and_Set.h @@ -57,13 +57,7 @@ private: ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Test_and_Set.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Test_and_Set.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_TEST_AND_SET_H */ diff --git a/ACE/ace/Thread.h b/ACE/ace/Thread.h index 67a190dcc41..6e79266bb1c 100644 --- a/ACE/ace/Thread.h +++ b/ACE/ace/Thread.h @@ -40,7 +40,7 @@ struct cancel_state * @brief Provides a wrapper for threads. * * This class provides a common interface that is mapped onto - * POSIX Pthreads, Solaris threads, Win32 threads, VxWorks + * POSIX Pthreads, Win32 threads, VxWorks * threads, or pSoS threads. Note, however, that it is * generally a better idea to use the ACE_Thread_Manager * programming API rather than the <ACE_Thread> API since the @@ -152,7 +152,6 @@ public: * If @a thread_id is 0, join() waits for any * undetached thread in the process to terminate * on platforms that support this capability - * (for example, Solaris). * @param departed points to a location that is set to the ID of the * terminated thread if join() returns successfully. * If @a departed is 0, it is ignored. diff --git a/ACE/ace/Thread_Adapter.cpp b/ACE/ace/Thread_Adapter.cpp index ec43c7bc2d9..d72d0d2d010 100644 --- a/ACE/ace/Thread_Adapter.cpp +++ b/ACE/ace/Thread_Adapter.cpp @@ -112,22 +112,6 @@ ACE_Thread_Adapter::invoke_i () // not to access <this> anywhere below this point. delete this; -#if defined (ACE_NEEDS_LWP_PRIO_SET) - // On SunOS, the LWP priority needs to be set in order to get - // preemption when running in the RT class. This is the ACE way to - // do that . . . - ACE_hthread_t thr_handle; - ACE_OS::thr_self (thr_handle); - int prio; - - // thr_getprio () on the current thread should never fail. - ACE_OS::thr_getprio (thr_handle, prio); - - // ACE_OS::thr_setprio () has the special logic to set the LWP priority, - // if running in the RT class. - ACE_OS::thr_setprio (prio); - -#endif /* ACE_NEEDS_LWP_PRIO_SET */ if (cancel_flags != 0) { // If both flags are set, ignore this. diff --git a/ACE/ace/Thread_Manager.cpp b/ACE/ace/Thread_Manager.cpp index 6b58fa5693e..7347fbd1f10 100644 --- a/ACE/ace/Thread_Manager.cpp +++ b/ACE/ace/Thread_Manager.cpp @@ -653,8 +653,6 @@ ACE_Thread_Manager::spawn_i (ACE_THR_FUNC func, #if defined (ACE_HAS_WTHREADS) // Have to duplicate handle if client asks for it. - // @@ How are thread handles implemented on AIX? Do they - // also need to be duplicated? if (t_handle != 0) # if defined (ACE_LACKS_DUPLICATEHANDLE) *t_handle = thr_handle; diff --git a/ACE/ace/Thread_Manager.h b/ACE/ace/Thread_Manager.h index 88a89867580..f57405f1fc4 100644 --- a/ACE/ace/Thread_Manager.h +++ b/ACE/ace/Thread_Manager.h @@ -202,7 +202,7 @@ protected: /// Unique thread ID. ACE_thread_t thr_id_; - /// Unique handle to thread (used by Win32 and AIX). + /// Unique handle to thread (used by Win32). ACE_hthread_t thr_handle_; /// Group ID. @@ -240,7 +240,7 @@ public: /// Unique thread id. ACE_thread_t self () const; - /// Unique handle to thread (used by Win32 and AIX). + /// Unique handle to thread (used by Win32). void self (ACE_hthread_t &); /// Dump the state of an object. diff --git a/ACE/ace/Thread_Manager.inl b/ACE/ace/Thread_Manager.inl index c6c93f270ee..386e7f67711 100644 --- a/ACE/ace/Thread_Manager.inl +++ b/ACE/ace/Thread_Manager.inl @@ -162,7 +162,7 @@ ACE_INLINE ACE_Thread_Descriptor * ACE_Thread_Descriptor::get_next () const { ACE_TRACE ("ACE_Thread_Descriptor::get_next"); - return static_cast<ACE_Thread_Descriptor * ACE_CAST_CONST> (this->next_); + return static_cast<ACE_Thread_Descriptor *> (this->next_); } // Reset this thread descriptor diff --git a/ACE/ace/Thread_Mutex.h b/ACE/ace/Thread_Mutex.h index 3793c5654ed..54292b630c2 100644 --- a/ACE/ace/Thread_Mutex.h +++ b/ACE/ace/Thread_Mutex.h @@ -38,7 +38,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * in the same process. It maps to <CRITICAL_SECTION>s on NT * and <ACE_mutex_t> with <type> set to <USYNC_THREAD> on UNIX. * ACE_Thread_Mutex is recursive on some platforms (like - * Win32). However, on most platforms (like Solaris) it is not + * Win32). However, on most platforms it is not * recursive. To be totally safe and portable, developers * should use ACE_Recursive_Thread_Mutex when they need a * recursive mutex. diff --git a/ACE/ace/Time_Policy_T.h b/ACE/ace/Time_Policy_T.h index 85d0dde6aec..de54653af13 100644 --- a/ACE/ace/Time_Policy_T.h +++ b/ACE/ace/Time_Policy_T.h @@ -62,13 +62,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Time_Policy_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Time_Policy_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Time_Policy_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - #endif /* ACE_TIME_POLICY_T_H */ diff --git a/ACE/ace/Time_Value_T.h b/ACE/ace/Time_Value_T.h index c6f9a55b87a..32b32df3d41 100644 --- a/ACE/ace/Time_Value_T.h +++ b/ACE/ace/Time_Value_T.h @@ -178,13 +178,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Time_Value_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Time_Value_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Time_Value_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_TIME_VALUE_T_H */ diff --git a/ACE/ace/Timeprobe_T.h b/ACE/ace/Timeprobe_T.h index 0c0a670841f..883c9e19e0d 100644 --- a/ACE/ace/Timeprobe_T.h +++ b/ACE/ace/Timeprobe_T.h @@ -203,13 +203,7 @@ protected: ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Timeprobe_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Timeprobe_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* ACE_COMPILE_TIMEPROBES */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Timer_Hash_T.h b/ACE/ace/Timer_Hash_T.h index 6c59b16d28f..2bbe5fff078 100644 --- a/ACE/ace/Timer_Hash_T.h +++ b/ACE/ace/Timer_Hash_T.h @@ -337,13 +337,7 @@ private: ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Timer_Hash_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Timer_Hash_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_TIMER_HASH_T_H */ diff --git a/ACE/ace/Timer_Heap_T.h b/ACE/ace/Timer_Heap_T.h index 62d57e72b7c..edde952efcd 100644 --- a/ACE/ace/Timer_Heap_T.h +++ b/ACE/ace/Timer_Heap_T.h @@ -332,13 +332,7 @@ private: ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Timer_Heap_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Timer_Heap_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_TIMER_HEAP_T_H */ diff --git a/ACE/ace/Timer_List_T.h b/ACE/ace/Timer_List_T.h index 133d48b21c6..18a05c4fe01 100644 --- a/ACE/ace/Timer_List_T.h +++ b/ACE/ace/Timer_List_T.h @@ -215,13 +215,7 @@ private: void operator= (const ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK> &) = delete; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Timer_List_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Timer_List_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_TIMER_LIST_T_H */ diff --git a/ACE/ace/Timer_Queue_Adapters.cpp b/ACE/ace/Timer_Queue_Adapters.cpp index d69bfd24f27..f6c3857ca7e 100644 --- a/ACE/ace/Timer_Queue_Adapters.cpp +++ b/ACE/ace/Timer_Queue_Adapters.cpp @@ -233,11 +233,6 @@ ACE_Thread_Timer_Queue_Adapter<TQ, TYPE>::svc () this->thr_id_ = ACE_Thread::self (); // Thread cancellation point, if ACE supports it. - // - // Note: This call generates a warning under Solaris because the header - // file /usr/include/pthread.h redefines the routine argument. This - // is a bug in the Solaris header files and has nothing to do with - // ACE. # if !defined (ACE_LACKS_PTHREAD_CANCEL) ACE_PTHREAD_CLEANUP_PUSH (&this->condition_.mutex ().get_nesting_mutex ()); # endif /* ACE_LACKS_PTHREAD_CANCEL */ diff --git a/ACE/ace/Timer_Queue_Adapters.h b/ACE/ace/Timer_Queue_Adapters.h index 0cd15c970c7..6e731a1caf9 100644 --- a/ACE/ace/Timer_Queue_Adapters.h +++ b/ACE/ace/Timer_Queue_Adapters.h @@ -251,13 +251,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL # include "ace/Timer_Queue_Adapters.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) # include "ace/Timer_Queue_Adapters.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -# pragma implementation ("Timer_Queue_Adapters.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_TIMER_QUEUE_ADAPTERS_H */ diff --git a/ACE/ace/Timer_Queue_Iterator.h b/ACE/ace/Timer_Queue_Iterator.h index ebb30d5dddf..d550397791b 100644 --- a/ACE/ace/Timer_Queue_Iterator.h +++ b/ACE/ace/Timer_Queue_Iterator.h @@ -187,13 +187,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Timer_Queue_Iterator.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Timer_Queue_Iterator.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Timer_Queue_Iterator.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_TIMER_QUEUE_ITERATOR_H */ diff --git a/ACE/ace/Timer_Queue_T.cpp b/ACE/ace/Timer_Queue_T.cpp index 923cae1b7b8..52ed9ad9c80 100644 --- a/ACE/ace/Timer_Queue_T.cpp +++ b/ACE/ace/Timer_Queue_T.cpp @@ -21,8 +21,8 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -// This fudge factor can be overriden for timers that need it, such as on -// Solaris, by defining the ACE_TIMER_SKEW symbol in the appropriate config +// This fudge factor can be overriden for timers that need it +// by defining the ACE_TIMER_SKEW symbol in the appropriate config // header. #if !defined (ACE_TIMER_SKEW) # define ACE_TIMER_SKEW 0 diff --git a/ACE/ace/Timer_Queue_T.h b/ACE/ace/Timer_Queue_T.h index 703625afe42..060285cdf19 100644 --- a/ACE/ace/Timer_Queue_T.h +++ b/ACE/ace/Timer_Queue_T.h @@ -237,13 +237,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Timer_Queue_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Timer_Queue_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Timer_Queue_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_TIMER_QUEUE_T_H */ diff --git a/ACE/ace/Timer_Wheel_T.h b/ACE/ace/Timer_Wheel_T.h index 5f0acf957c0..8d16b81400b 100644 --- a/ACE/ace/Timer_Wheel_T.h +++ b/ACE/ace/Timer_Wheel_T.h @@ -213,13 +213,7 @@ private: ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Timer_Wheel_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Timer_Wheel_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_TIMER_WHEEL_T_H */ diff --git a/ACE/ace/Token.h b/ACE/ace/Token.h index 9d024820b24..4c3bcc80b5a 100644 --- a/ACE/ace/Token.h +++ b/ACE/ace/Token.h @@ -27,7 +27,7 @@ #include "ace/Thread_Mutex.h" -#if (defined (ACE_WIN32) && !defined (ACE_USES_WINCE_SEMA_SIMULATION)) || defined (ACE_HAS_VXTHREADS) +#if defined (ACE_WIN32) || defined (ACE_HAS_VXTHREADS) // If platforms support semaphores with timed wait, then we use semaphores instead of c.v. # define ACE_TOKEN_USES_SEMAPHORE #endif /* ACE_WIN32 || ACE_HAS_VXTHREADS */ @@ -56,8 +56,8 @@ class ACE_Time_Value; * <acquire> multiple times, however, it must call <release> an * equal number of times before the token is actually released. * Threads that are blocked awaiting the token are serviced in - * strict FIFO/LIFO order as other threads release the token (Solaris - * and Pthread mutexes don't strictly enforce an acquisition + * strict FIFO/LIFO order as other threads release the token + * (Pthread mutexes don't strictly enforce an acquisition * order). There are two lists within the class. Write * acquires always have higher priority over read acquires. Which * means, if you use both write/read operations, care must be diff --git a/ACE/ace/Tokenizer_T.h b/ACE/ace/Tokenizer_T.h index 6172520f4cf..a9ade225b02 100644 --- a/ACE/ace/Tokenizer_T.h +++ b/ACE/ace/Tokenizer_T.h @@ -226,13 +226,7 @@ typedef ACE_Tokenizer_T <ACE_TCHAR> ACE_Tokenizer; ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Tokenizer_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Tokenizer_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Typed_SV_Message.h b/ACE/ace/Typed_SV_Message.h index d46d5c1e250..a901e1de01c 100644 --- a/ACE/ace/Typed_SV_Message.h +++ b/ACE/ace/Typed_SV_Message.h @@ -91,13 +91,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Typed_SV_Message.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Typed_SV_Message.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Typed_SV_Message.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Typed_SV_Message_Queue.h b/ACE/ace/Typed_SV_Message_Queue.h index 4d83cea4e9f..7e9fe558bf6 100644 --- a/ACE/ace/Typed_SV_Message_Queue.h +++ b/ACE/ace/Typed_SV_Message_Queue.h @@ -77,13 +77,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Typed_SV_Message_Queue.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Typed_SV_Message_Queue.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Typed_SV_Message_Queue.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_TYPED_MESSAGE_QUEUE_H */ diff --git a/ACE/ace/Unbounded_Queue.h b/ACE/ace/Unbounded_Queue.h index f0773b44ccc..6d20557c0b5 100644 --- a/ACE/ace/Unbounded_Queue.h +++ b/ACE/ace/Unbounded_Queue.h @@ -279,13 +279,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Unbounded_Queue.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Unbounded_Queue.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Unbounded_Queue.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_UNBOUNDED_QUEUE_H */ diff --git a/ACE/ace/Unbounded_Set.h b/ACE/ace/Unbounded_Set.h index 2fc19a24a3e..79fd80c7610 100644 --- a/ACE/ace/Unbounded_Set.h +++ b/ACE/ace/Unbounded_Set.h @@ -86,13 +86,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Unbounded_Set.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Unbounded_Set.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Unbounded_Set.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_UNBOUNDED_SET_H */ diff --git a/ACE/ace/Unbounded_Set_Ex.h b/ACE/ace/Unbounded_Set_Ex.h index 6b289c0a415..e30a8e1a3ba 100644 --- a/ACE/ace/Unbounded_Set_Ex.h +++ b/ACE/ace/Unbounded_Set_Ex.h @@ -356,13 +356,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Unbounded_Set_Ex.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Unbounded_Set_Ex.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Unbounded_Set_Ex.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_UNBOUNDED_SET_H */ diff --git a/ACE/ace/Vector_T.h b/ACE/ace/Vector_T.h index eed72a38973..1674d2856d0 100644 --- a/ACE/ace/Vector_T.h +++ b/ACE/ace/Vector_T.h @@ -157,7 +157,7 @@ public: * This function dumps the content of the vector. TO BE MOVED out * of this class. It needs to be implemented as a global template * function that accepts a const ACE_Vector<T>, in order to - * make instances of this class compile on Linux, AIX. G++ and xlC + * make instances of this class compile on Linux. G++ and xlC * have template instantiation algoriths, which are different from * the one in Visual C++. The algorithms try to instantiate ALL * methods declared in the template class, regardless of whether the @@ -260,13 +260,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Vector_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Vector_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Vector_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/ACE/ace/WFMO_Reactor.cpp b/ACE/ace/WFMO_Reactor.cpp index 30f664ba6ab..f5cd8859ebb 100644 --- a/ACE/ace/WFMO_Reactor.cpp +++ b/ACE/ace/WFMO_Reactor.cpp @@ -1758,48 +1758,7 @@ ACE_WFMO_Reactor::ok_to_wait (ACE_Time_Value *max_wait_time, // will not be able to dispatch it // We need to wait for both the <lock_> and <ok_to_wait_> event. - // If not on WinCE, use WaitForMultipleObjects() to wait for both atomically. - // On WinCE, the waitAll arg to WFMO must be false, so wait for the - // ok_to_wait_ event first (since that's likely to take the longest) then - // grab the lock and recheck the ok_to_wait_ event. When we can get them - // both, or there's an error/timeout, return. -#if defined (ACE_HAS_WINCE) - ACE_UNUSED_ARG (alertable); - ACE_Time_Value timeout; - if (max_wait_time != 0) - { - timeout = ACE_OS::gettimeofday (); - timeout += *max_wait_time; - } - while (1) - { - int status; - if (max_wait_time == 0) - status = this->ok_to_wait_.wait (); - else - status = this->ok_to_wait_.wait (&timeout); - if (status == -1) - return -1; - // The event is signaled, so it's ok to wait; grab the lock and - // recheck the event. If something has changed, restart the wait. - if (max_wait_time == 0) - status = this->lock_.acquire (); - else - { - status = this->lock_.acquire (timeout); - } - if (status == -1) - return -1; - - // Have the lock_, now re-check the event. If it's not signaled, - // another thread changed something so go back and wait again. - if (this->ok_to_wait_.wait (&ACE_Time_Value::zero, 0) == 0) - break; - this->lock_.release (); - } - return 1; - -#else + // Use WaitForMultipleObjects() to wait for both atomically. int timeout = max_wait_time == 0 ? INFINITE : max_wait_time->msec (); DWORD result = 0; while (1) @@ -1843,7 +1802,6 @@ ACE_WFMO_Reactor::ok_to_wait (ACE_Time_Value *max_wait_time, // It is ok to enter ::WaitForMultipleObjects return 1; -#endif /* ACE_HAS_WINCE */ } DWORD @@ -1854,7 +1812,7 @@ ACE_WFMO_Reactor::wait_for_multiple_events (int timeout, // If <alertable> is enabled allow asynchronous completion of // ReadFile and WriteFile operations. -#if defined (ACE_HAS_PHARLAP) || defined (ACE_HAS_WINCE) +#if defined (ACE_HAS_PHARLAP) // PharLap doesn't do async I/O and doesn't implement // WaitForMultipleObjectsEx, so use WaitForMultipleObjects. ACE_UNUSED_ARG (alertable); @@ -1920,16 +1878,11 @@ ACE_WFMO_Reactor::dispatch (DWORD wait_status) case WAIT_FAILED: // Failure. ACE_OS::set_errno_to_last_error (); return -1; - case WAIT_TIMEOUT: // Timeout. errno = ETIME; return handlers_dispatched; - -#ifndef ACE_HAS_WINCE case WAIT_IO_COMPLETION: // APC. return handlers_dispatched; -#endif // ACE_HAS_WINCE - default: // Dispatch. // We'll let dispatch worry about abandoned mutes. handlers_dispatched += this->dispatch_handles (wait_status); diff --git a/ACE/ace/ace.mpc b/ACE/ace/ace.mpc index 59d06539cc8..97e8b5fec64 100644 --- a/ACE/ace/ace.mpc +++ b/ACE/ace/ace.mpc @@ -24,7 +24,6 @@ project(ACE) : ace_output, acedefaults, install, other, codecs, token, svcconf, ATM_QoS.cpp ATM_Stream.cpp Atomic_Op.cpp - Atomic_Op_Sparc.c Barrier.cpp Base_Thread_Adapter.cpp Based_Pointer_Repository.cpp @@ -206,7 +205,6 @@ project(ACE) : ace_output, acedefaults, install, other, codecs, token, svcconf, Recursive_Thread_Mutex.cpp Recyclable.cpp Registry.cpp - Rtems_init.c RW_Mutex.cpp RW_Process_Mutex.cpp RW_Thread_Mutex.cpp @@ -245,7 +243,6 @@ project(ACE) : ace_output, acedefaults, install, other, codecs, token, svcconf, Stack_Trace.cpp Stats.cpp String_Base_Const.cpp - SUN_Proactor.cpp SV_Message.cpp SV_Message_Queue.cpp SV_Semaphore_Complex.cpp @@ -402,7 +399,6 @@ project(ACE) : ace_output, acedefaults, install, other, codecs, token, svcconf, ACE_export.h Bound_Ptr.h - CE_Screen_Output.h Codeset_Symbols.h CORBA_macros.h Codeset_Symbols.h diff --git a/ACE/ace/ace_for_tao.mpc b/ACE/ace/ace_for_tao.mpc index 6fc36f53daf..acb98a071af 100644 --- a/ACE/ace/ace_for_tao.mpc +++ b/ACE/ace/ace_for_tao.mpc @@ -150,7 +150,6 @@ project(ACE_FOR_TAO) : acedefaults, install, svcconf, uuid, versioned_namespace, Reactor_Timer_Interface.cpp Read_Buffer.cpp Recursive_Thread_Mutex.cpp - Rtems_init.c RW_Mutex.cpp RW_Thread_Mutex.cpp Sched_Params.cpp @@ -360,7 +359,6 @@ project(ACE_FOR_TAO) : acedefaults, install, svcconf, uuid, versioned_namespace, Version.h ace_wchar.h checked_iterator.h - config-WinCE.h config-all.h config-lite.h config-win32-borland.h diff --git a/ACE/ace/ace_wchar.h b/ACE/ace/ace_wchar.h index 980d03f0728..4488e9d20ec 100644 --- a/ACE/ace/ace_wchar.h +++ b/ACE/ace/ace_wchar.h @@ -35,11 +35,6 @@ # include /**/ <wchar.h> # include /**/ <wctype.h> # endif -# elif defined (ACE_OPENVMS) -# include /**/ <wchar.h> -# include /**/ <wctype.h> -# elif defined (ACE_HAS_WINCE) -# include /**/ <wtypes.h> # else # include /**/ <cwchar> # include /**/ <cwctype> @@ -208,9 +203,9 @@ private: #endif /* ACE_HAS_ICONV */ /// Disallow these operation. - ACE_Ascii_To_Wide (); - ACE_Ascii_To_Wide (ACE_Ascii_To_Wide &); - ACE_Ascii_To_Wide operator= (ACE_Ascii_To_Wide &); + ACE_Ascii_To_Wide () = delete; + ACE_Ascii_To_Wide (ACE_Ascii_To_Wide &) = delete; + ACE_Ascii_To_Wide operator= (ACE_Ascii_To_Wide &) = delete; }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/ace_wchar.inl b/ACE/ace/ace_wchar.inl index 752c177f680..b390b32fc1f 100644 --- a/ACE/ace/ace_wchar.inl +++ b/ACE/ace/ace_wchar.inl @@ -116,8 +116,8 @@ inline wchar_t * ACE_Ascii_To_Wide::convert (const char *str) { // Short circuit null pointer case - if (str == 0) - return 0; + if (!str) + return nullptr; # if defined (ACE_WIN32) UINT const cp = GetACP (); // Codepage diff --git a/ACE/ace/config-WinCE.h b/ACE/ace/config-WinCE.h deleted file mode 100644 index 4435d96575c..00000000000 --- a/ACE/ace/config-WinCE.h +++ /dev/null @@ -1,216 +0,0 @@ -// Note: For WinCE build, simply use: #include "ace/config-win32.h" -// It is same as config.h for Windows NT/2k so that you can -// share same files and directories for both WinCE and NT/2k -// builds, unless you add additional definition(s) for each -// specific build or change the output directory. - -#ifndef ACE_CONFIG_WINCE_H -#define ACE_CONFIG_WINCE_H - -#include /**/ "ace/pre.h" - -#ifndef ACE_CONFIG_WIN32_H -# error Use config-win32.h in config.h instead of this header -#endif // ACE_CONFIG_WIN32_H - -#if !defined (_WIN32_WCE) -# error Define _WIN32_WCE to version (i.e. 500 = 5.0) -#endif // _WIN32_WCE - -#if (_WIN32_WCE < 500) -# error ACE requires Windows CE 5.0 and later. -#endif // _WIN32_WCE - -#if !defined (ACE_HAS_WINCE) -# define ACE_HAS_WINCE 1 -#endif - -// We need these libraries to build: -#if defined (_MSC_VER) -# pragma comment(lib,"corelibc.lib") -# pragma comment(linker, "/nodefaultlib:oldnames.lib") -#endif - -// Only DLL version is supported on CE. -//#if defined (ACE_HAS_DLL) -//# undef ACE_HAS_DLL -//#endif // ACE_HAS_DLL -//#define ACE_HAS_DLL 1 - -// Need to define LD search path explicitly on CE because -// CE doesn't have environment variables and we can't get -// the information using getenv. -#define ACE_DEFAULT_LD_SEARCH_PATH ACE_TEXT (".\\;\\windows") - -#define ACE_LACKS_ABORT -#define ACE_LACKS_FCNTL_H -#define ACE_LACKS_SYS_TYPES_H -#define ACE_LACKS_GETCWD -#define ACE_LACKS_ASCTIME -#define ACE_LACKS_ASCTIME_R -#define ACE_LACKS_GMTIME -#define ACE_LACKS_GMTIME_R -#define ACE_LACKS_LOCALTIME -#define ACE_LACKS_STRTOK_R -#define ACE_LACKS_PERROR -#define ACE_LACKS_STRFTIME -#define ACE_LACKS_WIN32_SETFILEPOINTEREX -#define ACE_LACKS_WIN32_SERVICES -#define ACE_LACKS_WIN32_SECURITY_DESCRIPTORS -#define ACE_LACKS_GETPROCESSTIMES -#define ACE_LACKS_PDH_H -#define ACE_LACKS_PDHMSG_H -#define ACE_LACKS_TIME -#define ACE_LACKS_TZSET -#define ACE_LACKS_RAISE -#define ACE_LACKS_BSEARCH - -#define ACE_LACKS_MSG_WFMO -#define ACE_LACKS_UMASK -#define ACE_HAS_TYPES_H -#define ACE_LACKS_DEV_T - -#define ACE_ISCTYPE_EQUIVALENT ::_isctype - -// WinCE only supports the UNICODE API -#if !defined (ACE_USES_WCHAR) -# define ACE_USES_WCHAR -#endif /* ACE_USES_WCHAR */ - -#if (_WIN32_WCE < 0x600) -# define ACE_USES_WINCE_SEMA_SIMULATION -# define ACE_LACKS_ERRNO_H -# define ACE_LACKS_DUP -# define ACE_LACKS_GETSYSTEMTIMEASFILETIME -#endif /* (_WIN32_WCE < 0x600) */ - -#define ACE_LACKS_REGNOTIFYCHANGEKEYVALUE - -#define ACE_HAS_NONSTATIC_OBJECT_MANAGER 1 - -#if ! defined(ACE_DEFAULT_THREAD_KEYS) -# define ACE_DEFAULT_THREAD_KEYS TLS_MINIMUM_AVAILABLE -#endif // ! defined(ACE_DEFAULT_THREAD_KEYS) - -// FILE stuff isn't always defined in CE -#if !defined (_FILE_DEFINED) - typedef void FILE; -# define _FILE_DEFINED -#endif /* !_FILE_DEFINED */ - -// This was defined in previous versions of CE, but not 2.11 -#define EXCEPTION_ACCESS_VIOLATION STATUS_ACCESS_VIOLATION - -#define ACE_MAIN WINAPI WinMain - -// SH3 cross-compiler can't handle inline functions correctly -// (along with other bugs.) -#if defined (SH3) -# define ACE_LACKS_INLINE_FUNCTIONS -#endif // SH3 && _DEBUG - -#ifndef ACE_DEFAULT_SERVER_HOST -# define ACE_DEFAULT_SERVER_HOST ACE_TEXT("localhost") -#endif // ACE_DEFAULT_SERVER_HOST - -// @@ Need to remap every function that uses any of these flags to -// Win32 API. These are for ANSI styled function and are not -// available on WinCE. - -#define _O_RDONLY 0x0000 // open for reading only -#define _O_WRONLY 0x0001 // open for writing only -#define _O_RDWR 0x0002 // open for reading and writing -#define _O_APPEND 0x0008 // writes done at eof - -#define _O_CREAT 0x0100 // create and open file -#define _O_TRUNC 0x0200 // open and truncate -#define _O_EXCL 0x0400 // open only if file doesn't already exist - -// O_TEXT files have <cr><lf> sequences translated to <lf> on read()'s, -// and <lf> sequences translated to <cr><lf> on write()'s -#define _O_TEXT 0x4000 // file mode is text (translated) -#define _O_BINARY 0x8000 // file mode is binary (untranslated) - -// Temporary file bit - file is deleted when last handle is closed -#define _O_TEMPORARY 0x0040 // temporary file bit - -// Non-ANSI names -#define O_RDONLY _O_RDONLY -#define O_WRONLY _O_WRONLY -#define O_RDWR _O_RDWR -#define O_APPEND _O_APPEND -#define O_CREAT _O_CREAT -#define O_TRUNC _O_TRUNC -#define O_EXCL _O_EXCL -#define O_TEXT _O_TEXT -#define O_BINARY _O_BINARY -#define O_TEMPORARY _O_TEMPORARY - -// @@ NSIG value. This is definitely not correct. -#define NSIG 23 - -#if !defined (FILE_MAP_COPY) -#define FILE_MAP_COPY 0 -#endif - -#define ACE_HAS_INTERLOCKED_EXCHANGEADD -#define ACE_LACKS_ACCESS -#define ACE_LACKS__WACCESS -#define ACE_HAS_ACCESS_EMULATION -#define ACE_LACKS_EXEC -#define ACE_LACKS_MKTEMP -#define ACE_LACKS_ISATTY -#define ACE_LACKS_STRERROR -#define ACE_LACKS_SYSTEM -#define ACE_LACKS_PIPE - -#define ACE_LACKS_CHDIR -#define ACE_LACKS_GETENV -#define ACE_LACKS_SETENV -#define ACE_LACKS_UNSETENV -#define ACE_LACKS_PUTENV -#define ACE_LACKS_GETENVSTRINGS -#define ACE_LACKS_STRENVDUP -#define ACE_LACKS_REALPATH -#define ACE_LACKS_SWAB -#define ACE_LACKS_TEMPNAM - -#if defined (_WIN32_WCE_EMULATION) -// @@ For some reason, qsort isn't defined correctly (_stdcall vs _cdecl) -// under emulation. So for right now, exclude it. -# define ACE_LACKS_QSORT -#endif // _WIN32_WCE_EMULATION - -#if !defined (BUFSIZ) -# define BUFSIZ 1024 -#endif - -#define ACE_HAS_WINCE_BROKEN_ERRNO - -#define ACE_HAS_STRDUP_EMULATION - -#if !defined (MAXSYMLINKS) -# define MAXSYMLINKS 0 -#endif - -// WinCE can't do fixed addresses for memory-mapped files. -#if defined (ACE_DEFAULT_BASE_ADDR) -# undef ACE_DEFAULT_BASE_ADDR -#endif -#define ACE_DEFAULT_BASE_ADDR 0 - -#if (_WIN32_WCE < 0x600) -# define ACE_HAS_TSS_EMULATION -#endif // WinCE version < 6.0 - -// CE doesn't support FILE_SHARE_DELETE like regular windows -#if !defined (ACE_DEFAULT_FILE_PERMS) -# define ACE_DEFAULT_FILE_PERMS (FILE_SHARE_READ | FILE_SHARE_WRITE) -#endif - -#define ACE_LACKS_SIGNAL_H -#define ACE_LACKS_SYS_STAT_H - -#include /**/ "ace/post.h" - -#endif // ACE_CONFIG_WINCE_H diff --git a/ACE/ace/config-aix-5.x.h b/ACE/ace/config-aix-5.x.h deleted file mode 100644 index e8f610274b6..00000000000 --- a/ACE/ace/config-aix-5.x.h +++ /dev/null @@ -1,320 +0,0 @@ -// -// Config file for AIX 5.1 and higher. - -#ifndef ACE_CONFIG_AIX_5_X_H -#define ACE_CONFIG_AIX_5_X_H - -// This define is needed for building with Visual Age C++ 5 in incremental -// mode. In the batch mode build, platform_aix_ibm.GNU sets it. The incremental -// mode compiler won't be supported after ACE 5.3, so this will also go away -// in that timeframe, so don't worry about future AIX versions. -#if !defined (ACE_AIX_VERS) -# define ACE_AIX_VERS 501 -#endif - -// AIX 5.1 has AIO, but it doesn't have the same API as other POSIX -// systems, and the semantics of operations are a bit different. Will take -// some real work to get this going. -// AIX 5.2, however, has the POSIX API implemented. However, the libc functions -// to implement it aren't exported by default. You need to use smit to enable -// them. So, leave AIO disabled unless the user explicitly enables it. -// config-aix-4.x.h will set ACE_HAS_AIO_CALLS if config-posix.h senses the -// feature-test macros, so set up _ACE_DISABLE_AIO_CALLS_ if the user didn't -// set it. Then check for it after including config-aix-4.x.h and remove -// ACE_HAS_AIO_CALLS if so. -#if !defined (ACE_HAS_AIO_CALLS) -# define _ACE_DISABLE_AIO_CALLS_ -#endif - -// Both IBM and g++ compilers set _THREAD_SAFE if compiler is asked to compile -// threaded code (xlC_r, as opposed to xlC; and g++ -pthread) -#if !defined (ACE_MT_SAFE) || (ACE_MT_SAFE != 0) -# if defined (ACE_HAS_THREADS) -# undef ACE_HAS_THREADS -# endif -# if defined (_THREAD_SAFE) -# define ACE_HAS_THREADS 1 -// # else -// # define ACE_HAS_THREADS 0 -# endif /* _THREAD_SAFE */ -#endif /* !ACE_MT_SAFE || (ACE_MT_SAFE != 0) */ - -#if defined (__IBMCPP__) - // AIX xlC, IBM C/C++ compiler - //******************************************************************** - // - - // Compiler does this with a builtin - it's not in libc. - // Although ACE does have alloca() on this compiler/platform combination, - // it is disabled by default since it can be dangerous. Uncomment the - // following line if you ACE to use it. - //# define ACE_HAS_ALLOCA - - // Compiler supports the ssize_t typedef. -# define ACE_HAS_SSIZE_T - - // Keep an eye on this as the compiler and standards converge... -# define ACE_LACKS_LINEBUFFERED_STREAMBUF -# define ACE_LACKS_PRAGMA_ONCE - -# define ACE_EXPLICIT_TEMPLATE_DESTRUCTOR_TAKES_ARGS - // When using -qtempinc, we don't need to see template implementation - // source (though we do need a pragma to find the correct source file). - // However, without -qtempinc (either -qnotempinc or -qtemplateregistry) - // we do need to see the source. -# if defined (__TEMPINC__) -# if !defined ACE_TEMPLATES_REQUIRE_PRAGMA -# define ACE_TEMPLATES_REQUIRE_PRAGMA -# endif -# else -# if !defined (ACE_TEMPLATES_REQUIRE_SOURCE) -# define ACE_TEMPLATES_REQUIRE_SOURCE -# endif -# endif /* __TEMPINC__ */ - -# undef WIFEXITED -# undef WEXITSTATUS - -# define ACE_HAS_CUSTOM_EXPORT_MACROS -# define ACE_Proper_Export_Flag -# define ACE_Proper_Import_Flag - // There's no explicit import/export per-se, but to be sure that declared - // template code is exported, explicitly instantiate the class. -# define ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) template class SINGLETON_TYPE < CLASS, LOCK >; -# define ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) extern template class SINGLETON_TYPE < CLASS, LOCK >; - -#elif defined (__GNUG__) - -# include "ace/config-g++-common.h" - -# define ACE_HAS_SSIZE_T - -# if !defined (ACE_MT_SAFE) || ACE_MT_SAFE != 0 - // ACE_MT_SAFE is #defined below, for all compilers. -# if !defined (_REENTRANT) -# define _REENTRANT -# endif /* _REENTRANT */ -# endif /* !ACE_MT_SAFE */ - -#else /* ! __IBMCPP__ && ! __GNUG__ */ -# ifdef __cplusplus /* Let it slide for C compilers. */ -# error unsupported compiler in ace/config-aix-5.x.h -# endif /* __cplusplus */ -#endif /* ! __xlC__ && ! __GNUG__ */ - -// Compiling for AIX. -#ifndef AIX -# define AIX -#endif /* AIX */ - -// Pick up all the detectable settings. -#include "ace/config-posix.h" - -// Regardless of what config-posix.h may indicate, AIX 5.3 is the first -// to support sem_timedwait(). Prior to that, use the emulation. -#if defined (ACE_HAS_POSIX_SEM_TIMEOUT) && \ - (defined (ACE_AIX_VERS) && (ACE_AIX_VERS < 503)) -# undef ACE_HAS_POSIX_SEM_TIMEOUT -#endif /* ACE_HAS_POSIX_SEM_TIMEOUT && ACE_AIX_VERS < 503 */ - -#if defined (ACE_DLL_SUFFIX) -# undef ACE_DLL_SUFFIX -#endif -#define ACE_DLL_SUFFIX ACE_TEXT (".so") - -#define ACE_DEFAULT_BASE_ADDR ((char *) 0x80000000) - -#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R - -#define ACE_HAS_SOCKLEN_T -#define ACE_HAS_4_4BSD_SENDMSG_RECVMSG - -// AIX has AIO, but the functions don't match those of other AIO-enabled -// platforms. If this is to work, it'll require some significant work, -// maybe moving the OS-abstraction stuff to an OS_AIO or some such thing. -//# define ACE_HAS_AIO_CALLS - -#define ACE_HAS_AIX_HI_RES_TIMER - -// Prototypes for both signal() and struct sigaction are consistent. -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES - -// OS has readdir and friends. -#define ACE_HAS_DIRENT - -// OS supports the getrusage() system call -#define ACE_HAS_GETRUSAGE - -#define ACE_HAS_GPERF - -#define ACE_HAS_H_ERRNO - -#define ACE_LACKS_STDINT_H -#define ACE_LACKS_SYS_SYSCTL_H - -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT -#define ACE_HAS_NONCONST_SELECT_TIMEVAL -#define ACE_HAS_ICMP_SUPPORT 1 -#define ACE_HAS_IP_MULTICAST - -// Lacks perfect filtering, must bind group address. -#if !defined ACE_LACKS_PERFECT_MULTICAST_FILTERING -# define ACE_LACKS_PERFECT_MULTICAST_FILTERING 1 -#endif /* ACE_LACKS_PERFECT_MULTICAST_FILTERING */ - -#define ACE_HAS_MSG - -// Compiler/platform supports poll(). -#define ACE_HAS_POLL - -// Platform supports POSIX O_NONBLOCK semantics. -#define ACE_HAS_POSIX_NONBLOCK - -#define ACE_HAS_POSIX_TIME -// ... but needs to include another header for it on 4.2+ -# define ACE_HAS_BROKEN_POSIX_TIME -// ... and needs another typedef -#define ACE_LACKS_TIMESPEC_T -#define ACE_HAS_SELECT_H - -#define ACE_HAS_REENTRANT_FUNCTIONS - -#define ACE_HAS_SIOCGIFCONF - -// Compiler/platform defines the sig_atomic_t typedef -#define ACE_HAS_SIG_ATOMIC_T -#define ACE_HAS_SIGINFO_T -#define ACE_LACKS_SIGINFO_H -#define ACE_HAS_P_READ_WRITE - -#define ACE_HAS_SIGWAIT -#define ACE_HAS_SOCKADDR_IN_SIN_LEN -#define ACE_HAS_STRBUF_T - -// Compiler supports stropts.h -#define ACE_HAS_STREAMS -// #define ACE_HAS_STREAM_PIPES - -// AIX bzero() -#define ACE_HAS_STRINGS - -#define ACE_HAS_STRUCT_NETDB_DATA - -// Dynamic linking is in good shape on newer OS/patch levels. If you have -// trouble with the dynamic linking parts of ACE, and can't patch your OS -// up to latest levels, comment this out. -#define ACE_HAS_SVR4_DYNAMIC_LINKING -// This is tightly related to dynamic linking... -#define ACE_HAS_AUTOMATIC_INIT_FINI - -#define ACE_HAS_SVR4_GETTIMEOFDAY - -#define ACE_HAS_SYSV_IPC -#define ACE_HAS_TIMOD_H -#define ACE_HAS_XTI -#define ACE_HAS_BROKEN_T_ERROR -#define ACE_TLI_TCP_DEVICE "/dev/xti/tcp" - -#define ACE_HAS_UALARM - -#define ACE_HAS_UCONTEXT_T - -#define ACE_HAS_CTYPE_T - -// Platform has XPG4 wide character type and functions. However, the size -// of wchar_t changes for 32- vs. 64-bit builds (unsigned short vs. unsigned -// int, respectively). -#define ACE_HAS_XPG4_MULTIBYTE_CHAR -#ifdef __64BIT__ -# define ACE_SIZEOF_WCHAR 4 -#else -# define ACE_SIZEOF_WCHAR 2 -#endif /* __64BIT__ */ - -#define ACE_LACKS_NETINET_TCP_H - -// AIX uses LIBPATH to search for libraries -#define ACE_LD_SEARCH_PATH ACE_TEXT ("LIBPATH") - -// Defines the page size of the system. -#define ACE_PAGE_SIZE 4096 - -//************************************************************** -// -// Threads related definitions. -// -// The threads on AIX are generally POSIX P1003.1c (ACE_HAS_PTHREADS). -// However, there is also a kernel thread ID (tid_t) that is used in -// ACE_Log_Msg (printing the thread ID). The tid_t is not the same as -// pthread_t, and can't derive one from the other - thread_self() gets -// the tid_t (kernel thread ID) if called from a thread. -// Thanks very much to Chris Lahey for straightening this out. - -#if defined (ACE_HAS_THREADS) -# if !defined (ACE_MT_SAFE) -# define ACE_MT_SAFE 1 -# endif - -# define ACE_HAS_PTHREADS -# define ACE_HAS_PTHREADS_UNIX98_EXT -# define ACE_HAS_PTHREAD_CONTINUE_NP -# define ACE_HAS_PTHREAD_SUSPEND_NP -# define ACE_HAS_RECURSIVE_MUTEXES -# define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS -# define ACE_HAS_SIGTHREADMASK -# define ACE_HAS_THREAD_SPECIFIC_STORAGE - -# define ACE_LACKS_THREAD_PROCESS_SCOPING -#else -# undef ACE_HAS_THREADS -#endif /* ACE_HAS_THREADS != 0 */ - -#define ACE_MALLOC_ALIGN 8 - -#if (defined _XOPEN_SOURCE && (_XOPEN_SOURCE - 0) >= 500) && !defined(_UNIX95) -# define ACE_HAS_3_PARAM_WCSTOK -#endif /* (_XOPEN_SOURCE -0) >= 500 && !_UNIX95 */ - -#if defined (_ACE_DISABLE_AIO_CALLS_) -# if defined (ACE_HAS_AIO_CALLS) -# undef ACE_HAS_AIO_CALLS -# endif -# undef _ACE_DISABLE_AIO_CALLS_ -#endif - -// AIX's /usr/include/unistd.h sets _POSIX_SEMAPHORE to indicate the system -// supplies such a facility, but the headers don't enable it unless -// _XOPEN_SOURCE >= 500. So disable semaphores here if _XOPEN_SOURCE isn't -// up to snuff. -#if defined (ACE_HAS_POSIX_SEM) && \ - (!defined (_XOPEN_SOURCE) || (_XOPEN_SOURCE-0 < 500)) -# undef ACE_HAS_POSIX_SEM -#endif - -// I think this is correct, but needs to be verified... -Steve Huston -#define ACE_HAS_SIGTIMEDWAIT - -// AIX 5.1 has netinet/tcp.h -#undef ACE_LACKS_NETINET_TCP_H - -#define ACE_HAS_SCANDIR -#define ACE_SCANDIR_CMP_USES_VOIDPTR -#define ACE_SCANDIR_SEL_LACKS_CONST -#define ACE_HAS_SIGSUSPEND -#define ACE_HAS_TIMEZONE /* Call tzset() to set timezone */ -#define ACE_LACKS_ISCTYPE -#define ACE_HAS_STRSIGNAL -#define ACE_NEEDS_STRSIGNAL_RANGE_CHECK -#define ACE_HAS_SOCKADDR_IN6_SIN6_LEN - - -#if defined (ACE_AIX_VERS) && (ACE_AIX_VERS < 503) -# define ACE_LACKS_UNSETENV -# define ACE_LACKS_LOG2 -# define ACE_LACKS_PTHREAD_ATTR_SETSTACK -#endif /* ACE_AIX_VERS < 503 */ - -#define ACE_SSIZE_T_FORMAT_SPECIFIER_ASCII "%ld" -#define ACE_SIZE_T_FORMAT_SPECIFIER_ASCII "%lu" - -#endif /* ACE_CONFIG_AIX_5_X_H */ diff --git a/ACE/ace/config-aix-7.h b/ACE/ace/config-aix-7.h deleted file mode 100644 index 3864490ce40..00000000000 --- a/ACE/ace/config-aix-7.h +++ /dev/null @@ -1,27 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file config-aix-7.h - * - * This is the config file for AIX 7 and higher. - * - * @author Steve Huston <shuston@riverace.com> - */ -//============================================================================= - -#ifndef ACE_CONFIG_AIX_7_H -#define ACE_CONFIG_AIX_7_H - -// Diffs from prior AIX versions are related to scandir() arguments. -#include "ace/config-aix-5.x.h" - -#ifdef ACE_SCANDIR_CMP_USES_VOIDPTR -# undef ACE_SCANDIR_CMP_USES_VOIDPTR -#endif /* ACE_SCANDIR_CMP_USES_VOIDPTR */ - -#ifdef ACE_SCANDIR_SEL_LACKS_CONST -# undef ACE_SCANDIR_SEL_LACKS_CONST -#endif /* ACE_SCANDIR_SEL_LACKS_CONST */ - -#endif /* ACE_CONFIG_AIX_7_H */ diff --git a/ACE/ace/config-all.h b/ACE/ace/config-all.h index 53925b24e02..102923c1941 100644 --- a/ACE/ace/config-all.h +++ b/ACE/ace/config-all.h @@ -70,6 +70,10 @@ # include "ace/Trace.h" #endif /* ACE_OS_NTRACE */ +#if !defined (ACE_TEMPLATES_REQUIRE_SOURCE) +# define ACE_TEMPLATES_REQUIRE_SOURCE +#endif + #if !defined (ACE_HAS_MONITOR_FRAMEWORK) # define ACE_HAS_MONITOR_FRAMEWORK 1 #endif diff --git a/ACE/ace/config-cygwin32.h b/ACE/ace/config-cygwin32.h index 29569a216fe..18544fcd08d 100644 --- a/ACE/ace/config-cygwin32.h +++ b/ACE/ace/config-cygwin32.h @@ -84,7 +84,6 @@ #define ACE_HAS_VOIDPTR_MMAP #define ACE_HAS_POLL #define ACE_HAS_SOCKADDR_MSG_NAME 1 -#define ACE_LACKS_PRI_T 1 // Compiler/platform supports alloca(). // Although ACE does have alloca() on this compiler/platform combination, it is diff --git a/ACE/ace/config-face-safety.h b/ACE/ace/config-face-safety.h index b06fed1e5b0..4ea75367230 100644 --- a/ACE/ace/config-face-safety.h +++ b/ACE/ace/config-face-safety.h @@ -216,8 +216,8 @@ #ifdef ACE_FACE_SAFETY_EXTENDED -# if defined ACE_WIN32 || defined ACE_HAS_WINCE -# error "FACE Safety profile not compatible with win32 or winCE" +# if defined ACE_WIN32 +# error "FACE Safety profile not compatible with win32" # endif # ifndef ACE_EMULATE_POSIX_DEVCTL diff --git a/ACE/ace/config-g++-common.h b/ACE/ace/config-g++-common.h index a6b51e705ad..9ab89245007 100644 --- a/ACE/ace/config-g++-common.h +++ b/ACE/ace/config-g++-common.h @@ -14,8 +14,6 @@ #define ACE_CC_MINOR_VERSION __GNUC_MINOR__ #define ACE_CC_BETA_VERSION (0) -#define ACE_TEMPLATES_REQUIRE_SOURCE - #if __cplusplus >= 202002L # define ACE_HAS_CPP20 #endif diff --git a/ACE/ace/config-hpux-11.00.h b/ACE/ace/config-hpux-11.00.h deleted file mode 100644 index f3802570a64..00000000000 --- a/ACE/ace/config-hpux-11.00.h +++ /dev/null @@ -1,381 +0,0 @@ -/* -*- C++ -*- */ -// The following configuration file is designed to work for HP -// platforms running HP-UX 11.00 using aC++ or gcc (2.95 and up). - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include /**/ "ace/pre.h" - -#define ACE_LACKS_STDINT_H -#define ACE_LACKS_SYS_SELECT_H - -#if defined (__GNUG__) -# include "ace/config-g++-common.h" -#else - -// aC++... - -// Precompiler needs extra flags to ignore "invalid #pragma directive" -# define ACE_CC_PREPROCESSOR_ARGS "-E +W 67" - -// Platform lacks streambuf "linebuffered ()". -# define ACE_LACKS_LINEBUFFERED_STREAMBUF 1 - -// Compiler's template mechanism must see source code (i.e., .C files). -# define ACE_TEMPLATES_REQUIRE_SOURCE - -// Compiler doesn't handle 'signed char' correctly (used in ace/IOStream.h) -# define ACE_LACKS_SIGNED_CHAR - -#endif /* __GNUG__, HP */ - -//********************************************************************* -// -// From here down is the compiler-INdependent OS settings. -// -//********************************************************************* - -// Compiling for HPUX. -#if !defined (HPUX) -#define HPUX -#endif /* HPUX */ -#define HPUX_11 - -#ifndef _HPUX_SOURCE -#define _HPUX_SOURCE -#endif - -#include /**/ <sys/stdsyms.h> - -// HP-UX is a POSIX-compliant system - see what's available. -#include "ace/config-posix.h" - -// config-posix.h sets up ACE_HAS_AIO_CALLS if the headers define the -// proper things. In HP-UX 11's case, the AIOCB Proactor works the best -// overall. If the user hasn't overridden it, select AIOCB. -#if defined (ACE_HAS_AIO_CALLS) -# if !defined (ACE_POSIX_AIOCB_PROACTOR) && !defined (ACE_POSIX_SIG_PROACTOR) -# define ACE_POSIX_AIOCB_PROACTOR -# endif /* !ACE_HAS_POSIX_AIOCB_PROACTOR && !ACE_POSIX_SIG_PROACTOR */ -#endif /* ACE_HAS_AIO_CALLS */ - -//////////////////////////////////////////////////////////////////////////// -// General OS information - see README for more details on what they mean -// -/////////////////////////////////////////////////////////////////////////// - -// HP/UX needs to have these addresses in a special range. -// If this is on a 64-bit model, the default is to use 64-bit addressing. -// It can also be set so that the mapped region is shareable with 32-bit -// programs. To enable the 32/64 sharing, comment out the first definition -// of ACE_DEFAULT_BASE_ADDR and uncomment the two lines after it. -#if defined (__LP64__) -# define ACE_DEFAULT_BASE_ADDR ((char *) 0x0000001100000000) -//# define ACE_DEFAULT_BASE_ADDR ((char *) 0x80000000) -//# define ACE_OS_EXTRA_MMAP_FLAGS MAP_ADDR32 - -# define ACE_DEFAULT_BASE_ADDRL (0x0000001100000000) -//# define ACE_DEFAULT_BASE_ADDRL (0x80000000) -#else -# define ACE_DEFAULT_BASE_ADDR ((char *) 0x80000000) -#endif /* __LP64__ */ - -// Preprocessor needs some help with data types -#if defined (__LP64__) -# define ACE_SIZEOF_LONG 8 -#else -# define ACE_SIZEOF_LONG 4 -#endif - -// Platform can do async I/O (aio_*) (set up in config-posix.h) -// ... but seems to require this in order to keep from hanging. Needs some -// investigation, maybe with HP. John Mulhern determined this value -// empirically. YMMV. If it does vary, set it up in your own config.h which -// then includes the ACE-supplied config. -#if !defined (ACE_INFINITE) -# define ACE_INFINITE 10000000 -#endif - -/* Compiler/platform correctly calls init()/fini() for shared libraries. */ -#define ACE_HAS_AUTOMATIC_INIT_FINI 1 - -// Manually tweak the malloc control block paddings to properly align -// things. -#define ACE_MALLOC_PADDING 16 -#define ACE_MALLOC_ALIGN 8 -#define ACE_PI_CONTROL_BLOCK_ALIGN_LONGS 3 - -// Compiler/platform contains the <sys/syscall.h> file. -#define ACE_HAS_SYS_SYSCALL_H - -#define ACE_HAS_SYS_PSTAT_H - -// But doesn't have a prototype for syscall() -#define ACE_LACKS_SYSCALL - -// Platform supports POSIX.1b clock_gettime () -#define ACE_HAS_CLOCK_GETTIME -#define ACE_HAS_CLOCK_SETTIME - -#define ACE_LACKS_CLOCK_MONOTONIC - -#define ACE_LACKS_PTHREAD_SCOPE_PROCESS - -// Prototypes for both signal() and struct sigaction are consistent. -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES - -// Compiler/platform has Dirent iterator functions. -#define ACE_HAS_DIRENT - -#define ACE_HAS_VSWPRINTF - -// Platform supports getpagesize() call -#define ACE_HAS_GETPAGESIZE -// But we define this just to be safe -#define ACE_PAGE_SIZE 4096 - -// Can run gperf on this platform (needed for TAO) -# define ACE_HAS_GPERF - -// Optimize ACE_Handle_Set for select(). -# define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT - -// Platform supports IP multicast -#define ACE_HAS_IP_MULTICAST -// At least for 11iv2, lacks perfect filtering. -#if (HPUX_VERS >= 1123) && !defined (ACE_LACKS_PERFECT_MULTICAST_FILTERING) -# define ACE_LACKS_PERFECT_MULTICAST_FILTERING 1 -#endif - -/* Platform defines MAP_FAILED as a long constant. */ -#define ACE_HAS_LONG_MAP_FAILED 1 - -// Platform supports recvmsg and sendmsg. -#define ACE_HAS_MSG - -// Platform's select() has non-const timeval argument -#define ACE_HAS_NONCONST_SELECT_TIMEVAL - -// Compiler/platform supports poll(). -#define ACE_HAS_POLL - -// Platform supports POSIX O_NONBLOCK semantics. -#define ACE_HAS_POSIX_NONBLOCK - -// Platform supports the POSIX struct timespec type -#define ACE_HAS_POSIX_TIME - -/* Platform has pread() and pwrite() support. */ -#define ACE_HAS_P_READ_WRITE 1 - -/* Platform will recurse infinitely on thread exits from TSS cleanup routines - (e.g., AIX) */ -#define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS 1 - -// Platform supports reentrant functions (all the POSIX *_r functions). -#define ACE_HAS_REENTRANT_FUNCTIONS -// ctime_r and asctime_r conform to POSIX.1c (2 param version) -#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R - -// Platform offers scandir(), and requires no adjustments for its API. -#define ACE_HAS_SCANDIR - -// HP-UX 11 has reentrant netdb functions. The catch is that the old -// functions (gethostbyname, etc.) are thread-safe and the _r versions are -// obsolescent. So, define things so the _r versions are not used. -// OS_NS_netdb.inl ensures no funny lock games are played in the -// ACE_NETDBCALL_RETURN macro. -#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS - -/* Platform lacks pri_t (e.g., Tandem NonStop UNIX). */ -#define ACE_LACKS_PRI_T 1 - -// Platform has shm_open -#define ACE_HAS_SHM_OPEN - -// Compiler/platform defines the sig_atomic_t typedef -#define ACE_HAS_SIG_ATOMIC_T - -/* Compiler requires extern "C" functions for signals. */ -#define ACE_HAS_SIG_C_FUNC 1 - -// Platform's sigaction() function takes const sigaction* as 2nd parameter. -#define ACE_HAS_SIGACTION_CONSTP2 - -#define ACE_HAS_SSIZE_T - -// Platform supports SVR4 extended signals -#define ACE_HAS_SIGINFO_T - -/* Define to 1 if platform has sigsuspend(). */ -#define ACE_HAS_SIGSUSPEND 1 - -// Platform doesn't detect a signal out of range unless it's way out of range. -#define ACE_HAS_SIGISMEMBER_BUG - -/* Platform provides socklen_t type, such as Linux with glibc2. */ -#define ACE_HAS_SOCKLEN_T 1 - -#define ACE_HAS_XPG4_MULTIBYTE_CHAR - -#define ACE_HAS_UALARM - -// Platform supports ucontext_t (which is used in the extended signal API). -#define ACE_HAS_UCONTEXT_T - -// Platform/compiler supports void * as second parameter to gettimeofday(). -#define ACE_HAS_VOIDPTR_GETTIMEOFDAY - -/* Platform requires void * for mmap(). */ -#define ACE_HAS_VOIDPTR_MMAP 1 - -/* OS/compiler uses void * arg 4 setsockopt() rather than const char * */ -#define ACE_HAS_VOIDPTR_SOCKOPT 1 - -// Platform supports SVR4 dynamic linking semantics. -// When used, this requires -ldl on the ACE library link line. -#define ACE_HAS_SVR4_DYNAMIC_LINKING - -// Platform supports the getrusage() system call. -#define ACE_HAS_GETRUSAGE - -/* Define to 1 if platform has the declaration of getrusage(). */ -#define ACE_HAS_GETRUSAGE_PROTOTYPE 1 - -// Platform has the sigwait function in a header file -#define ACE_HAS_SIGWAIT -#define ACE_HAS_SIGTIMEDWAIT - -// Platform supports System V IPC (most versions of UNIX, but not Win32) -#define ACE_HAS_SYSV_IPC - -// accept() is thread-safe -#define ACE_HAS_THREAD_SAFE_ACCEPT - -// Platform lacks a typedef for timespec_t, but has struct timespec -#define ACE_LACKS_TIMESPEC_T - -// dlopen() takes a char* instead of const char* -#define ACE_HAS_CHARPTR_DL - -// lacks setegid and seteuid -#define ACE_LACKS_SETEGID -#define ACE_LACKS_SETEUID - -#define ACE_LACKS_SUSECONDS_T -#define ACE_LACKS_SYS_SYSCTL_H - -#if !(defined(__STDC_EXT__) || defined(_INCLUDE_LONGLONG) || defined(_INCLUDE_STDC__SOURCE_199901)) -# define ACE_LACKS_STRTOLL -# define ACE_LACKS_WCSTOLL -# define ACE_LACKS_STRTOULL -# define ACE_LACKS_WCSTOULL -#endif - -#define ACE_LACKS_ISWASCII - -#define ACE_LACKS_SETENV -#define ACE_LACKS_UNSETENV - -// Shared library name/path components -#if defined (__ia64) -# define ACE_DLL_SUFFIX ACE_TEXT (".so") -#else -# define ACE_DLL_SUFFIX ACE_TEXT (".sl") -#endif /* __ia64 */ -#if defined (__LP64__) -# define ACE_LD_SEARCH_PATH ACE_TEXT ("LD_LIBRARY_PATH") -#else -# define ACE_LD_SEARCH_PATH ACE_TEXT ("SHLIB_PATH") -#endif /* __LP64__ */ - -#if defined (_INCLUDE__STDC_A1_SOURCE) -# define ACE_HAS_3_PARAM_WCSTOK -#endif - -#define ACE_LACKS_STRUCT_LIFNUM - -////////////////////////////////////////////////////////////////////////// -// STREAMS information -// -////////////////////////////////////////////////////////////////////////// - -// Platform supports STREAMS -#define ACE_HAS_STREAMS -// Compiler/platform supports struct strbuf. -#define ACE_HAS_STRBUF_T -// But the putmsg signature doesn't have it as const... -// Well, it really does, but it depends on preprocessor defines. -#define ACE_LACKS_CONST_STRBUF_PTR -/* Platform supports TLI timod STREAMS module */ -#define ACE_HAS_TIMOD_H 1 - -// Platform supports STREAM pipes -// This is possible, but not by default - need to rebuild the kernel to -// get them enabled - see pipe(2) and "STREAMS/UX for the HP 9000" -// #define ACE_HAS_STREAM_PIPES - -///////////////////////////////////////////////////////////////////////// -// TLI/XTI information -// -//////////////////////////////////////////////////////////////////////// - -// Platform supports XTI (includes TLI). -#define ACE_HAS_XTI -// HP-UX 11 conforms to the XPG4 spec, which ACE calls broken for the -// errmsg not being const... -#define ACE_HAS_BROKEN_T_ERROR -// The definitions of TCP_NODELAY and TCP_MAXSEG conflict between -// sys/xti.h and netinet/tcp.h. -#define ACE_HAS_CONFLICTING_XTI_MACROS -/* Platform provides <sys/xti.h> header */ -#define ACE_HAS_SYS_XTI_H 1 - -///////////////////////////////////////////////////////////////////////// -// Threads information. -// -// Use of threads is controlled by the 'threads' argument to make. See -// include/makeinclude/platform_hpux_aCC.GNU for details. If it's not set, -// the default is to enable it, since kernel threads are always available -// on HP-UX 11, as opposed to 10.x where it was optional software. -// -//////////////////////////////////////////////////////////////////////// - -#if defined (ACE_HAS_THREADS) -# if (ACE_HAS_THREADS == 0) -# undef ACE_HAS_THREADS -# endif /* ACE_HAS_THREADS == 0 */ -#else -# define ACE_HAS_THREADS -#endif /* ACE_HAS_THREADS */ - -#if defined (ACE_HAS_THREADS) - -# if !defined (ACE_MT_SAFE) -# define ACE_MT_SAFE 1 -# endif - -// HP-UX doesn't define _POSIX_THREADS since it doesn't implement all -// features (lacks thread priority inheritance and protection), so -// config-posix.h doesn't get this one... -# define ACE_HAS_PTHREADS -# define ACE_HAS_PTHREADS_UNIX98_EXT -# define ACE_HAS_PTHREAD_CONTINUE -# define ACE_HAS_PTHREAD_RESUME_NP -# define ACE_HAS_PTHREAD_SUSPEND -# define ACE_HAS_RECURSIVE_MUTEXES -# define ACE_HAS_THREAD_SPECIFIC_STORAGE -# define ACE_LACKS_PTHREAD_ATTR_SETSTACK -# define ACE_LACKS_CONDATTR_SETCLOCK -#endif /* ACE_HAS_THREADS */ - -#define ACE_HAS_POSIX_SEM - -// Platform has POSIX terminal interface. -#define ACE_HAS_TERMIOS - -// gethostbyaddr does not handle IPv6-mapped-IPv4 addresses -#define ACE_HAS_BROKEN_GETHOSTBYADDR_V4MAPPED - -#include /**/ "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/ACE/ace/config-hurd.h b/ACE/ace/config-hurd.h index ef78e596b37..95517b69d86 100644 --- a/ACE/ace/config-hurd.h +++ b/ACE/ace/config-hurd.h @@ -59,7 +59,6 @@ #endif /* __GLIBC__ */ #define ACE_HAS_LSEEK64 -//#define ACE_LACKS_LSEEK64_PROTOTYPE #define ACE_HAS_P_READ_WRITE // Use ACE's alternate cuserid() implementation since the use of the diff --git a/ACE/ace/config-icc-common.h b/ACE/ace/config-icc-common.h index ce825d2beed..65a21df7f52 100644 --- a/ACE/ace/config-icc-common.h +++ b/ACE/ace/config-icc-common.h @@ -57,8 +57,6 @@ # define ACE_HAS_INTEL_ASSEMBLY #endif -#define ACE_TEMPLATES_REQUIRE_SOURCE - #if (__INTEL_COMPILER >= 910) # define ACE_EXPLICIT_TEMPLATE_DESTRUCTOR_TAKES_ARGS #endif diff --git a/ACE/ace/config-integritySCA.h b/ACE/ace/config-integritySCA.h index 3628279d01e..92495ed7cd3 100644 --- a/ACE/ace/config-integritySCA.h +++ b/ACE/ace/config-integritySCA.h @@ -24,7 +24,6 @@ #define ACE_LACKS_GETEGID #define ACE_LACKS_GETGID -#define ACE_TEMPLATES_REQUIRE_SOURCE 1 #define TAO_USE_SEQUENCE_TEMPLATES #define _REENTRANT #define ACE_MT_SAFE 1 diff --git a/ACE/ace/config-kfreebsd.h b/ACE/ace/config-kfreebsd.h index bc13d8b428d..db57811bcfe 100644 --- a/ACE/ace/config-kfreebsd.h +++ b/ACE/ace/config-kfreebsd.h @@ -177,8 +177,7 @@ /* Mutexes are inherently recursive (e.g., Win32) */ /* #undef ACE_HAS_RECURSIVE_MUTEXES */ -/* Platform will recurse infinitely on thread exits from TSS cleanup routines - (e.g., AIX) */ +/* Platform will recurse infinitely on thread exits from TSS cleanup routines */ #define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS 1 /* Platform supports reentrant functions (i.e., all the POSIX *_r functions). @@ -360,9 +359,6 @@ /* Compiler complains about use of obsolete "pragma once" */ #define ACE_LACKS_PRAGMA_ONCE 1 -/* Define to 1 if the system lacks the type 'pri_t'. */ -#define ACE_LACKS_PRI_T 1 - /* Define to 1 if platform lacks pthread_thr_sigsetmask(). */ #define ACE_LACKS_PTHREAD_THR_SIGSETMASK 1 diff --git a/ACE/ace/config-linux-common.h b/ACE/ace/config-linux-common.h index 1d3eba2f27e..1f2234d0b64 100644 --- a/ACE/ace/config-linux-common.h +++ b/ACE/ace/config-linux-common.h @@ -57,8 +57,6 @@ # include "ace/config-icc-common.h" #elif defined (__GNUG__) # include "ace/config-g++-common.h" -#elif defined (__SUNCC_PRO) || defined (__SUNPRO_CC) -# include "ace/config-suncc-common.h" #elif defined (__PGI) // Portable group compiler # define ACE_LACKS_SWAB @@ -71,7 +69,7 @@ * (TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.{h,c}) that may indirectly * include this */ -#else /* ! __GNUG__ && !__DECCXX && !__INTEL_COMPILER && && !__PGI */ +#else /* ! __GNUG__ && !__INTEL_COMPILER && && !__PGI */ # ifdef __cplusplus /* Let it slide for C compilers. */ # error unsupported compiler in ace/config-linux.h # endif /* __cplusplus */ diff --git a/ACE/ace/config-lite.h b/ACE/ace/config-lite.h index 9fcc12c2a6b..87d168f2504 100644 --- a/ACE/ace/config-lite.h +++ b/ACE/ace/config-lite.h @@ -91,57 +91,6 @@ typedef ACE_OS_Thread_Descriptor *(*ACE_THR_DESC_LOG_MSG_HOOK) (); ACE_END_VERSIONED_NAMESPACE_DECL -/** - * @deprecated ACE_DECLARE_STL_REVERSE_ITERATORS is a crutch to be - * used until all C++ compiler supported by ACE support - * the standard reverse_iterator adapters. - * @internal ACE_DECLARE_STL_REVERSE_ITERATORS is not meant for use - * outside of ACE. - */ -// STL reverse_iterator declaration generator -// Make sure you include <iterator> in the file you're using this -// generator, and that the following traits are available: -// -// iterator -// const_iterator -// value_type -// reference -// pointer -// const_reference -// const_pointer -// difference_type -// -// Once all C++ compilers support the standard reverse_iterator -// adapters, we can drop this generator macro or at least drop the -// MSVC++ or Sun Studio preprocessor conditional blocks. -#if defined (__SUNPRO_CC) && __SUNPRO_CC <= 0x5140 \ - && !defined (_STLPORT_VERSION) - // If we're not using the stlport4 C++ library (which has standard - // iterators), we need to ensure this is included in order to test - // the _RWSTD_NO_CLASS_PARTIAL_SPEC feature test macro below. -# include <Cstd/stdcomp.h> -#endif /* __SUNPRO_CC <= 0x5110 */ -#if defined (__SUNPRO_CC) && __SUNPRO_CC <= 0x5140 \ - && defined (_RWSTD_NO_CLASS_PARTIAL_SPEC) -# define ACE_DECLARE_STL_REVERSE_ITERATORS \ - typedef std::reverse_iterator<iterator, \ - std::input_iterator_tag, \ - value_type, \ - reference, \ - pointer, \ - difference_type> reverse_iterator; \ - typedef std::reverse_iterator<const_iterator, \ - std::input_iterator_tag, \ - value_type const, \ - const_reference, \ - const_pointer, \ - difference_type> const_reverse_iterator; -#else -# define ACE_DECLARE_STL_REVERSE_ITERATORS \ - typedef std::reverse_iterator<iterator> reverse_iterator; \ - typedef std::reverse_iterator<const_iterator> const_reverse_iterator; -#endif /* _MSC_VER && _WIN64 */ - #include /**/ "ace/post.h" #endif /* ACE_CONFIG_LITE_H */ diff --git a/ACE/ace/config-macosx-jaguar.h b/ACE/ace/config-macosx-jaguar.h index 76a0df0c9dd..fb8dfd775b9 100644 --- a/ACE/ace/config-macosx-jaguar.h +++ b/ACE/ace/config-macosx-jaguar.h @@ -25,8 +25,6 @@ #define ACE_HAS_GPERF #define ACE_HAS_POSIX_SEM -//#define ACE_HAS_SVR4_TLI - #define ACE_LACKS_STROPTS_H #define ACE_LACKS_WCHAR_H diff --git a/ACE/ace/config-macosx-panther.h b/ACE/ace/config-macosx-panther.h index d4ce6f41619..2eb6c3c68fd 100644 --- a/ACE/ace/config-macosx-panther.h +++ b/ACE/ace/config-macosx-panther.h @@ -26,8 +26,6 @@ #define ACE_HAS_GPERF #define ACE_HAS_POSIX_SEM -//#define ACE_HAS_SVR4_TLI - #define ACE_LACKS_STROPTS_H #define ACE_LACKS_WCHAR_H diff --git a/ACE/ace/config-macros.h b/ACE/ace/config-macros.h index 0ea1e2dc3ad..144e0283d98 100644 --- a/ACE/ace/config-macros.h +++ b/ACE/ace/config-macros.h @@ -84,7 +84,7 @@ // Perfect Multicast filtering refers to RFC 3376, where a socket is only // delivered dgrams for groups joined even if it didn't bind the group // address. We turn this option off by default, although most OS's -// except for Windows and Solaris probably lack perfect filtering. +// except for Windows probably lack perfect filtering. // ========================================================================= # if !defined (ACE_LACKS_PERFECT_MULTICAST_FILTERING) @@ -101,14 +101,13 @@ # if !defined (ACE_HAS_PROCESS_SPAWN) # if !defined (ACE_LACKS_FORK) || \ - (defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP)) || \ - defined (ACE_WINCE) || defined (ACE_OPENVMS) + (defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP)) # define ACE_HAS_PROCESS_SPAWN 1 # endif # endif /* ACE_HAS_PROCESS_SPAWN */ # if !defined (ACE_HAS_DYNAMIC_LINKING) -# if defined (ACE_HAS_SVR4_DYNAMIC_LINKING) || defined (ACE_WIN32) || defined (ACE_VXWORKS) || defined (__hpux) +# if defined (ACE_HAS_SVR4_DYNAMIC_LINKING) || defined (ACE_WIN32) || defined (ACE_VXWORKS) # define ACE_HAS_DYNAMIC_LINKING 1 # endif # endif /* ACE_HAS_DYNAMIC_LINKING */ @@ -234,17 +233,6 @@ # define ACE_sap_any_cast(TYPE) reinterpret_cast<TYPE> (const_cast<ACE_Addr &> (ACE_Addr::sap_any)) -# if !defined (ACE_CAST_CONST) - // Sun CC 4.2, for example, requires const in reinterpret casts of - // data members in const member functions. But, other compilers - // complain about the useless const. This keeps everyone happy. -# if defined (__SUNPRO_CC) -# define ACE_CAST_CONST const -# else /* ! __SUNPRO_CC */ -# define ACE_CAST_CONST -# endif /* ! __SUNPRO_CC */ -# endif /* ! ACE_CAST_CONST */ - // ============================================================================ // Compiler Silencing macros // @@ -255,7 +243,7 @@ #if !defined (ACE_UNUSED_ARG) # if defined (__GNUC__) || defined (__BORLANDC__) # define ACE_UNUSED_ARG(a) (void) (a) -# elif defined (ghs) || defined (__hpux) || defined (__DECCXX) || defined (__rational__) || defined (__USLC__) || defined (__DCC__) || defined (__PGI) +# elif defined (ghs) || defined (__rational__) || defined (__USLC__) || defined (__DCC__) || defined (__PGI) // Some compilers complain about "statement with no effect" with (a). // This eliminates the warnings, and no code is generated for the null // conditional statement. @note that may only be true if -O is enabled, @@ -266,7 +254,7 @@ # endif /* ghs ..... */ #endif /* !ACE_UNUSED_ARG */ -#if defined (_MSC_VER) || defined (ghs) || defined (__DECCXX) || defined(__BORLANDC__) || defined (__USLC__) || defined (__DCC__) || defined (__PGI) || (defined (__HP_aCC) && (__HP_aCC < 39000 || __HP_aCC >= 60500)) || defined (__IAR_SYSTEMS_ICC__) +#if defined (_MSC_VER) || defined (ghs) || defined(__BORLANDC__) || defined (__USLC__) || defined (__DCC__) || defined (__PGI) || defined (__IAR_SYSTEMS_ICC__) # define ACE_NOTREACHED(a) #else /* ghs || ..... */ # define ACE_NOTREACHED(a) a diff --git a/ACE/ace/config-mqx.h b/ACE/ace/config-mqx.h index b27de279666..028b9c367af 100644 --- a/ACE/ace/config-mqx.h +++ b/ACE/ace/config-mqx.h @@ -55,7 +55,6 @@ extern "C" { #define ACE_RENAME_EQUIVALENT MQX_Filesystem::inst().rename #define ACE_MQX -#define ACE_TEMPLATES_REQUIRE_SOURCE #define ACE_PAGE_SIZE 4096 #define ACE_SOCKET_LEN uint16_t #define ACE_SOCKOPT_LEN socklen_t diff --git a/ACE/ace/config-netbsd.h b/ACE/ace/config-netbsd.h index 85c0da476d9..5caba73a4a4 100644 --- a/ACE/ace/config-netbsd.h +++ b/ACE/ace/config-netbsd.h @@ -94,7 +94,6 @@ #define ACE_LACKS_MUTEXATTR_PSHARED 1 #define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS 1 #define ACE_LACKS_PERFECT_MULTICAST_FILTERING 1 -#define ACE_LACKS_PRI_T 1 #define ACE_LACKS_PTHREAD_THR_SIGSETMASK 1 #define ACE_LACKS_PTHREAD_YIELD 1 #define ACE_LACKS_RWLOCKATTR_PSHARED 1 diff --git a/ACE/ace/config-openvms.h b/ACE/ace/config-openvms.h deleted file mode 100644 index 5417d250a25..00000000000 --- a/ACE/ace/config-openvms.h +++ /dev/null @@ -1,182 +0,0 @@ -/* -*- C++ -*- */ -// The following configuration file is designed to work for OpenVMS 7.3-2 - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H - -#ifdef __cplusplus -#pragma message disable CODCAUUNR -#pragma message disable CODEUNREACHABLE -//#pragma message disable DOLLARID -//#pragma message disable NOSIMPINT -//#pragma message disable NOSTDLONGLONG -#pragma message disable NARROWPTR -//#pragma message disable LONGEXTERN -#pragma message disable UNSCOMZER -#endif - -// Use a signed int to match POSIX -#define __SIGNED_INT_TIME_T - -#define ACE_OPENVMS __VMS_VER - -#define ACE_DLL_SUFFIX ACE_TEXT("") - -#define ACE_HAS_DUMP 1 - -// need this includes to ensure proper sequence of definitions so that -// f.i. HP C/C++ does not '#define ' memcpy, memmove etc. -#include <stdarg.h> -#include <stdio.h> -#include <string.h> -#undef memset -#undef memcpy -#undef memmove - -#if defined(__ia64__) - // on OpenVMS IA64 we need this get the singleton exported since we build - // ACE/TAO with the NOTEMPLATES export option which prohibits exporting - // of any template symbols unless explicitly exported - #define ACE_HAS_CUSTOM_EXPORT_MACROS - #define ACE_Proper_Export_Flag - #define ACE_Proper_Import_Flag - #define ACE_EXPORT_SINGLETON_DECLARATION(T) template class __declspec (dllexport) T - #define ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) template class __declspec (dllexport) SINGLETON_TYPE<CLASS, LOCK>; -#else - #define ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION -#endif - -#define ACE_DEFAULT_BASE_ADDR ((char*)(0x30000000)) - -#define ACE_MAX_UDP_PACKET_SIZE 65535 - -/* missing system headers */ -#define ACE_LACKS_STDINT_H 1 -#define ACE_LACKS_SYS_IPC_H 1 -#define ACE_LACKS_SYS_SEM_H 1 -#define ACE_LACKS_SEMAPHORE_H 1 -#define ACE_LACKS_SYS_SELECT_H 1 -#define ACE_LACKS_TERMIOS_H 1 -#define ACE_LACKS_SYS_SHM_H 1 -#define ACE_LACKS_SYS_MSG_H 1 -#define ACE_LACKS_REGEX_H 1 -#define ACE_LACKS_SEARCH_H 1 -#define ACE_LACKS_SCHED_H 1 -#define ACE_LACKS_SYS_SYSCTL_H 1 -#define ACE_LACKS_SYS_PARAM_H 1 -#define ACE_LACKS_SIGINFO_H 1 -#define ACE_LACKS_UCONTEXT_H 1 - -/* missing rtl functions */ -#define ACE_LACKS_SETPGID 1 -#define ACE_LACKS_SETREUID 1 -#define ACE_LACKS_SETREGID 1 -#define ACE_LACKS_FORK 1 -#define ACE_LACKS_GETPGID 1 -#define ACE_LACKS_SETSID 1 -#define ACE_LACKS_FCNTL 1 -#define ACE_LACKS_SETEGID 1 -#define ACE_LACKS_SETEUID 1 - -#define ACE_LACKS_REALPATH 1 - -#define ACE_LACKS_SYMLINKS 1 - -#define ACE_HAS_P_READ_WRITE -#define ACE_HAS_CHARPTR_DL 1 -#define ACE_HAS_CLOCK_GETTIME 1 -#define ACE_HAS_CLOCK_SETTIME 1 -#define ACE_HAS_VOIDPTR_GETTIMEOFDAY 1 -#define ACE_HAS_DIRENT 1 -#define ACE_HAS_GETPAGESIZE 1 -#define ACE_HAS_MSG -#define ACE_HAS_NONCONST_SELECT_TIMEVAL 1 -#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R 1 -#define ACE_HAS_3_PARAM_WCSTOK 1 -#define ACE_HAS_SIGSUSPEND 1 -#define ACE_HAS_SIGWAIT 1 -#define ACE_HAS_SIGTIMEDWAIT 1 - -#define ACE_HAS_SIG_C_FUNC 1 -#define ACE_HAS_SIGISMEMBER_BUG -#define ACE_HAS_STRNLEN 1 -#define ACE_HAS_STREAMS 1 -#define ACE_HAS_UALARM 1 -#define ACE_HAS_VOIDPTR_MMAP 1 -#define ACE_HAS_VOIDPTR_SOCKOPT 1 -#define ACE_LACKS_LSTAT 1 -#define ACE_LACKS_MADVISE 1 -#define ACE_LACKS_MKFIFO 1 -#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS 1 -#define ACE_LACKS_READLINK 1 -#define ACE_LACKS_RLIMIT 1 -#define ACE_LACKS_RLIMIT_PROTOTYPE 1 -#define ACE_LACKS_SETSCHED -#define ACE_LACKS_SYSCALL 1 -#define ACE_LACKS_WCSTOULL 1 -#define ACE_LACKS_WCSTOLL - -/* (missing) standard data types */ -#define ACE_LACKS_CONST_TIMESPEC_PTR 1 -#define ACE_LACKS_SUSECONDS_T 1 -#define ACE_HAS_IDTYPE_T 1 -#define ACE_HAS_SIGINFO_T 1 -#define ACE_HAS_XPG4_MULTIBYTE_CHAR 1 -#define ACE_HAS_SIZET_SOCKET_LEN 1 -#define ACE_HAS_SSIZE_T 1 -#define ACE_LACKS_PRI_T 1 -#define ACE_LACKS_SEMBUF_T 1 -#define ACE_LACKS_STRRECVFD 1 -#define ACE_LACKS_T_ERRNO 1 - -/* POSIX threads compatibilities */ -#define ACE_LACKS_RWLOCK_T 1 -#define ACE_LACKS_PTHREAD_KILL 1 -#define ACE_LACKS_THREAD_PROCESS_SCOPING 1 - -#define ACE_HAS_PTHREADS 1 -#define ACE_HAS_PTHREAD_PROCESS_ENUM 1 -#define ACE_LACKS_UNNAMED_SEMAPHORE 1 -#define ACE_MT_SAFE 1 -#define ACE_HAS_THREADS 1 -#define ACE_HAS_THREAD_SPECIFIC_STORAGE 1 -#define ACE_HAS_THR_C_DEST 1 -#define ACE_HAS_THR_C_FUNC 1 -#define ACE_LACKS_PTHREAD_SIGMASK 1 -#define ACE_LACKS_PTHREAD_THR_SIGSETMASK 1 -#define ACE_NEEDS_HUGE_THREAD_STACKSIZE (64U*1024) -#define ACE_HAS_PTHREAD_SETCONCURRENCY 1 -#define ACE_HAS_PTHREAD_GETCONCURRENCY 1 -#define ACE_HAS_PTHREAD_SCHEDPARAM 1 - -/* language/platform conformance */ -#define ACE_TEMPLATES_REQUIRE_SOURCE 1 -#define ACE_HAS_AUTOMATIC_INIT_FINI 1 -#define ACE_LACKS_UNIX_SIGNALS 1 - -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES 1 -#define ACE_LACKS_LINEBUFFERED_STREAMBUF 1 - -#define ACE_HAS_GPERF 1 -#define ACE_HAS_IP_MULTICAST 1 -#define ACE_LACKS_PERFECT_MULTICAST_FILTERING 1 -#define ACE_HAS_POSIX_NONBLOCK 1 -#define ACE_HAS_POSIX_TIME 1 -#define ACE_HAS_BROKEN_POSIX_TIME 1 -#define ACE_HAS_SVR4_DYNAMIC_LINKING 1 - -#define ACE_LACKS_NAMED_POSIX_SEM 1 -#define ACE_LACKS_SYSV_SHMEM 1 -#define ACE_LACKS_UNIX_DOMAIN_SOCKETS 1 -#define ACE_LACKS_UNIX_SYSLOG 1 -#define ACE_LACKS_ALPHASORT 1 -#define ACE_LACKS_ISCTYPE -#define ACE_LACKS_ISBLANK - -#define ACE_LACKS_SETENV -#define ACE_LACKS_UNSETENV - -#define ACE_HAS_SOCK_BUF_SIZE_MAX -#define ACE_HAS_SOCK_BUF_SIZE_MAX_VALUE 65535 - -#endif diff --git a/ACE/ace/config-rtems.h b/ACE/ace/config-rtems.h deleted file mode 100644 index e74a3faa463..00000000000 --- a/ACE/ace/config-rtems.h +++ /dev/null @@ -1,155 +0,0 @@ -/* -*- C -*- */ -/* The following configuration file is designed to work for RTEMS - platforms using GNU C. -*/ - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H - -#if ! defined (__ACE_INLINE__) -#define __ACE_INLINE__ -#endif /* ! __ACE_INLINE__ */ - -// Needed to make some prototypes visible. -// #if ! defined (_GNU_SOURCE) -// #define _GNU_SOURCE -// #endif /* ! _GNU_SOURCE */ - -// First the machine specific part -// There are no known port specific issues with the RTEMS port of ACE. -// XXX Pentium and PowerPC have high res timer support in ACE. - -// Then the compiler specific parts -#if defined (__GNUG__) -# include "ace/config-g++-common.h" -#else /* ! __GNUG__ */ -# ifdef __cplusplus /* Let it slide for C compilers. */ -# error unsupported compiler in ace/config-rtems.h -# endif /* __cplusplus */ -#endif /* ! __GNUG__ */ - -#include "ace/config-posix.h" - -// Completely common part :-) - -#define ACE_HAS_NONSTATIC_OBJECT_MANAGER - -#define ACE_LACKS_ALPHASORT -#define ACE_LACKS_REGEX_H -#define ACE_LACKS_STROPTS_H -#define ACE_LACKS_DLFCN_H -#define ACE_LACKS_SIGINFO_H -#define ACE_LACKS_SYS_IPC_H -#define ACE_LACKS_SYS_SEM_H -#define ACE_LACKS_STRINGS_H -#define ACE_LACKS_SYS_SHM_H -#define ACE_LACKS_SETEGID -#define ACE_LACKS_SETEUID -#define ACE_LACKS_POLL_H -#define ACE_HAS_NONCONST_SELECT_TIMEVAL -#define ACE_LACKS_STRCASECMP -#define ACE_LACKS_MKSTEMP -#define ACE_LACKS_STRDUP -#define ACE_LACKS_STRTOK_R -#define ACE_LACKS_REALPATH -#define ACE_LACKS_TEMPNAM -#define ACE_LACKS_TZSET - -// Temporarily, enabling this results in compile errors with -// rtems 4.6.6. -#define ACE_LACKS_WCHAR_H - -#if !defined (ACE_MT_SAFE) -#define ACE_MT_SAFE 1 -#endif - -#if ACE_MT_SAFE -# define ACE_HAS_THREADS -# define ACE_HAS_PTHREADS -# define ACE_HAS_THREAD_SPECIFIC_STORAGE -# define ACE_HAS_PTHREAD_SCHEDPARAM -# define ACE_LACKS_THREAD_PROCESS_SCOPING -#else -# define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R -#endif - -#define ACE_HAS_ALT_CUSERID -#define ACE_HAS_4_4BSD_SENDMSG_RECVMSG -#define ACE_HAS_CLOCK_GETTIME -#define ACE_HAS_CLOCK_SETTIME -#define ACE_HAS_DIRENT -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT -#define ACE_HAS_MSG -#define ACE_HAS_MT_SAFE_MKTIME -#define ACE_HAS_NONCONST_READV -#define ACE_HAS_GETPAGESIZE -#define ACE_HAS_POSIX_SEM -#define ACE_HAS_POSIX_TIME -#define ACE_HAS_REENTRANT_FUNCTIONS -#define ACE_HAS_SIGACTION_CONSTP2 -#define ACE_HAS_SIGINFO_T -#define ACE_HAS_SIGSUSPEND -#define ACE_HAS_SSIZE_T -#define ACE_HAS_VOIDPTR_GETTIMEOFDAY -#define ACE_HAS_SYS_FILIO_H -#define ACE_HAS_TIMEZONE_GETTIMEOFDAY -#define ACE_LACKS_EXEC -#define ACE_LACKS_FILELOCKS -#define ACE_LACKS_FORK -#define ACE_LACKS_GETPGID -#define ACE_LACKS_TIMESPEC_T -#define ACE_LACKS_MADVISE -#define ACE_LACKS_MMAP -#define ACE_LACKS_MPROTECT -#define ACE_LACKS_MSYNC -#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS -#define ACE_LACKS_PTHREAD_THR_SIGSETMASK -#define ACE_LACKS_READLINK -#define ACE_LACKS_READV -#define ACE_LACKS_RLIMIT -#define ACE_LACKS_RLIMIT_PROTOTYPE -#define ACE_LACKS_RWLOCK_T -#define ACE_LACKS_SBRK -#define ACE_LACKS_SEMBUF_T -#define ACE_LACKS_SETREUID -#define ACE_LACKS_SETREUID_PROTOTYPE -#define ACE_LACKS_SETREGID -#define ACE_LACKS_SETREGID_PROTOTYPE -#define ACE_LACKS_STRPTIME -#define ACE_LACKS_STRRECVFD -#define ACE_LACKS_SI_ADDR -#define ACE_LACKS_SOCKETPAIR -#define ACE_LACKS_SYS_MSG_H -#define ACE_LACKS_SYSV_SHMEM -#define ACE_LACKS_SYSCALL -#define ACE_LACKS_UCONTEXT_H -#define ACE_HAS_NONCONST_WRITEV -#define ACE_LACKS_WRITEV -#define ACE_NEEDS_HUGE_THREAD_STACKSIZE 65536 -#define ACE_NEEDS_SCHED_H -#define ACE_HAS_POSIX_NONBLOCK -#define ACE_HAS_TERMIOS - -// rtems 4.7 or higher -#if (__RTEMS_MAJOR__ > 4) || (__RTEMS_MAJOR__ == 4 && __RTEMS_MINOR__ > 6) -# define ACE_HAS_UALARM -#else -# define ACE_HAS_NOTSUP_SC_PAGESIZE -# define ACE_LACKS_SUSECONDS_T -# define ACE_LACKS_INTPTR_T -# undef ACE_HAS_SHM_OPEN -# undef ACE_HAS_AIO_CALLS -#endif - -// __RTEMS_REVISION__ could also be used but this is broken according -// to the rtems people - -#if !defined (_POSIX_REALTIME_SIGNALS) -# define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES -#endif - -#if defined (ACE_LACKS_NETWORKING) -# include "ace/config-posix-nonetworking.h" -#endif - -#endif /* ACE_CONFIG_H */ diff --git a/ACE/ace/config-suncc-common.h b/ACE/ace/config-suncc-common.h index 908aef297c9..75fafb245d4 100644 --- a/ACE/ace/config-suncc-common.h +++ b/ACE/ace/config-suncc-common.h @@ -38,7 +38,5 @@ # define ACE_LACKS_PRAGMA_ONCE #endif /* ! ACE_LACKS_PRAGMA_ONCE */ -#define ACE_TEMPLATES_REQUIRE_SOURCE - #include /**/ "ace/post.h" #endif /* ACE_SUNCC_COMMON_H */ diff --git a/ACE/ace/config-sunos5.10.h b/ACE/ace/config-sunos5.10.h deleted file mode 100644 index 94d87715332..00000000000 --- a/ACE/ace/config-sunos5.10.h +++ /dev/null @@ -1,62 +0,0 @@ -/* -*- C++ -*- */ -// The following configuration file is designed to work for SunOS 5.10 -// (Solaris 10) platforms using the SunC++ 5.x (Sun Studio 8-10), or g++ -// compilers. - -#ifndef ACE_CONFIG_H - -// ACE_CONFIG_H is defined by one of the following #included headers. - -// #include the SunOS 5.9 config, then add any SunOS 5.10 updates below. -#include "ace/config-sunos5.9.h" - -// Solaris 10 can do sem_timedwait() (see ACE_OS::sema_wait). -#define ACE_HAS_POSIX_SEM_TIMEOUT - -#define ACE_HAS_SCANDIR - -// Solaris 10 offers a useable alphasort() unlike previous Solaris versions. -#if defined (ACE_LACKS_ALPHASORT) -# undef ACE_LACKS_ALPHASORT -#endif - -#undef ACE_LACKS_GETADDRINFO -#undef ACE_LACKS_GETNAMEINFO - -// Solaris 10 offers a useable log2() unlike previous Solaris versions. -#if defined (ACE_LACKS_LOG2) -# undef ACE_LACKS_LOG2 -#endif - -// Solaris 10 offers a useable isblank() unlike previous Solaris versions. -#if defined (ACE_LACKS_ISBLANK) -# undef ACE_LACKS_ISBLANK -#endif - -// Solaris 10 delivers pthread_attr_setstack -#if defined (ACE_LACKS_PTHREAD_ATTR_SETSTACK) -# undef ACE_LACKS_PTHREAD_ATTR_SETSTACK -#endif - -// Solaris 10 introduced printf() modifiers for [s]size_t types. -#undef ACE_SSIZE_T_FORMAT_SPECIFIER_ASCII -#define ACE_SSIZE_T_FORMAT_SPECIFIER_ASCII "%zd" -#undef ACE_SIZE_T_FORMAT_SPECIFIER_ASCII -#define ACE_SIZE_T_FORMAT_SPECIFIER_ASCII "%zu" - -// Solaris 10 offers wcstoll() and wcstoull() -#if defined (ACE_LACKS_WCSTOLL) -# undef ACE_LACKS_WCSTOLL -#endif /* ACE_LACKS_WCSTOLL */ -#if defined (ACE_LACKS_WCSTOULL) -# undef ACE_LACKS_WCSTOULL -#endif /* ACE_LACKS_WCSTOULL */ - -#if defined (ACE_HAS_SCTP) && defined (ACE_HAS_LKSCTP) -# define ACE_HAS_VOID_PTR_SCTP_GETLADDRS -# define ACE_HAS_VOID_PTR_SCTP_GETPADDRS -#endif - -#define ACE_HAS_SOLARIS_ATOMIC_LIB - -#endif /* ACE_CONFIG_H */ diff --git a/ACE/ace/config-sunos5.11.h b/ACE/ace/config-sunos5.11.h deleted file mode 100644 index 07f8b679f3b..00000000000 --- a/ACE/ace/config-sunos5.11.h +++ /dev/null @@ -1,13 +0,0 @@ -/* -*- C++ -*- */ -// The following configuration file is designed to work for SunOS 5.11 -// (Solaris 11) platforms using the SunC++ 5.x (Sun Studio 10-12), or g++ -// compilers. - -#ifndef ACE_CONFIG_H - -// ACE_CONFIG_H is defined by one of the following #included headers. - -// #include the SunOS 5.10 config, then add any SunOS 5.11 updates below. -#include "ace/config-sunos5.10.h" - -#endif /* ACE_CONFIG_H */ diff --git a/ACE/ace/config-sunos5.4-g++.h b/ACE/ace/config-sunos5.4-g++.h deleted file mode 100644 index 74be0d51147..00000000000 --- a/ACE/ace/config-sunos5.4-g++.h +++ /dev/null @@ -1,164 +0,0 @@ -/* -*- C++ -*- */ -// The following configuration file is designed to work for SunOS 5.4 -// platforms using the GNU g++ compiler. - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include /**/ "ace/pre.h" - -#if ! defined (__ACE_INLINE__) -# define __ACE_INLINE__ -#endif /* ! __ACE_INLINE__ */ - -#include "ace/config-g++-common.h" - -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT - -// Platform supports pread() and pwrite() -#define ACE_HAS_P_READ_WRITE - -#define ACE_HAS_XPG4_MULTIBYTE_CHAR - -// Platform has POSIX terminal interface. -#define ACE_HAS_TERMIOS - -// Platform supports System V IPC (most versions of UNIX, but not Win32) -#define ACE_HAS_SYSV_IPC - -// Sun has the wrong prototype for sendmsg. -#define ACE_HAS_NONCONST_SENDMSG - -// Platform supports system configuration information. -#define ACE_HAS_SYS_SYSTEMINFO_H -#define ACE_HAS_SYSV_SYSINFO - -// Platform supports the POSIX regular expression library -#define ACE_HAS_REGEX - -// Platform supports recvmsg and sendmsg. -#define ACE_HAS_MSG - -// Compiler/platform contains the <sys/syscall.h> file. -#define ACE_HAS_SYS_SYSCALL_H - -// Compiler/platform correctly calls init()/fini() for shared libraries. -#define ACE_HAS_AUTOMATIC_INIT_FINI - -// Platform supports POSIX O_NONBLOCK semantics. -#define ACE_HAS_POSIX_NONBLOCK - -// Compiler/platform supports SunOS high resolution timers. -#define ACE_HAS_HI_RES_TIMER - -// Platform supports IP multicast -#define ACE_HAS_IP_MULTICAST - -// Compiler/platform supports alloca() -// Although ACE does have alloca() on this compiler/platform combination, it is -// disabled by default since it can be dangerous. Uncomment the following line -// if you ACE to use it. -//#define ACE_HAS_ALLOCA - -// Compiler/platform has <alloca.h> -#define ACE_HAS_ALLOCA_H - -// Platform contains <poll.h>. -#define ACE_HAS_POLL - -// Platform supports POSIX timers via timestruc_t. -#define ACE_HAS_POSIX_TIME - -// Platform supports the /proc file system. -#define ACE_HAS_PROC_FS - -// Platform supports the prusage_t struct. -#define ACE_HAS_PRUSAGE_T - -// Compiler/platform defines the sig_atomic_t typedef. -#define ACE_HAS_SIG_ATOMIC_T - -// Platform supports SVR4 extended signals. -#define ACE_HAS_SIGINFO_T -#define ACE_HAS_UCONTEXT_T - -// Compiler/platform provides the sockio.h file. -#define ACE_HAS_SYS_SOCKIO_H - -// Compiler supports the ssize_t typedef. -#define ACE_HAS_SSIZE_T - -// Platform supports STREAMS. -#define ACE_HAS_STREAMS - -// Platform supports STREAM pipes. -#define ACE_HAS_STREAM_PIPES - -// Compiler/platform supports struct strbuf. -#define ACE_HAS_STRBUF_T - -// Compiler/platform supports SVR4 dynamic linking semantics. -#define ACE_HAS_SVR4_DYNAMIC_LINKING - -// Compiler/platform supports SVR4 gettimeofday() prototype. -#define ACE_HAS_SVR4_GETTIMEOFDAY - -// Platform lacks pthread_sigaction -#define ACE_LACKS_PTHREAD_THR_SIGSETMASK - -// Compiler/platform supports SVR4 TLI (in particular, T_GETNAME stuff)... -#define ACE_HAS_SVR4_TLI - -// Platform provides <sys/filio.h> header. -#define ACE_HAS_SYS_FILIO_H - -#define ACE_HAS_STRSIGNAL - -/* Turn off the following defines if you want to disable threading. */ -// Compile using multi-thread libraries. -#if !defined (ACE_MT_SAFE) -# define ACE_MT_SAFE 1 -# if !defined (_REENTRANT) -# define _REENTRANT -# endif /* _REENTRANT */ -#endif /* !ACE_MT_SAFE */ - -// Platform supports Solaris threads. -#define ACE_HAS_STHREADS - -// Platform supports threads. -#define ACE_HAS_THREADS - -// Compiler/platform has thread-specific storage -#define ACE_HAS_THREAD_SPECIFIC_STORAGE - -// Platform supports reentrant functions (i.e., all the POSIX *_r functions). -#define ACE_HAS_REENTRANT_FUNCTIONS - -/* end threading defines */ - -#define ACE_HAS_PRIOCNTL -#define ACE_NEEDS_LWP_PRIO_SET - -// Platform supports TLI timod STREAMS module. -#define ACE_HAS_TIMOD_H - -// Platform supports TLI tiuser header. -#define ACE_HAS_TIUSER_H - -// Platform provides TLI function prototypes. -#define ACE_HAS_TLI_PROTOTYPES - -// Platform supports TLI. -#define ACE_HAS_TLI - -// Use the poll() event demultiplexor rather than select(). -//#define ACE_USE_POLL - -// Defines the page size of the system. -#define ACE_PAGE_SIZE 4096 -#define ACE_HAS_IDTYPE_T -#define ACE_HAS_GPERF -#define ACE_HAS_DIRENT - -#include /**/ "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/ACE/ace/config-sunos5.4-sunc++-4.x.h b/ACE/ace/config-sunos5.4-sunc++-4.x.h deleted file mode 100644 index 4bcec509c33..00000000000 --- a/ACE/ace/config-sunos5.4-sunc++-4.x.h +++ /dev/null @@ -1,172 +0,0 @@ -/* -*- C++ -*- */ -// The following configuration file is designed to work for SunOS 5.4 -// platforms using the SunC++ 4.0.x compiler. - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include /**/ "ace/pre.h" - -#if ! defined (__ACE_INLINE__) -# define __ACE_INLINE__ -#endif /* ! __ACE_INLINE__ */ - -// Optimize ACE_Handle_Set for select(). -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT - -// Platform supports pread() and pwrite() -#define ACE_HAS_P_READ_WRITE - -#define ACE_HAS_XPG4_MULTIBYTE_CHAR - -// Platform supports System V IPC (most versions of UNIX, but not Win32) -#define ACE_HAS_SYSV_IPC - -// Sun has the wrong prototype for sendmsg. -#define ACE_HAS_NONCONST_SENDMSG - -// Platform supports system configuration information. -#define ACE_HAS_SYS_SYSTEMINFO_H -#define ACE_HAS_SYSV_SYSINFO - -// Platform supports the POSIX regular expression library. -#define ACE_HAS_REGEX - -// Platform supports recvmsg and sendmsg. -#define ACE_HAS_MSG - -// Compiler/platform contains the <sys/syscall.h> file. -#define ACE_HAS_SYS_SYSCALL_H - -// Platform has POSIX terminal interface. -#define ACE_HAS_TERMIOS - -// Compiler/platform correctly calls init()/fini() for shared libraries. -#define ACE_HAS_AUTOMATIC_INIT_FINI - -// Platform supports POSIX O_NONBLOCK semantics. -#define ACE_HAS_POSIX_NONBLOCK - -// Compiler/platform supports SunOS high resolution timers. -#define ACE_HAS_HI_RES_TIMER - -// Platform supports IP multicast -#define ACE_HAS_IP_MULTICAST - -// Compiler/platform supports alloca() -// Although ACE does have alloca() on this compiler/platform combination, it is -// disabled by default since it can be dangerous. Uncomment the following line -// if you ACE to use it. -//#define ACE_HAS_ALLOCA - -// Compiler/platform has <alloca.h> -#define ACE_HAS_ALLOCA_H - -// Platform contains <poll.h>. -#define ACE_HAS_POLL - -// Platform supports POSIX timers via timestruc_t. -#define ACE_HAS_POSIX_TIME - -// Platform supports the /proc file system. -#define ACE_HAS_PROC_FS - -// Platform supports the prusage_t struct. -#define ACE_HAS_PRUSAGE_T - -// Compiler/platform defines the sig_atomic_t typedef. -#define ACE_HAS_SIG_ATOMIC_T - -// Platform supports SVR4 extended signals. -#define ACE_HAS_SIGINFO_T -#define ACE_HAS_UCONTEXT_T - -// Compiler/platform provides the sockio.h file. -#define ACE_HAS_SYS_SOCKIO_H - -// Compiler supports the ssize_t typedef. -#define ACE_HAS_SSIZE_T - -// Platform supports STREAMS. -#define ACE_HAS_STREAMS - -// Platform supports STREAM pipes. -#define ACE_HAS_STREAM_PIPES - -// Compiler/platform supports struct strbuf. -#define ACE_HAS_STRBUF_T - -// Compiler/platform supports SVR4 dynamic linking semantics. -#define ACE_HAS_SVR4_DYNAMIC_LINKING - -// Compiler/platform supports SVR4 gettimeofday() prototype. -#define ACE_HAS_SVR4_GETTIMEOFDAY - -// Compiler/platform supports SVR4 signal typedef. -#define ACE_HAS_SVR4_SIGNAL_T - -// Platform lacks pthread_sigaction -#define ACE_LACKS_PTHREAD_THR_SIGSETMASK - -// Compiler/platform supports SVR4 ACE_TLI (in particular, T_GETNAME stuff)... -#define ACE_HAS_SVR4_TLI - -// Platform provides <sys/filio.h> header. -#define ACE_HAS_SYS_FILIO_H - -#define ACE_HAS_STRSIGNAL - -/* Turn off the following defines if you want to disable threading. */ -// Compile using multi-thread libraries. -#if !defined (ACE_MT_SAFE) -# define ACE_MT_SAFE 1 -#endif - -// Platform supports Solaris threads. -#define ACE_HAS_STHREADS - -// Platform supports threads. -#define ACE_HAS_THREADS - -// Compiler/platform has thread-specific storage -#define ACE_HAS_THREAD_SPECIFIC_STORAGE - -// Platform supports reentrant functions (i.e., all the POSIX *_r functions). -#define ACE_HAS_REENTRANT_FUNCTIONS - -/* end threading defines */ - -#define ACE_HAS_PRIOCNTL -#define ACE_NEEDS_LWP_PRIO_SET - -// Reactor detects deadlock -// #define ACE_REACTOR_HAS_DEADLOCK_DETECTION - -// Platform supports ACE_TLI timod STREAMS module. -#define ACE_HAS_TIMOD_H - -// Platform supports ACE_TLI tiuser header. -#define ACE_HAS_TIUSER_H - -// Platform provides ACE_TLI function prototypes. -#define ACE_HAS_TLI_PROTOTYPES - -// Platform supports ACE_TLI. -#define ACE_HAS_TLI - -#define ACE_LACKS_LINEBUFFERED_STREAMBUF -#define ACE_LACKS_SIGNED_CHAR - -// Use the poll() event demultiplexor rather than select(). -//#define ACE_USE_POLL - -#define ACE_NEEDS_DEV_IO_CONVERSION - -// Defines the page size of the system. -#define ACE_PAGE_SIZE 4096 -#define ACE_HAS_IDTYPE_T - -#define ACE_HAS_GPERF -#define ACE_HAS_DIRENT - -#include /**/ "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/ACE/ace/config-sunos5.5.h b/ACE/ace/config-sunos5.5.h deleted file mode 100644 index 7fc73ca2e75..00000000000 --- a/ACE/ace/config-sunos5.5.h +++ /dev/null @@ -1,336 +0,0 @@ -/* -*- C++ -*- */ -// This configuration file is designed to work for SunOS 5.5 platforms -// using the following compilers: -// * Sun C++ 4.2 and later (including 5.x), patched as noted below -// * g++ -// * Green Hills 1.8.8 and later - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include /**/ "ace/pre.h" - -#define ACE_LACKS_STDINT_H - -// alphasort() is present on earlier Solaris versions but is marked as not for -// use on non-BSD systems and not supported for use in applications that use -// system libraries or with multiple threads. So it's mostly useless. -#define ACE_LACKS_ALPHASORT - -// Solaris doesn't support log2() -#define ACE_LACKS_LOG2 - -// SunOS 5.5 does not provide getloadavg() -#define ACE_LACKS_GETLOADAVG - -// Before we do anything, we should include <sys/feature_tests.h> to -// ensure that things are set up properly. -#include <sys/feature_tests.h> - -// Sun has the posix defines so let this file sort out what Sun delivers -#include "ace/config-posix.h" - -// Compiler version-specific settings: -#if defined (__SUNPRO_CC) -# if (__SUNPRO_CC < 0x410) - // The following might not be necessary, but I can't tell: my build - // with Sun C++ 4.0.1 never completes. -# define ACE_NEEDS_DEV_IO_CONVERSION -# elif (__SUNPRO_CC >= 0x420) -# if (__SUNPRO_CC >= 0x500) - // 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_THR_C_DEST -# endif /* __SUNPRO_CC_COMPAT >= 5 */ -# endif /* __SUNPRO_CC >= 0x500 */ -# endif /* __SUNPRO_CC >= 0x420 */ - -# define ACE_CAST_CONST const -# define ACE_HAS_HI_RES_TIMER -# define ACE_HAS_SIG_C_FUNC /* Sun CC 5.0 needs this, 4.2 doesn't mind. */ -# define ACE_HAS_XPG4_MULTIBYTE_CHAR -# define ACE_LACKS_LINEBUFFERED_STREAMBUF -# define ACE_LACKS_SIGNED_CHAR - - /* If you want to disable threading with Sun CC, remove -mt - from your CFLAGS, e.g., using make threads=0. */ - - -// Take advantage of Sun Studio 8 (Sun C++ 5.5) or better symbol -// visibility to generate improved shared library binaries. -# if (__SUNPRO_CC > 0x540) - -# if defined (ACE_HAS_CUSTOM_EXPORT_MACROS) && ACE_HAS_CUSTOM_EXPORT_MACROS == 0 -# undef ACE_HAS_CUSTOM_EXPORT_MACROS -# else -# ifndef ACE_HAS_CUSTOM_EXPORT_MACROS -# define ACE_HAS_CUSTOM_EXPORT_MACROS -# endif /* !ACE_HAS_CUSTOM_EXPORT_MACROS */ -# define ACE_Proper_Export_Flag __symbolic -# define ACE_Proper_Import_Flag __global - -# define ACE_EXPORT_SINGLETON_DECLARATION(T) template class ACE_Proper_Export_Flag T -# define ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) template class ACE_Proper_Export_Flag SINGLETON_TYPE <CLASS, LOCK>; - -// # define ACE_IMPORT_SINGLETON_DECLARATION(T) extern template class T -// # define ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) extern template class SINGLETON_TYPE<CLASS, LOCK>; - -# endif /* ACE_HAS_CUSTOM_EXPORT_MACROS == 0 */ -# endif /* __SUNPRO_CC > 0x540 (> Sun C++ 5.4) */ - -#elif defined (__GNUG__) -# include "ace/config-g++-common.h" - -# define ACE_HAS_HI_RES_TIMER -# define ACE_HAS_XPG4_MULTIBYTE_CHAR - -# if !defined (ACE_MT_SAFE) || ACE_MT_SAFE != 0 - // ACE_MT_SAFE is #defined below, for all compilers. -# if !defined (_REENTRANT) - /* If you want to disable threading, comment out the following - line. Or, add -DACE_MT_SAFE=0 to your CFLAGS, e.g., using - make threads=0. */ -# define _REENTRANT -# endif /* _REENTRANT */ -# endif /* !ACE_MT_SAFE */ - -#else /* ! __SUNPRO_CC && ! __GNUG__ */ -# ifdef __cplusplus /* Let it slide for C compilers. */ -# error unsupported compiler in ace/config-sunos5.5.h -# endif /* __cplusplus */ -#endif /* ! __SUNPRO_CC && ! __GNUG__ */ - -#if !defined (__ACE_INLINE__) -// @note If you have link problems with undefined inline template -// functions with Sun C++, be sure that the #define of __ACE_INLINE__ -// below is not commented out. -# define __ACE_INLINE__ -#endif /* ! __ACE_INLINE__ */ - -// Platform supports the POSIX regular expression library. -// @note Please comment out the ACE_HAS_REGEX #define if you -// have link problems with g++ or egcs on SunOS 5.5. -#define ACE_HAS_REGEX - -// Optimize ACE_Handle_Set for select(). -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT - -// select()'s timeval arg is not declared as const and may be modified -#define ACE_HAS_NONCONST_SELECT_TIMEVAL - -// Platform supports pread() and pwrite() -#define ACE_HAS_P_READ_WRITE -#define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS -#define ACE_HAS_UALARM -#define ACE_LACKS_UALARM_PROTOTYPE - -// Platform supports System V IPC (most versions of UNIX, but not Win32) -#define ACE_HAS_SYSV_IPC - -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES - -// Platform supports system configuration information. -#define ACE_HAS_SYS_SYSTEMINFO_H -#define ACE_HAS_SYSV_SYSINFO - -// Platform supports recvmsg and sendmsg. -#define ACE_HAS_MSG - -// Compiler/platform contains the <sys/syscall.h> file. -#define ACE_HAS_SYS_SYSCALL_H - -// Platform has POSIX terminal interface. -#define ACE_HAS_TERMIOS - -// Compiler/platform correctly calls init()/fini() for shared libraries. -#define ACE_HAS_AUTOMATIC_INIT_FINI - -// Platform supports POSIX O_NONBLOCK semantics. -#define ACE_HAS_POSIX_NONBLOCK - -// Platform supports IP multicast -#define ACE_HAS_IP_MULTICAST - -// This setting was determined by running the autoconf tests. If it doesn't -// work uniformly, will need some tweaking, possibly based on other -// XPG feature-test macros. -#define ACE_HAS_CONST_CHAR_SWAB - -// Compiler/platform supports alloca() -// Although ACE does have alloca() on this compiler/platform combination, it is -// disabled by default since it can be dangerous. Uncomment the following line -// if you ACE to use it. -//#define ACE_HAS_ALLOCA - -// Compiler/platform has <alloca.h> -#define ACE_HAS_ALLOCA_H - -// Platform contains <poll.h>. -#define ACE_HAS_POLL - -// Platform supports POSIX timers via timestruc_t. -#define ACE_HAS_POSIX_TIME - -// ACE_HAS_CLOCK_GETTIME requires linking with -lposix4. -#define ACE_HAS_CLOCK_GETTIME -#define ACE_HAS_CLOCK_SETTIME - -// Platform supports the /proc file system. -#define ACE_HAS_PROC_FS - -// Platform supports the prusage_t struct. -#define ACE_HAS_PRUSAGE_T -#define ACE_HAS_GETRUSAGE - -// Compiler/platform defines the sig_atomic_t typedef. -#define ACE_HAS_SIG_ATOMIC_T - -// Platform supports SVR4 extended signals. -#define ACE_HAS_SIGINFO_T -#define ACE_HAS_UCONTEXT_T - -// Compiler/platform provides the sockio.h file. -#define ACE_HAS_SYS_SOCKIO_H - -// Compiler supports the ssize_t typedef. -#define ACE_HAS_SSIZE_T - -// Platform supports STREAMS. -#define ACE_HAS_STREAMS - -// Platform supports STREAM pipes. -#define ACE_HAS_STREAM_PIPES - -// Compiler/platform supports struct strbuf. -#define ACE_HAS_STRBUF_T - -// Compiler/platform supports SVR4 dynamic linking semantics. -#define ACE_HAS_SVR4_DYNAMIC_LINKING - -// Compiler/platform supports SVR4 gettimeofday() prototype. -#define ACE_HAS_SVR4_GETTIMEOFDAY - -// Compiler/platform supports SVR4 ACE_TLI (in particular, T_GETNAME stuff)... -#define ACE_HAS_SVR4_TLI - -// Platform provides <sys/filio.h> header. -#define ACE_HAS_SYS_FILIO_H - -#define ACE_HAS_STRSIGNAL - -// SunOS 5.5.x does not support mkstemp -#define ACE_LACKS_MKSTEMP -#define ACE_LACKS_SYS_SYSCTL_H - -#if !(defined(_XOPEN_SOURCE) && (_XOPEN_VERSION - 0 >= 4)) -# define ACE_HAS_CHARPTR_SHMDT -#endif - -#if !defined (ACE_MT_SAFE) || (ACE_MT_SAFE == 1) -#if defined (_REENTRANT) || \ - (defined (_POSIX_C_SOURCE) && (_POSIX_C_SOURCE - 0 >= 199506L)) || \ - defined (_POSIX_PTHREAD_SEMANTICS) - // Compile using multi-thread libraries. -# define ACE_HAS_THREADS - -# if !defined (ACE_MT_SAFE) -# define ACE_MT_SAFE 1 -# endif /* ACE_MT_SAFE */ - - // Platform supports POSIX pthreads *and* Solaris threads, by - // default! If you only want to use POSIX pthreads, add - // -D_POSIX_PTHREAD_SEMANTICS to your CFLAGS. Or, #define it right - // here. See the Intro (3) man page for information on - // -D_POSIX_PTHREAD_SEMANTICS. -# if defined (_POSIX_PTHREAD_SEMANTICS) -# define ACE_LACKS_RWLOCK_T -# else -# define ACE_HAS_STHREADS -# endif /* ! _POSIX_PTHREAD_SEMANTICS */ - -# define ACE_HAS_PTHREADS - // . . . but only supports SCHED_OTHER scheduling policy -# define ACE_HAS_ONLY_SCHED_OTHER -# define ACE_HAS_SIGWAIT -# define ACE_HAS_SIGTIMEDWAIT -# define ACE_HAS_SIGSUSPEND -# define ACE_LACKS_PTHREAD_ATTR_SETSTACK - - // Compiler/platform has thread-specific storage -# define ACE_HAS_THREAD_SPECIFIC_STORAGE - - // Platform supports reentrant functions (i.e., all the POSIX *_r functions). -# define ACE_HAS_REENTRANT_FUNCTIONS - -# define ACE_NEEDS_LWP_PRIO_SET -# define ACE_HAS_THR_YIELD -# define ACE_LACKS_PTHREAD_YIELD -#endif /* _REENTRANT || _POSIX_C_SOURCE >= 199506L || \ - _POSIX_PTHREAD_SEMANTICS */ -#endif /* !ACE_MT_SAFE || ACE_MT_SAFE == 1 */ - -#define ACE_HAS_PRIOCNTL - -// Platform supports ACE_TLI timod STREAMS module. -#define ACE_HAS_TIMOD_H - -// Platform supports ACE_TLI tiuser header. -#define ACE_HAS_TIUSER_H - -// Platform provides ACE_TLI function prototypes. -#define ACE_HAS_TLI_PROTOTYPES - -// Platform has broken t_error() prototype. -#define ACE_HAS_BROKEN_T_ERROR - -// Platform supports ACE_TLI. -#define ACE_HAS_TLI - -#define ACE_HAS_GETPAGESIZE 1 - -#define ACE_HAS_IDTYPE_T - -#define ACE_HAS_GPERF -#define ACE_HAS_DIRENT - -#define ACE_LACKS_ISCTYPE -#define ACE_LACKS_ISBLANK - -#if defined (__SUNPRO_CC) -# define ACE_CC_NAME ACE_TEXT ("SunPro C++") -# define ACE_CC_MAJOR_VERSION (__SUNPRO_CC >> 8) -# define ACE_CC_MINOR_VERSION (__SUNPRO_CC & 0x00ff) -# define ACE_CC_BETA_VERSION (0) -#endif /* __SUNPRO_CC */ - -#if defined (i386) && (_FILE_OFFSET_BITS==32) -# define ACE_HAS_X86_STAT_MACROS -#endif /* i386 && _FILE_OFFSET_BITS==32 */ - -#define ACE_MALLOC_ALIGN ((size_t)8) -#define ACE_LACKS_SETREUID_PROTOTYPE -#define ACE_LACKS_SETREGID_PROTOTYPE - -// Solaris does indeed implement the inet_aton() function, but it is -// found in `libresolv.*'. It doesn't seem worth it to link another -// library just for that function. Just use the emulation in ACE that -// has been used for years. -#define ACE_LACKS_INET_ATON - -// Solaris doesn't have wcstoull -#define ACE_LACKS_WCSTOLL -#define ACE_LACKS_WCSTOULL - -#if defined (_LARGEFILE_SOURCE) || (_FILE_OFFSET_BITS==64) -#undef ACE_HAS_PROC_FS -#undef ACE_HAS_PRUSAGE_T -#endif /* (_LARGEFILE_SOURCE) || (_FILE_OFFSET_BITS==64) */ - -// Sum of the iov_len values can't be larger then SSIZE_MAX -#define ACE_HAS_SOCK_BUF_SIZE_MAX - -#define ACE_LACKS_SETENV -#define ACE_LACKS_UNSETENV - -#include /**/ "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/ACE/ace/config-sunos5.6.h b/ACE/ace/config-sunos5.6.h deleted file mode 100644 index 2e2ef3b9d03..00000000000 --- a/ACE/ace/config-sunos5.6.h +++ /dev/null @@ -1,99 +0,0 @@ -/* -*- C++ -*- */ -// The following configuration file is designed to work for SunOS 5.6 -// platforms using the SunC++ 4.x or g++ compilers. - -#ifndef ACE_CONFIG_H - -// ACE_CONFIG_H is defined by one of the following #included headers. - -// #include the SunOS 5.5 config file, then add SunOS 5.6 updates below. - -#include "ace/config-sunos5.5.h" - -#if (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE > 2) || \ - defined (__EXTENSIONS__) -// The asctime_r/ctime_r parameters change at POSIX.1c-1995 -# if (defined (_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 199506L) -# define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R -# endif /* POSIX_C_SOURCE >= 199506L */ -# define ACE_HAS_SIGWAIT -// Hack 'cuz _POSIX_C_SOURCE > 2 and -DEXTENSIONS hides this. -# define ACE_LACKS_MADVISE_PROTOTYPE -#endif /* _POSIX_C_SOURCE > 2 || __EXTENSIONS__ */ - -// Support for the SunC++ 5.2 compiler. -// Do not undefine for compat mode < 5 -#if defined (__SUNPRO_CC) && __SUNPRO_CC > 0x510 -#if defined (__SUNPRO_CC_COMPAT) && (__SUNPRO_CC_COMPAT >= 5) -#ifdef ACE_LACKS_ACE_IOSTREAM -#undef ACE_LACKS_ACE_IOSTREAM -#endif /* ACE_LACKS_ACE_IOSTREAM */ -#endif /* defined (__SUNPRO_CC_COMPAT) && (__SUNPRO_CC_COMPAT >= 5) */ - -#ifndef ACE_LACKS_UNBUFFERED_STREAMBUF -#define ACE_LACKS_UNBUFFERED_STREAMBUF 1 -#endif /* ACE_LACKS_UNBUFFERED_STREAMBUF */ -#ifndef ACE_TEMPLATES_REQUIRE_SOURCE -#define ACE_TEMPLATES_REQUIRE_SOURCE 1 -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ -// Forte 7 seems to botch this one... -#ifndef ACE_HAS_THR_C_DEST -#define ACE_HAS_THR_C_DEST 1 -#endif /* ACE_HAS_THR_C_DEST */ -#ifndef ACE_HAS_THR_C_FUNC -#define ACE_HAS_THR_C_FUNC 1 -#endif /* ACE_HAS_THR_C_FUNC */ -#ifndef ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES 1 -#endif /* ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES */ -#ifndef ACE_HAS_SIG_C_FUNC -#define ACE_HAS_SIG_C_FUNC 1 -#endif /* ACE_HAS_SIG_C_FUNC */ -#ifndef ACE_LACKS_IOSTREAM_FX -#define ACE_LACKS_IOSTREAM_FX 1 -#endif /* ACE_LACKS_IOSTREAM_FX */ -#ifndef ACE_LACKS_LINEBUFFERED_STREAMBUF -#define ACE_LACKS_LINEBUFFERED_STREAMBUF 1 -#endif /* ACE_LACKS_LINEBUFFERED_STREAMBUF */ - -#endif /* defined (__SUNPRO_CC) && __SUNPRO_CC > 0x510 */ - -// SunOS 5.6 and above support mkstemp -#undef ACE_LACKS_MKSTEMP - -// SunOS 5.6 has AIO calls. -#if !defined (ACE_HAS_AIO_CALLS) -#define ACE_HAS_AIO_CALLS -#endif /* ACE_HAS_AIO_CALLS */ - -#if !defined (ACE_HAS_POSIX_REALTIME_SIGNALS) -#define ACE_HAS_POSIX_REALTIME_SIGNALS -#endif /* ACE_HAS_POSIX_REALTIME_SIGNALS */ - -#if !defined (ACE_HAS_POSIX_MESSAGE_PASSING) -#define ACE_HAS_POSIX_MESSAGE_PASSING -#endif /* ACE_HAS_POSIX_MESSAGE_PASSING */ - -#if !defined (ACE_HAS_POSIX_SEM) -#define ACE_HAS_POSIX_SEM -#endif /* ACE_HAS_POSIX_SEM */ - -// Sunos 5.6's aio_* with RT signals is broken. -#if !defined (ACE_POSIX_AIOCB_PROACTOR) -#define ACE_POSIX_AIOCB_PROACTOR -#endif /* ACE_POSIX_AIOCB_PROACTOR */ - -// SunOS 5.6 introduced shm_open, but need to turn on POSIX.1b or higher -// to pick it up. -#if defined (_POSIX_C_SOURCE) && (_POSIX_C_SOURCE > 2) -# define ACE_HAS_SHM_OPEN -#else -# undef ACE_HAS_SHM_OPEN -#endif /* _POSIX_C_SOURCE > 2 */ - -// The struct msghdr is conditional on SunOS 5.6 based on _XPG4_2 -#if defined(_XPG4_2) -# define ACE_HAS_4_4BSD_SENDMSG_RECVMSG -#endif /* _XPG4_2 */ - -#endif /* ACE_CONFIG_H */ diff --git a/ACE/ace/config-sunos5.7.h b/ACE/ace/config-sunos5.7.h deleted file mode 100644 index d21859e5d19..00000000000 --- a/ACE/ace/config-sunos5.7.h +++ /dev/null @@ -1,67 +0,0 @@ -/* -*- C++ -*- */ -// The following configuration file is designed to work for SunOS 5.7 -// (Solaris 7) platforms using the SunC++ 4.x, 5.x, or g++ compilers. - -#ifndef ACE_CONFIG_H - -// ACE_CONFIG_H is defined by one of the following #included headers. - -// #include the SunOS 5.6 config file, then add SunOS 5.7 updates below. - -#include "ace/config-sunos5.6.h" - -// This may be true for earlier Solaris versions, but I can only verify -// it for Solaris 7 and later. -#define ACE_HAS_VFWPRINTF -#if defined (ACE_HAS_SHM_OPEN) -# define ACE_SHM_OPEN_REQUIRES_ONE_SLASH -#endif - -// Sun began distributing <sys/loadavg.h> with SunOS 5.7 -#define ACE_HAS_SYS_LOADAVG_H - -// SunOS 5.7 has getloadavg() -#undef ACE_LACKS_GETLOADAVG - -#if defined (__SUNPRO_CC) && (__SUNPRO_CC <= 0x530) - // Wide character methods are in std:: when using SunCC 5.3 -# define ACE_WCHAR_IN_STD_NAMESPACE -#endif - -// SunOS 5.7 supports SCHED_FIFO and SCHED_RR, as well as SCHED_OTHER. -#undef ACE_HAS_ONLY_SCHED_OTHER - -// SunOS 5.7 gets this right . . . -#undef ACE_HAS_BROKEN_T_ERROR - -// And doesn't need to set LWP priorities, as shown by -// performance-tests/Misc/preempt. -#undef ACE_NEEDS_LWP_PRIO_SET - -// SunOS 5.7 can support Real-Time Signals and POSIX4 AIO operations -// are supported. - -#if !defined (ACE_HAS_AIO_CALLS) -#define ACE_HAS_AIO_CALLS -#endif /* !ACE_HAS_AIO_CALLS */ - -// SunOS 5.7 has socklen_t -#define ACE_HAS_SOCKLEN_T - -#if defined (__sparcv9) -#if !defined (_LP64) -# define _LP64 -#endif /* _LP64 */ -#define ACE_SIZEOF_LONG 8 /* Needed to circumvent compiler bug #4294969 */ -#endif /* __sparcv9 */ - -#if (defined(_XOPEN_SOURCE) && (_XOPEN_VERSION - 0 == 4)) /* XPG4 or XPG4v2 */ -// 2 parameter wcstok() -#else /* XPG4 or XPG4v2 */ -# define ACE_HAS_3_PARAM_WCSTOK -#endif - -// Solaris 7 started to support /dev/poll -#define ACE_HAS_DEV_POLL - -#endif /* ACE_CONFIG_H */ diff --git a/ACE/ace/config-sunos5.8.h b/ACE/ace/config-sunos5.8.h deleted file mode 100644 index b78ee27a187..00000000000 --- a/ACE/ace/config-sunos5.8.h +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- C++ -*- */ -// The following configuration file is designed to work for SunOS 5.8 -// (Solaris 8) platforms using the SunC++ 4.x, 5.x, 6.x, or g++ compilers. - -#ifndef ACE_CONFIG_H - -// ACE_CONFIG_H is defined by one of the following #included headers. - -// #include the SunOS 5.7 config, then add any SunOS 5.8 updates below. -#include "ace/config-sunos5.7.h" - -#undef ACE_WCHAR_IN_STD_NAMESPACE - -// This may be true for versions prior to Solaris 8 as well, but I don't -// have any to try it on. -#if !defined (ACE_HAS_TIMEZONE) -# define ACE_HAS_TIMEZONE -#endif - -// The range of thread priorities for 5.8 differs from 5.7 in the -// minimum priority for the SCHED_OTHER policy (i.e., -// ACE_THR_PRI_OTHER_MIN) -# define ACE_THR_PRI_OTHER_MIN (long) -20 - -# if defined (_POSIX_PTHREAD_SEMANTICS) -# ifdef ACE_LACKS_RWLOCK_T -# undef ACE_LACKS_RWLOCK_T -# endif /* ACE_LACKS_RWLOCK_T */ -# endif /* _POSIX_PTHREAD_SEMANTICS */ - -// This is no longer the case for Sun 5.9 onwards -# undef ACE_HAS_X86_STAT_MACROS - -// gethostbyaddr does not handle IPv6-mapped-IPv4 addresses -#define ACE_HAS_BROKEN_GETHOSTBYADDR_V4MAPPED - -#endif /* ACE_CONFIG_H */ diff --git a/ACE/ace/config-sunos5.9.h b/ACE/ace/config-sunos5.9.h deleted file mode 100644 index 53cb350fbd4..00000000000 --- a/ACE/ace/config-sunos5.9.h +++ /dev/null @@ -1,18 +0,0 @@ -/* -*- C++ -*- */ -// The following configuration file is designed to work for SunOS 5.9 -// (Solaris 9) platforms using the SunC++ 5.x (Forte 6 and 7), or g++ -// compilers. - -#ifndef ACE_CONFIG_H - -// ACE_CONFIG_H is defined by one of the following #included headers. - -// #include the SunOS 5.8 config, then add any SunOS 5.9 updates below. -#include "ace/config-sunos5.8.h" - -#define ACE_HAS_SENDFILE 1 -#define ACE_LACKS_GETADDRINFO -#define ACE_LACKS_GETNAMEINFO -#define ACE_LACKS_THR_CONCURRENCY_FUNCS - -#endif /* ACE_CONFIG_H */ diff --git a/ACE/ace/config-vxworks6.4.h b/ACE/ace/config-vxworks6.4.h index 430923a9c7e..91983c3f2d6 100644 --- a/ACE/ace/config-vxworks6.4.h +++ b/ACE/ace/config-vxworks6.4.h @@ -42,9 +42,6 @@ # define _C99 # endif # endif - -#elif defined (__DCC__) -# define ACE_TEMPLATES_REQUIRE_SOURCE #else /* ! __GNUG__ && !__DCC__ */ # ifdef __cplusplus /* Let it slide for C compilers. */ # error unsupported compiler on VxWorks diff --git a/ACE/ace/config-win32-borland.h b/ACE/ace/config-win32-borland.h index 096feb0eb43..1ffc9968e98 100644 --- a/ACE/ace/config-win32-borland.h +++ b/ACE/ace/config-win32-borland.h @@ -114,7 +114,6 @@ #define ACE_HAS_USER_MODE_MASKS 1 #define ACE_LACKS_ACE_IOSTREAM 1 #define ACE_LACKS_LINEBUFFERED_STREAMBUF 1 -#define ACE_TEMPLATES_REQUIRE_SOURCE 1 #if defined (ACE_HAS_BCC32) # define ACE_UINT64_FORMAT_SPECIFIER_ASCII "%Lu" # define ACE_INT64_FORMAT_SPECIFIER_ASCII "%Ld" diff --git a/ACE/ace/config-win32-common.h b/ACE/ace/config-win32-common.h index a22eb51989a..f22fbb0f063 100644 --- a/ACE/ace/config-win32-common.h +++ b/ACE/ace/config-win32-common.h @@ -8,13 +8,6 @@ #error Use config-win32.h in config.h instead of this header #endif /* ACE_CONFIG_WIN32_H */ -// Windows Mobile (CE) stuff is primarily further restrictions to what's -// in the rest of this file. Also, it defined ACE_HAS_WINCE, which is used -// in this file. -#if defined (_WIN32_WCE) -# include "ace/config-WinCE.h" -#endif /* _WIN32_WCE */ - #if defined(__MINGW32__) // When using the --std=c++0x option with MinGW the compiler omits defining // the following required macros (at least with the GCC 4.6.2 version) @@ -31,7 +24,7 @@ #endif // Complain if WIN32 is not already defined. -#if !defined (WIN32) && !defined (ACE_HAS_WINCE) +#if !defined (WIN32) # error Please define WIN32 in your project settings. #endif @@ -106,8 +99,6 @@ # define ACE_MT_SAFE 1 #endif -// On winCE these classes do not exist. If they are -// introduced in the future, no changes need to be made #if defined (ABOVE_NORMAL_PRIORITY_CLASS) && \ defined (BELOW_NORMAL_PRIORITY_CLASS) && \ defined (HIGH_PRIORITY_CLASS) && \ @@ -210,18 +201,14 @@ # define ACE_IOV_MAX 64 #endif /* ACE_IOV_MAX */ -#if !defined (ACE_HAS_WINCE) // Platform supports pread() and pwrite() -# define ACE_HAS_WTOF -#endif /* ! ACE_HAS_WINCE */ +#define ACE_HAS_WTOF #define ACE_HAS_P_READ_WRITE -#if !defined (ACE_HAS_WINCE) -# define ACE_HAS_DIRECT_H -# define ACE_HAS_PROCESS_H -# define ACE_HAS_IO_H -#endif /* ! ACE_HAS_WINCE */ +#define ACE_HAS_DIRECT_H +#define ACE_HAS_PROCESS_H +#define ACE_HAS_IO_H #define ACE_DEFAULT_THREAD_PRIORITY 0 @@ -417,8 +404,6 @@ # include /**/ <afxwin.h> /* He is doing MFC */ // Windows.h will be included via afxwin.h->afx.h->afx_ver_.h->afxv_w32.h // #define _INC_WINDOWS // Prevent winsock.h from including windows.h -#elif defined (ACE_HAS_WINCE) -# include /**/ <windows.h> #endif #if !defined (_INC_WINDOWS) /* Already include windows.h ? */ @@ -448,68 +433,22 @@ # if !defined (_WINSOCK2API_) // will also include windows.h, if not present # include /**/ <winsock2.h> -// WinCE 4 doesn't define the Exxx values without the WSA prefix, so do that -// here. This is all lifted from the #if 0'd out part of winsock2.h. -# if defined (_WIN32_WCE) && (_WIN32_WCE < 0x600) -# define EWOULDBLOCK WSAEWOULDBLOCK -# define EINPROGRESS WSAEINPROGRESS -# define EALREADY WSAEALREADY -# define ENOTSOCK WSAENOTSOCK -# define EDESTADDRREQ WSAEDESTADDRREQ -# define EMSGSIZE WSAEMSGSIZE -# define EPROTOTYPE WSAEPROTOTYPE -# define ENOPROTOOPT WSAENOPROTOOPT -# define EPROTONOSUPPORT WSAEPROTONOSUPPORT -# define ESOCKTNOSUPPORT WSAESOCKTNOSUPPORT -# define EOPNOTSUPP WSAEOPNOTSUPP -# define EPFNOSUPPORT WSAEPFNOSUPPORT -# define EAFNOSUPPORT WSAEAFNOSUPPORT -# define EADDRINUSE WSAEADDRINUSE -# define EADDRNOTAVAIL WSAEADDRNOTAVAIL -# define ENETDOWN WSAENETDOWN -# define ENETUNREACH WSAENETUNREACH -# define ENETRESET WSAENETRESET -# define ECONNABORTED WSAECONNABORTED -# define ECONNRESET WSAECONNRESET -# define ENOBUFS WSAENOBUFS -# define EISCONN WSAEISCONN -# define ENOTCONN WSAENOTCONN -# define ESHUTDOWN WSAESHUTDOWN -# define ETOOMANYREFS WSAETOOMANYREFS -# define ETIMEDOUT WSAETIMEDOUT -# define ECONNREFUSED WSAECONNREFUSED -# define ELOOP WSAELOOP -# define ENAMETOOLONG WSAENAMETOOLONG -# define EHOSTDOWN WSAEHOSTDOWN -# define EHOSTUNREACH WSAEHOSTUNREACH -# define ENOTEMPTY WSAENOTEMPTY -# define EPROCLIM WSAEPROCLIM -# define EUSERS WSAEUSERS -# define EDQUOT WSAEDQUOT -# define ESTALE WSAESTALE -# define EREMOTE WSAEREMOTE -# endif /* (_WIN32_WCE) && (_WIN32_WCE < 0x600) */ # endif /* _WINSOCK2API */ # if defined (ACE_HAS_FORE_ATM_WS2) # include /**/ <ws2atm.h> # endif /*ACE_HAS_FORE_ATM_WS2 */ -// CE doesn't have Microsoft Winsock 2 extensions -# if !defined _MSWSOCK_ && !defined (ACE_HAS_WINCE) +# if !defined _MSWSOCK_ # include /**/ <mswsock.h> # endif /* _MSWSOCK_ */ # if defined (_MSC_VER) -# if defined (ACE_HAS_WINCE) -# pragma comment(lib, "ws2.lib") -# else -# pragma comment(lib, "ws2_32.lib") -# pragma comment(lib, "mswsock.lib") -# if defined (ACE_HAS_IPV6) -# pragma comment(lib, "iphlpapi.lib") -# endif -# endif /* ACE_HAS_WINCE */ +# pragma comment(lib, "ws2_32.lib") +# pragma comment(lib, "mswsock.lib") +# if defined (ACE_HAS_IPV6) +# pragma comment(lib, "iphlpapi.lib") +# endif # endif /* _MSC_VER */ # define ACE_WSOCK_VERSION 2, 0 @@ -521,7 +460,7 @@ // PharLap ETS has its own winsock lib, so don't grab the one // supplied with the OS. -# if defined (_MSC_VER) && !defined (_WIN32_WCE) && !defined (ACE_HAS_PHARLAP) +# if defined (_MSC_VER) && !defined (ACE_HAS_PHARLAP) # pragma comment(lib, "wsock32.lib") # endif /* _MSC_VER */ @@ -549,11 +488,9 @@ # define ACE_HAS_IP_MULTICAST #endif /* ACE_HAS_WINSOCK2 */ -#if !defined (ACE_HAS_WINCE) -# define ACE_HAS_INTERLOCKED_EXCHANGEADD -#endif +#define ACE_HAS_INTERLOCKED_EXCHANGEADD -#if !defined (ACE_HAS_WINCE) && !defined (ACE_HAS_PHARLAP) +#if !defined (ACE_HAS_PHARLAP) # if _WIN32_WINNT >= 0x400 # define ACE_HAS_SIGNAL_OBJECT_AND_WAIT @@ -563,7 +500,7 @@ # define ACE_HAS_CANCEL_IO # define ACE_HAS_WIN32_OVERLAPPED_IO # define ACE_HAS_WIN32_NAMED_PIPES -#endif /* !defined (ACE_HAS_WINCE) && !ACE_HAS_PHARLAP */ +#endif /* !ACE_HAS_PHARLAP */ #if !defined (ACE_SEH_DEFAULT_EXCEPTION_HANDLING_ACTION) # define ACE_SEH_DEFAULT_EXCEPTION_HANDLING_ACTION EXCEPTION_CONTINUE_SEARCH @@ -596,9 +533,6 @@ #define ACE_HAS_NONCONST_SWAB #define ACE_HAS_INT_SWAB -// gethostbyaddr does not handle IPv6-mapped-IPv4 addresses -#define ACE_HAS_BROKEN_GETHOSTBYADDR_V4MAPPED - #if defined (ACE_WIN64) // Data must be aligned on 8-byte boundaries, at a minimum. # define ACE_MALLOC_ALIGN 8 @@ -610,23 +544,17 @@ # define ACE_DISABLES_THREAD_LIBRARY_CALLS 0 #endif /* ACE_DISABLES_THREAD_LIBRARY_CALLS */ -#if !defined (ACE_HAS_WINCE) && !defined (ACE_HAS_PHARLAP) +#if !defined (ACE_HAS_PHARLAP) # define ACE_HAS_LOG_MSG_NT_EVENT_LOG -#endif /* !ACE_HAS_WINCE && !ACE_HAS_PHARLAP */ +#endif /* !ACE_HAS_PHARLAP */ -#if !defined (ACE_HAS_WINCE) -# define ACE_HAS_LLSEEK -#endif /* !ACE_HAS_WINCE */ +#define ACE_HAS_LLSEEK // Needed for obtaining the MAC address -// I dont believe this will work under CE, notice the -// check for ACE_HAS_WINCE. -# if !defined (ACE_HAS_WINCE) -# include <nb30.h> -# if defined (_MSC_VER) -# pragma comment(lib, "netapi32.lib") // needed for obtaing MACaddress -# endif -# endif /* !ACE_HAS_WINCE */ +#include <nb30.h> +#if defined (_MSC_VER) +# pragma comment(lib, "netapi32.lib") // needed for obtaing MACaddress +#endif #if !defined (WINVER) # define WINVER 0x0400 // pretend it's at least WinNT 4.0 diff --git a/ACE/ace/config-win32-msvc-14.h b/ACE/ace/config-win32-msvc-14.h index 866c45f6dd2..18fea9a9a5e 100644 --- a/ACE/ace/config-win32-msvc-14.h +++ b/ACE/ace/config-win32-msvc-14.h @@ -37,33 +37,19 @@ #define ACE_STRCASECMP_EQUIVALENT ::_stricmp #define ACE_STRNCASECMP_EQUIVALENT ::_strnicmp #define ACE_WCSDUP_EQUIVALENT ::_wcsdup -#if defined (ACE_HAS_WINCE) -# define ACE_FILENO_EQUIVALENT ::_fileno -#else -# define ACE_FILENO_EQUIVALENT(X) (_get_osfhandle (::_fileno (X))) -#endif +#define ACE_FILENO_EQUIVALENT(X) (_get_osfhandle (::_fileno (X))) -// Windows Mobile 6 doesn't do sig_atomic_t, but maybe future versions will. -# if !defined (_WIN32_WCE) || (_WIN32_WCE > 0x601) -# define ACE_HAS_SIG_ATOMIC_T -# endif /* !Win CE 6.0 or less */ +#define ACE_HAS_SIG_ATOMIC_T #define ACE_LACKS_STRPTIME -// Evaluate this with a WinCE build; maybe things have improved since VC8. -//#if !defined (ACE_HAS_WINCE) -# define ACE_HAS_INTRIN_H -# define ACE_HAS_INTRINSIC_INTERLOCKED -//#endif +#define ACE_HAS_INTRIN_H +#define ACE_HAS_INTRINSIC_INTERLOCKED -#if !defined (_WIN32_WCE) || (_WIN32_WCE >= 0x501) -# define ACE_HAS_INTRINSIC_BYTESWAP -#endif +#define ACE_HAS_INTRINSIC_BYTESWAP #define ACE_LACKS_STRRECVFD -#define ACE_TEMPLATES_REQUIRE_SOURCE - // Platform provides ACE_TLI function prototypes. // For Win32, this is not really true, but saves a lot of hassle! #define ACE_HAS_TLI_PROTOTYPES @@ -85,17 +71,10 @@ // 'class1' : inherits 'class2::member' via dominance #pragma warning(disable:4250) -// CE (at least thru Windows Mobile 5) doesn't have the new, secure CRT. -#if !defined (ACE_HAS_WINCE) && !defined (ACE_HAS_TR24731_2005_CRT) +#if !defined (ACE_HAS_TR24731_2005_CRT) # define ACE_HAS_TR24731_2005_CRT #endif -// On CE w/o MFC config-WinCE.h needs to declare a placement new. This -// triggers a warning that there's no placement delete, which can be ignored. -#if defined (ACE_HAS_WINCE) && !defined (ACE_HAS_MFC) -# pragma warning(disable:4291) -#endif - // A template can not be exported. Only an instantiation may be exported. #define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT diff --git a/ACE/ace/config-win32-msvc.h b/ACE/ace/config-win32-msvc.h index c1cdeb85277..1e1b063d420 100644 --- a/ACE/ace/config-win32-msvc.h +++ b/ACE/ace/config-win32-msvc.h @@ -30,12 +30,7 @@ #define ACE_LACKS_NATIVE_WCHAR_T #endif -// Win Mobile still does thread exits differently than PC Windows. -#if defined (_WIN32_WCE) -# define ACE_ENDTHREADEX(STATUS) ExitThread ((DWORD) STATUS) -#else # define ACE_ENDTHREADEX(STATUS) ::_endthreadex ((DWORD) STATUS) -#endif /* _WIN32_WCE */ //FUZZ: disable check_for_msc_ver #if (_MSC_VER >= 1930) @@ -54,13 +49,13 @@ #if defined(ACE_MT_SAFE) && (ACE_MT_SAFE != 0) // must have _MT defined to include multithreading // features from win32 headers -# if !defined(_MT) && !defined (ACE_HAS_WINCE) +# if !defined(_MT) // *** DO NOT *** defeat this error message by defining _MT yourself. // On MSVC, this is changed by selecting the Multithreaded // DLL or Debug Multithreaded DLL in the Project Settings // under C++ Code Generation. # error You must link against multi-threaded libraries when using ACE (check your project settings) -# endif /* !_MT && !ACE_HAS_WINCE */ +# endif /* !_MT */ #endif /* ACE_MT_SAFE && ACE_MT_SAFE != 0 */ #include <malloc.h> diff --git a/ACE/ace/os_include/net/os_if.h b/ACE/ace/os_include/net/os_if.h index be467aa2b24..eeb640e76e8 100644 --- a/ACE/ace/os_include/net/os_if.h +++ b/ACE/ace/os_include/net/os_if.h @@ -30,12 +30,6 @@ # if defined (ACE_HAS_NET_IF_DL_H) # include /**/ <net/if_dl.h> # endif /* ACE_HAS_NET_IF_DL_H */ -# if defined (HPUX) && defined (IOR) - /* HP-UX 11.11 defines IOR in /usr/include/pa/inline.h - and we don't want that definition. See IOP_IORC.h. - Thanks to Torsten Kopper <tkue_0931@fastmail.fm> for this patch.*/ -# undef IOR -# endif /* HPUX && IOR */ #endif /* !ACE_LACKS_NET_IF_H */ #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) diff --git a/ACE/ace/os_include/os_dlfcn.h b/ACE/ace/os_include/os_dlfcn.h index d13d5ca5ce7..76b75cc082d 100644 --- a/ACE/ace/os_include/os_dlfcn.h +++ b/ACE/ace/os_include/os_dlfcn.h @@ -26,10 +26,6 @@ # include /**/ <dlfcn.h> #endif /* !ACE_LACKS_DLFCN_H */ -#if defined (__hpux) -# include /**/ <dl.h> -#endif /* __hpux */ - #if defined (ACE_VXWORKS) && !defined (__RTP__) # include /**/ <loadLib.h> /* for module load */ # include /**/ <unldLib.h> /* for module unload */ @@ -66,15 +62,7 @@ extern "C" # if !defined (ACE_DEFAULT_SHLIB_MODE) # define ACE_DEFAULT_SHLIB_MODE RTLD_LAZY | RTLD_GLOBAL # endif -#elif defined (__hpux) - typedef shl_t ACE_SHLIB_HANDLE; -# if !defined (ACE_SHLIB_INVALID_HANDLE) -# define ACE_SHLIB_INVALID_HANDLE 0 -# endif /* ACE_SHLIB_INVALID_HANDLE */ -# if !defined (ACE_DEFAULT_SHLIB_MODE) -# define ACE_DEFAULT_SHLIB_MODE BIND_DEFERRED | DYNAMIC_PATH -# endif /* ACE_DEFAULT_SHLIB_MODE */ -#else /* !ACE_WIN32 && !ACE_HAS_SVR4_DYNAMIC_LINKING && !__hpux */ +#else /* !ACE_WIN32 && !ACE_HAS_SVR4_DYNAMIC_LINKING */ typedef void *ACE_SHLIB_HANDLE; # if !defined (ACE_SHLIB_INVALID_HANDLE) # define ACE_SHLIB_INVALID_HANDLE 0 diff --git a/ACE/ace/os_include/os_errno.h b/ACE/ace/os_include/os_errno.h index d132d73882c..dac78b9bf8f 100644 --- a/ACE/ace/os_include/os_errno.h +++ b/ACE/ace/os_include/os_errno.h @@ -22,9 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if !defined (ACE_LACKS_ERRNO_H) -# include /**/ <errno.h> -#endif /* !ACE_LACKS_ERRNO_H */ +#include /**/ <errno.h> #if defined (ACE_VXWORKS) // Needed for VxWorks to pickup errnoSet() @@ -285,7 +283,7 @@ extern "C" void herror (const char *str); #endif /* ACE_HAS_H_ERRNO */ -#if defined (ACE_LACKS_ERRNO_H) || defined (ACE_DEFINE_MISSING_ERRNOS) +#if defined (ACE_DEFINE_MISSING_ERRNOS) # if !defined (EPERM) # define EPERM 1 # endif /* EPERM */ diff --git a/ACE/ace/os_include/os_kstat.h b/ACE/ace/os_include/os_kstat.h deleted file mode 100644 index 957b608bd88..00000000000 --- a/ACE/ace/os_include/os_kstat.h +++ /dev/null @@ -1,31 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file os_kstat.h - * - * @author Johnny Willemsen <jwillemsen@remedy.nl> - */ -//============================================================================= - -#ifndef ACE_OS_INCLUDE_OS_KSTAT_H -#define ACE_OS_INCLUDE_OS_KSTAT_H - -#include /**/ "ace/pre.h" - -#include /**/ "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if defined (ACE_HAS_KSTAT) -# define ACE_HAS_KSTAT_H -#endif /* ACE_HAS_KSTAT */ - -#if defined (ACE_HAS_KSTAT_H) -# include <kstat.h> -#endif /* ACE_HAS_KSTAT_H */ - -#include /**/ "ace/post.h" -#endif /* ACE_OS_INCLUDE_OS_KSTAT_H */ diff --git a/ACE/ace/os_include/os_pthread.h b/ACE/ace/os_include/os_pthread.h index 50c483ba9d7..a789d117314 100644 --- a/ACE/ace/os_include/os_pthread.h +++ b/ACE/ace/os_include/os_pthread.h @@ -22,22 +22,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if defined (ACE_HAS_PRIOCNTL) - // Need to #include thread.h before #defining THR_BOUND, etc., - // when building without threads on SunOS 5.x. -# if defined (sun) -# include /**/ <thread.h> -# endif /* sun */ - - // Need to #include these before #defining USYNC_PROCESS on SunOS 5.x. -# include /**/ <sys/rtpriocntl.h> -# include /**/ <sys/tspriocntl.h> -#endif /* ACE_HAS_PRIOCNTL */ - #include "ace/os_include/sys/os_types.h" #include "ace/os_include/os_stdint.h" -// This needs to go here *first* to avoid problems with AIX. # if defined (ACE_HAS_PTHREADS) # define ACE_DONT_INCLUDE_ACE_SIGNAL_H # include "ace/os_include/os_signal.h" @@ -70,17 +57,7 @@ # if defined (_POSIX_PRIORITY_SCHEDULING) # define ACE_PROC_PRI_FIFO_MIN (sched_get_priority_min(SCHED_FIFO)) # define ACE_PROC_PRI_RR_MIN (sched_get_priority_min(SCHED_RR)) -# if defined (HPUX) - // HP-UX's other is the SCHED_HPUX class, which uses historical - // values that have reverse semantics from POSIX (low value is - // more important priority). To use these in pthreads calls, - // the values need to be converted. The other scheduling classes - // don't need this special treatment. -# define ACE_PROC_PRI_OTHER_MIN \ - (sched_get_priority_min(SCHED_OTHER)) -# else -# define ACE_PROC_PRI_OTHER_MIN (sched_get_priority_min(SCHED_OTHER)) -# endif /* HPUX */ +# define ACE_PROC_PRI_OTHER_MIN (sched_get_priority_min(SCHED_OTHER)) # else /* UNICOS is missing a sched_get_priority_min() implementation */ # define ACE_PROC_PRI_FIFO_MIN 0 # define ACE_PROC_PRI_RR_MIN 0 @@ -90,12 +67,7 @@ # if defined (_POSIX_PRIORITY_SCHEDULING) # define ACE_PROC_PRI_FIFO_MAX (sched_get_priority_max(SCHED_FIFO)) # define ACE_PROC_PRI_RR_MAX (sched_get_priority_max(SCHED_RR)) -# if defined (HPUX) -# define ACE_PROC_PRI_OTHER_MAX \ - (sched_get_priority_max(SCHED_OTHER)) -# else -# define ACE_PROC_PRI_OTHER_MAX (sched_get_priority_max(SCHED_OTHER)) -# endif /* HPUX */ +# define ACE_PROC_PRI_OTHER_MAX (sched_get_priority_max(SCHED_OTHER)) # else # define ACE_PROC_PRI_FIFO_MAX 59 # define ACE_PROC_PRI_RR_MAX 59 @@ -132,49 +104,6 @@ # if !defined (ACE_THR_PRI_OTHER_MAX) # define ACE_THR_PRI_OTHER_MAX (long) PRI_OTHER_MAX # endif /* !ACE_THR_PRI_OTHER_MAX */ -# elif defined (AIX) - // AIX's priority range is 1 (low) to 127 (high). There aren't - // any preprocessor macros I can find. PRIORITY_MIN is for - // process priorities, as far as I can see, and does not apply - // to thread priority. The 1 to 127 range is from the - // pthread_attr_setschedparam man page (Steve Huston, 18-May-2001). -# if !defined (ACE_THR_PRI_FIFO_MIN) -# define ACE_THR_PRI_FIFO_MIN (long) 1 -# endif /* !ACE_THR_PRI_FIFO_MIN */ -# if !defined (ACE_THR_PRI_FIFO_MAX) -# define ACE_THR_PRI_FIFO_MAX (long) 127 -# endif /* !ACE_THR_PRI_FIFO_MAX */ -# if !defined (ACE_THR_PRI_RR_MIN) -# define ACE_THR_PRI_RR_MIN (long) 1 -# endif /* !ACE_THR_PRI_RR_MIN */ -# if !defined (ACE_THR_PRI_RR_MAX) -# define ACE_THR_PRI_RR_MAX (long) 127 -# endif /* !ACE_THR_PRI_RR_MAX */ -# if !defined (ACE_THR_PRI_OTHER_MIN) -# define ACE_THR_PRI_OTHER_MIN (long) 1 -# endif /* !ACE_THR_PRI_OTHER_MIN */ -# if !defined (ACE_THR_PRI_OTHER_MAX) -# define ACE_THR_PRI_OTHER_MAX (long) 127 -# endif /* !ACE_THR_PRI_OTHER_MAX */ -# elif defined (sun) -# if !defined (ACE_THR_PRI_FIFO_MIN) -# define ACE_THR_PRI_FIFO_MIN (long) 0 -# endif /* !ACE_THR_PRI_FIFO_MIN */ -# if !defined (ACE_THR_PRI_FIFO_MAX) -# define ACE_THR_PRI_FIFO_MAX (long) 59 -# endif /* !ACE_THR_PRI_FIFO_MAX */ -# if !defined (ACE_THR_PRI_RR_MIN) -# define ACE_THR_PRI_RR_MIN (long) 0 -# endif /* !ACE_THR_PRI_RR_MIN */ -# if !defined (ACE_THR_PRI_RR_MAX) -# define ACE_THR_PRI_RR_MAX (long) 59 -# endif /* !ACE_THR_PRI_RR_MAX */ -# if !defined (ACE_THR_PRI_OTHER_MIN) -# define ACE_THR_PRI_OTHER_MIN (long) 0 -# endif /* !ACE_THR_PRI_OTHER_MIN */ -# if !defined (ACE_THR_PRI_OTHER_MAX) -# define ACE_THR_PRI_OTHER_MAX (long) 127 -# endif /* !ACE_THR_PRI_OTHER_MAX */ # else # if !defined (ACE_THR_PRI_FIFO_MIN) # define ACE_THR_PRI_FIFO_MIN (long) ACE_PROC_PRI_FIFO_MIN @@ -258,14 +187,12 @@ # endif /* PTHREAD_MUTEXTYPE_FAST */ # endif /* PTHREAD_PROCESS_SHARED */ -# if !defined (ACE_HAS_STHREADS) -# if !defined (USYNC_THREAD) -# define USYNC_THREAD PTHREAD_PROCESS_PRIVATE -# endif /* ! USYNC_THREAD */ -# if !defined (USYNC_PROCESS) -# define USYNC_PROCESS PTHREAD_PROCESS_SHARED -# endif /* ! USYNC_PROCESS */ -# endif /* ACE_HAS_STHREADS */ +# if !defined (USYNC_THREAD) +# define USYNC_THREAD PTHREAD_PROCESS_PRIVATE +# endif /* ! USYNC_THREAD */ +# if !defined (USYNC_PROCESS) +# define USYNC_PROCESS PTHREAD_PROCESS_SHARED +# endif /* ! USYNC_PROCESS */ /* MM-Graz: prevent warnings */ # undef THR_BOUND @@ -292,7 +219,7 @@ # define THR_EXPLICIT_SCHED 0x00800000 # define THR_SCHED_IO 0x01000000 -# if !defined (ACE_HAS_STHREADS) && !defined (ACE_MQX) +# if !defined (ACE_MQX) # if !defined (ACE_HAS_POSIX_SEM) && !defined (ACE_USES_FIFO_SEM) // This needs to be moved out of here. @@ -322,8 +249,6 @@ public: # endif /* !ACE_HAS_POSIX_SEM */ # if defined (ACE_LACKS_PTHREAD_YIELD) && defined (ACE_HAS_THR_YIELD) - // If we are on Solaris we can just reuse the existing - // implementations of these synchronization types. # if !defined (ACE_LACKS_RWLOCK_T) && !defined (ACE_HAS_PTHREADS_UNIX98_EXT) # include /**/ <synch.h> typedef rwlock_t ACE_rwlock_t; @@ -335,7 +260,7 @@ public: # if !defined (ACE_HAS_POSIX_SEM) typedef sema_t ACE_sema_t; # endif /* !ACE_HAS_POSIX_SEM */ -# endif /* !ACE_HAS_STHREADS */ +# endif /* !ACE_MQX */ # if defined (ACE_HAS_PTHREADS_UNIX98_EXT) && !defined (ACE_LACKS_RWLOCK_T) typedef pthread_rwlock_t ACE_rwlock_t; @@ -362,26 +287,6 @@ public: # endif /* _XOPEN_SOURCE && _XOPEN_SOURCE < 600 */ # endif /* ACE_LINUX && ((__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2)) */ - -#elif defined (ACE_HAS_STHREADS) -# if !defined (ACE_THR_PRI_FIFO_MIN) -# define ACE_THR_PRI_FIFO_MIN (long) 0 -# endif /* !ACE_THR_PRI_FIFO_MIN */ -# if !defined (ACE_THR_PRI_FIFO_MAX) -# define ACE_THR_PRI_FIFO_MAX (long) 59 -# endif /* !ACE_THR_PRI_FIFO_MAX */ -# if !defined (ACE_THR_PRI_RR_MIN) -# define ACE_THR_PRI_RR_MIN (long) 0 -# endif /* !ACE_THR_PRI_RR_MIN */ -# if !defined (ACE_THR_PRI_RR_MAX) -# define ACE_THR_PRI_RR_MAX (long) 59 -# endif /* !ACE_THR_PRI_RR_MAX */ -# if !defined (ACE_THR_PRI_OTHER_MIN) -# define ACE_THR_PRI_OTHER_MIN (long) 0 -# endif /* !ACE_THR_PRI_OTHER_MIN */ -# if !defined (ACE_THR_PRI_OTHER_MAX) -# define ACE_THR_PRI_OTHER_MAX (long) 127 -# endif /* !ACE_THR_PRI_OTHER_MAX */ #endif /* ACE_HAS_PTHREADS */ #include /**/ "ace/post.h" diff --git a/ACE/ace/os_include/os_signal.h b/ACE/ace/os_include/os_signal.h index 6ab5f76fbe2..679a1944aab 100644 --- a/ACE/ace/os_include/os_signal.h +++ b/ACE/ace/os_include/os_signal.h @@ -24,11 +24,9 @@ #include "ace/os_include/sys/os_types.h" -#if !defined (ACE_LACKS_SIGNAL_H) - extern "C" { +extern "C" { # include /**/ <signal.h> - } -#endif /* !ACE_LACKS_SIGNAL_H */ +} #if defined (ACE_HAS_SIGINFO_T) # if !defined (ACE_LACKS_SIGINFO_H) @@ -137,7 +135,7 @@ extern "C" #if defined (ACE_VXWORKS) # define ACE_NSIG (_NSIGS + 1) -#elif defined (__Lynx__) || defined (ACE_HAS_RTEMS) +#elif defined (__Lynx__) # define ACE_NSIG (NSIG + 1) #else // All other platforms set NSIG to one greater than the @@ -145,10 +143,6 @@ extern "C" # define ACE_NSIG NSIG #endif /* ACE_VXWORKS */ -#if defined (ACE_HAS_WINCE) - typedef void (__cdecl * __sighandler_t)(int); -#endif - #if defined (ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES) // Prototypes for both signal() and struct sigaction are consistent.. using ACE_SignalHandler = void (*)(int); @@ -163,9 +157,6 @@ extern "C" #elif defined (INTEGRITY) using ACE_SignalHandler = void (*)(); using ACE_SignalHandlerV = void (*)(int); -#elif defined (ACE_HAS_RTEMS) - using ACE_SignalHandler = void (*)(); - using ACE_SignalHandlerV = void (*)(); #else /* This is necessary for some older broken version of cfront */ # if defined (SIG_PF) # define ACE_SignalHandler SIG_PF diff --git a/ACE/ace/os_include/os_stropts.h b/ACE/ace/os_include/os_stropts.h index 4ed4c4b44da..7b641bee9da 100644 --- a/ACE/ace/os_include/os_stropts.h +++ b/ACE/ace/os_include/os_stropts.h @@ -24,12 +24,6 @@ #include "ace/os_include/os_unistd.h" -#if defined (ACE_HAS_TIMOD_H) -# include /**/ <sys/timod.h> -#elif defined (ACE_HAS_OSF_TIMOD_H) -# include /**/ <tli/timod.h> -#endif /* ACE_HAS_TIMOD_H */ - #if !defined (ACE_LACKS_SYS_IOCTL_H) # include /**/ <sys/ioctl.h> #endif /* !ACE_LACKS_SYS_IOCTL_H */ @@ -42,28 +36,10 @@ # include /**/ <sys/sockio.h> #endif /* ACE_HAS_SOCKIO_H */ -// This is sorta counter intuitive, but this is how it was done in OS.h -// @todo: fix this... dhinton -#if defined (ACE_HAS_STREAMS) -# if defined (AIX) -# if !defined (_XOPEN_EXTENDED_SOURCE) -# define _XOPEN_EXTENDED_SOURCE -# endif /* !_XOPEN_EXTENDED_SOURCE */ -# endif /* AIX */ -#endif /* ACE_HAS_STREAMS */ - #if !defined (ACE_LACKS_STROPTS_H) # include /**/ <stropts.h> #endif /* !ACE_LACKS_STROPTS_H */ -// This is sorta counter intuitive, but this is how it was done in OS.h -// @todo: fix this... dhinton -#if defined (ACE_HAS_STREAMS) -# if defined (AIX) -# undef _XOPEN_EXTENDED_SOURCE -# endif /* AIX */ -#endif /* ACE_HAS_STREAMS */ - #if defined (ACE_VXWORKS) // for ioctl() # include /**/ <ioLib.h> diff --git a/ACE/ace/os_include/os_termios.h b/ACE/ace/os_include/os_termios.h index 59392d90214..d16476497ae 100644 --- a/ACE/ace/os_include/os_termios.h +++ b/ACE/ace/os_include/os_termios.h @@ -26,9 +26,5 @@ # include /**/ <termios.h> #endif /* !ACE_LACKS_TERMIOS_H */ -#if defined (HPUX) -# include /**/ <sys/modem.h> -#endif /* HPUX */ - #include /**/ "ace/post.h" #endif /* ACE_OS_INCLUDE_OS_TERMIOS_H */ diff --git a/ACE/ace/os_include/os_time.h b/ACE/ace/os_include/os_time.h index 5970afb2d65..eb716ff27ec 100644 --- a/ACE/ace/os_include/os_time.h +++ b/ACE/ace/os_include/os_time.h @@ -25,11 +25,8 @@ // @todo should we include anything from signal.h? #include "ace/os_include/sys/os_types.h" -// To get the proper select() signature, this is required for HP-UX, and -// maybe other platforms that offer both int and fdset forms of select(). -// For HP-UX, sys/time.h must be included before time.h, or -// _XOPEN_SOURCE_EXTENDED must be defined. It's not nice to require -// the preprocessor macro, so we force our select() preference this way. +// To get the proper select() signature, this is required for maybe other platforms +// that offer both int and fdset forms of select(). #if !defined (ACE_LACKS_SYS_TIME_H) # include /**/ <sys/time.h> #endif /* !ACE_LACKS_SYS_TIME_H */ @@ -56,13 +53,6 @@ typedef struct timespec /// Nanoseconds long tv_nsec; } timespec_t; -# elif defined (ACE_HAS_BROKEN_POSIX_TIME) -# if defined (ACE_OPENVMS) -# include /**/ <timers.h> -# else -// OSF/1 defines struct timespec in <sys/timers.h> - Tom Marrs -# include /**/ <sys/timers.h> -# endif # endif /* !ACE_HAS_POSIX_TIME */ # if defined(ACE_LACKS_TIMESPEC_T) @@ -82,8 +72,7 @@ extern "C" // straightening them out. #if defined (ACE_HAS_PTHREADS) /* POSIX.1c threads (pthreads) */ // ... and 2-parameter asctime_r and ctime_r -# if !defined (ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R) && \ - !defined (ACE_HAS_STHREADS) && !defined (ACE_VXWORKS) +# if !defined (ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R) && !defined (ACE_VXWORKS) # define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R # endif #endif /* ACE_HAS_PTHREADS */ diff --git a/ACE/ace/os_include/os_unistd.h b/ACE/ace/os_include/os_unistd.h index db6275d0026..14d1621d3ba 100644 --- a/ACE/ace/os_include/os_unistd.h +++ b/ACE/ace/os_include/os_unistd.h @@ -33,10 +33,6 @@ # include /**/ <io.h> #endif /* ACE_HAS_IO_H */ -#if defined (ACE_HAS_SYS_SYSTEMINFO_H) -# include /**/ <sys/systeminfo.h> -#endif /* ACE_HAS_SYS_SYSTEMINFO_H */ - #if !defined (ACE_LACKS_UNISTD_H) # include /**/ <unistd.h> #endif /* !ACE_LACKS_UNISTD_H */ @@ -72,15 +68,9 @@ extern "C" #if defined (ACE_WIN32) // The following are #defines and #includes that are specific to // WIN32. -# if defined (ACE_HAS_WINCE) -# define ACE_STDIN _fileno (stdin) -# define ACE_STDOUT _fileno (stdout) -# define ACE_STDERR _fileno (stderr) -# else # define ACE_STDIN GetStdHandle (STD_INPUT_HANDLE) # define ACE_STDOUT GetStdHandle (STD_OUTPUT_HANDLE) # define ACE_STDERR GetStdHandle (STD_ERROR_HANDLE) -# endif // ACE_HAS_WINCE // The following are #defines and #includes that are specific to UNIX. #else /* !ACE_WIN32 */ # if defined (STDIN_FILENO) @@ -100,20 +90,6 @@ extern "C" # endif #endif /* ACE_WIN32 */ -#if (!defined (_BSD_SOURCE) && \ - !defined (_XOPEN_SOURCE) && !defined (_XOPEN_SOURCE_EXTENDED)) \ - || (defined (_XOPEN_SOURCE) && defined (__GNUC__)) - -# if defined (ACE_LACKS_SETREUID_PROTOTYPE) - extern int setreuid (uid_t ruid, uid_t euid); -# endif /* ACE_LACKS_SETREUID_PROTOTYPE */ - -# if defined (ACE_LACKS_SETREGID_PROTOTYPE) - extern int setregid (gid_t rgid, gid_t egid); -# endif /* ACE_LACKS_SETREGID_PROTOTYPE */ -#endif /* !_BSD_SOURCE && !_XOPEN_SOURCE && !_XOPEN_SOURCE_EXTENDED - || _XOPEN_SOURCE && __GNUC__ */ - // for use by access() # if !defined (R_OK) # define R_OK 04 /* Test for Read permission. */ @@ -136,27 +112,12 @@ extern "C" # define F_OK 0 /* Test for existence of File. */ # endif /* F_OK */ -#if defined (ACE_LACKS_UALARM_PROTOTYPE) - u_int ualarm (u_int usecs, u_int interval); -#endif /* ACE_LACKS_UALARM_PROTOTYPE */ - #if defined (ACE_LACKS_GETPGID_PROTOTYPE) && \ !defined (_XOPEN_SOURCE) && !defined (_XOPEN_SOURCE_EXTENDED) pid_t getpgid (pid_t pid); #endif /* ACE_LACKS_GETPGID_PROTOTYPE && !_XOPEN_SOURCE && !_XOPEN_SOURCE_EXTENDED */ -#if !defined (_LARGEFILE64_SOURCE) -# if defined (ACE_LACKS_LSEEK64_PROTOTYPE) && \ - defined (ACE_LACKS_LLSEEK_PROTOTYPE) -# error Define either ACE_LACKS_LSEEK64_PROTOTYPE or ACE_LACKS_LLSEEK_PROTOTYPE, not both! -# elif defined (ACE_LACKS_LSEEK64_PROTOTYPE) - ACE_LOFF_T lseek64 (int fd, ACE_LOFF_T offset, int whence); -# elif defined (ACE_LACKS_LLSEEK_PROTOTYPE) - ACE_LOFF_T llseek (int fd, ACE_LOFF_T offset, int whence); -# endif -#endif /* _LARGEFILE64_SOURCE */ - #if defined (__BORLANDC__) # define _isatty isatty #endif /* __BORLANDC__ */ diff --git a/ACE/ace/os_include/sys/os_mman.h b/ACE/ace/os_include/sys/os_mman.h index 2f98bf4b798..6671ffd1c86 100644 --- a/ACE/ace/os_include/sys/os_mman.h +++ b/ACE/ace/os_include/sys/os_mman.h @@ -81,9 +81,6 @@ PAGE_NOCACHE */ # if !defined (MAP_FAILED) # define MAP_FAILED ((void *) -1) -# elif defined (ACE_HAS_LONG_MAP_FAILED) -# undef MAP_FAILED -# define MAP_FAILED ((void *) -1L) # endif /* !MAP_FAILED */ #if !defined (PROT_RDWR) @@ -100,10 +97,6 @@ PAGE_NOCACHE */ # define MS_SYNC 0x0 # endif /* !MS_SYNC */ -#if !defined (ACE_LACKS_MADVISE) && defined (ACE_LACKS_MADVISE_PROTOTYPE) - extern "C" int madvise(caddr_t, size_t, int); -#endif /* !ACE_LACKS_MADVISE && ACE_LACKS_MADVISE_PROTOTYPE */ - #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/ACE/ace/os_include/sys/os_resource.h b/ACE/ace/os_include/sys/os_resource.h index 437e2d6e49d..a014351617a 100644 --- a/ACE/ace/os_include/sys/os_resource.h +++ b/ACE/ace/os_include/sys/os_resource.h @@ -29,10 +29,6 @@ # include /**/ <sys/resource.h> #endif /* !ACE_LACKS_SYS_RESOURCE_H */ -#if defined (ACE_HAS_SYS_SYSTEMINFO_H) -# include /**/ <sys/systeminfo.h> -#endif /* ACE_HAS_SYS_SYSTEMINFO_H */ - #if defined (ACE_HAS_SYS_SYSCALL_H) # include /**/ <sys/syscall.h> #endif /* ACE_HAS_SYS_SYSCALL_H */ @@ -59,14 +55,7 @@ extern "C" }; #endif /* ACE_WIN32 */ -#if defined (ACE_LACKS_RLIMIT_PROTOTYPE) - int getrlimit (int resource, struct rlimit *rlp); - int setrlimit (int resource, const struct rlimit *rlp); -#endif /* ACE_LACKS_RLIMIT_PROTOTYPE */ - -#if defined (ACE_HAS_PRUSAGE_T) - typedef prusage_t ACE_Rusage; -#elif defined (ACE_HAS_GETRUSAGE) +#if defined (ACE_HAS_GETRUSAGE) typedef rusage ACE_Rusage; #else typedef int ACE_Rusage; diff --git a/ACE/ace/os_include/sys/os_socket.h b/ACE/ace/os_include/sys/os_socket.h index 8c8ce66f9ab..e3bd900fe15 100644 --- a/ACE/ace/os_include/sys/os_socket.h +++ b/ACE/ace/os_include/sys/os_socket.h @@ -255,36 +255,14 @@ extern "C" # define ACE_PROTOCOL_FAMILY_INET PF_INET #endif /* ACE_HAS_IPV6 */ -#if !defined (ACE_HAS_SOCK_BUF_SIZE_MAX_VALUE) #define ACE_HAS_SOCK_BUF_SIZE_MAX_VALUE SSIZE_MAX -#endif /* ACE_HAS_SOCK_BUF_SIZE_MAX_VALUE */ #if !defined (ACE_SOCKET_LEN) #if defined (ACE_HAS_SOCKLEN_T) -# if defined (__hpux) - /* - ** HP-UX supplies the socklen_t type unless some feature set less than - ** _XOPEN_SOURCE_EXTENDED is specifically requested. However, it only - ** actually uses the socklen_t type in supplied socket functions if - ** _XOPEN_SOURCE_EXTENDED is specifically requested. So, for example, - ** the compile options ACE usually uses (includes -mt) cause _HPUX_SOURCE - ** to be set, which sets _INCLUDE_XOPEN_SOURCE_EXTENDED (causing socklen_t - ** to be defined) but _not_ _XOPEN_SOURCE_EXTENDED (causing socket functions - ** to use int, not socklen_t). React to this situation here... - */ -# if defined (_XOPEN_SOURCE_EXTENDED) typedef socklen_t ACE_SOCKET_LEN; -# else -typedef int ACE_SOCKET_LEN; -# endif /* _XOPEN_SOURCE_EXTENDED */ -# else -typedef socklen_t ACE_SOCKET_LEN; -# endif /* __hpux */ -#elif defined (ACE_HAS_SIZET_SOCKET_LEN) -typedef size_t ACE_SOCKET_LEN; #else typedef int ACE_SOCKET_LEN; -#endif /* ACE_HAS_SIZET_SOCKET_LEN */ +#endif /* ACE_HAS_SOCKLEN_T */ #endif /* ACE_SOCKET_LEN */ #if defined (ACE_HAS_NETLINK) diff --git a/ACE/ace/os_include/sys/os_stat.h b/ACE/ace/os_include/sys/os_stat.h index d179d5f95c0..7e6db7b9cae 100644 --- a/ACE/ace/os_include/sys/os_stat.h +++ b/ACE/ace/os_include/sys/os_stat.h @@ -82,12 +82,9 @@ extern "C" # if !defined (S_IXOTH) # define S_IXOTH 00001 # endif /* S_IXOTH */ - -// WinCE's S_IFLNK is defined with the other bits, below. -#if !defined (S_IFLNK) && !defined (ACE_HAS_WINCE) -#define S_IFLNK 0200000 -#endif /* S_IFLNK && !ACE_HAS_WINCE */ - +# if !defined (S_IFLNK) +# define S_IFLNK 0200000 +# endif /* S_IFLNK */ #endif /* ACE_LACKS_MODE_MASKS */ // Some systems (VxWorks) don't define S_ISLNK @@ -104,55 +101,6 @@ extern "C" # define S_ISDIR(mode) ((mode&S_IFMT) == S_IFDIR) #endif -#if defined (ACE_HAS_WINCE) - -// Translate the WinCE bits into names expected by our callers. -// The dwFileAttributes parameter doesn't have protection info, so -// S_IFMT is the whole thing. Since there are no symbolic links, S_IFLNK is 0. -# define S_IFMT 0xFFFF -# define S_IFDIR FILE_ATTRIBUTE_DIRECTORY -# define S_IFREG FILE_ATTRIBUTE_NORMAL -# define S_IFLNK 0 -# define S_IFCHR 0 - -# if !defined (__MINGW32__) - // Since CE does not have _stat by default as NT/2000 does, the 'stat' - // struct defined here will be used. Also note that CE file system - // struct is only for the CE 3.0 or later. - // Refer to the WCHAR.H from Visual C++ and WIBASE.H from eVC 3.0. - struct stat - { - /// always 0 on Windows platforms - dev_t st_dev; - - /// always 0 on Windows platforms - dev_t st_rdev; - - /// file attribute - mode_t st_mode; - - /// number of hard links - nlink_t st_nlink; - - /// time of last access - time_t st_atime; - - /// time of last data modification - time_t st_mtime; - - /// time of creation - time_t st_ctime; - - /// file size, in bytes - ACE_OFF_T st_size; - - // Following members do not have direct conversion in Window platforms. - //u_long st_blksize; // optimal blocksize for I/O - //u_long st_flags; // user defined flags for file - }; - #endif -#endif /* ACE_HAS_WINCE */ - #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/ACE/ace/os_include/sys/os_types.h b/ACE/ace/os_include/sys/os_types.h index 822c8a93d97..b179c7051ad 100644 --- a/ACE/ace/os_include/sys/os_types.h +++ b/ACE/ace/os_include/sys/os_types.h @@ -28,10 +28,6 @@ # include /**/ <sys/types.h> #endif /* !ACE_LACKS_SYS_TYPES_H */ -#if defined (ACE_HAS_TYPES_H) -# include /**/ <types.h> -#endif /* ACE_HAS_TYPES_H */ - # if defined (ACE_USES_STD_NAMESPACE_FOR_STDC_LIB) && \ (ACE_USES_STD_NAMESPACE_FOR_STDC_LIB != 0) using std::time_t; @@ -49,14 +45,6 @@ typedef double ACE_timer_t; typedef int clockid_t; #endif /* ACE_LACKS_CLOCKID_T */ -#if defined (ACE_LACKS_DEV_T) - typedef unsigned int dev_t; -#endif /* ACE_LACKS_DEV_T */ - -#if defined (ACE_HAS_WINCE) - typedef long off_t; -#endif - #if defined(ACE_WIN32) && defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS==64) typedef __int64 ACE_OFF_T; #else @@ -65,18 +53,13 @@ typedef double ACE_timer_t; #if defined (ACE_SIZEOF_LONG) && ACE_SIZEOF_LONG == 8 typedef off_t ACE_LOFF_T; -#elif defined (ACE_HAS_RTEMS) || defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__APPLE__) || \ - (defined (ACE_OPENVMS) && defined (_LARGEFILE)) +#elif defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__APPLE__) typedef off_t ACE_LOFF_T; -#elif defined (AIX) || defined (HPUX) || defined (__QNX__) +#elif defined (__QNX__) typedef off64_t ACE_LOFF_T; -#elif defined (__sun) - typedef offset_t ACE_LOFF_T; #elif defined (WIN32) typedef __int64 ACE_LOFF_T; -#elif (defined (ACE_VXWORKS) && (ACE_VXWORKS <= 0x700)) || \ - defined (ACE_LYNXOS_MAJOR) || \ - (defined (ACE_OPENVMS) && !defined (_LARGEFILE)) +#elif (defined (ACE_VXWORKS) && (ACE_VXWORKS <= 0x700)) || defined (ACE_LYNXOS_MAJOR) typedef long long ACE_LOFF_T; #else typedef loff_t ACE_LOFF_T; diff --git a/ACE/apps/Gateway/Gateway/File_Parser.h b/ACE/apps/Gateway/Gateway/File_Parser.h index 09733640cd2..1e2fdae4990 100644 --- a/ACE/apps/Gateway/Gateway/File_Parser.h +++ b/ACE/apps/Gateway/Gateway/File_Parser.h @@ -88,12 +88,6 @@ protected: FILE *infile_; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "File_Parser.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("File_Parser.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* _FILE_PARSER */ diff --git a/ACE/apps/JAWS/clients/Caching/URL_Array_Helper.h b/ACE/apps/JAWS/clients/Caching/URL_Array_Helper.h index 45749326554..18fdd582dab 100644 --- a/ACE/apps/JAWS/clients/Caching/URL_Array_Helper.h +++ b/ACE/apps/JAWS/clients/Caching/URL_Array_Helper.h @@ -24,12 +24,6 @@ size_t ace_array_encode (void *buf, const T &x); template <class T> size_t ace_array_decode (void *buf, T &x); -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "URL_Array_Helper.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("URL_Array_Helper.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* ACE_URL_ARRAY_HELPER_H */ diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/get.c b/ACE/apps/JAWS/clients/WebSTONE/src/get.c index 87fc678a7af..d800e5678b7 100644 --- a/ACE/apps/JAWS/clients/WebSTONE/src/get.c +++ b/ACE/apps/JAWS/clients/WebSTONE/src/get.c @@ -27,9 +27,6 @@ #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#ifdef SUNOS -#include <unistd.h> -#endif #include <ctype.h> #ifdef WIN32 diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/systems.h b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/systems.h index 31bf570c21f..fbdf805a2cf 100644 --- a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/systems.h +++ b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/systems.h @@ -72,26 +72,6 @@ #define ZERO(ptr,len) memset(ptr,0,len) -#elif defined(SOLARIS) - -#define FILE_UNIX -#undef FILE_STDIO -#define DAEMON_UNIX_MOBRULE -#define DAEMON_NEEDS_SEMAPHORE -#define NET_SOCKETS -#define FILE_UNIX_MMAP -#define FILE_MMAP_FLAGS MAP_PRIVATE -#undef BSD_SIGNALS -#define BSD_RLIMIT -#define NEED_CRYPT_H -#define AUTH_DBM -/* The Solaris routines return ENOSPC when too many semaphores are SEM_UNDO. */ -#define SEM_FLOCK -#define DLL_CAPABLE -#define DLL_DLOPEN - -#define ZERO(ptr,len) memset(ptr,0,len) - #elif defined(SUNOS4) #define BSD_SIGNALS @@ -132,44 +112,6 @@ #define DLL_CAPABLE #define DLL_DLOPEN -#elif defined(AIX) - -#define FILE_UNIX -#undef FILE_STDIO -#undef DAEMON_UNIX_FORK -#undef DAEMON_UNIX_POOL -#define DAEMON_UNIX_MOBRULE -#define DAEMON_NEEDS_SEMAPHORE -#define NET_SOCKETS -#define FILE_UNIX_MMAP -#define FILE_MMAP_FLAGS MAP_PRIVATE -#undef BSD_SIGNALS -#define BSD_RLIMIT -#undef NEED_CRYPT_H -#define AUTH_DBM -#define SEM_FLOCK -#define ZERO(ptr,len) memset(ptr,0,len) -#define DLL_CAPABLE -#define DLL_DLOPEN - -#elif defined(HPUX) - -#define FILE_UNIX -#undef FILE_STDIO -#define DAEMON_UNIX_MOBRULE -#define DAEMON_NEEDS_SEMAPHORE -#define NET_SOCKETS -#define FILE_UNIX_MMAP -#define FILE_MMAP_FLAGS MAP_PRIVATE -#undef BSD_SIGNALS -#undef BSD_RLIMIT -#undef NEED_CRYPT_H -#define AUTH_DBM -#define SEM_FLOCK -#define ZERO(ptr,len) memset(ptr,0,len) -#define DLL_CAPABLE -#define DLL_HPSHL - #else /* Windows NT */ #include <wtypes.h> diff --git a/ACE/apps/JAWS/server/JAWS_Pipeline_Handler.h b/ACE/apps/JAWS/server/JAWS_Pipeline_Handler.h index 51cde38176e..c8f8712f594 100644 --- a/ACE/apps/JAWS/server/JAWS_Pipeline_Handler.h +++ b/ACE/apps/JAWS/server/JAWS_Pipeline_Handler.h @@ -20,8 +20,6 @@ public: // Callback hook for specialized data processing }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "JAWS_Pipeline_Handler.cpp" -#endif #endif /* !defined (JAWS_PIPELINE_HANDLER_H) */ diff --git a/ACE/apps/JAWS2/JAWS/Assoc_Array.h b/ACE/apps/JAWS2/JAWS/Assoc_Array.h index c08d4a6e9d1..1890efb1018 100644 --- a/ACE/apps/JAWS2/JAWS/Assoc_Array.h +++ b/ACE/apps/JAWS2/JAWS/Assoc_Array.h @@ -87,8 +87,6 @@ private: // The next item to be pointed to by iterator. }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "JAWS/Assoc_Array.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* !defined (JAWS_ASSOC_ARRAY_H) */ diff --git a/ACE/apps/JAWS2/JAWS/Cache_Hash_T.h b/ACE/apps/JAWS2/JAWS/Cache_Hash_T.h index d04cf681754..c8272072fdc 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_Hash_T.h +++ b/ACE/apps/JAWS2/JAWS/Cache_Hash_T.h @@ -47,8 +47,6 @@ private: CACHE_BUCKET_MANAGER **hashtable_; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "JAWS/Cache_Hash_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* ACE_CACHE_HASH_T_H */ diff --git a/ACE/apps/JAWS2/JAWS/Cache_Heap_T.h b/ACE/apps/JAWS2/JAWS/Cache_Heap_T.h index b151cf27665..d89f5195055 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_Heap_T.h +++ b/ACE/apps/JAWS2/JAWS/Cache_Heap_T.h @@ -86,8 +86,6 @@ private: size_t heap_idx_; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "JAWS/Cache_Heap_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* JAWS_CACHE_HEAP_T_H */ diff --git a/ACE/apps/JAWS2/JAWS/Cache_List_T.h b/ACE/apps/JAWS2/JAWS/Cache_List_T.h index 69ac360becb..4be52d0767b 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_List_T.h +++ b/ACE/apps/JAWS2/JAWS/Cache_List_T.h @@ -95,8 +95,6 @@ private: JAWS_Cache_List_Item *prev_; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "JAWS/Cache_List_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* JAWS_CACHE_LIST_T_H */ diff --git a/ACE/apps/JAWS2/JAWS/Cache_Manager_T.h b/ACE/apps/JAWS2/JAWS/Cache_Manager_T.h index 5e9e708a53b..36f00c3c273 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_Manager_T.h +++ b/ACE/apps/JAWS2/JAWS/Cache_Manager_T.h @@ -165,8 +165,6 @@ private: Cache_Manager *manager_; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "JAWS/Cache_Manager_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* JAWS_CACHE_MANAGER_T_H */ diff --git a/ACE/apps/JAWS2/JAWS/Hash_Bucket_T.h b/ACE/apps/JAWS2/JAWS/Hash_Bucket_T.h index 050871ecae7..7ab972e93bc 100644 --- a/ACE/apps/JAWS2/JAWS/Hash_Bucket_T.h +++ b/ACE/apps/JAWS2/JAWS/Hash_Bucket_T.h @@ -188,9 +188,6 @@ private: JAWS_Hash_Bucket_DLCStack<EXT_ID, INT_ID> dlcstack_; }; - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "JAWS/Hash_Bucket_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* JAWS_HASH_BUCKET_T_H */ diff --git a/ACE/apps/JAWS2/JAWS/Pipeline_Handler_T.h b/ACE/apps/JAWS2/JAWS/Pipeline_Handler_T.h index 8ee9db8b6bd..eb757eb92f0 100644 --- a/ACE/apps/JAWS2/JAWS/Pipeline_Handler_T.h +++ b/ACE/apps/JAWS2/JAWS/Pipeline_Handler_T.h @@ -22,8 +22,6 @@ public: // Callback hook for specialized data processing }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "JAWS/Pipeline_Handler_T.cpp" -#endif #endif /* !defined (JAWS_PIPELINE_HANDLER_T_H) */ diff --git a/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.h b/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.h index cc6a1367167..03f7f795995 100644 --- a/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.h +++ b/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.h @@ -83,14 +83,6 @@ private: ACE_TSS_TYPE (JAWS_CACHED_ALLOCATOR(T)) ts_allocator_; }; - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "jaws3/Cached_Allocator_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Cached_Allocator_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - #endif /* JAWS_CACHED_ALLOCATOR_T_H */ diff --git a/ACE/apps/JAWS3/jaws3/Concurrency_T.h b/ACE/apps/JAWS3/jaws3/Concurrency_T.h index 371c53b58de..2313c737439 100644 --- a/ACE/apps/JAWS3/jaws3/Concurrency_T.h +++ b/ACE/apps/JAWS3/jaws3/Concurrency_T.h @@ -32,13 +32,6 @@ protected: CONCURRENCY_IMPL *impl_; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "jaws3/Concurrency_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Concurrency_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - #endif /* JAWS_CONCURRENCY_T_H */ diff --git a/ACE/bin/MakeProjectCreator/config/ace_mc.mpb b/ACE/bin/MakeProjectCreator/config/ace_mc.mpb index 7be197f05a0..1146452ceeb 100644 --- a/ACE/bin/MakeProjectCreator/config/ace_mc.mpb +++ b/ACE/bin/MakeProjectCreator/config/ace_mc.mpb @@ -2,7 +2,6 @@ project : ace_etcl_parser { after += Monitor_Control libs += ACE_Monitor_Control - avoids += wince specific (prop:microsoft) { lit_libs += pdh diff --git a/ACE/bin/MakeProjectCreator/config/inet.mpb b/ACE/bin/MakeProjectCreator/config/inet.mpb index dd5094fe901..1915c061c30 100644 --- a/ACE/bin/MakeProjectCreator/config/inet.mpb +++ b/ACE/bin/MakeProjectCreator/config/inet.mpb @@ -1,6 +1,5 @@ // -*- MPC -*- project : acelib { - avoids += wince avoids += old_stdstream avoids += exclude_inet avoids += ace_for_tao @@ -9,4 +8,4 @@ project : acelib { libs += ACE_INet includes += $(ACE_ROOT)/protocols } - + diff --git a/ACE/bin/MakeProjectCreator/templates/gnu.mpd b/ACE/bin/MakeProjectCreator/templates/gnu.mpd index ee3a32011b3..f4c97286447 100644 --- a/ACE/bin/MakeProjectCreator/templates/gnu.mpd +++ b/ACE/bin/MakeProjectCreator/templates/gnu.mpd @@ -201,9 +201,6 @@ RCFLAGS = \ endif <%endif%> -# To build multiple targets in the same directory on AIX, it works -# best to have a template directory per project. -# The compiler/linker isn't too smart about instantiating templates... ifdef TEMPINCDIR TEMPINCDIR := $(TEMPINCDIR)/<%project_name%> all: $(TEMPINCDIR) diff --git a/ACE/bin/PerlACE/Run_Test.pm b/ACE/bin/PerlACE/Run_Test.pm index 165a3149be2..fe0bfb74aff 100644 --- a/ACE/bin/PerlACE/Run_Test.pm +++ b/ACE/bin/PerlACE/Run_Test.pm @@ -251,29 +251,6 @@ sub add_lib_path { sub check_privilege_group { - if ($^O eq 'hpux') { - my($access) = 'RTSCHED'; - my($status) = 0; - my($getprivgrp) = '/bin/getprivgrp'; - - if (-x $getprivgrp) { - if (open(GPG, "$getprivgrp |")) { - while(<GPG>) { - if (index($_, $access) >= 0) { - $status = 1; - } - } - close(GPG); - } - } - - if (!$status) { - print STDERR - "WARNING: You must have $access privileges to run this test.\n", - " Run \"man 1m setprivgrp\" for more information.\n"; - exit(0); - } - } } # waits until it finds a matching regular expression in a file diff --git a/ACE/contrib/FaCE/ACE.ico b/ACE/contrib/FaCE/ACE.ico Binary files differdeleted file mode 100644 index 3efedc9021b..00000000000 --- a/ACE/contrib/FaCE/ACE.ico +++ /dev/null diff --git a/ACE/contrib/FaCE/ACE_Racer.bmp b/ACE/contrib/FaCE/ACE_Racer.bmp Binary files differdeleted file mode 100644 index a487f63f81c..00000000000 --- a/ACE/contrib/FaCE/ACE_Racer.bmp +++ /dev/null diff --git a/ACE/contrib/FaCE/CE_ARGV.cpp b/ACE/contrib/FaCE/CE_ARGV.cpp deleted file mode 100644 index 463ed1e41c8..00000000000 --- a/ACE/contrib/FaCE/CE_ARGV.cpp +++ /dev/null @@ -1,115 +0,0 @@ -#include "CE_ARGV.h" - -CE_ARGV::CE_ARGV(wchar_t* cmdLine) -: ce_argv_(0) -, ce_argc_(0) -{ - const wchar_t* dummyArgv = L"root"; // dummy for the first argv - const wchar_t* separator = L" "; // blank space is a separator - - int formattedCmdLineLength = wcslen(dummyArgv) + - wcslen(separator) + - 1; // 1 is for the NULL at the end - - if (wcslen(cmdLine) > 0) { - formattedCmdLineLength += wcslen(cmdLine); - formattedCmdLineLength += wcslen(separator); - } - - // formattedCmdLine will have dummyArgv and a separator at the beginning of cmdLine - // and a separator at the end to generalize format and reduce the amount of code - wchar_t* formattedCmdLine = 0; - formattedCmdLine = new wchar_t[formattedCmdLineLength]; - - wcscpy(formattedCmdLine, dummyArgv); - wcscat(formattedCmdLine, separator); - - int max_possible_argc = 1; // start with 1 because of the dummyArgv at the beginning - - if (wcslen(cmdLine) > 0) { - int formattedPos = wcslen(formattedCmdLine); - int cmdLineLength = wcslen(cmdLine); - - // Inside of this for loop, it does same thing as strcat except it - // checks and puts only one single white space between two argv entries. - for (int i = 0; i < cmdLineLength; ++i) { - if (iswspace(cmdLine[i]) != 0) { - ++max_possible_argc; // counting the number of white spaces - } - - formattedCmdLine[formattedPos++] = cmdLine[i]; - - if (iswspace(cmdLine[i]) != 0) { - // make sure there is only one white space between two argv entries. - while ((i < cmdLineLength) && (iswspace(cmdLine[i + 1]) != 0)) { - ++i; - } - } - } - - formattedCmdLine[formattedPos] = 0; - wcscat(formattedCmdLine, separator); // make sure formattedCmdLine ends with a blank - } - - int formattedCmdLength = wcslen(formattedCmdLine); - - bool insideQuotation = false; - int* argv_strlen = 0; - int entry_size = 0; - argv_strlen = new int[max_possible_argc]; - - // determine argc - for (int i = 0; i < formattedCmdLength; ++i) { - if (formattedCmdLine[i] == '\\') { - ++i; // ignore the following character - ++entry_size; - } - else if (formattedCmdLine[i] == '"') { - insideQuotation = !insideQuotation; - } - else if ((!insideQuotation) && (iswspace(formattedCmdLine[i]) != 0)) { - // new argv entry end found - argv_strlen[ce_argc_++] = entry_size; // cache the size of this entry - entry_size = 0; - } - else { - ++entry_size; - } - } - - ce_argv_ = new wchar_t*[ce_argc_ + 1]; - ce_argv_[ce_argc_] = 0; // Last command line entry is a NULL. - - for (int j = 0, cmdLinePos = 0; j < ce_argc_; ++j, ++cmdLinePos) { - int length = argv_strlen[j]; - - ce_argv_[j] = new wchar_t[length + 1]; - ce_argv_[j][length] = 0; // string termination null - - if (iswspace(formattedCmdLine[cmdLinePos]) != 0) { - // This is where prior argv has trailing '"' at the end. - ++cmdLinePos; - } - - for (int n = 0; n < length; ++n, ++cmdLinePos) { - if ((formattedCmdLine[cmdLinePos] == '\\') || (formattedCmdLine[cmdLinePos] == '"')) { - ++cmdLinePos; - } - - ce_argv_[j][n] = formattedCmdLine[cmdLinePos]; - } - } - - delete [] argv_strlen; - delete [] formattedCmdLine; -} - - -CE_ARGV::~CE_ARGV() -{ - for (int i = 0; i < ce_argc_; ++i) { - delete [] ce_argv_[i]; - } - - delete [] ce_argv_; -} diff --git a/ACE/contrib/FaCE/CE_ARGV.h b/ACE/contrib/FaCE/CE_ARGV.h deleted file mode 100644 index 083432bb313..00000000000 --- a/ACE/contrib/FaCE/CE_ARGV.h +++ /dev/null @@ -1,89 +0,0 @@ -// -*- C++ -*- -//============================================================================= -/** - * @file CE_ARGV.h - * - * @author Si Mong Park <spark@ociweb.com> - */ -//============================================================================= - -#ifndef CE_ARGV_H -#define CE_ARGV_H - -#include <windows.h> -#include <ctype.h> - - -/** - * @class CE_ARGV - * - * @brief This class is to hash input parameters, argc and argv, for WinCE platform. - * - * Since WinCE only supports wchar_t as an input from OS, some implementation detail, - * especially for CORBA spec, will not support wchar_t (wchar_t) type parameter. - * Moreover, WinCE's input parameter type is totally different than any other OS; - * all command line parameters will be stored in a single wide-character string with - * each unit parameter divided by blank space, and it does not provide the name of - * executable (generally known as argv[0]). - * This class is to convert CE's command line parameters and simulate as in the same - * manner as other general platforms, adding 'root' as a first argc, which is for the - * name of executable in other OS. - */ -class CE_ARGV -{ -public: - /** - * Ctor accepts CE command line as a parameter. - */ - CE_ARGV(wchar_t* cmdLine); - - /** - * Default Dtor that deletes any memory allocated for the converted string. - */ - ~CE_ARGV(); - - /** - * Returns the number of command line parameters, same as argc on Unix. - */ - int argc(); - - /** - * Returns the 'char**' that contains the converted command line parameters. - */ - wchar_t** argv(); - -private: - /** - * Copy Ctor is not allowed. - */ - CE_ARGV(); - - /** - * Copy Ctor is not allowed. - */ - CE_ARGV(CE_ARGV&); - - /** - * Pointer of converted command line parameters. - */ - wchar_t** ce_argv_; - - /** - * Integer that is same as argc on other OS's. - */ - int ce_argc_; -}; - - -inline int CE_ARGV::argc() -{ - return ce_argc_; -} - - -inline wchar_t** CE_ARGV::argv() -{ - return ce_argv_; -} - -#endif // CE_ARGV_H diff --git a/ACE/contrib/FaCE/CE_Screen_Output.cpp b/ACE/contrib/FaCE/CE_Screen_Output.cpp deleted file mode 100644 index f0d0caf6b02..00000000000 --- a/ACE/contrib/FaCE/CE_Screen_Output.cpp +++ /dev/null @@ -1,164 +0,0 @@ -#include "CE_Screen_Output.h" -#include <string.h> - -// This utility does not use ACE, and shouldn't. -//FUZZ: disable check_for_lack_ACE_OS - -HWND CE_Screen_Output::handler_ = 0; - - -CE_Screen_Output::CE_Screen_Output() -: pFile_(0) -{ -} - - -CE_Screen_Output::~CE_Screen_Output() -{ - if (pFile_ != 0) { - fclose(pFile_); - } -} - - -void CE_Screen_Output::SetOutputWindow(HWND hEdit) -{ - handler_ = hEdit; -} - - -void CE_Screen_Output::clear() -{ - SetWindowText(handler_, 0); -} - - -CE_Screen_Output& CE_Screen_Output::operator << (wchar_t* output) -{ - int length = GetWindowTextLength(handler_); - SendMessage(handler_, EM_SETSEL, length, length); - SendMessage(handler_, EM_REPLACESEL, 0, (LPARAM)output); - - if (pFile_ != 0) - { - fwprintf(pFile_, L"%s", output); - } - - return *this; -} - - -CE_Screen_Output& CE_Screen_Output::operator << (const wchar_t* output) -{ - wchar_t* buffer = _wcsdup(output); - if (buffer != 0) - { - *this << buffer; - delete buffer; - } - return *this; -} - - -CE_Screen_Output& CE_Screen_Output::operator << (char* output) -{ - int len = MultiByteToWideChar(CP_OEMCP, MB_PRECOMPOSED, output, -1, 0, 0); - wchar_t* w_output = new wchar_t[len]; - - MultiByteToWideChar(CP_OEMCP, MB_PRECOMPOSED, output, -1, w_output, len); - *this << w_output; - - delete w_output; - - return *this; -} - - -CE_Screen_Output& CE_Screen_Output::operator << (const char* output) -{ - int len = MultiByteToWideChar(CP_OEMCP, MB_PRECOMPOSED, output, -1, 0, 0); - wchar_t* w_output = new wchar_t[len]; - - MultiByteToWideChar(CP_OEMCP, MB_PRECOMPOSED, output, -1, w_output, len); - *this << w_output; - - delete [] w_output; - return *this; -} - - -CE_Screen_Output& CE_Screen_Output::operator << (char output) -{ - *this << (int)output; - return *this; -} - - -CE_Screen_Output& CE_Screen_Output::operator << (unsigned char output) -{ - *this << (int)output; - return *this; -} - - -CE_Screen_Output& CE_Screen_Output::operator << (unsigned short output) -{ - wchar_t buffer[20]; - wsprintf(buffer, L"%u", output); - *this << buffer; - return *this; -} - - -CE_Screen_Output& CE_Screen_Output::operator << (int output) -{ - wchar_t buffer[20]; - wsprintf(buffer, L"%d", output); - *this << buffer; - return *this; -} - - -CE_Screen_Output& CE_Screen_Output::operator << (unsigned int output) -{ - wchar_t buffer[20]; - wsprintf(buffer, L"%du", output); - *this << buffer; - return *this; -} - - -CE_Screen_Output& CE_Screen_Output::operator << (float output) -{ - wchar_t buffer[20]; - swprintf(buffer, L"%f", output); - *this << buffer; - return *this; -} - - -CE_Screen_Output& CE_Screen_Output::operator << (long output) -{ - wchar_t buffer[20]; - wsprintf(buffer, L"%l", output); - *this << buffer; - return *this; -} - - -CE_Screen_Output& CE_Screen_Output::operator << (unsigned long output) -{ - wchar_t buffer[20]; - wsprintf(buffer, L"%lu", output); - *this << buffer; - return *this; -} - - -CE_Screen_Output& CE_Screen_Output::operator << (FILE* pFile) -{ - pFile_ = pFile; - return *this; -} - -//FUZZ: enable check_for_lack_ACE_OS diff --git a/ACE/contrib/FaCE/CE_Screen_Output.h b/ACE/contrib/FaCE/CE_Screen_Output.h deleted file mode 100644 index 63746e21a0c..00000000000 --- a/ACE/contrib/FaCE/CE_Screen_Output.h +++ /dev/null @@ -1,96 +0,0 @@ -/** - * @file CE_Screen_Output.h - * - * @author Si Mong Park <spark@ociweb.com> - */ -//============================================================================= - -#ifndef CE_Screen_Output_h -#define CE_Screen_Output_h - -#include <windows.h> -#include <stdio.h> - -const wchar_t endl[] = L"\r\n"; -const wchar_t tab[] = L"\t"; - -/** - * @class CE_Screen_Output - * - * @brief Replacement of text output for Windows CE. - * - * This class allows standard text output to be displayed on - * text window for Windows CE. Generally, all ACE output will - * go through under CE if and only if user uses WindozeCE - * implementation by using main_ce instead of main. - * Also, for the easier debugging purpose, object pointer of - * this class can be gotten from ACE_Log_Msg::msg_callback() - * and then can be used directly by user just like cout stream. - */ -class CE_Screen_Output -{ -public: - /** - * Default Ctor - */ - CE_Screen_Output(); - - /** - * Default Dtor - */ - virtual ~CE_Screen_Output(); - - /** - * Interface to specify active window handle. - */ - void SetOutputWindow(HWND hWnd); - - /** - * Clears text screen. - */ - void clear(); - - /** - * << operator that performs actual print out. - * - * Note: This is the only one operator that performs - * output. All other perators convert the type and - * use this operator underneath. - */ - CE_Screen_Output& operator << (wchar_t*); - CE_Screen_Output& operator << (const wchar_t*); - - CE_Screen_Output& operator << (char* output); - CE_Screen_Output& operator << (const char* output); - - CE_Screen_Output& operator << (char output); - CE_Screen_Output& operator << (unsigned char output); - - CE_Screen_Output& operator << (unsigned short output); - - CE_Screen_Output& operator << (int output); - CE_Screen_Output& operator << (unsigned int output); - - CE_Screen_Output& operator << (float output); - - CE_Screen_Output& operator << (long output); - CE_Screen_Output& operator << (unsigned long output); - - CE_Screen_Output& operator << (FILE* pFile); - -private: - /** - * Copy Ctor - */ - CE_Screen_Output(CE_Screen_Output&); - - static HWND handler_; - - /** - * File pointer that used to save output to file. - * This class does not own the file handler pointer. - */ - FILE* pFile_; -}; - -#endif // CE_Screen_Output_h diff --git a/ACE/contrib/FaCE/FACE.ico b/ACE/contrib/FaCE/FACE.ico Binary files differdeleted file mode 100644 index 8a91925b128..00000000000 --- a/ACE/contrib/FaCE/FACE.ico +++ /dev/null diff --git a/ACE/contrib/FaCE/FaCE.cpp b/ACE/contrib/FaCE/FaCE.cpp deleted file mode 100644 index 265e21cbeee..00000000000 --- a/ACE/contrib/FaCE/FaCE.cpp +++ /dev/null @@ -1,652 +0,0 @@ -#include "FaCE.h" - -#ifdef NO_ACE - -#include "CE_ARGV.h" - -#else - -#include <ace/ACE.h> -#include <ace/ARGV.h> -#include <ace/Log_Msg.h> - -#endif // NO_ACE - -#include <commctrl.h> -#include <aygshell.h> -#include <sipapi.h> - -// This utility does not use ACE, and shouldn't. -//FUZZ: disable check_for_lack_ACE_OS - -const ACE_TCHAR* g_ParameterFileName = ACE_TEXT("Parameters.txt"); - -/** - * This simple and small class manages user-input command line - * parameters and parameter history file. - * - * @author Si Mong Park (spark@ociweb.com) - */ -class ParameterList -{ -public: - /** - * Default Ctor. - */ - ParameterList() : next_(0), param_(0) {}; - - /** - * Dtor: deletes all sub-PameterList objects as well as - * memory block allocated for the param_ by _wcsdup(). - */ - ~ParameterList() { free(param_); delete next_; }; - - /** - * Add a new parameter to the list. - */ - void addParameter(char*); - - /** - * Add a new parameter to the list. - */ - void addParameter(ACE_TCHAR*); - - /** - * Save all parameters stored in the list to the - * file. - * Note that 'outputFile' is only for the internal use - * and user must call this function without any parameter. - */ - void saveParameter(FILE* outputFile = 0); - - /** - * Send out windows message to load/update parameters. - */ - void sendParameterMSG(HWND, UINT); - -private: - /** - * A pointer to the next ParameterList object. - * This attribute is totally hidden from user. - */ - ParameterList* next_; - - /** - * User-specified command line parameter. - * This attribute is totally hidden from user. - */ - ACE_TCHAR* param_; -}; - - -void ParameterList::addParameter(char* newParameter) -{ -#ifdef NO_ACE - int len = MultiByteToWideChar(CP_OEMCP, MB_PRECOMPOSED, newParameter, -1, 0, 0); - wchar_t* w_output = new wchar_t[len]; - - MultiByteToWideChar(CP_OEMCP, MB_PRECOMPOSED, newParameter, -1, w_output, len); - this->addParameter(w_output); - - delete [] w_output; -#else - this->addParameter(ACE_TEXT_CHAR_TO_TCHAR(newParameter)); -#endif // NO_ACE -} - - -void ParameterList::addParameter(ACE_TCHAR* newParameter) -{ - if (this->param_ == 0) { - this->param_ = _wcsdup(newParameter); - this->next_ = new ParameterList(); // create and add a new ParameterList object - } - else { - if (wcscmp(this->param_, newParameter) != 0) { - this->next_->addParameter(newParameter); - } - } -} - - -void ParameterList::saveParameter(FILE* outputFile) -{ - if ( (outputFile == 0) && (this->param_ != 0) ) { - outputFile = _wfopen(g_ParameterFileName, ACE_TEXT("w+")); - } - - if (outputFile != 0) { - if (this->param_ != 0) { - fwprintf(outputFile, ACE_TEXT("%s\n"), this->param_); - this->next_->saveParameter(outputFile); - } - else { - fclose(outputFile); - } - } -} - - -void ParameterList::sendParameterMSG(HWND hDlg, UINT message) -{ - if (param_ != 0) { - SendDlgItemMessage(hDlg, IDC_CMDEDIT, message, 0, (LPARAM)this->param_); - this->next_->sendParameterMSG(hDlg, message); - } -} - - -// Global Variables: -HINSTANCE g_hInst; // The current instance -HWND g_hwndCB; // The command bar handle -HWND hWndEdit; // Read only edit box for output display -FILE* g_OutputFile; // File handler for output save - -ParameterList g_Parameter; // command line parameter list - -ACE_CE_Screen_Output cout; // Replacement of std::cout - -ACE_TCHAR g_CommandLine[MAX_COMMAND_LINE]; // User-specified command line parameter -ACE_TCHAR g_SaveFileName[MAX_LOADSTRING]; // Name of the output file - -static SHACTIVATEINFO s_sai; - -// Forward declarations of functions included in this code module: -ATOM MyRegisterClass (HINSTANCE, ACE_TCHAR*); -BOOL InitInstance (HINSTANCE, int); -LRESULT CALLBACK WndProc (HWND, UINT, WPARAM, LPARAM); -LRESULT CALLBACK About (HWND, UINT, WPARAM, LPARAM); -LRESULT CALLBACK CommandLine (HWND, UINT, WPARAM, LPARAM); -LRESULT CALLBACK SaveFileName (HWND, UINT, WPARAM, LPARAM); -LRESULT CALLBACK FileError (HWND, UINT, WPARAM, LPARAM); -LRESULT CALLBACK FileExist (HWND, UINT, WPARAM, LPARAM); -HWND CreateRpCommandBar(HWND); - - -void InitSetup() -{ - g_OutputFile = 0; - memset(g_CommandLine, 0, MAX_COMMAND_LINE * sizeof(ACE_TCHAR)); - memset(g_SaveFileName, 0, MAX_LOADSTRING * sizeof(ACE_TCHAR)); -} - - -void LoadParameterHistory() -{ - FILE* parameterFile = _wfopen(g_ParameterFileName, ACE_TEXT("r")); - - if (parameterFile != 0) { - while (feof(parameterFile) == 0) { - // Note: Remember that fwprintf takes wide-character format specifier but - // save string as ASCII. Thus, history must be read as ASCII then converted - // to wide-character (Unicode on WinCE). - char singleParameter[MAX_COMMAND_LINE]; - int size = 0; - fread(&singleParameter[size], sizeof(char), 1, parameterFile); - - // WinCE does not have function that reads upto the end of line. - while (singleParameter[size] != '\n') { - fread(&singleParameter[++size], sizeof(char), 1, parameterFile); - } - - if (size > 0) { - singleParameter[size] = 0; // NULL terminator - g_Parameter.addParameter(singleParameter); - } - } - fclose(parameterFile); - } -} - - -// -// FUNCTION: MyRegisterClass() -// -// PURPOSE: Registers the window class. -// -// COMMENTS: -// -// It is important to call this function so that the application -// will get 'well formed' small icons associated with it. -// -ATOM MyRegisterClass(HINSTANCE hInstance, ACE_TCHAR* szWindowClass) -{ - WNDCLASS wc; - - wc.style = CS_HREDRAW | CS_VREDRAW; - wc.lpfnWndProc = (WNDPROC) WndProc; - wc.cbClsExtra = 0; - wc.cbWndExtra = 0; - wc.hInstance = hInstance; - wc.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_FACE)); - wc.hCursor = 0; - wc.hbrBackground = (HBRUSH) GetStockObject(WHITE_BRUSH); - wc.lpszMenuName = 0; - wc.lpszClassName = szWindowClass; - - return RegisterClass(&wc); -} - -// -// FUNCTION: InitInstance(HANDLE, int) -// -// PURPOSE: Saves instance handle and creates main window -// -// COMMENTS: -// -// In this function, we save the instance handle in a global variable and -// create and display the main program window. -// -BOOL InitInstance(HINSTANCE hInstance, int nCmdShow) -{ - HWND hWnd = 0; - - ACE_TCHAR szTitle[MAX_LOADSTRING]; // The title bar text - ACE_TCHAR szWindowClass[MAX_LOADSTRING]; // The window class name - - g_hInst = hInstance; // Store instance handle in our global variable - // Initialize global strings - LoadString(hInstance, IDC_FACE, szWindowClass, MAX_LOADSTRING); - LoadString(hInstance, IDS_APP_TITLE, szTitle, MAX_LOADSTRING); - - //If it is already running, then focus on the window - hWnd = FindWindow(szWindowClass, szTitle); - if (hWnd) - { - // set focus to foremost child window - // The "| 0x01" is used to bring any owned windows to the foreground and - // activate them. - SetForegroundWindow((HWND)((ULONG) hWnd | 0x00000001)); - return 0; - } - - MyRegisterClass(hInstance, szWindowClass); - - RECT rect; - GetClientRect(hWnd, &rect); - - hWnd = CreateWindow(szWindowClass, szTitle, WS_VISIBLE, - CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, 0, 0, hInstance, 0); - - if (!hWnd) - { - int error = 0; - error = GetLastError(); - return FALSE; - } - //When the main window is created using CW_USEDEFAULT the height of the menubar (if one - // is created is not taken into account). So we resize the window after creating it - // if a menubar is present - { - RECT rc; - GetWindowRect(hWnd, &rc); - rc.bottom -= MENU_HEIGHT; - if (g_hwndCB) - MoveWindow(hWnd, rc.left, rc.top, rc.right, rc.bottom, FALSE); - } - - ShowWindow(hWnd, nCmdShow); - UpdateWindow(hWnd); - - return TRUE; -} - -// -// FUNCTION: WndProc(HWND, unsigned, WORD, LONG) -// -// PURPOSE: Processes messages for the main window. -// -// WM_COMMAND - process the application menu -// WM_PAINT - Paint the main window -// WM_DESTROY - post a quit message and return -// -LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) -{ - HDC hdc; - int wmId, wmEvent, nCmdHt; - PAINTSTRUCT ps; - RECT textRect; - - switch (message) - { - case WM_COMMAND: - wmId = LOWORD(wParam); - wmEvent = HIWORD(wParam); - // Parse the menu selections: - switch (wmId) - { - case IDM_HELP_ABOUT: - DialogBox(g_hInst, (const ACE_TCHAR*)IDD_ABOUTBOX, hWnd, (DLGPROC)About); - break; - - case IDOK: - SendMessage(hWnd, WM_ACTIVATE, MAKEWPARAM(WA_INACTIVE, 0), (LPARAM)hWnd); - SendMessage(hWnd, WM_CLOSE, 0, 0); - break; - - case ID_SETTING_RUN: - { -#ifdef NO_ACE - cout << ACE_TEXT("START with command line: ") << g_CommandLine << endl; - CE_ARGV ce_argv(g_CommandLine); - main_i(ce_argv.argc(), ce_argv.argv()); - cout << ACE_TEXT("END") << endl << endl; -#else - cout << ACE_TEXT("START with command line: ") << g_CommandLine << endl; - ACE_ARGV ce_argv(g_CommandLine); - ACE::init(); - ACE_LOG_MSG->msg_callback(&cout); // register call back - ACE_LOG_MSG->set_flags(ACE_Log_Msg::MSG_CALLBACK); // set call back flag - ace_main_i(ce_argv.argc(), ce_argv.argv()); - ACE::fini(); - cout << ACE_TEXT("END") << endl << endl; -#endif // NO_ACE - } - break; - - case ID_SETTING_EXIT: - SendMessage(hWnd, WM_DESTROY, 0, 0); - break; - - case ID_TOOLS_SAVETOFILE: - // create a dialog box to get the file name - DialogBox(g_hInst, (const ACE_TCHAR*)IDD_OUTFILE, hWnd, (DLGPROC)SaveFileName); - break; - - case ID_SETTING_COMMANDLINE: - // create a dialog box to get the command line - DialogBox(g_hInst, (const ACE_TCHAR*)IDD_CMDLINE, hWnd, (DLGPROC)CommandLine); - break; - - default: - return DefWindowProc(hWnd, message, wParam, lParam); - } - break; - - case WM_CREATE: - SHMENUBARINFO mbi; - - memset(&mbi, 0, sizeof(SHMENUBARINFO)); - mbi.cbSize = sizeof(SHMENUBARINFO); - mbi.hwndParent = hWnd; - mbi.nToolBarId = IDM_MENU; - mbi.hInstRes = g_hInst; - mbi.nBmpId = 0; - mbi.cBmpImages = 0; - - if (!SHCreateMenuBar(&mbi)) - return 0; - - g_hwndCB = mbi.hwndMB; - - // Initialize the shell activate info structure - memset (&s_sai, 0, sizeof (s_sai)); - s_sai.cbSize = sizeof (s_sai); - - GetClientRect(hWnd, &textRect); - nCmdHt = CommandBar_Height(mbi.hwndMB); - - hWndEdit = CreateWindow(ACE_TEXT("EDIT"), - 0, - WS_CHILD | WS_VISIBLE | ES_READONLY | ES_MULTILINE | WS_VSCROLL | WS_HSCROLL, - 0, - 0, - textRect.right, - textRect.bottom - MENU_HEIGHT, - hWnd, - 0, - g_hInst, - 0); - cout.SetOutputWindow(hWndEdit); - LoadParameterHistory(); - break; - - case WM_PAINT: - RECT rt; - hdc = BeginPaint(hWnd, &ps); - GetClientRect(hWnd, &rt); - EndPaint(hWnd, &ps); - break; - - case WM_ACTIVATE: - // Notify shell of our activate message - SHHandleWMActivate(hWnd, wParam, lParam, &s_sai, FALSE); - break; - - case WM_SETTINGCHANGE: - SHHandleWMSettingChange(hWnd, wParam, lParam, &s_sai); - break; - - case WM_HIBERNATE: // low power - case WM_CLOSE: - case WM_DESTROY: - g_Parameter.saveParameter(); // save parameters to history file - CommandBar_Destroy(g_hwndCB); - PostQuitMessage(0); - break; - - default: - return DefWindowProc(hWnd, message, wParam, lParam); - } - return 0; -} - - -HWND CreateRpCommandBar(HWND hwnd) -{ - SHMENUBARINFO mbi; - - memset(&mbi, 0, sizeof(SHMENUBARINFO)); - mbi.cbSize = sizeof(SHMENUBARINFO); - mbi.hwndParent = hwnd; - mbi.nToolBarId = IDM_MENU; - mbi.hInstRes = g_hInst; - mbi.nBmpId = 0; - mbi.cBmpImages = 0; - - if (!SHCreateMenuBar(&mbi)) - return 0; - - return mbi.hwndMB; -} - -// Mesage handler for the About box. -LRESULT CALLBACK About(HWND hDlg, UINT message, WPARAM wParam, LPARAM) -{ - SHINITDLGINFO shidi; - - const ACE_TCHAR* copyrightNote = -ACE_TEXT("ACE and TAO are copyrighted by Dr. Douglas C. Schmidt and Center for Distributed Object") \ -ACE_TEXT("Computing at Washington University, 1993-2002, all rights reserved.") \ -ACE_TEXT("FaCE is copyrighted by Object Computing, Inc., 2002,\n all rights reserved.\n") \ -ACE_TEXT("See License.txt for more information."); - - switch (message) - { - case WM_INITDIALOG: - // Create a Done button and size it. - shidi.dwMask = SHIDIM_FLAGS; - shidi.dwFlags = SHIDIF_DONEBUTTON | SHIDIF_SIPDOWN | SHIDIF_SIZEDLGFULLSCREEN; - shidi.hDlg = hDlg; - SHInitDialog(&shidi); - SetDlgItemText(hDlg, IDC_COPYRIGHT, copyrightNote); - return TRUE; - - case WM_COMMAND: - if (LOWORD(wParam) == IDOK) - { - EndDialog(hDlg, LOWORD(wParam)); - return TRUE; - } - break; - } - return FALSE; -} - - -LRESULT CALLBACK CommandLine(HWND hDlg, UINT message, WPARAM wParam, LPARAM) -{ - int wmId; - int wmEvent; - - switch (message) - { - case WM_INITDIALOG: - g_Parameter.sendParameterMSG(hDlg, CB_INSERTSTRING); - SetDlgItemText(hDlg, IDC_CMDEDIT, g_CommandLine); // pass existing command line for display - return TRUE; - - case WM_COMMAND: - wmId = LOWORD(wParam); - wmEvent = HIWORD(wParam); - // Parse the menu selections: - switch (wmId) - { - case IDOK: - // new command line accepted - GetDlgItemText(hDlg, IDC_CMDEDIT, g_CommandLine, MAX_COMMAND_LINE - 1); - EndDialog(hDlg, wmId); - g_Parameter.addParameter(g_CommandLine); - return TRUE; - - case IDCANCEL: - EndDialog(hDlg, wmId); - return TRUE; - - default: - return FALSE; - } - break; - default: - return FALSE; - } - - return FALSE; -} - - -LRESULT CALLBACK SaveFileName(HWND hDlg, UINT message, WPARAM wParam, LPARAM) -{ - int wmId; - int wmEvent; - - ACE_TCHAR tempBuffer[MAX_LOADSTRING]; - ACE_TCHAR fileMode[3] = { 0, '+', 0 }; // mode will either be "a+" or "w+" - FILE* tempFile; - - switch (message) - { - case WM_INITDIALOG: - SetDlgItemText(hDlg, IDC_SAVEFILE, g_SaveFileName); - return TRUE; - - case WM_COMMAND: - wmId = LOWORD(wParam); - wmEvent = HIWORD(wParam); - // Parse the menu selections: - switch (wmId) - { - case IDOK: - GetDlgItemText(hDlg, IDC_SAVEFILE, tempBuffer, MAX_LOADSTRING - 1); - EndDialog(hDlg, wmId); - - tempFile = _wfopen(tempBuffer, ACE_TEXT("r")); - - if (tempFile != 0) // if file exists - { - fclose(tempFile); // close temp handler - int choice = DialogBox(g_hInst, (const ACE_TCHAR*)IDD_FILEEXIST, hDlg, (DLGPROC)FileExist); - switch (choice) - { - case IDOVERWRITE: // overwrite existing file - fileMode[0] = 'w'; - break; - - case IDC_APPEND: // append to existing file - fileMode[0] = 'a'; - break; - - case IDCANCEL: // cancel operation without changing g_OutputFile - return TRUE; - } - } - else // if file does not exist - { - fileMode[0] = 'w'; - } - - tempFile = _wfopen(tempBuffer, fileMode); - - if (tempFile == 0) - { - DialogBox(g_hInst, (const ACE_TCHAR*)IDD_ERRFILE, hDlg, (DLGPROC)FileError); - } - else - { - wcscpy(g_SaveFileName, tempBuffer); - - if (g_OutputFile != 0) - { - fclose(g_OutputFile); // close any open file - } - - g_OutputFile = tempFile; - - cout << g_OutputFile; // update FILE* for the CE_Screen_Output class object. - } - - return TRUE; - - case IDCANCEL: - EndDialog(hDlg, wmId); - return TRUE; - - default: - return FALSE; - } - break; - default: - return FALSE; - } - - return FALSE; -} - - -LRESULT CALLBACK FileError(HWND hDlg, UINT message, WPARAM wParam, LPARAM) -{ - switch (message) - { - case WM_INITDIALOG: - return TRUE; - - case WM_COMMAND: - if (LOWORD(wParam) == IDOK) - { - EndDialog(hDlg, LOWORD(wParam)); - return TRUE; - } - break; - } - - return FALSE; -} - - -LRESULT CALLBACK FileExist(HWND hDlg, UINT message, WPARAM wParam, LPARAM) -{ - switch (message) - { - case WM_INITDIALOG: - return TRUE; - case WM_COMMAND: - EndDialog(hDlg, LOWORD(wParam)); - return TRUE; - default: - return FALSE; - } - - return FALSE; -} - -//FUZZ: enable check_for_lack_ACE_OS diff --git a/ACE/contrib/FaCE/FaCE.h b/ACE/contrib/FaCE/FaCE.h deleted file mode 100644 index f8dc293aa1a..00000000000 --- a/ACE/contrib/FaCE/FaCE.h +++ /dev/null @@ -1,54 +0,0 @@ -// -*- C++ -*- -//============================================================================= -/** - * @file FaCE.h - * - * @author Si Mong Park <spark@ociweb.com> - */ -//============================================================================= - -#if !defined(AFX_FACE_H__1043241E_A6A9_4246_A9E4_7A774E19EE73__INCLUDED_) -#define AFX_FACE_H__1043241E_A6A9_4246_A9E4_7A774E19EE73__INCLUDED_ - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 - -#if (_WIN32_WCE <= 211) -#error This project can not be built for H/PC Pro 2.11 or earlier platforms. -#endif - -#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers - -////// -// BEGIN FaCE specific preprocessor -#ifdef NO_ACE - -#include <windows.h> -#include "CE_Screen_Output.h" - -#define ACE_TCHAR wchar_t -#define ACE_TEXT(STRING) L##STRING -#define ACE_CE_Screen_Output CE_Screen_Output - -int main_i(int, wchar_t**); - -#else - -#include <ace/CE_Screen_Output.h> - -int ace_main_i(int, ACE_TCHAR**); - -#endif // NO_ACE -// END FaCE specific -////// - -#include "resource.h" - -#define MENU_HEIGHT 26 -#define MAX_LOADSTRING 101 -#define MAX_COMMAND_LINE 1001 // Max number of characters + 1 (null at the end) for user-input argv - -extern ACE_CE_Screen_Output cout; // Replacement of std::cout - -#endif // !defined(AFX_FACE_H__1043241E_A6A9_4246_A9E4_7A774E19EE73__INCLUDED_) diff --git a/ACE/contrib/FaCE/FaCE.mpc b/ACE/contrib/FaCE/FaCE.mpc deleted file mode 100644 index a107075b12d..00000000000 --- a/ACE/contrib/FaCE/FaCE.mpc +++ /dev/null @@ -1,14 +0,0 @@ -// -*- MPC -*- -project: aceexe { - exename = FaCE - // This is just a dummy_label to prevent the example from being compiled - // in MPC builds - requires += dummy_label - requires += wince - lit_libs += aygshell commctrl - - Source_Files { - FaCE.cpp - Main.cpp - } -} diff --git a/ACE/contrib/FaCE/FaCE.rc b/ACE/contrib/FaCE/FaCE.rc deleted file mode 100644 index 1d1b40df81e..00000000000 --- a/ACE/contrib/FaCE/FaCE.rc +++ /dev/null @@ -1,268 +0,0 @@ -//Microsoft Developer Studio generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "newres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_FACE ICON DISCARDABLE "FACE.ico"
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE
-BEGIN
- "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE
-BEGIN
- "#include ""newres.h""\r\n"
- "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE
-BEGIN
- "\r\n"
- "\0"
-END
-
-#endif // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Data
-//
-
-IDM_MENU SHMENUBAR MOVEABLE PURE
-BEGIN
- IDM_MENU, 2,
- I_IMAGENONE, ID_SETTING, TBSTATE_ENABLED,
- TBSTYLE_DROPDOWN | TBSTYLE_AUTOSIZE, IDS_CAP_SETTING, 0, 0,
- I_IMAGENONE, IDM_MAIN_COMMAND1, TBSTATE_ENABLED,
- TBSTYLE_DROPDOWN | TBSTYLE_AUTOSIZE, IDS_HELP, 0, 1,
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menubar
-//
-
-IDM_MENU MENU DISCARDABLE
-BEGIN
- POPUP "Setting"
- BEGIN
- MENUITEM "Command Line", ID_SETTING_COMMANDLINE
- MENUITEM "Run", ID_SETTING_RUN
- MENUITEM SEPARATOR
- MENUITEM "Exit", ID_SETTING_EXIT
- END
- POPUP "Tools"
- BEGIN
- MENUITEM "About", IDM_HELP_ABOUT
- MENUITEM "Save To File", ID_TOOLS_SAVETOFILE
- END
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-IDD_ABOUTBOX DIALOG DISCARDABLE 0, 0, 148, 161
-STYLE WS_POPUP | WS_CAPTION
-EXSTYLE 0x80000000L
-CAPTION "About FACE"
-FONT 8, "System"
-BEGIN
- CONTROL 113,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE,33,6,
- 69,52
- CTEXT "Static",IDC_COPYRIGHT,7,86,128,68
- CONTROL 114,IDC_TAO,"Static",SS_BITMAP,7,61,134,22
-END
-
-IDD_CMDLINE DIALOG DISCARDABLE 0, 0, 125, 50
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Command Line"
-FONT 8, "System"
-BEGIN
- DEFPUSHBUTTON "OK",IDOK,7,29,50,14
- PUSHBUTTON "Cancel",IDCANCEL,68,29,50,14
- COMBOBOX IDC_CMDEDIT,7,7,111,80,CBS_DROPDOWN | CBS_AUTOHSCROLL |
- CBS_OEMCONVERT | CBS_SORT | CBS_HASSTRINGS | WS_VSCROLL |
- WS_TABSTOP
-END
-
-IDD_OUTFILE DIALOG DISCARDABLE 0, 0, 127, 49
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Output File Name"
-FONT 8, "System"
-BEGIN
- DEFPUSHBUTTON "OK",IDOK,7,28,50,14
- PUSHBUTTON "Cancel",IDCANCEL,70,28,50,14
- EDITTEXT IDC_SAVEFILE,7,7,113,14,ES_AUTOHSCROLL
-END
-
-IDD_ERRFILE DIALOG DISCARDABLE 0, 0, 124, 49
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "ERROR"
-FONT 8, "System"
-BEGIN
- DEFPUSHBUTTON "OK",IDOK,37,28,50,14
- CTEXT "File Creation Error!",IDC_ERRFILE,13,7,98,17,
- SS_CENTERIMAGE
-END
-
-IDD_FILEEXIST DIALOG DISCARDABLE 0, 0, 114, 90
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "File Exists"
-FONT 8, "System"
-BEGIN
- DEFPUSHBUTTON "Overwrite",IDOVERWRITE,32,32,50,14
- PUSHBUTTON "Cancel",IDCANCEL,32,68,50,14
- PUSHBUTTON "Append",IDC_APPEND,32,50,50,14
- CTEXT "File already exists!",IDC_STATIC,7,15,100,11
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Accelerator
-//
-
-IDC_FACE ACCELERATORS DISCARDABLE
-BEGIN
- "A", IDM_HELP_ABOUT, VIRTKEY, CONTROL, NOINVERT
- "Q", IDOK, VIRTKEY, CONTROL, NOINVERT
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE
-BEGIN
- IDD_ABOUTBOX, DIALOG
- BEGIN
- LEFTMARGIN, 7
- RIGHTMARGIN, 141
- TOPMARGIN, 6
- BOTTOMMARGIN, 154
- END
-
- IDD_CMDLINE, DIALOG
- BEGIN
- LEFTMARGIN, 7
- RIGHTMARGIN, 118
- TOPMARGIN, 7
- BOTTOMMARGIN, 43
- END
-
- IDD_OUTFILE, DIALOG
- BEGIN
- LEFTMARGIN, 7
- RIGHTMARGIN, 120
- TOPMARGIN, 7
- BOTTOMMARGIN, 42
- END
-
- IDD_ERRFILE, DIALOG
- BEGIN
- LEFTMARGIN, 7
- RIGHTMARGIN, 117
- TOPMARGIN, 7
- BOTTOMMARGIN, 42
- END
-
- IDD_FILEEXIST, DIALOG
- BEGIN
- LEFTMARGIN, 7
- RIGHTMARGIN, 107
- TOPMARGIN, 7
- BOTTOMMARGIN, 82
- END
-END
-#endif // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Bitmap
-//
-
-IDB_ACERACER BITMAP DISCARDABLE "ACE_Racer.bmp"
-IDB_TAO BITMAP DISCARDABLE "TAO.bmp"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE DISCARDABLE
-BEGIN
- IDS_APP_TITLE "FaCE"
- IDC_FACE "FaCE"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
- IDS_HELP "Tools"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
- IDS_COMMAND1 "Done "
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
- IDS_CAP_SETTING "Setting"
-END
-
-#endif // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif // not APSTUDIO_INVOKED
-
diff --git a/ACE/contrib/FaCE/FaCENOACE.mpc b/ACE/contrib/FaCE/FaCENOACE.mpc deleted file mode 100644 index cc91b9a048d..00000000000 --- a/ACE/contrib/FaCE/FaCENOACE.mpc +++ /dev/null @@ -1,14 +0,0 @@ -// -*- MPC -*- -project: vc_warnings { - exename = FaCENOACE - requires += wince - macros += NO_ACE - lit_libs += aygshell commctrl - - Source_Files { - FaCE.cpp - Main.cpp - CE_ARGV.cpp - CE_Screen_Output.cpp - } -} diff --git a/ACE/contrib/FaCE/FaCE_OS.h b/ACE/contrib/FaCE/FaCE_OS.h deleted file mode 100644 index 4043068af52..00000000000 --- a/ACE/contrib/FaCE/FaCE_OS.h +++ /dev/null @@ -1,36 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file FaCE_OS.h - * - * @author Si Mong Park <spark@ociweb.com> - */ -//============================================================================= - -#ifndef FaCE_OS_h -#define FaCE_OS_h - -// This definition is for the "int FaCE_MAIN(int, wchar_t**)" using FaCE. -# define FaCE_MAIN \ -ace_main_i (int, ACE_TCHAR**); \ -extern BOOL InitInstance (HINSTANCE, int); \ -extern void InitSetup(); \ -int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, ACE_TCHAR* lpCmdLine, int nCmdShow) \ -{ \ - MSG msg; \ - HACCEL hAccelTable; \ - if (!InitInstance (hInstance, nCmdShow)) return FALSE; \ - hAccelTable = LoadAccelerators(hInstance, (const ACE_TCHAR*)IDC_FACE); \ - InitSetup(); \ - while (GetMessage(&msg, 0, 0, 0)) { \ - if (!TranslateAccelerator(msg.hwnd, hAccelTable, &msg)) { \ - TranslateMessage(&msg); \ - DispatchMessage(&msg); \ - } \ - } \ - return msg.wParam; \ -} \ -int ace_main_i - -#endif // FaCE_OS_h diff --git a/ACE/contrib/FaCE/License.txt b/ACE/contrib/FaCE/License.txt deleted file mode 100644 index 1c58219c67a..00000000000 --- a/ACE/contrib/FaCE/License.txt +++ /dev/null @@ -1,28 +0,0 @@ -== -== Copyright and Licensing Information -== -== - -ACE(tm) and TAO(tm) are copyrighted by Dr. Douglas C. Schmidt and the Center for Distributed -Object Computing ('DOC' group) at Washington University, Copyright (C) 1993 - 2002, all rights -reserved. Since ACE and TAO are open source, free software, you are free to use, modify, and -distribute the ACE and TAO source code and object code produced from the source, as long as -you include this copyright statement along with code built using ACE and TAO. Please refer to -ACE and TAO documentations for detailed copyright and license information on ACE and TAO. - -FaCE is an additional front-end shell package designed for ACE and TAO testing work for Pocket -PC 2002 platform, created and released by Object Computing, Inc. (OCI) and distributed with ACE -and TAO under the same licensing terms. You can modify and change the source of FaCE for your -own use as long as you provide attribution to OCI by including its copyright statement in your -distributions of source and object code. OCI welcomes submissions of improvements to the FaCE -code base. - -FaCE is copyrighted by Object Computing, Inc., St. Louis Missouri, Copyright (C) 2002, -all rights reserved. - - -== -== Warranty Information -== - -FaCE is provided 'as is' without warranties of any kind. diff --git a/ACE/contrib/FaCE/Main.cpp b/ACE/contrib/FaCE/Main.cpp deleted file mode 100644 index dd927c27203..00000000000 --- a/ACE/contrib/FaCE/Main.cpp +++ /dev/null @@ -1,47 +0,0 @@ -// ************************************************ -// ** This file is NOT to be used for framework. ** -// ************************************************ - -// This file defines the entry point for Windows CE, which is defined in OS.h for real applications. - - -#include "FaCE.h" - -extern BOOL InitInstance (HINSTANCE, int); -extern void InitSetup(); - - -int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE, ACE_TCHAR*, int nCmdShow) -{ - MSG msg; - HACCEL hAccelTable; - if (!InitInstance (hInstance, nCmdShow)) return FALSE; - hAccelTable = LoadAccelerators(hInstance, (const ACE_TCHAR*)IDC_FACE); - InitSetup(); - while (GetMessage(&msg, 0, 0, 0)) { - if (!TranslateAccelerator(msg.hwnd, hAccelTable, &msg)) { - TranslateMessage(&msg); - DispatchMessage(&msg); - } - } - return msg.wParam; -} - - -#ifdef NO_ACE - -int main_i(int, ACE_TCHAR**) -{ - // this function will be replaced by user's main_ce function - return 0; -} - -#else - -int ace_main_i(int, ACE_TCHAR**) -{ - // this function will be replaced by user's main_ce function - return 0; -} - -#endif // NO_ACE diff --git a/ACE/contrib/FaCE/README b/ACE/contrib/FaCE/README deleted file mode 100644 index f81650500ce..00000000000 --- a/ACE/contrib/FaCE/README +++ /dev/null @@ -1,283 +0,0 @@ -=== -=== FaCE (Front-end for ACE CE) -=== -=== Object Computing, Inc. <http://www.ociweb.com> -=== St. Louis, Missouri -=== Copyright (C) 2002. All rights reserved. -=== -=== V1.01, March 30th, 2002 -=== - -== What's FaCE? - -FaCE is a simple front-end framework for testing and debugging non-Windows -CE applications on the Pocket PC 2002 platform. Originally, FaCE was -developed to test ACE and TAO components internally in Object Computing, Inc. -However, since it has shown dramatic increase of productivity in a lot -shorter amount of time, it has been prepared as a package for all programmers -who want to test and run existing codes (non-WinCE native codes) on Pocket PC -2002 and WinCE 3.0. - -The features of FaCE are: - - 1. command line parameter support - 2. command line history support (never type in same command line again) - 3. output displayed on the windows screen - 4. output to file (with append and overwrite support) - 5. does not use MFC - 6. almost no modification to existing user code - 7. easy to enable and disable after install - -* Default project files only contain Pocket PC 2002 platform configuration. - A new configuration can be added for other WinCE 3.0 platform from eVC. - - -== Package Contents - -Files contained in FaCE package are: - - Main Framework Files for both ACE users and non-ACE users - - ACE_Racer.bmp - - FaCE.h & cpp - - FaCE.ico - - FaCE.rc - - newres.h - - resource.h - - TAO.bmp - - ACE entry point definition file - - FaCE_OS.h - - Additional Framework files for non-ACE users - - CE_ARGV.h & cpp - - CE_Screen_Output.h & cpp - - Files for loading skeleton FaCE from eVC - - FaCE.vcp & vcw : FaCE Project files for ACE users - - FaCENOACE.vcp & vcw : FaCE Project files for non-ACE users - - Main.cpp : almost empty entry point function - - Misc. Files - - ACE.ico : a bonus icon of ACE logo - - License.txt : license and warranty information - - ReadMe.txt : this document - - -== Requirement - - - Microsoft(C) eMbedded Visual Studio/C++ (eVC) 3.0 - - Pocket PC 2002 SDK - - ** For ACE-users only: - - ACE+TAO installed and configured for WinCE build only for ACE-users - - ace and ace_os libraries built for WinCE and loaded on machine - - -== Important Note - -It has been reported that certain Pocket PC 2002 machines with ARM processor -can be totally dead and will not even respond to the hard reset. While the -real cause of this problem is unknown, HP has released a patch for this -problem. We have tested it, and it seems working fine on our machine (HP -Jornada 568), which is our 5th machine that has been running fine for the -longest time. - -As this has been identified by hardware manufacturer and can be fixed as HP -did, Object Computing, Inc. (OCI) or any member of ACE+TAO community cannot -be responsible for this problem. If this problem happens during debugging, -contact your hardware manufacturer for fix or replacement. It has found -that almost all Pocket PC 2002 machines regardless of manufacturers have same -problem. - -Also, Phil Mesnier at OCI has found that virtual function calls under certain -situation can cause a problem that randomly changes parameter and pointer -values over function calls. This is due to the incorrect instructions -generated by eVC for ARM processor. So far, no solution or patch has been -released by compiler vendor, although vendor is aware of this problem. - -Since Pocket PC 2002 is based on WinCE 3.0, ACE+TAO as well as FaCE should -be able to run on any WinCE 3.0 platform by adding a new configuration with -minimal change. - - -== Installation & Setup - -1. Create a subdirectory named 'FaCE' (or anything in your taste) under - your current project directory. - -2. Copy FaCE_OS.h to the ACE_ROOT/ace directory, and add following line at - the end of your ACE_ROOT/ace/config.h file: - - #include "FaCE_OS.h" - -3. Copy main framework files listed above and add them into "your" project - (NOT FaCE.vcw/vcp). For non-ACE users, copy additional framework files - for non-ACE users in addition to the main framework files. - It would be a good idea to create a new folder in your project and put - all FaCE files into it. This way, it will be easy to disable FaCE by - setting the folder excluded from the build on the folder property option. - - ** IMPORTANT! ** - FaCE does NOT use MFC. Thus, if your project is already set for - 'Not using MFC', then do not change the setting. - - * Note: Make sure those files are not shared by multiple executables. - Each project must have its own copy of those files. - It is a good idea to create a separate folder on your project - and put FaCE related files into that folder. In that case, - if you want to disable FaCE and run by using normal 'main', - then you can simply set the whole FaCE folder excluded from - build in the project setting menu. - -4. Change your 'main()' function part similar to the following example. - - #ifdef ACE_HAS_WINCE - #include "FaCE/FaCE.h" // use the name of subdirectory you created - int FaCE_MAIN (int argc, ACE_TCHAR *argv[]) - #else - int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // ACE normal entry point - #endif - - Change the directory name for "FaCE/FaCE.h" if necessary. - For non-ACE users, use 'UNDER_CE' instead of 'ACE_HAS_WINCE'. - - == Possible Additional Change - - Above change will be the only change if your program compiles and links - fine under eVC. It does not mean that your program is WinCE-ready but - just means that your program does not include the libraries that are not - supported by WinCE, such as iostream. - - For ACE users, good examples will be the ACE test programs under - $ACE_ROOT/test. - - For non-ACE users, I highly recommend to create a project for WinCE first - if it has not already been done and write your code using wmain. - Try compile and link your program without FaCE to check your program does - not include any libraries not supported by WinCE. FaCE supports text output - by aliasing 'cout' in FaCE.h; however, it is NOT a real iostream but an alias - for CE_Screen_Output class. You may need to use '#ifdef UNDER_CE' for your - iostream includes, if you want to share the code among different platforms. - - Also, it is important to match the parameter types for 'wmain' function. - For WinCE, it MUST be in the format of: - - int FaCE_MAIN (int, wchar_t**) - - and you can leave your original wmain type as it was for non-CE platform - definition. - -5. Go to 'ResourceView' or double-click on the 'FaCE.rc'. Open 'String Table -> - String Table' from the resource browse view, and change the string value (caption) - defined for 'IDS_APP_TITLE' from 'FaCE' to your program name. This will - help identifying multiple FaCE-fied applications when you browse them - through system memory -> running programs in case of crash. - -6. That's it! - -** Optionally, you can personalize the icons defined for FaCE for your own. - To do this easily, load "FaCE.vcw" (requires ACE library) or "FaCENOACE.vcw" - from eVC. Also, FaCENOACE.vcw can be used as 'hello world'-type starting - frame-work for non-WinCE programmers. - -** Non-ACE users may see the warning messages saying, "Could not find the file xxx", - for ace.h, Log_Msg.h, OS.h, and CE_Screen_Output.h. This is due to the eVC's - not-so-perfect precompilation file checking and totally harmless. - -** Later if you don't want to use FaCE anymore, simply restore your original - main function and remove FaCE files from your project (or exclude FaCE files - from build). ACE library does not have to be rebuilt as FaCE_OS.h only - contains macro. - -== Running FaCE - -1. Command line option - -User can specify the command line option for the program by using 'Settings -> -Command Line' from the FaCE menu. FaCE will automatically save all user-entered -command line parameters as a ASCII format file named 'Parameters.txt' in the -root directory of WinCE device/emulator. User can edit and change by opening -this file from any text editor and save as a ASCII text file with DOS standard -CR/LF combo. This will greatly save time especially when you are working on the -Pocket PC machine that does not have keyboard. Remember NOT to convert file -format to Unicode; it must be standard DOS ASCII text file. - -2. Output Saving - -You can save output to file by selecting 'Tools -> Save To File'. By default, -FaCE will not create/save any file. Also, any output received before setting -up this feature will not be saved. - -If the file with specified name exists, FaCE will ask whether you want to -append to the end of file or erase and overwrite. All output files will be -saved in the root directory of the system. - -3. Running Your Program - -'Setting -> Run' will execute your program. Two tags, 'START' and 'END' -indicate the beginning and end of your code. - -For ACE users, any log message sent to ACE message log (ACE_DEBUG, for example) -will be displayed on the screen. Also, if you have setup to save to file, -the same contents will be saved to the file as well. Note that the output will -NOT have ACE internal tags (i.e. Dec 04 14:51:12.000 2001@LM_DEBUG@) because -FaCE uses callback message function, and ACE does not pass those tags along -with the output message. - -For non-ACE users, you can declare your own local copy of CE_Screen_Output -object. For example, you can declare CE_Screen_Output object in your cpp file -like: - - CE_Screen_Output cout; - -and use it like, - - int a = 100; - wchar_t* strTemp = L"Hello, world!"; - cout << L"String : " << strTemp << L"a = " << a << endl; - -Remember, CE_Screen_Output is just a simple text output function and does not -have the full capabilities of iostream, which is not available for WinCE 3.0. - -4. In case of crash - -If you have started your code, but the code crashes, which can be easily -identified by looking for the 'END' tag, then you can use Windows CE's memory -program to kill the process (Start -> Settings -> System tag -> Memory -> -Running Programs tag). If you have changed IDS_APP_TITLE in the resource -viewer, then you will see the name you have specified; otherwise, FaCE will be -listed. You can select the name and stop the process by clicking 'Stop' button. -Sometimes, you may need to reset the machine if you cannot access memory program. - - -== Note - -- This FaCE framework does not use any MFC; it only uses general Win32 - API, thus, your project setting does not have to be changed. - -- FaCE is for the 'legacy' Unix/DOS style console applications that - do not use any Win32 and MFC for Windows OS. Programs that are already - using native Windows/WinCE API's will not need FaCE framework. - -- If you run your application from FaCE (Settings -> Run), 'START' and - 'END' will appear at the beginning and end of output messages from your - application. If you see 'END' lable after execution, you can run your - program again without exit and start up FaCE again. - -- Make sure to terminate FaCE by selecting 'Settings -> Exit'. It will - completely terminate FaCE session; Clicking on the 'X' button - at the top-left corner of the screen will not, just like most WinCE programs. - -- FaCE_MAIN is only for the WinCE port of ACE, ensuring proper windows system - message filtering along with proper registraion so that user can see the - process from memory setting and task switcher applications. - -- ACE and FaCE do not overrides native WinMain. If you are developing for - Windows OS only, your WinMain should be just safe from any overrides. - In this case, of course, you don't need to use FaCE package. - - -== Question or Comment - -If you have question and/or comment specific to the FaCE, please contact -Si Park at spark@ociweb.com or Justin Michel at michel_j@ociweb.com. diff --git a/ACE/contrib/FaCE/TAO.bmp b/ACE/contrib/FaCE/TAO.bmp Binary files differdeleted file mode 100644 index 1492f789509..00000000000 --- a/ACE/contrib/FaCE/TAO.bmp +++ /dev/null diff --git a/ACE/contrib/FaCE/newres.h b/ACE/contrib/FaCE/newres.h deleted file mode 100644 index c0fcf13874f..00000000000 --- a/ACE/contrib/FaCE/newres.h +++ /dev/null @@ -1,42 +0,0 @@ -#ifndef __NEWRES_H__ -#define __NEWRES_H__ - -#if !defined(UNDER_CE) -#define UNDER_CE _WIN32_WCE -#endif - -#if defined(_WIN32_WCE) - #if !defined(WCEOLE_ENABLE_DIALOGEX) - #define DIALOGEX DIALOG DISCARDABLE - #endif - #include <commctrl.h> - #define SHMENUBAR RCDATA - #if defined(WIN32_PLATFORM_PSPC) && (_WIN32_WCE >= 300) - #include <aygshell.h> - #define AFXCE_IDR_SCRATCH_SHMENU 28700 - #else - #define I_IMAGENONE (-2) - #define NOMENU 0xFFFF - #define IDS_SHNEW 1 - - #define IDM_SHAREDNEW 10 - #define IDM_SHAREDNEWDEFAULT 11 - #endif // _WIN32_WCE_PSPC - #define AFXCE_IDD_SAVEMODIFIEDDLG 28701 -#endif // _WIN32_WCE - -#ifdef RC_INVOKED -#ifndef _INC_WINDOWS -#define _INC_WINDOWS - #include "winuser.h" // extract from windows header - #include "winver.h" - #include "windows.h" -#endif -#endif - -#ifdef IDC_STATIC -#undef IDC_STATIC -#endif -#define IDC_STATIC (-1) - -#endif //__NEWRES_H__ diff --git a/ACE/contrib/FaCE/resource.h b/ACE/contrib/FaCE/resource.h deleted file mode 100644 index 385039fa6ac..00000000000 --- a/ACE/contrib/FaCE/resource.h +++ /dev/null @@ -1,43 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Developer Studio generated include file. -// Used by FaCE.rc -// -#define IDS_APP_TITLE 1 -#define IDC_FACE 3 -#define IDI_FACE 101 -#define IDM_MENU 102 -#define IDD_ABOUTBOX 103 -#define IDS_HELP 104 -#define IDD_CMDLINE 104 -#define IDD_OUTFILE 105 -#define IDD_ERRFILE 107 -#define IDD_FILEEXIST 109 -#define IDB_ACERACER 113 -#define IDB_TAO 114 -#define IDS_COMMAND1 301 -#define IDC_CMDEDIT 1001 -#define IDC_SAVEFILE 1002 -#define IDC_ERRFILE 1003 -#define IDOVERWRITE 1004 -#define IDC_APPEND 1005 -#define IDC_COPYRIGHT 1007 -#define IDC_TAO 1008 -#define IDM_MAIN_COMMAND1 40001 -#define IDM_HELP_ABOUT 40003 -#define ID_SETTING 40004 -#define IDS_CAP_SETTING 40006 -#define ID_SETTING_COMMANDLINE 40007 -#define ID_SETTING_RUN 40008 -#define ID_SETTING_EXIT 40011 -#define ID_TOOLS_SAVETOFILE 40012 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 116 -#define _APS_NEXT_COMMAND_VALUE 40013 -#define _APS_NEXT_CONTROL_VALUE 1009 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif diff --git a/ACE/docs/ACE-guidelines.html b/ACE/docs/ACE-guidelines.html index ab270f13aa8..2a39073badc 100644 --- a/ACE/docs/ACE-guidelines.html +++ b/ACE/docs/ACE-guidelines.html @@ -243,17 +243,9 @@ rather than <strong><code>#if</code></strong> directive. For example, <pre> #if defined (ACE_HAS_THREADS) - # if defined (ACE_HAS_STHREADS) - # include /**/ <synch.h> - # include /**/ <thread.h> - # define ACE_SCOPE_PROCESS P_PID - # define ACE_SCOPE_LWP P_LWPID - # define ACE_SCOPE_THREAD (ACE_SCOPE_LWP + 1) - # else - # define ACE_SCOPE_PROCESS 0 - # define ACE_SCOPE_LWP 1 - # define ACE_SCOPE_THREAD 2 - # endif /* ACE_HAS_STHREADS */ + # define ACE_SCOPE_PROCESS 0 + # define ACE_SCOPE_LWP 1 + # define ACE_SCOPE_THREAD 2 #endif /* ACE_HAS_THREADS */ </pre><p> @@ -379,13 +371,7 @@ If using g++, problems like this can be flagged as a warning by using the "<code #include "Foo_T.inl" #endif /* __ACE_INLINE__ */ - #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Foo_T.cpp" - #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - - #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) - #pragma implementation "Foo_T.cpp" - #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* FOO_T_H */ </pre></p> @@ -1196,9 +1182,7 @@ public: the code is removed.<p> <li>Be <strong>very</strong> careful with the code that you put - in a signal handler. On Solaris, the man pages document systems - calls as being Async-Signal-Safe if they can be called from signal - handlers. In general, it's best to just set a flag in a signal + in a signal handler. In general, it's best to just set a flag in a signal handler and take appropriate action elsewhere. It's also best to avoid using signals, especially asynchronous signals.<p> @@ -1213,8 +1197,7 @@ public: This avoids leaving the temporary file even if the program crashes.<p> <li>Be sure to specify the <code>THR_BOUND</code> thread creation - flag for time-critical threads. This ensures that the thread competes - for resources globally on Solaris. It is harmless on other platforms.<p> + flag for time-critical threads. It is harmless on other platforms.<p> </ul> diff --git a/ACE/docs/ACE-porting.html b/ACE/docs/ACE-porting.html index ead06da4ffe..233d1434c03 100644 --- a/ACE/docs/ACE-porting.html +++ b/ACE/docs/ACE-porting.html @@ -79,14 +79,11 @@ threading API correctly. Currently, ACE has support for the following thread APIs: <P> <UL> -<LI> <B>UNIX International (UI) Threads</B> - (<CODE>ACE_HAS_STHREADS</CODE>) - Solaris.<P> - <LI> <B>POSIX Pthreads</B> (<CODE>ACE_HAS_PTHREADS</CODE>) -Final standard (also - called draft 10) [MIT, Linux, and Solaris]. <P> + called draft 10) [MIT, Linux]. <P> <LI> <B>Win32 Threads</B> (<CODE>ACE_HAS_WTHREADS</CODE>) - Windows - NT, Windows '95/98, and Windows CE <P> + NT, Windows '95/98<P> <LI> <B>VxWorks Tasks</B> (<CODE>ACE_VXWORKS</CODE>) - VxWorks <P> </UL> diff --git a/ACE/docs/CE-status.txt b/ACE/docs/CE-status.txt deleted file mode 100644 index 963549092f8..00000000000 --- a/ACE/docs/CE-status.txt +++ /dev/null @@ -1,50 +0,0 @@ - -/** - -@page wince ACE on Windows CE status - -Last updated Friday 14-November-2008 by Johnny Willemsen -<jwillemsen@remedy.nl> - -@subsection ce_status Status - -As of ACE 5.6, Remedy IT supports ACE and TAO on Windows CE building with -Microsoft Visual Studio 2005 and targeting the Windows Mobile 5 and 6. OCI -supports TAO 1.3 on at least Windows CE 3 with the PocketPC 2002 SDK. Contact -the individual support provider for complete information regarding these -platforms as well as the supported hardware targets. - -@subsection ce_evc eMbedded Visual C++ Projects - -Whereas previous ACE versions had separate ACE and ACE_OS eMbedded Visual C++ -project files, the project and workspace arrangement is now the same as -for other Windows versions. The project and workspace files themselves are -generated using the MakeProjectCreator tool when the ACE kit is prepared. -Both EVC3 and EVC4 use the same project and workspace files. - -Developers working with sources checked out from CVS must generate the -project and workspace files locally using MPC. The autobuild system's -generate_makefile and generate_workspace commands can be used for this. - -@subsection ce_vc8 Visual Studio 2005 Projects - -The ACE release process generates the needed Visual Studio 2005 solution and -project files with "_WinCE" appended to the name (e.g. ACE_WinCE.vcproj) to -distinguish them from both Win32-targeted VC8 projects (ACE_vc8.vcproj) and -Visual Studio 2003 projects (ACE_vc71.vcproj). The files are generated with -the "Pocket PC 2003 SDK (ARMV4)", "Windows Mobile 5.0 Pocket PC SDK -(ARMV4I)", and "Windows Mobile 6 SDK (ARMV4I)" platforms defined. To add -additional platforms, the files must be regenerated using MPC. - -@subsection ce_wchar Unicode/WChar - -ACE on WindowsCE automatically has ACE_HAS_WCHAR and ACE_USES_WCHAR turned -on. Thus ACE_TCHAR and ACE_TEXT() are the wide char versions. - -@subsection ce_tests Running the Test Suite on Windows CE - -The ACE test suite in ACE_wrappers/tests is used on Windows CE as well as -on dekstop Windows. The test suite tools are extended to run remotely -on the device using the telnet server. - -*/ diff --git a/ACE/docs/index.html b/ACE/docs/index.html index 929c5856ea8..459d5506084 100644 --- a/ACE/docs/index.html +++ b/ACE/docs/index.html @@ -87,7 +87,6 @@ ask. <P> <li><a href="ACE-SSL.html">ACE+SSL</a> - What is ACE+SSL and how to get it. <li><a href="Symbol_Versioning.html">Symbol versioning</a> - How to do symbol versioning with ACE+TAO. - <li><a href="CE-status.txt">CE-status.txt</a> - The status of ACE on Windows CE. <li><a href="ACE-monotonic-timer.html">ACE-monotonic-timer.html</a> - How to use the ACE monotonic timer support. <li><a href="../ACEXML/docs/readme.txt">ACEXML</a> - A SAX2-based XML parser ACE uses and provides. </ul> diff --git a/ACE/docs/wchar.txt b/ACE/docs/wchar.txt index d8b88ad8042..517b89d56b0 100644 --- a/ACE/docs/wchar.txt +++ b/ACE/docs/wchar.txt @@ -35,7 +35,7 @@ Like Regular Support, both char and wchar_t versions of some methods are available, but unlike Regular Support, other methods that have char arguments or return values may have wchar_t arguments or return values. -This has been tested on Windows and Linux, and is the default for Windows CE. +This has been tested on Windows and Linux. @subsection wchar_othermacros Other Important Macros diff --git a/ACE/etc/ace.doxygen b/ACE/etc/ace.doxygen index 1798728f259..f8b033f54a4 100644 --- a/ACE/etc/ace.doxygen +++ b/ACE/etc/ace.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.5 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -86,7 +86,7 @@ CREATE_SUBDIRS = NO # level increment doubles the number of directories, resulting in 4096 # directories at level 8 which is the default and also the maximum value. The # sub-directories are organized in 2 levels, the first level always has a fixed -# numer of 16 directories. +# number of 16 directories. # Minimum value: 0, maximum value: 8, default value: 8. # This tag requires that the tag CREATE_SUBDIRS is set to YES. @@ -558,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -849,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -1189,10 +1198,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = ACE_ @@ -1271,7 +1281,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1287,17 +1302,13 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = # The HTML_COLORSTYLE tag can be used to specify if the generated HTML output -# should be rendered with a dark or light theme. Default setting AUTO_LIGHT -# enables light output unless the user preference is dark output. Other options -# are DARK to always use dark mode, LIGHT to always use light mode, AUTO_DARK to -# default to dark mode unless the user prefers light mode, and TOGGLE to let the -# user toggle between dark and light mode via a button. -# Possible values are: LIGHT Always generate light output., DARK Always generate -# dark output., AUTO_LIGHT Automatically set the mode according to the user -# preference, use light mode if no preference is set (the default)., AUTO_DARK -# Automatically set the mode according to the user preference, use dark mode if -# no preference is set. and TOGGLE Allow to user to switch between light and -# dark mode via a button.. +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. # The default value is: AUTO_LIGHT. # This tag requires that the tag GENERATE_HTML is set to YES. diff --git a/ACE/etc/ace_inet.doxygen b/ACE/etc/ace_inet.doxygen index 94e2f74b509..7d0df6eaeb8 100644 --- a/ACE/etc/ace_inet.doxygen +++ b/ACE/etc/ace_inet.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.5 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -86,7 +86,7 @@ CREATE_SUBDIRS = NO # level increment doubles the number of directories, resulting in 4096 # directories at level 8 which is the default and also the maximum value. The # sub-directories are organized in 2 levels, the first level always has a fixed -# numer of 16 directories. +# number of 16 directories. # Minimum value: 0, maximum value: 8, default value: 8. # This tag requires that the tag CREATE_SUBDIRS is set to YES. @@ -558,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -849,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -1178,10 +1187,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = @@ -1260,7 +1270,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1276,17 +1291,13 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = # The HTML_COLORSTYLE tag can be used to specify if the generated HTML output -# should be rendered with a dark or light theme. Default setting AUTO_LIGHT -# enables light output unless the user preference is dark output. Other options -# are DARK to always use dark mode, LIGHT to always use light mode, AUTO_DARK to -# default to dark mode unless the user prefers light mode, and TOGGLE to let the -# user toggle between dark and light mode via a button. -# Possible values are: LIGHT Always generate light output., DARK Always generate -# dark output., AUTO_LIGHT Automatically set the mode according to the user -# preference, use light mode if no preference is set (the default)., AUTO_DARK -# Automatically set the mode according to the user preference, use dark mode if -# no preference is set. and TOGGLE Allow to user to switch between light and -# dark mode via a button.. +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. # The default value is: AUTO_LIGHT. # This tag requires that the tag GENERATE_HTML is set to YES. diff --git a/ACE/etc/ace_qos.doxygen b/ACE/etc/ace_qos.doxygen index 25f2b2ea1a6..518ff9cbbf2 100644 --- a/ACE/etc/ace_qos.doxygen +++ b/ACE/etc/ace_qos.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.5 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -86,7 +86,7 @@ CREATE_SUBDIRS = NO # level increment doubles the number of directories, resulting in 4096 # directories at level 8 which is the default and also the maximum value. The # sub-directories are organized in 2 levels, the first level always has a fixed -# numer of 16 directories. +# number of 16 directories. # Minimum value: 0, maximum value: 8, default value: 8. # This tag requires that the tag CREATE_SUBDIRS is set to YES. @@ -558,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -849,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -1178,10 +1187,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = ACE_ \ @@ -1261,7 +1271,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1277,17 +1292,13 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = # The HTML_COLORSTYLE tag can be used to specify if the generated HTML output -# should be rendered with a dark or light theme. Default setting AUTO_LIGHT -# enables light output unless the user preference is dark output. Other options -# are DARK to always use dark mode, LIGHT to always use light mode, AUTO_DARK to -# default to dark mode unless the user prefers light mode, and TOGGLE to let the -# user toggle between dark and light mode via a button. -# Possible values are: LIGHT Always generate light output., DARK Always generate -# dark output., AUTO_LIGHT Automatically set the mode according to the user -# preference, use light mode if no preference is set (the default)., AUTO_DARK -# Automatically set the mode according to the user preference, use dark mode if -# no preference is set. and TOGGLE Allow to user to switch between light and -# dark mode via a button.. +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. # The default value is: AUTO_LIGHT. # This tag requires that the tag GENERATE_HTML is set to YES. diff --git a/ACE/etc/ace_rmcast.doxygen b/ACE/etc/ace_rmcast.doxygen index 2de34aa8ed4..c21b74d87b9 100644 --- a/ACE/etc/ace_rmcast.doxygen +++ b/ACE/etc/ace_rmcast.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.5 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -86,7 +86,7 @@ CREATE_SUBDIRS = NO # level increment doubles the number of directories, resulting in 4096 # directories at level 8 which is the default and also the maximum value. The # sub-directories are organized in 2 levels, the first level always has a fixed -# numer of 16 directories. +# number of 16 directories. # Minimum value: 0, maximum value: 8, default value: 8. # This tag requires that the tag CREATE_SUBDIRS is set to YES. @@ -558,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -849,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -1178,10 +1187,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = @@ -1260,7 +1270,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1276,17 +1291,13 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = # The HTML_COLORSTYLE tag can be used to specify if the generated HTML output -# should be rendered with a dark or light theme. Default setting AUTO_LIGHT -# enables light output unless the user preference is dark output. Other options -# are DARK to always use dark mode, LIGHT to always use light mode, AUTO_DARK to -# default to dark mode unless the user prefers light mode, and TOGGLE to let the -# user toggle between dark and light mode via a button. -# Possible values are: LIGHT Always generate light output., DARK Always generate -# dark output., AUTO_LIGHT Automatically set the mode according to the user -# preference, use light mode if no preference is set (the default)., AUTO_DARK -# Automatically set the mode according to the user preference, use dark mode if -# no preference is set. and TOGGLE Allow to user to switch between light and -# dark mode via a button.. +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. # The default value is: AUTO_LIGHT. # This tag requires that the tag GENERATE_HTML is set to YES. diff --git a/ACE/etc/ace_ssl.doxygen b/ACE/etc/ace_ssl.doxygen index 4bf8c0f828d..2af4e756b10 100644 --- a/ACE/etc/ace_ssl.doxygen +++ b/ACE/etc/ace_ssl.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.5 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -86,7 +86,7 @@ CREATE_SUBDIRS = NO # level increment doubles the number of directories, resulting in 4096 # directories at level 8 which is the default and also the maximum value. The # sub-directories are organized in 2 levels, the first level always has a fixed -# numer of 16 directories. +# number of 16 directories. # Minimum value: 0, maximum value: 8, default value: 8. # This tag requires that the tag CREATE_SUBDIRS is set to YES. @@ -558,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -849,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -1178,10 +1187,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = ACE_SSL_ @@ -1260,7 +1270,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1276,17 +1291,13 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = # The HTML_COLORSTYLE tag can be used to specify if the generated HTML output -# should be rendered with a dark or light theme. Default setting AUTO_LIGHT -# enables light output unless the user preference is dark output. Other options -# are DARK to always use dark mode, LIGHT to always use light mode, AUTO_DARK to -# default to dark mode unless the user prefers light mode, and TOGGLE to let the -# user toggle between dark and light mode via a button. -# Possible values are: LIGHT Always generate light output., DARK Always generate -# dark output., AUTO_LIGHT Automatically set the mode according to the user -# preference, use light mode if no preference is set (the default)., AUTO_DARK -# Automatically set the mode according to the user preference, use dark mode if -# no preference is set. and TOGGLE Allow to user to switch between light and -# dark mode via a button.. +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. # The default value is: AUTO_LIGHT. # This tag requires that the tag GENERATE_HTML is set to YES. diff --git a/ACE/etc/acexml.doxygen b/ACE/etc/acexml.doxygen index 6bca811f9ba..68e99cbbdd5 100644 --- a/ACE/etc/acexml.doxygen +++ b/ACE/etc/acexml.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.5 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -86,7 +86,7 @@ CREATE_SUBDIRS = NO # level increment doubles the number of directories, resulting in 4096 # directories at level 8 which is the default and also the maximum value. The # sub-directories are organized in 2 levels, the first level always has a fixed -# numer of 16 directories. +# number of 16 directories. # Minimum value: 0, maximum value: 8, default value: 8. # This tag requires that the tag CREATE_SUBDIRS is set to YES. @@ -558,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -849,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -1179,10 +1188,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = ACEXML_ @@ -1261,7 +1271,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1277,17 +1292,13 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = # The HTML_COLORSTYLE tag can be used to specify if the generated HTML output -# should be rendered with a dark or light theme. Default setting AUTO_LIGHT -# enables light output unless the user preference is dark output. Other options -# are DARK to always use dark mode, LIGHT to always use light mode, AUTO_DARK to -# default to dark mode unless the user prefers light mode, and TOGGLE to let the -# user toggle between dark and light mode via a button. -# Possible values are: LIGHT Always generate light output., DARK Always generate -# dark output., AUTO_LIGHT Automatically set the mode according to the user -# preference, use light mode if no preference is set (the default)., AUTO_DARK -# Automatically set the mode according to the user preference, use dark mode if -# no preference is set. and TOGGLE Allow to user to switch between light and -# dark mode via a button.. +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. # The default value is: AUTO_LIGHT. # This tag requires that the tag GENERATE_HTML is set to YES. diff --git a/ACE/etc/xlc_dummy.cpp b/ACE/etc/xlc_dummy.cpp deleted file mode 100644 index d8bc164c48e..00000000000 --- a/ACE/etc/xlc_dummy.cpp +++ /dev/null @@ -1,7 +0,0 @@ -// -// This file exists only to help with template instantiation when building -// shared libraries on AIX using C Set++. See rules.lib.GNU for usage. - -/* FUZZ: disable check_for_improper_main_declaration */ - -main() {} diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.h b/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.h index 17ae8c06a62..f24577307da 100644 --- a/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.h +++ b/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.h @@ -112,13 +112,7 @@ private: #define ACE_INLINE #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Peer_Router.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Peer_Router.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* ACE_HAS_THREADS */ #endif /* _PEER_ROUTER_H */ diff --git a/ACE/examples/Bounded_Packet_Relay/BPR_Drivers_T.h b/ACE/examples/Bounded_Packet_Relay/BPR_Drivers_T.h index 931ec9ea65c..56dc447e693 100644 --- a/ACE/examples/Bounded_Packet_Relay/BPR_Drivers_T.h +++ b/ACE/examples/Bounded_Packet_Relay/BPR_Drivers_T.h @@ -160,12 +160,6 @@ private: int logging_level_; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "BPR_Drivers_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("BPR_Drivers_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* _BPR_DRIVERS_T_H_ */ diff --git a/ACE/examples/C++NPv1/README b/ACE/examples/C++NPv1/README index 25126be99b1..52c29053541 100644 --- a/ACE/examples/C++NPv1/README +++ b/ACE/examples/C++NPv1/README @@ -7,7 +7,6 @@ Patterns'' (C++NPv1) by Douglas C. Schmidt and Stephen D. Huston We have compiled and run these files on the following platforms: - Sun Solaris 8 on SPARC using Sun Forte 6. Redhat Linux 7.1 using g++ 2.96. Microsoft Windows 2000 using Microsoft Visual C++ 6. diff --git a/ACE/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp b/ACE/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp index 3122d0a87da..054aa03f0d2 100644 --- a/ACE/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp +++ b/ACE/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp @@ -4,7 +4,7 @@ #include "ace/config-all.h" -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)) +#if defined (ACE_WIN32) || (defined (ACE_HAS_AIO_CALLS)) #include "ace/OS_NS_string.h" #include "ace/OS_NS_sys_socket.h" @@ -351,7 +351,7 @@ int AIO_Client_Logging_Daemon::fini () { return 0; } -#endif /* (ACE_WIN32 && !ACE_HAS_WINCE) || ACE_HAS_AIO_CALLS */ +#endif /* ACE_WIN32 || ACE_HAS_AIO_CALLS */ ACE_FACTORY_DEFINE (AIO_CLD, AIO_Client_Logging_Daemon) diff --git a/ACE/examples/C++NPv2/README b/ACE/examples/C++NPv2/README index e741eb64ed8..b9fa446c91b 100644 --- a/ACE/examples/C++NPv2/README +++ b/ACE/examples/C++NPv2/README @@ -7,7 +7,6 @@ The files in this directory contain the source code from the book We have compiled and run these files on the following platforms: - Sun Solaris 8 on SPARC using Sun Forte 6. Redhat Linux 7.1 using g++ 2.96. Microsoft Windows 2000 using Microsoft Visual C++ 6. diff --git a/ACE/examples/C++NPv2/Reactor_Logging_Server_Adapter.h b/ACE/examples/C++NPv2/Reactor_Logging_Server_Adapter.h index b4839beb648..f3b1a3b7846 100644 --- a/ACE/examples/C++NPv2/Reactor_Logging_Server_Adapter.h +++ b/ACE/examples/C++NPv2/Reactor_Logging_Server_Adapter.h @@ -22,12 +22,6 @@ private: Reactor_Logging_Server<ACCEPTOR> *server_; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Reactor_Logging_Server_Adapter.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Reactor_Logging_Server_Adapter.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* _REACTOR_LOGGING_SERVER_ADAPTER_H */ diff --git a/ACE/examples/C++NPv2/Reactor_Logging_Server_T.h b/ACE/examples/C++NPv2/Reactor_Logging_Server_T.h index 2df69c8bb04..e21a745ec05 100644 --- a/ACE/examples/C++NPv2/Reactor_Logging_Server_T.h +++ b/ACE/examples/C++NPv2/Reactor_Logging_Server_T.h @@ -16,12 +16,6 @@ public: ACE_Reactor *reactor); }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Reactor_Logging_Server_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Reactor_Logging_Server_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* _REACTOR_LOGGING_SERVER_T_H */ diff --git a/ACE/examples/Connection/non_blocking/CPP-acceptor.h b/ACE/examples/Connection/non_blocking/CPP-acceptor.h index e01d505a8ec..7a2eb1a3b00 100644 --- a/ACE/examples/Connection/non_blocking/CPP-acceptor.h +++ b/ACE/examples/Connection/non_blocking/CPP-acceptor.h @@ -80,12 +80,6 @@ private: // signal. }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "CPP-acceptor.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("CPP-acceptor.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* CPP_ACCEPTOR_H */ diff --git a/ACE/examples/Connection/non_blocking/CPP-connector.h b/ACE/examples/Connection/non_blocking/CPP-connector.h index 8bc322a058d..2f89038ce25 100644 --- a/ACE/examples/Connection/non_blocking/CPP-connector.h +++ b/ACE/examples/Connection/non_blocking/CPP-connector.h @@ -84,12 +84,6 @@ private: // signal. }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "CPP-connector.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("CPP-connector.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* CPP_CONNECTOR_H */ diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/sock_sap.mpc b/ACE/examples/IPC_SAP/SOCK_SAP/sock_sap.mpc index b8fc1278152..56eedf33423 100644 --- a/ACE/examples/IPC_SAP/SOCK_SAP/sock_sap.mpc +++ b/ACE/examples/IPC_SAP/SOCK_SAP/sock_sap.mpc @@ -7,7 +7,6 @@ project(*C_inclient) : aceexe { } project(*C_inserver) : aceexe { - avoids += wince exename = C-inserver Source_Files { C-inserver.cpp diff --git a/ACE/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFC.mpc b/ACE/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFC.mpc index 43b42f64429..ba8c411b325 100644 --- a/ACE/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFC.mpc +++ b/ACE/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFC.mpc @@ -1,8 +1,7 @@ // -*- MPC -*- project : aceexe, ace_mfc { - avoids += wince exename = Log_Msg_MFC - Source_Files { + Source_Files { Log_Msg_MFC.cpp Log_Msg_MFCDlg.cpp MFC_Log.cpp diff --git a/ACE/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFCDlg.cpp b/ACE/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFCDlg.cpp index c05addf6cc7..1e476e4bb89 100644 --- a/ACE/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFCDlg.cpp +++ b/ACE/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFCDlg.cpp @@ -103,7 +103,6 @@ BOOL CLog_Msg_MFCDlg::OnInitDialog() ASSERT((IDM_ABOUTBOX & 0xFFF0) == IDM_ABOUTBOX); ASSERT(IDM_ABOUTBOX < 0xF000); -#if !defined (_WIN32_WCE) CMenu* pSysMenu = GetSystemMenu(FALSE); if (pSysMenu != 0) { @@ -115,7 +114,6 @@ BOOL CLog_Msg_MFCDlg::OnInitDialog() pSysMenu->AppendMenu(MF_STRING, IDM_ABOUTBOX, strAboutMenu); } } -#endif /* !_WIN32_WCE */ // Set the icon for this dialog. The framework does this automatically // when the application's main window is not a dialog diff --git a/ACE/examples/NT_Service/NT_Service.mpc b/ACE/examples/NT_Service/NT_Service.mpc index 76522621847..756d0562548 100644 --- a/ACE/examples/NT_Service/NT_Service.mpc +++ b/ACE/examples/NT_Service/NT_Service.mpc @@ -1,5 +1,4 @@ // -*- MPC -*- project : aceexe, winregistry { - avoids += wince exename = main } diff --git a/ACE/examples/OS/Process/OS_Process.mpc b/ACE/examples/OS/Process/OS_Process.mpc index a6cffe93337..3b23928c3ad 100644 --- a/ACE/examples/OS/Process/OS_Process.mpc +++ b/ACE/examples/OS/Process/OS_Process.mpc @@ -6,7 +6,6 @@ project(*imore) : aceexe, avoids_ace_for_tao { } } project(*process) : aceexe { - avoids += wince exename = process Source_Files { process.cpp diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/README b/ACE/examples/QOS/Change_Receiver_FlowSpec/README index 7fab042dd19..5f1c66344dc 100644 --- a/ACE/examples/QOS/Change_Receiver_FlowSpec/README +++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/README @@ -6,7 +6,7 @@ A Regression test for ACE QoS features. This test implements a simple Receiver-Sender program that ensures Quality of Service (QoS) guarantees on the underlying network before transmitting data. The program tests the ACE QoS APIs/features. The -test works for Winsock2 APIs on Win2K as well as RAPI on Solaris. +test works for Winsock2 APIs on Win2K. In addition it dynamically changes the receiver flow spec which in turn changes the RESV messages sent. diff --git a/ACE/examples/QOS/Change_Sender_TSpec/README b/ACE/examples/QOS/Change_Sender_TSpec/README index 6b24dcc704b..34238f4fec4 100644 --- a/ACE/examples/QOS/Change_Sender_TSpec/README +++ b/ACE/examples/QOS/Change_Sender_TSpec/README @@ -6,7 +6,7 @@ A Regression test for ACE QoS features. This test implements a simple Receiver-Sender program that ensures Quality of Service (QoS) guarantees on the underlying network before transmitting data. The program tests the ACE QoS APIs/features. The -test works for Winsock2 APIs on Win2K as well as RAPI on Solaris. +test works for Winsock2 APIs on Win2K. In addition it dynamically changes the sender TSpec which in turn changes the PATH messages. diff --git a/ACE/examples/QOS/Diffserv/NOTES.txt b/ACE/examples/QOS/Diffserv/NOTES.txt index 6009e2fed59..4f88b9e1762 100644 --- a/ACE/examples/QOS/Diffserv/NOTES.txt +++ b/ACE/examples/QOS/Diffserv/NOTES.txt @@ -49,9 +49,3 @@ However, FreeBSD seems to be more fussy about the size of the parameter you pass into the setsockopt call. Make sure you get the size right, and cast it properly, ie. don't cast a short, or some other size. - - -Solaris notes -============= -No problems setting DSCP or ECN values. - diff --git a/ACE/examples/QOS/Simple/README b/ACE/examples/QOS/Simple/README index 39aa2fa3abd..5744f0c8099 100644 --- a/ACE/examples/QOS/Simple/README +++ b/ACE/examples/QOS/Simple/README @@ -6,7 +6,7 @@ A Regression test for ACE QoS features. This test implements a simple Receiver-Sender program that ensures Quality of Service (QoS) guarantees on the underlying network before transmitting data. The program tests the ACE QoS APIs/features. The -test works for Winsock2 APIs on Win2K as well as RAPI on Solaris. +test works for Winsock2 APIs on Win2K. ------------------------------------------------------------------------ diff --git a/ACE/examples/Reactor/Proactor/test_cancel.cpp b/ACE/examples/Reactor/Proactor/test_cancel.cpp index 3ee661d9b30..8dfb8259e16 100644 --- a/ACE/examples/Reactor/Proactor/test_cancel.cpp +++ b/ACE/examples/Reactor/Proactor/test_cancel.cpp @@ -13,10 +13,7 @@ * cancel the operation and so the program exits closing the * connection. * - * Works fine on NT. On Solaris platforms, the asynch read is - * pending, but the cancel returns with the value <AIO_ALLDONE> - * indicating all the operations in that handle are done. - * But, LynxOS has a good <aio_cancel> implementation. It works + * Works fine on NT. LynxOS has a good <aio_cancel> implementation. It works * fine. * * = RUN diff --git a/ACE/examples/Reactor/Proactor/test_proactor3.cpp b/ACE/examples/Reactor/Proactor/test_proactor3.cpp index 369d3699737..68542f46080 100644 --- a/ACE/examples/Reactor/Proactor/test_proactor3.cpp +++ b/ACE/examples/Reactor/Proactor/test_proactor3.cpp @@ -44,7 +44,6 @@ #elif defined (ACE_HAS_AIO_CALLS) #include "ace/POSIX_Proactor.h" -#include "ace/SUN_Proactor.h" #endif /* ACE_HAS_WIN32_OVERLAPPED_IO */ @@ -128,12 +127,6 @@ MyTask::create_proactor () proactor = new ACE_POSIX_SIG_Proactor; ACE_DEBUG ((LM_DEBUG,"(%t) Create Proactor Type=SIG\n")); break; -# if defined (sun) - case 3: - proactor = new ACE_SUN_Proactor (max_aio_operations); - ACE_DEBUG ((LM_DEBUG,"(%t) Create Proactor Type=SUN\n")); - break; -# endif /* sun */ default: proactor = new ACE_POSIX_SIG_Proactor; ACE_DEBUG ((LM_DEBUG,"(%t) Create Proactor Type=SIG\n")); @@ -671,9 +664,6 @@ set_proactor_type (const char *ptype) case 'D' : proactor_type = 0; return true; case 'A' : proactor_type = 1; return true; case 'I' : proactor_type = 2; return true; -#if defined (sun) - case 'S' : proactor_type = 3; return true; -#endif /* sun */ } return false; } @@ -737,9 +727,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { -#if defined (sun) - ACE_DEBUG ((LM_DEBUG, "\nSUN defined!\n")); -#endif if (parse_args (argc, argv) == -1) return -1; diff --git a/ACE/examples/Reactor/WFMO_Reactor/APC.cpp b/ACE/examples/Reactor/WFMO_Reactor/APC.cpp index 49775b0ef68..00d21aa59c5 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/APC.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/APC.cpp @@ -12,7 +12,7 @@ #include "ace/OS_main.h" -#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && _WIN32_WINNT >= 0x400 +#if defined (ACE_WIN32) && _WIN32_WINNT >= 0x400 #include "ace/Reactor.h" #include "ace/Auto_Event.h" diff --git a/ACE/examples/Reactor/WFMO_Reactor/Handle_Close.cpp b/ACE/examples/Reactor/WFMO_Reactor/Handle_Close.cpp index 78035c00323..9a2a4840559 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Handle_Close.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Handle_Close.cpp @@ -209,7 +209,7 @@ create_reactor () if (opt_wfmo_reactor) { -#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) +#if defined (ACE_WIN32) ACE_NEW_RETURN (impl, ACE_WFMO_Reactor, 0); diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.cpp b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.cpp index 9bd499624d4..249ee30fa74 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.cpp +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.cpp @@ -1,29 +1,5 @@ #include "Handle_Broadcast.h" -#if defined (SunOS4) -extern "C" -{ - int init (); - int fini (); - void __sti__Handle_Broadcast_C_init_(); - void __std__Handle_Broadcast_C_init_(); -} - -int -init () -{ - __sti__Handle_Broadcast_C_init_(); - return 0; -} - -int -fini () -{ - __std__Handle_Broadcast_C_init_(); - return 0; -} -#endif /* SunOS4 */ - unsigned short Handle_Broadcast::DEFAULT_PORT = ACE_DEFAULT_BROADCAST_PORT; #if !defined (__ACE_INLINE__) diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.cpp b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.cpp index 7eff9d9db0c..cdf7eb650c0 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.cpp +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.cpp @@ -1,30 +1,5 @@ #include "Handle_L_FIFO.h" - -#if defined (SunOS4) -extern "C" -{ - int init (); - int fini (); - void __sti__Handle_L_FIFO_C_init_(); - void __std__Handle_L_FIFO_C_init_(); -} - -int -init () -{ - __sti__Handle_L_FIFO_C_init_(); - return 0; -} - -int -fini () -{ - __std__Handle_L_FIFO_C_init_(); - return 0; -} -#endif /* SunOS4 */ - const ACE_TCHAR *Handle_L_FIFO::DEFAULT_RENDEZVOUS = ACE_TEXT("/tmp/foo_fifo"); #if !defined (__ACE_INLINE__) diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.cpp b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.cpp index a21a39e6fe1..89c0e227e5a 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.cpp +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.cpp @@ -1,29 +1,5 @@ #include "Handle_R_Dgram.h" -#if defined (SunOS4) -extern "C" -{ - int init (); - int fini (); - void __sti__Handle_R_Dgram_C_init_(); - void __std__Handle_R_Dgram_C_init_(); -} - -int -init () -{ - __sti__Handle_R_Dgram_C_init_(); - return 0; -} - -int -fini () -{ - __std__Handle_R_Dgram_C_init_(); - return 0; -} -#endif /* SunOS4 */ - unsigned short Handle_R_Dgram::DEFAULT_PORT = ACE_DEFAULT_SERVER_PORT; #if !defined (__ACE_INLINE__) diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.cpp b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.cpp index 8ce2a3214a2..240cb2980ae 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.cpp +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.cpp @@ -1,31 +1,6 @@ #include "Handle_R_Stream.h" -#if defined (SunOS4) -extern "C" -{ - int init (); - int fini (); - void __sti__Handle_R_Stream_C_recv_n_(); - void __std__Handle_R_Stream_C_recv_n_(); -} - -int -init () -{ - __sti__Handle_R_Stream_C_recv_n_(); - return 0; -} - -int -fini () -{ - __std__Handle_R_Stream_C_recv_n_(); - return 0; -} -#endif /* SunOS4 */ - // Static variables. - u_short Handle_R_Stream::DEFAULT_PORT = ACE_DEFAULT_SERVER_PORT; char *Handle_R_Stream::login_name = 0; char Handle_R_Stream::login[ACE_MAX_USERID]; diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.h index 13e5b419445..76c78c9b8ce 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.h +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.h @@ -63,8 +63,6 @@ protected: extern ACE_Service_Object_Type rts; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Handle_Thr_Stream.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* ACE_HAS_THREADS */ #endif /* _HANDLE_THR_STREAM_H */ diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.cpp b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.cpp index 445dc1c05dd..b605faab14f 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.cpp +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.cpp @@ -1,29 +1,5 @@ #include "Handle_Timeout.h" -#if defined (SunOS4) -extern "C" -{ - int init (); - int fini (); - void __sti__Handle_Timeout_C_init_(); - void __std__Handle_Timeout_C_init_(); -} - -int -init () -{ - __sti__Handle_Timeout_C_init_(); - return 0; -} - -int -fini () -{ - __std__Handle_Timeout_C_init_(); - return 0; -} -#endif /* SunOS4 */ - #if !defined (__ACE_INLINE__) #include "Handle_Timeout.inl" #endif /* __ACE_INLINE__ */ diff --git a/ACE/examples/Service_Configurator/Misc/README b/ACE/examples/Service_Configurator/Misc/README index d9a9568fbd4..d02bf5fed62 100644 --- a/ACE/examples/Service_Configurator/Misc/README +++ b/ACE/examples/Service_Configurator/Misc/README @@ -1,25 +1,6 @@ - - This directory contains an example that illustrates how the ACE Service Configurator can configure static and dynamic services, both from the command-line and from a svc.config file. We define several instances, i.e., Timer_Service_1 and Timer_Service_2 of the SAME service just to exercise different configuration options. A "real" application would usually define different services. - -Windows CE: ------------ - -When using Windows CE (WCE) emulator, make sure that you use the -following command to copy the svc.conf files into the top-level -directory in CE emulator. - - empfile -c svc.conf1 wce:\svc.conf1 - empfile -c svc.conf2 wce:\svc.conf2 - -The command "empfile" moves the files to emulator's root directory and -resigters the files with CE emulator's object store. - -Also make sure you type in at least one argument (which is argv[0],) -when the program dialog box requests you to key in the program -arguments. Otherwise, the program won't run at all. diff --git a/ACE/examples/Shared_Malloc/test_position_independent_malloc.h b/ACE/examples/Shared_Malloc/test_position_independent_malloc.h index d01985ce0da..97da10749c1 100644 --- a/ACE/examples/Shared_Malloc/test_position_independent_malloc.h +++ b/ACE/examples/Shared_Malloc/test_position_independent_malloc.h @@ -1,6 +1,5 @@ // -// Define struct used in test_position_independent_malloc.cpp - needs -// to be in a separate file for template generation on AIX IBM C++. +// Define struct used in test_position_independent_malloc.cpp #ifndef __TEST_POSITION_INDEPENDENT_MALLOC_H #define __TEST_POSITION_INDEPENDENT_MALLOC_H diff --git a/ACE/examples/Threads/tss1.cpp b/ACE/examples/Threads/tss1.cpp index 74ab7782476..201aee8885e 100644 --- a/ACE/examples/Threads/tss1.cpp +++ b/ACE/examples/Threads/tss1.cpp @@ -24,7 +24,6 @@ #include "thread_specific.h" -// (Sun C++ 4.2 with -O3 won't link if the following is not const.) static const int iterations = 100; // Static variables. @@ -32,7 +31,6 @@ ACE_MT (ACE_Thread_Mutex Errno::lock_); int Errno::flags_; // This is our thread-specific error handler... -// (Sun C++ 4.2 with -O3 won't link if the following is static.) ACE_TSS<Errno> TSS_Error; // Keeps track of whether Tester::close () has started. diff --git a/ACE/examples/Timer_Queue/Driver.h b/ACE/examples/Timer_Queue/Driver.h index d19f4015e73..ac9d6a98c49 100644 --- a/ACE/examples/Timer_Queue/Driver.h +++ b/ACE/examples/Timer_Queue/Driver.h @@ -128,12 +128,6 @@ protected: Command<RECEIVER, ACTION> *shutdown_cmd_; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Driver.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Driver.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* _DRIVER_H_ */ diff --git a/ACE/examples/Web_Crawler/main.cpp b/ACE/examples/Web_Crawler/main.cpp index 7a2091ee52d..832548aba8a 100644 --- a/ACE/examples/Web_Crawler/main.cpp +++ b/ACE/examples/Web_Crawler/main.cpp @@ -27,9 +27,7 @@ void sig_handler (int) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { -#if !defined (ACE_HAS_WINCE) ACE_Sig_Action sa ((ACE_SignalHandler) sig_handler, SIGFPE); -#endif Web_Crawler crawler; if (crawler.open (argc, argv) == -1) diff --git a/ACE/include/makeinclude/platform_aix.GNU b/ACE/include/makeinclude/platform_aix.GNU deleted file mode 100644 index 7d09c969385..00000000000 --- a/ACE/include/makeinclude/platform_aix.GNU +++ /dev/null @@ -1,103 +0,0 @@ - -# AIX 5.x using the IBM C Set++ compiler. -# -# NOTE! IBM is no longer supporting AIX at any version earlier than 4.3, -# and Riverace is not testing or supporting ACE on them either. No steps -# have been taken to intentionally disable anything, but it is not being -# tested either. -# -# NOTE 2! This file is only for use with the older CSet++ compiler, which -# IBM doesn't sell or support any longer. Riverace doesn't support ACE -# with it either. This file is still here in case there is some site -# still using the old compiler, but it is completely unsupported. -# -# On 4.1, this file assumes that the user has installed the AIX patch -# containing the dl*() APIs. To use these APIs, IBM has created a -# separate product (free to AIX licensees) called shared library -# hookable symbols (or slhs/6000). If they don't have this patch, the -# sv* commands for compiling and linking will not be present on the -# system. -# -# On 4.2, the AIX fileset bos.rte.bind_cmds must be at version 4.2.0.2 or -# higher in order to build libACEshr.a, and at 4.2.0.4 or higher for dl*() -# routines to work properly. Best to apply the update available at: -# ftp://service.boulder.ibm.com/aix/fixes/v4/os/bos.rte.bind_cmds.4.2.0.4.bff -# or a successor. - -debug ?= 1 -distrib ?= 0 -optimize ?= 0 -threads ?= 1 - -# In case anything here or in the config depends on OS version number, -# grab it here and pass it all to the compiler as well. -AIX_MAJOR_VERS := $(shell uname -v) -AIX_MINOR_VERS := $(shell uname -r) - -# aix_build turns on the funky shared library building code. -aix_build = 1 -# ibmcxx_build turns on the extra step for instantiating and compiling -# template instances. -ibmcxx_build = 1 - -ifeq ($(threads),1) -CC = xlc_r -CXX = xlC_r -DLD = makeC++SharedLib_r -else -CC = xlc -CXX = xlC -DLD = makeC++SharedLib -endif - -# -qextchk is handy, but produces false type mismatches when linking -# netsvcs with 3.1.4, so it's disabled. IBM reports this fixed in 3.6.4. -TEMPINCDIR = tempinc -CCFLAGS += $(CFLAGS) -qtempinc=$(TEMPINCDIR) -qinfo - -# IBM C/C++ compiler 3.6.x produces a bazillion warnings about 0-valued -# preprocessor defs. Since both 3.1 and 3.4 could be installed, don't ask -# lslpp for one or the other. Instead, compile a file and see which compiler -# the user has set up for use. This trick was submitted by Craig Rodrigues -# <rodrigc@mediaone.net>, originally from the vacpp compiler newsgroup. -# It relies on the preprocessor defining __xlC__ to the proper version -# number of the compiler. -XLCVERSION := $(shell echo "__xlC__" > ./testAIXCompilerVersion.cpp) -XLCVERSION := $(shell $(CXX) -E ./testAIXCompilerVersion.cpp | tail -1) -ACE_AIX_CLEAN := $(shell $(RM) ./testAIXCompilerVersion.cpp) -ifeq ($(XLCVERSION),0x0306) - CCFLAGS += -qflag=e:e -else - CCFLAGS += -qflag=w:w -endif -CPPFLAGS += -qlanglvl=ansi -DACE_AIX_MAJOR_VERS=$(AIX_MAJOR_VERS) -DACE_AIX_MINOR_VERS=$(AIX_MINOR_VERS) - -# -qinitauto seems useful, but when built with -qinitauto=5F, the -# Process_Strategy_Test went CPU bound in ostream, so I removed it (S. Huston) -DCFLAGS += -g -qcheck=nobounds:div:null - -ACELIB = -lACE -LD = $(CXX) - -ifeq ($(AIX_MINOR_VERS),1) -LLIBS = -lsvld -ltli_r $(ACELIB) -LIBS += $(filter-out $(SHLIBA:lib%.a=-l%), $(LLIBS)) -else -LIBS += -ltli_r -ldl -endif - -ARFLAGS = ruv -AR = ar -LDFLAGS += -bI:/lib/pse.exp -# Default OCCFLAGS builds common code for all RS/6000 architectures but -# this can be set to optimize for your particular computer. The commented -# out example optimizes for RS/6000 43P. -# OCCFLAGS is not used by default. To used it, set optimize=1 -# either in this file or on the command line. -#OCCFLAGS += -qarch=ppc -qtune=604 -OCCFLAGS += -O2 -qarch=com -RANLIB = ranlib -SOFLAGS = -p 0 - -SOVERSION = -SONAME = diff --git a/ACE/include/makeinclude/platform_aix_g++.GNU b/ACE/include/makeinclude/platform_aix_g++.GNU deleted file mode 100644 index 0ec6775e370..00000000000 --- a/ACE/include/makeinclude/platform_aix_g++.GNU +++ /dev/null @@ -1,92 +0,0 @@ -# Platform macros for building on AIX with g++. This has been tested on -# AIX 4.3 and 5 with gcc 3. Earlier versions of gcc may compile, but are -# known to have serious problems on AIX. -# -# Contributed by Ian Wright <I.Wright@elsevier.co.uk> -# Updated for AIX 4.3 and gcc 3 by Steve Huston <shuston@riverace.com> - -debug ?= 1 -distrib ?= 0 -optimize ?= 1 -threads ?= 1 -buildbits ?= 32 -with_ld ?= aix -no_hidden_visibility ?= 1 - -PLATFORM_XT_CPPFLAGS= -PLATFORM_XT_LIBS=-lXt -PLATFORM_XT_LDFLAGS= - -PLATFORM_X11_CPPFLAGS= -PLATFORM_X11_LIBS=-lX11 -PLATFORM_X11_LDFLAGS= - -# Yes, believe it or not... -# The way to make a shared lib on AIX is to make a shared object file and -# then put that in an archive. -# Non-shared archives are named lib<x>ns.a - ns = non-shared. -SOEXT = so -LDFLAGS += -Wl,-brtl - -ifeq (1,$(threads)) - FLAGS_C_CC += -pthread -endif - -ifeq ($(shared_libs),1) -ACELIB = -lACE -else -ACELIB = -lACEns -endif - -# In case anything here or in the config depends on OS version number, -# grab it here and pass it all to the compiler as well. -AIX_MAJOR_VERS := $(shell uname -v) -AIX_MINOR_VERS := $(shell uname -r) -AIX_VERS := $(AIX_MAJOR_VERS)0$(AIX_MINOR_VERS) - -CC = gcc -CXX = g++ - -FLAGS_C_CC += -DACE_AIX_VERS=$(AIX_VERS) -ifeq ($(buildbits),32) - FLAGS_C_CC += -maix32 -endif -ifeq ($(buildbits),64) - FLAGS_C_CC += -maix64 - LDFLAGS += -maix64 - ARFLAGS += -X64 -endif -DCFLAGS += -g -DCCFLAGS += -g -DLD = $(CXX) -LD = $(CXX) -# Linking TAO_IDL runs out of TOC space unless -bbigtoc is given to ld. -# Don't do it for everything because it decreases run-time performance. -ifeq ($(notdir $(shell pwd)), TAO_IDL) -LDFLAGS += -Wl,-bbigtoc -endif - -OCFLAGS = -O2 -OCCFLAGS = $(OCFLAGS) -ifeq ($(threads),1) - SOFLAGS += -pthread -endif - -# AIX 5 has a new ld option, -bexpfull, that exports all the symbols that -# g++ 3.3+ needs to work correctly. The new option is available by default -# in AIX 5.2 and later, but must be installed by a patch to AIX 5.1. -ifeq ($(AIX_MAJOR_VERS),5) - SOFLAGS += -shared -Wl,-bexpfull # -Wl,-bloadmap:lib.mapelse -else - SOFLAGS += -shared -Wl,-bexpall # -Wl,-bloadmap:lib.map -endif - -LIBS += -lxti -ldl -ARFLAGS += cruv -RANLIB = ranlib -LD_RPATH = -Wl,-R, - -# Test for template instantiation, add to SOFLAGS if versioned_so set, -# add -E to LDFLAGS if using GNU ld -# -include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU diff --git a/ACE/include/makeinclude/platform_aix_ibm.GNU b/ACE/include/makeinclude/platform_aix_ibm.GNU deleted file mode 100644 index aa9f3f76775..00000000000 --- a/ACE/include/makeinclude/platform_aix_ibm.GNU +++ /dev/null @@ -1,194 +0,0 @@ - -# This file is for use with AIX 5.x and up, using either of the IBM -# compilers (Visual Age C++ 6 or newer XL C++ compiler). - -debug ?= 1 -distrib ?= 0 -optimize ?= 0 -threads ?= 1 -buildbits ?= 32 - -ifeq (,$(inline)) -ifeq (1,$(debug)) - inline = 0 -else - inline = 1 -endif -endif - -# First, find out which compiler we're building with. The settings we -# use for compiling, as well as how to build shared libraries, depend on -# the compiler version. There's no easy way to ask lslpp which is installed. -# Instead, compile a file and see which compiler is set up for use. This -# trick was submitted by Craig Rodrigues <rodrigc@mediaone.net>, originally -# from the vacpp compiler newsgroup. -# It relies on the preprocessor defining __xlC__ to the proper version -# number of the compiler. -XLCVERSION := $(shell echo "__xlC__" > ./testxlCvers.cpp;xlC -E ./testxlCvers.cpp | tail -n 1;$(RM) testxlCvers.cpp) -#XLCVERSION := $(shell xlC -E ./testAIXCompilerVersion.cpp | tail -1') -#ACE_AIX_CLEAN := $(shell $(RM) ./testAIXCompilerVersion.cpp) - -# In case anything here or in the config depends on OS version number, -# grab it here and pass it all to the compiler as well. -AIX_MAJOR_VERS := $(shell uname -v) -AIX_MINOR_VERS := $(shell uname -r) -AIX_VERS := $(AIX_MAJOR_VERS)0$(AIX_MINOR_VERS) - -SOEXT = so -SOFLAGS += -G -LDFLAGS += -brtl -#SHR_FILTER=$(ACE_ROOT)/bin/aix_shr - -ifeq ($(threads),1) -# Note - the _r form of the compiler command turns on -qthreads and the -# thread-required preprocessor defines, as well as -lpthreads for linking. -# If this is Visual Age C++ 5, DLD will get reset below. -CC = xlc_r -CXX = xlC_r -DLD = makeC++SharedLib_r -else -CC = xlc -CXX = xlC -DLD = makeC++SharedLib -endif - -ARFLAGS = ruv -AR = ar -LD = $(SHR_FILTER) $(CXX) -RANLIB = ranlib - -CPPFLAGS += -DACE_AIX_VERS=$(AIX_VERS) - -# AIX 5.2 offers POSIX aio, but the Visual Age C++ compiler can't grok the -# aio.h header file. This is a known problem and will be addressed in -# May 2004 (per IBM). This is a workaround for it, supplied by IBM. -# When the compiler fix is released, this workaround (and the change -# to -qflag, below) can be removed. (Steve Huston) -ifeq (502,$(AIX_VERS)) -CPPFLAGS += -U__C99_RESTRICT -endif - -# -qinitauto seems like an interesting option, but some tests (specifically -# Process_Strategy_Test) hang with it turned on. This should be investigated -# at some point. -DCCFLAGS += -g -qcheck=nobounds:div:null -DCFLAGS += -g - -ifeq ($(XLCVERSION),0x0600) - # This is just for the workaround for aio, above. Without it, the - # compiler warns that __C99_RESTRICT is reserved. When that workaround - # is gone, this ifeq can be removed also. -qflag=w:w is what we want - # in the end. - CCFLAGS += -qtemplateregistry=templateregistry.$(MAKEFILE) - ifeq (502,$(AIX_VERS)) - CCFLAGS += -qflag=e:e - else - CCFLAGS += -qflag=w:w - endif -else - ifeq ($(XLCVERSION),0x0700) - CCFLAGS += -qflag=w:w - ifeq ($(templates),manual) - CCFLAGS += -qnotempinc -qnotemplateregistry - else - CCFLAGS += -qtemplateregistry=templateregistry.$(MAKEFILE) - endif - # According to documentation, default is -qeh, which is equivalent - # to -qeh=v5. Apparently 6.0 fixed some problems with nested - # try-catch blocks. - CCFLAGS += -qeh=v6 - else - ifeq ($(XLCVERSION),0x0800) - CCFLAGS += -qflag=w:w - ifeq ($(templates),manual) - CCFLAGS += -qnotempinc -qnotemplateregistry - else - CCFLAGS += -qtemplateregistry=templateregistry.$(MAKEFILE) - endif - # According to documentation, default is -qeh, which is equivalent - # to -qeh=v5. Apparently 6.0 fixed some problems with nested - # try-catch blocks. - CCFLAGS += -qeh=v6 - else - # Until there's a reason to change, use the V9 settings for V10.1, 11.1, - # 12.1 and 13.1. - ifeq ($(XLCVERSION),0x0a01) - XLCVERSION = 0x0900 - endif - ifeq ($(XLCVERSION),0x0b01) - XLCVERSION = 0x0900 - endif - ifeq ($(XLCVERSION),0x0c01) - XLCVERSION = 0x0900 - endif - ifeq ($(XLCVERSION),0x0d01) - XLCVERSION = 0x0900 - endif - ifeq ($(XLCVERSION),0x0900) - CCFLAGS += -qflag=w:w - ifeq ($(templates),manual) - CCFLAGS += -qnotempinc -qnotemplateregistry - else - CCFLAGS += -qtemplateregistry=templateregistry.$(MAKEFILE) - endif - # According to documentation, default is -qeh, which is equivalent - # to -qeh=v5. Apparently 6.0 fixed some problems with nested - # try-catch blocks. - CCFLAGS += -qeh=v6 - else - CXX = echo "Unrecognized compiler version $(XLCVERSION)\n" - endif - endif - endif -endif - -DLD = $(CXX) -qmkshrobj -SOFLAGS += $(CCFLAGS) $(CPPFLAGS) $(INCLDIRS) - -ifeq ($(buildbits),64) - DLD += -q64 - CFLAGS += -q64 -qwarn64 - CCFLAGS += -q64 -qwarn64 - ARFLAGS := -X64 $(ARFLAGS) - - # This option results in a crash of TAO when building 64bit with - # Visual Age 6. No idea why but don't use it when using Visual Age 6. - ifneq ($(XLCVERSION),0x0600) - # CCFLAGS += -qstaticinline - endif -else - # Using 32bit the staticinline option works. - #CCFLAGS += -qstaticinline -endif - -# The Visual Age preprocessor is not usable with the TAO_IDL compiler. -# At the moment an idl file just contains includes of other idl files -# the Visual Age preprocessor doesn't report that file in the list of -# files that is used. The only way we can workaround this is using the -# gcc preprocessor, do this in your platform_macros.GNU is this -# causes problems -# TAO_IDL_PREPROCESSOR = gcc - -ifeq ($(exceptions),0) - CCFLAGS += -qnoeh -endif - -CCFLAGS += -qrtti=all - -ifeq ($(shared_libs),1) -ACELIB = -lACE -else -ACELIB = -lACEns -endif - -LIBS += -lxti -ldl - -SONAME = -SOVERSION = -# Default OCCFLAGS builds turns on mid-level optimize level. Compiler defaults -# to build machine's architecture and a reasonable tuning effort for recent -# machine architectures. To optimize for a more specific architecture, set -# your OCCFLAGS to the desired -qarch and/or -qtune values. For example: -#OCCFLAGS += -qarch=ppc -qtune=604 - -OCCFLAGS += -qlibansi -O2 diff --git a/ACE/include/makeinclude/platform_gcc_clang_common.GNU b/ACE/include/makeinclude/platform_gcc_clang_common.GNU index ac70c620b61..bd147cc8746 100644 --- a/ACE/include/makeinclude/platform_gcc_clang_common.GNU +++ b/ACE/include/makeinclude/platform_gcc_clang_common.GNU @@ -80,15 +80,7 @@ templates ?= automatic versioned_so ?= 1 with_ld ?= ifneq ($(versioned_so),0) - ifeq ($(with_ld),hpux) - SOFLAGS += -Wl,+h -Wl,$(SONAME) - else - ifeq ($(with_ld),aix) - # What to do here??? - else - SOFLAGS += -Wl,-h -Wl,$(SONAME) - endif - endif + SOFLAGS += -Wl,-h -Wl,$(SONAME) endif ifeq ($(versioned_so),2) diff --git a/ACE/include/makeinclude/platform_hpux_aCC.GNU b/ACE/include/makeinclude/platform_hpux_aCC.GNU deleted file mode 100644 index 5a6dbea96ff..00000000000 --- a/ACE/include/makeinclude/platform_hpux_aCC.GNU +++ /dev/null @@ -1,213 +0,0 @@ -# -# This is for HP-UX 11.x using the aC++ compiler. -# -# HP-UX 11 supports both 32-bit and 64-bit builds, regardless of which -# architecture the build is done on. This file is set up to build native -# to the machine it's running on. To cross-build for another platform, add -# "buildbits=32" to make a 32-bit build, and "buildbits=64" to do a 64-bit -# build. Note that if you explicitly specify a 64-bit build, the option -# -Wl,+vnocompatwarnings is added to shut up the "At least one PA 2.0 object -# file detected..." messages. - -buildbits ?= 0 -debug ?= 1 -distrib ?= 0 -optimize ?= 0 -stdcpplib ?= 1 -threads ?= 1 -versioned_so ?= 0 - -# First, extract the OS version number. -HPVERS_WORDS := $(subst ., ,$(shell uname -r)) -HPMODEL := $(shell uname -m) -HPUX_VERS := $(join $(word 2,$(HPVERS_WORDS)),$(word 3,$(HPVERS_WORDS))) -# -CC = /bin/cc -CXX = aCC - -# Determine compiler version -CXXVERS_WORDS := $(subst ., , $(shell $(CXX) -V 2>&1)) -CXXINFO := $(word 3, $(CXXVERS_WORDS)) -# aCC++ 3.67 gives "aCC: HP ANSI C++ B3910B A.03.67" -# aCC++ 3.73 gives "aCC: HP ANSI C++ B3910B A.03.73" -# -ifeq (ANSI, $(CXXINFO)) - CXXMINORVERS := $(word 8, $(CXXVERS_WORDS)) - CXXMAJORVERS := $(word 7, $(CXXVERS_WORDS)) -else - ifeq (aC++/ANSI, $(CXXINFO)) - CXXMINORVERS := $(word 8, $(CXXVERS_WORDS)) - CXXMAJORVERS := $(word 7, $(CXXVERS_WORDS)) - else - CXXMINORVERS := $(word 7, $(CXXVERS_WORDS)) - CXXMAJORVERS := $(word 6, $(CXXVERS_WORDS)) - endif -endif - -# Want to be able to do [unsigned] long long. -CCFLAGS += -ext - -ifeq (1,$(stdcpplib)) - CCFLAGS += -AA - ifeq (03,$(CXXMAJORVERS)) - # Warning 930 is spurious when new(std::nothrow) is used. Reported to HP - # as support call 3201224717. (Steve Huston, 23-Nov-2002) - CCFLAGS += +W930 - endif -# Compile errors using -AA and +noeh together - HP problem report -# JAGad12608, fix slated for Dec 2001 Release -- Steve Huston, April 10, 2001. -else - CCFLAGS += -AP -endif - -# Set the appropriate preprocessor defs for threading based on OS version -# and specified compiler options. -ifeq ($(threads),1) - THR_DEFS = -DACE_HAS_THREADS - CC_THR_DEFS += -mt -else - THR_DEFS = -DACE_HAS_THREADS=0 - # On HP-UX 11, even without building for threads, the *_r reentrant - # functions are available, and _REENTRANT enables them. - THR_DEFS += -D_REENTRANT -endif - -ifeq ($(HPMODEL), ia64) - itanium = 1 -endif - -ifeq (03,$(CXXMAJORVERS)) - # Suppress Warning 302 ((...) parameter list is a non-portable feature) - # Suppress Warning 361 (missing return from non-void function) - # Suppress Warning 1039(Binary incompatabilty between old and new compilers) - CCFLAGS += +W302,361,1039 - ifeq (57,$(CXXMINORVERS)) - # aCC 3.57 has a bug. When a class has private constructors - # and is trying to be created from a friend class we end up with - # a compile error. We disable array optimization in the compiler - # by setting this environment variable. HP CR JAGaf43094 - export aCC_ARRAY_OPT=OFF - endif - ifeq (60,$(CXXMINORVERS)) - # Same bug as above - export aCC_ARRAY_OPT=OFF - endif - ifeq (80,$(CXXMINORVERS)) - # Enabled template meta programming - CCFLAGS += +hpxstd98 - endif - ifeq (85,$(CXXMINORVERS)) - # Enabled template meta programming - CCFLAGS += +hpxstd98 - endif -endif - -ifeq (05,$(CXXMAJORVERS)) - # Warnings about binary incompatiblity - CCFLAGS += +W1016,1031 -endif - -ifeq (06,$(CXXMAJORVERS)) - ifeq (13,$(CXXMINORVERS)) - # Warnings dllexport/dllimport conflict with "x" (declared at line y); dllexport assumed - CCFLAGS += +W3390,3397 - endif -endif - -CPPFLAGS += $(THR_DEFS) -D_HPUX_SOURCE -DHPUX_VERS=$(HPUX_VERS) -DACE_LACKS_PRAGMA_ONCE -CCFLAGS += $(CC_THR_DEFS) - -DCCFLAGS += -g -DLD = $(CXX) $(CCFLAGS) -LD = $(CXX) -OCCFLAGS = -O -PIC = +Z - -AR = /usr/ccs/bin/ar -ARFLAGS = ruv -RANLIB = echo -LDFLAGS = -Wl,+s -z -SOFLAGS += -b - -ifeq ($(distrib),1) - -ifeq ($(buildbits),32) -SOFLAGS += -Wl,-x -Wl,+h$(@F) -Wl,+b/usr/lib -endif -ifeq ($(buildbits),64) - ifeq ($(itanium),1) - SOFLAGS += -Wl,-x -Wl,+h$(@F) -Wl,+b/usr/lib/hpux64 - else - SOFLAGS += -Wl,-x -Wl,+h$(@F) -Wl,+b/usr/lib/pa20_64 - endif -endif - -endif - -ifeq ($(itanium),1) - SOEXT = so -else - SOEXT = sl -endif - -ifeq ($(buildbits),32) - ifeq ($(itanium),1) - CFLAGS += +DD32 - CCFLAGS += +DD32 - else - CFLAGS += +DA1.1 +DS1.1 - CCFLAGS += +DA1.1 +DS1.1 - endif -else -ifeq ($(buildbits),64) - ifeq ($(itanium),1) - CFLAGS += +DD64 - CCFLAGS += +DD64 - else - ## Without the W, it isn't really a 64-bit build - CFLAGS += +DA2.0W +DS2.0W - CCFLAGS += +DA2.0W +DS2.0W - endif -LDFLAGS += -Wl,+vnocompatwarnings -else - ifneq ($(itanium),1) - # HP aCC on Itanium doesn't support this option, defaults to 32bit then. - CFLAGS += +DAportable - CCFLAGS += +DAportable - endif -endif -endif - -#11.x: -ifeq ($(threads),1) - # If -mt is in CCFLAGS, we don't need to add anything to LIBS; -mt does it. - ifeq ($(findstring -mt,$(CCFLAGS)),) - ## -L./ must directly preceed the system libraries for 64-bit builds - ## with aCC 3.27. Without this change, libpthread.sl can not be found. - LIBS += -L./ -lpthread - endif -endif -LIBS += -lxti -lrt -ldld - -# The correct flags to pass to the linker for dynamic shared library -# versioning -# -ifneq ($(SONAME),) - SOFLAGS += -Wl,+h -Wl,$(SONAME) -endif - -# if _FILE_OFFSET_BITS==64 then the HP headers will produce -# spurious 600 warnings, except on 11.23 -# Can also (possible) be fixed with patch PHKL_34670 on HP-UX 11.11 -# -ifeq ($(64bitoffsets),1) - ifneq ($(HPUX_VERS), 1123) - CCFLAGS += +W600 - endif -endif - -ifeq ($(c++11),1) - CCFLAGS += -Ax -endif - -LD_RPATH = -Wl,+s,+b, diff --git a/ACE/include/makeinclude/platform_hpux_gcc.GNU b/ACE/include/makeinclude/platform_hpux_gcc.GNU deleted file mode 100644 index f6b754aa32a..00000000000 --- a/ACE/include/makeinclude/platform_hpux_gcc.GNU +++ /dev/null @@ -1,105 +0,0 @@ -# - -buildbits ?= 64 -debug ?= 1 -distrib ?= 0 -optimize ?= 1 -stdcpplib ?= 1 -threads ?= 1 -versioned_so ?= 0 -with_ld ?= hpux - -# First, extract the OS version number. -HPVERS_WORDS := $(subst ., ,$(shell uname -r)) -HPMODEL := $(shell uname -m) -HPUX_VERS := $(join $(word 2,$(HPVERS_WORDS)),$(word 3,$(HPVERS_WORDS))) -# -CC = gcc -CXX = g++ -CFLAGS += -w - -# -# Set the appropriate preprocessor defs for threading based on OS version. -# If the user has requested building without threads, then don't set any. -# -ifeq ($(threads),1) - ifeq (3.,$(findstring 3.,$(CXX_VERSION))) - THR_DEFS = -threads - endif - ifeq ($(word 2,$(HPVERS_WORDS)), 11) - THR_DEFS += -DACE_HAS_THREADS -D_POSIX_C_SOURCE=199506L - else - THR_DEFS += -DACE_HAS_THREADS -D_REENTRANT - endif -endif - -ifeq ($(HPMODEL), ia64) - itanium = 1 -endif - -# On HP-UX 11, there's a conflict with pthread_atfork in sys/unistd.h and -# sys/pthread.h - both define the function, but slightly differently. -# -fstrict-prototype resolves the issue. -#ifeq ($(word 2,$(HPVERS_WORDS)), 11) -#CCFLAGS += -fstrict-prototype -#endif -DCFLAGS += -g -DCCFLAGS += -g -DLD = $(CXX) -LD = $(CXX) -OCFLAGS += -O2 -PIC = -fPIC -# GNU ar doesn't work (missing libfl.sl?) so use HP ar. -AR = /usr/bin/ar -ARFLAGS = ruv -RANLIB = echo -LDFLAGS = -L. -L$(ACE_ROOT)/lib -Wl,+s -SOFLAGS += $(CPPFLAGS) -shared -nostdlib $(PIC) -Wl,-E -SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.$(SOEXT) $< -PRELIB = @true - -ifeq ($(itanium),1) - SOEXT = so -else - SOEXT = sl -endif - -ifeq ($(itanium),1) - ifeq ($(buildbits),64) - CCFLAGS += -mlp64 - CFLAGS += -mlp64 - else - CCFLAGS += -milp32 - CFLAGS += -milp32 - endif -endif - -# -# Grab the appropriate libraries based on the version of HP-UX we're building -# on and whether or not thread support is being used. -# -ifeq ($(word 2,$(HPVERS_WORDS)), 11) - - #11.x: - ifeq ($(threads),1) - LIBS += -lxti -lpthread -lrt -ldld - else - LIBS += -lxti -lrt -ldld - endif - -else - - # 10.x: - LIBS += -lxti -ldld - ifeq ($(threads),1) - LIBS += -lcma - endif - -endif - -# Test for template instantiation, add to SOFLAGS if versioned_so set, -# add -E to LDFLAGS if using GNU ld -# -include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU - -CCFLAGS += -DHPUX_VERS=$(HPUX_VERS) $(THR_DEFS) diff --git a/ACE/include/makeinclude/platform_linux_suncc.GNU b/ACE/include/makeinclude/platform_linux_suncc.GNU deleted file mode 100644 index 3489fc423e9..00000000000 --- a/ACE/include/makeinclude/platform_linux_suncc.GNU +++ /dev/null @@ -1,74 +0,0 @@ - -# This file should allow ACE to be built on Linux, using the Sun compiler. -# The Sun compiler on linux is still in the Alpha stage, so no guarantees -# given at this point - -include $(ACE_ROOT)/include/makeinclude/platform_linux_common.GNU - -no_hidden_visibility ?= 1 - -ifeq ($(insure),0) - CC = CC - CXX = CC -endif - -GNU_LIBPTHREAD_VERSION := $(shell getconf GNU_LIBPTHREAD_VERSION) -ifeq (NPTL, $(word 1,$(GNU_LIBPTHREAD_VERSION))) - CPPFLAGS += -DACE_HAS_LINUX_NPTL -endif - -DCCFLAGS += -g -DCFLAGS += -g -DLD = $(CXX) -LD = $(CXX) -LIBS += -ldl -OCCFLAGS = -O3 -OCFLAGS = -O3 -PRELIB = @true -SOFLAGS += -shared -PIC = -PIC - -SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<; \ - $(SOLINK.cc) -o $@ $(LDFLAGS) $(VSHDIR)$*.o - -ifeq ($(threads),1) - CPPFLAGS += -D_REENTRANT - LIBS += -lpthread -lrt -endif - -ifeq ($(optimize),0) - # Disable all optimizing in code - CPPFLAGS += -O0 -endif - - -ifeq ($(shared_libs), 1) - ifneq ($static_libs_only), 1) - ifneq ($(no_hidden_visibility),1) - CCFLAGS += -fvisibility=hidden - else - CPPFLAGS += -DACE_HAS_CUSTOM_EXPORT_MACROS=0 - endif # no_hidden_visibility - endif -endif - -ifeq ($(buildbits),32) - CFLAGS += -m32 - LDFLAGS += -m32 -endif -ifeq ($(buildbits),64) - CFLAGS += -m64 -endif - -# Enable GNU extensions -CPPFLAGS+= -D_GNU_SOURCE - -# Added line below to support "Executable Shared Object" files (as -# needed by the service configurator). -# Marius Kjeldahl <mariusk@sn.no, marius@funcom.com> -ifeq ($(threads),1) - ESOBUILD = $(COMPILEESO.cc) $(PIC) -shared -o $(VSHDIR)$*.so $< - ifndef PRELIB - PRELIB = @true - endif # ! PRELIB -endif diff --git a/ACE/include/makeinclude/platform_openvms.GNU b/ACE/include/makeinclude/platform_openvms.GNU deleted file mode 100644 index ee2cb678ba7..00000000000 --- a/ACE/include/makeinclude/platform_openvms.GNU +++ /dev/null @@ -1,101 +0,0 @@ - -# for OpenVMS GNV - -ACE_OPENVMS = 1 -versioned_so ?= 0 -debug ?= 1 -optimize ?= 0 -threads ?= 1 -pthread ?= 1 -ssl ?= 0 -rwho ?= 0 -buildbits ?= 32 - -VDIR ?= obj/ -VSHDIR ?= shobj/ -PRELINK_TYPE ?= USE_OLB - -LN_S = cp -p -DEFFLAGS += -CCFLAGS += -D__USE_STD_IOSTREAM -ieee -names_as_is_short -ifeq ($(HOSTTYPE),ia64) - CCFLAGS += "-Wc/warn=DISABLE=(INTOVERFLOW,REFTEMPORARY,INTSIGNCHANGE)" -else - CCFLAGS += -msg_disable intoverflow,reftemporary,intsignchange -endif -CCFLAGS += -Wc/template=auto - -ifeq ($(buildbits),64) - CCFLAGS += -Wc/MODEL=ANSI -endif - -ifeq ($(HOSTTYPE),ia64) - ACE_OPENVMS_IA64 = 1 - SYMVEC_OPT_FILE ?= $(LIB_NAME)_symvec.opt - ifeq ($(PRJ_TYPE),library) - ifeq ($(shared_libs),1) - CCFLAGS += "-Wc/export_sym=(OPTIONS_FILE=$(SYMVEC_OPT_FILE),ALL,NOTEMPLATES)" - endif - endif -else - LDFLAGS += -Wl/PRELINK=$(PRELINK_TYPE)/MAP/CROSS -endif - -ifeq ($(debug),1) - LDFLAGS += -g -endif -LDFLAGS += -threads -DCCFLAGS += -g -OCCFLAGS += -O - -CFLAGS += -ieee -names_as_is_short -DCFLAGS += -g -OCFLAGS += -O - -PIC = -RANLIB = @true -ifeq ($(HOSTTYPE),ia64) - ARFLAGS = -r - SOFLAGS = -shared $(SYMVEC_OPT_FILE) -else - ARFLAGS = -c - SOFLAGS = -shared -auto_symvec -endif -ifeq ($(pthread),1) - LIBS += -lpthread -endif - -CC = cc -CXX = cxx -LD = $(CXX) -DLD = $(CXX) -SOVERSION = -SOEXT = exe -EXEEXT = .exe - -ifeq ($(HOSTTYPE),ia64) - REALCLEAN_FILES += $(SYMVEC_OPT_FILE) $(CLEANUP_VSHLIB_NO_VER:%.exe=%.DSF) \ - $(CLEANUP_BIN:%=%.DSF) $(basename $(BIN)) -else - REALCLEAN_FILES += $(CLEANUP_VSHLIB_NO_VER:%.exe=%_symvec.opt) $(CLEANUP_VSHLIB_NO_VER:%.exe=%.DSF) \ - $(CLEANUP_BIN:%=%.DSF) $(basename $(BIN)) -endif - -ifneq ($(MAKEFILE),$(DEPENDENCY_FILE)) -VMS_DUMMY_ := $(shell touch $(DEPENDENCY_FILE)) -VMS_DUMMY_ := $(VMS_DUMMY_) -endif - -ifeq ($(HOSTTYPE),ia64) - ifeq ($(shared_libs),1) - ifneq ($(SHLIB),) -BUILD := post_build.local - -.PHONY: post_build.local - -post_build.local: - @-if [ ! -z "$(VSHLIB)" ]; then dcl "set image/success $(VSHLIB)"; echo ""; fi - - endif - endif -endif diff --git a/ACE/include/makeinclude/platform_rtems.x_g++.GNU b/ACE/include/makeinclude/platform_rtems.x_g++.GNU deleted file mode 100644 index 2f61e6a647e..00000000000 --- a/ACE/include/makeinclude/platform_rtems.x_g++.GNU +++ /dev/null @@ -1,49 +0,0 @@ -# -*- Makefile -*- - -# RTEMS 4.6.6 and later with GNU g++. - -CROSS-COMPILE = 1 - -debug ?= 1 -optimize ?= 1 -threads ?= 1 - -shared_libs = -static_libs = 1 -rwho = 0 - -ifneq (,$(HOST_ROOT)) - TAO_IDL = $(HOST_ROOT)/bin/tao_idl - TAO_IDL_DEP = $(TAO_IDL) -endif - -ifeq (,$(RTEMS_MAKEFILE_PATH)) - default: - @ERROR: you must set your RTEMS_MAKEFILE_PATH environment variable -endif # RTEMS_MAKEFILE_PATH - -ifeq (,$(PERL_PATH)) - PERL_PATH = perl -endif # ! PERL_PATH - -include $(RTEMS_MAKEFILE_PATH)/Makefile.inc -include $(RTEMS_MAKEFILE_PATH)/make/target.cfg - -# Test for template instantiation. -include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU - -ifeq (no,$(RTEMS_HAS_NETWORKING)) - CFLAGS += -DACE_LACKS_NETWORKING - CCFLAGS += -DACE_LACKS_NETWORKING -endif - -CFLAGS += -specs bsp_specs -qrtems -D_REENTRANT -fasm -fno-builtin -fno-defer-pop -fvolatile -DACE_HAS_RTEMS -B$(RTEMS_MAKEFILE_PATH)/lib -DCFLAGS += -g -DCCFLAGS += -g -DLD = $(LD) -INCLDIRS += - -LD = $(CXX) -LDFLAGS += -Wl,--allow-multiple-definition -B$(RTEMS_MAKEFILE_PATH)/lib -Wl,-Ttext,0x00100000 -OCFLAGS += -O -PIC = diff --git a/ACE/include/makeinclude/platform_sunos5_common.GNU b/ACE/include/makeinclude/platform_sunos5_common.GNU deleted file mode 100644 index 0dc819189f1..00000000000 --- a/ACE/include/makeinclude/platform_sunos5_common.GNU +++ /dev/null @@ -1,45 +0,0 @@ -# -*- Makefile -*- - - -# SunOS 5.x common settings - -ifeq ($(shell /bin/uname -r),5.9) - # Solaris 9 puts sendfile() in a separate library. - LIBS += -lsendfile -endif -ifeq ($(shell /bin/uname -r),5.10) - # Solaris 10 puts sendfile() in a separate library. - LIBS += -lsendfile - sctp ?= lksctp -endif -ifeq ($(shell /bin/uname -r),5.11) - # Solaris 11 puts sendfile() in a separate library. - LIBS += -lsendfile - sctp ?= lksctp -endif -kstat ?= 1 -ifeq ($(kstat),1) - # Unguard the raw monitor code and link the system lib. - FLAGS_C_CC += -DACE_HAS_KSTAT - LIBS += -lkstat -endif - -PLATFORM_X11_CPPFLAGS= -I/usr/openwin/include -I/usr/dt/include -PLATFORM_X11_LIBS =-lX11 -PLATFORM_X11_LDFLAGS= - -PLATFORM_TK_CPPFLAGS= -PLATFORM_TK_LIBS=-ltk -ltcl -PLATFORM_TK_LDFLAGS= - -# TODO: Fix the parameters -#PLATFORM_TCL_CPPFLAGS=-I/usr/include/tcl8.4 -#PLATFORM_TCL_LIBS=-ltcl8.4 -#PLATFORM_TCL_LDFLAGS= - -sctp ?= -ifeq ($(sctp),lksctp) - PLATFORM_SCTP_CPPFLAGS+= -DACE_HAS_LKSCTP - PLATFORM_SCTP_LIBS?= -lsctp -endif - diff --git a/ACE/include/makeinclude/platform_sunos5_g++.GNU b/ACE/include/makeinclude/platform_sunos5_g++.GNU deleted file mode 100644 index f5f0b990bb6..00000000000 --- a/ACE/include/makeinclude/platform_sunos5_g++.GNU +++ /dev/null @@ -1,65 +0,0 @@ -# -*- Makefile -*- - -# SunOS 5.x (Solaris 2.x) with g++ - -# NOTE: On Solaris86, you'll need to use GNU as instead of /usr/ccs/bin/as, -# if you want -gstabs+ and -pipe support. - -debug ?= 1 -optimize ?= 1 -threads ?= 1 -buildbits ?= 32 - -ifeq ($(buildbits),64) - FLAGS_C_CC += -m64 - LDFLAGS += -m64 -endif - -ifeq ($(shell /bin/uname -m),i86pc) - #### gcc on Solaris86 doesn't use -g - DCFLAGS += -gstabs+ - DCCFLAGS += -gstabs+ -else # ! i86pc - DCFLAGS += -g - DCCFLAGS += -g -endif # ! i86pc - -CC = gcc -CXX = g++ - -ifeq ($(threads),1) - CPPFLAGS += -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -endif - -DLD = $(CXX) -LD = $(CXX) -LDFLAGS += -LIBS += -lsocket -ldl -lgen -lnsl -lposix4 -lthread -OCFLAGS += -O3 -OCCFLAGS += -O3 -PIC = -fPIC -AR = ar -ARFLAGS = ruv -RANLIB = @true -SOFLAGS += -shared $(CPPFLAGS) -SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $< -PRELIB = @true -LD_RPATH = -Wl,-R, - -# Get common Solaris settings -include $(ACE_ROOT)/include/makeinclude/platform_sunos5_common.GNU - -# Test for template instantiation, add to SOFLAGS if SONAME set, -# add -E to LDFLAGS if using GNU ld -# -include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU - -# Make sure we resolve all symbols at link time, see bugzilla 2710 -LDFLAGS += -z now - -## Unfortunately, gcc 3.0 fails to many cpp files with -## optimization enabled. Even -O causes the compiler -## to core dump on some files. -ifeq ($(shell $(CXX) --version),3.0) - override optimize = 0 -endif diff --git a/ACE/include/makeinclude/platform_sunos5_sunc++.GNU b/ACE/include/makeinclude/platform_sunos5_sunc++.GNU deleted file mode 100644 index 34c6be57aeb..00000000000 --- a/ACE/include/makeinclude/platform_sunos5_sunc++.GNU +++ /dev/null @@ -1,264 +0,0 @@ -# -*- Makefile -*- - - -# SunOS 5.x (Solaris 2.x) with Sun C++ 4.2 and 5.x -# -# NOTE: Sun C++ 5.0 users might need to add this to their CCFLAGS: -# -compat=4 and/or remove -instances=explicit. Please note that -# inlining is disabled by default with Sun C++ 5.0. If you'd like -# to try enabling it, comment out the "inline = 0" line below. -# -# To enable compilation of 64-bit binaries with Sun CC 5.0, a -# platform_macros.GNU file such as this can be used: -# fast=1 -# include $(ACE_ROOT)/include/makeinclude/platform_sunos5_sunc++.GNU -# CFLAGS += -xtarget=ultra2 -xarch=v9a #### CPU specific! -# SOFLAGS += -xtarget=ultra2 -xarch=v9a -# LDFLAGS += -L/opt/SUNWspro/SC5.0/lib/v9 -L/usr/lib/sparcv9 -# Please note that the xtarget and xarch settings are specific to -# the target CPU. The /opt/SUNWspro/ Sun C++ installation directory -# is site-specific. -# -# To build 64-bit binaries with Forte 6 and later, build with the -# "buildbits=64" option (make buildbits=64). -# -# With slight modification, this file could be used with Sun C++ 4.1. -# However, it's likely that you won't be able to build all of ACE -# with Sun C++ 4.1. -# -# NOTE: some ACE files might generate this warning: -# "Warning: Could not find source for " one of the following: -# default constructor, copy constructor, destructor, or assignment -# operator. It appears that with +w, Sun C++ 4.x issues this warning -# whenever it has to generate one of these functions (because it wasn't -# defined by the user). This isn't really a problem. -# This warning appears to be fixed by Sun C++ 4.2 jumbo patch 104631-02. -# -# -pta instantiates all template members, which makes libraries bigger. -# But, it's supposed to put each member into it's own .o, so executable -# size should not be penalized. We don't use it because it's not -# necessary with automatic template instantiation. - -compat4 ?= 0 -debug ?= 1 -distrib ?= 1 -rwtools ?= 0 -stdcpplib ?= 1 -stlport ?= 0 -threads ?= 1 -pthreads ?= 1 -versioned_so ?= 1 -tk_reactor ?= 0 -ace_with_x11 ?= 0 -no_annotations ?= 1 -no_hidden_visibility ?= 1 -templates ?= automatic - -## If you set this to 1 you will need to add -xarch=v8plus (or higher) -## to CFLAGS or the assembler code will not compile -atomic_ops_sparc ?= 0 - -ifeq ($(threads),1) - CFLAGS += -mt - LDFLAGS += -mt -endif # threads - -CC = cc -CXX = CC - -CC_VERSION := $(shell $(CXX) -V 2>&1) - -### CC 5.4 provides insufficient preprocessor output (at 111715-17 2005/10/13) -### We need to use cc instead - see bugzilla #2478. -ifeq (C++ 5.4,$(findstring C++ 5.4,$(CC_VERSION))) - ACE_CC_PREPROCESSOR = cc -endif - -ifeq ($(atomic_ops_sparc),1) - CFLAGS += -DACE_HAS_BUILTIN_ATOMIC_OP -DACE_INCLUDE_ATOMIC_OP_SPARC -endif - -#### The following macro overrides enable creation of fast executables. -#### They _don't_ support fast compilation :-) -#### To use, add fast=1 to your "make" invocation. -#### -#### -g is incompatible with -fast. If you need -g, you can -#### use "-fast -O3". -#### -#### Have to do this _before_ adding any -xarch, -xtarget, etc. flags since -#### -fast is shorthand for a list of internally-assigned options, some of -#### which will are -xarch, -xtarget. Thus, explicit -xarch needs to go -#### to the right of -fast. -DCFLAGS += -g -DCCFLAGS += -DLD = $(CXX) -ifeq (1,$(fast)) - CFLAGS += -fast - DCFLAGS = - DCCFLAGS = - LDFLAGS += -fast -endif # fast -# Make sure we resolve all symbols at link time, see bugzilla 2710 -LDFLAGS += -z now - -# Studio 8 or better has version greater than 5.4 (Studio 8 == CC 5.5). -STUDIO_8_OR_BETTER = $(shell a=`echo $(CC_VERSION) | sed -e 's/[^0-9]*\([0-9]*\)\.\([0-9]*\).*$$/\1\2/g'`; if test "$$a" -gt 54; then echo 1; else echo 0; fi) -STUDIO_12_OR_BETTER = $(shell a=`echo $(CC_VERSION) | sed -e 's/[^0-9]*\([0-9]*\)\.\([0-9]*\).*$$/\1\2/g'`; if test "$$a" -gt 58; then echo 1; else echo 0; fi) - -ifeq (C++ 5,$(findstring C++ 5,$(CC_VERSION))) - #### CC 5.0 or later - #### Inlining appears to cause link problems with early releases of - #### CC 5.0. - ifeq (C++ 5.0,$(findstring C++ 5.0,$(CC_VERSION))) - inline = 0 - else - ifeq (C++ 5.1 ,$(findstring C++ 5.1 ,$(CC_VERSION))) - inline = 0 - else # ! 5.1 - inline ?= 1 - endif # 5.2 or greater - endif #! 5.0 - - CCFLAGS += $(CFLAGS) - - #### If compat=4 is desired, set up for that. There are syntactic diffs - #### in the compatibility modes, but here all we need to be concerned with - #### is turning on -compat=4, and not trying to enable the new libraries. - ifeq ($(compat4),1) - CCFLAGS += -compat=4 - CCFLAGS += -features=rtti - else - ifneq (C++ 5.0,$(findstring C++ 5.0,$(CC_VERSION))) - # If 64-bit build is desired, turn that on. If no code gen options - # are given to Forte 6, the default build is 32-bit, even when - # building on a 64-bit system. Specifying xarch=v9 generates code - # that runs on any Sparc v9 (64-bit) processor. - # Beginning at (I believe) Studio 10 (C++ 5.7) there's a - # -xarch=generic64 option that works for both Sparc and x86. - # If you want to tune this further, you should extract and insert - # from CCFLAGS in a private platform_macros.GNU file. - ifeq (64,$(buildbits)) - ifeq (C++ 5.7,$(findstring C++ 5.7,$(CC_VERSION))) - CFLAGS += -xarch=generic64 - LDFLAGS += -xarch=generic64 - else - ifeq (C++ 5.8,$(findstring C++ 5.8,$(CC_VERSION))) - CFLAGS += -xarch=generic64 - LDFLAGS += -xarch=generic64 - else - # Starting at Studio 12 (CC 5.9), -m64 is used in place of -xarch - ifeq (1,$(STUDIO_12_OR_BETTER)) - CFLAGS += -m64 - LDFLAGS += -m64 - else - CFLAGS += -xarch=v9 - LDFLAGS += -xarch=v9 - endif # C++ 5.9+ - endif # C++ 5.8 - endif # C++ 5.7 - endif # buildbits - endif # CC 5.0 - endif # compat4 requested -endif # CC 5.0 or later - -ifeq ($(shared_libs), 1) - ifneq ($(static_libs_only), 1) - # Take advantage of Sun Studio 8 (v5.5) symbol scopes to - # generate improved shared library binaries. - ifeq ($(STUDIO_8_OR_BETTER),1) - ifneq ($(no_hidden_visibility),1) - CCFLAGS += -xldscope=hidden - else - CPPFLAGS += -DACE_HAS_CUSTOM_EXPORT_MACROS=0 - endif # no_hidden_visibility - endif # Sun Studio 8 (C++ 5.5) or better. - endif # static_libs_only -endif # shared_libs - -LD = $(CXX) -ifeq ($(distrib),0) - LDFLAGS += -R $(ACE_ROOT)/lib -R./ -endif - -# Get common Solaris settings -include $(ACE_ROOT)/include/makeinclude/platform_sunos5_common.GNU - -LIBS += -lsocket -lrt -laio -ldl -lnsl -lgen -lposix4 -ladm - -# Support alternate CC libraries (i.e. STLport, Tools.h++, Cstd) -# See: http://docs.sun.com/app/docs/doc/820-7599/bkaty?a=view -ifeq ($(stlport),1) - CC_LIBRARY = stlport4 - PLATFORM_STLPORT_CCFLAGS += -library=$(CC_LIBRARY) - PLATFORM_STLPORT_LDFLAGS += -library=$(CC_LIBRARY) -else - ifeq ($(rwtools),1) - ifeq ($(stdcpplib),1) - CC_LIBRARY = rwtools7_std - else - CC_LIBRARY = rwtools7,iostream - CPPFLAGS += -DACE_USES_OLD_IOSTREAMS - endif - else # default - ifeq ($(stdcpplib),1) - CC_LIBRARY = Cstd - else - CC_LIBRARY = no%Cstd,iostream - CPPFLAGS += -DACE_USES_OLD_IOSTREAMS - endif - endif - CCFLAGS += -library=$(CC_LIBRARY) - LDFLAGS += -library=$(CC_LIBRARY) -endif - -### CC 5.10 enables annotation support by default; allow user to override -### new behavior. This also provides a work around for 64-bit linker crashes, -### see: http://defect.opensolaris.org/bz/show_bug.cgi?id=9720 -ifeq (C++ 5.10,$(findstring C++ 5.10,$(CC_VERSION))) - ifeq ($(no_annotations),1) - LDFLAGS += -xannotate=no - endif -endif - -LDFLAGS += -xildoff -ifeq ($(pthreads),1) - CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS -endif -OCFLAGS += -xO4 -PIC = -KPIC -AR = CC -ARFLAGS = -xar -o -RANLIB = echo -SOFLAGS += -G $(CPPFLAGS) - -# The correct flags to pass to the linker for ELF dynamic shared library -# versioning. This knows that wrapper_macros.GNU will set versioned_so to -# 1 if it's not set. So, the only way SOFLAGS should _not_ get this is if -# versioned_so has been explicitly disabled. -# -ifeq ($(versioned_so),1) - SOFLAGS += -h $(SONAME) -endif - -ifdef CLEANUP_BIN - #### Builds .shobj/$*.o file, then .shobj/$*.so file. The .o files - #### are used for building libraries and executables. But, it seems - #### to be necessary to build the .so files (with -G) in order to get - #### all template instantiations. - SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \ - $(SOLINK.cc) -o $@ -h $@ $(LDFLAGS) $(VSHDIR)$*.o -else - #### Optimize builds when no executables are built in the current - #### directory. Only a library is being created, and -G is used - #### in that step. Therefore, all templates instantations are - #### included in the library. This optimization saves almost 11 Mb - #### (2.6 percent) and 27 minutes (22 percent) on the entire ACE - #### build on a 168 MHz Sun Ultra2. - #### - #### Sun C++ won't allow the output from a compile to be named with - #### a .so extension. Rather than muck with the ACE build rules and - #### risk upsetting builds on other platforms, just ln the output - #### after building it. - SOBUILD = $(RM) $@; $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $< && \ - /bin/ln $(VSHDIR)$*.o $@ -endif # CLEANUP_BIN diff --git a/ACE/include/makeinclude/platform_vxworks6.6.GNU b/ACE/include/makeinclude/platform_vxworks6.6.GNU index a8ad549cf05..9f00cbd6941 100644 --- a/ACE/include/makeinclude/platform_vxworks6.6.GNU +++ b/ACE/include/makeinclude/platform_vxworks6.6.GNU @@ -6,10 +6,6 @@ endif # VXWORKS_VERSION_FLAG include $(ACE_ROOT)/include/makeinclude/platform_vxworks6.5.GNU -ifeq ("$(WIND_HOST_TYPE)","sun4-solaris2") - override RM=rm -f -endif # sun4-solaris2 - # Disable strict aliasing warnings, these are given on some VxWorks system # header files and has been reported to WindRiver ifeq ("$(TOOL_FAMILY)","gnu") diff --git a/ACE/include/makeinclude/rules.bin.GNU b/ACE/include/makeinclude/rules.bin.GNU index 9fb934580cb..3da9b1b5eaa 100644 --- a/ACE/include/makeinclude/rules.bin.GNU +++ b/ACE/include/makeinclude/rules.bin.GNU @@ -1,7 +1,7 @@ # -*- Makefile -*- #---------------------------------------------------------------------------- -# +# # # Build binaries # GNU version @@ -35,18 +35,12 @@ PSRC += $(addsuffix .cpp, $(CLEANUP_BIN)) CLEANUP_INSTALL += $(CLEANUP_BIN:%=$(INSBIN)/%$(VAR)$(EXEEXT)) VXWORKSLINK ?= -using_aix_vacpp ?= ifeq ($(VXWORKSLINK),1) $(ARCH_BIN): $(DEFAULTRULE) mv $(DEFAULTRULE) $@ else # !VXWORKSLINK - ifeq (1,$(using_aix_vacpp)) -$(ARCH_BIN): %: %.icc $(SRC) - vacbld_r $< -severitylevel=warning - else # !using_aix_vacpp # Since we add in the vdir, don't use arch_bin. use bin instead! $(ARCH_BIN): %: $(VDIR)$(BIN).$(OBJEXT) $(VOBJS) $(LINK.cc) $(LDFLAGS) $(CC_OUTPUT_FLAG) $@ $(sort $(VDIR)$(BIN).$(OBJEXT) $(VOBJS)) $(VLDLIBS) $(POSTLINK) - endif # using_aix_vacpp endif diff --git a/ACE/include/makeinclude/rules.lib.GNU b/ACE/include/makeinclude/rules.lib.GNU index 1a84f3d92cd..6b8c2e8fc13 100644 --- a/ACE/include/makeinclude/rules.lib.GNU +++ b/ACE/include/makeinclude/rules.lib.GNU @@ -137,7 +137,6 @@ ifneq ($(INSLIB),) endif # INSLIB ace_lib_prelink ?= 0 -aix_build ?= 0 ifeq (1,$(VXWORKS)) @@ -187,25 +186,11 @@ $(VLIB): $(VLOBJS) #### to lib files, for example. -$(LINK.cc) $(LINK_OUTPUT_FLAG) ace-templ_inst $? $(LDFLAGS) $(ACE_NUL_STDERR) endif # ace_lib_prelink - ifeq (1,$(ACE_OPENVMS)) - find $(TMPINCDIR:%=%) -name "*.$(OBJEXT)" -or -name "*.obj" | xargs $(AR) $(ARFLAGS) $@ $(AREXTRA) - else - ifneq (,$(AR.cc.override)) + ifneq (,$(AR.cc.override)) $(AR.cc.override) else ([ "`echo $(TMPINCDIR:%=%/*.$(OBJEXT))`" != "$(TMPINCDIR:%=%/*.$(OBJEXT))" ] && echo $(TMPINCDIR:%=%/*.$(OBJEXT)); \ echo $(filter %.$(OBJEXT), $^)) | xargs $(AR) $(ARFLAGS) $@ $(AREXTRA) - endif - endif - ifdef ibmcxx_build -# This is required to get AIX IBM C/C++ to instantiate and compile the needed -# templates. - if test -s ./$(TEMPINCDIR)/*.C; \ - then \ - $(LINK.cc) $(LINK_OUTPUT_FLAG) dummy $(LDFLAGS) $(ACE_ROOT)/etc/xlc_dummy.cpp $^ $(ACE_SHLIBS) $(LIBS); \ - $(RM) dummy; \ - $(AR) $(ARFLAGS) $@ $(TEMPINCDIR)/*.$(OBJEXT); \ - fi endif -chmod a+r $@ ifneq (,$(RANLIB)) @@ -214,55 +199,19 @@ $(VLIB): $(VLOBJS) endif # !VXWORKS -# Note that if you don't want to build shared libraries, just remove the -# $(VSHOBJS) -# -# The AIX shr.o build is out here to keep it away from the SOVERSION stuff. -# The SOVERSION transform is applied after building the library file. -ifeq (1,$(aix_build)) -shr.o: $(VSHOBJS) - $(SHR_FILTER) $(SOLINK.cc) $(SO_OUTPUT_FLAG) $@ $^ $(LDFLAGS) $(ACE_SHLIBS) $(LIBS) - -.INTERMEDIATE: shr.o -endif # aix_build - ifeq ($(VXWORKSLINK),1) $(VSHLIB): $(basename $(notdir $(PRJ_FILE))).out -$(RM) $@ -$(LN_S) $(PROJECT_OUT) $@ -$(POST_BUILD_RULE) else # !VXWORKSLINK - ifeq (1,$(aix_build)) -$(VSHLIB): shr.o - $(AR) $(ARFLAGS) $@ $? - ifneq (,$(RANLIB)) - -$(RANLIB) $@ - endif # RANLIB - else # ! aix_build $(VSHLIB): $(VSHOBJS) - ifdef PRELIB + ifdef PRELIB $(PRELIB) - endif # PRELIB - ifdef ibmcxx_build - # This is required to get AIX IBM C/C++ to instantiate and compile the needed - # templates before building the library. - if test -s ./$(TEMPINCDIR)/*.C; \ - then \ - $(LINK.cc) $(LINK_OUTPUT_FLAG) dummy $(LDFLAGS) $(ACE_ROOT)/etc/xlc_dummy.cpp $^ $(ACE_SHLIBS) $(LIBS); \ - $(RM) dummy; \ - fi - endif # ibmcxx_build - ifdef SHLIBBUILD + endif # PRELIB + ifdef SHLIBBUILD $(SHLIBBUILD) else # ! SHLIBBUILD - ifdef ibmcxx_build - if test -s ./$(TEMPINCDIR)/*.$(OBJEXT); \ - then \ - $(SOLINK.cc) $(SO_OUTPUT_FLAG) $@ $^ $(TEMPINCDIR)/*.$(OBJEXT) $(LDFLAGS) $(ACE_SHLIBS) $(LIBS); \ - else \ - $(SOLINK.cc) $(SO_OUTPUT_FLAG) $@ $^ $(LDFLAGS) $(ACE_SHLIBS) $(LIBS); \ - fi - else # !ibmcxx_build ifeq (1,$(ace_lib_prelink)) #### Attempt a link (which will fail), to add template instantiations #### to lib files, for example. @@ -273,9 +222,7 @@ $(VSHLIB): $(VSHOBJS) else $(SHR_FILTER) $(SOLINK.cc) $(SO_OUTPUT_FLAG) $@ $^ $(LDFLAGS) $(ACE_SHLIBS) $(LIBS) endif #override - endif # ibmcxx_build - endif # SHLIBBUILD - endif # aix_build + endif # SHLIBBUILD endif # VXWORKSLINK ifneq ($(SOVERSION),) # This carefully works with both ARCH (where VSHLIB_* refer to the ARCH diff --git a/ACE/include/makeinclude/rules.local.GNU b/ACE/include/makeinclude/rules.local.GNU index 11283525473..d2da721b3f1 100644 --- a/ACE/include/makeinclude/rules.local.GNU +++ b/ACE/include/makeinclude/rules.local.GNU @@ -1,6 +1,6 @@ # -*- Makefile -*- #---------------------------------------------------------------------------- -# +# # # Local targets # GNU version @@ -27,20 +27,9 @@ ifdef TEMPINCDIR CLEANUP_DIRS += $(TEMPINCDIR) endif -ifdef sun - CLEANUP_DIRS += SunWS_cache -endif - vxworks_ntbuild ?= 0 lacks_touch ?= 0 -#### TEMPLATE_REPOSITORY can be set in individual platform files -#### to create template repository directories. See -#### platform_sunos5_sunc++.GNU for an example. -ifdef TEMPLATE_REPOSITORY -CLEANUP_DIRS += $(TEMPLATE_REPOSITORY) -endif - ifeq ($(use_pwd_call),) ifneq ($(mingw32),1) use_pwd_call := 0 @@ -369,7 +358,7 @@ ifneq ($(SHLIB_UNCHECKED),) -$(RM) $(SHLIB_UNCHECKED) ifeq ($(versioned_so),1) -$(RM) $(SHLIB_UNCHECKED)$(SOVERSION) -else +else ifeq ($(versioned_so),2) -$(RM) $(SHLIB_UNCHECKED:.$(SOEXT)=$(SOVERSION).$(SOEXT)) endif @@ -510,7 +499,7 @@ depend.local: $(MAKEFILE) idl_stubs.local @$(RM) $(DEPENDENCY_FILE).old @cp $(DEPENDENCY_FILE) $(DEPENDENCY_FILE).old $(DEPGEN_ENV) $(DEPGEN) -A $(DEPEND_CMD_ARGS) -f $(DEPENDENCY_FILE) \ - $(CPPFLAGS) -t gnu -DMAKEDEPEND $(CCFLAGS) $(LSRC) $(SRC) $(PSRC) + $(CPPFLAGS) -t gnu -DMAKEDEPEND $(CCFLAGS) $(LSRC) $(SRC) $(PSRC) @if cmp -s $(DEPENDENCY_FILE) $(DEPENDENCY_FILE).old ;\ then echo "GNUmakefile dependencies unchanged." ;\ else \ diff --git a/ACE/include/makeinclude/wrapper_macros.GNU b/ACE/include/makeinclude/wrapper_macros.GNU index f9888281467..d815f614662 100644 --- a/ACE/include/makeinclude/wrapper_macros.GNU +++ b/ACE/include/makeinclude/wrapper_macros.GNU @@ -26,7 +26,6 @@ # to CPPFLAGS, PLATFORM_DMALLOC_LDFLAGS to LDFLAGS, and # PLATFORM_DMALLOC_LIBS to LIBS. For more information on # dmalloc, see http://dmalloc.com. -# fast Enable -fast option, e.g., with Sun C++. # inline Enable ACE inlining. Some platforms enable inlining by # default, others do not. If platform_macros.GNU does not # set this, inline is enabled. @@ -224,7 +223,6 @@ endif # alternate_platform_macros # Define some variables to silence warnings GHS ?= -AIX_TEMPLATE_HACK ?= # $(ACE_PLATFORM_CONFIG) is used in dependency rules and corresponds to the # platform dependent config-*.h file included in config.h, and can be set @@ -843,10 +841,6 @@ ifdef quantify PURELINK += quantify -best-effort -cache-dir=$(PURE_CACHE_DIR) \ -max_threads=100 $(PLATFORM_QUANTIFY_OPTIONS) CPPFLAGS += -DACE_HAS_QUANTIFY -I$(ACE_QUANTIFY_DIR) - - ifeq ($(shell uname -p),sparc) - PURELINK += -record-register-window-traps - endif # sparc endif # quantify repo ?= diff --git a/ACE/netsvcs/lib/Base_Optimizer.h b/ACE/netsvcs/lib/Base_Optimizer.h index f4a648f09b3..ba98f50d34f 100644 --- a/ACE/netsvcs/lib/Base_Optimizer.h +++ b/ACE/netsvcs/lib/Base_Optimizer.h @@ -35,12 +35,6 @@ public: Member m_; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Base_Optimizer.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Base_Optimizer.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* BASE_OPTIMIZER_H */ diff --git a/ACE/netsvcs/lib/Log_Message_Receiver.h b/ACE/netsvcs/lib/Log_Message_Receiver.h index 30b9cbf0d9d..e98e221cf6a 100644 --- a/ACE/netsvcs/lib/Log_Message_Receiver.h +++ b/ACE/netsvcs/lib/Log_Message_Receiver.h @@ -198,12 +198,6 @@ private: Log_Message_Receiver_Impl (const Log_Message_Receiver_Impl<ACE_SYNCH_USE> &) = delete; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Log_Message_Receiver.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Log_Message_Receiver.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* LOG_MESSAGE_RECEIVER_H */ diff --git a/ACE/netsvcs/lib/Server_Logging_Handler_T.h b/ACE/netsvcs/lib/Server_Logging_Handler_T.h index 69d9572b239..0a6e3804e99 100644 --- a/ACE/netsvcs/lib/Server_Logging_Handler_T.h +++ b/ACE/netsvcs/lib/Server_Logging_Handler_T.h @@ -199,12 +199,6 @@ public: virtual int svc (); }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Server_Logging_Handler_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Server_Logging_Handler_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* ACE_SERVER_LOGGING_HANDLER_T_H */ diff --git a/ACE/performance-tests/Misc/childbirth_time.cpp b/ACE/performance-tests/Misc/childbirth_time.cpp index 09177e6cdf6..2cefc86ec35 100644 --- a/ACE/performance-tests/Misc/childbirth_time.cpp +++ b/ACE/performance-tests/Misc/childbirth_time.cpp @@ -27,7 +27,7 @@ * on UN*X platform. * * -t: Measure the performance of native thread creation - * mechanisms. On Solaris, this is thr_create (). + * mechanisms. * On NT, this is CreateThread (). Currently, only * these two platforms are implemented. * @@ -171,7 +171,7 @@ prof_fork (size_t iteration) static double prof_native_thread (size_t iteration) { -#if defined (ACE_HAS_THREADS) && (defined (ACE_HAS_WTHREADS) || defined (ACE_HAS_STHREADS)) +#if defined (ACE_HAS_THREADS) && defined (ACE_HAS_WTHREADS) if (iteration != 0) { ACE_Profile_Timer ptimer; @@ -191,14 +191,6 @@ prof_native_thread (size_t iteration) 0, CREATE_SUSPENDED, 0) == 0) -#elif defined (ACE_HAS_STHREADS) - //FUZZ: disable check_for_lack_ACE_OS - if (::thr_create (0, - 0, - &ace_empty, - 0, - THR_SUSPENDED, - 0) != 0) #endif ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "CreateThread"), -1); //FUZZ: enable check_for_lack_ACE_OS diff --git a/ACE/performance-tests/Misc/context_switch_time.cpp b/ACE/performance-tests/Misc/context_switch_time.cpp index 89dc0749080..a4315a1a155 100644 --- a/ACE/performance-tests/Misc/context_switch_time.cpp +++ b/ACE/performance-tests/Misc/context_switch_time.cpp @@ -24,12 +24,6 @@ * from the one described in 1) above, and the result is divided by * two to yield the context switch time. * - * Notes: - * On Solaris 2.5.1, it appears that the lowest context switching times, - * at least on a single-CPU machine, are obtained _without_ creating new - * LWPs for new threads (THR_NEW_LWP). The -n option enables the use of - * THR_NEW_LWP for testing. - * * = CREATION DATE * 17 January 1997 * @@ -218,10 +212,6 @@ Suspend_Resume_Test::svc () low_.ready (); - // For information: the cost of the just the loop itself below, - // without the suspend and resume calls, on a 166 MHz Ultrasparc - // is about 12.3 nanoseconds per iteration. - timer_.start (); for (ACE_UINT32 i = 0; i < iterations_; ++i) @@ -443,10 +433,6 @@ Ping_Suspend_Resume_Test::svc () priority, high_priority)); #endif /* ACE_DEBUG_CST */ - // For information: the cost of the just the loop itself below, - // without the suspend and resume calls, on a 166 MHz Ultrasparc - // is about 12.3 nanoseconds per iteration. - timer_.start (); ACE_UINT32 i; @@ -999,10 +985,6 @@ Synchronized_Suspend_Resume_Test::svc () priority, high_priority)); #endif /* ACE_DEBUG_CST */ - // For information: the cost of the just the loop itself below, - // without the suspend and resume calls, on a 166 MHz Ultrasparc - // is about 12.3 nanoseconds per iteration. - ACE_UINT32 i; for (i = 0; i < iterations_; ++i) diff --git a/ACE/performance-tests/Misc/preempt.cpp b/ACE/performance-tests/Misc/preempt.cpp index 22ba8d31661..20b70117e5a 100644 --- a/ACE/performance-tests/Misc/preempt.cpp +++ b/ACE/performance-tests/Misc/preempt.cpp @@ -37,10 +37,6 @@ #if defined (ACE_HAS_THREADS) || ! defined (ACE_LACKS_FORK) -#if defined (ACE_HAS_STHREADS) -# include <sys/lwp.h> /* for _lwp_self () */ -#endif /* ACE_HAS_STHREADS */ - static const char usage [] = "[-? |\n" #if defined (ACE_HAS_THREADS) " [-f use fork instead of spawn]\n" @@ -150,13 +146,9 @@ High_Priority_Task::svc () if (ACE_Thread::getprio (thr_handle, prio) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "getprio failed"), -1); -#if defined (ACE_HAS_STHREADS) - ACE_DEBUG ((LM_DEBUG, "(%P|%u|%t) High: prio = %d, priority_ = %d\n", - _lwp_self (), prio, this->priority_)); -#else /* ! ACE_HAS_STHREADS */ ACE_DEBUG ((LM_DEBUG, "(%P|%t) High: prio = %d, priority_ = %d\n", prio, this->priority_)); -#endif /* ! ACE_HAS_STHREADS */ + ACE_ASSERT (this->priority_ == prio); ACE_Time_Value pause (0, read_period); @@ -251,13 +243,9 @@ Low_Priority_Task::svc () if (ACE_Thread::getprio (thr_handle, prio) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "getprio failed"), -1); -#if defined (ACE_HAS_STHREADS) - ACE_DEBUG ((LM_DEBUG, "(%P|%u|%t) Low: prio = %d, priority_ = %d\n", - _lwp_self (), prio, this->priority_)); -#else /* ! ACE_HAS_STHREADS */ ACE_DEBUG ((LM_DEBUG, "(%P|%t) Low: prio = %d, priority_ = %d\n", prio, this->priority_)); -#endif /* ! ACE_HAS_STHREADS */ + ACE_ASSERT (this->priority_ == prio); u_long iterations = 0; @@ -371,7 +359,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) if (get_options (argc, argv)) ACE_OS::exit (-1); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params ( ACE_Sched_Params ( ACE_SCHED_FIFO, diff --git a/ACE/performance-tests/Misc/test_singleton.h b/ACE/performance-tests/Misc/test_singleton.h index 5c6e349f98f..e9ae536359f 100644 --- a/ACE/performance-tests/Misc/test_singleton.h +++ b/ACE/performance-tests/Misc/test_singleton.h @@ -1,6 +1,4 @@ -// Define the DC_Singleton here - it needs to be in a separate file to -// get picked up correctly on AIX with auto template instantiation using -// IBM C++ compiler (xlC). +// Define the DC_Singleton here #ifndef __TEST_SINGLETON_H #define __TEST_SINGLETON_H diff --git a/ACE/performance-tests/Server_Concurrency/Latency_Stats.h b/ACE/performance-tests/Server_Concurrency/Latency_Stats.h index 723d287a33d..80a88bea8d4 100644 --- a/ACE/performance-tests/Server_Concurrency/Latency_Stats.h +++ b/ACE/performance-tests/Server_Concurrency/Latency_Stats.h @@ -187,7 +187,7 @@ Throughput_Stats::sample () inline void move_to_rt_class () { - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/README b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/README index 179391919c7..e3ac204493a 100644 --- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/README +++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/README @@ -27,12 +27,7 @@ details. Some reasonable options to use to run the tests are: -v -B -s 15 -v -n 4 -t 4 -s 15 -You should experiment with other options as you see fit. Note that on -Solaris, you should always make sure that you have more than 1 LWP (by -using either the -B or the -n options) since otherwise the program may -get into an infinite loop due to the semantics of SunOS unbound -threads... (This may no longer be the case.) - +You should experiment with other options as you see fit. Available Options in Performance_Test module: ============================================= diff --git a/ACE/performance-tests/Synch-Benchmarks/Synch_Lib/Benchmark_Base.h b/ACE/performance-tests/Synch-Benchmarks/Synch_Lib/Benchmark_Base.h index d2db07a5a14..7023dfccffd 100644 --- a/ACE/performance-tests/Synch-Benchmarks/Synch_Lib/Benchmark_Base.h +++ b/ACE/performance-tests/Synch-Benchmarks/Synch_Lib/Benchmark_Base.h @@ -29,7 +29,7 @@ class Thr_ID // // DESCRIPTION // Pthreads are too lame to have a sensible scalar values for the - // thread id (unlike Solaris threads). Therefore, we have to + // thread id. Therefore, we have to // emulate this ourselves with this class (gag). { public: diff --git a/ACE/performance-tests/TCP/tcp_test.cpp b/ACE/performance-tests/TCP/tcp_test.cpp index 970fbc1fa52..375cb51d3e3 100644 --- a/ACE/performance-tests/TCP/tcp_test.cpp +++ b/ACE/performance-tests/TCP/tcp_test.cpp @@ -516,8 +516,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. - + // Enable FIFO scheduling, e.g. if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/ACE/protocols/ace/INet/BidirStreamBuffer.h b/ACE/protocols/ace/INet/BidirStreamBuffer.h index 61306083a9d..1b5f0e4a76b 100644 --- a/ACE/protocols/ace/INet/BidirStreamBuffer.h +++ b/ACE/protocols/ace/INet/BidirStreamBuffer.h @@ -124,13 +124,7 @@ namespace ACE ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/INet/BidirStreamBuffer.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("BidirStreamBuffer.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_IOS_BIDIR_STREAM_BUFFER_H */ diff --git a/ACE/protocols/ace/INet/BufferedStreamBuffer.h b/ACE/protocols/ace/INet/BufferedStreamBuffer.h index 4bb2a5c394b..56bae21bb22 100644 --- a/ACE/protocols/ace/INet/BufferedStreamBuffer.h +++ b/ACE/protocols/ace/INet/BufferedStreamBuffer.h @@ -95,13 +95,7 @@ namespace ACE ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/INet/BufferedStreamBuffer.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("BufferedStreamBuffer.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_IOS_BUFFERED_STREAM_BUFFER_H */ diff --git a/ACE/protocols/ace/INet/FTP_Session.h b/ACE/protocols/ace/INet/FTP_Session.h index 787877cee8e..8a218490fde 100644 --- a/ACE/protocols/ace/INet/FTP_Session.h +++ b/ACE/protocols/ace/INet/FTP_Session.h @@ -112,13 +112,7 @@ namespace ACE ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/INet/FTP_Session.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("FTP_Session.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_FTP_SESSION_H */ diff --git a/ACE/protocols/ace/INet/HTTPS_Session.h b/ACE/protocols/ace/INet/HTTPS_Session.h index 51f0132c530..e08d9dd61cd 100644 --- a/ACE/protocols/ace/INet/HTTPS_Session.h +++ b/ACE/protocols/ace/INet/HTTPS_Session.h @@ -86,13 +86,7 @@ namespace ACE ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/INet/HTTPS_Session.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("HTTPS_Session.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_HTTPS_SESSION_H */ diff --git a/ACE/protocols/ace/INet/HTTP_Session.h b/ACE/protocols/ace/INet/HTTP_Session.h index ef45d3006e5..784f6073373 100644 --- a/ACE/protocols/ace/INet/HTTP_Session.h +++ b/ACE/protocols/ace/INet/HTTP_Session.h @@ -66,13 +66,7 @@ namespace ACE ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/INet/HTTP_Session.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("HTTP_Session.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_HTTP_SESSION_H */ diff --git a/ACE/protocols/ace/INet/HTTP_StreamPolicy.h b/ACE/protocols/ace/INet/HTTP_StreamPolicy.h index 73e15241500..ca8c9889b59 100644 --- a/ACE/protocols/ace/INet/HTTP_StreamPolicy.h +++ b/ACE/protocols/ace/INet/HTTP_StreamPolicy.h @@ -85,13 +85,7 @@ namespace ACE ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/INet/HTTP_StreamPolicy.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("HTTP_StreamPolicy.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_HTTP_STREAM_POLICY_H */ diff --git a/ACE/protocols/ace/INet/HTTP_StreamPolicyBase.h b/ACE/protocols/ace/INet/HTTP_StreamPolicyBase.h index a305492f59a..5f2e1b58097 100644 --- a/ACE/protocols/ace/INet/HTTP_StreamPolicyBase.h +++ b/ACE/protocols/ace/INet/HTTP_StreamPolicyBase.h @@ -52,13 +52,7 @@ namespace ACE ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/INet/HTTP_StreamPolicyBase.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("HTTP_StreamPolicyBase.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_HTTP_STREAM_POLICY_BASE_H */ diff --git a/ACE/protocols/ace/INet/SSLSock_IOStream.h b/ACE/protocols/ace/INet/SSLSock_IOStream.h index f97887a9e1d..92d71913636 100644 --- a/ACE/protocols/ace/INet/SSLSock_IOStream.h +++ b/ACE/protocols/ace/INet/SSLSock_IOStream.h @@ -163,13 +163,7 @@ namespace ACE ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/INet/SSLSock_IOStream.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("SSLSock_IOStream.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_IOS_SSLSOCK_IOSTREAM_H */ diff --git a/ACE/protocols/ace/INet/SSL_CallbackManager.h b/ACE/protocols/ace/INet/SSL_CallbackManager.h index 2e58acac03e..c2c807809de 100644 --- a/ACE/protocols/ace/INet/SSL_CallbackManager.h +++ b/ACE/protocols/ace/INet/SSL_CallbackManager.h @@ -22,7 +22,7 @@ namespace ACE { namespace INet { - // NOTE: Solaris studio compilers amongst others will issue warnings if the + // NOTE: Some compilers will issue warnings if the // the correct type of function pointer (i.e. extern "C" ) is not stored/used // of the form: // Warning (Anachronism): Formal argument 1 of type diff --git a/ACE/protocols/ace/INet/Sock_IOStream.h b/ACE/protocols/ace/INet/Sock_IOStream.h index ddd101c7453..609be0fcedc 100644 --- a/ACE/protocols/ace/INet/Sock_IOStream.h +++ b/ACE/protocols/ace/INet/Sock_IOStream.h @@ -162,13 +162,7 @@ namespace ACE ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/INet/Sock_IOStream.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Sock_IOStream.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_IOS_SOCK_IOSTREAM_H */ diff --git a/ACE/protocols/ace/INet/StreamHandler.h b/ACE/protocols/ace/INet/StreamHandler.h index 2a680d61450..f2314122f11 100644 --- a/ACE/protocols/ace/INet/StreamHandler.h +++ b/ACE/protocols/ace/INet/StreamHandler.h @@ -137,13 +137,7 @@ namespace ACE ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/INet/StreamHandler.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("StreamHandler.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_IOS_STREAM_HANDLER_H */ diff --git a/ACE/protocols/ace/INet/StreamInterceptor.h b/ACE/protocols/ace/INet/StreamInterceptor.h index e71cda5c94f..1df803c1142 100644 --- a/ACE/protocols/ace/INet/StreamInterceptor.h +++ b/ACE/protocols/ace/INet/StreamInterceptor.h @@ -59,13 +59,7 @@ namespace ACE ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/INet/StreamInterceptor.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("StreamInterceptor.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_IOS_STREAM_INTERCEPTOR_H */ diff --git a/ACE/protocols/ace/INet/String_IOStream.h b/ACE/protocols/ace/INet/String_IOStream.h index 508852317d9..f1be7ffa2da 100644 --- a/ACE/protocols/ace/INet/String_IOStream.h +++ b/ACE/protocols/ace/INet/String_IOStream.h @@ -160,13 +160,7 @@ namespace ACE ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/INet/String_IOStream.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("String_IOStream.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_IOS_STRING_IOSTREAM_H */ diff --git a/ACE/protocols/ace/INet/inet.mpc b/ACE/protocols/ace/INet/inet.mpc index 3d7d8c815ca..e0c77ec0bc7 100644 --- a/ACE/protocols/ace/INet/inet.mpc +++ b/ACE/protocols/ace/INet/inet.mpc @@ -3,7 +3,6 @@ project(INet) : acelib, ace_output, install { sharedname = ACE_INet dynamicflags += ACE_INET_BUILD_DLL includes += $(ACE_ROOT)/protocols - avoids += wince avoids += old_stdstream avoids += exclude_inet avoids += ace_for_tao diff --git a/ACE/protocols/ace/RMCast/Acknowledge.h b/ACE/protocols/ace/RMCast/Acknowledge.h index 67487e4a85f..1c3f968a789 100644 --- a/ACE/protocols/ace/RMCast/Acknowledge.h +++ b/ACE/protocols/ace/RMCast/Acknowledge.h @@ -42,10 +42,7 @@ namespace ACE_RMCast virtual void send (Message_ptr m); - // Sun C++ 5.4 can't handle private here. - // - // private: - public: + private: struct Descr { //@@ There should be no default c-tor. diff --git a/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h b/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h index 6f3c476fb71..b14823f17b0 100644 --- a/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h +++ b/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h @@ -39,13 +39,7 @@ // The second #undef protects against being reset in a config.h file. #undef ACE_NDEBUG -#if defined (ACE_HAS_WINCE) -// Note that Pocket PC 2002 will NOT create a directory if it does not start with a leading '\'. -// PPC 2002 only accepts '\log' as a valid directory name, while 'log\' works under WinCE 3.0. -# define ACE_LOG_DIRECTORY_FOR_MKDIR ACE_TEXT ("\\log") -# define ACE_LOG_DIRECTORY ACE_TEXT ("\\log\\") -# define MAKE_PIPE_NAME(X) ACE_TEXT ("\\\\.\\pipe\\"#X) -#elif defined (ACE_WIN32) +#if defined (ACE_WIN32) # define ACE_LOG_DIRECTORY ACE_TEXT ("log\\") # define MAKE_PIPE_NAME(X) ACE_TEXT ("\\\\.\\pipe\\"#X) #else @@ -53,17 +47,13 @@ # define MAKE_PIPE_NAME(X) ACE_TEXT (X) #endif /* ACE_WIN32 */ -#if defined (ACE_HAS_WINCE) -#define ACE_LOG_FILE_EXT_NAME ACE_TEXT (".txt") -#else #define ACE_LOG_FILE_EXT_NAME ACE_TEXT (".log") -#endif /* ACE_HAS_WINCE */ -#if defined (ACE_HAS_WINCE) || defined (ACE_HAS_PHARLAP) +#if defined (ACE_HAS_PHARLAP) const size_t ACE_MAX_CLIENTS = 4; #else const size_t ACE_MAX_CLIENTS = 30; -#endif /* ACE_HAS_WINCE */ +#endif /* ACE_HAS_PHARLAP */ const size_t ACE_NS_MAX_ENTRIES = 1000; const size_t ACE_DEFAULT_USECS = 1000; @@ -205,11 +195,9 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) // Ignore the error value since the directory may already exist. const ACE_TCHAR *test_dir {}; -#if !defined (ACE_HAS_WINCE) test_dir = ACE_OS::getenv (ACE_TEXT ("ACE_TEST_DIR")); if (test_dir == 0) -#endif /* ACE_HAS_WINCE */ test_dir = ACE_TEXT (""); ACE_OS::sprintf (temp, @@ -234,14 +222,10 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) # else /* ! VXWORKS */ // This doesn't seem to work on VxWorks if the directory doesn't // exist: it creates a plain file instead of a directory. If the - // directory does exist, it causes a wierd console error message + // directory does exist, it causes a weird console error message // about "cat: input error on standard input: Is a directory". So, // VxWorks users must create the directory manually. -# if defined (ACE_HAS_WINCE) - ACE_OS::mkdir (ACE_LOG_DIRECTORY_FOR_MKDIR); -# else ACE_OS::mkdir (ACE_LOG_DIRECTORY); -# endif // ACE_HAS_WINCE # endif /* ! VXWORKS */ # if !defined (ACE_LACKS_IOSTREAM_TOTALLY) diff --git a/ACE/rpmbuild/ace-tao.spec b/ACE/rpmbuild/ace-tao.spec index bda83603a50..7168e8acf84 100644 --- a/ACE/rpmbuild/ace-tao.spec +++ b/ACE/rpmbuild/ace-tao.spec @@ -1128,13 +1128,13 @@ cat mmraw.list |\ sort -u > allhdrs.list # Add missing headers. -echo ace/QtReactor/QtReactor.h >> allhdrs.list +ls ace/*{.h,.inl,.cpp} >> allhdrs.list %if 0%{?_with_tao:1}%{?_without_tao:0} -echo TAO/tao/QtResource/QtResource_Factory.h >> allhdrs.list -echo TAO/tao/QtResource/QtResource_Loader.h >> allhdrs.list -echo TAO/tao/PortableServer/get_arg.h >> allhdrs.list -echo TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.{h,inl,cpp} >> allhdrs.list -echo TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.{h,inl,cpp} >> allhdrs.list +ls TAO/tao/*{.h,.inl,_T.cpp} >> allhdrs.list +ls TAO/tao/*/*{.h,.inl,.cpp} >> allhdrs.list +ls TAO/orbsvcs/orbsvcs/*{.idl,.h,.inl,_T.cpp} >> allhdrs.list +ls TAO/orbsvcs/orbsvcs/*/*{.h,.inl,_T.cpp} >> allhdrs.list +ls TAO/orbsvcs/orbsvcs/ESF/*.cpp >> allhdrs.list %endif # Install headers and create header lists diff --git a/ACE/tests/Array_Map_Test.cpp b/ACE/tests/Array_Map_Test.cpp index 9d8ad4448ce..725814d7f33 100644 --- a/ACE/tests/Array_Map_Test.cpp +++ b/ACE/tests/Array_Map_Test.cpp @@ -296,7 +296,7 @@ index_operator_test () const_reverse_iterator const rlast = const_phonetic.rend (); for (const_reverse_iterator r = const_phonetic.rbegin (); - !(r == rlast); // Sun C++ Forte doesn't support operator!= + (r != rlast); ++r, --letter, --word) { if ((*r).first != *letter || (*r).second != *word) @@ -412,9 +412,6 @@ reference_count_test () std::pair<Map::iterator, bool> result; { - // Enter a new scope block to assure destruction of temporaries - // on systems like Solaris / Sun C++. - result = map.insert (std::make_pair (ACE_TString (ACE_TEXT ("Two")), counted)); @@ -424,9 +421,6 @@ reference_count_test () ACE_TEST_ASSERT (counted.refcount () == 3); { - // Enter a new scope block to assure destruction of temporaries - // on systems like Solaris / Sun C++. - result = map.insert (std::make_pair (ACE_TString (ACE_TEXT ("Three")), counted)); diff --git a/ACE/tests/Auto_Event_Test.cpp b/ACE/tests/Auto_Event_Test.cpp index 7b7d2828a43..dd960c75843 100644 --- a/ACE/tests/Auto_Event_Test.cpp +++ b/ACE/tests/Auto_Event_Test.cpp @@ -22,7 +22,7 @@ #include "ace/Atomic_Op.h" // msec that times are allowed to differ before test fails. -#if defined (ACE_HAS_HI_RES_TIMER) || defined (ACE_HAS_AIX_HI_RES_TIMER) || \ +#if defined (ACE_HAS_HI_RES_TIMER) || \ defined (ACE_HAS_PENTIUM) || \ defined (ACE_HAS_POWERPC_TIMER) # define ACE_ALLOWED_SLACK 100 diff --git a/ACE/tests/Based_Pointer_Test.cpp b/ACE/tests/Based_Pointer_Test.cpp index 875bb70d188..7b5f2ef3761 100644 --- a/ACE/tests/Based_Pointer_Test.cpp +++ b/ACE/tests/Based_Pointer_Test.cpp @@ -49,7 +49,7 @@ class Void_Pointer : public ACE_Based_Pointer<void> # define OBJ_SUFFIX ACE_DLL_SUFFIX #endif /* ACE_LD_DECORATOR_STR */ -#if defined (ACE_WIN32) || defined (ACE_OPENVMS) +#if defined (ACE_WIN32) # define OBJ_PREFIX ACE_DLL_PREFIX #else # define OBJ_PREFIX ACE_TEXT("./") ACE_DLL_PREFIX @@ -108,12 +108,7 @@ int singleton_test () -1); } -#if defined (ACE_OPENVMS) - // with OPENVMS symbol names > 31 cause us trouble with dlsym() - void* foo = dll.symbol (ACE_TEXT ("get_based_pointer_repo_inst")); -#else void* foo = dll.symbol (ACE_TEXT ("get_based_pointer_repository_instance")); -#endif // Cast the void* to function* with a long as intermediate. ptrdiff_t tmp = reinterpret_cast<ptrdiff_t> (foo); diff --git a/ACE/tests/Based_Pointer_Test_Lib.cpp b/ACE/tests/Based_Pointer_Test_Lib.cpp index 555bd2d98c7..fc0b9481c1a 100644 --- a/ACE/tests/Based_Pointer_Test_Lib.cpp +++ b/ACE/tests/Based_Pointer_Test_Lib.cpp @@ -14,16 +14,9 @@ #include "ace/svc_export.h" #include "ace/Based_Pointer_Repository.h" -#if defined (ACE_OPENVMS) -// with OPENVMS symbol names > 31 cause us trouble with dlsym() -extern "C" ACE_Svc_Export void * -get_based_pointer_repo_inst () -#else -extern "C" ACE_Svc_Export void * -get_based_pointer_repository_instance () -#endif +extern "C" ACE_Svc_Export void *get_based_pointer_repository_instance () { - void* baddr = ACE_BASED_POINTER_REPOSITORY::instance(); - return baddr; + void* baddr = ACE_BASED_POINTER_REPOSITORY::instance(); + return baddr; } diff --git a/ACE/tests/Bound_Ptr_Test.h b/ACE/tests/Bound_Ptr_Test.h index 250c8283c25..80cefeff78c 100644 --- a/ACE/tests/Bound_Ptr_Test.h +++ b/ACE/tests/Bound_Ptr_Test.h @@ -3,8 +3,7 @@ /** * @file Bound_Ptr_Test.h * - * Define class needed for generating templates. IBM C++ requires this to - * be in its own file for auto template instantiation. + * Define class needed for generating templates. * * @author @author Christopher Kohlhoff <chris@kohlhoff.com> */ diff --git a/ACE/tests/Bug_3505_Regression_Test.cpp b/ACE/tests/Bug_3505_Regression_Test.cpp index 0609ec07ed7..291fd895f66 100644 --- a/ACE/tests/Bug_3505_Regression_Test.cpp +++ b/ACE/tests/Bug_3505_Regression_Test.cpp @@ -14,7 +14,6 @@ #include "ace/Service_Gestalt.h" #include "test_config.h" - int run_main (int, ACE_TCHAR *[]) { diff --git a/ACE/tests/Bug_3541_Regression_Test.cpp b/ACE/tests/Bug_3541_Regression_Test.cpp index 8fb700a7d34..302ade29a3b 100644 --- a/ACE/tests/Bug_3541_Regression_Test.cpp +++ b/ACE/tests/Bug_3541_Regression_Test.cpp @@ -21,7 +21,7 @@ run_main (int, ACE_TCHAR *[]) int ret = 0; -#if defined(ACE_WIN32) && !defined (ACE_USES_WINCE_SEMA_SIMULATION) +#if defined(ACE_WIN32) int lastError; // ACE_OS::event_init() diff --git a/ACE/tests/Bug_3911_Regression_Test.cpp b/ACE/tests/Bug_3911_Regression_Test.cpp index 7eb5463d201..55a98040cd0 100644 --- a/ACE/tests/Bug_3911_Regression_Test.cpp +++ b/ACE/tests/Bug_3911_Regression_Test.cpp @@ -20,14 +20,7 @@ init_test () { // Cleanup the MMAP file so we won't trip over the leftover mmap // file from the previous crash. -#if defined (ACE_HAS_WINCE) || defined (ACE_OPENVMS) - // WinCE cannot do fixed base, ever. - ACE_MMAP_Memory_Pool_Options options - (0, - ACE_MMAP_Memory_Pool_Options::NEVER_FIXED); -#else ACE_MMAP_Memory_Pool_Options options (ACE_DEFAULT_BASE_ADDR); -#endif /* ACE_HAS_WINCE */ //FUZZ: disable check_for_lack_ACE_OS ACE_MMAP_Memory_Pool mmap (MMAP_FILENAME, &options); //FUZZ: enable check_for_lack_ACE_OS diff --git a/ACE/tests/Bug_3943_Regression_Test.cpp b/ACE/tests/Bug_3943_Regression_Test.cpp index 2763741b581..25d9e48e46d 100644 --- a/ACE/tests/Bug_3943_Regression_Test.cpp +++ b/ACE/tests/Bug_3943_Regression_Test.cpp @@ -95,7 +95,6 @@ namespace { const DWORD minorVersion, const BYTE productType) { -#if !defined(ACE_HAS_WINCE) OSVERSIONINFOEX versioninfo; versioninfo.dwOSVersionInfoSize = sizeof (OSVERSIONINFOEX); versioninfo.dwMajorVersion = majorVersion; @@ -170,27 +169,19 @@ namespace { } return 0; -#else // defined(ACE_HAS_WINCE) - // no version testing of WinCE has been performed - ACE_UNUSED_ARG (majorVersion); - ACE_UNUSED_ARG (minorVersion); - ACE_UNUSED_ARG (productType); - return -1; -#endif /* ACE_HAS_WINCE */ } #endif /* ACE_WIN32 */ int processENOBUFS() { -#if defined (ACE_WIN32) && !defined(ACE_HAS_WINCE) +#if defined (ACE_WIN32) // it has been identified that Windows7 does not have the ENOBUFS issue // but testing has not been performed on Server 2008 or Vista to identify - // wether the issue exists or not + // whether the issue exists or not return beforeVersion(6, 1, VER_NT_WORKSTATION); -#else // defined(ACE_HAS_WINCE) - // currently, no versions of WINCE identified to not have the ENOBUFS error +#else return 0; -#endif /* ACE_WIN32 && !ACE_HAS_WINCE */ +#endif /* ACE_WIN32 */ } struct IovecGuard @@ -205,31 +196,27 @@ namespace { static const int ALL_SLOTS = -1; }; + /* + * This class is the product created by both ACE_Connector + * and ACE_Acceptor objects. + */ class Svc_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> { - // = TITLE - // This class is the product created by both <ACE_Connector> - // and <ACE_Acceptor> objects. - // - // = DESCRIPTION - // This class gets its own header file to work around AIX C++ - // compiler "features" related to template instantiation... It is - // only used by Conn_Test.cpp. public: - Svc_Handler (ACE_Thread_Manager * = 0); // Do-nothing constructor. + Svc_Handler (ACE_Thread_Manager * = nullptr); - int open (void *) override; // Initialization hook. + int open (void *) override; - void send_data (); // Send data to server. + void send_data (); - void recv_data (); // Recv data from client. + void recv_data (); - int close (u_long = 0) override; // Shutdown the <Svc_Handler>. + int close (u_long = 0) override; private: enum Direction { READX, WRITEX }; // VxWorks defines READ and WRITE diff --git a/ACE/tests/CDR_File_Test.cpp b/ACE/tests/CDR_File_Test.cpp index aee71f3aa1f..40ccca78f00 100644 --- a/ACE/tests/CDR_File_Test.cpp +++ b/ACE/tests/CDR_File_Test.cpp @@ -70,32 +70,6 @@ ostream & operator << (ostream &os, const CDR_Test &t) { -#if defined (ACE_OPENVMS) - // to circumvent some obscure bug with OpenVMS iostreams digit conversions - // combined with shared libraries???? - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("\n" - "Char: %c\n" - "Short: %u\n" - "Long: %d\n"), - t.char_, - t.word2_, - t.word4_)); - - ACE_CDR::ULongLong hi = (t.word8_ >> 32); - ACE_CDR::ULongLong lo = (t.word8_ & 0xffffffff); - - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("\n" - "ULongLong 1st half: %x\n" - "ULongLong 2nd half: %x\n" - "Float: %f\n" - "Double: %f\n"), - ACE_Utils::truncate_cast<ACE_UINT32> (hi), - ACE_Utils::truncate_cast<ACE_UINT32> (lo), - t.fpoint_, - t.dprec_)); -#else os << "Char: " << t.char_ << endl << "Short: " << t.word2_ << endl << "Long: " << t.word4_ << endl; @@ -113,7 +87,6 @@ operator << (ostream &os, << dec << endl << "Float: " << t.fpoint_ << endl << "Double: " << t.dprec_ << endl; -#endif return os; } diff --git a/ACE/tests/Cache_Map_Manager_Test.h b/ACE/tests/Cache_Map_Manager_Test.h index 24cf916479a..31b2569f23e 100644 --- a/ACE/tests/Cache_Map_Manager_Test.h +++ b/ACE/tests/Cache_Map_Manager_Test.h @@ -4,8 +4,7 @@ /** * @file Cache_Map_Manager_Test.h * - * Define class needed for generating templates. IBM C++ requires this to - * be in its own file for auto template instantiation. + * Define class needed for generating templates. * * @author Kirthika Parameswaran <kirthika@cs.wustl.edu> */ diff --git a/ACE/tests/Cached_Accept_Conn_Test.cpp b/ACE/tests/Cached_Accept_Conn_Test.cpp index 960816e3402..71c07ca733c 100644 --- a/ACE/tests/Cached_Accept_Conn_Test.cpp +++ b/ACE/tests/Cached_Accept_Conn_Test.cpp @@ -30,18 +30,7 @@ #pragma warning(disable:4503) #endif /* _MSC_VER */ -// Note: To keep both sunCC5.0 without debugging symbols and gcc2.7.3 -// happy, it was necessary to have the definitions of the methods of -// the Accept_Strategy before the instantiations. - -// HPUX doesn't accept these declaration after their usage. - -// For some strange reason this must *not* be static since otherwise -// certain versions of SunC++ will not link properly. int connection_accepted = 0; - -// For some strange reason this must *not* be static since otherwise -// certain versions of SunC++ will not link properly. int debug = 0; template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> diff --git a/ACE/tests/Cached_Accept_Conn_Test.h b/ACE/tests/Cached_Accept_Conn_Test.h index 39d680c87e1..def161547ec 100644 --- a/ACE/tests/Cached_Accept_Conn_Test.h +++ b/ACE/tests/Cached_Accept_Conn_Test.h @@ -3,8 +3,7 @@ /** * @file Cached_Accept_Conn_Test.h * - * Define class needed for generating templates. IBM C++ requires this to - * be in its own file for auto template instantiation. + * Define class needed for generating templates. * * @author Kirthika Parameswaran <kirthika@cs.wustl.edu> */ diff --git a/ACE/tests/Cached_Conn_Test.h b/ACE/tests/Cached_Conn_Test.h index c9e9d6e6fe5..4ca36cd919c 100644 --- a/ACE/tests/Cached_Conn_Test.h +++ b/ACE/tests/Cached_Conn_Test.h @@ -3,8 +3,7 @@ /** * @file Cached_Conn_Test.h * - * Define class needed for generating templates. IBM C++ requires this to - * be in its own file for auto template instantiation. + * Define class needed for generating templates. * * @author Kirthika Parameswaran <kirthika@cs.wustl.edu> */ diff --git a/ACE/tests/Collection_Test.h b/ACE/tests/Collection_Test.h index b8f4c1cd76e..176fa491e51 100644 --- a/ACE/tests/Collection_Test.h +++ b/ACE/tests/Collection_Test.h @@ -5,8 +5,7 @@ /** * @file Collection_Test.h * - * Define class needed for generating templates. IBM C++ requires this to - * be in its own file for auto template instantiation. + * Define class needed for generating templates. * * @author Irfan Pyarali <irfan@cs.wustl.edu> */ diff --git a/ACE/tests/Compiler_Features_09_Test.cpp b/ACE/tests/Compiler_Features_09_Test.cpp index c765724237a..28e0be3cdc1 100644 --- a/ACE/tests/Compiler_Features_09_Test.cpp +++ b/ACE/tests/Compiler_Features_09_Test.cpp @@ -71,10 +71,6 @@ run_main (int, ACE_TCHAR *[]) // ... with a compliant implementation of std::auto_ptr<> you should be // able to write: // x = y; - // but the Solaris compiler was broken as of August, 2009!! So you have - // to work around in the following way. This compiler is important - // enough for the ACE community, so we have to support this broken - // configuration ... x.reset(y.release()); // ... there should be just one destruction so far ... diff --git a/ACE/tests/Conn_Test.h b/ACE/tests/Conn_Test.h index 637466d19fd..49531fb5603 100644 --- a/ACE/tests/Conn_Test.h +++ b/ACE/tests/Conn_Test.h @@ -4,9 +4,6 @@ /** * @file Conn_Test.h * - * Define class needed for generating templates. IBM C++ requires this to - * be in its own file for auto template instantiation. - * * @author Irfan Pyarali <irfan@cs.wustl.edu> */ //============================================================================= @@ -27,10 +24,6 @@ * * @brief This class is the product created by both <ACE_Connector> * and <ACE_Acceptor> objects. - * - * This class gets its own header file to work around AIX C++ - * compiler "features" related to template instantiation... It is - * only used by Conn_Test.cpp. */ class Svc_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> { diff --git a/ACE/tests/DLL_Test.cpp b/ACE/tests/DLL_Test.cpp index 7e43c6267f8..6539deccb62 100644 --- a/ACE/tests/DLL_Test.cpp +++ b/ACE/tests/DLL_Test.cpp @@ -26,7 +26,7 @@ # define OBJ_SUFFIX ACE_DLL_SUFFIX #endif /* ACE_LD_DECORATOR_STR */ -#if defined (ACE_WIN32) || defined (ACE_OPENVMS) +#if defined (ACE_WIN32) # define OBJ_PREFIX ACE_DLL_PREFIX #else # define OBJ_PREFIX ACE_TEXT("./") ACE_DLL_PREFIX diff --git a/ACE/tests/Dynamic_Priority_Test.cpp b/ACE/tests/Dynamic_Priority_Test.cpp index de5939b43ed..0d2ec3ff127 100644 --- a/ACE/tests/Dynamic_Priority_Test.cpp +++ b/ACE/tests/Dynamic_Priority_Test.cpp @@ -697,7 +697,7 @@ run_main (int, ACE_TCHAR *[]) ACE_START_TEST (ACE_TEXT ("Dynamic_Priority_Test")); #if defined (ACE_HAS_TIMED_MESSAGE_BLOCKS) - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params ( ACE_Sched_Params ( ACE_SCHED_FIFO, diff --git a/ACE/tests/FIFO_Test.cpp b/ACE/tests/FIFO_Test.cpp index c5f665a4fdc..7a2648516c6 100644 --- a/ACE/tests/FIFO_Test.cpp +++ b/ACE/tests/FIFO_Test.cpp @@ -104,15 +104,8 @@ server (void *arg) ACE_TEXT ("select")), 0); - // On AIX, select() always seems to select a fifo handle as a normal file, - // always readable. Just wait a second... -# if defined (AIX) || defined (HPUX) || defined (__osf__) - ACE_OS::sleep (1); -# endif /* AIX || HPUX */ - // Read the things the client is sending; alphabet, huge overflow, then // alphabet. - char buf[BUFSIZ]; ssize_t recv_count; ssize_t expect = static_cast <ssize_t> (ACE_OS::strlen (ACE_ALPHABET)); diff --git a/ACE/tests/Framework_Component_DLL.h b/ACE/tests/Framework_Component_DLL.h index 91deea999cb..f99bbce4777 100644 --- a/ACE/tests/Framework_Component_DLL.h +++ b/ACE/tests/Framework_Component_DLL.h @@ -3,8 +3,7 @@ /** * @file Framework_Component_DLL.h * - * Define class needed for generating templates. IBM C++ requires this to - * be in its own file for auto template instantiation. + * Define class needed for generating templates. * * @author Don Hinton <dhinton@ieee.org> */ diff --git a/ACE/tests/Framework_Component_Test.h b/ACE/tests/Framework_Component_Test.h index 5a77fb7f623..2b8fd75d3e1 100644 --- a/ACE/tests/Framework_Component_Test.h +++ b/ACE/tests/Framework_Component_Test.h @@ -3,8 +3,7 @@ /** * @file Framework_Component_Test.h * - * Define class needed for generating templates. IBM C++ requires this to - * be in its own file for auto template instantiation. + * Define class needed for generating templates. * * @author Don Hinton <dhinton@ieee.org> */ diff --git a/ACE/tests/INET_Addr_Test.cpp b/ACE/tests/INET_Addr_Test.cpp index ff1b5f8fe6e..2a7e69a51bf 100644 --- a/ACE/tests/INET_Addr_Test.cpp +++ b/ACE/tests/INET_Addr_Test.cpp @@ -248,11 +248,6 @@ int run_main (int, ACE_TCHAR *[]) static_cast<const struct sockaddr_in6*> (addr_port.get_addr()); const struct sockaddr_in6 *check_in6 = static_cast<const struct sockaddr_in6*> (check.get_addr()); -# if defined(AIX) - - ACE_ERROR((LM_ERROR, ACE_TEXT (" addr_port_in6->sin6_len=%d, check_in6->sin6_len=%d\n") - , (int)addr_port_in6->sin6_len, (int)check_in6->sin6_len)); -# endif ACE_ERROR((LM_ERROR, ACE_TEXT (" addr_port_in6->sin6_family=%d, check_in6->sin6_family=%d\n") , (int)addr_port_in6->sin6_family, (int)check_in6->sin6_family)); diff --git a/ACE/tests/IOStream_Test.cpp b/ACE/tests/IOStream_Test.cpp index 46ca847729a..7901b5e84cf 100644 --- a/ACE/tests/IOStream_Test.cpp +++ b/ACE/tests/IOStream_Test.cpp @@ -153,9 +153,8 @@ client (void *arg = 0) // We don't _need_ to dynamically allocate the ACE_SOCK_IOStream. // But if we don't, it doesn't get destroyed on some platforms, - // e.g., g++ 2.7.2.1 and Sun C++ 4.2 on Solaris 2.5.1. (It does work - // on Linux, so the code seems fine.) If we manage the storage - // ourselves, we _will_ destroy it at the end of this function. + // If we manage the storage ourselves, we _will_ destroy it at + // the end of this function. ACE_SOCK_IOStream server; ACE_INET_Addr *remote_addr = (ACE_INET_Addr *) arg; @@ -269,9 +268,8 @@ server (void *arg = 0) { // We don't _need_ to dynamically allocate the ACE_SOCK_IOStream. // But if we don't, it doesn't get destroyed on some platforms, - // e.g., g++ 2.7.2.1 and Sun C++ 4.2 on Solaris 2.5.1. (It does work - // on Linux, so the code seems fine.) If we manage the storage - // ourselves, we _will_ destroy it at the end of this function. + // If we manage the storage ourselves, we _will_ destroy it at + // the end of this function. ACE_SOCK_IOStream client_handler; ACE_INET_Addr server_addr; diff --git a/ACE/tests/Logging_Strategy_Test.cpp b/ACE/tests/Logging_Strategy_Test.cpp index 273dbcadf48..c3d61cadabb 100644 --- a/ACE/tests/Logging_Strategy_Test.cpp +++ b/ACE/tests/Logging_Strategy_Test.cpp @@ -36,8 +36,7 @@ #include "ace/Thread_Manager.h" #if defined (ACE_AS_STATIC_LIBS) || \ - (!defined (ACE_WIN32) && !defined (ACE_HAS_SVR4_DYNAMIC_LINKING) && \ - !defined (__hpux)) + (!defined (ACE_WIN32) && !defined (ACE_HAS_SVR4_DYNAMIC_LINKING)) #include "ace/Logging_Strategy.h" #endif @@ -430,9 +429,7 @@ int run_main (int argc, ACE_TCHAR *argv []) // though, and you may activate the logging strategy as described in // the non-DLL section below under DLL environments as well. -#if !defined (ACE_AS_STATIC_LIBS) && \ - (defined (ACE_WIN32) || defined (ACE_HAS_SVR4_DYNAMIC_LINKING) || \ - defined (__hpux)) +#if !defined (ACE_AS_STATIC_LIBS) && (defined (ACE_WIN32) || defined (ACE_HAS_SVR4_DYNAMIC_LINKING)) // Platform support DLLs, and not configured to link statically ACE_TCHAR arg_str[250]; @@ -467,8 +464,7 @@ int run_main (int argc, ACE_TCHAR *argv []) ((LM_ERROR, "Error initializing the ACE_Logging_Strategy.\n"), 1); -#endif /* !ACE_AS_STATIC_LIBS && (ACE_WIN32 || - ACE_HAS_SVR4_DYNAMIC_LINKING || __hpux) */ +#endif /* !ACE_AS_STATIC_LIBS && (ACE_WIN32 ACE_HAS_SVR4_DYNAMIC_LINKING) */ // launch a new Thread if (ACE_Thread_Manager::instance ()->spawn diff --git a/ACE/tests/MEM_Stream_Test.h b/ACE/tests/MEM_Stream_Test.h index adc7cdd0dd6..990fdd4645e 100644 --- a/ACE/tests/MEM_Stream_Test.h +++ b/ACE/tests/MEM_Stream_Test.h @@ -5,8 +5,7 @@ * @file MEM_Stream_Test.h * * This file has the class definitions needed for template generation in - * MEM_Stream_Test.cpp. They have to be in a separate file so AIX xlC can - * find them at auto-instantiate time. + * MEM_Stream_Test.cpp. * * @author Steve Huston <shuston@riverace.com> */ diff --git a/ACE/tests/Main.cpp b/ACE/tests/Main.cpp index 46833b5d73f..3d248d70163 100644 --- a/ACE/tests/Main.cpp +++ b/ACE/tests/Main.cpp @@ -10,11 +10,8 @@ */ //============================================================================= - #include "ace/OS_main.h" -#if defined (ACE_HAS_WINCE) -# include "ace/ACE.h" -#endif /* ACE_HAS_WINCE */ + int run_main (int argc, ACE_TCHAR *argv[]); int diff --git a/ACE/tests/Malloc_Test.cpp b/ACE/tests/Malloc_Test.cpp index 97c419fcfbe..c93ea9b304e 100644 --- a/ACE/tests/Malloc_Test.cpp +++ b/ACE/tests/Malloc_Test.cpp @@ -35,7 +35,7 @@ typedef ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex> MALLOC; #define MMAP_FILENAME ACE_TEXT ("test_file") #define MUTEX_NAME ACE_TEXT ("test_lock") -#if !defined (ACE_LINUX) && !defined (ACE_OPENVMS) \ +#if !defined (ACE_LINUX) \ && !defined (ACE_ANDROID) \ && !(defined (ACE_WIN32) \ && (defined (ghs) || defined (__MINGW32__) )) \ @@ -70,7 +70,7 @@ static const void *PARENT_BASE_ADDR = ACE_DEFAULT_BASE_ADDR; // processes. So, though the whole PI pointer thing is tested here, // it isn't actually using multiple address ranges. -#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 && !defined (HPUX)) +#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1) # define CHILD_ADDR_DELTA (1024*1024) #else # define CHILD_ADDR_DELTA 0 @@ -91,15 +91,7 @@ myallocator (const void *base_addr = 0) if (static_allocator.get () == 0) { -#if defined (ACE_HAS_WINCE) || defined (ACE_OPENVMS) - // WinCE cannot do fixed base, ever. - ACE_UNUSED_ARG (base_addr); - ACE_MMAP_Memory_Pool_Options options - (0, - ACE_MMAP_Memory_Pool_Options::NEVER_FIXED); -#else ACE_MMAP_Memory_Pool_Options options (base_addr); -#endif /* ACE_HAS_WINCE */ #if !defined (ACE_TEST_REMAP_ON_FAULT) options.minimum_bytes_ = 512 * 1024; @@ -118,15 +110,7 @@ init_test (const void *base_addr = 0) { // Cleanup the MMAP file so we won't trip over the leftover mmap // file from the previous crash. -#if defined (ACE_HAS_WINCE) || defined (ACE_OPENVMS) - // WinCE cannot do fixed base, ever. - ACE_UNUSED_ARG (base_addr); - ACE_MMAP_Memory_Pool_Options options - (0, - ACE_MMAP_Memory_Pool_Options::NEVER_FIXED); -#else ACE_MMAP_Memory_Pool_Options options (base_addr); -#endif /* ACE_HAS_WINCE */ //FUZZ: disable check_for_lack_ACE_OS ACE_MMAP_Memory_Pool mmap (MMAP_FILENAME, &options); //FUZZ: enable check_for_lack_ACE_OS @@ -307,7 +291,7 @@ child () // virtual address on every 32 bit process. On WinNT/2k, memory above // 2Gb is reserved for the system. So, we need to check at runtime // (we want an ACE_HAS_WINNT4 == 0 ace to run on either). -// To catch any odd case arising from Pharlap and/or WinCE, do the +// To catch any odd case arising from Pharlap, do the // run time check and run the NT4-or-better code unless we're on // CE or something other than NT4 (Pharlap reports itself as NT 3.51). static void diff --git a/ACE/tests/Malloc_Test.h b/ACE/tests/Malloc_Test.h index c675830581b..6b64e856531 100644 --- a/ACE/tests/Malloc_Test.h +++ b/ACE/tests/Malloc_Test.h @@ -2,9 +2,7 @@ /** * @file Malloc_Test.h * - * This class gets its own header file to work around AIX C++ - * compiler "features" related to template instantiation... It is - * only used by Malloc_Test.cpp. + * It is only used by Malloc_Test.cpp. * * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> */ diff --git a/ACE/tests/Map_Test.h b/ACE/tests/Map_Test.h index 0574733260c..5b82ff9b7ef 100644 --- a/ACE/tests/Map_Test.h +++ b/ACE/tests/Map_Test.h @@ -5,8 +5,7 @@ * @file Map_Test.h * * This file has the class definitions needed for template generation in - * Map_Test.cpp. They have to be in a separate file so AIX xlC can - * find them at auto-instantiate time. + * Map_Test.cpp. * * @author Irfan Pyarali <irfan@cs.wustl.edu> */ diff --git a/ACE/tests/Message_Queue_Test.cpp b/ACE/tests/Message_Queue_Test.cpp index ce5163e5be4..be63d886a1a 100644 --- a/ACE/tests/Message_Queue_Test.cpp +++ b/ACE/tests/Message_Queue_Test.cpp @@ -44,11 +44,7 @@ using QUEUE = ACE_Message_Queue<ACE_NULL_SYNCH>; using ITERATOR = ACE_Message_Queue_Iterator<ACE_NULL_SYNCH>; using REVERSE_ITERATOR = ACE_Message_Queue_Reverse_Iterator<ACE_NULL_SYNCH>; -#if defined (ACE_HAS_WINCE) -static const int MESSAGE_FACTOR = 10000; -#else static const int MESSAGE_FACTOR = 100000; -#endif static const int MAX_MESSAGES = 10000; static const int MAX_MESSAGE_SIZE = 32; static const char test_message[] = "ACE_Message_Queue Test Message"; diff --git a/ACE/tests/Message_Queue_Test_Ex.h b/ACE/tests/Message_Queue_Test_Ex.h index 8dd9a4a544e..0642fffb96a 100644 --- a/ACE/tests/Message_Queue_Test_Ex.h +++ b/ACE/tests/Message_Queue_Test_Ex.h @@ -4,8 +4,7 @@ /** * @file Message_Queue_Test_Ex.h * - * Define class needed for generating templates. IBM C++ requires this - * to be in its own file for auto template instantiation. + * Define class needed for generating templates. * * @author Michael Vitlo <mvitalo@sprynet.com> * @author Irfan Pyarali <irfan@cs.wustl.edu> diff --git a/ACE/tests/Multicast_Test.cpp b/ACE/tests/Multicast_Test.cpp index c00aaa347b0..524767532ec 100644 --- a/ACE/tests/Multicast_Test.cpp +++ b/ACE/tests/Multicast_Test.cpp @@ -255,7 +255,7 @@ MCT_Config::open (int argc, ACE_TCHAR *argv[]) { int n = ACE_OS::atoi (getopt.opt_arg ()); // I'm assuming 0 means unlimited, so just use whatever the - // user provides. Seems to work okay on Solaris 5.8. + // user provides. if (IP_MAX_MEMBERSHIPS == 0) this->groups_ = n; else diff --git a/ACE/tests/Multicast_Test_IPV6.cpp b/ACE/tests/Multicast_Test_IPV6.cpp index 65347b3bf7d..11056ef53c7 100644 --- a/ACE/tests/Multicast_Test_IPV6.cpp +++ b/ACE/tests/Multicast_Test_IPV6.cpp @@ -265,7 +265,7 @@ MCT_Config::open (int argc, ACE_TCHAR *argv[]) { int n = ACE_OS::atoi (getopt.opt_arg ()); // I'm assuming 0 means unlimited, so just use whatever the - // user provides. Seems to work okay on Solaris 5.8. + // user provides. if (IP_MAX_MEMBERSHIPS == 0) this->groups_ = n; else diff --git a/ACE/tests/Network_Adapters_Test.cpp b/ACE/tests/Network_Adapters_Test.cpp index 7ef95d8116d..24838782704 100644 --- a/ACE/tests/Network_Adapters_Test.cpp +++ b/ACE/tests/Network_Adapters_Test.cpp @@ -835,7 +835,7 @@ extern "C" } #endif /* #if defined (ACE_HAS_SIG_C_FUNC) */ -#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) +#if defined (ACE_WIN32) static BOOL WINAPI CtrlHandler(DWORD fdwCtrlType) { switch (fdwCtrlType) @@ -1011,9 +1011,7 @@ run_main (int argc, ACE_TCHAR *argv[]) ACE_START_TEST (ACE_TEXT ("Network_Adapters_Test")); #if defined (ACE_WIN32) -#if !defined (ACE_HAS_WINCE) SetConsoleCtrlHandler(&CtrlHandler, TRUE); -#endif #else /* #if defined (ACE_WIN32) */ // Set a handler for SIGSEGV signal to call for abort. ACE_Sig_Action sa1 ((ACE_SignalHandler) sigsegv_handler, SIGSEGV); diff --git a/ACE/tests/OS_Test.cpp b/ACE/tests/OS_Test.cpp index 03666ca0ae2..b9fad773749 100644 --- a/ACE/tests/OS_Test.cpp +++ b/ACE/tests/OS_Test.cpp @@ -108,7 +108,7 @@ rename_test () } ACE_OS::fclose (f); -#if defined (ACE_WIN32) && defined (ACE_LACKS_WIN32_MOVEFILEEX) || defined (ACE_HAS_WINCE) +#if defined (ACE_WIN32) && defined (ACE_LACKS_WIN32_MOVEFILEEX) // Can't rename if new_file exists already. ACE_OS::unlink (new_file); #endif @@ -603,8 +603,6 @@ snprintf_test (SNPrintF_t fn) ACE_OS::memset(buf, 0xab, 2*BUFFER_SIZE); retval = fn (buf, BUFFER_SIZE, "%d", 1234); - // HP-UX has broken vsnprintf -#if !defined (HPUX) if (retval != 4) { ACE_ERROR ((LM_ERROR, @@ -612,7 +610,6 @@ snprintf_test (SNPrintF_t fn) retval)); ++error_count; } -#endif /* !HPUX */ if (buf[3] != 0) { diff --git a/ACE/tests/Priority_Reactor_Test.h b/ACE/tests/Priority_Reactor_Test.h index 7bdc5ff9d1d..44b64f7bbd1 100644 --- a/ACE/tests/Priority_Reactor_Test.h +++ b/ACE/tests/Priority_Reactor_Test.h @@ -3,9 +3,7 @@ /** * @file Priority_Reactor_Test.h * - * This class gets its own header file to work around AIX C++ - * compiler "features" related to template instantiation... It is - * only used by Priority_Reactor_Test.cpp. + * It is only used by Priority_Reactor_Test.cpp. * * @author Carlos O'Ryan <coryan@cs.wustl.edu> */ diff --git a/ACE/tests/Priority_Task_Test.cpp b/ACE/tests/Priority_Task_Test.cpp index 91a16596730..305c7f0aa83 100644 --- a/ACE/tests/Priority_Task_Test.cpp +++ b/ACE/tests/Priority_Task_Test.cpp @@ -199,12 +199,6 @@ run_main (int argc, ACE_TCHAR *argv[]) // Spawn off ACE_MAX_ITERATIONS of tasks, passing each one their // iteration number as their priority. - - // NOTE: on Solaris, for example, this requests the min FIFO - // priority. But, this test doesn't use the Realtime scheduling - // class. The FIFO priorities are used because they're all - // nonnegative. - ACE_Sched_Priority_Iterator priority (ACE_SCHED_FIFO, ACE_SCOPE_THREAD); diff --git a/ACE/tests/Proactor_Test.cpp b/ACE/tests/Proactor_Test.cpp index e82b054b90c..6657c096a15 100644 --- a/ACE/tests/Proactor_Test.cpp +++ b/ACE/tests/Proactor_Test.cpp @@ -50,7 +50,6 @@ # include "ace/POSIX_Proactor.h" # include "ace/POSIX_CB_Proactor.h" -# include "ace/SUN_Proactor.h" #endif /* ACE_WIN32 */ @@ -58,7 +57,7 @@ // Proactor Type (UNIX only, Win32 ignored) -using ProactorType = enum { DEFAULT = 0, AIOCB, SIG, SUN, CB }; +using ProactorType = enum { DEFAULT = 0, AIOCB, SIG, CB }; static ProactorType proactor_type = DEFAULT; // POSIX : > 0 max number aio operations proactor, @@ -238,16 +237,6 @@ MyTask::create_proactor (ProactorType type_proactor, size_t max_op) break; #endif /* ACE_HAS_POSIX_REALTIME_SIGNALS */ -# if defined (sun) - case SUN: - ACE_NEW_RETURN (proactor_impl, - ACE_SUN_Proactor (max_op), - -1); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("(%t) Create Proactor Type = SUN\n"))); - break; -# endif /* sun */ - # if !defined(ACE_HAS_BROKEN_SIGEVENT_STRUCT) case CB: ACE_NEW_RETURN (proactor_impl, @@ -1722,7 +1711,6 @@ print_usage (int /* argc */, ACE_TCHAR *argv[]) ACE_TEXT ("\n a AIOCB") ACE_TEXT ("\n i SIG") ACE_TEXT ("\n c CB") - ACE_TEXT ("\n s SUN") ACE_TEXT ("\n d default") ACE_TEXT ("\n-d <duplex mode 1-on/0-off>") ACE_TEXT ("\n-h <host> for Client mode") @@ -1761,11 +1749,6 @@ set_proactor_type (const ACE_TCHAR *ptype) case 'I': proactor_type = SIG; return 1; -#if defined (sun) - case 'S': - proactor_type = SUN; - return 1; -#endif /* sun */ #if !defined (ACE_HAS_BROKEN_SIGEVENT_STRUCT) case 'C': proactor_type = CB; @@ -1849,13 +1832,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) } // switch } // while - if (proactor_type == SUN && threads > 1) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sun aiowait is not thread-safe; ") - ACE_TEXT ("changing to 1 thread\n"))); - threads = 1; - } - return 0; } diff --git a/ACE/tests/Proactor_Test_IPV6.cpp b/ACE/tests/Proactor_Test_IPV6.cpp index c4e2adb050d..0a4e4e84c18 100644 --- a/ACE/tests/Proactor_Test_IPV6.cpp +++ b/ACE/tests/Proactor_Test_IPV6.cpp @@ -51,14 +51,13 @@ # include "ace/POSIX_Proactor.h" # include "ace/POSIX_CB_Proactor.h" -# include "ace/SUN_Proactor.h" #endif /* defined (ACE_HAS_WIN32_OVERLAPPED_IO) */ #include "Proactor_Test.h" // Proactor Type (UNIX only, Win32 ignored) -using ProactorType = enum { DEFAULT = 0, AIOCB, SIG, SUN, CB }; +using ProactorType = enum { DEFAULT = 0, AIOCB, SIG, CB }; static ProactorType proactor_type = DEFAULT; // POSIX : > 0 max number aio operations proactor, @@ -200,7 +199,7 @@ MyTask::create_proactor (ProactorType type_proactor, size_t max_op) ACE_TEST_ASSERT (this->proactor_ == 0); -#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) +#if defined (ACE_WIN32) ACE_UNUSED_ARG (type_proactor); ACE_UNUSED_ARG (max_op); @@ -238,16 +237,6 @@ MyTask::create_proactor (ProactorType type_proactor, size_t max_op) break; #endif /* ACE_HAS_POSIX_REALTIME_SIGNALS */ -# if defined (sun) - case SUN: - ACE_NEW_RETURN (proactor_impl, - ACE_SUN_Proactor (max_op), - -1); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("(%t) Create Proactor Type = SUN\n"))); - break; -# endif /* sun */ - # if !defined(ACE_HAS_BROKEN_SIGEVENT_STRUCT) case CB: ACE_NEW_RETURN (proactor_impl, @@ -264,7 +253,7 @@ MyTask::create_proactor (ProactorType type_proactor, size_t max_op) break; } -#endif // (ACE_WIN32) && !defined (ACE_HAS_WINCE) +#endif // (ACE_WIN32) // always delete implementation 1 , not !(proactor_impl == 0) ACE_NEW_RETURN (this->proactor_, @@ -1316,8 +1305,7 @@ Client::initiate_write_stream () static const size_t complete_message_length = ACE_OS::strlen (complete_message); -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) - +#if defined (ACE_WIN32) ACE_Message_Block *mb1 = 0, *mb2 = 0, *mb3 = 0; @@ -1354,7 +1342,7 @@ Client::initiate_write_stream () ACE_TEXT ("Client::ACE_Asynch_Stream::writev")), -1); } -#else /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ +#else /* defined (ACE_WIN32) */ ACE_Message_Block *mb = 0; @@ -1381,7 +1369,7 @@ Client::initiate_write_stream () ACE_TEXT ("write")), -1); } -#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ +#endif /* defined (ACE_WIN32) */ this->io_count_++; this->total_w_++; @@ -1397,7 +1385,7 @@ Client::initiate_read_stream () static const size_t complete_message_length = ACE_OS::strlen (complete_message); -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) +#if defined (ACE_WIN32) ACE_Message_Block *mb1 = 0, *mb2 = 0, *mb3 = 0, @@ -1446,7 +1434,7 @@ Client::initiate_read_stream () ACE_TEXT ("Client::ACE_Asynch_Read_Stream::readv")), -1); } -#else /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ +#else /* defined (ACE_WIN32) */ // Try to read more chunks size_t blksize = ( complete_message_length > BUFSIZ ) ? @@ -1479,7 +1467,7 @@ Client::initiate_read_stream () ACE_TEXT ("read")), -1); } -#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ +#endif /* defined (ACE_WIN32) */ this->io_count_++; this->total_r_++; @@ -1530,7 +1518,7 @@ Client::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result) ACE_TEXT ("error"), result.error ())); -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) +#if defined (ACE_WIN32) size_t bytes_transferred = result.bytes_transferred (); char index = 0; for (ACE_Message_Block* mb_i = &mb; @@ -1561,7 +1549,7 @@ Client::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result) index, mb_i->rd_ptr ())); } -#else /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ +#else /* defined (ACE_WIN32) */ // write 0 at string end for proper printout (if end of mb, it's 0 already) mb.rd_ptr()[0] = '\0'; // move rd_ptr backwards as required for printout @@ -1570,7 +1558,7 @@ Client::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result) ACE_TEXT ("%s = %s\n"), ACE_TEXT ("message_block"), mb.rd_ptr ())); -#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ +#endif /* defined (ACE_WIN32) */ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("**** end of message ****************\n"))); @@ -1760,7 +1748,6 @@ print_usage (int /* argc */, ACE_TCHAR *argv[]) ACE_TEXT ("\n a AIOCB") ACE_TEXT ("\n i SIG") ACE_TEXT ("\n c CB") - ACE_TEXT ("\n s SUN") ACE_TEXT ("\n d default") ACE_TEXT ("\n-d <duplex mode 1-on/0-off>") ACE_TEXT ("\n-h <host> for Client mode") @@ -1799,11 +1786,6 @@ set_proactor_type (const ACE_TCHAR *ptype) case 'I': proactor_type = SIG; return 1; -#if defined (sun) - case 'S': - proactor_type = SUN; - return 1; -#endif /* sun */ #if !defined (ACE_HAS_BROKEN_SIGEVENT_STRUCT) case 'C': proactor_type = CB; @@ -1891,13 +1873,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) } // switch } // while - if (proactor_type == SUN && threads > 1) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sun aiowait is not thread-safe; ") - ACE_TEXT ("changing to 1 thread\n"))); - threads = 1; - } - return 0; } diff --git a/ACE/tests/Proactor_UDP_Test.cpp b/ACE/tests/Proactor_UDP_Test.cpp index 5d32acc263d..30457b30ac3 100644 --- a/ACE/tests/Proactor_UDP_Test.cpp +++ b/ACE/tests/Proactor_UDP_Test.cpp @@ -47,12 +47,11 @@ # include "ace/POSIX_Proactor.h" # include "ace/POSIX_CB_Proactor.h" -# include "ace/SUN_Proactor.h" #endif /* ACE_WIN32 */ // Proactor Type (UNIX only, Win32 ignored) -using ProactorType = enum { DEFAULT = 0, AIOCB, SIG, SUN, CB }; +using ProactorType = enum { DEFAULT = 0, AIOCB, SIG, CB }; static ProactorType proactor_type = DEFAULT; // POSIX : > 0 max number aio operations proactor, @@ -233,16 +232,6 @@ MyTask::create_proactor (ProactorType type_proactor, size_t max_op) break; #endif /* ACE_HAS_POSIX_REALTIME_SIGNALS */ -# if defined (sun) - case SUN: - ACE_NEW_RETURN (proactor_impl, - ACE_SUN_Proactor (max_op), - -1); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("(%t) Create Proactor Type = SUN\n"))); - break; -# endif /* sun */ - # if !defined(ACE_HAS_BROKEN_SIGEVENT_STRUCT) case CB: ACE_NEW_RETURN (proactor_impl, @@ -746,10 +735,9 @@ struct Session_Data // indicating the addressing info for the client. // Master is initialized with a count of the number of expected sessions. After // this number are set up, Master will stop listening for session requests. -// This is a bit fragile but is necessary because on HP-UX, AIX, et al., it -// is impossible to close/cancel a socket with an outstanding UDP recieve -// (on AIX the process is so wedged the machine needs to be rebooted to -// clear it!). So, this bit of messiness is necessary for portability. +// This is a bit fragile but is necessary because on HP-UX, et al., it +// is impossible to close/cancel a socket with an outstanding UDP receive +// So, this bit of messiness is necessary for portability. // When the Master is destroyed, it will try to stop establishing sessions // but this will only work on Windows. class Master : public ACE_Handler @@ -1989,7 +1977,6 @@ print_usage (int /* argc */, ACE_TCHAR *argv[]) ACE_TEXT ("\n a AIOCB") ACE_TEXT ("\n i SIG") ACE_TEXT ("\n c CB") - ACE_TEXT ("\n s SUN") ACE_TEXT ("\n d default") ACE_TEXT ("\n-d <duplex mode 1-on/0-off>") ACE_TEXT ("\n-h <host> for Client mode") @@ -2028,11 +2015,6 @@ set_proactor_type (const ACE_TCHAR *ptype) case 'I': proactor_type = SIG; return 1; -#if defined (sun) - case 'S': - proactor_type = SUN; - return 1; -#endif /* sun */ #if !defined (ACE_HAS_BROKEN_SIGEVENT_STRUCT) case 'C': proactor_type = CB; @@ -2116,13 +2098,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) } // switch } // while - if (proactor_type == SUN && threads > 1) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sun aiowait is not thread-safe; ") - ACE_TEXT ("changing to 1 thread\n"))); - threads = 1; - } - return 0; } diff --git a/ACE/tests/Process_Env_Test.cpp b/ACE/tests/Process_Env_Test.cpp index a7107a0fbec..4b9342c8557 100644 --- a/ACE/tests/Process_Env_Test.cpp +++ b/ACE/tests/Process_Env_Test.cpp @@ -14,7 +14,7 @@ #include "ace/Process.h" #include "ace/SString.h" -#if defined (ACE_WIN32) && !defined (ACE_USES_WCHAR) && !defined (ACE_HAS_WINCE) +#if defined (ACE_WIN32) && !defined (ACE_USES_WCHAR) using setenvfn_t = void (*)(const ACE_TCHAR *, const ACE_TCHAR *, void *); void create_large_env (setenvfn_t setenv, void *ctx) @@ -54,7 +54,7 @@ run_main (int, ACE_TCHAR*[]) int test_status = 0; ACE_START_TEST (ACE_TEXT ("Process_Env_Test")); -#if defined (ACE_WIN32) && !defined (ACE_USES_WCHAR) && !defined (ACE_HAS_WINCE) +#if defined (ACE_WIN32) && !defined (ACE_USES_WCHAR) ACE_Process_Options options ( 0, ACE_Process_Options::DEFAULT_COMMAND_LINE_BUF_LEN, @@ -120,7 +120,7 @@ run_main (int, ACE_TCHAR*[]) #else ACE_DEBUG ((LM_INFO, "This test is for Win32 without ACE_USES_WCHAR\n")); -#endif /* ACE_WIN32 && !ACE_USES_WCHAR && !ACE_HAS_WINCE */ +#endif /* ACE_WIN32 && !ACE_USES_WCHAR */ ACE_END_TEST; return test_status; diff --git a/ACE/tests/Process_Manager_Test.cpp b/ACE/tests/Process_Manager_Test.cpp index 7464ffded68..241498941b9 100644 --- a/ACE/tests/Process_Manager_Test.cpp +++ b/ACE/tests/Process_Manager_Test.cpp @@ -75,9 +75,7 @@ spawn_child (const ACE_TCHAR *argv0, int sleep_time, int my_process_id) { -#if defined (ACE_HAS_WINCE) -const ACE_TCHAR *cmdline_format = ACE_TEXT("%s %d"); -#elif defined (ACE_WIN32) +#if defined (ACE_WIN32) const ACE_TCHAR *cmdline_format = ACE_TEXT("\"%s\" %s %d"); #elif !defined (ACE_USES_WCHAR) const ACE_TCHAR *cmdline_format = ACE_TEXT (".") ACE_DIRECTORY_SEPARATOR_STR ACE_TEXT("%s %s %d"); @@ -134,9 +132,7 @@ const ACE_TCHAR *cmdline_format = ACE_TEXT (".") ACE_DIRECTORY_SEPARATOR_STR ACE opts.process_name (argv0); #ifndef ACE_LACKS_VA_FUNCTIONS opts.command_line (cmdline_format, -#if !defined (ACE_HAS_WINCE) argv0, -#endif /* !ACE_HAS_WINCE */ cmd, sleep_time); #else @@ -570,8 +566,7 @@ run_main (int argc, ACE_TCHAR *argv[]) } #endif /* ACE_HAS_THREADS */ -#if !defined (ACE_OPENVMS) && \ - (defined ACE_WIN32 || !defined ACE_LACKS_UNIX_SIGNALS) +#if defined ACE_WIN32 || !defined ACE_LACKS_UNIX_SIGNALS // -------------------------------------------------- // Finally, try the reactor stuff... mgr.open (ACE_Process_Manager::DEFAULT_SIZE, @@ -601,7 +596,7 @@ run_main (int argc, ACE_TCHAR *argv[]) ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P) %d processes left in manager\n"), nr_procs)); -#endif /* !defined (ACE_OPENVMS) */ +#endif /* defined (ACE_WIN32) */ #endif // ACE_HAS_PROCESS_SPAWN ACE_END_TEST; return test_status; diff --git a/ACE/tests/Process_Manual_Event_Test.cpp b/ACE/tests/Process_Manual_Event_Test.cpp index 10c2d9187a6..a7a4832f457 100644 --- a/ACE/tests/Process_Manual_Event_Test.cpp +++ b/ACE/tests/Process_Manual_Event_Test.cpp @@ -184,20 +184,6 @@ run_main (int argc, ACE_TCHAR *argv[]) // The parent cleans up any remnant of past runs of this test. // See Bugzilla #2662 for further info. - // On AIX, this is done by removing the shared memory objects before - // trying to run. -# if defined (AIX) - // FUZZ: disable check_for_lack_ACE_OS - if (::shm_unlink (event_ping_name) != 0 && errno != ENOENT) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%P) event_ping %p\n"), - ACE_TEXT ("shm_unlink"))); - if (::shm_unlink (event_pong_name) != 0 && errno != ENOENT) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%P) event_pong %p\n"), - ACE_TEXT ("shm_unlink"))); - // FUZZ: enable check_for_lack_ACE_OS -# endif /* AIX */ ACE_TCHAR const * argv_0 = argc > 0 ? argv[0] : ACE_TEXT ("Process_Manual_Event_Test"); diff --git a/ACE/tests/Process_Strategy_Test.cpp b/ACE/tests/Process_Strategy_Test.cpp index 8b29d634394..d8df9490bac 100644 --- a/ACE/tests/Process_Strategy_Test.cpp +++ b/ACE/tests/Process_Strategy_Test.cpp @@ -48,11 +48,6 @@ // Counting_Service and Options in here #include "Process_Strategy_Test.h" -// This test does not function properly when fork() is used on HP-UX -#if defined(__hpux) -#define ACE_LACKS_FORK -#endif /* __hpux */ - ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, Options, ACE_Null_Mutex); // Define a <Strategy_Acceptor> that's parameterized by the @@ -361,13 +356,6 @@ Counting_Service::handle_input (ACE_HANDLE) { char buf[BUFSIZ]; ACE_Time_Value* timeout = 0; -#if defined (__hpux) - // Even though we're in handle_input, there seems to be a - // situation on HP-UX where there is nothing to recv just yet. - // So, we recv() with a timeout and everything works. - ACE_Time_Value hpux_timeout (3); - timeout = &hpux_timeout; -#endif /* __hpux */ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) reading from peer on %d\n"), diff --git a/ACE/tests/Process_Strategy_Test.h b/ACE/tests/Process_Strategy_Test.h index a5a6c731d9d..8075bd35e7c 100644 --- a/ACE/tests/Process_Strategy_Test.h +++ b/ACE/tests/Process_Strategy_Test.h @@ -5,8 +5,7 @@ * @file Process_Strategy_Test.h * * This file contains the definition of Counting_Service and - * Options. Some compilers need it in a .h file for template - * instantiation (such as AIX C Set ++). + * Options. * * @author Doug Schmidt <d.schmidt@vanderbilt.edu> and Kevin Boyle <kboyle@sanwafp.com> */ diff --git a/ACE/tests/Process_Test.cpp b/ACE/tests/Process_Test.cpp index 3cfc9def393..da2c0f67bb2 100644 --- a/ACE/tests/Process_Test.cpp +++ b/ACE/tests/Process_Test.cpp @@ -252,9 +252,7 @@ run_main (int argc, ACE_TCHAR *argv[]) // Although most systems provide some mechanism to do this, the code // in this test uses Linux-specific techniques. Thus, although it // is possible to add the code for the checks on, for example, - // HP-UX (pstat_getproc, pstat_getpathname) and - // AIX (/proc is available, but there's no self and the fds are not links - // to the opened file names), the code isn't here at present. + // HP-UX (pstat_getproc, pstat_getpathname) #if defined (ACE_LACKS_FORK) || defined (ACE_LACKS_READLINK) || !defined(ACE_LINUX) ACE_ERROR ((LM_INFO, ACE_TEXT ("The remainder of this test is not supported on this platform\n"))); diff --git a/ACE/tests/Reactor_Fairness_Test.h b/ACE/tests/Reactor_Fairness_Test.h index 468439c218a..848a817ba92 100644 --- a/ACE/tests/Reactor_Fairness_Test.h +++ b/ACE/tests/Reactor_Fairness_Test.h @@ -4,9 +4,7 @@ * @file Reactor_Fairness_Test.h * * This file includes template class definitions for the - * Reactor_Fairness_Test.cpp program. This class gets its own - * header file to work around AIX C++ compiler "features" related - * to template instantiation... + * Reactor_Fairness_Test.cpp program. * * @author Steve Huston <shuston@riverace.com> */ diff --git a/ACE/tests/Reactor_Performance_Test.h b/ACE/tests/Reactor_Performance_Test.h index 5fa44547edd..758ac20745f 100644 --- a/ACE/tests/Reactor_Performance_Test.h +++ b/ACE/tests/Reactor_Performance_Test.h @@ -4,9 +4,7 @@ * @file Reactor_Performance_Test.h * * This file includes template class definitions for the - * Reactor_Performance_Test.cpp program. This class gets its own - * header file to work around AIX C++ compiler "features" related - * to template instantiation... + * Reactor_Performance_Test.cpp program. * * @author Irfan Pyarali <irfan@cs.wustl.edu> and Steve Huston <shuston@riverace.com> */ diff --git a/ACE/tests/SOCK_Connector_Test.cpp b/ACE/tests/SOCK_Connector_Test.cpp index 40296f00f84..2db953b4c21 100644 --- a/ACE/tests/SOCK_Connector_Test.cpp +++ b/ACE/tests/SOCK_Connector_Test.cpp @@ -103,10 +103,9 @@ find_another_host (ACE_TCHAR other_host[]) // an infinite loop on Linux --mas 03-08-2001 while ((h = gethostent ()) != 0) { - if (ACE_OS::strcmp (h->h_name, - ACE_TEXT_ALWAYS_CHAR (ACE_DEFAULT_SERVER_HOST)) == 0) + if (ACE_OS::strcmp (h->h_name, ACE_TEXT_ALWAYS_CHAR (ACE_DEFAULT_SERVER_HOST)) == 0) continue; - // AIX just _has_ to be different + if (ACE_OS::strcmp (h->h_name, "loopback") == 0) continue; diff --git a/ACE/tests/SSL/Main.cpp b/ACE/tests/SSL/Main.cpp index 46833b5d73f..3d248d70163 100644 --- a/ACE/tests/SSL/Main.cpp +++ b/ACE/tests/SSL/Main.cpp @@ -10,11 +10,8 @@ */ //============================================================================= - #include "ace/OS_main.h" -#if defined (ACE_HAS_WINCE) -# include "ace/ACE.h" -#endif /* ACE_HAS_WINCE */ + int run_main (int argc, ACE_TCHAR *argv[]); int diff --git a/ACE/tests/SSL/SSL_Asynch_Stream_Test.cpp b/ACE/tests/SSL/SSL_Asynch_Stream_Test.cpp index 8a52126f1b0..162d22215fb 100644 --- a/ACE/tests/SSL/SSL_Asynch_Stream_Test.cpp +++ b/ACE/tests/SSL/SSL_Asynch_Stream_Test.cpp @@ -38,8 +38,7 @@ #include "ace/SSL/SSL_SOCK_Acceptor.h" #include "ace/SSL/SSL_SOCK_Stream.h" - -#if defined (ACE_HAS_THREADS) && ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS))) +#if defined (ACE_HAS_THREADS) && (defined (ACE_WIN32) || (defined (ACE_HAS_AIO_CALLS))) // This only works on Win32 platforms and on Unix platforms // supporting POSIX aio calls. diff --git a/ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.h b/ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.h index 6d96043f40f..48775635862 100644 --- a/ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.h +++ b/ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.h @@ -3,9 +3,7 @@ /** * @file Thread_Pool_Reactor_SSL_Test.h * - * This class gets its own header file to work around AIX C++ - * compiler "features" related to template instantiation... It is - * only used by Thread_Pool_Reactor_Test_SSL.cpp. + * It is only used by Thread_Pool_Reactor_Test_SSL.cpp. * * @author Irfan Pyarali <irfan@cs.wustl.edu> Nanbor Wang <nanbor@cs.wustl.edu> */ diff --git a/ACE/tests/STL_algorithm_Test_T.h b/ACE/tests/STL_algorithm_Test_T.h index 7aeccccb1ea..0b7a40b0f71 100644 --- a/ACE/tests/STL_algorithm_Test_T.h +++ b/ACE/tests/STL_algorithm_Test_T.h @@ -16,12 +16,6 @@ template <typename T> int test_STL_algorithm (T & container); -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "STL_algorithm_Test_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("STL_algorithm_Test_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* ACE_TESTS_STL_ALGORITHM_TEST_T_H */ diff --git a/ACE/tests/Semaphore_Test.cpp b/ACE/tests/Semaphore_Test.cpp index d43318c96aa..6818f969d34 100644 --- a/ACE/tests/Semaphore_Test.cpp +++ b/ACE/tests/Semaphore_Test.cpp @@ -20,7 +20,7 @@ #include "ace/OS_NS_unistd.h" // msec that times are allowed to differ before test fails. -#if defined (ACE_HAS_HI_RES_TIMER) || defined (ACE_HAS_AIX_HI_RES_TIMER) || \ +#if defined (ACE_HAS_HI_RES_TIMER) || \ defined (ACE_HAS_PENTIUM) || \ defined (ACE_HAS_POWERPC_TIMER) # define ACE_ALLOWED_SLACK 100 diff --git a/ACE/tests/Service_Config_Test.cpp b/ACE/tests/Service_Config_Test.cpp index faecd5b834b..859d7d33cb2 100644 --- a/ACE/tests/Service_Config_Test.cpp +++ b/ACE/tests/Service_Config_Test.cpp @@ -183,7 +183,7 @@ testLoadingServiceConfFileAndProcessNo (int argc, ACE_TCHAR *argv[]) // Configurator file appropriate to the platform. // For example, Windows Unicode uses UTF-16. // - // iconv(1) found on Linux and Solaris, for example, can + // iconv(1) found on Linux, for example, can // be used to convert between encodings. // // Byte ordering is also an issue, so we should be @@ -285,7 +285,7 @@ testLoadingServiceConfFile (int argc, ACE_TCHAR *argv[]) // Configurator file appropriate to the platform. // For example, Windows Unicode uses UTF-16. // - // iconv(1) found on Linux and Solaris, for example, can + // iconv(1) found on Linux, for example, can // be used to convert between encodings. // // Byte ordering is also an issue, so we should be @@ -676,7 +676,7 @@ testNonACEThread () u_int errors_before = error; -#if defined (ACE_HAS_WTHREADS) && !defined (ACE_HAS_WINCE) +#if defined (ACE_HAS_WTHREADS) HANDLE thr_h = (HANDLE)_beginthreadex (0, 0, &nonacethreadentry, diff --git a/ACE/tests/Signal_Test.cpp b/ACE/tests/Signal_Test.cpp index 29f40c78eb9..25cf75a6e5d 100644 --- a/ACE/tests/Signal_Test.cpp +++ b/ACE/tests/Signal_Test.cpp @@ -336,7 +336,7 @@ run_test (ACE_THR_FUNC worker, { // For the synchronous signal tests, block signals to prevent // asynchronous delivery to default handler (at least necessary - // on linux and solaris; POSIX spec also states that signal(s) + // on linux ; POSIX spec also states that signal(s) // should be blocked before call to sigwait()) ACE_Sig_Guard guard; diff --git a/ACE/tests/TP_Reactor_Test.h b/ACE/tests/TP_Reactor_Test.h index 32c23525273..b5f7e66cd3c 100644 --- a/ACE/tests/TP_Reactor_Test.h +++ b/ACE/tests/TP_Reactor_Test.h @@ -3,8 +3,7 @@ /** * @file TP_Reactor_Test.h * - * Define class needed for generating templates. IBM C++ requires this to - * be in its own file for auto template instantiation. + * Define class needed for generating templates. * * @author Alexander Libman <alibman@ihug.com.au> * @author <alexl@rumblgroup.com> diff --git a/ACE/tests/TSS_Test_Errno.h b/ACE/tests/TSS_Test_Errno.h index d2c9c8166e4..de556a585fc 100644 --- a/ACE/tests/TSS_Test_Errno.h +++ b/ACE/tests/TSS_Test_Errno.h @@ -4,9 +4,7 @@ /** * @file TSS_Test_Errno.h * - * This file contains the definition of Errno. Some compilers need - * it in a .h file for template instantiation (such as AIX C Set - * ++). + * This file contains the definition of Errno. * * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> */ @@ -21,9 +19,7 @@ * * @brief Define a simple Errno abstraction * - * This class gets its own header file to work around AIX C++ - * compiler "features" related to template instantiation... It is - * only used by TSS_Test.cpp. + * It is only used by TSS_Test.cpp. */ class Errno { diff --git a/ACE/tests/Task_Ex_Test.h b/ACE/tests/Task_Ex_Test.h index 01aa1c1ce08..ccb7c377ed9 100644 --- a/ACE/tests/Task_Ex_Test.h +++ b/ACE/tests/Task_Ex_Test.h @@ -4,8 +4,7 @@ /** * @file Task_Ex_Test.h * - * Define class needed for generating templates. IBM C++ requires this - * to be in its own file for auto template instantiation. + * Define class needed for generating templates. * * @author Kobi Cohen-Arazi <kobi-co@barak-online.net> */ diff --git a/ACE/tests/Thread_Creation_Threshold_Test.cpp b/ACE/tests/Thread_Creation_Threshold_Test.cpp index a84bd553651..1627e013309 100644 --- a/ACE/tests/Thread_Creation_Threshold_Test.cpp +++ b/ACE/tests/Thread_Creation_Threshold_Test.cpp @@ -6,11 +6,7 @@ * This test program stresses how many threads can be * consecutively (not simultaneously) created on a platform. * Rather than testing exhaustively, it establishes a - * semi-arbitrary upper limit (MAX_THREAD)of threads. The limit - * is only partly arbitrary because it was chosen as a value that - * exceeded an observed upper limit on the values that Solaris 9 - * will accept as arguments to thr_concurrency(), used by - * ACE_OS::thr_create(THR_NEW_LWP). + * semi-arbitrary upper limit (MAX_THREAD)of threads. * * @author Chris Cleeland <cleeland@ociweb.com> */ diff --git a/ACE/tests/Thread_Pool_Reactor_Resume_Test.h b/ACE/tests/Thread_Pool_Reactor_Resume_Test.h index 67b95e0ccb9..a2fe552260d 100644 --- a/ACE/tests/Thread_Pool_Reactor_Resume_Test.h +++ b/ACE/tests/Thread_Pool_Reactor_Resume_Test.h @@ -3,9 +3,7 @@ /** * @file Thread_Pool_Reactor_Resume_Test.h * - * This class gets its own header file to work around AIX C++ - * compiler "features" related to template instantiation... It is - * only used by Thread_Pool_Reactor_Test.cpp. + * It is only used by Thread_Pool_Reactor_Test.cpp. * * @author Irfan Pyarali <irfan@cs.wustl.edu> Nanbor Wang <nanbor@cs.wustl.edu> */ diff --git a/ACE/tests/Thread_Pool_Reactor_Test.h b/ACE/tests/Thread_Pool_Reactor_Test.h index 78e9dc7b0be..a1abf6852a9 100644 --- a/ACE/tests/Thread_Pool_Reactor_Test.h +++ b/ACE/tests/Thread_Pool_Reactor_Test.h @@ -3,9 +3,7 @@ /** * @file Thread_Pool_Reactor_Test.h * - * This class gets its own header file to work around AIX C++ - * compiler "features" related to template instantiation... It is - * only used by Thread_Pool_Reactor_Test.cpp. + * It is only used by Thread_Pool_Reactor_Test.cpp. * * @author Irfan Pyarali <irfan@cs.wustl.edu> Nanbor Wang <nanbor@cs.wustl.edu> */ diff --git a/ACE/tests/Thread_Pool_Test.cpp b/ACE/tests/Thread_Pool_Test.cpp index 0a76061e31a..7be44853b36 100644 --- a/ACE/tests/Thread_Pool_Test.cpp +++ b/ACE/tests/Thread_Pool_Test.cpp @@ -223,14 +223,12 @@ Thread_Pool::test_queue_deactivation_shutdown () if (manual) { -#if !defined (ACE_HAS_WINCE) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) enter a new message for ") ACE_TEXT ("the task pool..."))); n = ACE_OS::read (ACE_STDIN, mb->wr_ptr (), mb->size ()); -#endif // ACE_HAS_WINCE } else { @@ -315,14 +313,12 @@ Thread_Pool::test_empty_message_shutdown () if (manual) { -#if !defined (ACE_HAS_WINCE) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) enter a new message for ") ACE_TEXT ("the task pool..."))); n = ACE_OS::read (ACE_STDIN, mb->wr_ptr (), mb->size ()); -#endif // ACE_HAS_WINCE } else { diff --git a/ACE/tests/Unload_libACE.cpp b/ACE/tests/Unload_libACE.cpp index b1a1b2d831b..17088486a32 100644 --- a/ACE/tests/Unload_libACE.cpp +++ b/ACE/tests/Unload_libACE.cpp @@ -26,10 +26,6 @@ #endif /* !ACE_VXWORKS && !__MINGW32__ && !CYGWIN32 */ #endif /* __GNUC__ */ -#if defined (__hpux) || defined (__SUNPRO_CC) -#define UNLOAD_LIBACE_TEST 1 -#endif /* (__hpux) || (__SUNPRO_CC) */ - #if defined (ACE_AS_STATIC_LIBS) #undef UNLOAD_LIBACE_TEST #endif /* ACE_AS_STATIC_LIBS */ @@ -160,9 +156,7 @@ main (int, char **) #else strcat (buf, "ACE"); #endif /* ACE_LIB_NAME */ -#if defined (__hpux) && !(defined (__ia64) && (__ia64 == 1)) - strcat (buf, ".sl"); -#elif defined (__APPLE__) +#if defined (__APPLE__) strcat (buf, ".dylib"); #else strcat (buf, ".so"); @@ -240,11 +234,9 @@ main (int, char **) #else # if defined (WIN32) && defined (ACE_USES_WCHAR) // Borrow include list from ace_wchar.h -# if defined (ACE_HAS_WINCE) -# include /**/ <wtypes.h> -# elif !defined (__BORLANDC__) +# if !defined (__BORLANDC__) # include /**/ <wchar.h> -# endif /* ACE_HAS_WINCE || __BORLANDC__ */ +# endif /* __BORLANDC__ */ int wmain (int, wchar_t **) diff --git a/ACE/tests/Upgradable_RW_Test.h b/ACE/tests/Upgradable_RW_Test.h index f27f18995f9..d6de6cbc254 100644 --- a/ACE/tests/Upgradable_RW_Test.h +++ b/ACE/tests/Upgradable_RW_Test.h @@ -3,9 +3,7 @@ /** * @file Upgradable_RW_Test.h * - * This class gets its own header file to work around AIX C++ - * compiler "features" related to template instantiation... It is - * only used by Upgradable_RW_Test.cpp. + * It is only used by Upgradable_RW_Test.cpp. * * @author Michael Kircher <mk1@cs.wustl.edu> */ diff --git a/ACE/tests/run_test.lst b/ACE/tests/run_test.lst index 26069c4b405..c8b018e3eb6 100644 --- a/ACE/tests/run_test.lst +++ b/ACE/tests/run_test.lst @@ -122,7 +122,7 @@ Dirent_Test: !VxWorks_RTP !LabVIEW_RT Dynamic_Priority_Test Dynamic_Test Enum_Interfaces_Test: !NO_NETWORK !LynxOS -Env_Value_Test: !WinCE !LabVIEW_RT +Env_Value_Test: !LabVIEW_RT FIFO_Test: !ACE_FOR_TAO Framework_Component_Test: !STATIC !nsk Future_Set_Test: !nsk !ACE_FOR_TAO @@ -149,7 +149,7 @@ MM_Shared_Memory_Test: !VxWorks !nsk !ACE_FOR_TAO !LynxOS MT_NonBlocking_Connect_Test: !ST MT_Reactor_Timer_Test MT_Reactor_Upcall_Test: !nsk -MT_Reference_Counted_Event_Handler_Test: !OpenVMS_IA64Crash !LynxOS +MT_Reference_Counted_Event_Handler_Test: !LynxOS MT_Reference_Counted_Event_Handler_Test -b 0: LynxOS MT_Reference_Counted_Event_Handler_Test -a 0: LynxOS MT_Reference_Counted_Notify_Test @@ -194,7 +194,7 @@ Proactor_UDP_Test: !VxWorks !LynxOS !nsk !ACE_FOR_TAO !BAD_AIO Process_Env_Test: !VxWorks !PHARLAP Process_Test: !VxWorks !ACE_FOR_TAO !PHARLAP Process_Manager_Test: !VxWorks !ACE_FOR_TAO !PHARLAP -Process_Manual_Event_Test: !HPUX !VxWorks !ACE_FOR_TAO !PHARLAP +Process_Manual_Event_Test: !VxWorks !ACE_FOR_TAO !PHARLAP Process_Mutex_Test: !VxWorks !ACE_FOR_TAO !PHARLAP Process_Semaphore_Test: !VxWorks !ACE_FOR_TAO !PHARLAP RB_Tree_Test @@ -279,7 +279,7 @@ SOCK_SEQPACK_SCTP_Test: !MSVC !nsk !ACE_FOR_TAO SOCK_Test_IPv6: !nsk Process_Strategy_Test: !VxWorks !LynxOS !ACE_FOR_TAO !PHARLAP Recursive_Condition_Bug_Test: !ST -UnloadLibACE: !STATIC !WinCE !LabVIEW_RT +UnloadLibACE: !STATIC !LabVIEW_RT UUID_Test: !NO_UUID !ACE_FOR_TAO Wild_Match_Test SSL/Bug_2912_Regression_Test: SSL !ACE_FOR_TAO !BAD_AIO diff --git a/ACE/tests/test_config.h b/ACE/tests/test_config.h index 82b7059ab75..beb395d7b6e 100644 --- a/ACE/tests/test_config.h +++ b/ACE/tests/test_config.h @@ -35,13 +35,7 @@ #include "ace/OS_NS_stdio.h" #include "ace/Log_Msg.h" -#if defined (ACE_HAS_WINCE) -// Note that Pocket PC 2002 will NOT create a directory if it does not start with a leading '\'. -// PPC 2002 only accepts '\log' as a valid directory name, while 'log\' works under WinCE 3.0. -# define ACE_LOG_DIRECTORY_FOR_MKDIR ACE_TEXT ("\\log") -# define ACE_LOG_DIRECTORY ACE_TEXT ("\\log\\") -# define MAKE_PIPE_NAME(X) ACE_TEXT ("\\\\.\\pipe\\"#X) -#elif defined (ACE_WIN32) +#if defined (ACE_WIN32) # define ACE_LOG_DIRECTORY ACE_TEXT ("log\\") # define ACE_LOG_DIRECTORY_FOR_MKDIR ACE_TEXT ("log\\") # define MAKE_PIPE_NAME(X) ACE_TEXT ("\\\\.\\pipe\\"#X) @@ -63,11 +57,11 @@ # define ACE_LOG_FILE_EXT_NAME ACE_TEXT (".log") #endif /* ACE_LOG_FILE_EXT_NAME */ -#if defined (ACE_HAS_WINCE) || defined (ACE_HAS_PHARLAP) +#if defined (ACE_HAS_PHARLAP) size_t const ACE_MAX_CLIENTS = 4; #else size_t const ACE_MAX_CLIENTS = 30; -#endif /* ACE_HAS_WINCE */ +#endif /* ACE_HAS_PHARLAP */ size_t const ACE_NS_MAX_ENTRIES = 1000; size_t const ACE_DEFAULT_USECS = 1000; diff --git a/ACE/tests/tests.mpc b/ACE/tests/tests.mpc index 3a311cb2fae..c98a938e184 100644 --- a/ACE/tests/tests.mpc +++ b/ACE/tests/tests.mpc @@ -1169,13 +1169,6 @@ project(Message Queue Test) : acetest { Source_Files { Message_Queue_Test.cpp } - verbatim(gnuace,local) { - # Needs a larger heap on AIX to avoid overwriting stacks in the counting - # part of the test. - ifdef AIX_VERS - LDFLAGS += -bmaxdata:0x20000000 - endif - } } project(Monotonic_Manual_Event Test) : acetest { @@ -2194,7 +2187,6 @@ project(Based Pointer Test) : acetest { } project(Library Unload): unload_libace { - avoids += wince exename = UnloadLibACE staticflags += ACE_AS_STATIC_LIBS Source_Files { diff --git a/TAO/DevGuideExamples/AMH_AMI/AMH_AMI.mpc b/TAO/DevGuideExamples/AMH_AMI/AMH_AMI.mpc index 256f03cbbdb..f577e2fc217 100644 --- a/TAO/DevGuideExamples/AMH_AMI/AMH_AMI.mpc +++ b/TAO/DevGuideExamples/AMH_AMI/AMH_AMI.mpc @@ -16,12 +16,6 @@ project(*Client): taoclient, messaging { middleC.cpp client.cpp } - // To avoid link errors with SunCC 5.[34], put this project's - // object files (and resulting SunWS_cache directory) in a different - // location than the default. - verbatim(gnuace, macros) { - VDIR = $(if $(ARCH),$(ARCH)/).obj/AMH_AMI_Client/ - } } project(*Middle_Server): messaging, taoserver, amh { diff --git a/TAO/MPC/config/notify_monitor_control.mpb b/TAO/MPC/config/notify_monitor_control.mpb index 026b234b94a..c8951b1fb68 100644 --- a/TAO/MPC/config/notify_monitor_control.mpb +++ b/TAO/MPC/config/notify_monitor_control.mpb @@ -1,6 +1,5 @@ // -*- MPC -*- feature(notify_monitor_control): svc_utils { - avoids += wince after += TAO_Monitor CosNotification_MC CosNotification_MC_Ext libs += TAO_CosNotification_MC_Ext TAO_CosNotification_MC TAO_Monitor macros += TAO_HAS_NOTIFICATION_MONITOR_CONTROL @@ -1,5 +1,5 @@ -USER VISIBLE CHANGES BETWEEN TAO-3.0.11 and TAO-3.0.12 -====================================================== +USER VISIBLE CHANGES BETWEEN TAO-3.0.11 and TAO-3.1.0 +===================================================== USER VISIBLE CHANGES BETWEEN TAO-3.0.10 and TAO-3.0.11 ====================================================== diff --git a/TAO/TAO-INSTALL.html b/TAO/TAO-INSTALL.html index 1bfc3b652ac..1094be61992 100644 --- a/TAO/TAO-INSTALL.html +++ b/TAO/TAO-INSTALL.html @@ -42,7 +42,7 @@ to run TAO on:<P> </tr> <tr valign=top> <td><b>Partially supported, i.e., infrequently tested</b></td> - <td>Solaris 9, FreeBSD, NetBSD, Windows CE, MacOSX, Linux/Alpha (RedHat, SuSE, and Debian), and AIX 5.x + <td>FreeBSD, NetBSD, MacOSX, Linux/Alpha (RedHat, SuSE, and Debian) </td> </tr> <tr valign=top bgcolor="#AFAFAF"> @@ -53,7 +53,7 @@ to run TAO on:<P> <td><b>Formerly Supported Platforms</b></td> <td> Embarcadero C++ Builder, Sun/C++ 5.1 through 5.4, g++ prior to 2.95.x, HP/UX 10.x, pSoS, Chorus, DEC UNIX, SCO, UnixWare, MVS, - Windows 9x/ME, Chorus, Tandem NS, OpenVMS 8.3 IA64 + Windows 9x/ME, Chorus, Tandem NS, OpenVMS 8.3 IA64, Windows CE, Solaris 9, AIX </td> </tr> </table> diff --git a/TAO/TAO_IDL/ast/ast_argument.cpp b/TAO/TAO_IDL/ast/ast_argument.cpp index 0fbe32d0656..039e5662f23 100644 --- a/TAO/TAO_IDL/ast/ast_argument.cpp +++ b/TAO/TAO_IDL/ast/ast_argument.cpp @@ -70,6 +70,11 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "ast_argument.h" #include "ast_visitor.h" +#include "ast_type.h" + +#include "utl_err.h" + +#include "global_extern.h" // Static functions. @@ -101,6 +106,12 @@ AST_Argument::AST_Argument (Direction d, AST_Field (AST_Decl::NT_argument, ft, n), pd_direction (d) { + AST_Decl::NodeType fnt = ft->node_type (); + + if (fnt == AST_Decl::NT_except) + { + idl_global->err ()->not_a_type (ft); + } } AST_Argument::~AST_Argument () diff --git a/TAO/TAO_IDL/ast/ast_field.cpp b/TAO/TAO_IDL/ast/ast_field.cpp index 6b09b061604..bacbf80714c 100644 --- a/TAO/TAO_IDL/ast/ast_field.cpp +++ b/TAO/TAO_IDL/ast/ast_field.cpp @@ -115,6 +115,10 @@ AST_Field::AST_Field (AST_Type *ft, idl_global->err ()->not_a_type (ft); } } + else if (fnt == AST_Decl::NT_except) + { + idl_global->err ()->not_a_type (ft); + } } // To be used when constructing a node of a subclass of AST_Field. diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp index 715ce0199e2..caa96561985 100644 --- a/TAO/TAO_IDL/be/be_codegen.cpp +++ b/TAO/TAO_IDL/be/be_codegen.cpp @@ -1795,23 +1795,9 @@ TAO_CodeGen::end_server_template_header () // Insert the code to include the template source file. *this->server_template_header_ - << be_nl_2 << "#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)"; - *this->server_template_header_ << be_nl << "#include \"" << be_global->be_get_server_template_skeleton_fname (true) << "\""; - *this->server_template_header_ << be_nl - << "#endif /* defined REQUIRED SOURCE */"; - - // Insert the code to include the template pragma. - *this->server_template_header_ - << be_nl_2 << "#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)"; - *this->server_template_header_ - << be_nl << "#pragma implementation (\"" - << be_global->be_get_server_template_skeleton_fname (true) - << "\")"; - *this->server_template_header_ << be_nl - << "#endif /* defined REQUIRED PRAGMA */"; // Code to put the last #endif. *this->server_template_header_ << "\n\n"; @@ -1916,18 +1902,9 @@ int TAO_CodeGen::end_ciao_svnt_template_header () { *this->ciao_svnt_template_header_ << be_nl_2 - << "#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)" - << be_nl << "#include \"" - << be_global->be_get_ciao_tmpl_svnt_src_fname (true) - << "\"" << be_nl - << "#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */" - << be_nl_2 - << "#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)" - << be_nl << "#pragma implementation (\"" + << "#include \"" << be_global->be_get_ciao_tmpl_svnt_src_fname (true) - << "\")" - << be_nl << "#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */" - << be_nl; + << "\"" << be_nl; if (be_global->post_include () != nullptr) { @@ -2768,7 +2745,6 @@ TAO_CodeGen::gen_stub_src_includes () if (be_global->gen_amh_classes ()) { - // Necessary for the AIX compiler. this->gen_standard_include (this->client_stubs_, "ace/Auto_Ptr.h"); } diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp index 2e79519140c..2eebde2ba5c 100644 --- a/TAO/TAO_IDL/be/be_interface.cpp +++ b/TAO/TAO_IDL/be/be_interface.cpp @@ -2012,20 +2012,10 @@ be_interface::gen_gperf_lookup_methods (const char *flat_name) tao_cg->gperf_input_stream ()->file () = nullptr; // Open the temp file. -#if defined (ACE_OPENVMS) - //FUZZ: disable check_for_lack_ACE_OS - ACE_HANDLE input = ::open (tao_cg->gperf_input_filename (), - O_RDONLY, - "shr=get,put,upd", - "ctx=rec", - "fop=dfw"); - //FUZZ: enable check_for_lack_ACE_OS -#else ACE_HANDLE input = ACE::open_temp_file ( ACE_TEXT_CHAR_TO_TCHAR (tao_cg->gperf_input_filename ()), O_RDONLY); -#endif if (input == ACE_INVALID_HANDLE) { @@ -2038,40 +2028,16 @@ be_interface::gen_gperf_lookup_methods (const char *flat_name) -1); } -#ifndef ACE_OPENVMS // Flush the output stream. Gperf also uses it as output. Ensure // current contents are written before gperf writes. ACE_OS::fflush (tao_cg->server_skeletons ()->file ()); -#endif /* !ACE_OPENVMS */ // Stdout is server skeleton. Do *not* close the file, just open // again with <ACE_OS::open> with WRITE + APPEND option.. After // this, remember to update the file offset to the correct location. - -#if defined (ACE_OPENVMS) - char* gperfOutput = ACE_OS::tempnam (0, "idl_"); - - if (gperfOutput == 0) - { - ACE_OS::close (input); - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("failed to allocate memory\n")), - -1); - } - - //FUZZ: disable check_for_lack_ACE_OS - ACE_HANDLE output = ::open (gperfOutput, - O_WRONLY | O_CREAT | O_EXCL, - ACE_DEFAULT_FILE_PERMS, - "shr=get,put,upd", - "ctx=rec", - "fop=dfw"); - //FUZZ: enable check_for_lack_ACE_OS -#else ACE_HANDLE output = ACE_OS::open (be_global->be_get_server_skeleton_fname (), O_WRONLY | O_APPEND); -#endif if (output == ACE_INVALID_HANDLE) { @@ -2207,49 +2173,6 @@ be_interface::gen_gperf_lookup_methods (const char *flat_name) ACE_OS::close (output); ACE_OS::close (input); -#if defined (ACE_OPENVMS) - ACE_OS::unlink (tao_cg->gperf_input_filename ()); - process_options.release_handles (); - - if (result != -1) - { - FILE* gperfOutputFile = ACE_OS::fopen (gperfOutput, "r"); - - if (gperfOutputFile == 0) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Error:%p: Couldn't open ") - ACE_TEXT ("gperf output file\n"), - "fopen")); - result = -1; - } - else - { - FILE* out = tao_cg->server_skeletons ()->file (); - int c; - - while ((c = ACE_OS::fgetc(gperfOutputFile)) != EOF) - { - ACE_OS::fputc (c, out); - } - - if (ferror (gperfOutputFile) || ferror (out)) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Error:%p: Couldn't open ") - ACE_TEXT ("gperf output file\n"), - "get/put")); - result = -1; - } - - ACE_OS::fclose (gperfOutputFile); - } - } - - ACE_OS::unlink (gperfOutput); - ACE_OS::free (gperfOutput); -#endif /* ACE_OPENVMS */ - return result; } diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp index 9ba14e43e27..b08822dc090 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp @@ -65,7 +65,6 @@ be_visitor_interface_cs::visit_interface (be_interface *node) << node->name () << "_ptr p)" << be_nl << "{" << be_idt_nl; - // Workaround for broken HP V7.4-004 on OpenVMS IA83 if (node->has_mixed_parentage ()) { *os << "::CORBA::AbstractBase_ptr abs = p;" << be_nl diff --git a/TAO/TAO_IDL/docs/historical/README b/TAO/TAO_IDL/docs/historical/README index 700c1c1a707..dc4181df2fa 100644 --- a/TAO/TAO_IDL/docs/historical/README +++ b/TAO/TAO_IDL/docs/historical/README @@ -148,7 +148,7 @@ platforms. The source distribution expects the following environment: - SunPro SparcWorks 3.x or 4.0 As preconfigured, it compiles on Solaris 2.x. It can be reconfigured to -compile on SunOS 4.x, HPUX or Apollo Domain OS. As far as is known, no use +compile on SunOS 4.x, or Apollo Domain OS. As far as is known, no use is made of Sun Make-specific features, and the Makefiles should be usable with other make programs. diff --git a/TAO/TAO_IDL/driver/drv_preproc.cpp b/TAO/TAO_IDL/driver/drv_preproc.cpp index 8d2105575b6..a26c09cce3a 100644 --- a/TAO/TAO_IDL/driver/drv_preproc.cpp +++ b/TAO/TAO_IDL/driver/drv_preproc.cpp @@ -1229,35 +1229,10 @@ DRV_pre_proc (const char *myfile) UTL_String *utl_string = nullptr; -#if defined (ACE_OPENVMS) - { - char main_abspath[MAXPATHLEN] = ""; - char trans_path[MAXPATHLEN] = ""; - char *main_fullpath = - ACE_OS::realpath (IDL_GlobalData::translateName (myfile, trans_path), - main_abspath); - - if (main_fullpath == 0) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Unable to construct full file pathname\n"))); - - (void) ACE_OS::unlink (tmp_ifile); - (void) ACE_OS::unlink (tmp_file); - throw Bailout (); - } - - ACE_NEW (utl_string, - UTL_String (main_fullpath, true)); - - idl_global->set_main_filename (utl_string); - } -#else ACE_NEW (utl_string, UTL_String (myfile, true)); idl_global->set_main_filename (utl_string); -#endif ACE_Auto_String_Free safety (ACE_OS::strdup (myfile)); @@ -1346,17 +1321,9 @@ DRV_pre_proc (const char *myfile) // If the following open() fails, then we're either being hit with a // symbolic link attack, or another process opened the file before // us. -#if defined (ACE_OPENVMS) - //FUZZ: disable check_for_lack_ACE_OS - fd = ::open (t_file, O_WRONLY | O_CREAT | O_EXCL, - ACE_DEFAULT_FILE_PERMS, - "shr=get,put,upd", "ctx=rec", "fop=dfw"); - //FUZZ: enable check_for_lack_ACE_OS -#else fd = ACE_OS::open (t_file, O_WRONLY | O_CREAT | O_EXCL, ACE_DEFAULT_FILE_PERMS); -#endif if (fd == ACE_INVALID_HANDLE) { @@ -1474,11 +1441,6 @@ DRV_pre_proc (const char *myfile) // version the current process // would exit if the pre-processor // returned with error. - -#if defined (ACE_OPENVMS) - cpp_options.release_handles(); -#endif - FILE * const yyin = ACE_OS::fopen (t_file, "r"); if (yyin == nullptr) diff --git a/TAO/TAO_IDL/fe/fe_utils.cpp b/TAO/TAO_IDL/fe/fe_utils.cpp index d63e3a2f841..1da6d96da19 100644 --- a/TAO/TAO_IDL/fe/fe_utils.cpp +++ b/TAO/TAO_IDL/fe/fe_utils.cpp @@ -436,7 +436,7 @@ FE_Utils::create_implied_ami_uses_stuff () int FE_Utils::path_cmp (const char *s, const char *t) { -#if defined (WIN32) || defined (ACE_OPENVMS) +#if defined (WIN32) // Since Windows has case-insensitive filenames, the preprocessor, // when searching using a provided relative path, will sometimes // capitalize the first letter of the last segment of a path name diff --git a/TAO/TAO_IDL/fe/idl.ll b/TAO/TAO_IDL/fe/idl.ll index 7b3dbdfa9fb..a07db882427 100644 --- a/TAO/TAO_IDL/fe/idl.ll +++ b/TAO/TAO_IDL/fe/idl.ll @@ -583,20 +583,6 @@ idl_parse_line_and_file (char *buf) } h[i] = '\0'; -#if defined (ACE_OPENVMS) - // translate this into *nix format as the OpenVMS preprocessor - // possibly produced VMS-style paths here. - char trans_path[MAXPATHLEN] = ""; - char *temp_h = IDL_GlobalData::translateName (h, trans_path); - if (temp_h) - h = temp_h; - else - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Unable to construct full file pathname\n"))); - throw Bailout (); - } -#endif ACE_NEW (tmp, UTL_String (h, true)); idl_global->update_prefix (tmp->get_string ()); @@ -615,21 +601,10 @@ idl_parse_line_and_file (char *buf) if (!is_real_filename) { -#if defined (ACE_OPENVMS) - char full_path[MAXPATHLEN] = ""; - char *full_fname = ACE_OS::realpath (fname->get_string (), full_path); - // I don't see the benefit of using ->compare since this is targeted at IDL identifiers - // not at filenames and in the case of OpenVMS (case-insensitive filesystem) gets really - // problematic as filenames retrieved through different mechanisms may give different - // casing. - is_main_filename = FE_Utils::path_cmp (idl_global->main_filename ()->get_string (), - full_fname) == 0; -#else is_main_filename = fname->compare (idl_global->main_filename ()) || same_file (fname->get_string (), idl_global->main_filename ()->get_string ()); -#endif } if (is_real_filename || is_main_filename) diff --git a/TAO/TAO_IDL/fe/idl.tab.cpp b/TAO/TAO_IDL/fe/idl.tab.cpp index 4f8615a1a40..3273f214299 100644 --- a/TAO/TAO_IDL/fe/idl.tab.cpp +++ b/TAO/TAO_IDL/fe/idl.tab.cpp @@ -746,18 +746,6 @@ typedef int_least16_t yytype_int16; typedef short yytype_int16; #endif -/* Work around bug in HP-UX 11.23, which defines these macros - incorrectly for preprocessor constants. This workaround can likely - be removed in 2023, as HPE has promised support for HP-UX 11.23 - (aka HP-UX 11i v2) only through the end of 2022; see Table 2 of - <https://h20195.www2.hpe.com/V2/getpdf.aspx/4AA4-7673ENW.pdf>. */ -#ifdef __hpux -# undef UINT_LEAST8_MAX -# undef UINT_LEAST16_MAX -# define UINT_LEAST8_MAX 255 -# define UINT_LEAST16_MAX 65535 -#endif - #if defined __UINT_LEAST8_MAX__ && __UINT_LEAST8_MAX__ <= __INT_MAX__ typedef __UINT_LEAST8_TYPE__ yytype_uint8; #elif (!defined __UINT_LEAST8_MAX__ && defined YY_STDINT_H \ diff --git a/TAO/TAO_IDL/fe/idl.yy.cpp b/TAO/TAO_IDL/fe/idl.yy.cpp index 566e026cb55..e5546389c91 100644 --- a/TAO/TAO_IDL/fe/idl.yy.cpp +++ b/TAO/TAO_IDL/fe/idl.yy.cpp @@ -288,7 +288,7 @@ /* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */ -#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L || defined (__HP_aCC) +#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, * if you want the limit (max/min) macros for int types. @@ -3644,20 +3644,6 @@ idl_parse_line_and_file (char *buf) } h[i] = '\0'; -#if defined (ACE_OPENVMS) - // translate this into *nix format as the OpenVMS preprocessor - // possibly produced VMS-style paths here. - char trans_path[MAXPATHLEN] = ""; - char *temp_h = IDL_GlobalData::translateName (h, trans_path); - if (temp_h) - h = temp_h; - else - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Unable to construct full file pathname\n"))); - throw Bailout (); - } -#endif ACE_NEW (tmp, UTL_String (h, true)); idl_global->update_prefix (tmp->get_string ()); @@ -3676,21 +3662,10 @@ idl_parse_line_and_file (char *buf) if (!is_real_filename) { -#if defined (ACE_OPENVMS) - char full_path[MAXPATHLEN] = ""; - char *full_fname = ACE_OS::realpath (fname->get_string (), full_path); - // I don't see the benefit of using ->compare since this is targeted at IDL identifiers - // not at filenames and in the case of OpenVMS (case-insensitive filesystem) gets really - // problematic as filenames retrieved through different mechanisms may give different - // casing. - is_main_filename = FE_Utils::path_cmp (idl_global->main_filename ()->get_string (), - full_fname) == 0; -#else is_main_filename = fname->compare (idl_global->main_filename ()) || same_file (fname->get_string (), idl_global->main_filename ()->get_string ()); -#endif } if (is_real_filename || is_main_filename) diff --git a/TAO/TAO_IDL/include/ast_decl.h b/TAO/TAO_IDL/include/ast_decl.h index 62064434224..295b8906ba2 100644 --- a/TAO/TAO_IDL/include/ast_decl.h +++ b/TAO/TAO_IDL/include/ast_decl.h @@ -73,9 +73,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "ace/SString.h" #include "ace/Vector_T.h" -// This is for AIX w/IBM C++ class Identifier; - class UTL_Scope; class UTL_String; class ast_visitor; diff --git a/TAO/TAO_IDL/include/idl_global.h b/TAO/TAO_IDL/include/idl_global.h index 485486a60dd..b59dec8c417 100644 --- a/TAO/TAO_IDL/include/idl_global.h +++ b/TAO/TAO_IDL/include/idl_global.h @@ -657,10 +657,6 @@ public: // match the corresponding element on this list, if it is // non-zero. -#if defined (ACE_OPENVMS) - static char* translateName (const char* name, char *name_buf); -#endif - AST_Module *corba_module () const; void corba_module (AST_Module *m); // Accessors for the member. diff --git a/TAO/TAO_IDL/include/utl_scope.h b/TAO/TAO_IDL/include/utl_scope.h index 697c03e1e08..e045a654000 100644 --- a/TAO/TAO_IDL/include/utl_scope.h +++ b/TAO/TAO_IDL/include/utl_scope.h @@ -81,9 +81,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "fe_utils.h" -// This is for AIX w/IBM C++. class Identifier; - class AST_PredefinedType; class AST_Module; class AST_Template_Module_Inst; @@ -560,12 +558,6 @@ private: long il; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "utl_scope_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("utl_scope_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif // _UTL_SCOPE_UTL_SCOPE_HH diff --git a/TAO/TAO_IDL/util/utl_global.cpp b/TAO/TAO_IDL/util/utl_global.cpp index 1c9a20bd53b..0eaf4f08f27 100644 --- a/TAO/TAO_IDL/util/utl_global.cpp +++ b/TAO/TAO_IDL/util/utl_global.cpp @@ -93,23 +93,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. static long *pSeenOnce = nullptr; -#if defined (ACE_OPENVMS) -#include <unixlib.h> -char* IDL_GlobalData::translateName(const char* name, char *name_buf) -{ - char* transName = (ACE_OS::strpbrk (name, ":[") == 0 - ? (char*)name - : ::decc$translate_vms (name)); - if (transName) - { - ACE_OS::strcpy (name_buf, transName); - transName = name_buf; - } - - return (transName == 0 || ((int)transName) == -1 ) ? 0 : transName; -} -#endif - IDL_GlobalData::IDL_GlobalData () : syntax_only_ (false), parse_args_exit_ (false), diff --git a/TAO/bin/tao_orb_tests.lst b/TAO/bin/tao_orb_tests.lst index ea47acd20b5..c64ad7e24d8 100644 --- a/TAO/bin/tao_orb_tests.lst +++ b/TAO/bin/tao_orb_tests.lst @@ -76,8 +76,8 @@ TAO/tests/Bug_1361_Regression/run_test.pl -quick : !MINIMUM !CORBA_E_COMPACT !CO TAO/tests/Bug_1476_Test/run_test.pl: !NO_MESSAGING !CORBA_E_MICRO TAO/tests/Bug_1482_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !QUICK !LynxOS TAO/tests/Bug_1482_Regression/run_test.pl -quick : !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST QUICK !LynxOS -TAO/tests/Bug_1551_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !OpenVMS_IA64Crash !QUICK -TAO/tests/Bug_1551_Regression/run_test.pl -quick: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !OpenVMS_IA64Crash QUICK +TAO/tests/Bug_1551_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !QUICK +TAO/tests/Bug_1551_Regression/run_test.pl -quick: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST QUICK TAO/tests/Bug_1636_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO TAO/tests/Bug_1639_Regression/run_test.pl: !CORBA_E_MICRO TAO/tests/Bug_1676_Regression/run_test.pl: @@ -221,12 +221,12 @@ TAO/tests/RTCORBA/Collocation/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MI TAO/tests/RTCORBA/Destroy_Thread_Pool/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST TAO/tests/RTCORBA/Explicit_Binding/run_test.pl: !VxWorks !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !IPV6 !ACE_FOR_TAO !ANDROID TAO/tests/RTCORBA/Linear_Priority/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !LynxOS -TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !ACE_FOR_TAO !OpenVMS_IA64Crash +TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !ACE_FOR_TAO TAO/tests/RTCORBA/ORB_init/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO TAO/tests/RTCORBA/Persistent_IOR/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST TAO/tests/RTCORBA/Policies/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST TAO/tests/RTCORBA/Policy_Combinations/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST -TAO/tests/RTCORBA/Priority_Inversion_With_Bands/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !ACE_FOR_TAO !OpenVMS_IA64Crash +TAO/tests/RTCORBA/Priority_Inversion_With_Bands/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !ACE_FOR_TAO TAO/tests/RTCORBA/Private_Connection/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/run_test.pl: !VxWorks !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !IPV6 !ACE_FOR_TAO !ANDROID TAO/tests/RTCORBA/RTMutex/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST @@ -234,7 +234,7 @@ TAO/tests/RTCORBA/Server_Declared/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_ TAO/tests/RTCORBA/Server_Protocol/run_test.pl: !VxWorks !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !IPV6 !ACE_FOR_TAO !ANDROID TAO/tests/RTCORBA/Thread_Pool/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !ACE_FOR_TAO TAO/tests/RTScheduling/VoidData/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS -TAO/tests/RTScheduling/Thread_Cancel/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ST !OpenVMS_IA64Crash +TAO/tests/RTScheduling/Thread_Cancel/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ST TAO/tests/RTScheduling/DT_Spawn/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS TAO/tests/RTScheduling/Current/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ST TAO/tests/RTScheduling/Scheduling_Interceptor/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !STATIC @@ -260,7 +260,7 @@ TAO/tests/AlternateIIOP/run_test.pl: !DISABLE_ToFix_LynxOS_x86 TAO/tests/Optimized_Connection/run_test.pl: !DISABLE_ToFix_LynxOS_x86 !ACE_FOR_TAO TAO/tests/Cache_Growth_Test/run_test.pl: TAO/tests/Muxing/run_test.pl: !ST -TAO/tests/Muxed_GIOP_Versions/run_test.pl: !ST !DISABLE_ToFix_LynxOS_PPC !OpenVMS_IA64Crash +TAO/tests/Muxed_GIOP_Versions/run_test.pl: !ST !DISABLE_ToFix_LynxOS_PPC TAO/tests/MT_Client/run_test.pl: !ST TAO/tests/MT_BiDir/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !GIOP10 !DISABLE_BIDIR !LynxOS TAO/tests/File_IO/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO @@ -278,20 +278,20 @@ TAO/tests/Smart_Proxies/dtor/run_test.pl: TAO/tests/Stack_Recursion/run_test.pl: !ST !DISABLE_ToFix_LynxOS_PPC !QUICK TAO/tests/Stack_Recursion/run_test.pl -quick : !ST !DISABLE_ToFix_LynxOS_PPC QUICK TAO/tests/Skeleton_Inheritance/run_test.pl: -TAO/tests/Faults/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !OpenVMS_IA64Crash -TAO/tests/Faults/run_test_pp.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !OpenVMS_IA64Crash +TAO/tests/Faults/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST +TAO/tests/Faults/run_test_pp.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST TAO/tests/CallbackTest/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO TAO/tests/CallbackTest/run_test_ipv6.pl: IPV6 !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO TAO/tests/CallbackTest/run_test_mixed_ip.pl: IPV6 !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO -TAO/tests/Crashed_Callback/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !OpenVMS_IA64Crash -# Disabled Crash On Write on Win32, see bugzilla 959 why !LabVIEW_RT !WinCE +TAO/tests/Crashed_Callback/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO +# Disabled Crash On Write on Win32, see bugzilla 959 why !LabVIEW_RT TAO/tests/Crash_On_Write/run_test.pl: !ST !Win32 TAO/tests/Mixed_Sync_ASync_Events/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO TAO/tests/Mixed_Sync_ASync_Events/run_exclusive_rw.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO TAO/tests/MT_NoUpcall_Client_Leader/run_test.pl: !ST !CORBA_E_MICRO !NO_MESSAGING TAO/tests/MT_NoUpcall_Connect/run_test.pl: !ST !CORBA_E_MICRO !NO_MESSAGING -TAO/tests/Nested_Upcall_Crash/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !OpenVMS_IA64Crash !QUICK -TAO/tests/Nested_Upcall_Crash/run_test.pl -quick: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !OpenVMS_IA64Crash QUICK +TAO/tests/Nested_Upcall_Crash/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !QUICK +TAO/tests/Nested_Upcall_Crash/run_test.pl -quick: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO QUICK TAO/tests/NestedUpcall/Simple/run_test.pl: !ST TAO/tests/NestedUpcall/MT_Client_Test/run_test.pl: !ST !CORBA_E_MICRO TAO/tests/NestedUpcall/Triangle_Test/run_test.pl: !CORBA_E_MICRO @@ -342,7 +342,7 @@ TAO/tests/IORTable_Locator/run_test.pl -async_2: !MINIMUM !CORBA_E_COMPACT !CORB TAO/tests/IORTable_Locator/run_test.pl -async_3: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO TAO/tests/Policies/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST TAO/tests/Timeout/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO -TAO/tests/MT_Timeout/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !OpenVMS_IA64Crash +TAO/tests/MT_Timeout/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST TAO/tests/Timed_Buffered_Oneways/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO TAO/tests/Time_Policy/run_test.pl: TAO/tests/Time_Policy/run_test_hr.pl: diff --git a/TAO/bin/tao_other_tests.lst b/TAO/bin/tao_other_tests.lst index f3be0eeaa57..8f185925c99 100644 --- a/TAO/bin/tao_other_tests.lst +++ b/TAO/bin/tao_other_tests.lst @@ -7,34 +7,34 @@ # # NOTE: This file contains examples and other service level test for # TAO's. Please do not include regular tests here. -TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl: !LynxOS !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !Win32 !ACE_FOR_TAO !OpenVMS !HPUX_IA64 -TAO/performance-tests/Cubit/TAO/MT_Cubit/run_test.pl: !ST !OpenBSD !Win32 !ACE_FOR_TAO !OpenVMS !CORBA_E_MICRO -TAO/performance-tests/Latency/Single_Threaded/run_test.pl -n 1000: !Win32 !ACE_FOR_TAO !OpenVMS -TAO/performance-tests/Latency/Thread_Pool/run_test.pl -n 1000: !ST !Win32 !ACE_FOR_TAO !OpenVMS -TAO/performance-tests/Latency/Thread_Per_Connection/run_test.pl -n 1000: !ST !Win32 !ACE_FOR_TAO !OpenVMS -TAO/performance-tests/Latency/AMI/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !Win32 !ACE_FOR_TAO !OpenVMS -TAO/performance-tests/Latency/DSI/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !ACE_FOR_TAO !OpenVMS -TAO/performance-tests/Latency/DII/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !ACE_FOR_TAO !OpenVMS -TAO/performance-tests/Latency/Deferred/run_test.pl: !QNX !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !ACE_FOR_TAO !OpenVMS -TAO/performance-tests/Sequence_Latency/Single_Threaded/run_test.pl: !Win32 !ACE_FOR_TAO !OpenVMS -TAO/performance-tests/Sequence_Latency/Thread_Pool/run_test.pl: !ST !Win32 !ACE_FOR_TAO !OpenVMS -TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/run_test.pl: !ST !Win32 !ACE_FOR_TAO !OpenVMS -TAO/performance-tests/Sequence_Latency/AMI/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !Win32 !ACE_FOR_TAO !OpenVMS -TAO/performance-tests/Sequence_Latency/DSI/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !ACE_FOR_TAO !OpenVMS -TAO/performance-tests/Sequence_Latency/DII/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !ACE_FOR_TAO !OpenVMS -TAO/performance-tests/Sequence_Latency/Deferred/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !ACE_FOR_TAO !OpenVMS -TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !ACE_FOR_TAO !OpenVMS -TAO/performance-tests/Throughput/run_test.pl: !Win32 !ACE_FOR_TAO !OpenVMS -TAO/performance-tests/POA/Object_Creation_And_Registration/run_test.pl: !Win32 !ACE_FOR_TAO !OpenVMS !CORBA_E_MICRO -TAO/performance-tests/RTCorba/Oneways/Reliable/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !OpenVMS !LynxOS !HPUX_IA64 -TAO/performance-tests/Protocols/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !Win32 !ACE_FOR_TAO !OpenVMS !LynxOS +TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl: !LynxOS !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !Win32 !ACE_FOR_TAO +TAO/performance-tests/Cubit/TAO/MT_Cubit/run_test.pl: !ST !OpenBSD !Win32 !ACE_FOR_TAO !CORBA_E_MICRO +TAO/performance-tests/Latency/Single_Threaded/run_test.pl -n 1000: !Win32 !ACE_FOR_TAO +TAO/performance-tests/Latency/Thread_Pool/run_test.pl -n 1000: !ST !Win32 !ACE_FOR_TAO +TAO/performance-tests/Latency/Thread_Per_Connection/run_test.pl -n 1000: !ST !Win32 !ACE_FOR_TAO +TAO/performance-tests/Latency/AMI/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !Win32 !ACE_FOR_TAO +TAO/performance-tests/Latency/DSI/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !ACE_FOR_TAO +TAO/performance-tests/Latency/DII/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !ACE_FOR_TAO +TAO/performance-tests/Latency/Deferred/run_test.pl: !QNX !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !ACE_FOR_TAO +TAO/performance-tests/Sequence_Latency/Single_Threaded/run_test.pl: !Win32 !ACE_FOR_TAO +TAO/performance-tests/Sequence_Latency/Thread_Pool/run_test.pl: !ST !Win32 !ACE_FOR_TAO +TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/run_test.pl: !ST !Win32 !ACE_FOR_TAO +TAO/performance-tests/Sequence_Latency/AMI/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !Win32 !ACE_FOR_TAO +TAO/performance-tests/Sequence_Latency/DSI/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !ACE_FOR_TAO +TAO/performance-tests/Sequence_Latency/DII/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !ACE_FOR_TAO +TAO/performance-tests/Sequence_Latency/Deferred/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !ACE_FOR_TAO +TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !ACE_FOR_TAO +TAO/performance-tests/Throughput/run_test.pl: !Win32 !ACE_FOR_TAO +TAO/performance-tests/POA/Object_Creation_And_Registration/run_test.pl: !Win32 !ACE_FOR_TAO !CORBA_E_MICRO +TAO/performance-tests/RTCorba/Oneways/Reliable/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !LynxOS +TAO/performance-tests/Protocols/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !Win32 !ACE_FOR_TAO !LynxOS TAO/examples/Simple/bank/run_test.pl: !NO_MESSAGING !CORBA_E_MICRO TAO/examples/Simple/grid/run_test.pl: !NO_MESSAGING !CORBA_E_MICRO TAO/examples/Simple/time/run_test.pl: !NO_MESSAGING !Win32 !CORBA_E_MICRO TAO/examples/Simple/time-date/run_test.pl: !ST !STATIC !NO_MESSAGING !Win32 TAO/examples/Quoter/run_test.pl: !DISABLE_ToFix_LynxOS_PPC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !ACE_FOR_TAO TAO/examples/Load_Balancing/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO -TAO/examples/AMH/Sink_Server/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !LynxOS !ACE_FOR_TAO !HPUX_IA64 +TAO/examples/AMH/Sink_Server/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !LynxOS !ACE_FOR_TAO TAO/examples/OBV/Typed_Events/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO TAO/examples/Buffered_AMI/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO TAO/orbsvcs/tests/AVStreams/Pluggable/run_test.pl -p TCP,UDP,RTP_UDP: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO @@ -88,7 +88,7 @@ TAO/orbsvcs/tests/Event/Basic/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_ TAO/orbsvcs/tests/Event/Performance/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO TAO/orbsvcs/tests/Event/UDP/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !NO_DIOP TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_x86 -TAO/orbsvcs/tests/EC_Throughput/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_ToFix_LynxOS_x86 !ACE_FOR_TAO !LynxOS !HPUX_IA64 +TAO/orbsvcs/tests/EC_Throughput/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_ToFix_LynxOS_x86 !ACE_FOR_TAO !LynxOS TAO/orbsvcs/tests/EC_MT_Mcast/run_test.pl:!ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !LynxOS TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/run_test.pl: !NO_MCAST !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !LynxOS TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/run_test.pl -ipv6: IPV6 !NO_MCAST !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !LynxOS @@ -142,7 +142,7 @@ TAO/orbsvcs/tests/ImplRepo/kill_server/run_test.pl -rm2523ol: !MINIMUM !CORBA_E_ TAO/orbsvcs/tests/ImplRepo/kill_slow_server/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !LynxOS !ACE_FOR_TAO TAO/orbsvcs/tests/ImplRepo/oneway/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !LynxOS !ACE_FOR_TAO TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !LynxOS !ACE_FOR_TAO !OSX -TAO/orbsvcs/tests/ImplRepo/manual_start/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !LynxOS !ACE_FOR_TAO !OpenVMS +TAO/orbsvcs/tests/ImplRepo/manual_start/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !LynxOS !ACE_FOR_TAO TAO/orbsvcs/tests/ImplRepo/scale/run_test.pl -servers 5 -objects 5: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS TAO/orbsvcs/tests/ImplRepo/scale_clients/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS TAO/orbsvcs/tests/ImplRepo/scale_clients/run_test.pl -clients 3 -secs_between_clients 0 -activationmode per_client: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS @@ -156,17 +156,17 @@ TAO/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl: !MINIMUM !CORBA_E_COMPAC TAO/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl -forwardalways: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS TAO/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl -forwardonce: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS TAO/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl -pingexternal: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS -TAO/orbsvcs/tests/ImplRepo/RestartServer/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS -TAO/orbsvcs/tests/ImplRepo/RestartServer/run_test.pl -manual: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS -TAO/orbsvcs/tests/ImplRepo/RestartServer/run_test.pl -manual -lockout: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS -TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS -TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl -delay 20 -imr_start: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS -TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl -hide_server -imr_start: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS -TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl -multistart: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS -TAO/orbsvcs/tests/ImplRepo/ping_interrupt/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS -TAO/orbsvcs/tests/ImplRepo/link_poas/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS -TAO/orbsvcs/tests/ImplRepo/RestartIMR/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS -TAO/orbsvcs/tests/ImplRepo/RestartIMR/run_test.pl -kill_server: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS +TAO/orbsvcs/tests/ImplRepo/RestartServer/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS +TAO/orbsvcs/tests/ImplRepo/RestartServer/run_test.pl -manual: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS +TAO/orbsvcs/tests/ImplRepo/RestartServer/run_test.pl -manual -lockout: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS +TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS +TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl -delay 20 -imr_start: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS +TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl -hide_server -imr_start: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS +TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl -multistart: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS +TAO/orbsvcs/tests/ImplRepo/ping_interrupt/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS +TAO/orbsvcs/tests/ImplRepo/link_poas/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS +TAO/orbsvcs/tests/ImplRepo/RestartIMR/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS +TAO/orbsvcs/tests/ImplRepo/RestartIMR/run_test.pl -kill_server: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS TAO/orbsvcs/examples/ImR/Combined_Service/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !ST !ACE_FOR_TAO !LynxOS TAO/orbsvcs/examples/CosEC/TypedSimple/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NO_IFR !ACE_FOR_TAO !WCHAR TAO/orbsvcs/tests/CosEvent/Timeout/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !NO_MESSAGING !ACE_FOR_TAO !LynxOS diff --git a/TAO/docs/Options.html b/TAO/docs/Options.html index ff514f532bd..7c6d234aa88 100644 --- a/TAO/docs/Options.html +++ b/TAO/docs/Options.html @@ -1012,8 +1012,7 @@ having them use the same configurator file. <td>Use this option to cycle through profiles when it has been detected that a connection is closed when reading a server reply and having the server possibly process the reqest more than once - is acceptable. This option currently does not work under FreeBSD, - OpenVMS, AIX, and Solaris. + is acceptable. This option currently does not work under FreeBSD. The number of retries will not exceed <em>limit</em>. If this option is used then -ORBForwardOnTransientLimit should also be used to avoid a TRANSIENT exception being thrown. @@ -1509,7 +1508,7 @@ thread-pool reactor which is the default.</td> highly scalable replacement for the <code>select()</code> based reactors. The ACE_Dev_Poll_Reactor is currently only supported on - HP-UX, Solaris and Linux. Be aware that dev_poll + Linux. Be aware that dev_poll support is experimental!</td> </tr> </tbody> diff --git a/TAO/docs/compiler.html b/TAO/docs/compiler.html index c12076ec35c..eaa53ba1a27 100644 --- a/TAO/docs/compiler.html +++ b/TAO/docs/compiler.html @@ -149,7 +149,7 @@ ACE_CC_PREPROCESSOR_ARGS macros.</P> <P>Case 1 is used by the Makefile on most machines to specify the preprocessor. Case 2 is used on Windows and platforms that need special arguments passed -to the preprocessor (MVS, HPUX, etc.). And case 3 isn't used at all, +to the preprocessor (MVS, etc.). And case 3 isn't used at all, but is included as a default case.</P> <P>Since the default preprocessor may not always work when TAO_IDL is moved to diff --git a/TAO/docs/interfacerepo/index.html b/TAO/docs/interfacerepo/index.html index 8ad637280d0..3cd1ad69e86 100644 --- a/TAO/docs/interfacerepo/index.html +++ b/TAO/docs/interfacerepo/index.html @@ -132,8 +132,7 @@ ACE_wrappers/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test.</li><p> <li> Code to support multicast discovery of the Interface Repository IOR has been added to TAO. Testing has been done using loopback on NT, -loopback on Solaris, and remotely between these two platforms in both -directions.</li><p> +and remotely between these two platforms in both directions.</li><p> <li> Read/write locking option added to IFR service. This option should be used if the IFR service is started using a service config file that @@ -155,7 +154,7 @@ directory under TAO/tao, taking its place alongside the other satellite librarie that have been created recently.</li><p> <li> IFR has been made compliant with the CORBA 2.4 version of Interface.idl. -Two new IFR object classes have been added, AbstractInterfaceDef and +Two new IFR object classes have been added, AbstractInterfaceDef and LocalInterfaceDef. Some data structures have changed, as well as the signature of some operations.</li><p> @@ -166,7 +165,7 @@ be built and linked if an application does not intend to call those functions. I it does, however, the application should have #include "tao/TypeCodeFactory_Adapter_Impl.h" or something similar in it somewhere, and also link to the TAO_TypeCodeFactory library. This will automatically load the -library if it has been compiled. Please see the example in +library if it has been compiled. Please see the example in ACE_ROOT/TAO/examples/TypeCode_Creation.</li><p> <li> The CORBA::Object::_get_interface() method has been implemented. This method will @@ -204,7 +203,7 @@ tao_ifr -ORBInitRef InterfaceRepository=corbaloc:iiop:[hostname]:[port]/Interfac associated POAs are created at IFR startup and destroyed at shutdown). </li><p> -<li> IFR now supports valuetypes, components, homes and eventtypes. A test +<li> IFR now supports valuetypes, components, homes and eventtypes. A test for this support has been added in TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test. </li><p> diff --git a/TAO/docs/releasenotes/ec.html b/TAO/docs/releasenotes/ec.html index 43c142707db..74194ba2232 100644 --- a/TAO/docs/releasenotes/ec.html +++ b/TAO/docs/releasenotes/ec.html @@ -92,10 +92,6 @@ port number for the <TT>Naming Service</TT> so you can use the <TT>NameService</ environment variable. <P>The script <TT>start_services</TT> in <TT>$TAO_ROOT/orbsvcs/tests</TT> can help with this. -<LI> -If you want real-time behavior on Solaris you may need to run these programs -as root; on the other hand, this particular example really has no priority -inversion, since only one thread runs at a time.</LI> </OL> Another example is <TT>EC_Multiple</TT>, numerous examples on how to run this test can be found in the scripts located in <TT>$TAO_ROOT/orbsvcs/tests/EC_Multiple</TT>. diff --git a/TAO/docs/releasenotes/index.html b/TAO/docs/releasenotes/index.html index b4d8c117ded..d078fd54502 100644 --- a/TAO/docs/releasenotes/index.html +++ b/TAO/docs/releasenotes/index.html @@ -339,8 +339,7 @@ Perfect Hashed Operation Lookup Strategy has been added to the IDL Compiler. -P flag to <tt>tao_idl</tt> enables the perfect hased lookup strategy. This strategy uses <a href="http://www.dre.vanderbilt.edu/~schmidt/PDF/gperf.pdf">GPERF</a>, the GNU's Perfect Hash Function Generator written by Dr.Douglas C. Schmidt. -Right now, GPERF works only on Solaris. Any work on porting GPERF to other -platforms will be highly appreciated.</L1></li> +</L1></li> <li> The <<= and >>= operators for user-defined types are now generated.</li> diff --git a/TAO/etc/tao.doxygen b/TAO/etc/tao.doxygen index 1ef7db117bd..195c2718880 100644 --- a/TAO/etc/tao.doxygen +++ b/TAO/etc/tao.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.5 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -86,7 +86,7 @@ CREATE_SUBDIRS = NO # level increment doubles the number of directories, resulting in 4096 # directories at level 8 which is the default and also the maximum value. The # sub-directories are organized in 2 levels, the first level always has a fixed -# numer of 16 directories. +# number of 16 directories. # Minimum value: 0, maximum value: 8, default value: 8. # This tag requires that the tag CREATE_SUBDIRS is set to YES. @@ -558,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -849,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -1181,10 +1190,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = TAO_ @@ -1263,7 +1273,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1279,17 +1294,13 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = # The HTML_COLORSTYLE tag can be used to specify if the generated HTML output -# should be rendered with a dark or light theme. Default setting AUTO_LIGHT -# enables light output unless the user preference is dark output. Other options -# are DARK to always use dark mode, LIGHT to always use light mode, AUTO_DARK to -# default to dark mode unless the user prefers light mode, and TOGGLE to let the -# user toggle between dark and light mode via a button. -# Possible values are: LIGHT Always generate light output., DARK Always generate -# dark output., AUTO_LIGHT Automatically set the mode according to the user -# preference, use light mode if no preference is set (the default)., AUTO_DARK -# Automatically set the mode according to the user preference, use dark mode if -# no preference is set. and TOGGLE Allow to user to switch between light and -# dark mode via a button.. +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. # The default value is: AUTO_LIGHT. # This tag requires that the tag GENERATE_HTML is set to YES. diff --git a/TAO/etc/tao_anytypecode.doxygen b/TAO/etc/tao_anytypecode.doxygen index 29f985cbfdf..d32d2a8e2f2 100644 --- a/TAO/etc/tao_anytypecode.doxygen +++ b/TAO/etc/tao_anytypecode.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.5 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -86,7 +86,7 @@ CREATE_SUBDIRS = NO # level increment doubles the number of directories, resulting in 4096 # directories at level 8 which is the default and also the maximum value. The # sub-directories are organized in 2 levels, the first level always has a fixed -# numer of 16 directories. +# number of 16 directories. # Minimum value: 0, maximum value: 8, default value: 8. # This tag requires that the tag CREATE_SUBDIRS is set to YES. @@ -558,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -849,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -1178,10 +1187,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = @@ -1260,7 +1270,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1276,17 +1291,13 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = # The HTML_COLORSTYLE tag can be used to specify if the generated HTML output -# should be rendered with a dark or light theme. Default setting AUTO_LIGHT -# enables light output unless the user preference is dark output. Other options -# are DARK to always use dark mode, LIGHT to always use light mode, AUTO_DARK to -# default to dark mode unless the user prefers light mode, and TOGGLE to let the -# user toggle between dark and light mode via a button. -# Possible values are: LIGHT Always generate light output., DARK Always generate -# dark output., AUTO_LIGHT Automatically set the mode according to the user -# preference, use light mode if no preference is set (the default)., AUTO_DARK -# Automatically set the mode according to the user preference, use dark mode if -# no preference is set. and TOGGLE Allow to user to switch between light and -# dark mode via a button.. +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. # The default value is: AUTO_LIGHT. # This tag requires that the tag GENERATE_HTML is set to YES. diff --git a/TAO/etc/tao_av.doxygen b/TAO/etc/tao_av.doxygen index 3180fb13aa7..13a85a70f64 100644 --- a/TAO/etc/tao_av.doxygen +++ b/TAO/etc/tao_av.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.5 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -86,7 +86,7 @@ CREATE_SUBDIRS = NO # level increment doubles the number of directories, resulting in 4096 # directories at level 8 which is the default and also the maximum value. The # sub-directories are organized in 2 levels, the first level always has a fixed -# numer of 16 directories. +# number of 16 directories. # Minimum value: 0, maximum value: 8, default value: 8. # This tag requires that the tag CREATE_SUBDIRS is set to YES. @@ -558,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -849,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -1182,10 +1191,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = @@ -1264,7 +1274,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1280,17 +1295,13 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = # The HTML_COLORSTYLE tag can be used to specify if the generated HTML output -# should be rendered with a dark or light theme. Default setting AUTO_LIGHT -# enables light output unless the user preference is dark output. Other options -# are DARK to always use dark mode, LIGHT to always use light mode, AUTO_DARK to -# default to dark mode unless the user prefers light mode, and TOGGLE to let the -# user toggle between dark and light mode via a button. -# Possible values are: LIGHT Always generate light output., DARK Always generate -# dark output., AUTO_LIGHT Automatically set the mode according to the user -# preference, use light mode if no preference is set (the default)., AUTO_DARK -# Automatically set the mode according to the user preference, use dark mode if -# no preference is set. and TOGGLE Allow to user to switch between light and -# dark mode via a button.. +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. # The default value is: AUTO_LIGHT. # This tag requires that the tag GENERATE_HTML is set to YES. diff --git a/TAO/etc/tao_compression.doxygen b/TAO/etc/tao_compression.doxygen index 55c4516c1bb..1e10b3e865e 100644 --- a/TAO/etc/tao_compression.doxygen +++ b/TAO/etc/tao_compression.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.5 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -86,7 +86,7 @@ CREATE_SUBDIRS = NO # level increment doubles the number of directories, resulting in 4096 # directories at level 8 which is the default and also the maximum value. The # sub-directories are organized in 2 levels, the first level always has a fixed -# numer of 16 directories. +# number of 16 directories. # Minimum value: 0, maximum value: 8, default value: 8. # This tag requires that the tag CREATE_SUBDIRS is set to YES. @@ -558,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -849,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -1178,10 +1187,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = @@ -1260,7 +1270,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1276,17 +1291,13 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = # The HTML_COLORSTYLE tag can be used to specify if the generated HTML output -# should be rendered with a dark or light theme. Default setting AUTO_LIGHT -# enables light output unless the user preference is dark output. Other options -# are DARK to always use dark mode, LIGHT to always use light mode, AUTO_DARK to -# default to dark mode unless the user prefers light mode, and TOGGLE to let the -# user toggle between dark and light mode via a button. -# Possible values are: LIGHT Always generate light output., DARK Always generate -# dark output., AUTO_LIGHT Automatically set the mode according to the user -# preference, use light mode if no preference is set (the default)., AUTO_DARK -# Automatically set the mode according to the user preference, use dark mode if -# no preference is set. and TOGGLE Allow to user to switch between light and -# dark mode via a button.. +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. # The default value is: AUTO_LIGHT. # This tag requires that the tag GENERATE_HTML is set to YES. diff --git a/TAO/etc/tao_cosevent.doxygen b/TAO/etc/tao_cosevent.doxygen index ec81571b38f..45635056076 100644 --- a/TAO/etc/tao_cosevent.doxygen +++ b/TAO/etc/tao_cosevent.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.5 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -86,7 +86,7 @@ CREATE_SUBDIRS = NO # level increment doubles the number of directories, resulting in 4096 # directories at level 8 which is the default and also the maximum value. The # sub-directories are organized in 2 levels, the first level always has a fixed -# numer of 16 directories. +# number of 16 directories. # Minimum value: 0, maximum value: 8, default value: 8. # This tag requires that the tag CREATE_SUBDIRS is set to YES. @@ -558,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -849,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -1181,10 +1190,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = @@ -1263,7 +1273,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1279,17 +1294,13 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = # The HTML_COLORSTYLE tag can be used to specify if the generated HTML output -# should be rendered with a dark or light theme. Default setting AUTO_LIGHT -# enables light output unless the user preference is dark output. Other options -# are DARK to always use dark mode, LIGHT to always use light mode, AUTO_DARK to -# default to dark mode unless the user prefers light mode, and TOGGLE to let the -# user toggle between dark and light mode via a button. -# Possible values are: LIGHT Always generate light output., DARK Always generate -# dark output., AUTO_LIGHT Automatically set the mode according to the user -# preference, use light mode if no preference is set (the default)., AUTO_DARK -# Automatically set the mode according to the user preference, use dark mode if -# no preference is set. and TOGGLE Allow to user to switch between light and -# dark mode via a button.. +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. # The default value is: AUTO_LIGHT. # This tag requires that the tag GENERATE_HTML is set to YES. diff --git a/TAO/etc/tao_cosnaming.doxygen b/TAO/etc/tao_cosnaming.doxygen index fee4e68e1b7..f8a17c3e173 100644 --- a/TAO/etc/tao_cosnaming.doxygen +++ b/TAO/etc/tao_cosnaming.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.5 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -86,7 +86,7 @@ CREATE_SUBDIRS = NO # level increment doubles the number of directories, resulting in 4096 # directories at level 8 which is the default and also the maximum value. The # sub-directories are organized in 2 levels, the first level always has a fixed -# numer of 16 directories. +# number of 16 directories. # Minimum value: 0, maximum value: 8, default value: 8. # This tag requires that the tag CREATE_SUBDIRS is set to YES. @@ -558,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -849,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -1180,10 +1189,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = @@ -1262,7 +1272,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1278,17 +1293,13 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = # The HTML_COLORSTYLE tag can be used to specify if the generated HTML output -# should be rendered with a dark or light theme. Default setting AUTO_LIGHT -# enables light output unless the user preference is dark output. Other options -# are DARK to always use dark mode, LIGHT to always use light mode, AUTO_DARK to -# default to dark mode unless the user prefers light mode, and TOGGLE to let the -# user toggle between dark and light mode via a button. -# Possible values are: LIGHT Always generate light output., DARK Always generate -# dark output., AUTO_LIGHT Automatically set the mode according to the user -# preference, use light mode if no preference is set (the default)., AUTO_DARK -# Automatically set the mode according to the user preference, use dark mode if -# no preference is set. and TOGGLE Allow to user to switch between light and -# dark mode via a button.. +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. # The default value is: AUTO_LIGHT. # This tag requires that the tag GENERATE_HTML is set to YES. diff --git a/TAO/etc/tao_cosnotification.doxygen b/TAO/etc/tao_cosnotification.doxygen index 4715a235bc8..eacf8594c71 100644 --- a/TAO/etc/tao_cosnotification.doxygen +++ b/TAO/etc/tao_cosnotification.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.5 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -86,7 +86,7 @@ CREATE_SUBDIRS = NO # level increment doubles the number of directories, resulting in 4096 # directories at level 8 which is the default and also the maximum value. The # sub-directories are organized in 2 levels, the first level always has a fixed -# numer of 16 directories. +# number of 16 directories. # Minimum value: 0, maximum value: 8, default value: 8. # This tag requires that the tag CREATE_SUBDIRS is set to YES. @@ -558,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -849,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -1185,10 +1194,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = @@ -1267,7 +1277,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1283,17 +1298,13 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = # The HTML_COLORSTYLE tag can be used to specify if the generated HTML output -# should be rendered with a dark or light theme. Default setting AUTO_LIGHT -# enables light output unless the user preference is dark output. Other options -# are DARK to always use dark mode, LIGHT to always use light mode, AUTO_DARK to -# default to dark mode unless the user prefers light mode, and TOGGLE to let the -# user toggle between dark and light mode via a button. -# Possible values are: LIGHT Always generate light output., DARK Always generate -# dark output., AUTO_LIGHT Automatically set the mode according to the user -# preference, use light mode if no preference is set (the default)., AUTO_DARK -# Automatically set the mode according to the user preference, use dark mode if -# no preference is set. and TOGGLE Allow to user to switch between light and -# dark mode via a button.. +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. # The default value is: AUTO_LIGHT. # This tag requires that the tag GENERATE_HTML is set to YES. diff --git a/TAO/etc/tao_costime.doxygen b/TAO/etc/tao_costime.doxygen index 1bf79c94924..91384316eab 100644 --- a/TAO/etc/tao_costime.doxygen +++ b/TAO/etc/tao_costime.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.5 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -86,7 +86,7 @@ CREATE_SUBDIRS = NO # level increment doubles the number of directories, resulting in 4096 # directories at level 8 which is the default and also the maximum value. The # sub-directories are organized in 2 levels, the first level always has a fixed -# numer of 16 directories. +# number of 16 directories. # Minimum value: 0, maximum value: 8, default value: 8. # This tag requires that the tag CREATE_SUBDIRS is set to YES. @@ -558,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -849,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -1180,10 +1189,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = @@ -1262,7 +1272,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1278,17 +1293,13 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = # The HTML_COLORSTYLE tag can be used to specify if the generated HTML output -# should be rendered with a dark or light theme. Default setting AUTO_LIGHT -# enables light output unless the user preference is dark output. Other options -# are DARK to always use dark mode, LIGHT to always use light mode, AUTO_DARK to -# default to dark mode unless the user prefers light mode, and TOGGLE to let the -# user toggle between dark and light mode via a button. -# Possible values are: LIGHT Always generate light output., DARK Always generate -# dark output., AUTO_LIGHT Automatically set the mode according to the user -# preference, use light mode if no preference is set (the default)., AUTO_DARK -# Automatically set the mode according to the user preference, use dark mode if -# no preference is set. and TOGGLE Allow to user to switch between light and -# dark mode via a button.. +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. # The default value is: AUTO_LIGHT. # This tag requires that the tag GENERATE_HTML is set to YES. diff --git a/TAO/etc/tao_costrader.doxygen b/TAO/etc/tao_costrader.doxygen index c43533d3e69..00a2d338d8e 100644 --- a/TAO/etc/tao_costrader.doxygen +++ b/TAO/etc/tao_costrader.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.5 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -86,7 +86,7 @@ CREATE_SUBDIRS = NO # level increment doubles the number of directories, resulting in 4096 # directories at level 8 which is the default and also the maximum value. The # sub-directories are organized in 2 levels, the first level always has a fixed -# numer of 16 directories. +# number of 16 directories. # Minimum value: 0, maximum value: 8, default value: 8. # This tag requires that the tag CREATE_SUBDIRS is set to YES. @@ -558,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -849,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -1181,10 +1190,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = @@ -1263,7 +1273,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1279,17 +1294,13 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = # The HTML_COLORSTYLE tag can be used to specify if the generated HTML output -# should be rendered with a dark or light theme. Default setting AUTO_LIGHT -# enables light output unless the user preference is dark output. Other options -# are DARK to always use dark mode, LIGHT to always use light mode, AUTO_DARK to -# default to dark mode unless the user prefers light mode, and TOGGLE to let the -# user toggle between dark and light mode via a button. -# Possible values are: LIGHT Always generate light output., DARK Always generate -# dark output., AUTO_LIGHT Automatically set the mode according to the user -# preference, use light mode if no preference is set (the default)., AUTO_DARK -# Automatically set the mode according to the user preference, use dark mode if -# no preference is set. and TOGGLE Allow to user to switch between light and -# dark mode via a button.. +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. # The default value is: AUTO_LIGHT. # This tag requires that the tag GENERATE_HTML is set to YES. diff --git a/TAO/etc/tao_dynamicany.doxygen b/TAO/etc/tao_dynamicany.doxygen index cf256d31af7..54d477038af 100644 --- a/TAO/etc/tao_dynamicany.doxygen +++ b/TAO/etc/tao_dynamicany.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.5 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -86,7 +86,7 @@ CREATE_SUBDIRS = NO # level increment doubles the number of directories, resulting in 4096 # directories at level 8 which is the default and also the maximum value. The # sub-directories are organized in 2 levels, the first level always has a fixed -# numer of 16 directories. +# number of 16 directories. # Minimum value: 0, maximum value: 8, default value: 8. # This tag requires that the tag CREATE_SUBDIRS is set to YES. @@ -558,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -849,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -1178,10 +1187,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = TAO_ @@ -1260,7 +1270,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1276,17 +1291,13 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = # The HTML_COLORSTYLE tag can be used to specify if the generated HTML output -# should be rendered with a dark or light theme. Default setting AUTO_LIGHT -# enables light output unless the user preference is dark output. Other options -# are DARK to always use dark mode, LIGHT to always use light mode, AUTO_DARK to -# default to dark mode unless the user prefers light mode, and TOGGLE to let the -# user toggle between dark and light mode via a button. -# Possible values are: LIGHT Always generate light output., DARK Always generate -# dark output., AUTO_LIGHT Automatically set the mode according to the user -# preference, use light mode if no preference is set (the default)., AUTO_DARK -# Automatically set the mode according to the user preference, use dark mode if -# no preference is set. and TOGGLE Allow to user to switch between light and -# dark mode via a button.. +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. # The default value is: AUTO_LIGHT. # This tag requires that the tag GENERATE_HTML is set to YES. diff --git a/TAO/etc/tao_dynamicinterface.doxygen b/TAO/etc/tao_dynamicinterface.doxygen index 6a772af1c74..1867e88aaad 100644 --- a/TAO/etc/tao_dynamicinterface.doxygen +++ b/TAO/etc/tao_dynamicinterface.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.5 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -86,7 +86,7 @@ CREATE_SUBDIRS = NO # level increment doubles the number of directories, resulting in 4096 # directories at level 8 which is the default and also the maximum value. The # sub-directories are organized in 2 levels, the first level always has a fixed -# numer of 16 directories. +# number of 16 directories. # Minimum value: 0, maximum value: 8, default value: 8. # This tag requires that the tag CREATE_SUBDIRS is set to YES. @@ -558,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -849,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -1178,10 +1187,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = @@ -1260,7 +1270,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1276,17 +1291,13 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = # The HTML_COLORSTYLE tag can be used to specify if the generated HTML output -# should be rendered with a dark or light theme. Default setting AUTO_LIGHT -# enables light output unless the user preference is dark output. Other options -# are DARK to always use dark mode, LIGHT to always use light mode, AUTO_DARK to -# default to dark mode unless the user prefers light mode, and TOGGLE to let the -# user toggle between dark and light mode via a button. -# Possible values are: LIGHT Always generate light output., DARK Always generate -# dark output., AUTO_LIGHT Automatically set the mode according to the user -# preference, use light mode if no preference is set (the default)., AUTO_DARK -# Automatically set the mode according to the user preference, use dark mode if -# no preference is set. and TOGGLE Allow to user to switch between light and -# dark mode via a button.. +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. # The default value is: AUTO_LIGHT. # This tag requires that the tag GENERATE_HTML is set to YES. diff --git a/TAO/etc/tao_esf.doxygen b/TAO/etc/tao_esf.doxygen index a729cc7877a..365f9b3ce37 100644 --- a/TAO/etc/tao_esf.doxygen +++ b/TAO/etc/tao_esf.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.5 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -86,7 +86,7 @@ CREATE_SUBDIRS = NO # level increment doubles the number of directories, resulting in 4096 # directories at level 8 which is the default and also the maximum value. The # sub-directories are organized in 2 levels, the first level always has a fixed -# numer of 16 directories. +# number of 16 directories. # Minimum value: 0, maximum value: 8, default value: 8. # This tag requires that the tag CREATE_SUBDIRS is set to YES. @@ -558,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -849,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -1179,10 +1188,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = @@ -1261,7 +1271,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1277,17 +1292,13 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = # The HTML_COLORSTYLE tag can be used to specify if the generated HTML output -# should be rendered with a dark or light theme. Default setting AUTO_LIGHT -# enables light output unless the user preference is dark output. Other options -# are DARK to always use dark mode, LIGHT to always use light mode, AUTO_DARK to -# default to dark mode unless the user prefers light mode, and TOGGLE to let the -# user toggle between dark and light mode via a button. -# Possible values are: LIGHT Always generate light output., DARK Always generate -# dark output., AUTO_LIGHT Automatically set the mode according to the user -# preference, use light mode if no preference is set (the default)., AUTO_DARK -# Automatically set the mode according to the user preference, use dark mode if -# no preference is set. and TOGGLE Allow to user to switch between light and -# dark mode via a button.. +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. # The default value is: AUTO_LIGHT. # This tag requires that the tag GENERATE_HTML is set to YES. diff --git a/TAO/etc/tao_ifr.doxygen b/TAO/etc/tao_ifr.doxygen index 58dcb9d832b..df2146b240d 100644 --- a/TAO/etc/tao_ifr.doxygen +++ b/TAO/etc/tao_ifr.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.5 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -86,7 +86,7 @@ CREATE_SUBDIRS = NO # level increment doubles the number of directories, resulting in 4096 # directories at level 8 which is the default and also the maximum value. The # sub-directories are organized in 2 levels, the first level always has a fixed -# numer of 16 directories. +# number of 16 directories. # Minimum value: 0, maximum value: 8, default value: 8. # This tag requires that the tag CREATE_SUBDIRS is set to YES. @@ -558,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -849,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -1176,10 +1185,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = @@ -1258,7 +1268,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1274,17 +1289,13 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = # The HTML_COLORSTYLE tag can be used to specify if the generated HTML output -# should be rendered with a dark or light theme. Default setting AUTO_LIGHT -# enables light output unless the user preference is dark output. Other options -# are DARK to always use dark mode, LIGHT to always use light mode, AUTO_DARK to -# default to dark mode unless the user prefers light mode, and TOGGLE to let the -# user toggle between dark and light mode via a button. -# Possible values are: LIGHT Always generate light output., DARK Always generate -# dark output., AUTO_LIGHT Automatically set the mode according to the user -# preference, use light mode if no preference is set (the default)., AUTO_DARK -# Automatically set the mode according to the user preference, use dark mode if -# no preference is set. and TOGGLE Allow to user to switch between light and -# dark mode via a button.. +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. # The default value is: AUTO_LIGHT. # This tag requires that the tag GENERATE_HTML is set to YES. diff --git a/TAO/etc/tao_implrepo.doxygen b/TAO/etc/tao_implrepo.doxygen index 3d8aba47933..5ba00b72d4c 100644 --- a/TAO/etc/tao_implrepo.doxygen +++ b/TAO/etc/tao_implrepo.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.5 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -86,7 +86,7 @@ CREATE_SUBDIRS = NO # level increment doubles the number of directories, resulting in 4096 # directories at level 8 which is the default and also the maximum value. The # sub-directories are organized in 2 levels, the first level always has a fixed -# numer of 16 directories. +# number of 16 directories. # Minimum value: 0, maximum value: 8, default value: 8. # This tag requires that the tag CREATE_SUBDIRS is set to YES. @@ -558,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -849,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -1178,10 +1187,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = @@ -1260,7 +1270,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1276,17 +1291,13 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = # The HTML_COLORSTYLE tag can be used to specify if the generated HTML output -# should be rendered with a dark or light theme. Default setting AUTO_LIGHT -# enables light output unless the user preference is dark output. Other options -# are DARK to always use dark mode, LIGHT to always use light mode, AUTO_DARK to -# default to dark mode unless the user prefers light mode, and TOGGLE to let the -# user toggle between dark and light mode via a button. -# Possible values are: LIGHT Always generate light output., DARK Always generate -# dark output., AUTO_LIGHT Automatically set the mode according to the user -# preference, use light mode if no preference is set (the default)., AUTO_DARK -# Automatically set the mode according to the user preference, use dark mode if -# no preference is set. and TOGGLE Allow to user to switch between light and -# dark mode via a button.. +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. # The default value is: AUTO_LIGHT. # This tag requires that the tag GENERATE_HTML is set to YES. diff --git a/TAO/etc/tao_iormanip.doxygen b/TAO/etc/tao_iormanip.doxygen index 788f455aa60..5ab1cff37dc 100644 --- a/TAO/etc/tao_iormanip.doxygen +++ b/TAO/etc/tao_iormanip.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.5 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -86,7 +86,7 @@ CREATE_SUBDIRS = NO # level increment doubles the number of directories, resulting in 4096 # directories at level 8 which is the default and also the maximum value. The # sub-directories are organized in 2 levels, the first level always has a fixed -# numer of 16 directories. +# number of 16 directories. # Minimum value: 0, maximum value: 8, default value: 8. # This tag requires that the tag CREATE_SUBDIRS is set to YES. @@ -558,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -849,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -1178,10 +1187,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = TAO_ @@ -1260,7 +1270,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1276,17 +1291,13 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = # The HTML_COLORSTYLE tag can be used to specify if the generated HTML output -# should be rendered with a dark or light theme. Default setting AUTO_LIGHT -# enables light output unless the user preference is dark output. Other options -# are DARK to always use dark mode, LIGHT to always use light mode, AUTO_DARK to -# default to dark mode unless the user prefers light mode, and TOGGLE to let the -# user toggle between dark and light mode via a button. -# Possible values are: LIGHT Always generate light output., DARK Always generate -# dark output., AUTO_LIGHT Automatically set the mode according to the user -# preference, use light mode if no preference is set (the default)., AUTO_DARK -# Automatically set the mode according to the user preference, use dark mode if -# no preference is set. and TOGGLE Allow to user to switch between light and -# dark mode via a button.. +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. # The default value is: AUTO_LIGHT. # This tag requires that the tag GENERATE_HTML is set to YES. diff --git a/TAO/etc/tao_iortable.doxygen b/TAO/etc/tao_iortable.doxygen index 068b7d4e385..1c2dbf9120f 100644 --- a/TAO/etc/tao_iortable.doxygen +++ b/TAO/etc/tao_iortable.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.5 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -86,7 +86,7 @@ CREATE_SUBDIRS = NO # level increment doubles the number of directories, resulting in 4096 # directories at level 8 which is the default and also the maximum value. The # sub-directories are organized in 2 levels, the first level always has a fixed -# numer of 16 directories. +# number of 16 directories. # Minimum value: 0, maximum value: 8, default value: 8. # This tag requires that the tag CREATE_SUBDIRS is set to YES. @@ -558,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -849,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -1178,10 +1187,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = TAO_ @@ -1260,7 +1270,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1276,17 +1291,13 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = # The HTML_COLORSTYLE tag can be used to specify if the generated HTML output -# should be rendered with a dark or light theme. Default setting AUTO_LIGHT -# enables light output unless the user preference is dark output. Other options -# are DARK to always use dark mode, LIGHT to always use light mode, AUTO_DARK to -# default to dark mode unless the user prefers light mode, and TOGGLE to let the -# user toggle between dark and light mode via a button. -# Possible values are: LIGHT Always generate light output., DARK Always generate -# dark output., AUTO_LIGHT Automatically set the mode according to the user -# preference, use light mode if no preference is set (the default)., AUTO_DARK -# Automatically set the mode according to the user preference, use dark mode if -# no preference is set. and TOGGLE Allow to user to switch between light and -# dark mode via a button.. +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. # The default value is: AUTO_LIGHT. # This tag requires that the tag GENERATE_HTML is set to YES. diff --git a/TAO/etc/tao_pi.doxygen b/TAO/etc/tao_pi.doxygen index 6da3ccd72ba..be8ecec423d 100644 --- a/TAO/etc/tao_pi.doxygen +++ b/TAO/etc/tao_pi.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.5 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -86,7 +86,7 @@ CREATE_SUBDIRS = NO # level increment doubles the number of directories, resulting in 4096 # directories at level 8 which is the default and also the maximum value. The # sub-directories are organized in 2 levels, the first level always has a fixed -# numer of 16 directories. +# number of 16 directories. # Minimum value: 0, maximum value: 8, default value: 8. # This tag requires that the tag CREATE_SUBDIRS is set to YES. @@ -558,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -849,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -1178,10 +1187,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = @@ -1260,7 +1270,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1276,17 +1291,13 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = # The HTML_COLORSTYLE tag can be used to specify if the generated HTML output -# should be rendered with a dark or light theme. Default setting AUTO_LIGHT -# enables light output unless the user preference is dark output. Other options -# are DARK to always use dark mode, LIGHT to always use light mode, AUTO_DARK to -# default to dark mode unless the user prefers light mode, and TOGGLE to let the -# user toggle between dark and light mode via a button. -# Possible values are: LIGHT Always generate light output., DARK Always generate -# dark output., AUTO_LIGHT Automatically set the mode according to the user -# preference, use light mode if no preference is set (the default)., AUTO_DARK -# Automatically set the mode according to the user preference, use dark mode if -# no preference is set. and TOGGLE Allow to user to switch between light and -# dark mode via a button.. +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. # The default value is: AUTO_LIGHT. # This tag requires that the tag GENERATE_HTML is set to YES. diff --git a/TAO/etc/tao_pi_server.doxygen b/TAO/etc/tao_pi_server.doxygen index 241ce7d4901..9994be08fa3 100644 --- a/TAO/etc/tao_pi_server.doxygen +++ b/TAO/etc/tao_pi_server.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.5 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -86,7 +86,7 @@ CREATE_SUBDIRS = NO # level increment doubles the number of directories, resulting in 4096 # directories at level 8 which is the default and also the maximum value. The # sub-directories are organized in 2 levels, the first level always has a fixed -# numer of 16 directories. +# number of 16 directories. # Minimum value: 0, maximum value: 8, default value: 8. # This tag requires that the tag CREATE_SUBDIRS is set to YES. @@ -558,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -849,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -1178,10 +1187,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = @@ -1260,7 +1270,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1276,17 +1291,13 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = # The HTML_COLORSTYLE tag can be used to specify if the generated HTML output -# should be rendered with a dark or light theme. Default setting AUTO_LIGHT -# enables light output unless the user preference is dark output. Other options -# are DARK to always use dark mode, LIGHT to always use light mode, AUTO_DARK to -# default to dark mode unless the user prefers light mode, and TOGGLE to let the -# user toggle between dark and light mode via a button. -# Possible values are: LIGHT Always generate light output., DARK Always generate -# dark output., AUTO_LIGHT Automatically set the mode according to the user -# preference, use light mode if no preference is set (the default)., AUTO_DARK -# Automatically set the mode according to the user preference, use dark mode if -# no preference is set. and TOGGLE Allow to user to switch between light and -# dark mode via a button.. +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. # The default value is: AUTO_LIGHT. # This tag requires that the tag GENERATE_HTML is set to YES. diff --git a/TAO/etc/tao_portablegroup.doxygen b/TAO/etc/tao_portablegroup.doxygen index f83f6588e28..10bd0270f23 100644 --- a/TAO/etc/tao_portablegroup.doxygen +++ b/TAO/etc/tao_portablegroup.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.5 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -86,7 +86,7 @@ CREATE_SUBDIRS = NO # level increment doubles the number of directories, resulting in 4096 # directories at level 8 which is the default and also the maximum value. The # sub-directories are organized in 2 levels, the first level always has a fixed -# numer of 16 directories. +# number of 16 directories. # Minimum value: 0, maximum value: 8, default value: 8. # This tag requires that the tag CREATE_SUBDIRS is set to YES. @@ -558,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -849,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -1180,10 +1189,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = @@ -1262,7 +1272,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1278,17 +1293,13 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = # The HTML_COLORSTYLE tag can be used to specify if the generated HTML output -# should be rendered with a dark or light theme. Default setting AUTO_LIGHT -# enables light output unless the user preference is dark output. Other options -# are DARK to always use dark mode, LIGHT to always use light mode, AUTO_DARK to -# default to dark mode unless the user prefers light mode, and TOGGLE to let the -# user toggle between dark and light mode via a button. -# Possible values are: LIGHT Always generate light output., DARK Always generate -# dark output., AUTO_LIGHT Automatically set the mode according to the user -# preference, use light mode if no preference is set (the default)., AUTO_DARK -# Automatically set the mode according to the user preference, use dark mode if -# no preference is set. and TOGGLE Allow to user to switch between light and -# dark mode via a button.. +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. # The default value is: AUTO_LIGHT. # This tag requires that the tag GENERATE_HTML is set to YES. diff --git a/TAO/etc/tao_portableserver.doxygen b/TAO/etc/tao_portableserver.doxygen index 3dc51541ec0..435ef74c625 100644 --- a/TAO/etc/tao_portableserver.doxygen +++ b/TAO/etc/tao_portableserver.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.5 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -86,7 +86,7 @@ CREATE_SUBDIRS = NO # level increment doubles the number of directories, resulting in 4096 # directories at level 8 which is the default and also the maximum value. The # sub-directories are organized in 2 levels, the first level always has a fixed -# numer of 16 directories. +# number of 16 directories. # Minimum value: 0, maximum value: 8, default value: 8. # This tag requires that the tag CREATE_SUBDIRS is set to YES. @@ -558,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -849,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -1178,10 +1187,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = TAO_ @@ -1260,7 +1270,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1276,17 +1291,13 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = # The HTML_COLORSTYLE tag can be used to specify if the generated HTML output -# should be rendered with a dark or light theme. Default setting AUTO_LIGHT -# enables light output unless the user preference is dark output. Other options -# are DARK to always use dark mode, LIGHT to always use light mode, AUTO_DARK to -# default to dark mode unless the user prefers light mode, and TOGGLE to let the -# user toggle between dark and light mode via a button. -# Possible values are: LIGHT Always generate light output., DARK Always generate -# dark output., AUTO_LIGHT Automatically set the mode according to the user -# preference, use light mode if no preference is set (the default)., AUTO_DARK -# Automatically set the mode according to the user preference, use dark mode if -# no preference is set. and TOGGLE Allow to user to switch between light and -# dark mode via a button.. +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. # The default value is: AUTO_LIGHT. # This tag requires that the tag GENERATE_HTML is set to YES. diff --git a/TAO/etc/tao_rtcorba.doxygen b/TAO/etc/tao_rtcorba.doxygen index e6085b660ee..433bcfabffd 100644 --- a/TAO/etc/tao_rtcorba.doxygen +++ b/TAO/etc/tao_rtcorba.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.5 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -86,7 +86,7 @@ CREATE_SUBDIRS = NO # level increment doubles the number of directories, resulting in 4096 # directories at level 8 which is the default and also the maximum value. The # sub-directories are organized in 2 levels, the first level always has a fixed -# numer of 16 directories. +# number of 16 directories. # Minimum value: 0, maximum value: 8, default value: 8. # This tag requires that the tag CREATE_SUBDIRS is set to YES. @@ -558,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -849,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -1178,10 +1187,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = TAO_ @@ -1260,7 +1270,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1276,17 +1291,13 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = # The HTML_COLORSTYLE tag can be used to specify if the generated HTML output -# should be rendered with a dark or light theme. Default setting AUTO_LIGHT -# enables light output unless the user preference is dark output. Other options -# are DARK to always use dark mode, LIGHT to always use light mode, AUTO_DARK to -# default to dark mode unless the user prefers light mode, and TOGGLE to let the -# user toggle between dark and light mode via a button. -# Possible values are: LIGHT Always generate light output., DARK Always generate -# dark output., AUTO_LIGHT Automatically set the mode according to the user -# preference, use light mode if no preference is set (the default)., AUTO_DARK -# Automatically set the mode according to the user preference, use dark mode if -# no preference is set. and TOGGLE Allow to user to switch between light and -# dark mode via a button.. +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. # The default value is: AUTO_LIGHT. # This tag requires that the tag GENERATE_HTML is set to YES. diff --git a/TAO/etc/tao_rtevent.doxygen b/TAO/etc/tao_rtevent.doxygen index c9ec29b7847..f108af1e2d6 100644 --- a/TAO/etc/tao_rtevent.doxygen +++ b/TAO/etc/tao_rtevent.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.5 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -86,7 +86,7 @@ CREATE_SUBDIRS = NO # level increment doubles the number of directories, resulting in 4096 # directories at level 8 which is the default and also the maximum value. The # sub-directories are organized in 2 levels, the first level always has a fixed -# numer of 16 directories. +# number of 16 directories. # Minimum value: 0, maximum value: 8, default value: 8. # This tag requires that the tag CREATE_SUBDIRS is set to YES. @@ -558,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -849,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -1190,10 +1199,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = @@ -1272,7 +1282,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1288,17 +1303,13 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = # The HTML_COLORSTYLE tag can be used to specify if the generated HTML output -# should be rendered with a dark or light theme. Default setting AUTO_LIGHT -# enables light output unless the user preference is dark output. Other options -# are DARK to always use dark mode, LIGHT to always use light mode, AUTO_DARK to -# default to dark mode unless the user prefers light mode, and TOGGLE to let the -# user toggle between dark and light mode via a button. -# Possible values are: LIGHT Always generate light output., DARK Always generate -# dark output., AUTO_LIGHT Automatically set the mode according to the user -# preference, use light mode if no preference is set (the default)., AUTO_DARK -# Automatically set the mode according to the user preference, use dark mode if -# no preference is set. and TOGGLE Allow to user to switch between light and -# dark mode via a button.. +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. # The default value is: AUTO_LIGHT. # This tag requires that the tag GENERATE_HTML is set to YES. diff --git a/TAO/etc/tao_rtportableserver.doxygen b/TAO/etc/tao_rtportableserver.doxygen index 5972c95f296..e48d731ade4 100644 --- a/TAO/etc/tao_rtportableserver.doxygen +++ b/TAO/etc/tao_rtportableserver.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.5 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -86,7 +86,7 @@ CREATE_SUBDIRS = NO # level increment doubles the number of directories, resulting in 4096 # directories at level 8 which is the default and also the maximum value. The # sub-directories are organized in 2 levels, the first level always has a fixed -# numer of 16 directories. +# number of 16 directories. # Minimum value: 0, maximum value: 8, default value: 8. # This tag requires that the tag CREATE_SUBDIRS is set to YES. @@ -558,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -849,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -1178,10 +1187,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = TAO_ @@ -1260,7 +1270,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1276,17 +1291,13 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = # The HTML_COLORSTYLE tag can be used to specify if the generated HTML output -# should be rendered with a dark or light theme. Default setting AUTO_LIGHT -# enables light output unless the user preference is dark output. Other options -# are DARK to always use dark mode, LIGHT to always use light mode, AUTO_DARK to -# default to dark mode unless the user prefers light mode, and TOGGLE to let the -# user toggle between dark and light mode via a button. -# Possible values are: LIGHT Always generate light output., DARK Always generate -# dark output., AUTO_LIGHT Automatically set the mode according to the user -# preference, use light mode if no preference is set (the default)., AUTO_DARK -# Automatically set the mode according to the user preference, use dark mode if -# no preference is set. and TOGGLE Allow to user to switch between light and -# dark mode via a button.. +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. # The default value is: AUTO_LIGHT. # This tag requires that the tag GENERATE_HTML is set to YES. diff --git a/TAO/etc/tao_security.doxygen b/TAO/etc/tao_security.doxygen index c0710824859..e147ecfd80b 100644 --- a/TAO/etc/tao_security.doxygen +++ b/TAO/etc/tao_security.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.5 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -86,7 +86,7 @@ CREATE_SUBDIRS = NO # level increment doubles the number of directories, resulting in 4096 # directories at level 8 which is the default and also the maximum value. The # sub-directories are organized in 2 levels, the first level always has a fixed -# numer of 16 directories. +# number of 16 directories. # Minimum value: 0, maximum value: 8, default value: 8. # This tag requires that the tag CREATE_SUBDIRS is set to YES. @@ -558,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -849,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -1184,10 +1193,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = @@ -1266,7 +1276,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1282,17 +1297,13 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = # The HTML_COLORSTYLE tag can be used to specify if the generated HTML output -# should be rendered with a dark or light theme. Default setting AUTO_LIGHT -# enables light output unless the user preference is dark output. Other options -# are DARK to always use dark mode, LIGHT to always use light mode, AUTO_DARK to -# default to dark mode unless the user prefers light mode, and TOGGLE to let the -# user toggle between dark and light mode via a button. -# Possible values are: LIGHT Always generate light output., DARK Always generate -# dark output., AUTO_LIGHT Automatically set the mode according to the user -# preference, use light mode if no preference is set (the default)., AUTO_DARK -# Automatically set the mode according to the user preference, use dark mode if -# no preference is set. and TOGGLE Allow to user to switch between light and -# dark mode via a button.. +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. # The default value is: AUTO_LIGHT. # This tag requires that the tag GENERATE_HTML is set to YES. diff --git a/TAO/etc/tao_smartproxies.doxygen b/TAO/etc/tao_smartproxies.doxygen index 3b05df648fd..35480366021 100644 --- a/TAO/etc/tao_smartproxies.doxygen +++ b/TAO/etc/tao_smartproxies.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.5 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -86,7 +86,7 @@ CREATE_SUBDIRS = NO # level increment doubles the number of directories, resulting in 4096 # directories at level 8 which is the default and also the maximum value. The # sub-directories are organized in 2 levels, the first level always has a fixed -# numer of 16 directories. +# number of 16 directories. # Minimum value: 0, maximum value: 8, default value: 8. # This tag requires that the tag CREATE_SUBDIRS is set to YES. @@ -558,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -849,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -1178,10 +1187,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = TAO_ @@ -1260,7 +1270,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1276,17 +1291,13 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = # The HTML_COLORSTYLE tag can be used to specify if the generated HTML output -# should be rendered with a dark or light theme. Default setting AUTO_LIGHT -# enables light output unless the user preference is dark output. Other options -# are DARK to always use dark mode, LIGHT to always use light mode, AUTO_DARK to -# default to dark mode unless the user prefers light mode, and TOGGLE to let the -# user toggle between dark and light mode via a button. -# Possible values are: LIGHT Always generate light output., DARK Always generate -# dark output., AUTO_LIGHT Automatically set the mode according to the user -# preference, use light mode if no preference is set (the default)., AUTO_DARK -# Automatically set the mode according to the user preference, use dark mode if -# no preference is set. and TOGGLE Allow to user to switch between light and -# dark mode via a button.. +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. # The default value is: AUTO_LIGHT. # This tag requires that the tag GENERATE_HTML is set to YES. diff --git a/TAO/etc/tao_ssliop.doxygen b/TAO/etc/tao_ssliop.doxygen index 98f7a931eef..b56a6293e37 100644 --- a/TAO/etc/tao_ssliop.doxygen +++ b/TAO/etc/tao_ssliop.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.5 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -86,7 +86,7 @@ CREATE_SUBDIRS = NO # level increment doubles the number of directories, resulting in 4096 # directories at level 8 which is the default and also the maximum value. The # sub-directories are organized in 2 levels, the first level always has a fixed -# numer of 16 directories. +# number of 16 directories. # Minimum value: 0, maximum value: 8, default value: 8. # This tag requires that the tag CREATE_SUBDIRS is set to YES. @@ -558,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -849,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -1184,10 +1193,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = @@ -1266,7 +1276,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1282,17 +1297,13 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = # The HTML_COLORSTYLE tag can be used to specify if the generated HTML output -# should be rendered with a dark or light theme. Default setting AUTO_LIGHT -# enables light output unless the user preference is dark output. Other options -# are DARK to always use dark mode, LIGHT to always use light mode, AUTO_DARK to -# default to dark mode unless the user prefers light mode, and TOGGLE to let the -# user toggle between dark and light mode via a button. -# Possible values are: LIGHT Always generate light output., DARK Always generate -# dark output., AUTO_LIGHT Automatically set the mode according to the user -# preference, use light mode if no preference is set (the default)., AUTO_DARK -# Automatically set the mode according to the user preference, use dark mode if -# no preference is set. and TOGGLE Allow to user to switch between light and -# dark mode via a button.. +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. # The default value is: AUTO_LIGHT. # This tag requires that the tag GENERATE_HTML is set to YES. diff --git a/TAO/etc/tao_strategies.doxygen b/TAO/etc/tao_strategies.doxygen index d790dba8a94..2bf4d004239 100644 --- a/TAO/etc/tao_strategies.doxygen +++ b/TAO/etc/tao_strategies.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.5 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -86,7 +86,7 @@ CREATE_SUBDIRS = NO # level increment doubles the number of directories, resulting in 4096 # directories at level 8 which is the default and also the maximum value. The # sub-directories are organized in 2 levels, the first level always has a fixed -# numer of 16 directories. +# number of 16 directories. # Minimum value: 0, maximum value: 8, default value: 8. # This tag requires that the tag CREATE_SUBDIRS is set to YES. @@ -558,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -849,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -1178,10 +1187,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = @@ -1260,7 +1270,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1276,17 +1291,13 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = # The HTML_COLORSTYLE tag can be used to specify if the generated HTML output -# should be rendered with a dark or light theme. Default setting AUTO_LIGHT -# enables light output unless the user preference is dark output. Other options -# are DARK to always use dark mode, LIGHT to always use light mode, AUTO_DARK to -# default to dark mode unless the user prefers light mode, and TOGGLE to let the -# user toggle between dark and light mode via a button. -# Possible values are: LIGHT Always generate light output., DARK Always generate -# dark output., AUTO_LIGHT Automatically set the mode according to the user -# preference, use light mode if no preference is set (the default)., AUTO_DARK -# Automatically set the mode according to the user preference, use dark mode if -# no preference is set. and TOGGLE Allow to user to switch between light and -# dark mode via a button.. +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. # The default value is: AUTO_LIGHT. # This tag requires that the tag GENERATE_HTML is set to YES. diff --git a/TAO/etc/tao_transportcurrent.doxygen b/TAO/etc/tao_transportcurrent.doxygen index 7f7a3b35f92..be1ed28a307 100644 --- a/TAO/etc/tao_transportcurrent.doxygen +++ b/TAO/etc/tao_transportcurrent.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.5 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -86,7 +86,7 @@ CREATE_SUBDIRS = NO # level increment doubles the number of directories, resulting in 4096 # directories at level 8 which is the default and also the maximum value. The # sub-directories are organized in 2 levels, the first level always has a fixed -# numer of 16 directories. +# number of 16 directories. # Minimum value: 0, maximum value: 8, default value: 8. # This tag requires that the tag CREATE_SUBDIRS is set to YES. @@ -558,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -849,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -1178,10 +1187,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = @@ -1260,7 +1270,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1276,17 +1291,13 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = # The HTML_COLORSTYLE tag can be used to specify if the generated HTML output -# should be rendered with a dark or light theme. Default setting AUTO_LIGHT -# enables light output unless the user preference is dark output. Other options -# are DARK to always use dark mode, LIGHT to always use light mode, AUTO_DARK to -# default to dark mode unless the user prefers light mode, and TOGGLE to let the -# user toggle between dark and light mode via a button. -# Possible values are: LIGHT Always generate light output., DARK Always generate -# dark output., AUTO_LIGHT Automatically set the mode according to the user -# preference, use light mode if no preference is set (the default)., AUTO_DARK -# Automatically set the mode according to the user preference, use dark mode if -# no preference is set. and TOGGLE Allow to user to switch between light and -# dark mode via a button.. +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. # The default value is: AUTO_LIGHT. # This tag requires that the tag GENERATE_HTML is set to YES. diff --git a/TAO/etc/tao_ziop.doxygen b/TAO/etc/tao_ziop.doxygen index f33463346d9..0acdc44af2a 100644 --- a/TAO/etc/tao_ziop.doxygen +++ b/TAO/etc/tao_ziop.doxygen @@ -1,4 +1,4 @@ -# Doxyfile 1.9.5 +# Doxyfile 1.9.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -86,7 +86,7 @@ CREATE_SUBDIRS = NO # level increment doubles the number of directories, resulting in 4096 # directories at level 8 which is the default and also the maximum value. The # sub-directories are organized in 2 levels, the first level always has a fixed -# numer of 16 directories. +# number of 16 directories. # Minimum value: 0, maximum value: 8, default value: 8. # This tag requires that the tag CREATE_SUBDIRS is set to YES. @@ -558,7 +558,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -849,6 +850,14 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but @@ -1178,10 +1187,11 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = @@ -1260,7 +1270,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1276,17 +1291,13 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = # The HTML_COLORSTYLE tag can be used to specify if the generated HTML output -# should be rendered with a dark or light theme. Default setting AUTO_LIGHT -# enables light output unless the user preference is dark output. Other options -# are DARK to always use dark mode, LIGHT to always use light mode, AUTO_DARK to -# default to dark mode unless the user prefers light mode, and TOGGLE to let the -# user toggle between dark and light mode via a button. -# Possible values are: LIGHT Always generate light output., DARK Always generate -# dark output., AUTO_LIGHT Automatically set the mode according to the user -# preference, use light mode if no preference is set (the default)., AUTO_DARK -# Automatically set the mode according to the user preference, use dark mode if -# no preference is set. and TOGGLE Allow to user to switch between light and -# dark mode via a button.. +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. # The default value is: AUTO_LIGHT. # This tag requires that the tag GENERATE_HTML is set to YES. diff --git a/TAO/examples/AMH/Sink_Server/Base_Server.cpp b/TAO/examples/AMH/Sink_Server/Base_Server.cpp index 23511c46da6..c3d71b297f0 100644 --- a/TAO/examples/AMH/Sink_Server/Base_Server.cpp +++ b/TAO/examples/AMH/Sink_Server/Base_Server.cpp @@ -72,7 +72,7 @@ Base_Server::try_RT_scheduling () priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/examples/AMH/Sink_Server/Client_Task.cpp b/TAO/examples/AMH/Sink_Server/Client_Task.cpp index 4025854a4e9..2bce4d98968 100644 --- a/TAO/examples/AMH/Sink_Server/Client_Task.cpp +++ b/TAO/examples/AMH/Sink_Server/Client_Task.cpp @@ -61,7 +61,7 @@ Client_Task::try_RT_scheduling () priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/examples/AMI/FL_Callback/peer.cpp b/TAO/examples/AMI/FL_Callback/peer.cpp index c4dcc225ef7..ac19e3863ce 100644 --- a/TAO/examples/AMI/FL_Callback/peer.cpp +++ b/TAO/examples/AMI/FL_Callback/peer.cpp @@ -76,7 +76,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/examples/OBV/Simple_util.h b/TAO/examples/OBV/Simple_util.h index 30b9d2fe8ee..32bfe42a5ae 100644 --- a/TAO/examples/OBV/Simple_util.h +++ b/TAO/examples/OBV/Simple_util.h @@ -149,11 +149,6 @@ protected: int shutdown_; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Simple_util.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Simple_util.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* TAO_UTIL_H */ diff --git a/TAO/examples/Persistent_Grid/Simple_util.h b/TAO/examples/Persistent_Grid/Simple_util.h index d9272e1fe0c..acb0aa284db 100644 --- a/TAO/examples/Persistent_Grid/Simple_util.h +++ b/TAO/examples/Persistent_Grid/Simple_util.h @@ -144,11 +144,6 @@ protected: Var server_; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Simple_util.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Simple_util.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* TAO_UTIL_H */ diff --git a/TAO/examples/Simple/Simple_util.h b/TAO/examples/Simple/Simple_util.h index 51319b172f1..d78ad81de95 100644 --- a/TAO/examples/Simple/Simple_util.h +++ b/TAO/examples/Simple/Simple_util.h @@ -160,11 +160,6 @@ private: int do_shutdown_; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Simple_util.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Simple_util.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* TAO_UTIL_H */ diff --git a/TAO/examples/Simple/grid/Grid_i.cpp b/TAO/examples/Simple/grid/Grid_i.cpp index 3fa4a1fcd6c..6906f8585d7 100644 --- a/TAO/examples/Simple/grid/Grid_i.cpp +++ b/TAO/examples/Simple/grid/Grid_i.cpp @@ -1,7 +1,7 @@ // -*- C++ -*- #include "Grid_i.h" -// Solaris and some Windows compilers don't have min in std namespaces +// Some Windows compilers don't have min in std namespaces // moreover on Windows 'min' is a macro, so we have to avoid using it literally. CORBA::UShort Grid_i::ushort_min (CORBA::UShort a, CORBA::UShort b) diff --git a/TAO/examples/Simple/grid/Grid_i.h b/TAO/examples/Simple/grid/Grid_i.h index 6d85fddce5d..fcce738f501 100644 --- a/TAO/examples/Simple/grid/Grid_i.h +++ b/TAO/examples/Simple/grid/Grid_i.h @@ -74,7 +74,7 @@ private: typedef ACE_Auto_Array_Ptr<CORBA::Long> GridArray; GridArray array_; - /// Solaris and some Windows compilers don't have min in std namespaces + /// Some Windows compilers don't have min in std namespaces static CORBA::UShort ushort_min (CORBA::UShort, CORBA::UShort); }; diff --git a/TAO/examples/Simple/time/Time_Client_i.cpp b/TAO/examples/Simple/time/Time_Client_i.cpp index 2ffb6c48a35..87feb97e099 100644 --- a/TAO/examples/Simple/time/Time_Client_i.cpp +++ b/TAO/examples/Simple/time/Time_Client_i.cpp @@ -27,13 +27,8 @@ Time_Client_i::run (const char *name, try { // 64-bit OS's require pointers to be aligned on an - // 8 byte boundary. 64-bit HP-UX requires a double to do this - // while a long does it for 64-bit Solaris. -#if defined (HPUX) - CORBA::Double padding = 0.0; -#else + // 8 byte boundary. CORBA::Long padding = 0; -#endif /* HPUX */ time_t timedate; ACE_UNUSED_ARG (padding); @@ -42,8 +37,6 @@ Time_Client_i::run (const char *name, timedate = static_cast <time_t> (client_->current_time ()); // Print out value - // Use ACE_OS::ctime_r(), ctime() doesn't seem to work properly - // under 64-bit solaris. ACE_TCHAR ascii_timedate[64] = ACE_TEXT (""); ACE_OS::ctime_r (&timedate, ascii_timedate, 64); diff --git a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp index 5eaee1f34e9..73eea3a075b 100644 --- a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp +++ b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp @@ -1004,7 +1004,7 @@ DualEC_Supplier::get_options (int argc, ACE_TCHAR *argv []) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling int min_priority = ACE_Sched_Params::priority_min (ACE_SCHED_FIFO); diff --git a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp index 9cda0d5e84f..19c3243803f 100644 --- a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp +++ b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp @@ -28,14 +28,6 @@ #include "ace/OS_NS_string.h" #include "ace/OS_NS_ctype.h" -#if defined (ACE_OPENVMS) -// need this to circumvent link error on OpenVMS -// has to do with interference in template instantiations -// for the server build by previous compilation of -// components which are reused here without recompilation -ACE_Time_Value dum = ACE_Time_Value::zero; -#endif - static const char usage [] = "[[-?]\n" " [-O[RBport] ORB port number]\n" diff --git a/TAO/orbsvcs/Trading_Service/Trading_Service.cpp b/TAO/orbsvcs/Trading_Service/Trading_Service.cpp index ca175391239..06f3f6b3dee 100644 --- a/TAO/orbsvcs/Trading_Service/Trading_Service.cpp +++ b/TAO/orbsvcs/Trading_Service/Trading_Service.cpp @@ -11,13 +11,11 @@ Trading_Shutdown::Trading_Shutdown (Trading_Service& trader) ACE_TEXT("%p\n"), ACE_TEXT("register_handler"))); -#ifndef ACE_HAS_WINCE if (this->shutdown_.register_handler (SIGTERM, this) == -1) ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT("%p\n"), ACE_TEXT("register_handler"))); -#endif // ACE_HAS_WINCE } int diff --git a/TAO/orbsvcs/examples/Notify/Filter/run_test.pl b/TAO/orbsvcs/examples/Notify/Filter/run_test.pl index cf6a58430cf..f264f8cd1d2 100755 --- a/TAO/orbsvcs/examples/Notify/Filter/run_test.pl +++ b/TAO/orbsvcs/examples/Notify/Filter/run_test.pl @@ -20,8 +20,6 @@ my $ns = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n my $nfs = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; my $flt = PerlACE::TestTarget::create_target (3) || die "Create target 3 failed\n"; -PerlACE::check_privilege_group(); - $nsiorfile = "naming.ior"; $nfsiorfile = "notify.ior"; diff --git a/TAO/orbsvcs/examples/Notify/Lanes/run_test.pl b/TAO/orbsvcs/examples/Notify/Lanes/run_test.pl index 85cb5a8d1f2..1fbdf0eefd2 100755 --- a/TAO/orbsvcs/examples/Notify/Lanes/run_test.pl +++ b/TAO/orbsvcs/examples/Notify/Lanes/run_test.pl @@ -22,8 +22,6 @@ my $sup = PerlACE::TestTarget::create_target (3) || die "Create target 3 failed\ my $con = PerlACE::TestTarget::create_target (4) || die "Create target 4 failed\n"; my $con2 = PerlACE::TestTarget::create_target (5) || die "Create target 5 failed\n"; -PerlACE::check_privilege_group(); - # Lanes Example # diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/run_test.pl b/TAO/orbsvcs/examples/Notify/Subscribe/run_test.pl index 7e04939283e..499b6f1efb2 100755 --- a/TAO/orbsvcs/examples/Notify/Subscribe/run_test.pl +++ b/TAO/orbsvcs/examples/Notify/Subscribe/run_test.pl @@ -20,8 +20,6 @@ my $ns = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n my $nfs = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; my $sub = PerlACE::TestTarget::create_target (3) || die "Create target 3 failed\n"; -PerlACE::check_privilege_group(); - $experiment_timeout = 60; $startup_timeout = 60; diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/run_test.pl b/TAO/orbsvcs/examples/Notify/ThreadPool/run_test.pl index f88a7aab724..65e370099e1 100755 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/run_test.pl +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/run_test.pl @@ -22,8 +22,6 @@ my $sup = PerlACE::TestTarget::create_target (3) || die "Create target 3 failed\ my $con = PerlACE::TestTarget::create_target (4) || die "Create target 4 failed\n"; my $con2 = PerlACE::TestTarget::create_target (5) || die "Create target 5 failed\n"; -PerlACE::check_privilege_group(); - # ThreadPool Example # diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h index e4e93dd5ba5..a5c3b9f757e 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h @@ -266,13 +266,7 @@ public: TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/AV/Endpoint_Strategy_T.cpp" -#endif /*ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Endpoint_Strategy_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* TAO_AV_ENDPOINT_STRATEGY_T_H */ diff --git a/TAO/orbsvcs/orbsvcs/AV/Flows_T.h b/TAO/orbsvcs/orbsvcs/AV/Flows_T.h index f2a0fc87f9c..75c57007562 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Flows_T.h +++ b/TAO/orbsvcs/orbsvcs/AV/Flows_T.h @@ -91,13 +91,7 @@ protected: TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/AV/Flows_T.cpp" -#endif /*ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Flows_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* TAO_AV_FLOWS_T_H */ diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h index 9f2baab57a9..16018fe81ab 100644 --- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h +++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h @@ -76,13 +76,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "orbsvcs/Channel_Clients_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Channel_Clients_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Channel_Clients_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* ACE_CHANNEL_CLIENTS_T_H */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h index b7cc48b1a54..5b194529aeb 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h @@ -69,12 +69,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "orbsvcs/ESF/ESF_Busy_Lock.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/ESF/ESF_Busy_Lock.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("ESF_Busy_Lock.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* TAO_ESF_BUSY_LOCK_H */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h index 36578eb57e5..9849d2ebc72 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h @@ -52,16 +52,8 @@ private: ACE_LOCK lock_; }; -// **************************************************************** - TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/ESF/ESF_Copy_On_Read.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("ESF_Copy_On_Read.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* TAO_ESF_COPY_ON_READ_H */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h index dddaf15ebc8..cb866075cbb 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h @@ -159,20 +159,12 @@ private: Collection *collection_; }; -// **************************************************************** - TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) #include "orbsvcs/ESF/ESF_Copy_On_Write.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/ESF/ESF_Copy_On_Write.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("ESF_Copy_On_Write.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* TAO_ESF_COPY_ON_WRITE_H */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h index c3e9f8e40d0..6ff53f19d5c 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h @@ -132,20 +132,12 @@ private: ACE_Unbounded_Queue<ACE_Command_Base*> command_queue_; }; -// **************************************************************** - TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) #include "orbsvcs/ESF/ESF_Delayed_Changes.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/ESF/ESF_Delayed_Changes.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("ESF_Delayed_Changes.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* TAO_ESF_DELAYED_CHANGES_H */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h index 7add098ca40..5c9b3ca2867 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h @@ -168,20 +168,12 @@ private: Target *target_; }; -// **************************************************************** - TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) #include "orbsvcs/ESF/ESF_Delayed_Command.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/ESF/ESF_Delayed_Command.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("ESF_Delayed_Command.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* TAO_ESF_DELAYED_COMMAND_H */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h index 5f46da59d2a..6928604f89e 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h @@ -43,20 +43,12 @@ private: ACE_LOCK lock_; }; -// **************************************************************** - TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) #include "orbsvcs/ESF/ESF_Immediate_Changes.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/ESF/ESF_Immediate_Changes.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("ESF_Immediate_Changes.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* TAO_ESF_IMMEDIATE_CHANGES_H */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h index 0ba8c9eeb56..f0608f20666 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h @@ -85,16 +85,8 @@ public: virtual void peer_disconnected (PEER *peer); }; -// **************************************************************** - TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/ESF/ESF_Peer_Admin.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("ESF_Peer_Admin.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* TAO_ESF_PEER_ADMIN_H */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h index d8b48b1ab57..43cc3b51172 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h @@ -83,20 +83,12 @@ private: PEER* peer_; }; -// **************************************************************** - TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) #include "orbsvcs/ESF/ESF_Peer_Workers.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/ESF/ESF_Peer_Workers.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("ESF_Peer_Workers.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* TAO_ESF_PEER_WORKERS_H */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h index 4c40bd9d446..7d9bb87b97c 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h @@ -135,20 +135,12 @@ private: COUNTED *counted_; }; -// **************************************************************** - TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) #include "orbsvcs/ESF/ESF_Proxy_Admin.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/ESF/ESF_Proxy_Admin.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("ESF_Proxy_Admin.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* TAO_ESF_PROXY_ADMIN_H */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h index b486e13f02f..bda7ef87470 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h @@ -154,17 +154,9 @@ public: virtual void shutdown () = 0; }; -// **************************************************************** - TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/ESF/ESF_Proxy_Collection.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("ESF_Proxy_Collection.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* TAO_ESF_PROXY_COLLECTION_H */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h index fbd79d670a7..af45c7b9d17 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h @@ -74,12 +74,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "orbsvcs/ESF/ESF_Proxy_List.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/ESF/ESF_Proxy_List.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("ESF_Proxy_List.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* TAO_ESF_PROXY_LIST_H */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h index 089f7caaf71..b15fd7d612b 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h @@ -101,12 +101,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "orbsvcs/ESF/ESF_Proxy_RB_Tree.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("ESF_Proxy_RB_Tree.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* TAO_ESF_PROXY_RB_TREE_H */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h index 0b4607fe62b..4000763686f 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h @@ -66,12 +66,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "orbsvcs/ESF/ESF_Proxy_RefCount_Guard.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("ESF_Proxy_RefCount_Guard.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* TAO_ESF_PROXY_REFCOUNT_GUARD_H */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h index 61873a0de55..01cd5c88987 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h @@ -54,12 +54,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "orbsvcs/ESF/ESF_RefCount_Guard.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/ESF/ESF_RefCount_Guard.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("ESF_RefCount_Guard.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* TAO_ESF_REFCOUNT_GUARD_H */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h index efea73b2dcc..a97b81a846a 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h @@ -38,12 +38,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "orbsvcs/ESF/ESF_Shutdown_Proxy.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/ESF/ESF_Shutdown_Proxy.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("ESF_Shutdown_Proxy.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* TAO_ESF_SHUTDOWN_PROXY_H */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h index fe8b04411b8..21c922af928 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h @@ -53,12 +53,6 @@ public: TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/ESF/ESF_Worker.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("ESF_Worker.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* TAO_ESF_WORKER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp index 5409f0b4406..b5f8d353c3d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp @@ -158,10 +158,6 @@ TAO_EC_Basic_Factory::destroy_scheduling_strategy (TAO_EC_Scheduling_Strategy* x TAO_EC_ProxyPushConsumer_Collection* TAO_EC_Basic_Factory::create_proxy_push_consumer_collection (TAO_EC_Event_Channel_Base *) { -#if defined (__SUNPRO_CC) - // This typedef is a workaround for a SunCC 4.2 bug - typedef TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>::Iterator TAO_EC_Consumer_List_Iterator; -#endif return new TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer, TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>::Iterator, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h index f60dd53129b..e6b26cbb72e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h @@ -54,13 +54,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "orbsvcs/Event/EC_Busy_Lock.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Event/EC_Busy_Lock.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("EC_Busy_Lock.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* TAO_EC_BUSY_LOCK_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h index 83fd3944ffa..5f8ab69c0fe 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h @@ -91,12 +91,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "orbsvcs/Event/EC_Lifetime_Utils_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Event/EC_Lifetime_Utils_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("EC_Lifetime_Utils_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* EC_LIFETIME_UTILS_T_H */ diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h index f9299545913..3dc26fcd924 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h @@ -60,13 +60,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("ConnectionHandler_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h index 1139e6aba01..8d1444c473e 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h @@ -44,12 +44,6 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("FT_ProxyAdmin_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.h index 916e7c50820..10f9477d1c8 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.h @@ -35,12 +35,6 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Fault_Detector_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h index d9bda41fe65..e63b7c30acc 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h @@ -107,13 +107,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("HTIOP_Acceptor_Impl.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* HTIOP_AccePTOR_IMPL_H */ diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h index f1fcfa313db..e55025ea730 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h @@ -101,13 +101,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("HTIOP_Connector_Impl.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /*HTIOP_CONNECTOR_IMPL_H*/ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.h index 4c00273e01e..0a43a56355d 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.h @@ -107,9 +107,7 @@ public: TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/IFRService/IFR_Service_Utils_T.cpp" -#endif /* defined REQUIRED SOURCE */ #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp index a0cebd7da5a..05a518b049c 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp @@ -107,7 +107,7 @@ TAO_LB_CPU_Load_Average_Monitor::loads () load = ((system_ll - idle_ll) * 100 / system_ll) / sys_info.dwNumberOfProcessors; } -#elif defined (ACE_LINUX) || defined (sun) +#elif defined (ACE_LINUX) // Only bother getting the load average over the last minute. // @@ -196,28 +196,9 @@ TAO_LB_CPU_Load_Average_Monitor::loads () } else throw CORBA::TRANSIENT (); // Correct exception? - -#elif defined (__hpux) - - struct pst_dynamic psd; - - if (::pstat_getdynamic (&psd, sizeof (psd), (size_t) 1, 0) != -1) - { - const long & num_processors = psd.psd_proc_cnt; - - ACE_ASSERT (num_processors > 0); - - if (num_processors > 0) - load = psd.psd_avg_1_min / num_processors; - else - throw CORBA::TRANSIENT (); // Correct exception? - } - else - throw CORBA::TRANSIENT (); // Correct exception? - #endif -#if defined (ACE_LINUX) || defined (sun) || defined (__hpux) || defined(__NetBSD__) || defined (__APPLE__) +#if defined (ACE_LINUX) || defined(__NetBSD__) || defined (__APPLE__) CosLoadBalancing::LoadList * tmp = 0; ACE_NEW_THROW_EX (tmp, CosLoadBalancing::LoadList (1), @@ -241,7 +222,7 @@ TAO_LB_CPU_Load_Average_Monitor::loads () ACE_UNUSED_ARG (load); throw CORBA::NO_IMPLEMENT (); -#endif /* linux || sun || __hpux || __NetBSD__ || __APPLE__ */ +#endif /* linux || __NetBSD__ || __APPLE__ */ } diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp index 4dc1ecb2214..d991ba35514 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp @@ -124,7 +124,7 @@ TAO_LB_CPU_Utilization_Monitor::loads () { CORBA::Float load = 0; -#if defined (ACE_LINUX) || defined (sun) +#if defined (ACE_LINUX) double load_double = calc_cpu_loading (); load = load_double; @@ -153,7 +153,7 @@ TAO_LB_CPU_Utilization_Monitor::loads () ACE_UNUSED_ARG (load); throw CORBA::NO_IMPLEMENT (); -#endif /* linux || sun */ +#endif /* linux */ } diff --git a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h index fc2193ccb7e..99f7ecfc70c 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h @@ -117,13 +117,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Naming/Bindings_Iterator_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Bindings_Iterator_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* TAO_BINDINGS_ITERATOR_T_H */ diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h index 464f46def2e..58b71530eb1 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h @@ -25,12 +25,8 @@ # pragma warning (disable : 4250) #endif /* _MSC_VER */ -// Note: 'interface' has been defined as struct on WinCE platform and -// gives a compiler error. This undef has been found harmless on -// Windows and solaris platforms; however, if this generates -// error, then proper ifdef must be added around following block. #if defined (interface) -#undef interface +# undef interface #endif // interface TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h index 8897a02cde2..2538197dee2 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h @@ -209,13 +209,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Naming/Naming_Service_Container.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Naming_Service_Container.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* NS_CONTAINERS_T_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Container_T.h b/TAO/orbsvcs/orbsvcs/Notify/Container_T.h index cd231d5ba81..b0cc870fae7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Container_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Container_T.h @@ -73,13 +73,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "orbsvcs/Notify/Container_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Notify/Container_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Container_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h index fbab796366f..1f412726da8 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h @@ -83,13 +83,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "orbsvcs/Notify/Event_Map_Entry_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Notify/Event_Map_Entry_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Event_Map_Entry_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h index 29f60d16ce0..5c2c50ecfe9 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h @@ -105,13 +105,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "orbsvcs/Notify/Event_Map_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Notify/Event_Map_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Event_Map_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* TAO_Notify_EVENT_MAP_T_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h index 1c5fd4a61d9..b7b68c0abc2 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h @@ -60,13 +60,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "orbsvcs/Notify/Find_Worker_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Notify/Find_Worker_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Find_Worker_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* TAO_Notify_FIND_WORKER_T_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h index 9ca4a06f167..f68ba7554ac 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h @@ -63,13 +63,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "orbsvcs/Notify/Method_Request_Updates_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Notify/Method_Request_Updates_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Method_Request_Updates_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.h index 9bfe7ee793c..48906d32554 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.h @@ -77,14 +77,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#include "orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.cpp" -#pragma implementation ("MonitorProxySupplier_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif // TAO_HAS_MONITOR_FRAMEWORK == 1 diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_T.h b/TAO/orbsvcs/orbsvcs/Notify/Property_T.h index 35b02c07772..284bac2ae8b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Property_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Property_T.h @@ -153,13 +153,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "orbsvcs/Notify/Property_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Notify/Property_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Property_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* TAO_Notify_PROPERTY_T_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h index 1c8903aeb84..97bc3f8109c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h @@ -54,13 +54,7 @@ public: TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Notify/ProxyConsumer_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("ProxyConsumer_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* TAO_Notify_PROXYCONSUMER_T_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h index a53e6e75705..1b0ba52617d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h @@ -92,13 +92,7 @@ protected: TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Notify/ProxySupplier_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("ProxySupplier_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* TAO_Notify_PROXYSUPPLIER_T_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h index e3f254893d5..2223c35d375 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h @@ -103,13 +103,7 @@ TAO_Notify_Proxy_T<POA_CosEventChannelAdmin::ProxyPushConsumer>; TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Notify/Proxy_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Proxy_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* TAO_Notify_PROXY_T_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.h index a60ab30879e..79e1e603c62 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.h @@ -39,13 +39,7 @@ namespace TAO_Notify TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Notify/Reconnect_Worker_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Reconnect_Worker_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h index fc1eb795058..cdbeabfad9f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h @@ -73,13 +73,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "orbsvcs/Notify/Refcountable_Guard_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Notify/Refcountable_Guard_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Refcountable_Guard_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.h index 241e3df615f..5cabef722fc 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.h @@ -50,13 +50,7 @@ namespace TAO_Notify TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Notify/Save_Persist_Worker_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Save_Persist_Worker_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h index 9f2050785ea..5153b642c29 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h @@ -57,13 +57,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "orbsvcs/Notify/Seq_Worker_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Notify/Seq_Worker_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Seq_Worker_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* TAO_Notify_SEQ_WORKER_T_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Validate_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Validate_Worker_T.h index b25fa1d876d..ac4cb88da1b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Validate_Worker_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Validate_Worker_T.h @@ -39,13 +39,7 @@ namespace TAO_Notify TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Validate_Worker_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Validate_Worker_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h index 11ea42ad9f8..998608bc1a1 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h @@ -121,13 +121,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) # include "orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -# pragma implementation ("SSLIOP_OpenSSL_st_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp index a7b0e2bf5f0..50fa3272b9f 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp @@ -26,11 +26,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ////////////////////// // compare the DFS finish times of two task entries, order higher time *first* -#if defined (ACE_HAS_WINCE) -int _cdecl compare_entry_finish_times (const void *first, const void *second) -#else extern "C" int compare_entry_finish_times (const void *first, const void *second) -#endif // ACE_HAS_WINCE { // sort blank entries to the end if (! first) diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h index 915645bdb6b..f1ae68873a7 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h @@ -489,13 +489,7 @@ protected: TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Reconfig_Sched_Utils_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* TAO_RECONFIG_SCHED_UTILS_T_H */ diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h index 3a8d9fbe6a9..cf97c6a068a 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h @@ -597,14 +597,7 @@ maintain_scheduling_array (ARRAY_ELEMENT_TYPE ** & current_ptr_array, TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Sched/Reconfig_Scheduler_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Reconfig_Scheduler_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - #include /**/ "ace/post.h" #endif /* TAO_RECONFIG_SCHEDULER_T_H */ diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h index b007c81109e..cf5cbd75de7 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h @@ -93,7 +93,7 @@ private: /** * Set to 1 if priority values increase with increasing priority, - * such as on Solaris and Win32, or 0 if they decrease, such as on + * such as on Win32, or 0 if they decrease, such as on * VxWorks. */ int increasing_priority_; diff --git a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp index 74e5d01c316..9421340692f 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp @@ -15,15 +15,11 @@ // Helper function type definition for sort // ////////////////////////////////////////////// -#if defined (ACE_HAS_WINCE) -typedef int (_cdecl* COMP_FUNC) (const void*, const void*); -#else // This is awkward, but it makes MSVC++ happy. extern "C" { typedef int (*COMP_FUNC) (const void*, const void*); } -#endif // ACE_HAS_WINCE /////////////////////////////////////////////////// // class ACE_Strategy_Scheduler member functions // diff --git a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h index 9f25a876c4a..fcdd9eaa8ed 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h @@ -244,11 +244,7 @@ protected: private: // = Comparison function to pass to qsort: calls instance ()->sort_comp (). -#if defined (ACE_HAS_WINCE) - static int _cdecl sort_function (void *arg1, void *arg2); -#else static int sort_function (void *arg1, void *arg2); -#endif // ACE_HAS_WINCE /// Instance of the strategy. static ACE_MUF_Scheduler_Strategy *instance_; diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp index c1d0f295880..d7ddddee467 100644 --- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp @@ -716,11 +716,6 @@ ACE_Scheduler_Factory::log_scheduling_tuples( ACE_OS::fclose (file); } -#if defined (HPUX) && !defined (__GNUG__) - // aCC can't handle RtecScheduler::Preemption_Priority_t used as an operator - // name. - typedef CORBA::Long RtecScheduler_Preemption_Priority_t; -#endif /* HPUX && !g++ */ RtecScheduler::Preemption_Priority_t ACE_Scheduler_Factory::preemption_priority () @@ -731,15 +726,8 @@ ACE_Scheduler_Factory::preemption_priority () { ACE_TSS_Type_Adapter<RtecScheduler::Preemption_Priority_t> *tss = ace_scheduler_factory_data->preemption_priority_; - // egcs 1.0.1 raises an internal compiler error if we implicitly - // call the type conversion operator. So, call it explicitly. -#if defined (HPUX) && !defined (__GNUG__) - const RtecScheduler::Preemption_Priority_t preemption_priority = - static_cast<RtecScheduler::Preemption_Priority_t> (tss->operator RtecScheduler_Preemption_Priority_t ()); -#else const RtecScheduler::Preemption_Priority_t preemption_priority = static_cast<RtecScheduler::Preemption_Priority_t> (tss->operator RtecScheduler::Preemption_Priority_t ()); -#endif /* HPUX && !g++ */ return preemption_priority; } else @@ -760,12 +748,7 @@ ACE_Scheduler_Factory::set_preemption_priority return; ace_scheduler_factory_data->preemption_priority_-> -#if defined (HPUX) && !defined (__GNUG__) - // aCC can't handle the typedef. - operator RtecScheduler_Preemption_Priority_t & () = preemption_priority; -#else operator RtecScheduler::Preemption_Priority_t & () = preemption_priority; -#endif /* HPUX && !g++ */ } diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h index e4b33dfc15b..a8f32363ce7 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h @@ -13,9 +13,7 @@ CORBA::Boolean TAO_find (const CORBA::Any& sequence, const OPERAND_TYPE& operand TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Trader/Interpreter_Utils_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* TAO_INTERPRETER_UTILS_T_H */ diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h index f0f7ff6c27d..c1aa7759070 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h @@ -185,9 +185,7 @@ public: TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Trader/Offer_Database.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* TAO_SERVICE_TYPE_MAP_H */ diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h index 32e7a17a33b..0401039fe27 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h @@ -74,9 +74,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Trader/Offer_Iterators_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h index fa06efa1c1a..2dd32da8127 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h @@ -804,9 +804,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Trader/Trader_Interfaces.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h index 91f2d0fcc1d..5ba5a9b4465 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h @@ -231,9 +231,7 @@ public: TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Trader/Trader_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp index de2cf0f85be..508ca8cf8f8 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp @@ -70,8 +70,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. - + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp index 22454390add..22fe8819380 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp @@ -217,8 +217,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. - + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp index b6de5b57c68..debd4a3316a 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp @@ -72,8 +72,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. - + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp index dd461f6fdae..213e824a89b 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp @@ -215,7 +215,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Disconnect.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Disconnect.h index b6f2325dce0..20f686fdd4a 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Disconnect.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Disconnect.h @@ -45,8 +45,6 @@ public: #include "Auto_Disconnect.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Auto_Disconnect.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* TAO_PERF_RTEC_AUTO_DISCONNECT_H */ diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.h index 9c69b56917b..2f8206ada5b 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.h @@ -74,8 +74,6 @@ private: ACE_Thread_Manager thr_mgr_; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Low_Priority_Setup.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* TAO_PERF_RTEC_LOW_PRIORITY_SETUP_H */ diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.h index 52052939f72..179b6c1fff6 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.h @@ -27,8 +27,6 @@ public: const char *object_id); }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "RIR_Narrow.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* TAO_PERF_RTEC_RIR_NARROW_H */ diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Servant_var.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Servant_var.h index a384cdc1744..76735a54e20 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Servant_var.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Servant_var.h @@ -71,8 +71,6 @@ private: #include "Servant_var.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Servant_var.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* TAO_PERF_RTEC_SERVANT_VAR_H */ diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Shutdown.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Shutdown.h index 379da06b1e5..b50a2195ee4 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Shutdown.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Shutdown.h @@ -25,8 +25,6 @@ public: #include "Shutdown.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Shutdown.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* TAO_PERF_RTEC_SHUTDOWN_H */ diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Task_Activator.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Task_Activator.h index 51f65fd5895..46ee61f38cb 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Task_Activator.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Task_Activator.h @@ -76,8 +76,6 @@ protected: #include "Task_Activator.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Task_Activator.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* TAO_PERF_RTEC_TASK_ACTIVATOR_H */ diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp index a6e3b6a798c..b24fd7d9b5f 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp @@ -256,13 +256,6 @@ static const short ace_cc_yycheck[] = { 4, #pragma alloca #define ACE_CC_YYSTACK_USE_ALLOCA #else /* not MSDOS, or __TURBOC__, or _AIX */ -#if 0 -#ifdef __hpux /* haible@ilog.fr says this works for HPUX 9.05 and up, - and on HPUX 10. Eventually we can turn this on. */ -#define ACE_CC_YYSTACK_USE_ALLOCA -#define alloca __builtin_alloca -#endif /* __hpux */ -#endif #endif /* not _AIX */ #endif /* not MSDOS, or __TURBOC__ */ #endif /* not sparc */ diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp index d2a9f33c2a1..8ec3b162ffe 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp @@ -90,7 +90,7 @@ Driver::run (int argc, ACE_TCHAR* argv[]) int min_priority = ACE_Sched_Params::priority_min (ACE_SCHED_FIFO); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, min_priority, diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp index 66b26fc2ac2..0202dcaee91 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp @@ -84,7 +84,7 @@ ECMS_Driver::run (int argc, ACE_TCHAR* argv[]) int min_priority = ACE_Sched_Params::priority_min (ACE_SCHED_FIFO); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, min_priority, diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.inl b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.inl index a4be43018e0..28afc4f0a1f 100644 --- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.inl +++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.inl @@ -27,7 +27,7 @@ ECM_Federation::supplier_types () const ACE_INLINE const char* ECM_Federation::supplier_name (CORBA::ULong i) const { - if (i < static_cast<ACE_CAST_CONST CORBA::ULong> (this->supplier_types_)) + if (i < static_cast<CORBA::ULong> (this->supplier_types_)) return this->supplier_names_[i]; return 0; } @@ -35,7 +35,7 @@ ECM_Federation::supplier_name (CORBA::ULong i) const ACE_INLINE CORBA::ULong ECM_Federation::supplier_ipaddr (CORBA::ULong i) const { - if (i < static_cast<ACE_CAST_CONST CORBA::ULong> (this->supplier_types_)) + if (i < static_cast<CORBA::ULong> (this->supplier_types_)) return this->supplier_ipaddr_[i]; return 0; } @@ -49,7 +49,7 @@ ECM_Federation::consumer_types () const ACE_INLINE const char* ECM_Federation::consumer_name (CORBA::ULong i) const { - if (i < static_cast<ACE_CAST_CONST CORBA::ULong> (this->consumer_types_)) + if (i < static_cast<CORBA::ULong> (this->consumer_types_)) return this->consumer_names_[i]; return 0; } @@ -57,7 +57,7 @@ ECM_Federation::consumer_name (CORBA::ULong i) const ACE_INLINE CORBA::ULong ECM_Federation::consumer_ipaddr (CORBA::ULong i) const { - if (i < static_cast<ACE_CAST_CONST CORBA::ULong> (this->consumer_types_)) + if (i < static_cast<CORBA::ULong> (this->consumer_types_)) return this->consumer_ipaddr_[i]; return 0; } diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp index c0f9d476954..e9481bcd951 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp +++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp @@ -21,10 +21,6 @@ #include "ace/OS_NS_strings.h" #include <memory> -#if defined (sun) -# include <sys/lwp.h> /* for _lwp_self */ -#endif /* sun */ - Test_ECG::Test_ECG () : lcl_name_ ("Test_ECG"), rmt_name_ (""), @@ -60,22 +56,13 @@ Test_ECG::Test_ECG () void print_priority_info (const char *const name) { -#if defined (ACE_HAS_PTHREADS) || defined (sun) +#if defined (ACE_HAS_PTHREADS) #if defined (ACE_HAS_PTHREADS) struct sched_param param; int policy, status; if ((status = pthread_getschedparam (pthread_self (), &policy, ¶m)) == 0) { -# ifdef sun - ACE_DEBUG ((LM_DEBUG, - "%C (%lu|%u); policy is %d, priority is %d\n", - name, - ACE_OS::getpid (), - _lwp_self (), - pthread_self (), - policy, param.sched_priority)); -# else /* ! sun */ ACE_DEBUG ((LM_DEBUG, "%C (%lu|%u); policy is %d, priority is %d\n", name, @@ -83,7 +70,6 @@ print_priority_info (const char *const name) 0, pthread_self (), policy, param.sched_priority )); -# endif /* ! sun */ } else { ACE_DEBUG ((LM_DEBUG,"pthread_getschedparam failed: %d\n", status)); } @@ -119,7 +105,7 @@ print_priority_info (const char *const name) #endif /* sun */ #else ACE_UNUSED_ARG (name); -#endif /* ACE_HAS_PTHREADS || sun */ +#endif /* ACE_HAS_PTHREADS */ } int @@ -222,7 +208,7 @@ Test_ECG::run (int argc, ACE_TCHAR* argv[]) int min_priority = ACE_Sched_Params::priority_min (ACE_SCHED_FIFO); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, min_priority, diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp index a10cc5b53ad..403a38f8f75 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp @@ -93,10 +93,9 @@ ECT_Consumer_Driver::run (int argc, ACE_TCHAR* argv[]) } } - int min_priority = - ACE_Sched_Params::priority_min (ACE_SCHED_FIFO); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + int min_priority = ACE_Sched_Params::priority_min (ACE_SCHED_FIFO); + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, min_priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp index 4168b9c133c..4dc0053f3b6 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp @@ -104,10 +104,9 @@ ECT_Supplier_Driver::run (int argc, ACE_TCHAR* argv[]) } } - int min_priority = - ACE_Sched_Params::priority_min (ACE_SCHED_FIFO); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + int min_priority = ACE_Sched_Params::priority_min (ACE_SCHED_FIFO); + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, min_priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp index d2eaa541490..cc1bc13d837 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp @@ -136,10 +136,9 @@ ECT_Throughput::run (int argc, ACE_TCHAR* argv[]) int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, - priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp index e467d335503..2837ba34dbb 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp @@ -153,8 +153,8 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) TAO_ECG_UDP_Out_Endpoint endpoint; // need to be explicit about the address type when built with // IPv6 support, otherwise SOCK_DGram::open defaults to ipv6 when - // given a sap_any address. This causes trouble on at least solaris - // and windows, or at most on not-linux. + // given a sap_any address. This causes trouble on at least windows, + // or at most on not-linux. if (endpoint.dgram ().open (ACE_Addr::sap_any, send_addr.get_type()) == -1) { diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp index f3644488f24..b5b82c362ff 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp @@ -27,8 +27,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp index 91415ec499c..4310fd57c57 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp @@ -26,8 +26,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.cpp b/TAO/orbsvcs/tests/Event/lib/Driver.cpp index c297a9147e3..b72b31e0d90 100644 --- a/TAO/orbsvcs/tests/Event/lib/Driver.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Driver.cpp @@ -220,8 +220,8 @@ EC_Driver::move_to_rt_class () + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/orbsvcs/tests/FT_Naming/Replication/run_test.pl b/TAO/orbsvcs/tests/FT_Naming/Replication/run_test.pl index f9cc8fd812f..f45ddef340f 100755 --- a/TAO/orbsvcs/tests/FT_Naming/Replication/run_test.pl +++ b/TAO/orbsvcs/tests/FT_Naming/Replication/run_test.pl @@ -167,9 +167,6 @@ print STDERR "Starting Client: $prog $args\n"; $CL = $test->CreateProcess ("$prog", "$args"); # Some systems may take a very long time to process 100 objects. -# For example, on a Solaris/SPARC system it was found that it took -# 8 seconds to bind 100 objects compared to 0.08 seconds on a -# Linux/Intel computer. So add to the wait time. $client = $CL->SpawnWaitKill ($test->ProcessStartWaitInterval() + 105); if ($client != 0) { diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp index 15ac48ac812..2f3c009efb1 100644 --- a/TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp +++ b/TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp @@ -77,7 +77,6 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) // Ignore the error value since the directory may already exist. const ACE_TCHAR *test_dir {}; -#if !defined (ACE_HAS_WINCE) # if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR) test_dir = ACE_OS::getenv (ACE_TEXT ("ACE_TEST_DIR")); # else @@ -93,7 +92,6 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) # endif /* ACE_WIN32 || !ACE_USES_WCHAR */ if (test_dir == 0) -#endif /* ACE_HAS_WINCE */ test_dir = ACE_TEXT (""); // This could be done with ACE_OS::sprintf() but it requires different @@ -123,11 +121,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) // directory does exist, it causes a wierd console error message // about "cat: input error on standard input: Is a directory". So, // VxWorks users must create the directory manually. -# if defined (ACE_HAS_WINCE) - ACE_OS::mkdir (ACE_LOG_DIRECTORY_FOR_MKDIR); -# else ACE_OS::mkdir (ACE_LOG_DIRECTORY); -# endif // ACE_HAS_WINCE # endif /* ! VXWORKS */ # if !defined (ACE_LACKS_IOSTREAM_TOTALLY) diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp index 15ac48ac812..2f3c009efb1 100644 --- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp +++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp @@ -77,7 +77,6 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) // Ignore the error value since the directory may already exist. const ACE_TCHAR *test_dir {}; -#if !defined (ACE_HAS_WINCE) # if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR) test_dir = ACE_OS::getenv (ACE_TEXT ("ACE_TEST_DIR")); # else @@ -93,7 +92,6 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) # endif /* ACE_WIN32 || !ACE_USES_WCHAR */ if (test_dir == 0) -#endif /* ACE_HAS_WINCE */ test_dir = ACE_TEXT (""); // This could be done with ACE_OS::sprintf() but it requires different @@ -123,11 +121,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) // directory does exist, it causes a wierd console error message // about "cat: input error on standard input: Is a directory". So, // VxWorks users must create the directory manually. -# if defined (ACE_HAS_WINCE) - ACE_OS::mkdir (ACE_LOG_DIRECTORY_FOR_MKDIR); -# else ACE_OS::mkdir (ACE_LOG_DIRECTORY); -# endif // ACE_HAS_WINCE # endif /* ! VXWORKS */ # if !defined (ACE_LACKS_IOSTREAM_TOTALLY) diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp index 15ac48ac812..2f3c009efb1 100644 --- a/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp +++ b/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp @@ -77,7 +77,6 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) // Ignore the error value since the directory may already exist. const ACE_TCHAR *test_dir {}; -#if !defined (ACE_HAS_WINCE) # if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR) test_dir = ACE_OS::getenv (ACE_TEXT ("ACE_TEST_DIR")); # else @@ -93,7 +92,6 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) # endif /* ACE_WIN32 || !ACE_USES_WCHAR */ if (test_dir == 0) -#endif /* ACE_HAS_WINCE */ test_dir = ACE_TEXT (""); // This could be done with ACE_OS::sprintf() but it requires different @@ -123,11 +121,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) // directory does exist, it causes a wierd console error message // about "cat: input error on standard input: Is a directory". So, // VxWorks users must create the directory manually. -# if defined (ACE_HAS_WINCE) - ACE_OS::mkdir (ACE_LOG_DIRECTORY_FOR_MKDIR); -# else ACE_OS::mkdir (ACE_LOG_DIRECTORY); -# endif // ACE_HAS_WINCE # endif /* ! VXWORKS */ # if !defined (ACE_LACKS_IOSTREAM_TOTALLY) diff --git a/TAO/orbsvcs/tests/HTIOP/test_config.h b/TAO/orbsvcs/tests/HTIOP/test_config.h index 6a0904281cf..e08ad3c0a52 100644 --- a/TAO/orbsvcs/tests/HTIOP/test_config.h +++ b/TAO/orbsvcs/tests/HTIOP/test_config.h @@ -35,13 +35,7 @@ #include "ace/OS_NS_stdio.h" #include "ace/Log_Msg.h" -#if defined (ACE_HAS_WINCE) -// Note that Pocket PC 2002 will NOT create a directory if it does not start with a leading '\'. -// PPC 2002 only accepts '\log' as a valid directory name, while 'log\' works under WinCE 3.0. -# define ACE_LOG_DIRECTORY_FOR_MKDIR ACE_TEXT ("\\log") -# define ACE_LOG_DIRECTORY ACE_TEXT ("\\log\\") -# define MAKE_PIPE_NAME(X) ACE_TEXT ("\\\\.\\pipe\\"#X) -#elif defined (ACE_WIN32) +#if defined (ACE_WIN32) # define ACE_LOG_DIRECTORY ACE_TEXT ("log\\") # define ACE_LOG_DIRECTORY_FOR_MKDIR ACE_TEXT ("log\\") # define MAKE_PIPE_NAME(X) ACE_TEXT ("\\\\.\\pipe\\"#X) @@ -57,11 +51,11 @@ #define ACE_LOG_FILE_EXT_NAME ACE_TEXT (".log") -#if defined (ACE_HAS_WINCE) || defined (ACE_HAS_PHARLAP) +#if defined (ACE_HAS_PHARLAP) size_t const ACE_MAX_CLIENTS = 4; #else size_t const ACE_MAX_CLIENTS = 30; -#endif /* ACE_HAS_WINCE */ +#endif /* ACE_HAS_PHARLAP */ size_t const ACE_NS_MAX_ENTRIES = 1000; size_t const ACE_DEFAULT_USECS = 1000; diff --git a/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc b/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc index a8fa7f3af1e..5769b24876a 100644 --- a/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc +++ b/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc @@ -57,12 +57,6 @@ project(nestea server) : portableserver, orbsvcsexe, avoids_minimum_corba, iorta nestea_server_i.cpp nestea_server.cpp } - // To avoid link errors with SunCC 5.[34], put this project's - // object files (and resulting SunWS_cache directory) in a different - // location than the default. - verbatim(gnuace, macros) { - VDIR = $(if $(ARCH),$(ARCH)/).obj/nestea_server/ - } } project(nestea client) : portableserver, orbsvcsexe, avoids_minimum_corba, iortable { @@ -77,11 +71,5 @@ project(nestea client) : portableserver, orbsvcsexe, avoids_minimum_corba, iorta nestea_client_i.cpp nestea_client.cpp } - // To avoid link errors with SunCC 5.[34], put this project's - // object files (and resulting SunWS_cache directory) in a different - // location than the default. - verbatim(gnuace, macros) { - VDIR = $(if $(ARCH),$(ARCH)/).obj/nestea_client/ - } } diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartServer/MessengerClient.cpp b/TAO/orbsvcs/tests/ImplRepo/RestartServer/MessengerClient.cpp index 27a7cc1090c..3d1bbe2684d 100644 --- a/TAO/orbsvcs/tests/ImplRepo/RestartServer/MessengerClient.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/RestartServer/MessengerClient.cpp @@ -55,7 +55,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { // Detection of closed on read currently not working certain platforms. -#if defined (sun) || defined (AIX) || defined (__FreeBSD_version) +#if defined (__FreeBSD_version) return 2; #endif diff --git a/TAO/orbsvcs/tests/Miop/McastLocal/README b/TAO/orbsvcs/tests/Miop/McastLocal/README index ef226909492..1d6d2bc44db 100644 --- a/TAO/orbsvcs/tests/Miop/McastLocal/README +++ b/TAO/orbsvcs/tests/Miop/McastLocal/README @@ -17,13 +17,8 @@ loopback interface (via its This is testing that these configuartion options are correctly working for MIOP. *********************************** -Note -This test currently fails on Solaris (at least ultra10) -as loopback multicasting seems to have a hardcoded (and unchangeable) SndSock -size of 0. It then throws away all data that is being sent by the client, -therefore the servers will timeout as they won't receive any message. -Some other systems (AIX and MacOS) also have problems with loopback +Some other systems (MacOS) also have problems with loopback multicasting issuing errno such as "Network/address unreachable" for each send. diff --git a/TAO/orbsvcs/tests/Notify/Basic/run_test.pl b/TAO/orbsvcs/tests/Notify/Basic/run_test.pl index fb38960eccc..4171598ddae 100755 --- a/TAO/orbsvcs/tests/Notify/Basic/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Basic/run_test.pl @@ -22,8 +22,6 @@ my $test = PerlACE::TestTarget::create_target (3) || die "Create target 3 failed $test->AddLibPath ('../lib'); -PerlACE::check_privilege_group(); - $experiment_timeout = 60; $startup_timeout = 60; diff --git a/TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl b/TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl index 1f699934ef0..d8abc1dad28 100755 --- a/TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl +++ b/TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl @@ -22,8 +22,6 @@ my $test = PerlACE::TestTarget::create_target (3) || die "Create target 3 failed $test->AddLibPath ('../lib'); -PerlACE::check_privilege_group(); - $experiment_timeout = 60; $startup_timeout = 60; diff --git a/TAO/orbsvcs/tests/Notify/Blocking/run_test.pl b/TAO/orbsvcs/tests/Notify/Blocking/run_test.pl index 1e3905e547c..65a6f4e22fa 100755 --- a/TAO/orbsvcs/tests/Notify/Blocking/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Blocking/run_test.pl @@ -24,8 +24,6 @@ my $con = PerlACE::TestTarget::create_target (4) || die "Create target 4 failed\ $sup->AddLibPath ('../lib'); $con->AddLibPath ('../lib'); -PerlACE::check_privilege_group(); - $port = $ns->RandomPort (); $host = $ns->HostName (); diff --git a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/run_test.pl b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/run_test.pl index 78f6114cfeb..7aebe8adb25 100755 --- a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/run_test.pl @@ -24,8 +24,6 @@ my $con = PerlACE::TestTarget::create_target (4) || die "Create target 4 failed\ $sup->AddLibPath ('../lib'); $con->AddLibPath ('../lib'); -PerlACE::check_privilege_group(); - $port = $ns->RandomPort (); $host = $ns->HostName (); diff --git a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/run_test.pl b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/run_test.pl index 91ae2a85513..4680033d4e9 100755 --- a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/run_test.pl @@ -24,8 +24,6 @@ my $con = PerlACE::TestTarget::create_target (4) || die "Create target 4 failed\ $sup->AddLibPath ('../lib'); $con->AddLibPath ('../lib'); -PerlACE::check_privilege_group(); - $domain1 = "domain1"; $domain2 = "domain2"; $expect_pass = "0"; diff --git a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/run_test.pl b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/run_test.pl index 46929f02acf..793ae6427e5 100755 --- a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/run_test.pl @@ -26,8 +26,6 @@ $sup->AddLibPath ('../lib'); $con1->AddLibPath ('../lib'); $con2->AddLibPath ('../lib'); -PerlACE::check_privilege_group(); - $port = $ns->RandomPort (); $host = $ns->HostName (); diff --git a/TAO/orbsvcs/tests/Notify/Discarding/run_test.pl b/TAO/orbsvcs/tests/Notify/Discarding/run_test.pl index 72ee2ef01ec..94b32ace888 100755 --- a/TAO/orbsvcs/tests/Notify/Discarding/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Discarding/run_test.pl @@ -28,8 +28,6 @@ $stc->AddLibPath ('../lib'); $ses->AddLibPath ('../lib'); $sec->AddLibPath ('../lib'); -PerlACE::check_privilege_group(); - $port = $ns->RandomPort (); $host = $ns->HostName (); $deadline = 0; diff --git a/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl b/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl index 08fb3d48377..4d89c2ea9c4 100755 --- a/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl @@ -7,8 +7,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::TestTarget; -PerlACE::check_privilege_group(); - $status = 0; $debug_level = '0'; diff --git a/TAO/orbsvcs/tests/Notify/MC/run_test.pl b/TAO/orbsvcs/tests/Notify/MC/run_test.pl index 2c39fbdd1d8..0c94da066bd 100755 --- a/TAO/orbsvcs/tests/Notify/MC/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/MC/run_test.pl @@ -26,8 +26,6 @@ $mon->AddLibPath ('../lib'); $sup->AddLibPath ('../lib'); $con->AddLibPath ('../lib'); -PerlACE::check_privilege_group(); - # define the following as necessary to customize the test my $static_build = 0; my $port = $ns->RandomPort (); diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl b/TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl index c5bbbcf2552..4132769ee50 100755 --- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl @@ -24,8 +24,6 @@ my $con = PerlACE::TestTarget::create_target (4) || die "Create target 4 failed\ $sup->AddLibPath ('../lib'); $con->AddLibPath ('../lib'); -PerlACE::check_privilege_group(); - $experiment_timeout = 60; $startup_timeout = 60; $shutdown_timeout = 10; diff --git a/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl b/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl index b26025b89d4..fbe92157694 100755 --- a/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl @@ -28,8 +28,6 @@ $stc->AddLibPath ('../lib'); $ses->AddLibPath ('../lib'); $sec->AddLibPath ('../lib'); -PerlACE::check_privilege_group(); - $deadline = 0; $port = $ns->RandomPort (); $host = $ns->HostName (); diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h index 110c1cbf2c6..a5457acb7d2 100644 --- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h +++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h @@ -50,10 +50,6 @@ protected: /// Create the POA with the params parsed. void create (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_poa); -#ifdef HPUX_11 - // Remove clash with /usr/include/machine/cpu.h and /usr/include/pa/cpu.h -#undef COMMAND -#endif enum COMMAND { CREATE, diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl index 8c557aa1972..efb64a5eacf 100755 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl @@ -24,8 +24,6 @@ my $con = PerlACE::TestTarget::create_target (4) || die "Create target 4 failed\ $sup->AddLibPath ('../lib'); $con->AddLibPath ('../lib'); -PerlACE::check_privilege_group(); - $port = $ns->RandomPort (); $host = $ns->HostName (); diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl index d9b2fbadf98..fdc1cd84a40 100755 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl @@ -24,8 +24,6 @@ my $con = PerlACE::TestTarget::create_target (4) || die "Create target 4 failed\ $sup->AddLibPath ('../lib'); $con->AddLibPath ('../lib'); -PerlACE::check_privilege_group(); - $port = $ns->RandomPort (); $host = $ns->HostName (); diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl index 3b6d2c1b6c7..556c71e84de 100755 --- a/TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl @@ -24,8 +24,6 @@ my $con = PerlACE::TestTarget::create_target (4) || die "Create target 4 failed\ $sup->AddLibPath ('../lib'); $con->AddLibPath ('../lib'); -PerlACE::check_privilege_group(); - $port = $ns->RandomPort (); $host = $ns->HostName (); diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl index 7002b6aaf44..15b32fb30aa 100755 --- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl @@ -24,8 +24,6 @@ my $con = PerlACE::TestTarget::create_target (4) || die "Create target 4 failed\ $sup->AddLibPath ('../lib'); $con->AddLibPath ('../lib'); -PerlACE::check_privilege_group(); - $port = $ns->RandomPort (); $host = $ns->HostName (); diff --git a/TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl b/TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl index c6282c68e8b..0b38411716b 100755 --- a/TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl @@ -21,8 +21,6 @@ my $nfs = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\ my $sup = PerlACE::TestTarget::create_target (3) || die "Create target 3 failed\n"; my $con = PerlACE::TestTarget::create_target (4) || die "Create target 4 failed\n"; -PerlACE::check_privilege_group(); - $experiment_timeout = 120; $startup_timeout = 120; $nfsconffile = "notify.conf"; diff --git a/TAO/orbsvcs/tests/Notify/Timeout/run_test.pl b/TAO/orbsvcs/tests/Notify/Timeout/run_test.pl index 0795c8cce42..1c95fc0d989 100755 --- a/TAO/orbsvcs/tests/Notify/Timeout/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Timeout/run_test.pl @@ -25,8 +25,6 @@ $sup->AddLibPath ('../lib'); $con->AddLibPath ('../lib'); $ns->AddLibPath ('../lib'); -PerlACE::check_privilege_group(); - #my $nscorbaloc = "-ORBInitRef NameService=file://$namingior"; my $supiorfile = "supplier.ior"; diff --git a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp index be12aa0b2b0..3df1a5da8d2 100644 --- a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp +++ b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp @@ -3,12 +3,12 @@ #include "orbsvcs/NotifyExtC.h" #include "orbsvcs/Notify/Notify_EventChannelFactory_i.h" -// On SunOS 5.8 and MacOS X, the static initialization trick used +// On MacOS X, the static initialization trick used // in the CosNotification_Serv library does not work. Including the // initializer class here works around the problem. -#if defined (sun) || defined (__APPLE__) +#if defined (__APPLE__) #include "orbsvcs/Notify/CosNotify_Initializer.h" -#endif /* sun || __APPLE__ */ +#endif /* __APPLE__ */ #include "tao/TimeBaseC.h" #include "tao/corba.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Application_Command.h b/TAO/orbsvcs/tests/Notify/lib/Application_Command.h index 1f7ecaefee3..527e2bc4844 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Application_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/Application_Command.h @@ -45,10 +45,6 @@ public: static const char* name (); protected: -#ifdef HPUX_11 - // Remove clash with /usr/include/machine/cpu.h and /usr/include/pa/cpu.h -#undef COMMAND -#endif enum COMMAND { INIT, diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h b/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h index 4cc0689e70c..559ed609abe 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h +++ b/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h @@ -25,10 +25,6 @@ class TAO_Notify_Tests_Command; * * @brief Template class to create COMMAND specific factories. */ -#ifdef HPUX_11 - // Remove clash with /usr/include/machine/cpu.h and /usr/include/pa/cpu.h -#undef COMMAND -#endif template <class COMMAND> class TAO_Notify_Tests_Command_Factory_T : public TAO_Notify_Tests_Command_Factory, public ACE_Service_Object { @@ -47,13 +43,7 @@ public: TAO_Notify_Tests_Command* create (); }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Command_Factory_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Command_Factory_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* TAO_COMMAND_FACTORY_T_H */ diff --git a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h index 7b9a8b7cf82..581379612e4 100644 --- a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h @@ -45,10 +45,6 @@ public: protected: /// = Data Members -#ifdef HPUX_11 - // Remove clash with /usr/include/machine/cpu.h and /usr/include/pa/cpu.h -#undef COMMAND -#endif enum COMMAND { CREATE, diff --git a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h index e9cedf5d4db..8ba7047f528 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h +++ b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h @@ -74,13 +74,7 @@ protected: const CosNotification::EventTypeSeq & removed); }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Consumer_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Consumer_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* TAO_Notify_Tests_CONSUMER_T_H */ diff --git a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h index aa45aef7489..9900fe4772a 100644 --- a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h @@ -49,10 +49,6 @@ public: protected: ///= Data Members -#ifdef HPUX_11 - // Remove clash with /usr/include/machine/cpu.h and /usr/include/pa/cpu.h -#undef COMMAND -#endif enum COMMAND { CREATE, diff --git a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h index f679a6682b4..66bd77adb5d 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h @@ -44,10 +44,6 @@ public: static const char* name (); protected: -#ifdef HPUX_11 - // Remove clash with /usr/include/machine/cpu.h and /usr/include/pa/cpu.h -#undef COMMAND -#endif enum COMMAND { CREATE_FACTORY, diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer_T.h b/TAO/orbsvcs/tests/Notify/lib/Peer_T.h index 263b2df4803..af5ed4e01ad 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Peer_T.h +++ b/TAO/orbsvcs/tests/Notify/lib/Peer_T.h @@ -103,13 +103,7 @@ protected: typename Proxy_Traits::ID proxy_id_; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Peer_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Peer_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* TAO_Notify_Tests_PEER_T_H */ diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h index 12778f61a6e..cac534dd344 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h @@ -47,10 +47,6 @@ public: protected: ///= Data Members -#ifdef HPUX_11 - // Remove clash with /usr/include/machine/cpu.h and /usr/include/pa/cpu.h -#undef COMMAND -#endif enum COMMAND { CREATE, diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h index e0d01d2559d..557188fd4d1 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h @@ -46,10 +46,6 @@ public: static const char* name (); protected: -#ifdef HPUX_11 - // Remove clash with /usr/include/machine/cpu.h and /usr/include/pa/cpu.h -#undef COMMAND -#endif enum COMMAND { CREATE, diff --git a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h index e7b13a30048..f95c319339c 100644 --- a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h @@ -44,10 +44,6 @@ public: static const char* name (); protected: -#ifdef HPUX_11 - // Remove clash with /usr/include/machine/cpu.h and /usr/include/pa/cpu.h -#undef COMMAND -#endif enum COMMAND { CREATE, diff --git a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h index 43d4e6310b2..cd580dab358 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h +++ b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h @@ -75,13 +75,7 @@ protected: const CosNotification::EventTypeSeq & removed); }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Supplier_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Supplier_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* TAO_Notify_Tests_SUPPLIER_T_H */ diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl index 3c4198790f7..cf925af1e25 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl @@ -7,8 +7,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::TestTarget; -PerlACE::check_privilege_group(); - my $nm_service = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; my $nt_service = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; my $consumer = PerlACE::TestTarget::create_target (3) || die "Create target 3 failed\n"; diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl index 9411ec61050..0567a2f11c2 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl @@ -6,8 +6,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::TestTarget; -PerlACE::check_privilege_group(); - $status = 0; @test_configs = ( "reactive.conf", "lookup.conf", "listener.conf"); diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl index a20b3706fb3..546265378a4 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl @@ -22,8 +22,6 @@ my $nfs = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\ my $sup = PerlACE::TestTarget::create_target (3) || die "Create target 3 failed\n"; my $con = PerlACE::TestTarget::create_target (4) || die "Create target 4 failed\n"; -PerlACE::check_privilege_group(); - # -n notify.conf -s supplier.conf -c consumer.conf -o output_dir -h getopts ("n:s:c:o:h"); diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl index 0a4f35bb22c..45c3137daeb 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl @@ -22,8 +22,6 @@ my $nfs = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\ my $sup = PerlACE::TestTarget::create_target (3) || die "Create target 3 failed\n"; my $con = PerlACE::TestTarget::create_target (4) || die "Create target 4 failed\n"; -PerlACE::check_privilege_group(); - # -n notify.conf -s supplier.conf -c consumer.conf -o output_dir -h getopts ("n:s:c:o:h"); diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl index f58e0e09cc9..06f7066d653 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl @@ -22,8 +22,6 @@ my $nfs = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\ my $sup = PerlACE::TestTarget::create_target (3) || die "Create target 3 failed\n"; my $con = PerlACE::TestTarget::create_target (4) || die "Create target 4 failed\n"; -PerlACE::check_privilege_group(); - # -n notify.conf -s supplier.conf -c consumer.conf -o output_dir -h getopts ("n:s:c:o:h:debug"); diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/run_test.pl index 93777990d13..92fd042da40 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/run_test.pl @@ -22,8 +22,6 @@ my $nfs = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\ my $sup = PerlACE::TestTarget::create_target (3) || die "Create target 3 failed\n"; my $con = PerlACE::TestTarget::create_target (4) || die "Create target 4 failed\n"; -PerlACE::check_privilege_group(); - # -n notify.conf -s supplier.conf -c consumer.conf -o output_dir -h getopts ("n:s:c:o:h:debug"); diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_notify.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_notify.pl index f9b2b14509b..8563834b89c 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_notify.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_notify.pl @@ -9,8 +9,6 @@ use PerlACE::TestTarget; use File::Copy; use Getopt::Std; -PerlACE::check_privilege_group(); - $status = 0; $debug_level = '0'; diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_test.pl index 889e1dfba12..275ed49867e 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_test.pl @@ -9,10 +9,6 @@ use PerlACE::TestTarget; use File::Copy; use Getopt::Std; -PerlACE::check_privilege_group(); - -$status = 0; - # -n notify.conf -s high_path.conf -c other_paths.conf -o output_dir -h getopts ("n:s:c:o:h"); diff --git a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h index cd921327d7a..6417e6df24d 100644 --- a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h +++ b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h @@ -39,8 +39,6 @@ private: #pragma warning(pop) #endif /* _MSC_VER */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Simple_Dynamic.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* TAO_SIMPLE_DYNAMIC_H */ diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.h b/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.h index be09dae14cd..61ff56473b8 100644 --- a/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.h +++ b/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.h @@ -49,14 +49,7 @@ class ServantList ServantRecordVector servant_records_; }; - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ServantList_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("ServantList_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* SERVANTLIST_T_H */ diff --git a/TAO/performance-tests/Callback/client.cpp b/TAO/performance-tests/Callback/client.cpp index 87e5d3a9e8b..df0df95f20c 100644 --- a/TAO/performance-tests/Callback/client.cpp +++ b/TAO/performance-tests/Callback/client.cpp @@ -50,10 +50,9 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, - priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/performance-tests/Callback/server.cpp b/TAO/performance-tests/Callback/server.cpp index e12195d755d..d7a2a43ec3b 100644 --- a/TAO/performance-tests/Callback/server.cpp +++ b/TAO/performance-tests/Callback/server.cpp @@ -18,10 +18,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, - priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. - + priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp index 6d1f4e8b305..46e4e4e960b 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp @@ -17,7 +17,7 @@ int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, ACE_THR_PRI_FIFO_DEF, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp index 5ba42c3f4db..ee6fff88605 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp @@ -23,10 +23,9 @@ int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { int priority = ACE_THR_PRI_FIFO_DEF; - priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, - priority); + priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp index 9c2afdb429c..6ddfa802019 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp @@ -76,12 +76,12 @@ int Globals::sched_fifo_init () { #if defined (ACE_HAS_THREADS) - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. -# if defined (_AIX) || defined (__APPLE__) || defined (BSD) + // Enable FIFO scheduling +# if defined (__APPLE__) || defined (BSD) int scope = ACE_SCOPE_THREAD; # else int scope = ACE_SCOPE_PROCESS; -# endif /* _AIX */ +# endif /* __APPLE__ || BSD */ if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, SCHED_PRIORITY, diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h index 3f116926ccd..33806d6f47c 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h @@ -49,8 +49,6 @@ if (status != OK)\ #elif defined (ACE_WIN32) || defined (__FreeBSD__) #define SCHED_PRIORITY \ ACE_Sched_Params::priority_max(ACE_SCHED_FIFO,ACE_SCOPE_THREAD) -#elif defined (HPUX) -#define SCHED_PRIORITY ACE_THR_PRI_FIFO_MAX #else #define SCHED_PRIORITY \ ACE_THR_PRI_FIFO_DEF + 25 @@ -110,7 +108,7 @@ public: int parse_args (int argc, ACE_TCHAR **argv); /** - * Enables fifo scheduling eg., RT scheduling class on solaris. + * Enables fifo scheduling. * Returns 0 on success, 1 if insufficient permission, or -1 * for other failure. As a side effect, sets thr_create_flags * appropriately. diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/README.tests b/TAO/performance-tests/Cubit/TAO/MT_Cubit/README.tests index 13150470eb2..99528977530 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/README.tests +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/README.tests @@ -23,7 +23,7 @@ The percentage of overhead is calculated in the following way: Latency Test ------------------------ -- configuration: - (1) su to root when running Solaris or LynxOS. + (1) su to root when on LynxOS. (2) Make yourself an Administrator in Windows NT on the server side: diff --git a/TAO/performance-tests/Latency/AMH_Single_Threaded/client.cpp b/TAO/performance-tests/Latency/AMH_Single_Threaded/client.cpp index cbcd21bd8dc..544bc599f18 100644 --- a/TAO/performance-tests/Latency/AMH_Single_Threaded/client.cpp +++ b/TAO/performance-tests/Latency/AMH_Single_Threaded/client.cpp @@ -61,8 +61,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/performance-tests/Latency/AMH_Single_Threaded/server.cpp b/TAO/performance-tests/Latency/AMH_Single_Threaded/server.cpp index 209c71bf7c3..f92a5fb4eee 100644 --- a/TAO/performance-tests/Latency/AMH_Single_Threaded/server.cpp +++ b/TAO/performance-tests/Latency/AMH_Single_Threaded/server.cpp @@ -41,8 +41,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. - + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/performance-tests/Latency/AMI/client.cpp b/TAO/performance-tests/Latency/AMI/client.cpp index fffeb23c96d..997c2687aec 100644 --- a/TAO/performance-tests/Latency/AMI/client.cpp +++ b/TAO/performance-tests/Latency/AMI/client.cpp @@ -52,8 +52,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/performance-tests/Latency/AMI/server.cpp b/TAO/performance-tests/Latency/AMI/server.cpp index 0951ffe2be9..1ba7876caee 100644 --- a/TAO/performance-tests/Latency/AMI/server.cpp +++ b/TAO/performance-tests/Latency/AMI/server.cpp @@ -47,13 +47,10 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, - priority); + priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); + priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, - priority); - - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/performance-tests/Latency/Collocation/Collocated_Test.cpp b/TAO/performance-tests/Latency/Collocation/Collocated_Test.cpp index 1b52a033215..ab5360f499d 100644 --- a/TAO/performance-tests/Latency/Collocation/Collocated_Test.cpp +++ b/TAO/performance-tests/Latency/Collocation/Collocated_Test.cpp @@ -38,8 +38,7 @@ set_priority() + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. - + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/performance-tests/Latency/DII/client.cpp b/TAO/performance-tests/Latency/DII/client.cpp index 918af48016c..f7fbd361812 100644 --- a/TAO/performance-tests/Latency/DII/client.cpp +++ b/TAO/performance-tests/Latency/DII/client.cpp @@ -62,8 +62,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. - + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/performance-tests/Latency/DII/server.cpp b/TAO/performance-tests/Latency/DII/server.cpp index 209c71bf7c3..5d88b4f0565 100644 --- a/TAO/performance-tests/Latency/DII/server.cpp +++ b/TAO/performance-tests/Latency/DII/server.cpp @@ -41,7 +41,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/Latency/DSI/client.cpp b/TAO/performance-tests/Latency/DSI/client.cpp index c71229731e0..ffe3425aa61 100644 --- a/TAO/performance-tests/Latency/DSI/client.cpp +++ b/TAO/performance-tests/Latency/DSI/client.cpp @@ -60,7 +60,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/Latency/DSI/server.cpp b/TAO/performance-tests/Latency/DSI/server.cpp index 3f26308a7ca..e3881b066dd 100644 --- a/TAO/performance-tests/Latency/DSI/server.cpp +++ b/TAO/performance-tests/Latency/DSI/server.cpp @@ -41,7 +41,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/Latency/Deferred/client.cpp b/TAO/performance-tests/Latency/Deferred/client.cpp index caefd2ff1a6..5803b9977d3 100644 --- a/TAO/performance-tests/Latency/Deferred/client.cpp +++ b/TAO/performance-tests/Latency/Deferred/client.cpp @@ -74,7 +74,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/Latency/Deferred/server.cpp b/TAO/performance-tests/Latency/Deferred/server.cpp index 209c71bf7c3..5d88b4f0565 100644 --- a/TAO/performance-tests/Latency/Deferred/server.cpp +++ b/TAO/performance-tests/Latency/Deferred/server.cpp @@ -41,7 +41,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/Latency/Single_Threaded/client.cpp b/TAO/performance-tests/Latency/Single_Threaded/client.cpp index cbcd21bd8dc..e2e51c13a18 100644 --- a/TAO/performance-tests/Latency/Single_Threaded/client.cpp +++ b/TAO/performance-tests/Latency/Single_Threaded/client.cpp @@ -61,7 +61,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/Latency/Single_Threaded/server.cpp b/TAO/performance-tests/Latency/Single_Threaded/server.cpp index 529769656f1..d9007a77da5 100644 --- a/TAO/performance-tests/Latency/Single_Threaded/server.cpp +++ b/TAO/performance-tests/Latency/Single_Threaded/server.cpp @@ -41,7 +41,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/client.cpp b/TAO/performance-tests/Latency/Thread_Per_Connection/client.cpp index 8d28b314596..b377c69f6dd 100644 --- a/TAO/performance-tests/Latency/Thread_Per_Connection/client.cpp +++ b/TAO/performance-tests/Latency/Thread_Per_Connection/client.cpp @@ -54,7 +54,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp b/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp index 529769656f1..d9007a77da5 100644 --- a/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp +++ b/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp @@ -41,7 +41,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/Latency/Thread_Pool/client.cpp b/TAO/performance-tests/Latency/Thread_Pool/client.cpp index 8d28b314596..b377c69f6dd 100644 --- a/TAO/performance-tests/Latency/Thread_Pool/client.cpp +++ b/TAO/performance-tests/Latency/Thread_Pool/client.cpp @@ -54,7 +54,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/Latency/Thread_Pool/server.cpp b/TAO/performance-tests/Latency/Thread_Pool/server.cpp index d35b4a08a41..716a84e6042 100644 --- a/TAO/performance-tests/Latency/Thread_Pool/server.cpp +++ b/TAO/performance-tests/Latency/Thread_Pool/server.cpp @@ -42,7 +42,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/POA/Create_Reference/create_reference.cpp b/TAO/performance-tests/POA/Create_Reference/create_reference.cpp index 2914991822a..4f6b1de5845 100644 --- a/TAO/performance-tests/POA/Create_Reference/create_reference.cpp +++ b/TAO/performance-tests/POA/Create_Reference/create_reference.cpp @@ -53,7 +53,7 @@ set_rt_scheduling () + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/POA/Implicit_Activation/client.cpp b/TAO/performance-tests/POA/Implicit_Activation/client.cpp index 526edd50312..e8188c08c68 100644 --- a/TAO/performance-tests/POA/Implicit_Activation/client.cpp +++ b/TAO/performance-tests/POA/Implicit_Activation/client.cpp @@ -57,7 +57,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp b/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp index 091ecb4f5f8..8587cedfeed 100644 --- a/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp +++ b/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp @@ -49,7 +49,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/POA/Implicit_Activation/server.cpp b/TAO/performance-tests/POA/Implicit_Activation/server.cpp index 4cef3ab975f..6badd57f616 100644 --- a/TAO/performance-tests/POA/Implicit_Activation/server.cpp +++ b/TAO/performance-tests/POA/Implicit_Activation/server.cpp @@ -40,7 +40,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp index 5940f002126..5a5677a4ff4 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp @@ -119,7 +119,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int priority = ACE_Sched_Params::priority_max (policy); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (policy, priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp index d1e5690f65f..2d937ba6028 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp @@ -86,7 +86,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int priority = ACE_Sched_Params::priority_max (policy); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (policy, priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp index 0e1c3d78eed..3f678aa1b6d 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp @@ -118,7 +118,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int priority = ACE_Sched_Params::priority_max (policy); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (policy, priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp index 167267759b2..4cc17873754 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp @@ -39,7 +39,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int priority = (ACE_Sched_Params::priority_max (policy)); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (policy, priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp index 7c0184fc5d9..08b6a53b82e 100644 --- a/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp +++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp @@ -366,7 +366,7 @@ set_rt_mode () (ACE_Sched_Params::priority_min (policy) + ACE_Sched_Params::priority_max (policy)) / 2; - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling int result = ACE_OS::sched_params (ACE_Sched_Params (policy, priority, diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp index b450e05b3d5..f38ce3b0f29 100644 --- a/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp +++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp @@ -42,7 +42,7 @@ set_rt_mode () (ACE_Sched_Params::priority_min (policy) + ACE_Sched_Params::priority_max (policy)) / 2; - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling int result = ACE_OS::sched_params (ACE_Sched_Params (policy, priority, diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp index 64c44e0d706..cf8de4e49ea 100644 --- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp @@ -341,7 +341,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp index 209c71bf7c3..5d88b4f0565 100644 --- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp @@ -41,7 +41,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/Sequence_Latency/AMI/client.cpp b/TAO/performance-tests/Sequence_Latency/AMI/client.cpp index d5d1921e003..d47149195b5 100644 --- a/TAO/performance-tests/Sequence_Latency/AMI/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/AMI/client.cpp @@ -347,7 +347,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/Sequence_Latency/AMI/server.cpp b/TAO/performance-tests/Sequence_Latency/AMI/server.cpp index 0951ffe2be9..fdaa47719f4 100644 --- a/TAO/performance-tests/Sequence_Latency/AMI/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/AMI/server.cpp @@ -53,7 +53,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/performance-tests/Sequence_Latency/DII/client.cpp b/TAO/performance-tests/Sequence_Latency/DII/client.cpp index 8498b310c13..f7813fce894 100644 --- a/TAO/performance-tests/Sequence_Latency/DII/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/DII/client.cpp @@ -384,7 +384,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/Sequence_Latency/DII/server.cpp b/TAO/performance-tests/Sequence_Latency/DII/server.cpp index 209c71bf7c3..5d88b4f0565 100644 --- a/TAO/performance-tests/Sequence_Latency/DII/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/DII/server.cpp @@ -41,7 +41,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/Sequence_Latency/DSI/client.cpp b/TAO/performance-tests/Sequence_Latency/DSI/client.cpp index 54ec9a64dde..44c7a7ba2fe 100644 --- a/TAO/performance-tests/Sequence_Latency/DSI/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/DSI/client.cpp @@ -343,7 +343,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/Sequence_Latency/DSI/server.cpp b/TAO/performance-tests/Sequence_Latency/DSI/server.cpp index 3f26308a7ca..e3881b066dd 100644 --- a/TAO/performance-tests/Sequence_Latency/DSI/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/DSI/server.cpp @@ -41,7 +41,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp b/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp index b159411c7d5..2049494d33e 100644 --- a/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp @@ -517,7 +517,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/server.cpp b/TAO/performance-tests/Sequence_Latency/Deferred/server.cpp index 209c71bf7c3..5d88b4f0565 100644 --- a/TAO/performance-tests/Sequence_Latency/Deferred/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/Deferred/server.cpp @@ -41,7 +41,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/client.cpp b/TAO/performance-tests/Sequence_Latency/Single_Threaded/client.cpp index 2b48adf7df4..968ba7c989a 100644 --- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/client.cpp @@ -340,7 +340,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp b/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp index cf5aa69814b..85e878952a3 100644 --- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp @@ -41,7 +41,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp index efe0b8651db..8e896f6c934 100644 --- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp @@ -76,7 +76,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp index 529769656f1..d9007a77da5 100644 --- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp @@ -41,7 +41,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/client.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Pool/client.cpp index 29a4c32a8a0..96f776e6a87 100644 --- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/client.cpp @@ -75,7 +75,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp index 52c17060905..d3a8e1e97c8 100644 --- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp @@ -42,7 +42,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/tao/Acceptor_Impl.h b/TAO/tao/Acceptor_Impl.h index 00cdf060c87..789d371b91d 100644 --- a/TAO/tao/Acceptor_Impl.h +++ b/TAO/tao/Acceptor_Impl.h @@ -101,13 +101,7 @@ protected: TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Acceptor_Impl.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Acceptor_Impl.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* TAO_ACCEPTOR_IMPL_H */ diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode.h b/TAO/tao/AnyTypeCode/Alias_TypeCode.h index 43156baa098..dbf21a25ecb 100644 --- a/TAO/tao/AnyTypeCode/Alias_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Alias_TypeCode.h @@ -115,13 +115,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL # include "tao/AnyTypeCode/Alias_TypeCode.inl" #endif /* __ACE_INLINE__ */ -#ifdef ACE_TEMPLATES_REQUIRE_SOURCE -# include "tao/AnyTypeCode/Alias_TypeCode.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA -# pragma implementation ("Alias_TypeCode.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ +#include "tao/AnyTypeCode/Alias_TypeCode.cpp" #include /**/ "ace/post.h" diff --git a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h index 75d1d23a1c3..39e1e8a469c 100644 --- a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h +++ b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h @@ -67,13 +67,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL # include "tao/AnyTypeCode/Any_Array_Impl_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/AnyTypeCode/Any_Array_Impl_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Any_Array_Impl_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h index fdd7343bbaf..902b219a567 100644 --- a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h +++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h @@ -64,13 +64,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL # include "tao/AnyTypeCode/Any_Basic_Impl_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/AnyTypeCode/Any_Basic_Impl_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Any_Basic_Impl_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h index dd627266355..e58f7734748 100644 --- a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h +++ b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h @@ -87,13 +87,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL # include "tao/AnyTypeCode/Any_Dual_Impl_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/AnyTypeCode/Any_Dual_Impl_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Any_Dual_Impl_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/AnyTypeCode/Any_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Impl_T.h index 6b36a5289de..9f7866a8b55 100644 --- a/TAO/tao/AnyTypeCode/Any_Impl_T.h +++ b/TAO/tao/AnyTypeCode/Any_Impl_T.h @@ -77,13 +77,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/AnyTypeCode/Any_Impl_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Any_Impl_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h index c57d09c7a04..039935a7b70 100644 --- a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h +++ b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h @@ -69,13 +69,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL # include "tao/AnyTypeCode/Any_Special_Impl_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/AnyTypeCode/Any_Special_Impl_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Any_Special_Impl_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode.h b/TAO/tao/AnyTypeCode/Enum_TypeCode.h index 66946b70841..707a495883e 100644 --- a/TAO/tao/AnyTypeCode/Enum_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Enum_TypeCode.h @@ -116,14 +116,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL # include "tao/AnyTypeCode/Enum_TypeCode.inl" #endif /* __ACE_INLINE__ */ -#ifdef ACE_TEMPLATES_REQUIRE_SOURCE -# include "tao/AnyTypeCode/Enum_TypeCode.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA -# pragma implementation ("Enum_TypeCode.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - +#include "tao/AnyTypeCode/Enum_TypeCode.cpp" #include /**/ "ace/post.h" diff --git a/TAO/tao/AnyTypeCode/Fixed_TypeCode.h b/TAO/tao/AnyTypeCode/Fixed_TypeCode.h index f655c3353b5..cd0a1550810 100644 --- a/TAO/tao/AnyTypeCode/Fixed_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Fixed_TypeCode.h @@ -92,14 +92,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL # include "tao/AnyTypeCode/Fixed_TypeCode.inl" #endif /* __ACE_INLINE__ */ -#ifdef ACE_TEMPLATES_REQUIRE_SOURCE -# include "tao/AnyTypeCode/Fixed_TypeCode.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA -# pragma implementation ("Fixed_TypeCode.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - +#include "tao/AnyTypeCode/Fixed_TypeCode.cpp" #include /**/ "ace/post.h" diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode.h b/TAO/tao/AnyTypeCode/Objref_TypeCode.h index 900ba64df0d..6e9957dda9a 100644 --- a/TAO/tao/AnyTypeCode/Objref_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Objref_TypeCode.h @@ -102,13 +102,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL # include "tao/AnyTypeCode/Objref_TypeCode.inl" #endif /* __ACE_INLINE__ */ -#ifdef ACE_TEMPLATES_REQUIRE_SOURCE -# include "tao/AnyTypeCode/Objref_TypeCode.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA -# pragma implementation ("Objref_TypeCode.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ +#include "tao/AnyTypeCode/Objref_TypeCode.cpp" #include /**/ "ace/post.h" diff --git a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h index 42eda17ed6a..3b922048bfa 100644 --- a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h @@ -170,13 +170,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL # include "tao/AnyTypeCode/Recursive_Type_TypeCode.inl" #endif /* __ACE_INLINE__ */ -#ifdef ACE_TEMPLATES_REQUIRE_SOURCE -# include "tao/AnyTypeCode/Recursive_Type_TypeCode.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA -# pragma implementation ("Recursive_Type_TypeCode.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ +#include "tao/AnyTypeCode/Recursive_Type_TypeCode.cpp" #include /**/ "ace/post.h" diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode.h b/TAO/tao/AnyTypeCode/Sequence_TypeCode.h index 8f0172be861..af3db83cce4 100644 --- a/TAO/tao/AnyTypeCode/Sequence_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode.h @@ -105,14 +105,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL # include "tao/AnyTypeCode/Sequence_TypeCode.inl" #endif /* __ACE_INLINE__ */ -#ifdef ACE_TEMPLATES_REQUIRE_SOURCE -# include "tao/AnyTypeCode/Sequence_TypeCode.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA -# pragma implementation ("Sequence_TypeCode.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - +#include "tao/AnyTypeCode/Sequence_TypeCode.cpp" #include /**/ "ace/post.h" diff --git a/TAO/tao/AnyTypeCode/String_TypeCode.h b/TAO/tao/AnyTypeCode/String_TypeCode.h index 4f7385135da..8c1b17337a0 100644 --- a/TAO/tao/AnyTypeCode/String_TypeCode.h +++ b/TAO/tao/AnyTypeCode/String_TypeCode.h @@ -91,13 +91,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL # include "tao/AnyTypeCode/String_TypeCode.inl" #endif /* __ACE_INLINE__ */ -#ifdef ACE_TEMPLATES_REQUIRE_SOURCE -# include "tao/AnyTypeCode/String_TypeCode.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA -# pragma implementation ("String_TypeCode.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ +#include "tao/AnyTypeCode/String_TypeCode.cpp" #include /**/ "ace/post.h" diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode.h b/TAO/tao/AnyTypeCode/Struct_TypeCode.h index a8911809dfc..e8e8642536b 100644 --- a/TAO/tao/AnyTypeCode/Struct_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Struct_TypeCode.h @@ -133,14 +133,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL # include "tao/AnyTypeCode/Struct_TypeCode.inl" #endif /* __ACE_INLINE__ */ -#ifdef ACE_TEMPLATES_REQUIRE_SOURCE -# include "tao/AnyTypeCode/Struct_TypeCode.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA -# pragma implementation ("Struct_TypeCode.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - +#include "tao/AnyTypeCode/Struct_TypeCode.cpp" #include /**/ "ace/post.h" diff --git a/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h b/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h index 3ff1801cffd..2a1777eb29f 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h @@ -80,14 +80,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL # include "tao/AnyTypeCode/TypeCode_Base_Attributes.inl" #endif /* __ACE_INLINE__ */ -#ifdef ACE_TEMPLATES_REQUIRE_SOURCE -# include "tao/AnyTypeCode/TypeCode_Base_Attributes.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA -# pragma implementation ("TypeCode_Base_Attributes.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - +#include "tao/AnyTypeCode/TypeCode_Base_Attributes.cpp" #include /**/ "ace/post.h" diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h index 87de72be46e..343c3200ff4 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h @@ -176,13 +176,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL # include "tao/AnyTypeCode/TypeCode_Case_Base_T.inl" #endif /* __ACE_INLINE__ */ -#ifdef ACE_TEMPLATES_REQUIRE_SOURCE -# include "tao/AnyTypeCode/TypeCode_Case_Base_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA -# pragma implementation ("TypeCode_Case_Base_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ +#include "tao/AnyTypeCode/TypeCode_Case_Base_T.cpp" #include /**/ "ace/post.h" diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h b/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h index d23aaa6b247..8ec7ef499a3 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h @@ -94,13 +94,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL # include "tao/AnyTypeCode/TypeCode_Case_Enum_T.inl" #endif /* __ACE_INLINE__ */ -#ifdef ACE_TEMPLATES_REQUIRE_SOURCE -# include "tao/AnyTypeCode/TypeCode_Case_Enum_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA -# pragma implementation ("TypeCode_Case_Enum_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ +#include "tao/AnyTypeCode/TypeCode_Case_Enum_T.cpp" #include /**/ "ace/post.h" diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_T.h b/TAO/tao/AnyTypeCode/TypeCode_Case_T.h index f859e06ff04..97bac3b0a7a 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_T.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_T.h @@ -127,13 +127,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL # include "tao/AnyTypeCode/TypeCode_Case_T.inl" #endif /* __ACE_INLINE__ */ -#ifdef ACE_TEMPLATES_REQUIRE_SOURCE -# include "tao/AnyTypeCode/TypeCode_Case_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA -# pragma implementation ("TypeCode_Case_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ +#include "tao/AnyTypeCode/TypeCode_Case_T.cpp" #include /**/ "ace/post.h" diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode.h b/TAO/tao/AnyTypeCode/Union_TypeCode.h index 83077b06840..bfdec5028f9 100644 --- a/TAO/tao/AnyTypeCode/Union_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Union_TypeCode.h @@ -151,14 +151,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL # include "tao/AnyTypeCode/Union_TypeCode.inl" #endif /* __ACE_INLINE__ */ -#ifdef ACE_TEMPLATES_REQUIRE_SOURCE -# include "tao/AnyTypeCode/Union_TypeCode.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA -# pragma implementation ("Union_TypeCode.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - +#include "tao/AnyTypeCode/Union_TypeCode.cpp" #include /**/ "ace/post.h" diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode.h b/TAO/tao/AnyTypeCode/Value_TypeCode.h index ebbfa261946..98ebe75a512 100644 --- a/TAO/tao/AnyTypeCode/Value_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Value_TypeCode.h @@ -151,14 +151,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL # include "tao/AnyTypeCode/Value_TypeCode.inl" #endif /* __ACE_INLINE__ */ -#ifdef ACE_TEMPLATES_REQUIRE_SOURCE -# include "tao/AnyTypeCode/Value_TypeCode.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA -# pragma implementation ("Value_TypeCode.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - +#include "tao/AnyTypeCode/Value_TypeCode.cpp" #include /**/ "ace/post.h" diff --git a/TAO/tao/Array_VarOut_T.h b/TAO/tao/Array_VarOut_T.h index 78ac9ed7eff..25bef261e74 100644 --- a/TAO/tao/Array_VarOut_T.h +++ b/TAO/tao/Array_VarOut_T.h @@ -227,13 +227,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/Array_VarOut_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Array_VarOut_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Array_VarOut_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/BD_String_Argument_T.h b/TAO/tao/BD_String_Argument_T.h index ac11e0957b1..3cb726840da 100644 --- a/TAO/tao/BD_String_Argument_T.h +++ b/TAO/tao/BD_String_Argument_T.h @@ -191,13 +191,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/BD_String_Argument_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/BD_String_Argument_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("BD_String_Argument_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Basic_Argument_T.h b/TAO/tao/Basic_Argument_T.h index 806620dc950..20d5ba83a47 100644 --- a/TAO/tao/Basic_Argument_T.h +++ b/TAO/tao/Basic_Argument_T.h @@ -168,13 +168,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/Basic_Argument_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Basic_Argument_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Basic_Argument_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Buffer_Allocator_T.h b/TAO/tao/Buffer_Allocator_T.h index 723de777a9e..21ac929c9ce 100644 --- a/TAO/tao/Buffer_Allocator_T.h +++ b/TAO/tao/Buffer_Allocator_T.h @@ -48,13 +48,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Buffer_Allocator_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Buffer_Allocator_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* TAO_BUFFER_ALLOCATOR_T_H */ diff --git a/TAO/tao/Cache_Entries_T.h b/TAO/tao/Cache_Entries_T.h index ed391738a38..8cc3e3dd85a 100644 --- a/TAO/tao/Cache_Entries_T.h +++ b/TAO/tao/Cache_Entries_T.h @@ -209,13 +209,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL # include "tao/Cache_Entries_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Cache_Entries_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("tao/Cache_Entries_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Codeset/Codeset_Translator_Factory_T.h b/TAO/tao/Codeset/Codeset_Translator_Factory_T.h index 6819b1b7027..c46d028914c 100644 --- a/TAO/tao/Codeset/Codeset_Translator_Factory_T.h +++ b/TAO/tao/Codeset/Codeset_Translator_Factory_T.h @@ -70,13 +70,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Codeset/Codeset_Translator_Factory_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Codeset_Translator_Factory_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* TAO_Codeset_Translator_Factory_T */ diff --git a/TAO/tao/Condition.h b/TAO/tao/Condition.h index f89649345d6..14ec7c2ce70 100644 --- a/TAO/tao/Condition.h +++ b/TAO/tao/Condition.h @@ -110,13 +110,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/Condition.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Condition.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Condition.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /*TAO_CONDITION_H*/ diff --git a/TAO/tao/Condition.inl b/TAO/tao/Condition.inl index dc169d494f8..6e417448509 100644 --- a/TAO/tao/Condition.inl +++ b/TAO/tao/Condition.inl @@ -16,10 +16,9 @@ TAO_Condition<MUTEX>::wait (MUTEX &mutex, abstime); } -// Peform an "alertable" timed wait. If the argument ABSTIME == 0 -// then we do a regular cond_wait(), else we do a timed wait for up to -// ABSTIME using the Solaris cond_timedwait() function. - +/// Peform an "alertable" timed wait. If the argument ABSTIME == 0 +/// then we do a regular cond_wait(), else we do a timed wait for up to +/// @a abstime template <class MUTEX> ACE_INLINE int TAO_Condition<MUTEX>::wait (const ACE_Time_Value *abstime) { diff --git a/TAO/tao/Connector_Impl.h b/TAO/tao/Connector_Impl.h index 42ca96486ec..e9ca7c68bc1 100644 --- a/TAO/tao/Connector_Impl.h +++ b/TAO/tao/Connector_Impl.h @@ -87,14 +87,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Connector_Impl.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Connector_Impl.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /*TAO_CONNECTOR_IMPL_H*/ diff --git a/TAO/tao/DynamicAny/DynAnyUtils_T.h b/TAO/tao/DynamicAny/DynAnyUtils_T.h index 6d6ba6e033b..9f16ca3b685 100644 --- a/TAO/tao/DynamicAny/DynAnyUtils_T.h +++ b/TAO/tao/DynamicAny/DynAnyUtils_T.h @@ -85,13 +85,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/DynamicAny/DynAnyUtils_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("tao/DynamicAny/DynAnyUtils_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Fixed_Array_Argument_T.h b/TAO/tao/Fixed_Array_Argument_T.h index 83b5f0a45c9..cf259d74eff 100644 --- a/TAO/tao/Fixed_Array_Argument_T.h +++ b/TAO/tao/Fixed_Array_Argument_T.h @@ -179,13 +179,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/Fixed_Array_Argument_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Fixed_Array_Argument_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Fixed_Array_Argument_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Fixed_Size_Argument_T.h b/TAO/tao/Fixed_Size_Argument_T.h index 6369762f23d..316533c5656 100644 --- a/TAO/tao/Fixed_Size_Argument_T.h +++ b/TAO/tao/Fixed_Size_Argument_T.h @@ -168,13 +168,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/Fixed_Size_Argument_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Fixed_Size_Argument_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Fixed_Size_Argument_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Intrusive_Ref_Count_Base_T.h b/TAO/tao/Intrusive_Ref_Count_Base_T.h index 69108c9836f..0bd741981cb 100644 --- a/TAO/tao/Intrusive_Ref_Count_Base_T.h +++ b/TAO/tao/Intrusive_Ref_Count_Base_T.h @@ -60,13 +60,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/Intrusive_Ref_Count_Base_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Intrusive_Ref_Count_Base_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Intrusive_Ref_Count_Base_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Intrusive_Ref_Count_Handle_T.h b/TAO/tao/Intrusive_Ref_Count_Handle_T.h index df2fb310c3c..3145ff074c7 100644 --- a/TAO/tao/Intrusive_Ref_Count_Handle_T.h +++ b/TAO/tao/Intrusive_Ref_Count_Handle_T.h @@ -144,13 +144,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/Intrusive_Ref_Count_Handle_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Intrusive_Ref_Count_Handle_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Intrusive_Ref_Count_Handle_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Intrusive_Ref_Count_Object_T.h b/TAO/tao/Intrusive_Ref_Count_Object_T.h index 1d97550e93e..5e2e731e57e 100644 --- a/TAO/tao/Intrusive_Ref_Count_Object_T.h +++ b/TAO/tao/Intrusive_Ref_Count_Object_T.h @@ -59,13 +59,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/Intrusive_Ref_Count_Object_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Intrusive_Ref_Count_Object_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Intrusive_Ref_Count_Object_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h index f8d3762ed62..be3a1b18ef3 100644 --- a/TAO/tao/Object.h +++ b/TAO/tao/Object.h @@ -32,12 +32,6 @@ #include "tao/Any_Insert_Policy_T.h" #include <atomic> -#if defined (HPUX) && defined (IOR) - /* HP-UX 11.11 defines IOR in /usr/include/pa/inline.h - and we don't want that definition. See IOP_IORC.h. */ -# undef IOR -#endif /* HPUX && IOR */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Stub; diff --git a/TAO/tao/Object_Argument_T.h b/TAO/tao/Object_Argument_T.h index bfb8af789da..b9ab71bca9b 100644 --- a/TAO/tao/Object_Argument_T.h +++ b/TAO/tao/Object_Argument_T.h @@ -190,13 +190,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/Object_Argument_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Object_Argument_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Object_Argument_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Object_T.h b/TAO/tao/Object_T.h index a2196feb410..068c7e34039 100644 --- a/TAO/tao/Object_T.h +++ b/TAO/tao/Object_T.h @@ -54,13 +54,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Object_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Object_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Objref_VarOut_T.h b/TAO/tao/Objref_VarOut_T.h index 6f7595d1f1a..4ab23d31180 100644 --- a/TAO/tao/Objref_VarOut_T.h +++ b/TAO/tao/Objref_VarOut_T.h @@ -118,13 +118,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/Objref_VarOut_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Objref_VarOut_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Objref_VarOut_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PI/Interceptor_List_T.h b/TAO/tao/PI/Interceptor_List_T.h index e8fd6b39c04..049027473ec 100644 --- a/TAO/tao/PI/Interceptor_List_T.h +++ b/TAO/tao/PI/Interceptor_List_T.h @@ -88,13 +88,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/PI/Interceptor_List_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Interceptor_List_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/BD_String_SArgument_T.cpp b/TAO/tao/PortableServer/BD_String_SArgument_T.cpp index df6ea5d437c..3cf7ed29a6a 100644 --- a/TAO/tao/PortableServer/BD_String_SArgument_T.cpp +++ b/TAO/tao/PortableServer/BD_String_SArgument_T.cpp @@ -1,10 +1,6 @@ #ifndef TAO_BD_STRING_SARGUMENT_T_CPP #define TAO_BD_STRING_SARGUMENT_T_CPP -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#include "tao/PortableServer/BD_String_SArgument_T.h" -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - #include "tao/SystemException.h" #if !defined (__ACE_INLINE__) diff --git a/TAO/tao/PortableServer/BD_String_SArgument_T.h b/TAO/tao/PortableServer/BD_String_SArgument_T.h index 1dbd80cbcb7..596afcb79f1 100644 --- a/TAO/tao/PortableServer/BD_String_SArgument_T.h +++ b/TAO/tao/PortableServer/BD_String_SArgument_T.h @@ -168,13 +168,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/PortableServer/BD_String_SArgument_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/PortableServer/BD_String_SArgument_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("BD_String_SArgument_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/Basic_SArgument_T.cpp b/TAO/tao/PortableServer/Basic_SArgument_T.cpp index b94ab234a86..69b8bb2525a 100644 --- a/TAO/tao/PortableServer/Basic_SArgument_T.cpp +++ b/TAO/tao/PortableServer/Basic_SArgument_T.cpp @@ -1,10 +1,6 @@ #ifndef TAO_BASIC_SARGUMENT_T_CPP #define TAO_BASIC_SARGUMENT_T_CPP -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#include "tao/PortableServer/Basic_SArgument_T.h" -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - #if !defined (__ACE_INLINE__) #include "tao/PortableServer/Basic_SArgument_T.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/PortableServer/Basic_SArgument_T.h b/TAO/tao/PortableServer/Basic_SArgument_T.h index 634f04ef1e3..95963964245 100644 --- a/TAO/tao/PortableServer/Basic_SArgument_T.h +++ b/TAO/tao/PortableServer/Basic_SArgument_T.h @@ -147,13 +147,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/PortableServer/Basic_SArgument_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/PortableServer/Basic_SArgument_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Basic_SArgument_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp index 7ffd4bb26f4..307757ab78b 100644 --- a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp +++ b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp @@ -1,10 +1,6 @@ #ifndef TAO_FIXED_ARRAY_SARGUMENT_T_CPP #define TAO_FIXED_ARRAY_SARGUMENT_T_CPP -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#include "tao/PortableServer/Fixed_Array_SArgument_T.h" -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - #if !defined (__ACE_INLINE__) #include "tao/PortableServer/Fixed_Array_SArgument_T.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h index 45c969025fb..8adce96633b 100644 --- a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h +++ b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h @@ -158,13 +158,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/PortableServer/Fixed_Array_SArgument_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/PortableServer/Fixed_Array_SArgument_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Fixed_Array_SArgument_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.cpp b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.cpp index ae9db025549..b5ad7d82dd8 100644 --- a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.cpp +++ b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.cpp @@ -1,10 +1,6 @@ #ifndef TAO_FIXED_SIZE_SARGUMENT_T_CPP #define TAO_FIXED_SIZE_SARGUMENT_T_CPP -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#include "tao/PortableServer/Fixed_Size_SArgument_T.h" -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - #if !defined (__ACE_INLINE__) #include "tao/PortableServer/Fixed_Size_SArgument_T.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h index 575c22be156..aa4874f1317 100644 --- a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h +++ b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h @@ -208,13 +208,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/PortableServer/Fixed_Size_SArgument_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/PortableServer/Fixed_Size_SArgument_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Fixed_Size_SArgument_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/Object_SArgument_T.cpp b/TAO/tao/PortableServer/Object_SArgument_T.cpp index b3289bcd7e5..fe5f960d60f 100644 --- a/TAO/tao/PortableServer/Object_SArgument_T.cpp +++ b/TAO/tao/PortableServer/Object_SArgument_T.cpp @@ -1,10 +1,6 @@ #ifndef TAO_OBJECT_SARGUMENT_T_CPP #define TAO_OBJECT_SARGUMENT_T_CPP -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#include "tao/PortableServer/Object_SArgument_T.h" -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - #if !defined (__ACE_INLINE__) #include "tao/PortableServer/Object_SArgument_T.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/PortableServer/Object_SArgument_T.h b/TAO/tao/PortableServer/Object_SArgument_T.h index a11c4181d79..0d14e0dcbae 100644 --- a/TAO/tao/PortableServer/Object_SArgument_T.h +++ b/TAO/tao/PortableServer/Object_SArgument_T.h @@ -171,13 +171,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/PortableServer/Object_SArgument_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/PortableServer/Object_SArgument_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Object_SArgument_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/Servant_var.h b/TAO/tao/PortableServer/Servant_var.h index d5ff171f722..d2215dcf051 100644 --- a/TAO/tao/PortableServer/Servant_var.h +++ b/TAO/tao/PortableServer/Servant_var.h @@ -126,13 +126,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL # include "tao/PortableServer/Servant_var.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/PortableServer/Servant_var.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("tao/PortableServer/Servant_var.cpp") -#endif #include /**/ "ace/post.h" #endif /* TAO_PORTABLESERVER_SERVANT_VAR_H */ diff --git a/TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp b/TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp index 8846e19f05b..768d4696efb 100644 --- a/TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp +++ b/TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp @@ -1,10 +1,6 @@ #ifndef TAO_SPECIAL_BASIC_SARGUMENT_T_CPP #define TAO_SPECIAL_BASIC_SARGUMENT_T_CPP -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#include "tao/PortableServer/Special_Basic_SArgument_T.h" -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - #if !defined (__ACE_INLINE__) #include "tao/PortableServer/Special_Basic_SArgument_T.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/PortableServer/Special_Basic_SArgument_T.h b/TAO/tao/PortableServer/Special_Basic_SArgument_T.h index d8ea769573f..8149c651288 100644 --- a/TAO/tao/PortableServer/Special_Basic_SArgument_T.h +++ b/TAO/tao/PortableServer/Special_Basic_SArgument_T.h @@ -161,13 +161,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/PortableServer/Special_Basic_SArgument_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/PortableServer/Special_Basic_SArgument_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Special_Basic_SArgument_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/UB_String_SArgument_T.cpp b/TAO/tao/PortableServer/UB_String_SArgument_T.cpp index dc9cd4b4b93..1f3d68a1828 100644 --- a/TAO/tao/PortableServer/UB_String_SArgument_T.cpp +++ b/TAO/tao/PortableServer/UB_String_SArgument_T.cpp @@ -1,10 +1,6 @@ #ifndef TAO_UB_STRING_SARGUMENT_T_CPP #define TAO_UB_STRING_SARGUMENT_T_CPP -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#include "tao/PortableServer/UB_String_SArgument_T.h" -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - #if !defined (__ACE_INLINE__) #include "tao/PortableServer/UB_String_SArgument_T.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/PortableServer/UB_String_SArgument_T.h b/TAO/tao/PortableServer/UB_String_SArgument_T.h index 89792b2d9e7..619a311df04 100644 --- a/TAO/tao/PortableServer/UB_String_SArgument_T.h +++ b/TAO/tao/PortableServer/UB_String_SArgument_T.h @@ -146,13 +146,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/PortableServer/UB_String_SArgument_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/PortableServer/UB_String_SArgument_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("UB_String_SArgument_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp b/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp index ce95fbe024c..6742fe7f68a 100644 --- a/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp +++ b/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp @@ -1,10 +1,6 @@ #ifndef TAO_VAR_ARRAY_SARGUMENT_T_CPP #define TAO_VAR_ARRAY_SARGUMENT_T_CPP -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#include "tao/PortableServer/Var_Array_SArgument_T.h" -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - #if !defined (__ACE_INLINE__) #include "tao/PortableServer/Var_Array_SArgument_T.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/PortableServer/Var_Array_SArgument_T.h b/TAO/tao/PortableServer/Var_Array_SArgument_T.h index 2f501c27f54..92d9806c505 100644 --- a/TAO/tao/PortableServer/Var_Array_SArgument_T.h +++ b/TAO/tao/PortableServer/Var_Array_SArgument_T.h @@ -160,13 +160,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/PortableServer/Var_Array_SArgument_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/PortableServer/Var_Array_SArgument_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Var_Array_SArgument_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp b/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp index 285f609dc9d..daa01e75ac8 100644 --- a/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp +++ b/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp @@ -1,10 +1,6 @@ #ifndef TAO_VAR_SIZE_SARGUMENT_T_CPP #define TAO_VAR_SIZE_SARGUMENT_T_CPP -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#include "tao/PortableServer/Var_Size_SArgument_T.h" -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - #include "tao/SystemException.h" #if !defined (__ACE_INLINE__) diff --git a/TAO/tao/PortableServer/Var_Size_SArgument_T.h b/TAO/tao/PortableServer/Var_Size_SArgument_T.h index d86ccc57770..e0d581cd9be 100644 --- a/TAO/tao/PortableServer/Var_Size_SArgument_T.h +++ b/TAO/tao/PortableServer/Var_Size_SArgument_T.h @@ -149,13 +149,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/PortableServer/Var_Size_SArgument_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/PortableServer/Var_Size_SArgument_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Var_Size_SArgument_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/Vector_SArgument_T.cpp b/TAO/tao/PortableServer/Vector_SArgument_T.cpp index b429071c296..a59fc9069c3 100644 --- a/TAO/tao/PortableServer/Vector_SArgument_T.cpp +++ b/TAO/tao/PortableServer/Vector_SArgument_T.cpp @@ -1,10 +1,6 @@ #ifndef TAO_VECTOR_SARGUMENT_T_CPP #define TAO_VECTOR_SARGUMENT_T_CPP -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#include "tao/PortableServer/Vector_SArgument_T.h" -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - #if !defined (__ACE_INLINE__) #include "tao/PortableServer/Vector_SArgument_T.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/PortableServer/Vector_SArgument_T.h b/TAO/tao/PortableServer/Vector_SArgument_T.h index caf6aecabe8..34b07eda3b7 100644 --- a/TAO/tao/PortableServer/Vector_SArgument_T.h +++ b/TAO/tao/PortableServer/Vector_SArgument_T.h @@ -155,13 +155,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/PortableServer/Vector_SArgument_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/PortableServer/Vector_SArgument_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Vector_SArgument_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Pseudo_VarOut_T.h b/TAO/tao/Pseudo_VarOut_T.h index 761414716cb..e379857dbf4 100644 --- a/TAO/tao/Pseudo_VarOut_T.h +++ b/TAO/tao/Pseudo_VarOut_T.h @@ -124,13 +124,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/Pseudo_VarOut_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Pseudo_VarOut_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Pseudo_VarOut_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Seq_Out_T.h b/TAO/tao/Seq_Out_T.h index e677d4e505e..56bc34fba27 100644 --- a/TAO/tao/Seq_Out_T.h +++ b/TAO/tao/Seq_Out_T.h @@ -59,13 +59,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/Seq_Out_T.inl" #endif /* defined INLINE */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Seq_Out_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Seq_Out_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* TAO_SEQ_OUT_T_H */ diff --git a/TAO/tao/Seq_Var_T.h b/TAO/tao/Seq_Var_T.h index 7596db9730a..9b51200027a 100644 --- a/TAO/tao/Seq_Var_T.h +++ b/TAO/tao/Seq_Var_T.h @@ -128,13 +128,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/Seq_Var_T.inl" #endif /* defined INLINE */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Seq_Var_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Seq_Var_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Special_Basic_Argument_T.h b/TAO/tao/Special_Basic_Argument_T.h index 47b72cabd25..c37630e732d 100644 --- a/TAO/tao/Special_Basic_Argument_T.h +++ b/TAO/tao/Special_Basic_Argument_T.h @@ -188,13 +188,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/Special_Basic_Argument_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Special_Basic_Argument_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Special_Basic_Argument_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/advanced_resource.cpp b/TAO/tao/Strategies/advanced_resource.cpp index 72a37aaaea1..7a4f1bca094 100644 --- a/TAO/tao/Strategies/advanced_resource.cpp +++ b/TAO/tao/Strategies/advanced_resource.cpp @@ -454,7 +454,6 @@ TAO_Advanced_Resource_Factory::allocate_reactor_impl () const #if defined(ACE_WIN32) \ && !defined (ACE_LACKS_MSG_WFMO) \ - && !defined (ACE_HAS_WINCE) \ && !defined (ACE_HAS_PHARLAP) case TAO_REACTOR_MSGWFMO: ACE_NEW_RETURN (impl, ACE_Msg_WFMO_Reactor (0, tmq.get ()), 0); diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h index 75199865edb..153a3d8207d 100644 --- a/TAO/tao/Stub.h +++ b/TAO/tao/Stub.h @@ -24,12 +24,6 @@ #include "tao/ORB_Core_Auto_Ptr.h" #include <atomic> -#if defined (HPUX) && defined (IOR) - /* HP-UX 11.11 defines IOR in /usr/include/pa/inline.h - and we don't want that definition. See IOP_IORC.h. */ -# undef IOR -#endif /* HPUX && IOR */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Forward declarations. diff --git a/TAO/tao/SystemException.cpp b/TAO/tao/SystemException.cpp index f8aa2c5beec..c4df7669a0d 100644 --- a/TAO/tao/SystemException.cpp +++ b/TAO/tao/SystemException.cpp @@ -152,8 +152,6 @@ CORBA::SystemException::_tao_errno (int errno_value) return TAO_ECONNREFUSED_MINOR_CODE; case ENOENT: return TAO_ENOENT_MINOR_CODE; - -#if !defined (ACE_HAS_WINCE) case EMFILE: return TAO_EMFILE_MINOR_CODE; case EBADF: @@ -162,8 +160,6 @@ CORBA::SystemException::_tao_errno (int errno_value) return TAO_EPERM_MINOR_CODE; case EINVAL: return TAO_EINVAL_MINOR_CODE; -#endif // ACE_HAS_WINCE - #if (ENOSYS != EFAULT) case ENOSYS: return TAO_ENOSYS_MINOR_CODE; diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp index fe76c2aec9b..9c6c32cfbc7 100644 --- a/TAO/tao/TAO_Internal.cpp +++ b/TAO/tao/TAO_Internal.cpp @@ -964,7 +964,7 @@ namespace // NOTE: When adding new global arguments, ensure they are only // applied when apply_values is true, but that they are always // consumed, if they need to be consumed. -#if defined (TAO_DEBUG) && !defined (ACE_HAS_WINCE) +#if defined (TAO_DEBUG) // Make it a little easier to debug programs using this code. if (apply_values) { @@ -982,7 +982,7 @@ namespace TAO_debug_level)); } } -#endif /* TAO_DEBUG && !ACE_HAS_WINCE */ +#endif /* TAO_DEBUG */ // Extract the Service Configurator ORB options from the argument // vector. diff --git a/TAO/tao/TAO_Singleton.h b/TAO/tao/TAO_Singleton.h index 4a55e38443e..85c820a5225 100644 --- a/TAO/tao/TAO_Singleton.h +++ b/TAO/tao/TAO_Singleton.h @@ -115,14 +115,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/TAO_Singleton.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/TAO_Singleton.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("TAO_Singleton.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - #include /**/ "ace/post.h" diff --git a/TAO/tao/TransportCurrent/Current_ORBInitializer.h b/TAO/tao/TransportCurrent/Current_ORBInitializer.h index 4e31955cdf2..89f2540e346 100644 --- a/TAO/tao/TransportCurrent/Current_ORBInitializer.h +++ b/TAO/tao/TransportCurrent/Current_ORBInitializer.h @@ -42,14 +42,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/TransportCurrent/Current_ORBInitializer.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("tao/TransportCurrent/Current_ORBInitializer.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - #include /**/ "ace/post.h" diff --git a/TAO/tao/Transport_Cache_Manager_T.h b/TAO/tao/Transport_Cache_Manager_T.h index 7cc7c188264..d7e5ed7d458 100644 --- a/TAO/tao/Transport_Cache_Manager_T.h +++ b/TAO/tao/Transport_Cache_Manager_T.h @@ -269,13 +269,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL # include "tao/Transport_Cache_Manager_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Transport_Cache_Manager_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("tao/Transport_Cache_Manager_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/UB_String_Argument_T.h b/TAO/tao/UB_String_Argument_T.h index 5221d90c31f..2257e339e99 100644 --- a/TAO/tao/UB_String_Argument_T.h +++ b/TAO/tao/UB_String_Argument_T.h @@ -171,13 +171,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/UB_String_Argument_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/UB_String_Argument_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("UB_String_Argument_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Utils/RIR_Narrow.h b/TAO/tao/Utils/RIR_Narrow.h index be31d6efa04..ddaa3c93487 100644 --- a/TAO/tao/Utils/RIR_Narrow.h +++ b/TAO/tao/Utils/RIR_Narrow.h @@ -58,9 +58,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -# include "tao/Utils/RIR_Narrow.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ +#include "tao/Utils/RIR_Narrow.cpp" #include /**/ "ace/post.h" diff --git a/TAO/tao/Utils/Server_Main.h b/TAO/tao/Utils/Server_Main.h index a194bc0354c..00cccb31b1d 100644 --- a/TAO/tao/Utils/Server_Main.h +++ b/TAO/tao/Utils/Server_Main.h @@ -81,13 +81,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -# include "tao/Utils/Server_Main.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -# pragma implementation "Server_Main.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ +#include "tao/Utils/Server_Main.cpp" #include /**/ "ace/post.h" diff --git a/TAO/tao/Valuetype/AbstractBase_T.h b/TAO/tao/Valuetype/AbstractBase_T.h index a6c3302c4fb..80ec9c2c677 100644 --- a/TAO/tao/Valuetype/AbstractBase_T.h +++ b/TAO/tao/Valuetype/AbstractBase_T.h @@ -43,13 +43,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Valuetype/AbstractBase_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("AbstractBase_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /*TAO_ABSTRACTBASE_T_H*/ diff --git a/TAO/tao/Valuetype/Value_VarOut_T.h b/TAO/tao/Valuetype/Value_VarOut_T.h index b4eba819bb8..1fffb98ffe2 100644 --- a/TAO/tao/Valuetype/Value_VarOut_T.h +++ b/TAO/tao/Valuetype/Value_VarOut_T.h @@ -111,13 +111,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Valuetype/Value_VarOut_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Value_VarOut_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/VarOut_T.h b/TAO/tao/VarOut_T.h index 857399b3332..d436d415ade 100644 --- a/TAO/tao/VarOut_T.h +++ b/TAO/tao/VarOut_T.h @@ -157,13 +157,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/VarOut_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/VarOut_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("VarOut_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Var_Array_Argument_T.h b/TAO/tao/Var_Array_Argument_T.h index f83e7d86abb..739e3e8f160 100644 --- a/TAO/tao/Var_Array_Argument_T.h +++ b/TAO/tao/Var_Array_Argument_T.h @@ -180,13 +180,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/Var_Array_Argument_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Var_Array_Argument_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Var_Array_Argument_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Var_Size_Argument_T.h b/TAO/tao/Var_Size_Argument_T.h index 404a03165a5..b972b9a8a84 100644 --- a/TAO/tao/Var_Size_Argument_T.h +++ b/TAO/tao/Var_Size_Argument_T.h @@ -174,13 +174,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/Var_Size_Argument_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Var_Size_Argument_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Var_Size_Argument_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Vector_Argument_T.h b/TAO/tao/Vector_Argument_T.h index 4cc8aa62885..a73a670a2b5 100644 --- a/TAO/tao/Vector_Argument_T.h +++ b/TAO/tao/Vector_Argument_T.h @@ -177,13 +177,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/Vector_Argument_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Vector_Argument_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Vector_Argument_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/target_specification.h b/TAO/tao/target_specification.h index 398ef5c1064..cc2b43ce9bd 100644 --- a/TAO/tao/target_specification.h +++ b/TAO/tao/target_specification.h @@ -27,12 +27,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if defined (HPUX) && defined (IOR) - /* HP-UX 11.11 defines IOR in /usr/include/pa/inline.h - and we don't want that definition. See IOP_IORC.h. */ -# undef IOR -#endif /* HPUX && IOR */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace IOP diff --git a/TAO/tests/Alt_Mapping/client.h b/TAO/tests/Alt_Mapping/client.h index 8a4be2d0646..33e6cfff869 100644 --- a/TAO/tests/Alt_Mapping/client.h +++ b/TAO/tests/Alt_Mapping/client.h @@ -58,12 +58,6 @@ private: Results results_; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "client.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("client.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* ALT_MAPPING_CLIENT_H */ diff --git a/TAO/tests/Bug_1020_Regression/server.cpp b/TAO/tests/Bug_1020_Regression/server.cpp index e8d1a07c1d4..5785226c018 100644 --- a/TAO/tests/Bug_1020_Regression/server.cpp +++ b/TAO/tests/Bug_1020_Regression/server.cpp @@ -6,15 +6,6 @@ const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); -#if defined (ACE_OPENVMS) -// need this to circumvent link error on OpenVMS -// has to do with interference in template instantiations -// for the server build by previous compilation of TestX -// components in client build which are reused by server -// without recompilation -ACE_Time_Value dum = ACE_Time_Value::zero; -#endif - int parse_args (int argc, ACE_TCHAR *argv[]); diff --git a/TAO/tests/Bug_1361_Regression/shutdown.cpp b/TAO/tests/Bug_1361_Regression/shutdown.cpp index 23e34e8cdb7..1da174a9384 100644 --- a/TAO/tests/Bug_1361_Regression/shutdown.cpp +++ b/TAO/tests/Bug_1361_Regression/shutdown.cpp @@ -1,14 +1,6 @@ #include "TestC.h" #include "ace/Get_Opt.h" -#if defined (ACE_OPENVMS) -// need this to circumvent link error on OpenVMS -// has to do with interference in template instantiations -// because multiple executables are build in one directory -// reuising eachothers object files. -ACE_Time_Value dum = ACE_Time_Value::zero; -#endif - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int diff --git a/TAO/tests/Bug_1495_Regression/tid_to_int.h b/TAO/tests/Bug_1495_Regression/tid_to_int.h index 89cb1b38fb6..33fff902b16 100644 --- a/TAO/tests/Bug_1495_Regression/tid_to_int.h +++ b/TAO/tests/Bug_1495_Regression/tid_to_int.h @@ -28,11 +28,7 @@ namespace { // ACE_thread_t is a pointer. Cast to an intermediate integer // type large enough to hold a pointer. -#if defined (ACE_OPENVMS) && (!defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64)) - int const tmp = reinterpret_cast<int> (tid); -#else intptr_t const tmp = reinterpret_cast<intptr_t> (tid); -#endif // We assume sizeof(thread_id_type) >= sizeof(ace_thread_id_type). return (thread_id_type) tmp; diff --git a/TAO/tests/Bug_2084_Regression/tid_to_int.h b/TAO/tests/Bug_2084_Regression/tid_to_int.h index 4031bfbf991..aec042a2aa3 100644 --- a/TAO/tests/Bug_2084_Regression/tid_to_int.h +++ b/TAO/tests/Bug_2084_Regression/tid_to_int.h @@ -28,11 +28,7 @@ namespace { // ACE_thread_t is a pointer. Cast to an intermediate integer // type large enough to hold a pointer. -#if defined (ACE_OPENVMS) && (!defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64)) - int const tmp = reinterpret_cast<int> (tid); -#else intptr_t const tmp = reinterpret_cast<intptr_t> (tid); -#endif // We assume sizeof(thread_id_type) >= sizeof(ace_thread_id_type). return (thread_id_type) tmp; diff --git a/TAO/tests/Bug_3315_Regression/main.cpp b/TAO/tests/Bug_3315_Regression/main.cpp index 472ac65e3bf..708fd164aab 100644 --- a/TAO/tests/Bug_3315_Regression/main.cpp +++ b/TAO/tests/Bug_3315_Regression/main.cpp @@ -5,9 +5,6 @@ int result = 0; -#if defined (__SUNPRO_CC) -extern "C" -#endif /* __SUNPRO_CC */ ACE_THR_FUNC_RETURN main_orb(void*) { try diff --git a/TAO/tests/Bug_3321_Regression/main.cpp b/TAO/tests/Bug_3321_Regression/main.cpp index 125ea313226..3441bd1e3a7 100644 --- a/TAO/tests/Bug_3321_Regression/main.cpp +++ b/TAO/tests/Bug_3321_Regression/main.cpp @@ -11,9 +11,6 @@ int result = 0; -#if defined (__SUNPRO_CC) -extern "C" -#endif /* __SUNPRO_CC */ ACE_THR_FUNC_RETURN main_orb(void*) { try diff --git a/TAO/tests/Bug_3558_Regression/client.cpp b/TAO/tests/Bug_3558_Regression/client.cpp index 8cca2b9be34..c2bb4e016cd 100644 --- a/TAO/tests/Bug_3558_Regression/client.cpp +++ b/TAO/tests/Bug_3558_Regression/client.cpp @@ -55,11 +55,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) static void * test_server (void *arg) { -#if defined (ACE_OPENVMS) && (!defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64)) - int server_nr = reinterpret_cast<int> (arg); -#else intptr_t server_nr = reinterpret_cast<intptr_t> (arg); -#endif ACE_TCHAR ior[256]; diff --git a/TAO/tests/Bug_3683_Regression/Simple_util.h b/TAO/tests/Bug_3683_Regression/Simple_util.h index 244b5b66170..b76b6b9e42b 100644 --- a/TAO/tests/Bug_3683_Regression/Simple_util.h +++ b/TAO/tests/Bug_3683_Regression/Simple_util.h @@ -149,11 +149,5 @@ private: int do_shutdown_; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Simple_util.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Simple_util.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - #endif /* TAO_UTIL_H */ diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.h index f8670e65903..f695221bf61 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.h @@ -49,13 +49,6 @@ private: }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ServantList_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("ServantList_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - #endif /* SERVANTLIST_T_H */ diff --git a/TAO/tests/CollocationLockup/CollocationLockup.cpp b/TAO/tests/CollocationLockup/CollocationLockup.cpp index b71122bc23b..ad25d7cb7bd 100644 --- a/TAO/tests/CollocationLockup/CollocationLockup.cpp +++ b/TAO/tests/CollocationLockup/CollocationLockup.cpp @@ -18,13 +18,7 @@ namespace { -#if defined (ACE_OPENVMS) - // less threads on OpenVMS otherwise this test - // (although working correctly) takes far too long. - const size_t N_THREADS = 10; -#else const size_t N_THREADS = 20; -#endif const size_t N_ITERATIONS = 100; } diff --git a/TAO/tests/CollocationLockup/run_test.pl b/TAO/tests/CollocationLockup/run_test.pl index 819642dfe99..0f7aacb946f 100755 --- a/TAO/tests/CollocationLockup/run_test.pl +++ b/TAO/tests/CollocationLockup/run_test.pl @@ -14,11 +14,6 @@ $debug_level = '0'; # 20 seconds and when the bug was fixed it returned before 20 seconds. $timeout = 0; -if ($^O eq "VMS") { - # On OpenVMS this test does not lock up but takes much longer - $timeout = 280; -} - foreach $i (@ARGV) { if ($i eq '-debug') { $debug_level = '10'; diff --git a/TAO/tests/Crashed_Callback/Crashed_Callback.cpp b/TAO/tests/Crashed_Callback/Crashed_Callback.cpp index cb57d3ddcaf..8b9fa38005e 100644 --- a/TAO/tests/Crashed_Callback/Crashed_Callback.cpp +++ b/TAO/tests/Crashed_Callback/Crashed_Callback.cpp @@ -15,14 +15,7 @@ Crashed_Callback::crash_now_please () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Crashed_Callback - crashing application\n")); -// OpenVMS seems to hang and not abort and dump core when abort() is called -// here. This needs further -#if defined (ACE_OPENVMS) - ACE_OS::_exit(); -#else ACE_OS::abort(); -#endif - } void diff --git a/TAO/tests/DynAny_Test/test_wrapper.h b/TAO/tests/DynAny_Test/test_wrapper.h index 11abca739b0..a2fdecdbd7c 100644 --- a/TAO/tests/DynAny_Test/test_wrapper.h +++ b/TAO/tests/DynAny_Test/test_wrapper.h @@ -36,12 +36,6 @@ private: TEST_OBJECT* test_object_; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "test_wrapper.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("test_wrapper.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* TEST_WRAPPER_H */ diff --git a/TAO/tests/Faults/test_i.cpp b/TAO/tests/Faults/test_i.cpp index bdb07cfb63d..aae860a4fb4 100644 --- a/TAO/tests/Faults/test_i.cpp +++ b/TAO/tests/Faults/test_i.cpp @@ -13,13 +13,7 @@ Callback_i::shutdown (CORBA::Boolean is_clean) { ACE_DEBUG ((LM_DEBUG, "Performing catastrophic shutdown\n")); -// OpenVMS seems to hang and not abort and dump core when abort() is called -// here. This needs further investigation. -#if defined (ACE_OPENVMS) - ACE_OS::_exit(); -#else ACE_OS::abort(); -#endif return; } this->orb_->shutdown (false); @@ -51,11 +45,7 @@ Simple_Server_i::shutdown_now (CORBA::Boolean is_clean) if (is_clean == 0) { ACE_DEBUG ((LM_DEBUG, "Performing catastrophic shutdown\n")); -#if defined (ACE_OPENVMS) - ACE_OS::_exit(); -#else ACE_OS::abort(); -#endif return; } diff --git a/TAO/tests/HandleExhaustion/client.cpp b/TAO/tests/HandleExhaustion/client.cpp index 827ee12269b..57af23d012d 100644 --- a/TAO/tests/HandleExhaustion/client.cpp +++ b/TAO/tests/HandleExhaustion/client.cpp @@ -58,15 +58,14 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) } // Try a few times until we run out of "trys" or we no longer get - // an exception. Some times it takes a little while to begin - // accepting again on AIX. + // an exception. for(size_t i = 0; i < 10; i++) try { cout << "Client: calling simple, i = " << i << endl; // This first invocation will actually cause the connection to // the server. Since the server has run out of file handles, - // it can not accept the new connection. On AIX, this will + // it can not accept the new connection. On some platforms, this will // receive a CORBA::COMM_FAILURE exception because it doesn't // complete in a timely manner. It does not mean that the test // has failed, as long as the server performs the correct diff --git a/TAO/tests/HandleExhaustion/run_test.pl b/TAO/tests/HandleExhaustion/run_test.pl index e3f912ce729..0e1a57f234c 100755 --- a/TAO/tests/HandleExhaustion/run_test.pl +++ b/TAO/tests/HandleExhaustion/run_test.pl @@ -8,8 +8,8 @@ use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::TestTarget; use strict; -if ($^O eq 'hpux' || $^O eq 'lynxos') { - print "This test will not run properly on HP-UX or LynxOS.\n", +if ($^O eq 'lynxos') { + print "This test will not run properly on LynxOS.\n", "When one process uses up all of the file descriptors, no other\n", "processes run by the same user can start.\n"; exit(0); diff --git a/TAO/tests/IDL_Test/README b/TAO/tests/IDL_Test/README index 386728b4915..ec8321dd999 100644 --- a/TAO/tests/IDL_Test/README +++ b/TAO/tests/IDL_Test/README @@ -37,3 +37,7 @@ The rest of the .idl files need only to build cleanly. To test the client/server functionality of the various IDL types and operations, see the test suite in ACE_wrappers/TAO/tests/Param_Test. +There are a few negative tests (e.g. invalid_scoping, keyword_case_diff, +exception_misuse) where it shall be verified that tao_idl exits with +an error status. The main.cpp program cannot be used for them because +it only handles positive tests. To this end, run the script run_test.pl. diff --git a/TAO/tests/IDL_Test/exception_misuse1.idl b/TAO/tests/IDL_Test/exception_misuse1.idl new file mode 100644 index 00000000000..0c614127f20 --- /dev/null +++ b/TAO/tests/IDL_Test/exception_misuse1.idl @@ -0,0 +1,15 @@ +/** + * @file exception_misuse1.idl + * + * https://github.com/DOCGroup/ACE_TAO/issues/2015 + * + * tao_idl shall reject use of exception for argument of method + * + */ +interface exception_misuse1 { + exception exc_t { + string reason; + }; + void doit (in exc_t ex); +}; + diff --git a/TAO/tests/IDL_Test/exception_misuse2.idl b/TAO/tests/IDL_Test/exception_misuse2.idl new file mode 100644 index 00000000000..d5deeeebd22 --- /dev/null +++ b/TAO/tests/IDL_Test/exception_misuse2.idl @@ -0,0 +1,17 @@ +/** + * @file exception_misuse2.idl + * + * https://github.com/DOCGroup/ACE_TAO/issues/2015 + * + * tao_idl shall reject use of exception for struct member + * + */ +module exception_misuse2 { + exception exc_t { + string reason; + }; + struct mystruct { + exc_t ex; + }; +}; + diff --git a/TAO/tests/IDL_Test/run_test.pl b/TAO/tests/IDL_Test/run_test.pl index 90a7fa9f5d9..4555a81197c 100755 --- a/TAO/tests/IDL_Test/run_test.pl +++ b/TAO/tests/IDL_Test/run_test.pl @@ -62,6 +62,20 @@ $test5 = $SV->SpawnWaitKill ($server5->ProcessStartWaitInterval()); open (STDERR, ">&STDOUT"); +my $server6 = PerlACE::TestTarget::create_target (6) || die "Create target 6 failed\n"; +my $input_file6 = $server6->LocalFile ("exception_misuse1.idl"); + +# Compile the IDL +$SV = $server6->CreateProcess ("$tao_idl", "$input_file6"); +$test6 = $SV->SpawnWaitKill ($server6->ProcessStartWaitInterval()); + +my $server7 = PerlACE::TestTarget::create_target (7) || die "Create target 7 failed\n"; +my $input_file7 = $server7->LocalFile ("exception_misuse2.idl"); + +# Compile the IDL +$SV = $server7->CreateProcess ("$tao_idl", "$input_file7"); +$test7 = $SV->SpawnWaitKill ($server7->ProcessStartWaitInterval()); + sub analyze_results { my $result_file = $_[0]; @@ -107,5 +121,13 @@ if ($match5!= 0) { print STDERR "ERROR: tao_idl -Cw should have printed warning for $input_file5\n"; $status = 1; } +if ($test6 == 0) { + print STDERR "ERROR: tao_idl returned $test6 for $input_file6, should have failed!\n"; + $status = 1; +} +if ($test7 == 0) { + print STDERR "ERROR: tao_idl returned $test7 for $input_file7, should have failed!\n"; + $status = 1; +} exit $status; diff --git a/TAO/tests/IDL_Test/typeprefix.idl b/TAO/tests/IDL_Test/typeprefix.idl index 5fb34afb825..0e503d5bfa9 100644 --- a/TAO/tests/IDL_Test/typeprefix.idl +++ b/TAO/tests/IDL_Test/typeprefix.idl @@ -1,5 +1,5 @@ // Test a construct with typeprefix which failed when TAO_IDL was build -// with Intel C++ or Sun C++ +// with Intel C++ module A { diff --git a/TAO/tests/IDL_Test/union.idl b/TAO/tests/IDL_Test/union.idl index 0ea237b65e2..fdee107e2cf 100644 --- a/TAO/tests/IDL_Test/union.idl +++ b/TAO/tests/IDL_Test/union.idl @@ -53,10 +53,6 @@ module Necessary }; // Union with negative cases -// At the moment, the SunCC preprocessor separates the negative -// sign from the number. This causes problems for the scanner/lexer -// used by tao_idl. -#if !defined (__SUNPRO_CC) || (__SUNPRO_CC > 0x5140) union foo switch (short) { case -3: @@ -65,7 +61,6 @@ union foo switch (short) default: long foo_iface_member; case 0: long foo_iface_member2; }; -#endif // !__SUNPRO_CC || __SUNPRO_CC > 0x5120 // Make sure that CORBA_Any::to_* is used everywhere. module UnionDiscTest diff --git a/TAO/tests/MProfile/README b/TAO/tests/MProfile/README index c75aa6c0026..252e19f04ba 100644 --- a/TAO/tests/MProfile/README +++ b/TAO/tests/MProfile/README @@ -17,7 +17,7 @@ This is a test to see whether we generate exceptions as per the spec. When we loose connection with a connected server, the ORB would throw a COMM_FAILURE exception. This is platform dependent. One wouldn't see this on NT. The reason for this is the way TCP has been -been implemented on NT & Solaris. I am not going in to the details for +been implemented on NT. I am not going in to the details for this behaviour. TRANSIENT exceptions are thrown when the ORB has tried all the object references it has and is not able to establish connection with any of them (TRANSIENT exceptions are also thrown for diff --git a/TAO/tests/Muxing/Server_Task.cpp b/TAO/tests/Muxing/Server_Task.cpp index d23f910e669..a82748d4990 100644 --- a/TAO/tests/Muxing/Server_Task.cpp +++ b/TAO/tests/Muxing/Server_Task.cpp @@ -14,13 +14,9 @@ Server_Task::svc () ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting server task\n")); try { -#if defined (ACE_OPENVMS) - // OpenVMS typically takes a lot longer... - ACE_Time_Value tv (360, 0); -#else // run the test for at most 120 seconds... ACE_Time_Value tv (120, 0); -#endif + this->orb_->run (tv); } catch (const CORBA::Exception&) diff --git a/TAO/tests/Muxing/client.cpp b/TAO/tests/Muxing/client.cpp index e57a0724552..be952d708d6 100644 --- a/TAO/tests/Muxing/client.cpp +++ b/TAO/tests/Muxing/client.cpp @@ -65,11 +65,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) else { Client_Task client_task (receiver.in (), -#if defined (ACE_OPENVMS) - 750, /* test takes much longer on OpenVMS */ -#else 1000, -#endif 32768, ACE_Thread_Manager::instance ()); diff --git a/TAO/tests/Nested_Upcall_Crash/Client_Peer.cpp b/TAO/tests/Nested_Upcall_Crash/Client_Peer.cpp index 2704f3b026d..3f907082468 100644 --- a/TAO/tests/Nested_Upcall_Crash/Client_Peer.cpp +++ b/TAO/tests/Nested_Upcall_Crash/Client_Peer.cpp @@ -63,12 +63,6 @@ Crasher::handle_timeout (ACE_Time_Value const & , { // ACE_DEBUG ((LM_DEBUG, "(%P|%t) Performing intentional crash // %a\n")); - // This tests hangs on OpenVMS when abort() is used. - // Also see Crashed_Callback test. -#if defined (ACE_OPENVMS) - ACE_OS::_exit (); -#else ACE_OS::abort(); -#endif return 0; } diff --git a/TAO/tests/Nested_Upcall_Crash/scavenger.cpp b/TAO/tests/Nested_Upcall_Crash/scavenger.cpp index e548316cdc5..3c250bfc2f3 100644 --- a/TAO/tests/Nested_Upcall_Crash/scavenger.cpp +++ b/TAO/tests/Nested_Upcall_Crash/scavenger.cpp @@ -6,14 +6,6 @@ const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); -#if defined (ACE_OPENVMS) -// need this to circumvent link error on OpenVMS -// has to do with interference in template instantiations -// because multiple executables are build in one directory -// reuising eachothers object files. -ACE_Time_Value dum = ACE_Time_Value::zero; -#endif - int parse_args (int argc, ACE_TCHAR *argv[]); diff --git a/TAO/tests/OBV/Simple/Simple_util.h b/TAO/tests/OBV/Simple/Simple_util.h index e798140edeb..acf966cf5d7 100644 --- a/TAO/tests/OBV/Simple/Simple_util.h +++ b/TAO/tests/OBV/Simple/Simple_util.h @@ -146,11 +146,5 @@ protected: int shutdown_; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Simple_util.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Simple_util.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - #endif /* TAO_UTIL_H */ diff --git a/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp b/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp index 969d2a7a1ad..f97cd985f0a 100644 --- a/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp +++ b/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp @@ -25,7 +25,7 @@ file_Service_Config_Test () // Configurator file appropriate to the platform. // For example, Windows Unicode uses UTF-16. // - // iconv(1) found on Linux and Solaris, for example, can + // iconv(1) found on Linux, for example, can // be used to convert between encodings. // // Byte ordering is also an issue, so we should be diff --git a/TAO/tests/Oneway_Send_Timeouts/Test_i.cpp b/TAO/tests/Oneway_Send_Timeouts/Test_i.cpp index 21aa3e07330..28aa6b3797d 100644 --- a/TAO/tests/Oneway_Send_Timeouts/Test_i.cpp +++ b/TAO/tests/Oneway_Send_Timeouts/Test_i.cpp @@ -24,7 +24,7 @@ Test_i::sleep (CORBA::Long sec, CORBA::Long msec) unsleep_ = false; ACE_Time_Value duration (sec); - duration.msec (static_cast<long> (msec)); // HPUX seems to require this cast + duration.msec (static_cast<long> (msec)); if (sec == 0 && msec == 0) { // 1000 seconds is infinity diff --git a/TAO/tests/POA/Loader/Servant_Activator.cpp b/TAO/tests/POA/Loader/Servant_Activator.cpp index 4fea526b473..09279156ab7 100644 --- a/TAO/tests/POA/Loader/Servant_Activator.cpp +++ b/TAO/tests/POA/Loader/Servant_Activator.cpp @@ -37,11 +37,7 @@ ServantActivator::ServantActivator (CORBA::ORB_ptr orb, // Cannot go from void* to function pointer directly. Cast the void* // to long first. void *symbol = this->dll_.symbol (factory_function); -#if defined (ACE_OPENVMS) && (!defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64)) - int function = reinterpret_cast<int> (symbol); -#else intptr_t function = reinterpret_cast<intptr_t> (symbol); -#endif servant_supplier_ = reinterpret_cast<SERVANT_FACTORY> (function); @@ -49,11 +45,7 @@ ServantActivator::ServantActivator (CORBA::ORB_ptr orb, // Obtain the symbol for the function which will destroy the // servant. symbol = this->dll_.symbol (garbage_collection_function); -#if defined (ACE_OPENVMS) && (!defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64)) - function = reinterpret_cast<int> (symbol); -#else function = reinterpret_cast<intptr_t> (symbol); -#endif servant_garbage_collector_ = reinterpret_cast<SERVANT_GARBAGE_COLLECTOR> (function); } diff --git a/TAO/tests/POA/Loader/Servant_Locator.cpp b/TAO/tests/POA/Loader/Servant_Locator.cpp index be759f8d63f..8c7c5fb12e2 100644 --- a/TAO/tests/POA/Loader/Servant_Locator.cpp +++ b/TAO/tests/POA/Loader/Servant_Locator.cpp @@ -39,11 +39,7 @@ ServantLocator::ServantLocator (CORBA::ORB_ptr orb, // to long first. // void *symbol = this->dll_.symbol (factory_function); -#if defined (ACE_OPENVMS) && (!defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64)) - int function = reinterpret_cast<int> (symbol); -#else intptr_t function = reinterpret_cast<intptr_t> (symbol); -#endif servant_supplier_ = reinterpret_cast<SERVANT_FACTORY> (function); @@ -51,11 +47,7 @@ ServantLocator::ServantLocator (CORBA::ORB_ptr orb, // Obtain the symbol for the function which will destroy the // servant. symbol = this->dll_.symbol (garbage_collection_function); -#if defined (ACE_OPENVMS) && (!defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64)) - function = reinterpret_cast<int> (symbol); -#else function = reinterpret_cast<intptr_t> (symbol); -#endif servant_garbage_collector_ = reinterpret_cast<SERVANT_GARBAGE_COLLECTOR> (function); diff --git a/TAO/tests/POA/On_Demand_Loading/Servant_Manager.cpp b/TAO/tests/POA/On_Demand_Loading/Servant_Manager.cpp index 74191316e78..7ffeef724c6 100644 --- a/TAO/tests/POA/On_Demand_Loading/Servant_Manager.cpp +++ b/TAO/tests/POA/On_Demand_Loading/Servant_Manager.cpp @@ -73,11 +73,7 @@ ServantManager_i::obtain_servant (const ACE_TCHAR *str, // Cannot go from void* to function pointer directly. Cast the void* // to long first. void *symbol = dll->symbol (create_symbol_.c_str ()); -#if defined (ACE_OPENVMS) && (!defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64)) - int function = reinterpret_cast<int> (symbol); -#else intptr_t function = reinterpret_cast<intptr_t> (symbol); -#endif SERVANT_FACTORY servant_creator = reinterpret_cast<SERVANT_FACTORY> (function); diff --git a/TAO/tests/Param_Test/client.h b/TAO/tests/Param_Test/client.h index 1989cac7797..40ba33ad9e3 100644 --- a/TAO/tests/Param_Test/client.h +++ b/TAO/tests/Param_Test/client.h @@ -62,12 +62,5 @@ private: Results results_; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "client.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("client.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - #endif /* CLIENTS_H */ diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp index bd10a07913b..ffbb009c40b 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp @@ -147,7 +147,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/tests/RTCORBA/Banded_Connections/bands.hpux b/TAO/tests/RTCORBA/Banded_Connections/bands.hpux deleted file mode 100644 index f4b469e61f4..00000000000 --- a/TAO/tests/RTCORBA/Banded_Connections/bands.hpux +++ /dev/null @@ -1 +0,0 @@ -16 20 21 27 28 31 diff --git a/TAO/tests/RTCORBA/Banded_Connections/run_test.pl b/TAO/tests/RTCORBA/Banded_Connections/run_test.pl index b7e699a64f4..36fb1648c9f 100755 --- a/TAO/tests/RTCORBA/Banded_Connections/run_test.pl +++ b/TAO/tests/RTCORBA/Banded_Connections/run_test.pl @@ -53,10 +53,6 @@ if ($^O eq "MSWin32") { $server_args = "-b bands.nt"; } -elsif ($^O eq "hpux") { - $server_args = - "-b bands.hpux"; -} else { $server_args = "-b bands.unix"; diff --git a/TAO/tests/RTCORBA/Bug_3643_Regression/run_test.pl b/TAO/tests/RTCORBA/Bug_3643_Regression/run_test.pl index dc8133995ef..592dc6439f5 100755 --- a/TAO/tests/RTCORBA/Bug_3643_Regression/run_test.pl +++ b/TAO/tests/RTCORBA/Bug_3643_Regression/run_test.pl @@ -12,7 +12,6 @@ my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 fail $number_of_clients = 4; $status = 0; -$continuous = ($^O eq 'hpux'); @configurations = ({ @@ -57,10 +56,6 @@ sub run_clients $SV = $server->CreateProcess ("server"); -if ($continuous) { - $SV->Arguments ("-ORBSvcConf continuous$PerlACE::svcconf_ext"); -} - $SV->Spawn (); for $test (@configurations) { diff --git a/TAO/tests/RTCORBA/Collocation/continuous.conf b/TAO/tests/RTCORBA/Collocation/continuous.conf deleted file mode 100644 index a4871d398f3..00000000000 --- a/TAO/tests/RTCORBA/Collocation/continuous.conf +++ /dev/null @@ -1,3 +0,0 @@ - -# Option for platforms where direct mapping doesn't work -static RT_ORB_Loader "-ORBPriorityMapping continuous" diff --git a/TAO/tests/RTCORBA/Collocation/continuous.conf.xml b/TAO/tests/RTCORBA/Collocation/continuous.conf.xml deleted file mode 100644 index f297697bc7c..00000000000 --- a/TAO/tests/RTCORBA/Collocation/continuous.conf.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version='1.0'?> -<!-- Converted from continuous.conf by svcconf-convert.pl --> -<ACE_Svc_Conf> - <!-- Option for platforms where direct mapping doesn't work --> - <static id="RT_ORB_Loader" params="-ORBPriorityMapping continuous"/> -</ACE_Svc_Conf> diff --git a/TAO/tests/RTCORBA/Collocation/run_test.pl b/TAO/tests/RTCORBA/Collocation/run_test.pl index 933821b6635..742c93117d6 100755 --- a/TAO/tests/RTCORBA/Collocation/run_test.pl +++ b/TAO/tests/RTCORBA/Collocation/run_test.pl @@ -7,18 +7,12 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::TestTarget; -$continuous = ($^O eq 'hpux'); - print STDERR "\n********** RTCORBA Collocation Unit Test **********\n\n"; my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; $T = $server->CreateProcess ("Collocation"); -if ($continuous) { - $T->Arguments("-ORBSvcConf continuous$PerlACE::svcconf_ext"); -} - $test = $T->SpawnWaitKill($server->ProcessStartWaitInterval ()); if ($test == 2) { # Mark as no longer running to avoid errors on exit. diff --git a/TAO/tests/RTCORBA/Destroy_Thread_Pool/continuous.conf b/TAO/tests/RTCORBA/Destroy_Thread_Pool/continuous.conf deleted file mode 100644 index a4871d398f3..00000000000 --- a/TAO/tests/RTCORBA/Destroy_Thread_Pool/continuous.conf +++ /dev/null @@ -1,3 +0,0 @@ - -# Option for platforms where direct mapping doesn't work -static RT_ORB_Loader "-ORBPriorityMapping continuous" diff --git a/TAO/tests/RTCORBA/Destroy_Thread_Pool/continuous.conf.xml b/TAO/tests/RTCORBA/Destroy_Thread_Pool/continuous.conf.xml deleted file mode 100644 index f297697bc7c..00000000000 --- a/TAO/tests/RTCORBA/Destroy_Thread_Pool/continuous.conf.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version='1.0'?> -<!-- Converted from continuous.conf by svcconf-convert.pl --> -<ACE_Svc_Conf> - <!-- Option for platforms where direct mapping doesn't work --> - <static id="RT_ORB_Loader" params="-ORBPriorityMapping continuous"/> -</ACE_Svc_Conf> diff --git a/TAO/tests/RTCORBA/Destroy_Thread_Pool/run_test.pl b/TAO/tests/RTCORBA/Destroy_Thread_Pool/run_test.pl index c5178cd358d..0dd08953484 100755 --- a/TAO/tests/RTCORBA/Destroy_Thread_Pool/run_test.pl +++ b/TAO/tests/RTCORBA/Destroy_Thread_Pool/run_test.pl @@ -9,14 +9,9 @@ use PerlACE::TestTarget; my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; -$continuous = ($^O eq 'hpux'); - print STDERR "\n********** RTCORBA Destroy_Thread_Pool Unit Test **********\n\n"; $SV = $server->CreateProcess ("Destroy_Thread_Pool"); -if ($continuous) { - $SV->Arguments("-ORBSvcConf continuous$PerlACE::svcconf_ext"); -} $server_status = $SV->SpawnWaitKill ($server->ProcessStartWaitInterval()); diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/continuous.conf b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/continuous.conf deleted file mode 100644 index 43526314bed..00000000000 --- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/continuous.conf +++ /dev/null @@ -1,3 +0,0 @@ - -# Option for platforms where direct mapping doesn't work -static RT_ORB_Loader "-ORBPriorityMapping continuous -RTORBDynamicThreadIdleTimeout 1000000" diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/continuous.conf.xml b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/continuous.conf.xml deleted file mode 100644 index bbb864e64b0..00000000000 --- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/continuous.conf.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version='1.0'?> -<!-- Converted from continuous.conf by svcconf-convert.pl --> -<ACE_Svc_Conf> - <!-- Option for platforms where direct mapping doesn't work --> - <static id="RT_ORB_Loader" params="-ORBPriorityMapping continuous -RTORBDynamicThreadIdleTimeout 1000000"/> -</ACE_Svc_Conf> diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/run_test.pl b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/run_test.pl index ad7ed09335e..11188a49f9d 100755 --- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/run_test.pl +++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/run_test.pl @@ -9,7 +9,6 @@ use PerlACE::TestTarget; $number_of_clients = 1; $status = 0; -$continuous = ($^O eq 'hpux'); my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; @@ -48,11 +47,6 @@ sub run_clients } $SV = $server->CreateProcess ("server"); - -if ($continuous) { - $SV->Arguments ("-ORBSvcConf continuous$PerlACE::svcconf_ext"); -} - $SV->Spawn (); for $test (@configurations) { diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl index aafa46c19bf..3473e447733 100755 --- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl +++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl @@ -37,10 +37,6 @@ if ($^O eq "MSWin32") { $priority1 = 2; $priority2 = 1; } -elsif ($^O eq "hpux") { - $priority1 = 17; - $priority2 = 22; -} else { $priority1 = 45; $priority2 = 50; diff --git a/TAO/tests/RTCORBA/Persistent_IOR/continuous.conf b/TAO/tests/RTCORBA/Persistent_IOR/continuous.conf deleted file mode 100644 index a4871d398f3..00000000000 --- a/TAO/tests/RTCORBA/Persistent_IOR/continuous.conf +++ /dev/null @@ -1,3 +0,0 @@ - -# Option for platforms where direct mapping doesn't work -static RT_ORB_Loader "-ORBPriorityMapping continuous" diff --git a/TAO/tests/RTCORBA/Persistent_IOR/continuous.conf.xml b/TAO/tests/RTCORBA/Persistent_IOR/continuous.conf.xml deleted file mode 100644 index f297697bc7c..00000000000 --- a/TAO/tests/RTCORBA/Persistent_IOR/continuous.conf.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version='1.0'?> -<!-- Converted from continuous.conf by svcconf-convert.pl --> -<ACE_Svc_Conf> - <!-- Option for platforms where direct mapping doesn't work --> - <static id="RT_ORB_Loader" params="-ORBPriorityMapping continuous"/> -</ACE_Svc_Conf> diff --git a/TAO/tests/RTCORBA/Persistent_IOR/run_test.pl b/TAO/tests/RTCORBA/Persistent_IOR/run_test.pl index af31dd971e8..f1dbb327896 100755 --- a/TAO/tests/RTCORBA/Persistent_IOR/run_test.pl +++ b/TAO/tests/RTCORBA/Persistent_IOR/run_test.pl @@ -15,10 +15,7 @@ $status = 0; $iiop_port = 27532; $tp_iiop_port = 27533; -$continuous = ($^O eq 'hpux'); - -$extra_server_args = ($continuous ? "-ORBSvcConf continuous$PerlACE::svcconf_ext " : '') . - "-d 1 -ORBEndpoint iiop://1.2\@:$iiop_port -ORBLaneEndpoint 2:0 iiop://1.2\@:$tp_iiop_port"; +$extra_server_args = "-d 1 -ORBEndpoint iiop://1.2\@:$iiop_port -ORBLaneEndpoint 2:0 iiop://1.2\@:$tp_iiop_port"; @iorfiles = ( diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/continuous.conf b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/continuous.conf deleted file mode 100644 index a4871d398f3..00000000000 --- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/continuous.conf +++ /dev/null @@ -1,3 +0,0 @@ - -# Option for platforms where direct mapping doesn't work -static RT_ORB_Loader "-ORBPriorityMapping continuous" diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/continuous.conf.xml b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/continuous.conf.xml deleted file mode 100644 index f297697bc7c..00000000000 --- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/continuous.conf.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version='1.0'?> -<!-- Converted from continuous.conf by svcconf-convert.pl --> -<ACE_Svc_Conf> - <!-- Option for platforms where direct mapping doesn't work --> - <static id="RT_ORB_Loader" params="-ORBPriorityMapping continuous"/> -</ACE_Svc_Conf> diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/run_test.pl b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/run_test.pl index cc019b226fc..1a3af766444 100755 --- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/run_test.pl +++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/run_test.pl @@ -12,9 +12,6 @@ $server_dynamic_threads = 0; $status = 0; -$continuous = ($^O eq 'hpux'); -$common_args = ($continuous ? "-ORBSvcConf continuous$PerlACE::svcconf_ext" : ''); - my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; @@ -70,7 +67,7 @@ sub run_test my @parms = @_; $arg = $parms[0]; - $SV = $server->CreateProcess ("server", "$common_args -s $server_static_threads -d $server_dynamic_threads -o $server_iorfile"); + $SV = $server->CreateProcess ("server", "-s $server_static_threads -d $server_dynamic_threads -o $server_iorfile"); $server_status = $SV->Spawn (); if ($server_status == -1) { @@ -94,7 +91,7 @@ sub run_test } } - $CL[$i] = $client->CreateProcess ("client", "$common_args $arg"); + $CL[$i] = $client->CreateProcess ("client", "$arg"); $CL[$i]->Spawn (); $client_status = $CL[$i]->WaitKill ($client->ProcessStartWaitInterval () + 80); diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/bands_r b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/bands_r deleted file mode 100644 index 2be55e3fa32..00000000000 --- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/bands_r +++ /dev/null @@ -1 +0,0 @@ -0 10000 20000 30000 diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/invocation_priorities_r b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/invocation_priorities_r deleted file mode 100644 index 795a75037bc..00000000000 --- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/invocation_priorities_r +++ /dev/null @@ -1 +0,0 @@ -5000 25000
\ No newline at end of file diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/lanes_r b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/lanes_r deleted file mode 100644 index 8274a68e2ae..00000000000 --- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/lanes_r +++ /dev/null @@ -1 +0,0 @@ -0 5000 25000
\ No newline at end of file diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/run_test.pl b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/run_test.pl index 5d6fef3a998..4cfcd847707 100755 --- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/run_test.pl +++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/run_test.pl @@ -30,17 +30,9 @@ my $status = 0; $extra_client_args = "-k file://$client_iorfile -ORBdebuglevel $client_debuglevel -d $client_debug -x"; $extra_server_args = "-ORBdebuglevel $server_debuglevel -d $server_debug"; - -if ($OSNAME eq "solaris") { - $lanes = "lanes_r"; - $bands = "bands_r"; - $inv_prio = "invocation_priorities_r"; -} -else { - $lanes = "lanes"; - $bands = "bands"; - $inv_prio = "invocation_priorities"; -} +$lanes = "lanes"; +$bands = "bands"; +$inv_prio = "invocation_priorities"; sub setup_configurations_2 { diff --git a/TAO/tests/RTCORBA/Server_Declared/continuous.conf b/TAO/tests/RTCORBA/Server_Declared/continuous.conf deleted file mode 100644 index a4871d398f3..00000000000 --- a/TAO/tests/RTCORBA/Server_Declared/continuous.conf +++ /dev/null @@ -1,3 +0,0 @@ - -# Option for platforms where direct mapping doesn't work -static RT_ORB_Loader "-ORBPriorityMapping continuous" diff --git a/TAO/tests/RTCORBA/Server_Declared/continuous.conf.xml b/TAO/tests/RTCORBA/Server_Declared/continuous.conf.xml deleted file mode 100644 index f297697bc7c..00000000000 --- a/TAO/tests/RTCORBA/Server_Declared/continuous.conf.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version='1.0'?> -<!-- Converted from continuous.conf by svcconf-convert.pl --> -<ACE_Svc_Conf> - <!-- Option for platforms where direct mapping doesn't work --> - <static id="RT_ORB_Loader" params="-ORBPriorityMapping continuous"/> -</ACE_Svc_Conf> diff --git a/TAO/tests/RTCORBA/Server_Declared/run_test.pl b/TAO/tests/RTCORBA/Server_Declared/run_test.pl index 494b89cbd07..1bb249beafc 100755 --- a/TAO/tests/RTCORBA/Server_Declared/run_test.pl +++ b/TAO/tests/RTCORBA/Server_Declared/run_test.pl @@ -55,15 +55,6 @@ if ($^O eq "MSWin32") { $server_args = "-a 1 -b 2"; } -elsif ($^O eq "hpux") { - $continuous = 1; - $server_args = - "-a 17 -b 29"; -} - -if ($continuous) { - $server_args .= " -ORBSvcConf continuous$PerlACE::svcconf_ext"; -} $SV = $server->CreateProcess ("server", "-p $server_iorfile1 -o $server_iorfile2 $server_args"); $CL = $client->CreateProcess ("client", "-p file://$client_iorfile1 -o file://$client_iorfile2"); diff --git a/TAO/tests/RTCORBA/Thread_Pool/continuous.conf b/TAO/tests/RTCORBA/Thread_Pool/continuous.conf deleted file mode 100644 index a4871d398f3..00000000000 --- a/TAO/tests/RTCORBA/Thread_Pool/continuous.conf +++ /dev/null @@ -1,3 +0,0 @@ - -# Option for platforms where direct mapping doesn't work -static RT_ORB_Loader "-ORBPriorityMapping continuous" diff --git a/TAO/tests/RTCORBA/Thread_Pool/continuous.conf.xml b/TAO/tests/RTCORBA/Thread_Pool/continuous.conf.xml deleted file mode 100644 index f297697bc7c..00000000000 --- a/TAO/tests/RTCORBA/Thread_Pool/continuous.conf.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version='1.0'?> -<!-- Converted from continuous.conf by svcconf-convert.pl --> -<ACE_Svc_Conf> - <!-- Option for platforms where direct mapping doesn't work --> - <static id="RT_ORB_Loader" params="-ORBPriorityMapping continuous"/> -</ACE_Svc_Conf> diff --git a/TAO/tests/RTCORBA/Thread_Pool/run_test.pl b/TAO/tests/RTCORBA/Thread_Pool/run_test.pl index b88220167c0..ae79da36238 100755 --- a/TAO/tests/RTCORBA/Thread_Pool/run_test.pl +++ b/TAO/tests/RTCORBA/Thread_Pool/run_test.pl @@ -32,7 +32,6 @@ if ($client->PutFile ($svc_conf.'.xml') == -1) { $number_of_clients = 4; $status = 0; -$continuous = ($^O eq 'hpux'); @configurations = ({ @@ -77,10 +76,6 @@ sub run_clients $SV = $server->CreateProcess ("server"); -if ($continuous) { - $SV->Arguments ("-ORBSvcConf continuous$PerlACE::svcconf_ext"); -} - $SV->Spawn (); for $test (@configurations) { diff --git a/TAO/tests/Smart_Proxies/Benchmark/client.cpp b/TAO/tests/Smart_Proxies/Benchmark/client.cpp index 8ec4f0bf503..adf1da5926b 100644 --- a/TAO/tests/Smart_Proxies/Benchmark/client.cpp +++ b/TAO/tests/Smart_Proxies/Benchmark/client.cpp @@ -89,7 +89,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, diff --git a/TAO/tests/Time_Policy/main.cpp b/TAO/tests/Time_Policy/main.cpp index 74d6e0b30e0..cf4a666c134 100644 --- a/TAO/tests/Time_Policy/main.cpp +++ b/TAO/tests/Time_Policy/main.cpp @@ -21,7 +21,6 @@ #if (TAO_HAS_TIME_POLICY == 1) && \ (defined (ACE_HAS_HI_RES_TIMER) || \ - defined (ACE_HAS_AIX_HI_RES_TIMER) || \ defined (ACE_WIN32) || \ (defined (ghs) && defined (ACE_HAS_PENTIUM)) || \ ((defined (__GNUG__) || defined (__INTEL_COMPILER)) && !defined(ACE_VXWORKS) && defined (ACE_HAS_PENTIUM)) || \ diff --git a/TAO/tests/Timed_Buffered_Oneways/test_i.cpp b/TAO/tests/Timed_Buffered_Oneways/test_i.cpp index fbc9e7f8c4a..ffd86dd588a 100644 --- a/TAO/tests/Timed_Buffered_Oneways/test_i.cpp +++ b/TAO/tests/Timed_Buffered_Oneways/test_i.cpp @@ -15,7 +15,6 @@ test_i::method (CORBA::ULong request_number, CORBA::ULong work) { ACE_Time_Value start (0); - // HPUX seems to require this cast start.msec (static_cast<long> (start_time)); ACE_DEBUG ((LM_DEBUG, "server:\t%d took\t%dms\n", @@ -39,7 +38,7 @@ void test_i::shutdown (CORBA::Long start_time) { ACE_Time_Value start (0); - start.msec (static_cast<long> (start_time)); // HPUX seems to require this cast + start.msec (static_cast<long> (start_time)); ACE_DEBUG ((LM_DEBUG, "server: Shutting down... (%dms)\n", (ACE_OS::gettimeofday() - start).msec ())); this->orb_->shutdown (false); |
