diff options
Diffstat (limited to 'ACE')
860 files changed, 16836 insertions, 18912 deletions
diff --git a/ACE/ACE-INSTALL.html b/ACE/ACE-INSTALL.html index 8208ee37113..2820390793b 100644 --- a/ACE/ACE-INSTALL.html +++ b/ACE/ACE-INSTALL.html @@ -49,7 +49,7 @@ report process</a>.<p> </li><li><a href="#MPC">General MPC Information</a> </li><li><a href="#eclipse">Working with ACE in Eclipse</a> </li><li><a href="#advanced">Advanced Topics</a> - </li><li><a href="#power">Building from Subversion</a> + </li><li><a href="#power">Building from subversion</a> </li></ul> @@ -153,12 +153,11 @@ document</a>.</p><p> <tr> <th>Remedy IT</th> <td>Maintains ACE on many platforms required for their ACE and - TAO service offerings. We support AIX, Borland C++ Builder 6/2006, - CBuilderX 1.0, MinGW, Microsoft Visual C++, GCC, - Cygwin, VxWorks 5.5.x & 6.x, OpenVMS 8.2-1 & 8.3 on Alpha and IA64, - BlueCAT Linux, RedHat, Fedora, - Tru64, SuSE Linux on Alpha/IA32/EM64T/IA64, RTEMS, QNX, LynxOS 4.0/4.2, - HPUX 11i v1/v2 32/64 bit on PA-RISC, and + TAO service offerings. Besides the standard DOC group platforms + we also support AIX, Borland C++ Builder 6/2006, CBuilderX 1.0, MinGW, + Cygwin, VxWorks 5.5.x & 6.x, OpenVMS 8.2-1 & 8.3, + Tru64, SuSE Linux on Alpha/IA32/EM64T, RTEMS, LynxOS, + HPUX 11i v2/v2 32/64 bit on PA-RISC, and HPUX 11i v2 on Itanium. The Intel C++ compiler is supported on Windows 32/64bit, Linux IA32/EM64T/Itanium2. </td> @@ -182,7 +181,7 @@ document</a>.</p><p> IRIX 6.x; UnixWare 7.1.0; Linux on PPC; OpenMVS; Tandem; SCO; FreeBSD; NetBSD; OpenBSD; - Macintosh OS X; OS/9; PharLap TNT Embedded ToolSuite 13; + Macintosh OS X; OS/9; PharLap TNT Embedded ToolSuite 9.1; QNX RTP and Neutrino 2.0; Interix (Windows Services for Unix) </td> </tr><tr> @@ -624,6 +623,15 @@ https://msdn.microsoft.com/visualc/downloads/default.aspx</a> for information. programs that uses ACE. Otherwise you may experience problems finding ace.dll or aced.dll.<br> <br> + </li><li>If you are building for Windows NT 4 or later (Windows 2000, XP, etc.) + then you can start building without anymore changes. If you are building + on Windows 9x/Me, then you should add the line <br> + <br> + <code>#define ACE_HAS_WINNT4 0</code><br> + <br> + before the #include statement in ACE_ROOT\ace\config.h and it + will turn off some WinNT/Win2K-specific code in ACE.<br> + <br> </li><li>If you want to use the standard C++ headers (iostream, cstdio, ... as defined by the C++ Standard Draft 2) that comes with MSVC, then add the line: <br> @@ -775,6 +783,15 @@ to check <a href="#win32nonic">here</a> first. <p> <br> <code>#include "ace/config-win32.h"</code><br> <br> + If you are building for Windows NT 4, Windows 2000, or Windows XP, + then you can start without any more changes. If you are building + on Windows 9x/Me, then you should add the line <br> + <br> + <code>#define ACE_HAS_WINNT4 0</code><br> + <br> + before the #include statement in ACE_ROOT\ace\config.h and it + will turn off some WinNT/Win2K-specific code in ACE.<br> + <br> </li><li>Open a Command Prompt (DOS Box).<br> <br> </li><li>Set the ACE_ROOT environment variable to point to the ACE_wrappers @@ -918,6 +935,15 @@ For our build we require the packages <blockquote><code></code><pre> #include "ace/config-win32.h" </pre></blockquote> + If you are building for Windows 9X/Me (ie, <em>not</em> WinNT or + Win2K), you will need to add: + + <blockquote><code></code><pre> #define ACE_HAS_WINNT4 0 + </pre></blockquote> + + before the <code>#include</code> line. + <br><br> + </li><li> Create a file called <tt>platform_macros.GNU</tt> in the <tt>$ACE_ROOT/include/makeinclude</tt> directory containing: @@ -1727,7 +1753,59 @@ your needs. For example when you give option debug=1 all the debug symbols will be created and the build will huge in size. The debug symbols are necessary when you want to debug your code.</p> -<p></p><hr align="left" width="50%"> +<p></p><hr align="left" width="50%"><p> +</p><h2><a name="rtems">Building and Installing ACE on RTEMS</a></h2> + +<pre>export RTEMS_MAKEFILE_PATH=/opt/rtems/CPU-rtems/BSP +# setup the build structure +cd ACE_wrappers + +# create the host (e.g. Linux in this case) build tree +bin/create_ace_build.pl Linux_g++ +cd build/Linux_g++/ace +ln -s ../../../ace/config-linux.h config.h +cd ../include/makeinclude +ln -s ../../../../include/makeinclude/platform_linux.GNU platform_macros.GNU +cd ../../../.. + +# create the target build tree +bin/create_ace_build.pl rtems +cd build/rtems/TAO +/bin/rm -r TAO_IDL +ln -s ../../Linux_g++/TAO/TAO_IDL . +cd ../ace +ln -s ../../../ace/config-rtems.h config.h +cd ../include/makeinclude +ln -s ../../../../include/makeinclude/platform_rtems.x_g++.GNU platform_macros.GNU +cd ../../../.. + +# build the host side of things +cd build/Linux_g++ +export ACE_ROOT=`pwd`; export LD_LIBRARY_PATH=`pwd`/ace:`pwd`/lib:$LD_LIBRARY_PATH +cd ace +make + +# optionally build the ACE tests +cd ../tests +make + +cd ../TAO +make + +# build the target side of things +cd ../rtems +export ACE_ROOT=`pwd` +cd ace +make +cd ../tests +# build rtems_init.o by hand +make -f ../include/makeinclude/Makefile.rtems rtems_init.o +make +cd ../TAO +make +</pre> + + <hr> <h1><a name="svcsinstall">Building and Installing ACE Network Services</a></h1> @@ -2362,45 +2440,15 @@ 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> + </p></li><li><strong>PharLap TNT Embedded ToolSuite (ETS)</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 - <a href="http://www.ardence.com/embedded/products.aspx?ID=71">PharLap ETS</a> - version 13. The port was originally done for Pharlap 9.1 and MSVC 6, - but has been updated to Pharlap ETS 13 with Visual Studio .NET 2003 - (VC7.1).</p><p> To build for PharLap, you'll need to use MPC to - generate .sln/.vcproj files with the ETS configurations. For example: - <pre> -cd \ace\ACE_wrappers -perl bin/mwc.pl -type vc71 -relative ACE_ROOT=C:/ace/ACE_wrappers -relative TAO_ROOT=C:/ace/ACE_wrappers/TAO -value_template configurations='"ETS Debug"' -value_template configurations+='"ETS Release"' -name_modifier *_ETS TAO_ACE.mwc - </pre> - That command will generate the same .sln and .vproj files as for - regular Windows builds with VC7.1, but they'll have names with an - <code>_ETS</code> suffix and will include the "ETS Debug" and - "ETS Release" configurations.</p><p> - After generating the needed VC7.1 files, use the ace/config-pharlap.h - configuration file, and the instructions + ACE has been ported to <a href="http://www.pharlap.com/">PharLap's</a> TNT Embedded + ToolSuite (ETS) version 9.1. The port is being tested with + Microsoft Visual C++ 6.</p><p> To build for PharLap, use the + ace/config-pharlap.h configuration file, and the instructions for building on Windows. Building the ACE library is the same as for regular Windows platforms, except you choose one of the PharLap - ETS configurations to build within Visual Studio. Only static + ETS configurations to build within Visual C++. Only static library configurations are available for PharLap at this time. For an example of how to build binaries, see the tests directory. The tests_pharlap_msvc.lnk @@ -2903,27 +2951,17 @@ show_uninit Lists all uninitialized in object files built for </pre> </p><hr><p> -</p><h2><a name="power">Building from Subversion (anonymous access)</a></h2> -If users are building from our <a href="https://svn.dre.vanderbilt.edu/viewvc/Middleware/trunk/">Subversion repository</a> the +</p><h2><a name="power">Building from anonymous subversion</a></h2> +If users are building from our <a href="https://svn.dre.vanderbilt.edu/viewvc/Middleware/trunk/"> svn</a> the GNUmakefiles, and project files for building on various platforms will -not be available. Subversion users are expected to <a href="#generate_using_mpc">generate them</a> +not be available. Users from subversion are expected to generate them using <a href="https://svn.dre.vanderbilt.edu/viewvc/MPC/trunk/docs/README?revision=HEAD">MPC</a> before building ACE, TAO or CIAO. We point out some suggestions below to get bootstrapped quickly. <ul> - <li>You can checkout different subsets from the Subversion repository. - <ul> - <li>To checkout ACE with MPC:<p> - <code>svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/sets-anon/ACE .</code> - </li> - <li>To checkout ACE+TAO with MPC:<p> - <code>svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/sets-anon/ACE+TAO .</code> - </li> - <li>To checkout ACE+TAO+CIAO with MPC:<p> + <li>You can checkout ACE+TAO+CIAO together with MPC with the following command: <p> <code>svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/sets-anon/ACE+TAO+CIAO .</code> - </li> - </ul> </p></li><li>Please make sure that you have <a href="http://www.perl.org/"> perl</a> installed, preferably perl 5.8 or higher. Users on Win32 based platforms are recommended to use @@ -2931,19 +2969,18 @@ quickly. State Perl</a>. We use active state perl without problems. We have ran into problems trying to use the cygwin version of perl on Win32 based platforms. <p> - </p></li> - <a name="generate_using_mpc"></a> - <li>To build ACE and associated tests, examples, - and associated utility libraries with GNUmakefiles, you must - generate GNUmakefiles with MPC:<p> - <code> $ACE_ROOT/bin/mwc.pl -type gnuace ACE.mwc</code> </p> - <p>On Windows, with Visual C++ 8, you must generate solution and project files with MPC:<p> + </p></li><li>If you just want to build ACE and associated tests, examples, + and associated utility libraries, we recommend that you do <p> + <code> $ACE_ROOT/bin/mwc.pl -type gnuace ACE.mwc</code> </p><p> + + from <code> $ACE_ROOT </code> to generate GNUmakefiles. Please use <code> $ACE_ROOT/bin/mwc.pl -type vc8 ACE.mwc </code> </p><p> - On Windows, with Visual C++ 7, you must generate solution and project files with MPC:<p> - <code> $ACE_ROOT/bin/mwc.pl -type vc71 ACE.mwc </code> </p> - </li><li>If you want to build TAO+CIAO and its associated libraries + to generate VC8 project and solution files. Please use <code>-type + vc71</code> to generate VC71 project and solution files. + + </p></li><li>If you want to build TAO+CIAO and its associated libraries please see <a href="TAO/TAO-INSTALL.html">TAO-INSTALL</a><a> and </a><a href="TAO/CIAO/CIAO-INSTALL.html">CIAO-INSTALL</a> for details. </li></ul> diff --git a/ACE/ACEXML/ChangeLog b/ACE/ACEXML/ChangeLog index a75cf4f65a1..2047d310a51 100644 --- a/ACE/ACEXML/ChangeLog +++ b/ACE/ACEXML/ChangeLog @@ -1,8 +1,3 @@ -Wed Jan 03 14:20:00 UTC 2007 Simon Massey <sma@prismtech.com> - - * common/XML_Macros.h: - With MFC, must delete any caught and eaten "out of memory" exceptions. - Fri Oct 28 02:29:57 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> From Russell Mora <russell_mora at symantec dot com> diff --git a/ACE/ACEXML/Makefile.am b/ACE/ACEXML/Makefile.am index 5e025e19d26..f0541d979c7 100644 --- a/ACE/ACEXML/Makefile.am +++ b/ACE/ACEXML/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ common \ diff --git a/ACE/ACEXML/apps/Makefile.am b/ACE/ACEXML/apps/Makefile.am index 7f7bf963687..81f0c9cbd88 100644 --- a/ACE/ACEXML/apps/Makefile.am +++ b/ACE/ACEXML/apps/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ svcconf diff --git a/ACE/ACEXML/apps/svcconf/Makefile.am b/ACE/ACEXML/apps/svcconf/Makefile.am index 2464ab3ad33..88cef2d99a5 100644 --- a/ACE/ACEXML/apps/svcconf/Makefile.am +++ b/ACE/ACEXML/apps/svcconf/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu includedir = @includedir@/ACEXML/apps/svcconf @@ -26,14 +26,6 @@ libACEXML_XML_Svc_Conf_Parser_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(ACE_ROOT)/ACEXML/common -if BUILD_ZLIB -if BUILD_ZZIP -libACEXML_XML_Svc_Conf_Parser_la_CPPFLAGS += \ - $(ACE_ZZIP_CPPFLAGS) \ - $(ACE_ZLIB_CPPFLAGS) -endif BUILD_ZZIP -endif BUILD_ZLIB - libACEXML_XML_Svc_Conf_Parser_la_SOURCES = \ Svcconf.cpp \ Svcconf_Handler.cpp @@ -41,27 +33,11 @@ libACEXML_XML_Svc_Conf_Parser_la_SOURCES = \ libACEXML_XML_Svc_Conf_Parser_la_LDFLAGS = \ -release @ACE_VERSION_NAME@ -if BUILD_ZLIB -if BUILD_ZZIP -libACEXML_XML_Svc_Conf_Parser_la_LDFLAGS += \ - $(ACE_ZZIP_LDFLAGS) \ - $(ACE_ZLIB_LDFLAGS) -endif BUILD_ZZIP -endif BUILD_ZLIB - libACEXML_XML_Svc_Conf_Parser_la_LIBADD = \ $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \ $(ACE_BUILDDIR)/ACEXML/common/libACEXML.la \ $(ACE_BUILDDIR)/ace/libACE.la -if BUILD_ZLIB -if BUILD_ZZIP -libACEXML_XML_Svc_Conf_Parser_la_LIBADD += \ - $(ACE_ZZIP_LIBS) \ - $(ACE_ZLIB_LIBS) -endif BUILD_ZZIP -endif BUILD_ZLIB - nobase_include_HEADERS = \ Svcconf.h \ Svcconf_Handler.h \ diff --git a/ACE/ACEXML/apps/svcconf/svcconf.mpc b/ACE/ACEXML/apps/svcconf/svcconf.mpc index 128e2e961e4..9b9f84b5413 100644 --- a/ACE/ACEXML/apps/svcconf/svcconf.mpc +++ b/ACE/ACEXML/apps/svcconf/svcconf.mpc @@ -1,6 +1,6 @@ // -*- MPC -*- // $Id$ -project(ACEXML_XML_Svc_Conf_Parser): acelib, acexml, install { +project(ACEXML_XML_Svc_Conf_Parser): acelib, acexml, core { sharedname = ACEXML_XML_Svc_Conf_Parser } diff --git a/ACE/ACEXML/common/Makefile.am b/ACE/ACEXML/common/Makefile.am index f08574ae905..d2f2e33a28e 100644 --- a/ACE/ACEXML/common/Makefile.am +++ b/ACE/ACEXML/common/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu includedir = @includedir@/ACEXML/common pkgconfigdir = @libdir@/pkgconfig @@ -26,14 +26,6 @@ libACEXML_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -DACEXML_BUILD_DLL -if BUILD_ZLIB -if BUILD_ZZIP -libACEXML_la_CPPFLAGS += \ - $(ACE_ZZIP_CPPFLAGS) \ - $(ACE_ZLIB_CPPFLAGS) -endif BUILD_ZZIP -endif BUILD_ZLIB - libACEXML_la_SOURCES = \ Attributes.cpp \ AttributesImpl.cpp \ @@ -71,25 +63,9 @@ libACEXML_la_SOURCES = \ libACEXML_la_LDFLAGS = \ -release @ACE_VERSION_NAME@ -if BUILD_ZLIB -if BUILD_ZZIP -libACEXML_la_LDFLAGS += \ - $(ACE_ZZIP_LDFLAGS) \ - $(ACE_ZLIB_LDFLAGS) -endif BUILD_ZZIP -endif BUILD_ZLIB - libACEXML_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la -if BUILD_ZLIB -if BUILD_ZZIP -libACEXML_la_LIBADD += \ - $(ACE_ZZIP_LIBS) \ - $(ACE_ZLIB_LIBS) -endif BUILD_ZZIP -endif BUILD_ZLIB - nobase_include_HEADERS = \ ACEXML_Export.h \ Attributes.h \ @@ -142,7 +118,7 @@ CLEANFILES = \ ACEXML.pc ACEXML.pc: ${top_builddir}/config.status ${srcdir}/ACEXML.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/ACEXML.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/ACEXML.pc.in endif !BUILD_ACE_FOR_TAO diff --git a/ACE/ACEXML/common/XML_Macros.h b/ACE/ACEXML/common/XML_Macros.h index 3941c0f2e7c..50ec6857b3a 100644 --- a/ACE/ACEXML/common/XML_Macros.h +++ b/ACE/ACEXML/common/XML_Macros.h @@ -32,19 +32,6 @@ #include "ace/Exception_Macros.h" -// The Windows MFC exception mechanism requires that a caught CException -// (including the CMemoryException in use here) be freed using its Delete() -// method. Thus, when MFC is in use and we're catching exceptions as a result -// of new(), the exception's Delete() method has to be called. No other -// platform imposes this sort of restriction/requirement. The Windows -// config stuff (at least for MSVC/MFC) defines a ACE_del_bad_alloc macro -// that works with its ACE_bad_alloc macro to implement this cleanup -// requirement. Since no other platform requires this, define it as -// empty here. -#if !defined (ACE_del_bad_alloc) -# define ACE_del_bad_alloc -#endif - // The following macros assume that an environment variable is passed // in/out of each function that can throw an exception. The type of the // environment variable is defined by ACEXML_ENV_TYPE. @@ -344,7 +331,7 @@ # define ACEXML_NEW_THROW_EX(POINTER,CONSTRUCTOR,EXCEPTION) \ do { try { POINTER = new CONSTRUCTOR; } \ - catch (ACE_bad_alloc) { ACE_del_bad_alloc errno = ENOMEM; ACEXML_THROW_R_INT (EXCEPTION); } \ + catch (ACE_bad_alloc) { errno = ENOMEM; ACEXML_THROW_R_INT (EXCEPTION); } \ } while (0) #else /* ! ACE_NEW_THROWS_EXCEPTIONS */ diff --git a/ACE/ACEXML/common/common.mpc b/ACE/ACEXML/common/common.mpc index 52fe9a39704..bd496a82123 100644 --- a/ACE/ACEXML/common/common.mpc +++ b/ACE/ACEXML/common/common.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(ACEXML): acelib, codecs, install, zzip, zlib { +project(ACEXML): acelib, codecs, core { avoids += ace_for_tao sharedname = ACEXML dynamicflags += ACEXML_BUILD_DLL diff --git a/ACE/ACEXML/examples/Makefile.am b/ACE/ACEXML/examples/Makefile.am index 0ddb642570a..8a2494ea586 100644 --- a/ACE/ACEXML/examples/Makefile.am +++ b/ACE/ACEXML/examples/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ SAXPrint diff --git a/ACE/ACEXML/examples/SAXPrint/Makefile.am b/ACE/ACEXML/examples/SAXPrint/Makefile.am index d196510359f..e8098217c3e 100644 --- a/ACE/ACEXML/examples/SAXPrint/Makefile.am +++ b/ACE/ACEXML/examples/SAXPrint/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -16,7 +16,6 @@ ACE_ROOT = $(top_srcdir) if BUILD_ACEXML if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS = SAXPrint SAXPrint_CPPFLAGS = \ @@ -24,14 +23,6 @@ SAXPrint_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(ACE_ROOT)/ACEXML/common -if BUILD_ZLIB -if BUILD_ZZIP -SAXPrint_CPPFLAGS += \ - $(ACE_ZZIP_CPPFLAGS) \ - $(ACE_ZLIB_CPPFLAGS) -endif BUILD_ZZIP -endif BUILD_ZLIB - SAXPrint_SOURCES = \ Print_Handler.cpp \ SAXPrint_Handler.cpp \ @@ -40,29 +31,11 @@ SAXPrint_SOURCES = \ SAXPrint_Handler.h \ SAXPrint_Handler.inl -SAXPrint_LDFLAGS = - -if BUILD_ZLIB -if BUILD_ZZIP -SAXPrint_LDFLAGS += \ - $(ACE_ZZIP_LDFLAGS) \ - $(ACE_ZLIB_LDFLAGS) -endif BUILD_ZZIP -endif BUILD_ZLIB - SAXPrint_LDADD = \ $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \ $(ACE_BUILDDIR)/ACEXML/common/libACEXML.la \ $(ACE_BUILDDIR)/ace/libACE.la -if BUILD_ZLIB -if BUILD_ZZIP -SAXPrint_LDADD += \ - $(ACE_ZZIP_LIBS) \ - $(ACE_ZLIB_LIBS) -endif BUILD_ZZIP -endif BUILD_ZLIB - endif !BUILD_ACE_FOR_TAO endif BUILD_ACEXML diff --git a/ACE/ACEXML/parser/Makefile.am b/ACE/ACEXML/parser/Makefile.am index 35c60abcb8d..de38e543937 100644 --- a/ACE/ACEXML/parser/Makefile.am +++ b/ACE/ACEXML/parser/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ parser diff --git a/ACE/ACEXML/parser/parser/Makefile.am b/ACE/ACEXML/parser/parser/Makefile.am index f4440e30faf..942e6a22bb4 100644 --- a/ACE/ACEXML/parser/parser/Makefile.am +++ b/ACE/ACEXML/parser/parser/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu includedir = @includedir@/ACEXML/parser/parser pkgconfigdir = @libdir@/pkgconfig @@ -56,7 +56,7 @@ CLEANFILES = \ ACEXML_Parser.pc ACEXML_Parser.pc: ${top_builddir}/config.status ${srcdir}/ACEXML_Parser.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/ACEXML_Parser.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/ACEXML_Parser.pc.in endif !BUILD_ACE_FOR_TAO diff --git a/ACE/ACEXML/parser/parser/parser.mpc b/ACE/ACEXML/parser/parser/parser.mpc index 520ea962b9d..9732f03fe76 100644 --- a/ACE/ACEXML/parser/parser/parser.mpc +++ b/ACE/ACEXML/parser/parser/parser.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(ACEXML_Parser): acelib, install { +project(ACEXML_Parser): acelib, core { avoids += ace_for_tao sharedname = ACEXML_Parser after += ACEXML diff --git a/ACE/ACEXML/tests/Makefile.am b/ACE/ACEXML/tests/Makefile.am index e8f43fdc317..926a3fd9212 100644 --- a/ACE/ACEXML/tests/Makefile.am +++ b/ACE/ACEXML/tests/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -21,7 +21,6 @@ noinst_PROGRAMS = if BUILD_ACEXML if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += ContentHandler_Test ContentHandler_Test_CPPFLAGS = \ @@ -29,40 +28,14 @@ ContentHandler_Test_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(ACE_ROOT)/ACEXML/common -if BUILD_ZLIB -if BUILD_ZZIP -ContentHandler_Test_CPPFLAGS += \ - $(ACE_ZZIP_CPPFLAGS) \ - $(ACE_ZLIB_CPPFLAGS) -endif BUILD_ZZIP -endif BUILD_ZLIB - ContentHandler_Test_SOURCES = \ ContentHandler_Test.cpp -ContentHandler_Test_LDFLAGS = - -if BUILD_ZLIB -if BUILD_ZZIP -ContentHandler_Test_LDFLAGS += \ - $(ACE_ZZIP_LDFLAGS) \ - $(ACE_ZLIB_LDFLAGS) -endif BUILD_ZZIP -endif BUILD_ZLIB - ContentHandler_Test_LDADD = \ $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \ $(ACE_BUILDDIR)/ACEXML/common/libACEXML.la \ $(ACE_BUILDDIR)/ace/libACE.la -if BUILD_ZLIB -if BUILD_ZZIP -ContentHandler_Test_LDADD += \ - $(ACE_ZZIP_LIBS) \ - $(ACE_ZLIB_LIBS) -endif BUILD_ZZIP -endif BUILD_ZLIB - endif !BUILD_ACE_FOR_TAO endif BUILD_ACEXML @@ -70,7 +43,6 @@ endif BUILD_ACEXML if BUILD_ACEXML if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += HttpCharStream_Test HttpCharStream_Test_CPPFLAGS = \ @@ -78,40 +50,14 @@ HttpCharStream_Test_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(ACE_ROOT)/ACEXML/common -if BUILD_ZLIB -if BUILD_ZZIP -HttpCharStream_Test_CPPFLAGS += \ - $(ACE_ZZIP_CPPFLAGS) \ - $(ACE_ZLIB_CPPFLAGS) -endif BUILD_ZZIP -endif BUILD_ZLIB - HttpCharStream_Test_SOURCES = \ HttpCharStream_Test.cpp -HttpCharStream_Test_LDFLAGS = - -if BUILD_ZLIB -if BUILD_ZZIP -HttpCharStream_Test_LDFLAGS += \ - $(ACE_ZZIP_LDFLAGS) \ - $(ACE_ZLIB_LDFLAGS) -endif BUILD_ZZIP -endif BUILD_ZLIB - HttpCharStream_Test_LDADD = \ $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \ $(ACE_BUILDDIR)/ACEXML/common/libACEXML.la \ $(ACE_BUILDDIR)/ace/libACE.la -if BUILD_ZLIB -if BUILD_ZZIP -HttpCharStream_Test_LDADD += \ - $(ACE_ZZIP_LIBS) \ - $(ACE_ZLIB_LIBS) -endif BUILD_ZZIP -endif BUILD_ZLIB - endif !BUILD_ACE_FOR_TAO endif BUILD_ACEXML @@ -119,7 +65,6 @@ endif BUILD_ACEXML if BUILD_ACEXML if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += NamespaceSupport_Test NamespaceSupport_Test_CPPFLAGS = \ @@ -127,40 +72,14 @@ NamespaceSupport_Test_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(ACE_ROOT)/ACEXML/common -if BUILD_ZLIB -if BUILD_ZZIP -NamespaceSupport_Test_CPPFLAGS += \ - $(ACE_ZZIP_CPPFLAGS) \ - $(ACE_ZLIB_CPPFLAGS) -endif BUILD_ZZIP -endif BUILD_ZLIB - NamespaceSupport_Test_SOURCES = \ NamespaceSupport_Test.cpp -NamespaceSupport_Test_LDFLAGS = - -if BUILD_ZLIB -if BUILD_ZZIP -NamespaceSupport_Test_LDFLAGS += \ - $(ACE_ZZIP_LDFLAGS) \ - $(ACE_ZLIB_LDFLAGS) -endif BUILD_ZZIP -endif BUILD_ZLIB - NamespaceSupport_Test_LDADD = \ $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \ $(ACE_BUILDDIR)/ACEXML/common/libACEXML.la \ $(ACE_BUILDDIR)/ace/libACE.la -if BUILD_ZLIB -if BUILD_ZZIP -NamespaceSupport_Test_LDADD += \ - $(ACE_ZZIP_LIBS) \ - $(ACE_ZLIB_LIBS) -endif BUILD_ZZIP -endif BUILD_ZLIB - endif !BUILD_ACE_FOR_TAO endif BUILD_ACEXML @@ -168,7 +87,6 @@ endif BUILD_ACEXML if BUILD_ACEXML if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Transcoder_Test Transcoder_Test_CPPFLAGS = \ @@ -176,40 +94,14 @@ Transcoder_Test_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(ACE_ROOT)/ACEXML/common -if BUILD_ZLIB -if BUILD_ZZIP -Transcoder_Test_CPPFLAGS += \ - $(ACE_ZZIP_CPPFLAGS) \ - $(ACE_ZLIB_CPPFLAGS) -endif BUILD_ZZIP -endif BUILD_ZLIB - Transcoder_Test_SOURCES = \ Transcoder_Test.cpp -Transcoder_Test_LDFLAGS = - -if BUILD_ZLIB -if BUILD_ZZIP -Transcoder_Test_LDFLAGS += \ - $(ACE_ZZIP_LDFLAGS) \ - $(ACE_ZLIB_LDFLAGS) -endif BUILD_ZZIP -endif BUILD_ZLIB - Transcoder_Test_LDADD = \ $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \ $(ACE_BUILDDIR)/ACEXML/common/libACEXML.la \ $(ACE_BUILDDIR)/ace/libACE.la -if BUILD_ZLIB -if BUILD_ZZIP -Transcoder_Test_LDADD += \ - $(ACE_ZZIP_LIBS) \ - $(ACE_ZLIB_LIBS) -endif BUILD_ZZIP -endif BUILD_ZLIB - endif !BUILD_ACE_FOR_TAO endif BUILD_ACEXML diff --git a/ACE/ACEXML/tests/util/Makefile.am b/ACE/ACEXML/tests/util/Makefile.am index b2d79bef425..486d37c1902 100644 --- a/ACE/ACEXML/tests/util/Makefile.am +++ b/ACE/ACEXML/tests/util/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -16,7 +16,6 @@ ACE_ROOT = $(top_srcdir) if BUILD_ACEXML if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS = test test_CPPFLAGS = \ @@ -24,40 +23,14 @@ test_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(ACE_ROOT)/ACEXML/common -if BUILD_ZLIB -if BUILD_ZZIP -test_CPPFLAGS += \ - $(ACE_ZZIP_CPPFLAGS) \ - $(ACE_ZLIB_CPPFLAGS) -endif BUILD_ZZIP -endif BUILD_ZLIB - test_SOURCES = \ test.cpp -test_LDFLAGS = - -if BUILD_ZLIB -if BUILD_ZZIP -test_LDFLAGS += \ - $(ACE_ZZIP_LDFLAGS) \ - $(ACE_ZLIB_LDFLAGS) -endif BUILD_ZZIP -endif BUILD_ZLIB - test_LDADD = \ $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \ $(ACE_BUILDDIR)/ACEXML/common/libACEXML.la \ $(ACE_BUILDDIR)/ace/libACE.la -if BUILD_ZLIB -if BUILD_ZZIP -test_LDADD += \ - $(ACE_ZZIP_LIBS) \ - $(ACE_ZLIB_LIBS) -endif BUILD_ZZIP -endif BUILD_ZLIB - endif !BUILD_ACE_FOR_TAO endif BUILD_ACEXML diff --git a/ACE/ASNMP/Makefile.am b/ACE/ASNMP/Makefile.am index 7ff1160c8a3..fa06f83a3c9 100644 --- a/ACE/ASNMP/Makefile.am +++ b/ACE/ASNMP/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ asnmp \ diff --git a/ACE/ASNMP/agent/Makefile.am b/ACE/ASNMP/agent/Makefile.am index afb76da40ed..b37fe7aec9e 100644 --- a/ACE/ASNMP/agent/Makefile.am +++ b/ACE/ASNMP/agent/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -15,7 +15,6 @@ ACE_ROOT = $(top_srcdir) ## Makefile.asnmp_agent.am if !BUILD_USES_WCHAR - noinst_PROGRAMS = agent agent_CPPFLAGS = \ diff --git a/ACE/ASNMP/asnmp/Makefile.am b/ACE/ASNMP/asnmp/Makefile.am index 7b117dab9f6..71347a6d858 100644 --- a/ACE/ASNMP/asnmp/Makefile.am +++ b/ACE/ASNMP/asnmp/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/ASNMP/examples/Makefile.am b/ACE/ASNMP/examples/Makefile.am index ba48f01c667..1855938d914 100644 --- a/ACE/ASNMP/examples/Makefile.am +++ b/ACE/ASNMP/examples/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ get \ diff --git a/ACE/ASNMP/examples/get/Makefile.am b/ACE/ASNMP/examples/get/Makefile.am index 0c3a6e4ea95..c691338b998 100644 --- a/ACE/ASNMP/examples/get/Makefile.am +++ b/ACE/ASNMP/examples/get/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -16,7 +16,6 @@ noinst_PROGRAMS = ## Makefile.asnmp_example_get.am if !BUILD_USES_WCHAR - noinst_PROGRAMS += get get_CPPFLAGS = \ @@ -36,7 +35,6 @@ endif !BUILD_USES_WCHAR ## Makefile.asnmp_example_get_async.am if !BUILD_USES_WCHAR - noinst_PROGRAMS += get_async get_async_CPPFLAGS = \ diff --git a/ACE/ASNMP/examples/next/Makefile.am b/ACE/ASNMP/examples/next/Makefile.am index a7b4c2a1256..dae95eaeaba 100644 --- a/ACE/ASNMP/examples/next/Makefile.am +++ b/ACE/ASNMP/examples/next/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -15,7 +15,6 @@ ACE_ROOT = $(top_srcdir) ## Makefile.asnmp_example_next.am if !BUILD_USES_WCHAR - noinst_PROGRAMS = next next_CPPFLAGS = \ diff --git a/ACE/ASNMP/examples/set/Makefile.am b/ACE/ASNMP/examples/set/Makefile.am index 94f708ec8e1..7810a658eed 100644 --- a/ACE/ASNMP/examples/set/Makefile.am +++ b/ACE/ASNMP/examples/set/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -15,7 +15,6 @@ ACE_ROOT = $(top_srcdir) ## Makefile.asnmp_example_set.am if !BUILD_USES_WCHAR - noinst_PROGRAMS = set set_CPPFLAGS = \ diff --git a/ACE/ASNMP/examples/trap/Makefile.am b/ACE/ASNMP/examples/trap/Makefile.am index a60adce7d30..52307634b67 100644 --- a/ACE/ASNMP/examples/trap/Makefile.am +++ b/ACE/ASNMP/examples/trap/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -15,7 +15,6 @@ ACE_ROOT = $(top_srcdir) ## Makefile.asnmp_example_trap.am if !BUILD_USES_WCHAR - noinst_PROGRAMS = trap trap_CPPFLAGS = \ diff --git a/ACE/ASNMP/examples/walk/Makefile.am b/ACE/ASNMP/examples/walk/Makefile.am index 9cff32a49de..f0bc64a36cf 100644 --- a/ACE/ASNMP/examples/walk/Makefile.am +++ b/ACE/ASNMP/examples/walk/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -15,7 +15,6 @@ ACE_ROOT = $(top_srcdir) ## Makefile.asnmp_example_walk.am if !BUILD_USES_WCHAR - noinst_PROGRAMS = walk walk_CPPFLAGS = \ diff --git a/ACE/ASNMP/tests/Makefile.am b/ACE/ASNMP/tests/Makefile.am index b8ac30972bf..0b9ae3d1ce7 100644 --- a/ACE/ASNMP/tests/Makefile.am +++ b/ACE/ASNMP/tests/Makefile.am @@ -6,13 +6,12 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) ## Makefile.asnmp_tests_Address_Test.am - noinst_PROGRAMS = Address_Test Address_Test_CPPFLAGS = \ @@ -29,7 +28,6 @@ Address_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.asnmp_tests_Counter64_Test.am - noinst_PROGRAMS += Counter64_Test Counter64_Test_CPPFLAGS = \ @@ -46,7 +44,6 @@ Counter64_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.asnmp_tests_Counter_Test.am - noinst_PROGRAMS += Counter_Test Counter_Test_CPPFLAGS = \ @@ -63,7 +60,6 @@ Counter_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.asnmp_tests_Gauge_Test.am - noinst_PROGRAMS += Gauge_Test Gauge_Test_CPPFLAGS = \ @@ -80,7 +76,6 @@ Gauge_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.asnmp_tests_Integer_Test.am - noinst_PROGRAMS += Integer_Test Integer_Test_CPPFLAGS = \ @@ -97,7 +92,6 @@ Integer_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.asnmp_tests_Octet_Test.am - noinst_PROGRAMS += Octet_Test Octet_Test_CPPFLAGS = \ @@ -114,7 +108,6 @@ Octet_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.asnmp_tests_Oid_Test.am - noinst_PROGRAMS += Oid_Test Oid_Test_CPPFLAGS = \ @@ -131,7 +124,6 @@ Oid_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.asnmp_tests_Target_Test.am - noinst_PROGRAMS += Target_Test Target_Test_CPPFLAGS = \ @@ -148,7 +140,6 @@ Target_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.asnmp_tests_Varbind_Test.am - noinst_PROGRAMS += Varbind_Test Varbind_Test_CPPFLAGS = \ diff --git a/ACE/ASNMP/tests/test_config.h b/ACE/ASNMP/tests/test_config.h index a0d2bab7aa8..887fa5cec8a 100644 --- a/ACE/ASNMP/tests/test_config.h +++ b/ACE/ASNMP/tests/test_config.h @@ -25,6 +25,32 @@ // FUZZ: disable check_for_streams_include #include "ace/streams.h" +#if !defined (ACE_HAS_TEMPLATE_SPECIALIZATION) +class KEY +// ============================================================================ +// = TITLE +// Define a key for use with the Map_Manager_Test. +// +// = DESCRIPTION +// This class is put into the test_config.h header file to work +// around AIX C++ compiler "features" related to template +// instantiation... It is only used by Map_Manager_Test.cpp +// ============================================================================ +{ +public: + KEY (size_t v = 0): value_ (v) + { } + + size_t hash (void) const { return this->value_; } + operator size_t () const { return this->value_; } + +private: + size_t value_; +}; +#else +typedef size_t KEY; +#endif /* ACE_HAS_TEMPLATE_SPECIALIZATION */ + #if defined (ACE_WIN32) #define ACE_DEFAULT_TEST_FILE ACE_TEXT ("C:\\temp\\ace_test_file") @@ -41,20 +67,16 @@ #endif /* ACE_WIN32 */ -#ifndef ACE_START_TEST #define ACE_START_TEST(NAME) \ const ACE_TCHAR *program = NAME; \ ACE_LOG_MSG->open (program, ACE_Log_Msg::OSTREAM); \ if (ace_file_stream.set_output (program) != 0) \ ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("set_output failed")), -1); \ - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) starting %s test at %D\n"), program)); -#endif /* ACE_START_TEST */ + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) starting %s test at %T\n"), program)); -#ifndef ACE_END_TEST #define ACE_END_TEST \ - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Ending %s test at %D\n"), program)); \ + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Ending %s test at %T\n"), program)); \ ace_file_stream.close (); -#endif /* ACE_END_TEST */ #define ACE_NEW_THREAD \ do {\ @@ -68,10 +90,10 @@ do {\ ACE_LOG_MSG->open (program, ACE_Log_Msg::OSTREAM); \ if (ace_file_stream.set_output (program, 1) != 0) \ ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("set_output failed")), -1); \ - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Starting %s test at %D\n"), program)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Starting %s test at %T\n"), program)); #define ACE_END_LOG \ - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Ending %s test at %D\n\n"), program)); \ + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Ending %s test at %T\n\n"), program)); \ ace_file_stream.close (); #define ACE_INIT_LOG(NAME) \ diff --git a/ACE/COPYING b/ACE/COPYING index 2a8822bc2a8..1645f46c517 100644 --- a/ACE/COPYING +++ b/ACE/COPYING @@ -8,7 +8,7 @@ referred to as "DOC software") are copyrighted by [5]Douglas C. Schmidt and his [6]research group at [7]Washington University, [8]University of California, Irvine, and [9]Vanderbilt University, - Copyright (c) 1993-2007, all rights reserved. Since DOC software is + Copyright (c) 1993-2006, all rights reserved. Since DOC software is open-source, freely available software, you are free to use, modify, copy, and distribute--perpetually and irrevocably--the DOC software source code and object code produced from the source, as well as copy diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 0412b314429..1904c98a8fc 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,2918 +1,8719 @@ -Mon Jan 8 17:58:46 UTC 2007 Chad Elliott <elliott_c@ociweb.com> +Thu Nov 9 19:59:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - * tests/Bug_1890_Regression_Test.cpp: + * include/makeinclude/platform_aix4_cset++.GNU: + * include/makeinclude/platform_integrity_ghs.GNU: + * include/makeinclude/platform_irix6.x_sgic++.GNU: + * include/makeinclude/platform_linux_pgi.GNU: + * include/makeinclude/platform_macosx_panther.GNU: + * include/makeinclude/platform_macosx_tiger.GNU: + * include/makeinclude/platform_netbsd.GNU: + * include/makeinclude/platform_openbsd.GNU: + * include/makeinclude/platform_osf1_4.x_rcc.GNU: + * include/makeinclude/platform_vxworks5.x_ghs.GNU: + Simplified these files using the ?= operator - Bug 1890 is specifically targeted for the Select Reactor. So, - instead of relying on ACE_Reactor::instance() being an - ACE_Select_Reactor, explicitly use the ACE_Select_Reactor impl. - This will fix this test on Windows. +Thu Nov 09 16:10:10 UTC 2006 Martin Corino <mcorino@remedy.nl> -Mon Jan 8 16:51:55 UTC 2007 Wallace Zhang <zhang_w@ociweb.com> + * ace/Service_Config.cpp: - * tests/Bug_2368_Regression_Test.cpp: + Reverted my earlier change of Nov 6 and additionally removed + the ACE_Reactor::instance() call from the ACE_Service_Config + CTOR since it seems to be unnecessary here. - Improved the test output to show the failure caused by the - unresolved bug is expected. +Thu Nov 9 15:22:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> -Mon Jan 8 13:48:17 UTC 2007 Chad Elliott <elliott_c@ociweb.com> + * include/makeinclude/wrapper_macros.GNU: + Default threads to 1 if not set, thanks to Chad for helping out + with finding out why I had a problem in the rtems build - * examples/APG/Logging/Trace.h: +Thu Nov 9 12:46:54 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - Undefine TRACE before defining it to avoid warnings from vc71. + * bin/MakeProjectCreator/config/acedefaults.mpb: + * bin/MakeProjectCreator/config/taodefaults.mpb: -Mon Jan 8 12:41:30 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + Add automake specific section to subtract out $(ACE_ROOT)/lib + from libpaths, as libraries are not copied to, or linked from, + there in automake builds. This removes unnecessary -L's from + being added to *_LDFLAGS, sometimes eliminating the need for + that automake variable altogether. - * ace/TP_Reactor.cpp: - Also use ACE_DISABLE_NOTIFY_PIPE_DEFAULT in the constructors +Thu Nov 9 10:48:52 UTC 2006 Olli Savia <ops@iki.fi> -Mon Jan 8 12:00:30 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + * examples/IPC_SAP/DEV_SAP/reader/reader.cpp: + * examples/IPC_SAP/DEV_SAP/writer/writer.cpp: + Changed used baudrate to 19200. Extended reader example to handle + timeout. - * ace/Select_Reactor_T.cpp: - Const improvement +Thu Nov 9 10:50:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - * ace/Select_Reactor_T.h : - Also use ACE_DISABLE_NOTIFY_PIPE_DEFAULT in the constructors + * ace/Timer_Heap_T.{h,cpp}: + Changed the preallocated constructor from int to bool. -Mon Jan 8 11:23:30 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> +Thu Nov 9 09:25:48 UTC 2006 Olli Savia <ops@iki.fi> - * ace/Select_Reactor_T.h (open): - Also use ACE_DISABLE_NOTIFY_PIPE_DEFAULT as default for disable_notify_pipe + * ace/TTY_IO.cpp: + Removed LynxOS 3.x specific workaround. - * ace/Select_Reactor_T.h: - Doxygen improvements +Wed Nov 8 22:22:27 UTC 2006 Steve Huston <shuston@riverace.com> -Mon Jan 8 10:45:30 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + * bin/make_release: Re-applied this: + Sat Oct 28 20:10:42 UTC 2006 Steve Huston <shuston@riverace.com> - * ace/Select_Reactor_Base.h: - Doxygen improvements +Wed Nov 8 22:12:46 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> - * ace/Select_Reactor_Base.h: - Changed the way we set the default for the - ACE_Select_Reactor_Notify::open call, instead of just hardcoding - the default 0, use the ACE_DISABLE_NOTIFY_PIPE_DEFAULT define - which is set by default to 0, but which we can set from a - config file to 1 to disable the notification pipe. + * ace/Service_Config.cpp: + * ace/Service_Gestalt.cpp: - * ace/config-posix-nonetworking.h: - Set ACE_DISABLE_NOTIFY_PIPE_DEFAULT to 1. The notification pipe - doesn't work when networking is fully disabled. + This resolves a problem with shutting down the Service + Configurator via the static ACE_Service_Config::close () method, + where the registered services' fini() methods were not being + called. For full details, see bugzilla# 2701. Thanks to Aaron + Scamehorn <Aaron dot Scamehorn at cogcap dot com> for discovering + it an providing a test case. -Mon Jan 8 00:10:52 UTC 2007 Iliyan Jeliazkov <iliyan@ociweb.com> +Wed Nov 8 19:21:17 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - * bin/tao_orb_tests.lst: + * bin/make_release: - Adding "!MINIMUM" for the TransportCurrent tests, since it - precludes the use of the TC functionality. + Updates to the release script to work with Subversion. -Sun Jan 7 19:02:30 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> +Mon Nov 6 16:07:43 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - * ace/config-hpux-11.00.h: - Don't set ACE_SIZEOF_WCHAR, let Basic_Types just do this. Fixes - the difference between ACE_SIZEOF_WCHAR and sizeof(wchar_t) on - the HP aCC test on the IA64 aCC build which runs on the Sep 2006 - version of HPUX + * ace/SOCK_IO.h (ACE_SOCK_IO): Clarified the behavior of + non-blocking I/O. Thanks to Robert Neumann <robert dot neumann + at gmail dot com> for motivating this change. -Sat Jan 6 04:41:30 UTC 2007 Chris Cleeland <cleeland_c@ociweb.com> +Tue Nov 08 15:40:10 UTC 2006 Martin Corino <mcorino@remedy.nl> - * include/makeinclude/macros.GNU: - * include/makeinclude/rules.common.GNU: - * include/makeinclude/rules.local.GNU: + * ace/INET_Addr.inl: - Added new phony target, "svnignore", which takes a good guess at - what files are generated in a directory and adds them to - svn:ignore property on the containing directory. - - * apps/gperf/src: - * apps/gperf/tests: - * bin: - * examples/APG/Active_Objects: - * examples/APG/Config: - * examples/APG/Containers: - * examples/APG/Logging: - * examples/APG/Misc_IPC: - * examples/APG/Naming: - * examples/APG/Proactor: - * examples/APG/Processes: - * examples/APG/Reactor: - * examples/APG/Shared_Memory: - * examples/APG/Signals: - * examples/APG/Sockets: - * examples/APG/Streams: - * examples/APG/Svc_Config: - * examples/APG/ThreadManagement: - * examples/APG/ThreadPools: - * examples/APG/ThreadSafety: - * examples/APG/Threads: - * examples/APG/Timers: - * examples/ASX: - * examples/ASX/CCM_App: - * examples/ASX/Message_Queue: - * examples/Bounded_Packet_Relay: - * examples/C++NPv1: - * examples/C++NPv2: - * examples/Connection/blocking: - * examples/Connection/misc: - * examples/Connection/non_blocking: - * examples/DLL: - * examples/Export: - * examples/IOStream/client: - * examples/IOStream/server: - * examples/IPC_SAP/ATM_SAP: - * examples/IPC_SAP/DEV_SAP/reader: - * examples/IPC_SAP/DEV_SAP/writer: - * examples/IPC_SAP/FIFO_SAP: - * examples/IPC_SAP/FILE_SAP: - * examples/IPC_SAP/SOCK_SAP: - * examples/IPC_SAP/SPIPE_SAP: - * examples/IPC_SAP/TLI_SAP: - * examples/IPC_SAP/UPIPE_SAP: - * examples/Log_Msg: - * examples/Logger/Acceptor-server: - * examples/Logger/client: - * examples/Logger/simple-server: - * examples/Mem_Map/IO-tests: - * examples/Mem_Map/file-reverse: - * examples/Misc: - * examples/Naming: - * examples/OS/Process: - * examples/Reactor/Dgram: - * examples/Reactor/FIFO: - * examples/Reactor/Misc: - * examples/Reactor/Multicast: - * examples/Reactor/Ntalker: - * examples/Reactor/Proactor: - * examples/Service_Configurator/IPC-tests/client: - * examples/Service_Configurator/IPC-tests/server: - * examples/Service_Configurator/Misc: - * examples/Shared_Malloc: - * examples/Shared_Memory: - * examples/Smart_Pointers: - * examples/Synch: - * examples/System_V_IPC/SV_Message_Queues: - * examples/System_V_IPC/SV_Semaphores: - * examples/Threads: - * examples/Timer_Queue: - * examples/Web_Crawler: - * protocols/examples/RMCast/Send_Msg: - * protocols/examples/TMCast/Member: - * protocols/tests/HTBP/Reactor_Tests: - * protocols/tests/HTBP/Send_Large_Msg: - * protocols/tests/HTBP/Send_Recv_Tests: - * protocols/tests/HTBP/ping: - * protocols/tests/RMCast: - * tests: - * tests/log: - - Added subversion svn:ignore properties on all these directories - comparable to the values previously in the vertigial .cvsignore - files, as well as updated them commensurate with the new svnignore - gnuace make target. - - * apps/gperf/src/.cvsignore: - * apps/gperf/tests/.cvsignore: - * examples/APG/Active_Objects/.cvsignore: - * examples/APG/Config/.cvsignore: - * examples/APG/Containers/.cvsignore: - * examples/APG/Logging/.cvsignore: - * examples/APG/Misc_IPC/.cvsignore: - * examples/APG/Naming/.cvsignore: - * examples/APG/Proactor/.cvsignore: - * examples/APG/Processes/.cvsignore: - * examples/APG/Reactor/.cvsignore: - * examples/APG/Shared_Memory/.cvsignore: - * examples/APG/Signals/.cvsignore: - * examples/APG/Sockets/.cvsignore: - * examples/APG/Streams/.cvsignore: - * examples/APG/Svc_Config/.cvsignore: - * examples/APG/ThreadManagement/.cvsignore: - * examples/APG/ThreadPools/.cvsignore: - * examples/APG/ThreadSafety/.cvsignore: - * examples/APG/Threads/.cvsignore: - * examples/APG/Timers/.cvsignore: - * examples/ASX/.cvsignore: - * examples/ASX/CCM_App/.cvsignore: - * examples/ASX/Message_Queue/.cvsignore: - * examples/Bounded_Packet_Relay/.cvsignore: - * examples/C++NPv1/.cvsignore: - * examples/C++NPv2/.cvsignore: - * examples/Connection/blocking/.cvsignore: - * examples/Connection/misc/.cvsignore: - * examples/Connection/non_blocking/.cvsignore: - * examples/DLL/.cvsignore: - * examples/Export/.cvsignore: - * examples/IOStream/client/.cvsignore: - * examples/IOStream/server/.cvsignore: - * examples/IPC_SAP/ATM_SAP/.cvsignore: - * examples/IPC_SAP/DEV_SAP/reader/.cvsignore: - * examples/IPC_SAP/DEV_SAP/writer/.cvsignore: - * examples/IPC_SAP/FIFO_SAP/.cvsignore: - * examples/IPC_SAP/FILE_SAP/.cvsignore: - * examples/IPC_SAP/SOCK_SAP/.cvsignore: - * examples/IPC_SAP/SPIPE_SAP/.cvsignore: - * examples/IPC_SAP/TLI_SAP/.cvsignore: - * examples/IPC_SAP/UPIPE_SAP/.cvsignore: - * examples/Log_Msg/.cvsignore: - * examples/Logger/Acceptor-server/.cvsignore: - * examples/Logger/client/.cvsignore: - * examples/Logger/simple-server/.cvsignore: - * examples/Mem_Map/IO-tests/.cvsignore: - * examples/Mem_Map/file-reverse/.cvsignore: - * examples/Misc/.cvsignore: - * examples/Naming/.cvsignore: - * examples/OS/Process/.cvsignore: - * examples/Reactor/Dgram/.cvsignore: - * examples/Reactor/FIFO/.cvsignore: - * examples/Reactor/Misc/.cvsignore: - * examples/Reactor/Multicast/.cvsignore: - * examples/Reactor/Ntalker/.cvsignore: - * examples/Reactor/Proactor/.cvsignore: - * examples/Service_Configurator/IPC-tests/client/.cvsignore: - * examples/Service_Configurator/IPC-tests/server/.cvsignore: - * examples/Service_Configurator/Misc/.cvsignore: - * examples/Shared_Malloc/.cvsignore: - * examples/Shared_Memory/.cvsignore: - * examples/Smart_Pointers/.cvsignore: - * examples/Synch/.cvsignore: - * examples/System_V_IPC/SV_Message_Queues/.cvsignore: - * examples/System_V_IPC/SV_Semaphores/.cvsignore: - * examples/Threads/.cvsignore: - * examples/Timer_Queue/.cvsignore: - * examples/Web_Crawler/.cvsignore: - * protocols/examples/TMCast/Member/.cvsignore: - * protocols/tests/HTBP/Reactor_Tests/.cvsignore: - * protocols/tests/HTBP/Send_Large_Msg/.cvsignore: - * protocols/tests/HTBP/Send_Recv_Tests/.cvsignore: - * protocols/tests/HTBP/ping/.cvsignore: - * tests/.cvsignore: - * tests/log/.cvsignore: - - Removed these files in favor of svn:ignore properties on the - parent directory. - -Sat Jan 6 00:06:52 UTC 2007 Steve Huston <shuston@riverace.com> - - * ace/config-WinCE.h: Removed the ACE_HAS_WINNT4 stuff. - - * ace/config-pharlap.h: Removed the ACE_HAS_WINNT4 stuff and added - ACE_LACKS_WIN32_SECURITY_DESCRIPTORS and ACE_LACKS_WIN32_MOVEFILEEX. - Added ACE_HAS_IP_MULTICAST. - Thanks to David Hauck for helping with these changes. - - * ace/config-lite.h: Removed another vestige of MSVC 6 support. + Enhanced operator <() to support IPv6 addresses as well. + Thanks to Andre Kostur (akostur at incognito dot com) for + submitting a patch for this. - * ace/Default_Constants.h: - * ace/config-win32-common.h: Moved the Win32 ACE_DEFAULT_FILE_PERMS - settings to config-win32-common.h - Also removed all the pre-NT4 stuff from config-win32-common.h. - - * ace/Asynch_Acceptor.{h cpp}: - * ace/Asynch_IO.{h cpp}: - * ace/Asynch_IO_Impl.{h cpp}: - * ace/Message_Queue.{h cpp inl}: - * ace/Message_Queue_T.{h cpp}: - * ace/Proactor.{h cpp}: - * ace/Proactor_Impl.{h cpp}: - * ace/WIN32_Asynch_IO.{h cpp}: - * ace/WIN32_Proactor.{h cpp}: - ACE_Message_Queue_NT and ACE_Asynch_IO switched from using - ACE_HAS_WINNT4==1 and maybe some other platforms to using the new - ACE_HAS_WIN32_OVERLAPPED_IO setting. It's now incumbent on the - config maintainer to keep config-win32-*.h, config-WinCE.h, - config-pharlap.h, etc. up to date on these features as the - various versions do or don't support them. - - * ace/config-win32-mingw.h: Removed ACE_HAS_WINNT4 section. - - * ace/Configuration.cpp (ACE_Configuration_Win32Registry::remove_section): - Removed the pre-NT4 section that checked for non-empty section. - - * ace/Mem_Map.cpp: Removed all the support for ACE_USE_MAPPING_NAME - since it was used only for pre-NT4 Windows. - - * ace/Msg_WFMO_Reactor.cpp (wait_for_multiple_events): Removed the - pre-NT4 code block that switched to MsgWaitForMultipleObjectsEx. - All Win platforms without ACE_LACKS_MSG_WMFO can do this now. - - * ace/OS_NS_stdio.inl (rename): - * tests/OS_Test.cpp: The ability to rename a file to one that exists - without removing the 'to' file first is now detected by the new - feature macro ACE_LACKS_WIN32_MOVEFILEEX instead of ACE_HAS_WINNT4. - - * ace/OS_NS_unistd.cpp (pread, pwrite): The Windows code that can do - overlapped is now built based on ACE_HAS_WIN32_OVERLAPPED_IO instead - of ACE_HAS_WINNT4. - - * ace/Pagefile_Memory_Pool.cpp: Setting up a security descriptor for - the file mapping is now determined by the lack of - ACE_LACKS_WIN32_SECURITY_DESCRIPTORS, not ACE_HAS_WINNT4. - - * ace/README: Added descriptions for ACE_HAS_WIN32_OVERLAPPED_IO, - ACE_HAS_WIN32_NAMED_PIPES, ACE_LACKS_WIN32_SECURITY_DESCRIPTORS, - ACE_LACKS_WIN32_MOVEFILEEX. - - * ace/Sock_Connect.cpp: Removed all the code that rummaged through - the registry looking for net interfaces on Windows. Getting - interface info now requires WinCE, Pharlap, or Winsock2. This removes - support for Win95, Win98, etc. - - * ace/SPIPE_Acceptor.{cpp h} (ACE_SPIPE_Acceptor): Now useable on - Windows when ACE_HAS_WIN32_NAMED_PIPES is set, not ACE_HAS_WINNT4. - Similar to above with ACE_HAS_WIN32_OVERLAPPED_IO - config - maintainers need to manage this setting. - - * ace/OS_NS_Thread.cpp (sched_params): Fix mis-aligned #if block - for ACE_HAS_PHARLAP_RT. Also, for scope == ACE_SCOPE_PROCESS, return - -1, ENOTSUP for Pharlap; it doesn't have SetPriorityClass(). - - * ACE-INSTALL.html: Removed mention of ACE_HAS_WINNT4 and building - for Win95/98/Me - ACE now requires WinNT 4 or later. - Updated the information for building for Pharlap ETS. +Wed Nov 8 14:24:02 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - * tests/CDR_File_Test.cpp: - * tests/Svc_Handler_Test.cpp: Removed the check for NT4 or better when - setting TEST_CAN_UNLINK_IN_ADVANCE. VxWorks is the only case - remaining where this needs to be set. + * configure.ac: - * tests/Malloc_Test.cpp: Removed the Win NT4 case checks for setting - ACE_TEST_REMAP_ON_FAULT; Win9x is no longer supported. Also, when - deciding address ranges for testing, decide at run time based on - GetVersionInfo() on Windows, not on preprocessor checks. + Change ACE_LACKS_NET_IF_H feature test to #include <sys/types.h> + (if present). - * tests/Message_Queue_Test.cpp: Use ACE_HAS_WIN32_OVERLAPPED_IO to - decide whether or not to test ACE_Message_Queue_NT. +Wed Nov 8 13:45:07 UTC 2006 Chad Elliott <elliott_c@ociweb.com> - * tests/Proactor_Scatter_Gather_Test.cpp: Decide whether or not to - run this test based on ACE_HAS_WIN32_OVERLAPPED_IO instead of - ACE_HAS_WINNT4. + * examples/C++NPv2/C++NPv2.mpc: - * ace/Proactor_Timer_Test.cpp: Run this test on Windows based on - ACE_HAS_WIN32_OVERLAPPED_IO instead of !ACE_HAS_WINCE. + The AC_CLD project requires threads in order to build and run + correctly. - * tests/SPIPE_Test.cpp: - * tests/UPIPE_SAP_Test.cpp: Manage which features to test on Windows - based on ACE_HAS_WIN32_NAMED_PIPES instead of ACE_HAS_WINNT4. +Tue Nov 07 15:49:10 UTC 2006 Martin Corino <mcorino@remedy.nl> - * ace/Dev_Poll_Reactor.cpp: Fixed spelling error in a comment. + * ace/OS_NS_netdb.inl: -Fri Jan 5 21:46:16 UTC 2007 Wallace Zhang <zhang_w@ociweb.com> + Changes to accomodate VxWorks 6.x versions of gethostbyname and + gethostbyaddr. These are threadsafe as the x_r versions are but + require deallocating the returned hostent structure. - * ace/Process.cpp: +Tue Nov 7 15:44:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - Improved the implementation of ACE_Process_Options::setenv(...) - to address the potential buffer overflow when invoking - sprintf and/or vsprintf. This fixes bug 2660 and 2762. More - discussions have been accumulated in RT 9198. + * ace/Sock_Connect.cpp: + With VxWorks 6.3 in rtp mode with IPv6 enabled declare the + in6addr_ constants explicitly, these are exported by the + VxWorks 6.3 rtp header files but not implemented -Fri Jan 5 19:06:17 UTC 2007 Chad Elliott <elliott_c@ociweb.com> +Tue Nov 07 13:31:10 UTC 2006 Martin Corino <mcorino@remedy.nl> - * bin/msvc_static_order.lst: + * include/makeinclude/platform_vxworks6.3.GNU: - Added project names to correct the build order for - TAO/tests/Collocation and TAO/tests/TransportCurrent. + Fixed build settings for PPC32 builds with softfloat. -Fri Jan 5 14:03:12 UTC 2007 Chad Elliott <elliott_c@ociweb.com> +Tue Nov 7 10:38:25 UTC 2006 Simon McQueen <sm@prismtech.com> - * apps/JAWS2/HTTPU/http_headers.h: + * tests/Naming_Test.cpp: - For the sake of compiling on HP-UX, #undef SERVER if it's defined. + Moved an ::open out of an ACE_ASSERT. It wasn't getting performed on + some builds. -Fri Jan 5 13:34:18 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> +Tue Nov 7 09:56:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - * ace/OS_NS_stdio.cpp: - * ace/config-hpux-11.00.h: - Disable ACE_HAS_VFWPRINTF again for HPUX, takes more time, - something for the future + * performance-tests/Misc/basic_func.{h,cpp}: + Renamed B to BB to resolve compile problems on rtems where we + have also a typedef B -Fri Jan 5 13:15:16 UTC 2007 Phil Mesnier <mesnier_p@ociweb.com> +Tue Nov 7 07:52:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - * ace/INET_Addr.cpp: + * ace/ACE.h: + Also rtems defines log2, use the same workaround as with cygwin - Replaced #if ACE_HAS_IPV6 with #if defined () to avoid confusing - doxygen. + * include/makeinclude/platform_rtems.x_g++.GNU: + Removed -ansi -Fri Jan 5 12:59:18 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> +Tue Nov 7 01:47:46 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> - * tests/Manual_Event_Test.cpp: - Removed n_iterations variable, it is not used at all + * ace/Sock_Connect.cpp (count_interfaces): + Another scoreboard fix. -Fri Jan 5 12:44:18 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> +Mon Nov 6 20:52:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - * ace/OS_NS_stdio.cpp: - When ACE_HAS_WCHAR is defined include os_wchar.h to get the - wchar methods which is needed on for example HPUX + * apps/Gateway/Gateway/Config_Files.{h,cpp}: + * apps/Gateway/Gateway/File_Parser.{h,cpp}: + * apps/Gateway/Gateway/Gateway.cpp: + Renamed class FP to FPRT. This resolves the compile errors on + rtems where a struct FP does exist + +Mon Nov 6 16:52:14 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> + + * ace/Sock_Connect.cpp: + My fix for Solaris x86 broke HPUX. The trouble is that the + method ACE::count_interfaces() is only used by the "generic" + implementation of get_ip_interfaces(). Probably a better + solution is to remove count_interfaces() and move its + functionality into the get_ip_interfaces() implementation, but + that is a bigger change than I care to make at the moment. I + think it should be possible to do so in a way that also reduces + the footprint and improves performance by eliminating the + effectively duplicated code in count_interfaces(). + +Mon Nov 06 14:14:10 UTC 2006 Martin Corino <mcorino@remedy.nl> - * ace/config-linux-common.h: - * ace/config-vxworks6.2.h: * ace/config-vxworks6.3.h: - * ace/config-vxworks6.4.h: - Added ACE_HAS_VFWPRINTF - * ace/config-win32-common.h: - Removed ACE_HAS_VSWPRINTF, isn't used anymore + Fixed incorrect definition of IOV_MAX. -Fri Jan 5 11:09:18 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> +Mon Nov 6 13:08:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - * ace/config-hpux-11.00.h: - Moved ACE_SIZEOF_LONG outside the aCC specific block, this is - also needed with GCC + * ace/config-sunos5.5.h: + Added ACE_HAS_GETRUSAGE, thanks to Michael Klein + <michael dot klein at fazi dot de> for reporting that SunOS has + this method, fixes bugzilla 2694. -Fri Jan 5 10:40:18 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> +Mon Nov 6 12:59:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - * tests/Thread_Creation_Threshold_Test.cpp: - Removed not needed semicolon after namespace closure + * examples/Service_Configurator/Misc/main.cpp: + * examples/Service_Configurator/Misc/Service_Configurator_Misc.mpc: + * examples/Service_Configurator/Misc/svc.conf1 + Fixed shared library name, make working for embedded platforms. + Thanks to Abdul Sowayan <abdullah dot sowayan at lmco dot com> + for reporting this, fixes bugzilla bug 2698 -Fri Jan 5 10:30:18 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> +Mon Nov 06 11:17:10 UTC 2006 Martin Corino <mcorino@remedy.nl> - * contrib/minizip/unzip.c: - * contrib/minizip/zip.c: - Fixed unitialized warnings + * ace/Service_Config.cpp: -Fri Jan 5 10:04:18 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + Implemented a fix for runtime problems in case + ACE_HAS_NONSTATIC_OBJECT_MANAGER is defined (seen on VxWorks 6.3 RTP). - * ace/config-g++-common.h: - A change related to my commit of: - Thu Jan 4 08:55:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> - With FC6 a bug in GCC has been fixed. This is then fixed in - GCC 4.1.1 but only in the RedHat codebase, not in other - GCC 4.x compilers. The HP GCC 4.1.1 compiler hasn't this - fix but also the SuSE 10.2 GCC 4.1.2 compiler has not this - fix. We assume at this moment that GCC 4.2 will have this - fix. If you have FC6 you must add the following define to - your config.h file: - ACE_GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS 1 +Sun Nov 5 14:14:51 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> -Fri Jan 5 07:05:18 UTC 2007 J.T. Conklin <jtc@acorntoolworks.com> + * ace/Sock_Connect.cpp: + Fix for Solaris x86. - * bin/MakeProjectCreator/modules/AutomakeWorkspaceHelper.pm: +Sat Nov 4 12:46:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - Remove "-Ge 1" from initial TAO_IDLFLAGS definition. + * ace/config-sunos4*.h: + Removed these files, these are ancient and not supported anymore -Fri Jan 5 03:34:00 UTC 2007 Phil Mesnier <mesnier_p@ociweb.com> +Fri Nov 3 18:12:36 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - * ace/INET_Addr.cpp: + * tests/Unload_libACE.cpp (main): Reverted the ACE_OS::exit() from + this since it's not supposed to be an ACE test. Thanks to Simon + Massey for reporting this. - Refactored the addr_to_string() method to format numeric IPv6 - addresses using [addr]:port to disambiguate addresses such as - [fe80::1:2:3]:12345. This should be benign as string_to_addr() - already parses [ipv6addr]:port formatted strings. +Fri Nov 03 15:52:10 UTC 2006 Martin Corino <mcorino@remedy.nl> -Fri Jan 5 00:51:22 UTC 2007 Phil Mesnier <mesnier_p@ociweb.com> + * bin/PerlACE/ProcessVX_Unix.pm: - * ace/INET_Addr.h: - * ace/INET_Addr.inl: + Bugfix in cmdline composition. - Added a new method, is_multicast(), to assist applications in - determining if the inet address is or is not a multicast address - regardless of it being an IPv4 or IPv6 format. +Fri Nov 3 15:15:43 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> - * ace/Timer_Queue_Adapters.cpp: + * ace/Sock_Connect.cpp: + Scoreboard cleanup. - Fixed a bug in - ACE_Async_Timer_Queue_Adapter<TQ>::schedule_ualarm() wherein the - time value for the alarm was computed using - ACE_OS::gettimeofday() rather than using the timer queue's - gettimeofday implementation. Thus situations where an alternate - time source were used, the scheduled alarm would be wrong. +Fri Nov 03 10:54:10 UTC 2006 Martin Corino <mcorino@remedy.nl> -Thu Jan 4 15:51:41 UTC 2007 Chris Cleeland <cleeland_c@ociweb.com> + * ace/OS_NS_sys_time.inl: - * tests/Thread_Creation_Threshold_Test.cpp: Changed name of - anonymous namespace constant from DEBUG to PRINT_DEBUG_MSGS to - avoid potential conflicts with #defines. This should clean up - at least one Windows build, and possibly others as well. + Fixed conversion warning on OpenVMS. -Thu Jan 4 15:33:08 UTC 2007 J.T. Conklin <jtc@acorntoolworks.com> +Fri Nov 3 00:39:04 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> - * configure.ac: + * ace/Sock_Connect.cpp: + One more optimization, this one to combine the methods for + evaluating the IPv6 or IPv4 enabled status. + +Fri Nov 3 00:32:27 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> + + * ace/Select_Reactor_Base.inl: + * ace/Select_Reactor_Base.cpp: + Additional optimization for finding and unbinding event + handlers. The solution moves the test for handles in range into + the top-level find and unbind methods to allow the fix for bug + 2653 to continue to work in unbind while avoiding a double check + for handles in range during a find. + +Thu Nov 2 20:33:55 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * tests/SOCK_Test_IPv6.cpp (spawn): + * tests/Pipe_Test.cpp (run_main): + * tests/SPIPE_Test.cpp (client): + * tests/TkReactor_Test.cpp (run_main): + * tests/MT_SOCK_Test.cpp (spawn): + * tests/Process_Strategy_Test.cpp (run_main): + * tests/Unload_libACE.cpp (main): + * tests/SOCK_Test.cpp (spawn): + * tests/Priority_Reactor_Test.cpp (run_main): + * tests/SOCK_Dgram_Test.cpp (spawn): + * tests/SOCK_SEQPACK_SCTP_Test.cpp (spawn_test): + * examples/Map_Manager/test_hash_map_manager.cpp (ACE_TMAIN): + * apps/mkcsregdb/mkcsregdb.cpp (fail): Replaced exit() with + ACE_OS::exit(). + +Wed Nov 01 20:04:00 US Central Time 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * Bronson Royce Schmidt checked in at 7 pounds, 15 ounces and + 21.25 inches long. + +Thu Nov 2 16:10:10 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> - Check <sys/time.h> instead of <time.h> for gettimeofday() - prototype. Also use AC_CHECK_DECL instead of AC_EGREP_CPP. - This fixes bugzilla bug 2764. + * ace/Sock_Connect.cpp: + Cleaned up debugging code left in my previous premature commit. -Thu Jan 4 13:53:33 UTC 2007 J.T. Conklin <jtc@acorntoolworks.com> +Thu Nov 2 15:42:29 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> - * ACEXML/tests/Makefile.am: - * ACEXML/tests/util/Makefile.am: - * ACEXML/apps/svcconf/Makefile.am: - * ACEXML/common/Makefile.am: - * ACEXML/examples/SAXPrint/Makefile.am: + * ace/Sock_Connect.cpp: + * ace/Sock_Connect.h: + Added support for IPv6 detection on HPUX, AIX, Solaris, WinCE, + and VxWorks 5.5.x. - Tweak to use ACE_{ZLIB,ZZIP}_{CPPFLAGS,LDFLAGS,LIBS} - instead of -I${ZLIB_ROOT}/include, etc. The former - are substituted by the configure script. +Wed Nov 01 09:05:10 UTC 2006 Martin Corino <mcorino@remedy.nl> - * m4/ace.m4: + * ace/OS_NS_stdlib.inl: - Add ACE_PATH_ZLIB and ACE_PATH_ZZIP autoconf macros. - zlib and zzip can now be enabled at configure time - with --with-zlib and --with-zzip. + Fixed conversion warnings in atop() on OpenVMS. -Thu Jan 4 12:45:46 UTC 2007 Chad Elliott <elliott_c@ociweb.com> +Wed Nov 01 08:35:10 UTC 2006 Martin Corino <mcorino@remedy.nl> - * ace/Basic_Stats.cpp: - * ace/Parse_Node.cpp: - * ace/Sample_History.cpp: - * ace/Service_Repository.cpp: + * ace/OS_NS_sys_stat.h: - Remove build warnings when ACE_NLOGGING is defined. + Fixed Borland compile failure over def of ACE_Stat. -Thu Jan 4 08:55:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> +Tue Oct 31 23:08:32 UTC 2006 Steve Huston <shuston@riverace.com> - * ace/config-g++-common.h: - With gcc 4.{0,1} we couldn't use visibility attributes for singletons - because of a bug in GCC. This has been fixed in GCC 4.1.1 that - gets shipped with FC6. This change enables the visibily - attributes again for GCC 4.1.1 or newer. + * ace/Dev_Poll_Reactor.h: Note that the Linux epoll code implementation + is supported, but the /dev/poll implementation is still + experimental. - * ace/Obstack.h: - Reverted the change below, it is an incorrect change - Wed Nov 22 09:07:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> - Use ACE_EXPORT_SINGLETON_DECLARATION to resolve link errors - on FC6. Thanks to Ken Sedgwick <ken at bonsai dot com> for - reporting this and testing out the patch. +Tue Oct 31 10:31:10 UTC 2006 Ossama Othman <ossama_othman at symantec.com> -Wed Jan 3 22:31:05 UTC 2007 Chris Cleeland <cleeland_c@ociweb.com> + * ace/OS_NS_sys_stat.h (ACE_WSTAT_FUNC_NAME): - This entry merges in changes from OCITAO 1.4a which were - originally part of RT 8678. + Corrected wstat() function name for Borland. - * ace/README: - * ace/config-sunos5.9.h: +Mon Oct 30 19:57:20 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - Added new compiler macro, ACE_LACKS_THR_CONCURRENCY_FUNCS, to - accomodate the deprecation of thr_concurrency() in Solaris 9 - onwards. The functions still exist, but the call semantics have - changed slightly such that values for which they would - previously succeed now fail despite the fact that they are - effectively no-ops in Solaris >= 9. This would cause - thr_create(THR_NEW_LWP) to fail in a process when invoked for - the 65536th (or greater) time. + * bin/ciao_tests.lst: - Currently this macro is only defined on Solaris 9+, but, since I - believ this function was only ever present on Solaris anyway, it - could probably be defined in general, and simply #undef'd on - Solaris 8 and prior. + Added run_test.pl in CIAO/tests/IDL3/Events/Any to the list of + CIAO tests to be run automatically. - * ace/OS_NS_Thread.cpp (thr_create): +Mon Oct 30 17:34:35 UTC 2006 Ossama Othman <ossama_othman at symantec.com> - Conditionally removed THR_NEW_LWP section when - ACE_LACKS_THR_CONCURRENCY_FUNCS is defined. + * ace/config-win32-common.h: - * tests/Thread_Creation_Threshold_Test.cpp: - * tests/run_test.lst: - * tests/tests.mpc: + Use 64-bit file offsets by default in the WIN64 case, similar to + what 64-bit UNIX systems do. + +Mon Oct 30 17:23:15 UTC 2006 Steve Huston <shuston@riverace.com> - Added a new test to check the threshold of thread creation. - This simply verifies that more than 2^15 threads can be created - sequentially (not simultaneously). + * include/makeinclude/wrapper_macros.GNU: Added 2 new build options, + dmalloc and mtrace. When specified at build time (e.g. make mtrace=1) + the PLATFORM_DMALLOC_CPPFLAGS and/or PLATFORM_MTRACE_CPPFLAGS values + are added to CPPFLAGS. For dmalloc, the PLATFORM_DMALLOC_LDFLAGS and + PLATFORM_DMALLOC_LIBS are added to LDFLAGS and LIBS, respectively. + Also added the ability to specify additional purify and quantify + command-line options by setting PLATFORM_PURIFY_OPTIONS and + PLATFORM_QUANTIFY_OPTIONS, respectively. Thank you to Howard + Finer for supplying these additions. -Wed Jan 3 22:10:54 UTC 2007 Chris Cleeland <cleeland_c@ociweb.com> +Mon Oct 30 16:56:28 UTC 2006 Chad Elliott <elliott_c@ociweb.com> - * ace/CDR_Stream.inl (adjust): + * bin/MakeProjectCreator/templates/gnu.mpd: - Reverted one-line change committed in r76279 and as part of - entry from "Wed Jan 3 05:53:04 UTC 2007 Chris Cleeland - <cleeland_c@ociweb.com>". After getting some questions from - Johnny and posing them to the originators of the change, the - originators indicated that, over time, the problem may have been - application-related as they could never isolate a test case that - provoked it. + The implementation for the 'targetoutdir' template variable was + incorrect. Libraries and executables were not symbolically linked + to the output location correctly. Also, 'targetoutdir' was not + taken into account for the 'libpaths' setting. -Wed Jan 3 19:52:05 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> +Mon Oct 30 15:30:47 UTC 2006 Simon McQueen <sm@prismtech.com> * bin/tao_orb_tests.lst: - Run the compression test when ZLIB is part of the config list -Wed Jan 3 19:34:47 UTC 2007 Chad Elliott <elliott_c@ociweb.com> + Scheduled regression test for bug #2669. + +Mon Oct 30 14:31:42 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> + + * ace/Select_Reactor_Base.inl: + Reverting the functional part of my previous commit until I + learn the correct way to manage the upper bound test portably. * bin/tao_orb_tests.lst: + Make the Bug 2654 test be ignored for minimum CORBA builds. - TAO/tests/Any/Recursive also does not work when the build is - static. It uses ACE_Dynamic_Service to locate the - TAO_TypeCodeFactory_Adapter which fails. +Mon Oct 30 12:18:03 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> -Wed Jan 3 18:35:02 UTC 2007 Chad Elliott <elliott_c@ociweb.com> + * ace/Select_Reactor_Base.inl (unbind): + Added an additional validity check and a comment to ward off + future optimizations. - * bin/tao_orb_tests.lst: +Mon Oct 30 09:24:42 UTC 2006 Ossama Othman <ossama_othman at symantec.com> - Do not run TAO/tests/Any/Recursive if minimum_corba, - corba_e_compact or corba_e_micro are enabled. Not all portions of - the test build with any one of these enabled. + * ace/OS_NS_sys_stat.h (ACE_stat): + * ace/OS_NS_sys_stat.inl (stat, wstat): -Wed Jan 3 15:50:39 UTC 2007 Chad Elliott <elliott_c@ociweb.com> + Only use Windows 64-bit stat structures and functions when + _FILE_OFFSET_BITS=64 is defined. Addresses 64-bit conversion + warnings. - * ACEXML/apps/svcconf/svcconf.mpc: - * ACEXML/common/common.mpc: - * ACEXML/parser/parser/parser.mpc: - * Kokyu/Kokyu.mpc: - * ace/QoS/qos.mpc: - * ace/SSL/ssl.mpc: - * ace/SSL/ssl_for_tao.mpc: - * ace/ace.mpc: - * ace/ace_flreactor.mpc: - * ace/ace_for_tao.mpc: - * ace/ace_qtreactor.mpc: - * ace/ace_tkreactor.mpc: - * ace/ace_xtreactor.mpc: - * apps/gperf/src/gperf.mpc: - * protocols/ace/HTBP/HTBP.mpc: - * protocols/ace/RMCast/RMCast.mpc: - * protocols/ace/TMCast/TMCast.mpc: +Sun Oct 30 05:31:01 UTC 2006 Ossama Othman <ossama_othman at symantec.com> + + * ace/Auto_Ptr.h (ACE_auto_ptr_reset): - Use the install base project instead of the deprecated core base - project. + Adjusted function template arguments to handle case where the + auto_ptr element type and pointer type passed to this function + are not the same. Addresses argument deduction failures. -Wed Jan 3 15:25:05 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + * ace/FILE.h (ACE_FILE): + + 64-bit file offset fixes. s/off_t/ACE_OFF_T. + + * ace/Truncate.h (Truncator): + + Added explicit specializations for int and long for Borland. + Relying on ACE_{U}INT32 specializations is not sufficient. + + * tests/CDR_File_Test.cpp (run_test): + + A 64-bit file offset is not always enabled. Corrected offset + type. s/ACE_LOFF_T/ACE_OFF_T. + +Sun Oct 29 17:10:39 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> * bin/tao_orb_tests.lst: - Added new PI test + Added Bug 2654 regression test to suite. -Wed Jan 3 14:57:49 UTC 2007 Chad Elliott <elliott_c@ociweb.com> +Sat Oct 28 20:50:56 UTC 2006 Steve Huston <shuston@riverace.com> - * bin/MakeProjectCreator/config/ipv6.mpb: + * examples/Threads/thread_specific.cpp: Need to reinterpret_cast a + pointer back to an intptr_t. - The cbx project type was replaced by the bds4 project type. +Sat Oct 28 20:10:42 UTC 2006 Steve Huston <shuston@riverace.com> -Wed Jan 03 14:20:00 UTC 2007 Simon Massey <sma@prismtech.com> + * bin/make_release: Added Smartphone configurations to the WinCE + project files generated at release time. - * ace/CORBA_macros.h: - With MFC, must delete any caught and eaten "out of memory" exceptions. +Sat Oct 28 13:50:01 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> -Wed Jan 3 13:25:06 UTC 2007 Chad Elliott <elliott_c@ociweb.com> + * ace/Select_Reactor_Base.cpp: - * bin/msvc_static_order.lst: + Fix to address Win32-specific problems in bug 2653 fix. - Build the TAO/tests/Smart_Proxies/Collocation/SP_Collocation_Idl - project before SP_Collocation_TestStubsLib. +Sat Oct 28 01:48:27 UTC 2006 Steve Huston <shuston@riverace.com> -Wed Jan 3 13:16:16 UTC 2007 Chad Elliott <elliott_c@ociweb.com> + * include/makeinclude/wrapper_macros.GNU: Add -L$(INSLIB) to LDFLAGS + if it was not there already. Allows link to work when built libraries + are moved to locations other than the default $(ACE_ROOT)/lib + location. - * bin/tao_other_tests.lst: +Fri Oct 28 03:23:18 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> + + * apps/JAWS2/JAWS/FILE.cpp: + * apps/JAWS2/JAWS/FILE.h: + * apps/JAWS2/JAWS/IO.cpp: + * apps/JAWS3/jaws3/FILE.cpp: + * apps/JAWS3/jaws3/FILE.h: + * examples/Threads/thread_manager.cpp: + * examples/Threads/cancel.cpp: + * examples/Threads/thread_specific.cpp: + * examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp: + * performance-tests/Synch-Benchmarks/Perf_Test/Benchmark_Performance.cpp + Addressed 64-bit conversion warnings. + +Fri Oct 28 02:49:11 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> + + * examples/APG/Shared_Memory/Mem_Map.cpp: + * examples/Mem_Map/file-reverse/file-reverse.cpp: + * examples/Web_Crawler/Mem_Map_Stream.cpp: + + Addressed 64-bit conversion warnings. + +Fri Oct 27 21:41:25 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> + + * THANKS: + * ace/Select_Reactor_Base.inl: + * ace/Select_Reactor_Base.cpp: + * ace/TP_Reactor.inl: + * ace/TP_Reactor.cpp: + * tests/run_test.lst: - Added !NO_MCAST to those tests that use multicast. + The fix for bug 2653. Thanks to Scott Mitchell <rsm at progress + dot com> and Chris Reed <cr at progress dot com> for the + considerable effort they put in helping to isolate this problem. - * tests/Unload_libACE.cpp: +Fri Oct 27 21:28:36 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> + + * tests/Bug_2653_Regression_Test.cpp: * tests/tests.mpc: - * tests/unload_libace.mpb: - Added support for running this test when ace_for_tao is enabled. + Added a new regression test. Without the accompaning fix, the + test coredump. If you comment out the call to test_for_crash, + the test will spin madly for 5 seconds, then abort. With the + pending fix to the TP reactor, the test has no errors. -Wed Jan 3 12:33:33 UTC 2007 Chad Elliott <elliott_c@ociweb.com> +Fri Oct 27 19:48:23 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - * include/makeinclude/wrapper_macros.GNU: + * ace/Filecache.cpp (ACE_Filecache_Object): - Since the zzip base project now 'requires' zlib, we can default - zlib to 1. This will cause no harm to those that do not have zlib - since zlib is a "feature" project and will not be included in any - project unless it is explicitly enabled. + Cast -1 to size_t. Ugly (and works), but currently necessary. + Addresses "passing negative value" warnings. -Wed Jan 3 09:36:13 UTC 2007 Olli Savia <ops@iki.fi> +Fri Oct 27 19:28:16 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - * include/makeinclude/wrapper_macros.GNU: + * ace/OS_NS_stdio.inl (flock_adjust_params): + * ace/OS_NS_sys_stat.inl (filesize): + + Fixed comparison of signed/unsigned warnings. + +Fri Oct 27 09:25:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Configuration_Import_Export.cpp: + Explicitly initialise pointer to 0 to silence warning in + gcc cygwi build + +Fri Oct 27 01:58:09 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> + + From Russell Mora <russell_mora at symantec dot com> + * ace/ACE.cpp: + * ace/ACE.h: + * ace/FILE.cpp: + * ace/File_Lock.h: + * ace/File_Lock.inl: + * ace/Filecache.cpp: + * ace/Filecache.h: + * ace/Local_Memory_Pool.cpp: + * ace/MEM_Acceptor.h: + * ace/MEM_Acceptor.inl: + * ace/MEM_IO.cpp: + * ace/MEM_IO.inl: + * ace/MEM_IO.h: + * ace/MMAP_Memory_Pool.cpp: + * ace/MMAP_Memory_Pool.h: + * ace/Mem_Map.cpp: + * ace/Mem_Map.h: + * ace/Mem_Map.inl: + * ace/OS_NS_macros.h: + * ace/OS_NS_stdio.cpp: * ace/OS_NS_stdio.inl: - * tests/OS_Test.cpp: + * ace/OS_NS_stdio.h: + * ace/OS_NS_sys_mman.h: + * ace/OS_NS_sys_mman.inl: + * ace/OS_NS_sys_stat.h: + * ace/OS_NS_sys_stat.inl: + * ace/OS_NS_unistd.cpp: + * ace/OS_NS_unistd.inl: + * ace/OS_NS_unistd.h: + * ace/Pagefile_Memory_Pool.inl: + * ace/Shared_Memory_MM.cpp: + * ace/Shared_Memory_MM.h: + * ace/Shared_Memory_MM.inl: + * ace/Shared_Memory_Pool.cpp: + * ace/Shared_Memory_Pool.h: + * ace/os_include/sys/os_types.h: + * ace/os_include/sys/os_stat.h: + * ace/os_include/os_unistd.h: + * examples/Web_Crawler/Iterators.cpp: + * examples/Web_Crawler/Mem_Map_Stream.cpp: + * examples/Web_Crawler/Mem_Map_Stream.h: + * examples/IPC_SAP/FILE_SAP/client.cpp: - Added the ability to use trio (http://sourceforge.net/projects/ctrio/) - if platform lacks decent support for vsnprintf. trio support is - enabled by defining trio=1 in plaform_macros.GNU + Added support for 64-bit file offsets on 32-bit platforms that + support the _FILE_OFFSET_BITS preprocessor symbol, as well as + Windows. Enable by defining the _FILE_OFFSET_BITS=64 + preprocessor symbol. ACE provides the necessary support on + Windows when it is defined with the assistance of a new + ACE_OFF_T typedef. -Wed Jan 3 07:52:05 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> +Thu Oct 26 24:44:55 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - Reverted my change below, it breaks the singleton on windows, the EXPORT - should not be there, seems we need a different way to resolve this - problem with FC6. + * ace/Truncate.h (Truncator): - Tue Jan 2 14:27:05 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - * ace/Based_Pointer_Repository.h: - Use ACE_EXPORT_SINGLETON_DECLARATION to resolve link errors - on FC6. Thanks to Olli Savia <ops@iki.fi> for - reporting this and testing out the patch. + Removed ACE_Export macros in the Borland case. They shouldn't + be necessary. -Wed Jan 3 07:47:05 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> +Thu Oct 26 14:05:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - * ASNMP/tests/test_config.h: - Only define ACE_START_TEST and ACE_END_TEST when they are not - defined yet. Removed some old code at the same time + * bin/tao_other_tests.lst: + Added orbsvcs/tests/Event/UDP test which tests the rtec + udp federation -Wed Jan 3 06:47:58 UTC 2007 J.T. Conklin <jtc@acorntoolworks.com> +Thu Oct 26 11:19:45 UTC 2006 Olli Savia <ops@iki.fi> - * configure.ac: + * ace/config-lynxos.h: + Added include "ace/config-posix.h" and removed defines + that are already defined by config-posix.h. + +Thu Oct 26 10:29:49 UTC 2006 Olli Savia <ops@iki.fi> - Added feature test for ACE_LACKS_REALPATH. Fixes bugzilla bug - 2613. + * ace/config-posix.h: + Removed duplicate check of _POSIX_MESSAGE_PASSING. -Wed Jan 3 06:09:39 UTC 2007 J.T. Conklin <jtc@acorntoolworks.com> +Thu Oct 26 07:48:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - * configure.ac: + * ace/Truncate.h: - Added feature test for ACE_HAS_SIGVAL_SIGVAL_INT and, for - completeness, ACE_HAS_SIGVAL_SIGVAL_PTR. Fixes bugzilla bug - 2716. + Added partial specialization for when types are the same, fixes + compile problems in the ACE lib with Borland -Wed Jan 3 05:53:04 UTC 2007 Chris Cleeland <cleeland_c@ociweb.com> +Thu Oct 26 07:01:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - This entry documents the merge of several small bug fixes from - the OCI distribution. + * ace/config-vxworks5.x.h: + Added ACE_LACKS_INTPTR_T, VxWorks 5.5.x seems not to deliver this + type - * ace/QtReactor/QtReactor.cpp: +Thu Oct 26 00:31:56 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - Merged in a change from OCITAO 1.4a that fixed a bug in - ACE_QtReactor::QtWaitForMultipleEvents() where - the two select() calls in that function might select on different - handler sets. The problem is the dispatch_set/wait_set can be - changed during the two select() calls. This could happen while - waiting for an event, another event is handled and dispatched - which changes the dispatch_set/wait_set. + * ace/Auto_Ptr.h: - This bug was found on a single thread Qt application [RT 8751]. + Added missing "element_type" typedef. - * ace/CDR_Stream.inl (adjust): + (ACE_auto_ptr_reset): - Applied a one-line change from Dan Troesser <troesser_d at - ociweb dot com>, originally committed to OCITAO 1.4a. VC8 - detected that memory around a buffer was being modified. - Changed a boundary check from <= check to < that some believed - was causing a write past the end of the buffer. After the - change, there were no compilation problems with VC8 and all the - ACE CDR-related tests passed. + Introduced this new function template to simplify the + ACE_AUTO_PTR_RESET macro implementation, to support + ACE's other auto_ptr-like class templates + (e.g. ACE_Auto_Array_Ptr<>), and to make auto_ptr + reset() operations convenient and easy for those needing the + ACE_AUTO_PTR_RESET functionality to. Users now need only + perform a call like: - * bin/tao_orb_tests.lst: + ACE_auto_ptr_reset (my_auto_ptr_instance, new foo); - Add in Bug_2702_Regression test. + Note that ACE_AUTO_PTR_RESET support for ACE's other + auto_ptr-like classes isn't strictly necessary since they all + support the reset() method. - * bin/auto_run_tests.pl: + Addresses build failures on platforms that define + ACE_LACKS_AUTO_PTR_RESET and in code that expects to use + ACE_AUTO_PTR_RESET on ACE_Auto_{Basic_}_Array<> instances. - Change the search logic for listed tests so that the script - "finds" tests even when the layout isn't using the "traditional" - layout where $TAO_ROOT == $ACE_ROOT/TAO. +Wed Oct 25 22:42:03 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - * NEWS: Updated to reflect these changes. + * tests/Integer_Truncate_Test.cpp: -Wed Jan 3 05:26:07 UTC 2007 J.T. Conklin <jtc@acorntoolworks.com> + Remove "const" qualifiers from types used in + ACE_Utils::Truncate<>() function template parameters that are + deduced using argument dependent lookup. Borland appears to get + confused, and can't find the non-const template parameter + Truncate<>() specializations. - * configure.ac: +Wed Oct 25 20:17:13 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - Added feature test for ACE_LACKS_SIGVAL_T. Fixes bugzilla bug - 2761. + * ace/Hash_Map_Manager_T.inl (ACE_Hash_Map_Iterator_Base_Ex): -Tue Jan 2 16:02:25 UTC 2007 Chad Elliott <elliott_c@ociweb.com> + Removed commented ACE_TRACE macro entirely. Fuzz parses + commented out code, and still incorrectly reports an ACE_TRACE + mismatch. - * bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm: + * ace/Truncate.h: + + Yet another attempt at placating Borland C++. Removed the + partial specialization for truncating values of the same type. + Typedefed the underlying Truncator structure template to further + simplify the function call. - Use the MakeWorkspaceBase module to reduce the amount of - duplicated code. +Wed Oct 25 18:31:47 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> -Tue Jan 2 14:27:05 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + * examples/C++NPv1/Reactive_Logging_Server.h: + * examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp: - * ace/Based_Pointer_Repository.h: - Use ACE_EXPORT_SINGLETON_DECLARATION to resolve link errors - on FC6. Thanks to Olli Savia <ops@iki.fi> for - reporting this and testing out the patch. + Include "ace/Basic_Types.h" to pull in intptr_t typedef. -Tue Jan 2 12:38:05 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> +Wed Oct 25 15:05:42 UTC 2006 Steve Huston <shuston@riverace.com> + + * ace/OS_NS_stdlib.inl (atop): s/intptr/intptr_t/ in ACE_WIN64 case. + +Wed Oct 25 09:47:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/SOCK_Dgram.cpp: + Fixed compile error in non win32 part + +Wed Oct 25 09:24:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/ace_for_tao.mpc: + Added Rtems_init.c, for rtems without network support we + also use the ace_for_tao base project + +Wed Oct 25 08:38:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> * ace/config-rtems.h: - Added ACE_LACKS_THREAD_PROCESS_SCOPING, rtems only supports - PTHREAD_SCOPE_PROCESS, setting another value will result in a - notsup error + * ace/OS_NS_netdb.inl: + Added ACE_LACKS_GETHOSTBYADDR_R - * ace/OS_NS_Thread.cpp: - Removed some old FSU thread code +Wed Oct 25 08:11:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> -Tue Jan 2 11:38:05 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + * ace/config-rtems.h: + * ace/OS_NS_sys_socket.inl: + Added ACE_LACKS_GETSOCKOPT, ACE_LACKS_RECV, ACE_LACKS_SEND, + and ACE_LACKS_SENDTO + +Wed Oct 25 08:04:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/Priority_Buffer_Test.cpp: + Fixed compile problem with gcc 2.96 + +Wed Oct 25 07:58:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> * ace/config-rtems.h: - Removed ACE_LACKS_MKFIFO, rtems has this API + * ace/OS_NS_sys_socket.inl: + Added ACE_LACKS_ACCEPT, ACE_LACKS_CONNECT, ACE_LACKS_GETPEERNAME, + ACE_LACKS_GETSOCKNAME - * ace/config-win32-borland.h: - * ace/OS_NS_stdio.inl: - Removed support for the Borland C++ preview compiler that shipped - with CBuilderX +Wed Oct 25 06:30:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - * ace/os_include/os_signal.h: - Removed Borland C++ preview support and fixed ACE_NSIG define - for rtems + * ace/TTY_IO.cpp: + Fixed compile error on Vxworks -Tue Jan 2 11:18:05 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> +Tue Oct 24 23:53:08 UTC 2006 Steve Huston <shuston@riverace.com> - * ace/config-macosx-panther.h: - * ace/config-macosx-tiger.h: - Added ACE_LACKS_SIGVAL_T + * ace/config-aix-4.x.h: Changed ACE_HAS_PTHREAD_CONTINUE to + ACE_HAS_PTHREAD_CONTINUE_NP and ACE_HAS_PTHREAD_SUSPEND to + ACE_HAS_PTHREAD_SUSPEND_NP. The non-_NP varieties return ENOTSUP; + the _NP varieties are the only documented APIs through AIX 5.3. + Thanks to Guy Peleg for raising this issue. -Tue Jan 2 11:15:05 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + * tests/Thread_Manager_Test.cpp: Altered the suspend/resume tests to + only allow ENOTSUP as a legit result if the config.h file does not + include ACE_HAS_... settings that indicate it should work. - * config-rtems.h: - Removed ACE_LACKS_PUTENV, rtems has this method, fixes the - Env_Value_Test failure +Tue Oct 24 23:59:10 UTC 2006 Ossama othman <ossama_othman at symantec dot com> -Tue Jan 2 11:06:05 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + * examples/Service_Configurator/IPC-tests/server/Handle_Timeout.inl + (init): + * examples/Shared_Malloc/test_position_independent_malloc.cpp + (parse_args): - * ace/ARGV.cpp: - Fixed constructor that combines two argv arrays to handle - an empty array as we can have with embedded platforms like - VxWorks and RTEMS + Use intptr_t instead of int when casting to void*. Addresses + "sizes do not match" warnings in 64-bit Intel compiler builds. -Tue Jan 2 10:49:05 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> +Tue Oct 24 23:49:25 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - * tests/run_test.lst: - Added missing ARGV_Test + * ace/Hash_Map_Manager_T.inl (ACE_Hash_Map_Iterator_Base_Ex): + + Commented out use of ACE_TRACE macro. The regular expression in + the bin/fuzz.pl script used to detect ACE_TRACE mismatch + incorrectly identifies a mismatch the ACE_TRACE question. Once + the fuzz script is fixed, the ACE_TRACE can be uncommented. + +Tue Oct 24 22:20:38 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> + + * ace/Truncate.h: + + Rename truncate to trunc. Yet another attempt at fixing Borland + compiler brain damage. + +Tue Oct 24 22:01:41 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> + + * ace/OS_NS_stdlib.inl (atop): + + Use intptr_t type to fix 64-bit conversion to void* warnings. + + * ace/Select_Reactor_Base.h (max_handlep1): + * ace/Select_Reactor_Base.inl (max_handlep1): + + Changed return type to be ACE_HANDLE on UNIX platforms instead + of size_t. Addresses "loss of significant bits" warnings in + 64-bit Intel compiler builds. + + * ace/Select_Reactor_Base.cpp (dump): + + Corrected format specifiers for Windows configuration. + + * ace/Select_Reactor_T.cpp (work_pending): + (wait_for_multiple_events): + + Removed unnecessary casts and corrected type of "width" variable + that is passed to select(). + + * tests/Map_Manager_Test.cpp (test_cache_map_manager): + + Fixed "might be used uninitialized" warning. + +Tue Oct 24 17:46:40 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> + + * ace/Truncate.h (Truncator): + + Export the Borland-specific specializations from the DLL. This + should address the "undefined symbol" link-time problem. + + * bin/MakeProjectCreator/config/acexml.mpb: -Tue Jan 2 10:23:05 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + Re-disabled ACEXML when ace_for_tao is enabled. ACEXML needs + the ACE_Configuration and memory map classes that are not found + in the ace_for_tao subset. +Tue Oct 24 14:44:09 UTC 2006 Olli Savia <ops@iki.fi> + + * ace/TTY_IO.cpp: + + Changed the default constructor to always initialise member + variables regardless of ACE_HAS_TERMIOS or ACE_HAS_TERMIO setting. + +Tue Oct 24 14:16:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/ACE.cpp: + Use some bools instead of int + + * ace/INET_Addr.cpp (set_port_number): + Added check for ACE_LACKS_HTONS + + * ace/INET_Addr.inl (get_port_number): + Added check for ACE_LACKS_NTOHS + +Tue Oct 24 13:54:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/os_include/netinet/os_in.h: * ace/config-rtems.h: - RTEMS does have aio support but there are several errors in the - rtems header files and it looks also that the behaviour is not - correct, reported this to the rtems maintainers and for the - rtems 4.6 version we disable the AIO support in ACE + Added ACE_LACKS_IP_MREQ -Tue Jan 2 09:44:05 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + * ace/INET_Addr.cpp (get_port_number_from_name): + Added ACE_LACKS_HTONS check - * tests/ARGV_Test.cpp: - Fixed compile errors in unicode build +Tue Oct 24 13:27:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> -Mon Jan 1 21:56:50 UTC 2007 James H. Hill <hillj@isis.vanderbilt.edu> + * ace/Reactor.h: + Added an include of Time_Value.h, this is included implicitly + but this implicit include is not there when using FOCUS with + tp-reactor specialization - * docs/ace_guidelines.vsmacros: +Tue Oct 24 13:09:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - Fixed bug that was causing the previous find and replace - values to be used when the current document is being saved. + * ace/Sock_Connect.cpp: + * ace/config-rtems.h: + Added ACE_LACKS_GET_BCAST_ADDR -Mon Jan 1 18:51:05 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> +Tue Oct 24 13:00:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - * ace/os_include/os_errno.h: - Defined ECANCELED when it has not been defined yet, fixes problems - with rtems + * ace/os_include/os_socket.h: + * ace/config-rtems.h: + Added ACE_LACKS_SOCKADDR -Mon Jan 1 18:39:05 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> +Tue Oct 24 12:54:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - * ace/POSIX_CB_Proactor.h: - Introduced new ACE_LACKS_SIGVAL_T, when this is defined then ACE - does a typedef for sigval_t + * ace/os_include/os_netdb.h: + * ace/config-rtems.h: + Added ACE_LACKS_HOSTENT - * ace/config-aix-5.x.h: - * ace/config-macosx.h: +Tue Oct 24 12:09:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/OS_NS_arpa_inet.inl: * ace/config-rtems.h: - * ace/config-sunos5.4-g++.h: - * ace/config-sunos5.4-sunc++-4.x.h: - * ace/config-sunos5.5.h: - * ace/config-vxworks5.x.h: - * ace/config-vxworks6.2.h: - * ace/config-vxworks6.3.h: - * ace/config-vxworks6.4.h: - Added ACE_LACKS_SIGVAL_T + Added ACE_LACKS_INET_ADDR and ACE_LACKS_INET_NTOA - * ace/POSIX_Asynch_IO.h: - Doxygen improvement +Tue Oct 24 12:00:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> -Sun Dec 31 22:33:14 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> + * ace/os_include/sys/os_socket.h: + Define MSG_OOB when it is not defined - * tests/SV_Shared_Memory_Test.cpp: +Tue Oct 24 11:17:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - Check and exit if allocator was not successfully initialized - (other processes could be using all the kernel's SysV shared - memory pages). Otherwise the test's child process will be stuck - in a spinloop while filling up the filesystem with log messages. + * ace/OS_NS_sys_socket.inl: + * ace/config-rtems.h: + Added ACE_LACKS_SOCKET, ACE_LACKS_SHUTDOWN and ACE_LACKS_SETSOCKOPT -Sun Dec 31 18:56:05 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> +Tue Oct 24 11:08:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - * docs/svn/config: - * docs/svn/svn-prefs.reg: - Added some more file extensions + * ace/OS_NS_sys_select.inl: + * ace/config-rtems.h: + Added ACE_LACKS_SELECT - * bin/generate_doxygen.pl: - * etc/tao_compression.doxygen: - * etc/tao_transportcurrent.doxygen: - * html/index.html: - Added doxygen generations for transport current and compression +Tue Oct 24 10:58:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> -Sun Dec 31 16:11:05 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> + * ace/os_include/netinet/os_in.h: + * ace/config-rtems.h: + Added ACE_LACKS_IN_ADDR and ACE_LACKS_SOCKADDR_IN - * ACEXML/common/Makefile.am: +Tue Oct 24 06:31:05 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - Fix stray trailing \ introduced in: - Sat Dec 30 06:20:18 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> + * ace/Numeric_Limits.h (ACE_Numeric_Limits): -Sat Dec 30 06:23:13 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> + Added missing "char" specialization for the + ACE_LACKS_NUMERIC_LIMITS case. The "signed char" and + "unsigned char" specializations are not always suitable. - * */Makefile.am: +Tue Oct 24 04:04:26 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - Baseline regeneration to match recent MPC, *.mpc, and *.mpb - changes. + * ace/Hash_Map_Manager_T.h (lock_): -Sat Dec 30 06:20:18 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> + Placed "mutable" keyword to beginning of declaration. It is a + storage class specifier, not a CV qualifier, and belongs at the + beginning. Addresses g++ warnings. - * ACEXML/tests/Makefile.am: - * ACEXML/tests/util/Makefile.am: - * ACEXML/apps/svcconf/Makefile.am: - * ACEXML/common/Makefile.am: - * ACEXML/examples/SAXPrint/Makefile.am: + * ace/Sock_Connect.cpp (get_fqdn): - Hand-add automake conditionals for BUILD_ZZIP and BUILD_ZLIB. - Unfortunately MPC resolves options, files, etc. set by - "features" at project generation time, but we want them to be - configure time options. + Addressed "might be used uninitialized warnings. -Sat Dec 30 06:16:53 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> +Mon Oct 23 02:28:42 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - * configure.ac: + * ace/Array_Base.cpp: + * ace/Array_Base.h: + * ace/Array_Base.inl: - Configure Makefiles for new subdirectory. + Added STL-style traits, iterators and swap() method. - * apps/JAWS2/Makefile.am: + (operator=): - Regenerate to descend into HTTPU subdirectory. + Improved exception-safety. - * apps/JAWS2/HTTPU/Makefile.am: + * ace/Array_Map.h: + * ace/config-lite.h: - New Makefile.am. + Moved reverse_iterator declarations to a new + ACE_DECLARE_STL_REVERSE_ITERATORS so that other ACE containers + may use them in a way that minimizes platform-specific + declaration duplication. -Sat Dec 30 06:12:59 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> + * ace/CDR_Stream.cpp (read_boolean_array): - * m4/ace.m4: + Addressed a Coverity CHECKED_RETURN error. There's no need to + check the return value of read_boolean() in this case. + Explicitly cast the return value to "void". - Add placeholder automake conditionals for BUILD_ZLIB and - BUILD_ZZIP. + Addressed Coverity DEADCODE error. No need to check for zero + "cont" pointer since the ACE_NEW_RETURN() call that initializes + it will return immediately. "cont" cannot be zero if the latter + call succeeds. - * bin/MakeProjectCreator/acexml.mpb: + * ace/CDR_Stream.inl (operator>>): - Derive from both zlib and zzip. + Explicitly check return value of input stream read operations. + Addressed a Coverity CHECKED_RETURN errors. -Fri Dec 29 16:57:10 UTC 2006 Steve Huston <shuston@riverace.com> + * ace/Configuration.cpp (new_section): - * ace/SOCK_Dgram.cpp (recv): Corrected a "can't delete void*" warning - that entered with - Thu Dec 28 22:47:05 UTC 2006 Steve Huston <shuston@riverace.com> + Fixed Coverity USE_AFTER_FREE error. Memory was being accessed + after it was freed. -Fri Dec 29 08:41:35 UTC 2006 Olli Savia <ops@iki.fi> + * ace/Configuration_Import_Export.cpp: - * tests/Proactor_Timer_Test.cpp: - Fixed compile error on LynxOS with 2.95.3. + Addressed Coverity RESOURCE_LEAK errors. -Fri Dec 29 08:31:21 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + * ace/Default_Constants.h (ACE_DEFAULT_CLOSE_ALL_HANDLES): - * ace/os_include/os_signal.h: - Did some cleanup in this file, removed old stuff + This symbol represents a boolean value. s/1/true. -Fri Dec 29 07:33:58 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> + * ace/Dev_Poll_Reactor.cpp (bind): + * ace/WFMO_Reactor.cpp (bind_i): - * bin/MakeProjectCreator/config/automake.features: + Disallow binding of a nil event handler pointer to the + repository. It is deferenced later on this method. - Set java, zlib, and zzip. We'll use automake conditionals to - defer these options to configure time. + * ace/Hash_Map_Manager_T.h: + * ace/Hash_Map_Manager_T.inl: -Thu Dec 28 22:47:05 UTC 2006 Steve Huston <shuston@riverace.com> + Added STL-style traits and iterator accessors. - * ace/SOCK_IO.{h, inl}: Changed the - recvv(iovec[], size_t, const ACE_Time_Value* = 0) and - sendv (const iovec[], size_t, const ACE_Time_Value*=0) methods - to specify the iovec count argument as int instead of size_t - since it gets reduced to int in the underlying OS calls (usually). - Removed the following deprecated methods: + (find): - ssize_t recv (iovec iov[], - size_t n, - const ACE_Time_Value *timeout = 0) const; + New method that returns an iterator as an "out" parameter. An + iterator return value could not be used due a conflict with an + existing find() method. - ssize_t recv (iovec *io_vec, - const ACE_Time_Value *timeout = 0) const; + (unbind): - ssize_t send (const iovec iov[], - size_t n, - const ACE_Time_Value *timeout = 0) const; + New method that unbinds the value pointed to by the given + iterator. - These were previously replaced with more specific ...v() methods. + (ACE_Hash_Map_Iterator_Base_Ex, ACE_Hash_Map_Iterator_Ex): - * ace/SOCK_Dgram.cpp (recv): Resolved ssize_t to u_long truncation - warning. + New constructors that position the iterator at the given + ACE_Hash_Map_Entry. - * ace/Service_Repository.{h cpp} (find, find_i): Changed the - ignore_suspended argument from int to bool to reflect it's true/false - nature. - Changed find_i() to return the located name's index in a size_t - argument when located - this allows it to pass indices as big as the - table can hold. The return value -1, -2 is not changed, but >= 0 - is no longer returned; it's == 0 for success, and the caller needs - to get the index from the 'slot' argument. This should cause no - issues since find_i() is private and internal use has been adjusted - to match; callers of find() have no use for an index value for a - table internal to ACE_Service_Repository. + * ace/Lib_Find.cpp (ldfind): - * ace/Service_Gestalt.cpp (~ACE_Service_Type_Dynamic_Guard): Use of - ACE_Service_Repository::find_i() adjusted per above. + Place parentheses around ternary operator "?:" conditional to + address an operator precedence problem. In this case, an + expression such as "a + b ? 0 : 1" was used, which is equivalent + to "(a + b) ? 0 : 1" instead of the desired "a + (b ? 0 : 1)". - * ace/Msg_WFMO_Reactor.cpp: Resolve truncation warning for 64-bit. + Changed local variable name from "got_suffix" to "has_suffix" to + clarify how the variable is being used. - * NEWS: Updated with API changes noted above. + * ace/OS_NS_Thread.inl (rw_unlock): -Thu Dec 28 20:56:28 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> + Fixed potential deadlock in case where reference count is one. + Addresses a Coverity DEADLOCK error. - * bin/tao_orb_tests.lst: + * ace/OS_NS_dirent.cpp (scandir_emulation): - Updated to enable TAO/tests/TransportCurrent/Framework for - static builds. + Fixed potential dereferencing of zero pointer reported by the + Coverity FORWARD_NULL checker. -Thu Dec 28 19:11:21 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + * ace/OS_NS_fcntl.cpp (open): - Reverted my change below this broke a lot of builds, seems - the settings in MPC are not used for ACE/TAO/CIAO so we need - to have them also in ACE duplicated + Return if SetFilePointer() call fails. Addresses Coverity + CHECKED_RETURN error. - Thu Dec 28 12:57:21 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + Added support for large files SetFilePointer() calls. Thanks to + Russell Mora for this fix. - * bin/MakeProjectCreator/config/global.features: - Removed the settings that are already set in the MPC - global.features file, no need to duplicate that info. + * ace/OS_NS_stdio.cpp (fopen): -Thu Dec 28 15:35:11 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> + Fixed potential crash if null mode string is passed to this + method. - * configure.ac: + * ace/OS_NS_stdio.inl (fdopen): + * ace/OS_NS_unistd.inl (isatty): - Add ACE_HAS_3_PARAM_READDIR_R feature test. + No need to check for ACE_LACKS_INTPTR_T. Just use intptr_t in + all cases. ACE now supplies this typedef if the platform + doesn't. -Thu Dec 28 14:54:00 UTC 2006 Pavel Zaichenko <zpf at ivl dot ua> + * ace/OS_TLI.h (t_bind): + * ace/OS_TLI.inl (t_bind): - * ace/OS_NS_unistd.cpp, - * ace/ARGV.cpp, - * ace/ARGV.h: Completed the integration of the quote_args feature - throughout the code. + Work around HP aCC 3.63 namespace scoping problem using typedef + hack in use for other structures. -Thu Dec 28 14:49:50 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + * ace/Select_Reactor_Base.cpp: + * ace/Select_Reactor_Base.h: + * ace/Select_Reactor_Base.inl: - * ace/ARGV.inl (argc): This method now first calls argv() before - returning the argc count. + Changed underlying event handler container from a simple array + to an ACE_Hash_Map_Manager<> on Windows, and to an + ACE_Array_Base<> on UNIX-like platforms. -Thu Dec 28 12:57:21 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + Use of an ACE_Hash_Map_Manager<> on Windows allows for faster + event handler searches. - * bin/MakeProjectCreator/config/global.features: - Removed the settings that are already set in the MPC - global.features file, no need to duplicate that info. + Use of an ACE_Array_Base<> on UNIX-like platforms allows us to + leverage advantages using a container (improved + exception-safety, container interface, etc), while still + retaining the direct file descriptor to event handler mapping at + essentially no cost to footprint relative to the previous + implementation. -Thu Dec 28 12:37:21 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + (bind): - * ace/DLL_Manager.cpp (get_handle): - Simplified this method a little + Disallow binding of a nil event handler pointer to the + repository. It is deferenced later on this method. Addresses a + potential crash. - * ace/Dynamic_Service_Base.cpp: - Layout change + * ace/Service_Config.cpp (current): - * ace/os_include/net/os_if.h: - Include ws2tcpip.h on windows as we do in the other files, this - way we don't get redefinitions on windows + Simplified these methods. - * ace/Service_Gestalt.cpp (process_directive): - No need to use an intermediate variable + Removed global lock that was held when accessing TSS. Only + initialization of global implementation needs to synchronized + with that lock. - * tests/ARGV_Test.cpp: - Fixed deprecated conversion warnings + Removed redundant accesses to TSS. - * tests/Time_Value_Test.cpp: - Added another test + * ace/Service_Config.h: -Thu Dec 28 11:13:21 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + Removed stray semi-colon. - * ace/config-aix-5.x.h: - Define ACE_HAS_3_PARAM_READDIR_R always independent of the compiler - used. + (impl_): -Wed Dec 27 21:15:50 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + This method no longer needs to return the pointer by reference. - * ace/ARGV.{h,cpp} Generalized the constructor for ACE_ARGV_T so - that it can optionally be directed to quote args or not, which - is consistent with the ACE_ARGV_T<CHAR_TYPE>::add() method - described below. + * ace/Service_Repository.cpp: - * ace/OS_NS_unistd.{h,cpp}: ACE_OS::argv_to_string() was updated - to implement the feature described above. + Changed loop index type so that it matches repository size type + (an unsigned integer), and updated loop decrement to take into + account the index type is now unsigned. -Wed Dec 27 21:19:57 UTC 2006 Pavel Zaichenko <zpf at ivl dot ua> + * ace/Sock_Connect.h (ipv4_enabled): + * ace/Sock_Connect.cpp (ipv4_enabled): - * ace/OS_NS_stdlib.cpp: ACE_OS::strenvdup() now correctly expands - environment variables are correctly expanded in strings of form - "$ACE_ROOT/subdir", "/some/dir/$ARCH/subdir" as well as - "$ACE_ROOT". + New run-time check for existence IPv4 stack. Some hosts only + contain IPv6 stacks. - * ace/OS_NS_unistd.cpp: ACE_OS::argv_to_string() and - ACE_OS::string_to_argv() now converts arguments list argv[] to - string and vice versa. Double quotes (") are correctly - quoted/unquoted during conversion. + From Sriram Chandramouli <sriram_chandramouli at symantec dot com> + (get_fqdn): - * ace/ARGV.{h,inl,cpp}: Made the following enhancements: + New method that retrieves fully qualified domain. getaddrinfo() + doesn't always provide the desired results. - ACE_ARGV_T<CHAR_TYPE>::add(const CHAR_TYPE *next_arg, bool quote_arg = false) - Now takes an additional argument - * @param quote_arg The argument @a next_arg need to be quoted while - * adding to the vector. - which is queued in the queue_ as well as next_arg for farther usage. + * ace/Svc_Conf.y (ace_get_module): + * ace/Svc_Conf_y.cpp (ace_get_module): - ACE_ARGV_T<CHAR_TYPE>::add(CHAR_TYPE *argv[]) - Each entry argv[i] of the argument list is interpreted as a single argument - (white spaces are preserved). + Simplified explicit casts. - ACE_ARGV_T<CHAR_TYPE>::create_buf_from_queue() - Creates a command line using arguments (next_arg, quote_arg) queued - with add() method. Quotes double quote symbols (") if needed. + Prevent dereferencing of potentially null pointer. -Wed Dec 27 21:14:34 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + * ace/System_Time.cpp: + * ace/System_Time.h: - * ace/ARGV.{h,cpp}: Removed the + No need to include "ace/Malloc_T.h", "ace/MMAP_Memory_Pool.h" + and "ace/Null_Mutex.h". Forward declarations are sufficient. - int argv_to_string (CHAR_TYPE **argv, CHAR_TYPE *&buf); + Use time_t type instead of ACE_UINT32 when returning times, such + as those returned from ACE_OS::time(). Addresses lack of + precision issues. - method since it's redundant with what's in ACE_OS::argv_to_string(). + * ace/Thread_Manager.cpp (wait): -Wed Dec 27 20:27:29 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + Addressed a Coverity CHECKED_RETURN error. There's no need to + check the return value of ACE_Thread::join() in this case. + Explicitly cast the return value to "void". - * ace/OS_NS_stdlib.{h,inl,cpp}: There's no need for the - strenvdup() method to be defined as - ACE_NAMESPACE_INLINE_FUNCTION. + * ace/Time_Value.h (ACE_ONE_SECOND_IN_USECONDS): -Wed Dec 27 15:12:12 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + Made this constant type-safe. It is now of type suseconds_t, + instead of a preprocessor symbol definition. - * ace/Map_Manager.{h,inl}: Added a default constructor for - ACE_Map_Entry to initialize the data members. Thanks to Dieter - Knueppel <Dieter dot Knueppel at batm dot de> for this fix. + * ace/UUID.cpp (lock): -Wed Dec 27 16:14:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + Addressed USE_AFTER_FREE Coverity error. Do not return a + pointer to the previous lock. It may have been destroyed. - * ace/os_include/netinet/os_in.h: - Define IPPROTO_TCP when not defined yet + * ace/UUID.h (lock): - * ace/os_include/netinet/os_tcp.h: - Define TCP_NODELAY when not defined yet + Changed return type from "ACE_SYNCH_MUTEX*" to "void". The + interface/implementation does not provide a means to safely + return the previous lock instance. -Wed Dec 27 16:10:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + * ace/ace_wchar.inl (convert): - * ace/os_include/net/os_if.h: - Only define the IFF_x defines when ACE_LACKS_NETWORKING is - defined to resolve redefinition warnings on windows + Corrected calculation of wide string length. -Wed Dec 27 14:06:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + * bin/MakeProjectCreator/config/acexml.mpb: - * ace/config-posix-nonetworking.h: - Added ACE_LACKS_GETHOSTENT + No longer any need to explicitly disable ACEXML in the + ace_for_tao configuration. -Wed Dec 27 12:42:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + * include/makeinclude/platform_irix6.x_sgic++.GNU: - * ace/Atomic_Op_T.h: - Doxygen improvements + SGI 7.3.x compiler doesn't have the 3506 error code. Do not + attempt to supress it. -Wed Dec 27 11:22:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> +Mon Oct 23 22:24:01 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - * ace/os_include/sys/os_socket.h: - Define SO_ERROR when it is not defined yet + * ace/Unbounded_Queue.cpp (set): -Wed Dec 27 10:34:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + Explicitly initialize dummy value. Addresses "use of + uninitialized variable" g++ 4.1 warning when the variable is a + POD type. - * ace/os_include/sys/os_socket.h: - Added ACE_LACKS_LINGER support + * ace/ace_for_tao.mpc: - * ace/config-posix-nonetworking.h: - Added ACE_LACKS_LINGER + Removed unnecessary semaphore related files. -Wed Dec 27 10:30:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + Added missing ace/Truncate.h header. - * ace/os_include/sys/os_socket.h: - Define SOCK_SEQPACKET when it is not defined yet +Mon Oct 23 21:44:32 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> -Wed Dec 27 10:27:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + * ace/Truncate.h (Truncator): - * ace/config-posix-nonetworking.h: - Added ACE_LACKS_IFCONF + Borland doesn't appear to be able to grok the use of the + function call operator in the ACE_Utils::Truncate<> function + template. Replaced the Truncator<>::operator() function call + operator with a static Truncator<>::truncate() method instead. - * ace/os_include/net/os_if.h: - Added some more types that need to be defined by ACE when - we compile without network support +Mon Oct 23 13:29:15 UTC 2006 Olli Savia <ops@iki.fi> - * ace/SOCK_Dgram.cpp: - Removed check for ACE_LACKS_IFREQ + * ACE-INSTALL.html: + * ace/Mem_Map.h: + * ace/Mem_Map.inl: + * ace/Mem_Map.cpp: + * ace/OS_NS_Thread.inl: + * ace/OS_NS_sys_mman.inl: + * ace/Reverse_Lock_T.h: + * ace/Task_Ex_T.h: + * ace/Task_T.h: + * ace/config-lynxos.h: + * include/makeinclude/platform_lynxos.GNU: - * ace/SOCK_Dgram_Bcast.cpp: - Layout changes + Removed LynxOS 3.x support. + +Mon Oct 23 12:59:35 UTC 2006 Chad Elliott <elliott_c@ociweb.com> + + * bin/generate_compile_stats.sh: + + Corrected a bug with my previous change. If config.h or + platform_macros.GNU were not present, the html would be incorrect. + I also added default.features to the list of configuration files + that are displayed. + +Mon Oct 23 06:34:24 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * ace/os_include/os_pthread.h: Changed + + # if !defined (ACE_LACKS_RWLOCK_T) + + to + + # if !defined (ACE_LACKS_RWLOCK_T) && !defined (ACE_HAS_PTHREADS_UNIX98_EXT) + + to stop a compile error on Solaris after SunOS 5.8. Thanks to + Boris Kaminer <boris dot kaminer at gmail dot com> for reporting + this fix. + +Sun Oct 23 00:29:55 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> + + * ace/Truncate.h: + + In the Borland-specific workaround, explicitly cast return value + of ACE_Numeric_Limits::max() of the smaller unsigned type to the + unsigned larger type to which it is being compared. Addresses + non-intuitive "comparison of signed and unsigned types" warning + issued by Borland compiler. Borland promotes unsigned char to + int, instead of unsigned int, when comparing to unsigned int. + This implicit type promotion behavior complies with the C++ + standard, but is a bit awkward nonetheless (IMHO :)). Thanks to + Johnny for pointing out Borland's explanation of the + non-intuitive warning. + +Sun Oct 22 08:11:25 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> -Wed Dec 27 10:15:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + * ace/Token_Request_Reply.inl (token_name): + + Simplified use of ACE_Utils::Truncate<> function template. Only + the "TO" type must be explicitly specified. The "FROM" type is + deduced automatically by the compiler. Note that explicitly + specifying both template parameters is perfectly valid, too. + + * ace/Truncate.h (Truncator): + + Added char/int specializations for Borland to allow the + Integer_Truncate_Test to compile. All of the Borland-specific + Truncator specializations are meant to be a temporary workaround + until Borland C++ is capable of supporting the generalized + implementation. + +Sat Oct 21 14:49:21 UTC 2006 Steve Huston <shuston@riverace.com> + + * ace/TSS_T.{h cpp}: Added "volatile" keyword to once_ member + since it can be changed by other threads. Removed the lock + acquiring from the ts_object() methods - after once_ is checked, + there are no further needs for locks. When needed, the key_ is + set up by ts_init() which does acquire a lock. This avoids a lock + acquire/release cycle on all calls when initialization of the + ACE_TSS object is not required, speeding up performance. Thanks to + Guy Peleg <guy dot peleg at amdocs dot com> for reporting this and + to Russell Mora <russell_mora at symantec dot com> for assisting in + analyzing the situation and recommending the particular fixes. + + * ace/Logging_Strategy.h: Minor doxygen improvements. + + * ace/Sock_Connect.cpp: When checking for IPv6 interfaces on Windows, + there's two conditionally compiled blocks of code. One block was + built if ACE_HAS_IPV6 SIO_ADDRESS_LIST_QUERY are both defined; the + other was built if ACE_HAS_IPV6 is defined. Added the check for + SIO_ADDRESS_LIST_QUERY to the second case as well since it makes + no sense to run it if the first isn't built. Thanks to Andre + Kostur for this fix. Also see: + Mon Oct 16 14:24:25 UTC 2006 Steve Huston <shuston@riverace.com> + + * ace/Task_T.h (reply): Clarified what happens on a reply(). Thanks + to Doug Schmidt for explaining the rationale for this. + + * ace/Token_Request_Reply.inl (token_name): VC7.1 had trouble grokking + the ACE_Utils::Truncate arguments in this case, so add the types + to a more complete specification of what template is desired. + +Sat Oct 21 15:19:46 UTC 2006 Steve Huston <shuston@riverace.com> + + * configure.ac: Removed the check for LINUX_VERSION that disabled + the check for epoll on Linux. Just let the check run - the macros + used checked the kernel/C version used to build the kernel instead + of the running kernel itself (I think...). In any event, the + use of the macros to disable the check prevented the check from + running on systems (such as RHEL 4) that do have epoll. Thank you + to Brian Campbell <becampbel at hotmail dot com> for researching + this area. + +Sat Oct 21 10:48:12 UTC 2006 Martin Corino <mcorino@remedy.nl> + + * bin/PerlACE/RunTest.pm: + * bin/PerlACE/ProcessVX.pm: + * bin/PerlACE/ProcessVX_Unix.pm: + + Changes to accomodate running autotests for VxWorks RTPs on + Linux hosts. + +Sat Oct 21 04:34:33 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> + + * ace/OS_NS_stdlib.cpp: + + Always include "ace/Numeric_Limits.h" in the ACE_LACKS_MKSTEMP + case. There is no need to conditionally include it when "max" + is undefined. Addresses VxWorks build errors. + + * ace/Truncate.h: + + Only use workaround for Borland compiler versions less than or + equal to 0x582. Thanks to Johnny for the suggestion. + + * tests/Integer_Truncate_Test.cpp (sizeof_from_lt_sizeof_to): + + Explicitly cast types in inequality comparison to silence + comparison of signed and unsigned warnings. It's not clear why + the warning is occuring since both types are unsigned. + + Removed remaining set of redundant parentheses that were + missed in a previous commit. + +Fri Oct 20 12:55:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Service_Manger.{h,cpp}: + Changed debug_ member to a real bool + +Fri Oct 20 12:40:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/OS_NS_sys_socket.inl (bind): + * ace/config-rtems.h: + Added ACE_LACKS_BIND + + * ace/Basic_Types.h: + Fixed compile problems with BCB6 + +Fri Oct 20 12:05:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Log_Record.inl: + Added check for ACE_LACKS_NTOHL and ACE_LACKS_HTONL + + * ace/config-rtems.h: + Added ACE_LACKS_NTOHL and ACE_LACKS_HTONL when no networking + is available + +Fri Oct 20 09:56:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/INET_Addr.h: + Small change to improve doxygen documentation + + * ace/OS_NS_sys_socket.inl (listen): + Added ACE_LACKS_LISTEN + + * ace/config-rtems.h: + Added ACE_LACKS_LISTEN + +Fri Oct 20 09:36:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/MakeProjectCreator/config/ciao_nodeapplicationmanager.mpb: + * bin/MakeProjectCreator/config/ciao_nodemanager_stub.mpb: + * bin/MakeProjectCreator/config/ciao_targetmanager_stub.mpb: + New base projects + + * bin/MakeProjectCreator/config/ciao_static_dnc_app.mpb: + Use the new base projects above + + Thanks to Abdul Sowayan <abdullah dot sowayan at lmco dot com> + for delivering these files + +Fri Oct 20 09:00:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> * ace/os_include/sys/os_socket.h: - Define SO_BROADCAST when it is not defined yet + Defined AF_UNSPEC and PF_UNSPEC when these are not defined by the + OS header files. -Wed Dec 27 10:11:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> +Fri Oct 20 08:55:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - * ace/os_include/netinet/os_in.h: - Add sockaddr_un when ACE_LACKS_SOCKADDR_UN is defined + * ace/os_include/sys/os_uio.h: + When INADDR_ANY is not defined, then define it, we need it in several + of the ACE header files - * ace/config-posix-nonetworking.h: - Added ACE_LACKS_SOCKADDR_UN +Fri Oct 20 08:44:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> -Wed Dec 27 10:05:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + * ace/os_include/sys/os_uio.h: + We define iovec when ACE_WIN32 was defined, changed this to a new + define, ACE_LACKS_IOVEC to make it easier to use with other platforms - * ace/Name_Request_Reply.cpp: - Use ACE_NTOHS so that this file compiles without network support + * ace/config-win32-common.h: + Added ACE_LACKS_IOVEC -Wed Dec 27 09:35:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + * ace/config-rtems.h: + When no networking has been configured, also define ACE_LACKS_IOVEC - * tests/ARGV_Test.cpp: - Fixed deprecated conversion warnings +Thu Oct 19 22:28:59 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> -Wed Dec 27 09:32:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + * contrib/minizip/iowin32.c + * contrib/minizip/iowin32.h + Removed these files. - * ace/OS_NS_dirent.cpp: - Removed workaround for vc6 +Thu Oct 19 23:20:26 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - * ace/OS_NS_dirent.inl: - Layout change + * examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp: + * examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp: + * examples/C++NPv1/Reactive_Logging_Server.h: -Wed Dec 27 09:27:06 UTC 2006 Olli Savia <ops@iki.fi> + Fixed integer/void* conversion related warnings by using + the "intptr_t" type instead of "int" or "long". - * tests/Log_Msg_Test.cpp: - Updated comment. +Thu Oct 19 22:58:02 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> -Wed Dec 27 09:24:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + * ace/Truncate.h: - * ace/OS_NS_dirent.inl (readdir_r): - Simplified the OS checks in this method, use the new - define ACE_HAS_3_PARAM_READDIR_R. This is then set in the - config files below, maybe it has to be set in more, but the - scoreboard will show that. + Borland compilers currently cannot handle the template + meta-programming in this header. Work around the limitation by + explicitly specializing the ACE_Utils::Truncator<> structure + template for a select few 32- and 64-bit integers. More will be + added as needed. + +Thu Oct 19 17:25:16 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> + + * tests/Integer_Truncate_Test.cpp: + + Removed redundant parentheses. + +Thu Oct 19 15:25:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/generate_rel_manpages: + Updated doxygen version + + * bin/MakeProjectCreator/templates/gnu.mpb: + Removed kylix support + +Thu Oct 19 13:19:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/OS_main.h: + Added main for rtems + +Thu Oct 19 11:48:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Rtems_init.c: + Fixed empty translation unit warnings + +Thu Oct 19 08:27:12 UTC 2006 Martin Corino <mcorino@remedy.nl> + + * include/makeinclude/platform_openvms.GNU: + Small change to create hardlinks for produced executables. + +Wed Oct 18 16:19:38 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> + + * contrib/minizip/minizip.suo + * contrib/minizip/miniziplibrarycode.suo + Removed these files. + +Wed Oct 18 13:52:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * include/makeinclude/platform_rtems.x_g++.GNU: + Major cleanup of old stuff and always define ACE_HAS_RTEMS + + * etc/rtems_init.c: + * ace/rtems_init.c: + Another move, for rtems we require some functions to always + be available, this defines our network settings and much more. + Because we always build static, we moved this to the ACE lib, + on rtems we define ACE_HAS_RTEMS and then compile the contents + of this file. This way the functions in this file are available + in any executable we link + + * ace/OS.h: + * ace/os_include/os_signal.h: + * ace/os_include/sys/os_types.h: + * ace/OS_NS_stdio.h: + * ace/OS_NS_time.inl: + Replaced __rtems__ with ACE_HAS_RTEMS + + * ace/ace.mpc: + Added rtems_init.c + +Wed Oct 18 13:01:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * include/makeincludes/rules.bin.GNU: + * include/makeincludes/rules.lib.GNU: + * include/makeincludes/wrapper_macros.GNU: + * include/makeincludes/platform_linux_borland.GNU: + Removed kylix support + +Wed Oct 18 10:05:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * apps/Gateway/Gateway/File_Parser.cpp: + Removed egcs workaround + +Wed Oct 18 08:07:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/rtems_init.c: + * etc/rtems_init.c: + Moved from tests to etc + +Tue Oct 18 06:27:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * examples/Reactor/Misc/test_signals_1.cpp: + * performance-tests/Misc/context_switch_time.cpp: + Renamed the global count variables to another name. These triggered + a bug in the VxWorks 5.5.2 compiler which we reported to windriver. + By renaming these we will get an error free compilation. + +Tue Oct 18 06:02:28 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> + + * ace/Basic_Types.h (intptr_t, uintptr_t): + + Provided suitable typedefs for these standard types when + ACE_LACKS_INTPTR_T is defined. + + * ace/Event_Handler.cpp (~ACE_Event_Handler_var): + + Only use an ACE_Errno_Guard if the underlying ACE_Event_Handler + pointer is non-zero. Saves a TSS access in the zero + ACE_Event_Handler pointer case. + + (operator=): + + Made strongly exception safe. + + * ace/FILE_IO.cpp (send, recv): + * ace/Message_Queue.cpp (enqueue, dequeue): + * ace/Message_Queue_T.cpp: + * ace/OS_NS_unistd.inl (hostname): + + Explicitly supply the "int" "TO" type to the + ACE_Utils::Truncate<> function template. It must now be + explicitly specified since ACE_Utils::Truncate<> now supports + truncation to all integer types, not just "int". + + * ace/Global_Macros.h (ACE_STATIC_CONSTANT): + + New macro for in-class static integral constant initialization + that works around compilers that don't like such initialization. + In-class integral constants in this case are meant to be + compile-time constants so that they may be used as template + arguments, for example. BOOST provides a similar macro. + + * ace/OS_NS_stdlib.inl (atop): + * ace/OS_NS_stdio.cpp (fopen): + + Removed ACE_LACKS_INTPTR_T check. It is no longer needed. + + * ace/Truncate.h: + + Generalized the ACE_Utils::Truncate<> function template + implementation for all integer types. + + * tests/run_test.lst: + * tests/tests.mpc: + + Added new "Integer_Truncate_Test" test that verifies the + ACE_Utils::Truncate<> function template works for all type + size/sign scenarios. + +Tue Oct 17 21:28:11 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> + + * ace/Service_Gestalt.cpp (parse_args_i): + + Checking for no arguments was missed inadvertently in the + original change-set from "Tue Oct 17 16:27:27 UTC 2006 ..." + +Tue Oct 17 21:09:36 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> + + * contrib/minizip/ChangeLogUnzip + * contrib/minizip/crypt.h + * contrib/minizip/ioapi.c + * contrib/minizip/ioapi.h + * contrib/minizip/iowin32.c + * contrib/minizip/iowin32.h + * contrib/minizip/miniunz.c + * contrib/minizip/minizip.c + * contrib/minizip/minizip.mpc + * contrib/minizip/minizip_export.h + * contrib/minizip/mztools.c + * contrib/minizip/mztools.h + * contrib/minizip/unzip.c + * contrib/minizip/unzip.h + * contrib/minizip/zip.c + * contrib/minizip/zip.h + Added the minizip project. Thanks to Krishnakumar Balasubramanian + <kitty at dre dot vanderbilt dot edu> for providing this. + +Tue Oct 17 17:17:36 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * ace/OS_NS_unistd.inl (truncate): SetFilePointerEx() returns a + BOOL not a DWORD (unlike SetFilePointer()..). Thanks to Boris + Kaminer <boris dot kaminer at gmail dot com> for reporting this. + +Tue Oct 17 16:27:27 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> + + * ace/DLL_Manager.cpp: + * ace/Parse_Node.cpp: + + Updated logging messages. + + * ace/Service_Gestalt.cpp: + + Updated logging messages to exclude the "e-word" causing false + positives in the Service_Config_Test. Updated comments. + +Tue Oct 17 12:35:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * apps/soreduce/Library.cpp: + taoversion is not a valid base project. Thanks to Manuel Traut + <manut dot de at googlemail dot com> for reporting this. + +Tue Oct 17 12:09:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ACE-INSTALL.html: + Updated supported platforms by Remedy IT. New are VxWorks 5.5.2, + OpenVMS 8.3, RTEMS and LynxOS. + +Tue Oct 17 12:05:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - * ace/config-aix-5.x.h: - * ace/config-cygwin32.h: - * ace/config-freebsd.h: - * ace/config-hpux-11.00.h: - * ace/config-linux-common.h: - * ace/config-netbsd.h: * ace/config-rtems.h: - * ace/config-sunos5.5.h: - * ace/config-vxworks6.4.h: - Added ACE_HAS_3_PARAM_READDIR_R + Cleanup - * ace/config-linux-common.h: - Added new ACE_LACKS_LINUX_VERSION_H around include of linux/version.h. - This file isn't present with BlueCAT 4 Linux from LynuxWorks. + * include/makeinclude/plaform_rtems.x_g++.GNU: + Improved for rtems 4.6.6 - * ace/config-posix.h: - Layout changes +Tue Oct 17 07:03:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/config-rtems.h: + * ace/OS_NS_unistd.inl: + Added support for ACE_LACKS_FDOPEN + +Mon Oct 16 21:29:57 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> + + * THANKS: Updated Chris Reed's entry in the list. + +Mon Oct 16 20:04:59 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> + + This change fixes bug#2612. See the description for the gory + details. In a nutshell, the problem is caused by the fact that + static services, loaded from a DLL, as part of a dynamic service + initialization can not be safely finalized when the dynamic + service's DLL gets unloaded. This was historically handled by + simply not unloading DLLs, and by finalizing all services at + process exit. With the introduction of the local configurations + feature, this changed. + + The finalization order was supposed to be guaranteed by the + ordering of the services in the repository. It really was a + kludge, because when dynamically loading and removing services + the order can change. Then whenever the process tries to clean + up, the dynamic service's DLL can be unloaded (because it gets + finalized first), and the static services' destructor code would + become inaccessible. The situation results in a SEGV at exit(). + + * ace/DLL.h: + * ace/DLL.cpp: + + Made assignment operator return a non-const reference to make it + well-formed. See C++ Standard, section "[special]". + + * ace/DLL_Manager.cpp: + * ace/Dynamic_Service_Base.cpp (instance): + * ace/Parse_Node.cpp: + + Fixed formatting and logging + + * ace/Service_Config.cpp (parse_args_i): + + Fixing a bug related to parsing the command line options that + take arguments. Thanks to Aaron Scamehorn <Aaron dot Scamehorn + at cogcap dot com> for reporting it. + + * ace/Service_Gestalt.cpp: + + Added ACE_Service_Dynamic_Guard (formerly + ACE_Service_Type_Forward_Declaration_Guard) which helps to + resolve an issue with hybrid services, i.e. dynamic services, + accompanied by static services in the same DLL. Only automatic + instances of SDG are supposed to exist. Those are created during + (dynamic) service initialization and serve to: + + (a) Ensure the service we are loading is ordered last in the + repository, following any other services it may cause to + register, as part of its own registration. This is a common case + when loading dynamic services from DLLs - there are often static + initializers, which register static services. + + (b) The SDG instance destructor detects if the dynamic service + initialized successfully and "fixes-up" all the newly registered + static services, so that each holds a reference to the DLL, from + which they have originated. + + Updated comments and formatting. + + * ace/Service_Object.h (dll): + * ace/Service_Object.inl (dll): + + Added void dll (const ACE_DLL&) to make it possible to + "relocate" services registered through static initializers found + in DLL's code segment(s). + + * ace/Service_Object.cpp (fini): + + Modified ACE_Service_Type::fini() to ensure the DLL associated + with the service is properly closed. This in conjunction with + the gestalt changes above, makes it possible to safely and + completely unload a service. + + * ace/Service_Repository.h: + * ace/Service_Repository.cpp (remove_i,relocate_i,relocate): + + Added relocate(), which allows association of a (static) service + objects with a DLL. Per changes to ACE_Service_Gestalt, + above. Added a counterpart private relocate_i(), which does not + obtain locks. + + * tests/Service_Config_Test.cpp: + + Added a test that combines more than one argument-taking command + line option to guard against regression for the bug fixed in + ACE_Service_Config::parse_args_i (see above). + +Mon Oct 16 19:20:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/config-rtems.h: + Updated with more changes needed for rtems + + * ace/os_include/os_signal.h: + Added specific defines for rtems + + * ace/OS_NS_time.cpp (difftime): + Removed not used variable and get gmtime/gmtime_r from the + global scope + + * ace/OS_NS_string.{h,cpp,inl}: + Added ACE_LACKS_STRTOK_R to make the rtems port easier + +Mon Oct 16 14:24:25 UTC 2006 Steve Huston <shuston@riverace.com> + + * ace/OS_NS_netdb.{cpp inl} (gethostbyname[_r], gethostbyaddr[_r]): + Check the specified string (name or addr) for unspecified or of + 0 length and return 0 if so - bypasses a system call and a possible + memory leak. Thanks to Howard Finer <hfiner at sonusnet dot com> + for these fixes. + + * ace/Sock_Connect.cpp (get_ip_interfaces): Don't report an error if + we can't find IPv6 addresses. It may be on a system with ACE_HAS_IPV6 + support compiled but IPv6 not configured/enabled. Thanks to Andre + Kostur <akostur at incognito dot com> for reporting this. + + * ace/WFMO_Reactor.cpp (ok_to_wait): In the ACE_HAS_WINCE block, + change fwaitAll arg from TRUE to FALSE - it must be FALSE on + WinCE (thru WinMobile 5) per MSDN. Thanks to Drew Reynaud + <drewreynaud at hotmail dot com> for this fix. + + * THANKS: Added Drew Reynaud to the Hall of Fame. + +Mon Oct 16 14:21:48 UTC 2006 Chad Elliott <elliott_c@ociweb.com> + + * bin/generate_compile_stats.sh: + + I accidentally deleted a letter in my previous commit. + +Mon Oct 16 14:02:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/config-rtems.h: + Added first set of missing defines + + * ace/os_include/sys/os_select.h: + * ace/os_include/sys/os_uio.h: + Removed rtems specific part, not needed anymore + + * ace/os_include/sys/os_types.h: + Added rtems check + + * include/makeinclude/plaform_rtems.x_g++.GNU: + Updated + +Mon Oct 16 13:47:25 UTC 2006 Chad Elliott <elliott_c@ociweb.com> + + * bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm: + + Use the create_command_line_string() method instead of printing + the command line directly. This opens the door for disabling this + functionality. + +Mon Oct 16 12:18:14 UTC 2006 Chad Elliott <elliott_c@ociweb.com> + + * ace/OS_NS_Thread.inl: + * ace/os_include/os_semaphore.h: + + The feature that I put in for Gottwald Port on Mon Mar 6 18:25:41 + UTC 2006 causes a performance overhead for semaphores where + ACE_HAS_POSIX_SEM is defined (SunOS, HP-UX, MacOS X, etc.). For + those that are not interested in timed semaphores, this feature + provides nothing and is detemental to performance. Now, this + feature is disabled by default and must be manually enabled by + defining the ACE_HAS_POSIX_SEM_TIMEOUT_EMULATION macro. + +Mon Oct 16 12:06:10 UTC 2006 Chad Elliott <elliott_c@ociweb.com> + + * bin/generate_compile_stats.sh: + + Added some changes to make this script usable for software other + than ACE+TAO+CIAO. + + - Enhanced the usage message. + - Fixed minor HTML errors. + - Added options to set the base root directory and software title. + +Mon Oct 16 11:53:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * examples/IOStream/client/IOStream_Client.mpc: + * examples/IOStream/server/IOStream_Server.mpc: + Added exename so that we create an exe, not a dll + + * examples/IOStream/client/.cvsignore: + * examples/IOStream/server/.cvsignore: + Removed duplicate lines + + * examples/IOStream/server/iostream_server.cpp: + Added needed include for building with VxWorks 5.5.2 + +Mon Oct 16 08:33:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/MakeProjectCreator/templates/ciao_static_dnc_app.mpb: + New base project for static dnc. + Thanks to Abdul Sowayan <abdullah dot sowayan at lmco dot com> + for creating this file + +Sun Oct 15 23:22:52 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> + + * bin/tao_orb_tests.lst: + Added Bug_2683_Regression to the test suite. + +Fri Oct 13 18:26:19 UTC 2006 Andy Stafford <ajs3@cec.wustl.edu> + + * include/makeinclude/wrapper_macros.GNU: + + Added 'lksctp' as recognized option to sctp documentation. + +Fri Oct 13 18:13:00 UTC 2006 Chad Elliott <elliott_c@ociweb.com> + + * bin/cle.pl (getDefaultDomain): + + Fixed a bug where extra text would be part of the domain name when + the /etc/hosts file contains an alias after the fully qualified + host name. + +Fri Oct 13 12:32:35 UTC 2006 Chad Elliott <elliott_c@ociweb.com> + + * bin/PerlACE/Process_Unix.pm: + + Added support for remote testing on UNIX only. Currently, ssh or + rsh is used to run an executable on the remote machine. The + remote test capability is only enabled if the RemoteInformation + method is called on the PerlACE::Process object. For more + details, see the RemoteInformation method in this module. + +Fri Oct 13 10:25:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * apps/soreduce/Library.cpp: + aceversion is not a valid base project. Thanks to Manuel Traut + <manut dot de at googlemail dot com> for reporting this. + +Thu Oct 12 16:44:34 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * ace/Log_Record.cpp (operator<<): Zapped the nonconst_record and + const_cast since this is no longer needed as per the following + change: + + Sun Aug 12 00:34:42 2001 Steve Huston <shuston@riverace.com> + * ace/Log_Record.h: + * ace/Log_Record.i (msg_data()): Changed ACE_TCHAR *msg_data() + to: const ACE_TCHAR *msg_data (void) const. Makes it safer, + and conforms to all current usage inside ACE. Also makes + C++ Network Programming examples simpler :-) + + Thanks to Abdul Sowayan <abdullah dot sowayan at lmco dot com> + for reporting this. + +Thu Oct 12 15:45:24 UTC 2006 Chad Elliott <elliott_c@ociweb.com> + + * bin/MakeProjectCreator/templates/gnu.mpd: + + If a custom definition has an 'output_option' set, the order of + listing the input file changes such that it is listed before the + output_option setting in the build rule. + + * bin/auto_run_tests.pl: + + Added a new option, -l, which can be used to specify an arbitrary + list of tests. + +Thu Oct 12 12:20:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Svc_Conf.h: + Fixed incorrect placed ACE_BEGIN_VERSIONED_NAMESPACE_DECL macro. + Thanks to Alexander Libman <alexander dot libman at earthlink dot net> + for reporting this + +Wed Oct 11 15:24:04 UTC 2006 Steve Huston <shuston@riverace.com> + + * ace/Log_Record.{h inl cpp}: Removed the set_msg_data_ptr() + method - it opens the possibility of putting a buffer in place + that can't be freed properly. All of the memory allocating and + deleting should be done internally to this class. The removed + method was only used internally. + Added a private msg_data_size_ member that keeps the allocated size + of msg_data_ in ACE_TCHARs (not bytes) to tell if the buffer needs + to be resized. Comparing to the string length is incorrect - it + causes buffer reallocating whenever a short logged message is + followed by a longer one, even if both are much shorter than the + allocated length of msg_data_. When a ctor allocates a msg_data_ + area, set the first spot to '\0' to a call to msg_data_len() won't + get random answers or a crash. + (msg_data (const ACE_TCHAR *)): Changed this method to return int, + not void. It also will now reallocate the msg_data_ buffer if needed + to hold the specified string. operator<< now uses msg_data() to set + the string instead of the now removed set_msg_data_ptr() method, + keeping all msg_data_ allocation and release in the same class. + (operator<<): Fix memory leak when setting a new msg_data_ + buffer. Thanks to Arturo Montes for letting us know about the leak. + + * docs/ACE-guidelines.html: Clarify the format of ChangeLog entries. + Remove the recommendation to always test on egcs; things should be + tested on at least Windows and Linux, but egcs is outdated. + +Tue Oct 10 18:46:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> * ACE-INSTALL.html: - Updated supported platforms by Remedy IT + Document how to get a current copy from subversion - * ace/INET_Addr.cpp: - Use the ACE_NTOHL macro and remove the check for ACE_LACKS_NTOHL +Tue Oct 10 14:16:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> - * ace/Map_Manager.{h,cpp}: - Changed free_ to a real bool + * ace/CDR_Stream.cpp: + Fixed incorrect comment - * ace/Name_Proxy.cpp: - * ace/Name_Request_Reply.cpp: - * ace/Time_Request_Reply.cpp - Use the ACE_NTOHL macro so that this file compiles without networking - support +Tue Oct 10 12:54:00 UTC 2006 Simon Massey <sma@prismtech.com> -Wed Dec 27 09:10:27 UTC 2006 Olli Savia <ops@iki.fi> + * ace/config-win32-msvc.h: + Changed the MFC build run-time dll decorators to match + the current build system settings. - * ace/Process.cpp: - Changed to use ACE_LACKS_VSNPRINTF instead of ACE_HAS_SNPRINTF. +Tue Oct 10 06:08:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> -Tue Dec 26 22:47:57 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + * bin/fuzz.pl: + Changed check for empty inline files to also check for empty + source files - * ace/OS_NS_unistd.cpp: Reverted the changes to ACE_OS::argv_to_string() - from here: + * bin/MakeProjectCreator/config/avoids_corba_e_compact.mpb: + * bin/MakeProjectCreator/config/avoids_corba_e_micro.mpb: + New avoids projects - Sun Dec 24 22:29:24 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + * etc/ace.doxygen: + Expand some more macros, should improve documentatation - so that Signal_Test.cpp tests don't break. In a nutshell, each - argv[i] argument to ACE_ARGV is not supposed to be quoted. - Thanks to Steve Huston for reporting this. + * html/README: + Updated download location to ISIS -Tue Dec 26 22:46:34 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> +Tue Oct 10 06:03:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> - * tests/ARGV_Test.cpp (run_main): Updated the test to test how the - conversion from char *argv[] to a char * works. + * docs/ACE-bug-process.html: + Updated to mention svn -Mon Dec 25 16:19:42 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + * docs/Download.html: + Commented out the source packages that are not complete at this moment - * Merry Christmas everyone!!! +Mon Oct 09 09:07:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> -Sun Dec 24 23:13:37 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + * bin/generate_rel_manpages: + Fixed an error in this script and updated the location to which the + generated packages should be copied to - * tests/ARGV_Test.cpp: Updated the test to ensure that Pavel's - patches work properly. +Mon Oct 09 09:03:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> -Sun Dec 24 22:29:24 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + * docs/Download.html: + Updated with the new download locations - * ace/OS_NS_stdlib.inl, - * ace/OS_NS_unistd.cpp: Modified ACE_OS::strenvdup() and - ACE_OS::argv_to_string() so they split the arguments containing - spaces in accordance with the documentation. Thanks to Pavel - Zaichenko <zpf at ivl dot ua> for these patches. + * docs/bczar/bczar.html: + Updated documentation generation instructions -Fri Dec 22 17:35:53 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> +Thu Oct 05 00:35:37 2006 William R. Otte wotte@dre.vanderbilt.edu - * ace/OS_NS_dirent.inl: + * ACE version 5.5.3 released. - Add a __NetBSD__ to the preprocessor conditional to select the - three argument version of readdir_r. While this what was done - for FreeBSD, HPUX, etc., it really points out a need for a new - feature test macro. +Tue Oct 3 16:45:35 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> - * ace/config-netbsd.h: + * NEWS + Updated the NEWS to add the changes for ACE_Hash_MultiMap_Manager + class and executionmanager_stub and plan_generator base projects. - Only define thread-related feature test macros if ACE_MT_SAFE is - defined (with a non-zero value). +Tue Oct 3 15:02:14 UTC 2006 Steve Huston <shuston@riverace.com> -Fri Dec 22 13:56:15 UTC 2006 Steve Huston <shuston@riverace.com> + * NEWS: Described the ACE_Refcounted_Auto_Ptr effects of + Thu Jul 6 20:45:15 UTC 2006 Steve Huston <shuston@riverace.com> - * apps/JAWS2/HTTPU/http_heders.cpp: - * apps/JAWS2/HTTPU/http_status.cpp: Specify type and class separately - for each static member instance to allow HP aC++ 03.* (PA-RISC - compiler) to grok it. At least the Itanium compilers could handle - this... there's hope. +Mon Oct 2 12:21:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> -Fri Dec 22 12:52:05 UTC 2006 Olli Savia <ops@iki.fi> + * ace/Log_Msg.cpp: + Const/bool improvements - * include/makeinclude/platform_lynxos.GNU: - Build shared libs by default. +Mon Oct 2 11:26:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> -Fri Dec 22 09:31:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + * ace/Log_Msg.{h,cpp}: + Changed is_set_ conditional values member to bool - * ace/Service_Manager.h: - Improved doxygen documentation, thanks to Stefan Naewe - <stefan at naewe dot de> for delivering the patch +Sat Sep 30 14:00:33 UTC 2006 Steve Huston <shuston@riverace.com> -Thu Dec 21 21:54:51 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + * tests/Cached_Allocator_Test.cpp: + * tests/Codecs_Test.cpp: + * tests/Enum_Interfaces_Test.cpp: + * tests/Get_Opt_Test.cpp (run_test): + * tests/Naming_Test.cpp: + * tests/Reactor_Notification_Queue_Test.cpp: + * tests/Reference_Counted_Event_Handler_Test.cpp: + * tests/Timer_Queue_Reference_Counting_Test.cpp: + Correct logging format for wide-char build. - * ace/config-freebsd.h: Added support for SCTP in FreeBSD version - 700028 and greater. Thanks to Craig Rodrigues <rodrigc at - crodrigues dot org> for reporting this. +Fri Sep 29 18:54:29 UTC 2006 Steve Huston <shuston@riverace.com> -Thu Dec 21 20:19:04 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + * ace/OS_NS_signal.inl (sigaction): In the !ACE_HAS_SIGACTION_CONSTP2 + case, use ACE_SIGACTION instead of "struct sigaction" to pick up + the funky HP hack. Also see: + Mon Jan 23 22:08:56 UTC 2006 Steve Huston <shuston@riverace.com> - * ace/Sock_Connect.cpp: - Use prefix increment and made get_interfaces working with rtems +Fri Sep 29 10:00:04 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * examples/Web_Crawler/Web_Crawler.mpc: + Added avoids+=uses_wchar for borland and bmake, the Borland + compiler gives a warning which can't be easily suppressed and + by not building this project we do get a few new green builds + +Thu Sep 28 19:37:13 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> + + * bin/diff-builds.pl: + Fixed the finding of the nearest earlier build for a given date. + +Thu Sep 28 16:53:14 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> + + * bin\MakeProjectCreator\config\ciao_executionmanager_stub.mpb + * bin\MakeProjectCreator\config\ciao_plan_generator.mpb + Added the base projects for executionmanager_stub and plan_generator. + +Thu Sep 28 14:46:43 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> + + * bin/diff-builds.pl: + + Updated to fix temporary files creation. Now all those are put + in the temporary files directory. Fixed the ability to compare + just two dates. + +Thu Sep 28 13:35:04 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/config-hpux-11.00.h: + Removed ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION that + was set for gcc, with this define set the ACE library doesn't + build. + + * ace/CDR_Stream.cpp: + Initialise pointer with 0 + + * ace/TP_Reactor.{h,inl}: + Changed owner from int to bool. + +Wed Sep 27 21:18:04 UTC 2006 Steve Huston <shuston@riverace.com> + + * ace/Synch_Options.h: Corrected the table of possible Use_Reactor, + Timeout combinations - it was reversed. + + * ace/WFMO_Reactor.{h cpp}: Change the delete_signal_handler_, + delete_timer_queue_, delete_handler_rep_, delete_notify_handler_, + and open_for_business_ members from int to bool to more + accurately reflect their nature as yes/no indicators. + Also, initialize notify_handler_ to 0 in constructors to avoid + a UMR warning from Purify. + +Wed Sep 27 06:28:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/msvc_static_compile.pl: + Added protocols directory + +Tue Sep 26 09:49:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/MakeProjectCreator/config/dynamicany.mpb: + Derive from valuetype, needed to get AbstractBase::_nil() in a no + inline build. + +Mon Sep 25 16:29:42 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * ace/ACE.cpp (send_n_i): Conditionally removed the check for + errno == ENOBUFS because Winsock send, or WSASend will try to + enqueue all buffer at once (to the kernel) and if not it will + return ENOBUFS, in which case the socket is always ready for + writing but actually winsock can never perform such write and we + have endless loop. Thanks to Aleksandar Vukajlovic <vukajlo at + finsoft dot co dot yu> for reporting this and suggesting a fix. + +Mon Sep 25 11:39:35 UTC 2006 Boris Kolpackov <boris@codesynthesis.com> + + * ace/Bound_Ptr.inl: + * ace/Bound_Ptr.h: + + Applied workarounds that should fix compile errors on BCB6. + Thanks to Martin Corino <mcorino at remedy.nl> for providing + the patch. + + * protocols/ace/TMCast/Messaging.hpp: + * protocols/ace/TMCast/TransactionController.hpp: + + Updated to use ACE_Strong_Bound_Ptr. + +Fri Sep 22 12:42:37 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * docs/index.html: Added a link to the http://www.acejoy.com ACE + developers website in China. Thanks to Winston Zhang <webmaster + at acejoy dot com> for creating this website. + +Tue Sep 19 12:27:47 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * tests/Unload_libACE.cpp: Fixed the formatting of this file so it + conformed to ACE guidelines. + +Tue Sep 19 02:54:20 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * ace/FILE_Connector.h: Changed the documentation to reflect the fact + that mkstemp() is used, not mktemp(). + +Thu Sep 21 16:51:34 UTC 2006 Ciju John <johnc@ociweb.com> + + * ace/TP_Reactor.h: + * ace/TP_Reactor.cpp: + The TP_Reactor signal handling implementation is + incomplete. In the current implementation under certain + circumstances (event loop breaks out if interrupted. This is + controlled via ACE_Select_Reactor_T::restart()), a properly + handled OS signal can break the reactor event loop in + an unpredictable manner. This is due to the fact that we cannot + predict which thread will receive the OS signal. Untill the + TP_Reactor signal handling is fixed, I am commenting it out. + +Thu Sep 21 15:13:19 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> + + * bin/tao_orb_tests.lst: + Added new bug 2188 regression test. + +Mon Sep 18 10:56:29 UTC 2006 Steve Huston <shuston@riverace.com> + + * include/makeinclude/platform_sunos5_sunc++.GNU: Add buildbits=64 + branch for Sun Studio 11 (Sun C++ 5.8). Thanks to Aleksandar + Vukajlovic <vukajlo at finsoft dot co dot yu> for this. + + * THANKS: Added Aleksandar Vukajlovic to the Hall of Fame. + +Thu Sep 14 23:01:16 UTC 2006 Steve Huston <shuston@riverace.com> + + * ace/Bound_Ptr.inl: Tweak syntax to try and work around apparant + issues with BCB6. + +Thu Sep 14 21:48:39 UTC 2006 Steve Huston <shuston@riverace.com> + + * ace/OS_NS_Thread.inl (thr_getspecific): Removed the ACE_Errno_Guard + around ::TlsGetValue() in the ACE_HAS_WTHREADS case. The comments + near the code said (paraphrasing) "...it was to protect against + ACE_Log_Msg::instance() overwriting the error value before it had a + chance to be logged; although ACE_ERROR et al already store the + error value before calling ACE_Log_Msg::instance(), there may be a + chance that other uses of ACE_Log_Msg don't protect this way." + I have a report that having the errno guard in place is taking + over 10% CPU during a customer system's run-time. This is way too + much to have in a hot path, especially for a mis-placed guard. + It seems a little random to be picking on ACE_OS::thr_getspecific() + when there are many more OS calls in the ACE_Log_Msg::instance() + call path. + If there are really cases outside of ACE_ERROR... et al, then the + guard should be worked into ACE_Log_Msg::instance() method. However, + rather than try that now, let's see if there are any real issues, + since OS-level calls should be setting errno when errors are + noticed, propagating from GetLastError() via + ACE_OS::set_errno_to_last_error () as needed. + Thanks to Kelly Hickel <kfh at mqsoftware dot com> for raising + this point. + +Wed Sep 13 18:25:37 UTC 2006 Boris Kolpackov <boris@codesynthesis.com> -Thu Dec 21 16:12:16 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> + * ace/Bound_Ptr.h: + * protocols/ace/RMCast/Reassemble.cpp: + + Re-applied my changes (Wed Sep 6) on build czar's (Steve + Huston) request. + +Tue Sep 12 18:07:57 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + + * docs/svn/svn-prefs.reg + * docs/svn/config + + Added pdf,eps,ps as binary file types. + +Tue Sep 12 13:56:22 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * apps/JAWS3/small/SS_Service_Handler.h: Added #include + "ace/svc_export.h". Thanks to Andy Wang <ypwangandy at gmail + dot com> for reporting this. + +Tue Sep 12 13:56:09 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * apps/JAWS3/small/SS_State_DONE.h: + * apps/JAWS3/small/SS_State_READ.h: Added #include + "ace/Synch_Traits.h". Thanks to Andy Wang <ypwangandy at gmail + dot com> for reporting this. + +Thu Sep 7 19:43:02 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * ace/FILE_Connector.h (ACE_FILE_Connector): Updated the + documentation to remove mention of the return values. Thanks to + Hieu Ngyuen <hieu dot t dot nguyen at vanderbilt dot edu> for + reporting this. + +Mon Sep 11 13:03:17 UTC 2006 Boris Kolpackov <boris@codesynthesis.com> + + * ace/Bound_Ptr.h: + * protocols/ace/RMCast/Reassemble.cpp: + + Reverted my previous changes (Wed Sep 6) since BCB2006 + is unable to handle the required C++ constructs. + +Sun Sep 10 09:23:04 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + + * include/makeinclude/platform_g++_common.GNU + + Committing a fix provided by Ossama Othman (Ossama_Othman at symantec dot com) + to fix a problem with symbol visibility when building static libraries. + +Fri Sep 8 21:11:20 UTC 2006 Steve Huston <shuston@riverace.com> + + * ace/CDR_Stream.cpp (ACE_OutputCDR::replace()): Fixed compile error + from apparant cut/paste error in ACE_ENABLE_SWAP_ON_WRITE path. + Thanks to JR Andreassen for reporting this. + + * ace/Bound_Ptr.h: Changed new constructor/assignment to use + dynamic_cast in order to be able to transport pointers through + that can go both up and down a class hierarchy. + (See Wed Sep 6 07:40:03 UTC 2006 Boris Kolpackov + <boris@codesynthesis.com>). + + * protocols/ace/RMCast/Protocol.h (clone(), clone_()): Replaced use of + naked pointers returned from clone_() with ACE_Strong_Bound_Ptr and + used new ACE_Strong_Bound_Ptr ctor to facilitate carrying a more- + refined type through a Profile_ptr and back. Closes up a window + for exception unsafeness noticed by Boris Kolpackov. Also see + Tue Aug 22 22:52:41 UTC 2006 Steve Huston <shuston@riverace.com> + +Fri Sep 8 18:25:17 UTC 2006 Steve Huston <shuston@riverace.com> + + * ace/Synch_Options.{h cpp}: Improved the documentation for this + class, particularly the table that explains the behavior for the + valid combinations of reactor-usage and timeout. Thank you to + Andriy Gapon <avg at icyb dot net dot ua> for motivating this. + + Also changed the return type of operator[] from int to bool; its + meaning was always 1/0 but was overlooked in the sweep for this + type of thing last year. + + * NEWS: Added the ACE_Synch_Options::operator[] return type change. + + * THANKS: Added Andriy Gapon to the Hall of Fame. + +Wed Sep 6 07:40:03 UTC 2006 Boris Kolpackov <boris@codesynthesis.com> + + * ace/Bound_Ptr.h: + + Added new constructor and assignment operator templates that + support the naked pointer-like implicit conversion. + + * protocols/ace/RMCast/Reassemble.cpp: + + Use the new constructor to get rid of reinterpret_cast. + +Tue Sep 5 21:28:02 UTC 2006 Nishanth Shankaran <nshankar@dre.vanderbilt.edu> + + * bin/MakeProjectCreator/config/ciao_race_component.mpb: + * bin/MakeProjectCreator/config/ciao_race_default.mpb: + * bin/MakeProjectCreator/config/ciao_race_monitor.mpb: Added new + RACE specific base projects. + +Fri Sep 1 19:58:06 UTC 2006 Ciju John <johnc@ociweb.com> + + * bin/tao_orb_tests.lst: + Turn on nightly regression test for bug 1476. + +Fri Sep 1 13:49:12 UTC 2006 Martin Corino <mcorino@remedy.nl> + + * bin/PerlACE/Run_Test.pm: + Increased process creation timeout for tests on openVMS. + +Thu Aug 31 01:45:06 UTC 2006 Sumant Tambe <sutambe@nospam> + + Added .xml files to it. + * docs/svn/config: + * docs/svn/svn-prefs.reg: + +Wed Aug 30 17:45:30 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> + + This change fixes bug#2648 + + * ace/Service_Object.cpp: + + Fixed formatting. + + * ace/Service_Repository.cpp: + + Updated logging. + + * ace/Service_Types.h: + * ace/Service_Types.cpp: + + Added ACE_Service_Object_Type::initialized_ member variable to + hold the result of calling init() on the ACE_Service_Object. The + value is later consulted in ACE_Service_Object_Type::fini() to + determine if ACE_Service_Object::fini() should be + called. C++NPv2 (page 120) says that fini() must be called if + and only if, init() succeeded, i.e. returned 0. + +Wed Aug 30 17:18:52 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> + + * bin/MakeProjectCreator/config/ciao_config_handlers.mpb + Modified this file to fixed the "reference to `ACE_Singleton<CIAO + ::Config_Handlers::XML_Helper, ACE_Null_Mutex>::instance()'"warnings + with FC5_Static build. + +Wed Aug 30 13:34:50 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + + * bin/make_release + + Updates to the make_release script to make it subversion compatible. + major updates to be aware of: + . Assumes the working copy it uses is flattened + . Must have DOC_ROOT set + . Script should be started from DOC_ROOT. + . Produces traditional (nested) releases + . Now produces a set of source-only kits in addition to + the traditional kits. + + IMPORTANT: The release makefiles have not been updated, and are + most likely broken. + + Producing a release is a two step process: + make_release -u # Update version numbers + make_release -k ace+tao+ciao # Create all kits. + +Wed Aug 30 12:19:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/CDR_Stream.{h,cpp}: + Use true/false consistently for the good_bit + +Wed Aug 30 05:57:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/Service_Config_Test.cpp: + Fixed argument not used warnings + +Tue Aug 29 21:17:26 UTC 2006 Steve Huston <shuston@riverace.com> + + * tests/Service_Config_DLL.{h cpp}: + * tests/Service_Config_Test.cpp: Added a test for ACE_Service_Config's + behavior when a dynamic service's init() hook returns -1 (failure). + This was precipitated by Bugzilla #2648. + +Tue Aug 29 18:07:39 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> + + * examples/IPC_SAP/SSL_SAP/SSL_SAP.mpc: + * tests/SSL/tests.mpc: + + Disable MPC projects in these files that depend on features not + found in the "ACE for TAO" subset", i.e. ACE_Profile_Timer and + asynch I/O. + +Tue Aug 29 13:19:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> * bin/tao_orb_tests.lst: + Added bug 2560 regression. It runs fine on windows but seem to + crash on linux exhibiting a bug that isn't fixed yet. + +Tue Aug 29 13:17:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - Fixing the condition for running the Transport::Current tests - (note that ST = Single Threaded, not STATIC). + * bin/PerlACE/ProcessVX.pm: + Commented out the ProcessVX_Unix require, it resulted in + errors on test systems when they don't have Net::Telnet () + available. -Thu Dec 21 14:31:04 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> +Tue Aug 29 11:16:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + * bin/PerlACE/Run_Test.pm: + * bin/PerlACE/ProcessVX_Unix.pm: + * tests/run_test.pl: + Changes for running tests on linux with vxworks 6.3 rtp model target + +Tue Aug 29 08:20:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/run_test.lst: + Don't run UUIDTest in ACE_FOR_TAO configuration + + * bin/ace-tests.lst: + Don't run wfmo reactor tests in ACE_FOR_TAO configuration + +Tue Aug 29 00:24:48 UTC 2006 Adam Mitz <mitza@ociweb.com> + + * docs/run_test.txt: + Fixed Perl bug in example (needed "" instead of '' to get $ variable + expansion) and added explanatory text on using $PerlACE::ACE_ROOT + and $PerlACE::TAO_ROOT. + +Tue Aug 29 00:26:56 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> + + * ace/SSL/ssl.mpc + * ace/SSL/ssl_for_tao.mpc + * bin/MakeProjectCreator/config/ssl_full.mpb: + * bin/MakeProjectCreator/config/ssl.mpb: + * bin/MakeProjectCreator/config/ssl_for_tao.mpb: + + Added support for new ACE_SSL subset "ACE_SSL_FOR_TAO" for + "ace_for_tao" configuration. The ACE_SSL_FOR_TAO subset merely + lacks asychronous I/O support. + +Tue Aug 29 00:04:29 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> + + * ace/ACE_export.h: + + SGI C++ 7.3 compiler does not support standard C++ "extern + inline" declarations. + + * ace/Log_Msg.cpp (log): + + Corrected scalar/vector operator delete() mismatch. The wide + string buffer was allocated as an array. Destroy it + accordingly. + + * ace/MMAP_Memory_Pool.cpp (ACE_MMAP_Memory_Pool): + + Prevent potential dereferencing of null pointer. + + * ace/Svc_Conf_Param.h: + + Corrected author information. + +Mon Aug 28 23:59:50 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> + + From Amnon Berger <AmnonAB at gmail dot com> + * ace/SSL/SSL_Context.h (ACE_SSL_Context): + * ace/SSL/SSL_Context.cpp (certificate): + + Added support for reading an X.509 certificate from memory + instead of a file. + +Mon Aug 28 19:33:50 UTC 2006 Sumant Tambe <sutambe@nospam> + + A quick perl script to create a change-log-entry date and time. + * bin/cltime.pl: + + Added *.cidl *.pcd *.cdd + * docs/svn/config: + * docs/svn/svn-prefs.reg: + +Mon Aug 28 14:14:39 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> + + * bin/tao_other_tests.lst: + Added TAO/orbsvcs/tests/Security/Big_Request/run_test.pl to the + list of SSL-based tests. Thanks to Johnny Willemsen + <jwillemsen@remedy.nl> for pointig out that it was missing. + +Mon Aug 28 13:45:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Svc_Conf_Lexer.cpp: + Fixed variable not used warning when ACE_USES_WCHAR is not + defined + + * ace/Min_Max.h: + Removed ACE_LACKS_MIN_MAX_TEMPLATES and the code that was + there when this define was set, this define wasn't enabled + in any configuration file. + +Mon Aug 28 11:53:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/MakeProjectCreator/config/taodefaults.mpb: + Added exceptions as base project, TAO requires native C++ exceptions. + +Mon Aug 28 11:45:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * protocols/tests/RMCast/RMCast.mpc: + Removed avoids usage, that is already in the base projects + +Mon Aug 28 11:13:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * etc/*.doxygen: + Set ignore prefix in several files to improve generated + documentation + +Mon Aug 28 11:08:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * etc/acexml.doxygen: + Ignore ACEXML_ as prefix + +Mon Aug 28 10:34:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * docs/run_test.txt: + Updated to explain how the script works on VxWorks and extended + the exampl in such a way that if there is not an executable + it returns directly + +Mon Aug 28 10:07:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/run_test.lst: + Added UUIDTest, was just not listed in this file + + * bin/PerlACE/ProcessVX_Unix.pm: + New initial file for running tests for VxWorks from an unix host + + * bin/PerlACE/ProcessVX.pm: + On unix use the new file above + +Mon Aug 28 09:05:20 UTC 2006 Boris Kolpackov <boris@codesynthesis.com> + + * bin/ace_tests.lst: + + Copied test exclusion list from the Multicast_Test entry. + + * protocols/tests/RMCast/Protocol.h: + * protocols/tests/RMCast/run_test.pl: + + Adjusted the timeout value and message size. + +Sun Aug 27 11:11:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/tao_orb_tests.lst: + Added twoway DII collocation test + +Sun Aug 27 00:03:07 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * ace/Filecache.cpp (ACE_Filecache_Object): Added a call to + + this->lock_.release (); + + to release the lock and so the same file can be fetched again. + Thanks to Liu Qian <qianliu dot gmail at com> for reporting + this. + +Sat Aug 26 17:40:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * docs/ACE-porting.html: + ACE_VXWORKS is the define for VxWorks, exceptions are required + for TAO. + +Sat Aug 26 17:36:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * docs/ACE-guidelines.html: + Updated some parts to mention svn instead of cvs + +Sat Aug 26 03:11:01 UTC 2006 Krishnakumar B <kitty@spam.invalid.domain> + + * docs/svn/svn-prefs.reg: + * docs/svn/config: + + Updates to add even more file types. + +Sat Aug 26 02:32:18 UTC 2006 Krishnakumar B <kitty@spam.invalid.domain> + + * docs/svn/svn-prefs.reg: + * docs/svn/config: + + Updated these files to add more entries to the list of globally + ignored extensions, and also to the list of file types which + should have automatic properties set. Also synced up the config and + svn-prefs.reg file. + +Fri Aug 25 22:01:38 UTC 2006 Steve Huston <shuston@riverace.com> + + * ace/Sock_Connect.cpp (get_ip_interfaces, count_interfaces): + Corrected to extract IPv6 information correctly from ioctl()- + returned structures. + + * tests/Enum_Interfaces_Test.cpp: On error condition ACE_HAS_IPV6 but + no ipv6 interfaces, do the log as LM_ERROR so the scoreboard picks + it up. + +Fri Aug 24 12:55:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/config-vxworks6.3.h: + * ace/Process.cpp: + * ace/Task.cpp: + Fixes for building on vxworks 6.3 with diab 5.4 compiler + +Fri Aug 24 11:17:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/CDR_Size.cpp: + Added include of OS_Memory.h to get ACE_align_binary + +Thu Aug 24 21:40:24 UTC 2006 Steve Huston <shuston@riverace.com> + + * tests/Process_Manual_Event_Test.cpp (acquire_release): Fixed a race + condition whereby while a parent and child were ping-ponging, it + was possible for one process to signal event1, wait on event2, then + signal event1 again before the other process could respond to + event1 being signaled and reset it. Thus, event1 was being reset + after the other process signaled it, ensuring a never-ending + wait at the end of the iterations. I changed the code to quickly + reset the event before printing the debug message, thereby closing + the window of opportunity a lot. But probably not completely + removing it... we'll have to see. + +Thu Aug 24 16:40:54 UTC 2006 Steve Huston <shuston@riverace.com> + + * ace/config-aix-4.x.h: Only need to set + ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION for g++ + prior to g++ 4.1 (have only heard report of this for g++ 4.1; + it may need adjustment for 4.0). Thanks to Nzer Zaidenberg + <scipioenterprises at yahoo dot com> for reporting the original + problem and testing this fix. + + * THANKS: Added Nzer Zaidenberg to the Hall of Fame. + +Thu Aug 24 16:33:22 UTC 2006 James H. Hill <hillj@isis.vanderbilt.edu> + + * docs/svn/config: + * docs/svn/svn-prefs.reg: + + Added auto-props for *.tex and *.cls files. + +Thu Aug 24 13:48:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/config-openvms.h + Removed ACE_HAS_SOCK_BUF_SIZE_MAX, not needed anymore with the + latest OpenVMS versions + +Thu Aug 24 08:11:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/DLL.h + * ace/Service_Repository.h + * ace/Service_Object.cpp + * ace/Parse_Node.cpp + * ace/Service_Object.inl + * ace/Parse_Node.h + * ace/Service_Repository.cpp + * ace/Service_Object.h + * ace/Service_Gestalt.h + * ace/Service_Gestalt.cpp + * ace/DLL_Manager.cpp + * ace/DLL.cpp + Reverted change from below on request of Iliyan because it broke + a set of tests that spawn a thread in init. + Tue Aug 22 21:43:34 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> + +Wed Aug 23 08:32:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Sock_Connect.{h,cpp}: + Reverted the change below, VxWorks/OpenVMS/AIX all have problems + after this change + + Tue Aug 22 15:19:46 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> + * ace/Sock_Connect.h: * ace/Sock_Connect.cpp: - Added support for get_interfaces for rtems -Thu Dec 21 13:32:08 UTC 2006 Olli Savia <ops@iki.fi> +Tue Aug 22 22:52:41 UTC 2006 Steve Huston <shuston@riverace.com> - * include/makeinclude/platform_lynxos.GNU: - Moved macro definitions from CFLAGS to CPPFLAGS. + * protocols/ace/RMCast/Protocol.h: Replaced use of + ACE_Refcounted_Auto_Ptr with ACE_Strong_Bound_Ptr. Code formerly used + ACE_Refcounted_Auto_Ptr::release() with the assumption it had the + same semantics as auto_ptr::release() - stealing the pointer away. + This used to work by accident. The fixed ACE_Refcounted_Auto_Ptr's + release() method decrements the reference count which may cause the + object to be deleted, which is what happened all the time in the + RMCast protocol's clone() methods. Because all the clone() methods + relied on being able to take a more-derived pointer and use it as + a Profile*, changing the refcounted pointer type necessitated + changing the protected clone_() methods to return a naked pointer + rather than a refcounted one. This is acceptable because the naked + pointer is not exposed to class users; the public methods insert + the naked pointer into a ACE_Strong_Bound_Ptr before giving access + to it externally. + + * protocols/ace/RMCast/Acknowledge.cpp: + * protocols/ace/RMCast/Reassemble.cpp: With properly functioning + refcounted pointers (see above) these needed a few changes to + make proper use of the pointers while maintaining correct reference + counts. + +Tue Aug 22 21:43:34 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> + + This change fixes bug#2612. + + * ace/DLL.h: + * ace/DLL.cpp: + + Made assignment return 'T&' instead of 'const T&'. Adjusted code + formatting and logging messages. + + * ace/DLL_Manager.cpp: + + Fixed formatting. + + * ace/Parse_Node.h: + * ace/Parse_Node.cpp: + + Added accessor for the underlying ACE_DLL and adjusted logging. + + * ace/Service_Gestalt.h: + * ace/Service_Gestalt.cpp: + + Introduced ACE_Service_Type_DLL_Guard class. As dynamic service + objects are loaded, static service objects that come with the + same DLL code, may also be registered. The static services + however, have no information about the context in which their + registration takes place and their relation with the DLL is + lost. A situation can easily arise where the dynamic service + object is finalized and its DLL - unmapped, but some of the + DLL's static services may still be around. Their finalization + would not be possible, if the DLL counting that code is gone. + + The guard, when instantiated (on the stack) swaps out the + current Gestalt and its service repository, and replaces them + with a "sandbox" Gestalt, which has lifetime sufficient for just + the current service initialization. Note that this mechanism is + effective even in the case where a service initialization causes + re-entry into the Gestalt to load and initialize another service + as part of the initialization. + + If no action is taken (in case of an error, for instance) the + guard destructor will simply finalize all newly initialized + service(s) from the sandbox. On the other hand, if + initialization is successful the service object descriptors are + "relocated" to the original Gestalt. + + During the relocation, all static services are "fixed-up" to + hold a reference to the DLL they belong to. Effectively, a + static service, initialized via loading of a particular DLL, + becomes a dynamic service. Thus the order of service + finalization does not matter anymore because the DLL will be + help in memory until the last service object it provides is + finalized. + + * ace/Service_Object.h: + * ace/Service_Object.inl: + * ace/Service_Object.cpp: + + Added a relocate method to modify the ACE_DLL each SO has. + + * ace/Service_Repository.h: + * ace/Service_Repository.cpp: + + Befrended ACE_Service_Type_DLL_Guard. Adjusted logging. + + * tests/Service_Config_Test.cpp: + + Simplified test case. + +Tue Aug 22 18:37:48 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> + + * bin/MakeProjectCreator/config/ipv6.mpb: + + Building with IPv6 for WinCE requires an additional library for + rtti that is not required for the windows builds. + + * bin/ciao_tests.lst: + * bin/tao_orb_tests.lst: + * bin/tao_other_tests.lst: + Added ACE_FOR_TAO exclusions as necessary + +Tue Aug 22 15:19:46 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> + + * ace/Sock_Connect.h: + * ace/Sock_Connect.cpp: + + Refactored interface discovery code. The methods used to find + IPv6 interface addresses is highly platform specific. So much so + that the single method was too confusing to maintain. With this + patch, the code has been refactored to put each + platform-specific variation in its own method, then only compile + the method needed by any given platform. I'm not sure this will + yield much of a footprint reduction, as all the existing code is + still present, it is just easier to keep track of what is going on. + + Also, when IPv6 is enabled, it might be on a platform that is + using IPv6 exclusively, ie, with no IPv4 enabled. At least one + third-party user of ACE requested a specific test for IPv4 + enablement status, thus I have added a new method for that test. + + * ace/config-linux.h: + Linux supplies the getipaddrs system call. + + * tests/Enum_Interfaces_Test.cpp: + Extended the test so that if ACE is built with ACE_HAS_IPV6 + defined, the test will expect at least one IPv6 endpoint or it + will fail. + +Tue Aug 22 11:41:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/UUID.{h,cpp}: + Implemented copy constructor + + * tests/UUIDTest.cpp: + Test copy constructor + +Tue Aug 22 09:36:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/UUID.{h,inl}: + Made the accessors const and reimplemented operator == and + operator !=. + + * tests/UUIDTest.cpp: + Test the operator != and ==. + +Mon Aug 21 20:46:43 UTC 2006 Steve Huston <shuston@riverace.com> + + * configure.ac: Modified the check for the net/if.h header file + to do a #include <sys/socket.h> if it exists. Allows the compile + of net/if.h to succeed, fixing a configure warning for a file that + exists but won't compile. Thanks to Don Meek <Don dot Meek at + windstream dot com> for reporting this problem. + + * THANKS: Added Don Meek to the Hall of Fame. + +Mon Aug 21 20:43:59 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> + + * ace/Service_Config.inl: + + Added the missing implementation of the static process_file () + method. Thanks to Lothar Werzinger <lothar@tradescape.biz> for + pointing that out. + +Mon Aug 21 20:06:38 Pacific Daylight Time 2006 Ossama Othman <ossama_othman at symantec dot com> + + From Russell Mora <russell_mora at symantec dot com>: + * ace/Thread_Exit.cpp (instance): + + Fixed race condition in generated code by stopping optimizer + from re-ordering static variable initializations by declaring + static "instance_" variable as "volatile". This problem was + observed on a quad-CPU Solaris 8 box. + +Mon Aug 21 18:31:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * etc/*.doxygen: + In all files except ace.doxygen added SHORT_NAMES=YES to let + doxygen generate shorter filenames, this should fix the problems + we had during the release with cpio not capable of handling + long filenames -Thu Dec 21 12:12:04 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> +Mon Aug 21 17:46:55 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - * include/makeinclude/rules.bin.GNU: - Removed old chorus rules + * ace/Numeric_Limits.h (ACE_Numeric_Limits): -Thu Dec 21 10:17:04 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + The Microsoft Platform SDK does not provide + std::numeric_limits<> specializations for 64 bit integers so we + need to explicitly provide ACE_Numeric_Limits<> specializations + to compensate for this deficiency. [Bug 2639] - * ace/UUID.cpp: - Fixed initialisation warning + Unfortunately there is no way to tell if the platform SDK is + being used so we specialize for the ACE_WIN64 + MSVC++ 7.1 case, + which is the configuration that exhibits this problem. It also + happens to be a fairly isolated configuration since 64-bit + support in MSVC++ 7.1 was not very good to begin with. -Thu Dec 21 09:45:00 UTC 2006 Simon Massey <sma@prismtech.com> +Mon Aug 21 15:35:26 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - * ace/OS_TLI.inl: - * ace/OS_NS_signal.h: + * ace/Timeprobe_T.cpp (print_times): More fixed for timestamp + inversion due to recording time from different threads. This + prints a warning message the first time it detects a timestamp + inversion. It also fixes various minor problems in the + timeprobe reports whenever the total number of timeprobes + exceeds 8192. Thanks to Patrick Rabau for contributing this. - Updated some HPUX Acc version bug fixes..... + * ace/INET_Addr.h: Updated the documentation of the non-reentrant + versions of get_host_addr() and get_host_name() to clarify how + they can be used correctly (or better yet not used at all..). + Thanks to Ephy Levy <EphyLevy at gmail dot com> for motivating + this. + + * ace/Logging_Strategy.cpp: Added a destructor to delete + this->filename_, which is allocated in the constructor. Thanks + to Amnon AB <AmnonAB at gmail dot com> for reporting this. + + * ace/Acceptor.h: Made the suspend()/resume() methods of + ACE_Strategy_Acceptor public rather than protected. Thanks to + Amnon AB <AmnonAB at gmail dot com> for reporting this. + + * docs/Symbol_Versioning.html (HREF): Added a link to the Riverace + webpage that describes symbol versioning in ACE. Thanks to + Steve Huston for contributing this. + + * ace/Timeprobe_T.cpp (print_times): Revised the code so that if + there is a timestamp inversion due to recording time from + different threads, the time difference will be displayed as a + negative value instead of a gigantic positive value. Also + compute the time difference correctly when the timeprobe array + wraps around. Thanks to Patrick Rabau <pr2345 at gmail dot com> + for this fix. + + * ace/Containers_T.cpp, + * ace/Log_Msg.cpp, + * ace/CDR_Size.cpp, + * ace/CDR_Size.inl, + * ace/CDR_Stream.cpp: Fixed a bunch of problems with type punning. + Thanks to Thomas Girard <thomas.g.girard at free dot fr> for + reporting this. + + * ace/TSS_T.cpp (tryacquire): There was a missing '&' in + + ACE_Thread::getspecific (this->key_, temp); + + Thanks to Thomas Girard <thomas.g.girard at free dot fr> for + reporting this. + +Mon Aug 21 10:45:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/UUID.{h,cpp,inl}: + Extended UUID to make it possible to assign a string to a UUID + to set it a new value. + + * tests/UUIDTest.cpp: + Extended this test to test the new functionality above. + +Mon Aug 21 10:26:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/UUID.{h,cpp,inl}: + Changed node_release_ to a real bool and use ACE_ERROR instead + of ACE_DEBUG for a real error message + + * ace/OS_NS_unistd.cpp: + Const improvement + +Sat Aug 19 22:03:03 UTC 2006 Yan Dai <dai_y@ociweb.com> + + * bin/tao_orb_tests.lst -Thu Dec 21 08:47:04 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + Excluded the DII collocation oneway test from running in the minimum + CORBA build. - * apps/JAWS2/HPPTU/http_headers.{h,inl}: - Fixed const warnings with Intel C++ +Fri Aug 18 20:38:35 UTC 2006 Steve Huston <shuston@riverace.com> -Wed Dec 20 22:06:14 UTC 2006 Olli Savia <ops@iki.fi> + * examples/APG/Logging/Trace.h: Further changed use of __VA_ARGS__ + to remove the comma and the fixed FMT arg from the macros. This + may still trigger the same ISO C99 warning, but it doesn't fail. - * tests/OS_Test.cpp: - HP-UX has broken vsnprintf function. Changed the test not - to fail on HP-UX. +Fri Aug 18 17:22:08 UTC 2006 Steve Huston <shuston@riverace.com> -Wed Dec 20 16:35:53 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> + * ace/OS_NS_unistd.cpp (pwrite): Corrected the large-file-offset + logic to build correctly for Windows. Also moved the explicit + SetFilePointerEx() before WriteFile() to the non-ACE_HAS_WINNT4 + section - for ACE_HAS_WINNT4 the supplied OVERLAPPED structure + carries the file offset to write at. - These are fixes correcting scoreboard issues pertaining to the - checkin from Tue Dec 19 22:09:34 UTC 2006. +Fri Aug 18 17:08:35 UTC 2006 Yan Dai <dai_y@ociweb.com> + + * bin/tao_orb_tests.lst + + Added DII collocation oneway test. This is the regression test + for bugzilla #2545. + +Fri Aug 18 15:49:01 UTC 2006 Steve Huston <shuston@riverace.com> + + * examples/APG/Logging/Trace.h: Changed the varargs form used in the + macros from ##__VA_ARGS__ to ,__VA_ARGS__ in an effort to conform + to C99 and clear some compile warnings from gcc4. This effectively + prohibits leaving the varargs out completely from the macro + invocation but that use-case isn't exercised anyway. + + * bin/ace_tests.lst: Add protocols/tests/RMCast/run_test.pl to run + RMCast tests, except ACE_FOR_TAO builds. + +Fri Aug 18 12:03:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> * bin/tao_orb_tests.lst: + Don't run Bug_2510_Regression in a ST build, it uses threading + + * bin/MakeProjectCreator/templates/bor.mpd: + Don't print a message with the dummy realclean + +Thu Aug 17 14:20:00 UTC 2006 Simon Massey <sma@prismtech.com> + + * apps/drwho/Binary_Search.cpp: + * apps/drwho/CM_Client.cpp: + * apps/drwho/CM_Server.cpp: + * apps/drwho/Hash_Table.cpp: + * apps/drwho/Options.cpp: + * apps/drwho/Options.h: + * apps/drwho/PMC_All.cpp: + * apps/drwho/PMC_Flo.cpp: + * apps/drwho/PMC_Ruser.cpp: + * apps/drwho/PMC_Usr.cpp: + * apps/drwho/PMS_All.cpp: + * apps/drwho/PMS_Flo.cpp: + * apps/drwho/PMS_Ruser.cpp: + * apps/drwho/PMS_Usr.cpp: + * apps/drwho/Protocol_Manger.cpp: + * apps/drwho/Protocol_Record.cpp: + * apps/drwho/Rwho_DB_Manager.cpp: + * apps/drwho/Search_Struct.cpp: + * apps/drwho/Single_Lookup.cpp: + * apps/Gateway/Gateway/Gateway.cpp: + * apps/Gateway/Gateway/Options.cpp: + * apps/Gateway/Gateway/Options.h: + + Renamed the enum ID "DEBUG" to "DEBUGGING", was causing problems + with MFC builds. + +Thu Aug 17 12:15:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/SString_Test.cpp: + Added a check whether npos is zero, if it is print an error, + with Intel C++ 9.0 with the Microsoft platform SDK this seems + to be zero + +Thu Aug 17 08:30:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/MakeProjectCreator/config/ciao_client_dnc.mpb: + * bin/MakeProjectCreator/config/ciao_deployment_stub.mpb: + * bin/MakeProjectCreator/config/ciao_deployment_svnt.mpb: + * bin/MakeProjectCreator/config/ciao_events_dnc.mpb: + * bin/MakeProjectCreator/config/ciao_rtevent_dnc.mpb: + Removed -Sc form the taoidlflags, it is deprecated already sometime + ago + +Wed Aug 16 22:19:47 UTC 2006 Steve Huston <shuston@riverace.com> + + * ace/Acceptor.h: Doxygen improvements. + +Wed Aug 16 17:42:02 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> + + * ace/Numeric_Limits.h: + + Explicitly #undef min and max before including <limits> in the + Mingw case to address global namespace pollution induced + conflicts. The previous attempt to address this problem where + the Windows-specific NOMINMAX preprocessor symbol was defined in + this header didn't work since the min and max macros were + already defined beforehand. In order for NOMINMAX to work as + expected, it would be have to be defined before any Windows + headers are included, or more preferrably on the + preprocessor/compiler command line. Unfortunately, that would + probably break some applications. + +Wed Aug 16 14:51:58 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + + * docs/svn/svn-prefs.reg + * docs/svn/config + + Updated to correct keywords values, and add use-commit-times + as a default option. + +Wed Aug 16 10:19:41 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Obstack_T.{cpp,inl}: + Moved grow_fast and freeze methods from inl to cpp file, + should fix the link problems with the RHAS IPv6 build + +Wed Aug 16 09:50:41 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * examples/Misc/Misc.mpc: + * examples/Misc/test_timestamp.cpp: + Simple small test for ACE::timestamp() + +Wed Aug 16 08:37:41 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * include/makeinclude/build_lib.bor: + * include/makeinclude/clean.bor: + * include/makeinclude/compiler.bor: + Removed support for the CBuilderX preview compiler, it has never + become more then preview and we don't test with it anymore + + * include/makeinclude/recurse.bor: + Removed from the repo, seems not to be used anymore + +Tue Aug 15 17:47:11 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> + + * ace/Numeric_Limits.h: + + Windows defines min/max macros that interfere with the + numeric_limits::min/max() traits. Prevent those macros from + being defined by defining the Windows-specific NOMINMAX symbol + before any Windows headers are included. This is currently + only done for Mingw builds since the problem is not exhibited by + other Windows builds (e.g. MSVC++, Borland, etc). + +Tue Aug 15 16:17:56 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> + + * ace/Hash_MultiMap_Manager_T.h + Made some minor changes to the documentation to use @a to refer to + argument names. + +Tue Aug 15 15:00:00 UTC 2006 Adam Mitz <mitza@ociweb.com> + + * ace/Event_Handler.cpp: + + Updated Event_Handler_var to use an ACE_Errno_Guard to + prevent overwriting the errno. + + * bin/tao_orb_tests.lst + + Added new test: TAO/tests/Oneway_Timeouts/run_test.pl + +Tue Aug 15 14:22:53 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> + + * ace/Hash_MultiMap_Manager_T.h + Address the "unsupported xml/html tag" warnings in doxygen build. + +Tue Aug 15 08:36:00 UTC 2006 Simon Massey <sma@prismtech.com> + + * bin/MakeProjectCreator/config/acedefaults.mpb + + Backout all of the recent MFC changes. + + * bin/MakeProjectCreator/config/ace_opt_mfc.mpb: + + DELETED. + +Mon Aug 14 23:34:11 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + + * ace/TP_Reactor.cpp + * ace/TP_Reactor.h + + Removed all register_handler member functions from these files. + This essentially enables the ability to register signal handlers in + the TP Reactor by implicitly delegating to the select reactor base + class. + + Other register_handler methods (not relating to signal handling) + were explicit delegations to the select reactor base class, present + only to silence virtual function hiding warnings created by + disabling the signal related methods. + +Mon Aug 14 16:14:56 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> + + * test/Hash_Multi_Map_Manager_Test.cpp + Address the "no matching function for call" errors. + + * ace/Hash_MultiMap_Manager_T.h + Address the "unsupported xml/html tag" warnings in doxygen build. + +Mon Aug 14 16:00:00 UTC 2006 Simon Massey <sma@prismtech.com> + + * bin/MakeProjectCreator/config/ace_mfc.mpb: + * bin/MakeProjectCreator/config/ace_opt_mfc.mpb: - Added the two Transport::Current tests to the scoreboard. + Backout the "Specific" guards. - * bin/MakeProjectCreator/config/tc.mpb: +Mon Aug 14 15:20:00 UTC 2006 Simon Massey <sma@prismtech.com> - Moved this file to $TAO_ROOT/MPC/config where it belongs. + * bin/MakeProjectCreator/config/ace_mfc.mpb: + * bin/MakeProjectCreator/config/ace_opt_mfc.mpb: -Wed Dec 20 12:31:04 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + Specific the macro and don't inherit from mfc for opt. - * tests/test_config.h: - Only define ACE_START_TEST and ACE_END_TEST when they are not - defined yet. This way we can set our own define in the config.h - file and for example just do logging to stdout instead of a file - which can be problematic when the test target doesn't have a - file system +Mon Aug 14 15:43:12 UTC 2006 Steve Huston <shuston@riverace.com> -Wed Dec 20 04:52:04 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + * tests/Makefile.am: Added Hash_Multi_Map_Manager_Test. + +Mon Aug 14 13:33:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * include/makeinclude/clean.bor: + Use .inl as file extension to clean instead of .i + + * bin/MakeProjectCreator/templates/bor.mpd: + Added empty realclean target + +Mon Aug 14 12:52:19 UTC 2006 Chad Elliott <elliott_c@ociweb.com> * ACE-INSTALL.html: - * docs/Download.html: - Fleshed out SVN instructions a bit more, corrected link mistake in - Download.html. + I added "-type gnuace" to the options where the default project + type was assumed. Eventually, MPC will not have a default project + type. + + * include/makeinclude/macros.GNU: + * include/makeinclude/rules.common.GNU: + * include/makeinclude/rules.local.GNU: + + Added a new target to remove only the binaries (executables and + shared libraries). + +Mon Aug 14 11:15:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/*.h: + Added /**/ to the include of config-all.h and ACE_export.h, this + way doxygen doesn't add these files to the include graphs which + make them much easier to read + +Sun Aug 13 23:30:02 UTC 2006 Yan Dai <dai_y@ociweb.com> + + * bin/tao_other_tests.lst: + + Excluded TAO POAManagerFactory and EndpointPolicy tests from + running in a minimum CORBA configuration. + +Sun Aug 13 22:21:55 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> + + * test/Hash_Multi_Map_Manager_Test.cpp + Address the "Implicit conversion of string literal to char * is + deprecated" warnings. + +Sun Aug 13 15:25:17 UTC 2006 Boris Kolpackov <boris@codesynthesis.com> + + * bin/MakeProjectCreator/config/ciaocidldefaults.mpb: + + Removed '--' from the cidlc command line. + +Sun Aug 13 000:02:00 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> + + * ace/Hash_MultiMap_Manager_T.inl + * ace/Hash_MultiMap_Manager_T.cpp + * ace/Hash_MultiMap_Manager_T.h + Change the name of these files into Hash_Multi_Map_Manager.*. + Add some comments to explain in brief the purpose of using + ACE_Hash_Multi_Map_Manager class and how to use it. + Remove the backward compatibility of ACE_Hash_Multi_Map_Manager class + and its associated iterator classes. + Remove "_Ex" on the names of ACE_Hash_Multi_Map_Manager class and its + associated iterator classes. + + * ace/Hash_MultiMap_Manager.h + Remove this file since it simply includes the + Hash_MultiMap_Manager_T.h file. + + * test/Hash_MultiMap_Manager_Test.cpp + Change the name of this file into Hash_Multi_Map_Manager_Test.cpp. + Address the "convert const char* to ACE_TCHAR*" errors. + + * ace/ace.mpc + Change the name of Hash_MultiMap_Manager project into + Hash_Multi_Map_Manager. + + * test/run_test.lst + * test/tests.mpc + Change the name of Hash_MultiMap_Manager_Test project into + Hash_Multi_Map_Manager_Test. + +Fri Aug 11 16:46:56 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> + + * ace/Hash_MultiMap_Manager.h + * ace/Hash_MultiMap_Manager_T.cpp + * ace/Hash_MultiMap_Manager_T.h + * ace/Hash_MultiMap_Manager_T.inl + Add these files which implement Hash_MultiMap_Manager. + + * test/Hash_MultiMap_Manager_Test.cpp + Add this test file for Hash_MultiMap_Manager. + + * ace/ace.mpc + Modify this file to include Hash_MultiMap_Manager. + + * test/run_test.lst + * test/tests.mpc + Modify these files to include Hash_MultiMap_Manager_Test. + +Fri Aug 11 16:37:34 UTC 2006 Steve Huston <shuston@riverace.com> + + * tests/CDR_File_Test.cpp: Corrected a signed/unsigned compare. + +Fri Aug 11 13:59:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/CDR_Size.cpp: + Add include of OS_Memory.h to get ACE_align_binary + + * ace/Sig_Handler.cpp: + Add include of Guard_T.h to get the guards + + * ace/config-vxworks6.3.h: + Add some code for the diab compiler but this is not complete + support, just some testing results. + +Fri Aug 11 07:17:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * docs/svn/config: + * docs/svn/svn-prefs.reg: + Added settings for .idl and .pidl + +Thu Aug 10 13:14:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/tao_other_tests.lst: + Disabled the performance tests on OpenVMS for the moment, they + result in too much error logs + +Thu Aug 10 10:33:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/MakeProjectCreator/config/taoidldefaults.mpb: + Updated for -GX + +Thu Aug 10 09:38:13 UTC 2006 Simon McQueen <sm@prismtech.com> + + * bin/tao_other_tests.lst: + + Exclude Bug_2615_Regression from running on 'ACE for TAO' builds. + +Thu Aug 10 01:52:34 UTC 2006 Steve Huston <shuston@riverace.com> + + * ace/config-aix-4.x.h: Added ACE_HAS_TEMPLATE_TYPEDEFS for Visual + Age C++ 6 and higher. + +Wed Aug 9 14:15:18 UTC 2006 Ciju John <johnc@ociweb.com> + + * bin/MakeProjectCreator/config/csd_threadpool.mpb: + + Added a dependency upon threads.mpb as this project shouldn't be + built if thread support is not going to be built into TAO. + +Wed Aug 9 13:45:00 UTC 2006 Simon Massey <sma@prismtech.com> + + * bin/MakeProjectCreator/config/acedefaults.mpb + + Typo, Remove the + character that came with the patch file. + +Wed Aug 9 12:17:00 UTC 2006 Simon Massey <sma@prismtech.com> + + * bin/MakeProjectCreator/config/ace_opt_mfc.mpb + * bin/MakeProjectCreator/config/acedefaults.mpb + + Chad's new fix for MPC building MFC projects. + +Tue Aug 8 14:00:06 UTC 2006 Carlos O'Ryan <coryan@atdesk.com> + + * Merged in all the changes from the fix_bug_2540 branch, that is, + from revision 73857 to revision 73859. + + Thu Aug 3 21:49:27 UTC 2006 Carlos O'Ryan <coryan@atdesk.com> + + * ace/TP_Reactor.cpp: + * ace/Select_Reactor_T.cpp: + Avoid the problems described in bug 2540 by detecting the + infinite loop and recomputing the number of active handlers. + Thanks to Jody Hagins for correcting my original "fix." + +Tue Aug 8 14:05:00 UTC 2006 Simon Massey <sma@prismtech.com> + + * bin/MakeProjectCreator/config/ace_mfc.mpb + * bin/MakeProjectCreator/config/acedefaults.mpb + + Reverted Chad's fix for MPC building MFC projects. + It seems that this causes non MFC builds to build as MFC + breaking the scoreboard. + +Tue Aug 8 09:30:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - Thanks to Craig Rodrigues <rodrigc at crodrigues dot org> for the patch. + * ACE.mwc: + Removed several directories which aren't existing anymore -Tue Dec 19 22:09:34 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> +Tue Aug 8 09:28:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - * bin/MakeProjectCreator/config/tc.mpb: + * ACE-INSTALL.html: + Removed some parts of the VxWorks building instructions because + it was really wrong what was said + +Tue Aug 8 09:15:00 UTC 2006 Simon Massey <sma@prismtech.com> + + * ace/OS_Memory.h + * ace/config-win32-msvc.h + * bin/MakeProjectCreator/config/ace_mfc.mpb + * bin/MakeProjectCreator/config/acedefaults.mpb + + Chad's fix for MPC building MFC projects. Correction for + Thu Apr 27 21:04:08 UTC 2006 Steve Huston <shuston@riverace.com> + throw CMemoryException on out-of-memory condition. These + exceptions must be caught by pointer and thrown via calling + AfxThrowMemoryException (). + +Tue Aug 8 08:06:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Select_Reactor_Base.cpp: + * ace/Select_Reactor_T.cpp: + Const improvements, use bool when possible + +Tue Aug 8 07:46:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/generate_rel_manpages: + * bin/make_release: + Did a little bit of cleanup removing old things + +Tue Aug 8 07:11:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Select_Reactor_T.cpp (dump): + Removed usage of not needed operator++ on the handle set + +Mon Aug 7 08:02:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Handle_Set.{h,cpp}: + Removed operator++, it is deprecated and nothing more then a noop + +Fri Aug 4 07:57:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Asynch_IO.h: + * ace/Event_Handler.h: + * ace/Framework_Component_T.h: + * ace/Hash_Map_Manager_T.h: + * ace/IO_SAP.h: + * ace/Local_Tokens.h: + * ace/LSOCK_Connector.h: + * ace/Map_Manager.h: + * ace/Map_T.h: + * ace/WFM_Reactor.h: + Doxygen improvements + +Thu Aug 3 10:39:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Connector.h: + Improved documentation + +Wed Aug 2 22:54:24 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> + + * THANKS: Added Eric Danielou to the hall of fame. + +Wed Aug 2 21:27:59 UTC 2006 Adam Mitz <mitza@ociweb.com> + + * bin/PerlACE/Run_Test.pm: + + Added two new packaged-scoped variables, $PerlACE::ACE_ROOT and + $PerlACE::TAO_ROOT. $PerlACE::TAO_ROOT is set to the TAO_ROOT + environment variable, if one exists. If not it is set to + $ACE_ROOT/TAO. $PerlACE::ACE_ROOT is the same as the ACE_ROOT + envrionment variable so it's just there for convenience and for + symmetry. + +Wed Aug 2 20:19:04 UTC 2006 Adam Mitz <mitza@ociweb.com> + + * bin/tao_other_tests.lst: + Added new test (TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression). + +Wed Aug 2 18:16:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Connector.cpp: + Const improvements + + * ace/Caching_Utility_T.h: + * ace/config-lite.h: + * ace/Event_Handler.h: + * ace/Framework_Component.h: + * ace/Lock.h: + * ace/Lock_Adapter_T.h: + * ace/Null_Mutex.h: + * ace/Object_Manager.h: + * ace/Object_Manager_Base.h: + * ace/Proactor.cpp: + * ace/Process_Manager.h: + * ace/Semaphore.h: + * ace/Thread_Exit.h: + Doxygen improvements + +Wed Aug 2 15:50:48 UTC 2006 Simon McQueen <sm@prismtech.com> + + * bin/tao_other_tests.lst: + + Schedule bugzilla #2615 regression test. + +Wed Aug 2 14:55:45 UTC 2006 Chad Elliott <elliott_c@ociweb.com> + + * ACE-INSTALL.html: + + Updated the location of the MPC documentation. It was moved from + the MPC root directory to a docs directory. + + * bin/ChangeLogEditor/CVSFileLocator.pm: + * bin/ChangeLogEditor/ChangeLogEdit.pm: + * bin/ChangeLogEditor/ChangeLogEntry.pm: + * bin/ChangeLogEditor/FileLocator.pm: + * bin/ChangeLogEditor/SVNFileLocator.pm: + * bin/cle.pl: - Added a new project type for projects using the Transport - Current functionality. + Added better support for subversion and it now reports errors from + cvs/svn. -Tue Dec 19 20:05:42 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + * bin/MakeProjectCreator/README: + + Updated to provide information on anonymously checking out MPC + using Subversion. + + * bin/make_release: + + I added "-type gnuace" to the options where the default project + type was assumed. Eventually, MPC will not have a default project + type. + +Wed Aug 2 13:47:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * docs/ACE-development-process.html: + Document the fact that people should test on at least two + platforms and should be available for some days after they + commit a change. + +Wed Aug 2 11:16:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> * docs/Download.html: - Added link to SVN documentation. + Also put the download page from deuce.doc under svn control + so that we can update it for the svn conversion -Tue Dec 19 14:19:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> +Wed Aug 2 11:07:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - * include/makeinclude/platform_rtems.x_g++.GNU: - Set load address + * docs/bczar/bczar.html: + * docs/bczar/privileges.html: + Added documents that where on deuce.doc, the documentation + for the bczar how to create a release should really be handled + with care, so put them under svn control + +Tue Aug 1 20:23:50 UTC 2006 Adam Mitz <mitza@ociweb.com> + + * ace/config-macosx-tiger.h: + Added preliminary support for Mac OS X 10.4 on Intel CPU's. + +Tue Aug 1 20:00:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/config-vxworks6.3.h: + Enabled some features in ACE because vxworks 6.3 delivers more system + api's + +Mon Jul 31 19:23:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/OS_NS_stropts.inl (ioctl): + Check for ACE_HAS_IOCTL_INT_3_PARAM to make it easier to handle + the different VxWorks versions + + * config-vxworks5.x.h: + * config-vxworks6.2.h: + * config-vxworks6.3.h: + Added ACE_HAS_IOCTL_INT_3_PARAM + +Mon Jul 31 18:48:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * Containers_T.{h,cpp}: + * Hash_Map_Manager_T.{h,cpp}: + * Map_Manager.{h,inl}: + * Node.{h,cpp}: + Removed check for !ACE_HAS_BROKEN_NOOP_DTORS, this define is + not in any config file + + * config-unixware-7.1.0.udk.h: + Removed commented out define + + * Token_Collection.{h,cpp}: + * Token_Manager.{h,inl}: + Changed debug flag to be a bool + + * SOCK_Dgram_Bcast.h + * TP_Reactor.h + * Signal.h + * Thread.h + * Thread_Adapter.h + Documentation updates + +Mon Jul 31 14:57:08 UTC 2006 Steve Huston <shuston@riverace.com> + + * apps/Makefile.am: Removed hard-coded inclusion of gperf in the + SUBDIRS list; it's an optional piece; see also + Tue Jun 20 20:19:37 UTC 2006 Steve Huston <shuston@riverace.com> + Thanks to Robert Schwebel <robert at schwebel dot de> for this fix. + +Mon Jul 31 14:36:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * etc/*.doxygen: + Cleanup of these files + +Sat Jul 29 11:26:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/config-icc-common.h: + Added fix for Intel C++ 9.1 + +Fri Jul 28 15:32:27 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + + * ace/SSL/Makefile.am + * ace/QoS/Makefile.am + * performance-tests/Synch-Benchmarks/Base_Test/Makefile.am + * performance-tests/Synch-Benchmarks/Perf_Test/Makefile.am + * Kokyu/Makefile.am + * apps/JAWS/clients/Caching/Makefile.am + * ACEXML/apps/svcconf/Makefile.am + * ACEXML/common/Makefile.am + * ACEXML/parser/parser/Makefile.am + * ACEXML/examples/SAXPrint/Makefile.am + * websvcs/lib/Makefile.am + * examples/ASX/Event_Server/Event_Server/Makefile.am + * examples/ASX/UPIPE_Event_Server/Makefile.am + * examples/Service_Configurator/IPC-tests/server/Makefile.am + + Updated to comply with the .i->.inl changes from: + Thu Jul 27 20:30:26 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + +Fri Jul 28 12:17:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * Kokyu/DSRT_Dispatch_Item_T.inl: + * ACEXML/parser/parser/Parser.inl: + Fixed file tag + +Thu Jul 27 20:30:26 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + + * ace/SSL/SSL_SOCK_Connector.h + * ace/SSL/SSL_SOCK_Acceptor.inl + * ace/SSL/SSL_SOCK_Acceptor.cpp + * ace/SSL/SSL_SOCK_Connector.i + * ace/SSL/SSL_SOCK_Stream.h + * ace/SSL/SSL_SOCK_Stream.i + * ace/SSL/SSL_SOCK_Acceptor.h + * ace/SSL/SSL_SOCK_Acceptor.i + * ace/SSL/SSL_SOCK.cpp + * ace/SSL/SSL_SOCK.inl + * ace/SSL/SSL_SOCK.h + * ace/SSL/SSL_SOCK.i + * ace/SSL/SSL_SOCK_Connector.cpp + * ace/SSL/SSL_SOCK_Connector.inl + * ace/SSL/SSL_SOCK_Stream.cpp + * ace/SSL/SSL_SOCK_Stream.inl + * ace/QoS/SOCK_Dgram_Mcast_QoS.inl + * ace/QoS/SOCK_Dgram_Mcast_QoS.cpp + * ace/QoS/QoS_Session_Impl.cpp + * ace/QoS/QoS_Session_Impl.inl + * ace/QoS/SOCK_Dgram_Mcast_QoS.h + * ace/QoS/SOCK_Dgram_Mcast_QoS.i + * ace/QoS/QoS_Session_Impl.h + * ace/QoS/QoS_Session_Impl.i + * performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp + * performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.inl + * performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.h + * performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.i + * performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.inl + * performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.h + * performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.i + * Kokyu/Kokyu_dsrt.cpp + * Kokyu/Kokyu_dsrt.inl + * Kokyu/Kokyu.cpp + * Kokyu/Kokyu.inl + * Kokyu/Kokyu_defs.h + * Kokyu/Kokyu_defs.i + * Kokyu/Dispatcher_Impl.h + * Kokyu/Dispatcher_Impl.i + * Kokyu/Default_Dispatcher_Impl.h + * Kokyu/Default_Dispatcher_Impl.i + * Kokyu/Dispatch_Deferrer.h + * Kokyu/Dispatch_Deferrer.i + * Kokyu/DSRT_Dispatcher_Impl_T.h + * Kokyu/DSRT_Dispatcher_Impl_T.i + * Kokyu/DSRT_Dispatch_Item_T.h + * Kokyu/DSRT_Dispatch_Item_T.i + * Kokyu/Kokyu_dsrt.h + * Kokyu/Kokyu_defs.cpp + * Kokyu/Kokyu_defs.inl + * Kokyu/Kokyu_dsrt.i + * Kokyu/Kokyu.h + * Kokyu/Dispatcher_Impl.cpp + * Kokyu/Dispatcher_Impl.inl + * Kokyu/Kokyu.i + * Kokyu/Default_Dispatcher_Impl.cpp + * Kokyu/Default_Dispatcher_Impl.inl + * Kokyu/Dispatch_Deferrer.cpp + * Kokyu/Dispatch_Deferrer.inl + * Kokyu/DSRT_Dispatcher_Impl_T.cpp + * Kokyu/DSRT_Dispatcher_Impl_T.inl + * Kokyu/DSRT_Dispatch_Item_T.cpp + * Kokyu/DSRT_Dispatch_Item_T.inl + * apps/JAWS/clients/Caching/Local_Locator.inl + * apps/JAWS/clients/Caching/Local_Locator.cpp + * apps/JAWS/clients/Caching/URL_Properties.inl + * apps/JAWS/clients/Caching/URL_Properties.cpp + * apps/JAWS/clients/Caching/Local_Locator.h + * apps/JAWS/clients/Caching/Local_Locator.i + * apps/JAWS/clients/Caching/URL_Properties.h + * apps/JAWS/clients/Caching/URL_Properties.i + * apps/JAWS/clients/Caching/Locator_Request_Reply.cpp + * apps/JAWS/clients/Caching/Locator_Request_Reply.inl + * apps/JAWS/clients/Caching/Locator_Request_Reply.h + * apps/JAWS/clients/Caching/Locator_Request_Reply.i + * apps/JAWS2/HTTPU/http_response.h + * apps/JAWS2/HTTPU/http_response.i + * apps/JAWS2/HTTPU/http_base.inl + * apps/JAWS2/HTTPU/http_base.cpp + * apps/JAWS2/HTTPU/http_headers.h + * apps/JAWS2/HTTPU/http_headers.i + * apps/JAWS2/HTTPU/http_status.inl + * apps/JAWS2/HTTPU/http_status.cpp + * apps/JAWS2/HTTPU/parse_http_request.h + * apps/JAWS2/HTTPU/http_request.inl + * apps/JAWS2/HTTPU/parse_http_request.i + * apps/JAWS2/HTTPU/http_request.cpp + * apps/JAWS2/HTTPU/parse_http_response.h + * apps/JAWS2/HTTPU/http_response.cpp + * apps/JAWS2/HTTPU/parse_http_response.i + * apps/JAWS2/HTTPU/http_response.inl + * apps/JAWS2/HTTPU/http_headers.inl + * apps/JAWS2/HTTPU/http_headers.cpp + * apps/JAWS2/HTTPU/http_base.h + * apps/JAWS2/HTTPU/http_base.i + * apps/JAWS2/HTTPU/parse_http_request.inl + * apps/JAWS2/HTTPU/parse_http_request.cpp + * apps/JAWS2/HTTPU/http_status.h + * apps/JAWS2/HTTPU/parse_http_response.cpp + * apps/JAWS2/HTTPU/parse_http_response.inl + * apps/JAWS2/HTTPU/http_status.i + * apps/JAWS2/HTTPU/http_request.h + * apps/JAWS2/HTTPU/http_request.i + * ACEXML/apps/svcconf/Svcconf_Handler.cpp + * ACEXML/apps/svcconf/Svcconf_Handler.inl + * ACEXML/apps/svcconf/Svcconf_Handler.h + * ACEXML/apps/svcconf/Svcconf_Handler.i + * ACEXML/common/AttributesImpl.cpp + * ACEXML/common/LocatorImpl.cpp + * ACEXML/common/Env.cpp + * ACEXML/common/Exception.cpp + * ACEXML/common/SAXExceptions.h + * ACEXML/common/SAXExceptions.i + * ACEXML/common/AttributesImpl.h + * ACEXML/common/AttributesImpl.i + * ACEXML/common/XMLFilterImpl.cpp + * ACEXML/common/Env.h + * ACEXML/common/SAXExceptions.cpp + * ACEXML/common/Env.i + * ACEXML/common/Exception.h + * ACEXML/common/Exception.i + * ACEXML/common/AttributesImpl.inl + * ACEXML/common/LocatorImpl.inl + * ACEXML/common/Env.inl + * ACEXML/common/XMLFilterImpl.h + * ACEXML/common/XMLFilterImpl.i + * ACEXML/common/Exception.inl + * ACEXML/common/XMLFilterImpl.inl + * ACEXML/common/LocatorImpl.h + * ACEXML/common/LocatorImpl.i + * ACEXML/common/SAXExceptions.inl + * ACEXML/parser/debug_validator/Element_Tree.i + * ACEXML/parser/debug_validator/Element_Tree.cpp + * ACEXML/parser/debug_validator/Element_Tree.inl + * ACEXML/parser/debug_validator/Element_Tree.h + * ACEXML/parser/parser/Parser.h + * ACEXML/parser/parser/Parser.i + * ACEXML/parser/parser/Entity_Manager.cpp + * ACEXML/parser/parser/Entity_Manager.inl + * ACEXML/parser/parser/Entity_Manager.h + * ACEXML/parser/parser/Entity_Manager.i + * ACEXML/parser/parser/Parser.cpp + * ACEXML/parser/parser/Parser.inl + * ACEXML/examples/SAXPrint/SAXPrint_Handler.cpp + * ACEXML/examples/SAXPrint/SAXPrint_Handler.inl + * ACEXML/examples/SAXPrint/SAXPrint_Handler.h + * ACEXML/examples/SAXPrint/SAXPrint_Handler.i + * websvcs/lib/URL_Addr.h + * websvcs/lib/URL_Addr.i + * websvcs/lib/URL_Addr.cpp + * websvcs/lib/URL_Addr.inl + * examples/ASX/Event_Server/Event_Server/Options.h + * examples/ASX/Event_Server/Event_Server/Options.i + * examples/ASX/Event_Server/Event_Server/Options.inl + * examples/ASX/UPIPE_Event_Server/Options.h + * examples/ASX/UPIPE_Event_Server/Options.i + * examples/ASX/UPIPE_Event_Server/Options.inl + * examples/Service_Configurator/IPC-tests/server/Handle_Timeout.cpp + * examples/Service_Configurator/IPC-tests/server/Handle_Timeout.inl + * examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.cpp + * examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.inl + * examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.h + * examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.i + * examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.h + * examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.i + * examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.h + * examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.i + * examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.cpp + * examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.inl + * examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.h + * examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.i + * examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.h + * examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.i + * examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.h + * examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.i + * examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.h + * examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.i + * examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.inl + * examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.cpp + * examples/Service_Configurator/IPC-tests/server/Handle_Timeout.h + * examples/Service_Configurator/IPC-tests/server/Handle_Timeout.i + * examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.inl + * examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.cpp + * examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.h + * examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.i + * examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.inl + * examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.cpp + * examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.cpp + * examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.inl + * examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.cpp + * examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.inl + * examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.cpp + * examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.inl + * examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.cpp + * examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.inl + * examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.h + * examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.i + + Moved the .i file to .inl (with history), changed the includes in the + .cpp and .h files to match, removed the .i file. + +Thu Jul 27 18:43:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ACE-INSTALL.html: + Some more updates to refer to the subversion archive + +Thu Jul 27 13:57:31 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + + * docs/svn/config + + Fixed syntax errors. thanks to Adam Mitz for reporting them. + +Thu Jul 27 10:14:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + Committing some small changes I had pending to see how svn behaves now + with updates and status info on the build systems. + + * ace/Recursive_Thread_Mutex.{h,cpp}: + Changed removed_ to a bool + + * ace/Thread_Mutex.{h,cpp,inl}: + Changed removed_ to a bool and removed ACE_USES_OBSOLETE_GUARD_CLASSES + support. + +Thu Jul 27 07:37:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * etc/tao.doxygen: + * etc/tao_portableserver.doxygen: + Set ignore prefix + + * Kokyu/Dispatcher_Task.i + * Kokyu/Dispatcher_Task.inl + Renamed .i to .inl so that we can have a look how subversion stores + this in the history + + * Kokyu/Dispatcher_Task.cpp + * Kokyu/Dispatcher_Task.h + * Kokyu/Makefile.am + Updated for the change above. + +Wed Jul 26 07:25:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/sets-manager.py: + Fixed typo + +Wed Jul 26 07:25:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ACE-INSTALL.html: + * html/Stats/index.shtml: + * docs/ACE-bug-process.html: + Updated documentation to point to the new svn repository + +Tue Jul 25 21:51:07 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + + * bin/PythonACE/fuzz/max_project_len.py + * bin/PythonACE/fuzz/inline.py + + Fixed errors in these checks. + +Tue Jul 25 20:52:51 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + + * bin/PythonACE/fuzz/cpp_inline.py + + Fixed this check, it was incorrectly matching ACE_INLINES inside + defines and comments. + +Tue Jul 25 20:16:26 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + + * docs/svn/svn-prefs.reg + * docs/svn/config + + Updated to add global-ignores to mimic .cvsignore functionality. + +Tue Jul 25 19:40:54 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + + * bin/PythonACE/__init__.py + + This enables PythonACE to be loaded as a module. + + * bin/PythonACE/fuzz/check_includes.py + * bin/PythonACE/fuzz/no_conflict_markers.py + + Fixed these checks, they were incorrectly flagging errors. + + * bin/fuzz.py + + Command line fuzz client that uses the PythonACE fuzz module. + + * bin/sets-manager.py + + Corrected this file to point at DOC/Middleware instead of ACE/Middleware. + +Mon Jul 24 23:58:33 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + + * docs/svn/svn-prefs.reg + * docs/svn/config + + Updated these files to add svn:keywords to most text types. + +Mon Jul 24 23:53:53 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + + * bin/create_ace_build.pl + + Fix provided by Steve Huston to prevent this script from building + links from .svn directories. + +Mon Jul 24 19:17:37 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + + * bin/fuzz.pl + + Disabled the ID string check until the script can be fixed to ignore + .svn directories. + +Mon Jul 24 15:45:34 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + + * Subversion conversion completed at revision 73730 + +Sun Jul 23 15:44:43 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + + * Repository frozen for repository conversion + +Sun Jul 23 11:17:31 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/make_release: + Don't exclude the other mwc files for vc71/vc8, this will create then + some more workspace files which just contain a subset of the projects + +Sun Jul 23 09:25:12 UTC 2006 Olli Savia <ops@iki.fi> + + * NEWS: + Added a note about TTY_IO API change. + +Sat Jul 22 19:12:10 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + + * docs/svn/config + * docs/svn/svn-prefs.reg + + These are client side configuration files for Subversion. Currently, + the automate setting svn:eol-style and svn:executable properties on + newly added files. + +Sat Jul 22 18:28:33 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + + * bin/sets-manager.py + + First cut of a branching script for subverion. Pass --help + to get documentation. + +Fri Jul 21 13:28:31 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/MakeProjectCreator/config/taoidldefaults.mpb: + Updated because of -oS addition to tao_idl + +Fri Jul 21 13:17:31 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/OS_NS_unistd.cpp: + Const improvements and initialise pointer with 0 + +Thu Jul 20 21:44:31 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> + + * tests/Service_Config_Test.cpp: + + In testLimits (), surrounded string literals with ACE_TEXT to + fix a build error on wchar builds. + +Thu Jul 20 16:42:04 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> + + * ace/Basic_Types.h: + + Removed ACE_NTOHLL function. It was experimental, untested and + not ready for the ACE sources just yet. + + Removed "ace/os_include/netinet/os_in.h" include directive. Now + that ACE_NTOHLL has been removed it is no longer necessary. + + * ace/Numeric_Limits.h: + + Commented out "{unsigned} long long" specializations in the + ACE_LACKS_NUMERIC_LIMITS case. They're currently not used, and + we need + +Thu Jul 20 15:19:30 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * ace/Basic_Types.h: Added + + # include "ace/os_include/netinet/os_in.h" // Get ntohl() + + and added the inline keyword to ACE_NTOHLL() to fix the problems + introduced with + + Wed Jul 19 22:46:51 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> + +Thu Jul 20 15:01:32 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * ace/Configuration.cpp: Made + ACE_Configuration_ExtId::operator==() and + ACE_Configuration_ExtId::operator!=() case insensitive. Thanks + to Domingos Monteiro <d dot monteiro at netia dot net> for this + contribution. + +Thu Jul 20 09:57:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/MakeProjectCreator/config/tao_no_iiop.mpb: + New feature to disable iiop in TAO + + * bin/MakeProjectCreator/config/global.features: + Set tao_no_iiop to 0 by default + +Thu Jul 20 09:11:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/OS_NS_Thread.h: + Doxygen improvements + +Thu Jul 20 08:55:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Mutex.{h,cpp,inl}: + Made the removed_ member a bool instead of an int + +Thu Jul 20 08:37:17 UTC 2006 Olli Savia <ops@iki.fi> + + * ace/TTY_IO.cpp: + Fixed compile error on VxWorks. Thanks to Johnny for pointing + out the problem. + +Wed Jul 19 23:39:05 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + + * bin/PythonACE/fuzz/__init__.py + * bin/PythonACE/fuzz/_generic_handler.py + * bin/PythonACE/fuzz/_mailer.py + * bin/PythonACE/fuzz/_singleton.py + * bin/PythonACE/fuzz/_warning_handler.py + * bin/PythonACE/fuzz/streams_include.py + + Changes necessary to support mailing (non-fatal) Fuzz errors to + the user that attempts a commit. streams_include is an example + of a fuzz check that sends warnings instead of stopping commits. -Tue Dec 19 14:18:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> +Wed Jul 19 22:46:51 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - * ace/Object_Manager_Base.cpp (print_error_message): - Fixed invalid filename + * ace/Basic_Types.h (ACE_INT64, ACE_UINT64): -Tue Dec 19 13:16:38 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + Silence g++ "-pedantic" warnings regarding use of "long long" + type by preceding the typedef with the g++ __extension__ + keyword. - * ace/Log_Msg_NT_Event_Log.cpp (log): Changed the loop iterator to - be size_t rather than long to silence a warning about comparing - signed and unsigned values. Thanks to Johnny for reporting +Wed Jul 19 21:15:51 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> + + * NEWS: + + Updated the file with a note announcing the interface change + from "Wed Jul 19 20:11:52 UTC 2006". + +Wed Jul 19 20:11:52 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> + + * ace/ACE.h: + * ace/ACE.cpp: + + Changing ACE::debug () to use boolean instead of char. + + * ace/Acceptor.cpp: + * ace/DLL_Manager.cpp: + * ace/Dynamic_Service_Dependency.cpp: + * ace/SOCK_Dgram_Bcast.cpp: + * ace/Service_Gestalt.cpp: + * ace/Service_Object.cpp: + * ace/Service_Repository.cpp: + * ace/Service_Types.cpp: + + Updating places where ACE::debug() return value is interpreted + as a integral type. + + * tests/Service_Config_Test.cpp: + + Fixing the test to correctly account for XML-based service + configurations. + +Wed Jul 19 15:53:09 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + + * bin/PythonACE/fuzz/__init__.py + * bin/PythonACE/fuzz/_fuzz.py + * bin/PythonACE/fuzz/_generic_handler.py + * bin/PythonACE/fuzz/_path.py + * bin/PythonACE/fuzz/_types.py + * bin/PythonACE/fuzz/check_includes.py + * bin/PythonACE/fuzz/cpp_inline.py + * bin/PythonACE/fuzz/inline.py + * bin/PythonACE/fuzz/math_include.py + * bin/PythonACE/fuzz/max_filename.py + * bin/PythonACE/fuzz/max_project_len.py + * bin/PythonACE/fuzz/newline.py + * bin/PythonACE/fuzz/no_conflict_markers.py + * bin/PythonACE/fuzz/noncvs.py + * bin/PythonACE/fuzz/ptr_arith_t.py + * bin/PythonACE/fuzz/refcountservantbase.py + * bin/PythonACE/fuzz/verify_changelog.py + + This is a python module designed to eventually replace the + bin/fuzz.pl script. Each .py file in the fuzz directory that + does not have a _ at the beginning of its filename contains a + single check. New fuzz checks can be added to the system simply + by creating a new file in the fuzz directory. Care should be + taken to select a filename that does not conflict with an + existing python module. + + ptr_arith_t.py and inline.py are good examples that use the + generic handler to implement their checks, max_project_len is a + good example of a check that does not use the generic handler. + +Wed Jul 19 15:07:29 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> + + * ace/DLL_Manager.cpp: + + Fixing a build problem on HP and Windows, as a consequence of my + earlier change: "Tue Jul 18 19:17:54 UTC 2006". Moral: use + ACE_TEXT around literal expressions only. + +Wed Jul 19 13:55:39 UTC 2006 Olli Savia <ops@iki.fi> + + * examples/IPC_SAP/DEV_SAP/reader/reader.cpp: + * examples/IPC_SAP/DEV_SAP/writer/writer.cpp: + Updated to reflect changes below. + +Wed Jul 19 13:39:13 UTC 2006 Olli Savia <ops@iki.fi> + + * ace/TTY_IO.h: + Changed type of rtsenb from 'int' to 'unsigned char'. + Updated documentation to note that 'parityenb' member is + now deprecated. + + * ace/TTY_IO.cpp: + Changed constructor of Serial_Params class to assign sensible + values to class members. + +Wed Jul 19 10:47:31 UTC 2006 Steve Huston <shuston@riverace.com> + + * tests/Proactor_Timer_Test.cpp: Corrected compile warning re static. + +Wed Jul 19 08:00:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/MakeProjectCreator/config/ciao_config_handlers_base.mpb: + Use exceptions as base project + +Wed Jul 19 7:14:10 UTC 2006 Ossama Othman <ossama_othman@symantec.com> + + * ace/String_Base.h (size_type): + + Explicitly bring the ACE_String_Base_Const::size_type typedef + into the ACE_String_Base<> scope through a "using" declaration. + IBM Visual Age 6 and Sun Studio 10 have difficulty resolving the + name otherwise. + + * ace/SString.cpp: + + Replaced std::numeric_limits<>::max() call that was + inadvertently introduced with its ACE_Numeric_Limits<> + counterpart. The former is not available on VxWorks. + +Tue Jul 18 22:52:38 UTC 2006 Steve Huston <shuston@riverace.com> + + * tests/Message_Queue_Test_Ex.cpp: Rearranged the pieces left out of + single-threaded builds; should correct single-threaded builds. + +Tue Jul 18 20:50:49 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * Happy Birthday to me!! + +Tue Jul 18 19:17:54 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> + + This change is in response to bug#2602, which was reported by + Lothar Werzinger <lothar at tradescape dot biz>. It fixes a + problem with trying to use XML as the service configuration file + format. The change also includes additional comments and + in-line documentation on the new ability to use local service + repositories. + + * ace/DLL_Manager.cpp: + + Updated the debugging output of DLL_Handle::open() to be able to + see _why_ a DLL open failed. For example, the errno message is + 'not found' in a case where one tries to open library A, which + in turn depends on library B, but B is missing. This change + allows one to see the underlying cause for the error + (via DLL_Handle::error(), if ACE_DEBUG=2, or greater is + present). + + * ace/Parse_Node.h: + * ace/Parse_Node.cpp: + + Moving the ACE_Service_Type_Factory here, from + Service_Config.{h,cpp} This class is only needed when + ACE_USES_CLASSIC_SVC_CONF is 1, i.e. when ACE is using the + non-XML configuration file format. Therefore, moving it to + Parse_Node.{h,cpp} causes it to compile only if needed. + + * ace/Service_Config.h: + + Removed the static get_xml_svc_conf() method, as it already has + the required implementation in the base class. + + * ace/Service_Gestalt.h: + * ace/Service_Gestalt.cpp: + + Moved the ACE_Service_Type_Factory class to Parse_Node.{h,cpp}. + Updated the documentation with a more clear description of the + class responsibilities. Corrected minor omissions. + +Tue Jul 18 18:12:17 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * ACE-INSTALL.html: Updated the description of how to build + ACE+TAO using MPC. Thanks to Steve Totten for helping with this. -Tue Dec 19 09:11:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> +Tue Jul 18 19:04:42 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - * ace/OS_NS_unistd.inl (readdir_r): - Refactored this method to make it easier to maintain and at the - same moment fixed compile error when building ACE on VxWorks 6.4 - in kernel mode without pthread support + * ace/Numeric_Limits.h: -Mon Dec 18 22:28:48 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + Corrected short integer limit constants, i.e. "s/SHORT/SHRT/g". - * ace/Log_Msg_NT_Event_Log.cpp (log): Iterate for i < - log_record.msg_data_len() rather than i < log_record.length () - to avoid nasty overrun errors. Thanks to Paxton Mason <PMason - at wolve dot com> for reporting this. This fixes bugid 2754. + Try other known "long long" integer constants if + "{U}LLONG_{MIN,MAX}" are not available. Issue a preprocessor + error if all known cases have been exhausted. -Mon Dec 18 22:28:18 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> +Tue Jul 18 16:55:31 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - * ace/Log_Record.h: Clarify the meaning of length() in the - comments. Thanks to Paxton Mason <PMason at wolve dot com> for - motivating this. + * ace/Makefile.am (libACE_la_SOURCES, nobase_include_HEADERS): -Mon Dec 18 13:48:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + Added new Sig_{Adapter,Handler}.* source and header files. - * ACEXML/common/common.mpc: - * bin/MakeProjectCreator/configs/acexml.mpb: - Added zzip as base, this project really uses zzip +Mon Jul 17 23:18:52 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - * bin/MakeProjectCreator/configs/acedefaults.mpb: - Removed zzip and zlib as base projects. Any project that uses - zzip or zlib should derive from the correct project, but not - acedefaults. When making them a base from acedefaults any - project links with zzip/zlib even when they don't use it. + * ace/README: Documented the ACE_TIMEPROBE_ASSERTS_FIXED_SIZE macro. - This fixes bugzilla bug 2751. +Mon Jul 17 23:16:55 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> -Mon Dec 18 10:59:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + * ace/Timeprobe_T.cpp (timeprobe): Added a check to guard against + segfaults by wrapping the index around when it reaches the end + of the buffer. Thanks to Patrick Rabau <pr2345 at gmail dot + com> for this fix. - * apps/JAWS2/HTTPU/parse_url.h: - Added prefix to the members of the URL_ERROR enum, NONE is a macro - on some platforms like VxWorks +Tue Jul 18 13:21:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> -Mon Dec 18 10:04:19 UTC 2006 Olli Savia <ops@iki.fi> + * bin/tao_orb_tests.lst: + Added Bug_2595_Regression - * tests/OS_Test.cpp: - Do not execute snprintf test if ACE_LACKS_VSNPRINTF is defined. +Tue Jul 18 12:48:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> -Fri Dec 15 23:09:29 UTC 2006 Steve Huston <shuston@riverace.com> + * bin/MakeProjectCreator/config/taoidldefaults.mpb: + Fixed the rules to decide whether a .inl file should be added + or not. Thanks to Chad Elliot for noticing this incorrect + rule. - * apps/JAWS2/JAWS/Makefile.am: Removed JAWS.h; see - Thu Dec 14 21:08:19 UTC 2006 Steve Huston <shuston@riverace.com> +Tue Jul 18 09:59:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> -Fri Dec 15 15:03:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + * bin/PerlACE/ProcessVX_Win32.pm: + Increased delay factor from 2 to 3, downloading executables + seems to take longer now + +Tue Jul 18 09:54:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/PerlACE/Process_Unix.pm: + Removed chorus support + +Mon Jul 17 22:52:19 UTC 2006 Steve Huston <shuston@riverace.com> + + * ace/Proactor.cpp (schedule_timer): Record the ACE_Proactor instance + that the timer is scheduled on in the ACE_Handler; makes this + behavior analogous to that in ACE_Reactor::schedule_timer(). + + * tests/Proactor_Timer_Test.cpp: Add a test for repeating timers and + canceling a repeating timer when it's likely that an expiration for + the timer is already queued when it's canceled. + +Mon Jul 17 16:06:57 UTC 2006 Steve Huston <shuston@riverace.com> + + * tests/Unload_libACE.cpp: Alter the libACE suffix for HP-UX on + PA-RISC only. Also see: + Fri Jul 14 19:44:03 UTC 2006 john_c <johnc@ociweb.com> + +Mon Jul 17 22:11:42 UTC 2006 Chad Elliott <elliott_c@ociweb.com> + + * examples/Threads/process_semaphore.cpp: + + Added #include of ace/OS_NS_stdlib.h to get ACE_OS::atoi(). + +Mon Jul 19 11:21:56 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> + + * ace/String_Base.cpp: + * ace/String_Base.inl: + + Explicitly qualify size_type parameters with "typename" to force + some compilers (Sun Studio 10) to recognize it as a type. + +Mon Jul 17 17:49:41 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> + + * include/makeinclude/platform_hpux_aCC.GNU (SOFLAGS): + + Corrected shared library path for Itanium builds. + + * protocols/ace/HTBP/HTBP_ID_Requestor.cpp (get_HTID): + + Use new ACE_CString::size_type type to hold string + position/index value, instead of "int". Addresses "comparison + between signed and unsigned" warnings. + +Mon Jul 17 16:04:07 UTC 2006 Chad Elliott <elliott_c@ociweb.com> + + * NEWS: + + Added information about the use of atomic operations on SPARC + Solaris. + +Mon Jul 17 15:09:21 UTC 2006 Steve Huston <shuston@riverace.com> + + * ace/Refcounted_Auto_Ptr.{h inl} (null): Changed the return type + of the null() method from int to bool in order to more accurately + reflect the true/false nature of the returned value. + + * NEWS: Noted the above change. + +Mon Jul 17 15:05:05 UTC 2006 Steve Huston <shuston@riverace.com> + + * examples/System_V_IPC/SV_Message_Queues/MQ_Server.cpp: Added + include "ace/Log_Msg.h" in the "non-supported platform" case. + Fixes compile error on Windows. + +Mon Jul 17 13:03:09 UTC 2006 Chad Elliott <elliott_c@ociweb.com> + + * ace/ace_for_tao.mpc: + + Sig_Handler.cpp and Sig_Adapter.cpp are needed to link gperf. + +Mon Jul 17 12:49:34 UTC 2006 Chad Elliott <elliott_c@ociweb.com> + + * netsvcs/servers/main.cpp: + + Added a missing #include for ace/Sig_Adapter.h. + +Mon Jul 17 11:57:26 UTC 2006 Chad Elliott <elliott_c@ociweb.com> + + * ace/qt_reactor.mpb: + + Removed this file. It was no longer referenced by ace and it's + functionality was replaced by ace_qtreactor.mpc. + +Mon Jul 17 10:41:14 UTC 2006 Steve Huston <shuston@riverace.com> + + * tests/Message_Queue_Test_Ex.cpp: Removed the VxWorks-specific + section from MQ_Ex_N_Tester::receiver() - it was apparantly + pulled in from another test example and didn't need to be here. + Should resolve compile errors on VxWorks. + +Mon Jul 18 09:32:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - * include/makeinclude/platform_vxworks6.3.GNU: - * include/makeinclude/platform_vxworks6.4.GNU: - * ace/config-vxworks6.4.h: * ace/config-vxworks6.3.h: + * include/makeinclude/platform_vxworks6.3.GNU: + New files for VxWorks 6.3 + + * ace/os_include/sys/os_types.h: + * ace/os_include/os_stdio.h: * ace/OS_NS_unistd.inl: * ace/OS_NS_arpa_inet.cpp: - * ace/os_include/os_stdio.h: - * ace/os_include/sys/os_types.h: - Added support for VxWorks 6.4 + Updated for VxWorks 6.3 -Thu Dec 14 21:08:19 UTC 2006 Steve Huston <shuston@riverace.com> +Sun Jul 17 06:49:21 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - * apps/JAWS2/JAWS/jaws2.mpc: Corrected compiler defines to add - JAWS_BUILD_DLL, not replace previous. + * apps/soreduce/Library.cpp (set_path): + * apps/soreduce/Obj_Module.cpp (add_source): + * examples/Misc/test_sstring.cpp: + * examples/Web_Crawler/Command_Processor.cpp: + * examples/Web_Crawler/URL_Visitor.cpp: - * apps/JAWS2/JAWS/Export.h: Replaced contents with new content - generated from generate_export_file.pl. Previous content was - generated from GenerateExportH.BAT and was missing lots of - stuff, some of which prevented generation of .lib, .exp files. + Use new ACE_CString::size_type type to hold string + position/index value, instead of "int". Addresses "comparison + between signed and unsigned" warnings. - * apps/JAWS2/JAWS/JAWS.h: Removed; it only had JAWS_TRACE defined - which is properly defined in Export.h now. + * examples/APG/Signals/SigAction.cpp: + * examples/System_V_IPC/SV_Message_Queues/MQ_Server.cpp: + * examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp: - * apps/JAWS2/JAWS/Pipeline_Tasks.cpp: - * apps/JAWS2/JAWS/IO_Handler.cpp: - * apps/JAWS2/JAWS/IO.cpp: - * apps/JAWS2/JAWS/Concurrency.cpp: Removed #include "JAWS/JAWS.h" + Include "ace/OS_NS_stdlib.h" to pull in ACE_OS::exit() + prototype. + + * examples/APG/Signals/SigGuard.cpp: + * examples/APG/Signals/SigHandler.cpp: + * examples/APG/Signals/SigHandlers.cpp: + * examples/APG/ThreadManagement/Signals.cpp: + * examples/APG/ThreadManagement/Signals2.cpp: + * examples/ASX/CCM_App/SC_Server.cpp: + * examples/ASX/Event_Server/Event_Server/event_server.cpp: + * examples/ASX/UPIPE_Event_Server/event_server.cpp: + * examples/Connection/blocking/SPIPE-connector.h: + * examples/Connection/misc/Connection_Handler.cpp: + * examples/Connection/non_blocking/CPP-acceptor.h: + * examples/Connection/non_blocking/CPP-connector.h: + * examples/Service_Configurator/IPC-tests/server/server_test.cpp: + * netsvcs/lib/TS_Clerk_Handler.cpp: + + Include "ace/Sig_Handler.h" or "ace/Sig_Adapter.h" to pull in + ACE_Sig_Handler or ACE_Sig_Adapter class declaration, + respectively. Necessitated by "ace/Signal.h" refactoring. + +Sun Jul 16 23:14:53 UTC 2006 Ciju John <johnc@ociweb.com> + + * ace/String_Base_Const.cpp: + + Took out an extra sem-colon. It seems to make the + FC4_Versioned_Namespace build grumpy. + +Sat Jul 15 16:14:05 UTC 2006 Ciju John <johnc@ociweb.com> + + * NEWS: + + Added entry on HPUX library extension changes. + +Fri Jul 14 22:10:02 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> + + * ace/Sig_Handler.cpp: + + Removed explicit template instantiations. They snuck back in + when Signal.* was refactored. Thanks to Johnny for pointing + this out. + +Fri Jul 14 21:32:02 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> + + * ace/Numeric_Limits.h: + + "ace/ACE_Export.h" -> "ace/ACE_export.h". Darn Windows case + insensitivity. -Thu Dec 14 12:36:43 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + Removed unnecessary "ACE_Export" from ACE_Numeric_Limits primary + template. - * ace/config-qnx-neutrino.h: - Added several missing defines to build with QNX + * ace/Registry.cpp (make_name): -Thu Dec 14 11:57:43 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + Use ACE_TString::size_type, not ssize_t, to hold string position + values. Addresses signed/unsigned comparison warnings. - * include/makeinclude/platform_qnx_neutrino.GNU: - Set all tools using ?= so that we can override the name - from the platform_macros.GNU file + * ace/Shared_Memory_Pool.h: + + Include new "ace/Sig_Handler.h" header to pull in + ACE_Sig_Handler class declaration. + + * ace/String_Base.h: + + Added tips to documentation related to potentially user visible + changes. + +Fri Jul 14 21:10:11 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> + + * ace/Atomic_Op.h (ACE_Atomic_Op): + * ace/Atomic_Op.inl (ACE_Atomic_Op): + + Reverted change that made the constructor parameters for the + "long" type specialization be passed in by reference to const + instead of by value. Explicit template instantiation is no + longer performed by ACE so there is no need for the + specialization constructor parameters to match the primary + template constructor parameters. + + * ace/CDR_Base.cpp: + * ace/CDR_Stream.h: + * ace/CDR_Stream.inl: + + Const-correctness improvements. + + * ace/CDR_Base.h: + + Minor const related cosmetic changes. + + * ace/CDR_Base.inl (first_size, next_size): + + Quickly multiply by two using a bit shift. This is guaranteed + to work since the variable is an unsigned integer. + + * ace/CORBA_macros.h: + + Removed unnecessary instantiation of emulated exception + environment variable from native exception case. Reduces + footprint in code that uses the ACE emulated exception macros in + a native C++ exception configuration, and provides a slight + performance increase due to resulting tighter binaries. + + * ace/DLL_Manager.cpp (get_dll_names): + + ACE_TString::rfind() now return an ACE_TString::size_type type. + Use ACE_TString::size_type, not ssize_t, to hold the return + value of ACE_TString::rfind(). + + * ace/Dev_Poll_Reactor.cpp: + + Include new "ace/Sig_Handler.h" header to pull in + ACE_Sig_Handler class declaration. + + Added support for HP-UX devpoll headers. + + * ace/Event_Handler.cpp: + + No need to include "ace/Message_Block.h". + + * ace/MMAP_Memory_Pool.h: + * ace/Select_Reactor_T.cpp: + * ace/TP_Reactor.cpp: + * ace/WFMO_Reactor.inl: + + Include new "ace/Sig_Handler.h" header to pull in + ACE_Sig_Handler class declaration. + + * ace/Malloc_Base.h (ACE_Allocator): + + Defined a new "size_type" typedef (currently a "size_t") to + simplify potential allocator size type changes in the future. + It's introduction was motivated by the ACE string class size + type fixes described below. Analogous to the STL + std::allocator<>::size_type typedef. + + * ace/Numeric_Limits.h: + + Traits containing basic integer limits. Useful for + template-based code on platforms that lack + std::numeric_limits<>. These traits are not meant to be a + replacement for std::numeric_limits<>. Rather they are a crutch + until all ACE-supported platforms support + std::numeric_limits<>. [Bug 2451] + + * ace/OS_NS_dirent.inl: + + "__USE_POSIX" -> "_POSIX_SOURCE". The former is a C library + implementation-specific feature test macro/symbol. + + * ace/OS_NS_stdio.cpp: + * ace/OS_NS_stdio.h: + * ace/OS_NS_stdio.inl (get_win32_versioninfo): -Thu Dec 14 00:12:49 UTC 2006 Steve Huston <shuston@riverace.com> + Fixed/added missing wide character support. - * ace/OS_NS_Thread.cpp (event_init): Solaris's shm_open() requires a - single '/' on the name argument. I opted to put that logic here - rather than the lower-level ACE_OS::shm_open(), but that point - is debatable. In any case, look for a leading / on the name if - ACE_SHM_OPEN_REQUIRES_ONE_SLASH is defined; if it's not there, - add it. + * ace/OS_NS_stdlib.cpp (mkstemp_emulation): - * ace/config-sunos5.8.h: Added ACE_SHM_OPEN_REQUIRES_ONE_SLASH. + Clean up preprocessor conditional blocks by taking advantage of + new ACE_Numeric_Limits<> trait templates. - * ace/README: Add description of ACE_SHM_OPEN_REQUIRES_ONE_SLASH. + * ace/OS_NS_stdlib.inl (atop): - * configure.ac: Added check for ACE_SHM_OPEN_REQUIRES_ONE_SLASH. - Fixed check for ACE_LACKS_NUMERIC_LIMITS to display the findings - when configuring. + Address VC++ 64-bit warnings by taking advantage of standard + intptr_t type, if available. - * m4/config_h.m4: Added ACE_SHM_OPEN_REQUIRES_ONE_SLASH and - ACE_LACKS_NUMERIC_LIMITS. + * ace/OS_NS_sys_socket.inl (closesocket): -Wed Dec 13 15:04:57 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> + Do not shutdown the write end here. Doing so will break + applications that duplicate a handle on fork(), for example, and + expect to continue writing in the fork()ed process. + + * ace/OS_NS_sys_utsname.cpp (uname): + + Fixed garbage in wide string output. + + * ace/Object_Manager.cpp: + + No need to include "ace/Containers.h". + + Include newly refactored "ace/Sig_Adapter.h" instead of old + "ace/Signal.h". Removes dependency on the ACE_Reactor. Allows + service configurator-disabled subset containing + ACE_Object_Manager support to be built, e,g, MPC ace_svcconf=0 + configuration. + + * ace/Object_Manager_Base.cpp (init): + * ace/Process.cpp (pass_handle): + + Fixed Windows version info handling in wide string + configurations. + + * ace/Process_Manager.h (wait): + + Clarified that the timeout value is a relative time, not + absolute, in the documentation. + + * ace/SOCK_Acceptor.cpp (shared_open): + + Removed assertion that assumes all protocol families are + internet related. This method is invoked by some non-internet + protocol subclasses, such as ACE_LSOCK_Acceptor. + + * ace/SOCK_Stream.cpp (close): + + Reinstituted explicit close_writer() method call for the + ACE_WIN32 case since ACE_OS::close() no longer causes the writer + to be shutdown on Windows (nor should it!). + + * ace/Service_Config.cpp: + + Replaced old "ace/Signal.h" include directive with + "ace/Sig_Adapter.h". ACE_Sig_Handler support is unnecessary. + + Removed redundant "ace/Service_Config.h" include directive. + + * ace/Sig_Adapter.cpp: + * ace/Sig_Adapter.h: + * ace/Sig_Handler.cpp: + * ace/Sig_Handler.h: + * ace/Sig_Handler.inl: + * ace/Signal.cpp: + * ace/Signal.h: + * ace/Signal.inl: + + Refactored ACE_Sig_Adapter and ACE_Sig_Handler classes from + "ace/Signal.*" into their own dedicated source files. Allows + ACE_Sig_{Guard,Set} to be used without introducing a dependency + on the ACE_Reactor framework. + + * ace/String_Base_Const.cpp (npos): + * ace/String_Base_Const.h (npos): + + Introduced a new "size_type" typedef. This is consistent with + the standard C++ string class typdef/trait. + + The "no position" constant is now an unsigned integer of the + same "size" type used by the underlying ACE string allocator. + It is defined to be the maximum value the unsigned type can + handle (e.g. ACE_Numeric_Limits<size_type>::max()). This works + since a string length will always be less than or equal to + "max() - 1" since the final character in the string is the null + terminator. [Bug 2598] + + * ace/String_Base.cpp: + * ace/String_Base.h: + * ace/String_Base.inl: + * ace/SString.cpp: + * ace/SString.h: + * ace/SString.inl: + + All size parameter and return value types are now consistent + with the size type of the underlying allocator + (i.e. ACE_Allocator::size_type). Addresses inability of ACE + string classes to provide valid search index for string lengths + greater than the maximum value of ssize_t, a signed type. In + particular, the find(), rfind() and strstr() methods now return + an unsigned integer (size_t) instead of a signed one + (ssize_t). Affected classes include: + + ACE_CString + ACE_WString + ACE_TString + ACE_NS_WString + + Unless you have been explicitly using -1 instead of npos when + comparing the return value of find(), rfind() and strstr(), + and/or assigning the return value to ssize_t you should not see + any difference. A new size_type typedef has been added to the ACE + string class to aid developers. + + The ACE_String_Base<>::strstr() documentation as well as a + default rfind() argument erroneously referred to -1 instead of + npos. Those instances have been corrected. + + To summarize, a "no position" condition is denoted using the npos + constant, not -1. It can be referred directly by scoping it with + the appropriate string class (e.g. ACE_CString::npos, + ACE_WString::npos, etc). [Bug 2598] + + * ace/Task_T.h: + + Include "ace/IO_Cntl_Msg.h" to pull in ACE_IO_Cntl_Msg class + declaration. + + * ace/Time_Value.cpp (max_time): + + Cleaned up preprocessor conditional blocks by taking advantage + of ACE_Numeric_Limits trait templates. + + * ace/Timer_Queue_Adapters.cpp: + + Include "ace/Signal.h" to pull in ACE_Sig_Guard class + declaration. + + * ace/Timer_Queue_Adapters.h: + + Forward declare ACE_Sig_Set class. No need for the full blown + declaration. + + * ace/Token.cpp: + + Minor cosmetic change. + + * ace/ace_wchar.h (ACE_GetVersionEx): + + New wide string support for Windows "GetVersionEx{A,W}()" + functions. + + * ace/ace_wchar.inl: + + Improved const-correctness. + + * ace/config-aix-4.x.h: + * ace/config-macosx-panther.h: + * ace/config-macosx-tiger.h: + * ace/config-macosx.h: + + Fixed single-threaded configuration so that all multi-thread + support is disabled. + + * ace/ace.mpc: + + Added missing DLL_Manager.cpp source file, and newly refactored + Sig_{Adapter,Handler}.cpp source files. + + * ace/ace_for_tao.mpc: + + Explicitly require the ace_svcconf MPC feature. + + Added missing ACE_LACKS_ACE_TOKEN macro. The ace_for_tao subset + does not support ACE's token collections. + + * ace/svcconf.mpb: + + Do not define ACE_HAS_ACE_SVCCONF. There is no such macro in + the ACE sources. + + Explicitly remove ACE_LACKS_ACE_SVCCONF from the macro list. + + Moved "DLL_Manager.cpp" to the core ACE library source file + list. "DLL_Manager.cpp" is not an optional component, and must + always exist in ACE regardless of whether or not ACE's service + configurator support is enabled. + + * ace/token.mpb: + + Do not define ACE_HAS_ACE_TOKEN. There is no such macro in + the ACE sources. + + Explicitly remove ACE_LACKS_ACE_TOKEN from the macro list. + + * bin/MakeProjectCreator/config/ace_for_tao.mpb: + + Added missing ACE_LACKS_ACE_TOKEN macro. The ace_for_tao subset + does not support ACE's token collections. + + * tests/SString_Test.cpp: + + Corrected checks for "no position" return values to compare + against "npos" constant, not "-1". + +Fri Jul 14 20:57:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/INET_Addr.cpp: + Initialise some pointers explicitly with 0 + +Fri Jul 14 20:41:23 UTC 2006 john_c <johnc@ociweb.com> * bin/tao_orb_tests.lst: - Updated the configuration for ORB_Local_Config/Bug_2612 to - require a multithreaded build to reflect the design goals of the - test. + Add new test TAO/tests/Optimized_Connection to nightly builds. -Tue Dec 12 23:50:43 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> +Fri Jul 14 20:39:41 UTC 2006 Steve Huston <shuston@riverace.com> - * NEWS: + * ace/config-vxworks6.2.h: Reverted this change: + Fri Jul 14 10:34:43 UTC 2006 Steve Huston <shuston@riverace.com> + It appears to not work, and I can't test anything else here. + +Fri Jul 14 18:53:32 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + + * bin/MakeProjectCreator/config/global.features + * bin/MakeProjectCreator/config/stl.mpb - Document --enable-ace-reactor-notification-queue. + Added an stl feature/base project for projects that use portions + of the STL that may not be universally supported. - * m4/ace.m4: +Fri Jul 14 19:44:03 UTC 2006 john_c <johnc@ociweb.com> - Add autoconf support for --enable-ace-reactor-notification-queue. - Configuring with this option sets ACE_HAS_REACTOR_NOTIFICATION_QUEUE - in config.h. + * ace/config-hpux-11.00.h: + * include/makeinclude/platform_hpux_aCC.GNU: -Wed Dec 13 01:41:19 UTC 2006 Abdullah Sowayan <abdullah.sowayan@lmco.com> + Changing the shared library extension for hpux ia64 to ".so". On + HP-UX 11i Version 1.5 the naming scheme is lib*.sl for PA and + lib*.so on IPF. - * ace/UUID.cpp: +Fri Jul 14 19:29:59 UTC 2006 Steve Huston <shuston@riverace.com> - Fixed a potential memory leak. Dynamic memory was allocated but - not freed under special circumstances. For details, check BUGID - 2746. This closes BUGID 2746. + * ace/OS_NS_stdio.cpp (DllMain): Add extern "C" to the DllMain + signature - enables it to be located and called at startup. + Thanks to Hubert Talbot <Hubert dot Talbot at criq dot qc dot ca> + for this fix. -Tue Dec 12 22:38:06 UTC 2006 Steve Huston <shuston@riverace.com> +Fri Jul 14 19:13:06 UTC 2006 john_c <john@ociweb.com> - * apps/JAWS2/HTTPU/parse_url.h: Made the char* members const to - resolve compile warnings about assignment of char* literals. + * ace/Timer_Queue_Adapters.cpp: -Tue Dec 12 19:54:05 UTC 2006 Steve Huston <shuston@riverace.com> + Include file was missing. Fixes compile error when + ACE_HAS_DEFERRED_TIMER_COMMANDS is defined. - * apps/JAWS2/HTTPU/httpu.mpc: Must build HTTPU after JAWS2. +Fri Jul 14 19:05:15 UTC 2006 Ciju John <john_c@ociweb.com> -Tue Dec 12 19:54:04 UTC 2006 Chad Elliott <elliott_c@ociweb.com> + * bin/tao_other_tests.lst: - * bin/fuzz.pl: + Adding the TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated + test to nightly builds. - Changed the regular expression to recognize #include's of files - with double quotes within a version block. +Fri Jul 14 16:25:00 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> -Tue Dec 12 19:31:39 UTC 2006 Chad Elliott <elliott_c@ociweb.com> + * bin/tao_orb_tests.lst: + Added exclusions for Bug_2593_Regression test. - * bin/fuzz.pl: +Fri Jul 14 15:50:34 UTC 2006 Adam Mitz <mitza@ociweb.com> - Corrected a bug where a non-ACE/TAO/CIAO file included within a - version block was being marked as an error. + * bin/PerlACE/Process_Unix.pm: + * bin/PerlACE/Process_Win32.pm: -Tue Dec 12 17:01:42 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> + Added an optional parameter to Process->Kill(). If the parameter is + true then the return value from the process is ignored. - * bin/MakeProjectCreator/config/MPC.cfg: +Fri Jul 14 15:45:04 UTC 2006 Steve Huston <shuston@riverace.com> - Added $DDS_ROOT/MPC/config to the includes, since the - .mpb files in DDS have been moved to this location, making - them consistent with the location of similar files in - TAO and CIAO. + * tests/Message_Queue_Test_Ex.{h cpp}: Corrected for !ACE_HAS_THREADS. -Tue Dec 12 15:08:32 UTC 2006 Chad Elliott <elliott_c@ociweb.com> +Fri Jul 14 15:39:53 UTC 2006 Adam Mitz <mitza@ociweb.com> * bin/tao_other_tests.lst: + Added new test (TAO/orbsvcs/tests/CosEvent/Timeout/run_test.pl). - Added the Trading unit test to the list. +Fri Jul 14 10:34:43 UTC 2006 Steve Huston <shuston@riverace.com> -Tue Dec 12 13:47:44 UTC 2006 Steve Huston <shuston@riverace.com> + * ace/config-vxworks6.2.h: Added ACE_LACKS_USECONDS_T to fix a + compile error. It's in the non-__RTP__ section since that's where + ACE_LACKS_SUSECONDS_T was, but I'm not sure this is correct. - * apps/JAWS2/HTTPU/httpu.mpc: Corrected build flags and added required - link library JAWS2. +Fri Jul 14 07:26:46 UTC 2006 Olli Savia <ops@iki.fi> -Tue Dec 12 06:05:38 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> + * ace/Thread_Mutex.h: + * ace/ace_wchar.h: + * tests/SOCK_Dgram_Bcast_Test.cpp: + Fixed typos in comments. - * configure.ac: + * m4/config_h.m4: + Removed references to ACE_HAS_TERM_IOCTLS. It's no longer + used in ACE/TAO/CIAO code. - Add ACE_HAS_ISASTREAM_PROTOTYPE feature test. +Fri Jul 14 02:11:21 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> -Tue Dec 12 06:00:09 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> + * bin/tao_orb_tests.lst: + Added new test for Bug 2593 to nightly suite. + +Thu Jul 13 20:40:10 UTC 2006 Olli Savia <ops@iki.fi> + + * ace/config-integritySCA.h: + Removed references to ACE_HAS_ATTR_SETSCHED. It's no longer + used in ACE/TAO/CIAO code. + + * ace/config-rtems.h: + Removed references to ACE_HAS_SIGNAL_SAFE_OS_CALLS. It's no longer + used in ACE/TAO/CIAO code. + + * ace/config-sco-5.0.0-mit-pthread.h: + Removed references to ACE_HAS_T_OPMGMT. It's no longer + used in ACE/TAO/CIAO code. + +Thu Jul 13 10:35:39 UTC 2006 Olli Savia <ops@iki.fi> + + * ace/Base_Thread_Adapter.cpp: + * ace/Cleanup.cpp: + * ace/OS.cpp: + * ace/OS_Errno.cpp: + * ace/OS_Log_Msg_Attributes.cpp: + * ace/OS_NS_Thread.cpp: + * ace/OS_NS_arpa_inet.cpp: + * ace/OS_NS_ctype.cpp: + * ace/OS_NS_dirent.cpp: + * ace/OS_NS_dlfcn.cpp: + * ace/OS_NS_errno.cpp: + * ace/OS_NS_fcntl.cpp: + * ace/OS_NS_math.cpp: + * ace/OS_NS_netdb.cpp: + * ace/OS_NS_poll.cpp: + * ace/OS_NS_pwd.cpp: + * ace/OS_NS_regex.cpp: + * ace/OS_NS_signal.cpp: + * ace/OS_NS_stdio.cpp: + * ace/OS_NS_stdlib.cpp: + * ace/OS_NS_string.cpp: + * ace/OS_NS_strings.cpp: + * ace/OS_NS_stropts.cpp: + * ace/OS_NS_sys_mman.cpp: + * ace/OS_NS_sys_msg.cpp: + * ace/OS_NS_sys_resource.cpp: + * ace/OS_NS_sys_select.cpp: + * ace/OS_NS_sys_sendfile.cpp: + * ace/OS_NS_sys_shm.cpp: + * ace/OS_NS_sys_socket.cpp: + * ace/OS_NS_sys_stat.cpp: + * ace/OS_NS_sys_time.cpp: + * ace/OS_NS_sys_uio.cpp: + * ace/OS_NS_sys_wait.cpp: + * ace/OS_NS_time.cpp: + * ace/OS_NS_unistd.cpp: + * ace/OS_NS_wchar.cpp: + * ace/OS_TLI.cpp: + * ace/Thread_Adapter.cpp: + * ace/Thread_Control.cpp: + * apps/JAWS2/HTTPU/parse_http_request.cpp: + * apps/JAWS2/HTTPU/parse_http_response.cpp: + + Fixed typo in comment. + +Thu Jul 13 09:51:33 UTC 2006 Olli Savia <ops@iki.fi> * configure.ac: + Removed references to ACE_HAS_EXCEPTION_H. It's no longer + used in ACE/TAO/CIAO code. + +Thu Jul 13 09:48:10 UTC 2006 Olli Savia <ops@iki.fi> - Add ACE_HAS_PTHREAD_SIGMASK_PROTOTYPE feature test. + * ace/os_include/os_string.h: + * ace/os_include/os_stropts.h: + Fixed typo in comment. -Tue Dec 12 05:13:33 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> +Thu Jul 13 09:32:54 UTC 2006 Olli Savia <ops@iki.fi> + * ace/config-vxworks6.2.h: * configure.ac: + * m4/config_h.m4: + Removed references to ACE_HAS_USING_KEYWORD. It's no longer + used in ACE/TAO/CIAO code. + +Thu Jul 6 20:45:15 UTC 2006 Steve Huston <shuston@riverace.com> + + * ace/Refcounted_Auto_Ptr.{h inl}: Repaired the ACE_Refcounted_Auto_Ptr + reset() and release() methods per Bugzilla #1925. They will both now + detach from the underlying ACE_Refcounted_Auto_Ptr_Rep object; + reset() will create a new one for the new pointer specified as its + argument. Generally modified the class to not make changes to the + underlying ACE_Refcounted_Auto_Ptr_Rep (such as with reset()). This + safely allows the get() method to avoid using the lock for reading + the pointer value since there's no way to change the underlying + rep's pointer. + Also cleaned up the Doxygen stuff for these classes. + + This work resulted in removal of the following methods in + ACE_Refcounted_Auto_Ptr_Rep (not ACE_Refcounted_Auto_Ptr): + - null () + - assign () + - release () + - reset () + + This significantly improves ACE_Refcounted_Auto_Ptr. This is not + a recommendation to [not] use it over ACE_Strong_Bound_Ptr. Just + responding to user reports. It may still be possibly/adviseable to + work further on this class, though I have no specific ideas or + reports at this time. + + * tests/Refcounted_Auto_Ptr_Test.{h cpp}: Added tests for release() + and reset() per code supplied in Bugzilla #1925. Removed code in + ACE_ASSERT since it doesn't run in Release builds; replaced with + explicit checks and ACE_ERROR. + +Wed Jul 12 20:32:49 UTC 2006 Steve Huston <shuston@riverace.com> + + * tests/Message_Queue_Test_Ex.{h cpp}: Fixed compile errors on Linux. + +Wed Jul 12 19:15:58 UTC 2006 Steve Huston <shuston@riverace.com> + + * ace/Message_Queue_T.{h cpp}: Added a new class, + ACE_Message_Queue_Ex_N<class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL>, that + is similar to ACE_Message_Queue_Ex in that the object queued is a + template parameter. However, ACE_Message_Queue_Ex_N allows the + enqueueing and dequeueing of multiple chained objects at once. This + wasn't added to ACE_Message_Queue_Ex because the chained object + functionality requires the ACE_MESSAGE_TYPE class to have a + ACE_MESSAGE_TYPE *next (void) const method, analogous to + ACE_Message_Block::next(), to follow the chain and this would + probably break existing applications using ACE_Message_Queue_Ex. + + * tests/Message_Queue_Test_Ex.{h cpp}: Added test capability for + ACE_Message_Queue_Ex_N. + + * NEWS: Added description of the new class. + + Thanks to Guy Peleg <guy dot peleg at amdocs dot com> for + contributing this new class and its tests. + +Wed Jul 12 16:37:40 UTC 2006 Steve Huston <shuston@riverace.com> + + * etc/ace.doxygen: + * etc/ace_qos.doxygen: + * etc/ace_ssl.doxygen: Use the IGNORE_PREFIX directive to have Doxygen + ignore the ACE_, ACE_QoS_, ACE_SSL_ prefixes when alphabetizing + the class index. Thanks to Stefan Naewe <naewe dot s at atlas dot de> + for this idea. + + * THANKS: Added Stefan Naewe to the Hall of Fame. + +Wed Jul 12 14:30:16 UTC 2006 Steve Huston <shuston@riverace.com> - Add ACE_LACKS_MKTEMP_PROTOTYPE and ACE_LACKS_MKSTEMP_PROTOTYPE - feature tests. + * ace/config-lynxos.h: + * ace/config-netbsd.h: Changed ACE_SCANDIR_CMP_USES_VOIDPTR to + ACE_SCANDIR_CMP_USES_CONST_VOIDPTR - makes it match the decl in + ace/os_include/os_dirent.h and should resolve a compile error. - * ace/README: +Wed Jul 12 13:55:09 UTC 2006 Steve Huston <shuston@riverace.com> - Document ACE_LACKS_MKSTEMP feature test macro. + * ace/Message_Queue.inl: Move the #include out of the namespace; see + Tue Jul 11 13:38:10 UTC 2006 Steve Huston <shuston@riverace.com> -Mon Dec 11 20:51:59 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> +Wed Jul 12 10:15:12 UTC 2006 Martin Corino <mcorino@remedy.nl> - * apps/JAWS2/HTTPU/httpu.mpc: Added a new MPC file. Thanks to - Sergey for this. + * include/makeinclude/platform_openvms.GNU: + Added fixes for SSL support. - * apps/JAWS2/HTTPU/http_base.cpp (receive): Made this work with - HTTPU. Thanks to Sergey Kosenko <sergey dot kosenko at gmail - dot com> for these patches. + * ace/config-openvms.h: + Added ACE_HAS_PTHREAD_SCHEDPARAM. -Mon Dec 11 20:21:14 UTC 2006 Steve Huston <shuston@riverace.com> + * ace/Global_Macros.h: + * ace/Lib_Find.cpp: + * ace/Service_Config.cpp: + * ace/Service_Config.h: + * ace/Service_Object.cpp: + * ace/Service_Object.h: + Moved OpenVMS specific dynamic service support class to a + better place. - * ace/CDR_Stream.{h cpp} (ACE_OutputCDR): Added a new method, int - consolidate (void) which consolidates any continuation message - blocks into the start block, ensuring that all data is located - in one block on return. This is useful for situations which - require the entire encoded stream to be available in one buffer, - regardless of length. +Wed Jul 12 07:13:01 UTC 2006 Olli Savia <ops@iki.fi> - * tests/CDR_Test.cpp: Added a test for consolidate(). + * ace/FILE_Connector.cpp: + It is safe to use ACE_OS::mkstemp() on all platforms. - * NEWS: Added notice for new consolidate() method. +Wed Jul 12 02:21:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - Thanks to Howard Finer <hfiner at sonusnet dot com> for supplying - the new ACE_OutputCDR::consolidate() method. + * bin/msvc_static_order.lst: + Build ObjRefTemplate before IORInterceptor -Mon Dec 11 20:03:04 UTC 2006 Chad Elliott <elliott_c@ociweb.com> +Tue Jul 11 23:09:28 UTC 2006 Chad Elliott <elliott_c@ociweb.com> - * bin/MakeProjectCreator/templates/gnu.mpd: + * include/makeinclude/platform_hpux_aCC.GNU: - Changed the template to use the words "make macros" instead of - features. There may have be some confusion with MPC features. + The C compiler doesn't support the -mt option. So, add -mt to + CC_THR_DEFS and then later add CC_THR_DEFS to CCFLAGS. CCFLAGS + isn't used when compiling C files. -Mon Dec 11 17:39:46 UTC 2006 James H. Hill <hillj@isis.vanderbilt.edu> +Tue Jul 11 22:30:21 UTC 2006 Steve Huston <shuston@riverace.com> - * docs/ace_guidelines.vsmacros: + * ace/config-win32-common.h: + * ace/config-WinCE.h: Break the tight tie between UNICODE and + ACE_USES_WCHAR I introduced in + Thu Oct 6 17:56:19 2005 Steve Huston <shuston@riverace.com> + Now ACE_USES_WCHAR is always on for CE; non-CE Windows builds must + explicitly set ACE_USES_WCHAR independent of UNICODE. Thanks to + Russell Morra <russell_mora at symantec dot com> for explaining + the situation and submitting this fix. + +Tue Jul 11 22:20:14 UTC 2006 Steve Huston <shuston@riverace.com> + + * bin/generate_doxygen.pl: Add the ability to put the generated + HTML output in a specified location using the new -html_output + command line option. It alters the path specified for the + HTML_OUTPUT and GENERATE_TAGFILE Doxygen options. + +Tue Jul 11 22:09:56 UTC 2006 Steve Huston <shuston@riverace.com> + + * include/makeinclude/platform_linux.GNU: Added support for the + "buildbits=64" and "buildbits=32" make settings to target + 32- and 64-bit build targets, respectively. Thanks to Boris + Kaminer <boris dor kaminer at gmail dot com> for this addition. + +Tue Jul 11 22:22:04 UTC 2006 Steve Huston <shuston@riverace.com> + + * configure.ac: Change the minimum automake version to 1.9.6; this is + required to generate Makefiles that work properly on AIX. + + * m4/compiler.m4: For AIX, replace ACE_AIX_MAJOR_VERS and + ACE_AIX_MINOR_VERS compile macros with ACE_AIX_VERS as the + hand-edited platform_aix_ibm.GNU has and the code expects. + Also removed the AIX 3 and 4 code since AIX 3 and 4 are no longer + supported. Also, turned on -qtemplateregistry for xlC-type + compilers (Visual Age C++ 6 and XL C++ 7). + +Tue Jul 11 21:37:51 UTC 2006 Steve Huston <shuston@riverace.com> + + * ace/OS_NS_stdio.cpp (snprintf, sprintf): In the wchar versions, + adjust the preprocessor checks to pick up the way that Solaris + indicates the presence of XPG5 capability. Allows these functions + to work, which allows ACE_Log_Msg to work also. + + * ace/OS_NS_unistd.{h inl} (ualarm): Changed u_long arguments and + return value to useconds_t to gain portability. + + * ace/OS_NS_dirent.{h inl cpp}: Made the selector and comparator + function pointer arguments to ACE_OS::scandir() and + scandir_emulation() be extern "C" to enforce their use with a + C RTL function. This resolves warnings from Solaris and makes usage + correct across all platforms. The function types are now in + typedefs ACE_SCANDIR_SELECTOR and ACE_SCANDIR_COMPARATOR, + respectively. The typedef was used previously only for Windows/MSVC + where the calling convention change had bit someone - now it's + uniform for all. + Also, folded in the ACE_SCANDIR_CMP_USES_VOIDPTR def here to + set up the proper typing with extern "C" for when it's needed to + cast inside the ACE_OS::scandir() implementation. The interface + offered by ACE_OS::scandir() is always defined in terms of + ACE_SCANDIR_SELECTOR and ACE_SCANDIR_COMPARATOR. + + * ace/Dirent_Selector.{h cpp}: Use the extern "C"-containing typedefs + for selector/comparator functions set up for ACE_OS::scandir() in + ACE_Dirent_Selector as well since they get passed through to ACE_OS. + + * apps/soreduce/Library.cpp: + * tests/Dirent_Test.cpp: Mark selector/comparator functions that'll be + passed to ACE_OS::scandir() as extern "C" to match new param types. + + * ace/config-aix-5.x.h: Added ACE_HAS_SCANDIR since AIX has scandir(), + as well as the needed ACE_SCANDIR_SEL_LACKS_CONST and + ACE_SCANDIR_CMP_USES_VOIDPTR to adjust to it's differences from + the common way scandir() is usually defined. + + * ace/config-hpux-11.00.h: Added ACE_HAS_SCANDIR. + + * ace/config-linux-common.h: Clarify that, despite the man page, + ACE_SCANDIR_CMP_USES_CONST_VOIDPTR is needed, at least on RHEL 3 + and 4. + + * ace/README: Added descriptions for ACE_HAS_SCANDIR and + ACE_SCANDIR_CMP_USES_VOIDPTR as well as the new settings + ACE_SCANDIR_SEL_LACKS_CONST and ACE_SCANDIR_CMP_USES_CONST_VOIDPTR. + + * NEWS: Summarize the above user-visible selector/comparator changes. + +Tue Jul 11 17:39:00 UTC 2006 Olli Savia <ops@iki.fi> - Fixed macros specification so the same file can be used - with both VS.NET 2003 and VS.NET 2005 development - environments. + * ace/Basic_Types.h: + * ace/OS.h: + Removed unnecessary includes. -Mon Dec 11 15:23:08 UTC 2006 Chad Elliott <elliott_c@ociweb.com> +Tue Jul 11 17:25:06 UTC 2006 Olli Savia <ops@iki.fi> - * bin/MakeProjectCreator/config/MPC.cfg: - * bin/mpc.pl: - * bin/mwc.pl: + * include/makeinclude/platform_rtems.x_g++.GNU: + * include/makeinclude/wrapper_macros.GNU: - Removed the code that specifically added the gnuace and borland - project types and rely on the dynamic_types directive in the - MPC.cfg to have the MPC core add them. + Removed references to obsolete ACE_HAS_GNUG_PRE_2_8 make + variable. Removed egcs checks. -Sat Dec 9 19:13:52 UTC 2006 Olli Savia <ops@iki.fi> +Tue Jul 11 16:55:57 UTC 2006 Olli Savia <ops@iki.fi> - * ace/config-vxworks5.x.h: - Added ACE_LACKS_VSNPRINTF. + * ace/TTY_IO.cpp: + Enable raw mode correctly on POSIX systems. Accept "none" as + valid parity value. Thanks to hongxing <hongxing777 at gmail dot com> + for the patch. -Fri Dec 8 20:20:09 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> + * ace/TTY_IO.h: + Updated documentation to reflect changes above. - * ace/Service_Config.cpp (parse_args_i): + * ace/os_include/sys/os_resource.h: + Fixed typo in comment. - Moving the "default:" label outside the block that handles the - "case 's':". Even though it should work correctly on allmost any - compiler, things like this are bad form. Thanks to Aaron - Scamehorn <Aaron dot Scamehorn at cogcap dot com> for noticing. +Tue Jul 11 16:38:29 UTC 2006 Olli Savia <ops@iki.fi> -Fri Dec 8 20:15:40 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> + * ace/config-linux-common.h: + * ace/os_include/os_signal.h: + * ace/os_include/os_stropts.h: - * THANKS: Add Ray Lischner. + Changed ACE_HAS_ISASTREAM_PROTO to ACE_HAS_ISASTREAM_PROTOTYPE and + ACE_HAS_PTHREAD_SIGMASK_PROTO to ACE_HAS_PTHREAD_SIGMASK_PROTOTYPE + to better follow ACE naming conventions. -Fri Dec 8 16:39:51 UTC 2006 Steve Huston <shuston@riverace.com> +Tue Jul 11 13:38:10 UTC 2006 Steve Huston <shuston@riverace.com> - * ace/Null_Mutex.h: Added ACE_Export to the class declarations. - Although they are probably inlined, VS .NET 2005 (VC8) complains - in some cases when a dll-interface class inherits from a - non-dll-interface class. + * ace/Message_Queue.inl: Include "ace/Guard_T.h" in the ACE_WIN32 + section to avoid compile errors with Release builds. -Fri Dec 8 15:36:23 UTC 2006 Ciju John <johnc@ociweb.com> + * ace/TSS_T.h: Improved documentation. - * tests/run_test.lst: - Bug_2659_Regression_Test cannot run in a single threaded build. + * tests/ACE_Init_TestDlg.cpp: Added comment block at the top to explain + the file's purpose. -Fri Dec 8 05:21:38 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> + * tests/Task_Test.cpp: Added a smoke test for the new + ACE_Task::last_thread() method. - * configure.ac: +Thu Jul 6 12:48:58 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - Changed code to extract version number from ace/Version.h to be - more resilient to leading whitespace like was added by a bug in - the release script in the last beta. Thanks to Ray Lischner - <rlischner at proteus-technologies dot com> for this patch. - Also thanks to Paul Riley <paul at riley dot net> for reporting - this problem. + * ace/OS_NS_sys_socket.inl (sendto): Initialize "bytes_sent" to 0 + to avoid random values. Thanks to Winston Zhang <winston_ace at + kubao-inc dot com> for reporting this. -Thu Dec 7 14:13:43 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> +Wed Jul 5 20:32:20 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - * ace/DLL_Manager.cpp: - Made error message dependent on ACE::debug. Thanks to David Faure - <dfaure at klaralvdalens-datakonsult dot se> for reporting this. + * ace/WFMO_Reactor.cpp (open): Added some more code to prevent + memory leaks when the ACE_WFMO_Reactor is reopened. Thanks to + Sonicfly Zhou <zhoucn at txsec dot com> for this fix. -Thu Dec 7 14:09:43 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> +Tue Jul 11 12:19:23 2006 Johnny Willemsen <jwillemsen@remedy.nl> - * bin/ciao_tests.lst: - Added RTCMM test + * etc/tao.doxygen: + Added .idl to FILE_PATTERNS -Thu Dec 7 12:47:43 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> +Tue Jul 11 12:01:12 UTC 2006 Chad Elliott <elliott_c@ociweb.com> - * ace/Read_Buffer.h: - Doxygen improvements + * ace/Atomic_Op.cpp: + * ace/Atomic_Op_Sparc.h: + * ace/Atomic_Op_Sparc.c: + * include/makeinclude/platform_sunos5_sunc++.GNU: - * ace/Read_Buffer.cpp: - Initialise pointer with 0 and use prefix increment + Added a SPARC assembler implementation of functions needed for use + within the ACE_Atomic_Op specializations. The implementation will + only be used if atomic_ops_sparc is set to 1 in + platform_macros.GNU. It also requires that v8plus or higher be + used with SunCC. -Thu Dec 7 09:47:43 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + * ace/Makefile.am: + * ace/ace.mpc: - * ACE-INSTALL.html: - Improved rtems documentation + Added the new Atomic_Op_Sparc.c. - * MakeProjectCreator/config/avoids_ace_for_tao.mpb: - New base project for avoids ace_for_tao + * ace/CDR_Base.cpp: - * bin/ciao_tests.lst - * bin/tao_orb_tests.lst - * bin/tao_other_tests.lst - Disabled all tests that are disabled in a minimum_corba build also - when using CORBA/e compact and micro + In grow(), call the clone_nocopy() method on the ACE_Data_Block + with the new size. Previously, the clone_nocopy() would be called + and then directly after that, size() would be called on the cloned + data block which would re-allocate to the new size and copy the + previous contents. -Thu Dec 7 07:49:24 UTC 2006 Olli Savia <ops@iki.fi> + In the same method, we avoid constructing an ACE_Message_Block to + avoid reference count manipulating the data block's reference + count. - * ace/OS_NS_stdio.h: - * ace/OS_NS_stdio.inl: - * ace/OS_NS_stdio.cpp: + Also, in consolidate(), avoid attempting to copy data if the + destination and source are the same. [RT 8372] + + * ace/CDR_Stream.h: + * ace/CDR_Stream.cpp: + + Added a constructor that takes an ACE_Data_Block* which can be + used to avoid an allocation while constructing the + ACE_Message_Block held by the ACE_OutputCDR. [RT 8372] + + * ace/Message_Block.h: + * ace/Message_Block.cpp: + * ace/Message_Block_T.h: + * ace/Message_Block_T.cpp: + + Added a new parameter to the ACE_Data_Block::clone_nocopy() method + that allows the user copy the data block, but increase the size + all in one step. [RT 8372] + + * ace/OS_NS_string.inl: + + Added an unrolled implementation of memset, only active if + ACE_HAS_SLOW_MEMSET is defined, that supports up to 16 bytes + without calling into the memset() C function. + + * ace/config-sunos5.5.h: + + SunCC 5.x supports new(nothrow_t). So, I have enable the use of + it when exceptions are enabled. [RT 8372] + + * ace/OS_NS_Thread.h: + * ace/os_include/os_pthread.h: + + Added macro definitions required to build ACE and TAO on Solaris + without using the pthreads library. + + * include/makeinclude/platform_aix_ibm.GNU: + * include/makeinclude/platform_hpux_aCC.GNU: + * include/makeinclude/platform_irix6.x_sgic++.GNU: + + Added 64-bit options to the CFLAGS macros to deal with the newly + added C file in ACE. [RT 8372] + +Tue Jul 11 01:47:23 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/Log_Msg_Test.cpp: + initialise pointer with 0 + +Tue Jul 11 01:37:23 2006 Johnny Willemsen <jwillemsen@remedy.nl> - Implemented ACE_OS::snprintf() by using ACE_OS::vsnprintf(). - Removed duplicate code and made maintaining easier. + * ace/OS_NS_unistd.h: + Layout change + +Tue Jul 11 01:09:23 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/MakeProjectCreator/config/taoidldefaults.mpb: + If -oA has been used as idlflags, don't add the A files + +Tue Jul 11 00:50:23 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/generate_compile_stats.sh: + Updated to also handle redhat version information + +Sun Jul 09 05:53:23 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ACE version 5.5.2 released. + +Fri Jul 7 08:07:50 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ACE-INSTALL.html: Small improvements + +Thu Jul 6 19:57:50 UTC 2006 Steve Huston <shuston@riverace.com> + + * ACE-INSTALL.html: Improvements and corrections motivated by + Abdul Sowayan <abdullah dot sowayan at lmco dot com>. + +Wed Jul 5 19:15:37 UTC 2006 Steve Huston <shuston@riverace.com> + + * ACE-INSTALL.html: Cleaned up further; clarified role of DOC and + support companies and use of PROBLEM-REPORT-FORM. + + * NEWS: Noted removal of Chorus and pSOS. + +Tue Jul 4 04:10:11 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * tests/Memcpy_Test.cpp: Added a short summary of this test. + Thanks to Arvind Krishna for contributing it. + +Tue Jul 4 01:05:47 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * tests/Memcpy_Test.cpp (testit): ACE-ified this test. + +Tue Jul 4 01:03:52 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * tests/CE_fostream.cpp: + * tests/Service_Config_Test.cpp: Improved the description of these + tests. + +Mon Jul 3 14:42:45 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> + + * NEWS: Updated the NEWS file with information about using multiple + service repositories. + +Mon Jul 3 03:25:43 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * examples/APG/Svc_Config/HA_Configurable_Server_Dynamic.cpp + (ACE_TMAIN): Changed the reactor event loop to explicitly pass + in ACE_Reactor::check_reconfiguration(). Thanks to Michael Reed + <mnr102 at yahoo dot com> for reporting this. + +Mon Jul 3 03:15:14 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * examples/Service_Configurator/IPC-tests/server/server_test.cpp + (ACE_TMAIN): Changed the reactor event loop to explicitly pass + in ACE_Reactor::check_reconfiguration(). + +Fri Jun 30 13:40:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/msvc_static_order.lst: + Added CSD_Framework and CSD_ThreadPool + +Fri Jun 30 09:33:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/generate_rel_manpages: + Updated doxygen version we are using for the release + +Fri Jun 30 07:29:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/MakeProjectCreator/config/taoexe.mpb: + Added corba/e and core_minimum_corba as base projects so that + the executables that can be build with CORBA/e and minimum + corba do have set the correct flags during compilation + +Thu Jun 29 17:30:52 UTC 2006 Steve Huston <shuston@riverace.com> + + * NEWS: Added a note about the logging changes from + Tue May 16 22:23:55 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + +Thu Jun 29 10:05:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/Signal_Test.cpp: + Layout changes + +Thu Jun 29 09:13:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Containers_T.cpp: + Initialise pointer with 0 + +Thu Jun 29 08:52:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * include/makeinclude/platform_g++_common.GNU: + * include/makeinclude/platform_osf1_4.x_cxx.GNU: + * include/makeinclude/platform_sunos5_ghs.GNU: + * include/makeinclude/platform_sunos5_sunc++.GNU: + * include/makeinclude/wrapper_macros.GNU: + Removed support for explicit templates, we don't support that + anymore + +Thu Jun 29 08:34:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * docs/ACE-guidelines.html: + Document that the STL generic algorithms are safe to be used and + made some other small updates + +Wed Jun 28 10:03:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/ace_for_tao.mpc: + Added missing file because of the sendfile addition to TAO + +Wed Jun 28 09:20:08 UTC 2006 Boris Kolpackov <boris@kolpackov.net> + + * protocols/ace/RMCast/Link.cpp: + * protocols/ace/RMCast/Link.h: + * protocols/ace/RMCast/Socket.cpp: + Added explicit calls to close functions for sockets and pipes. + Thanks to finalpatch <fengli@gmail.com> for reporting this. + +Wed Jun 28 07:10:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * docs/ACE-guidelines.html: + Document that template template arguments are not possible to + be used because HP aCC 3.70 doesn't support it. + +Tue Jun 27 13:06:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Unbounded_Queue.cpp: + Explicitly initialise pointers with 0 + +Tue Jun 27 08:59:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/ace_for_tao.mpc: + Added MMAP_Memory_Pool.* because TAO uses these for sendfile + support + +Tue Jun 27 06:56:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/OS_NS_unistd.inl: + * ace/config-WinCE.h: + WinCE doesn't seem to have SetFilePointerEx, so introduced + ACE_LACKS_SETFILEPOINTEREX which we check in OS_NS_unistd.inl, + if this is set we fallback to SetFilePointer + +Tue Jun 27 06:47:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/CDR_File_Test.cpp: + Fixed 64bit conversion warning + +Tue Jun 27 06:34:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/MakeProjectCreator/config/taolib.mpb: + Added tao_versioning_idl_defaults as base + +Mon Jun 26 13:27:00 UTC 2006 Simon Massey <sma@prismtech.com> + + * NEWS: + Added PICurrent refactoring note. Moved from NEWS to TAO/NEWS + +Mon Jun 26 08:27:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/DLL_Manager.h: + Reexport ACE_DLL_Handle, the ACE_DLL_Manager returns a pointer + to this type in its interfaces. Thanks to Patrick Bennett + <Patrick dot Bennett at inin dot com> for reporting this + +Mon Jun 26 08:17:12 UTC 2006 Martin Corino <mcorino@remedy.nl> + * include/makeinclude/platform_openvms.GNU: + Some compileswitch changes. + + * ace/config-openvms.h: + Added multicast filtering setting. + +Sun Jun 25 11:54:12 UTC 2006 Martin Corino <mcorino@remedy.nl> + + * include/makeinclude/platform_openvms.GNU: + Some compileswitch changes. + +Sun Jun 25 08:36:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/msvc_mpc_auto_compile.pl: + Build gperf and TAO_IDL before tao + +Sat Jun 24 14:02:15 UTC 2006 Steve Huston <shuston@riverace.com> + + * ace/Lib_Find.cpp (open_temp_file): In the ACE_WIN32 section, + 'perm' is not used, so use ACE_UNUSED_ARG on it. + + * tests/Hash_Map_Manager_Test.cpp: Use const ACE_TCHAR with literal + string, not non-const. Resolves compile warning on some compilers. + +Fri Jun 23 21:03:37 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> + + * ace/Lib_Find.cpp (open_temp_file): + + Added FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE + for the 'perms' argument of the Windows version, which + eliminates a open_temp_file() failure in the IDL compiler + on a file that was previously opened/closed with fopen/fclose. + Thanks to Krishnakumar Balasubramanian <kitty@dre.vanderbilt.edu> + for figuring out the fix. + +Fri Jun 23 16:01:31 UTC 2006 Steve Huston <shuston@riverace.com> + + * examples/Reactor/Proactor/test_proactor.cpp (open): When calling + ACE_OS::open(), don't supply a very UNIXy-looking 0644 value for + the 'perms' argument. Let it default to something reasonable for + the platform. Using 0644 on Windows passes something Windows doesn't + like, and the test fails. Thanks very much to William Cote + <William dot Cote at hp dot com> for fixing this. + + * THANKS: Added William Cote to the Hall of Fame. + +Fri Jun 23 13:20:21 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + Reverted the change below, it triggers pidl recompilation for all pidl files + Fri Jun 23 07:36:21 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + * bin/MakeProjectCreator/config/taoidldefaults.mpb: + Added .pidl to the inputext. This should be the way how things should + run fine again in TAO but it seems somewhere ther is something missing. + +Fri Jun 23 07:36:21 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/MakeProjectCreator/config/taoidldefaults.mpb: + Added .pidl to the inputext. This should be the way how things should + run fine again in TAO but it seems somewhere ther is something missing. + +Thu Jun 22 21:05:20 UTC 2006 Krishnakumar B <kitty@dre.vanderbilt.edu> + + * ace/OS_NS_fcntl.h (ACE_DEFAULT_OPEN_PERMS): Set the value of + ACE_DEFAULT_OPEN_PERMS from ACE_DEFAULT_FILE_PERMS instead of + 0. This ensures that users of ACE_OS::open() who don't override + the default argument get a sensible default. + +Thu Jun 22 15:08:01 UTC 2006 Steve Huston <shuston@riverace.com> + + * ace/SSL/SSL_Context.{h cpp} (load_trusted_ca): Added a third + argument, bool use_env_defaults, which defaults to true. If false, + the ca_file and ca_dir arguments do not get ACE defaults applied + to them if passed as 0. This allows a user to specify a 0 file or + directory to the underlying SSL_CTX_load_verify_locations() function. + If a ca_dir is supplied, attempt to add its CA list to the + X509 names in addition to that of ca_file. + + (seed_file): If the file loads ok, check RAND_status() to see if + there's "enough" entropy. + + * ace/SSL/SSL_Context.inl: + * ace/SSL/SSL_Asynch_Stream.cpp: + * ace/SSL/SSL_SOCK_Stream.cpp: When setting up SSL_CTX, set the verify + mode as well. When creating a new socket object, let it inherit the + verify mode from the SSL context rather than making a call back to + the context to retrieve the verify mode and setting it with a + separate SSL call. + +Thu Jun 22 14:48:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/msvc_static_order.lst: + Build the portableserver earlier in the list of libs + +Thu Jun 22 05:29:48 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> + + * ace/Service_Gestalt.cpp: + + The initialize_i() method would not remove a service, which + failed to initialize, in case the ACE_NOLOGGING is defined. For + some reason the two blocks of code were switched around. Thanks + to Martin Corino <mcorino at remedy dot nl> for pointing out the + problem. + +Wed Jun 21 21:29:04 UTC 2006 Steve Huston <shuston@riverace.com> + + * ace/config-lynxos.h: Added ACE_LACKS_STRPTIME. This should fix a + compile error on LynxOS. + +Wed Jun 21 15:45:32 UTC 2006 Steve Huston <shuston@riverace.com> + + * tests/Hash_Map_Manager_Test.cpp: Fix incorrect concatenating of + text literals. + +Wed Jun 21 07:10:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * examples/Misc/test_trace.cpp: + Fixed fuzz error + +Tue Jun 20 23:20:17 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * tests/Framework_Component_DLL.cpp: Added a description of this test. + +Tue Jun 20 22:34:43 UTC 2006 Steve Huston <shuston@riverace.com> + + * tests/Service_Config_DLL.cpp: Added a comment block at the top + to describe this file's purpose. + +Tue Jun 20 22:09:54 UTC 2006 Steve Huston <shuston@riverace.com> + + * ace/OS_NS_time.cpp (strptime): Added a const_cast<char*> wherever + a return of something based on the const char *buf was done; related + to: + Tue Jun 20 20:19:37 UTC 2006 Steve Huston <shuston@riverace.com> + + * NEWS: Noted that the signature of ACE_OS::strptime() changed, also + related to the entry above. + +Tue Jun 20 20:19:37 UTC 2006 Steve Huston <shuston@riverace.com> + + * configure.ac: * ace/README: + * ace/OS_NS_time.h: + * ace/OS_NS_time.inl: + * ace/OS_NS_time.cpp: + * m4/config_h.m4: The ACE_OS::strptime() wrapper was previously not + compiled in unless ACE_HAS_STRPTIME was set. If this was set and + ACE_LACKS_NATIVE_STRPTIME was also set, an emulation was supplied. + This has been changed so that: + - ACE_OS::strptime() is always supplied. + - The emulation is used if ACE_LACKS_STRPTIME is set. + - The first arg to ACE_OS::strptime() is now "const char *" + instead of "char *" as the native strptime() is. + - ACE_OS::strptime() is inlineable. + ACE_HAS_STRPTIME is no longer used, and ACE_LACKS_NATIVE_STRPTIME + is changed to ACE_LACKS_STRPTIME. If ACE_LACKS_STRPTIME is set + and the user decides not to include the emulation, then + ACE_REFUSE_STRPTIME_EMULATION should be set, which will cause + ACE_NOTSUP_RETURN to be used instead of the emulation. + + * ace/config-borland-common.h: + * ace/config-vxworks5.x.h: + * ace/config-vxworks6.2.h: + * ace/config-win32-dmc.h: + * ace/config-win32-ghs.h: + * ace/config-win32-mingw.h: + * ace/config-win32-msvc-7.h: + * ace/config-win32-msvc-8.h: + * ace/config-win32-visualage.h: Removed ACE_HAS_STRPTIME; changed + ACE_LACKS_NATIVE_STRPTIME to ACE_LACKS_STRPTIME. + * ace/config-cygwin32.h: - * ace/config-freebsd.h: - * ace/config-hpux-11.00.h: + * ace/config-doxygen.h: * ace/config-irix6.x-common.h: * ace/config-linux-common.h: - * ace/config-lynxos.h: - * ace/config-macosx-panther.h: - * ace/config-macosx-tiger.h: - * ace/config-macosx.h: * ace/config-netbsd.h: - * ace/config-openbsd.h: * ace/config-openvms.h: - * ace/config-posix.h: - * ace/config-qnx-rtp-62x.h: - * ace/config-sunos5.7.h: - * ace/config-tru64.h: - * ace/config-vxworks6.2.h: - * ace/config-vxworks6.3.h: - * ace/config-win32-common.h: - * ace/config-win32-interix.h: + * ace/config-sunos5.5.h: + * ace/config-tandem-nsk-mips-v3.h: Removed ACE_HAS_STRPTIME. - Removed ACE_HAS_SNPRINTF and added ACE_LACKS_VSNPRINTF - if necessary (I probably missed some platforms, need to recheck - after next scoreboard round). + * ace/config-rtems.h: Changed ACE_LACKS_NATIVE_STRPTIME to + ACE_LACKS_STRPTIME. + NOTE!! RTEMS users should add #define ACE_REFUSE_STRPTIME_EMULATION + to the local config.h file to avoid bringing in the emulation, + maintaining behavior in previous ACE versions. -Thu Dec 7 00:27:58 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> + For additional background on why this arrangement was put in place + originally, please see: + Tue Aug 10 14:46:12 1999 David L. Levine <levine@cs.wustl.edu> + It makes sense, but adds a unique requirement for porting to new + platforms that one must know to explicitly enable an existing wrapper, + even if its natively available. This has tripped up a number of porting + efforts (including mine) and now it's consistent with other wrappers. - * m4/config_h.m4: - * configure.ac: + * m4/ace.m4: Add --enable-wince to set up the BUILD_WINCE setting + that's inserted into the Makefile.am files for the wince MPC setting. - Remove obsolete ACE_HAS_UNION_WAIT feature test. + * ace/ace.mpc: Replace config-win32-msvc-6.h with config-win32-msvc-8.h -Wed Dec 6 21:06:37 UTC 2006 Ciju John <johnc@ociweb.com> + * bin/bin/mpc: Removed the verbatim for automake that adds + TESTS=auto_run_tests.pl - it was an early attempt at getting the + test ability to work that never was right. - * tests/Bug_2659_Regression_Test.cpp: - Compile failure on RTEMS due to non-ANSI signal API on the - platform. Fixed by casting function ptr to proper type. + * */Makefile.am: Regenerated with MPC. This effectively changes the + version scheme based on the changes in: + Thu May 18 16:37:46 UTC 2006 Steve Huston <shuston@riverace.com> -Wed Dec 6 14:49:44 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> + * apps/Makefile.am: Hand-added code to avoid building gperf if + --disable-gperf was specified to configure. Thanks to Robert Schwebel + <robert at schwebel dot de> for this fix. - * m4/config_h.m4: - * configure.ac: + * apps/gperf/tests/Makefile.am: This one doesn't get close to being + regenerated with MPC. The "stamp" items require hand-tweaking as + given in previous entries for this file. - Remove obsolete ACE_LACKS_CMSG_DATA_MACRO and - ACE_LACKS_CMSG_DATA_MEMBER feature test. + * ace/Makefile.am: Regenerated with MPC and hand-tweaked to add needed + "nobase_include_HEADERS =" line. -Wed Dec 6 11:07:43 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + * configure.ac: Added the following new AC_CONFIG_FILES entries: - * ace/config-mit-pthread.h: - * ace/config-sco-5.0.0-mit-pthread.h: - Removed MIT pthread config files, not supported for years - anymore + * ACEXML/tests/util/Makefile.am: + * apps/JAWS2/Makefile.am: + * apps/JAWS2/JAWS/Makefile.am: + * examples/ASX/Event_Server/Makefile.am: + * examples/ASX/Event_Server/Event_Server/Makefile.am: + * examples/ASX/Event_Server/Transceiver/Makefile.am: + * examples/ASX/UPIPE_Event_Server/Makefile.am: + * examples/Map_Manager/Makefile.am: + * examples/Reactor/TP_Reactor/Makefile.am: + * protocols/tests/Makefile.am: + * protocols/tests/RMCast/Makefile.am: New files, generated with MPC. + + * THANKS: Added Robert Schwebel to the Hall of Fame. + +Tue Jun 20 19:25:20 UTC 2006 Steve Huston <shuston@riverace.com> + + * ace/Task.{h inl cpp}: Moved the public data members (thr_count_, + thr_mgr_, flags_, grp_id_, lock_) from public to a new protected + section. There was a comment that said these should be private, but + no reason given why they weren't. + Removed the thr_count_dec() method since it is no longer used + anywhere in ACE. Moved its functionality into cleanup() where it + also sets the new last_thread_id_ member (see below). + Added a new member last_thread_id_ which holds the thread ID + (ACE_thread_t) of the last thread to exit svc() processing. Before + any threads exit, the value is 0; it's set to 0 in the constructor + and in activate(). + The new accessor, ACE_thread_t last_thread (void) const, retrieves + the value of last_thread_id_. It's recommended that a thread in + close() check the last_thread_id_ value, rather than the thr_count(), + when deciding if it's safe to destroy the object. Since thr_count + can be seen as 0 in multiple threads concurrently, it's not safe + to rely on for destroying a thread. This fixes Bugzilla #2339. + Thanks to Howard Finer <hfiner@sonusnet.com> for this idea. + + * NEWS: Added a note about the new ACE_Task::last_thread() method. + +Tue Jun 20 18:55:12 UTC 2006 Martin Corino <mcorino@remedy.nl> + + * tests/Based_Pointer_Test.cpp: + * tests/Based_Pointer_Test_Lib.cpp: + * tests/CDR_File_Test.cpp: + * tests/DLL_Test.cpp: + * tests/Malloc_Test.cpp: + * tests/Process_Manager_Test.cpp: + Several fixes to make OpenVMS happy. - * ace/config-mklinux.h: - Removed, this linux version hasn't been maintained for years +Tue Jun 20 18:04:45 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - * ace/ACE.cpp: - Removed all mit-pthread specific code + * examples/Log_Msg/test_ostream.cpp (ACE_TMAIN): Couldn't used + std::getline() for some odd reason.. Fixed by using + ifstream::getline() instead. Thanks to Johnny for reporting + this. - * configure.ac: - Removed mit-pthread checks +Tue Jun 20 14:31:05 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - * ace/WFMO_Reactor.cpp: - Const/bool change + * examples/Misc/test_trace.cpp (recursive): Simplified the + ACE_TRACE method name to make fuzz happy. -Wed Dec 6 07:57:43 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> +Tue Jun 20 13:50:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - * bin/ciao_tests.lst: - * bin/tao_orb_tests.lst: - * bin/tao_other_tests.lst: - Disabled all tests that are disabled in a minimum_corba build also - when using CORBA/e compact and micro + * tests/Hash_Map_Manager_Test.cpp: + Fixed unicode compile problems -Tue Dec 5 23:53:34 UTC 2006 Ciju John <johnc@ociweb.com> +Tue Jun 20 12:51:19 UTC 2006 James H. Hill <hillj@isis.vanderbilt.edu> + + * bin/ChangeLogEditor/FileLocatorFactory.pm: + + Now supports the standard hack for subversion on Windows when + SVN_ASP_DOT_NET_HACK environment variable is set. Instead + of placing repo info in a .svn file, it is placed in _svn. + +Tue Jun 20 12:31:12 UTC 2006 Martin Corino <mcorino@remedy.nl> + + * ace/os_include/os_time.h: + * ace/os_include/sys/os_types.h: + Fixed type definitions for OpenVMS. + + * ace/config-openvms.h: + Updated build configuration for OpenVMS. + + * ace/Lib_Find{.h .cpp}: + * ace/DLL_Manager.cpp: + * ace/Service_Config{.h .cpp}: + * ace/Global_Macros.h: + * ace/Strategies_T.cpp: + * ace/Logging_Strategy.cpp: + Added support for dynamic loading scheme of service configurator + framework under OpenVMS. + + * ace/OS_NS_stdio.h: + Additional include for OpenVMS. + +Tue Jun 20 08:23:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/MakeProjectCreator/config/taolib.mpb: + Add corba subset projects as base + + * bin/MakeProjectCreator/config/core_minimum_corba.mpb: + New file for usage within the core libs + + * bin/MakeProjectCreator/config/core_minimum_corba.mpb: + Make minimum corba a feature + +Tue Jun 20 07:42:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * examples/Log_Msg/test_callback.cpp: + Fixed typo + +Tue Jun 20 07:04:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/MakeProjectCreator/config/global.features: + CORBA subset configurations are disabled by default + +Mon Jun 19 18:03:12 UTC 2006 Martin Corino <mcorino@remedy.nl> + + * include/makeinclude/platform_openvms.GNU: + Changed template instantiation model. + + * include/makeinclude/rules.local.GNU: + Change to enable adding custom REALCLEAN_FILES in platform file. + +Mon Jun 19 15:11:12 UTC 2006 Martin Corino <mcorino@remedy.nl> + + * bin/auto_run_tests.pl: + Changed to enable spawning Perl testscripts on OpenVMS. + +Mon Jun 19 14:26:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ACE-INSTALL.html: + Replaced dsp/dsw with sln/vcproj. Thanks to Abdullah Sowayan + <abdullah dot sowayan at lmco dot com> for reporting this + +Mon Jun 19 13:14:54 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * tests/Hash_Map_Manager_Test.cpp (test_two_allocators): Fixed a typo. + Thanks to Abdul for reporting this. + + * tests/Hash_Map_Manager_Test.cpp (test_two_allocators): Added a + test for the two allocator version of ACE_Hash_Map_Manager. + Thanks to Jarek for contributing this. + +Mon Jun 19 02:55:48 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * examples/Log_Msg/test_ostream.cpp (ACE_TMAIN): Enhanced the test to + show the ofstream output better. + +Mon Jun 19 01:31:46 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * examples/Log_Msg/test_callback.cpp (ACE_TMAIN): Zapped the + extraneous '\n' from the messages. + +Mon Jun 19 01:06:49 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * examples/Misc/test_trace.cpp: Enhanced to the the ACE_TRACE macro. + +Sun Jun 18 16:58:20 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * netsvcs/clients/Logger/indirect_logging.cpp (ACE_TMAIN): Cleaned + up the test to work if none of the daemons are running. + +Sun Jun 18 16:44:14 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * ace/Signal.{inl,cpp}: Moved the destructors out of the *.inl + file into the *.cpp file since inline destructors aren't really + a good idea. + +Sun Jun 18 16:35:13 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * netsvcs/lib/Client_Logging_Handler.cpp (send): Printout the type + of log message as a diagnostic to make it easier to see the + filtering that's going on! + +Fri Jun 16 17:48:18 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * ace/CDR_Size.cpp (adjust): Added a fix for the case where + ACE_LACKS_CDR_ALIGNMENT is undefined. Thanks to Aleksandar + Vukajlovic <vukajlo at finsoft dot co dot yu> for contributing + this. + +Fri Jun 16 13:57:53 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * ace/Ping_Socket.cpp: Replaced the use of char, short, int, + etc. for struct ip and icmp with the equivalent + ACE_UNIT[8,12,32] types to ensure a fixed size. Thanks to Paul + Daugherty <Paul at nextalk dot com> and Robert S. Iakobashvili + <coroberti at gmail dot com> for reporting this and contributing + a fix. + +Mon Jun 19 11:37:17 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/OS_NS_unistd.{h,cpp,inl}: + Changed the (f)truncate method to use ACE_LOFF_T and use + SetFilePointerEx on windows to fix 64bit warnings + +Mon Jun 19 10:08:17 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/diff-builds.pl: + Changed this script not to die when we can't find results for + a certain date, then just take the closest results. + +Mon Jun 19 10:00:17 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Service_Gestalt.cpp: + * ace/Acceptor.cpp: + Const improvement + +Mon Jun 19 09:56:17 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> + + * ace/OS_NS_sys_sendfile.cpp (sendfile_emulation): + + Verify the ACE_OS::mmap() call succeeded prior to continuing. + + Use ACE_OS::send() instead of ACE_OS::write() on Windows. The + latter doesn't provide the same semantics on Windows as on + Unix. Addresses an ACE_OS::sendfile() failure on Windows. + +Tue Jun 13 02:10:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/run_tests.lst: + Don't run netlink test in ACE_FOR_TAO configuration + +Mon Jun 12 17:00:02 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> + + * include/makeinclude/wrapper_macros.GNU: + + Set winnt to 0 if not explicitly set by a platform_*.GNU + makefile. + +Mon Jun 12 16:48:19 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * tests/SV_Shared_Memory_Test.cpp (run_main): Moved a couple of + calls outside of ACE_ASSERT since they don't belong in there. + +Mon Jun 12 14:34:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/OS_NS_sys_stat.h: + Fixed mingw definition of ACE_stat + +Mon Jun 12 10:24:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/MakeProjectCreator/config/vc6.features: + Removed this file, wer don't support vc6 anymore + +Mon Jun 12 01:30:03 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * ace/Thread_Manager.cpp (wait): Changed the flag parameters to be + bool rathet than int. Thanks to Johnny for this suggestion. + +Sat Jun 10 22:32:03 UTC 2006 Steve Huston <shuston@riverace.com> + + * ACE-INSTALL.html: Corrected a bunch of platform build things and + hopefully clarified the sections a bit. + + * bin/make_release: Removed the search for, and chmod for, dsp/dsw + files - they're for MSVC6 which is no longer generated. + +Sat Jun 10 10:07:32 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> + + * ace/Thread_Manager.cpp: + Fix for compiler errors. + +Sat Jun 10 04:31:54 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> + + * bin/MakeProjectCreator/config/automake.features: + + Define MPC feature variable "wxWindows" to 1. + + * bin/MakeProjectCreator/config/wxwindows.mpb: + + Add automake specific definitions for compile_flags, + linkflags, and pure_libs. + +Fri Jun 9 19:25:19 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * ace/Thread_Manager.h: Added a new parameter to wait() that + determines whether relative or absolute time is used. Thanks to + Sonicfly Zhou <zhoucn at txsec dot com> for this idea. + +Fri Jun 9 14:06:52 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * ace/Hash_Map_With_Allocator_T.{h,inl,cpp}: Enhanced this class + so that it compiles with the new "two allocator" + ACE_Hash_Map_Manager_Ex class. This class needs to be improved + so that it actually leverages the two allocator features, but + that's something for the future. + +Fri Jun 9 13:15:38 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * ace/Hash_Map_Manager_T.h: Clarified the meaning of the + constructor and open() parameters. + +Fri Jun 9 13:07:40 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * ace/Hash_Map_Manager_T.cpp (open): If the user doesn't supply an + entry_alloc pointer then use the table_alloc pointer. + +Fri Jun 9 13:00:22 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * ace/Hash_Map_Manager_T.cpp (open): Zapped the use of ACE_ASSERT + and replaced it with and if statement. We shouldn't be using + ACE_ASSERT in ACE library code.. + +Fri Jun 9 12:53:48 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * ace/Hash_Map_Manager_T.{h,inl,cpp}: Added support for a separate + allocator for creating the entries in the chain of + ACE_Hash_Map_Entry objects in the buckets. There are now two + allocators, one for the bucket table and the other for the + entries in the buckets. Thanks to Jaroslaw Nozderko <jaroslaw + dot nozderko at polkomtel dot com dot pl> for this fix. + +Fri Jun 9 14:04:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/ace_for_tao.mpc: + Updated because ARGV and Arg_Shifter are template files now + +Fri Jun 9 13:58:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/FILE_IO.cpp: + Const improvements + + * ace/MMAP_Memory_Pool.cpp: + Added static cast from ACE_LOFF_T to size_t and const improvements + +Fri Jun 9 13:58:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/FILE_IO.cpp: + Added static cast from ACE_LOFF_T to size_t + +Fri Jun 9 13:42:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/OS_NS_sys_stat.inl: + Use special stat call for vc71 + +Fri Jun 9 13:33:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Connection_Recycling_Strategy.h: + Doxygen improvement + +Fri Jun 9 13:12:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/OS_NS_unistd.{h,cpp}: + Use ACE_LOFF_T in the pwrite interface + +Fri Jun 9 12:47:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/OS_NS_sys_stat.h: + With vc71 use _stati64 for ACE_stat, not __stat64. The first has + time as 32bit, the second time as 64 bit (__time64_t) which causes + problems because the time interfaces of ACE use time_t which is + 32bit with vc71 but 64bit with vc8. + +Fri Jun 9 10:29:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Configuration_Import_Export.cpp: + Initialise pointer with 0 + +Fri Jun 9 10:13:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Arg_Shifter.{h,cpp}: + Also refactored ACE_Arg_Shifter to ACE_Arg_Shifter<CHAR_TYPE> and + made ACE_Arg_Shifter a typedef. The refactoring fo ACE_ARGV resulted + in a drop of the TAO Hello client executable of about 2.5Kb which is + nice for such a small change. + + * ace/ace.mpc: + * ace/Makefile.am: + Updated because Arg_Shifter.cpp is not a template file + +Fri Jun 9 09:54:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/config-linux-common.h: + Added ACE_HAS_NETLINK, all linux versions do support netlink sockets. + This closes bugzilla bug 2317. Thanks to Robert Iakobashvili + <coroberti at gmail dot com> and Razi Ben-Yehuda + <raziebe at gmail dot com> for creating the netlink wrappers + +Fri Jun 9 08:16:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/SOCK_Netlink_Test.cpp: + New test for netlink sockets. Thanks to Robert Iakobashvili + <coroberti at gmail dot com> for creating this test. - * tests/Bug_2659_Regression_Test.cpp: - * tests/run_test.lst: * tests/tests.mpc: - Adding regression test for Bug 2659. + * tests/run_test.lst: + Added new netlink test -Tue Dec 5 19:44:43 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> +Fri Jun 9 07:55:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - * ace/config-freebsd.h: - Simplified ACE_HAS_SNPRINTF setting + * ace/ARGV.{h,cpp,inl}: - * ace/config-irix6.x-common.h: - * ace/config-sco-5.0.0-mit-pthread.h: - * ace/config-tru64.h: - Removed commented out defines, makes it easier to search whether - a macro is defined in any config file or not + Refactored ACE_ARGV to ACE_ARGV_T which is a template, where + ACE_ARGV is now a typedef of ACE_ARGV_T<ACE_TCHAR>. Taken the + idea from the wchar work of David Giovannini <giovannd at ociweb + dot com> - * ace/config-tru64.h: - Use config-posix.h + * ace/ace.mpc: + * ace/Makefile.am: - * ace/Read_Buffer.{h,cpp}: - Changed close_on_delete to a real bool + ARGV.cpp added to the template files, added the new netlink files + + * ace/OS_NS_sys_stat.{h,inl}: + * ace/MMAP_Memory_Pool{h,cpp}: + * ace/Mem_Map.{h,cpp,inl}: + * ace/Filecache.{h,cpp}: + * ace/FILE_IO.cpp: + * ace/FILE.h: + + Use ACE_LOFF_T for the filesize so that we can support files + bigger then 2Gb on windows and other platforms. Also use for + Borland the 64bit stat structure and api's. This fixes bugzilla + bug 1286, thanks to Ruslan Zasukhin <sunshine at public dot + kherson dot ua> for reporting this. Also fixes part of bugzilla + bug 2359, thanks to Olivier Brunet <o dot brunet at free dot fr> + for reporting this. - * ace/Service_Config.{h,inl}: - * ace/Service_Gestalt.{h,cpp,inl}: - Use bool for the ignore arguments +Thu Jun 8 17:13:42 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - * ace/SOCK_Dgram.inl: - Const change + * ace/String_Base.h, + ace/Array_Map.h: Removed the @deprecated + comments to make Ossama happy ;-) This fixes bugid 2558. -Tue Dec 5 15:47:43 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> +Thu Jun 8 12:44:46 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - * include/makeinclude/makeinclude/platform_osf1_3.2_cxx.GNU: - * include/makeinclude/makeinclude/platform_osf1_4.x_cxx.GNU: - * include/makeinclude/makeinclude/platform_osf1_4.x_g++.GNU: - * include/makeinclude/makeinclude/platform_osf1_4.x_rcc.GNU: - Removed, very old + * ace/OS_NS_Thread.inl (recursive_mutex_lock): Cleaned up the + structure of the code here so that we don't try to release the + nesting lock unless it was acquired successfully. Thanks to + J.T. for reporting this. - * include/makeinclude/makeinclude/platform_tru64_cxx.GNU: - * include/makeinclude/makeinclude/platform_tru64_g++.GNU: - We should be able to build on tru64 but it isn't really maintained, - moved the contents of the osf files into these files +Thu Jun 8 12:37:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> -Tue Dec 5 15:22:43 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + * bin/MakeProjectCreator/config/corba_e_compact.mpb: + * bin/MakeProjectCreator/config/corba_e_micro.mpb: + New base projects for CORBA/e micro and compact - * include/makeinclude/makeinclude/platform_aix4_cset++.GNU: - * include/makeinclude/makeinclude/platform_aix.GNU: - Moved contents of cset++ method into the aix one, the aix - file just included the first one +Thu Jun 8 12:28:49 UTC 2006 Chad Elliott <elliott_c@ociweb.com> - * include/makeinclude/makeinclude/platform_aix4.2.GNU: - Removed, old + * bin/DependencyGenerator/DependencyEditor.pm: + * bin/DependencyGenerator/DependencyGenerator.pm: + * bin/DependencyGenerator/GNUDependencyWriter.pm: + * bin/DependencyGenerator/GNUObjectGenerator.pm: + * bin/DependencyGenerator/Preprocessor.pm: + * bin/depgen.pl: - * ace/config-aix-4.x.h: - * ace/config-aix-5.x.h: - Moved contents of 4.x.h file into the 5.x.h file. Removed a lot - of old checks for AIX 4 so that we can maintain things easier. + Committing performance improvements which take off about 7% from + the dependency generation time for the whole ACE_wrappers tree. - * ace/ACE.cpp: - * ace/OS_NS_sys_wait.inl: - Removed ACE_HAS_UNION_WAIT, was only set for aix4 +Thu Jun 8 11:57:58 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - * ace/Log_Msg.cpp: - * ace/OS_NS_Thread.cpp: - Removed code for AIX 4.x to handle pthread_t + * ace/OS_NS_dirent.cpp: + * ace/OS_NS_dirent.h: + + Don't compile the {opendir,readir,closedir,scandir}_emulation() + functions if {opendir,readir,closedir,scandir} are provided by + the OS. + +Thu Jun 8 11:29:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Netlink_Addr.h: + * ace/SOCK_SEQPACK_Association.h: + Doxygen fixes + + * ace/OS_NS_Thread.inl: + Const improvement + +Thu Jun 8 11:37:59 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> + + * ace/config-netbsd.h: + + Define ACE_HAS_SCANDIR and ACE_SCANDIR_CMP_VOIDPTR. + +Wed Jun 7 23:02:53 UTC 2006 Krishnakumar B <kitty@nospam.invalid.domain> + + * tests/Recursive_Mutex_Test.cpp: Use ACE_TEST_MUTEX instead of + ACE_Recursive_Thread_Mutex so that we use the right version of + mutex (ACE_Process_Mutex) on Windows. Thanks to Doug for the + suggestion. This should fix the Recursive_Mutex_Test failing on + Windows. + +Wed Jun 7 21:42:36 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + + * bin/MakeProjectCreator/config/ciao_config_handlers.mpb + + Fixed static library ordering problem. + +Wed Jun 7 13:34:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/config-doxygen.h: + Added ACE_HAS_NETLINK so that we get documentation for the new + netlink classes + +Wed Jun 7 13:31:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/run_test.lst: + Removed chorus + +Wed Jun 7 13:16:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> * ace/os_include/sys/os_socket.h: - Removed ACE_HAS_AIX_BROKEN_SOCKET_HEADER, was only set for aix 4 + When ACE_HAS_NETLINK is defined, include more files specific + for this protocol. + +Wed Jun 7 12:56:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Netlink_Addr.{h,cpp,inl}: + * ace/SOCK_Netlink.{h,cpp,inl}: + New files for netlink sockets. Thanks to Robert Iakobashvili + <coroberti at gmail dot com> and Razi Ben-Yehuda + <raziebe at gmail dot com> for creating these new files. + These files will be added to the ACE mpc later this week, with + the files in the repo it is much easier to test them on + multiple linux version. See bugzilla bug 2317 for more info. + +Wed Jun 7 12:28:18 UTC 2006 Chad Elliott <elliott_c@ociweb.com> + + * bin/MakeProjectCreator/templates/gnu.mpd: + + Changed the message displayed when a project isn't build when a + particular feature is disabled. Many users thought that this + message was an error, I believe, because of the word 'missing'. + +Wed Jun 7 11:46:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/config-suncc-common.h: + New config file for the SunCC compiler, idea is to refactor + all things related to the Sun C++ compiler to this file. This is + to make it easier to support Sun C++ on Linux + +Wed Jun 7 10:45:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * include/makeinclude/platform_linux_suncc.GNU: + First version for using the Sun compiler on Linux. The compiler + itself is an alpha version, so no guarantees at this moment -Tue Dec 5 15:08:43 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> +Wed Jun 7 10:07:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - * ace/config-aix-4.1.x.h: - * ace/config-aix-4.2.x.h: - * ace/config-aix-4.3.x.h: - Removed, these AIX versions aren't supported anymore + * ace/Strategies_T.cpp: + Initialise pointer with 0 and const improvement -Tue Dec 5 14:33:43 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> +Wed Jun 7 09:19:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - * ace/config-irix6.x-sgic++-nothreads.h: - Removed + * bin/MakeProjectCreator/config/taoidldefaults.mpb: + When using -SS we do generate an empty S.h file, so add S + to the header_outputext so that we zap this file during a clean -Tue Dec 5 14:30:43 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> +Wed Jun 7 09:02:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - * ace/config-sunos5.4-centerline-2.x.h: - * include/makeinclude/platform_sunos5_centerline.GNU: - Removed centerline support + * include/makeinclude/platform_aix_g++.GNU: + Set X11 and Xt defines, thanks to Peter Grotrian + <peter dot grotrian at pdv-fs dot de> for reporting this. This fixes + bugzilla 2556 -Tue Dec 5 14:07:43 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + * ace/config-sunos5.5.h: + Added fixes to build with threads=0, this fixes bugzilla bug 2555. Thanks + to Peter Grotrian <peter dot grotrian at pdv-fs dot de> for reporting + this. + + * ace/config-aix-4.x.h: + Added fixes to build with threads=0, this fixes bugzilla bug 2553. Thanks + to Peter Grotrian <peter dot grotrian at pdv-fs dot de> for reporting + this. - * include/makeinclude/platform_sunos4_g++.GNU: - * include/makeinclude/platform_sunos4_lucid.GNU: - * include/makeinclude/platform_sunos4_sunc++3.x.GNU: - * include/makeinclude/platform_sunos4_sunc++4.x.GNU: - Removed, not supported anymore + * include/makeinclude/platform_chorus.GNU: + * include/makeinclude/platform_chorus4.x_g++.GNU: + * include/makeinclude/platform_chorus_ghs.GNU: + * include/makeinclude/platform_psos_diab.GNU: + * include/makeinclude/platform_psos_diab_ppc.GNU: + * include/makeinclude/platform_psos_tm.GNU: + * include/makeinclude/platform_psosim_g++.GNU: + Removed these files, psos and chorus are not supported anymore -Tue Dec 5 13:59:43 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> +Wed Jun 7 08:27:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - * ace/config-sco-5.0.0-fsu-pthread.h: - Deleted, fsu pthread is already removed some time ago. + * ace/OS_NS_Thread.cpp: + Added needed check for VxWorks with task api + + * ace/os_include/sys/os_stat.h: + Removed workarounds for old Borland compiler versions -Tue Dec 5 13:58:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> +Wed Jun 7 03:25:00 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - * ace/config-sco-4.2-nothread.h: - Deleted, ancient + * bin/MakeProjectCreator/config/ciao_config_handlers_base.mpb + * bin/MakeProjectCreator/config/ciao_config_handlers_base.mpc -Tue Dec 5 13:51:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + Corrected the file extension. - * ace/config-dgux-4.11-epc.h: - * ace/config-dgux-4.x-ghs.h: - * include/makeinclude/platform_dgux4_epc.GNU: - * include/makeinclude/platform_dgux4_ghs.GNU: - Deleted +Tue Jun 6 21:11:37 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * ace/WFMO_Reactor.cpp (open): make sure we delete the + notify_handler_ before reassigning it to prevent resource leaks. + Thanks to Sonicfly Zhou <zhoucn at txsec dot com> for suggesting + this. + +Tue Jun 6 21:41:02 UTC 2006 Steve Huston <shuston@riverace.com> + + * ace/Service_Gestalt.{h cpp}: + * ace/Dynamic_Service_Base.cpp: + * ace/Dynamic_Service_Dependency.cpp: + * ace/Service_Config.cpp: + * ace/Service_Object.cpp: + * ace/Svc_Conf_Lexer.cpp: Add missing #include directives. + +Tue Jun 6 18:09:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> * ace/OS_NS_Thread.cpp: - Removed dgux support. Fixes bugzilla 2011 + Reverted a change for VxWorks, broke other platforms, will make + a new change tomorrow. -Tue Dec 5 13:41:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> +Tue Jun 6 17:14:51 UTC 2006 Chad Elliott <elliott_c@ociweb.com> - * ace/config-irix5.2.h: - * ace/config-irix5.3-g++.h: - * ace/config-irix5.3-sgic++.h: - * include/makeinclude/platform_irix5.2.GNU: - * include/makeinclude/platform_irix5.3_g++.GNU: - * include/makeinclude/platform_irix5.3_sgic++.GNU: - Deleted + * bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm: - * include/makeinclude/platform_irix6.x_common.GNU: - Use operator ?= + Cleaned up the fill_value() method and removed an unused method. - * ace/os_include/os_signal.h: - Removed Irix 5 support, fixes bugzilla 2013. + * bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm: -Tue Dec 5 13:31:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + Use DirectoryManager::mpc_basename() instead of + File::Basename::basename(). - * ace/config-m88k.h: - * include/makeinclude/platform_m88k.GNU: - Deleted +Tue Jun 6 15:43:32 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - * ace/os_include/os_signal.h: - * ace/os_include/sys/os_resource.h: - * ace/os_include/sys/os_time.h: - Removed support for m88k which isn't maintained for years now. - Fixes bugzilla 2012 + * bin/MakeProjectCreator/templates/gnu.mpd + + Modified to explicitly state the name of a project being skipped + due to missing features or libraries. + +Tue Jun 6 03:57:08 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> + + * ace/Hash_Map_Manager_T.cpp: + * ace/Hash_Map_Manager_T.h: + + Added key() and item() methods to ACE_Hash_Map_Entry<>, to be + like ACE_RB_Tree_Node<>. This makes it easier to switch code + to and from Hash_Maps and RB_Trees. Mark direct access to + the ext_id_ and int_id_ fields @deprecated. + + * ace/Hash_Map_Manager_T.cpp: + * ace/Hash_Map_Manager_T.h: + * ace/Hash_Map_Manager_T.inl: + * ace/RB_Tree.h: + * ace/RB_Tree.inl: + + Added operator->() for iterators to be more like STL API. + +Mon Jun 5 20:27:42 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + + * bin/MakeProjectCreator/config/ciao_config_handlers.mpb + * bin/MakeProjectCreator/config/ciao_config_handlers_base.mpc + + Restructured to clean up config handlers MPC files. + +Sun Jun 4 13:38:21 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * tests/Array_Map_Test.cpp: Fixed all uses of empty() to be + is_empty(). + +Sun Jun 4 13:35:25 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * ace/Array_Map.{h,inl}, + * ace/Intrusive_List.{h,inl}, + * ace/String_Base.{h,inl}: Changed empty() to is_empty(), which + makes more sense. Kept empty() around for the time being as a + @deprecated method. Thanks to Domingos Monteiro <d dot monteiro + at netia dot net> for this suggestion. + +Sun Jun 4 00:51:38 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * ace/CString.{h,inl,cpp}: Added some performance improvements for ACE_CString: + + . Introduced new operators == and != to compare ACE_CString + and const char *. This results in at least a 10-fold performance + improvement, due to avoiding dynamic memory allocation. + + . Streamlined the existing operator == between two ACE_CString's. + (15% improvement in some cases, due to avoiding some of the + overhead of compare()) + + Also cleaned up some of the doxygen comments, e.g., the + ACE_CString comparison operators must have been returning an + integer at some point (?), but it's not the case anymore. + Thanks to Patrick Rabau <pr2345 at gmail dot com> for these + patches. + +Fri Jun 2 19:52:19 UTC 2006 Yan Dai <dai_y@ociweb.com> -Tue Dec 5 13:28:10 UTC 2006 Chad Elliott <elliott_c@ociweb.com> + * bin/tao_orb_tests.lst: + + Removed DII_Collocation_Tests. + +Fri Jun 2 16:29:55 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * ace/Select_Reactor_T.cpp (open): Added an error message + explicitly noting that the notification pipe open failed, which + should make debugging easier when this occurs, e.g., due to a + disabled network interface. Thanks to David Highley <dhighley + at highley-recommended dot com> for this suggestion. + +Fri Jun 2 12:20:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/MakeProjectCreator/config/taoidl3toidl2defaults.mpb: + Updated to make cross compilation possible + +Fri Jun 2 12:12:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> * bin/MakeProjectCreator/templates/gnu.mpd: + Added TAO_IDL3_TO_IDL2 and TAO_IDL3_TO_IDL2_DEP as first step to + run idl3_to_idl2 in a cross build environment - If the gendir setting for the custom file is '.', then ommit the - gendir setting. This is required for version 3.4.45 of MPC. +Fri Jun 2 11:51:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> -Tue Dec 5 12:20:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + * include/makeinclude/platform_vxworks6.2.GNU: + Updated for VxWorks 6.2 - * ace/os_include/sys/os_socket.h: - Removed check for ACE_LACKS_CMSG_DATA_MACRO which wasn't - set in any configuration file. This also resulted in the - removal of ACE_LACKS_CMSG_DATA_MEMBER because this define - was never checked +Fri Jun 2 11:33:36 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - * ace/config-qnx-neutrino.h: - * ace/config-qnx-rtp-62x.h: - * ace/config-qnx-rtp-pre62x.h: - * ace/config-tandem-nsk-mips-v2.h: - * ace/config-tandem-nsk-mips-v3.h: - Removed ACE_LACKS_CMSG_DATA_MEMBER, it has no impact at all + * tests/Recursive_Mutex_Test.cpp (test_recursion_depth): The + get_nesting_level() only works on certain OS platforms, so don't + use it as part of the test. -Tue Dec 5 11:25:00 UTC 2006 Simon Massey <sma@prismtech.com> +Fri Jun 2 10:13:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - * ace/SStringfwd.h: + * ace/Configuration.cpp: + Fixed operator== - Provide for annoying HP aCC 3.xx template bug. + * tests/Config_Test.{h,cpp}: + Added an explicit test for operator==. Thanks to Popeye Cai + <popeye dot cai at utstar dot com> for reporting this. This + fixes bugzilla bug 2550 -Tue Dec 5 10:01:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> +Fri Jun 2 10:02:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - * ace/config-lynxos.h: + * ace/OS_NS_Thread.cpp: + Improved VxWorks 6.2 support - Improved LynxOS 4.2 support + * ace/Svc_Handler.cpp: + 64bit change and initialise pointer with 0 -Mon Dec 4 23:13:12 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> + * ace/Process.cpp: + Added support for VxWorks 6.x in rtp mode - * ace/Service_Gestalt.cpp (init_i): +Fri Jun 2 09:42:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - Fixed bug#2735 and eliminated a potential memory leak of the - list of already processed static services. The failure scenario - is based on a case where static initializers register a bunch of - service objects and then later the gestalt::open() is called. At - that point, the abovementioned list is reinitialized and its - contents was lost. See also the other failure scenario - (bug#2701) for which a fix was put in on Nov 9 2006. + * ace/OS_NS_Thread.inl: + Added necessary code for VxWorks 6.2 -Mon Dec 4 18:00:16 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> +Thu Jun 1 23:13:58 UTC 2006 Yan Dai <dai_y@ociweb.com> * bin/tao_orb_tests.lst: - Added a regression test for bug#2612 + Added oneway and twoway DII_Collocation_Tests. -Mon Dec 4 15:42:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> +Thu Jun 1 20:53:31 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - * bin/MakeProjectCreator/config: - Moved TAO base projects to $TAO_ROOT/MPC/config + * tests/Recursive_Mutex_Test.cpp (run_main): -Mon Dec 4 13:16:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + Added ACE_UNUSED_ARG macros to eliminate 'unused parameter' + warnings on single threaded builds. - * bin/MakeProjectCreator/config/MPC.cfg: - Set includes so that TAO and CIAO base projects could be - under TAO_ROOT and CIAO_ROOT +Thu Jun 1 16:54:56 UTC 2006 Yan Dai <dai_y@ociweb.com> + + * bin/tao_orb_tests.lst: + + Added new DII_Collocation_Tests. + +Thu Jun 1 13:59:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/FILE.cpp: + Const improvement + +Thu Jun 1 12:15:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/Dirent_Test.cpp: + Updated VxWorks specific checks, removed chorus checks + +Thu Jun 1 11:03:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * examples/Threads/thread_pool.cpp: + Fixed 64bit conversion warnings + +Thu Jun 1 09:39:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/diff-builds.pl: + Corrected usage of strftime + +Thu Jun 1 09:19:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Default_Constants.h: + Define the platform suffix for vxworks + + * ace/Sock_Connect.cpp: + Added include for VxWorks and removed some unneeded checks + for vxworks >= 0x600 + + * ace/ACE.h: + Doxygen improvement + + * ace/config-vxworks6.2.h: + Updated with more settings to better match vxworks 6.2 + + * ace/Process_Manager.cpp: + Added specific check for vxworks + + * ace/OS_NS_stdlib.inl: + Emulate putenv with setenv when putenv is not available but + setenv is. + +Thu Jun 1 02:26:03 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> + + * ace/Service_Gestalt.h: + * ace/Service_Gestalt.cpp: + + Reworked the way static svc descriptors are kept so that if DLLs + include static initializers, they won't cause a problem if the + DLL is later unloaded and reloaded. There is currently no + dependency replationship between these "static" services and the + DLL that contains them, so there is still a slight risk that + pointers held after the DLL is unloaded might be referenced. But + the only thing that actually uses these pointers is the service + gestalt itself if it is processing an explicit static directive + and the desired service object had not yet been loaded in that + configuration context. + +Wed May 31 20:49:03 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> + + * examples/APG/Logging/Trace.h: + + Added '##' to several macro definitions in this file, at the + suggestion of Steve Huston <shuston@riverace.com> to get + rid of warnings on GCC4 platforms. + +Wed May 31 18:18:37 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - * bin/MakeProjectCreator/config/ciao_client_dnc.mpb: - * bin/MakeProjectCreator/config/ciao_component_dnc.mpb: * bin/MakeProjectCreator/config/ciao_config_handlers.mpb: - * bin/MakeProjectCreator/config/ciao_config_handlers_base.mpb: - * bin/MakeProjectCreator/config/ciao_container_dnc.mpb: - * bin/MakeProjectCreator/config/ciao_deployment_stub.mpb: - * bin/MakeProjectCreator/config/ciao_deployment_svnt.mpb: - * bin/MakeProjectCreator/config/ciao_domainapplicationmanager_dnc.mpb: - * bin/MakeProjectCreator/config/ciao_events_base_dnc.mpb: - * bin/MakeProjectCreator/config/ciao_events_dnc.mpb: - * bin/MakeProjectCreator/config/ciao_executionmanager_stub.mpb: - * bin/MakeProjectCreator/config/ciao_nodeapplication.mpb: - * bin/MakeProjectCreator/config/ciao_nodeapplicationmanager.mpb: - * bin/MakeProjectCreator/config/ciao_nodemanager_stub.mpb: - * bin/MakeProjectCreator/config/ciao_nodemanager_svnt.mpb: - * bin/MakeProjectCreator/config/ciao_noop_configurator.mpb: - * bin/MakeProjectCreator/config/ciao_plan_generator.mpb: - * bin/MakeProjectCreator/config/ciao_race_component.mpb: - * bin/MakeProjectCreator/config/ciao_race_default.mpb: - * bin/MakeProjectCreator/config/ciao_race_monitor.mpb: - * bin/MakeProjectCreator/config/ciao_rtevent_dnc.mpb: - * bin/MakeProjectCreator/config/ciao_servant_dnc.mpb: - * bin/MakeProjectCreator/config/ciao_server_dnc.mpb: - * bin/MakeProjectCreator/config/ciao_static_dnc_app.mpb: - * bin/MakeProjectCreator/config/ciao_targetmanager_stub.mpb: - * bin/MakeProjectCreator/config/ciao_targetmanager_svnt.mpb: - * bin/MakeProjectCreator/config/ciao_xml_utils.mpb: - * bin/MakeProjectCreator/config/ciaocidldefaults.mpb: - * bin/MakeProjectCreator/config/cidlc.mpb: - * bin/MakeProjectCreator/config/dance_extension_stub.mpb: - Moved to $CIAO_ROOT/MPC/config -Mon Dec 4 13:13:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + Shortened some line lengths, to make the file more readable. + +Wed May 31 16:36:43 UTC 2006 Steve Huston <shuston@riverace.com> + + * tests/tests.mpc: + * tests/run_test.lst: Don't build or run Unload_libACE on WinCE. The + code is purposely leaving out ACE stuff and the ACE stuff is needed + for WinCE, unless there's lots of conditional code added to duplicate + the workings on ACE_TMAIN on CE. + +Wed May 31 14:33:16 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> + + * ace/OS_NS_Thread.inl (recursive_mutex_lock): + + Added additional ACE_UNUSED_ARG for the timeout parameter, to + eliminate warnings in single-threaded builds. + +Wed May 31 13:05:05 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * ace/Argv_Type_Converter.cpp (align_char_with_wchar): ACE-ified this code. + +Wed May 31 14:00:16 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> + + * tests/Recursive_Mutex_Test.cpp (run_main): + + Moved '#if defined (ACE_HAS_THREADS)' up a few lines to include + a variable defined inside the same guard at the top of the file, + to eliminate an 'undefined' error on single-threaded builds. + +Wed May 31 13:37:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> * bin/tao_orb_tests.lst: - Don't run Bug_2709_Regression with ACE_FOR_TAO + Added Bug_2542_Regression, this should run without problems -Mon Dec 4 12:49:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> +Wed May 31 11:44:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - * ace/Basic_Types.h: - Added check for __ia64__, then we assume we have little endian, - this define is set by the HP OpenVMS compiler + * ace/OS_NS_time.inl: + Fixed unreachable code warning -Mon Dec 4 12:26:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> +Wed May 31 09:23:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - * bin/MakeProjectCreator/config/ciao_targetmanager_svnt.mpb: - New base project + * tests/run_test.lst: + Changes for ACE_FOR_TAO configuration -Mon Dec 4 11:27:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> +Wed May 31 08:19:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - * bin/MakeProjectCreator/config/ciao_nodeapplication.mpb: - New base project for nodeapplication library + * tests/Bound_Ptr_Test.cpp: + Initalise pointers with 0 - * bin/MakeProjectCreator/config/ciao_nodeapplicationmanager.mpb: - Derive from ciao_nodeapplication +Wed May 31 08:16:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - * bin/MakeProjectCreator/config/ciao_nodemanager_stub.mpb: - * bin/MakeProjectCreator/config/ciao_nodemanager_svnt.mpb: - * bin/MakeProjectCreator/config/ciao_race_default.mpb: - * bin/MakeProjectCreator/config/ciao_race_monitor.mpb: - * bin/MakeProjectCreator/config/ciao_targetmanager_stub.mpb: - Fixed incorrect id tag + * tests/Recursive_Mutex_Test.cpp: + Added missing include to get ACE_OS::sleep - * bin/MakeProjectCreator/config/ciao_noop_configurator.mpb: - New base project +Tue May 30 21:56:52 UTC 2006 Steve Huston <shuston@riverace.com> -Mon Dec 4 11:26:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + * ACE-INSTALL.html: Corrected the AIX section; removed descriptions of + old compilers that are no longer supported and suggested the config + and platform_macros files to use. Thanks to Michelle Zheng + <Michelle dot Zheng at dowjones dot com> for motivating this. - * bin/fuzz.pl: - Corrected the expression to fill the files_mpc array and - enabled the Id check again + * THANKS: Added Michelle Zheng to the Hall of Fame. -Fri Dec 1 13:36:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> +Tue May 30 19:17:40 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> - * Kokyu/docs/Kokyu.html: - Updated download location of ACE/TAO/CIAO + * ace/Dynamic_Service.h: + * ace/Dynamic_Service.inl: + * ace/Dynamic_Service.cpp: + * ace/Dynamic_Service_Base.h: + * ace/Dynamic_Service_Base.cpp: + * ace/Dynamic_Service_Dependency.cpp: -Wed Nov 29 15:40:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + In order to ensure proper separation of contexts, this patch + gives the dynamic service instance lookup the ability to + optionally exclude the global configuration context. - * ace/OS_NS_unistd.cpp (num_processors*): - Check the return value of sysctl, if it returns -1 then - also return the method with -1 + * ace/Service_Gestalt.h: + * ace/Service_Gestalt.cpp: -Wed Nov 29 12:47:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + To allow explicitly configured static service objects, those for + which a directive such as 'static XYZ "foo bar"', to be + independently configured in different configuration contexts, + these changes retain any static service descriptor for service + XYZ, then looks for a previous instance of XYZ in the local + context only, otherwise it uses the previously retained static + service descriptor to create a new instance. - * bin/MakeProjectCreator/config/ciao_client_dnc.mpb: - Simplified this file -Wed Nov 29 11:03:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> +Tue May 30 18:24:54 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - * ace/Malloc_T.{h,cpp}: - Changed delete_lock_ to a real bool + * ace/DLL.h (ACE_DLL): Updated the documentation of open() to explain the + lookup scheme when a filename is given. Thanks to Phlip + <phlip2005 at gmail dot com> for motivating this. -Wed Nov 29 07:09:17 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> +Tue May 30 13:06:42 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - * Makefile.am: - * configure.ac: + * ace/ACE.inl: + * ace/Base_Thread_Adapter.cpp: + * ace/Default_Constants.h: + * ace/Global_Macros.h: + * ace/OS.h: + * ace/OS_NS_Thread.cpp: + * ace/OS_NS_Thread.h: + * ace/OS_NS_netdb.inl: + * ace/OS_NS_signal.inl: + * ace/OS_NS_sys_socket.inl: + * ace/OS_NS_time.inl: + * ace/OS_main.cpp: + * ace/OS_main.h: + * ace/Object_Manager_Base.h: + * ace/Process_Manager.cpp: + * ace/Process_Semaphore.cpp: + * ace/Process_Semaphore.h: + * ace/Process_Semaphore.inl: + * ace/Recursive_Thread_Mutex.cpp: + * ace/SV_Semaphore_Simple.h: + * ace/TLI_Acceptor.cpp: + * ace/Thread_Adapter.cpp: + * ace/Token.h: + * ace/config-macros.h: Removed all vestiges of PSOS. + +Tue May 30 12:22:53 UTC 2006 Chad Elliott <elliott_c@ociweb.com> - If ACEXML, ASNMP, or protocols subdirectories are not present, - don't try to configure or build them. Thanks to Stephen Torri - <storri at cse dot wustl dot edu> for reporting this. + * bin/mpc.pl: + * bin/mwc.pl: -Tue Nov 28 21:02:25 UTC 2006 Steve Huston <shuston@riverace.com> + Added a load-time check for the minimum perl version (5.6). - * ace/WIN32_Asynch_IO.cpp (ACE_WIN32_Asynch_Connect::post_result): - The 'result' pointer is invalid upon return from post_completion() - regardless of whether or not it succeeds. This fix prevents - dereferencing result on failure of post_completion(), such as at - proactor shutdown. Thank you to Ken Kane <kenneth dot kane at - ironmountain dot com> for the analysis and fix. +Tue May 30 12:18:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - * THANKS: Updated Ken Kane's email address. + * ace/Log_Msg.cpp: + * ace/OS_NS_dirent.inl: + * ace/OS_NS_netdb.inl: + * ace/OS_NS_pwd.inl: + * ace/OS_NS_stdlib.inl: + * ace/OS_NS_Thread.cpp: + * ace/OS_NS_Thread.inl: + * ace/OS_NS_time.cpp: + * ace/OS_NS_time.inl: + * ace/Thread_Manager.cpp: + * ace/os_include/os_pthread.h: + * ace/os_include/os_stdlib.h: + Removed support for HPUX 10.20 -Tue Nov 28 20:36:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + * ace/os_include/net/os_if.h: + * ace/os_include/netinet/os_tcp.h: + Removed psos support - * bin/auto_run_tests.pl: - Added \n after the message when we can't chdir to a certain - directory to prevent detecting the wrong test because this - message is then on the same line as the next test. + * ace/os_include/sys/os_types.h: + Removed ACE_LACKS_FLOATING_POINT -Tue Nov 28 20:15:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> +Tue May 30 11:57:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - * bin/MakeProjectCreator/config/ciao_deployment_svnt.mpb: - Removed include path that didn't exist anymore + * ace/config-hpux-10.x-g++.h + * ace/config-hpux-10.x-hpc++.h + * ace/config-hpux-10.x.h + Removed these files, not supported anymore -Tue Nov 28 16:04:45 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + * ace/OS_NS_time.inl: + Removed check for ACE_CTIME_R_RETURNS_INT, it was for hpux 10.20 - * bin/MakeProjectCreator/config/ciao_config_handlers_base.mpb - * bin/MakeProjectCreator/config/ciao_nodemanager_svnt.mpb +Tue May 30 11:57:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - Fix for linker warnings/errors on OS X. + * ace/config-osf1-4.0.h: + Removed, contents merged to tru64 file -Tue Nov 28 14:08:23 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> + * ace/config-tru64.h: + Added osf1-4.0 file contents, be aware that tru64 support hasn't + been tested for a long time. - * bin/msvc_mpc_auto_compile.pl: +Tue May 30 11:45:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - Reorder @ace_core_dirs so that protocols follows tests, as - the HTBP protocol tests depend on the Test_Output library. + * tests/Recursive_Mutex_Test.cpp: + Fixed compile error -Tue Nov 28 13:30:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> +Tue May 30 11:11:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - * bin/MakeProjectCreator/config/event.mpb: - * bin/MakeProjectCreator/config/event_serv.mpb: - * bin/MakeProjectCreator/config/event_skel.mpb: - * bin/MakeProjectCreator/config/ftorbutils.mpb: - * bin/MakeProjectCreator/config/ftrtevent.mpb: - * bin/MakeProjectCreator/config/ifrservice.mpb: - * bin/MakeProjectCreator/config/imr_locator.mpb: - * bin/MakeProjectCreator/config/portablegroup.mpb: - * bin/MakeProjectCreator/config/rtcorbacommon.mpb: - Added avoids_corba_e_compact as base project, if we have CORBA/e - compact we don't have the needed features available to build these - projects. + * ace/os_include/os_stdio.h: + Removed psos support -Tue Nov 28 13:25:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + * ace/IOStream.h: + Removed checks for ACE_LACKS_CHAR_STAR_RIGHT_SHIFTS, that was only + set for chorus which is removed - * bin/MakeProjectCreator/config/avoids_corba_e_micro.mpb: - * bin/MakeProjectCreator/config/avoids_corba_e_compact.mpb: - Fixed incorrect feature name + * ace/Basic_Types.h: + * ace/Log_Msg.cpp: + * ace/Profile_Timer.{h,cpp}: + Removed checks for ACE_LACKS_FLOATING_POINT. Was only set for chorus + which is now removed. - * bin/MakeProjectCreator/config/global.features: - Removed duplicate minimum_corba + * ace/OS_NS_Thread.cpp: + Removed chorus support -Tue Nov 28 09:53:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + * ace/config-chorus.h: + Removed. - * bin/MakeProjectCreator/config/ciao_client_dnc.mpb: - * bin/MakeProjectCreator/config/ciao_events_dnc.mpb: - Removed security as base, for the moment we decoupled from - the security service. + * ace/INET_Addr.cpp + * ace/Lib_Find.cpp + * ace/Local_Tokens.cpp + * ace/Log_Record.cpp + * ace/Parse_Node.cpp + Removed check for ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS, is only + set for psos which we don't support anymore -Tue Nov 28 00:28:28 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> + * ace/os_include/os_signal.h: + Removed check for ACE_SIGINFO_IS_SIGINFO_T, only set for psos - * protocols/tests/HTBP/htbptest.mpb: + * ace/config-psos-diab-mips.h + * ace/config-psos-diab-ppc.h + * ace/config-psos-diab.h + * ace/config-psos-tm.h + * ace/config-psosim-g++.h + Removed from the repo, psos support has been removed - Add dependency on Test_Output. +Tue May 30 10:48:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> -Mon Nov 27 12:30:28 UTC 2006 Chad Elliott <elliott_c@ociweb.com> + * ace/CDR_Stream.cpp: + Use true/false, when demarshaling a string, check the result of the + demarshaling of the length of the string, if that failed, just return + directly instead of trying to demarshal a random lenght string - * tests/Bug_2653_Regression_Test.cpp: + * ace/Task.h: + * ace/System_Time.h: + Doxygen improvement - When a thread is started, you must wait() on it before exiting the - process to avoid a core dump. + * ace/ACE.cpp: + * ace/SOCK_Dgram_Bcast.cpp: + * ace/Sock_Connect.cpp: + * ace/Process.cpp: + * ace/OS_NS_unistd.cpp: + * ace/Mem_Map.cpp: + Removed chorus support - * tests/run_test.pl: + * ace/config-fsu-pthread.h: + Removed this file, this configuration isn't supported and used for + ages - Print out the test header before checking for the executable. If - the executable is not there, it will appear as if the previous - test failed. + * ace/Condition_Thread_Mutex.cpp: + * ace/Recursive_Thread_Mutex.cpp: + Removed fsu pthread support -Mon Nov 27 08:45:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + * ace/Process_Manager.cpp: + Const improvement - * ace/config-sunos5.5.h: - Fixed compile problem on solaris x86 when _FILE_OFFSET_BITS=64 - is set. Thanks to Michael Klein <michael dot klein at fazi dot de> - for reporting this. Fixed bugzilla bug 2693. + * ace/OS.inl: + * ace/OS_NS_sys_socket.inl: + * ace/OS_NS_stdlib.cpp: + * ace/OS_NS_stdlib.inl: + * ace/OS_NS_Thread.cpp: + Removed psos support -Mon Nov 27 08:09:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + * ace/OS_NS_unistd.inl: + * ace/OS_NS_stdio.{h,cpp,inl}: + * ace/Handle_Set.h: + * ace/OS_NS_Thread.{h,inl}: + Removed psos and chorus support - * bin/MakeProjectCreator/config/minimum_corba.mpb: - * bin/MakeProjectCreator/config/avoids_minimum_corba.mpb: - Renames minimum_corba to avoids_minimum_corba. Fixes bugzilla - 2589. + * ace/Thread_Manager.{h,cpp,inl}: + Made terminated_ a real bool, removed chorus support, check for + ACE_VXWORKS instead of VXWORKS - * bin/MakeProjectCreator/config/avoids_corba_e_micro.mpb: - Fixed this file and made corba_e_compact its parent, when - we can't build a project in corba_e_compact then corba_e_micro - is also not an option. + * ace/OS_NS_sys_time.inl: + Check for ACE_VXWORKS instead of VXWORKS - * bin/MakeProjectCreator/config/event.mpb: - * bin/MakeProjectCreator/config/event_serv.mpb: - * bin/MakeProjectCreator/config/event_skel.mpb: - * bin/MakeProjectCreator/config/ftorbutils.mpb: - * bin/MakeProjectCreator/config/ftrtevent.mpb: - * bin/MakeProjectCreator/config/ifrservice.mpb: - * bin/MakeProjectCreator/config/imr_locator.mpb: - * bin/MakeProjectCreator/config/portablegroup.mpb: - * bin/MakeProjectCreator/config/rtcorbacommon.mpb: - Updated for rename of minimum_corba + * ace/MMAP_Memory_Pool.{h,cpp}: + Removed chorus support, use bool internally and added an option to + get each time an unique mmap filename -Mon Nov 27 06:05:38 UTC 2006 Olli Savia <ops@iki.fi> + * ace/config-linux-common.h: + Added ACE_HAS_VOIDPTR_MMAP and removed KCC support - * tests/OS_Test.cpp: - Fixed compile error on VxWorks. Thanks to Johnny Willemsen - for pointing out the problem and suggesting a fix. + * ace/ace_wchar.inl + * ace/Default_Constants.h + * ace/INET_Addr.h + * ace/IPC_SAP.cpp + * ace/Message_Queue.cpp + * ace/Message_Queue.h + * ace/Message_Queue.inl + * ace/Message_Queue_T.cpp + * ace/Message_Queue_T.h + * ace/OS.h + * ace/OS_NS_macros.h + * ace/OS_NS_stdio.h + * ace/OS_NS_stdio.inl + * ace/OS_NS_stdlib.inl + * ace/OS_NS_Thread.cpp + * ace/OS_NS_Thread.h + * ace/OS_NS_Thread.inl + * ace/OS_NS_time.inl + * ace/Recursive_Thread_Mutex.cpp + * ace/Sched_Params.cpp + * ace/Select_Reactor_T.cpp + * ace/SOCK_Dgram_Bcast.cpp + * ace/Thread_Manager.h + * ace/Token.h + Check for ACE_VXWORKS instead of VXWORKS -Fri Nov 24 13:27:55 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> +Mon May 29 22:08:50 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - * bin/MakeProjectCreator/config/automake.features: + * ace/OS_NS_Thread.inl (recursive_mutex_lock): *Really* make the compiler + happy now. Thanks Olli! - Set stl and boost. We'll use automake conditionals to defer - these options to configure time. +Mon May 29 21:12:50 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> -Fri Nov 24 13:05:01 UTC 2006 Olli Savia <ops@iki.fi> + * ace/OS_NS_Thread.inl (recursive_mutex_lock): Added a const_cast + for ACE_Time_Value * to make the compiler happy when passing the + timeout parameter to ACE_OS::cond_timed_wait(). Thanks to Olli + Savia for helping here. - * tests/OS_Test.cpp: - Added ACE_OS::snprintf test. +Mon May 29 20:30:44 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> -Fri Nov 24 10:08:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + * We recently added the 2100th contributor to ACE+TAO+CIAO!!! The + 2000th contributor was added in August of 2005, this means that + over 100 different people have contributed to the project in the + past 9 months! - * ace/Sock_Connect.cpp: - Fixed compile errors when building on linux with no - networking support +Mon May 29 19:50:54 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> -Thu Nov 23 17:06:17 UTC 2006 Simon McQueen <sm@prismtech.com> + * examples/Service_Configurator/IPC-tests/server/server_test.cpp (ACE_TMAIN): + Changed - * ace/OS_Errno.h: - * ace/OS_Errno.cpp: + ACE_Reactor::instance ()->run_reactor_event_loop () - Fix compile errors with g++ on Solaris with NDEBUG. + to -Thu Nov 23 14:09:17 UTC 2006 Steve Huston <shuston@riverace.com> + ACE_Reactor::run_event_loop () - * include/makeinclude/rules.lib.GNU: Corrected error introduced by - Wed Nov 22 21:53:17 UTC 2006 Steve Huston <shuston@riverace.com>. + so that reconfiguration happens properly after a SIGHUP or + SIGINT occurs. Thanks to Kevin Hu <Xiaotao dot Hu at ge dot + com> for motivating this. -Thu Nov 23 06:53:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> +Mon May 29 18:10:50 UTC 2006 Steve Huston <shuston@riverace.com> - * bin/MakeProjectCreator/config/ace_for_tao.mpb: - Added ACE_LACKS_MSG_WFMO as define, that prevents other projects - to try to use the msg wfmo reactor which is not available in the - ace_for_tao configuration + * tests/Signal_Test.cpp: + * tests/Thread_Manager_Test.cpp: Add missing ACE_TEXT to a string. -Thu Nov 23 03:14:58 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> +Mon May 29 18:44:05 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - * tests/Integer_Truncate_Test.cpp: - * apps/JAWS/clients/WebSTONE/src/README: + * tests/Recursive_Mutex_Test.cpp: Enhanced this test to exercise + the new timed feature of ACE_Recursive_Thread_Mutex. - Removed svn:executable property. +Mon May 29 18:16:31 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> -Wed Nov 22 23:16:22 UTC 2006 Steve Huston <shuston@riverace.com> + * ace/Recursive_Thread_Mutex.h: Clarified that get_nesting_level() + may return -1 on some platforms when ACE_HAS_RECURSIVE_MUTEXES + is enabled. - * examples/Timer_Queue/Async_Timer_Queue_Test.cpp: Ignore SIGQUIT code - for platforms with ACE_LACKS_UNIX_SIGNALS. Fixes WinCE build error. +Mon May 29 17:45:02 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> -Wed Nov 22 21:58:16 UTC 2006 Steve Huston <shuston@riverace.com> + * ace/Recursive_Thread_Mutex.inl: Moved some of the short accessor + methods from the Recursive_Thread_Mutex.cpp file to here. - * tests/RB_Tree_Test.cpp: Don't use ACE_ASSERT for code - it doesn't - get executed in Release builds. + * ace/Recursive_Thread_Mutex.h, + ace/Recursive_Thread_Mutex.inl: Added support for time recursive + mutexes, thanks also to Abdullah. - Pulled these in from the 5.5 stream: + * ace/OS_NS_Thread.h, + * ace/OS_NS_Thread.inl: Added support for timed recursive mutexes. + Thanks to Abdullah Sowayan <abdullah dot sowayan at lmco dot + com> for contributing this. - Mon Nov 20 21:26:24 UTC 2006 Steve Huston <shuston@riverace.com> +Mon May 29 17:30:52 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - * ace/config-win32-msvc.h: - * ace/OS_Memory.h: - The MFC new/exception code needed the ability to delete a caught - CMemoryException object to prevent memory leaks (see - http://msdn2.microsoft.com/de-de/library/0e5twxsh(VS.80).aspx). - This necessitates that every platform other than Windows/MFC gets - an empty define for ACE_del_bad_alloc, and the ACE_NEW... macros - have ACE_del_bad_alloc expanded in the catch block. - For past history of this issue, see the trail starting at: - Tue Aug 8 09:15:00 UTC 2006 Simon Massey <sma@prismtech.com> + * ace/OS_NS_Thread.h: Updated the documentation to clarify why + recursive mutexes can't be used for ACE_OS::mutex_lock(). - Thu Nov 16 16:14:32 UTC 2006 Steve Huston <shuston@riverace.com> +Mon May 29 18:27:08 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - * ace/String_Base.{h inl}: Added a capacity() method that returns - the number of allocated CHAR units in the string object. Thanks to - Kelly Hickel <kfh at mqsoftware dot com> for supplying this. + * examples/DLL/test_dll.cpp: - * NEWS: Updated with recent ACE_String_Base and build additions. + Changed instances of a C-style cast from void* to + pointer-to-function to a two-step reinterpret_cast + using ptrdiff_t as an intermediate. C++ forbids casting + directly between pointer-to-object and pointer-to-function, + and some of the newer compilers are catching it. - Mon Nov 13 17:40:58 UTC 2006 Steve Huston <shuston@riverace.com> +Sat May 27 15:03:07 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - * ace/String_Base.{h cpp}: Added a fast_resize(size_t) method to - manage the sizing/reallocating of the string, but doesn't do the - memory setting of resize(). Changed resize() to call fast_resize() - then do the memory setting. - Thank you to Kelly Hickel <kfh at mqsoftware dot com> for these - additions. + * netsvcs/servers/main.cpp (ACE_TMAIN): Removed the following code: + if (ACE::debug () == 0) + ACE_LOG_MSG->priority_mask (~LM_DEBUG, ACE_Log_Msg::PROCESS); -Wed Nov 22 21:53:17 UTC 2006 Steve Huston <shuston@riverace.com> + since (1) it makes debugging hard and (2) it's simply wrong + since it's blowing away anything that's set by the + ACE_Logging_Strategy in the svc.conf file. - Pulled these in from the 5.5 stream: +Sat May 27 14:37:14 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - Thu Nov 16 21:56:37 UTC 2006 Steve Huston <shuston@riverace.com> + * ace/Log_Record.cpp (print): Only print out the log records if the + corresponding type is enabled for logging. - * include/makeinclude/rules.local.GNU: For creating the object file - directories (e.g., VDIR and VSHDIR, and their subdirectories), change - from using the directory as a prerequisite and make that prereq - a PHONY target to embed the command(s) to check and create the - directory if needed. This accomplishes two things: 1) allows the - make to work with clearmake in GNU compatibility mode (clearmake - always saw the PHONY target as remade and remade every file in the - project), and 2) avoids using a PHONY target as a prerequisite, - something the GNU make manual says to avoid. Thank you to Howard - Finer <hfiner at sonusnet dot com> for motivating and assisting - in this effort. +Sat May 27 14:35:21 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - Tue Nov 14 22:33:03 UTC 2006 Steve Huston <shuston@riverace.com> + * netsvcs/servers/main.cpp: Enable the ignore_debug_flag in the + ACE_Service_Config::open() call so that we can override the + default ACE_Log_Priority settings in the svc.conf file. - * include/makeinclude/rules.lib.GNU: Change VLOBJS and VSHOBJS to - use $(patsubst) instead of $(if) to look for entries that have - relative directories in them (../). Avoids $(if) which does not - work in Clearcase's clearmake GNU compatibility mode. +Sat May 27 11:36:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> -Wed Nov 22 19:52:23 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> + * performance-tests/SCTP/hist.cpp: + Fixed compile error - * ace/Select_Reactor_T.inl: +Fri May 26 22:02:48 UTC 2006 Steve Huston <shuston@riverace.com> - Add #include of "Log_Msg.h". This is required to bring things - into scope on systems where ACE_TEMPLATES_REQUIRE_SOURCE isn't - defined/needed. + * examples/IPC_SAP/SPIPE_SAP/consumer_msg.cpp: + * examples/IPC_SAP/SPIPE_SAP/consumer_read.cpp: + * examples/IPC_SAP/SPIPE_SAP/server.cpp: Wide-char fixes; there's no + wide-char variant for ACE_OS::fdetach(). -Wed Nov 22 18:27:39 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> + * examples/IPC_SAP/TLI_SAP/CPP-client.cpp: + * examples/IPC_SAP/TLI_SAP/db-client.cpp: + * examples/IPC_SAP/TLI_SAP/ftp-client.cpp: + * examples/Connection/non_blocking/test_tli_acceptor.cpp: + * examples/Connection/non_blocking/test_tli_connector.cpp: + Wide-char/narrow-char fixes. - * performance-tests/Synch-Benchmarks/Base_Test/Makefile.am: +Fri May 26 21:47:56 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - Regenerated. + * netsvcs/lib/Client_Logging_Handler.cpp, + * netsvcs/lib/Server_Logging_Handler_T.cpp, + * ace/Log_Msg_IPC.cpp: Removed the special case code for Windows + since it seems like ACE (or Windows) now handles this properly. - * performance-tests/Synch-Benchmarks/Base_Test/Synch_Benchmarks_Base_Test.mpc: +Fri May 26 21:20:35 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * ace/Log_Record.cpp (operator>>): Add one when allocating the buffer. + +Fri May 26 13:16:48 UTC 2006 Nanbor Wang <nanbor@exothermic.txcorp.com> + + * ace/DLL_Manager.cpp: + + Fixed incorrect usage of ACE::debug check. Thanks to Johnny for + reporting this. + +Fri May 26 15:04:55 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> + + * ASNMP/tests/Counter_Test.cpp: + * ASNMP/tests/Gauge_Test.cpp: + * performance-tests/SCTP/hist.cpp: + + Added static_cast<>s to eliminate implicit conversion warnings. + +Fri May 26 12:42:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/Naming_Test.cpp: + Replaced assert with if statement, resolved argument not used + warning in BCB6 release builds + +Fri May 26 10:26:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/Bug_1890_Regression_Test.cpp: + * tests/Bug_2540_Regression_Test.cpp: + New tests made by Carlos O'Ryan for the given bug numbers. + + * tests/run_test.lst: + * tests/tests.mpc: + Added the new tests above + +Fri May 26 09:53:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/PerlACE/Run_Test.pm: + Increased wait_interval_for_process_creation from 5 to 10 seconds. + On the slower systems some tests failed because the startup time + is longer then 5 seconds, especially if several configuration files + are read and saved during startup + +Fri May 26 08:21:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/diff-builds.pl: + Fixed typo in comment + +Thu May 25 04:58:44 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * tests/Tokens_Test.cpp (run_main): Don't try to spawn the + netsvcs/server/main if it's not built. + +Thu May 25 03:53:47 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> + + * m4/config_h.m4: - Add automake specific includes definition to find headers - relative to source directory. + Removed AH_TEMPLATE for ACE_LACKS_TCP_H. This was replaced + with ACE_LACKS_NETINET_TCP_H long ago. -Wed Nov 22 16:57:55 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> +Wed May 24 22:19:43 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> - * performance-tests/Synch-Benchmarks/Perf_Test/Makefile.am: + * ace/Service_Repository.{h, inl, cpp}: - Regenerated. + Changed size arguments type to size_t in ctor, open, + current_size, total_size and the corresponding members. + ACE_Service_Repository_Iterator::next_ now starts from 0 instead + of -1 to avoid warnings about signed/unsigned comparisons. + * ace/Service_Gestalt.cpp: + + Reverted the change "Wed May 24 14:00:43 UTC 2006 Iliyan + Jeliazkov <iliyan@ociweb.com>", since now the + Service_repository::instance() takes size_t argument. + + * performance-tests/Synch-Benchmarks/Base_Test/Synch_Benchmarks_Base_Test.mpc: * performance-tests/Synch-Benchmarks/Perf_Test/Synch_Benchmarks_Perf_Test.mpc: - Add automake specific includes definition to find headers - relative to source directory. + Fixed and error whereby the DLL's generated by this two project + files did not match the name used in the svc configuration + files, causing the test to crash because of missing DLL. + +Wed May 24 13:08:08 UTC 2006 Steve Huston <shuston@riverace.com> + + * ace/Message_Queue.h: Added #include "ace/Thread_Mutex.h" on platforms + that have ACE_Message_Queue_NT available; that class has a + ACE_Thread_Mutex member so the include is needed to see the class. + Thanks to Guy Peleg <guype at amdocs dot com> for this fix. -Wed Nov 22 16:48:58 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> +Wed May 24 17:39:47 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - * Makefile.am: + * ace/Remote_Tokens.cpp (request_reply): Added a helpful error + message to make it easy to track down problems with TSS. - Hand tweak, HTBP tests depend on Test_Output library. This - requires changing the build order so that the protocols dir - is built after tests. +Wed May 24 17:22:31 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - * apps/gperf/tests/Makefile.am: + * configure.ac: - Hand tweak to find gperf executable on automake builds. Chad - has given me info to make MPC generation work, which I'll add - in the near future. + Change feature test to define ACE_LACKS_NATIVE_STRPTIME if + system doesn't support strptime(), as it seems ACE doesn't + follow its feature test macro naming conventions when it comes + to strptime(). - * m4/ace.m4: + Changed ACE_LACKS_STRPTIME_PROTOTYPE feature test to use + AC_CHECK_DECL instead of AC_EGREP_HEADER. - Placeholder for a BUILD_WXWINDOWS feature test. For now it - always returns false. +Wed May 24 16:33:59 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> * configure.ac: + * m4/config_h.m4: - Configure examples/ConfigViewer/Makefile. + Changed ACE_LACKS_STRPTIME and ACE_LACKS_STRPTIME_PROTOTYPE + feature tests to use the same idiom as similar tests. This + Avoids requiring an AH_TEMPLATE for each feature test macro + in config_h.m4. -Wed Nov 22 15:34:12 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> +Wed May 24 09:07:53 2006 Douglas C. Schmidt <schmidt@cse.wustl.edu> - * ace/Version.h: + * ace/Activation_Queue.cpp, + * ace/Activation_Queue.inl: Fixed the queue() "setter" method + so that it doesn't leak memory. Thanks to David Chu <beyonddc + dot storage at gmail dot com> for providing this fix. - Remove extraneous whitespace from ACE_VERSION macro definition. +Wed May 24 14:00:43 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> - * ace/Makefile.am: + * ace/Service_Gestalt.cpp: - Hand tweak. + Added a cast from size_t to int in the ctor to match the + interface of ::instance() and to quiet the 64bit compilers, + complaining about loss of precision in the implicit conversion. - * ace/QoS/Makefile.am: +Tue May 23 19:21:55 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - Revert to earlier version until MPC generation issues are - resolved. + * tests/Signal_Test.cpp: - * apps/JAWS2/JAWS/Makefile.am: - * apps/JAWS3/jaws3/Makefile.am: + Reset SIGHUP handler to SIG_DFL to support cases where SIGHUP + is ignored (running under nohup(1), etc.). - Regenerated. +Tue May 23 10:55:59 2006 Douglas C. Schmidt <schmidt@cse.wustl.edu> - * apps/JAWS2/JAWS/jaws2.mpc: - * apps/JAWS3/jaws3/jaws3.mpc: + * netsvcs/lib/Client_Logging_Handler.cpp (handle_input): + * netsvcs/lib/Server_Logging_Handler_T.cpp + (handle_logging_record): Cleaned up the code so that it should + have no memory leaks and will also build cleanly on all the OS + platforms. - Add automake specific includes definition to find headers - relative to source directory. + * ace/Log_Msg_IPC.cpp: Fix support for ACE_HAS_STREAM_PIPES. -Wed Nov 22 14:24:31 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> +Tue May 23 13:05:03 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> - * ace/Makefile.am: + * ace/Log_Msg.cpp: + Fixing a memory leak found by valgrind. - Regenerated. + * ace/Timeprobe.cpp: + Added missing include - this wouldn't comple with both noinline + and ACE_COMPILE_TIMEPROPE set. - * ace/ace_xtreactor.mpc: - * ace/ace_tkreactor.mpc: - * ace/ace_flreactor.mpc: - * ace/ace_qtreactor.mpc: +Mon May 22 21:13:15 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> - Changed to specify full name of pkgconfig template file, - the MPC Custom spec does not automatically match *.pc.in - files. + * bin/diff-builds.pl: -Wed Nov 22 14:16:40 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> + Updated to allow diff between the tests failures today and on a + specified date, for the clean builds (or, all the builds from + the build score). - * examples/ConfigViewer/Makefile.am: +Mon May 22 19:06:41 UTC 2006 Steve Huston <shuston@riverace.com> - New file. + * ace/Log_Record.cpp (operator<<, operator>>): Have to use a different + CDR array method when ACE_USES_WCHAR. -Wed Nov 22 14:10:08 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> +Mon May 22 09:04:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - * protocols/tests/RMCast/Makefile.am: - * protocols/tests/Makefile.am: - * protocols/tests/HTBP/Reactor_Tests/Makefile.am: - * protocols/tests/HTBP/Send_Large_Msg/Makefile.am: - * protocols/tests/HTBP/Makefile.am: - * protocols/tests/HTBP/Send_Recv_Tests/Makefile.am: - * protocols/tests/HTBP/ping/Makefile.am: - * protocols/ace/RMCast/Makefile.am: - * protocols/ace/Makefile.am: - * protocols/ace/TMCast/Makefile.am: - * protocols/ace/HTBP/Makefile.am: - * protocols/examples/RMCast/Send_Msg/Makefile.am: - * protocols/examples/RMCast/Makefile.am: - * protocols/examples/Makefile.am: - * protocols/examples/TMCast/Member/Makefile.am: - * protocols/examples/TMCast/Makefile.am: - * ace/Makefile.am: - * ace/SSL/Makefile.am: - * ace/QoS/Makefile.am: - * performance-tests/Synch-Benchmarks/Base_Test/Makefile.am: - * performance-tests/Synch-Benchmarks/Makefile.am: - * performance-tests/Synch-Benchmarks/Synch_Lib/Makefile.am: - * performance-tests/Synch-Benchmarks/Perf_Test/Makefile.am: - * performance-tests/Server_Concurrency/Leader_Follower/Makefile.am: - * performance-tests/Server_Concurrency/Makefile.am: - * performance-tests/Server_Concurrency/Queue_Based_Workers/Makefile.am: - * performance-tests/TCP/Makefile.am: - * performance-tests/UDP/Makefile.am: - * performance-tests/SCTP/Makefile.am: - * performance-tests/Makefile.am: - * performance-tests/Misc/Makefile.am: - * Kokyu/tests/FIFO/Makefile.am: - * Kokyu/tests/DSRT_MIF/Makefile.am: - * Kokyu/tests/Makefile.am: - * Kokyu/tests/EDF/Makefile.am: - * Kokyu/Makefile.am: - * tests/SSL/Makefile.am: - * tests/Makefile.am: - * apps/Gateway/Gateway/Makefile.am: - * apps/Gateway/Makefile.am: - * apps/Gateway/Peer/Makefile.am: - * apps/mkcsregdb/Makefile.am: - * apps/drwho/Makefile.am: - * apps/gperf/tests/Makefile.am: - * apps/gperf/src/Makefile.am: - * apps/gperf/Makefile.am: - * apps/JAWS/clients/Blobby/Makefile.am: - * apps/JAWS/clients/Makefile.am: - * apps/JAWS/clients/Caching/Makefile.am: - * apps/JAWS/server/Makefile.am: - * apps/JAWS/Makefile.am: - * apps/JAWS2/JAWS/Makefile.am: - * apps/JAWS2/Makefile.am: - * apps/JAWS3/jaws3/Makefile.am: - * apps/JAWS3/Makefile.am: - * apps/soreduce/Makefile.am: - * bin/Makefile.am: - * ACEXML/tests/Makefile.am: - * ACEXML/tests/util/Makefile.am: - * ACEXML/apps/svcconf/Makefile.am: - * ACEXML/apps/Makefile.am: - * ACEXML/common/Makefile.am: - * ACEXML/Makefile.am: - * ACEXML/parser/Makefile.am: - * ACEXML/parser/parser/Makefile.am: - * ACEXML/examples/SAXPrint/Makefile.am: - * ACEXML/examples/Makefile.am: - * websvcs/tests/Makefile.am: - * websvcs/lib/Makefile.am: - * websvcs/Makefile.am: - * netsvcs/clients/Logger/Makefile.am: - * netsvcs/clients/Tokens/rw_lock/Makefile.am: - * netsvcs/clients/Tokens/mutex/Makefile.am: - * netsvcs/clients/Tokens/deadlock/Makefile.am: - * netsvcs/clients/Tokens/collection/Makefile.am: - * netsvcs/clients/Tokens/invariant/Makefile.am: - * netsvcs/clients/Tokens/manual/Makefile.am: - * netsvcs/clients/Naming/Dump_Restore/Makefile.am: - * netsvcs/clients/Naming/Makefile.am: - * netsvcs/clients/Naming/Client/Makefile.am: - * netsvcs/clients/Makefile.am: - * netsvcs/lib/Makefile.am: - * netsvcs/servers/Makefile.am: - * netsvcs/Makefile.am: - * ASNMP/tests/Makefile.am: - * ASNMP/Makefile.am: - * ASNMP/agent/Makefile.am: - * ASNMP/asnmp/Makefile.am: - * ASNMP/examples/get/Makefile.am: - * ASNMP/examples/trap/Makefile.am: - * ASNMP/examples/Makefile.am: - * ASNMP/examples/set/Makefile.am: - * ASNMP/examples/next/Makefile.am: - * ASNMP/examples/walk/Makefile.am: - * examples/OS/Makefile.am: - * examples/OS/Process/Makefile.am: - * examples/Synch/Makefile.am: - * examples/Timer_Queue/Makefile.am: - * examples/Log_Msg/Makefile.am: - * examples/Misc/Makefile.am: - * examples/ASX/CCM_App/Makefile.am: - * examples/ASX/Event_Server/Transceiver/Makefile.am: - * examples/ASX/Event_Server/Event_Server/Makefile.am: - * examples/ASX/Event_Server/Makefile.am: - * examples/ASX/Message_Queue/Makefile.am: - * examples/ASX/UPIPE_Event_Server/Makefile.am: - * examples/ASX/Makefile.am: - * examples/Web_Crawler/Makefile.am: - * examples/Shared_Malloc/Makefile.am: - * examples/QOS/Change_Sender_TSpec/Makefile.am: - * examples/QOS/Diffserv/Makefile.am: - * examples/QOS/Simple/Makefile.am: - * examples/QOS/Change_Receiver_FlowSpec/Makefile.am: - * examples/Bounded_Packet_Relay/Makefile.am: - * examples/System_V_IPC/SV_Message_Queues/Makefile.am: - * examples/System_V_IPC/Makefile.am: - * examples/System_V_IPC/SV_Semaphores/Makefile.am: - * examples/Map_Manager/Makefile.am: - * examples/APG/Svc_Config/Makefile.am: - * examples/APG/ThreadSafety/Makefile.am: - * examples/APG/ThreadPools/Makefile.am: - * examples/APG/Active_Objects/Makefile.am: - * examples/APG/Logging/Makefile.am: - * examples/APG/Misc_IPC/Makefile.am: - * examples/APG/Proactor/Makefile.am: - * examples/APG/Threads/Makefile.am: - * examples/APG/Shared_Memory/Makefile.am: - * examples/APG/Reactor/Makefile.am: - * examples/APG/Signals/Makefile.am: - * examples/APG/Timers/Makefile.am: - * examples/APG/ThreadManagement/Makefile.am: - * examples/APG/Config/Makefile.am: - * examples/APG/Containers/Makefile.am: - * examples/APG/Processes/Makefile.am: - * examples/APG/Naming/Makefile.am: - * examples/APG/Makefile.am: - * examples/APG/Sockets/Makefile.am: - * examples/APG/Streams/Makefile.am: - * examples/Registry/Makefile.am: - * examples/Smart_Pointers/Makefile.am: - * examples/DLL/Makefile.am: - * examples/IPC_SAP/DEV_SAP/reader/Makefile.am: - * examples/IPC_SAP/DEV_SAP/Makefile.am: - * examples/IPC_SAP/DEV_SAP/writer/Makefile.am: - * examples/IPC_SAP/FILE_SAP/Makefile.am: - * examples/IPC_SAP/SOCK_SAP/Makefile.am: - * examples/IPC_SAP/SPIPE_SAP/Makefile.am: - * examples/IPC_SAP/ATM_SAP/Makefile.am: - * examples/IPC_SAP/SSL_SAP/Makefile.am: - * examples/IPC_SAP/UPIPE_SAP/Makefile.am: - * examples/IPC_SAP/FIFO_SAP/Makefile.am: - * examples/IPC_SAP/Makefile.am: - * examples/IPC_SAP/TLI_SAP/Makefile.am: - * examples/Logger/Acceptor-server/Makefile.am: - * examples/Logger/Makefile.am: - * examples/Logger/simple-server/Makefile.am: - * examples/Logger/client/Makefile.am: - * examples/Export/Makefile.am: - * examples/Service_Configurator/Makefile.am: - * examples/Service_Configurator/IPC-tests/server/Makefile.am: - * examples/Service_Configurator/IPC-tests/Makefile.am: - * examples/Service_Configurator/IPC-tests/client/Makefile.am: - * examples/Service_Configurator/Misc/Makefile.am: - * examples/IOStream/server/Makefile.am: - * examples/IOStream/Makefile.am: - * examples/IOStream/client/Makefile.am: - * examples/Threads/Makefile.am: - * examples/Shared_Memory/Makefile.am: - * examples/Reactor/Ntalker/Makefile.am: - * examples/Reactor/TP_Reactor/Makefile.am: - * examples/Reactor/FIFO/Makefile.am: - * examples/Reactor/Multicast/Makefile.am: - * examples/Reactor/WFMO_Reactor/Makefile.am: - * examples/Reactor/Proactor/Makefile.am: - * examples/Reactor/Makefile.am: - * examples/Reactor/Dgram/Makefile.am: - * examples/Reactor/Misc/Makefile.am: - * examples/Connection/non_blocking/Makefile.am: - * examples/Connection/blocking/Makefile.am: - * examples/Connection/Makefile.am: - * examples/Connection/misc/Makefile.am: - * examples/NT_Service/Makefile.am: - * examples/Naming/Makefile.am: - * examples/Makefile.am: - * examples/Mem_Map/IO-tests/Makefile.am: - * examples/Mem_Map/file-reverse/Makefile.am: - * examples/Mem_Map/Makefile.am: - * examples/C++NPv1/Makefile.am: - * examples/C++NPv2/Makefile.am: - - Regenerated. - -Wed Nov 22 13:45:43 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> + * netsvcs/lib/Client_Logging_Handler.cpp: + Fixed compile error on Solaris + +Mon May 22 04:53:29 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> + + * tests/Signal_Test.cpp: + + The change: + Sat May 20 15:10:55 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> + + Was not enough to get this test working on all platforms. + + Revert to using ACE_Sig_Guard in worker_child(). Handle the + SIGINT race condition by raising it if and only if the child + was not shut down by the parent. + +Sun May 21 13:46:49 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> + + * tests/Service_Config_Test.cpp: + + Fixing Windows test failures, because errno gets overriden + between Service Repository::insert() and testLimits(). Most + likely, it happens in ace_yyparse (), however the existing + mechanism for reporting parser errors does not allow for + reliably propagating the cause of the error. Removing the test + for the cause of the error and simply reporting the error, if it + had occured. + +Sat May 20 15:10:55 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> + + * tests/Signal_Test.cpp: + + Changed synchronous tests to block signals at the top level. + This had been done with a ACE_Sig_Guard, but that lead to a race + condition between when the guard was release and the delivery of + the SIGINT the client sends to itself. The SIGINT would then be + handled by the default handler, which terminated the process + before the "Ending" message was written to the log. + + #if'd out the ACE_DEBUG, etc. invocations from handle_signal(). + These result in signal-unsafe functions being called when the + handler is called asynchronously. A braver person would have + just removed them entirely. + +Fri May 19 20:08:29 UTC 2006 Steve Huston <shuston@riverace.com> + + * ace/config-sunos5.6.h: + * ace/os_include/sys/os_mman.h: Moved the declaration of ::madvise() + from config-sunos5.6.h to os_mman.h, to be compiled only when + ACE_LACKS_MADVISE_PROTOTYPE is defined. Set + ACE_LACKS_MADVISE_PROTOTYPE in config-sunos5.6.h where it used to + declare madvise(). This allows autoconf-detected + ACE_LACKS_MADVISE_PROTOTYPE platforms (such as Solaris 9) to + compile correctly. + +Fri May 19 17:53:51 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> + + * ace/Service_Gestalt.cpp: + + Fixed a defect in process_directive () which was replacing the + ENOSPC errno with EINVAL. Added #ifndef ACE_NLOGGING / #endif + around logging statements. + + * ace/Service_Repository.cpp: + + Minor reformating. + + * tests/Service_Config_DLL.cpp: + + Added two independent service objects, to be used in the + testLimits test. See testLimits(). + + * tests/Service_Config_Test.cpp: + + Reworked the testLimits() to avoid printing the word "error", + which confuses the test driver into thinking the test failed. + +Fri May 19 17:51:33 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> + + * ace/Service_Gestalt.cpp: + + Elminated memory leak found by valgrind. + +Fri May 19 17:09:51 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> + + * tests/Service_Config_Test.cpp: + + Fixed a warning due to assignment of a string literal to a + non-const variable. + +Thu May 18 17:42:09 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> + + * bin/diff-builds.pl: + + Contributing a little tool to find the difference in the failing + tests between two dates, on the same build. Or between two + builds, on a particular date. Thanks to Johnny Willemsen + <jwillemsen@remedy.nl> for mining and hosting the data used by + this script. + +Thu May 18 17:33:57 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> * configure.ac: + * m4/config_h.m4: - Update for HTBP unit test and TMCast example move. - - * protocols/tests/HTBP/Reactor_Tests/Reactor_Tests.mpc: - * protocols/tests/HTBP/Reactor_Tests/client.cpp: - * protocols/tests/HTBP/Reactor_Tests/inside.conf: - * protocols/tests/HTBP/Reactor_Tests/server.cpp: - * protocols/tests/HTBP/Reactor_Tests/Makefile.am: - * protocols/tests/HTBP/Reactor_Tests/test_config.h: - * protocols/tests/HTBP/Reactor_Tests/run_test.pl: - * protocols/tests/HTBP/HTBP_Config.conf: - * protocols/tests/HTBP/Send_Large_Msg/client.cpp: - * protocols/tests/HTBP/Send_Large_Msg/Send_Large_Msg.mpc: - * protocols/tests/HTBP/Send_Large_Msg/server.cpp: - * protocols/tests/HTBP/Send_Large_Msg/Makefile.am: - * protocols/tests/HTBP/Send_Large_Msg/run_test.pl: - * protocols/tests/HTBP/Makefile.am: - * protocols/tests/HTBP/Send_Recv_Tests/SendRecv_Test.mpc: - * protocols/tests/HTBP/Send_Recv_Tests/Makefile.am: - * protocols/tests/HTBP/Send_Recv_Tests/SendRecv_Test.cpp: - * protocols/tests/HTBP/htbptest.mpb: - * protocols/tests/HTBP/ping/client.cpp: - * protocols/tests/HTBP/ping/server.cpp: - * protocols/tests/HTBP/ping/Makefile.am: - * protocols/tests/HTBP/ping/ping.mpc: - * protocols/tests/HTBP/ping/run_test.pl: - * protocols/tests/HTBP/README: - - Move HTBP unit tests to protocols/tests/HTBP... - - * tests/HTBP/Reactor_Tests/Reactor_Tests.mpc: - * tests/HTBP/Reactor_Tests/client.cpp: - * tests/HTBP/Reactor_Tests/inside.conf: - * tests/HTBP/Reactor_Tests/server.cpp: - * tests/HTBP/Reactor_Tests/Makefile.am: - * tests/HTBP/Reactor_Tests/test_config.h: - * tests/HTBP/Reactor_Tests/run_test.pl: - * tests/HTBP/HTBP_Config.conf: - * tests/HTBP/Send_Large_Msg/client.cpp: - * tests/HTBP/Send_Large_Msg/Send_Large_Msg.mpc: - * tests/HTBP/Send_Large_Msg/server.cpp: - * tests/HTBP/Send_Large_Msg/Makefile.am: - * tests/HTBP/Send_Large_Msg/run_test.pl: - * tests/HTBP/Makefile.am: - * tests/HTBP/Send_Recv_Tests/SendRecv_Test.mpc: - * tests/HTBP/Send_Recv_Tests/Makefile.am: - * tests/HTBP/Send_Recv_Tests/SendRecv_Test.cpp: - * tests/HTBP/htbptest.mpb: - * tests/HTBP/ping/client.cpp: - * tests/HTBP/ping/server.cpp: - * tests/HTBP/ping/Makefile.am: - * tests/HTBP/ping/ping.mpc: - * tests/HTBP/ping/run_test.pl: - * tests/HTBP/README: - - ...from tests/HTBP. - - * protocols/examples/TMCast/Member/Member.mpc: - * protocols/examples/TMCast/Member/member.cpp: - * protocols/examples/TMCast/Member/Makefile.am: - * protocols/examples/TMCast/Member/README: - * protocols/examples/TMCast/Makefile.am: - - Moved TMCast examples to protocols/examples/TMCast... - - * examples/TMCast/Member/Member.mpc: - * examples/TMCast/Member/member.cpp: - * examples/TMCast/Member/Makefile.am: - * examples/TMCast/Member/README: - * examples/TMCast/Makefile.am: - - ...from examples/TMCast. - -Wed Nov 22 13:25:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> + Changed feature test for socklen_t to #include <sys/types.h> + before <sys/socket.h>. Use cannonical AC_CHECK_TYPE and + AC_DEFINE with a third argument instead of a AH_TEMPLATE for + ACE_HAS_SOCKLEN_T. Fixes configuration on OpenBSD. Thanks to + Vladimir Panov <gbr at voidland dot org> for reporting this bug. - * ace/ace_for_tao.mpc: - Add uuid as base project. For building COIOP as part of the - TAO strategies library we need uuid. The nicest solution would - be to make the uuid feature dependent on the ace_for_tao - feature and let the user overrule this but that is not - possible yet. If you are using ace_for_tao and don't want - to have uuid pulled in, set uuid explicitly to 0 in your - default.features file. +Thu May 18 16:37:46 UTC 2006 Steve Huston <shuston@riverace.com> + + * configure.ac: Set a ACE_VERSION_NAME variable with the version + string (canonical major.minor.beta), which may include a fix kit id. + + * bin/MakeProjectCreator/config/acedefaults.mpb: Change am_version from + libtool's -version-info format (current:revision:age) to the ACE + release number format (major.minor.beta) and rename it am_release. + This is intended for use with the libtool's -release option and will + result in library names that correspond to the ACE kit number. + The -version-info option uses interface numbers meant to indicate a + series of public API numbers. However, with ACE, things change + pretty often. Rather than try to come up with a way of managing + interface numbers, just use the release numbering that users know + and are used to. + +Thu May 18 15:15:16 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> + + * bin/tao_orb_tests.lst: + + Removed Limits from the list of ORB tests because it is now part + of ACE. + + * tests/Service_Config_Test.cpp: + + Added functionality to test gestalt size limits. + +Thu May 18 15:21:33 UTC 2006 Steve Huston <shuston@riverace.com> + + * NEWS: + * ace/Task.{h inl cpp}: Reverted the changes from: + Fri Apr 14 15:53:21 UTC 2006 Steve Huston <shuston@riverace.com> + Tasks that delete themselves from within close() would invalidate + the lock that ACE_Task held across the close() call and perform + undefined and illegal actions on the deleted lock upon return. + Bugzilla #2339 remains unresolved. + +Wed May 17 20:31:11 UTC 2006 Roopa Pundaleeka <roopa@txcorp.com> + + * ace/DLL_Manager.cpp: + * ace/DLL_Manager.h: + The dll handle is added to the to the + handle_vector_ only after the library is opened + successfully. This way, the vector does not have redundant + handles. + + * ace/Object_Manager.cpp: + ACE_DLL_Manager::close_singleton is called explicitly from the + ACE_Object_Manager to make sure ACE_DLL_Manager gets cleaned up, + even if there was an error while opening a lib file. + + Thanks to Timo Kuosmanen <ttkuosma at cc dot jyu dot fi> for + reporting this. -Wed Nov 22 10:48:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> +Wed May 17 14:07:33 2006 Douglas C. Schmidt <schmidt@cse.wustl.edu> + + * netsvcs/lib/Server_Logging_Handler_T.cpp: Improved the code so + that it should compile and run properly on Windows. Thanks to + Phil Mesnier for reporting this. + +Wed May 17 19:07:43 UTC 2006 Steve Huston <shuston@riverace.com> + + * ace/Dynamic_Service_Dependency.h: Doxygen correction; use @c to + set a word in "typewriter" font, but for known class names, there's + no need to do this. + +Wed May 17 17:56:49 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + + * examples/C++NPv1/Logging_Client.cpp + * examples/C++NPv1/Logging_Handler.cpp + * examples/C++NPv2/Logging_Handler.cpp + + Removed now-redundant CDR insertion/extration operators now + defined in ace/Log_Record.{h,cpp} + +Wed May 17 09:35:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/os_include/sys/os_ipc.h: + * ace/os_include/sys/os_socket.h: + * ace/os_include/sys/os_stat.h: + * ace/os_include/sys/os_types.h: + Removed psos support + + * ace/os_include/sys/os_mman.h: + Removed madvice prototype and ACE_LACKS_MADVISE_PROTOTYPE, it + is not set in any config file + +Wed May 17 02:23:31 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> + + * ace/Log_Msg_IPC.cpp: + + Fix typo exposed on systems with ACE_HAS_STREAM_PIPES defined. + I'll leave it to Will & Doug to do whatever the TO DO said to do. + +Tue May 16 22:23:55 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + + * ace/Log_Msg_IPC.cpp + * ace/Log_Record.cpp + * ace/Log_Record.h + * ace/Log_Record.inl + * netsvcs/lib/Client_Logging_Handler.cpp + * netsvcs/lib/Server_Logging_Handler_T.cpp + + Fixed some problems that stemmed from changing ACE_Log_Msg + msg_data_ from a fixed-size array to a dynamically-sized array. + Thanks to Keith Muzzioli <Keith_W_Muzzioli at raytheon dot com>, + John Black <John_K_Black at Raytheon dot com>, and Mitsuo + Fukasawa <fukasawa_mitsuo at nifty dot com> for reporting this + and to Doug Schmidt for helping to fix it! + +Tue May 16 13:20:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/OS_NS_sys_time.inl: + * ace/OS_NS_time.{h,cpp,inl}: + Removed chorus and psos support + + * ace/OS_Thread_Adapter.cpp: + Removed psos support + +Tue May 16 13:09:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/OS_NS_sys_wait.{h,inl}: + Remove chorus support + + * ace/OS_NS_stropts.inl: + * ace/OS_NS_sys_stat.inl: + * ace/OS_NS_string.inl: + Removed psos support + +Tue May 16 13:02:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> * ace/Log_Msg.cpp: - Refactored handling of %W. Added a check for a nill pointer - as we have for ascii strings. Fixes bugzilla 2277. + * ace/OS_NS_arpa_inet.{h,cpp,inl}: + * ace/OS_NS_dirent.inl: + Removed psos support - * tests/Log_Msg_Test.cpp: - Added test for %W with a string as argument and with a - nill pointer. Fixes bugzilla 2715. + * ace/INET_Addr.cpp: + * ace/config-macros.h: + Removed chorus support + + * ace/Unbounded_Queue.h: + Removed remark about chorus + + * ace/config-cray.h: + Removed explicit template instantiation define, we don't have that + anymore + + * ace/config-hpux-11.00.h: + * ace/config-sunos5.7.h: + * ace/config-rtems.h: + * ace/config-osf1-4.0.h: + Removed kcc support + +Mon May 15 11:30:14 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> + + * bin/tao_other_tests.lst: + Added more tests that can't run in ACE_FOR_TAO configations due + to dependency on something that avoids ACE_FOR_TAO. + +Mon May 15 01:15:45 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> + + * bin/tao_orb_tests.lst: + * bin/tao_other_tests.lst: + Added !ACE_FOR_TAO to those tests for which MPC skips generating + executables because it directly or indirectly avoids ACE_FOR_TAO. + Indirect avoidance occurs when a project derives from a base + project that avoids ACE_FOR_TAO. -Wed Nov 22 10:38:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> +Thu May 11 12:37:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - * examples/Misc/test_XtReactor1.cpp: - * examples/Misc/test_XtReactor2.cpp: - * tests/FlReactor_Test.cpp: - * tests/XtReactor_Test.cpp: - * tests/TkReactor_Test.cpp: - * tests/QtReactor_Test.cpp: - Updated because of move below. + * ace/Message_Block.h: + Doxygen improvements + +Thu May 11 11:15:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> -Wed Nov 22 10:35:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> + * ace/Dev_Poll_Reactor.cpp: + Removed chorus support - * ace/QtReactor*.*: - * ace/FlReactor*.*: - * ace/XtReactor*.*: - * ace/TkReactor*.*: - Moved these reactors to their own subdirectories to make - maintenance a lot easier. +Thu May 11 07:19:12 UTC 2006 Kees van Marle <kvmarle@remedy.nl> -Wed Nov 22 10:45:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> + * bin/tao_orb_tests.lst: + Added Bug_1254_Regression - * bin/MakeProjectCreator/config/core_anytypecode.mpb: - Removed svn:executable property +Wed May 10 14:10:02 UTC 2006 Steve Huston <shuston@riverace.com> - * bin/MakeProjectCreator/config/core_strategies.mpb - New base project for the strategies library when build in - ace_for_tao configuration + * ace/config-win32-msvc-7.h: MSVC 7.1 operator new throws an exception + on an out-of-memory condition, but only when the standard C++ + library is used; the older CRT new() doesn't. + +Tue May 9 11:38:30 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> * bin/MakeProjectCreator/config/orbsvcslib.mpb: - Removed -GT so that we also don't generate TIE files for the - orbsvcs anymore. Will speedup builds and simplify other mpc - files + Add -GT to the idlflags, all orbsvcs then do generate the TIE files, + if people then use them, they get them out of the box. - * bin/MakeProjectCreator/config/strategies.mpb - Derive from core_strategies. Now the strategies library - does get build in an ace_for_tao configuration but - shmiop and uiop are not build at all, other protocols - can be build. This way we can build COIOP in an ace_for_tao - setup +Tue May 9 07:36:30 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - * bin/make_release: - Removed dsp/dsw reference, corrected naming of the ACE - packages when the version number gets added. + * bin/MakeProjectCreator/config/taoidldefaults.mpb: + Removed -Sc, added -GT, see bugzilla bug 2525 for more info - * include/makeinclude/platform_hpux_aCC.GNU: - Removed HPUX 10.20 support +Tue May 9 07:25:30 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - * include/makeinclude/platform_lynxos.GNU: - ACE_HAS_BROKEN_THREAD_KEYFREE is now set in the config file + * ace/Condition_T.{h,cpp,inl}: + * ace/Local_Name_Space_T.cpp: + * ace/Configuration.cpp: + * ace/Sched_Params.cpp: + * ace/Mutex.{h,cpp,inl}: + * ace/Select_Reactor_T.cpp: + * ace/Signal.cpp: + Removed Chorus support - * include/makeinclude/wrapper_macros.GNU: - Removed ACE_HAS_GNUG_PRE_2_8 checks + * ace/CDR_Stream.cpp: + Small layout change -Wed Nov 22 09:07:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> + * ace/Event_Handler.cpp: + Removed psos support - * docs/run_test.txt: - Document ACE_RUN_VX_TGT_HOST + * ace/Message_Block.h: + Doxygen improvements - * docs/bczar/bczar.html: - Updated this file + * ace/Message_Block.cpp: + Const improvement - * ace/config-freebsd.h: - * ace/POSIX_Proactor.cpp: - Added ACE_HAS_SIGVAL_SIGVAL_INT, this fixes bugzilla - bug 2716. Thanks to Craig Rodrigues - <rodrigc at crodrigues dot org> for reporting this. +Sun May 7 21:03:30 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> - * ace/ace.mpc: - Added missing OS.inl. This fixes bugzilla bug 2705. - Thanks to Daniel Black <dragonheart at gentoo dot org> - for reporting this. + * ace/Service_Config.{h,cpp}: - * Release: - Removed dsw files + Weeding out the remaining issues with single threaded + builds. The implementation now relies on the ACE_TSS_* macros to + abstract from the differences among build styles and platform + support for TSS. - * ace/config-rtems.h: - * ace/config-posix-nonetworking.h: - Moved the configuration to build without no networking - support to its own file so that we can reuse this for - example on linux + * ace/Service_Gestalt.{h,cpp}: - * ace/config-rtems.h: - Added support for rtems 4.7 + Eliminated commented out code. Minor reformatting in places. - * ace/config-unixware-7.1.0.udk.h: - Cleanup + * ace/TSS_T.{h,inl,cpp}: - * ace/config-lyxos.h: - Added support for LynxOS 4.2 + Added some comments to help others avoid a few pitfalls. Made + ts_init() a non-const, which eliminates a few const_cast's. - * ace/config-linux.h: - * ace/config-linux-common.h: - Moved ACE_HAS_GETIFADDRS to the common file and added - support for ACE_LACKS_NETWORKING on linux +Sun May 7 07:02:51 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> - * ace/INET_Addr.cpp: - * ace/OS_NS_netdb.cpp - Fixed compile problem when using ACE_LACKS_NETWORKING on - linux + * ace/Service_Config.h: + * ace/Service_Config.cpp: - * ace/Obstack.h: - Use ACE_EXPORT_SINGLETON_DECLARATION to resolve link errors - on FC6. Thanks to Ken Sedgwick <ken at bonsai dot com> for - reporting this and testing out the patch. + Refactored the TSS usage (again) to fix a nasty + order-of-initialization problem. The gist of which is that, if + the ptr (to a template class instance) is a static member, in + static builds, it will be initialized by the process prologue + code *after* another static initializer has had the chance to + use and assign it a value. The solution was to use a method + scope static instance, which C++ guarantees to be initialized by + the (first) exit from that method. - * ace/OS_NS_string.inl: - Initialise pointer with 0 + * ace/Service_Gestalt.h: + * ace/Service_Gestalt.cpp: + + Refactored the construction to avoid using straight new in + constructor initializer lists. Replaced new with ACE_NEW_* where + appropriate. + +Sat May 6 18:08:13 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> + + * configure.ac: + + Add feature tests for ACE_LACKS_ASCTIME, ACE_LACKS_ACSTIME_R, + ACE_LACKS_GETCWD, ACE_LACKS_GMTIME, ACE_LACKS_GMTIME_R, + ACE_LACKS_LOCALTIME, and ACE_LACKS_STRFTIME. + +Sat May 6 09:52:06 2006 Douglas C. Schmidt <schmidt@cse.wustl.edu> + + * examples/DLL/test_dll.cpp: Renamed the DLLs and removed the "./" + from the pathname. Thanks to Sam and Roopa for reporting this + and tracking it down, respectively. + +Sat May 6 10:23:13 UTC 2006 Steve Huston <shuston@riverace.com> + + * include/makeinclude/platform_sunos5_sunc++.GNU: Add -lrt -laio to + the LIBS. The Proactor framework needs this; I'm not sure why it + never showed up until static builds were run. + +Tue Apr 25 10:22:16 2006 Douglas C. Schmidt <schmidt@cse.wustl.edu> + + * ace/OS_NS_string.cpp (strerror): Do a sanity check to make sure + errnum >= 0 and < _sys_nerr and set errno to EINVAL if things + are not sane. Thanks to Aleksandar Vukajlovic <vukajlo at + finsoft dot co dot yu> for this fix. + +Fri May 5 19:37:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Default_Constants.h: + Added a compile time check that ACE_DEFAULT_CDR_BUFSIZE must be + defined to a value bigger then 0, it is 0 we get in a never ending + loop in the CDR code + +Fri May 5 17:01:32 UTC 2006 Steve Huston <shuston@riverace.com> + + * examples/Service_Configurator/IPC-tests/client/local_spipe_client_test.cpp: + * examples/Service_Configurator/IPC-tests/client/remote_thr_stream_client_test.cpp: + * examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.{cpp i h}: + Wide-char corrections. + +Fri May 5 13:11:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/FIFO.cpp: + * ace/os_include/os_stddef.h: + Removed psos support + + * ace/config-WinCE.h: + * ace/os_include/os_stddef.h: + Moved setting of ACE_LACKS_STDDEF_H and ACE_LACKS_PTRDIFF_T to the + WinCE file + +Fri May 5 13:08:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * include/makeinclude/platform_openvms.GNU: + Changed the way templates are handled + +Fri May 5 11:42:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Reactor_Token_T.h: + Removed workaround for vc6 + +Fri May 5 08:38:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/MMAP_Memory_Pool.{h,cpp}: + Made guess_on_fault_ a real bool + +Fri May 5 08:09:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/os_include/os_dirent.h: + * ace/os_include/os_errno.h: + * ace/os_include/os_netdb.h: + * ace/os_include/os_stdint.h: + * ace/os_include/os_time.h: + * ace/os_include/os_string.h: + * ace/os_include/os_stdlib.h: + Removed psos support + + * ace/os_include/os_dlfcn.h: + * ace/os_include/os_signal.h: + Removed psos and kcc support + + * ace/os_include/os_pthread.h: + Removed chorus support + + * ace/os_include/os_unistd.h: + Removed chorus and psos support + +Fri May 5 07:59:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/OS_NS_sys_utsname.cpp: + * ace/OS.h + Removed psos and chorus support + + * ace/OS_NS_fcntl.cpp: + * ace/Lib_Find.cpp: + * ace/OS_NS_netdb.inl: + Removed psos support + + * ace/Mem_Map.cpp: + Removed chorus support + + * ace/IOStream.h: + Removed checks for KCC compiler + +Fri May 5 07:42:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Base_Thread_Adapter.h: + * ace/SPIPE_Connector.cpp: + * ace/SOCK_Dgram.cpp: + * ace/Select_Reactor_T.cpp: + * ace/Handle_Set.cpp: + Removed code for psos, support for this platform will be removed + + * ace/CDR_Base.h: + Removed check for KCC compiler + + * ace/Malloc_Allocator.h: + Doxygen improvement + +Thu May 4 22:11:06 UTC 2006 Steve Huston <shuston@riverace.com> + + * ace/Message_Block.h: Made ACE_Data_Block::release_i() virtual. + Thanks to Gary Fernandez <gary dot fernandez at ironmountain dot + com> for this change. + +Thu May 4 21:07:10 UTC 2006 Steve Huston <shuston@riverace.com> + + * ace/SPIPE_Acceptor.cpp (create_new_instance, close): Have to use + ACE_TEXT_ALWAYS_CHAR to pass pipe name on wide-char w/ + ACE_HAS_STREAM_PIPES. Thanks to Gary Fernandez <gary dot + fernandez at ironmountain dot com> for this fix and to Yasser + Zabuair <yzabuair at hotmail dot com> for also reporting it. This + fixes bugid 2541. + + * THANKS: Added Gary and Yasser to the Hall of Fame. + +Thu May 4 08:50:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + Reverted the change below, broke the sendfile test and Steve + Huston changed things in such a way that sendfile is only + used on Solaris 9 and newer + + Tue May 2 09:34:54 Pacific Daylight Time 2006 <ossama_othman at symantec dot com> + * ace/OS_NS_sys_sendfile.inl (sendfile): + Removed "::" global scope qualifier from platform sendfile() + call. It caused problem on Solaris 8. Thanks to Simon Massey + and Johnny Willemsen for analyzing the problem and suggesting + this fix. + +Thu May 4 08:36:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/ace_for_tao.mpc: + Added OS_NS_sys_sendfile + +Thu May 4 00:43:32 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> + + * ace/Makefile.am: + + Add Dynamic_Service_Dependency.{cpp,h} to appropriate lists. + +Wed May 3 16:02:10 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> + + * ace/Service_Config.h: + * ace/Service_Config.cpp: + + Fixed a problem due to an attempt to access current_ before it + has been initialized (a static ACE_TSS instance). The current_ + is now just a pointer to an ACE_TSS instance, which gets + dynamicaly allocated upon invoking the current() method. The + deallocation of that instance is left up to the Object Manager + with which the dynamic ACE_TSS instance is registered. + + * ace/TSS_T.h: + + Added a ACE_TSS_SET () to complete the set of TSS access + operations, which should work regardless of threading, TSS + emulation and TSS availability. + +Wed May 3 11:52:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Mem_Map.inl: + Small const improvements + +Wed May 3 10:39:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Mem_Map.{h,cpp,inl}: + Made close_handle_ a bool + +Wed May 3 08:56:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/config-macros.h: + Removed support for KCC + +Wed May 3 08:14:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/OS_NS_sys_sendfile.h: + Export sendfile_emulation to resolve link problems in the + windows builds + +Wed May 3 03:36:23 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> + + * ace/Svc_Conf_y.cpp: + + Moved the ACE_BEGIN_VERSIONED_NAMESPACE_DECL macro to include + ace_yyparse. + +Tue May 2 09:34:54 Pacific Daylight Time 2006 <ossama_othman at symantec dot com> + + * ace/OS_NS_sys_sendfile.inl (sendfile): + + Removed "::" global scope qualifier from platform sendfile() + call. It caused problem on Solaris 8. Thanks to Simon Massey + and Johnny Willemsen for analyzing the problem and suggesting + this fix. + +Tue May 2 10:34:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/config-WinCE.h: + Added ACE_LACKS_GETCWD, ACE_LACKS_ASCTIME, ACE_LACKS_ASCTIME_R, + ACE_LACKS_GMTIME, ACE_LACKS_GMTIME_R, ACE_LACKS_LOCALTIME and + ACE_LACKS_STRFTIME. These macros are new and will be used soon + in the ACE_OS layer. + +Mon May 1 19:49:45 UTC 2006 Steve Huston <shuston@riverace.com> + + * ace/ARGV.{h i cpp}: Filled out more of the documentation in this + class, specifically mentioning that the class will enforce the + "whitespace separates tokens, except when quoted" rule of command + line parsing that's consistent with ACE_Get_Opt, etc. Also removed + documentation of non-existant restrictions such as after using + add(), can't use buf(). + Removed the State enum since the only value ever used was ITERATIVE, + and changed "int state_" to "bool iterative_" (and removed the + state() accessor). Changed substitute_env_args_ from int to bool. + + * ace/OS_NS_unistd.{h cpp} (argv_to_string, string_to_argv): Changed + the substitute_env_args parameter from "int" to "bool" to better + reflect what it is, a yes/no indicator. + +Mon May 1 06:53:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * include/makeinclude/platform_sunos5_g++.GNU: + * include/makeinclude/platform_sunos5_sunc++.GNU: + Also for solaris 10 link the sendfile lib + +Sun Apr 30 04:21:37 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> + + * ace/Svc_Conf_y.cpp: + What I meant to commit last time. + +Sun Apr 30 02:21:16 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> + + * ace/Svc_Conf_y.cpp: + Eliminating more warnings from the scoreboard. I'm not sure the + best way to add this patch to ace/svcconf.mpb, since it affects + more than just gnuace targets. The easiest would be to store the + diff between this commit and the previous version and run patch, + but I'm not sure how to integrate that solution. + +Sat Apr 29 13:58:28 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> + + * ace/Service_Gestalt.cpp: + More fuzz cleanup. + +Sat Apr 29 13:17:24 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> + + * ace/ACE.cpp: + Fuzz cleanup. + + * THANKS: + Added credits. + +Fri Apr 28 22:31:52 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> + + * ace/Service_Gestalt.cpp: + + Removed an ';' after ACE_TRACE, which was confusing GCC4 with + "hidden visibility" enabled. + +Fri Apr 28 21:22:53 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> + + * ace/Service_Config.cpp: + * ace/Service_Gestalt.cpp: + + More re-formatting to weed out those pesky tabs. + +Fri Apr 28 20:57:19 UTC 2006 Steve Huston <shuston@riverace.com> + + * ace/config-sunos5.8.h: + * ace/config-sunos5.9.h: Moved ACE_HAS_SENDFILE from Solaris 8 to + Solaris 9. Solaris 8 supports sendfilev[64] but not sendfile, + at least not without some patches I don't know about. + +Fri Apr 28 20:13:41 UTC 2006 Steve Huston <shuston@riverace.com> + + * include/makeinclude/platform_sunos5_g++.GNU: + * include/makeinclude/platform_sunos5_sunc++.GNU: + Solaris 9 puts sendfile() is a separate library, so LIBS needs + -lsendfile on Solaris 9. + +Fri Apr 28 18:03:11 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> + + * ace/ACE.cpp: + * ace/DLL.cpp: + * ace/DLL_Manager.cpp: + * ace/Dynamic_Service_Base.cpp: + * ace/Dynamic_Service_Dependency.cpp: + * ace/Parse_Node.cpp: + * ace/Service_Config.inl: + * ace/Service_Config.cpp: + * ace/Service_Gestalt.cpp: + * ace/Service_Object.cpp: + * ace/Service_Repository.cpp: + * ace/Service_Types.cpp: + * ace/Shared_Object.cpp: + + Applied formatting style consistent with ACE convention. + +Fri Apr 28 15:48:25 UTC 2006 Steve Huston <shuston@riverace.com> + + * ace/Service_Config.cpp (open_i): ACE_DEFAULT_SVC_CONF shouldn't + be enclosed in ACE_LIB_TEXT since it's defined in terms of + ACE_LIB_TEXT already. + +Fri Apr 28 15:49:21 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> + + * ace/Makefile.am: + Added new Service_Gestalt files to the appropriate lists. + +Fri Apr 28 15:42:59 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> + + * ace/Service_Config.cpp: + Fixed a problem killing some wchar builds. + + * ace/Service_Gestalt.h: + Cleaned up the long-lines of the UNIMPLEMENTED functions. + +Fri Apr 28 15:26:53 UTC 2006 Steve Huston <shuston@riverace.com> + + * ace/Timer_Queue_Adapters.h: Clarified the use and restrictions with + ACE_Async_Timer_Queue_Adapter. + +Fri Apr 28 15:22:35 UTC 2006 Steve Huston <shuston@riverace.com> + + * apps/JAWS2/JAWS/Concurrency.cpp: Removed unused variables. + +Fri Apr 28 14:54:04 UTC 2006 Steve Huston <shuston@riverace.com> + + * ace/config-macros.h: HP aC++ needs to see the statement in + ACE_NOTREACHED up to the version 6 series (Integrity). Also see + Tue Apr 11 13:12:36 UTC 2006 Simon McQueen <sm@prismtech.com> + +Fri Apr 28 14:31:48 UTC 2006 Steve Huston <shuston@riverace.com> + + * ace/Service_Gestalt.h: Removed extraneous ';' from + ACE_UNIMPLEMENTED_FUNC usage. + + * m4/ace.m4: Fixed incorrect variable referenced in case during + --enable-uses-wchar. Thanks to Paul Robinson <probinson at + gmail dot com> for reporting this. + +Fri Apr 28 14:03:50 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> + + * ace/Dynamic_Service.h: + * ace/Parse_Node.h: + + Fixed the usage of ACE_UNIMPLEMENTED_FUNC to remove the trailing + semicolon. It was causing build errors on compilers that define + the macro as empty. + +Fri Apr 28 13:55:01 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> + + * ace/Service_Gestalt.h: + + Fixed the usage of ACE_UNIMPLEMENTED_FUNC to remove the trailing + semicolon. It was causing build errors on compilers that define + the macro as empty. + +Fri Apr 28 13:29:08 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> + + * bin/tao_orb_tests.lst: + + Updated the conditions for running the ORB-specific service + repository tests. + +Fri Apr 28 13:23:57 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> + + * ace/Service_Config.h: + + Updated the declaration of current_ to match the definition in + its use of ACE_TSS_TYPE macro, as they are not equivalent for + a single-threaded builds. + +Fri Apr 28 13:21:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/Process_Mutex_Test.cpp: + When spawn fails log an error and exit instead of using an assert + which causes an abort of the exe + +Fri Apr 28 13:15:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/Pipe_Test.cpp: + When spawn fails log an error and exit instead of using an assert + which causes an abort of the exe + +Fri Apr 28 12:49:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/config-openvms.h: + Added __SIGNED_INT_TIME_T so that we get a signed time_t that + matches the POSIX spec that ACE expects. + +Fri Apr 28 12:23:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/config-openvms.h: + Removed comments, macros are documented in generally, added + ACE_LACKS_PERFECT_MULTICAST_FILTERING + +Fri Apr 28 11:11:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/PerlACE/Process_VMS.pm: + New file to be able to run the tests automatically on OpenVMS + + * bin/PerlACE/Process.pm: + When running on OpenVMS use Process_VMS + + * ace/config-openvms.h: + Added ACE_HAS_SIGISMEMBER_BUG + + * tests/run_test.pl: + If ACE_ROOT is not set, add ../bin to lib + +Fri Apr 28 09:23:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/Process_Manager_Test.cpp: + Also create a logfile for each child process started + +Fri Apr 28 08:06:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/run_test.lst: + Added Sendfile_Test + +Fri Apr 28 08:04:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/Sendfile_Test.cpp: + Added missing include + +Thu Apr 27 21:04:08 UTC 2006 Steve Huston <shuston@riverace.com> + + * ace/OS_Memory.h: Allow configs to set ACE_bad_alloc to avoid + extending the if-elif chain here further. + + * ace/config-win32-msvc.h: Regardless of MSVC version, MFC changes + operator new to throw CMemoryException on out-of-memory condition. + Version-specific settings still control the setting of + ACE_HAS_NEW_NOTHROW. Thanks to Mohit Kapoor <Mohit dot Kapoor at + siemens dot com> for this fix. + + * ace/Select_Reactor_T.cpp (handle_error): HACK ALERT! Some Linux + kernels will return from select() with an "invalid" errno value, + ERESTARTNOHAND, when compiled with profiling enabled. This works + around the problem. This is a known kernel bug; see Red Hat Bugzilla + https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=161468 and + https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=123648 as well + as Riverace support issue #167 and Riverace's complaint to Red Hat, + support issue #17841808. + + * THANKS: Added Mohit Kapoor to the Hall of Fame. + +Thu Apr 27 20:14:52 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> + + * ace/Service_Gestalt.cpp: + + Fixed a complaint from a ACE_NDEBUG builds about unrefrenced + variable (only used in ACE_ASSERT). + +Thu Apr 27 18:33:18 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/Aio_Platform_Test.cpp: + When AIO is not available, just print an info message and exit + + * tests/run_test.lst: + Added Aio_Platform_Test, it was not in this file at all + +Thu Apr 27 18:21:17 UTC 2006 Steve Huston <shuston@riverace.com> + + * ace/config-aix-5.x.h: Added ACE_HAS_SIGSUSPEND. + +Thu Apr 27 14:57:10 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> + + * ace/Svc_Conf.y: + * ace/Svc_Conf_Tokens.h: + * ace/Svc_Conf_y.cpp: + + Fixed fuzz complaint about #include inside a versioned namespace + in Svc_Conf_y.cpp. It was due to a code that Bison generates a + part of the parser, from Svc_Conf.y. Changed the versioned + namespace to encloses the non-generated code only, while the + rest of the parser seems to be designed so that multiple parses + can coexist without name clashes. + +Thu Apr 27 14:29:07 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> + + * ace/Dynamic_Service_Dependency.h: + * ace/Dynamic_Service_Dependency.cpp: + + Updated to remove an empty inl file. + + * ace/Dynamic_Service_Dependency.inl: + + Removed this file. + +Thu Apr 27 14:00:18 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Sock_Connect.cpp: + Implemented get_ip_interfaces for OpenVMS + +Thu Apr 27 11:19:18 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Array_Map.h: + * ace/ATM_Addr.h: + * ace/Atomic_Op_T.h: + * ace/Base_Thread_Adapter.h: + * ace/Cached_Connect_Strategy_T.h: + * ace/Capabilities.h: + * ace/Default_Constants.h: + * ace/Hash_Map_Manager_T.h: + * ace/Log_Msg_Callback.h: + * ace/Log_Msg_IPC.h: + * ace/Map_Manager.h: + * ace/POSIX_Asynch_IO.h: + * ace/POSIX_Proactor.h: + * ace/RB_Tree.h: + * ace/Strategies_T.h: + * ace/Timer_Heap_T.h: + * ace/Timer_List_T.h: + * ace/Timer_Queue_Adapters.h: + * ace/Timer_Queue_T.h: + * ace/Timer_Wheel_T.h: + Fixed doxygen warnings + +Thu Apr 27 01:49:18 UTC 2006 Ossama Othman <ossama@dre.vanderbilt.edu> + + * ace/OS_NS_sys_sendfile.h (sendfile, sendfile_emulation): + * ace/OS_NS_sys_sendfile.cpp (sendfile_emulation): + + ACE_LOFF_T -> off_t. Expected ACE_LOFF_T behavior is still + under scrutiny. + + * ace/OS_NS_sys_sendfile.inl: + + Added missing <sys/sendfile.h> include directive. Addresses + infinite recursion at run-time when ACE_HAS_SENDFILE is defined. + + (sendfile): + + ACE_LOFF_T -> off_t, as above. + +Wed Apr 26 22:00:21 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> + + * ace/Parse_Node.h: + * ace/Service_Gestalt.h: + + Correcting a build problem, caused by the extraneous semicolons + after ACE_UNIMPLEMENTED_FUNC + +Wed Apr 26 20:21:49 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> + + The motivation for these changes was to enable support in ACE + for multiple instances of Service Configuration Repository, or + more appropriately - "Gestalt" (from the German word, meaning + something that's more than the sum of its parts). This is + feature is necessary to enable support for ORB-specific, or more + generally - service-specific sets of services, i.e. to be able + to have dynamically loaded services to use their own private set + of service objects. In the context of the implementation I will + use "gestalt" as a synonym for service configuration context or + service configuration repository. + + In order to accomplish this, the "instance"-related + functionality of the former ACE_Service_Config class has been + moved to another class - ACE_Service_Gestalt. The + ACE_Service_Config retains all static interfaces and those + members, pertaining to the concept of process-wide configuration + state. The service config, as known today has been retained as a + concept, but in its specialized semantics as holding a + process-wide configuration state. The primary concept expressing + an instance of configuration context is the gestalt. The + implementation actually uses a specialization of + ACE_Service_Gestalt in order to implement ACE_Service_Config as + a singleton, special case of configuration context. + + The static methods in ACE_Service_Config provide access to + process-wide gestalt (ubergestalt, anyone?) instance. + + For more details, here is the history of all included changes, + with their motivation and explanation. It is ordered + alphabetically, by the names of the changed files: + + * ace/ACE.cpp: + + Added to the condition evaluating ACE::debug() to include a + check if environmental variable ACE_DEBUG has been set. + + Updated the debug() function to call getenv() only once by using + a method-local static variable to hold the value from the + environment. + + * ace/DLL.h: + * ace/DLL.cpp: + + Implemented an operator=, needed in order to implement the + ACE_Service_Configuration_Guard class. + + * ace/DLL_Manager.cpp: + + Improved the error diagnostics so that a "file not found" would + not mask a "symbol not defined" error when loading a DLL. + + * ace/Dynamic_Service.h: + + "Privatized" copy ctor and operator= for ACE_Dynamic_Service + objects since it is not designed for such operations. + + * ace/Dynamic_Service.inl: + + Added overloaded method instance() for ACE_ANTI_TCHAR. + + * ace/Dynamic_Service.cpp: + + Changes to enable instantiation of a service, based on the + registration in a particular service repository. Adding a method + that takes ACE_Service_Gestalt* additional parameter. + + * ace/Dynamic_Service_Base.h: + * ace/Dynamic_Service_Base.cpp: + + Factored out a find_i() method to be used by the friend + ACE_Dynamic_Service_Dependency class. It implements the specific + lookup policy that extends the search to the global repository + if the named service object can not be found locally. + + Added instance method, allowing the caller to explicitly specify + the gestalt. + + * ace/Dynamic_Service_Dependency.h: + * ace/Dynamic_Service_Dependency.inl: + * ace/Dynamic_Service_Dependency.cpp: + + A newly introduced class, whose instances are designed to be + embedded inside instances of other classes, typically created by + DLL-based factories (service objects). This provides a way to + declare dependency on a specific service, thus avoiding order of + initialization issues with objects whose implementation code + resides in dynamically loaded services. + + It is disastrous to have dynamically loadable services create + and give away ownership of objects and then be unloaded before + all those instances have been deleted. Normally the code for + such objects classes resides within the TEXT segment of the DLL, + which implements the service. If a service gets removed, its DLL + may be unmapped from memory and then any attempt to invoke a + method on the said objects will cause SEGV. + + Such instances must contain a member of + ACE_Dynamic_Service_Dependency initialized with the service they + depend on. @code ACE_Dynamic_Service_Dependency's constructor + and destructor are "magical" - they work by maintaining the + underlying dynamic service's DLL reference count. + + The problem was not present before because the one Service + Repository outlived any other user objects. Now that an + un-loadable service can own its configuration, the sequence of + service finalization has been reversed. + + Updated the implementation of ACE_Dynamic_Service_Dependency + class to ease debugging. ACE_Dynamic_Service_Dependency gets + initialized whenever a dependent service gets loaded, to help us + keep our access to dependent instances after their DLL is gone + (by upping the ref count on the DLL). + + Updated usage of gestalt's instance() to current(). Removed + unnecessary comments. + + * ace/Global_Macros.h: + + Changed the ACE_STATIC_SVC_DEFINE to use the new + ACE_Service_Config::insert () method, which allows to streamline + the Service Configuration interface and promote hiding the + storage used for the static service descriptors. + + * ace/Parse_Node.h: + * ace/Parse_Node.cpp: + + Changes to aid in keeping track of the gestalt, while deep in + the guts of the svc.conf parser. + + Replaced the ACE_Service_Gestalt & in the method signatures with + ACE_Service_Gestalt * to unify the interfaces. + + Updated the static function node's logic to use only + ACE_Service_Gestalt public members and to no longer rely on + knowledge about the internal storage representation of service + repository. + + Removed a static_cast<> in ACE_Static_Function_Node::symbol() + that was causing problems on some platforms. It was not even + necessary as both sides were of the same type. + + * ace/Service_Config.{h,inl,cpp}: + + This separates the responsibilities between the service gestalt, + which represents an _instance_ of configuration information, and + the service config, which represents a special, process-wide, + global configuration repository. Since both these entities + represent the same concept - service configuration state, but + from different aspects, the ACE_Service_Config now inherits + (publicly) from ACE_Service_Gestalt. + + Lots of instance-related code moved to ACE_Service_Gestalt + Replaced the use of char with ACE_ANTI_TCHAR and the appropriate + ACE_TEXT_* macros. + + Moved the parsing of command-line options, pertaining to the + process as a whole, here - in the parse_args_i () (protected, + virtual). + + In order to resolve a problem caused by the inability of a + dependent static service to determine which gestalt they need to + register with, the concept of "current" was separated from the + "global" gestalt. The current gestalt is pointed to by a + pointer, stored in thread-specific storage (TSS) and manipulated + by the ACE_Service_Config_Guard class that implements the + "resource acquisition is initialization" idiom. + + Fixed an error in the separation of responsibilities between the + instance gestalt and the global (ubergestalt), during + initialization. The bug can cause infinite recursion, when + initializing an ORB, housed in a dynamic service. The singleton + gestalt (i.e. ACE_Service_Config) must be initialized through + open_i(), before open_i() can proceed initializing the specific + gestalt instance. The difficulty is in that some use cases + reverse the order of initialization by calling + ACE_Service_Config::open () first and then, at some point call + the instance gestalt open_i(). The solution is to use the + is_initialized_ member together with an explicit call to + ACE_Service_Config::global()->open_i(). To ease debugging of + the process of registering static service, I have changes the + ACE_Service_Config::static_svcs() to return + ACE_Service_Gestalt::instance (), instead. Thus all the + ACE_STATIC_SVC* macros are still working (no need to change + existing code), but now there is a convenient place to debug - + see the newly added ACE_Service_Gestalt::insert () method. The + header file no longer declares ACE_STATIC_SVCS, + ACE_STATIC_SVCS_ITERATOR, ACE_SVC_QUEUE and + ACE_SVC_QUEUE_ITERATOR. Those are now protected typedefs in + ACE_Service_Gestalt, where they are actually used. + + Added new insert () method to use instead of the sequence + static_svc ()->insert () which unnecessary exposes the internal + storage structure of Service Configurator. Made no_static_svcs_ + an instance member, instead of a class (static) member, thus + providing for ability to set it per instance, not globally. + + Added default values for open_i() and declared private copy ctor + and assignment operator for ACE_Service_Config_Guard, since it + is not intended to be copied. + + Similarly, moved the parts of the open_i() functionality that + did not belong in every instance of the gestalt. + ACE_Service_Config is again a process-wide Singleton,registered + with ACE_Object_Manager. + + Eliminated old #if 0-ed code in Service_Config.cpp. + + * ace/Service_Gestalt.h: + * ace/Service_Gestalt.inl: + * ace/Service_Gestalt.cpp: + + Encapsulates the idea of Service Configuration repository, or + configuration context. + + Changed open_i to be able to detect if it is working on the + special, process-wide instance (ubergestalt) or a "plain" + gestalt instance, since there are things that must only be done + once per process - like signal handler, logging key and + daemon-ization of the whole process. + + Added an ignore_static_svcs parameter to + ACE_Service_Gestalt::open_i in order to preserve the prior + behavior of the singleton ACE_Service_Gestalt instance. Even + though its no_static_svcs_ member was being initialized with 1, + some clients (TAO) needs to be able to override it. Since now a + call to open_i on an instance gestalt may precede in time the + call to open_i on the ubergestalt, we need a mechanism to allow + the no_static_svcs_ value to be overridden. + + Added the insert()'s implementation (described above). Added a + singleton() method to return the process-wide gestalt singleton + (or ubergestalt?:). Used in open_i() to account for the fact + that now a Service Gestalt may be called to open () prior to + open () on the singleton instance, which would typically contain + the bulk of the static service object descriptors. + + There was a problem with "hybrid" service objects, i.e. dynamic + SO which contains static SO (dependent services). The dependent + services are typically registered via static ctor or static + initializer at the point of loading of the dynamic SO's DLL. As + such, they end up registering before the dynamic SO. Upon + finalization of the service repository, the dynamic SO is + finalized first, thus unloading its DLL and unmapping the TEXT + segment, where the dependent static services code is. When + next, the static SO is to be finalized its memory is no longer + at valid address. The change ensures the dynamic service is + registered *before* its dependent static services and will + therefore be finalized last. The solution is based upon the + concept of forward declaring a dynamic service, named after the + configuration file being processed. Before processing a file, + we simply check for an existing service with the same name and + "pass" if we find one. + + Fixed the ACE_Service_Config_Guard's detection of the case where + the forward service declaration was not replaced by a proper + declaration as expected. It now properly removes the forward + decl, not the "good" instance. + + Cleared up the TSS management issue, causing executable to crash + on startup. The problem was due to an order-of-instantiation + issue, involving the TSS-based pointer to the current + gestalt. Used ACE_Object_Manager's shutting_down and starting_up + methods to determine if it is safe to use the static ACE_TSS + instance. + + Added const-ness for find(). Removed prototypes for initialize, + resume, suspend and remove that used plain char type and + conditionally compiled in only for WinCE and + ACE_USES_WCHAR. Service_Config still declares and defines these + (using ACE_ANTI_TCHAR). Updated to resolve problems when built + with ACE_USES_WCHAR. + + Declared private copy ctor and assignment operator for + ACE_Service_Gestalt and ACE_Service_Type_Factory, since their + instances are not intended to be copied. Added an + ACE_UNIMPLEMENTED_FUNC macro for the copy-ctor and assignment + operator of ACE_Service_Type_Factory. + + Reorganized to streamline the header file and remove unnecessary + declarations and to add a decl for find_static_svc_descriptor(). + + Changed the open() method's implementation to incorporate the + additional parameter for open_i(). + + Added the new find_static_svc_descriptor() member, which allows + ACE_Static_Function_Node to not need to know how the static + services are registered in the service repository. + + * ace/Service_Object.h: + * ace/Service_Object.inl: + * ace/Service_Object.cpp: + + Exposed the dll_ member through dll () const method because the + reference is needed by the new ACE_Dynamic_Service_Dependency + class. Fixed the dump () method. + + * ace/Service_Repository.h: + * ace/Service_Repository.cpp: + + Added const-ness for the find* () methods. Added debugging. The + remove method changes the order of services registrations in the + repository, which may break the Service Repository's invariant, + imposed by the need to correctly finalize dynamic services with + their own static services. + + For example, consider a case where a static service (S0) is + registered in the repository. Then a DLL-based service (D1) + registers its own static service (S1). So far the order is + "finalization-compatible": S0 < D1 < S1, i.e. services will be + finalized in reverse order and D1's DLL will still be available + when finalizing S1. Now let's remove (S0). Currently, after + this operation the repository end up in this order: S1 < D1, + which is trivially not finalization-compatible. + + Instead of replacing the pointer with the last ptr to a svc in + the array (repository) and then decrementing the current size of + the repo, the solution actually shifts left the rest of the + array. + + * ace/Service_Types.cpp: + * ace/Shared_Object.cpp: + + Removed some and updated existing debug statements. Eliminated + dead partial instantiation code. + + * ace/Svc_Conf.y: + * ace/Svc_Conf.h: + * ace/Svc_Conf_Tokens.h: + * ace/Svc_Conf_y.cpp: + + Changed to allow propagation of the knowledge about which + gestalt is currently being used for service registrations. + + Factored the ACE_Svc_Conf_Param class out in its own translation + unit. + + * ace/Svc_Conf_Param.h: + + Replaced the ACE_Service_Gestalt & in the method signatures with + ACE_Service_Gestalt * + + * ace/svcconf.mpb: + + Updated the svcconf.mpb rule to allow building with Bison 2.0 + and up. The change adds #ifdef/#endif around the generated + header file. A YYSTYPE_IS_DECLARED define is added in order to + make sure the token declarations from the Svc_Conf_Tokens.h are + used instead of those generated in the Svc_Conf_y.cpp file. + + Added the new Dynamic_Service_Dependency.* files. + + * bin/tao_orb_tests.lst: + + Adding the new tests to the automated test suite to run during + the nightly builds. + +Wed Apr 26 17:13:57 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> + + * bin/tao_orb_tests.lst: + Added test for Parallel_Connect_Strategy. This test will take + about 9 minutes to run to completion. + +Wed Apr 26 14:22:31 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> + + * bin/tao_orb_tests.lst: + Added tests for new POA features. + + * bin/MakeProjectCreator/config/endpointpolicy.mpb: + Applications wishing to use the TAO EndpointPolicy should add + this base project to their MPC files. This will include + libTAO_EndpointPolicy in their link lines. + +Wed Apr 26 14:10:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * include/makeinclude/platform_hpux_kcc.GNU: + * include/makeinclude/platform_irix6.x_kcc.GNU: + * include/makeinclude/platform_linux_kcc.GNU: + * include/makeinclude/platform_osf1_4.x_kcc.GNU: + * include/makeinclude/platform_sunos5_kcc.GNU: + * include/makeinclude/platform_tru64_kcc.GNU: + Removed these files which are for the KAI C++ compiler. This + compiler doesn't exist anymore and full support for KAI C++ + has been removed now from ACE/TAO. See bugzilla bug 2007 + +Wed Apr 26 13:03:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/tao_orb_tests.lst: + Added TAO/tests/POA/Bug_2511_Regression + +Wed Apr 26 12:52:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Process_Manager.cpp: + Fixed fuzz errors and use const when possible + +Wed Apr 26 12:02:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/CDR_Test.cpp: + Boolean is now size 1 or bigger, the marshaling code will take + care that a Boolean is marshaled as octet of size 1 + +Wed Apr 26 11:28:28 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> + + * bin/tao_orb_tests.lst: + Added TAO/tests/OBV/truncatable. + +Wed Apr 26 10:05:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/tao_orb_tests.lst: + Added TAO/tests/OBV + +Wed Apr 26 09:56:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/tao_orb_tests.lst: + Added TAO/tests/Portable_Interceptors/Bug_2510_Regression + +Wed Apr 26 07:21:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * include/makeinclude/platform_vxworks5.5.x.GNU: + Increased template-depth to 50, hopefully this is large enough to + also build CIAO + +Tue Apr 25 16:44:04 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> + + * ace/CDR_Stream.h: + * ace/CDR_Stream.cpp: + Added code to support rewinding the output CDR to some previous + location and updating a value there. This is required to support + marshaling offset values were the target of the offset is not + known until the final offset target is actually reached. + +Tue Apr 25 13:50:12 UTC 2006 Martin Corino <mcorino@remedy.nl> + + * tests/Signal_Test.cpp: + Fixed this test for (modern) Linux and Solaris at least. + The crux is blocking signals before calling sigwait() when doing + synchronous signal handling. + +Tue Apr 25 09:35:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Base_Thread_Adapter.h: + * ace/Cleanup.h: + Fixed some errors I made + +Tue Apr 25 09:23:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ACE-INSTALL.html: + Updated supported platforms and use vc8 for the MPC examples + +Tue Apr 25 08:49:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/CDR_Base.h: + Always use bool for Boolean, see bugzilla 2514 for more info + +Tue Apr 25 06:33:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Log_Msg.h: + Put back ACE_TSS_CLEANUP_NAME that got lost by accident with the + vc6 cleanup. Thanks to Olli Savia for reporting this. + +Mon Apr 24 17:39:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/run_test.lst: + Added Signal_Test. Thanks to Martin Corino for notificing that + we don't run this test on any platform. + +Mon Apr 24 10:17:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/tao_orb_tests.lst: + Added TAO/tests/Bug_1676_Regression + +Mon Apr 24 09:57:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * include/makeinclude/platform_vxworks5.5.x.GNU: + Increase template depth to resolve compile errors when building + TAO with the new sequence implementation + +Mon Apr 24 09:17:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/os_include/sys/os_types.h: + Added ACE_LOFF_T for LynxOS. Thanks to Simon Massey for delivering + the patch + +Fri Apr 21 16:28:26 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> + + Merge from ARMS Escher repository. + + * ace/OS_NS_Thread.cpp + + Updated sched_params() to not ignore the process id passed in. + Also enhanced the Windows implementation to get a handle to the + process specified before applying the priority class changes. + + * ace/Process_Manager.cpp + * ace/Process_Manager.h + + Added methods set_scheduler and set_scheduler_all + to set scheduling parameters for process(es) managed by this + class. + + * bin/MakeProjectCreator/config/ciao_config_handlers.mpb + + Fixed build ordering problem in CIAO. + +Fri Apr 21 07:41:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Caching_Utility_T.cpp: + Removed invalid added const + +Thu Apr 20 19:27:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/os_include/sys/os_types.h: + Added ACE_LOFF_T for the BSD variants, thanks to J.T. Conklin + for delivering the patch + +Thu Apr 20 18:16:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/config-macros.h: + Removed setting of ACE_ANY_OPS_USE_NAMESPACE again. This causes + problems when building CIAO. Thanks to Jeff Parsons for finding + this. + +Thu Apr 20 11:46:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/ACE_Init_Test.rc: + Removed another msvc specific part + +Thu Apr 20 11:06:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/fuzz.pl: + Added a check for deprecated macros, first one to check is + ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION + + * tests/*.cpp: + * protocols/*.cpp: + * ACEXML/*.cpp: + * performance-tests/*.cpp + * netsvcs/*.cpp + Removed all explicit template instantiations + + * ace/os_include/sys/os_types.h: + Added ACE_LOFF_T typedef for VxWorks 6.2 and newer + +Thu Apr 20 07:23:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/os_include/sys/os_types.h: + Always define ACE_LOFF_T so that we can use it in the sendfile + wrapper + +Thu Apr 20 07:17:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/svcconf.mpb: + Removed Service_Templates.cpp + +Wed Apr 19 19:18:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/*: + Removed explicit template support + +Wed Apr 19 15:09:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/Bug_2368_Regression_Test.cpp: + Fixed compile error and compile warning + +Wed Apr 19 14:35:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/OS_NS_sys_sendfile.h: + Updated include to get size_t and ACE_LOFF_T to fix compile + errors on Solaris + +Wed Apr 19 13:31:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * examples/APG/Logging/Use_Multiple_Sinks.cpp: + * examples/APG/Logging/Use_Ostream.cpp: + * examples/APG/Logging/LogManager.h: + Removed vc6 workarounds + +Wed Apr 19 13:13:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/Bug_2368_Regression_Test.cpp: + * tests/run_test.lst: + * tests/tests.mpc: + Added regression for bug 2368, this will fail because this bug + isn't addressed yet + +Wed Apr 19 13:08:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * include/makeinclude/platform_sunos5_g++.GNU: + Use -shared instead of -G when building shared libraries. Thanks to + Alan L Batongbacal <alanlb at vt dot edu> for reporting this. This + fixes bugzilla bug 1848. + +Wed Apr 19 12:11:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/ACE_Init_Test.rc: + Removed msvc specific lines + + * tests/tests.mpc: + The ACE_Init_Test should use its resource file. Fixes bugzilla + 2495 + + * ace/Capabilities.{h,cpp}: + Prefix increment instead of postfix + + * ace/Hash_Map_Manager_T.{h,cpp}: + Removed workaround for suncc 4.2 + + * ace/Object_Manager.h: + * ace/Parse_Node.h: + * ace/POSIX_Proactor.h: + * ace/Thread_Mutex.h: + Doxygen improvements + + * ace/Parse_Node.cpp: + Use prefix increment, initialise pointers with 0 and don't print + an error message when we can't a dll, this gives false messages + when using TAO. This fixes bugzilla 2383. Thanks to Ming Xiong + for making a patch. + + * ace/Proactor.h: + Removed all virtual keywords, not needed for this class. Fixes + bugzilla 2178. + + * ace/Thread_Manager.h: + Removed virtual keywords, not needed and safes footprint. Fixes + bugzilla 2179. + + * bin/fuzz.pl: + Added more msvc checks to detect code constructors for vc6 or + vc7.0 + +Wed Apr 19 11:48:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + Merged ACE changes from sendfile branch. Also made a lot of const + improvements throughout ACE. + + Tue Apr 4 10:20:36 2006 Ossama Othman <ossama@dre.vanderbilt.edu> + + * ace/Mem_Map.cpp (open): + + Only copy the filename to the ACE_Mem_Map::filename_ member + if the call to open() succeeds. + + * ace/PI_Malloc.h (ACE_Malloc_Header): + + Added missing private and undefined copy constructor. The + corresponding assignment operator was already there. + + Wed Mar 29 14:51:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/config-sunos5.8.h: + Solaris 8 and newer also support sendfile. It seems HPUX also + supports it but with a different signature and semantics, so just + don't try it there yet. + + Wed Mar 29 13:06:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/MMAP_Memory_Pool.{h,cpp,inl}: + Added new .inl file to implement the new mmap accessors, include + this new file in the header and implementation file + + Wed Mar 29 08:00:12 2006 Ossama Othman <ossama@dre.vanderbilt.edu> + + * ace/OS_NS_sys_sendfile.cpp + * ace/OS_NS_sys_sendfile.h + * ace/OS_NS_sys_sendfile.inl + New sendfile wrapper + + * ace/MMAP_Memory_Pool.h: + Added accessors for mmap + + * ace/ace.mpc + Added OS_NS_sys_sendfile + + * ace/config-linux-common.h + Added ACE_HAS_SENDFILE + +Wed Apr 19 07:48:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + Merged ACE changes from sequpdate3 branch + + * ace/config-osf1-3.2.h: + Removed, very old + + * ace/config-tru64.h: + Removed include of config-osf1-3.2.h + + * ace/OS_Dirent.cpp: + * ace/OS_Memory.{cpp,inl}: + * ace/OS_String.{cpp,inl}: + * ace/Sync.cpp: + Removed these files, where not build for a long time already + + * ace/ace.mpc: + Removed files above + + * ace/OS_Memory.h: + * ace/OS_String.h: + Removed include of inline files + + * ace/config-win32-msvc6.h: + * ace/config-kcc-common.h: + Removed these files, vc6 and kcc are deprecated + + * ace/config-irix6.x-kcc.h: + * ace/config-osf1-4.0.h: + * ace/config-sunos5.5.h: + Removed support for KCC + + * ace/Asynch_IO_Impl.h: + Removed workarounds for KCC + + * ace/config-win32-msvc.h: + Removed support for vc6 and vc7.0 + + * ace/Array_Base.cpp: + * ace/Array_Map.{h,cpp}: + * ace/Base_Thread_Adapter.h: + * ace/Cleanup.h: + * ace/Log_Msg.h: + * ace/Versioned_Namespace.h: + * ace/Get_Opt.cpp: + * ace/WIN32_Proactor.cpp: + * ace/Message_Queue.cpp: + * ace/CDR_Base.h: + Removed work arounds for vc6 + + * ace/README + * ace/config-win32-msvc6.h: + * ace/Global_Macros.h: + Deprecated ACE_HAS_BROKEN_NAMESPACES, we drop msvc6 and I am + removing the workarounds for this compiler one by one as part of the + new sequence implementation. Because we deprecate this also + ACE_NESTED_CLASS is deprecated + + * ace/config-win32-msvc6.h: + * ace/config-win32-msvc7.h: + * ace/config-win32-msvc8.h: + Removed ACE_HAS_BROKEN_IMPLICIT_CONST_CAST, not used in ACE + + * ace/config-win32-msvc6.h: + * ace/config-win32-visualage.h: + * ace/Registry.h + Removed ACE_HAS_BROKEN_NESTED_TEMPLATES, only used for msvc6 and + visual age, both are being dropped + +Wed Apr 19 07:48:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/tao_orb_tests.lst: + Added Bug_2503_Regression -Mon Nov 20 08:16:34 2006 Simon McQueen <sm@prismtech.com> +Tue Apr 18 20:49:16 2006 Wallace Zhang <zhangw@ociweb.com> - * ACE version 5.5.4 released. + * ACE version 5.5.1 released. Local Variables: mode: change-log diff --git a/ACE/ChangeLogs/ChangeLog-06b b/ACE/ChangeLogs/ChangeLog-06b deleted file mode 100644 index 2212ce3f6f0..00000000000 --- a/ACE/ChangeLogs/ChangeLog-06b +++ /dev/null @@ -1,8927 +0,0 @@ -Fri Nov 17 07:06:10 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/msvc_static_order.lst: - Added another RTScheduling example library project - -Fri Nov 17 06:47:10 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/MakeProjectCreator/config/taoidldefaults.mpb: - Updated this file because tao_idl doesn't generate a S_T.inl - file anymore - -Thu Nov 16 20:38:10 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/msvc_static_order.lst: - Added new RTScheduling example library projects to fix compile - errors in the msvc static builds - -Wed Nov 15 23:23:10 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - - * protocols/Makefile.am: - - Add lost support for --disable-ace-tests and --disable-ace-examples - -Wed Nov 15 21:55:01 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - - * ace/Makefile.am: - - Add OS.inl to nobase_include_HEADERS. - -Wed Nov 15 19:08:39 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - - * ace/config-lite.h: - - Changed to not include <Cstd/stdcomp.h> on Solaris systems - when using the stlport4 C++ library. - -Wed Nov 15 15:33:10 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - - * apps/JAWS/clients/Caching/caching.mpc: - - Add exename definition so that an executable, rather than - a shared library, is built. - -Wed Nov 15 10:35:00 UTC 2006 Simon Massey <sma@prismtech.com> - - * NEWS: - - Added entry for Iliyan Jeliazkov. - -Wed Nov 15 01:56:28 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - - * protocols/ace/HTBP/Makefile.am: - * protocols/ace/RMCast/Makefile.am: - * protocols/ace/TMCast/Makefile.am: - - Change includedir to omit the "protocols" subdirectory. - - The header files for these libraries are intended to be - installed in ${prefix}/include/ace/{HTBP,RMCast,TMCast} - not ${prefix}/include/protocols/ace/{HTBP,RMCast,TMCast}. - -Wed Nov 15 01:11:02 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - - * ace/Makefile.am: - - Add Numeric_Limits.h to nobase_include_HEADERS. - -Tue Nov 14 18:42:18 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> - - * ace/Service_Gestalt.inl: - * ace/Service_Gestalt.cpp: - - After a gestalt gets close()-ed it is still a valid instance - however, because it is disassociated from its service repository - the situation becomes another special case the gestalt - implementation must account for. This change is in addition to - the bug fix introduced with the change from "Thu Nov 9 20:07:42 - UTC 2006". - -Tue Nov 14 14:30:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Select_Reactor_T.cpp: - Removed some not used macros that did cause problems when running - FOCUS - -Tue Nov 14 11:23:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Timer_Queue_T.cpp: - Added hook for FOCUS, const improvement - -Tue Nov 14 07:56:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ACE-INSTALL.html: - Updated rtems information - -Mon Nov 13 00:17:19 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> - - * ace/Service_Gestalt.cpp: - - Calling close() on a gestalt must not obliterate any static - service registrations. Those may still be needed if the gestalts - gets re-opened again, before its destructor runs. This change - fixes a problem (introduced with "Thu Nov 9 20:07:42 UTC 2006") - which broke this invariant. - -Sat Nov 11 18:37:12 UTC 2006 Chris Cleeland <cleeland_c@ociweb.com> - - * ace/Service_Gestalt.cpp (find_processed_static_svc): - - Added a check at the beginning of this function that drops out - if processed_static_svcs_ or the arg is a zero pointer. This - gets ride of core dumps in scoreboard builds running tests like - some of the TAO EC tests (basically anything which has a static - service defined and expects to find it), but there is still the - more fundamental problem as to why the static services aren't - there in the first place. - -Fri Nov 10 22:30:12 UTC 2006 Martin Corino <mcorino@remedy.nl> - - * include/makeinclude/platform_vxworks6.3.GNU: - - Fixes for VxWorks 6.3 PPC builds. - -Fri Nov 10 21:26:41 UTC 2006 Chris Cleeland <cleeland_c@ociweb.com> - - * ace/OS_NS_Thread.h (THR_HAS_WTHREADS): - - Added THR_EXPLICIT_SCHED definition to ACE_HAS_WTHREADS clause - so that application-level code doesn't have to have #ifdefs to - figure out whether it's okay to use THR_EXPLICIT_SCHED. - - This change is part of a change to TAO from - Thu Nov 9 15:42:32 UTC 2006 Chris Cleeland <cleeland_c@ociweb.com> - -Fri Nov 10 15:02:26 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> - - * ace/Service_Config.cpp (close): - - Removing a forgotten debug statetement. - -Fri Nov 10 13:42:12 UTC 2006 Martin Corino <mcorino@remedy.nl> - - * bin/vx_repo_link.pl: - - New perl 'program' to handle link phase for VxWorks 5.5.x - builds using -frepo option. - - * include/makeinclude/platform_vxworks5.5.x.GNU: - * include/makeinclude/rules.lib.GNU: - - Changes to enable building ACE/TAO apps for VxWorks 5.5.x SIMNT - targets using -frepo option. - -Fri Nov 10 12:53:32 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * bin/make_release: - * docs/bczar/bczar.html: - - Minor update to bczar documentation to correct install paths, - minor bugfix to release script to correct PRF generation. - -Fri Nov 10 12:22:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/INET_Addr.cpp: - Fixed argument not used warnings in rtems no network build - -Fri Nov 10 10:06:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Reactor_Impl.h: - * ace/Dev_Poll_Reactor.{h,cpp}: - * ace/Select_Reactor_T.{h,cpp}: - * ace/WFMO_Reactor.{h,inl}: - Changed initialized to return a bool, that is the type we store - as member. - -Fri Nov 10 10:03:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/OS_NS_unistd.cpp: - Const changes and use prefix operators instead of postfix - - * ace/Process.cpp: - Use prefix increment instead of postfix - - * ace/Reactor.cpp (timer_queue): - No need to use an intermediate variable - -Fri Nov 10 05:47:15 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * docs/bczar/bczar.html - - Updates to release script documentation. - -Thu Nov 9 20:07:42 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> - - * ace/Service_Config.cpp: - * ace/Service_Gestalt.h: - * ace/Service_Gestalt.cpp: - - A follow up to my change from "Wed Nov 8 22:12:46". Adding the - close_svcs() call in ACE_Service_Config::close() ensured that - the repository and its contents gets properly finalized, but it - did not account for the potential subsequent re-opening of the - Service Config. This causes failures in open/close/open - scenarios, like Framework_Component_Test. - -Thu Nov 9 19:59:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * include/makeinclude/platform_aix4_cset++.GNU: - * include/makeinclude/platform_integrity_ghs.GNU: - * include/makeinclude/platform_irix6.x_sgic++.GNU: - * include/makeinclude/platform_linux_pgi.GNU: - * include/makeinclude/platform_macosx_panther.GNU: - * include/makeinclude/platform_macosx_tiger.GNU: - * include/makeinclude/platform_netbsd.GNU: - * include/makeinclude/platform_openbsd.GNU: - * include/makeinclude/platform_osf1_4.x_rcc.GNU: - * include/makeinclude/platform_vxworks5.x_ghs.GNU: - Simplified these files using the ?= operator - -Thu Nov 09 16:10:10 UTC 2006 Martin Corino <mcorino@remedy.nl> - - * ace/Service_Config.cpp: - - Reverted my earlier change of Nov 6 and additionally removed - the ACE_Reactor::instance() call from the ACE_Service_Config - CTOR since it seems to be unnecessary here. - -Thu Nov 9 15:22:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * include/makeinclude/wrapper_macros.GNU: - Default threads to 1 if not set, thanks to Chad for helping out - with finding out why I had a problem in the rtems build - -Thu Nov 9 12:46:54 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - - * bin/MakeProjectCreator/config/acedefaults.mpb: - * bin/MakeProjectCreator/config/taodefaults.mpb: - - Add automake specific section to subtract out $(ACE_ROOT)/lib - from libpaths, as libraries are not copied to, or linked from, - there in automake builds. This removes unnecessary -L's from - being added to *_LDFLAGS, sometimes eliminating the need for - that automake variable altogether. - -Thu Nov 9 10:48:52 UTC 2006 Olli Savia <ops@iki.fi> - - * examples/IPC_SAP/DEV_SAP/reader/reader.cpp: - * examples/IPC_SAP/DEV_SAP/writer/writer.cpp: - Changed used baudrate to 19200. Extended reader example to handle - timeout. - -Thu Nov 9 10:50:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Timer_Heap_T.{h,cpp}: - Changed the preallocated constructor from int to bool. - -Thu Nov 9 09:25:48 UTC 2006 Olli Savia <ops@iki.fi> - - * ace/TTY_IO.cpp: - Removed LynxOS 3.x specific workaround. - -Wed Nov 8 22:22:27 UTC 2006 Steve Huston <shuston@riverace.com> - - * bin/make_release: Re-applied this: - Sat Oct 28 20:10:42 UTC 2006 Steve Huston <shuston@riverace.com> - -Wed Nov 8 22:12:46 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> - - * ace/Service_Config.cpp: - * ace/Service_Gestalt.cpp: - - This resolves a problem with shutting down the Service - Configurator via the static ACE_Service_Config::close () method, - where the registered services' fini() methods were not being - called. For full details, see bugzilla# 2701. Thanks to Aaron - Scamehorn <Aaron dot Scamehorn at cogcap dot com> for discovering - it an providing a test case. - -Wed Nov 8 19:21:17 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * bin/make_release: - - Updates to the release script to work with Subversion. - -Mon Nov 6 16:07:43 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * ace/SOCK_IO.h (ACE_SOCK_IO): Clarified the behavior of - non-blocking I/O. Thanks to Robert Neumann <robert dot neumann - at gmail dot com> for motivating this change. - -Tue Nov 08 15:40:10 UTC 2006 Martin Corino <mcorino@remedy.nl> - - * ace/INET_Addr.inl: - - Enhanced operator <() to support IPv6 addresses as well. - Thanks to Andre Kostur (akostur at incognito dot com) for - submitting a patch for this. - -Wed Nov 8 14:24:02 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - - * configure.ac: - - Change ACE_LACKS_NET_IF_H feature test to #include <sys/types.h> - (if present). - -Wed Nov 8 13:45:07 UTC 2006 Chad Elliott <elliott_c@ociweb.com> - - * examples/C++NPv2/C++NPv2.mpc: - - The AC_CLD project requires threads in order to build and run - correctly. - -Tue Nov 07 15:49:10 UTC 2006 Martin Corino <mcorino@remedy.nl> - - * ace/OS_NS_netdb.inl: - - Changes to accomodate VxWorks 6.x versions of gethostbyname and - gethostbyaddr. These are threadsafe as the x_r versions are but - require deallocating the returned hostent structure. - -Tue Nov 7 15:44:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Sock_Connect.cpp: - With VxWorks 6.3 in rtp mode with IPv6 enabled declare the - in6addr_ constants explicitly, these are exported by the - VxWorks 6.3 rtp header files but not implemented - -Tue Nov 07 13:31:10 UTC 2006 Martin Corino <mcorino@remedy.nl> - - * include/makeinclude/platform_vxworks6.3.GNU: - - Fixed build settings for PPC32 builds with softfloat. - -Tue Nov 7 10:38:25 UTC 2006 Simon McQueen <sm@prismtech.com> - - * tests/Naming_Test.cpp: - - Moved an ::open out of an ACE_ASSERT. It wasn't getting performed on - some builds. - -Tue Nov 7 09:56:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * performance-tests/Misc/basic_func.{h,cpp}: - Renamed B to BB to resolve compile problems on rtems where we - have also a typedef B - -Tue Nov 7 07:52:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/ACE.h: - Also rtems defines log2, use the same workaround as with cygwin - - * include/makeinclude/platform_rtems.x_g++.GNU: - Removed -ansi - -Tue Nov 7 01:47:46 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> - - * ace/Sock_Connect.cpp (count_interfaces): - Another scoreboard fix. - -Mon Nov 6 20:52:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * apps/Gateway/Gateway/Config_Files.{h,cpp}: - * apps/Gateway/Gateway/File_Parser.{h,cpp}: - * apps/Gateway/Gateway/Gateway.cpp: - Renamed class FP to FPRT. This resolves the compile errors on - rtems where a struct FP does exist - -Mon Nov 6 16:52:14 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> - - * ace/Sock_Connect.cpp: - My fix for Solaris x86 broke HPUX. The trouble is that the - method ACE::count_interfaces() is only used by the "generic" - implementation of get_ip_interfaces(). Probably a better - solution is to remove count_interfaces() and move its - functionality into the get_ip_interfaces() implementation, but - that is a bigger change than I care to make at the moment. I - think it should be possible to do so in a way that also reduces - the footprint and improves performance by eliminating the - effectively duplicated code in count_interfaces(). - -Mon Nov 06 14:14:10 UTC 2006 Martin Corino <mcorino@remedy.nl> - - * ace/config-vxworks6.3.h: - - Fixed incorrect definition of IOV_MAX. - -Mon Nov 6 13:08:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/config-sunos5.5.h: - Added ACE_HAS_GETRUSAGE, thanks to Michael Klein - <michael dot klein at fazi dot de> for reporting that SunOS has - this method, fixes bugzilla 2694. - -Mon Nov 6 12:59:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * examples/Service_Configurator/Misc/main.cpp: - * examples/Service_Configurator/Misc/Service_Configurator_Misc.mpc: - * examples/Service_Configurator/Misc/svc.conf1 - Fixed shared library name, make working for embedded platforms. - Thanks to Abdul Sowayan <abdullah dot sowayan at lmco dot com> - for reporting this, fixes bugzilla bug 2698 - -Mon Nov 06 11:17:10 UTC 2006 Martin Corino <mcorino@remedy.nl> - - * ace/Service_Config.cpp: - - Implemented a fix for runtime problems in case - ACE_HAS_NONSTATIC_OBJECT_MANAGER is defined (seen on VxWorks 6.3 RTP). - -Sun Nov 5 14:14:51 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> - - * ace/Sock_Connect.cpp: - Fix for Solaris x86. - -Sat Nov 4 12:46:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/config-sunos4*.h: - Removed these files, these are ancient and not supported anymore - -Fri Nov 3 18:12:36 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * tests/Unload_libACE.cpp (main): Reverted the ACE_OS::exit() from - this since it's not supposed to be an ACE test. Thanks to Simon - Massey for reporting this. - -Fri Nov 03 15:52:10 UTC 2006 Martin Corino <mcorino@remedy.nl> - - * bin/PerlACE/ProcessVX_Unix.pm: - - Bugfix in cmdline composition. - -Fri Nov 3 15:15:43 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> - - * ace/Sock_Connect.cpp: - Scoreboard cleanup. - -Fri Nov 03 10:54:10 UTC 2006 Martin Corino <mcorino@remedy.nl> - - * ace/OS_NS_sys_time.inl: - - Fixed conversion warning on OpenVMS. - -Fri Nov 3 00:39:04 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> - - * ace/Sock_Connect.cpp: - One more optimization, this one to combine the methods for - evaluating the IPv6 or IPv4 enabled status. - -Fri Nov 3 00:32:27 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> - - * ace/Select_Reactor_Base.inl: - * ace/Select_Reactor_Base.cpp: - Additional optimization for finding and unbinding event - handlers. The solution moves the test for handles in range into - the top-level find and unbind methods to allow the fix for bug - 2653 to continue to work in unbind while avoiding a double check - for handles in range during a find. - -Thu Nov 2 20:33:55 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * tests/SOCK_Test_IPv6.cpp (spawn): - * tests/Pipe_Test.cpp (run_main): - * tests/SPIPE_Test.cpp (client): - * tests/TkReactor_Test.cpp (run_main): - * tests/MT_SOCK_Test.cpp (spawn): - * tests/Process_Strategy_Test.cpp (run_main): - * tests/Unload_libACE.cpp (main): - * tests/SOCK_Test.cpp (spawn): - * tests/Priority_Reactor_Test.cpp (run_main): - * tests/SOCK_Dgram_Test.cpp (spawn): - * tests/SOCK_SEQPACK_SCTP_Test.cpp (spawn_test): - * examples/Map_Manager/test_hash_map_manager.cpp (ACE_TMAIN): - * apps/mkcsregdb/mkcsregdb.cpp (fail): Replaced exit() with - ACE_OS::exit(). - -Wed Nov 01 20:04:00 US Central Time 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * Bronson Royce Schmidt checked in at 7 pounds, 15 ounces and - 21.25 inches long. - -Thu Nov 2 16:10:10 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> - - * ace/Sock_Connect.cpp: - Cleaned up debugging code left in my previous premature commit. - -Thu Nov 2 15:42:29 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> - - * ace/Sock_Connect.cpp: - * ace/Sock_Connect.h: - Added support for IPv6 detection on HPUX, AIX, Solaris, WinCE, - and VxWorks 5.5.x. - -Wed Nov 01 09:05:10 UTC 2006 Martin Corino <mcorino@remedy.nl> - - * ace/OS_NS_stdlib.inl: - - Fixed conversion warnings in atop() on OpenVMS. - -Wed Nov 01 08:35:10 UTC 2006 Martin Corino <mcorino@remedy.nl> - - * ace/OS_NS_sys_stat.h: - - Fixed Borland compile failure over def of ACE_Stat. - -Tue Oct 31 23:08:32 UTC 2006 Steve Huston <shuston@riverace.com> - - * ace/Dev_Poll_Reactor.h: Note that the Linux epoll code implementation - is supported, but the /dev/poll implementation is still - experimental. - -Tue Oct 31 10:31:10 UTC 2006 Ossama Othman <ossama_othman at symantec.com> - - * ace/OS_NS_sys_stat.h (ACE_WSTAT_FUNC_NAME): - - Corrected wstat() function name for Borland. - -Mon Oct 30 19:57:20 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - - * bin/ciao_tests.lst: - - Added run_test.pl in CIAO/tests/IDL3/Events/Any to the list of - CIAO tests to be run automatically. - -Mon Oct 30 17:34:35 UTC 2006 Ossama Othman <ossama_othman at symantec.com> - - * ace/config-win32-common.h: - - Use 64-bit file offsets by default in the WIN64 case, similar to - what 64-bit UNIX systems do. - -Mon Oct 30 17:23:15 UTC 2006 Steve Huston <shuston@riverace.com> - - * include/makeinclude/wrapper_macros.GNU: Added 2 new build options, - dmalloc and mtrace. When specified at build time (e.g. make mtrace=1) - the PLATFORM_DMALLOC_CPPFLAGS and/or PLATFORM_MTRACE_CPPFLAGS values - are added to CPPFLAGS. For dmalloc, the PLATFORM_DMALLOC_LDFLAGS and - PLATFORM_DMALLOC_LIBS are added to LDFLAGS and LIBS, respectively. - Also added the ability to specify additional purify and quantify - command-line options by setting PLATFORM_PURIFY_OPTIONS and - PLATFORM_QUANTIFY_OPTIONS, respectively. Thank you to Howard - Finer for supplying these additions. - -Mon Oct 30 16:56:28 UTC 2006 Chad Elliott <elliott_c@ociweb.com> - - * bin/MakeProjectCreator/templates/gnu.mpd: - - The implementation for the 'targetoutdir' template variable was - incorrect. Libraries and executables were not symbolically linked - to the output location correctly. Also, 'targetoutdir' was not - taken into account for the 'libpaths' setting. - -Mon Oct 30 15:30:47 UTC 2006 Simon McQueen <sm@prismtech.com> - - * bin/tao_orb_tests.lst: - - Scheduled regression test for bug #2669. - -Mon Oct 30 14:31:42 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> - - * ace/Select_Reactor_Base.inl: - Reverting the functional part of my previous commit until I - learn the correct way to manage the upper bound test portably. - - * bin/tao_orb_tests.lst: - Make the Bug 2654 test be ignored for minimum CORBA builds. - -Mon Oct 30 12:18:03 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> - - * ace/Select_Reactor_Base.inl (unbind): - Added an additional validity check and a comment to ward off - future optimizations. - -Mon Oct 30 09:24:42 UTC 2006 Ossama Othman <ossama_othman at symantec.com> - - * ace/OS_NS_sys_stat.h (ACE_stat): - * ace/OS_NS_sys_stat.inl (stat, wstat): - - Only use Windows 64-bit stat structures and functions when - _FILE_OFFSET_BITS=64 is defined. Addresses 64-bit conversion - warnings. - -Sun Oct 30 05:31:01 UTC 2006 Ossama Othman <ossama_othman at symantec.com> - - * ace/Auto_Ptr.h (ACE_auto_ptr_reset): - - Adjusted function template arguments to handle case where the - auto_ptr element type and pointer type passed to this function - are not the same. Addresses argument deduction failures. - - * ace/FILE.h (ACE_FILE): - - 64-bit file offset fixes. s/off_t/ACE_OFF_T. - - * ace/Truncate.h (Truncator): - - Added explicit specializations for int and long for Borland. - Relying on ACE_{U}INT32 specializations is not sufficient. - - * tests/CDR_File_Test.cpp (run_test): - - A 64-bit file offset is not always enabled. Corrected offset - type. s/ACE_LOFF_T/ACE_OFF_T. - -Sun Oct 29 17:10:39 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> - - * bin/tao_orb_tests.lst: - Added Bug 2654 regression test to suite. - -Sat Oct 28 20:50:56 UTC 2006 Steve Huston <shuston@riverace.com> - - * examples/Threads/thread_specific.cpp: Need to reinterpret_cast a - pointer back to an intptr_t. - -Sat Oct 28 20:10:42 UTC 2006 Steve Huston <shuston@riverace.com> - - * bin/make_release: Added Smartphone configurations to the WinCE - project files generated at release time. - -Sat Oct 28 13:50:01 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> - - * ace/Select_Reactor_Base.cpp: - - Fix to address Win32-specific problems in bug 2653 fix. - -Sat Oct 28 01:48:27 UTC 2006 Steve Huston <shuston@riverace.com> - - * include/makeinclude/wrapper_macros.GNU: Add -L$(INSLIB) to LDFLAGS - if it was not there already. Allows link to work when built libraries - are moved to locations other than the default $(ACE_ROOT)/lib - location. - -Fri Oct 28 03:23:18 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - - * apps/JAWS2/JAWS/FILE.cpp: - * apps/JAWS2/JAWS/FILE.h: - * apps/JAWS2/JAWS/IO.cpp: - * apps/JAWS3/jaws3/FILE.cpp: - * apps/JAWS3/jaws3/FILE.h: - * examples/Threads/thread_manager.cpp: - * examples/Threads/cancel.cpp: - * examples/Threads/thread_specific.cpp: - * examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp: - * performance-tests/Synch-Benchmarks/Perf_Test/Benchmark_Performance.cpp - Addressed 64-bit conversion warnings. - -Fri Oct 28 02:49:11 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - - * examples/APG/Shared_Memory/Mem_Map.cpp: - * examples/Mem_Map/file-reverse/file-reverse.cpp: - * examples/Web_Crawler/Mem_Map_Stream.cpp: - - Addressed 64-bit conversion warnings. - -Fri Oct 27 21:41:25 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> - - * THANKS: - * ace/Select_Reactor_Base.inl: - * ace/Select_Reactor_Base.cpp: - * ace/TP_Reactor.inl: - * ace/TP_Reactor.cpp: - * tests/run_test.lst: - - The fix for bug 2653. Thanks to Scott Mitchell <rsm at progress - dot com> and Chris Reed <cr at progress dot com> for the - considerable effort they put in helping to isolate this problem. - -Fri Oct 27 21:28:36 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> - - * tests/Bug_2653_Regression_Test.cpp: - * tests/tests.mpc: - - Added a new regression test. Without the accompaning fix, the - test coredump. If you comment out the call to test_for_crash, - the test will spin madly for 5 seconds, then abort. With the - pending fix to the TP reactor, the test has no errors. - -Fri Oct 27 19:48:23 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - - * ace/Filecache.cpp (ACE_Filecache_Object): - - Cast -1 to size_t. Ugly (and works), but currently necessary. - Addresses "passing negative value" warnings. - -Fri Oct 27 19:28:16 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - - * ace/OS_NS_stdio.inl (flock_adjust_params): - * ace/OS_NS_sys_stat.inl (filesize): - - Fixed comparison of signed/unsigned warnings. - -Fri Oct 27 09:25:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Configuration_Import_Export.cpp: - Explicitly initialise pointer to 0 to silence warning in - gcc cygwi build - -Fri Oct 27 01:58:09 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - - From Russell Mora <russell_mora at symantec dot com> - * ace/ACE.cpp: - * ace/ACE.h: - * ace/FILE.cpp: - * ace/File_Lock.h: - * ace/File_Lock.inl: - * ace/Filecache.cpp: - * ace/Filecache.h: - * ace/Local_Memory_Pool.cpp: - * ace/MEM_Acceptor.h: - * ace/MEM_Acceptor.inl: - * ace/MEM_IO.cpp: - * ace/MEM_IO.inl: - * ace/MEM_IO.h: - * ace/MMAP_Memory_Pool.cpp: - * ace/MMAP_Memory_Pool.h: - * ace/Mem_Map.cpp: - * ace/Mem_Map.h: - * ace/Mem_Map.inl: - * ace/OS_NS_macros.h: - * ace/OS_NS_stdio.cpp: - * ace/OS_NS_stdio.inl: - * ace/OS_NS_stdio.h: - * ace/OS_NS_sys_mman.h: - * ace/OS_NS_sys_mman.inl: - * ace/OS_NS_sys_stat.h: - * ace/OS_NS_sys_stat.inl: - * ace/OS_NS_unistd.cpp: - * ace/OS_NS_unistd.inl: - * ace/OS_NS_unistd.h: - * ace/Pagefile_Memory_Pool.inl: - * ace/Shared_Memory_MM.cpp: - * ace/Shared_Memory_MM.h: - * ace/Shared_Memory_MM.inl: - * ace/Shared_Memory_Pool.cpp: - * ace/Shared_Memory_Pool.h: - * ace/os_include/sys/os_types.h: - * ace/os_include/sys/os_stat.h: - * ace/os_include/os_unistd.h: - * examples/Web_Crawler/Iterators.cpp: - * examples/Web_Crawler/Mem_Map_Stream.cpp: - * examples/Web_Crawler/Mem_Map_Stream.h: - * examples/IPC_SAP/FILE_SAP/client.cpp: - - Added support for 64-bit file offsets on 32-bit platforms that - support the _FILE_OFFSET_BITS preprocessor symbol, as well as - Windows. Enable by defining the _FILE_OFFSET_BITS=64 - preprocessor symbol. ACE provides the necessary support on - Windows when it is defined with the assistance of a new - ACE_OFF_T typedef. - -Thu Oct 26 24:44:55 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - - * ace/Truncate.h (Truncator): - - Removed ACE_Export macros in the Borland case. They shouldn't - be necessary. - -Thu Oct 26 14:05:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/tao_other_tests.lst: - Added orbsvcs/tests/Event/UDP test which tests the rtec - udp federation - -Thu Oct 26 11:19:45 UTC 2006 Olli Savia <ops@iki.fi> - - * ace/config-lynxos.h: - Added include "ace/config-posix.h" and removed defines - that are already defined by config-posix.h. - -Thu Oct 26 10:29:49 UTC 2006 Olli Savia <ops@iki.fi> - - * ace/config-posix.h: - Removed duplicate check of _POSIX_MESSAGE_PASSING. - -Thu Oct 26 07:48:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Truncate.h: - - Added partial specialization for when types are the same, fixes - compile problems in the ACE lib with Borland - -Thu Oct 26 07:01:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/config-vxworks5.x.h: - Added ACE_LACKS_INTPTR_T, VxWorks 5.5.x seems not to deliver this - type - -Thu Oct 26 00:31:56 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - - * ace/Auto_Ptr.h: - - Added missing "element_type" typedef. - - (ACE_auto_ptr_reset): - - Introduced this new function template to simplify the - ACE_AUTO_PTR_RESET macro implementation, to support - ACE's other auto_ptr-like class templates - (e.g. ACE_Auto_Array_Ptr<>), and to make auto_ptr - reset() operations convenient and easy for those needing the - ACE_AUTO_PTR_RESET functionality to. Users now need only - perform a call like: - - ACE_auto_ptr_reset (my_auto_ptr_instance, new foo); - - Note that ACE_AUTO_PTR_RESET support for ACE's other - auto_ptr-like classes isn't strictly necessary since they all - support the reset() method. - - Addresses build failures on platforms that define - ACE_LACKS_AUTO_PTR_RESET and in code that expects to use - ACE_AUTO_PTR_RESET on ACE_Auto_{Basic_}_Array<> instances. - -Wed Oct 25 22:42:03 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - - * tests/Integer_Truncate_Test.cpp: - - Remove "const" qualifiers from types used in - ACE_Utils::Truncate<>() function template parameters that are - deduced using argument dependent lookup. Borland appears to get - confused, and can't find the non-const template parameter - Truncate<>() specializations. - -Wed Oct 25 20:17:13 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - - * ace/Hash_Map_Manager_T.inl (ACE_Hash_Map_Iterator_Base_Ex): - - Removed commented ACE_TRACE macro entirely. Fuzz parses - commented out code, and still incorrectly reports an ACE_TRACE - mismatch. - - * ace/Truncate.h: - - Yet another attempt at placating Borland C++. Removed the - partial specialization for truncating values of the same type. - Typedefed the underlying Truncator structure template to further - simplify the function call. - -Wed Oct 25 18:31:47 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - - * examples/C++NPv1/Reactive_Logging_Server.h: - * examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp: - - Include "ace/Basic_Types.h" to pull in intptr_t typedef. - -Wed Oct 25 15:05:42 UTC 2006 Steve Huston <shuston@riverace.com> - - * ace/OS_NS_stdlib.inl (atop): s/intptr/intptr_t/ in ACE_WIN64 case. - -Wed Oct 25 09:47:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/SOCK_Dgram.cpp: - Fixed compile error in non win32 part - -Wed Oct 25 09:24:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/ace_for_tao.mpc: - Added Rtems_init.c, for rtems without network support we - also use the ace_for_tao base project - -Wed Oct 25 08:38:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/config-rtems.h: - * ace/OS_NS_netdb.inl: - Added ACE_LACKS_GETHOSTBYADDR_R - -Wed Oct 25 08:11:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/config-rtems.h: - * ace/OS_NS_sys_socket.inl: - Added ACE_LACKS_GETSOCKOPT, ACE_LACKS_RECV, ACE_LACKS_SEND, - and ACE_LACKS_SENDTO - -Wed Oct 25 08:04:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tests/Priority_Buffer_Test.cpp: - Fixed compile problem with gcc 2.96 - -Wed Oct 25 07:58:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/config-rtems.h: - * ace/OS_NS_sys_socket.inl: - Added ACE_LACKS_ACCEPT, ACE_LACKS_CONNECT, ACE_LACKS_GETPEERNAME, - ACE_LACKS_GETSOCKNAME - -Wed Oct 25 06:30:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/TTY_IO.cpp: - Fixed compile error on Vxworks - -Tue Oct 24 23:53:08 UTC 2006 Steve Huston <shuston@riverace.com> - - * ace/config-aix-4.x.h: Changed ACE_HAS_PTHREAD_CONTINUE to - ACE_HAS_PTHREAD_CONTINUE_NP and ACE_HAS_PTHREAD_SUSPEND to - ACE_HAS_PTHREAD_SUSPEND_NP. The non-_NP varieties return ENOTSUP; - the _NP varieties are the only documented APIs through AIX 5.3. - Thanks to Guy Peleg for raising this issue. - - * tests/Thread_Manager_Test.cpp: Altered the suspend/resume tests to - only allow ENOTSUP as a legit result if the config.h file does not - include ACE_HAS_... settings that indicate it should work. - -Tue Oct 24 23:59:10 UTC 2006 Ossama othman <ossama_othman at symantec dot com> - - * examples/Service_Configurator/IPC-tests/server/Handle_Timeout.inl - (init): - * examples/Shared_Malloc/test_position_independent_malloc.cpp - (parse_args): - - Use intptr_t instead of int when casting to void*. Addresses - "sizes do not match" warnings in 64-bit Intel compiler builds. - -Tue Oct 24 23:49:25 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - - * ace/Hash_Map_Manager_T.inl (ACE_Hash_Map_Iterator_Base_Ex): - - Commented out use of ACE_TRACE macro. The regular expression in - the bin/fuzz.pl script used to detect ACE_TRACE mismatch - incorrectly identifies a mismatch the ACE_TRACE question. Once - the fuzz script is fixed, the ACE_TRACE can be uncommented. - -Tue Oct 24 22:20:38 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - - * ace/Truncate.h: - - Rename truncate to trunc. Yet another attempt at fixing Borland - compiler brain damage. - -Tue Oct 24 22:01:41 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - - * ace/OS_NS_stdlib.inl (atop): - - Use intptr_t type to fix 64-bit conversion to void* warnings. - - * ace/Select_Reactor_Base.h (max_handlep1): - * ace/Select_Reactor_Base.inl (max_handlep1): - - Changed return type to be ACE_HANDLE on UNIX platforms instead - of size_t. Addresses "loss of significant bits" warnings in - 64-bit Intel compiler builds. - - * ace/Select_Reactor_Base.cpp (dump): - - Corrected format specifiers for Windows configuration. - - * ace/Select_Reactor_T.cpp (work_pending): - (wait_for_multiple_events): - - Removed unnecessary casts and corrected type of "width" variable - that is passed to select(). - - * tests/Map_Manager_Test.cpp (test_cache_map_manager): - - Fixed "might be used uninitialized" warning. - -Tue Oct 24 17:46:40 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - - * ace/Truncate.h (Truncator): - - Export the Borland-specific specializations from the DLL. This - should address the "undefined symbol" link-time problem. - - * bin/MakeProjectCreator/config/acexml.mpb: - - Re-disabled ACEXML when ace_for_tao is enabled. ACEXML needs - the ACE_Configuration and memory map classes that are not found - in the ace_for_tao subset. - -Tue Oct 24 14:44:09 UTC 2006 Olli Savia <ops@iki.fi> - - * ace/TTY_IO.cpp: - - Changed the default constructor to always initialise member - variables regardless of ACE_HAS_TERMIOS or ACE_HAS_TERMIO setting. - -Tue Oct 24 14:16:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/ACE.cpp: - Use some bools instead of int - - * ace/INET_Addr.cpp (set_port_number): - Added check for ACE_LACKS_HTONS - - * ace/INET_Addr.inl (get_port_number): - Added check for ACE_LACKS_NTOHS - -Tue Oct 24 13:54:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/os_include/netinet/os_in.h: - * ace/config-rtems.h: - Added ACE_LACKS_IP_MREQ - - * ace/INET_Addr.cpp (get_port_number_from_name): - Added ACE_LACKS_HTONS check - -Tue Oct 24 13:27:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Reactor.h: - Added an include of Time_Value.h, this is included implicitly - but this implicit include is not there when using FOCUS with - tp-reactor specialization - -Tue Oct 24 13:09:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Sock_Connect.cpp: - * ace/config-rtems.h: - Added ACE_LACKS_GET_BCAST_ADDR - -Tue Oct 24 13:00:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/os_include/os_socket.h: - * ace/config-rtems.h: - Added ACE_LACKS_SOCKADDR - -Tue Oct 24 12:54:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/os_include/os_netdb.h: - * ace/config-rtems.h: - Added ACE_LACKS_HOSTENT - -Tue Oct 24 12:09:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/OS_NS_arpa_inet.inl: - * ace/config-rtems.h: - Added ACE_LACKS_INET_ADDR and ACE_LACKS_INET_NTOA - -Tue Oct 24 12:00:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/os_include/sys/os_socket.h: - Define MSG_OOB when it is not defined - -Tue Oct 24 11:17:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/OS_NS_sys_socket.inl: - * ace/config-rtems.h: - Added ACE_LACKS_SOCKET, ACE_LACKS_SHUTDOWN and ACE_LACKS_SETSOCKOPT - -Tue Oct 24 11:08:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/OS_NS_sys_select.inl: - * ace/config-rtems.h: - Added ACE_LACKS_SELECT - -Tue Oct 24 10:58:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/os_include/netinet/os_in.h: - * ace/config-rtems.h: - Added ACE_LACKS_IN_ADDR and ACE_LACKS_SOCKADDR_IN - -Tue Oct 24 06:31:05 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - - * ace/Numeric_Limits.h (ACE_Numeric_Limits): - - Added missing "char" specialization for the - ACE_LACKS_NUMERIC_LIMITS case. The "signed char" and - "unsigned char" specializations are not always suitable. - -Tue Oct 24 04:04:26 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - - * ace/Hash_Map_Manager_T.h (lock_): - - Placed "mutable" keyword to beginning of declaration. It is a - storage class specifier, not a CV qualifier, and belongs at the - beginning. Addresses g++ warnings. - - * ace/Sock_Connect.cpp (get_fqdn): - - Addressed "might be used uninitialized warnings. - -Mon Oct 23 02:28:42 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - - * ace/Array_Base.cpp: - * ace/Array_Base.h: - * ace/Array_Base.inl: - - Added STL-style traits, iterators and swap() method. - - (operator=): - - Improved exception-safety. - - * ace/Array_Map.h: - * ace/config-lite.h: - - Moved reverse_iterator declarations to a new - ACE_DECLARE_STL_REVERSE_ITERATORS so that other ACE containers - may use them in a way that minimizes platform-specific - declaration duplication. - - * ace/CDR_Stream.cpp (read_boolean_array): - - Addressed a Coverity CHECKED_RETURN error. There's no need to - check the return value of read_boolean() in this case. - Explicitly cast the return value to "void". - - Addressed Coverity DEADCODE error. No need to check for zero - "cont" pointer since the ACE_NEW_RETURN() call that initializes - it will return immediately. "cont" cannot be zero if the latter - call succeeds. - - * ace/CDR_Stream.inl (operator>>): - - Explicitly check return value of input stream read operations. - Addressed a Coverity CHECKED_RETURN errors. - - * ace/Configuration.cpp (new_section): - - Fixed Coverity USE_AFTER_FREE error. Memory was being accessed - after it was freed. - - * ace/Configuration_Import_Export.cpp: - - Addressed Coverity RESOURCE_LEAK errors. - - * ace/Default_Constants.h (ACE_DEFAULT_CLOSE_ALL_HANDLES): - - This symbol represents a boolean value. s/1/true. - - * ace/Dev_Poll_Reactor.cpp (bind): - * ace/WFMO_Reactor.cpp (bind_i): - - Disallow binding of a nil event handler pointer to the - repository. It is deferenced later on this method. - - * ace/Hash_Map_Manager_T.h: - * ace/Hash_Map_Manager_T.inl: - - Added STL-style traits and iterator accessors. - - (find): - - New method that returns an iterator as an "out" parameter. An - iterator return value could not be used due a conflict with an - existing find() method. - - (unbind): - - New method that unbinds the value pointed to by the given - iterator. - - (ACE_Hash_Map_Iterator_Base_Ex, ACE_Hash_Map_Iterator_Ex): - - New constructors that position the iterator at the given - ACE_Hash_Map_Entry. - - * ace/Lib_Find.cpp (ldfind): - - Place parentheses around ternary operator "?:" conditional to - address an operator precedence problem. In this case, an - expression such as "a + b ? 0 : 1" was used, which is equivalent - to "(a + b) ? 0 : 1" instead of the desired "a + (b ? 0 : 1)". - - Changed local variable name from "got_suffix" to "has_suffix" to - clarify how the variable is being used. - - * ace/OS_NS_Thread.inl (rw_unlock): - - Fixed potential deadlock in case where reference count is one. - Addresses a Coverity DEADLOCK error. - - * ace/OS_NS_dirent.cpp (scandir_emulation): - - Fixed potential dereferencing of zero pointer reported by the - Coverity FORWARD_NULL checker. - - * ace/OS_NS_fcntl.cpp (open): - - Return if SetFilePointer() call fails. Addresses Coverity - CHECKED_RETURN error. - - Added support for large files SetFilePointer() calls. Thanks to - Russell Mora for this fix. - - * ace/OS_NS_stdio.cpp (fopen): - - Fixed potential crash if null mode string is passed to this - method. - - * ace/OS_NS_stdio.inl (fdopen): - * ace/OS_NS_unistd.inl (isatty): - - No need to check for ACE_LACKS_INTPTR_T. Just use intptr_t in - all cases. ACE now supplies this typedef if the platform - doesn't. - - * ace/OS_TLI.h (t_bind): - * ace/OS_TLI.inl (t_bind): - - Work around HP aCC 3.63 namespace scoping problem using typedef - hack in use for other structures. - - * ace/Select_Reactor_Base.cpp: - * ace/Select_Reactor_Base.h: - * ace/Select_Reactor_Base.inl: - - Changed underlying event handler container from a simple array - to an ACE_Hash_Map_Manager<> on Windows, and to an - ACE_Array_Base<> on UNIX-like platforms. - - Use of an ACE_Hash_Map_Manager<> on Windows allows for faster - event handler searches. - - Use of an ACE_Array_Base<> on UNIX-like platforms allows us to - leverage advantages using a container (improved - exception-safety, container interface, etc), while still - retaining the direct file descriptor to event handler mapping at - essentially no cost to footprint relative to the previous - implementation. - - (bind): - - Disallow binding of a nil event handler pointer to the - repository. It is deferenced later on this method. Addresses a - potential crash. - - * ace/Service_Config.cpp (current): - - Simplified these methods. - - Removed global lock that was held when accessing TSS. Only - initialization of global implementation needs to synchronized - with that lock. - - Removed redundant accesses to TSS. - - * ace/Service_Config.h: - - Removed stray semi-colon. - - (impl_): - - This method no longer needs to return the pointer by reference. - - * ace/Service_Repository.cpp: - - Changed loop index type so that it matches repository size type - (an unsigned integer), and updated loop decrement to take into - account the index type is now unsigned. - - * ace/Sock_Connect.h (ipv4_enabled): - * ace/Sock_Connect.cpp (ipv4_enabled): - - New run-time check for existence IPv4 stack. Some hosts only - contain IPv6 stacks. - - From Sriram Chandramouli <sriram_chandramouli at symantec dot com> - (get_fqdn): - - New method that retrieves fully qualified domain. getaddrinfo() - doesn't always provide the desired results. - - * ace/Svc_Conf.y (ace_get_module): - * ace/Svc_Conf_y.cpp (ace_get_module): - - Simplified explicit casts. - - Prevent dereferencing of potentially null pointer. - - * ace/System_Time.cpp: - * ace/System_Time.h: - - No need to include "ace/Malloc_T.h", "ace/MMAP_Memory_Pool.h" - and "ace/Null_Mutex.h". Forward declarations are sufficient. - - Use time_t type instead of ACE_UINT32 when returning times, such - as those returned from ACE_OS::time(). Addresses lack of - precision issues. - - * ace/Thread_Manager.cpp (wait): - - Addressed a Coverity CHECKED_RETURN error. There's no need to - check the return value of ACE_Thread::join() in this case. - Explicitly cast the return value to "void". - - * ace/Time_Value.h (ACE_ONE_SECOND_IN_USECONDS): - - Made this constant type-safe. It is now of type suseconds_t, - instead of a preprocessor symbol definition. - - * ace/UUID.cpp (lock): - - Addressed USE_AFTER_FREE Coverity error. Do not return a - pointer to the previous lock. It may have been destroyed. - - * ace/UUID.h (lock): - - Changed return type from "ACE_SYNCH_MUTEX*" to "void". The - interface/implementation does not provide a means to safely - return the previous lock instance. - - * ace/ace_wchar.inl (convert): - - Corrected calculation of wide string length. - - * bin/MakeProjectCreator/config/acexml.mpb: - - No longer any need to explicitly disable ACEXML in the - ace_for_tao configuration. - - * include/makeinclude/platform_irix6.x_sgic++.GNU: - - SGI 7.3.x compiler doesn't have the 3506 error code. Do not - attempt to supress it. - -Mon Oct 23 22:24:01 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - - * ace/Unbounded_Queue.cpp (set): - - Explicitly initialize dummy value. Addresses "use of - uninitialized variable" g++ 4.1 warning when the variable is a - POD type. - - * ace/ace_for_tao.mpc: - - Removed unnecessary semaphore related files. - - Added missing ace/Truncate.h header. - -Mon Oct 23 21:44:32 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - - * ace/Truncate.h (Truncator): - - Borland doesn't appear to be able to grok the use of the - function call operator in the ACE_Utils::Truncate<> function - template. Replaced the Truncator<>::operator() function call - operator with a static Truncator<>::truncate() method instead. - -Mon Oct 23 13:29:15 UTC 2006 Olli Savia <ops@iki.fi> - - * ACE-INSTALL.html: - * ace/Mem_Map.h: - * ace/Mem_Map.inl: - * ace/Mem_Map.cpp: - * ace/OS_NS_Thread.inl: - * ace/OS_NS_sys_mman.inl: - * ace/Reverse_Lock_T.h: - * ace/Task_Ex_T.h: - * ace/Task_T.h: - * ace/config-lynxos.h: - * include/makeinclude/platform_lynxos.GNU: - - Removed LynxOS 3.x support. - -Mon Oct 23 12:59:35 UTC 2006 Chad Elliott <elliott_c@ociweb.com> - - * bin/generate_compile_stats.sh: - - Corrected a bug with my previous change. If config.h or - platform_macros.GNU were not present, the html would be incorrect. - I also added default.features to the list of configuration files - that are displayed. - -Mon Oct 23 06:34:24 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * ace/os_include/os_pthread.h: Changed - - # if !defined (ACE_LACKS_RWLOCK_T) - - to - - # if !defined (ACE_LACKS_RWLOCK_T) && !defined (ACE_HAS_PTHREADS_UNIX98_EXT) - - to stop a compile error on Solaris after SunOS 5.8. Thanks to - Boris Kaminer <boris dot kaminer at gmail dot com> for reporting - this fix. - -Sun Oct 23 00:29:55 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - - * ace/Truncate.h: - - In the Borland-specific workaround, explicitly cast return value - of ACE_Numeric_Limits::max() of the smaller unsigned type to the - unsigned larger type to which it is being compared. Addresses - non-intuitive "comparison of signed and unsigned types" warning - issued by Borland compiler. Borland promotes unsigned char to - int, instead of unsigned int, when comparing to unsigned int. - This implicit type promotion behavior complies with the C++ - standard, but is a bit awkward nonetheless (IMHO :)). Thanks to - Johnny for pointing out Borland's explanation of the - non-intuitive warning. - -Sun Oct 22 08:11:25 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - - * ace/Token_Request_Reply.inl (token_name): - - Simplified use of ACE_Utils::Truncate<> function template. Only - the "TO" type must be explicitly specified. The "FROM" type is - deduced automatically by the compiler. Note that explicitly - specifying both template parameters is perfectly valid, too. - - * ace/Truncate.h (Truncator): - - Added char/int specializations for Borland to allow the - Integer_Truncate_Test to compile. All of the Borland-specific - Truncator specializations are meant to be a temporary workaround - until Borland C++ is capable of supporting the generalized - implementation. - -Sat Oct 21 14:49:21 UTC 2006 Steve Huston <shuston@riverace.com> - - * ace/TSS_T.{h cpp}: Added "volatile" keyword to once_ member - since it can be changed by other threads. Removed the lock - acquiring from the ts_object() methods - after once_ is checked, - there are no further needs for locks. When needed, the key_ is - set up by ts_init() which does acquire a lock. This avoids a lock - acquire/release cycle on all calls when initialization of the - ACE_TSS object is not required, speeding up performance. Thanks to - Guy Peleg <guy dot peleg at amdocs dot com> for reporting this and - to Russell Mora <russell_mora at symantec dot com> for assisting in - analyzing the situation and recommending the particular fixes. - - * ace/Logging_Strategy.h: Minor doxygen improvements. - - * ace/Sock_Connect.cpp: When checking for IPv6 interfaces on Windows, - there's two conditionally compiled blocks of code. One block was - built if ACE_HAS_IPV6 SIO_ADDRESS_LIST_QUERY are both defined; the - other was built if ACE_HAS_IPV6 is defined. Added the check for - SIO_ADDRESS_LIST_QUERY to the second case as well since it makes - no sense to run it if the first isn't built. Thanks to Andre - Kostur for this fix. Also see: - Mon Oct 16 14:24:25 UTC 2006 Steve Huston <shuston@riverace.com> - - * ace/Task_T.h (reply): Clarified what happens on a reply(). Thanks - to Doug Schmidt for explaining the rationale for this. - - * ace/Token_Request_Reply.inl (token_name): VC7.1 had trouble grokking - the ACE_Utils::Truncate arguments in this case, so add the types - to a more complete specification of what template is desired. - -Sat Oct 21 15:19:46 UTC 2006 Steve Huston <shuston@riverace.com> - - * configure.ac: Removed the check for LINUX_VERSION that disabled - the check for epoll on Linux. Just let the check run - the macros - used checked the kernel/C version used to build the kernel instead - of the running kernel itself (I think...). In any event, the - use of the macros to disable the check prevented the check from - running on systems (such as RHEL 4) that do have epoll. Thank you - to Brian Campbell <becampbel at hotmail dot com> for researching - this area. - -Sat Oct 21 10:48:12 UTC 2006 Martin Corino <mcorino@remedy.nl> - - * bin/PerlACE/RunTest.pm: - * bin/PerlACE/ProcessVX.pm: - * bin/PerlACE/ProcessVX_Unix.pm: - - Changes to accomodate running autotests for VxWorks RTPs on - Linux hosts. - -Sat Oct 21 04:34:33 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - - * ace/OS_NS_stdlib.cpp: - - Always include "ace/Numeric_Limits.h" in the ACE_LACKS_MKSTEMP - case. There is no need to conditionally include it when "max" - is undefined. Addresses VxWorks build errors. - - * ace/Truncate.h: - - Only use workaround for Borland compiler versions less than or - equal to 0x582. Thanks to Johnny for the suggestion. - - * tests/Integer_Truncate_Test.cpp (sizeof_from_lt_sizeof_to): - - Explicitly cast types in inequality comparison to silence - comparison of signed and unsigned warnings. It's not clear why - the warning is occuring since both types are unsigned. - - Removed remaining set of redundant parentheses that were - missed in a previous commit. - -Fri Oct 20 12:55:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Service_Manger.{h,cpp}: - Changed debug_ member to a real bool - -Fri Oct 20 12:40:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/OS_NS_sys_socket.inl (bind): - * ace/config-rtems.h: - Added ACE_LACKS_BIND - - * ace/Basic_Types.h: - Fixed compile problems with BCB6 - -Fri Oct 20 12:05:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Log_Record.inl: - Added check for ACE_LACKS_NTOHL and ACE_LACKS_HTONL - - * ace/config-rtems.h: - Added ACE_LACKS_NTOHL and ACE_LACKS_HTONL when no networking - is available - -Fri Oct 20 09:56:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/INET_Addr.h: - Small change to improve doxygen documentation - - * ace/OS_NS_sys_socket.inl (listen): - Added ACE_LACKS_LISTEN - - * ace/config-rtems.h: - Added ACE_LACKS_LISTEN - -Fri Oct 20 09:36:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/MakeProjectCreator/config/ciao_nodeapplicationmanager.mpb: - * bin/MakeProjectCreator/config/ciao_nodemanager_stub.mpb: - * bin/MakeProjectCreator/config/ciao_targetmanager_stub.mpb: - New base projects - - * bin/MakeProjectCreator/config/ciao_static_dnc_app.mpb: - Use the new base projects above - - Thanks to Abdul Sowayan <abdullah dot sowayan at lmco dot com> - for delivering these files - -Fri Oct 20 09:00:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/os_include/sys/os_socket.h: - Defined AF_UNSPEC and PF_UNSPEC when these are not defined by the - OS header files. - -Fri Oct 20 08:55:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/os_include/sys/os_uio.h: - When INADDR_ANY is not defined, then define it, we need it in several - of the ACE header files - -Fri Oct 20 08:44:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/os_include/sys/os_uio.h: - We define iovec when ACE_WIN32 was defined, changed this to a new - define, ACE_LACKS_IOVEC to make it easier to use with other platforms - - * ace/config-win32-common.h: - Added ACE_LACKS_IOVEC - - * ace/config-rtems.h: - When no networking has been configured, also define ACE_LACKS_IOVEC - -Thu Oct 19 22:28:59 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> - - * contrib/minizip/iowin32.c - * contrib/minizip/iowin32.h - Removed these files. - -Thu Oct 19 23:20:26 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - - * examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp: - * examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp: - * examples/C++NPv1/Reactive_Logging_Server.h: - - Fixed integer/void* conversion related warnings by using - the "intptr_t" type instead of "int" or "long". - -Thu Oct 19 22:58:02 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - - * ace/Truncate.h: - - Borland compilers currently cannot handle the template - meta-programming in this header. Work around the limitation by - explicitly specializing the ACE_Utils::Truncator<> structure - template for a select few 32- and 64-bit integers. More will be - added as needed. - -Thu Oct 19 17:25:16 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - - * tests/Integer_Truncate_Test.cpp: - - Removed redundant parentheses. - -Thu Oct 19 15:25:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/generate_rel_manpages: - Updated doxygen version - - * bin/MakeProjectCreator/templates/gnu.mpb: - Removed kylix support - -Thu Oct 19 13:19:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/OS_main.h: - Added main for rtems - -Thu Oct 19 11:48:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Rtems_init.c: - Fixed empty translation unit warnings - -Thu Oct 19 08:27:12 UTC 2006 Martin Corino <mcorino@remedy.nl> - - * include/makeinclude/platform_openvms.GNU: - Small change to create hardlinks for produced executables. - -Wed Oct 18 16:19:38 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> - - * contrib/minizip/minizip.suo - * contrib/minizip/miniziplibrarycode.suo - Removed these files. - -Wed Oct 18 13:52:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * include/makeinclude/platform_rtems.x_g++.GNU: - Major cleanup of old stuff and always define ACE_HAS_RTEMS - - * etc/rtems_init.c: - * ace/rtems_init.c: - Another move, for rtems we require some functions to always - be available, this defines our network settings and much more. - Because we always build static, we moved this to the ACE lib, - on rtems we define ACE_HAS_RTEMS and then compile the contents - of this file. This way the functions in this file are available - in any executable we link - - * ace/OS.h: - * ace/os_include/os_signal.h: - * ace/os_include/sys/os_types.h: - * ace/OS_NS_stdio.h: - * ace/OS_NS_time.inl: - Replaced __rtems__ with ACE_HAS_RTEMS - - * ace/ace.mpc: - Added rtems_init.c - -Wed Oct 18 13:01:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * include/makeincludes/rules.bin.GNU: - * include/makeincludes/rules.lib.GNU: - * include/makeincludes/wrapper_macros.GNU: - * include/makeincludes/platform_linux_borland.GNU: - Removed kylix support - -Wed Oct 18 10:05:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * apps/Gateway/Gateway/File_Parser.cpp: - Removed egcs workaround - -Wed Oct 18 08:07:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tests/rtems_init.c: - * etc/rtems_init.c: - Moved from tests to etc - -Tue Oct 18 06:27:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * examples/Reactor/Misc/test_signals_1.cpp: - * performance-tests/Misc/context_switch_time.cpp: - Renamed the global count variables to another name. These triggered - a bug in the VxWorks 5.5.2 compiler which we reported to windriver. - By renaming these we will get an error free compilation. - -Tue Oct 18 06:02:28 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - - * ace/Basic_Types.h (intptr_t, uintptr_t): - - Provided suitable typedefs for these standard types when - ACE_LACKS_INTPTR_T is defined. - - * ace/Event_Handler.cpp (~ACE_Event_Handler_var): - - Only use an ACE_Errno_Guard if the underlying ACE_Event_Handler - pointer is non-zero. Saves a TSS access in the zero - ACE_Event_Handler pointer case. - - (operator=): - - Made strongly exception safe. - - * ace/FILE_IO.cpp (send, recv): - * ace/Message_Queue.cpp (enqueue, dequeue): - * ace/Message_Queue_T.cpp: - * ace/OS_NS_unistd.inl (hostname): - - Explicitly supply the "int" "TO" type to the - ACE_Utils::Truncate<> function template. It must now be - explicitly specified since ACE_Utils::Truncate<> now supports - truncation to all integer types, not just "int". - - * ace/Global_Macros.h (ACE_STATIC_CONSTANT): - - New macro for in-class static integral constant initialization - that works around compilers that don't like such initialization. - In-class integral constants in this case are meant to be - compile-time constants so that they may be used as template - arguments, for example. BOOST provides a similar macro. - - * ace/OS_NS_stdlib.inl (atop): - * ace/OS_NS_stdio.cpp (fopen): - - Removed ACE_LACKS_INTPTR_T check. It is no longer needed. - - * ace/Truncate.h: - - Generalized the ACE_Utils::Truncate<> function template - implementation for all integer types. - - * tests/run_test.lst: - * tests/tests.mpc: - - Added new "Integer_Truncate_Test" test that verifies the - ACE_Utils::Truncate<> function template works for all type - size/sign scenarios. - -Tue Oct 17 21:28:11 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> - - * ace/Service_Gestalt.cpp (parse_args_i): - - Checking for no arguments was missed inadvertently in the - original change-set from "Tue Oct 17 16:27:27 UTC 2006 ..." - -Tue Oct 17 21:09:36 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> - - * contrib/minizip/ChangeLogUnzip - * contrib/minizip/crypt.h - * contrib/minizip/ioapi.c - * contrib/minizip/ioapi.h - * contrib/minizip/iowin32.c - * contrib/minizip/iowin32.h - * contrib/minizip/miniunz.c - * contrib/minizip/minizip.c - * contrib/minizip/minizip.mpc - * contrib/minizip/minizip_export.h - * contrib/minizip/mztools.c - * contrib/minizip/mztools.h - * contrib/minizip/unzip.c - * contrib/minizip/unzip.h - * contrib/minizip/zip.c - * contrib/minizip/zip.h - Added the minizip project. Thanks to Krishnakumar Balasubramanian - <kitty at dre dot vanderbilt dot edu> for providing this. - -Tue Oct 17 17:17:36 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * ace/OS_NS_unistd.inl (truncate): SetFilePointerEx() returns a - BOOL not a DWORD (unlike SetFilePointer()..). Thanks to Boris - Kaminer <boris dot kaminer at gmail dot com> for reporting this. - -Tue Oct 17 16:27:27 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> - - * ace/DLL_Manager.cpp: - * ace/Parse_Node.cpp: - - Updated logging messages. - - * ace/Service_Gestalt.cpp: - - Updated logging messages to exclude the "e-word" causing false - positives in the Service_Config_Test. Updated comments. - -Tue Oct 17 12:35:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * apps/soreduce/Library.cpp: - taoversion is not a valid base project. Thanks to Manuel Traut - <manut dot de at googlemail dot com> for reporting this. - -Tue Oct 17 12:09:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ACE-INSTALL.html: - Updated supported platforms by Remedy IT. New are VxWorks 5.5.2, - OpenVMS 8.3, RTEMS and LynxOS. - -Tue Oct 17 12:05:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/config-rtems.h: - Cleanup - - * include/makeinclude/plaform_rtems.x_g++.GNU: - Improved for rtems 4.6.6 - -Tue Oct 17 07:03:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/config-rtems.h: - * ace/OS_NS_unistd.inl: - Added support for ACE_LACKS_FDOPEN - -Mon Oct 16 21:29:57 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> - - * THANKS: Updated Chris Reed's entry in the list. - -Mon Oct 16 20:04:59 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> - - This change fixes bug#2612. See the description for the gory - details. In a nutshell, the problem is caused by the fact that - static services, loaded from a DLL, as part of a dynamic service - initialization can not be safely finalized when the dynamic - service's DLL gets unloaded. This was historically handled by - simply not unloading DLLs, and by finalizing all services at - process exit. With the introduction of the local configurations - feature, this changed. - - The finalization order was supposed to be guaranteed by the - ordering of the services in the repository. It really was a - kludge, because when dynamically loading and removing services - the order can change. Then whenever the process tries to clean - up, the dynamic service's DLL can be unloaded (because it gets - finalized first), and the static services' destructor code would - become inaccessible. The situation results in a SEGV at exit(). - - * ace/DLL.h: - * ace/DLL.cpp: - - Made assignment operator return a non-const reference to make it - well-formed. See C++ Standard, section "[special]". - - * ace/DLL_Manager.cpp: - * ace/Dynamic_Service_Base.cpp (instance): - * ace/Parse_Node.cpp: - - Fixed formatting and logging - - * ace/Service_Config.cpp (parse_args_i): - - Fixing a bug related to parsing the command line options that - take arguments. Thanks to Aaron Scamehorn <Aaron dot Scamehorn - at cogcap dot com> for reporting it. - - * ace/Service_Gestalt.cpp: - - Added ACE_Service_Dynamic_Guard (formerly - ACE_Service_Type_Forward_Declaration_Guard) which helps to - resolve an issue with hybrid services, i.e. dynamic services, - accompanied by static services in the same DLL. Only automatic - instances of SDG are supposed to exist. Those are created during - (dynamic) service initialization and serve to: - - (a) Ensure the service we are loading is ordered last in the - repository, following any other services it may cause to - register, as part of its own registration. This is a common case - when loading dynamic services from DLLs - there are often static - initializers, which register static services. - - (b) The SDG instance destructor detects if the dynamic service - initialized successfully and "fixes-up" all the newly registered - static services, so that each holds a reference to the DLL, from - which they have originated. - - Updated comments and formatting. - - * ace/Service_Object.h (dll): - * ace/Service_Object.inl (dll): - - Added void dll (const ACE_DLL&) to make it possible to - "relocate" services registered through static initializers found - in DLL's code segment(s). - - * ace/Service_Object.cpp (fini): - - Modified ACE_Service_Type::fini() to ensure the DLL associated - with the service is properly closed. This in conjunction with - the gestalt changes above, makes it possible to safely and - completely unload a service. - - * ace/Service_Repository.h: - * ace/Service_Repository.cpp (remove_i,relocate_i,relocate): - - Added relocate(), which allows association of a (static) service - objects with a DLL. Per changes to ACE_Service_Gestalt, - above. Added a counterpart private relocate_i(), which does not - obtain locks. - - * tests/Service_Config_Test.cpp: - - Added a test that combines more than one argument-taking command - line option to guard against regression for the bug fixed in - ACE_Service_Config::parse_args_i (see above). - -Mon Oct 16 19:20:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/config-rtems.h: - Updated with more changes needed for rtems - - * ace/os_include/os_signal.h: - Added specific defines for rtems - - * ace/OS_NS_time.cpp (difftime): - Removed not used variable and get gmtime/gmtime_r from the - global scope - - * ace/OS_NS_string.{h,cpp,inl}: - Added ACE_LACKS_STRTOK_R to make the rtems port easier - -Mon Oct 16 14:24:25 UTC 2006 Steve Huston <shuston@riverace.com> - - * ace/OS_NS_netdb.{cpp inl} (gethostbyname[_r], gethostbyaddr[_r]): - Check the specified string (name or addr) for unspecified or of - 0 length and return 0 if so - bypasses a system call and a possible - memory leak. Thanks to Howard Finer <hfiner at sonusnet dot com> - for these fixes. - - * ace/Sock_Connect.cpp (get_ip_interfaces): Don't report an error if - we can't find IPv6 addresses. It may be on a system with ACE_HAS_IPV6 - support compiled but IPv6 not configured/enabled. Thanks to Andre - Kostur <akostur at incognito dot com> for reporting this. - - * ace/WFMO_Reactor.cpp (ok_to_wait): In the ACE_HAS_WINCE block, - change fwaitAll arg from TRUE to FALSE - it must be FALSE on - WinCE (thru WinMobile 5) per MSDN. Thanks to Drew Reynaud - <drewreynaud at hotmail dot com> for this fix. - - * THANKS: Added Drew Reynaud to the Hall of Fame. - -Mon Oct 16 14:21:48 UTC 2006 Chad Elliott <elliott_c@ociweb.com> - - * bin/generate_compile_stats.sh: - - I accidentally deleted a letter in my previous commit. - -Mon Oct 16 14:02:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/config-rtems.h: - Added first set of missing defines - - * ace/os_include/sys/os_select.h: - * ace/os_include/sys/os_uio.h: - Removed rtems specific part, not needed anymore - - * ace/os_include/sys/os_types.h: - Added rtems check - - * include/makeinclude/plaform_rtems.x_g++.GNU: - Updated - -Mon Oct 16 13:47:25 UTC 2006 Chad Elliott <elliott_c@ociweb.com> - - * bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm: - - Use the create_command_line_string() method instead of printing - the command line directly. This opens the door for disabling this - functionality. - -Mon Oct 16 12:18:14 UTC 2006 Chad Elliott <elliott_c@ociweb.com> - - * ace/OS_NS_Thread.inl: - * ace/os_include/os_semaphore.h: - - The feature that I put in for Gottwald Port on Mon Mar 6 18:25:41 - UTC 2006 causes a performance overhead for semaphores where - ACE_HAS_POSIX_SEM is defined (SunOS, HP-UX, MacOS X, etc.). For - those that are not interested in timed semaphores, this feature - provides nothing and is detemental to performance. Now, this - feature is disabled by default and must be manually enabled by - defining the ACE_HAS_POSIX_SEM_TIMEOUT_EMULATION macro. - -Mon Oct 16 12:06:10 UTC 2006 Chad Elliott <elliott_c@ociweb.com> - - * bin/generate_compile_stats.sh: - - Added some changes to make this script usable for software other - than ACE+TAO+CIAO. - - - Enhanced the usage message. - - Fixed minor HTML errors. - - Added options to set the base root directory and software title. - -Mon Oct 16 11:53:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * examples/IOStream/client/IOStream_Client.mpc: - * examples/IOStream/server/IOStream_Server.mpc: - Added exename so that we create an exe, not a dll - - * examples/IOStream/client/.cvsignore: - * examples/IOStream/server/.cvsignore: - Removed duplicate lines - - * examples/IOStream/server/iostream_server.cpp: - Added needed include for building with VxWorks 5.5.2 - -Mon Oct 16 08:33:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/MakeProjectCreator/templates/ciao_static_dnc_app.mpb: - New base project for static dnc. - Thanks to Abdul Sowayan <abdullah dot sowayan at lmco dot com> - for creating this file - -Sun Oct 15 23:22:52 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> - - * bin/tao_orb_tests.lst: - Added Bug_2683_Regression to the test suite. - -Fri Oct 13 18:26:19 UTC 2006 Andy Stafford <ajs3@cec.wustl.edu> - - * include/makeinclude/wrapper_macros.GNU: - - Added 'lksctp' as recognized option to sctp documentation. - -Fri Oct 13 18:13:00 UTC 2006 Chad Elliott <elliott_c@ociweb.com> - - * bin/cle.pl (getDefaultDomain): - - Fixed a bug where extra text would be part of the domain name when - the /etc/hosts file contains an alias after the fully qualified - host name. - -Fri Oct 13 12:32:35 UTC 2006 Chad Elliott <elliott_c@ociweb.com> - - * bin/PerlACE/Process_Unix.pm: - - Added support for remote testing on UNIX only. Currently, ssh or - rsh is used to run an executable on the remote machine. The - remote test capability is only enabled if the RemoteInformation - method is called on the PerlACE::Process object. For more - details, see the RemoteInformation method in this module. - -Fri Oct 13 10:25:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * apps/soreduce/Library.cpp: - aceversion is not a valid base project. Thanks to Manuel Traut - <manut dot de at googlemail dot com> for reporting this. - -Thu Oct 12 16:44:34 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * ace/Log_Record.cpp (operator<<): Zapped the nonconst_record and - const_cast since this is no longer needed as per the following - change: - - Sun Aug 12 00:34:42 2001 Steve Huston <shuston@riverace.com> - * ace/Log_Record.h: - * ace/Log_Record.i (msg_data()): Changed ACE_TCHAR *msg_data() - to: const ACE_TCHAR *msg_data (void) const. Makes it safer, - and conforms to all current usage inside ACE. Also makes - C++ Network Programming examples simpler :-) - - Thanks to Abdul Sowayan <abdullah dot sowayan at lmco dot com> - for reporting this. - -Thu Oct 12 15:45:24 UTC 2006 Chad Elliott <elliott_c@ociweb.com> - - * bin/MakeProjectCreator/templates/gnu.mpd: - - If a custom definition has an 'output_option' set, the order of - listing the input file changes such that it is listed before the - output_option setting in the build rule. - - * bin/auto_run_tests.pl: - - Added a new option, -l, which can be used to specify an arbitrary - list of tests. - -Thu Oct 12 12:20:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Svc_Conf.h: - Fixed incorrect placed ACE_BEGIN_VERSIONED_NAMESPACE_DECL macro. - Thanks to Alexander Libman <alexander dot libman at earthlink dot net> - for reporting this - -Wed Oct 11 15:24:04 UTC 2006 Steve Huston <shuston@riverace.com> - - * ace/Log_Record.{h inl cpp}: Removed the set_msg_data_ptr() - method - it opens the possibility of putting a buffer in place - that can't be freed properly. All of the memory allocating and - deleting should be done internally to this class. The removed - method was only used internally. - Added a private msg_data_size_ member that keeps the allocated size - of msg_data_ in ACE_TCHARs (not bytes) to tell if the buffer needs - to be resized. Comparing to the string length is incorrect - it - causes buffer reallocating whenever a short logged message is - followed by a longer one, even if both are much shorter than the - allocated length of msg_data_. When a ctor allocates a msg_data_ - area, set the first spot to '\0' to a call to msg_data_len() won't - get random answers or a crash. - (msg_data (const ACE_TCHAR *)): Changed this method to return int, - not void. It also will now reallocate the msg_data_ buffer if needed - to hold the specified string. operator<< now uses msg_data() to set - the string instead of the now removed set_msg_data_ptr() method, - keeping all msg_data_ allocation and release in the same class. - (operator<<): Fix memory leak when setting a new msg_data_ - buffer. Thanks to Arturo Montes for letting us know about the leak. - - * docs/ACE-guidelines.html: Clarify the format of ChangeLog entries. - Remove the recommendation to always test on egcs; things should be - tested on at least Windows and Linux, but egcs is outdated. - -Tue Oct 10 18:46:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ACE-INSTALL.html: - Document how to get a current copy from subversion - -Tue Oct 10 14:16:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/CDR_Stream.cpp: - Fixed incorrect comment - -Tue Oct 10 12:54:00 UTC 2006 Simon Massey <sma@prismtech.com> - - * ace/config-win32-msvc.h: - Changed the MFC build run-time dll decorators to match - the current build system settings. - -Tue Oct 10 06:08:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/fuzz.pl: - Changed check for empty inline files to also check for empty - source files - - * bin/MakeProjectCreator/config/avoids_corba_e_compact.mpb: - * bin/MakeProjectCreator/config/avoids_corba_e_micro.mpb: - New avoids projects - - * etc/ace.doxygen: - Expand some more macros, should improve documentatation - - * html/README: - Updated download location to ISIS - -Tue Oct 10 06:03:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * docs/ACE-bug-process.html: - Updated to mention svn - - * docs/Download.html: - Commented out the source packages that are not complete at this moment - -Mon Oct 09 09:07:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/generate_rel_manpages: - Fixed an error in this script and updated the location to which the - generated packages should be copied to - -Mon Oct 09 09:03:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * docs/Download.html: - Updated with the new download locations - - * docs/bczar/bczar.html: - Updated documentation generation instructions - -Thu Oct 05 00:35:37 2006 William R. Otte wotte@dre.vanderbilt.edu - - * ACE version 5.5.3 released. - -Tue Oct 3 16:45:35 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> - - * NEWS - Updated the NEWS to add the changes for ACE_Hash_MultiMap_Manager - class and executionmanager_stub and plan_generator base projects. - -Tue Oct 3 15:02:14 UTC 2006 Steve Huston <shuston@riverace.com> - - * NEWS: Described the ACE_Refcounted_Auto_Ptr effects of - Thu Jul 6 20:45:15 UTC 2006 Steve Huston <shuston@riverace.com> - -Mon Oct 2 12:21:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Log_Msg.cpp: - Const/bool improvements - -Mon Oct 2 11:26:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Log_Msg.{h,cpp}: - Changed is_set_ conditional values member to bool - -Sat Sep 30 14:00:33 UTC 2006 Steve Huston <shuston@riverace.com> - - * tests/Cached_Allocator_Test.cpp: - * tests/Codecs_Test.cpp: - * tests/Enum_Interfaces_Test.cpp: - * tests/Get_Opt_Test.cpp (run_test): - * tests/Naming_Test.cpp: - * tests/Reactor_Notification_Queue_Test.cpp: - * tests/Reference_Counted_Event_Handler_Test.cpp: - * tests/Timer_Queue_Reference_Counting_Test.cpp: - Correct logging format for wide-char build. - -Fri Sep 29 18:54:29 UTC 2006 Steve Huston <shuston@riverace.com> - - * ace/OS_NS_signal.inl (sigaction): In the !ACE_HAS_SIGACTION_CONSTP2 - case, use ACE_SIGACTION instead of "struct sigaction" to pick up - the funky HP hack. Also see: - Mon Jan 23 22:08:56 UTC 2006 Steve Huston <shuston@riverace.com> - -Fri Sep 29 10:00:04 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * examples/Web_Crawler/Web_Crawler.mpc: - Added avoids+=uses_wchar for borland and bmake, the Borland - compiler gives a warning which can't be easily suppressed and - by not building this project we do get a few new green builds - -Thu Sep 28 19:37:13 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> - - * bin/diff-builds.pl: - Fixed the finding of the nearest earlier build for a given date. - -Thu Sep 28 16:53:14 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> - - * bin\MakeProjectCreator\config\ciao_executionmanager_stub.mpb - * bin\MakeProjectCreator\config\ciao_plan_generator.mpb - Added the base projects for executionmanager_stub and plan_generator. - -Thu Sep 28 14:46:43 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> - - * bin/diff-builds.pl: - - Updated to fix temporary files creation. Now all those are put - in the temporary files directory. Fixed the ability to compare - just two dates. - -Thu Sep 28 13:35:04 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/config-hpux-11.00.h: - Removed ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION that - was set for gcc, with this define set the ACE library doesn't - build. - - * ace/CDR_Stream.cpp: - Initialise pointer with 0 - - * ace/TP_Reactor.{h,inl}: - Changed owner from int to bool. - -Wed Sep 27 21:18:04 UTC 2006 Steve Huston <shuston@riverace.com> - - * ace/Synch_Options.h: Corrected the table of possible Use_Reactor, - Timeout combinations - it was reversed. - - * ace/WFMO_Reactor.{h cpp}: Change the delete_signal_handler_, - delete_timer_queue_, delete_handler_rep_, delete_notify_handler_, - and open_for_business_ members from int to bool to more - accurately reflect their nature as yes/no indicators. - Also, initialize notify_handler_ to 0 in constructors to avoid - a UMR warning from Purify. - -Wed Sep 27 06:28:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/msvc_static_compile.pl: - Added protocols directory - -Tue Sep 26 09:49:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/MakeProjectCreator/config/dynamicany.mpb: - Derive from valuetype, needed to get AbstractBase::_nil() in a no - inline build. - -Mon Sep 25 16:29:42 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * ace/ACE.cpp (send_n_i): Conditionally removed the check for - errno == ENOBUFS because Winsock send, or WSASend will try to - enqueue all buffer at once (to the kernel) and if not it will - return ENOBUFS, in which case the socket is always ready for - writing but actually winsock can never perform such write and we - have endless loop. Thanks to Aleksandar Vukajlovic <vukajlo at - finsoft dot co dot yu> for reporting this and suggesting a fix. - -Mon Sep 25 11:39:35 UTC 2006 Boris Kolpackov <boris@codesynthesis.com> - - * ace/Bound_Ptr.inl: - * ace/Bound_Ptr.h: - - Applied workarounds that should fix compile errors on BCB6. - Thanks to Martin Corino <mcorino at remedy.nl> for providing - the patch. - - * protocols/ace/TMCast/Messaging.hpp: - * protocols/ace/TMCast/TransactionController.hpp: - - Updated to use ACE_Strong_Bound_Ptr. - -Fri Sep 22 12:42:37 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * docs/index.html: Added a link to the http://www.acejoy.com ACE - developers website in China. Thanks to Winston Zhang <webmaster - at acejoy dot com> for creating this website. - -Tue Sep 19 12:27:47 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * tests/Unload_libACE.cpp: Fixed the formatting of this file so it - conformed to ACE guidelines. - -Tue Sep 19 02:54:20 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * ace/FILE_Connector.h: Changed the documentation to reflect the fact - that mkstemp() is used, not mktemp(). - -Thu Sep 21 16:51:34 UTC 2006 Ciju John <johnc@ociweb.com> - - * ace/TP_Reactor.h: - * ace/TP_Reactor.cpp: - The TP_Reactor signal handling implementation is - incomplete. In the current implementation under certain - circumstances (event loop breaks out if interrupted. This is - controlled via ACE_Select_Reactor_T::restart()), a properly - handled OS signal can break the reactor event loop in - an unpredictable manner. This is due to the fact that we cannot - predict which thread will receive the OS signal. Untill the - TP_Reactor signal handling is fixed, I am commenting it out. - -Thu Sep 21 15:13:19 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> - - * bin/tao_orb_tests.lst: - Added new bug 2188 regression test. - -Mon Sep 18 10:56:29 UTC 2006 Steve Huston <shuston@riverace.com> - - * include/makeinclude/platform_sunos5_sunc++.GNU: Add buildbits=64 - branch for Sun Studio 11 (Sun C++ 5.8). Thanks to Aleksandar - Vukajlovic <vukajlo at finsoft dot co dot yu> for this. - - * THANKS: Added Aleksandar Vukajlovic to the Hall of Fame. - -Thu Sep 14 23:01:16 UTC 2006 Steve Huston <shuston@riverace.com> - - * ace/Bound_Ptr.inl: Tweak syntax to try and work around apparant - issues with BCB6. - -Thu Sep 14 21:48:39 UTC 2006 Steve Huston <shuston@riverace.com> - - * ace/OS_NS_Thread.inl (thr_getspecific): Removed the ACE_Errno_Guard - around ::TlsGetValue() in the ACE_HAS_WTHREADS case. The comments - near the code said (paraphrasing) "...it was to protect against - ACE_Log_Msg::instance() overwriting the error value before it had a - chance to be logged; although ACE_ERROR et al already store the - error value before calling ACE_Log_Msg::instance(), there may be a - chance that other uses of ACE_Log_Msg don't protect this way." - I have a report that having the errno guard in place is taking - over 10% CPU during a customer system's run-time. This is way too - much to have in a hot path, especially for a mis-placed guard. - It seems a little random to be picking on ACE_OS::thr_getspecific() - when there are many more OS calls in the ACE_Log_Msg::instance() - call path. - If there are really cases outside of ACE_ERROR... et al, then the - guard should be worked into ACE_Log_Msg::instance() method. However, - rather than try that now, let's see if there are any real issues, - since OS-level calls should be setting errno when errors are - noticed, propagating from GetLastError() via - ACE_OS::set_errno_to_last_error () as needed. - Thanks to Kelly Hickel <kfh at mqsoftware dot com> for raising - this point. - -Wed Sep 13 18:25:37 UTC 2006 Boris Kolpackov <boris@codesynthesis.com> - - * ace/Bound_Ptr.h: - * protocols/ace/RMCast/Reassemble.cpp: - - Re-applied my changes (Wed Sep 6) on build czar's (Steve - Huston) request. - -Tue Sep 12 18:07:57 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * docs/svn/svn-prefs.reg - * docs/svn/config - - Added pdf,eps,ps as binary file types. - -Tue Sep 12 13:56:22 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * apps/JAWS3/small/SS_Service_Handler.h: Added #include - "ace/svc_export.h". Thanks to Andy Wang <ypwangandy at gmail - dot com> for reporting this. - -Tue Sep 12 13:56:09 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * apps/JAWS3/small/SS_State_DONE.h: - * apps/JAWS3/small/SS_State_READ.h: Added #include - "ace/Synch_Traits.h". Thanks to Andy Wang <ypwangandy at gmail - dot com> for reporting this. - -Thu Sep 7 19:43:02 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * ace/FILE_Connector.h (ACE_FILE_Connector): Updated the - documentation to remove mention of the return values. Thanks to - Hieu Ngyuen <hieu dot t dot nguyen at vanderbilt dot edu> for - reporting this. - -Mon Sep 11 13:03:17 UTC 2006 Boris Kolpackov <boris@codesynthesis.com> - - * ace/Bound_Ptr.h: - * protocols/ace/RMCast/Reassemble.cpp: - - Reverted my previous changes (Wed Sep 6) since BCB2006 - is unable to handle the required C++ constructs. - -Sun Sep 10 09:23:04 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * include/makeinclude/platform_g++_common.GNU - - Committing a fix provided by Ossama Othman (Ossama_Othman at symantec dot com) - to fix a problem with symbol visibility when building static libraries. - -Fri Sep 8 21:11:20 UTC 2006 Steve Huston <shuston@riverace.com> - - * ace/CDR_Stream.cpp (ACE_OutputCDR::replace()): Fixed compile error - from apparant cut/paste error in ACE_ENABLE_SWAP_ON_WRITE path. - Thanks to JR Andreassen for reporting this. - - * ace/Bound_Ptr.h: Changed new constructor/assignment to use - dynamic_cast in order to be able to transport pointers through - that can go both up and down a class hierarchy. - (See Wed Sep 6 07:40:03 UTC 2006 Boris Kolpackov - <boris@codesynthesis.com>). - - * protocols/ace/RMCast/Protocol.h (clone(), clone_()): Replaced use of - naked pointers returned from clone_() with ACE_Strong_Bound_Ptr and - used new ACE_Strong_Bound_Ptr ctor to facilitate carrying a more- - refined type through a Profile_ptr and back. Closes up a window - for exception unsafeness noticed by Boris Kolpackov. Also see - Tue Aug 22 22:52:41 UTC 2006 Steve Huston <shuston@riverace.com> - -Fri Sep 8 18:25:17 UTC 2006 Steve Huston <shuston@riverace.com> - - * ace/Synch_Options.{h cpp}: Improved the documentation for this - class, particularly the table that explains the behavior for the - valid combinations of reactor-usage and timeout. Thank you to - Andriy Gapon <avg at icyb dot net dot ua> for motivating this. - - Also changed the return type of operator[] from int to bool; its - meaning was always 1/0 but was overlooked in the sweep for this - type of thing last year. - - * NEWS: Added the ACE_Synch_Options::operator[] return type change. - - * THANKS: Added Andriy Gapon to the Hall of Fame. - -Wed Sep 6 07:40:03 UTC 2006 Boris Kolpackov <boris@codesynthesis.com> - - * ace/Bound_Ptr.h: - - Added new constructor and assignment operator templates that - support the naked pointer-like implicit conversion. - - * protocols/ace/RMCast/Reassemble.cpp: - - Use the new constructor to get rid of reinterpret_cast. - -Tue Sep 5 21:28:02 UTC 2006 Nishanth Shankaran <nshankar@dre.vanderbilt.edu> - - * bin/MakeProjectCreator/config/ciao_race_component.mpb: - * bin/MakeProjectCreator/config/ciao_race_default.mpb: - * bin/MakeProjectCreator/config/ciao_race_monitor.mpb: Added new - RACE specific base projects. - -Fri Sep 1 19:58:06 UTC 2006 Ciju John <johnc@ociweb.com> - - * bin/tao_orb_tests.lst: - Turn on nightly regression test for bug 1476. - -Fri Sep 1 13:49:12 UTC 2006 Martin Corino <mcorino@remedy.nl> - - * bin/PerlACE/Run_Test.pm: - Increased process creation timeout for tests on openVMS. - -Thu Aug 31 01:45:06 UTC 2006 Sumant Tambe <sutambe@nospam> - - Added .xml files to it. - * docs/svn/config: - * docs/svn/svn-prefs.reg: - -Wed Aug 30 17:45:30 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> - - This change fixes bug#2648 - - * ace/Service_Object.cpp: - - Fixed formatting. - - * ace/Service_Repository.cpp: - - Updated logging. - - * ace/Service_Types.h: - * ace/Service_Types.cpp: - - Added ACE_Service_Object_Type::initialized_ member variable to - hold the result of calling init() on the ACE_Service_Object. The - value is later consulted in ACE_Service_Object_Type::fini() to - determine if ACE_Service_Object::fini() should be - called. C++NPv2 (page 120) says that fini() must be called if - and only if, init() succeeded, i.e. returned 0. - -Wed Aug 30 17:18:52 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> - - * bin/MakeProjectCreator/config/ciao_config_handlers.mpb - Modified this file to fixed the "reference to `ACE_Singleton<CIAO - ::Config_Handlers::XML_Helper, ACE_Null_Mutex>::instance()'"warnings - with FC5_Static build. - -Wed Aug 30 13:34:50 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * bin/make_release - - Updates to the make_release script to make it subversion compatible. - major updates to be aware of: - . Assumes the working copy it uses is flattened - . Must have DOC_ROOT set - . Script should be started from DOC_ROOT. - . Produces traditional (nested) releases - . Now produces a set of source-only kits in addition to - the traditional kits. - - IMPORTANT: The release makefiles have not been updated, and are - most likely broken. - - Producing a release is a two step process: - make_release -u # Update version numbers - make_release -k ace+tao+ciao # Create all kits. - -Wed Aug 30 12:19:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/CDR_Stream.{h,cpp}: - Use true/false consistently for the good_bit - -Wed Aug 30 05:57:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tests/Service_Config_Test.cpp: - Fixed argument not used warnings - -Tue Aug 29 21:17:26 UTC 2006 Steve Huston <shuston@riverace.com> - - * tests/Service_Config_DLL.{h cpp}: - * tests/Service_Config_Test.cpp: Added a test for ACE_Service_Config's - behavior when a dynamic service's init() hook returns -1 (failure). - This was precipitated by Bugzilla #2648. - -Tue Aug 29 18:07:39 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - - * examples/IPC_SAP/SSL_SAP/SSL_SAP.mpc: - * tests/SSL/tests.mpc: - - Disable MPC projects in these files that depend on features not - found in the "ACE for TAO" subset", i.e. ACE_Profile_Timer and - asynch I/O. - -Tue Aug 29 13:19:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/tao_orb_tests.lst: - Added bug 2560 regression. It runs fine on windows but seem to - crash on linux exhibiting a bug that isn't fixed yet. - -Tue Aug 29 13:17:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/PerlACE/ProcessVX.pm: - Commented out the ProcessVX_Unix require, it resulted in - errors on test systems when they don't have Net::Telnet () - available. - -Tue Aug 29 11:16:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/PerlACE/Run_Test.pm: - * bin/PerlACE/ProcessVX_Unix.pm: - * tests/run_test.pl: - Changes for running tests on linux with vxworks 6.3 rtp model target - -Tue Aug 29 08:20:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tests/run_test.lst: - Don't run UUIDTest in ACE_FOR_TAO configuration - - * bin/ace-tests.lst: - Don't run wfmo reactor tests in ACE_FOR_TAO configuration - -Tue Aug 29 00:24:48 UTC 2006 Adam Mitz <mitza@ociweb.com> - - * docs/run_test.txt: - Fixed Perl bug in example (needed "" instead of '' to get $ variable - expansion) and added explanatory text on using $PerlACE::ACE_ROOT - and $PerlACE::TAO_ROOT. - -Tue Aug 29 00:26:56 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - - * ace/SSL/ssl.mpc - * ace/SSL/ssl_for_tao.mpc - * bin/MakeProjectCreator/config/ssl_full.mpb: - * bin/MakeProjectCreator/config/ssl.mpb: - * bin/MakeProjectCreator/config/ssl_for_tao.mpb: - - Added support for new ACE_SSL subset "ACE_SSL_FOR_TAO" for - "ace_for_tao" configuration. The ACE_SSL_FOR_TAO subset merely - lacks asychronous I/O support. - -Tue Aug 29 00:04:29 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - - * ace/ACE_export.h: - - SGI C++ 7.3 compiler does not support standard C++ "extern - inline" declarations. - - * ace/Log_Msg.cpp (log): - - Corrected scalar/vector operator delete() mismatch. The wide - string buffer was allocated as an array. Destroy it - accordingly. - - * ace/MMAP_Memory_Pool.cpp (ACE_MMAP_Memory_Pool): - - Prevent potential dereferencing of null pointer. - - * ace/Svc_Conf_Param.h: - - Corrected author information. - -Mon Aug 28 23:59:50 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - - From Amnon Berger <AmnonAB at gmail dot com> - * ace/SSL/SSL_Context.h (ACE_SSL_Context): - * ace/SSL/SSL_Context.cpp (certificate): - - Added support for reading an X.509 certificate from memory - instead of a file. - -Mon Aug 28 19:33:50 UTC 2006 Sumant Tambe <sutambe@nospam> - - A quick perl script to create a change-log-entry date and time. - * bin/cltime.pl: - - Added *.cidl *.pcd *.cdd - * docs/svn/config: - * docs/svn/svn-prefs.reg: - -Mon Aug 28 14:14:39 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> - - * bin/tao_other_tests.lst: - Added TAO/orbsvcs/tests/Security/Big_Request/run_test.pl to the - list of SSL-based tests. Thanks to Johnny Willemsen - <jwillemsen@remedy.nl> for pointig out that it was missing. - -Mon Aug 28 13:45:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Svc_Conf_Lexer.cpp: - Fixed variable not used warning when ACE_USES_WCHAR is not - defined - - * ace/Min_Max.h: - Removed ACE_LACKS_MIN_MAX_TEMPLATES and the code that was - there when this define was set, this define wasn't enabled - in any configuration file. - -Mon Aug 28 11:53:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/MakeProjectCreator/config/taodefaults.mpb: - Added exceptions as base project, TAO requires native C++ exceptions. - -Mon Aug 28 11:45:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * protocols/tests/RMCast/RMCast.mpc: - Removed avoids usage, that is already in the base projects - -Mon Aug 28 11:13:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * etc/*.doxygen: - Set ignore prefix in several files to improve generated - documentation - -Mon Aug 28 11:08:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * etc/acexml.doxygen: - Ignore ACEXML_ as prefix - -Mon Aug 28 10:34:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * docs/run_test.txt: - Updated to explain how the script works on VxWorks and extended - the exampl in such a way that if there is not an executable - it returns directly - -Mon Aug 28 10:07:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tests/run_test.lst: - Added UUIDTest, was just not listed in this file - - * bin/PerlACE/ProcessVX_Unix.pm: - New initial file for running tests for VxWorks from an unix host - - * bin/PerlACE/ProcessVX.pm: - On unix use the new file above - -Mon Aug 28 09:05:20 UTC 2006 Boris Kolpackov <boris@codesynthesis.com> - - * bin/ace_tests.lst: - - Copied test exclusion list from the Multicast_Test entry. - - * protocols/tests/RMCast/Protocol.h: - * protocols/tests/RMCast/run_test.pl: - - Adjusted the timeout value and message size. - -Sun Aug 27 11:11:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/tao_orb_tests.lst: - Added twoway DII collocation test - -Sun Aug 27 00:03:07 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * ace/Filecache.cpp (ACE_Filecache_Object): Added a call to - - this->lock_.release (); - - to release the lock and so the same file can be fetched again. - Thanks to Liu Qian <qianliu dot gmail at com> for reporting - this. - -Sat Aug 26 17:40:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * docs/ACE-porting.html: - ACE_VXWORKS is the define for VxWorks, exceptions are required - for TAO. - -Sat Aug 26 17:36:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * docs/ACE-guidelines.html: - Updated some parts to mention svn instead of cvs - -Sat Aug 26 03:11:01 UTC 2006 Krishnakumar B <kitty@spam.invalid.domain> - - * docs/svn/svn-prefs.reg: - * docs/svn/config: - - Updates to add even more file types. - -Sat Aug 26 02:32:18 UTC 2006 Krishnakumar B <kitty@spam.invalid.domain> - - * docs/svn/svn-prefs.reg: - * docs/svn/config: - - Updated these files to add more entries to the list of globally - ignored extensions, and also to the list of file types which - should have automatic properties set. Also synced up the config and - svn-prefs.reg file. - -Fri Aug 25 22:01:38 UTC 2006 Steve Huston <shuston@riverace.com> - - * ace/Sock_Connect.cpp (get_ip_interfaces, count_interfaces): - Corrected to extract IPv6 information correctly from ioctl()- - returned structures. - - * tests/Enum_Interfaces_Test.cpp: On error condition ACE_HAS_IPV6 but - no ipv6 interfaces, do the log as LM_ERROR so the scoreboard picks - it up. - -Fri Aug 24 12:55:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/config-vxworks6.3.h: - * ace/Process.cpp: - * ace/Task.cpp: - Fixes for building on vxworks 6.3 with diab 5.4 compiler - -Fri Aug 24 11:17:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/CDR_Size.cpp: - Added include of OS_Memory.h to get ACE_align_binary - -Thu Aug 24 21:40:24 UTC 2006 Steve Huston <shuston@riverace.com> - - * tests/Process_Manual_Event_Test.cpp (acquire_release): Fixed a race - condition whereby while a parent and child were ping-ponging, it - was possible for one process to signal event1, wait on event2, then - signal event1 again before the other process could respond to - event1 being signaled and reset it. Thus, event1 was being reset - after the other process signaled it, ensuring a never-ending - wait at the end of the iterations. I changed the code to quickly - reset the event before printing the debug message, thereby closing - the window of opportunity a lot. But probably not completely - removing it... we'll have to see. - -Thu Aug 24 16:40:54 UTC 2006 Steve Huston <shuston@riverace.com> - - * ace/config-aix-4.x.h: Only need to set - ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION for g++ - prior to g++ 4.1 (have only heard report of this for g++ 4.1; - it may need adjustment for 4.0). Thanks to Nzer Zaidenberg - <scipioenterprises at yahoo dot com> for reporting the original - problem and testing this fix. - - * THANKS: Added Nzer Zaidenberg to the Hall of Fame. - -Thu Aug 24 16:33:22 UTC 2006 James H. Hill <hillj@isis.vanderbilt.edu> - - * docs/svn/config: - * docs/svn/svn-prefs.reg: - - Added auto-props for *.tex and *.cls files. - -Thu Aug 24 13:48:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/config-openvms.h - Removed ACE_HAS_SOCK_BUF_SIZE_MAX, not needed anymore with the - latest OpenVMS versions - -Thu Aug 24 08:11:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/DLL.h - * ace/Service_Repository.h - * ace/Service_Object.cpp - * ace/Parse_Node.cpp - * ace/Service_Object.inl - * ace/Parse_Node.h - * ace/Service_Repository.cpp - * ace/Service_Object.h - * ace/Service_Gestalt.h - * ace/Service_Gestalt.cpp - * ace/DLL_Manager.cpp - * ace/DLL.cpp - Reverted change from below on request of Iliyan because it broke - a set of tests that spawn a thread in init. - Tue Aug 22 21:43:34 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> - -Wed Aug 23 08:32:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Sock_Connect.{h,cpp}: - Reverted the change below, VxWorks/OpenVMS/AIX all have problems - after this change - - Tue Aug 22 15:19:46 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> - * ace/Sock_Connect.h: - * ace/Sock_Connect.cpp: - -Tue Aug 22 22:52:41 UTC 2006 Steve Huston <shuston@riverace.com> - - * protocols/ace/RMCast/Protocol.h: Replaced use of - ACE_Refcounted_Auto_Ptr with ACE_Strong_Bound_Ptr. Code formerly used - ACE_Refcounted_Auto_Ptr::release() with the assumption it had the - same semantics as auto_ptr::release() - stealing the pointer away. - This used to work by accident. The fixed ACE_Refcounted_Auto_Ptr's - release() method decrements the reference count which may cause the - object to be deleted, which is what happened all the time in the - RMCast protocol's clone() methods. Because all the clone() methods - relied on being able to take a more-derived pointer and use it as - a Profile*, changing the refcounted pointer type necessitated - changing the protected clone_() methods to return a naked pointer - rather than a refcounted one. This is acceptable because the naked - pointer is not exposed to class users; the public methods insert - the naked pointer into a ACE_Strong_Bound_Ptr before giving access - to it externally. - - * protocols/ace/RMCast/Acknowledge.cpp: - * protocols/ace/RMCast/Reassemble.cpp: With properly functioning - refcounted pointers (see above) these needed a few changes to - make proper use of the pointers while maintaining correct reference - counts. - -Tue Aug 22 21:43:34 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> - - This change fixes bug#2612. - - * ace/DLL.h: - * ace/DLL.cpp: - - Made assignment return 'T&' instead of 'const T&'. Adjusted code - formatting and logging messages. - - * ace/DLL_Manager.cpp: - - Fixed formatting. - - * ace/Parse_Node.h: - * ace/Parse_Node.cpp: - - Added accessor for the underlying ACE_DLL and adjusted logging. - - * ace/Service_Gestalt.h: - * ace/Service_Gestalt.cpp: - - Introduced ACE_Service_Type_DLL_Guard class. As dynamic service - objects are loaded, static service objects that come with the - same DLL code, may also be registered. The static services - however, have no information about the context in which their - registration takes place and their relation with the DLL is - lost. A situation can easily arise where the dynamic service - object is finalized and its DLL - unmapped, but some of the - DLL's static services may still be around. Their finalization - would not be possible, if the DLL counting that code is gone. - - The guard, when instantiated (on the stack) swaps out the - current Gestalt and its service repository, and replaces them - with a "sandbox" Gestalt, which has lifetime sufficient for just - the current service initialization. Note that this mechanism is - effective even in the case where a service initialization causes - re-entry into the Gestalt to load and initialize another service - as part of the initialization. - - If no action is taken (in case of an error, for instance) the - guard destructor will simply finalize all newly initialized - service(s) from the sandbox. On the other hand, if - initialization is successful the service object descriptors are - "relocated" to the original Gestalt. - - During the relocation, all static services are "fixed-up" to - hold a reference to the DLL they belong to. Effectively, a - static service, initialized via loading of a particular DLL, - becomes a dynamic service. Thus the order of service - finalization does not matter anymore because the DLL will be - help in memory until the last service object it provides is - finalized. - - * ace/Service_Object.h: - * ace/Service_Object.inl: - * ace/Service_Object.cpp: - - Added a relocate method to modify the ACE_DLL each SO has. - - * ace/Service_Repository.h: - * ace/Service_Repository.cpp: - - Befrended ACE_Service_Type_DLL_Guard. Adjusted logging. - - * tests/Service_Config_Test.cpp: - - Simplified test case. - -Tue Aug 22 18:37:48 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> - - * bin/MakeProjectCreator/config/ipv6.mpb: - - Building with IPv6 for WinCE requires an additional library for - rtti that is not required for the windows builds. - - * bin/ciao_tests.lst: - * bin/tao_orb_tests.lst: - * bin/tao_other_tests.lst: - Added ACE_FOR_TAO exclusions as necessary - -Tue Aug 22 15:19:46 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> - - * ace/Sock_Connect.h: - * ace/Sock_Connect.cpp: - - Refactored interface discovery code. The methods used to find - IPv6 interface addresses is highly platform specific. So much so - that the single method was too confusing to maintain. With this - patch, the code has been refactored to put each - platform-specific variation in its own method, then only compile - the method needed by any given platform. I'm not sure this will - yield much of a footprint reduction, as all the existing code is - still present, it is just easier to keep track of what is going on. - - Also, when IPv6 is enabled, it might be on a platform that is - using IPv6 exclusively, ie, with no IPv4 enabled. At least one - third-party user of ACE requested a specific test for IPv4 - enablement status, thus I have added a new method for that test. - - * ace/config-linux.h: - Linux supplies the getipaddrs system call. - - * tests/Enum_Interfaces_Test.cpp: - Extended the test so that if ACE is built with ACE_HAS_IPV6 - defined, the test will expect at least one IPv6 endpoint or it - will fail. - -Tue Aug 22 11:41:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/UUID.{h,cpp}: - Implemented copy constructor - - * tests/UUIDTest.cpp: - Test copy constructor - -Tue Aug 22 09:36:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/UUID.{h,inl}: - Made the accessors const and reimplemented operator == and - operator !=. - - * tests/UUIDTest.cpp: - Test the operator != and ==. - -Mon Aug 21 20:46:43 UTC 2006 Steve Huston <shuston@riverace.com> - - * configure.ac: Modified the check for the net/if.h header file - to do a #include <sys/socket.h> if it exists. Allows the compile - of net/if.h to succeed, fixing a configure warning for a file that - exists but won't compile. Thanks to Don Meek <Don dot Meek at - windstream dot com> for reporting this problem. - - * THANKS: Added Don Meek to the Hall of Fame. - -Mon Aug 21 20:43:59 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> - - * ace/Service_Config.inl: - - Added the missing implementation of the static process_file () - method. Thanks to Lothar Werzinger <lothar@tradescape.biz> for - pointing that out. - -Mon Aug 21 20:06:38 Pacific Daylight Time 2006 Ossama Othman <ossama_othman at symantec dot com> - - From Russell Mora <russell_mora at symantec dot com>: - * ace/Thread_Exit.cpp (instance): - - Fixed race condition in generated code by stopping optimizer - from re-ordering static variable initializations by declaring - static "instance_" variable as "volatile". This problem was - observed on a quad-CPU Solaris 8 box. - -Mon Aug 21 18:31:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * etc/*.doxygen: - In all files except ace.doxygen added SHORT_NAMES=YES to let - doxygen generate shorter filenames, this should fix the problems - we had during the release with cpio not capable of handling - long filenames - -Mon Aug 21 17:46:55 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - - * ace/Numeric_Limits.h (ACE_Numeric_Limits): - - The Microsoft Platform SDK does not provide - std::numeric_limits<> specializations for 64 bit integers so we - need to explicitly provide ACE_Numeric_Limits<> specializations - to compensate for this deficiency. [Bug 2639] - - Unfortunately there is no way to tell if the platform SDK is - being used so we specialize for the ACE_WIN64 + MSVC++ 7.1 case, - which is the configuration that exhibits this problem. It also - happens to be a fairly isolated configuration since 64-bit - support in MSVC++ 7.1 was not very good to begin with. - -Mon Aug 21 15:35:26 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * ace/Timeprobe_T.cpp (print_times): More fixed for timestamp - inversion due to recording time from different threads. This - prints a warning message the first time it detects a timestamp - inversion. It also fixes various minor problems in the - timeprobe reports whenever the total number of timeprobes - exceeds 8192. Thanks to Patrick Rabau for contributing this. - - * ace/INET_Addr.h: Updated the documentation of the non-reentrant - versions of get_host_addr() and get_host_name() to clarify how - they can be used correctly (or better yet not used at all..). - Thanks to Ephy Levy <EphyLevy at gmail dot com> for motivating - this. - - * ace/Logging_Strategy.cpp: Added a destructor to delete - this->filename_, which is allocated in the constructor. Thanks - to Amnon AB <AmnonAB at gmail dot com> for reporting this. - - * ace/Acceptor.h: Made the suspend()/resume() methods of - ACE_Strategy_Acceptor public rather than protected. Thanks to - Amnon AB <AmnonAB at gmail dot com> for reporting this. - - * docs/Symbol_Versioning.html (HREF): Added a link to the Riverace - webpage that describes symbol versioning in ACE. Thanks to - Steve Huston for contributing this. - - * ace/Timeprobe_T.cpp (print_times): Revised the code so that if - there is a timestamp inversion due to recording time from - different threads, the time difference will be displayed as a - negative value instead of a gigantic positive value. Also - compute the time difference correctly when the timeprobe array - wraps around. Thanks to Patrick Rabau <pr2345 at gmail dot com> - for this fix. - - * ace/Containers_T.cpp, - * ace/Log_Msg.cpp, - * ace/CDR_Size.cpp, - * ace/CDR_Size.inl, - * ace/CDR_Stream.cpp: Fixed a bunch of problems with type punning. - Thanks to Thomas Girard <thomas.g.girard at free dot fr> for - reporting this. - - * ace/TSS_T.cpp (tryacquire): There was a missing '&' in - - ACE_Thread::getspecific (this->key_, temp); - - Thanks to Thomas Girard <thomas.g.girard at free dot fr> for - reporting this. - -Mon Aug 21 10:45:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/UUID.{h,cpp,inl}: - Extended UUID to make it possible to assign a string to a UUID - to set it a new value. - - * tests/UUIDTest.cpp: - Extended this test to test the new functionality above. - -Mon Aug 21 10:26:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/UUID.{h,cpp,inl}: - Changed node_release_ to a real bool and use ACE_ERROR instead - of ACE_DEBUG for a real error message - - * ace/OS_NS_unistd.cpp: - Const improvement - -Sat Aug 19 22:03:03 UTC 2006 Yan Dai <dai_y@ociweb.com> - - * bin/tao_orb_tests.lst - - Excluded the DII collocation oneway test from running in the minimum - CORBA build. - -Fri Aug 18 20:38:35 UTC 2006 Steve Huston <shuston@riverace.com> - - * examples/APG/Logging/Trace.h: Further changed use of __VA_ARGS__ - to remove the comma and the fixed FMT arg from the macros. This - may still trigger the same ISO C99 warning, but it doesn't fail. - -Fri Aug 18 17:22:08 UTC 2006 Steve Huston <shuston@riverace.com> - - * ace/OS_NS_unistd.cpp (pwrite): Corrected the large-file-offset - logic to build correctly for Windows. Also moved the explicit - SetFilePointerEx() before WriteFile() to the non-ACE_HAS_WINNT4 - section - for ACE_HAS_WINNT4 the supplied OVERLAPPED structure - carries the file offset to write at. - -Fri Aug 18 17:08:35 UTC 2006 Yan Dai <dai_y@ociweb.com> - - * bin/tao_orb_tests.lst - - Added DII collocation oneway test. This is the regression test - for bugzilla #2545. - -Fri Aug 18 15:49:01 UTC 2006 Steve Huston <shuston@riverace.com> - - * examples/APG/Logging/Trace.h: Changed the varargs form used in the - macros from ##__VA_ARGS__ to ,__VA_ARGS__ in an effort to conform - to C99 and clear some compile warnings from gcc4. This effectively - prohibits leaving the varargs out completely from the macro - invocation but that use-case isn't exercised anyway. - - * bin/ace_tests.lst: Add protocols/tests/RMCast/run_test.pl to run - RMCast tests, except ACE_FOR_TAO builds. - -Fri Aug 18 12:03:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/tao_orb_tests.lst: - Don't run Bug_2510_Regression in a ST build, it uses threading - - * bin/MakeProjectCreator/templates/bor.mpd: - Don't print a message with the dummy realclean - -Thu Aug 17 14:20:00 UTC 2006 Simon Massey <sma@prismtech.com> - - * apps/drwho/Binary_Search.cpp: - * apps/drwho/CM_Client.cpp: - * apps/drwho/CM_Server.cpp: - * apps/drwho/Hash_Table.cpp: - * apps/drwho/Options.cpp: - * apps/drwho/Options.h: - * apps/drwho/PMC_All.cpp: - * apps/drwho/PMC_Flo.cpp: - * apps/drwho/PMC_Ruser.cpp: - * apps/drwho/PMC_Usr.cpp: - * apps/drwho/PMS_All.cpp: - * apps/drwho/PMS_Flo.cpp: - * apps/drwho/PMS_Ruser.cpp: - * apps/drwho/PMS_Usr.cpp: - * apps/drwho/Protocol_Manger.cpp: - * apps/drwho/Protocol_Record.cpp: - * apps/drwho/Rwho_DB_Manager.cpp: - * apps/drwho/Search_Struct.cpp: - * apps/drwho/Single_Lookup.cpp: - * apps/Gateway/Gateway/Gateway.cpp: - * apps/Gateway/Gateway/Options.cpp: - * apps/Gateway/Gateway/Options.h: - - Renamed the enum ID "DEBUG" to "DEBUGGING", was causing problems - with MFC builds. - -Thu Aug 17 12:15:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tests/SString_Test.cpp: - Added a check whether npos is zero, if it is print an error, - with Intel C++ 9.0 with the Microsoft platform SDK this seems - to be zero - -Thu Aug 17 08:30:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/MakeProjectCreator/config/ciao_client_dnc.mpb: - * bin/MakeProjectCreator/config/ciao_deployment_stub.mpb: - * bin/MakeProjectCreator/config/ciao_deployment_svnt.mpb: - * bin/MakeProjectCreator/config/ciao_events_dnc.mpb: - * bin/MakeProjectCreator/config/ciao_rtevent_dnc.mpb: - Removed -Sc form the taoidlflags, it is deprecated already sometime - ago - -Wed Aug 16 22:19:47 UTC 2006 Steve Huston <shuston@riverace.com> - - * ace/Acceptor.h: Doxygen improvements. - -Wed Aug 16 17:42:02 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - - * ace/Numeric_Limits.h: - - Explicitly #undef min and max before including <limits> in the - Mingw case to address global namespace pollution induced - conflicts. The previous attempt to address this problem where - the Windows-specific NOMINMAX preprocessor symbol was defined in - this header didn't work since the min and max macros were - already defined beforehand. In order for NOMINMAX to work as - expected, it would be have to be defined before any Windows - headers are included, or more preferrably on the - preprocessor/compiler command line. Unfortunately, that would - probably break some applications. - -Wed Aug 16 14:51:58 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * docs/svn/svn-prefs.reg - * docs/svn/config - - Updated to correct keywords values, and add use-commit-times - as a default option. - -Wed Aug 16 10:19:41 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Obstack_T.{cpp,inl}: - Moved grow_fast and freeze methods from inl to cpp file, - should fix the link problems with the RHAS IPv6 build - -Wed Aug 16 09:50:41 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * examples/Misc/Misc.mpc: - * examples/Misc/test_timestamp.cpp: - Simple small test for ACE::timestamp() - -Wed Aug 16 08:37:41 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * include/makeinclude/build_lib.bor: - * include/makeinclude/clean.bor: - * include/makeinclude/compiler.bor: - Removed support for the CBuilderX preview compiler, it has never - become more then preview and we don't test with it anymore - - * include/makeinclude/recurse.bor: - Removed from the repo, seems not to be used anymore - -Tue Aug 15 17:47:11 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - - * ace/Numeric_Limits.h: - - Windows defines min/max macros that interfere with the - numeric_limits::min/max() traits. Prevent those macros from - being defined by defining the Windows-specific NOMINMAX symbol - before any Windows headers are included. This is currently - only done for Mingw builds since the problem is not exhibited by - other Windows builds (e.g. MSVC++, Borland, etc). - -Tue Aug 15 16:17:56 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> - - * ace/Hash_MultiMap_Manager_T.h - Made some minor changes to the documentation to use @a to refer to - argument names. - -Tue Aug 15 15:00:00 UTC 2006 Adam Mitz <mitza@ociweb.com> - - * ace/Event_Handler.cpp: - - Updated Event_Handler_var to use an ACE_Errno_Guard to - prevent overwriting the errno. - - * bin/tao_orb_tests.lst - - Added new test: TAO/tests/Oneway_Timeouts/run_test.pl - -Tue Aug 15 14:22:53 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> - - * ace/Hash_MultiMap_Manager_T.h - Address the "unsupported xml/html tag" warnings in doxygen build. - -Tue Aug 15 08:36:00 UTC 2006 Simon Massey <sma@prismtech.com> - - * bin/MakeProjectCreator/config/acedefaults.mpb - - Backout all of the recent MFC changes. - - * bin/MakeProjectCreator/config/ace_opt_mfc.mpb: - - DELETED. - -Mon Aug 14 23:34:11 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * ace/TP_Reactor.cpp - * ace/TP_Reactor.h - - Removed all register_handler member functions from these files. - This essentially enables the ability to register signal handlers in - the TP Reactor by implicitly delegating to the select reactor base - class. - - Other register_handler methods (not relating to signal handling) - were explicit delegations to the select reactor base class, present - only to silence virtual function hiding warnings created by - disabling the signal related methods. - -Mon Aug 14 16:14:56 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> - - * test/Hash_Multi_Map_Manager_Test.cpp - Address the "no matching function for call" errors. - - * ace/Hash_MultiMap_Manager_T.h - Address the "unsupported xml/html tag" warnings in doxygen build. - -Mon Aug 14 16:00:00 UTC 2006 Simon Massey <sma@prismtech.com> - - * bin/MakeProjectCreator/config/ace_mfc.mpb: - * bin/MakeProjectCreator/config/ace_opt_mfc.mpb: - - Backout the "Specific" guards. - -Mon Aug 14 15:20:00 UTC 2006 Simon Massey <sma@prismtech.com> - - * bin/MakeProjectCreator/config/ace_mfc.mpb: - * bin/MakeProjectCreator/config/ace_opt_mfc.mpb: - - Specific the macro and don't inherit from mfc for opt. - -Mon Aug 14 15:43:12 UTC 2006 Steve Huston <shuston@riverace.com> - - * tests/Makefile.am: Added Hash_Multi_Map_Manager_Test. - -Mon Aug 14 13:33:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * include/makeinclude/clean.bor: - Use .inl as file extension to clean instead of .i - - * bin/MakeProjectCreator/templates/bor.mpd: - Added empty realclean target - -Mon Aug 14 12:52:19 UTC 2006 Chad Elliott <elliott_c@ociweb.com> - - * ACE-INSTALL.html: - - I added "-type gnuace" to the options where the default project - type was assumed. Eventually, MPC will not have a default project - type. - - * include/makeinclude/macros.GNU: - * include/makeinclude/rules.common.GNU: - * include/makeinclude/rules.local.GNU: - - Added a new target to remove only the binaries (executables and - shared libraries). - -Mon Aug 14 11:15:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/*.h: - Added /**/ to the include of config-all.h and ACE_export.h, this - way doxygen doesn't add these files to the include graphs which - make them much easier to read - -Sun Aug 13 23:30:02 UTC 2006 Yan Dai <dai_y@ociweb.com> - - * bin/tao_other_tests.lst: - - Excluded TAO POAManagerFactory and EndpointPolicy tests from - running in a minimum CORBA configuration. - -Sun Aug 13 22:21:55 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> - - * test/Hash_Multi_Map_Manager_Test.cpp - Address the "Implicit conversion of string literal to char * is - deprecated" warnings. - -Sun Aug 13 15:25:17 UTC 2006 Boris Kolpackov <boris@codesynthesis.com> - - * bin/MakeProjectCreator/config/ciaocidldefaults.mpb: - - Removed '--' from the cidlc command line. - -Sun Aug 13 000:02:00 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> - - * ace/Hash_MultiMap_Manager_T.inl - * ace/Hash_MultiMap_Manager_T.cpp - * ace/Hash_MultiMap_Manager_T.h - Change the name of these files into Hash_Multi_Map_Manager.*. - Add some comments to explain in brief the purpose of using - ACE_Hash_Multi_Map_Manager class and how to use it. - Remove the backward compatibility of ACE_Hash_Multi_Map_Manager class - and its associated iterator classes. - Remove "_Ex" on the names of ACE_Hash_Multi_Map_Manager class and its - associated iterator classes. - - * ace/Hash_MultiMap_Manager.h - Remove this file since it simply includes the - Hash_MultiMap_Manager_T.h file. - - * test/Hash_MultiMap_Manager_Test.cpp - Change the name of this file into Hash_Multi_Map_Manager_Test.cpp. - Address the "convert const char* to ACE_TCHAR*" errors. - - * ace/ace.mpc - Change the name of Hash_MultiMap_Manager project into - Hash_Multi_Map_Manager. - - * test/run_test.lst - * test/tests.mpc - Change the name of Hash_MultiMap_Manager_Test project into - Hash_Multi_Map_Manager_Test. - -Fri Aug 11 16:46:56 UTC 2006 Shanshan Jiang <shanshan.jiang@vanderbilt.edu> - - * ace/Hash_MultiMap_Manager.h - * ace/Hash_MultiMap_Manager_T.cpp - * ace/Hash_MultiMap_Manager_T.h - * ace/Hash_MultiMap_Manager_T.inl - Add these files which implement Hash_MultiMap_Manager. - - * test/Hash_MultiMap_Manager_Test.cpp - Add this test file for Hash_MultiMap_Manager. - - * ace/ace.mpc - Modify this file to include Hash_MultiMap_Manager. - - * test/run_test.lst - * test/tests.mpc - Modify these files to include Hash_MultiMap_Manager_Test. - -Fri Aug 11 16:37:34 UTC 2006 Steve Huston <shuston@riverace.com> - - * tests/CDR_File_Test.cpp: Corrected a signed/unsigned compare. - -Fri Aug 11 13:59:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/CDR_Size.cpp: - Add include of OS_Memory.h to get ACE_align_binary - - * ace/Sig_Handler.cpp: - Add include of Guard_T.h to get the guards - - * ace/config-vxworks6.3.h: - Add some code for the diab compiler but this is not complete - support, just some testing results. - -Fri Aug 11 07:17:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * docs/svn/config: - * docs/svn/svn-prefs.reg: - Added settings for .idl and .pidl - -Thu Aug 10 13:14:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/tao_other_tests.lst: - Disabled the performance tests on OpenVMS for the moment, they - result in too much error logs - -Thu Aug 10 10:33:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/MakeProjectCreator/config/taoidldefaults.mpb: - Updated for -GX - -Thu Aug 10 09:38:13 UTC 2006 Simon McQueen <sm@prismtech.com> - - * bin/tao_other_tests.lst: - - Exclude Bug_2615_Regression from running on 'ACE for TAO' builds. - -Thu Aug 10 01:52:34 UTC 2006 Steve Huston <shuston@riverace.com> - - * ace/config-aix-4.x.h: Added ACE_HAS_TEMPLATE_TYPEDEFS for Visual - Age C++ 6 and higher. - -Wed Aug 9 14:15:18 UTC 2006 Ciju John <johnc@ociweb.com> - - * bin/MakeProjectCreator/config/csd_threadpool.mpb: - - Added a dependency upon threads.mpb as this project shouldn't be - built if thread support is not going to be built into TAO. - -Wed Aug 9 13:45:00 UTC 2006 Simon Massey <sma@prismtech.com> - - * bin/MakeProjectCreator/config/acedefaults.mpb - - Typo, Remove the + character that came with the patch file. - -Wed Aug 9 12:17:00 UTC 2006 Simon Massey <sma@prismtech.com> - - * bin/MakeProjectCreator/config/ace_opt_mfc.mpb - * bin/MakeProjectCreator/config/acedefaults.mpb - - Chad's new fix for MPC building MFC projects. - -Tue Aug 8 14:00:06 UTC 2006 Carlos O'Ryan <coryan@atdesk.com> - - * Merged in all the changes from the fix_bug_2540 branch, that is, - from revision 73857 to revision 73859. - - Thu Aug 3 21:49:27 UTC 2006 Carlos O'Ryan <coryan@atdesk.com> - - * ace/TP_Reactor.cpp: - * ace/Select_Reactor_T.cpp: - Avoid the problems described in bug 2540 by detecting the - infinite loop and recomputing the number of active handlers. - Thanks to Jody Hagins for correcting my original "fix." - -Tue Aug 8 14:05:00 UTC 2006 Simon Massey <sma@prismtech.com> - - * bin/MakeProjectCreator/config/ace_mfc.mpb - * bin/MakeProjectCreator/config/acedefaults.mpb - - Reverted Chad's fix for MPC building MFC projects. - It seems that this causes non MFC builds to build as MFC - breaking the scoreboard. - -Tue Aug 8 09:30:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ACE.mwc: - Removed several directories which aren't existing anymore - -Tue Aug 8 09:28:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ACE-INSTALL.html: - Removed some parts of the VxWorks building instructions because - it was really wrong what was said - -Tue Aug 8 09:15:00 UTC 2006 Simon Massey <sma@prismtech.com> - - * ace/OS_Memory.h - * ace/config-win32-msvc.h - * bin/MakeProjectCreator/config/ace_mfc.mpb - * bin/MakeProjectCreator/config/acedefaults.mpb - - Chad's fix for MPC building MFC projects. Correction for - Thu Apr 27 21:04:08 UTC 2006 Steve Huston <shuston@riverace.com> - throw CMemoryException on out-of-memory condition. These - exceptions must be caught by pointer and thrown via calling - AfxThrowMemoryException (). - -Tue Aug 8 08:06:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Select_Reactor_Base.cpp: - * ace/Select_Reactor_T.cpp: - Const improvements, use bool when possible - -Tue Aug 8 07:46:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/generate_rel_manpages: - * bin/make_release: - Did a little bit of cleanup removing old things - -Tue Aug 8 07:11:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Select_Reactor_T.cpp (dump): - Removed usage of not needed operator++ on the handle set - -Mon Aug 7 08:02:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Handle_Set.{h,cpp}: - Removed operator++, it is deprecated and nothing more then a noop - -Fri Aug 4 07:57:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Asynch_IO.h: - * ace/Event_Handler.h: - * ace/Framework_Component_T.h: - * ace/Hash_Map_Manager_T.h: - * ace/IO_SAP.h: - * ace/Local_Tokens.h: - * ace/LSOCK_Connector.h: - * ace/Map_Manager.h: - * ace/Map_T.h: - * ace/WFM_Reactor.h: - Doxygen improvements - -Thu Aug 3 10:39:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Connector.h: - Improved documentation - -Wed Aug 2 22:54:24 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> - - * THANKS: Added Eric Danielou to the hall of fame. - -Wed Aug 2 21:27:59 UTC 2006 Adam Mitz <mitza@ociweb.com> - - * bin/PerlACE/Run_Test.pm: - - Added two new packaged-scoped variables, $PerlACE::ACE_ROOT and - $PerlACE::TAO_ROOT. $PerlACE::TAO_ROOT is set to the TAO_ROOT - environment variable, if one exists. If not it is set to - $ACE_ROOT/TAO. $PerlACE::ACE_ROOT is the same as the ACE_ROOT - envrionment variable so it's just there for convenience and for - symmetry. - -Wed Aug 2 20:19:04 UTC 2006 Adam Mitz <mitza@ociweb.com> - - * bin/tao_other_tests.lst: - Added new test (TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression). - -Wed Aug 2 18:16:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Connector.cpp: - Const improvements - - * ace/Caching_Utility_T.h: - * ace/config-lite.h: - * ace/Event_Handler.h: - * ace/Framework_Component.h: - * ace/Lock.h: - * ace/Lock_Adapter_T.h: - * ace/Null_Mutex.h: - * ace/Object_Manager.h: - * ace/Object_Manager_Base.h: - * ace/Proactor.cpp: - * ace/Process_Manager.h: - * ace/Semaphore.h: - * ace/Thread_Exit.h: - Doxygen improvements - -Wed Aug 2 15:50:48 UTC 2006 Simon McQueen <sm@prismtech.com> - - * bin/tao_other_tests.lst: - - Schedule bugzilla #2615 regression test. - -Wed Aug 2 14:55:45 UTC 2006 Chad Elliott <elliott_c@ociweb.com> - - * ACE-INSTALL.html: - - Updated the location of the MPC documentation. It was moved from - the MPC root directory to a docs directory. - - * bin/ChangeLogEditor/CVSFileLocator.pm: - * bin/ChangeLogEditor/ChangeLogEdit.pm: - * bin/ChangeLogEditor/ChangeLogEntry.pm: - * bin/ChangeLogEditor/FileLocator.pm: - * bin/ChangeLogEditor/SVNFileLocator.pm: - * bin/cle.pl: - - Added better support for subversion and it now reports errors from - cvs/svn. - - * bin/MakeProjectCreator/README: - - Updated to provide information on anonymously checking out MPC - using Subversion. - - * bin/make_release: - - I added "-type gnuace" to the options where the default project - type was assumed. Eventually, MPC will not have a default project - type. - -Wed Aug 2 13:47:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * docs/ACE-development-process.html: - Document the fact that people should test on at least two - platforms and should be available for some days after they - commit a change. - -Wed Aug 2 11:16:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * docs/Download.html: - Also put the download page from deuce.doc under svn control - so that we can update it for the svn conversion - -Wed Aug 2 11:07:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * docs/bczar/bczar.html: - * docs/bczar/privileges.html: - Added documents that where on deuce.doc, the documentation - for the bczar how to create a release should really be handled - with care, so put them under svn control - -Tue Aug 1 20:23:50 UTC 2006 Adam Mitz <mitza@ociweb.com> - - * ace/config-macosx-tiger.h: - Added preliminary support for Mac OS X 10.4 on Intel CPU's. - -Tue Aug 1 20:00:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/config-vxworks6.3.h: - Enabled some features in ACE because vxworks 6.3 delivers more system - api's - -Mon Jul 31 19:23:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/OS_NS_stropts.inl (ioctl): - Check for ACE_HAS_IOCTL_INT_3_PARAM to make it easier to handle - the different VxWorks versions - - * config-vxworks5.x.h: - * config-vxworks6.2.h: - * config-vxworks6.3.h: - Added ACE_HAS_IOCTL_INT_3_PARAM - -Mon Jul 31 18:48:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * Containers_T.{h,cpp}: - * Hash_Map_Manager_T.{h,cpp}: - * Map_Manager.{h,inl}: - * Node.{h,cpp}: - Removed check for !ACE_HAS_BROKEN_NOOP_DTORS, this define is - not in any config file - - * config-unixware-7.1.0.udk.h: - Removed commented out define - - * Token_Collection.{h,cpp}: - * Token_Manager.{h,inl}: - Changed debug flag to be a bool - - * SOCK_Dgram_Bcast.h - * TP_Reactor.h - * Signal.h - * Thread.h - * Thread_Adapter.h - Documentation updates - -Mon Jul 31 14:57:08 UTC 2006 Steve Huston <shuston@riverace.com> - - * apps/Makefile.am: Removed hard-coded inclusion of gperf in the - SUBDIRS list; it's an optional piece; see also - Tue Jun 20 20:19:37 UTC 2006 Steve Huston <shuston@riverace.com> - Thanks to Robert Schwebel <robert at schwebel dot de> for this fix. - -Mon Jul 31 14:36:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * etc/*.doxygen: - Cleanup of these files - -Sat Jul 29 11:26:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/config-icc-common.h: - Added fix for Intel C++ 9.1 - -Fri Jul 28 15:32:27 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * ace/SSL/Makefile.am - * ace/QoS/Makefile.am - * performance-tests/Synch-Benchmarks/Base_Test/Makefile.am - * performance-tests/Synch-Benchmarks/Perf_Test/Makefile.am - * Kokyu/Makefile.am - * apps/JAWS/clients/Caching/Makefile.am - * ACEXML/apps/svcconf/Makefile.am - * ACEXML/common/Makefile.am - * ACEXML/parser/parser/Makefile.am - * ACEXML/examples/SAXPrint/Makefile.am - * websvcs/lib/Makefile.am - * examples/ASX/Event_Server/Event_Server/Makefile.am - * examples/ASX/UPIPE_Event_Server/Makefile.am - * examples/Service_Configurator/IPC-tests/server/Makefile.am - - Updated to comply with the .i->.inl changes from: - Thu Jul 27 20:30:26 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - -Fri Jul 28 12:17:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * Kokyu/DSRT_Dispatch_Item_T.inl: - * ACEXML/parser/parser/Parser.inl: - Fixed file tag - -Thu Jul 27 20:30:26 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * ace/SSL/SSL_SOCK_Connector.h - * ace/SSL/SSL_SOCK_Acceptor.inl - * ace/SSL/SSL_SOCK_Acceptor.cpp - * ace/SSL/SSL_SOCK_Connector.i - * ace/SSL/SSL_SOCK_Stream.h - * ace/SSL/SSL_SOCK_Stream.i - * ace/SSL/SSL_SOCK_Acceptor.h - * ace/SSL/SSL_SOCK_Acceptor.i - * ace/SSL/SSL_SOCK.cpp - * ace/SSL/SSL_SOCK.inl - * ace/SSL/SSL_SOCK.h - * ace/SSL/SSL_SOCK.i - * ace/SSL/SSL_SOCK_Connector.cpp - * ace/SSL/SSL_SOCK_Connector.inl - * ace/SSL/SSL_SOCK_Stream.cpp - * ace/SSL/SSL_SOCK_Stream.inl - * ace/QoS/SOCK_Dgram_Mcast_QoS.inl - * ace/QoS/SOCK_Dgram_Mcast_QoS.cpp - * ace/QoS/QoS_Session_Impl.cpp - * ace/QoS/QoS_Session_Impl.inl - * ace/QoS/SOCK_Dgram_Mcast_QoS.h - * ace/QoS/SOCK_Dgram_Mcast_QoS.i - * ace/QoS/QoS_Session_Impl.h - * ace/QoS/QoS_Session_Impl.i - * performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp - * performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.inl - * performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.h - * performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.i - * performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.inl - * performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.h - * performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.i - * Kokyu/Kokyu_dsrt.cpp - * Kokyu/Kokyu_dsrt.inl - * Kokyu/Kokyu.cpp - * Kokyu/Kokyu.inl - * Kokyu/Kokyu_defs.h - * Kokyu/Kokyu_defs.i - * Kokyu/Dispatcher_Impl.h - * Kokyu/Dispatcher_Impl.i - * Kokyu/Default_Dispatcher_Impl.h - * Kokyu/Default_Dispatcher_Impl.i - * Kokyu/Dispatch_Deferrer.h - * Kokyu/Dispatch_Deferrer.i - * Kokyu/DSRT_Dispatcher_Impl_T.h - * Kokyu/DSRT_Dispatcher_Impl_T.i - * Kokyu/DSRT_Dispatch_Item_T.h - * Kokyu/DSRT_Dispatch_Item_T.i - * Kokyu/Kokyu_dsrt.h - * Kokyu/Kokyu_defs.cpp - * Kokyu/Kokyu_defs.inl - * Kokyu/Kokyu_dsrt.i - * Kokyu/Kokyu.h - * Kokyu/Dispatcher_Impl.cpp - * Kokyu/Dispatcher_Impl.inl - * Kokyu/Kokyu.i - * Kokyu/Default_Dispatcher_Impl.cpp - * Kokyu/Default_Dispatcher_Impl.inl - * Kokyu/Dispatch_Deferrer.cpp - * Kokyu/Dispatch_Deferrer.inl - * Kokyu/DSRT_Dispatcher_Impl_T.cpp - * Kokyu/DSRT_Dispatcher_Impl_T.inl - * Kokyu/DSRT_Dispatch_Item_T.cpp - * Kokyu/DSRT_Dispatch_Item_T.inl - * apps/JAWS/clients/Caching/Local_Locator.inl - * apps/JAWS/clients/Caching/Local_Locator.cpp - * apps/JAWS/clients/Caching/URL_Properties.inl - * apps/JAWS/clients/Caching/URL_Properties.cpp - * apps/JAWS/clients/Caching/Local_Locator.h - * apps/JAWS/clients/Caching/Local_Locator.i - * apps/JAWS/clients/Caching/URL_Properties.h - * apps/JAWS/clients/Caching/URL_Properties.i - * apps/JAWS/clients/Caching/Locator_Request_Reply.cpp - * apps/JAWS/clients/Caching/Locator_Request_Reply.inl - * apps/JAWS/clients/Caching/Locator_Request_Reply.h - * apps/JAWS/clients/Caching/Locator_Request_Reply.i - * apps/JAWS2/HTTPU/http_response.h - * apps/JAWS2/HTTPU/http_response.i - * apps/JAWS2/HTTPU/http_base.inl - * apps/JAWS2/HTTPU/http_base.cpp - * apps/JAWS2/HTTPU/http_headers.h - * apps/JAWS2/HTTPU/http_headers.i - * apps/JAWS2/HTTPU/http_status.inl - * apps/JAWS2/HTTPU/http_status.cpp - * apps/JAWS2/HTTPU/parse_http_request.h - * apps/JAWS2/HTTPU/http_request.inl - * apps/JAWS2/HTTPU/parse_http_request.i - * apps/JAWS2/HTTPU/http_request.cpp - * apps/JAWS2/HTTPU/parse_http_response.h - * apps/JAWS2/HTTPU/http_response.cpp - * apps/JAWS2/HTTPU/parse_http_response.i - * apps/JAWS2/HTTPU/http_response.inl - * apps/JAWS2/HTTPU/http_headers.inl - * apps/JAWS2/HTTPU/http_headers.cpp - * apps/JAWS2/HTTPU/http_base.h - * apps/JAWS2/HTTPU/http_base.i - * apps/JAWS2/HTTPU/parse_http_request.inl - * apps/JAWS2/HTTPU/parse_http_request.cpp - * apps/JAWS2/HTTPU/http_status.h - * apps/JAWS2/HTTPU/parse_http_response.cpp - * apps/JAWS2/HTTPU/parse_http_response.inl - * apps/JAWS2/HTTPU/http_status.i - * apps/JAWS2/HTTPU/http_request.h - * apps/JAWS2/HTTPU/http_request.i - * ACEXML/apps/svcconf/Svcconf_Handler.cpp - * ACEXML/apps/svcconf/Svcconf_Handler.inl - * ACEXML/apps/svcconf/Svcconf_Handler.h - * ACEXML/apps/svcconf/Svcconf_Handler.i - * ACEXML/common/AttributesImpl.cpp - * ACEXML/common/LocatorImpl.cpp - * ACEXML/common/Env.cpp - * ACEXML/common/Exception.cpp - * ACEXML/common/SAXExceptions.h - * ACEXML/common/SAXExceptions.i - * ACEXML/common/AttributesImpl.h - * ACEXML/common/AttributesImpl.i - * ACEXML/common/XMLFilterImpl.cpp - * ACEXML/common/Env.h - * ACEXML/common/SAXExceptions.cpp - * ACEXML/common/Env.i - * ACEXML/common/Exception.h - * ACEXML/common/Exception.i - * ACEXML/common/AttributesImpl.inl - * ACEXML/common/LocatorImpl.inl - * ACEXML/common/Env.inl - * ACEXML/common/XMLFilterImpl.h - * ACEXML/common/XMLFilterImpl.i - * ACEXML/common/Exception.inl - * ACEXML/common/XMLFilterImpl.inl - * ACEXML/common/LocatorImpl.h - * ACEXML/common/LocatorImpl.i - * ACEXML/common/SAXExceptions.inl - * ACEXML/parser/debug_validator/Element_Tree.i - * ACEXML/parser/debug_validator/Element_Tree.cpp - * ACEXML/parser/debug_validator/Element_Tree.inl - * ACEXML/parser/debug_validator/Element_Tree.h - * ACEXML/parser/parser/Parser.h - * ACEXML/parser/parser/Parser.i - * ACEXML/parser/parser/Entity_Manager.cpp - * ACEXML/parser/parser/Entity_Manager.inl - * ACEXML/parser/parser/Entity_Manager.h - * ACEXML/parser/parser/Entity_Manager.i - * ACEXML/parser/parser/Parser.cpp - * ACEXML/parser/parser/Parser.inl - * ACEXML/examples/SAXPrint/SAXPrint_Handler.cpp - * ACEXML/examples/SAXPrint/SAXPrint_Handler.inl - * ACEXML/examples/SAXPrint/SAXPrint_Handler.h - * ACEXML/examples/SAXPrint/SAXPrint_Handler.i - * websvcs/lib/URL_Addr.h - * websvcs/lib/URL_Addr.i - * websvcs/lib/URL_Addr.cpp - * websvcs/lib/URL_Addr.inl - * examples/ASX/Event_Server/Event_Server/Options.h - * examples/ASX/Event_Server/Event_Server/Options.i - * examples/ASX/Event_Server/Event_Server/Options.inl - * examples/ASX/UPIPE_Event_Server/Options.h - * examples/ASX/UPIPE_Event_Server/Options.i - * examples/ASX/UPIPE_Event_Server/Options.inl - * examples/Service_Configurator/IPC-tests/server/Handle_Timeout.cpp - * examples/Service_Configurator/IPC-tests/server/Handle_Timeout.inl - * examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.cpp - * examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.inl - * examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.h - * examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.i - * examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.h - * examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.i - * examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.h - * examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.i - * examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.cpp - * examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.inl - * examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.h - * examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.i - * examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.h - * examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.i - * examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.h - * examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.i - * examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.h - * examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.i - * examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.inl - * examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.cpp - * examples/Service_Configurator/IPC-tests/server/Handle_Timeout.h - * examples/Service_Configurator/IPC-tests/server/Handle_Timeout.i - * examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.inl - * examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.cpp - * examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.h - * examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.i - * examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.inl - * examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.cpp - * examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.cpp - * examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.inl - * examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.cpp - * examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.inl - * examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.cpp - * examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.inl - * examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.cpp - * examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.inl - * examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.h - * examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.i - - Moved the .i file to .inl (with history), changed the includes in the - .cpp and .h files to match, removed the .i file. - -Thu Jul 27 18:43:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ACE-INSTALL.html: - Some more updates to refer to the subversion archive - -Thu Jul 27 13:57:31 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * docs/svn/config - - Fixed syntax errors. thanks to Adam Mitz for reporting them. - -Thu Jul 27 10:14:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - Committing some small changes I had pending to see how svn behaves now - with updates and status info on the build systems. - - * ace/Recursive_Thread_Mutex.{h,cpp}: - Changed removed_ to a bool - - * ace/Thread_Mutex.{h,cpp,inl}: - Changed removed_ to a bool and removed ACE_USES_OBSOLETE_GUARD_CLASSES - support. - -Thu Jul 27 07:37:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * etc/tao.doxygen: - * etc/tao_portableserver.doxygen: - Set ignore prefix - - * Kokyu/Dispatcher_Task.i - * Kokyu/Dispatcher_Task.inl - Renamed .i to .inl so that we can have a look how subversion stores - this in the history - - * Kokyu/Dispatcher_Task.cpp - * Kokyu/Dispatcher_Task.h - * Kokyu/Makefile.am - Updated for the change above. - -Wed Jul 26 07:25:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/sets-manager.py: - Fixed typo - -Wed Jul 26 07:25:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ACE-INSTALL.html: - * html/Stats/index.shtml: - * docs/ACE-bug-process.html: - Updated documentation to point to the new svn repository - -Tue Jul 25 21:51:07 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * bin/PythonACE/fuzz/max_project_len.py - * bin/PythonACE/fuzz/inline.py - - Fixed errors in these checks. - -Tue Jul 25 20:52:51 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * bin/PythonACE/fuzz/cpp_inline.py - - Fixed this check, it was incorrectly matching ACE_INLINES inside - defines and comments. - -Tue Jul 25 20:16:26 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * docs/svn/svn-prefs.reg - * docs/svn/config - - Updated to add global-ignores to mimic .cvsignore functionality. - -Tue Jul 25 19:40:54 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * bin/PythonACE/__init__.py - - This enables PythonACE to be loaded as a module. - - * bin/PythonACE/fuzz/check_includes.py - * bin/PythonACE/fuzz/no_conflict_markers.py - - Fixed these checks, they were incorrectly flagging errors. - - * bin/fuzz.py - - Command line fuzz client that uses the PythonACE fuzz module. - - * bin/sets-manager.py - - Corrected this file to point at DOC/Middleware instead of ACE/Middleware. - -Mon Jul 24 23:58:33 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * docs/svn/svn-prefs.reg - * docs/svn/config - - Updated these files to add svn:keywords to most text types. - -Mon Jul 24 23:53:53 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * bin/create_ace_build.pl - - Fix provided by Steve Huston to prevent this script from building - links from .svn directories. - -Mon Jul 24 19:17:37 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * bin/fuzz.pl - - Disabled the ID string check until the script can be fixed to ignore - .svn directories. - -Mon Jul 24 15:45:34 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * Subversion conversion completed at revision 73730 - -Sun Jul 23 15:44:43 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * Repository frozen for repository conversion - -Sun Jul 23 11:17:31 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/make_release: - Don't exclude the other mwc files for vc71/vc8, this will create then - some more workspace files which just contain a subset of the projects - -Sun Jul 23 09:25:12 UTC 2006 Olli Savia <ops@iki.fi> - - * NEWS: - Added a note about TTY_IO API change. - -Sat Jul 22 19:12:10 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * docs/svn/config - * docs/svn/svn-prefs.reg - - These are client side configuration files for Subversion. Currently, - the automate setting svn:eol-style and svn:executable properties on - newly added files. - -Sat Jul 22 18:28:33 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * bin/sets-manager.py - - First cut of a branching script for subverion. Pass --help - to get documentation. - -Fri Jul 21 13:28:31 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/MakeProjectCreator/config/taoidldefaults.mpb: - Updated because of -oS addition to tao_idl - -Fri Jul 21 13:17:31 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/OS_NS_unistd.cpp: - Const improvements and initialise pointer with 0 - -Thu Jul 20 21:44:31 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> - - * tests/Service_Config_Test.cpp: - - In testLimits (), surrounded string literals with ACE_TEXT to - fix a build error on wchar builds. - -Thu Jul 20 16:42:04 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - - * ace/Basic_Types.h: - - Removed ACE_NTOHLL function. It was experimental, untested and - not ready for the ACE sources just yet. - - Removed "ace/os_include/netinet/os_in.h" include directive. Now - that ACE_NTOHLL has been removed it is no longer necessary. - - * ace/Numeric_Limits.h: - - Commented out "{unsigned} long long" specializations in the - ACE_LACKS_NUMERIC_LIMITS case. They're currently not used, and - we need - -Thu Jul 20 15:19:30 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * ace/Basic_Types.h: Added - - # include "ace/os_include/netinet/os_in.h" // Get ntohl() - - and added the inline keyword to ACE_NTOHLL() to fix the problems - introduced with - - Wed Jul 19 22:46:51 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - -Thu Jul 20 15:01:32 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * ace/Configuration.cpp: Made - ACE_Configuration_ExtId::operator==() and - ACE_Configuration_ExtId::operator!=() case insensitive. Thanks - to Domingos Monteiro <d dot monteiro at netia dot net> for this - contribution. - -Thu Jul 20 09:57:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/MakeProjectCreator/config/tao_no_iiop.mpb: - New feature to disable iiop in TAO - - * bin/MakeProjectCreator/config/global.features: - Set tao_no_iiop to 0 by default - -Thu Jul 20 09:11:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/OS_NS_Thread.h: - Doxygen improvements - -Thu Jul 20 08:55:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Mutex.{h,cpp,inl}: - Made the removed_ member a bool instead of an int - -Thu Jul 20 08:37:17 UTC 2006 Olli Savia <ops@iki.fi> - - * ace/TTY_IO.cpp: - Fixed compile error on VxWorks. Thanks to Johnny for pointing - out the problem. - -Wed Jul 19 23:39:05 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * bin/PythonACE/fuzz/__init__.py - * bin/PythonACE/fuzz/_generic_handler.py - * bin/PythonACE/fuzz/_mailer.py - * bin/PythonACE/fuzz/_singleton.py - * bin/PythonACE/fuzz/_warning_handler.py - * bin/PythonACE/fuzz/streams_include.py - - Changes necessary to support mailing (non-fatal) Fuzz errors to - the user that attempts a commit. streams_include is an example - of a fuzz check that sends warnings instead of stopping commits. - -Wed Jul 19 22:46:51 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - - * ace/Basic_Types.h (ACE_INT64, ACE_UINT64): - - Silence g++ "-pedantic" warnings regarding use of "long long" - type by preceding the typedef with the g++ __extension__ - keyword. - -Wed Jul 19 21:15:51 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> - - * NEWS: - - Updated the file with a note announcing the interface change - from "Wed Jul 19 20:11:52 UTC 2006". - -Wed Jul 19 20:11:52 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> - - * ace/ACE.h: - * ace/ACE.cpp: - - Changing ACE::debug () to use boolean instead of char. - - * ace/Acceptor.cpp: - * ace/DLL_Manager.cpp: - * ace/Dynamic_Service_Dependency.cpp: - * ace/SOCK_Dgram_Bcast.cpp: - * ace/Service_Gestalt.cpp: - * ace/Service_Object.cpp: - * ace/Service_Repository.cpp: - * ace/Service_Types.cpp: - - Updating places where ACE::debug() return value is interpreted - as a integral type. - - * tests/Service_Config_Test.cpp: - - Fixing the test to correctly account for XML-based service - configurations. - -Wed Jul 19 15:53:09 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * bin/PythonACE/fuzz/__init__.py - * bin/PythonACE/fuzz/_fuzz.py - * bin/PythonACE/fuzz/_generic_handler.py - * bin/PythonACE/fuzz/_path.py - * bin/PythonACE/fuzz/_types.py - * bin/PythonACE/fuzz/check_includes.py - * bin/PythonACE/fuzz/cpp_inline.py - * bin/PythonACE/fuzz/inline.py - * bin/PythonACE/fuzz/math_include.py - * bin/PythonACE/fuzz/max_filename.py - * bin/PythonACE/fuzz/max_project_len.py - * bin/PythonACE/fuzz/newline.py - * bin/PythonACE/fuzz/no_conflict_markers.py - * bin/PythonACE/fuzz/noncvs.py - * bin/PythonACE/fuzz/ptr_arith_t.py - * bin/PythonACE/fuzz/refcountservantbase.py - * bin/PythonACE/fuzz/verify_changelog.py - - This is a python module designed to eventually replace the - bin/fuzz.pl script. Each .py file in the fuzz directory that - does not have a _ at the beginning of its filename contains a - single check. New fuzz checks can be added to the system simply - by creating a new file in the fuzz directory. Care should be - taken to select a filename that does not conflict with an - existing python module. - - ptr_arith_t.py and inline.py are good examples that use the - generic handler to implement their checks, max_project_len is a - good example of a check that does not use the generic handler. - -Wed Jul 19 15:07:29 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> - - * ace/DLL_Manager.cpp: - - Fixing a build problem on HP and Windows, as a consequence of my - earlier change: "Tue Jul 18 19:17:54 UTC 2006". Moral: use - ACE_TEXT around literal expressions only. - -Wed Jul 19 13:55:39 UTC 2006 Olli Savia <ops@iki.fi> - - * examples/IPC_SAP/DEV_SAP/reader/reader.cpp: - * examples/IPC_SAP/DEV_SAP/writer/writer.cpp: - Updated to reflect changes below. - -Wed Jul 19 13:39:13 UTC 2006 Olli Savia <ops@iki.fi> - - * ace/TTY_IO.h: - Changed type of rtsenb from 'int' to 'unsigned char'. - Updated documentation to note that 'parityenb' member is - now deprecated. - - * ace/TTY_IO.cpp: - Changed constructor of Serial_Params class to assign sensible - values to class members. - -Wed Jul 19 10:47:31 UTC 2006 Steve Huston <shuston@riverace.com> - - * tests/Proactor_Timer_Test.cpp: Corrected compile warning re static. - -Wed Jul 19 08:00:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/MakeProjectCreator/config/ciao_config_handlers_base.mpb: - Use exceptions as base project - -Wed Jul 19 7:14:10 UTC 2006 Ossama Othman <ossama_othman@symantec.com> - - * ace/String_Base.h (size_type): - - Explicitly bring the ACE_String_Base_Const::size_type typedef - into the ACE_String_Base<> scope through a "using" declaration. - IBM Visual Age 6 and Sun Studio 10 have difficulty resolving the - name otherwise. - - * ace/SString.cpp: - - Replaced std::numeric_limits<>::max() call that was - inadvertently introduced with its ACE_Numeric_Limits<> - counterpart. The former is not available on VxWorks. - -Tue Jul 18 22:52:38 UTC 2006 Steve Huston <shuston@riverace.com> - - * tests/Message_Queue_Test_Ex.cpp: Rearranged the pieces left out of - single-threaded builds; should correct single-threaded builds. - -Tue Jul 18 20:50:49 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * Happy Birthday to me!! - -Tue Jul 18 19:17:54 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> - - This change is in response to bug#2602, which was reported by - Lothar Werzinger <lothar at tradescape dot biz>. It fixes a - problem with trying to use XML as the service configuration file - format. The change also includes additional comments and - in-line documentation on the new ability to use local service - repositories. - - * ace/DLL_Manager.cpp: - - Updated the debugging output of DLL_Handle::open() to be able to - see _why_ a DLL open failed. For example, the errno message is - 'not found' in a case where one tries to open library A, which - in turn depends on library B, but B is missing. This change - allows one to see the underlying cause for the error - (via DLL_Handle::error(), if ACE_DEBUG=2, or greater is - present). - - * ace/Parse_Node.h: - * ace/Parse_Node.cpp: - - Moving the ACE_Service_Type_Factory here, from - Service_Config.{h,cpp} This class is only needed when - ACE_USES_CLASSIC_SVC_CONF is 1, i.e. when ACE is using the - non-XML configuration file format. Therefore, moving it to - Parse_Node.{h,cpp} causes it to compile only if needed. - - * ace/Service_Config.h: - - Removed the static get_xml_svc_conf() method, as it already has - the required implementation in the base class. - - * ace/Service_Gestalt.h: - * ace/Service_Gestalt.cpp: - - Moved the ACE_Service_Type_Factory class to Parse_Node.{h,cpp}. - Updated the documentation with a more clear description of the - class responsibilities. Corrected minor omissions. - -Tue Jul 18 18:12:17 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * ACE-INSTALL.html: Updated the description of how to build - ACE+TAO using MPC. Thanks to Steve Totten for helping with - this. - -Tue Jul 18 19:04:42 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - - * ace/Numeric_Limits.h: - - Corrected short integer limit constants, i.e. "s/SHORT/SHRT/g". - - Try other known "long long" integer constants if - "{U}LLONG_{MIN,MAX}" are not available. Issue a preprocessor - error if all known cases have been exhausted. - -Tue Jul 18 16:55:31 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - - * ace/Makefile.am (libACE_la_SOURCES, nobase_include_HEADERS): - - Added new Sig_{Adapter,Handler}.* source and header files. - -Mon Jul 17 23:18:52 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * ace/README: Documented the ACE_TIMEPROBE_ASSERTS_FIXED_SIZE macro. - -Mon Jul 17 23:16:55 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * ace/Timeprobe_T.cpp (timeprobe): Added a check to guard against - segfaults by wrapping the index around when it reaches the end - of the buffer. Thanks to Patrick Rabau <pr2345 at gmail dot - com> for this fix. - -Tue Jul 18 13:21:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/tao_orb_tests.lst: - Added Bug_2595_Regression - -Tue Jul 18 12:48:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/MakeProjectCreator/config/taoidldefaults.mpb: - Fixed the rules to decide whether a .inl file should be added - or not. Thanks to Chad Elliot for noticing this incorrect - rule. - -Tue Jul 18 09:59:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/PerlACE/ProcessVX_Win32.pm: - Increased delay factor from 2 to 3, downloading executables - seems to take longer now - -Tue Jul 18 09:54:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/PerlACE/Process_Unix.pm: - Removed chorus support - -Mon Jul 17 22:52:19 UTC 2006 Steve Huston <shuston@riverace.com> - - * ace/Proactor.cpp (schedule_timer): Record the ACE_Proactor instance - that the timer is scheduled on in the ACE_Handler; makes this - behavior analogous to that in ACE_Reactor::schedule_timer(). - - * tests/Proactor_Timer_Test.cpp: Add a test for repeating timers and - canceling a repeating timer when it's likely that an expiration for - the timer is already queued when it's canceled. - -Mon Jul 17 16:06:57 UTC 2006 Steve Huston <shuston@riverace.com> - - * tests/Unload_libACE.cpp: Alter the libACE suffix for HP-UX on - PA-RISC only. Also see: - Fri Jul 14 19:44:03 UTC 2006 john_c <johnc@ociweb.com> - -Mon Jul 17 22:11:42 UTC 2006 Chad Elliott <elliott_c@ociweb.com> - - * examples/Threads/process_semaphore.cpp: - - Added #include of ace/OS_NS_stdlib.h to get ACE_OS::atoi(). - -Mon Jul 19 11:21:56 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - - * ace/String_Base.cpp: - * ace/String_Base.inl: - - Explicitly qualify size_type parameters with "typename" to force - some compilers (Sun Studio 10) to recognize it as a type. - -Mon Jul 17 17:49:41 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - - * include/makeinclude/platform_hpux_aCC.GNU (SOFLAGS): - - Corrected shared library path for Itanium builds. - - * protocols/ace/HTBP/HTBP_ID_Requestor.cpp (get_HTID): - - Use new ACE_CString::size_type type to hold string - position/index value, instead of "int". Addresses "comparison - between signed and unsigned" warnings. - -Mon Jul 17 16:04:07 UTC 2006 Chad Elliott <elliott_c@ociweb.com> - - * NEWS: - - Added information about the use of atomic operations on SPARC - Solaris. - -Mon Jul 17 15:09:21 UTC 2006 Steve Huston <shuston@riverace.com> - - * ace/Refcounted_Auto_Ptr.{h inl} (null): Changed the return type - of the null() method from int to bool in order to more accurately - reflect the true/false nature of the returned value. - - * NEWS: Noted the above change. - -Mon Jul 17 15:05:05 UTC 2006 Steve Huston <shuston@riverace.com> - - * examples/System_V_IPC/SV_Message_Queues/MQ_Server.cpp: Added - include "ace/Log_Msg.h" in the "non-supported platform" case. - Fixes compile error on Windows. - -Mon Jul 17 13:03:09 UTC 2006 Chad Elliott <elliott_c@ociweb.com> - - * ace/ace_for_tao.mpc: - - Sig_Handler.cpp and Sig_Adapter.cpp are needed to link gperf. - -Mon Jul 17 12:49:34 UTC 2006 Chad Elliott <elliott_c@ociweb.com> - - * netsvcs/servers/main.cpp: - - Added a missing #include for ace/Sig_Adapter.h. - -Mon Jul 17 11:57:26 UTC 2006 Chad Elliott <elliott_c@ociweb.com> - - * ace/qt_reactor.mpb: - - Removed this file. It was no longer referenced by ace and it's - functionality was replaced by ace_qtreactor.mpc. - -Mon Jul 17 10:41:14 UTC 2006 Steve Huston <shuston@riverace.com> - - * tests/Message_Queue_Test_Ex.cpp: Removed the VxWorks-specific - section from MQ_Ex_N_Tester::receiver() - it was apparantly - pulled in from another test example and didn't need to be here. - Should resolve compile errors on VxWorks. - -Mon Jul 18 09:32:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/config-vxworks6.3.h: - * include/makeinclude/platform_vxworks6.3.GNU: - New files for VxWorks 6.3 - - * ace/os_include/sys/os_types.h: - * ace/os_include/os_stdio.h: - * ace/OS_NS_unistd.inl: - * ace/OS_NS_arpa_inet.cpp: - Updated for VxWorks 6.3 - -Sun Jul 17 06:49:21 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - - * apps/soreduce/Library.cpp (set_path): - * apps/soreduce/Obj_Module.cpp (add_source): - * examples/Misc/test_sstring.cpp: - * examples/Web_Crawler/Command_Processor.cpp: - * examples/Web_Crawler/URL_Visitor.cpp: - - Use new ACE_CString::size_type type to hold string - position/index value, instead of "int". Addresses "comparison - between signed and unsigned" warnings. - - * examples/APG/Signals/SigAction.cpp: - * examples/System_V_IPC/SV_Message_Queues/MQ_Server.cpp: - * examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp: - - Include "ace/OS_NS_stdlib.h" to pull in ACE_OS::exit() - prototype. - - * examples/APG/Signals/SigGuard.cpp: - * examples/APG/Signals/SigHandler.cpp: - * examples/APG/Signals/SigHandlers.cpp: - * examples/APG/ThreadManagement/Signals.cpp: - * examples/APG/ThreadManagement/Signals2.cpp: - * examples/ASX/CCM_App/SC_Server.cpp: - * examples/ASX/Event_Server/Event_Server/event_server.cpp: - * examples/ASX/UPIPE_Event_Server/event_server.cpp: - * examples/Connection/blocking/SPIPE-connector.h: - * examples/Connection/misc/Connection_Handler.cpp: - * examples/Connection/non_blocking/CPP-acceptor.h: - * examples/Connection/non_blocking/CPP-connector.h: - * examples/Service_Configurator/IPC-tests/server/server_test.cpp: - * netsvcs/lib/TS_Clerk_Handler.cpp: - - Include "ace/Sig_Handler.h" or "ace/Sig_Adapter.h" to pull in - ACE_Sig_Handler or ACE_Sig_Adapter class declaration, - respectively. Necessitated by "ace/Signal.h" refactoring. - -Sun Jul 16 23:14:53 UTC 2006 Ciju John <johnc@ociweb.com> - - * ace/String_Base_Const.cpp: - - Took out an extra sem-colon. It seems to make the - FC4_Versioned_Namespace build grumpy. - -Sat Jul 15 16:14:05 UTC 2006 Ciju John <johnc@ociweb.com> - - * NEWS: - - Added entry on HPUX library extension changes. - -Fri Jul 14 22:10:02 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - - * ace/Sig_Handler.cpp: - - Removed explicit template instantiations. They snuck back in - when Signal.* was refactored. Thanks to Johnny for pointing - this out. - -Fri Jul 14 21:32:02 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - - * ace/Numeric_Limits.h: - - "ace/ACE_Export.h" -> "ace/ACE_export.h". Darn Windows case - insensitivity. - - Removed unnecessary "ACE_Export" from ACE_Numeric_Limits primary - template. - - * ace/Registry.cpp (make_name): - - Use ACE_TString::size_type, not ssize_t, to hold string position - values. Addresses signed/unsigned comparison warnings. - - * ace/Shared_Memory_Pool.h: - - Include new "ace/Sig_Handler.h" header to pull in - ACE_Sig_Handler class declaration. - - * ace/String_Base.h: - - Added tips to documentation related to potentially user visible - changes. - -Fri Jul 14 21:10:11 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - - * ace/Atomic_Op.h (ACE_Atomic_Op): - * ace/Atomic_Op.inl (ACE_Atomic_Op): - - Reverted change that made the constructor parameters for the - "long" type specialization be passed in by reference to const - instead of by value. Explicit template instantiation is no - longer performed by ACE so there is no need for the - specialization constructor parameters to match the primary - template constructor parameters. - - * ace/CDR_Base.cpp: - * ace/CDR_Stream.h: - * ace/CDR_Stream.inl: - - Const-correctness improvements. - - * ace/CDR_Base.h: - - Minor const related cosmetic changes. - - * ace/CDR_Base.inl (first_size, next_size): - - Quickly multiply by two using a bit shift. This is guaranteed - to work since the variable is an unsigned integer. - - * ace/CORBA_macros.h: - - Removed unnecessary instantiation of emulated exception - environment variable from native exception case. Reduces - footprint in code that uses the ACE emulated exception macros in - a native C++ exception configuration, and provides a slight - performance increase due to resulting tighter binaries. - - * ace/DLL_Manager.cpp (get_dll_names): - - ACE_TString::rfind() now return an ACE_TString::size_type type. - Use ACE_TString::size_type, not ssize_t, to hold the return - value of ACE_TString::rfind(). - - * ace/Dev_Poll_Reactor.cpp: - - Include new "ace/Sig_Handler.h" header to pull in - ACE_Sig_Handler class declaration. - - Added support for HP-UX devpoll headers. - - * ace/Event_Handler.cpp: - - No need to include "ace/Message_Block.h". - - * ace/MMAP_Memory_Pool.h: - * ace/Select_Reactor_T.cpp: - * ace/TP_Reactor.cpp: - * ace/WFMO_Reactor.inl: - - Include new "ace/Sig_Handler.h" header to pull in - ACE_Sig_Handler class declaration. - - * ace/Malloc_Base.h (ACE_Allocator): - - Defined a new "size_type" typedef (currently a "size_t") to - simplify potential allocator size type changes in the future. - It's introduction was motivated by the ACE string class size - type fixes described below. Analogous to the STL - std::allocator<>::size_type typedef. - - * ace/Numeric_Limits.h: - - Traits containing basic integer limits. Useful for - template-based code on platforms that lack - std::numeric_limits<>. These traits are not meant to be a - replacement for std::numeric_limits<>. Rather they are a crutch - until all ACE-supported platforms support - std::numeric_limits<>. [Bug 2451] - - * ace/OS_NS_dirent.inl: - - "__USE_POSIX" -> "_POSIX_SOURCE". The former is a C library - implementation-specific feature test macro/symbol. - - * ace/OS_NS_stdio.cpp: - * ace/OS_NS_stdio.h: - * ace/OS_NS_stdio.inl (get_win32_versioninfo): - - Fixed/added missing wide character support. - - * ace/OS_NS_stdlib.cpp (mkstemp_emulation): - - Clean up preprocessor conditional blocks by taking advantage of - new ACE_Numeric_Limits<> trait templates. - - * ace/OS_NS_stdlib.inl (atop): - - Address VC++ 64-bit warnings by taking advantage of standard - intptr_t type, if available. - - * ace/OS_NS_sys_socket.inl (closesocket): - - Do not shutdown the write end here. Doing so will break - applications that duplicate a handle on fork(), for example, and - expect to continue writing in the fork()ed process. - - * ace/OS_NS_sys_utsname.cpp (uname): - - Fixed garbage in wide string output. - - * ace/Object_Manager.cpp: - - No need to include "ace/Containers.h". - - Include newly refactored "ace/Sig_Adapter.h" instead of old - "ace/Signal.h". Removes dependency on the ACE_Reactor. Allows - service configurator-disabled subset containing - ACE_Object_Manager support to be built, e,g, MPC ace_svcconf=0 - configuration. - - * ace/Object_Manager_Base.cpp (init): - * ace/Process.cpp (pass_handle): - - Fixed Windows version info handling in wide string - configurations. - - * ace/Process_Manager.h (wait): - - Clarified that the timeout value is a relative time, not - absolute, in the documentation. - - * ace/SOCK_Acceptor.cpp (shared_open): - - Removed assertion that assumes all protocol families are - internet related. This method is invoked by some non-internet - protocol subclasses, such as ACE_LSOCK_Acceptor. - - * ace/SOCK_Stream.cpp (close): - - Reinstituted explicit close_writer() method call for the - ACE_WIN32 case since ACE_OS::close() no longer causes the writer - to be shutdown on Windows (nor should it!). - - * ace/Service_Config.cpp: - - Replaced old "ace/Signal.h" include directive with - "ace/Sig_Adapter.h". ACE_Sig_Handler support is unnecessary. - - Removed redundant "ace/Service_Config.h" include directive. - - * ace/Sig_Adapter.cpp: - * ace/Sig_Adapter.h: - * ace/Sig_Handler.cpp: - * ace/Sig_Handler.h: - * ace/Sig_Handler.inl: - * ace/Signal.cpp: - * ace/Signal.h: - * ace/Signal.inl: - - Refactored ACE_Sig_Adapter and ACE_Sig_Handler classes from - "ace/Signal.*" into their own dedicated source files. Allows - ACE_Sig_{Guard,Set} to be used without introducing a dependency - on the ACE_Reactor framework. - - * ace/String_Base_Const.cpp (npos): - * ace/String_Base_Const.h (npos): - - Introduced a new "size_type" typedef. This is consistent with - the standard C++ string class typdef/trait. - - The "no position" constant is now an unsigned integer of the - same "size" type used by the underlying ACE string allocator. - It is defined to be the maximum value the unsigned type can - handle (e.g. ACE_Numeric_Limits<size_type>::max()). This works - since a string length will always be less than or equal to - "max() - 1" since the final character in the string is the null - terminator. [Bug 2598] - - * ace/String_Base.cpp: - * ace/String_Base.h: - * ace/String_Base.inl: - * ace/SString.cpp: - * ace/SString.h: - * ace/SString.inl: - - All size parameter and return value types are now consistent - with the size type of the underlying allocator - (i.e. ACE_Allocator::size_type). Addresses inability of ACE - string classes to provide valid search index for string lengths - greater than the maximum value of ssize_t, a signed type. In - particular, the find(), rfind() and strstr() methods now return - an unsigned integer (size_t) instead of a signed one - (ssize_t). Affected classes include: - - ACE_CString - ACE_WString - ACE_TString - ACE_NS_WString - - Unless you have been explicitly using -1 instead of npos when - comparing the return value of find(), rfind() and strstr(), - and/or assigning the return value to ssize_t you should not see - any difference. A new size_type typedef has been added to the ACE - string class to aid developers. - - The ACE_String_Base<>::strstr() documentation as well as a - default rfind() argument erroneously referred to -1 instead of - npos. Those instances have been corrected. - - To summarize, a "no position" condition is denoted using the npos - constant, not -1. It can be referred directly by scoping it with - the appropriate string class (e.g. ACE_CString::npos, - ACE_WString::npos, etc). [Bug 2598] - - * ace/Task_T.h: - - Include "ace/IO_Cntl_Msg.h" to pull in ACE_IO_Cntl_Msg class - declaration. - - * ace/Time_Value.cpp (max_time): - - Cleaned up preprocessor conditional blocks by taking advantage - of ACE_Numeric_Limits trait templates. - - * ace/Timer_Queue_Adapters.cpp: - - Include "ace/Signal.h" to pull in ACE_Sig_Guard class - declaration. - - * ace/Timer_Queue_Adapters.h: - - Forward declare ACE_Sig_Set class. No need for the full blown - declaration. - - * ace/Token.cpp: - - Minor cosmetic change. - - * ace/ace_wchar.h (ACE_GetVersionEx): - - New wide string support for Windows "GetVersionEx{A,W}()" - functions. - - * ace/ace_wchar.inl: - - Improved const-correctness. - - * ace/config-aix-4.x.h: - * ace/config-macosx-panther.h: - * ace/config-macosx-tiger.h: - * ace/config-macosx.h: - - Fixed single-threaded configuration so that all multi-thread - support is disabled. - - * ace/ace.mpc: - - Added missing DLL_Manager.cpp source file, and newly refactored - Sig_{Adapter,Handler}.cpp source files. - - * ace/ace_for_tao.mpc: - - Explicitly require the ace_svcconf MPC feature. - - Added missing ACE_LACKS_ACE_TOKEN macro. The ace_for_tao subset - does not support ACE's token collections. - - * ace/svcconf.mpb: - - Do not define ACE_HAS_ACE_SVCCONF. There is no such macro in - the ACE sources. - - Explicitly remove ACE_LACKS_ACE_SVCCONF from the macro list. - - Moved "DLL_Manager.cpp" to the core ACE library source file - list. "DLL_Manager.cpp" is not an optional component, and must - always exist in ACE regardless of whether or not ACE's service - configurator support is enabled. - - * ace/token.mpb: - - Do not define ACE_HAS_ACE_TOKEN. There is no such macro in - the ACE sources. - - Explicitly remove ACE_LACKS_ACE_TOKEN from the macro list. - - * bin/MakeProjectCreator/config/ace_for_tao.mpb: - - Added missing ACE_LACKS_ACE_TOKEN macro. The ace_for_tao subset - does not support ACE's token collections. - - * tests/SString_Test.cpp: - - Corrected checks for "no position" return values to compare - against "npos" constant, not "-1". - -Fri Jul 14 20:57:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/INET_Addr.cpp: - Initialise some pointers explicitly with 0 - -Fri Jul 14 20:41:23 UTC 2006 john_c <johnc@ociweb.com> - - * bin/tao_orb_tests.lst: - - Add new test TAO/tests/Optimized_Connection to nightly builds. - -Fri Jul 14 20:39:41 UTC 2006 Steve Huston <shuston@riverace.com> - - * ace/config-vxworks6.2.h: Reverted this change: - Fri Jul 14 10:34:43 UTC 2006 Steve Huston <shuston@riverace.com> - It appears to not work, and I can't test anything else here. - -Fri Jul 14 18:53:32 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * bin/MakeProjectCreator/config/global.features - * bin/MakeProjectCreator/config/stl.mpb - - Added an stl feature/base project for projects that use portions - of the STL that may not be universally supported. - -Fri Jul 14 19:44:03 UTC 2006 john_c <johnc@ociweb.com> - - * ace/config-hpux-11.00.h: - * include/makeinclude/platform_hpux_aCC.GNU: - - Changing the shared library extension for hpux ia64 to ".so". On - HP-UX 11i Version 1.5 the naming scheme is lib*.sl for PA and - lib*.so on IPF. - -Fri Jul 14 19:29:59 UTC 2006 Steve Huston <shuston@riverace.com> - - * ace/OS_NS_stdio.cpp (DllMain): Add extern "C" to the DllMain - signature - enables it to be located and called at startup. - Thanks to Hubert Talbot <Hubert dot Talbot at criq dot qc dot ca> - for this fix. - -Fri Jul 14 19:13:06 UTC 2006 john_c <john@ociweb.com> - - * ace/Timer_Queue_Adapters.cpp: - - Include file was missing. Fixes compile error when - ACE_HAS_DEFERRED_TIMER_COMMANDS is defined. - -Fri Jul 14 19:05:15 UTC 2006 Ciju John <john_c@ociweb.com> - - * bin/tao_other_tests.lst: - - Adding the TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated - test to nightly builds. - -Fri Jul 14 16:25:00 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> - - * bin/tao_orb_tests.lst: - Added exclusions for Bug_2593_Regression test. - -Fri Jul 14 15:50:34 UTC 2006 Adam Mitz <mitza@ociweb.com> - - * bin/PerlACE/Process_Unix.pm: - * bin/PerlACE/Process_Win32.pm: - - Added an optional parameter to Process->Kill(). If the parameter is - true then the return value from the process is ignored. - -Fri Jul 14 15:45:04 UTC 2006 Steve Huston <shuston@riverace.com> - - * tests/Message_Queue_Test_Ex.{h cpp}: Corrected for !ACE_HAS_THREADS. - -Fri Jul 14 15:39:53 UTC 2006 Adam Mitz <mitza@ociweb.com> - - * bin/tao_other_tests.lst: - Added new test (TAO/orbsvcs/tests/CosEvent/Timeout/run_test.pl). - -Fri Jul 14 10:34:43 UTC 2006 Steve Huston <shuston@riverace.com> - - * ace/config-vxworks6.2.h: Added ACE_LACKS_USECONDS_T to fix a - compile error. It's in the non-__RTP__ section since that's where - ACE_LACKS_SUSECONDS_T was, but I'm not sure this is correct. - -Fri Jul 14 07:26:46 UTC 2006 Olli Savia <ops@iki.fi> - - * ace/Thread_Mutex.h: - * ace/ace_wchar.h: - * tests/SOCK_Dgram_Bcast_Test.cpp: - Fixed typos in comments. - - * m4/config_h.m4: - Removed references to ACE_HAS_TERM_IOCTLS. It's no longer - used in ACE/TAO/CIAO code. - -Fri Jul 14 02:11:21 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> - - * bin/tao_orb_tests.lst: - Added new test for Bug 2593 to nightly suite. - -Thu Jul 13 20:40:10 UTC 2006 Olli Savia <ops@iki.fi> - - * ace/config-integritySCA.h: - Removed references to ACE_HAS_ATTR_SETSCHED. It's no longer - used in ACE/TAO/CIAO code. - - * ace/config-rtems.h: - Removed references to ACE_HAS_SIGNAL_SAFE_OS_CALLS. It's no longer - used in ACE/TAO/CIAO code. - - * ace/config-sco-5.0.0-mit-pthread.h: - Removed references to ACE_HAS_T_OPMGMT. It's no longer - used in ACE/TAO/CIAO code. - -Thu Jul 13 10:35:39 UTC 2006 Olli Savia <ops@iki.fi> - - * ace/Base_Thread_Adapter.cpp: - * ace/Cleanup.cpp: - * ace/OS.cpp: - * ace/OS_Errno.cpp: - * ace/OS_Log_Msg_Attributes.cpp: - * ace/OS_NS_Thread.cpp: - * ace/OS_NS_arpa_inet.cpp: - * ace/OS_NS_ctype.cpp: - * ace/OS_NS_dirent.cpp: - * ace/OS_NS_dlfcn.cpp: - * ace/OS_NS_errno.cpp: - * ace/OS_NS_fcntl.cpp: - * ace/OS_NS_math.cpp: - * ace/OS_NS_netdb.cpp: - * ace/OS_NS_poll.cpp: - * ace/OS_NS_pwd.cpp: - * ace/OS_NS_regex.cpp: - * ace/OS_NS_signal.cpp: - * ace/OS_NS_stdio.cpp: - * ace/OS_NS_stdlib.cpp: - * ace/OS_NS_string.cpp: - * ace/OS_NS_strings.cpp: - * ace/OS_NS_stropts.cpp: - * ace/OS_NS_sys_mman.cpp: - * ace/OS_NS_sys_msg.cpp: - * ace/OS_NS_sys_resource.cpp: - * ace/OS_NS_sys_select.cpp: - * ace/OS_NS_sys_sendfile.cpp: - * ace/OS_NS_sys_shm.cpp: - * ace/OS_NS_sys_socket.cpp: - * ace/OS_NS_sys_stat.cpp: - * ace/OS_NS_sys_time.cpp: - * ace/OS_NS_sys_uio.cpp: - * ace/OS_NS_sys_wait.cpp: - * ace/OS_NS_time.cpp: - * ace/OS_NS_unistd.cpp: - * ace/OS_NS_wchar.cpp: - * ace/OS_TLI.cpp: - * ace/Thread_Adapter.cpp: - * ace/Thread_Control.cpp: - * apps/JAWS2/HTTPU/parse_http_request.cpp: - * apps/JAWS2/HTTPU/parse_http_response.cpp: - - Fixed typo in comment. - -Thu Jul 13 09:51:33 UTC 2006 Olli Savia <ops@iki.fi> - - * configure.ac: - Removed references to ACE_HAS_EXCEPTION_H. It's no longer - used in ACE/TAO/CIAO code. - -Thu Jul 13 09:48:10 UTC 2006 Olli Savia <ops@iki.fi> - - * ace/os_include/os_string.h: - * ace/os_include/os_stropts.h: - Fixed typo in comment. - -Thu Jul 13 09:32:54 UTC 2006 Olli Savia <ops@iki.fi> - - * ace/config-vxworks6.2.h: - * configure.ac: - * m4/config_h.m4: - Removed references to ACE_HAS_USING_KEYWORD. It's no longer - used in ACE/TAO/CIAO code. - -Thu Jul 6 20:45:15 UTC 2006 Steve Huston <shuston@riverace.com> - - * ace/Refcounted_Auto_Ptr.{h inl}: Repaired the ACE_Refcounted_Auto_Ptr - reset() and release() methods per Bugzilla #1925. They will both now - detach from the underlying ACE_Refcounted_Auto_Ptr_Rep object; - reset() will create a new one for the new pointer specified as its - argument. Generally modified the class to not make changes to the - underlying ACE_Refcounted_Auto_Ptr_Rep (such as with reset()). This - safely allows the get() method to avoid using the lock for reading - the pointer value since there's no way to change the underlying - rep's pointer. - Also cleaned up the Doxygen stuff for these classes. - - This work resulted in removal of the following methods in - ACE_Refcounted_Auto_Ptr_Rep (not ACE_Refcounted_Auto_Ptr): - - null () - - assign () - - release () - - reset () - - This significantly improves ACE_Refcounted_Auto_Ptr. This is not - a recommendation to [not] use it over ACE_Strong_Bound_Ptr. Just - responding to user reports. It may still be possibly/adviseable to - work further on this class, though I have no specific ideas or - reports at this time. - - * tests/Refcounted_Auto_Ptr_Test.{h cpp}: Added tests for release() - and reset() per code supplied in Bugzilla #1925. Removed code in - ACE_ASSERT since it doesn't run in Release builds; replaced with - explicit checks and ACE_ERROR. - -Wed Jul 12 20:32:49 UTC 2006 Steve Huston <shuston@riverace.com> - - * tests/Message_Queue_Test_Ex.{h cpp}: Fixed compile errors on Linux. - -Wed Jul 12 19:15:58 UTC 2006 Steve Huston <shuston@riverace.com> - - * ace/Message_Queue_T.{h cpp}: Added a new class, - ACE_Message_Queue_Ex_N<class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL>, that - is similar to ACE_Message_Queue_Ex in that the object queued is a - template parameter. However, ACE_Message_Queue_Ex_N allows the - enqueueing and dequeueing of multiple chained objects at once. This - wasn't added to ACE_Message_Queue_Ex because the chained object - functionality requires the ACE_MESSAGE_TYPE class to have a - ACE_MESSAGE_TYPE *next (void) const method, analogous to - ACE_Message_Block::next(), to follow the chain and this would - probably break existing applications using ACE_Message_Queue_Ex. - - * tests/Message_Queue_Test_Ex.{h cpp}: Added test capability for - ACE_Message_Queue_Ex_N. - - * NEWS: Added description of the new class. - - Thanks to Guy Peleg <guy dot peleg at amdocs dot com> for - contributing this new class and its tests. - -Wed Jul 12 16:37:40 UTC 2006 Steve Huston <shuston@riverace.com> - - * etc/ace.doxygen: - * etc/ace_qos.doxygen: - * etc/ace_ssl.doxygen: Use the IGNORE_PREFIX directive to have Doxygen - ignore the ACE_, ACE_QoS_, ACE_SSL_ prefixes when alphabetizing - the class index. Thanks to Stefan Naewe <naewe dot s at atlas dot de> - for this idea. - - * THANKS: Added Stefan Naewe to the Hall of Fame. - -Wed Jul 12 14:30:16 UTC 2006 Steve Huston <shuston@riverace.com> - - * ace/config-lynxos.h: - * ace/config-netbsd.h: Changed ACE_SCANDIR_CMP_USES_VOIDPTR to - ACE_SCANDIR_CMP_USES_CONST_VOIDPTR - makes it match the decl in - ace/os_include/os_dirent.h and should resolve a compile error. - -Wed Jul 12 13:55:09 UTC 2006 Steve Huston <shuston@riverace.com> - - * ace/Message_Queue.inl: Move the #include out of the namespace; see - Tue Jul 11 13:38:10 UTC 2006 Steve Huston <shuston@riverace.com> - -Wed Jul 12 10:15:12 UTC 2006 Martin Corino <mcorino@remedy.nl> - - * include/makeinclude/platform_openvms.GNU: - Added fixes for SSL support. - - * ace/config-openvms.h: - Added ACE_HAS_PTHREAD_SCHEDPARAM. - - * ace/Global_Macros.h: - * ace/Lib_Find.cpp: - * ace/Service_Config.cpp: - * ace/Service_Config.h: - * ace/Service_Object.cpp: - * ace/Service_Object.h: - Moved OpenVMS specific dynamic service support class to a - better place. - -Wed Jul 12 07:13:01 UTC 2006 Olli Savia <ops@iki.fi> - - * ace/FILE_Connector.cpp: - It is safe to use ACE_OS::mkstemp() on all platforms. - -Wed Jul 12 02:21:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/msvc_static_order.lst: - Build ObjRefTemplate before IORInterceptor - -Tue Jul 11 23:09:28 UTC 2006 Chad Elliott <elliott_c@ociweb.com> - - * include/makeinclude/platform_hpux_aCC.GNU: - - The C compiler doesn't support the -mt option. So, add -mt to - CC_THR_DEFS and then later add CC_THR_DEFS to CCFLAGS. CCFLAGS - isn't used when compiling C files. - -Tue Jul 11 22:30:21 UTC 2006 Steve Huston <shuston@riverace.com> - - * ace/config-win32-common.h: - * ace/config-WinCE.h: Break the tight tie between UNICODE and - ACE_USES_WCHAR I introduced in - Thu Oct 6 17:56:19 2005 Steve Huston <shuston@riverace.com> - Now ACE_USES_WCHAR is always on for CE; non-CE Windows builds must - explicitly set ACE_USES_WCHAR independent of UNICODE. Thanks to - Russell Morra <russell_mora at symantec dot com> for explaining - the situation and submitting this fix. - -Tue Jul 11 22:20:14 UTC 2006 Steve Huston <shuston@riverace.com> - - * bin/generate_doxygen.pl: Add the ability to put the generated - HTML output in a specified location using the new -html_output - command line option. It alters the path specified for the - HTML_OUTPUT and GENERATE_TAGFILE Doxygen options. - -Tue Jul 11 22:09:56 UTC 2006 Steve Huston <shuston@riverace.com> - - * include/makeinclude/platform_linux.GNU: Added support for the - "buildbits=64" and "buildbits=32" make settings to target - 32- and 64-bit build targets, respectively. Thanks to Boris - Kaminer <boris dor kaminer at gmail dot com> for this addition. - -Tue Jul 11 22:22:04 UTC 2006 Steve Huston <shuston@riverace.com> - - * configure.ac: Change the minimum automake version to 1.9.6; this is - required to generate Makefiles that work properly on AIX. - - * m4/compiler.m4: For AIX, replace ACE_AIX_MAJOR_VERS and - ACE_AIX_MINOR_VERS compile macros with ACE_AIX_VERS as the - hand-edited platform_aix_ibm.GNU has and the code expects. - Also removed the AIX 3 and 4 code since AIX 3 and 4 are no longer - supported. Also, turned on -qtemplateregistry for xlC-type - compilers (Visual Age C++ 6 and XL C++ 7). - -Tue Jul 11 21:37:51 UTC 2006 Steve Huston <shuston@riverace.com> - - * ace/OS_NS_stdio.cpp (snprintf, sprintf): In the wchar versions, - adjust the preprocessor checks to pick up the way that Solaris - indicates the presence of XPG5 capability. Allows these functions - to work, which allows ACE_Log_Msg to work also. - - * ace/OS_NS_unistd.{h inl} (ualarm): Changed u_long arguments and - return value to useconds_t to gain portability. - - * ace/OS_NS_dirent.{h inl cpp}: Made the selector and comparator - function pointer arguments to ACE_OS::scandir() and - scandir_emulation() be extern "C" to enforce their use with a - C RTL function. This resolves warnings from Solaris and makes usage - correct across all platforms. The function types are now in - typedefs ACE_SCANDIR_SELECTOR and ACE_SCANDIR_COMPARATOR, - respectively. The typedef was used previously only for Windows/MSVC - where the calling convention change had bit someone - now it's - uniform for all. - Also, folded in the ACE_SCANDIR_CMP_USES_VOIDPTR def here to - set up the proper typing with extern "C" for when it's needed to - cast inside the ACE_OS::scandir() implementation. The interface - offered by ACE_OS::scandir() is always defined in terms of - ACE_SCANDIR_SELECTOR and ACE_SCANDIR_COMPARATOR. - - * ace/Dirent_Selector.{h cpp}: Use the extern "C"-containing typedefs - for selector/comparator functions set up for ACE_OS::scandir() in - ACE_Dirent_Selector as well since they get passed through to ACE_OS. - - * apps/soreduce/Library.cpp: - * tests/Dirent_Test.cpp: Mark selector/comparator functions that'll be - passed to ACE_OS::scandir() as extern "C" to match new param types. - - * ace/config-aix-5.x.h: Added ACE_HAS_SCANDIR since AIX has scandir(), - as well as the needed ACE_SCANDIR_SEL_LACKS_CONST and - ACE_SCANDIR_CMP_USES_VOIDPTR to adjust to it's differences from - the common way scandir() is usually defined. - - * ace/config-hpux-11.00.h: Added ACE_HAS_SCANDIR. - - * ace/config-linux-common.h: Clarify that, despite the man page, - ACE_SCANDIR_CMP_USES_CONST_VOIDPTR is needed, at least on RHEL 3 - and 4. - - * ace/README: Added descriptions for ACE_HAS_SCANDIR and - ACE_SCANDIR_CMP_USES_VOIDPTR as well as the new settings - ACE_SCANDIR_SEL_LACKS_CONST and ACE_SCANDIR_CMP_USES_CONST_VOIDPTR. - - * NEWS: Summarize the above user-visible selector/comparator changes. - -Tue Jul 11 17:39:00 UTC 2006 Olli Savia <ops@iki.fi> - - * ace/Basic_Types.h: - * ace/OS.h: - Removed unnecessary includes. - -Tue Jul 11 17:25:06 UTC 2006 Olli Savia <ops@iki.fi> - - * include/makeinclude/platform_rtems.x_g++.GNU: - * include/makeinclude/wrapper_macros.GNU: - - Removed references to obsolete ACE_HAS_GNUG_PRE_2_8 make - variable. Removed egcs checks. - -Tue Jul 11 16:55:57 UTC 2006 Olli Savia <ops@iki.fi> - - * ace/TTY_IO.cpp: - Enable raw mode correctly on POSIX systems. Accept "none" as - valid parity value. Thanks to hongxing <hongxing777 at gmail dot com> - for the patch. - - * ace/TTY_IO.h: - Updated documentation to reflect changes above. - - * ace/os_include/sys/os_resource.h: - Fixed typo in comment. - -Tue Jul 11 16:38:29 UTC 2006 Olli Savia <ops@iki.fi> - - * ace/config-linux-common.h: - * ace/os_include/os_signal.h: - * ace/os_include/os_stropts.h: - - Changed ACE_HAS_ISASTREAM_PROTO to ACE_HAS_ISASTREAM_PROTOTYPE and - ACE_HAS_PTHREAD_SIGMASK_PROTO to ACE_HAS_PTHREAD_SIGMASK_PROTOTYPE - to better follow ACE naming conventions. - -Tue Jul 11 13:38:10 UTC 2006 Steve Huston <shuston@riverace.com> - - * ace/Message_Queue.inl: Include "ace/Guard_T.h" in the ACE_WIN32 - section to avoid compile errors with Release builds. - - * ace/TSS_T.h: Improved documentation. - - * tests/ACE_Init_TestDlg.cpp: Added comment block at the top to explain - the file's purpose. - - * tests/Task_Test.cpp: Added a smoke test for the new - ACE_Task::last_thread() method. - -Thu Jul 6 12:48:58 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * ace/OS_NS_sys_socket.inl (sendto): Initialize "bytes_sent" to 0 - to avoid random values. Thanks to Winston Zhang <winston_ace at - kubao-inc dot com> for reporting this. - -Wed Jul 5 20:32:20 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * ace/WFMO_Reactor.cpp (open): Added some more code to prevent - memory leaks when the ACE_WFMO_Reactor is reopened. Thanks to - Sonicfly Zhou <zhoucn at txsec dot com> for this fix. - -Tue Jul 11 12:19:23 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * etc/tao.doxygen: - Added .idl to FILE_PATTERNS - -Tue Jul 11 12:01:12 UTC 2006 Chad Elliott <elliott_c@ociweb.com> - - * ace/Atomic_Op.cpp: - * ace/Atomic_Op_Sparc.h: - * ace/Atomic_Op_Sparc.c: - * include/makeinclude/platform_sunos5_sunc++.GNU: - - Added a SPARC assembler implementation of functions needed for use - within the ACE_Atomic_Op specializations. The implementation will - only be used if atomic_ops_sparc is set to 1 in - platform_macros.GNU. It also requires that v8plus or higher be - used with SunCC. - - * ace/Makefile.am: - * ace/ace.mpc: - - Added the new Atomic_Op_Sparc.c. - - * ace/CDR_Base.cpp: - - In grow(), call the clone_nocopy() method on the ACE_Data_Block - with the new size. Previously, the clone_nocopy() would be called - and then directly after that, size() would be called on the cloned - data block which would re-allocate to the new size and copy the - previous contents. - - In the same method, we avoid constructing an ACE_Message_Block to - avoid reference count manipulating the data block's reference - count. - - Also, in consolidate(), avoid attempting to copy data if the - destination and source are the same. [RT 8372] - - * ace/CDR_Stream.h: - * ace/CDR_Stream.cpp: - - Added a constructor that takes an ACE_Data_Block* which can be - used to avoid an allocation while constructing the - ACE_Message_Block held by the ACE_OutputCDR. [RT 8372] - - * ace/Message_Block.h: - * ace/Message_Block.cpp: - * ace/Message_Block_T.h: - * ace/Message_Block_T.cpp: - - Added a new parameter to the ACE_Data_Block::clone_nocopy() method - that allows the user copy the data block, but increase the size - all in one step. [RT 8372] - - * ace/OS_NS_string.inl: - - Added an unrolled implementation of memset, only active if - ACE_HAS_SLOW_MEMSET is defined, that supports up to 16 bytes - without calling into the memset() C function. - - * ace/config-sunos5.5.h: - - SunCC 5.x supports new(nothrow_t). So, I have enable the use of - it when exceptions are enabled. [RT 8372] - - * ace/OS_NS_Thread.h: - * ace/os_include/os_pthread.h: - - Added macro definitions required to build ACE and TAO on Solaris - without using the pthreads library. - - * include/makeinclude/platform_aix_ibm.GNU: - * include/makeinclude/platform_hpux_aCC.GNU: - * include/makeinclude/platform_irix6.x_sgic++.GNU: - - Added 64-bit options to the CFLAGS macros to deal with the newly - added C file in ACE. [RT 8372] - -Tue Jul 11 01:47:23 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tests/Log_Msg_Test.cpp: - initialise pointer with 0 - -Tue Jul 11 01:37:23 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/OS_NS_unistd.h: - Layout change - -Tue Jul 11 01:09:23 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/MakeProjectCreator/config/taoidldefaults.mpb: - If -oA has been used as idlflags, don't add the A files - -Tue Jul 11 00:50:23 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/generate_compile_stats.sh: - Updated to also handle redhat version information - -Sun Jul 09 05:53:23 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ACE version 5.5.2 released. - -Fri Jul 7 08:07:50 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ACE-INSTALL.html: Small improvements - -Thu Jul 6 19:57:50 UTC 2006 Steve Huston <shuston@riverace.com> - - * ACE-INSTALL.html: Improvements and corrections motivated by - Abdul Sowayan <abdullah dot sowayan at lmco dot com>. - -Wed Jul 5 19:15:37 UTC 2006 Steve Huston <shuston@riverace.com> - - * ACE-INSTALL.html: Cleaned up further; clarified role of DOC and - support companies and use of PROBLEM-REPORT-FORM. - - * NEWS: Noted removal of Chorus and pSOS. - -Tue Jul 4 04:10:11 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * tests/Memcpy_Test.cpp: Added a short summary of this test. - Thanks to Arvind Krishna for contributing it. - -Tue Jul 4 01:05:47 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * tests/Memcpy_Test.cpp (testit): ACE-ified this test. - -Tue Jul 4 01:03:52 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * tests/CE_fostream.cpp: - * tests/Service_Config_Test.cpp: Improved the description of these - tests. - -Mon Jul 3 14:42:45 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> - - * NEWS: Updated the NEWS file with information about using multiple - service repositories. - -Mon Jul 3 03:25:43 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * examples/APG/Svc_Config/HA_Configurable_Server_Dynamic.cpp - (ACE_TMAIN): Changed the reactor event loop to explicitly pass - in ACE_Reactor::check_reconfiguration(). Thanks to Michael Reed - <mnr102 at yahoo dot com> for reporting this. - -Mon Jul 3 03:15:14 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * examples/Service_Configurator/IPC-tests/server/server_test.cpp - (ACE_TMAIN): Changed the reactor event loop to explicitly pass - in ACE_Reactor::check_reconfiguration(). - -Fri Jun 30 13:40:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/msvc_static_order.lst: - Added CSD_Framework and CSD_ThreadPool - -Fri Jun 30 09:33:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/generate_rel_manpages: - Updated doxygen version we are using for the release - -Fri Jun 30 07:29:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/MakeProjectCreator/config/taoexe.mpb: - Added corba/e and core_minimum_corba as base projects so that - the executables that can be build with CORBA/e and minimum - corba do have set the correct flags during compilation - -Thu Jun 29 17:30:52 UTC 2006 Steve Huston <shuston@riverace.com> - - * NEWS: Added a note about the logging changes from - Tue May 16 22:23:55 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - -Thu Jun 29 10:05:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tests/Signal_Test.cpp: - Layout changes - -Thu Jun 29 09:13:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Containers_T.cpp: - Initialise pointer with 0 - -Thu Jun 29 08:52:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * include/makeinclude/platform_g++_common.GNU: - * include/makeinclude/platform_osf1_4.x_cxx.GNU: - * include/makeinclude/platform_sunos5_ghs.GNU: - * include/makeinclude/platform_sunos5_sunc++.GNU: - * include/makeinclude/wrapper_macros.GNU: - Removed support for explicit templates, we don't support that - anymore - -Thu Jun 29 08:34:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * docs/ACE-guidelines.html: - Document that the STL generic algorithms are safe to be used and - made some other small updates - -Wed Jun 28 10:03:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/ace_for_tao.mpc: - Added missing file because of the sendfile addition to TAO - -Wed Jun 28 09:20:08 UTC 2006 Boris Kolpackov <boris@kolpackov.net> - - * protocols/ace/RMCast/Link.cpp: - * protocols/ace/RMCast/Link.h: - * protocols/ace/RMCast/Socket.cpp: - Added explicit calls to close functions for sockets and pipes. - Thanks to finalpatch <fengli@gmail.com> for reporting this. - -Wed Jun 28 07:10:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * docs/ACE-guidelines.html: - Document that template template arguments are not possible to - be used because HP aCC 3.70 doesn't support it. - -Tue Jun 27 13:06:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Unbounded_Queue.cpp: - Explicitly initialise pointers with 0 - -Tue Jun 27 08:59:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/ace_for_tao.mpc: - Added MMAP_Memory_Pool.* because TAO uses these for sendfile - support - -Tue Jun 27 06:56:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/OS_NS_unistd.inl: - * ace/config-WinCE.h: - WinCE doesn't seem to have SetFilePointerEx, so introduced - ACE_LACKS_SETFILEPOINTEREX which we check in OS_NS_unistd.inl, - if this is set we fallback to SetFilePointer - -Tue Jun 27 06:47:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tests/CDR_File_Test.cpp: - Fixed 64bit conversion warning - -Tue Jun 27 06:34:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/MakeProjectCreator/config/taolib.mpb: - Added tao_versioning_idl_defaults as base - -Mon Jun 26 13:27:00 UTC 2006 Simon Massey <sma@prismtech.com> - - * NEWS: - Added PICurrent refactoring note. Moved from NEWS to TAO/NEWS - -Mon Jun 26 08:27:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/DLL_Manager.h: - Reexport ACE_DLL_Handle, the ACE_DLL_Manager returns a pointer - to this type in its interfaces. Thanks to Patrick Bennett - <Patrick dot Bennett at inin dot com> for reporting this - -Mon Jun 26 08:17:12 UTC 2006 Martin Corino <mcorino@remedy.nl> - - * include/makeinclude/platform_openvms.GNU: - Some compileswitch changes. - - * ace/config-openvms.h: - Added multicast filtering setting. - -Sun Jun 25 11:54:12 UTC 2006 Martin Corino <mcorino@remedy.nl> - - * include/makeinclude/platform_openvms.GNU: - Some compileswitch changes. - -Sun Jun 25 08:36:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/msvc_mpc_auto_compile.pl: - Build gperf and TAO_IDL before tao - -Sat Jun 24 14:02:15 UTC 2006 Steve Huston <shuston@riverace.com> - - * ace/Lib_Find.cpp (open_temp_file): In the ACE_WIN32 section, - 'perm' is not used, so use ACE_UNUSED_ARG on it. - - * tests/Hash_Map_Manager_Test.cpp: Use const ACE_TCHAR with literal - string, not non-const. Resolves compile warning on some compilers. - -Fri Jun 23 21:03:37 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - - * ace/Lib_Find.cpp (open_temp_file): - - Added FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE - for the 'perms' argument of the Windows version, which - eliminates a open_temp_file() failure in the IDL compiler - on a file that was previously opened/closed with fopen/fclose. - Thanks to Krishnakumar Balasubramanian <kitty@dre.vanderbilt.edu> - for figuring out the fix. - -Fri Jun 23 16:01:31 UTC 2006 Steve Huston <shuston@riverace.com> - - * examples/Reactor/Proactor/test_proactor.cpp (open): When calling - ACE_OS::open(), don't supply a very UNIXy-looking 0644 value for - the 'perms' argument. Let it default to something reasonable for - the platform. Using 0644 on Windows passes something Windows doesn't - like, and the test fails. Thanks very much to William Cote - <William dot Cote at hp dot com> for fixing this. - - * THANKS: Added William Cote to the Hall of Fame. - -Fri Jun 23 13:20:21 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - Reverted the change below, it triggers pidl recompilation for all pidl files - Fri Jun 23 07:36:21 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - * bin/MakeProjectCreator/config/taoidldefaults.mpb: - Added .pidl to the inputext. This should be the way how things should - run fine again in TAO but it seems somewhere ther is something missing. - -Fri Jun 23 07:36:21 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/MakeProjectCreator/config/taoidldefaults.mpb: - Added .pidl to the inputext. This should be the way how things should - run fine again in TAO but it seems somewhere ther is something missing. - -Thu Jun 22 21:05:20 UTC 2006 Krishnakumar B <kitty@dre.vanderbilt.edu> - - * ace/OS_NS_fcntl.h (ACE_DEFAULT_OPEN_PERMS): Set the value of - ACE_DEFAULT_OPEN_PERMS from ACE_DEFAULT_FILE_PERMS instead of - 0. This ensures that users of ACE_OS::open() who don't override - the default argument get a sensible default. - -Thu Jun 22 15:08:01 UTC 2006 Steve Huston <shuston@riverace.com> - - * ace/SSL/SSL_Context.{h cpp} (load_trusted_ca): Added a third - argument, bool use_env_defaults, which defaults to true. If false, - the ca_file and ca_dir arguments do not get ACE defaults applied - to them if passed as 0. This allows a user to specify a 0 file or - directory to the underlying SSL_CTX_load_verify_locations() function. - If a ca_dir is supplied, attempt to add its CA list to the - X509 names in addition to that of ca_file. - - (seed_file): If the file loads ok, check RAND_status() to see if - there's "enough" entropy. - - * ace/SSL/SSL_Context.inl: - * ace/SSL/SSL_Asynch_Stream.cpp: - * ace/SSL/SSL_SOCK_Stream.cpp: When setting up SSL_CTX, set the verify - mode as well. When creating a new socket object, let it inherit the - verify mode from the SSL context rather than making a call back to - the context to retrieve the verify mode and setting it with a - separate SSL call. - -Thu Jun 22 14:48:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/msvc_static_order.lst: - Build the portableserver earlier in the list of libs - -Thu Jun 22 05:29:48 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> - - * ace/Service_Gestalt.cpp: - - The initialize_i() method would not remove a service, which - failed to initialize, in case the ACE_NOLOGGING is defined. For - some reason the two blocks of code were switched around. Thanks - to Martin Corino <mcorino at remedy dot nl> for pointing out the - problem. - -Wed Jun 21 21:29:04 UTC 2006 Steve Huston <shuston@riverace.com> - - * ace/config-lynxos.h: Added ACE_LACKS_STRPTIME. This should fix a - compile error on LynxOS. - -Wed Jun 21 15:45:32 UTC 2006 Steve Huston <shuston@riverace.com> - - * tests/Hash_Map_Manager_Test.cpp: Fix incorrect concatenating of - text literals. - -Wed Jun 21 07:10:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * examples/Misc/test_trace.cpp: - Fixed fuzz error - -Tue Jun 20 23:20:17 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * tests/Framework_Component_DLL.cpp: Added a description of this test. - -Tue Jun 20 22:34:43 UTC 2006 Steve Huston <shuston@riverace.com> - - * tests/Service_Config_DLL.cpp: Added a comment block at the top - to describe this file's purpose. - -Tue Jun 20 22:09:54 UTC 2006 Steve Huston <shuston@riverace.com> - - * ace/OS_NS_time.cpp (strptime): Added a const_cast<char*> wherever - a return of something based on the const char *buf was done; related - to: - Tue Jun 20 20:19:37 UTC 2006 Steve Huston <shuston@riverace.com> - - * NEWS: Noted that the signature of ACE_OS::strptime() changed, also - related to the entry above. - -Tue Jun 20 20:19:37 UTC 2006 Steve Huston <shuston@riverace.com> - - * configure.ac: - * ace/README: - * ace/OS_NS_time.h: - * ace/OS_NS_time.inl: - * ace/OS_NS_time.cpp: - * m4/config_h.m4: The ACE_OS::strptime() wrapper was previously not - compiled in unless ACE_HAS_STRPTIME was set. If this was set and - ACE_LACKS_NATIVE_STRPTIME was also set, an emulation was supplied. - This has been changed so that: - - ACE_OS::strptime() is always supplied. - - The emulation is used if ACE_LACKS_STRPTIME is set. - - The first arg to ACE_OS::strptime() is now "const char *" - instead of "char *" as the native strptime() is. - - ACE_OS::strptime() is inlineable. - ACE_HAS_STRPTIME is no longer used, and ACE_LACKS_NATIVE_STRPTIME - is changed to ACE_LACKS_STRPTIME. If ACE_LACKS_STRPTIME is set - and the user decides not to include the emulation, then - ACE_REFUSE_STRPTIME_EMULATION should be set, which will cause - ACE_NOTSUP_RETURN to be used instead of the emulation. - - * ace/config-borland-common.h: - * ace/config-vxworks5.x.h: - * ace/config-vxworks6.2.h: - * ace/config-win32-dmc.h: - * ace/config-win32-ghs.h: - * ace/config-win32-mingw.h: - * ace/config-win32-msvc-7.h: - * ace/config-win32-msvc-8.h: - * ace/config-win32-visualage.h: Removed ACE_HAS_STRPTIME; changed - ACE_LACKS_NATIVE_STRPTIME to ACE_LACKS_STRPTIME. - - * ace/config-cygwin32.h: - * ace/config-doxygen.h: - * ace/config-irix6.x-common.h: - * ace/config-linux-common.h: - * ace/config-netbsd.h: - * ace/config-openvms.h: - * ace/config-sunos5.5.h: - * ace/config-tandem-nsk-mips-v3.h: Removed ACE_HAS_STRPTIME. - - * ace/config-rtems.h: Changed ACE_LACKS_NATIVE_STRPTIME to - ACE_LACKS_STRPTIME. - NOTE!! RTEMS users should add #define ACE_REFUSE_STRPTIME_EMULATION - to the local config.h file to avoid bringing in the emulation, - maintaining behavior in previous ACE versions. - - For additional background on why this arrangement was put in place - originally, please see: - Tue Aug 10 14:46:12 1999 David L. Levine <levine@cs.wustl.edu> - It makes sense, but adds a unique requirement for porting to new - platforms that one must know to explicitly enable an existing wrapper, - even if its natively available. This has tripped up a number of porting - efforts (including mine) and now it's consistent with other wrappers. - - * m4/ace.m4: Add --enable-wince to set up the BUILD_WINCE setting - that's inserted into the Makefile.am files for the wince MPC setting. - - * ace/ace.mpc: Replace config-win32-msvc-6.h with config-win32-msvc-8.h - - * bin/bin/mpc: Removed the verbatim for automake that adds - TESTS=auto_run_tests.pl - it was an early attempt at getting the - test ability to work that never was right. - - * */Makefile.am: Regenerated with MPC. This effectively changes the - version scheme based on the changes in: - Thu May 18 16:37:46 UTC 2006 Steve Huston <shuston@riverace.com> - - * apps/Makefile.am: Hand-added code to avoid building gperf if - --disable-gperf was specified to configure. Thanks to Robert Schwebel - <robert at schwebel dot de> for this fix. - - * apps/gperf/tests/Makefile.am: This one doesn't get close to being - regenerated with MPC. The "stamp" items require hand-tweaking as - given in previous entries for this file. - - * ace/Makefile.am: Regenerated with MPC and hand-tweaked to add needed - "nobase_include_HEADERS =" line. - - * configure.ac: Added the following new AC_CONFIG_FILES entries: - - * ACEXML/tests/util/Makefile.am: - * apps/JAWS2/Makefile.am: - * apps/JAWS2/JAWS/Makefile.am: - * examples/ASX/Event_Server/Makefile.am: - * examples/ASX/Event_Server/Event_Server/Makefile.am: - * examples/ASX/Event_Server/Transceiver/Makefile.am: - * examples/ASX/UPIPE_Event_Server/Makefile.am: - * examples/Map_Manager/Makefile.am: - * examples/Reactor/TP_Reactor/Makefile.am: - * protocols/tests/Makefile.am: - * protocols/tests/RMCast/Makefile.am: New files, generated with MPC. - - * THANKS: Added Robert Schwebel to the Hall of Fame. - -Tue Jun 20 19:25:20 UTC 2006 Steve Huston <shuston@riverace.com> - - * ace/Task.{h inl cpp}: Moved the public data members (thr_count_, - thr_mgr_, flags_, grp_id_, lock_) from public to a new protected - section. There was a comment that said these should be private, but - no reason given why they weren't. - Removed the thr_count_dec() method since it is no longer used - anywhere in ACE. Moved its functionality into cleanup() where it - also sets the new last_thread_id_ member (see below). - Added a new member last_thread_id_ which holds the thread ID - (ACE_thread_t) of the last thread to exit svc() processing. Before - any threads exit, the value is 0; it's set to 0 in the constructor - and in activate(). - The new accessor, ACE_thread_t last_thread (void) const, retrieves - the value of last_thread_id_. It's recommended that a thread in - close() check the last_thread_id_ value, rather than the thr_count(), - when deciding if it's safe to destroy the object. Since thr_count - can be seen as 0 in multiple threads concurrently, it's not safe - to rely on for destroying a thread. This fixes Bugzilla #2339. - Thanks to Howard Finer <hfiner@sonusnet.com> for this idea. - - * NEWS: Added a note about the new ACE_Task::last_thread() method. - -Tue Jun 20 18:55:12 UTC 2006 Martin Corino <mcorino@remedy.nl> - - * tests/Based_Pointer_Test.cpp: - * tests/Based_Pointer_Test_Lib.cpp: - * tests/CDR_File_Test.cpp: - * tests/DLL_Test.cpp: - * tests/Malloc_Test.cpp: - * tests/Process_Manager_Test.cpp: - Several fixes to make OpenVMS happy. - -Tue Jun 20 18:04:45 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * examples/Log_Msg/test_ostream.cpp (ACE_TMAIN): Couldn't used - std::getline() for some odd reason.. Fixed by using - ifstream::getline() instead. Thanks to Johnny for reporting - this. - -Tue Jun 20 14:31:05 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * examples/Misc/test_trace.cpp (recursive): Simplified the - ACE_TRACE method name to make fuzz happy. - -Tue Jun 20 13:50:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tests/Hash_Map_Manager_Test.cpp: - Fixed unicode compile problems - -Tue Jun 20 12:51:19 UTC 2006 James H. Hill <hillj@isis.vanderbilt.edu> - - * bin/ChangeLogEditor/FileLocatorFactory.pm: - - Now supports the standard hack for subversion on Windows when - SVN_ASP_DOT_NET_HACK environment variable is set. Instead - of placing repo info in a .svn file, it is placed in _svn. - -Tue Jun 20 12:31:12 UTC 2006 Martin Corino <mcorino@remedy.nl> - - * ace/os_include/os_time.h: - * ace/os_include/sys/os_types.h: - Fixed type definitions for OpenVMS. - - * ace/config-openvms.h: - Updated build configuration for OpenVMS. - - * ace/Lib_Find{.h .cpp}: - * ace/DLL_Manager.cpp: - * ace/Service_Config{.h .cpp}: - * ace/Global_Macros.h: - * ace/Strategies_T.cpp: - * ace/Logging_Strategy.cpp: - Added support for dynamic loading scheme of service configurator - framework under OpenVMS. - - * ace/OS_NS_stdio.h: - Additional include for OpenVMS. - -Tue Jun 20 08:23:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/MakeProjectCreator/config/taolib.mpb: - Add corba subset projects as base - - * bin/MakeProjectCreator/config/core_minimum_corba.mpb: - New file for usage within the core libs - - * bin/MakeProjectCreator/config/core_minimum_corba.mpb: - Make minimum corba a feature - -Tue Jun 20 07:42:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * examples/Log_Msg/test_callback.cpp: - Fixed typo - -Tue Jun 20 07:04:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/MakeProjectCreator/config/global.features: - CORBA subset configurations are disabled by default - -Mon Jun 19 18:03:12 UTC 2006 Martin Corino <mcorino@remedy.nl> - - * include/makeinclude/platform_openvms.GNU: - Changed template instantiation model. - - * include/makeinclude/rules.local.GNU: - Change to enable adding custom REALCLEAN_FILES in platform file. - -Mon Jun 19 15:11:12 UTC 2006 Martin Corino <mcorino@remedy.nl> - - * bin/auto_run_tests.pl: - Changed to enable spawning Perl testscripts on OpenVMS. - -Mon Jun 19 14:26:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ACE-INSTALL.html: - Replaced dsp/dsw with sln/vcproj. Thanks to Abdullah Sowayan - <abdullah dot sowayan at lmco dot com> for reporting this - -Mon Jun 19 13:14:54 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * tests/Hash_Map_Manager_Test.cpp (test_two_allocators): Fixed a typo. - Thanks to Abdul for reporting this. - - * tests/Hash_Map_Manager_Test.cpp (test_two_allocators): Added a - test for the two allocator version of ACE_Hash_Map_Manager. - Thanks to Jarek for contributing this. - -Mon Jun 19 02:55:48 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * examples/Log_Msg/test_ostream.cpp (ACE_TMAIN): Enhanced the test to - show the ofstream output better. - -Mon Jun 19 01:31:46 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * examples/Log_Msg/test_callback.cpp (ACE_TMAIN): Zapped the - extraneous '\n' from the messages. - -Mon Jun 19 01:06:49 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * examples/Misc/test_trace.cpp: Enhanced to the the ACE_TRACE macro. - -Sun Jun 18 16:58:20 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * netsvcs/clients/Logger/indirect_logging.cpp (ACE_TMAIN): Cleaned - up the test to work if none of the daemons are running. - -Sun Jun 18 16:44:14 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * ace/Signal.{inl,cpp}: Moved the destructors out of the *.inl - file into the *.cpp file since inline destructors aren't really - a good idea. - -Sun Jun 18 16:35:13 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * netsvcs/lib/Client_Logging_Handler.cpp (send): Printout the type - of log message as a diagnostic to make it easier to see the - filtering that's going on! - -Fri Jun 16 17:48:18 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * ace/CDR_Size.cpp (adjust): Added a fix for the case where - ACE_LACKS_CDR_ALIGNMENT is undefined. Thanks to Aleksandar - Vukajlovic <vukajlo at finsoft dot co dot yu> for contributing - this. - -Fri Jun 16 13:57:53 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * ace/Ping_Socket.cpp: Replaced the use of char, short, int, - etc. for struct ip and icmp with the equivalent - ACE_UNIT[8,12,32] types to ensure a fixed size. Thanks to Paul - Daugherty <Paul at nextalk dot com> and Robert S. Iakobashvili - <coroberti at gmail dot com> for reporting this and contributing - a fix. - -Mon Jun 19 11:37:17 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/OS_NS_unistd.{h,cpp,inl}: - Changed the (f)truncate method to use ACE_LOFF_T and use - SetFilePointerEx on windows to fix 64bit warnings - -Mon Jun 19 10:08:17 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/diff-builds.pl: - Changed this script not to die when we can't find results for - a certain date, then just take the closest results. - -Mon Jun 19 10:00:17 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Service_Gestalt.cpp: - * ace/Acceptor.cpp: - Const improvement - -Mon Jun 19 09:56:17 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> - - * ace/OS_NS_sys_sendfile.cpp (sendfile_emulation): - - Verify the ACE_OS::mmap() call succeeded prior to continuing. - - Use ACE_OS::send() instead of ACE_OS::write() on Windows. The - latter doesn't provide the same semantics on Windows as on - Unix. Addresses an ACE_OS::sendfile() failure on Windows. - -Tue Jun 13 02:10:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tests/run_tests.lst: - Don't run netlink test in ACE_FOR_TAO configuration - -Mon Jun 12 17:00:02 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - - * include/makeinclude/wrapper_macros.GNU: - - Set winnt to 0 if not explicitly set by a platform_*.GNU - makefile. - -Mon Jun 12 16:48:19 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * tests/SV_Shared_Memory_Test.cpp (run_main): Moved a couple of - calls outside of ACE_ASSERT since they don't belong in there. - -Mon Jun 12 14:34:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/OS_NS_sys_stat.h: - Fixed mingw definition of ACE_stat - -Mon Jun 12 10:24:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/MakeProjectCreator/config/vc6.features: - Removed this file, wer don't support vc6 anymore - -Mon Jun 12 01:30:03 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * ace/Thread_Manager.cpp (wait): Changed the flag parameters to be - bool rathet than int. Thanks to Johnny for this suggestion. - -Sat Jun 10 22:32:03 UTC 2006 Steve Huston <shuston@riverace.com> - - * ACE-INSTALL.html: Corrected a bunch of platform build things and - hopefully clarified the sections a bit. - - * bin/make_release: Removed the search for, and chmod for, dsp/dsw - files - they're for MSVC6 which is no longer generated. - -Sat Jun 10 10:07:32 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> - - * ace/Thread_Manager.cpp: - Fix for compiler errors. - -Sat Jun 10 04:31:54 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - - * bin/MakeProjectCreator/config/automake.features: - - Define MPC feature variable "wxWindows" to 1. - - * bin/MakeProjectCreator/config/wxwindows.mpb: - - Add automake specific definitions for compile_flags, - linkflags, and pure_libs. - -Fri Jun 9 19:25:19 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * ace/Thread_Manager.h: Added a new parameter to wait() that - determines whether relative or absolute time is used. Thanks to - Sonicfly Zhou <zhoucn at txsec dot com> for this idea. - -Fri Jun 9 14:06:52 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * ace/Hash_Map_With_Allocator_T.{h,inl,cpp}: Enhanced this class - so that it compiles with the new "two allocator" - ACE_Hash_Map_Manager_Ex class. This class needs to be improved - so that it actually leverages the two allocator features, but - that's something for the future. - -Fri Jun 9 13:15:38 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * ace/Hash_Map_Manager_T.h: Clarified the meaning of the - constructor and open() parameters. - -Fri Jun 9 13:07:40 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * ace/Hash_Map_Manager_T.cpp (open): If the user doesn't supply an - entry_alloc pointer then use the table_alloc pointer. - -Fri Jun 9 13:00:22 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * ace/Hash_Map_Manager_T.cpp (open): Zapped the use of ACE_ASSERT - and replaced it with and if statement. We shouldn't be using - ACE_ASSERT in ACE library code.. - -Fri Jun 9 12:53:48 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * ace/Hash_Map_Manager_T.{h,inl,cpp}: Added support for a separate - allocator for creating the entries in the chain of - ACE_Hash_Map_Entry objects in the buckets. There are now two - allocators, one for the bucket table and the other for the - entries in the buckets. Thanks to Jaroslaw Nozderko <jaroslaw - dot nozderko at polkomtel dot com dot pl> for this fix. - -Fri Jun 9 14:04:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/ace_for_tao.mpc: - Updated because ARGV and Arg_Shifter are template files now - -Fri Jun 9 13:58:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/FILE_IO.cpp: - Const improvements - - * ace/MMAP_Memory_Pool.cpp: - Added static cast from ACE_LOFF_T to size_t and const improvements - -Fri Jun 9 13:58:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/FILE_IO.cpp: - Added static cast from ACE_LOFF_T to size_t - -Fri Jun 9 13:42:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/OS_NS_sys_stat.inl: - Use special stat call for vc71 - -Fri Jun 9 13:33:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Connection_Recycling_Strategy.h: - Doxygen improvement - -Fri Jun 9 13:12:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/OS_NS_unistd.{h,cpp}: - Use ACE_LOFF_T in the pwrite interface - -Fri Jun 9 12:47:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/OS_NS_sys_stat.h: - With vc71 use _stati64 for ACE_stat, not __stat64. The first has - time as 32bit, the second time as 64 bit (__time64_t) which causes - problems because the time interfaces of ACE use time_t which is - 32bit with vc71 but 64bit with vc8. - -Fri Jun 9 10:29:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Configuration_Import_Export.cpp: - Initialise pointer with 0 - -Fri Jun 9 10:13:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Arg_Shifter.{h,cpp}: - Also refactored ACE_Arg_Shifter to ACE_Arg_Shifter<CHAR_TYPE> and - made ACE_Arg_Shifter a typedef. The refactoring fo ACE_ARGV resulted - in a drop of the TAO Hello client executable of about 2.5Kb which is - nice for such a small change. - - * ace/ace.mpc: - * ace/Makefile.am: - Updated because Arg_Shifter.cpp is not a template file - -Fri Jun 9 09:54:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/config-linux-common.h: - Added ACE_HAS_NETLINK, all linux versions do support netlink sockets. - This closes bugzilla bug 2317. Thanks to Robert Iakobashvili - <coroberti at gmail dot com> and Razi Ben-Yehuda - <raziebe at gmail dot com> for creating the netlink wrappers - -Fri Jun 9 08:16:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tests/SOCK_Netlink_Test.cpp: - New test for netlink sockets. Thanks to Robert Iakobashvili - <coroberti at gmail dot com> for creating this test. - - * tests/tests.mpc: - * tests/run_test.lst: - Added new netlink test - -Fri Jun 9 07:55:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/ARGV.{h,cpp,inl}: - - Refactored ACE_ARGV to ACE_ARGV_T which is a template, where - ACE_ARGV is now a typedef of ACE_ARGV_T<ACE_TCHAR>. Taken the - idea from the wchar work of David Giovannini <giovannd at ociweb - dot com> - - * ace/ace.mpc: - * ace/Makefile.am: - - ARGV.cpp added to the template files, added the new netlink files - - * ace/OS_NS_sys_stat.{h,inl}: - * ace/MMAP_Memory_Pool{h,cpp}: - * ace/Mem_Map.{h,cpp,inl}: - * ace/Filecache.{h,cpp}: - * ace/FILE_IO.cpp: - * ace/FILE.h: - - Use ACE_LOFF_T for the filesize so that we can support files - bigger then 2Gb on windows and other platforms. Also use for - Borland the 64bit stat structure and api's. This fixes bugzilla - bug 1286, thanks to Ruslan Zasukhin <sunshine at public dot - kherson dot ua> for reporting this. Also fixes part of bugzilla - bug 2359, thanks to Olivier Brunet <o dot brunet at free dot fr> - for reporting this. - -Thu Jun 8 17:13:42 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * ace/String_Base.h, - ace/Array_Map.h: Removed the @deprecated - comments to make Ossama happy ;-) This fixes bugid 2558. - -Thu Jun 8 12:44:46 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * ace/OS_NS_Thread.inl (recursive_mutex_lock): Cleaned up the - structure of the code here so that we don't try to release the - nesting lock unless it was acquired successfully. Thanks to - J.T. for reporting this. - -Thu Jun 8 12:37:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/MakeProjectCreator/config/corba_e_compact.mpb: - * bin/MakeProjectCreator/config/corba_e_micro.mpb: - New base projects for CORBA/e micro and compact - -Thu Jun 8 12:28:49 UTC 2006 Chad Elliott <elliott_c@ociweb.com> - - * bin/DependencyGenerator/DependencyEditor.pm: - * bin/DependencyGenerator/DependencyGenerator.pm: - * bin/DependencyGenerator/GNUDependencyWriter.pm: - * bin/DependencyGenerator/GNUObjectGenerator.pm: - * bin/DependencyGenerator/Preprocessor.pm: - * bin/depgen.pl: - - Committing performance improvements which take off about 7% from - the dependency generation time for the whole ACE_wrappers tree. - -Thu Jun 8 11:57:58 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - - * ace/OS_NS_dirent.cpp: - * ace/OS_NS_dirent.h: - - Don't compile the {opendir,readir,closedir,scandir}_emulation() - functions if {opendir,readir,closedir,scandir} are provided by - the OS. - -Thu Jun 8 11:29:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Netlink_Addr.h: - * ace/SOCK_SEQPACK_Association.h: - Doxygen fixes - - * ace/OS_NS_Thread.inl: - Const improvement - -Thu Jun 8 11:37:59 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - - * ace/config-netbsd.h: - - Define ACE_HAS_SCANDIR and ACE_SCANDIR_CMP_VOIDPTR. - -Wed Jun 7 23:02:53 UTC 2006 Krishnakumar B <kitty@nospam.invalid.domain> - - * tests/Recursive_Mutex_Test.cpp: Use ACE_TEST_MUTEX instead of - ACE_Recursive_Thread_Mutex so that we use the right version of - mutex (ACE_Process_Mutex) on Windows. Thanks to Doug for the - suggestion. This should fix the Recursive_Mutex_Test failing on - Windows. - -Wed Jun 7 21:42:36 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * bin/MakeProjectCreator/config/ciao_config_handlers.mpb - - Fixed static library ordering problem. - -Wed Jun 7 13:34:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/config-doxygen.h: - Added ACE_HAS_NETLINK so that we get documentation for the new - netlink classes - -Wed Jun 7 13:31:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tests/run_test.lst: - Removed chorus - -Wed Jun 7 13:16:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/os_include/sys/os_socket.h: - When ACE_HAS_NETLINK is defined, include more files specific - for this protocol. - -Wed Jun 7 12:56:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Netlink_Addr.{h,cpp,inl}: - * ace/SOCK_Netlink.{h,cpp,inl}: - New files for netlink sockets. Thanks to Robert Iakobashvili - <coroberti at gmail dot com> and Razi Ben-Yehuda - <raziebe at gmail dot com> for creating these new files. - These files will be added to the ACE mpc later this week, with - the files in the repo it is much easier to test them on - multiple linux version. See bugzilla bug 2317 for more info. - -Wed Jun 7 12:28:18 UTC 2006 Chad Elliott <elliott_c@ociweb.com> - - * bin/MakeProjectCreator/templates/gnu.mpd: - - Changed the message displayed when a project isn't build when a - particular feature is disabled. Many users thought that this - message was an error, I believe, because of the word 'missing'. - -Wed Jun 7 11:46:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/config-suncc-common.h: - New config file for the SunCC compiler, idea is to refactor - all things related to the Sun C++ compiler to this file. This is - to make it easier to support Sun C++ on Linux - -Wed Jun 7 10:45:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * include/makeinclude/platform_linux_suncc.GNU: - First version for using the Sun compiler on Linux. The compiler - itself is an alpha version, so no guarantees at this moment - -Wed Jun 7 10:07:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Strategies_T.cpp: - Initialise pointer with 0 and const improvement - -Wed Jun 7 09:19:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/MakeProjectCreator/config/taoidldefaults.mpb: - When using -SS we do generate an empty S.h file, so add S - to the header_outputext so that we zap this file during a clean - -Wed Jun 7 09:02:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * include/makeinclude/platform_aix_g++.GNU: - Set X11 and Xt defines, thanks to Peter Grotrian - <peter dot grotrian at pdv-fs dot de> for reporting this. This fixes - bugzilla 2556 - - * ace/config-sunos5.5.h: - Added fixes to build with threads=0, this fixes bugzilla bug 2555. Thanks - to Peter Grotrian <peter dot grotrian at pdv-fs dot de> for reporting - this. - - * ace/config-aix-4.x.h: - Added fixes to build with threads=0, this fixes bugzilla bug 2553. Thanks - to Peter Grotrian <peter dot grotrian at pdv-fs dot de> for reporting - this. - - * include/makeinclude/platform_chorus.GNU: - * include/makeinclude/platform_chorus4.x_g++.GNU: - * include/makeinclude/platform_chorus_ghs.GNU: - * include/makeinclude/platform_psos_diab.GNU: - * include/makeinclude/platform_psos_diab_ppc.GNU: - * include/makeinclude/platform_psos_tm.GNU: - * include/makeinclude/platform_psosim_g++.GNU: - Removed these files, psos and chorus are not supported anymore - -Wed Jun 7 08:27:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/OS_NS_Thread.cpp: - Added needed check for VxWorks with task api - - * ace/os_include/sys/os_stat.h: - Removed workarounds for old Borland compiler versions - -Wed Jun 7 03:25:00 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * bin/MakeProjectCreator/config/ciao_config_handlers_base.mpb - * bin/MakeProjectCreator/config/ciao_config_handlers_base.mpc - - Corrected the file extension. - -Tue Jun 6 21:11:37 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * ace/WFMO_Reactor.cpp (open): make sure we delete the - notify_handler_ before reassigning it to prevent resource leaks. - Thanks to Sonicfly Zhou <zhoucn at txsec dot com> for suggesting - this. - -Tue Jun 6 21:41:02 UTC 2006 Steve Huston <shuston@riverace.com> - - * ace/Service_Gestalt.{h cpp}: - * ace/Dynamic_Service_Base.cpp: - * ace/Dynamic_Service_Dependency.cpp: - * ace/Service_Config.cpp: - * ace/Service_Object.cpp: - * ace/Svc_Conf_Lexer.cpp: Add missing #include directives. - -Tue Jun 6 18:09:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/OS_NS_Thread.cpp: - Reverted a change for VxWorks, broke other platforms, will make - a new change tomorrow. - -Tue Jun 6 17:14:51 UTC 2006 Chad Elliott <elliott_c@ociweb.com> - - * bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm: - - Cleaned up the fill_value() method and removed an unused method. - - * bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm: - - Use DirectoryManager::mpc_basename() instead of - File::Basename::basename(). - -Tue Jun 6 15:43:32 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * bin/MakeProjectCreator/templates/gnu.mpd - - Modified to explicitly state the name of a project being skipped - due to missing features or libraries. - -Tue Jun 6 03:57:08 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - - * ace/Hash_Map_Manager_T.cpp: - * ace/Hash_Map_Manager_T.h: - - Added key() and item() methods to ACE_Hash_Map_Entry<>, to be - like ACE_RB_Tree_Node<>. This makes it easier to switch code - to and from Hash_Maps and RB_Trees. Mark direct access to - the ext_id_ and int_id_ fields @deprecated. - - * ace/Hash_Map_Manager_T.cpp: - * ace/Hash_Map_Manager_T.h: - * ace/Hash_Map_Manager_T.inl: - * ace/RB_Tree.h: - * ace/RB_Tree.inl: - - Added operator->() for iterators to be more like STL API. - -Mon Jun 5 20:27:42 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * bin/MakeProjectCreator/config/ciao_config_handlers.mpb - * bin/MakeProjectCreator/config/ciao_config_handlers_base.mpc - - Restructured to clean up config handlers MPC files. - -Sun Jun 4 13:38:21 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * tests/Array_Map_Test.cpp: Fixed all uses of empty() to be - is_empty(). - -Sun Jun 4 13:35:25 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * ace/Array_Map.{h,inl}, - * ace/Intrusive_List.{h,inl}, - * ace/String_Base.{h,inl}: Changed empty() to is_empty(), which - makes more sense. Kept empty() around for the time being as a - @deprecated method. Thanks to Domingos Monteiro <d dot monteiro - at netia dot net> for this suggestion. - -Sun Jun 4 00:51:38 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * ace/CString.{h,inl,cpp}: Added some performance improvements for ACE_CString: - - . Introduced new operators == and != to compare ACE_CString - and const char *. This results in at least a 10-fold performance - improvement, due to avoiding dynamic memory allocation. - - . Streamlined the existing operator == between two ACE_CString's. - (15% improvement in some cases, due to avoiding some of the - overhead of compare()) - - Also cleaned up some of the doxygen comments, e.g., the - ACE_CString comparison operators must have been returning an - integer at some point (?), but it's not the case anymore. - Thanks to Patrick Rabau <pr2345 at gmail dot com> for these - patches. - -Fri Jun 2 19:52:19 UTC 2006 Yan Dai <dai_y@ociweb.com> - - * bin/tao_orb_tests.lst: - - Removed DII_Collocation_Tests. - -Fri Jun 2 16:29:55 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * ace/Select_Reactor_T.cpp (open): Added an error message - explicitly noting that the notification pipe open failed, which - should make debugging easier when this occurs, e.g., due to a - disabled network interface. Thanks to David Highley <dhighley - at highley-recommended dot com> for this suggestion. - -Fri Jun 2 12:20:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/MakeProjectCreator/config/taoidl3toidl2defaults.mpb: - Updated to make cross compilation possible - -Fri Jun 2 12:12:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/MakeProjectCreator/templates/gnu.mpd: - Added TAO_IDL3_TO_IDL2 and TAO_IDL3_TO_IDL2_DEP as first step to - run idl3_to_idl2 in a cross build environment - -Fri Jun 2 11:51:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * include/makeinclude/platform_vxworks6.2.GNU: - Updated for VxWorks 6.2 - -Fri Jun 2 11:33:36 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * tests/Recursive_Mutex_Test.cpp (test_recursion_depth): The - get_nesting_level() only works on certain OS platforms, so don't - use it as part of the test. - -Fri Jun 2 10:13:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Configuration.cpp: - Fixed operator== - - * tests/Config_Test.{h,cpp}: - Added an explicit test for operator==. Thanks to Popeye Cai - <popeye dot cai at utstar dot com> for reporting this. This - fixes bugzilla bug 2550 - -Fri Jun 2 10:02:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/OS_NS_Thread.cpp: - Improved VxWorks 6.2 support - - * ace/Svc_Handler.cpp: - 64bit change and initialise pointer with 0 - - * ace/Process.cpp: - Added support for VxWorks 6.x in rtp mode - -Fri Jun 2 09:42:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/OS_NS_Thread.inl: - Added necessary code for VxWorks 6.2 - -Thu Jun 1 23:13:58 UTC 2006 Yan Dai <dai_y@ociweb.com> - - * bin/tao_orb_tests.lst: - - Added oneway and twoway DII_Collocation_Tests. - -Thu Jun 1 20:53:31 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - - * tests/Recursive_Mutex_Test.cpp (run_main): - - Added ACE_UNUSED_ARG macros to eliminate 'unused parameter' - warnings on single threaded builds. - -Thu Jun 1 16:54:56 UTC 2006 Yan Dai <dai_y@ociweb.com> - - * bin/tao_orb_tests.lst: - - Added new DII_Collocation_Tests. - -Thu Jun 1 13:59:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/FILE.cpp: - Const improvement - -Thu Jun 1 12:15:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tests/Dirent_Test.cpp: - Updated VxWorks specific checks, removed chorus checks - -Thu Jun 1 11:03:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * examples/Threads/thread_pool.cpp: - Fixed 64bit conversion warnings - -Thu Jun 1 09:39:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/diff-builds.pl: - Corrected usage of strftime - -Thu Jun 1 09:19:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Default_Constants.h: - Define the platform suffix for vxworks - - * ace/Sock_Connect.cpp: - Added include for VxWorks and removed some unneeded checks - for vxworks >= 0x600 - - * ace/ACE.h: - Doxygen improvement - - * ace/config-vxworks6.2.h: - Updated with more settings to better match vxworks 6.2 - - * ace/Process_Manager.cpp: - Added specific check for vxworks - - * ace/OS_NS_stdlib.inl: - Emulate putenv with setenv when putenv is not available but - setenv is. - -Thu Jun 1 02:26:03 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> - - * ace/Service_Gestalt.h: - * ace/Service_Gestalt.cpp: - - Reworked the way static svc descriptors are kept so that if DLLs - include static initializers, they won't cause a problem if the - DLL is later unloaded and reloaded. There is currently no - dependency replationship between these "static" services and the - DLL that contains them, so there is still a slight risk that - pointers held after the DLL is unloaded might be referenced. But - the only thing that actually uses these pointers is the service - gestalt itself if it is processing an explicit static directive - and the desired service object had not yet been loaded in that - configuration context. - -Wed May 31 20:49:03 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - - * examples/APG/Logging/Trace.h: - - Added '##' to several macro definitions in this file, at the - suggestion of Steve Huston <shuston@riverace.com> to get - rid of warnings on GCC4 platforms. - -Wed May 31 18:18:37 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - - * bin/MakeProjectCreator/config/ciao_config_handlers.mpb: - - Shortened some line lengths, to make the file more readable. - -Wed May 31 16:36:43 UTC 2006 Steve Huston <shuston@riverace.com> - - * tests/tests.mpc: - * tests/run_test.lst: Don't build or run Unload_libACE on WinCE. The - code is purposely leaving out ACE stuff and the ACE stuff is needed - for WinCE, unless there's lots of conditional code added to duplicate - the workings on ACE_TMAIN on CE. - -Wed May 31 14:33:16 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - - * ace/OS_NS_Thread.inl (recursive_mutex_lock): - - Added additional ACE_UNUSED_ARG for the timeout parameter, to - eliminate warnings in single-threaded builds. - -Wed May 31 13:05:05 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * ace/Argv_Type_Converter.cpp (align_char_with_wchar): ACE-ified this code. - -Wed May 31 14:00:16 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - - * tests/Recursive_Mutex_Test.cpp (run_main): - - Moved '#if defined (ACE_HAS_THREADS)' up a few lines to include - a variable defined inside the same guard at the top of the file, - to eliminate an 'undefined' error on single-threaded builds. - -Wed May 31 13:37:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/tao_orb_tests.lst: - Added Bug_2542_Regression, this should run without problems - -Wed May 31 11:44:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/OS_NS_time.inl: - Fixed unreachable code warning - -Wed May 31 09:23:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tests/run_test.lst: - Changes for ACE_FOR_TAO configuration - -Wed May 31 08:19:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tests/Bound_Ptr_Test.cpp: - Initalise pointers with 0 - -Wed May 31 08:16:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tests/Recursive_Mutex_Test.cpp: - Added missing include to get ACE_OS::sleep - -Tue May 30 21:56:52 UTC 2006 Steve Huston <shuston@riverace.com> - - * ACE-INSTALL.html: Corrected the AIX section; removed descriptions of - old compilers that are no longer supported and suggested the config - and platform_macros files to use. Thanks to Michelle Zheng - <Michelle dot Zheng at dowjones dot com> for motivating this. - - * THANKS: Added Michelle Zheng to the Hall of Fame. - -Tue May 30 19:17:40 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> - - * ace/Dynamic_Service.h: - * ace/Dynamic_Service.inl: - * ace/Dynamic_Service.cpp: - * ace/Dynamic_Service_Base.h: - * ace/Dynamic_Service_Base.cpp: - * ace/Dynamic_Service_Dependency.cpp: - - In order to ensure proper separation of contexts, this patch - gives the dynamic service instance lookup the ability to - optionally exclude the global configuration context. - - * ace/Service_Gestalt.h: - * ace/Service_Gestalt.cpp: - - To allow explicitly configured static service objects, those for - which a directive such as 'static XYZ "foo bar"', to be - independently configured in different configuration contexts, - these changes retain any static service descriptor for service - XYZ, then looks for a previous instance of XYZ in the local - context only, otherwise it uses the previously retained static - service descriptor to create a new instance. - - -Tue May 30 18:24:54 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * ace/DLL.h (ACE_DLL): Updated the documentation of open() to explain the - lookup scheme when a filename is given. Thanks to Phlip - <phlip2005 at gmail dot com> for motivating this. - -Tue May 30 13:06:42 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * ace/ACE.inl: - * ace/Base_Thread_Adapter.cpp: - * ace/Default_Constants.h: - * ace/Global_Macros.h: - * ace/OS.h: - * ace/OS_NS_Thread.cpp: - * ace/OS_NS_Thread.h: - * ace/OS_NS_netdb.inl: - * ace/OS_NS_signal.inl: - * ace/OS_NS_sys_socket.inl: - * ace/OS_NS_time.inl: - * ace/OS_main.cpp: - * ace/OS_main.h: - * ace/Object_Manager_Base.h: - * ace/Process_Manager.cpp: - * ace/Process_Semaphore.cpp: - * ace/Process_Semaphore.h: - * ace/Process_Semaphore.inl: - * ace/Recursive_Thread_Mutex.cpp: - * ace/SV_Semaphore_Simple.h: - * ace/TLI_Acceptor.cpp: - * ace/Thread_Adapter.cpp: - * ace/Token.h: - * ace/config-macros.h: Removed all vestiges of PSOS. - -Tue May 30 12:22:53 UTC 2006 Chad Elliott <elliott_c@ociweb.com> - - * bin/mpc.pl: - * bin/mwc.pl: - - Added a load-time check for the minimum perl version (5.6). - -Tue May 30 12:18:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Log_Msg.cpp: - * ace/OS_NS_dirent.inl: - * ace/OS_NS_netdb.inl: - * ace/OS_NS_pwd.inl: - * ace/OS_NS_stdlib.inl: - * ace/OS_NS_Thread.cpp: - * ace/OS_NS_Thread.inl: - * ace/OS_NS_time.cpp: - * ace/OS_NS_time.inl: - * ace/Thread_Manager.cpp: - * ace/os_include/os_pthread.h: - * ace/os_include/os_stdlib.h: - Removed support for HPUX 10.20 - - * ace/os_include/net/os_if.h: - * ace/os_include/netinet/os_tcp.h: - Removed psos support - - * ace/os_include/sys/os_types.h: - Removed ACE_LACKS_FLOATING_POINT - -Tue May 30 11:57:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/config-hpux-10.x-g++.h - * ace/config-hpux-10.x-hpc++.h - * ace/config-hpux-10.x.h - Removed these files, not supported anymore - - * ace/OS_NS_time.inl: - Removed check for ACE_CTIME_R_RETURNS_INT, it was for hpux 10.20 - -Tue May 30 11:57:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/config-osf1-4.0.h: - Removed, contents merged to tru64 file - - * ace/config-tru64.h: - Added osf1-4.0 file contents, be aware that tru64 support hasn't - been tested for a long time. - -Tue May 30 11:45:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tests/Recursive_Mutex_Test.cpp: - Fixed compile error - -Tue May 30 11:11:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/os_include/os_stdio.h: - Removed psos support - - * ace/IOStream.h: - Removed checks for ACE_LACKS_CHAR_STAR_RIGHT_SHIFTS, that was only - set for chorus which is removed - - * ace/Basic_Types.h: - * ace/Log_Msg.cpp: - * ace/Profile_Timer.{h,cpp}: - Removed checks for ACE_LACKS_FLOATING_POINT. Was only set for chorus - which is now removed. - - * ace/OS_NS_Thread.cpp: - Removed chorus support - - * ace/config-chorus.h: - Removed. - - * ace/INET_Addr.cpp - * ace/Lib_Find.cpp - * ace/Local_Tokens.cpp - * ace/Log_Record.cpp - * ace/Parse_Node.cpp - Removed check for ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS, is only - set for psos which we don't support anymore - - * ace/os_include/os_signal.h: - Removed check for ACE_SIGINFO_IS_SIGINFO_T, only set for psos - - * ace/config-psos-diab-mips.h - * ace/config-psos-diab-ppc.h - * ace/config-psos-diab.h - * ace/config-psos-tm.h - * ace/config-psosim-g++.h - Removed from the repo, psos support has been removed - -Tue May 30 10:48:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/CDR_Stream.cpp: - Use true/false, when demarshaling a string, check the result of the - demarshaling of the length of the string, if that failed, just return - directly instead of trying to demarshal a random lenght string - - * ace/Task.h: - * ace/System_Time.h: - Doxygen improvement - - * ace/ACE.cpp: - * ace/SOCK_Dgram_Bcast.cpp: - * ace/Sock_Connect.cpp: - * ace/Process.cpp: - * ace/OS_NS_unistd.cpp: - * ace/Mem_Map.cpp: - Removed chorus support - - * ace/config-fsu-pthread.h: - Removed this file, this configuration isn't supported and used for - ages - - * ace/Condition_Thread_Mutex.cpp: - * ace/Recursive_Thread_Mutex.cpp: - Removed fsu pthread support - - * ace/Process_Manager.cpp: - Const improvement - - * ace/OS.inl: - * ace/OS_NS_sys_socket.inl: - * ace/OS_NS_stdlib.cpp: - * ace/OS_NS_stdlib.inl: - * ace/OS_NS_Thread.cpp: - Removed psos support - - * ace/OS_NS_unistd.inl: - * ace/OS_NS_stdio.{h,cpp,inl}: - * ace/Handle_Set.h: - * ace/OS_NS_Thread.{h,inl}: - Removed psos and chorus support - - * ace/Thread_Manager.{h,cpp,inl}: - Made terminated_ a real bool, removed chorus support, check for - ACE_VXWORKS instead of VXWORKS - - * ace/OS_NS_sys_time.inl: - Check for ACE_VXWORKS instead of VXWORKS - - * ace/MMAP_Memory_Pool.{h,cpp}: - Removed chorus support, use bool internally and added an option to - get each time an unique mmap filename - - * ace/config-linux-common.h: - Added ACE_HAS_VOIDPTR_MMAP and removed KCC support - - * ace/ace_wchar.inl - * ace/Default_Constants.h - * ace/INET_Addr.h - * ace/IPC_SAP.cpp - * ace/Message_Queue.cpp - * ace/Message_Queue.h - * ace/Message_Queue.inl - * ace/Message_Queue_T.cpp - * ace/Message_Queue_T.h - * ace/OS.h - * ace/OS_NS_macros.h - * ace/OS_NS_stdio.h - * ace/OS_NS_stdio.inl - * ace/OS_NS_stdlib.inl - * ace/OS_NS_Thread.cpp - * ace/OS_NS_Thread.h - * ace/OS_NS_Thread.inl - * ace/OS_NS_time.inl - * ace/Recursive_Thread_Mutex.cpp - * ace/Sched_Params.cpp - * ace/Select_Reactor_T.cpp - * ace/SOCK_Dgram_Bcast.cpp - * ace/Thread_Manager.h - * ace/Token.h - Check for ACE_VXWORKS instead of VXWORKS - -Mon May 29 22:08:50 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * ace/OS_NS_Thread.inl (recursive_mutex_lock): *Really* make the compiler - happy now. Thanks Olli! - -Mon May 29 21:12:50 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * ace/OS_NS_Thread.inl (recursive_mutex_lock): Added a const_cast - for ACE_Time_Value * to make the compiler happy when passing the - timeout parameter to ACE_OS::cond_timed_wait(). Thanks to Olli - Savia for helping here. - -Mon May 29 20:30:44 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * We recently added the 2100th contributor to ACE+TAO+CIAO!!! The - 2000th contributor was added in August of 2005, this means that - over 100 different people have contributed to the project in the - past 9 months! - -Mon May 29 19:50:54 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * examples/Service_Configurator/IPC-tests/server/server_test.cpp (ACE_TMAIN): - Changed - - ACE_Reactor::instance ()->run_reactor_event_loop () - - to - - ACE_Reactor::run_event_loop () - - so that reconfiguration happens properly after a SIGHUP or - SIGINT occurs. Thanks to Kevin Hu <Xiaotao dot Hu at ge dot - com> for motivating this. - -Mon May 29 18:10:50 UTC 2006 Steve Huston <shuston@riverace.com> - - * tests/Signal_Test.cpp: - * tests/Thread_Manager_Test.cpp: Add missing ACE_TEXT to a string. - -Mon May 29 18:44:05 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * tests/Recursive_Mutex_Test.cpp: Enhanced this test to exercise - the new timed feature of ACE_Recursive_Thread_Mutex. - -Mon May 29 18:16:31 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * ace/Recursive_Thread_Mutex.h: Clarified that get_nesting_level() - may return -1 on some platforms when ACE_HAS_RECURSIVE_MUTEXES - is enabled. - -Mon May 29 17:45:02 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * ace/Recursive_Thread_Mutex.inl: Moved some of the short accessor - methods from the Recursive_Thread_Mutex.cpp file to here. - - * ace/Recursive_Thread_Mutex.h, - ace/Recursive_Thread_Mutex.inl: Added support for time recursive - mutexes, thanks also to Abdullah. - - * ace/OS_NS_Thread.h, - * ace/OS_NS_Thread.inl: Added support for timed recursive mutexes. - Thanks to Abdullah Sowayan <abdullah dot sowayan at lmco dot - com> for contributing this. - -Mon May 29 17:30:52 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * ace/OS_NS_Thread.h: Updated the documentation to clarify why - recursive mutexes can't be used for ACE_OS::mutex_lock(). - -Mon May 29 18:27:08 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - - * examples/DLL/test_dll.cpp: - - Changed instances of a C-style cast from void* to - pointer-to-function to a two-step reinterpret_cast - using ptrdiff_t as an intermediate. C++ forbids casting - directly between pointer-to-object and pointer-to-function, - and some of the newer compilers are catching it. - -Sat May 27 15:03:07 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * netsvcs/servers/main.cpp (ACE_TMAIN): Removed the following code: - - if (ACE::debug () == 0) - ACE_LOG_MSG->priority_mask (~LM_DEBUG, ACE_Log_Msg::PROCESS); - - since (1) it makes debugging hard and (2) it's simply wrong - since it's blowing away anything that's set by the - ACE_Logging_Strategy in the svc.conf file. - -Sat May 27 14:37:14 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * ace/Log_Record.cpp (print): Only print out the log records if the - corresponding type is enabled for logging. - -Sat May 27 14:35:21 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * netsvcs/servers/main.cpp: Enable the ignore_debug_flag in the - ACE_Service_Config::open() call so that we can override the - default ACE_Log_Priority settings in the svc.conf file. - -Sat May 27 11:36:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * performance-tests/SCTP/hist.cpp: - Fixed compile error - -Fri May 26 22:02:48 UTC 2006 Steve Huston <shuston@riverace.com> - - * examples/IPC_SAP/SPIPE_SAP/consumer_msg.cpp: - * examples/IPC_SAP/SPIPE_SAP/consumer_read.cpp: - * examples/IPC_SAP/SPIPE_SAP/server.cpp: Wide-char fixes; there's no - wide-char variant for ACE_OS::fdetach(). - - * examples/IPC_SAP/TLI_SAP/CPP-client.cpp: - * examples/IPC_SAP/TLI_SAP/db-client.cpp: - * examples/IPC_SAP/TLI_SAP/ftp-client.cpp: - * examples/Connection/non_blocking/test_tli_acceptor.cpp: - * examples/Connection/non_blocking/test_tli_connector.cpp: - Wide-char/narrow-char fixes. - -Fri May 26 21:47:56 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * netsvcs/lib/Client_Logging_Handler.cpp, - * netsvcs/lib/Server_Logging_Handler_T.cpp, - * ace/Log_Msg_IPC.cpp: Removed the special case code for Windows - since it seems like ACE (or Windows) now handles this properly. - -Fri May 26 21:20:35 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * ace/Log_Record.cpp (operator>>): Add one when allocating the buffer. - -Fri May 26 13:16:48 UTC 2006 Nanbor Wang <nanbor@exothermic.txcorp.com> - - * ace/DLL_Manager.cpp: - - Fixed incorrect usage of ACE::debug check. Thanks to Johnny for - reporting this. - -Fri May 26 15:04:55 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - - * ASNMP/tests/Counter_Test.cpp: - * ASNMP/tests/Gauge_Test.cpp: - * performance-tests/SCTP/hist.cpp: - - Added static_cast<>s to eliminate implicit conversion warnings. - -Fri May 26 12:42:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tests/Naming_Test.cpp: - Replaced assert with if statement, resolved argument not used - warning in BCB6 release builds - -Fri May 26 10:26:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tests/Bug_1890_Regression_Test.cpp: - * tests/Bug_2540_Regression_Test.cpp: - New tests made by Carlos O'Ryan for the given bug numbers. - - * tests/run_test.lst: - * tests/tests.mpc: - Added the new tests above - -Fri May 26 09:53:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/PerlACE/Run_Test.pm: - Increased wait_interval_for_process_creation from 5 to 10 seconds. - On the slower systems some tests failed because the startup time - is longer then 5 seconds, especially if several configuration files - are read and saved during startup - -Fri May 26 08:21:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/diff-builds.pl: - Fixed typo in comment - -Thu May 25 04:58:44 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * tests/Tokens_Test.cpp (run_main): Don't try to spawn the - netsvcs/server/main if it's not built. - -Thu May 25 03:53:47 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - - * m4/config_h.m4: - - Removed AH_TEMPLATE for ACE_LACKS_TCP_H. This was replaced - with ACE_LACKS_NETINET_TCP_H long ago. - -Wed May 24 22:19:43 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> - - * ace/Service_Repository.{h, inl, cpp}: - - Changed size arguments type to size_t in ctor, open, - current_size, total_size and the corresponding members. - ACE_Service_Repository_Iterator::next_ now starts from 0 instead - of -1 to avoid warnings about signed/unsigned comparisons. - - * ace/Service_Gestalt.cpp: - - Reverted the change "Wed May 24 14:00:43 UTC 2006 Iliyan - Jeliazkov <iliyan@ociweb.com>", since now the - Service_repository::instance() takes size_t argument. - - * performance-tests/Synch-Benchmarks/Base_Test/Synch_Benchmarks_Base_Test.mpc: - * performance-tests/Synch-Benchmarks/Perf_Test/Synch_Benchmarks_Perf_Test.mpc: - - Fixed and error whereby the DLL's generated by this two project - files did not match the name used in the svc configuration - files, causing the test to crash because of missing DLL. - -Wed May 24 13:08:08 UTC 2006 Steve Huston <shuston@riverace.com> - - * ace/Message_Queue.h: Added #include "ace/Thread_Mutex.h" on platforms - that have ACE_Message_Queue_NT available; that class has a - ACE_Thread_Mutex member so the include is needed to see the class. - Thanks to Guy Peleg <guype at amdocs dot com> for this fix. - -Wed May 24 17:39:47 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - - * ace/Remote_Tokens.cpp (request_reply): Added a helpful error - message to make it easy to track down problems with TSS. - -Wed May 24 17:22:31 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - - * configure.ac: - - Change feature test to define ACE_LACKS_NATIVE_STRPTIME if - system doesn't support strptime(), as it seems ACE doesn't - follow its feature test macro naming conventions when it comes - to strptime(). - - Changed ACE_LACKS_STRPTIME_PROTOTYPE feature test to use - AC_CHECK_DECL instead of AC_EGREP_HEADER. - -Wed May 24 16:33:59 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - - * configure.ac: - * m4/config_h.m4: - - Changed ACE_LACKS_STRPTIME and ACE_LACKS_STRPTIME_PROTOTYPE - feature tests to use the same idiom as similar tests. This - Avoids requiring an AH_TEMPLATE for each feature test macro - in config_h.m4. - -Wed May 24 09:07:53 2006 Douglas C. Schmidt <schmidt@cse.wustl.edu> - - * ace/Activation_Queue.cpp, - * ace/Activation_Queue.inl: Fixed the queue() "setter" method - so that it doesn't leak memory. Thanks to David Chu <beyonddc - dot storage at gmail dot com> for providing this fix. - -Wed May 24 14:00:43 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> - - * ace/Service_Gestalt.cpp: - - Added a cast from size_t to int in the ctor to match the - interface of ::instance() and to quiet the 64bit compilers, - complaining about loss of precision in the implicit conversion. - -Tue May 23 19:21:55 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - - * tests/Signal_Test.cpp: - - Reset SIGHUP handler to SIG_DFL to support cases where SIGHUP - is ignored (running under nohup(1), etc.). - -Tue May 23 10:55:59 2006 Douglas C. Schmidt <schmidt@cse.wustl.edu> - - * netsvcs/lib/Client_Logging_Handler.cpp (handle_input): - * netsvcs/lib/Server_Logging_Handler_T.cpp - (handle_logging_record): Cleaned up the code so that it should - have no memory leaks and will also build cleanly on all the OS - platforms. - - * ace/Log_Msg_IPC.cpp: Fix support for ACE_HAS_STREAM_PIPES. - -Tue May 23 13:05:03 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> - - * ace/Log_Msg.cpp: - Fixing a memory leak found by valgrind. - - * ace/Timeprobe.cpp: - Added missing include - this wouldn't comple with both noinline - and ACE_COMPILE_TIMEPROPE set. - -Mon May 22 21:13:15 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> - - * bin/diff-builds.pl: - - Updated to allow diff between the tests failures today and on a - specified date, for the clean builds (or, all the builds from - the build score). - -Mon May 22 19:06:41 UTC 2006 Steve Huston <shuston@riverace.com> - - * ace/Log_Record.cpp (operator<<, operator>>): Have to use a different - CDR array method when ACE_USES_WCHAR. - -Mon May 22 09:04:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * netsvcs/lib/Client_Logging_Handler.cpp: - Fixed compile error on Solaris - -Mon May 22 04:53:29 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - - * tests/Signal_Test.cpp: - - The change: - Sat May 20 15:10:55 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - - Was not enough to get this test working on all platforms. - - Revert to using ACE_Sig_Guard in worker_child(). Handle the - SIGINT race condition by raising it if and only if the child - was not shut down by the parent. - -Sun May 21 13:46:49 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> - - * tests/Service_Config_Test.cpp: - - Fixing Windows test failures, because errno gets overriden - between Service Repository::insert() and testLimits(). Most - likely, it happens in ace_yyparse (), however the existing - mechanism for reporting parser errors does not allow for - reliably propagating the cause of the error. Removing the test - for the cause of the error and simply reporting the error, if it - had occured. - -Sat May 20 15:10:55 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - - * tests/Signal_Test.cpp: - - Changed synchronous tests to block signals at the top level. - This had been done with a ACE_Sig_Guard, but that lead to a race - condition between when the guard was release and the delivery of - the SIGINT the client sends to itself. The SIGINT would then be - handled by the default handler, which terminated the process - before the "Ending" message was written to the log. - - #if'd out the ACE_DEBUG, etc. invocations from handle_signal(). - These result in signal-unsafe functions being called when the - handler is called asynchronously. A braver person would have - just removed them entirely. - -Fri May 19 20:08:29 UTC 2006 Steve Huston <shuston@riverace.com> - - * ace/config-sunos5.6.h: - * ace/os_include/sys/os_mman.h: Moved the declaration of ::madvise() - from config-sunos5.6.h to os_mman.h, to be compiled only when - ACE_LACKS_MADVISE_PROTOTYPE is defined. Set - ACE_LACKS_MADVISE_PROTOTYPE in config-sunos5.6.h where it used to - declare madvise(). This allows autoconf-detected - ACE_LACKS_MADVISE_PROTOTYPE platforms (such as Solaris 9) to - compile correctly. - -Fri May 19 17:53:51 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> - - * ace/Service_Gestalt.cpp: - - Fixed a defect in process_directive () which was replacing the - ENOSPC errno with EINVAL. Added #ifndef ACE_NLOGGING / #endif - around logging statements. - - * ace/Service_Repository.cpp: - - Minor reformating. - - * tests/Service_Config_DLL.cpp: - - Added two independent service objects, to be used in the - testLimits test. See testLimits(). - - * tests/Service_Config_Test.cpp: - - Reworked the testLimits() to avoid printing the word "error", - which confuses the test driver into thinking the test failed. - -Fri May 19 17:51:33 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> - - * ace/Service_Gestalt.cpp: - - Elminated memory leak found by valgrind. - -Fri May 19 17:09:51 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> - - * tests/Service_Config_Test.cpp: - - Fixed a warning due to assignment of a string literal to a - non-const variable. - -Thu May 18 17:42:09 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> - - * bin/diff-builds.pl: - - Contributing a little tool to find the difference in the failing - tests between two dates, on the same build. Or between two - builds, on a particular date. Thanks to Johnny Willemsen - <jwillemsen@remedy.nl> for mining and hosting the data used by - this script. - -Thu May 18 17:33:57 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - - * configure.ac: - * m4/config_h.m4: - - Changed feature test for socklen_t to #include <sys/types.h> - before <sys/socket.h>. Use cannonical AC_CHECK_TYPE and - AC_DEFINE with a third argument instead of a AH_TEMPLATE for - ACE_HAS_SOCKLEN_T. Fixes configuration on OpenBSD. Thanks to - Vladimir Panov <gbr at voidland dot org> for reporting this bug. - -Thu May 18 16:37:46 UTC 2006 Steve Huston <shuston@riverace.com> - - * configure.ac: Set a ACE_VERSION_NAME variable with the version - string (canonical major.minor.beta), which may include a fix kit id. - - * bin/MakeProjectCreator/config/acedefaults.mpb: Change am_version from - libtool's -version-info format (current:revision:age) to the ACE - release number format (major.minor.beta) and rename it am_release. - This is intended for use with the libtool's -release option and will - result in library names that correspond to the ACE kit number. - The -version-info option uses interface numbers meant to indicate a - series of public API numbers. However, with ACE, things change - pretty often. Rather than try to come up with a way of managing - interface numbers, just use the release numbering that users know - and are used to. - -Thu May 18 15:15:16 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> - - * bin/tao_orb_tests.lst: - - Removed Limits from the list of ORB tests because it is now part - of ACE. - - * tests/Service_Config_Test.cpp: - - Added functionality to test gestalt size limits. - -Thu May 18 15:21:33 UTC 2006 Steve Huston <shuston@riverace.com> - - * NEWS: - * ace/Task.{h inl cpp}: Reverted the changes from: - Fri Apr 14 15:53:21 UTC 2006 Steve Huston <shuston@riverace.com> - Tasks that delete themselves from within close() would invalidate - the lock that ACE_Task held across the close() call and perform - undefined and illegal actions on the deleted lock upon return. - Bugzilla #2339 remains unresolved. - -Wed May 17 20:31:11 UTC 2006 Roopa Pundaleeka <roopa@txcorp.com> - - * ace/DLL_Manager.cpp: - * ace/DLL_Manager.h: - The dll handle is added to the to the - handle_vector_ only after the library is opened - successfully. This way, the vector does not have redundant - handles. - - * ace/Object_Manager.cpp: - ACE_DLL_Manager::close_singleton is called explicitly from the - ACE_Object_Manager to make sure ACE_DLL_Manager gets cleaned up, - even if there was an error while opening a lib file. - - Thanks to Timo Kuosmanen <ttkuosma at cc dot jyu dot fi> for - reporting this. - -Wed May 17 14:07:33 2006 Douglas C. Schmidt <schmidt@cse.wustl.edu> - - * netsvcs/lib/Server_Logging_Handler_T.cpp: Improved the code so - that it should compile and run properly on Windows. Thanks to - Phil Mesnier for reporting this. - -Wed May 17 19:07:43 UTC 2006 Steve Huston <shuston@riverace.com> - - * ace/Dynamic_Service_Dependency.h: Doxygen correction; use @c to - set a word in "typewriter" font, but for known class names, there's - no need to do this. - -Wed May 17 17:56:49 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * examples/C++NPv1/Logging_Client.cpp - * examples/C++NPv1/Logging_Handler.cpp - * examples/C++NPv2/Logging_Handler.cpp - - Removed now-redundant CDR insertion/extration operators now - defined in ace/Log_Record.{h,cpp} - -Wed May 17 09:35:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/os_include/sys/os_ipc.h: - * ace/os_include/sys/os_socket.h: - * ace/os_include/sys/os_stat.h: - * ace/os_include/sys/os_types.h: - Removed psos support - - * ace/os_include/sys/os_mman.h: - Removed madvice prototype and ACE_LACKS_MADVISE_PROTOTYPE, it - is not set in any config file - -Wed May 17 02:23:31 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> - - * ace/Log_Msg_IPC.cpp: - - Fix typo exposed on systems with ACE_HAS_STREAM_PIPES defined. - I'll leave it to Will & Doug to do whatever the TO DO said to do. - -Tue May 16 22:23:55 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - * ace/Log_Msg_IPC.cpp - * ace/Log_Record.cpp - * ace/Log_Record.h - * ace/Log_Record.inl - * netsvcs/lib/Client_Logging_Handler.cpp - * netsvcs/lib/Server_Logging_Handler_T.cpp - - Fixed some problems that stemmed from changing ACE_Log_Msg - msg_data_ from a fixed-size array to a dynamically-sized array. - Thanks to Keith Muzzioli <Keith_W_Muzzioli at raytheon dot com>, - John Black <John_K_Black at Raytheon dot com>, and Mitsuo - Fukasawa <fukasawa_mitsuo at nifty dot com> for reporting this - and to Doug Schmidt for helping to fix it! - -Tue May 16 13:20:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/OS_NS_sys_time.inl: - * ace/OS_NS_time.{h,cpp,inl}: - Removed chorus and psos support - - * ace/OS_Thread_Adapter.cpp: - Removed psos support - -Tue May 16 13:09:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/OS_NS_sys_wait.{h,inl}: - Remove chorus support - - * ace/OS_NS_stropts.inl: - * ace/OS_NS_sys_stat.inl: - * ace/OS_NS_string.inl: - Removed psos support - -Tue May 16 13:02:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Log_Msg.cpp: - * ace/OS_NS_arpa_inet.{h,cpp,inl}: - * ace/OS_NS_dirent.inl: - Removed psos support - - * ace/INET_Addr.cpp: - * ace/config-macros.h: - Removed chorus support - - * ace/Unbounded_Queue.h: - Removed remark about chorus - - * ace/config-cray.h: - Removed explicit template instantiation define, we don't have that - anymore - - * ace/config-hpux-11.00.h: - * ace/config-sunos5.7.h: - * ace/config-rtems.h: - * ace/config-osf1-4.0.h: - Removed kcc support - -Mon May 15 11:30:14 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> - - * bin/tao_other_tests.lst: - Added more tests that can't run in ACE_FOR_TAO configations due - to dependency on something that avoids ACE_FOR_TAO. - -Mon May 15 01:15:45 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> - - * bin/tao_orb_tests.lst: - * bin/tao_other_tests.lst: - Added !ACE_FOR_TAO to those tests for which MPC skips generating - executables because it directly or indirectly avoids ACE_FOR_TAO. - Indirect avoidance occurs when a project derives from a base - project that avoids ACE_FOR_TAO. - -Thu May 11 12:37:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Message_Block.h: - Doxygen improvements - -Thu May 11 11:15:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Dev_Poll_Reactor.cpp: - Removed chorus support - -Thu May 11 07:19:12 UTC 2006 Kees van Marle <kvmarle@remedy.nl> - - * bin/tao_orb_tests.lst: - Added Bug_1254_Regression - -Wed May 10 14:10:02 UTC 2006 Steve Huston <shuston@riverace.com> - - * ace/config-win32-msvc-7.h: MSVC 7.1 operator new throws an exception - on an out-of-memory condition, but only when the standard C++ - library is used; the older CRT new() doesn't. - -Tue May 9 11:38:30 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/MakeProjectCreator/config/orbsvcslib.mpb: - Add -GT to the idlflags, all orbsvcs then do generate the TIE files, - if people then use them, they get them out of the box. - -Tue May 9 07:36:30 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/MakeProjectCreator/config/taoidldefaults.mpb: - Removed -Sc, added -GT, see bugzilla bug 2525 for more info - -Tue May 9 07:25:30 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Condition_T.{h,cpp,inl}: - * ace/Local_Name_Space_T.cpp: - * ace/Configuration.cpp: - * ace/Sched_Params.cpp: - * ace/Mutex.{h,cpp,inl}: - * ace/Select_Reactor_T.cpp: - * ace/Signal.cpp: - Removed Chorus support - - * ace/CDR_Stream.cpp: - Small layout change - - * ace/Event_Handler.cpp: - Removed psos support - - * ace/Message_Block.h: - Doxygen improvements - - * ace/Message_Block.cpp: - Const improvement - -Sun May 7 21:03:30 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> - - * ace/Service_Config.{h,cpp}: - - Weeding out the remaining issues with single threaded - builds. The implementation now relies on the ACE_TSS_* macros to - abstract from the differences among build styles and platform - support for TSS. - - * ace/Service_Gestalt.{h,cpp}: - - Eliminated commented out code. Minor reformatting in places. - - * ace/TSS_T.{h,inl,cpp}: - - Added some comments to help others avoid a few pitfalls. Made - ts_init() a non-const, which eliminates a few const_cast's. - -Sun May 7 07:02:51 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> - - * ace/Service_Config.h: - * ace/Service_Config.cpp: - - Refactored the TSS usage (again) to fix a nasty - order-of-initialization problem. The gist of which is that, if - the ptr (to a template class instance) is a static member, in - static builds, it will be initialized by the process prologue - code *after* another static initializer has had the chance to - use and assign it a value. The solution was to use a method - scope static instance, which C++ guarantees to be initialized by - the (first) exit from that method. - - * ace/Service_Gestalt.h: - * ace/Service_Gestalt.cpp: - - Refactored the construction to avoid using straight new in - constructor initializer lists. Replaced new with ACE_NEW_* where - appropriate. - -Sat May 6 18:08:13 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - - * configure.ac: - - Add feature tests for ACE_LACKS_ASCTIME, ACE_LACKS_ACSTIME_R, - ACE_LACKS_GETCWD, ACE_LACKS_GMTIME, ACE_LACKS_GMTIME_R, - ACE_LACKS_LOCALTIME, and ACE_LACKS_STRFTIME. - -Sat May 6 09:52:06 2006 Douglas C. Schmidt <schmidt@cse.wustl.edu> - - * examples/DLL/test_dll.cpp: Renamed the DLLs and removed the "./" - from the pathname. Thanks to Sam and Roopa for reporting this - and tracking it down, respectively. - -Sat May 6 10:23:13 UTC 2006 Steve Huston <shuston@riverace.com> - - * include/makeinclude/platform_sunos5_sunc++.GNU: Add -lrt -laio to - the LIBS. The Proactor framework needs this; I'm not sure why it - never showed up until static builds were run. - -Tue Apr 25 10:22:16 2006 Douglas C. Schmidt <schmidt@cse.wustl.edu> - - * ace/OS_NS_string.cpp (strerror): Do a sanity check to make sure - errnum >= 0 and < _sys_nerr and set errno to EINVAL if things - are not sane. Thanks to Aleksandar Vukajlovic <vukajlo at - finsoft dot co dot yu> for this fix. - -Fri May 5 19:37:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Default_Constants.h: - Added a compile time check that ACE_DEFAULT_CDR_BUFSIZE must be - defined to a value bigger then 0, it is 0 we get in a never ending - loop in the CDR code - -Fri May 5 17:01:32 UTC 2006 Steve Huston <shuston@riverace.com> - - * examples/Service_Configurator/IPC-tests/client/local_spipe_client_test.cpp: - * examples/Service_Configurator/IPC-tests/client/remote_thr_stream_client_test.cpp: - * examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.{cpp i h}: - Wide-char corrections. - -Fri May 5 13:11:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/FIFO.cpp: - * ace/os_include/os_stddef.h: - Removed psos support - - * ace/config-WinCE.h: - * ace/os_include/os_stddef.h: - Moved setting of ACE_LACKS_STDDEF_H and ACE_LACKS_PTRDIFF_T to the - WinCE file - -Fri May 5 13:08:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * include/makeinclude/platform_openvms.GNU: - Changed the way templates are handled - -Fri May 5 11:42:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Reactor_Token_T.h: - Removed workaround for vc6 - -Fri May 5 08:38:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/MMAP_Memory_Pool.{h,cpp}: - Made guess_on_fault_ a real bool - -Fri May 5 08:09:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/os_include/os_dirent.h: - * ace/os_include/os_errno.h: - * ace/os_include/os_netdb.h: - * ace/os_include/os_stdint.h: - * ace/os_include/os_time.h: - * ace/os_include/os_string.h: - * ace/os_include/os_stdlib.h: - Removed psos support - - * ace/os_include/os_dlfcn.h: - * ace/os_include/os_signal.h: - Removed psos and kcc support - - * ace/os_include/os_pthread.h: - Removed chorus support - - * ace/os_include/os_unistd.h: - Removed chorus and psos support - -Fri May 5 07:59:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/OS_NS_sys_utsname.cpp: - * ace/OS.h - Removed psos and chorus support - - * ace/OS_NS_fcntl.cpp: - * ace/Lib_Find.cpp: - * ace/OS_NS_netdb.inl: - Removed psos support - - * ace/Mem_Map.cpp: - Removed chorus support - - * ace/IOStream.h: - Removed checks for KCC compiler - -Fri May 5 07:42:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Base_Thread_Adapter.h: - * ace/SPIPE_Connector.cpp: - * ace/SOCK_Dgram.cpp: - * ace/Select_Reactor_T.cpp: - * ace/Handle_Set.cpp: - Removed code for psos, support for this platform will be removed - - * ace/CDR_Base.h: - Removed check for KCC compiler - - * ace/Malloc_Allocator.h: - Doxygen improvement - -Thu May 4 22:11:06 UTC 2006 Steve Huston <shuston@riverace.com> - - * ace/Message_Block.h: Made ACE_Data_Block::release_i() virtual. - Thanks to Gary Fernandez <gary dot fernandez at ironmountain dot - com> for this change. - -Thu May 4 21:07:10 UTC 2006 Steve Huston <shuston@riverace.com> - - * ace/SPIPE_Acceptor.cpp (create_new_instance, close): Have to use - ACE_TEXT_ALWAYS_CHAR to pass pipe name on wide-char w/ - ACE_HAS_STREAM_PIPES. Thanks to Gary Fernandez <gary dot - fernandez at ironmountain dot com> for this fix and to Yasser - Zabuair <yzabuair at hotmail dot com> for also reporting it. This - fixes bugid 2541. - - * THANKS: Added Gary and Yasser to the Hall of Fame. - -Thu May 4 08:50:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - Reverted the change below, broke the sendfile test and Steve - Huston changed things in such a way that sendfile is only - used on Solaris 9 and newer - - Tue May 2 09:34:54 Pacific Daylight Time 2006 <ossama_othman at symantec dot com> - * ace/OS_NS_sys_sendfile.inl (sendfile): - Removed "::" global scope qualifier from platform sendfile() - call. It caused problem on Solaris 8. Thanks to Simon Massey - and Johnny Willemsen for analyzing the problem and suggesting - this fix. - -Thu May 4 08:36:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/ace_for_tao.mpc: - Added OS_NS_sys_sendfile - -Thu May 4 00:43:32 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - - * ace/Makefile.am: - - Add Dynamic_Service_Dependency.{cpp,h} to appropriate lists. - -Wed May 3 16:02:10 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> - - * ace/Service_Config.h: - * ace/Service_Config.cpp: - - Fixed a problem due to an attempt to access current_ before it - has been initialized (a static ACE_TSS instance). The current_ - is now just a pointer to an ACE_TSS instance, which gets - dynamicaly allocated upon invoking the current() method. The - deallocation of that instance is left up to the Object Manager - with which the dynamic ACE_TSS instance is registered. - - * ace/TSS_T.h: - - Added a ACE_TSS_SET () to complete the set of TSS access - operations, which should work regardless of threading, TSS - emulation and TSS availability. - -Wed May 3 11:52:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Mem_Map.inl: - Small const improvements - -Wed May 3 10:39:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Mem_Map.{h,cpp,inl}: - Made close_handle_ a bool - -Wed May 3 08:56:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/config-macros.h: - Removed support for KCC - -Wed May 3 08:14:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/OS_NS_sys_sendfile.h: - Export sendfile_emulation to resolve link problems in the - windows builds - -Wed May 3 03:36:23 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> - - * ace/Svc_Conf_y.cpp: - - Moved the ACE_BEGIN_VERSIONED_NAMESPACE_DECL macro to include - ace_yyparse. - -Tue May 2 09:34:54 Pacific Daylight Time 2006 <ossama_othman at symantec dot com> - - * ace/OS_NS_sys_sendfile.inl (sendfile): - - Removed "::" global scope qualifier from platform sendfile() - call. It caused problem on Solaris 8. Thanks to Simon Massey - and Johnny Willemsen for analyzing the problem and suggesting - this fix. - -Tue May 2 10:34:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/config-WinCE.h: - Added ACE_LACKS_GETCWD, ACE_LACKS_ASCTIME, ACE_LACKS_ASCTIME_R, - ACE_LACKS_GMTIME, ACE_LACKS_GMTIME_R, ACE_LACKS_LOCALTIME and - ACE_LACKS_STRFTIME. These macros are new and will be used soon - in the ACE_OS layer. - -Mon May 1 19:49:45 UTC 2006 Steve Huston <shuston@riverace.com> - - * ace/ARGV.{h i cpp}: Filled out more of the documentation in this - class, specifically mentioning that the class will enforce the - "whitespace separates tokens, except when quoted" rule of command - line parsing that's consistent with ACE_Get_Opt, etc. Also removed - documentation of non-existant restrictions such as after using - add(), can't use buf(). - Removed the State enum since the only value ever used was ITERATIVE, - and changed "int state_" to "bool iterative_" (and removed the - state() accessor). Changed substitute_env_args_ from int to bool. - - * ace/OS_NS_unistd.{h cpp} (argv_to_string, string_to_argv): Changed - the substitute_env_args parameter from "int" to "bool" to better - reflect what it is, a yes/no indicator. - -Mon May 1 06:53:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * include/makeinclude/platform_sunos5_g++.GNU: - * include/makeinclude/platform_sunos5_sunc++.GNU: - Also for solaris 10 link the sendfile lib - -Sun Apr 30 04:21:37 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> - - * ace/Svc_Conf_y.cpp: - What I meant to commit last time. - -Sun Apr 30 02:21:16 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> - - * ace/Svc_Conf_y.cpp: - Eliminating more warnings from the scoreboard. I'm not sure the - best way to add this patch to ace/svcconf.mpb, since it affects - more than just gnuace targets. The easiest would be to store the - diff between this commit and the previous version and run patch, - but I'm not sure how to integrate that solution. - -Sat Apr 29 13:58:28 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> - - * ace/Service_Gestalt.cpp: - More fuzz cleanup. - -Sat Apr 29 13:17:24 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> - - * ace/ACE.cpp: - Fuzz cleanup. - - * THANKS: - Added credits. - -Fri Apr 28 22:31:52 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> - - * ace/Service_Gestalt.cpp: - - Removed an ';' after ACE_TRACE, which was confusing GCC4 with - "hidden visibility" enabled. - -Fri Apr 28 21:22:53 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> - - * ace/Service_Config.cpp: - * ace/Service_Gestalt.cpp: - - More re-formatting to weed out those pesky tabs. - -Fri Apr 28 20:57:19 UTC 2006 Steve Huston <shuston@riverace.com> - - * ace/config-sunos5.8.h: - * ace/config-sunos5.9.h: Moved ACE_HAS_SENDFILE from Solaris 8 to - Solaris 9. Solaris 8 supports sendfilev[64] but not sendfile, - at least not without some patches I don't know about. - -Fri Apr 28 20:13:41 UTC 2006 Steve Huston <shuston@riverace.com> - - * include/makeinclude/platform_sunos5_g++.GNU: - * include/makeinclude/platform_sunos5_sunc++.GNU: - Solaris 9 puts sendfile() is a separate library, so LIBS needs - -lsendfile on Solaris 9. - -Fri Apr 28 18:03:11 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> - - * ace/ACE.cpp: - * ace/DLL.cpp: - * ace/DLL_Manager.cpp: - * ace/Dynamic_Service_Base.cpp: - * ace/Dynamic_Service_Dependency.cpp: - * ace/Parse_Node.cpp: - * ace/Service_Config.inl: - * ace/Service_Config.cpp: - * ace/Service_Gestalt.cpp: - * ace/Service_Object.cpp: - * ace/Service_Repository.cpp: - * ace/Service_Types.cpp: - * ace/Shared_Object.cpp: - - Applied formatting style consistent with ACE convention. - -Fri Apr 28 15:48:25 UTC 2006 Steve Huston <shuston@riverace.com> - - * ace/Service_Config.cpp (open_i): ACE_DEFAULT_SVC_CONF shouldn't - be enclosed in ACE_LIB_TEXT since it's defined in terms of - ACE_LIB_TEXT already. - -Fri Apr 28 15:49:21 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> - - * ace/Makefile.am: - Added new Service_Gestalt files to the appropriate lists. - -Fri Apr 28 15:42:59 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> - - * ace/Service_Config.cpp: - Fixed a problem killing some wchar builds. - - * ace/Service_Gestalt.h: - Cleaned up the long-lines of the UNIMPLEMENTED functions. - -Fri Apr 28 15:26:53 UTC 2006 Steve Huston <shuston@riverace.com> - - * ace/Timer_Queue_Adapters.h: Clarified the use and restrictions with - ACE_Async_Timer_Queue_Adapter. - -Fri Apr 28 15:22:35 UTC 2006 Steve Huston <shuston@riverace.com> - - * apps/JAWS2/JAWS/Concurrency.cpp: Removed unused variables. - -Fri Apr 28 14:54:04 UTC 2006 Steve Huston <shuston@riverace.com> - - * ace/config-macros.h: HP aC++ needs to see the statement in - ACE_NOTREACHED up to the version 6 series (Integrity). Also see - Tue Apr 11 13:12:36 UTC 2006 Simon McQueen <sm@prismtech.com> - -Fri Apr 28 14:31:48 UTC 2006 Steve Huston <shuston@riverace.com> - - * ace/Service_Gestalt.h: Removed extraneous ';' from - ACE_UNIMPLEMENTED_FUNC usage. - - * m4/ace.m4: Fixed incorrect variable referenced in case during - --enable-uses-wchar. Thanks to Paul Robinson <probinson at - gmail dot com> for reporting this. - -Fri Apr 28 14:03:50 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> - - * ace/Dynamic_Service.h: - * ace/Parse_Node.h: - - Fixed the usage of ACE_UNIMPLEMENTED_FUNC to remove the trailing - semicolon. It was causing build errors on compilers that define - the macro as empty. - -Fri Apr 28 13:55:01 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> - - * ace/Service_Gestalt.h: - - Fixed the usage of ACE_UNIMPLEMENTED_FUNC to remove the trailing - semicolon. It was causing build errors on compilers that define - the macro as empty. - -Fri Apr 28 13:29:08 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> - - * bin/tao_orb_tests.lst: - - Updated the conditions for running the ORB-specific service - repository tests. - -Fri Apr 28 13:23:57 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> - - * ace/Service_Config.h: - - Updated the declaration of current_ to match the definition in - its use of ACE_TSS_TYPE macro, as they are not equivalent for - a single-threaded builds. - -Fri Apr 28 13:21:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tests/Process_Mutex_Test.cpp: - When spawn fails log an error and exit instead of using an assert - which causes an abort of the exe - -Fri Apr 28 13:15:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tests/Pipe_Test.cpp: - When spawn fails log an error and exit instead of using an assert - which causes an abort of the exe - -Fri Apr 28 12:49:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/config-openvms.h: - Added __SIGNED_INT_TIME_T so that we get a signed time_t that - matches the POSIX spec that ACE expects. - -Fri Apr 28 12:23:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/config-openvms.h: - Removed comments, macros are documented in generally, added - ACE_LACKS_PERFECT_MULTICAST_FILTERING - -Fri Apr 28 11:11:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/PerlACE/Process_VMS.pm: - New file to be able to run the tests automatically on OpenVMS - - * bin/PerlACE/Process.pm: - When running on OpenVMS use Process_VMS - - * ace/config-openvms.h: - Added ACE_HAS_SIGISMEMBER_BUG - - * tests/run_test.pl: - If ACE_ROOT is not set, add ../bin to lib - -Fri Apr 28 09:23:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tests/Process_Manager_Test.cpp: - Also create a logfile for each child process started - -Fri Apr 28 08:06:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tests/run_test.lst: - Added Sendfile_Test - -Fri Apr 28 08:04:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tests/Sendfile_Test.cpp: - Added missing include - -Thu Apr 27 21:04:08 UTC 2006 Steve Huston <shuston@riverace.com> - - * ace/OS_Memory.h: Allow configs to set ACE_bad_alloc to avoid - extending the if-elif chain here further. - - * ace/config-win32-msvc.h: Regardless of MSVC version, MFC changes - operator new to throw CMemoryException on out-of-memory condition. - Version-specific settings still control the setting of - ACE_HAS_NEW_NOTHROW. Thanks to Mohit Kapoor <Mohit dot Kapoor at - siemens dot com> for this fix. - - * ace/Select_Reactor_T.cpp (handle_error): HACK ALERT! Some Linux - kernels will return from select() with an "invalid" errno value, - ERESTARTNOHAND, when compiled with profiling enabled. This works - around the problem. This is a known kernel bug; see Red Hat Bugzilla - https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=161468 and - https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=123648 as well - as Riverace support issue #167 and Riverace's complaint to Red Hat, - support issue #17841808. - - * THANKS: Added Mohit Kapoor to the Hall of Fame. - -Thu Apr 27 20:14:52 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> - - * ace/Service_Gestalt.cpp: - - Fixed a complaint from a ACE_NDEBUG builds about unrefrenced - variable (only used in ACE_ASSERT). - -Thu Apr 27 18:33:18 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tests/Aio_Platform_Test.cpp: - When AIO is not available, just print an info message and exit - - * tests/run_test.lst: - Added Aio_Platform_Test, it was not in this file at all - -Thu Apr 27 18:21:17 UTC 2006 Steve Huston <shuston@riverace.com> - - * ace/config-aix-5.x.h: Added ACE_HAS_SIGSUSPEND. - -Thu Apr 27 14:57:10 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> - - * ace/Svc_Conf.y: - * ace/Svc_Conf_Tokens.h: - * ace/Svc_Conf_y.cpp: - - Fixed fuzz complaint about #include inside a versioned namespace - in Svc_Conf_y.cpp. It was due to a code that Bison generates a - part of the parser, from Svc_Conf.y. Changed the versioned - namespace to encloses the non-generated code only, while the - rest of the parser seems to be designed so that multiple parses - can coexist without name clashes. - -Thu Apr 27 14:29:07 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> - - * ace/Dynamic_Service_Dependency.h: - * ace/Dynamic_Service_Dependency.cpp: - - Updated to remove an empty inl file. - - * ace/Dynamic_Service_Dependency.inl: - - Removed this file. - -Thu Apr 27 14:00:18 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Sock_Connect.cpp: - Implemented get_ip_interfaces for OpenVMS - -Thu Apr 27 11:19:18 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Array_Map.h: - * ace/ATM_Addr.h: - * ace/Atomic_Op_T.h: - * ace/Base_Thread_Adapter.h: - * ace/Cached_Connect_Strategy_T.h: - * ace/Capabilities.h: - * ace/Default_Constants.h: - * ace/Hash_Map_Manager_T.h: - * ace/Log_Msg_Callback.h: - * ace/Log_Msg_IPC.h: - * ace/Map_Manager.h: - * ace/POSIX_Asynch_IO.h: - * ace/POSIX_Proactor.h: - * ace/RB_Tree.h: - * ace/Strategies_T.h: - * ace/Timer_Heap_T.h: - * ace/Timer_List_T.h: - * ace/Timer_Queue_Adapters.h: - * ace/Timer_Queue_T.h: - * ace/Timer_Wheel_T.h: - Fixed doxygen warnings - -Thu Apr 27 01:49:18 UTC 2006 Ossama Othman <ossama@dre.vanderbilt.edu> - - * ace/OS_NS_sys_sendfile.h (sendfile, sendfile_emulation): - * ace/OS_NS_sys_sendfile.cpp (sendfile_emulation): - - ACE_LOFF_T -> off_t. Expected ACE_LOFF_T behavior is still - under scrutiny. - - * ace/OS_NS_sys_sendfile.inl: - - Added missing <sys/sendfile.h> include directive. Addresses - infinite recursion at run-time when ACE_HAS_SENDFILE is defined. - - (sendfile): - - ACE_LOFF_T -> off_t, as above. - -Wed Apr 26 22:00:21 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> - - * ace/Parse_Node.h: - * ace/Service_Gestalt.h: - - Correcting a build problem, caused by the extraneous semicolons - after ACE_UNIMPLEMENTED_FUNC - -Wed Apr 26 20:21:49 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> - - The motivation for these changes was to enable support in ACE - for multiple instances of Service Configuration Repository, or - more appropriately - "Gestalt" (from the German word, meaning - something that's more than the sum of its parts). This is - feature is necessary to enable support for ORB-specific, or more - generally - service-specific sets of services, i.e. to be able - to have dynamically loaded services to use their own private set - of service objects. In the context of the implementation I will - use "gestalt" as a synonym for service configuration context or - service configuration repository. - - In order to accomplish this, the "instance"-related - functionality of the former ACE_Service_Config class has been - moved to another class - ACE_Service_Gestalt. The - ACE_Service_Config retains all static interfaces and those - members, pertaining to the concept of process-wide configuration - state. The service config, as known today has been retained as a - concept, but in its specialized semantics as holding a - process-wide configuration state. The primary concept expressing - an instance of configuration context is the gestalt. The - implementation actually uses a specialization of - ACE_Service_Gestalt in order to implement ACE_Service_Config as - a singleton, special case of configuration context. - - The static methods in ACE_Service_Config provide access to - process-wide gestalt (ubergestalt, anyone?) instance. - - For more details, here is the history of all included changes, - with their motivation and explanation. It is ordered - alphabetically, by the names of the changed files: - - * ace/ACE.cpp: - - Added to the condition evaluating ACE::debug() to include a - check if environmental variable ACE_DEBUG has been set. - - Updated the debug() function to call getenv() only once by using - a method-local static variable to hold the value from the - environment. - - * ace/DLL.h: - * ace/DLL.cpp: - - Implemented an operator=, needed in order to implement the - ACE_Service_Configuration_Guard class. - - * ace/DLL_Manager.cpp: - - Improved the error diagnostics so that a "file not found" would - not mask a "symbol not defined" error when loading a DLL. - - * ace/Dynamic_Service.h: - - "Privatized" copy ctor and operator= for ACE_Dynamic_Service - objects since it is not designed for such operations. - - * ace/Dynamic_Service.inl: - - Added overloaded method instance() for ACE_ANTI_TCHAR. - - * ace/Dynamic_Service.cpp: - - Changes to enable instantiation of a service, based on the - registration in a particular service repository. Adding a method - that takes ACE_Service_Gestalt* additional parameter. - - * ace/Dynamic_Service_Base.h: - * ace/Dynamic_Service_Base.cpp: - - Factored out a find_i() method to be used by the friend - ACE_Dynamic_Service_Dependency class. It implements the specific - lookup policy that extends the search to the global repository - if the named service object can not be found locally. - - Added instance method, allowing the caller to explicitly specify - the gestalt. - - * ace/Dynamic_Service_Dependency.h: - * ace/Dynamic_Service_Dependency.inl: - * ace/Dynamic_Service_Dependency.cpp: - - A newly introduced class, whose instances are designed to be - embedded inside instances of other classes, typically created by - DLL-based factories (service objects). This provides a way to - declare dependency on a specific service, thus avoiding order of - initialization issues with objects whose implementation code - resides in dynamically loaded services. - - It is disastrous to have dynamically loadable services create - and give away ownership of objects and then be unloaded before - all those instances have been deleted. Normally the code for - such objects classes resides within the TEXT segment of the DLL, - which implements the service. If a service gets removed, its DLL - may be unmapped from memory and then any attempt to invoke a - method on the said objects will cause SEGV. - - Such instances must contain a member of - ACE_Dynamic_Service_Dependency initialized with the service they - depend on. @code ACE_Dynamic_Service_Dependency's constructor - and destructor are "magical" - they work by maintaining the - underlying dynamic service's DLL reference count. - - The problem was not present before because the one Service - Repository outlived any other user objects. Now that an - un-loadable service can own its configuration, the sequence of - service finalization has been reversed. - - Updated the implementation of ACE_Dynamic_Service_Dependency - class to ease debugging. ACE_Dynamic_Service_Dependency gets - initialized whenever a dependent service gets loaded, to help us - keep our access to dependent instances after their DLL is gone - (by upping the ref count on the DLL). - - Updated usage of gestalt's instance() to current(). Removed - unnecessary comments. - - * ace/Global_Macros.h: - - Changed the ACE_STATIC_SVC_DEFINE to use the new - ACE_Service_Config::insert () method, which allows to streamline - the Service Configuration interface and promote hiding the - storage used for the static service descriptors. - - * ace/Parse_Node.h: - * ace/Parse_Node.cpp: - - Changes to aid in keeping track of the gestalt, while deep in - the guts of the svc.conf parser. - - Replaced the ACE_Service_Gestalt & in the method signatures with - ACE_Service_Gestalt * to unify the interfaces. - - Updated the static function node's logic to use only - ACE_Service_Gestalt public members and to no longer rely on - knowledge about the internal storage representation of service - repository. - - Removed a static_cast<> in ACE_Static_Function_Node::symbol() - that was causing problems on some platforms. It was not even - necessary as both sides were of the same type. - - * ace/Service_Config.{h,inl,cpp}: - - This separates the responsibilities between the service gestalt, - which represents an _instance_ of configuration information, and - the service config, which represents a special, process-wide, - global configuration repository. Since both these entities - represent the same concept - service configuration state, but - from different aspects, the ACE_Service_Config now inherits - (publicly) from ACE_Service_Gestalt. - - Lots of instance-related code moved to ACE_Service_Gestalt - Replaced the use of char with ACE_ANTI_TCHAR and the appropriate - ACE_TEXT_* macros. - - Moved the parsing of command-line options, pertaining to the - process as a whole, here - in the parse_args_i () (protected, - virtual). - - In order to resolve a problem caused by the inability of a - dependent static service to determine which gestalt they need to - register with, the concept of "current" was separated from the - "global" gestalt. The current gestalt is pointed to by a - pointer, stored in thread-specific storage (TSS) and manipulated - by the ACE_Service_Config_Guard class that implements the - "resource acquisition is initialization" idiom. - - Fixed an error in the separation of responsibilities between the - instance gestalt and the global (ubergestalt), during - initialization. The bug can cause infinite recursion, when - initializing an ORB, housed in a dynamic service. The singleton - gestalt (i.e. ACE_Service_Config) must be initialized through - open_i(), before open_i() can proceed initializing the specific - gestalt instance. The difficulty is in that some use cases - reverse the order of initialization by calling - ACE_Service_Config::open () first and then, at some point call - the instance gestalt open_i(). The solution is to use the - is_initialized_ member together with an explicit call to - ACE_Service_Config::global()->open_i(). To ease debugging of - the process of registering static service, I have changes the - ACE_Service_Config::static_svcs() to return - ACE_Service_Gestalt::instance (), instead. Thus all the - ACE_STATIC_SVC* macros are still working (no need to change - existing code), but now there is a convenient place to debug - - see the newly added ACE_Service_Gestalt::insert () method. The - header file no longer declares ACE_STATIC_SVCS, - ACE_STATIC_SVCS_ITERATOR, ACE_SVC_QUEUE and - ACE_SVC_QUEUE_ITERATOR. Those are now protected typedefs in - ACE_Service_Gestalt, where they are actually used. - - Added new insert () method to use instead of the sequence - static_svc ()->insert () which unnecessary exposes the internal - storage structure of Service Configurator. Made no_static_svcs_ - an instance member, instead of a class (static) member, thus - providing for ability to set it per instance, not globally. - - Added default values for open_i() and declared private copy ctor - and assignment operator for ACE_Service_Config_Guard, since it - is not intended to be copied. - - Similarly, moved the parts of the open_i() functionality that - did not belong in every instance of the gestalt. - ACE_Service_Config is again a process-wide Singleton,registered - with ACE_Object_Manager. - - Eliminated old #if 0-ed code in Service_Config.cpp. - - * ace/Service_Gestalt.h: - * ace/Service_Gestalt.inl: - * ace/Service_Gestalt.cpp: - - Encapsulates the idea of Service Configuration repository, or - configuration context. - - Changed open_i to be able to detect if it is working on the - special, process-wide instance (ubergestalt) or a "plain" - gestalt instance, since there are things that must only be done - once per process - like signal handler, logging key and - daemon-ization of the whole process. - - Added an ignore_static_svcs parameter to - ACE_Service_Gestalt::open_i in order to preserve the prior - behavior of the singleton ACE_Service_Gestalt instance. Even - though its no_static_svcs_ member was being initialized with 1, - some clients (TAO) needs to be able to override it. Since now a - call to open_i on an instance gestalt may precede in time the - call to open_i on the ubergestalt, we need a mechanism to allow - the no_static_svcs_ value to be overridden. - - Added the insert()'s implementation (described above). Added a - singleton() method to return the process-wide gestalt singleton - (or ubergestalt?:). Used in open_i() to account for the fact - that now a Service Gestalt may be called to open () prior to - open () on the singleton instance, which would typically contain - the bulk of the static service object descriptors. - - There was a problem with "hybrid" service objects, i.e. dynamic - SO which contains static SO (dependent services). The dependent - services are typically registered via static ctor or static - initializer at the point of loading of the dynamic SO's DLL. As - such, they end up registering before the dynamic SO. Upon - finalization of the service repository, the dynamic SO is - finalized first, thus unloading its DLL and unmapping the TEXT - segment, where the dependent static services code is. When - next, the static SO is to be finalized its memory is no longer - at valid address. The change ensures the dynamic service is - registered *before* its dependent static services and will - therefore be finalized last. The solution is based upon the - concept of forward declaring a dynamic service, named after the - configuration file being processed. Before processing a file, - we simply check for an existing service with the same name and - "pass" if we find one. - - Fixed the ACE_Service_Config_Guard's detection of the case where - the forward service declaration was not replaced by a proper - declaration as expected. It now properly removes the forward - decl, not the "good" instance. - - Cleared up the TSS management issue, causing executable to crash - on startup. The problem was due to an order-of-instantiation - issue, involving the TSS-based pointer to the current - gestalt. Used ACE_Object_Manager's shutting_down and starting_up - methods to determine if it is safe to use the static ACE_TSS - instance. - - Added const-ness for find(). Removed prototypes for initialize, - resume, suspend and remove that used plain char type and - conditionally compiled in only for WinCE and - ACE_USES_WCHAR. Service_Config still declares and defines these - (using ACE_ANTI_TCHAR). Updated to resolve problems when built - with ACE_USES_WCHAR. - - Declared private copy ctor and assignment operator for - ACE_Service_Gestalt and ACE_Service_Type_Factory, since their - instances are not intended to be copied. Added an - ACE_UNIMPLEMENTED_FUNC macro for the copy-ctor and assignment - operator of ACE_Service_Type_Factory. - - Reorganized to streamline the header file and remove unnecessary - declarations and to add a decl for find_static_svc_descriptor(). - - Changed the open() method's implementation to incorporate the - additional parameter for open_i(). - - Added the new find_static_svc_descriptor() member, which allows - ACE_Static_Function_Node to not need to know how the static - services are registered in the service repository. - - * ace/Service_Object.h: - * ace/Service_Object.inl: - * ace/Service_Object.cpp: - - Exposed the dll_ member through dll () const method because the - reference is needed by the new ACE_Dynamic_Service_Dependency - class. Fixed the dump () method. - - * ace/Service_Repository.h: - * ace/Service_Repository.cpp: - - Added const-ness for the find* () methods. Added debugging. The - remove method changes the order of services registrations in the - repository, which may break the Service Repository's invariant, - imposed by the need to correctly finalize dynamic services with - their own static services. - - For example, consider a case where a static service (S0) is - registered in the repository. Then a DLL-based service (D1) - registers its own static service (S1). So far the order is - "finalization-compatible": S0 < D1 < S1, i.e. services will be - finalized in reverse order and D1's DLL will still be available - when finalizing S1. Now let's remove (S0). Currently, after - this operation the repository end up in this order: S1 < D1, - which is trivially not finalization-compatible. - - Instead of replacing the pointer with the last ptr to a svc in - the array (repository) and then decrementing the current size of - the repo, the solution actually shifts left the rest of the - array. - - * ace/Service_Types.cpp: - * ace/Shared_Object.cpp: - - Removed some and updated existing debug statements. Eliminated - dead partial instantiation code. - - * ace/Svc_Conf.y: - * ace/Svc_Conf.h: - * ace/Svc_Conf_Tokens.h: - * ace/Svc_Conf_y.cpp: - - Changed to allow propagation of the knowledge about which - gestalt is currently being used for service registrations. - - Factored the ACE_Svc_Conf_Param class out in its own translation - unit. - - * ace/Svc_Conf_Param.h: - - Replaced the ACE_Service_Gestalt & in the method signatures with - ACE_Service_Gestalt * - - * ace/svcconf.mpb: - - Updated the svcconf.mpb rule to allow building with Bison 2.0 - and up. The change adds #ifdef/#endif around the generated - header file. A YYSTYPE_IS_DECLARED define is added in order to - make sure the token declarations from the Svc_Conf_Tokens.h are - used instead of those generated in the Svc_Conf_y.cpp file. - - Added the new Dynamic_Service_Dependency.* files. - - * bin/tao_orb_tests.lst: - - Adding the new tests to the automated test suite to run during - the nightly builds. - -Wed Apr 26 17:13:57 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> - - * bin/tao_orb_tests.lst: - Added test for Parallel_Connect_Strategy. This test will take - about 9 minutes to run to completion. - -Wed Apr 26 14:22:31 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> - - * bin/tao_orb_tests.lst: - Added tests for new POA features. - - * bin/MakeProjectCreator/config/endpointpolicy.mpb: - Applications wishing to use the TAO EndpointPolicy should add - this base project to their MPC files. This will include - libTAO_EndpointPolicy in their link lines. - -Wed Apr 26 14:10:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * include/makeinclude/platform_hpux_kcc.GNU: - * include/makeinclude/platform_irix6.x_kcc.GNU: - * include/makeinclude/platform_linux_kcc.GNU: - * include/makeinclude/platform_osf1_4.x_kcc.GNU: - * include/makeinclude/platform_sunos5_kcc.GNU: - * include/makeinclude/platform_tru64_kcc.GNU: - Removed these files which are for the KAI C++ compiler. This - compiler doesn't exist anymore and full support for KAI C++ - has been removed now from ACE/TAO. See bugzilla bug 2007 - -Wed Apr 26 13:03:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/tao_orb_tests.lst: - Added TAO/tests/POA/Bug_2511_Regression - -Wed Apr 26 12:52:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Process_Manager.cpp: - Fixed fuzz errors and use const when possible - -Wed Apr 26 12:02:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tests/CDR_Test.cpp: - Boolean is now size 1 or bigger, the marshaling code will take - care that a Boolean is marshaled as octet of size 1 - -Wed Apr 26 11:28:28 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> - - * bin/tao_orb_tests.lst: - Added TAO/tests/OBV/truncatable. - -Wed Apr 26 10:05:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/tao_orb_tests.lst: - Added TAO/tests/OBV - -Wed Apr 26 09:56:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/tao_orb_tests.lst: - Added TAO/tests/Portable_Interceptors/Bug_2510_Regression - -Wed Apr 26 07:21:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * include/makeinclude/platform_vxworks5.5.x.GNU: - Increased template-depth to 50, hopefully this is large enough to - also build CIAO - -Tue Apr 25 16:44:04 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> - - * ace/CDR_Stream.h: - * ace/CDR_Stream.cpp: - Added code to support rewinding the output CDR to some previous - location and updating a value there. This is required to support - marshaling offset values were the target of the offset is not - known until the final offset target is actually reached. - -Tue Apr 25 13:50:12 UTC 2006 Martin Corino <mcorino@remedy.nl> - - * tests/Signal_Test.cpp: - Fixed this test for (modern) Linux and Solaris at least. - The crux is blocking signals before calling sigwait() when doing - synchronous signal handling. - -Tue Apr 25 09:35:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Base_Thread_Adapter.h: - * ace/Cleanup.h: - Fixed some errors I made - -Tue Apr 25 09:23:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ACE-INSTALL.html: - Updated supported platforms and use vc8 for the MPC examples - -Tue Apr 25 08:49:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/CDR_Base.h: - Always use bool for Boolean, see bugzilla 2514 for more info - -Tue Apr 25 06:33:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Log_Msg.h: - Put back ACE_TSS_CLEANUP_NAME that got lost by accident with the - vc6 cleanup. Thanks to Olli Savia for reporting this. - -Mon Apr 24 17:39:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tests/run_test.lst: - Added Signal_Test. Thanks to Martin Corino for notificing that - we don't run this test on any platform. - -Mon Apr 24 10:17:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/tao_orb_tests.lst: - Added TAO/tests/Bug_1676_Regression - -Mon Apr 24 09:57:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * include/makeinclude/platform_vxworks5.5.x.GNU: - Increase template depth to resolve compile errors when building - TAO with the new sequence implementation - -Mon Apr 24 09:17:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/os_include/sys/os_types.h: - Added ACE_LOFF_T for LynxOS. Thanks to Simon Massey for delivering - the patch - -Fri Apr 21 16:28:26 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu> - - Merge from ARMS Escher repository. - - * ace/OS_NS_Thread.cpp - - Updated sched_params() to not ignore the process id passed in. - Also enhanced the Windows implementation to get a handle to the - process specified before applying the priority class changes. - - * ace/Process_Manager.cpp - * ace/Process_Manager.h - - Added methods set_scheduler and set_scheduler_all - to set scheduling parameters for process(es) managed by this - class. - - * bin/MakeProjectCreator/config/ciao_config_handlers.mpb - - Fixed build ordering problem in CIAO. - -Fri Apr 21 07:41:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Caching_Utility_T.cpp: - Removed invalid added const - -Thu Apr 20 19:27:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/os_include/sys/os_types.h: - Added ACE_LOFF_T for the BSD variants, thanks to J.T. Conklin - for delivering the patch - -Thu Apr 20 18:16:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/config-macros.h: - Removed setting of ACE_ANY_OPS_USE_NAMESPACE again. This causes - problems when building CIAO. Thanks to Jeff Parsons for finding - this. - -Thu Apr 20 11:46:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tests/ACE_Init_Test.rc: - Removed another msvc specific part - -Thu Apr 20 11:06:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/fuzz.pl: - Added a check for deprecated macros, first one to check is - ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION - - * tests/*.cpp: - * protocols/*.cpp: - * ACEXML/*.cpp: - * performance-tests/*.cpp - * netsvcs/*.cpp - Removed all explicit template instantiations - - * ace/os_include/sys/os_types.h: - Added ACE_LOFF_T typedef for VxWorks 6.2 and newer - -Thu Apr 20 07:23:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/os_include/sys/os_types.h: - Always define ACE_LOFF_T so that we can use it in the sendfile - wrapper - -Thu Apr 20 07:17:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/svcconf.mpb: - Removed Service_Templates.cpp - -Wed Apr 19 19:18:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/*: - Removed explicit template support - -Wed Apr 19 15:09:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tests/Bug_2368_Regression_Test.cpp: - Fixed compile error and compile warning - -Wed Apr 19 14:35:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/OS_NS_sys_sendfile.h: - Updated include to get size_t and ACE_LOFF_T to fix compile - errors on Solaris - -Wed Apr 19 13:31:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * examples/APG/Logging/Use_Multiple_Sinks.cpp: - * examples/APG/Logging/Use_Ostream.cpp: - * examples/APG/Logging/LogManager.h: - Removed vc6 workarounds - -Wed Apr 19 13:13:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tests/Bug_2368_Regression_Test.cpp: - * tests/run_test.lst: - * tests/tests.mpc: - Added regression for bug 2368, this will fail because this bug - isn't addressed yet - -Wed Apr 19 13:08:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * include/makeinclude/platform_sunos5_g++.GNU: - Use -shared instead of -G when building shared libraries. Thanks to - Alan L Batongbacal <alanlb at vt dot edu> for reporting this. This - fixes bugzilla bug 1848. - -Wed Apr 19 12:11:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * tests/ACE_Init_Test.rc: - Removed msvc specific lines - - * tests/tests.mpc: - The ACE_Init_Test should use its resource file. Fixes bugzilla - 2495 - - * ace/Capabilities.{h,cpp}: - Prefix increment instead of postfix - - * ace/Hash_Map_Manager_T.{h,cpp}: - Removed workaround for suncc 4.2 - - * ace/Object_Manager.h: - * ace/Parse_Node.h: - * ace/POSIX_Proactor.h: - * ace/Thread_Mutex.h: - Doxygen improvements - - * ace/Parse_Node.cpp: - Use prefix increment, initialise pointers with 0 and don't print - an error message when we can't a dll, this gives false messages - when using TAO. This fixes bugzilla 2383. Thanks to Ming Xiong - for making a patch. - - * ace/Proactor.h: - Removed all virtual keywords, not needed for this class. Fixes - bugzilla 2178. - - * ace/Thread_Manager.h: - Removed virtual keywords, not needed and safes footprint. Fixes - bugzilla 2179. - - * bin/fuzz.pl: - Added more msvc checks to detect code constructors for vc6 or - vc7.0 - -Wed Apr 19 11:48:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - Merged ACE changes from sendfile branch. Also made a lot of const - improvements throughout ACE. - - Tue Apr 4 10:20:36 2006 Ossama Othman <ossama@dre.vanderbilt.edu> - - * ace/Mem_Map.cpp (open): - - Only copy the filename to the ACE_Mem_Map::filename_ member - if the call to open() succeeds. - - * ace/PI_Malloc.h (ACE_Malloc_Header): - - Added missing private and undefined copy constructor. The - corresponding assignment operator was already there. - - Wed Mar 29 14:51:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/config-sunos5.8.h: - Solaris 8 and newer also support sendfile. It seems HPUX also - supports it but with a different signature and semantics, so just - don't try it there yet. - - Wed Mar 29 13:06:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/MMAP_Memory_Pool.{h,cpp,inl}: - Added new .inl file to implement the new mmap accessors, include - this new file in the header and implementation file - - Wed Mar 29 08:00:12 2006 Ossama Othman <ossama@dre.vanderbilt.edu> - - * ace/OS_NS_sys_sendfile.cpp - * ace/OS_NS_sys_sendfile.h - * ace/OS_NS_sys_sendfile.inl - New sendfile wrapper - - * ace/MMAP_Memory_Pool.h: - Added accessors for mmap - - * ace/ace.mpc - Added OS_NS_sys_sendfile - - * ace/config-linux-common.h - Added ACE_HAS_SENDFILE - -Wed Apr 19 07:48:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - Merged ACE changes from sequpdate3 branch - - * ace/config-osf1-3.2.h: - Removed, very old - - * ace/config-tru64.h: - Removed include of config-osf1-3.2.h - - * ace/OS_Dirent.cpp: - * ace/OS_Memory.{cpp,inl}: - * ace/OS_String.{cpp,inl}: - * ace/Sync.cpp: - Removed these files, where not build for a long time already - - * ace/ace.mpc: - Removed files above - - * ace/OS_Memory.h: - * ace/OS_String.h: - Removed include of inline files - - * ace/config-win32-msvc6.h: - * ace/config-kcc-common.h: - Removed these files, vc6 and kcc are deprecated - - * ace/config-irix6.x-kcc.h: - * ace/config-osf1-4.0.h: - * ace/config-sunos5.5.h: - Removed support for KCC - - * ace/Asynch_IO_Impl.h: - Removed workarounds for KCC - - * ace/config-win32-msvc.h: - Removed support for vc6 and vc7.0 - - * ace/Array_Base.cpp: - * ace/Array_Map.{h,cpp}: - * ace/Base_Thread_Adapter.h: - * ace/Cleanup.h: - * ace/Log_Msg.h: - * ace/Versioned_Namespace.h: - * ace/Get_Opt.cpp: - * ace/WIN32_Proactor.cpp: - * ace/Message_Queue.cpp: - * ace/CDR_Base.h: - Removed work arounds for vc6 - - * ace/README - * ace/config-win32-msvc6.h: - * ace/Global_Macros.h: - Deprecated ACE_HAS_BROKEN_NAMESPACES, we drop msvc6 and I am - removing the workarounds for this compiler one by one as part of the - new sequence implementation. Because we deprecate this also - ACE_NESTED_CLASS is deprecated - - * ace/config-win32-msvc6.h: - * ace/config-win32-msvc7.h: - * ace/config-win32-msvc8.h: - Removed ACE_HAS_BROKEN_IMPLICIT_CONST_CAST, not used in ACE - - * ace/config-win32-msvc6.h: - * ace/config-win32-visualage.h: - * ace/Registry.h - Removed ACE_HAS_BROKEN_NESTED_TEMPLATES, only used for msvc6 and - visual age, both are being dropped - -Wed Apr 19 07:48:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * bin/tao_orb_tests.lst: - Added Bug_2503_Regression - -Tue Apr 18 20:49:16 2006 Wallace Zhang <zhangw@ociweb.com> - - * ACE version 5.5.1 released. - -Local Variables: -mode: change-log -add-log-time-format: (lambda () (progn (setq tz (getenv "TZ")) (set-time-zone-rule "UTC") (setq time (format-time-string "%a %b %e %H:%M:%S %Z %Y" (current-time))) (set-time-zone-rule tz) time)) -indent-tabs-mode: nil -End: diff --git a/ACE/Kokyu/Kokyu.mpc b/ACE/Kokyu/Kokyu.mpc index 182c2115f9a..aeb6e69941e 100644 --- a/ACE/Kokyu/Kokyu.mpc +++ b/ACE/Kokyu/Kokyu.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- now wouldn't this be cool... // $Id$ -project(Kokyu) : acelib, install { +project(Kokyu) : acelib, core { sharedname = Kokyu dynamicflags = KOKYU_BUILD_DLL diff --git a/ACE/Kokyu/Makefile.am b/ACE/Kokyu/Makefile.am index 86deb01005e..8a68d21c2eb 100644 --- a/ACE/Kokyu/Makefile.am +++ b/ACE/Kokyu/Makefile.am @@ -2,11 +2,6 @@ ## ## $Id$ ## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc includedir = @includedir@/Kokyu pkgconfigdir = @libdir@/pkgconfig @@ -35,7 +30,7 @@ libKokyu_la_SOURCES = \ Kokyu_defs.cpp libKokyu_la_LDFLAGS = \ - -release @ACE_VERSION_NAME@ + -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@ libKokyu_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la @@ -65,11 +60,7 @@ nobase_include_HEADERS = \ Kokyu_dsrt.h \ Kokyu_dsrt.inl -pkgconfig_DATA = \ - Kokyu.pc - -CLEANFILES = \ - Kokyu.pc +pkgconfig_DATA = Kokyu.pc Kokyu.pc: ${top_builddir}/config.status ${srcdir}/Kokyu.pc.in ${top_builddir}/config.status --file $@:${srcdir}/Kokyu.pc.in diff --git a/ACE/Kokyu/docs/Kokyu.html b/ACE/Kokyu/docs/Kokyu.html index bb4505eb9e6..55c8016cd1c 100644 --- a/ACE/Kokyu/docs/Kokyu.html +++ b/ACE/Kokyu/docs/Kokyu.html @@ -357,7 +357,7 @@ interface is in <tt>Kokyu::DSRT_Dispatcher (Kokyu_dsrt.h)</tt> <h3> <a NAME="Status"></a>Current status</h3> Kokyu dispatching framework is available as a separate module under <tt><font size=+1>ACE_wrappers/Kokyu</font></tt> -as part of the <a href="http://download.dre.vanderbilt.edu">ACE/TAO +as part of the <a href="http://deuce.doc.wustl.edu/Download.html">ACE/TAO distribution</a>. Note that this module is not dependent on TAO, though it is built on top of ACE. The TAO Event Channel uses the Strategy and Service Configurator patterns to use configurable dispatching modules. diff --git a/ACE/Kokyu/tests/DSRT_MIF/Makefile.am b/ACE/Kokyu/tests/DSRT_MIF/Makefile.am index 4ed16f988cd..9e51858b971 100644 --- a/ACE/Kokyu/tests/DSRT_MIF/Makefile.am +++ b/ACE/Kokyu/tests/DSRT_MIF/Makefile.am @@ -6,16 +6,12 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## ./bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) - -## Makefile.DSRT_MIF.am - -if !BUILD_ACE_FOR_TAO - +## Makefile.DSRT_MIF.am noinst_PROGRAMS = MIF MIF_CPPFLAGS = \ @@ -27,10 +23,8 @@ MIF_SOURCES = \ MIF.cpp MIF_LDADD = \ - $(top_builddir)/Kokyu/libKokyu.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO + $(ACE_BUILDDIR)/Kokyu/libKokyu.la \ + $(ACE_BUILDDIR)/ace/libACE.la ## Clean up template repositories, etc. clean-local: diff --git a/ACE/Kokyu/tests/EDF/Makefile.am b/ACE/Kokyu/tests/EDF/Makefile.am index 9aa8fcdf71d..22b09e8251a 100644 --- a/ACE/Kokyu/tests/EDF/Makefile.am +++ b/ACE/Kokyu/tests/EDF/Makefile.am @@ -6,13 +6,12 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## ./bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) -## Makefile.EDF.am - +## Makefile.EDF.am noinst_PROGRAMS = EDF EDF_CPPFLAGS = \ @@ -24,8 +23,8 @@ EDF_SOURCES = \ test.cpp EDF_LDADD = \ - $(top_builddir)/Kokyu/libKokyu.la \ - $(ACE_BUILDDIR)/ace/libACE.la + $(ACE_BUILDDIR)/Kokyu/libKokyu.la \ + $(ACE_BUILDDIR)/ace/libACE.la ## Clean up template repositories, etc. clean-local: diff --git a/ACE/Kokyu/tests/FIFO/Makefile.am b/ACE/Kokyu/tests/FIFO/Makefile.am index 05b7dbe9e38..9852af122e0 100644 --- a/ACE/Kokyu/tests/FIFO/Makefile.am +++ b/ACE/Kokyu/tests/FIFO/Makefile.am @@ -6,13 +6,12 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## ./bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake ACE.mwc ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) -## Makefile.FIFO.am - +## Makefile.FIFO.am noinst_PROGRAMS = FIFO FIFO_CPPFLAGS = \ @@ -24,8 +23,8 @@ FIFO_SOURCES = \ test.cpp FIFO_LDADD = \ - $(top_builddir)/Kokyu/libKokyu.la \ - $(ACE_BUILDDIR)/ace/libACE.la + $(ACE_BUILDDIR)/Kokyu/libKokyu.la \ + $(ACE_BUILDDIR)/ace/libACE.la ## Clean up template repositories, etc. clean-local: diff --git a/ACE/Kokyu/tests/Makefile.am b/ACE/Kokyu/tests/Makefile.am index 9745459d4e3..39737061deb 100644 --- a/ACE/Kokyu/tests/Makefile.am +++ b/ACE/Kokyu/tests/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## ./bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake ACE.mwc SUBDIRS = \ DSRT_MIF \ diff --git a/ACE/Makefile.am b/ACE/Makefile.am index 29fb2e2dbe8..340e2a53ff1 100644 --- a/ACE/Makefile.am +++ b/ACE/Makefile.am @@ -9,12 +9,18 @@ ## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ - ace \ - @ACEXML@ \ - @ASNMP@ \ + ace \ + ASNMP + +if BUILD_ACEXML +SUBDIRS += ACEXML +endif + +SUBDIRS += \ apps \ bin \ - netsvcs + netsvcs \ + protocols if BUILD_EXAMPLES SUBDIRS += examples @@ -26,7 +32,6 @@ SUBDIRS += tests endif SUBDIRS += \ - @protocols@ \ websvcs \ @KOKYU@ \ @TAO@ @@ -3,125 +3,10 @@ PLANNED MAJOR CHANGES "SOMETIME IN THE FUTURE" (i.e., exact beta not known) . (Remedy) OpenVMS 8.3 on IA64 port -PLANNED CHANGES FOR "ACE-5.5.6" -=============================== - -. (OO) Minor 64 bit file offset fixes for ACE AIO classes on HP-UX. - -. (OO) Various other fixes that have been piling up. - -PLANNED CHANGES FOR "ACE-5.5.5" -=============================== - -. (Riverace) Pharlap ETS 13 qualification. - -USER VISIBLE CHANGES BETWEEN ACE-5.5.4 and ACE-5.5.5 -==================================================== - -. Reformat stringified IPv6 addresses to use [addr]:port when printing - addresses that contain ':' such as "::1". - -. Added method to ACE_INET_Addr to determine if address is IPv6 or - IPv4 multicast. - -. Fixed a bug in ACE_Async_Timer_Adapter_Timer_Queue_Adapter<TQ> where the - gettimeofday function of the timer queue was ignored when setting the alarm. - -. Fixed a problem where, on Solaris 9 onwards, calling - ACE_OS::thr_create(THR_NEW_LWP) more than 2^15 (65535) times in a - process will fail. See changelog entry from "Wed Jan 3 22:31:05 UTC - 2007 Chris Cleeland <cleeland_c@ociweb.com>" for more information. - -. Fixed a bug in ACE_QtReactor where the two select() calls in that function - might select on different handler sets. - -. ACE_SOCK_IO::recvv(iovec[], size_t, const ACE_Time_Value* = 0) and - ACE_SOCK_IO::sendv (const iovec[], size_t, const ACE_Time_Value* = 0) methods - were changed to specify the iovec count argument as int instead of size_t - since it gets reduced to int in the underlying OS calls (usually). - -. The following deprecated methods were removed: - - ssize_t ACE_SOCK_IO::recv (iovec iov[], - size_t n, - const ACE_Time_Value *timeout = 0) const; - - ssize_t ACE_SOCK_IO::recv (iovec *io_vec, - const ACE_Time_Value *timeout = 0) const; - - ssize_t ACE_SOCK_IO::send (const iovec iov[], - size_t n, - const ACE_Time_Value *timeout = 0) const; - - These were previously replaced with more specific recvv() and sendv() - methods. - -. The ACE_Service_Repository::find(const ACE_TCHAR name[], - const ACE_Service_Type **srp = 0, - int ignore_suspended = true) const - method's 'ignore_suspended' parameter was changed from int to bool to - reflect it's purpose as a yes/no indicator. - -. Added --enable-ace-reactor-notification-queue configure script - option to the autoconf build for enabling the Reactor's userspace - notification queue (defines ACE_HAS_REACTOR_NOTIFICATION_QUEUE in - config.h). - -. The int ACE_OutputCDR::consolidate(void) method was contributed by - Howard Finer at Sonus Networks. This method consolidates any continuation - blocks used by an ACE_OutputCDR object into a single block. It's useful for - situations which require access to a single memory area containing the - encoded stream, regardless of its length, when the length cannot be known - in advance. - -. There are a number of new methods defined on ACE_String_Base<CHAR>: - - size_t capacity (void) const: This method returns the number - of allocated CHAR units in the string object. - - void fast_resize (size_t): This method manage the sizing/reallocating - of the string, but doesn't do the memory setting of resize(). - - bool operator!= (const CHAR *) const - bool operator== (const CHAR *) const: These methods compare the - string with a nul-terminated CHAR* string. - - nonmember functions operator== and operator!= where also added - that compare const ACE_String_Base and const CHAR*; these make - it possible to switch ACE_String and CHAR* on either side of - the operator. - - Thank you to Kelly Hickel <kfh at mqsoftware dot com> for these additions. - -. There are 2 new build options on the traditional make command: - dmalloc and mtrace. When specified at build time (e.g. make mtrace=1) - the PLATFORM_DMALLOC_CPPFLAGS and/or PLATFORM_MTRACE_CPPFLAGS values - are added to CPPFLAGS. For dmalloc, the PLATFORM_DMALLOC_LDFLAGS and - PLATFORM_DMALLOC_LIBS are added to LDFLAGS and LIBS, respectively. - Thank you to Howard Finer for supplying these additions. - -. Added the ability to specify additional purify and quantify command-line - options by setting PLATFORM_PURIFY_OPTIONS and PLATFORM_QUANTIFY_OPTIONS, - respectively. Thank you to Howard Finer for supplying these additions. - -. Removed Irix 5, DGUX, and m88k support - -. Improved LynxOS 4.2 support - -. VxWorks 6.4 support - -. Added support for FC6. Because the GCC 4.1.1 version that gets shipped - has a fix for the visibility attribute we use for the singletons - you will need to define the following in your config.h file. This can't be - done automatically because SuSE 10.2 gets shipped with GCC 4.1.2 but - doesn't have the same fix - ACE_GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS 1 - -. RTEMS port +. (Remedy) RTEMS port USER VISIBLE CHANGES BETWEEN ACE-5.5.3 and ACE-5.5.4 ==================================================== - . Added appropriate intptr_t and uintptr_t typedefs on platforms that don't provide them (i.e. when ACE_LACKS_INTPTR_T is defined). @@ -133,7 +18,7 @@ USER VISIBLE CHANGES BETWEEN ACE-5.5.3 and ACE-5.5.4 Windows. Use the new ACE_OFF_T typedef to refer to file offsets across UNIX and Windows portably. -. 64-bit file offsets are now enabled by default in Win64 +. 64 bit file offsets are now enabled by default in Win64 configurations. . Improved support for 64 bit platforms (64 bit addresses, etc). @@ -148,7 +33,7 @@ USER VISIBLE CHANGES BETWEEN ACE-5.5.3 and ACE-5.5.4 . Greatly improved event handler dispatch performance in select()-based reactors (e.g. ACE_Select_Reactor and ACE_TP_Reactor) - for large handle sets on Windows. Previous event handler search + for large handle sets on Windows. Previous event handler search were linear, and are now constant on average. . Addressed a number of Coverity errors (CHECKED_RETURN, DEADCODE, @@ -159,13 +44,6 @@ USER VISIBLE CHANGES BETWEEN ACE-5.5.3 and ACE-5.5.4 . Removed support for LynxOS 3.x. -. Resolved Bugzilla #2701 to ensure fini() is called for all - Service Objects upon calling ACE_Service_Config::close() - -. VxWorks 5.5.2 has been tested, for ACE the support is exactly - the same as for VxWorks 5.5.1. No specific defines or flags have - to be used. - USER VISIBLE CHANGES BETWEEN ACE-5.5.2 and ACE-5.5.3 ==================================================== diff --git a/ACE/PROBLEM-REPORT-FORM b/ACE/PROBLEM-REPORT-FORM index 9eccbd1eab0..7e3ce98b2ec 100644 --- a/ACE/PROBLEM-REPORT-FORM +++ b/ACE/PROBLEM-REPORT-FORM @@ -43,7 +43,7 @@ To: ace-bugs@cs.wustl.edu Subject: [area]: [synopsis] - ACE VERSION: 5.5.4 + ACE VERSION: 5.5.3 HOST MACHINE and OPERATING SYSTEM: If on Windows based OS's, which version of WINSOCK do you diff --git a/ACE/Release b/ACE/Release index 6072314a11f..bec32e4a29c 100644 --- a/ACE/Release +++ b/ACE/Release @@ -86,6 +86,7 @@ RELEASE_FILES = \ $(addprefix ACE_wrappers/,$(CONTROLLED_FILES)) \ ACE_wrappers/ACE-INSTALL \ ACE_wrappers/GNUmake* \ + ACE_wrappers/*.dsw \ ACE_wrappers/*.sln \ ACE_wrappers/*.bor \ ACE_wrappers/*.vcw \ @@ -117,10 +118,10 @@ RELEASE_LIB_FILES = \ RELEASE_TAG_FILES = \ html -.PHONY: tag ACE TAO CIAO acesources taosources ciaosources +.PHONY: tag ACE TAO CIAO acesources taosources ciaosources .PHONY: allsources manpages all -# Some useful defines which are used to create the release bundle. +# Some useful defines which are used to create the release bundle. ACE_TAG_VALUE = $(shell head -1 VERSION | perl -ne \ 's/.* ([\d\.]+),.*\n/$$1/; tr/./_/; print "ACE-$$_";') ACE_TAG = -ta $(ACE_TAG_VALUE) @@ -162,22 +163,22 @@ acesources: $(APPLY_NEW_TAG) @$(ACE_ROOT)/bin/make_release -k ace $(ACE_TAG) \ $(INSTALL_KIT) $(ZIP_FILES) $(CHECK) -#### The following target is for use by the TAO Release target. It -#### should not be called directly from the command line. This is +#### The following target is for use by the TAO Release target. It +#### should not be called directly from the command line. This is #### invoked by the TAO target this Release file. taosources: @$(ACE_ROOT)/bin/make_release -k ace+tao $(ACE_TAG) $(TAO_TAG) \ $(INSTALL_KIT) $(ZIP_FILES) $(CHECK) -#### The following target is for use by the TAO Release target. It -#### should not be called directly from the command line. This is +#### The following target is for use by the TAO Release target. It +#### should not be called directly from the command line. This is #### invoked by the TAO target this Release file. ciaosources: @$(ACE_ROOT)/bin/make_release -k ace+tao+ciao $(ACE_TAG) $(TAO_TAG) $(CIAO_TAG) \ $(INSTALL_KIT) $(ZIP_FILES) $(CHECK) ######################################################################### -## The following targets are a matter of convinience. We don't +## The following targets are a matter of convinience. We don't ## believe that we ever will release ACE+TAO+CIAO seperately. If that ## happens then we have these to help us out. ######################################################################### diff --git a/ACE/THANKS b/ACE/THANKS index 2ac399557c6..4936d09d3ab 100644 --- a/ACE/THANKS +++ b/ACE/THANKS @@ -1702,7 +1702,7 @@ Craig Watcham <craigw at ananzi dot co dot za> Pit Linnartz <Pit dot Linnartz at t-mobile dot de> Peder Norgaard <pcn at pogt dot dk> David Ohlemacher <ohlemacher at bbn dot com> -Ken Kane <kenneth dot kane at ironmountain dot com> +Ken Kane <kkane at livevault dot com> Bill Church <wchurch at ara dot com> Udo Berninger <udo dot berninger at siemens dot com> Vincent Korkos <vincent dot korkos at fr dot thalesgroup dot com> @@ -1733,7 +1733,7 @@ Roland Schimmack <Roland dot Schimmack at gmx dot de> Roy Pollock <rpollock at ghs dot com> Eric Held <Eric dot Held at harris dot com> Kees van Marle <kvmarle at remedy dot nl> -Dieter Knueppel <Dieter dot Knueppel at batm dot de> +Dieter Knueppel <dknueppel at datus dot com> Amol Tambe <Amol dot Tambe at ideas dot com> Emiliano Berenbaum <eberenb at yahoo dot com> Scott Clarke <sclarke at ideorlando dot org> @@ -1765,6 +1765,7 @@ Onopin V. Mikhail <kool at garant dot ru> Edward R. Mulholland <emulholl at atl dot lmco dot com> Brian Buesker <bbuesker at qualcomm dot com> Vladimir Naylov <vladimir at monosphere dot com> +David Faure <faure at kde dot org> Ted Mules <ned at technisyst dot com dot au> Mike Hepburn <mike at anvil dot com> Dale Wilson <wilson_d at ociweb dot com> @@ -2036,7 +2037,7 @@ Hubert Talbot <Hubert dot Talbot at criq dot qc dot ca> Oh Yoon Sik <boom at estsoft dot com> Anton Bakanovskiy <Anton dot Bakanovskiy at bercut dot ru> Toha Bakanovsky <im-scooter at yandex dot ru> -David Faure <dfaure at klaralvdalens-datakonsult dot se> <faure at kde dot org> +David Faure <dfaure at klaralvdalens-datakonsult dot se> Robert Hancock <hancockr at shaw dot ca> Peter Oslej <peter dot oslej at vrm dot sk> Yongming Wang <wangym at gmail dot com> @@ -2131,7 +2132,7 @@ Michael Reed <mnr102 at yahoo dot com> Heesuk Shin <heesuks at econz dot com> Hong Xing <hongxing777 at gmail dot com> Winston Zhang <winston_ace at kubao-inc dot com> -Stefan Naewe <naewe dot s at atlas dot de> <stefan at naewe dot de> +Stefan Naewe <naewe dot s at atlas dot de> Graeme Bell <graemeb at econz dot com> Eric Danielou <eric dot danielou at eads dot com> Wei Jiang <sdjiangwei at sina dot com> @@ -2159,14 +2160,6 @@ N Johnson <nj at artesys dot info> Adam Nagel <nagelar at isis dot vanderbilt dot edu> Robert Neumann <robert dot neumann at gmail dot com> Venkat <swara101 at yahoo dot com> -Juraj Ivancic <juraj dot ivancic at gmail dot com> -Daniel Black <dragonheart at gentoo dot org> -Richard Ridgway <Richard_Ridgway at ml dot com> -Vadym Ridosh <vridosh at prismtech dot com> -Viola Wang <vwang at eso dot org> -Ray Lischner <rlischner at proteus-technologies dot com> -Sergey Kosenko <sergey dot kosenko at gmail dot com> -Pavel Zaichenko <zpf at ivl dot ua> I would particularly like to thank Paul Stephenson, who worked with me at Ericsson in the early 1990's. Paul devised the recursive Makefile diff --git a/ACE/VERSION b/ACE/VERSION index 91fcb538a9c..ed4f76e9cbd 100644 --- a/ACE/VERSION +++ b/ACE/VERSION @@ -1,4 +1,4 @@ -This is ACE version 5.5.4, released Mon Nov 20 08:16:34 2006. +This is ACE version 5.5.3, released Thu Oct 05 00:35:37 2006. If you have any problems with or questions about ACE, please send email to the ACE mailing list (ace-users@cs.wustl.edu), using the form diff --git a/ACE/ace/ACE.cpp b/ACE/ace/ACE.cpp index 6fec4b5d3a1..bfc8a867d6c 100644 --- a/ACE/ace/ACE.cpp +++ b/ACE/ace/ACE.cpp @@ -455,6 +455,12 @@ ACE::recv (ACE_HANDLE handle, return ACE_OS::recv (handle, (char *) buf, len, flags); else { +#if defined (ACE_HAS_RECV_TIMEDWAIT) + ACE_Time_Value copy = *timeout; + copy += ACE_OS::gettimeofday (); + timespec_t ts = copy; + return ::recv_timedwait (handle, buf, len, flags, &ts); +#else int val = 0; if (ACE::enter_recv_timedwait (handle, timeout, val) ==-1) return -1; @@ -465,6 +471,7 @@ ACE::recv (ACE_HANDLE handle, ACE::restore_non_blocking_mode (handle, val); return bytes_transferred; } +#endif /* ACE_HAS_RECV_TIMEDWAIT */ } } @@ -506,6 +513,12 @@ ACE::recv (ACE_HANDLE handle, return ACE::recv_i (handle, buf, n); else { +#if defined (ACE_HAS_READ_TIMEDWAIT) + ACE_Time_Value copy = *timeout; + copy += ACE_OS::gettimeofday (); + timespec_t ts = copy; + return ::read_timedwait (handle, buf, n, &ts); +#else int val = 0; if (ACE::enter_recv_timedwait (handle, timeout, val) == -1) return -1; @@ -515,6 +528,7 @@ ACE::recv (ACE_HANDLE handle, ACE::restore_non_blocking_mode (handle, val); return bytes_transferred; } +#endif /* ACE_HAS_READ_TIMEDWAIT */ } } @@ -528,6 +542,12 @@ ACE::recvmsg (ACE_HANDLE handle, return ACE_OS::recvmsg (handle, msg, flags); else { +#if defined (ACE_HAS_RECVMSG_TIMEDWAIT) + ACE_Time_Value copy = *timeout; + copy += ACE_OS::gettimeofday (); + timespec_t ts = copy; + return ::recvmsg_timedwait (handle, msg, flags, &ts); +#else int val = 0; if (ACE::enter_recv_timedwait (handle, timeout, val) == -1) return -1; @@ -537,6 +557,7 @@ ACE::recvmsg (ACE_HANDLE handle, ACE::restore_non_blocking_mode (handle, val); return bytes_transferred; } +#endif /* ACE_HAS_RECVMSG_TIMEDWAIT */ } } @@ -553,6 +574,12 @@ ACE::recvfrom (ACE_HANDLE handle, return ACE_OS::recvfrom (handle, buf, len, flags, addr, addrlen); else { +#if defined (ACE_HAS_RECVFROM_TIMEDWAIT) + ACE_Time_Value copy = *timeout; + copy += ACE_OS::gettimeofday (); + timespec_t ts = copy; + return ::recvfrom_timedwait (handle, buf, len, flags, addr, addrlen, &ts); +#else int val = 0; if (ACE::enter_recv_timedwait (handle, timeout, val) == -1) return -1; @@ -563,6 +590,7 @@ ACE::recvfrom (ACE_HANDLE handle, ACE::restore_non_blocking_mode (handle, val); return bytes_transferred; } +#endif /* ACE_HAS_RECVFROM_TIMEDWAIT */ } } @@ -967,6 +995,12 @@ ACE::recvv (ACE_HANDLE handle, return ACE_OS::recvv (handle, iov, iovcnt); else { +#if defined (ACE_HAS_READV_TIMEDWAIT) + ACE_Time_Value copy = *timeout; + copy += ACE_OS::gettimeofday (); + timespec_t ts = copy; + return ::readv_timedwait (handle, iov, iovcnt, &ts); +#else int val = 0; if (ACE::enter_recv_timedwait (handle, timeout, val) == -1) return -1; @@ -976,6 +1010,7 @@ ACE::recvv (ACE_HANDLE handle, ACE::restore_non_blocking_mode (handle, val); return bytes_transferred; } +#endif /* ACE_HAS_READV_TIMEDWAIT */ } } @@ -1230,6 +1265,12 @@ ACE::send (ACE_HANDLE handle, return ACE_OS::send (handle, (const char *) buf, n, flags); else { +#if defined (ACE_HAS_SEND_TIMEDWAIT) + ACE_Time_Value copy = *timeout; + copy += ACE_OS::gettimeofday(); + timespec_t ts = copy; + return ::send_timedwait (handle, buf, n, flags, &ts); +#else int val = 0; if (ACE::enter_send_timedwait (handle, timeout, val) == -1) return -1; @@ -1239,6 +1280,7 @@ ACE::send (ACE_HANDLE handle, ACE::restore_non_blocking_mode (handle, val); return bytes_transferred; } +#endif /* ACE_HAS_SEND_TIMEDWAIT */ } } @@ -1279,6 +1321,12 @@ ACE::send (ACE_HANDLE handle, return ACE::send_i (handle, buf, n); else { +#if defined (ACE_HAS_WRITE_TIMEDWAIT) + ACE_Time_Value copy = *timeout; + copy += ACE_OS::gettimeofday (); + timespec_t ts = copy; + return ::write_timedwait (handle, buf, n, &ts); +#else int val = 0; if (ACE::enter_send_timedwait (handle, timeout, val) == -1) return -1; @@ -1288,6 +1336,7 @@ ACE::send (ACE_HANDLE handle, ACE::restore_non_blocking_mode (handle, val); return bytes_transferred; } +#endif /* ACE_HAS_WRITE_TIMEDWAIT */ } } @@ -1301,6 +1350,12 @@ ACE::sendmsg (ACE_HANDLE handle, return ACE_OS::sendmsg (handle, msg, flags); else { +#if defined (ACE_HAS_SENDMSG_TIMEDWAIT) + ACE_Time_Value copy = *timeout; + copy += ACE_OS::gettimeofday (); + timespec_t ts = copy; + return ::sendmsg_timedwait (handle, msg, flags, &ts); +#else int val = 0; if (ACE::enter_send_timedwait (handle, timeout, val) == -1) return -1; @@ -1310,6 +1365,7 @@ ACE::sendmsg (ACE_HANDLE handle, ACE::restore_non_blocking_mode (handle, val); return bytes_transferred; } +#endif /* ACE_HAS_SENDMSG_TIMEDWAIT */ } } @@ -1326,6 +1382,12 @@ ACE::sendto (ACE_HANDLE handle, return ACE_OS::sendto (handle, buf, len, flags, addr, addrlen); else { +#if defined (ACE_HAS_SENDTO_TIMEDWAIT) + ACE_Time_Value copy = *timeout; + copy += ACE_OS::gettimeofday (); + timespec_t ts = copy; + return ::sendto_timedwait (handle, buf, len, flags, addr, addrlen, ts); +#else int val = 0; if (ACE::enter_send_timedwait (handle, timeout, val) == -1) return -1; @@ -1336,6 +1398,7 @@ ACE::sendto (ACE_HANDLE handle, ACE::restore_non_blocking_mode (handle, val); return bytes_transferred; } +#endif /* ACE_HAS_SENDTO_TIMEDWAIT */ } } @@ -1742,6 +1805,12 @@ ACE::sendv (ACE_HANDLE handle, return ACE_OS::sendv (handle, iov, iovcnt); else { +#if defined (ACE_HAS_WRITEV_TIMEDWAIT) + ACE_Time_Value copy = *timeout; + copy += ACE_OS::gettimeofday (); + timespec_t ts = copy; + return ::sendv_timedwait (handle, iov, iovcnt, &ts); +#else int val = 0; if (ACE::enter_send_timedwait (handle, timeout, val) == -1) return -1; @@ -1751,6 +1820,7 @@ ACE::sendv (ACE_HANDLE handle, ACE::restore_non_blocking_mode (handle, val); return bytes_transferred; } +#endif /* ACE_HAS_WRITEV_TIMEDWAIT */ } } @@ -2818,8 +2888,13 @@ ACE::fork (const ACE_TCHAR *program_name, } // Parent process waits for child to terminate. - ACE_exitcode status; +#if defined (ACE_HAS_UNION_WAIT) + union wait status; + if (pid < 0 || ACE_OS::waitpid (pid, &(status.w_status), 0) < 0) +#else + ACE_exitcode status; if (pid < 0 || ACE_OS::waitpid (pid, &status, 0) < 0) +#endif /* ACE_HAS_UNION_WAIT */ return -1; // child terminated by calling exit()? diff --git a/ACE/ace/FlReactor/ACE_FlReactor.pc.in b/ACE/ace/ACE_FlReactor.pc.in index c284481585d..c284481585d 100644 --- a/ACE/ace/FlReactor/ACE_FlReactor.pc.in +++ b/ACE/ace/ACE_FlReactor.pc.in diff --git a/ACE/ace/FlReactor/ACE_FlReactor_export.h b/ACE/ace/ACE_FlReactor_export.h index f46b66cb3f7..f46b66cb3f7 100644 --- a/ACE/ace/FlReactor/ACE_FlReactor_export.h +++ b/ACE/ace/ACE_FlReactor_export.h diff --git a/ACE/ace/QtReactor/ACE_QtReactor.pc.in b/ACE/ace/ACE_QtReactor.pc.in index 4e7aa83e6be..4e7aa83e6be 100644 --- a/ACE/ace/QtReactor/ACE_QtReactor.pc.in +++ b/ACE/ace/ACE_QtReactor.pc.in diff --git a/ACE/ace/QtReactor/ACE_QtReactor_export.h b/ACE/ace/ACE_QtReactor_export.h index f7192051a29..f7192051a29 100644 --- a/ACE/ace/QtReactor/ACE_QtReactor_export.h +++ b/ACE/ace/ACE_QtReactor_export.h diff --git a/ACE/ace/TkReactor/ACE_TkReactor.pc.in b/ACE/ace/ACE_TkReactor.pc.in index e53797e600c..e53797e600c 100644 --- a/ACE/ace/TkReactor/ACE_TkReactor.pc.in +++ b/ACE/ace/ACE_TkReactor.pc.in diff --git a/ACE/ace/TkReactor/ACE_TkReactor_export.h b/ACE/ace/ACE_TkReactor_export.h index bd74f861e60..bd74f861e60 100644 --- a/ACE/ace/TkReactor/ACE_TkReactor_export.h +++ b/ACE/ace/ACE_TkReactor_export.h diff --git a/ACE/ace/XtReactor/ACE_XtReactor.pc.in b/ACE/ace/ACE_XtReactor.pc.in index 118c61c5632..118c61c5632 100644 --- a/ACE/ace/XtReactor/ACE_XtReactor.pc.in +++ b/ACE/ace/ACE_XtReactor.pc.in diff --git a/ACE/ace/XtReactor/ACE_XtReactor_export.h b/ACE/ace/ACE_XtReactor_export.h index 3d9049cb7af..3d9049cb7af 100644 --- a/ACE/ace/XtReactor/ACE_XtReactor_export.h +++ b/ACE/ace/ACE_XtReactor_export.h diff --git a/ACE/ace/ARGV.cpp b/ACE/ace/ARGV.cpp index 6117ded088a..8ef7d441afb 100644 --- a/ACE/ace/ARGV.cpp +++ b/ACE/ace/ARGV.cpp @@ -17,25 +17,10 @@ ACE_RCSID(ace, ARGV, "$Id$") // Open versioned namespace, if enabled by the user. ACE_BEGIN_VERSIONED_NAMESPACE_DECL -ACE_ALLOC_HOOK_DEFINE (ACE_ARGV_Queue_Entry) ACE_ALLOC_HOOK_DEFINE (ACE_ARGV) template <typename CHAR_TYPE> void -ACE_ARGV_Queue_Entry_T<CHAR_TYPE>::dump (void) const -{ -#if defined (ACE_HAS_DUMP) - ACE_TRACE ("ACE_ARGV_Queue_Entry_T::dump"); - - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("arg_ = %s"), this->arg_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("quote_arg_ = %d"), (int)this->quote_arg_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -#endif /* ACE_HAS_DUMP */ -} - -template <typename CHAR_TYPE> -void ACE_ARGV_T<CHAR_TYPE>::dump (void) const { #if defined (ACE_HAS_DUMP) @@ -76,6 +61,13 @@ ACE_ARGV_T<CHAR_TYPE>::string_to_argv (void) } template <typename CHAR_TYPE> +int +ACE_ARGV_T<CHAR_TYPE>::argv_to_string (CHAR_TYPE **argv, CHAR_TYPE *&buf) +{ + return ACE_OS::argv_to_string (argv, buf); +} + +template <typename CHAR_TYPE> ACE_ARGV_T<CHAR_TYPE>::ACE_ARGV_T (const CHAR_TYPE buf[], bool substitute_env_args) : substitute_env_args_ (substitute_env_args), @@ -105,8 +97,7 @@ ACE_ARGV_T<CHAR_TYPE>::ACE_ARGV_T (const CHAR_TYPE buf[], template <typename CHAR_TYPE> ACE_ARGV_T<CHAR_TYPE>::ACE_ARGV_T (CHAR_TYPE *argv[], - bool substitute_env_args, - bool quote_arg) + bool substitute_env_args) : substitute_env_args_ (substitute_env_args), iterative_ (false), argc_ (0), @@ -120,17 +111,13 @@ ACE_ARGV_T<CHAR_TYPE>::ACE_ARGV_T (CHAR_TYPE *argv[], if (argv == 0 || argv[0] == 0) return; - this->argc_ = ACE_OS::argv_to_string (argv, - this->buf_, - substitute_env_args, - quote_arg); + this->argc_ = ACE_OS::argv_to_string (argv, this->buf_, substitute_env_args); } template <typename CHAR_TYPE> ACE_ARGV_T<CHAR_TYPE>::ACE_ARGV_T (CHAR_TYPE *first_argv[], CHAR_TYPE *second_argv[], - bool substitute_env_args, - bool quote_args) + bool substitute_env_args) : substitute_env_args_ (substitute_env_args), iterative_ (false), argc_ (0), @@ -141,29 +128,17 @@ ACE_ARGV_T<CHAR_TYPE>::ACE_ARGV_T (CHAR_TYPE *first_argv[], { ACE_TRACE ("ACE_ARGV_T::ACE_ARGV_T CHAR_TYPE*[] + CHAR_TYPE *[] to CHAR_TYPE[]"); - int first_argc = 0; - int second_argc = 0; + int first_argc; + int second_argc; - CHAR_TYPE *first_buf = 0; - CHAR_TYPE *second_buf = 0; + CHAR_TYPE *first_buf; + CHAR_TYPE *second_buf; // convert the first argv to a string - if (first_argv != 0 && first_argv[0] != 0) - { - first_argc = ACE_OS::argv_to_string (first_argv, - first_buf, - substitute_env_args, - quote_args); - } + first_argc = this->argv_to_string (first_argv, first_buf); // convert the second argv to a string - if (second_argv != 0 && second_argv[0] != 0) - { - second_argc = ACE_OS::argv_to_string (second_argv, - second_buf, - substitute_env_args, - quote_args); - } + second_argc = this->argv_to_string (second_argv, second_buf); // Add the number of arguments in both the argvs. this->argc_ = first_argc + second_argc; @@ -182,7 +157,9 @@ ACE_ARGV_T<CHAR_TYPE>::ACE_ARGV_T (CHAR_TYPE *first_argv[], ACE_OS::strcat (this->buf_, second_buf); // Delete the first and second buffers + delete [] first_buf; + delete [] second_buf; } @@ -203,7 +180,7 @@ ACE_ARGV_T<CHAR_TYPE>::ACE_ARGV_T (bool substitute_env_args) template <typename CHAR_TYPE> int -ACE_ARGV_T<CHAR_TYPE>::add (const CHAR_TYPE *next_arg, bool quote_arg) +ACE_ARGV_T<CHAR_TYPE>::add (const CHAR_TYPE *next_arg) { // Only allow this to work in the "iterative" verion -- the // ACE_ARGVs created with the one argument constructor. @@ -213,25 +190,14 @@ ACE_ARGV_T<CHAR_TYPE>::add (const CHAR_TYPE *next_arg, bool quote_arg) return -1; } - this->length_ += ACE_OS::strlen (next_arg); - if (quote_arg && ACE_OS::strchr (next_arg, ' ') != 0) - { - this->length_ += 2; - if (ACE_OS::strchr (next_arg, '"') != 0) - for (const CHAR_TYPE * p = next_arg; *p != '\0'; ++p) - if (*p == '"') ++this->length_; - } - else - { - quote_arg = false; - } - // Put the new argument at the end of the queue. - if (this->queue_.enqueue_tail (ACE_ARGV_Queue_Entry_T<CHAR_TYPE> (next_arg, quote_arg)) == -1) + if (this->queue_.enqueue_tail (const_cast <CHAR_TYPE *> (next_arg)) == -1) ACE_ERROR_RETURN ((LM_ERROR, ACE_LIB_TEXT ("Can't add more to ARGV queue")), -1); + this->length_ += ACE_OS::strlen (next_arg); + this->argc_++; // Wipe argv_ and buf_ away so that they will be recreated if the @@ -253,10 +219,10 @@ ACE_ARGV_T<CHAR_TYPE>::add (const CHAR_TYPE *next_arg, bool quote_arg) template <typename CHAR_TYPE> int -ACE_ARGV_T<CHAR_TYPE>::add (CHAR_TYPE *argv[], bool quote_args) +ACE_ARGV_T<CHAR_TYPE>::add (CHAR_TYPE *argv[]) { for (int i = 0; argv[i] != 0; i++) - if (this->add (argv[i], quote_args) == -1) + if (this->add (argv[i]) == -1) return -1; return 0; @@ -297,58 +263,36 @@ ACE_ARGV_T<CHAR_TYPE>::create_buf_from_queue (void) -1); // Get an iterator over the queue - ACE_Unbounded_Queue_Iterator<ACE_ARGV_Queue_Entry_T<CHAR_TYPE> > iter (this->queue_); + ACE_Unbounded_Queue_Iterator<CHAR_TYPE *> iter (this->queue_); - ACE_ARGV_Queue_Entry_T<CHAR_TYPE> *arg = 0; + CHAR_TYPE **arg = 0; CHAR_TYPE *ptr = this->buf_; size_t len; + int more = 0; while (!iter.done ()) { // Get next argument from the queue. iter.next (arg); - iter.advance (); - - if (arg->quote_arg_) - { - *ptr++ = '"'; - if (ACE_OS::strchr (arg->arg_, '"') != 0) - { - for (const CHAR_TYPE * p = arg->arg_; *p != '\0'; ++p) - { - if (*p == '"') *ptr++ = '\\'; - *ptr++ = *p; - } - } - else - { - len = ACE_OS::strlen (arg->arg_); - // Copy the argument into buf_ - ACE_OS::memcpy ((void *) ptr, - (const void *) (arg->arg_), - len * sizeof (CHAR_TYPE)); - // Move the pointer down. - ptr += len; - } - *ptr++ = '"'; - } - else - { - len = ACE_OS::strlen (arg->arg_); - // Copy the argument into buf_ - ACE_OS::memcpy ((void *) ptr, - (const void *) (arg->arg_), - len * sizeof (CHAR_TYPE)); - // Move the pointer down. - ptr += len; - } + + more = iter.advance (); + + len = ACE_OS::strlen (*arg); + + // Copy the argument into buf_ + ACE_OS::memcpy ((void *) ptr, + (const void *) (*arg), + len * sizeof (CHAR_TYPE)); + // Move the pointer down. + ptr += len; // Put in an argument separating space. - *ptr++ = ' '; + if (more != 0) + *ptr++ = ' '; } // Put in the NUL terminator - ptr[-1] = '\0'; + *ptr = '\0'; return 0; } diff --git a/ACE/ace/ARGV.h b/ACE/ace/ARGV.h index 15b583dbbf4..f9540fc4824 100644 --- a/ACE/ace/ARGV.h +++ b/ACE/ace/ARGV.h @@ -27,54 +27,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL /** - * @class ACE_ARGV_Queue_Entry_T - * - * @brief An entry in the queue which keeps user supplied arguments. - */ -template <typename CHAR_TYPE> -class ACE_ARGV_Queue_Entry_T -{ -public: - // = Initialization and termination. - /// Initialize a ACE_ARGV_Queue_Entry_T. - ACE_ARGV_Queue_Entry_T (void); - - /** - * Initialize a ACE_ARGV_Queue_Entry_T. - * - * @param arg Pointer to an argument - * - * @param quote_arg The argument @a arg need to be quoted - * while adding to the vector. - */ - ACE_ARGV_Queue_Entry_T (const CHAR_TYPE *arg, - bool quote_arg); - - /** - * Initialize a ACE_ARGV_Queue_Entry_T. - * - * @param entry Pointer to a queue entry - */ - ACE_ARGV_Queue_Entry_T (const ACE_ARGV_Queue_Entry_T<CHAR_TYPE> &entry); - - /// We need this destructor to keep some compilers from complaining. - /// It's just a no-op, however. - ~ACE_ARGV_Queue_Entry_T (void); - - /// Dump the state of this object. - void dump (void) const; - - // Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - - /// Pointer to the argument. - const CHAR_TYPE * arg_; - - /// The argument need to be quoted while adding to the vector. - bool quote_arg_; -}; - -/** * @class ACE_ARGV_T * * @brief Builds a counted argument vector (ala argc/argv) from either @@ -127,13 +79,9 @@ public: * an environment variable reference (e.g., @c $VAR) will have * its environment variable value in the resultant vector * in place of the environment variable name. - * - * @param quote_args If non-zero each argument @a argv[i] needs to - * be enclosed in double quotes ('"'). */ ACE_ARGV_T (CHAR_TYPE *argv[], - bool substitute_env_args = true, - bool quote_args = false); + bool substitute_env_args = true); /** * Initializes the argument vector from two combined argument vectors. @@ -148,15 +96,10 @@ public: * reference (e.g., @c $VAR) will have its environment * variable value in the resultant vector in place * of the environment variable name. - * - * @param quote_args If non-zero each arguments @a first_argv[i] and - * @a second_argv[i] needs to be enclosed - * in double quotes ('"'). */ ACE_ARGV_T (CHAR_TYPE *first_argv[], CHAR_TYPE *second_argv[], - bool substitute_env_args = true, - bool quote_args = false); + bool substitute_env_args = true); /** * Initialize this object so arguments can be added later using one @@ -218,14 +161,11 @@ public: * * @param next_arg Pointer to the next argument to add to the vector. * - * @param quote_arg The argument @a next_arg need to be quoted while - * adding to the vector. - * * @retval 0 on success; -1 on failure. Most likely @c errno values are: * - EINVAL: This object is not in iterative mode. * - ENOMEM: Not enough memory available to save @a next_arg. */ - int add (const CHAR_TYPE *next_arg, bool quote_arg = false); + int add (const CHAR_TYPE *next_arg); /** * Add an array of arguments. This only works in the iterative mode. @@ -238,14 +178,11 @@ public: * @param argv Pointers to the arguments to add to the vector. * @a argv must be terminated by a 0 pointer. * - * @param quote_args If non-zero each argument @a argv[i] needs to - * be enclosed in double quotes ('"'). - * * @retval 0 on success; -1 on failure. Most likely @c errno values are: * - EINVAL: This object is not in iterative mode. * - ENOMEM: Not enough memory available to save @a next_arg. */ - int add (CHAR_TYPE *argv[], bool quote_args = false); + int add (CHAR_TYPE *argv[]); private: /// Copy constructor not implemented. @@ -260,6 +197,10 @@ private: /// Converts buf_ into the CHAR_TYPE *argv[] format. int string_to_argv (void); + /// Returns the string created from argv in buf and + /// returns the number of arguments. + int argv_to_string (CHAR_TYPE **argv, CHAR_TYPE *&buf); + /// Replace args with environment variable values? bool substitute_env_args_; @@ -280,10 +221,9 @@ private: /// Queue which keeps user supplied arguments. This is only /// active in the "iterative" mode. - ACE_Unbounded_Queue<ACE_ARGV_Queue_Entry_T<CHAR_TYPE> > queue_; + ACE_Unbounded_Queue<CHAR_TYPE *> queue_; }; -typedef ACE_ARGV_Queue_Entry_T<ACE_TCHAR> ACE_ARGV_Queue_Entry; typedef ACE_ARGV_T<ACE_TCHAR> ACE_ARGV; // Close versioned namespace, if enabled by the user. diff --git a/ACE/ace/ARGV.inl b/ACE/ace/ARGV.inl index e84166f49ba..6924a95cca4 100644 --- a/ACE/ace/ARGV.inl +++ b/ACE/ace/ARGV.inl @@ -6,47 +6,12 @@ // Open versioned namespace, if enabled by the user. ACE_BEGIN_VERSIONED_NAMESPACE_DECL -template <typename CHAR_TYPE> ACE_INLINE -ACE_ARGV_Queue_Entry_T<CHAR_TYPE>::ACE_ARGV_Queue_Entry_T (void) - : arg_(0), - quote_arg_(false) -{ - // No-op -} - -template <typename CHAR_TYPE> ACE_INLINE -ACE_ARGV_Queue_Entry_T<CHAR_TYPE>::ACE_ARGV_Queue_Entry_T (const CHAR_TYPE *arg, - bool quote_arg) - : arg_(arg), - quote_arg_(quote_arg) -{ - // No-op -} - -template <typename CHAR_TYPE> ACE_INLINE -ACE_ARGV_Queue_Entry_T<CHAR_TYPE>::ACE_ARGV_Queue_Entry_T (const ACE_ARGV_Queue_Entry_T<CHAR_TYPE> &entry) - : arg_(entry.arg_), - quote_arg_(entry.quote_arg_) -{ - // No-op -} - -template <typename CHAR_TYPE> ACE_INLINE -ACE_ARGV_Queue_Entry_T<CHAR_TYPE>::~ACE_ARGV_Queue_Entry_T (void) -{ - // No-op just to keep some compilers happy... -} - // Return the number of args template <typename CHAR_TYPE> ACE_INLINE int ACE_ARGV_T<CHAR_TYPE>::argc (void) const { ACE_TRACE ("ACE_ARGV_T::argc"); - // Try to create the argv_ if it isn't there - ACE_ARGV_T<CHAR_TYPE> *nonconst_this = - const_cast <ACE_ARGV_T<CHAR_TYPE> *> (this); - (void) nonconst_this->argv (); return this->argc_; } diff --git a/ACE/ace/Asynch_Acceptor.cpp b/ACE/ace/Asynch_Acceptor.cpp index fd7525a30c8..374658afefe 100644 --- a/ACE/ace/Asynch_Acceptor.cpp +++ b/ACE/ace/Asynch_Acceptor.cpp @@ -12,7 +12,7 @@ ACE_RCSID(ace, Asynch_Acceptor, "$Id$") -#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS) +#if (defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS)) && !defined(ACE_HAS_WINCE) // This only works on platforms that support async i/o. #include "ace/OS_Errno.h" @@ -239,6 +239,8 @@ ACE_Asynch_Acceptor<HANDLER>::accept (size_t bytes_to_read, const void *act) template <class HANDLER> void ACE_Asynch_Acceptor<HANDLER>::handle_accept (const ACE_Asynch_Accept::Result &result) { +#if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) || (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) || defined (ACE_HAS_AIO_CALLS) + ACE_TRACE ("ACE_Asynch_Acceptor<>::handle_accept"); // Variable for error tracking @@ -250,7 +252,7 @@ ACE_Asynch_Acceptor<HANDLER>::handle_accept (const ACE_Asynch_Accept::Result &re error = 1; } -#if defined (ACE_WIN32) +#if !defined (ACE_HAS_AIO_CALLS) // In order to use accept handle with other Window Sockets 1.1 // functions, we call the setsockopt function with the // SO_UPDATE_ACCEPT_CONTEXT option. This option initializes the @@ -265,7 +267,7 @@ ACE_Asynch_Acceptor<HANDLER>::handle_accept (const ACE_Asynch_Accept::Result &re { error = 1; } -#endif /* ACE_WIN32 */ +#endif /* ACE_HAS_AIO_CALLS */ // Parse address. ACE_INET_Addr local_address; @@ -340,6 +342,7 @@ ACE_Asynch_Acceptor<HANDLER>::handle_accept (const ACE_Asynch_Accept::Result &re #endif ) this->accept (this->bytes_to_read_); +#endif /* (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) || (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) || defined (ACE_HAS_AIO_CALLS */ } template <class HANDLER> int @@ -367,14 +370,14 @@ ACE_Asynch_Acceptor<HANDLER>::cancel (void) // All I/O operations that are canceled will complete with the error // ERROR_OPERATION_ABORTED. All completion notifications for the I/O // operations will occur normally. -#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) && \ - (defined (_MSC_VER) || defined (__BORLANDC__)) +#if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) \ + && ( defined (_MSC_VER) || (defined (__BORLANDC__))) return (int) ::CancelIo (this->listen_handle_); #else // Supported now return this->asynch_accept_.cancel(); -#endif /* defined (ACE_HAS_WIN32_OVERLAPPED_IO) && (defined (_MSC_VER)) || defined (__BORLANDC__)) */ +#endif /* (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) && ((defined (_MSC_VER)) || (defined (__BORLANDC__))) */ } template <class HANDLER> void @@ -393,7 +396,7 @@ ACE_Asynch_Acceptor<HANDLER>::parse_address (const str.get_local_addr (local_address); str.get_remote_addr (remote_address); -#elif defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) +#elif (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) || (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) ACE_Message_Block &message_block = result.message_block (); @@ -424,7 +427,7 @@ ACE_Asynch_Acceptor<HANDLER>::parse_address (const #else // just in case errno = ENOTSUP; -#endif /* defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) */ +#endif /* (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) || (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) */ return; } diff --git a/ACE/ace/Asynch_Acceptor.h b/ACE/ace/Asynch_Acceptor.h index f615557feb8..80ae20a3667 100644 --- a/ACE/ace/Asynch_Acceptor.h +++ b/ACE/ace/Asynch_Acceptor.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS) +#if (defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS)) && !defined(ACE_HAS_WINCE) // This only works on platforms that support async i/o. #include "ace/Default_Constants.h" @@ -291,6 +291,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL #pragma implementation ("Asynch_Acceptor.cpp") #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ -#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */ +#endif /* ACE_WIN32 || ACE_HAS_AIO_CALLS */ #include /**/ "ace/post.h" #endif /* ACE_ASYNCH_ACCEPTOR_H */ diff --git a/ACE/ace/Asynch_IO.cpp b/ACE/ace/Asynch_IO.cpp index 07027962100..cfcaf28aa2c 100644 --- a/ACE/ace/Asynch_IO.cpp +++ b/ACE/ace/Asynch_IO.cpp @@ -4,7 +4,7 @@ ACE_RCSID(ace, Asynch_IO, "$Id$") -#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS) +#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)) // This only works on platforms with Asynchronous IO #include "ace/Proactor.h" @@ -187,7 +187,7 @@ ACE_Asynch_Read_Stream::read (ACE_Message_Block &message_block, signal_number); } -#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) +#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) int ACE_Asynch_Read_Stream::readv (ACE_Message_Block &message_block, size_t bytes_to_read, @@ -201,7 +201,7 @@ ACE_Asynch_Read_Stream::readv (ACE_Message_Block &message_block, priority, signal_number); } -#endif /* ACE_HAS_WIN32_OVERLAPPED_IO */ +#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) */ ACE_Asynch_Operation_Impl * ACE_Asynch_Read_Stream::implementation (void) const @@ -295,7 +295,7 @@ ACE_Asynch_Write_Stream::write (ACE_Message_Block &message_block, signal_number); } -#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) +#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) int ACE_Asynch_Write_Stream::writev (ACE_Message_Block &message_block, size_t bytes_to_write, @@ -309,7 +309,7 @@ ACE_Asynch_Write_Stream::writev (ACE_Message_Block &message_block, priority, signal_number); } -#endif /* ACE_HAS_WIN32_OVERLAPPED_IO */ +#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) */ ACE_Asynch_Operation_Impl * ACE_Asynch_Write_Stream::implementation (void) const @@ -1330,6 +1330,6 @@ ACE_Asynch_Write_Dgram::Result::~Result (void) { } -#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */ +#endif /* ACE_WIN32 || ACE_HAS_AIO_CALLS */ ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Asynch_IO.h b/ACE/ace/Asynch_IO.h index 873ef6f40e9..c4ae5c8ca3b 100644 --- a/ACE/ace/Asynch_IO.h +++ b/ACE/ace/Asynch_IO.h @@ -33,7 +33,7 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS) +#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)) #include "ace/Synch_Traits.h" #if defined (ACE_HAS_THREADS) @@ -49,7 +49,8 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -# if defined (ACE_HAS_WIN32_OVERLAPPED_IO) +# if defined (ACE_WIN32) && ! defined (ACE_HAS_WINCE) \ + && ! defined (ACE_HAS_PHARLAP) typedef TRANSMIT_FILE_BUFFERS ACE_TRANSMIT_FILE_BUFFERS; typedef LPTRANSMIT_FILE_BUFFERS ACE_LPTRANSMIT_FILE_BUFFERS; typedef PTRANSMIT_FILE_BUFFERS ACE_PTRANSMIT_FILE_BUFFERS; @@ -58,7 +59,7 @@ typedef PTRANSMIT_FILE_BUFFERS ACE_PTRANSMIT_FILE_BUFFERS; # define ACE_STATUS_TIMEOUT STATUS_TIMEOUT # define ACE_WAIT_FAILED WAIT_FAILED # define ACE_WAIT_TIMEOUT WAIT_TIMEOUT -# else /* ACE_HAS_WIN32_OVERLAPPED_IO */ +# else /* ACE_WIN32 */ struct ACE_TRANSMIT_FILE_BUFFERS { void *Head; @@ -75,7 +76,7 @@ typedef ACE_TRANSMIT_FILE_BUFFERS* ACE_LPTRANSMIT_FILE_BUFFERS; # define ACE_STATUS_TIMEOUT LONG_MAX # define ACE_WAIT_FAILED LONG_MAX # define ACE_WAIT_TIMEOUT LONG_MAX -# endif /* ACE_HAS_WIN32_OVERLAPPED_IO */ +# endif /* ACE_WIN32 */ // Forward declarations class ACE_Proactor; @@ -337,7 +338,7 @@ public: int priority = 0, int signal_number = ACE_SIGRTMIN); -#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) +#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) /** * Same as above but with scatter support, through chaining of composite * message blocks using the continuation field. @@ -347,7 +348,7 @@ public: const void *act = 0, int priority = 0, int signal_number = ACE_SIGRTMIN); -#endif /* defined (ACE_HAS_WIN32_OVERLAPPED_IO) */ +#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) */ /// Return the underlying implementation class. // (this should be protected...) @@ -461,7 +462,7 @@ public: int priority = 0, int signal_number = ACE_SIGRTMIN); -#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) +#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) /** * Same as above but with gather support, through chaining of composite * message blocks using the continuation field. @@ -471,7 +472,7 @@ public: const void *act = 0, int priority = 0, int signal_number = ACE_SIGRTMIN); -#endif /* defined (ACE_HAS_WIN32_OVERLAPPED_IO) */ +#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) */ /// Return the underlying implementation class. /// @todo (this should be protected...) diff --git a/ACE/ace/Asynch_IO_Impl.cpp b/ACE/ace/Asynch_IO_Impl.cpp index 5349f5e7ca1..8dba289d6ec 100644 --- a/ACE/ace/Asynch_IO_Impl.cpp +++ b/ACE/ace/Asynch_IO_Impl.cpp @@ -2,7 +2,7 @@ #include "ace/Asynch_IO_Impl.h" -#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS) +#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)) // This only works on Win32 platforms and on Unix platforms supporting // aio calls. @@ -114,4 +114,4 @@ ACE_Asynch_Write_Dgram_Result_Impl::ACE_Asynch_Write_Dgram_Result_Impl (void) ACE_END_VERSIONED_NAMESPACE_DECL -#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */ +#endif /* ACE_WIN32 || ACE_HAS_WINCE */ diff --git a/ACE/ace/Asynch_IO_Impl.h b/ACE/ace/Asynch_IO_Impl.h index b1af7a57d25..3e0af19f2e7 100644 --- a/ACE/ace/Asynch_IO_Impl.h +++ b/ACE/ace/Asynch_IO_Impl.h @@ -30,7 +30,7 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS) +#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)) // This only works on Win32 platforms and on Unix platforms supporting // aio calls. @@ -811,6 +811,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Asynch_IO_Impl.inl" #endif /* __ACE_INLINE__ */ -#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */ +#endif /* ACE_HAS_AIO_CALLS || !ACE_HAS_WINCE && ACE_WIN32 */ #include /**/ "ace/post.h" #endif /* ACE_ASYNCH_IO_IMPL_H */ diff --git a/ACE/ace/Atomic_Op_T.h b/ACE/ace/Atomic_Op_T.h index ea5c5d201c4..35d1ceec8a5 100644 --- a/ACE/ace/Atomic_Op_T.h +++ b/ACE/ace/Atomic_Op_T.h @@ -46,57 +46,57 @@ class ACE_Atomic_Op_Ex public: // = Initialization methods. - /// Initialize @c value_ to 0. + /// Initialize <value_> to 0. ACE_Atomic_Op_Ex (ACE_LOCK &mtx); - /// Initialize @c value_ to c. + /// Initialize <value_> to c. ACE_Atomic_Op_Ex (ACE_LOCK &mtx, const TYPE &c); // = Accessors. - /// Atomically pre-increment @c value_. + /// Atomically pre-increment <value_>. TYPE operator++ (void); - /// Atomically post-increment @c value_. + /// Atomically post-increment <value_>. TYPE operator++ (int); - /// Atomically increment @c value_ by rhs. + /// Atomically increment <value_> by rhs. TYPE operator+= (const TYPE &rhs); - /// Atomically pre-decrement @c value_. + /// Atomically pre-decrement <value_>. TYPE operator-- (void); - /// Atomically post-decrement @c value_. + /// Atomically post-decrement <value_>. TYPE operator-- (int); - /// Atomically decrement @c value_ by rhs. + /// Atomically decrement <value_> by rhs. TYPE operator-= (const TYPE &rhs); - /// Atomically compare @c value_ with rhs. + /// Atomically compare <value_> with rhs. bool operator== (const TYPE &rhs) const; - /// Atomically compare @c value_ with rhs. + /// Atomically compare <value_> with rhs. bool operator!= (const TYPE &rhs) const; - /// Atomically check if @c value_ greater than or equal to rhs. + /// Atomically check if <value_> greater than or equal to rhs. bool operator>= (const TYPE &rhs) const; - /// Atomically check if @c value_ greater than rhs. + /// Atomically check if <value_> greater than rhs. bool operator> (const TYPE &rhs) const; - /// Atomically check if @c value_ less than or equal to rhs. + /// Atomically check if <value_> less than or equal to rhs. bool operator<= (const TYPE &rhs) const; - /// Atomically check if @c value_ less than rhs. + /// Atomically check if <value_> less than rhs. bool operator< (const TYPE &rhs) const; - /// Atomically assign rhs to @c value_. + /// Atomically assign rhs to <value_>. ACE_Atomic_Op_Ex<ACE_LOCK, TYPE> &operator= (const TYPE &rhs); - /// Atomically assign <rhs> to @c value_. + /// Atomically assign <rhs> to <value_>. ACE_Atomic_Op_Ex<ACE_LOCK, TYPE> &operator= (const ACE_Atomic_Op_Ex<ACE_LOCK, TYPE> &rhs); - /// Explicitly return @c value_. + /// Explicitly return <value_>. TYPE value (void) const; /// Dump the state of an object. @@ -118,7 +118,7 @@ public: ACE_LOCK &mutex (void); /** - * Explicitly return @c value_ (by reference). This gives the user + * Explicitly return <value_> (by reference). This gives the user * full, unrestricted access to the underlying value. This method * will usually be used in conjunction with explicit access to the * lock. Use with care ;-) @@ -151,58 +151,58 @@ template <class ACE_LOCK, class TYPE> class ACE_Atomic_Op { public: - /// Initialize @c value_ to 0. + /// Initialize <value_> to 0. ACE_Atomic_Op (void); - /// Initialize @c value_ to c. + /// Initialize <value_> to c. ACE_Atomic_Op (const TYPE &c); /// Manage copying... ACE_Atomic_Op (const ACE_Atomic_Op<ACE_LOCK, TYPE> &c); - /// Atomically assign rhs to @c value_. + /// Atomically assign rhs to <value_>. ACE_Atomic_Op<ACE_LOCK, TYPE> &operator= (const TYPE &rhs); - /// Atomically assign <rhs> to @c value_. + /// Atomically assign <rhs> to <value_>. ACE_Atomic_Op<ACE_LOCK, TYPE> &operator= (const ACE_Atomic_Op<ACE_LOCK, TYPE> &rhs); - /// Atomically pre-increment @c value_. + /// Atomically pre-increment <value_>. TYPE operator++ (void); - /// Atomically post-increment @c value_. + /// Atomically post-increment <value_>. TYPE operator++ (int); - /// Atomically increment @c value_ by rhs. + /// Atomically increment <value_> by rhs. TYPE operator+= (const TYPE &rhs); - /// Atomically pre-decrement @c value_. + /// Atomically pre-decrement <value_>. TYPE operator-- (void); - /// Atomically post-decrement @c value_. + /// Atomically post-decrement <value_>. TYPE operator-- (int); - /// Atomically decrement @c value_ by rhs. + /// Atomically decrement <value_> by rhs. TYPE operator-= (const TYPE &rhs); - /// Atomically compare @c value_ with rhs. + /// Atomically compare <value_> with rhs. bool operator== (const TYPE &rhs) const; - /// Atomically compare @c value_ with rhs. + /// Atomically compare <value_> with rhs. bool operator!= (const TYPE &rhs) const; - /// Atomically check if @c value_ greater than or equal to rhs. + /// Atomically check if <value_> greater than or equal to rhs. bool operator>= (const TYPE &rhs) const; - /// Atomically check if @c value_ greater than rhs. + /// Atomically check if <value_> greater than rhs. bool operator> (const TYPE &rhs) const; - /// Atomically check if @c value_ less than or equal to rhs. + /// Atomically check if <value_> less than or equal to rhs. bool operator<= (const TYPE &rhs) const; - /// Atomically check if @c value_ less than rhs. + /// Atomically check if <value_> less than rhs. bool operator< (const TYPE &rhs) const; - /// Explicitly return @c value_. + /// Explicitly return <value_>. TYPE value (void) const; /// Dump the state of an object. @@ -221,7 +221,7 @@ public: ACE_LOCK &mutex (void); /** - * Explicitly return @c value_ (by reference). This gives the user + * Explicitly return <value_> (by reference). This gives the user * full, unrestricted access to the underlying value. This method * will usually be used in conjunction with explicit access to the * lock. Use with care ;-) diff --git a/ACE/ace/Basic_Stats.cpp b/ACE/ace/Basic_Stats.cpp index 0f00f5b7332..f81b29bfcaa 100644 --- a/ACE/ace/Basic_Stats.cpp +++ b/ACE/ace/Basic_Stats.cpp @@ -70,9 +70,6 @@ ACE_Basic_Stats::dump_results (const ACE_TCHAR *msg, l_avg, l_max, this->max_at_)); -#else - ACE_UNUSED_ARG (msg); - ACE_UNUSED_ARG (sf); #endif /* ACE_NLOGGING */ } diff --git a/ACE/ace/Basic_Types.h b/ACE/ace/Basic_Types.h index 48a0becdb12..367f3ace86d 100644 --- a/ACE/ace/Basic_Types.h +++ b/ACE/ace/Basic_Types.h @@ -392,8 +392,8 @@ ACE_END_VERSIONED_NAMESPACE_DECL # else /* ! BYTE_ORDER && ! __BYTE_ORDER */ // We weren't explicitly told, so we have to figure it out . . . # if defined (i386) || defined (__i386__) || defined (_M_IX86) || \ - defined (vax) || defined (__alpha) || defined (__LITTLE_ENDIAN__) || \ - defined (ARM) || defined (_M_IA64) || defined (__ia64__) || \ + defined (vax) || defined (__alpha) || defined (__LITTLE_ENDIAN__) ||\ + defined (ARM) || defined (_M_IA64) || \ defined (_M_AMD64) || defined (__amd64) // We know these are little endian. # define ACE_LITTLE_ENDIAN 0x0123 diff --git a/ACE/ace/CDR_Stream.cpp b/ACE/ace/CDR_Stream.cpp index b033d8a1587..516e4fd2c63 100644 --- a/ACE/ace/CDR_Stream.cpp +++ b/ACE/ace/CDR_Stream.cpp @@ -677,51 +677,6 @@ ACE_OutputCDR::write_boolean_array (const ACE_CDR::Boolean* x, return this->good_bit (); } - -int -ACE_OutputCDR::consolidate (void) -{ - // Optimize by only doing something if we need to - if (this->current_ != &this->start_) - { - // Set the number of bytes in the top-level block, reallocating - // if necessary. The rd_ptr and wr_ptr remain at the original offsets - // into the buffer, even if it is reallocated. - // Return an error if the allocation failed. - size_t newsize = - ACE_CDR::first_size (this->total_length () - + ACE_CDR::MAX_ALIGNMENT); - if (this->start_.size (newsize) < 0) - { - return -1; - } - - // Consolidate the chain into the first block. NOTE that - // ACE_CDR::consolidate can not be used since we don't want to - // overwrite what is already in the first block. We just append it since - // the read and write pointers weren't affected by the resizing above. - // We also don't have to worry about alignment since the start block is - // already aligned. - // NOTE also we know there is a continuation since we checked for it - // above. There is therefore no reason to check for a 0 continuation - // field here. - ACE_Message_Block *cont = this->start_.cont (); - for (const ACE_Message_Block* i = cont; i != 0; i = i->cont ()) - { - this->start_.copy (i->rd_ptr (), i->length ()); - } - - // Release the old blocks that were consolidated and reset the - // current_ and current_is_writable_ to reflect the single used block. - ACE_Message_Block::release (cont); - this->start_.cont (0); - this->current_ = &this->start_; - this->current_is_writable_ = true; - } - - return 0; -} - ACE_Message_Block* ACE_OutputCDR::find (char* loc) diff --git a/ACE/ace/CDR_Stream.h b/ACE/ace/CDR_Stream.h index 40504e1a2cf..3e4d23a92dc 100644 --- a/ACE/ace/CDR_Stream.h +++ b/ACE/ace/CDR_Stream.h @@ -138,8 +138,8 @@ public: /** * Create an output stream from an arbitrary data block, care must be * exercised with alignment, because this contructor will align if - * needed. In this case @a data_block will not point to the - * start of the output stream. begin()->rd_ptr() points to the start + * needed. In this case the <data_block> buffer will not point to the + * start off the output stream. begin()->rd_prt() points to the start * off the output stream. See ACE_ptr_align_binary() to properly align a * pointer and use ACE_CDR::MAX_ALIGNMENT for the correct alignment. */ @@ -338,15 +338,6 @@ public: /// Return the <current_> message block in chain. const ACE_Message_Block *current (void) const; - /// Replace the message block chain with a single message block. - /** - * Upon successful completion, there will be a single message block - * containing the data from the complete message block chain. - * - * @note The only expected error is to run out of memory. - */ - int consolidate (void); - /** * Access the underlying buffer (read only). @note This * method only returns a pointer to the first block in the @@ -355,7 +346,7 @@ public: const char *buffer (void) const; /** - * Return the size of first message block in the block chain. @note This + * Return the start and size of the internal buffer.@note This * method only returns information about the first block in the * chain. */ @@ -481,7 +472,7 @@ private: /// The start of the chain of message blocks. ACE_Message_Block start_; - /// The current block in the chain where we are writing. + /// The current block in the chain were we are writing. ACE_Message_Block *current_; #if !defined (ACE_LACKS_CDR_IALIGNMENT) diff --git a/ACE/ace/CORBA_macros.h b/ACE/ace/CORBA_macros.h index 4a7a3c44bf0..8b36ec2f0a0 100644 --- a/ACE/ace/CORBA_macros.h +++ b/ACE/ace/CORBA_macros.h @@ -34,19 +34,6 @@ #include "ace/Exception_Macros.h" -// The Windows MFC exception mechanism requires that a caught CException -// (including the CMemoryException in use here) be freed using its Delete() -// method. Thus, when MFC is in use and we're catching exceptions as a result -// of new(), the exception's Delete() method has to be called. No other -// platform imposes this sort of restriction/requirement. The Windows -// config stuff (at least for MSVC/MFC) defines a ACE_del_bad_alloc macro -// that works with its ACE_bad_alloc macro to implement this cleanup -// requirement. Since no other platform requires this, define it as -// empty here. -#if !defined (ACE_del_bad_alloc) -# define ACE_del_bad_alloc -#endif - // If you wish to you use these macros for emulating exceptions on // platforms which lack native exception support, you need to do the // following: @@ -420,7 +407,7 @@ # define ACE_NEW_THROW_EX(POINTER,CONSTRUCTOR,EXCEPTION) \ do { try { POINTER = new CONSTRUCTOR; } \ - catch (ACE_bad_alloc) { ACE_del_bad_alloc errno = ENOMEM; ACE_THROW_INT (EXCEPTION); } \ + catch (ACE_bad_alloc) { errno = ENOMEM; ACE_THROW_INT (EXCEPTION); } \ } while (0) #else /* ! ACE_NEW_THROWS_EXCEPTIONS */ diff --git a/ACE/ace/Configuration.cpp b/ACE/ace/Configuration.cpp index 039c2a1c192..3201b66bd4a 100644 --- a/ACE/ace/Configuration.cpp +++ b/ACE/ace/Configuration.cpp @@ -576,12 +576,47 @@ ACE_Configuration_Win32Registry::remove_section (const ACE_Configuration_Section } int errnum; +#if (ACE_HAS_WINNT4 != 0) errnum = ACE_TEXT_RegDeleteKey (base_key, sub_section); if (errnum != ERROR_SUCCESS) { errno = errnum; return -1; } +#else + if (!recursive) + { + ACE_Configuration_Section_Key section; + if (open_section (key, sub_section, 0, section)) + return -1; + + HKEY sub_key; + if (load_key (section, sub_key)) + return -1; + + ACE_TCHAR name_buffer[ACE_DEFAULT_BUFSIZE]; + DWORD buffer_size = ACE_DEFAULT_BUFSIZE; + // Check for a an entry under the sub_key + if (ACE_TEXT_RegEnumKeyEx (sub_key, + 0, + name_buffer, + &buffer_size, + 0, + 0, + 0, + 0) == ERROR_SUCCESS) + { + errno = ERROR_DIR_NOT_EMPTY; + return -1; + } + } + errnum = ACE_TEXT_RegDeleteKey (base_key, sub_section); + if (errnum != ERROR_SUCCESS) + { + errno = errnum; + return -1; + } +#endif return 0; } diff --git a/ACE/ace/DLL_Manager.cpp b/ACE/ace/DLL_Manager.cpp index 4290700b55e..378ccd7e9bb 100644 --- a/ACE/ace/DLL_Manager.cpp +++ b/ACE/ace/DLL_Manager.cpp @@ -281,7 +281,7 @@ ACE_DLL_Handle::close (int unload) this->handle_ = ACE_SHLIB_INVALID_HANDLE; } - if (retval != 0 && ACE::debug ()) + if (retval != 0) ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("ACE (%P|%t) DLL_Handle::close - ") ACE_LIB_TEXT ("Failed with: \"%s\".\n"), @@ -339,6 +339,8 @@ ACE_DLL_Handle::get_handle (int become_owner) ACE_TRACE ("ACE_DLL_Handle::get_handle"); ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, 0)); + ACE_SHLIB_HANDLE handle = ACE_SHLIB_INVALID_HANDLE; + if (this->refcount_ == 0 && become_owner != 0) { if (ACE::debug ()) @@ -349,7 +351,7 @@ ACE_DLL_Handle::get_handle (int become_owner) return ACE_SHLIB_INVALID_HANDLE; } - ACE_SHLIB_HANDLE handle = this->handle_; + handle = this->handle_; if (become_owner != 0) { diff --git a/ACE/ace/Default_Constants.h b/ACE/ace/Default_Constants.h index 754904ea84f..15aeb799399 100644 --- a/ACE/ace/Default_Constants.h +++ b/ACE/ace/Default_Constants.h @@ -278,11 +278,18 @@ // Default file permissions. # if !defined (ACE_DEFAULT_FILE_PERMS) -# if defined (ACE_VXWORKS) +# if defined (ACE_WIN32) +# if defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 == 1) +# define ACE_DEFAULT_FILE_PERMS (FILE_SHARE_READ | FILE_SHARE_WRITE | \ + FILE_SHARE_DELETE) +# else +# define ACE_DEFAULT_FILE_PERMS (FILE_SHARE_READ | FILE_SHARE_WRITE) +# endif /* ACE_HAS_WINNT4 */ +# elif defined (ACE_VXWORKS) # define ACE_DEFAULT_FILE_PERMS (S_IRUSR | S_IWUSR| S_IRGRP| S_IROTH) # else # define ACE_DEFAULT_FILE_PERMS 0644 -# endif /* ACE_VXWORKS */ +# endif /* ACE_WIN32 */ # endif /* ACE_DEFAULT_FILE_PERMS */ // Default directory permissions. diff --git a/ACE/ace/Dev_Poll_Reactor.cpp b/ACE/ace/Dev_Poll_Reactor.cpp index 8bf63534735..3f181426598 100644 --- a/ACE/ace/Dev_Poll_Reactor.cpp +++ b/ACE/ace/Dev_Poll_Reactor.cpp @@ -104,7 +104,7 @@ ACE_Dev_Poll_Reactor_Notify::open (ACE_Reactor_Impl *r, #endif /* ACE_HAS_REACTOR_NOTIFICATION_QUEUE */ // Set the read handle into non-blocking mode since we need to - // perform a "speculative" read when determining if there are + // perform a "speculative" read when determining if their are // notifications to dispatch. if (ACE::set_flags (this->notification_pipe_.read_handle (), ACE_NONBLOCK) == -1) @@ -2228,12 +2228,12 @@ ACE_Dev_Poll_Reactor::handler (int signum, return 0; } -bool +int ACE_Dev_Poll_Reactor::initialized (void) { ACE_TRACE ("ACE_Dev_Poll_Reactor::initialized"); - ACE_MT (ACE_GUARD_RETURN (ACE_Dev_Poll_Reactor_Token, mon, this->token_, false)); + ACE_MT (ACE_GUARD_RETURN (ACE_Dev_Poll_Reactor_Token, mon, this->token_, -1)); return this->initialized_; } diff --git a/ACE/ace/Dev_Poll_Reactor.h b/ACE/ace/Dev_Poll_Reactor.h index 41132201f01..a3b0d83635f 100644 --- a/ACE/ace/Dev_Poll_Reactor.h +++ b/ACE/ace/Dev_Poll_Reactor.h @@ -873,7 +873,7 @@ public: /// Returns true if Reactor has been successfully initialized, else /// false. - virtual bool initialized (void); + virtual int initialized (void); /// Returns the current size of the Reactor's internal descriptor /// table. diff --git a/ACE/ace/Dynamic_Service_Base.cpp b/ACE/ace/Dynamic_Service_Base.cpp index 301361a0b2d..7c2bd20fcec 100644 --- a/ACE/ace/Dynamic_Service_Base.cpp +++ b/ACE/ace/Dynamic_Service_Base.cpp @@ -60,7 +60,7 @@ ACE_Dynamic_Service_Base::find_i (const ACE_Service_Gestalt* &repo, { // Check the static repo, too if different if (repo == global) - break; + break; } return svc_rec; @@ -80,6 +80,7 @@ ACE_Dynamic_Service_Base::instance (const ACE_Service_Gestalt* repo, const ACE_Service_Type_Impl *type = 0; const ACE_Service_Gestalt* repo_found = repo; + const ACE_Service_Type *svc_rec = find_i (repo_found, name, no_global); if (svc_rec != 0) { diff --git a/ACE/ace/FlReactor/FlReactor.cpp b/ACE/ace/FlReactor.cpp index 611b9a14a19..f45ce67a994 100644 --- a/ACE/ace/FlReactor/FlReactor.cpp +++ b/ACE/ace/FlReactor.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "ace/FlReactor/FlReactor.h" +#include "ace/FlReactor.h" ACE_RCSID(ace, FlReactor, "$Id$") diff --git a/ACE/ace/FlReactor/FlReactor.h b/ACE/ace/FlReactor.h index e35572b99e1..5126c52e0aa 100644 --- a/ACE/ace/FlReactor/FlReactor.h +++ b/ACE/ace/FlReactor.h @@ -25,7 +25,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/FlReactor/ACE_FlReactor_export.h" +#include "ace/ACE_FlReactor_export.h" #include "ace/Select_Reactor.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/INET_Addr.cpp b/ACE/ace/INET_Addr.cpp index b32fe9ddfb5..3c978d006bc 100644 --- a/ACE/ace/INET_Addr.cpp +++ b/ACE/ace/INET_Addr.cpp @@ -36,37 +36,27 @@ ACE_INET_Addr::addr_to_string (ACE_TCHAR s[], ACE_TRACE ("ACE_INET_Addr::addr_to_string"); // XXX Can we (should we) include the scope id for IPv6 addresses? - char hoststr[MAXHOSTNAMELEN+1]; - bool result = false; - if (ipaddr_format == 0) - result = (this->get_host_name (hoststr,MAXHOSTNAMELEN+1) == 0); - else - result = (this->get_host_addr (hoststr,MAXHOSTNAMELEN+1) != 0); - - if (!result) - return -1; - - size_t total_len = - ACE_OS::strlen (hoststr) - + 5 // ACE_OS::strlen ("65535"), Assuming the max port number. - + 1 // sizeof (':'), addr/port sep - + 1; // sizeof ('\0'), terminating NUL - ACE_TCHAR const *format = ACE_LIB_TEXT("%s:%d"); -#if defined (ACE_HAS_IPV6) - if (ACE_OS::strchr(hoststr,':') != 0) - { - total_len += 2; // ACE_OS::strlen ("[]") IPv6 addr frames - format = ACE_LIB_TEXT("[%s]:%d"); - } -#endif // ACE_HAS_IPV6 + size_t const total_len = + (ipaddr_format == 0 + ? ACE_OS::strlen (this->get_host_name ()) + : ACE_OS::strlen (this->get_host_addr ())) + + ACE_OS::strlen ("65536") // Assume the max port number. + + sizeof (':') + + sizeof ('\0'); // For trailing '\0'. if (size < total_len) return -1; else - ACE_OS::sprintf (s, format, - ACE_TEXT_CHAR_TO_TCHAR (hoststr), this->get_port_number ()); - return 0; + { + ACE_OS::sprintf (s, + ACE_LIB_TEXT ("%s:%d"), + ACE_TEXT_CHAR_TO_TCHAR (ipaddr_format == 0 + ? this->get_host_name () + : this->get_host_addr ()), + this->get_port_number ()); + return 0; + } } void @@ -327,9 +317,13 @@ ACE_INET_Addr::set (u_short port_number, struct in_addr addrv4; if (ACE_OS::inet_aton (host_name, &addrv4) == 1) +# if !defined (ACE_LACKS_NTOHL) return this->set (port_number, - encode ? ACE_NTOHL (addrv4.s_addr) : addrv4.s_addr, + encode ? ntohl (addrv4.s_addr) : addrv4.s_addr, encode); +# else + return -1; +# endif /* ACE_LACKS_NTOHL */ else { # if defined (ACE_VXWORKS) && defined (ACE_LACKS_GETHOSTBYNAME) @@ -352,9 +346,13 @@ ACE_INET_Addr::set (u_short port_number, (void) ACE_OS::memcpy ((void *) &addrv4.s_addr, hp->h_addr, hp->h_length); +# if !defined (ACE_LACKS_NTOHL) return this->set (port_number, - encode ? ACE_NTOHL (addrv4.s_addr) : addrv4.s_addr, + encode ? ntohl (addrv4.s_addr) : addrv4.s_addr, encode); +# else + return -1; +# endif /* ACE_LACKS_NTOHL */ } } #endif /* ACE_HAS_IPV6 */ @@ -367,6 +365,7 @@ static int get_port_number_from_name (const char port_name[], { int port_number = 0; +#if !defined (ACE_LACKS_HTONS) // Maybe port_name is directly a port number? char *endp = 0; port_number = static_cast<int> (ACE_OS::strtol (port_name, &endp, 10)); @@ -377,9 +376,10 @@ static int get_port_number_from_name (const char port_name[], // store that value as the port number. NOTE: this number must // be returned in network byte order! u_short n = static_cast<u_short> (port_number); - n = ACE_HTONS (n); + n = htons (n); return n; } +#endif // We try to resolve port number from its name. @@ -656,18 +656,12 @@ ACE_INET_Addr::ACE_INET_Addr (const wchar_t port_name[], : ACE_Addr (this->determine_type(), sizeof (inet_addr_)) { ACE_TRACE ("ACE_INET_Addr::ACE_INET_Addr"); -#if !defined (ACE_LACKS_HTONL) this->reset (); if (this->set (port_name, htonl (inet_address), protocol) == -1) ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("ACE_INET_Addr::ACE_INET_Addr"))); -#else - ACE_UNUSED_ARG (port_name); - ACE_UNUSED_ARG (inet_address); - ACE_UNUSED_ARG (protocol); -#endif } #endif /* ACE_HAS_WCHAR */ @@ -752,8 +746,12 @@ ACE_INET_Addr::set_port_number (u_short port_number, { ACE_TRACE ("ACE_INET_Addr::set_port_number"); +#if !defined (ACE_LACKS_HTONS) if (encode) - port_number = ACE_HTONS (port_number); + port_number = htons (port_number); +#else + ACE_UNUSED_ARG (encode); +#endif /* ACE_LACKS_HTONS */ #if defined (ACE_HAS_IPV6) if (this->get_type () == AF_INET6) @@ -1105,8 +1103,11 @@ ACE_INET_Addr::get_ip_address (void) const return 0; } #endif /* ACE_HAS_IPV6 */ - return ACE_NTOHL (ACE_UINT32 (this->inet_addr_.in4_.sin_addr.s_addr)); +#if !defined (ACE_LACKS_NTOHL) + return ntohl (ACE_UINT32 (this->inet_addr_.in4_.sin_addr.s_addr)); +#else return 0; +#endif /* ACE_LACKS_NTOHL */ } ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/INET_Addr.h b/ACE/ace/INET_Addr.h index 9d66e4b5418..f05b90667b0 100644 --- a/ACE/ace/INET_Addr.h +++ b/ACE/ace/INET_Addr.h @@ -315,9 +315,6 @@ public: /// Return @c true if the IP address is IPv4/IPv6 loopback address. bool is_loopback (void) const; - /// Return @c true if the IP address is IPv4/IPv6 multicast address. - bool is_multicast (void) const; - #if defined (ACE_HAS_IPV6) /// Return @c true if the IP address is IPv6 linklocal address. bool is_linklocal (void) const; diff --git a/ACE/ace/INET_Addr.inl b/ACE/ace/INET_Addr.inl index 50b5e5dcdb1..15af6fe0a42 100644 --- a/ACE/ace/INET_Addr.inl +++ b/ACE/ace/INET_Addr.inl @@ -208,19 +208,6 @@ ACE_INET_Addr::is_loopback (void) const return (this->get_ip_address () == INADDR_LOOPBACK); } -// Return @c true if the IP address is IPv4/IPv6 multicast address. -ACE_INLINE bool -ACE_INET_Addr::is_multicast (void) const -{ -#if defined (ACE_HAS_IPV6) - if (this->get_type() == AF_INET6) - return this->inet_addr_.in6_.sin6_addr.s6_addr[0] == 0xFF; -#endif /* ACE_HAS_IPV6 */ - return - this->inet_addr_.in4_.sin_addr.s_addr >= 0xE0000000 && // 224.0.0.0 - this->inet_addr_.in4_.sin_addr.s_addr <= 0xEFFFFFFF; // 239.255.255.255 -} - #if defined (ACE_HAS_IPV6) // Return @c true if the IP address is IPv6 linklocal address. ACE_INLINE bool diff --git a/ACE/ace/Log_Msg.cpp b/ACE/ace/Log_Msg.cpp index 41b6e0bb4fb..52866c75050 100644 --- a/ACE/ace/Log_Msg.cpp +++ b/ACE/ace/Log_Msg.cpp @@ -1599,6 +1599,23 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, ACE_OS::sprintf (bp, format, static_cast <unsigned> (ACE_Thread::self ())); +#elif defined (ACE_AIX_VERS) && (ACE_AIX_VERS <= 402) + // AIX's pthread_t (ACE_hthread_t) is a pointer, and it's + // a little ugly to send that through a %u format. So, + // get the kernel thread ID (tid_t) via thread_self() and + // display that instead. + // This isn't conditionalized on ACE_HAS_THREAD_SELF because + // 1. AIX 4.2 doesn't have that def anymore (it messes up + // other things) + // 2. OSF/1 V3.2 has that def, and I'm not sure what affect + // this would have on that. + // -Steve Huston, 19-Aug-97 + ACE_OS::strcpy (fp, ACE_LIB_TEXT ("u")); + if (can_check) + this_len = ACE_OS::snprintf + (bp, bspace, format, thread_self()); + else + this_len = ACE_OS::sprintf (bp, format, thread_self()); #elif defined (DIGITAL_UNIX) ACE_OS::strcpy (fp, ACE_LIB_TEXT ("u")); { @@ -1684,26 +1701,33 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, case 'W': { -#if defined (ACE_HAS_WCHAR) +#if defined (ACE_WIN32) + ACE_TCHAR *wstr = va_arg (argp, ACE_TCHAR *); +# if defined (ACE_USES_WCHAR) + ACE_OS::strcpy (fp, ACE_LIB_TEXT ("s")); +# else /* ACE_USES_WCHAR */ + ACE_OS::strcpy (fp, ACE_LIB_TEXT ("S")); +# endif /* ACE_USES_WCHAR */ + if (can_check) + this_len = ACE_OS::snprintf + (bp, bspace, format, wstr ? wstr : ACE_LIB_TEXT ("(null)")); + else + this_len = ACE_OS::sprintf + (bp, format, wstr ? wstr : ACE_LIB_TEXT ("(null)")); +#elif defined (ACE_HAS_WCHAR) wchar_t *wchar_str = va_arg (argp, wchar_t *); # if defined (HPUX) ACE_OS::strcpy (fp, ACE_LIB_TEXT ("S")); -# elif defined (ACE_WIN32) -# if defined (ACE_USES_WCHAR) - ACE_OS::strcpy (fp, ACE_LIB_TEXT ("s")); -# else /* ACE_USES_WCHAR */ - ACE_OS::strcpy (fp, ACE_LIB_TEXT ("S")); -# endif /* ACE_USES_WCHAR */ # else ACE_OS::strcpy (fp, ACE_LIB_TEXT ("ls")); # endif /* HPUX */ if (can_check) this_len = ACE_OS::snprintf - (bp, bspace, format, wchar_str ? wchar_str : ACE_TEXT_WIDE("(null)")); + (bp, bspace, format, wchar_str); else this_len = ACE_OS::sprintf - (bp, format, wchar_str ? wchar_str : ACE_TEXT_WIDE("(null)")); -#endif /* ACE_HAS_WCHAR */ + (bp, format, wchar_str); +#endif /* ACE_WIN32 / ACE_HAS_WCHAR */ ACE_UPDATE_COUNT (bspace, this_len); } break; diff --git a/ACE/ace/Log_Msg_NT_Event_Log.cpp b/ACE/ace/Log_Msg_NT_Event_Log.cpp index fc1844a81ce..8053624283c 100644 --- a/ACE/ace/Log_Msg_NT_Event_Log.cpp +++ b/ACE/ace/Log_Msg_NT_Event_Log.cpp @@ -103,15 +103,13 @@ int ACE_Log_Msg_NT_Event_Log::log (ACE_Log_Record &log_record) { // Make a copy of the log text and replace any newlines with - // CR-LF. Newline characters on their own do not appear correctly in - // the event viewer. We allow for a doubling in the size of the msg - // data for the worst case of all newlines. + // CR-LF. Newline characters on their own do not appear correctly + // in the event viewer. We allow for a doubling in the size of + // the msg data for the worst case of all newlines. const ACE_TCHAR* src_msg_data = log_record.msg_data (); ACE_TCHAR msg_data [ACE_Log_Record::MAXLOGMSGLEN * 2]; - for (size_t i = 0, j = 0; - i < log_record.msg_data_len (); - ++i) + for (long i = 0, j = 0; i < log_record.length (); ++i) { if (src_msg_data[i] == '\n') { diff --git a/ACE/ace/Log_Record.h b/ACE/ace/Log_Record.h index 978f2ade5ae..36bda6f89ac 100644 --- a/ACE/ace/Log_Record.h +++ b/ACE/ace/Log_Record.h @@ -130,12 +130,10 @@ public: /// power of 2, as defined by the enums in <ACE_Log_Priority>). void priority (u_long num); - /// Get the total length of the <Log_Record>, which includes the - /// size of the various data member fields. + /// Get the length of the <Log_Record>. long length (void) const; - /// Set the total length of the <Log_Record>, which needs to account for - /// the size of the various data member fields. + /// Set the length of the <Log_Record>. void length (long); /// Get the time stamp of the <Log_Record>. diff --git a/ACE/ace/Makefile.am b/ACE/ace/Makefile.am index 955b88be851..3f61d779a43 100644 --- a/ACE/ace/Makefile.am +++ b/ACE/ace/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu includedir = @includedir@/ace pkgconfigdir = @libdir@/pkgconfig @@ -16,7 +16,7 @@ ACE_ROOT = $(top_srcdir) SUBDIRS = \ . \ - QoS \ + QoS \ SSL CLEANFILES = @@ -33,6 +33,8 @@ lib_LTLIBRARIES += libACE.la libACE_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ + -DACE_HAS_ACE_TOKEN \ + -DACE_HAS_ACE_SVCCONF \ -DACE_BUILD_DLL libACE_la_SOURCES = \ @@ -239,7 +241,6 @@ libACE_la_SOURCES = \ Registry_Name_Space.cpp \ Remote_Name_Space.cpp \ Remote_Tokens.cpp \ - Rtems_init.c \ SOCK.cpp \ SOCK_Acceptor.cpp \ SOCK_CODgram.cpp \ @@ -391,7 +392,6 @@ nobase_include_HEADERS += \ Asynch_Pseudo_Task.h \ Atomic_Op.h \ Atomic_Op.inl \ - Atomic_Op_Sparc.h \ Atomic_Op_T.cpp \ Atomic_Op_T.h \ Atomic_Op_T.inl \ @@ -568,9 +568,6 @@ nobase_include_HEADERS += \ Hash_Map_With_Allocator_T.cpp \ Hash_Map_With_Allocator_T.h \ Hash_Map_With_Allocator_T.inl \ - Hash_Multi_Map_Manager_T.cpp \ - Hash_Multi_Map_Manager_T.h \ - Hash_Multi_Map_Manager_T.inl \ Hashable.h \ Hashable.inl \ High_Res_Timer.h \ @@ -704,9 +701,7 @@ nobase_include_HEADERS += \ Null_Condition.h \ Null_Mutex.h \ Null_Semaphore.h \ - Numeric_Limits.h \ OS.h \ - OS.inl \ OS_Dirent.h \ OS_Errno.h \ OS_Errno.inl \ @@ -1211,7 +1206,7 @@ CLEANFILES += \ ACE.pc ACE.pc: ${top_builddir}/config.status ${srcdir}/ACE.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/ACE.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/ACE.pc.in endif !BUILD_ACE_FOR_TAO @@ -1235,7 +1230,7 @@ libACE_FlReactor_la_CPPFLAGS = \ -DACE_FLREACTOR_BUILD_DLL libACE_FlReactor_la_SOURCES = \ - FlReactor/FlReactor.cpp + FlReactor.cpp libACE_FlReactor_la_LDFLAGS = \ -release @ACE_VERSION_NAME@ $(ACE_FLTK_LDFLAGS) @@ -1245,8 +1240,8 @@ libACE_FlReactor_la_LIBADD = \ $(ACE_FLTK_LIBS) nobase_include_HEADERS += \ - FlReactor/ACE_FlReactor_export.h \ - FlReactor/FlReactor.h + ACE_FlReactor_export.h \ + FlReactor.h pkgconfig_DATA += \ ACE_FlReactor.pc @@ -1254,15 +1249,15 @@ pkgconfig_DATA += \ CLEANFILES += \ ACE_FlReactor.pc -ACE_FlReactor.pc: ${top_builddir}/config.status ${srcdir}/FlReactor/ACE_FlReactor.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/FlReactor/ACE_FlReactor.pc.in +ACE_FlReactor.pc: ${top_builddir}/config.status ${srcdir}/ACE_FlReactor.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/ACE_FlReactor.pc.in endif BUILD_X11 endif BUILD_GL endif BUILD_FL EXTRA_DIST += \ - FlReactor/ACE_FlReactor.pc.in + ACE_FlReactor.pc.in ## Makefile.ACE_QtReactor.am @@ -1270,13 +1265,13 @@ EXTRA_DIST += \ if BUILD_QT BUILT_SOURCES = \ - QtReactor/QtReactor_moc.cpp + QtReactor_moc.cpp CLEANFILES += \ - QtReactor/QtReactor_moc.cpp + QtReactor_moc.cpp -QtReactor/QtReactor_moc.cpp: $(srcdir)/QtReactor/QtReactor.h - $(QTDIR)/bin/moc $(srcdir)/QtReactor/QtReactor.h -o QtReactor/QtReactor_moc.cpp +QtReactor_moc.cpp: $(srcdir)/QtReactor.h + $(QTDIR)/bin/moc -o QtReactor_moc.cpp $(srcdir)/QtReactor.h lib_LTLIBRARIES += libACE_QtReactor.la @@ -1287,8 +1282,8 @@ libACE_QtReactor_la_CPPFLAGS = \ -DACE_QTREACTOR_BUILD_DLL libACE_QtReactor_la_SOURCES = \ - QtReactor/QtReactor.cpp \ - QtReactor/QtReactor_moc.cpp + QtReactor.cpp \ + QtReactor_moc.cpp libACE_QtReactor_la_LDFLAGS = \ -release @ACE_VERSION_NAME@ $(ACE_QT_LDFLAGS) @@ -1298,8 +1293,8 @@ libACE_QtReactor_la_LIBADD = \ $(ACE_QT_LIBS) nobase_include_HEADERS += \ - QtReactor/ACE_QtReactor_export.h \ - QtReactor/QtReactor.h + ACE_QtReactor_export.h \ + QtReactor.h pkgconfig_DATA += \ ACE_QtReactor.pc @@ -1307,13 +1302,13 @@ pkgconfig_DATA += \ CLEANFILES += \ ACE_QtReactor.pc -ACE_QtReactor.pc: ${top_builddir}/config.status ${srcdir}/QtReactor/ACE_QtReactor.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/QtReactor/ACE_QtReactor.pc.in +ACE_QtReactor.pc: ${top_builddir}/config.status ${srcdir}/ACE_QtReactor.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/ACE_QtReactor.pc.in endif BUILD_QT EXTRA_DIST += \ - QtReactor/ACE_QtReactor.pc.in + ACE_QtReactor.pc.in ## Makefile.ACE_TkReactor.am @@ -1330,7 +1325,7 @@ libACE_TkReactor_la_CPPFLAGS = \ -DACE_TKREACTOR_BUILD_DLL libACE_TkReactor_la_SOURCES = \ - TkReactor/TkReactor.cpp + TkReactor.cpp libACE_TkReactor_la_LDFLAGS = \ -release @ACE_VERSION_NAME@ $(ACE_TK_LDFLAGS) $(ACE_TCL_LDFLAGS) @@ -1341,8 +1336,8 @@ libACE_TkReactor_la_LIBADD = \ $(ACE_TCL_LIBS) nobase_include_HEADERS += \ - TkReactor/ACE_TkReactor_export.h \ - TkReactor/TkReactor.h + ACE_TkReactor_export.h \ + TkReactor.h pkgconfig_DATA += \ ACE_TkReactor.pc @@ -1350,13 +1345,13 @@ pkgconfig_DATA += \ CLEANFILES += \ ACE_TkReactor.pc -ACE_TkReactor.pc: ${top_builddir}/config.status ${srcdir}/TkReactor/ACE_TkReactor.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/TkReactor/ACE_TkReactor.pc.in +ACE_TkReactor.pc: ${top_builddir}/config.status ${srcdir}/ACE_TkReactor.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/ACE_TkReactor.pc.in endif BUILD_TK EXTRA_DIST += \ - TkReactor/ACE_TkReactor.pc.in + ACE_TkReactor.pc.in ## Makefile.ACE_XtReactor.am @@ -1374,7 +1369,7 @@ libACE_XtReactor_la_CPPFLAGS = \ -DACE_XTREACTOR_BUILD_DLL libACE_XtReactor_la_SOURCES = \ - XtReactor/XtReactor.cpp + XtReactor.cpp libACE_XtReactor_la_LDFLAGS = \ -release @ACE_VERSION_NAME@ $(ACE_X11_LDFLAGS) $(ACE_XT_LDFLAGS) @@ -1385,8 +1380,8 @@ libACE_XtReactor_la_LIBADD = \ $(ACE_X11_LIBS) nobase_include_HEADERS += \ - XtReactor/ACE_XtReactor_export.h \ - XtReactor/XtReactor.h + ACE_XtReactor_export.h \ + XtReactor.h pkgconfig_DATA += \ ACE_XtReactor.pc @@ -1394,14 +1389,14 @@ pkgconfig_DATA += \ CLEANFILES += \ ACE_XtReactor.pc -ACE_XtReactor.pc: ${top_builddir}/config.status ${srcdir}/XtReactor/ACE_XtReactor.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/XtReactor/ACE_XtReactor.pc.in +ACE_XtReactor.pc: ${top_builddir}/config.status ${srcdir}/ACE_XtReactor.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/ACE_XtReactor.pc.in endif BUILD_XT endif BUILD_X11 EXTRA_DIST += \ - XtReactor/ACE_XtReactor.pc.in + ACE_XtReactor.pc.in ## Clean up template repositories, etc. diff --git a/ACE/ace/Malloc_T.cpp b/ACE/ace/Malloc_T.cpp index 674b1916f33..d59436ac2b6 100644 --- a/ACE/ace/Malloc_T.cpp +++ b/ACE/ace/Malloc_T.cpp @@ -483,7 +483,7 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T (const ACE_TCHAR *p if (this->lock_ == 0) return; - this->delete_lock_ = true; + this->delete_lock_ = 1; this->bad_flag_ = this->open (); @@ -508,7 +508,7 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T (const ACE_TCHAR *p if (this->lock_ == 0) return; - this->delete_lock_ = true; + this->delete_lock_ = 1; this->bad_flag_ = this->open (); if (this->bad_flag_ == -1) @@ -525,7 +525,7 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T (const ACE_TCHAR *p : cb_ptr_ (0), memory_pool_ (pool_name, options), lock_ (lock), - delete_lock_ (false), + delete_lock_ (0), bad_flag_ (0) { ACE_TRACE ("ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T"); @@ -560,7 +560,7 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T (const ACE_TCHAR *p if (this->lock_ == 0) return; - this->delete_lock_ = true; + this->delete_lock_ = 1; this->bad_flag_ = this->open (); if (this->bad_flag_ == -1) ACE_ERROR ((LM_ERROR, diff --git a/ACE/ace/Malloc_T.h b/ACE/ace/Malloc_T.h index a8c11e4d0fa..021a13c2e58 100644 --- a/ACE/ace/Malloc_T.h +++ b/ACE/ace/Malloc_T.h @@ -661,9 +661,7 @@ private: /// Lock that ensures mutual exclusion for the memory pool. ACE_LOCK *lock_; - - /// True if destructor should delete the lock - bool delete_lock_; + int delete_lock_; // True if destructor should delete the lock /// Keep track of failure in constructor. int bad_flag_; diff --git a/ACE/ace/Map_Manager.cpp b/ACE/ace/Map_Manager.cpp index 7ee226e8821..f39124ce9d9 100644 --- a/ACE/ace/Map_Manager.cpp +++ b/ACE/ace/Map_Manager.cpp @@ -170,7 +170,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::move_all_free_slots_from_occupied_lis if (current_slot.free_) { // Reset free flag to zero before moving to free list. - current_slot.free_ = false; + current_slot.free_ = 0; // Move from occupied list to free list. this->move_from_occupied_list_to_free_list (position_of_current_slot); @@ -461,7 +461,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::unbind_slot (ACE_UINT32 slot) // run out of free slots in the free list. // - this->search_structure_[slot].free_ = true; + this->search_structure_[slot].free_ = 1; #else @@ -530,7 +530,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::resize_i (ACE_UINT32 new_size) // flag to be zero so that we don't have to set it when the slot // is moved to the occupied list. In addition, this flag has no // meaning while this slot is in the free list. - temp[i].free_ = false; + temp[i].free_ = 0; #endif /* ACE_HAS_LAZY_MAP_MANAGER */ diff --git a/ACE/ace/Map_Manager.h b/ACE/ace/Map_Manager.h index 2c3f800c6bc..d57da083b03 100644 --- a/ACE/ace/Map_Manager.h +++ b/ACE/ace/Map_Manager.h @@ -39,9 +39,6 @@ template <class EXT_ID, class INT_ID> class ACE_Map_Entry { public: - /// Initialize member variables. - ACE_Map_Entry (void); - /// We need this destructor to keep some compilers from complaining. /// It's just a no-op, however. ~ACE_Map_Entry (void); @@ -82,7 +79,7 @@ public: #if defined (ACE_HAS_LAZY_MAP_MANAGER) /// Is this entry free? - bool free_; + int free_; #endif /* ACE_HAS_LAZY_MAP_MANAGER */ diff --git a/ACE/ace/Map_Manager.inl b/ACE/ace/Map_Manager.inl index a3718734763..493d6c6a5c1 100644 --- a/ACE/ace/Map_Manager.inl +++ b/ACE/ace/Map_Manager.inl @@ -8,16 +8,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL template <class EXT_ID, class INT_ID> ACE_INLINE -ACE_Map_Entry<EXT_ID, INT_ID>::ACE_Map_Entry (void) - : next_ (0), - prev_ (0) -#if defined (ACE_HAS_LAZY_MAP_MANAGER) - , free_ (1) -#endif /* ACE_HAS_LAZY_MAP_MANAGER */ -{ -} - -template <class EXT_ID, class INT_ID> ACE_INLINE ACE_Map_Entry<EXT_ID, INT_ID>::~ACE_Map_Entry (void) { // No-op just to keep some compilers happy... diff --git a/ACE/ace/Mem_Map.cpp b/ACE/ace/Mem_Map.cpp index 0f8775018c4..d2bc4102ce6 100644 --- a/ACE/ace/Mem_Map.cpp +++ b/ACE/ace/Mem_Map.cpp @@ -13,12 +13,49 @@ #include "ace/Log_Msg.h" #include "ace/Truncate.h" +#if defined (ACE_WIN32) \ + && (!defined(ACE_HAS_WINNT4) || (ACE_HAS_WINNT4 == 0)) +# define ACE_USE_MAPPING_NAME 1 +#endif /* ACE_WIN32 */ + +#if defined (ACE_USE_MAPPING_NAME) +#include "ace/SString.h" +#endif /* ACE_USE_MAPPING_NAME */ + ACE_RCSID(ace, Mem_Map, "Mem_Map.cpp,v 4.39 2003/11/01 11:15:13 dhinton Exp") ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_Mem_Map) +#if defined (ACE_USE_MAPPING_NAME) +// Gets a mapping object name from a file name. TODO: The file name +// is used as the key to the mapping. We should try to avoid mapping +// the same object name to different files (there is a mapping object +// name length limitation). + +static void +to_mapping_name (ACE_TCHAR *mapobjname, + const ACE_TCHAR *filename, + size_t len) +{ + --len; + size_t i = 0; + + while (*filename && i < len) + { + if (*filename == ACE_LIB_TEXT ('\\')) + // Can't use backslash in mapping object name. + mapobjname[i] = ACE_LIB_TEXT ('.'); + else + mapobjname[i] = *filename; + ++filename; + ++i; + } + + mapobjname[i] = 0; +} +#endif /* ACE_USE_MAPPING_NAME */ void ACE_Mem_Map::dump (void) const @@ -141,6 +178,31 @@ ACE_Mem_Map::map_it (ACE_HANDLE handle, return -1; } +#if defined (ACE_USE_MAPPING_NAME) + if (ACE_BIT_ENABLED (share, MAP_SHARED)) + { +# if defined(__MINGW32__) + const int max_mapping_name_length = 32; +# else + const int max_mapping_name_length = 31; +# endif /* __MINGW32__ */ + ACE_TCHAR file_mapping_name[max_mapping_name_length + 1]; + to_mapping_name (file_mapping_name, + filename_, + max_mapping_name_length + 1); + + this->base_addr_ = ACE_OS::mmap (this->base_addr_, + this->length_, + prot, + share, + this->handle_, + offset, + &this->file_mapping_, + sa, + file_mapping_name); + } + else +#endif /* ACE_USE_MAPPING_NAME */ this->base_addr_ = ACE_OS::mmap (this->base_addr_, this->length_, prot, diff --git a/ACE/ace/Message_Queue.cpp b/ACE/ace/Message_Queue.cpp index 7295c2b9c8f..504af19b0fb 100644 --- a/ACE/ace/Message_Queue.cpp +++ b/ACE/ace/Message_Queue.cpp @@ -379,7 +379,7 @@ ACE_Message_Queue_Vx::peek_dequeue_head (ACE_Message_Block *&, #endif /* ACE_VXWORKS */ -#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) +#if defined (ACE_WIN32) && (ACE_HAS_WINNT4 != 0) ACE_Message_Queue_NT::ACE_Message_Queue_NT (DWORD max_threads) : max_cthrs_ (max_threads), @@ -597,6 +597,6 @@ ACE_Message_Queue_NT::dump (void) const #endif /* ACE_HAS_DUMP */ } -#endif /* ACE_HAS_WIN32_OVERLAPPED_IO */ +#endif /* ACE_WIN32 && ACE_HAS_WINNT4 != 0 */ ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Message_Queue.h b/ACE/ace/Message_Queue.h index 5a4b26fbfd6..4f9fc0f107f 100644 --- a/ACE/ace/Message_Queue.h +++ b/ACE/ace/Message_Queue.h @@ -21,7 +21,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/IO_Cntl_Msg.h" -#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) +#if defined (ACE_WIN32) && (ACE_HAS_WINNT4 != 0) # include "ace/Thread_Mutex.h" /* Needed in ACE_Message_Queue_NT */ #endif @@ -425,7 +425,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL ACE_BEGIN_VERSIONED_NAMESPACE_DECL -#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) +#if defined (ACE_WIN32) && (ACE_HAS_WINNT4 != 0) /** * @class ACE_Message_Queue_NT * @@ -617,7 +617,7 @@ private: ACE_HANDLE completion_port_; }; -#endif /* ACE_HAS_WIN32_OVERLAPPED_IO */ +#endif /* ACE_WIN32 && ACE_HAS_WINNT4 != 0 */ ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Message_Queue.inl b/ACE/ace/Message_Queue.inl index 452b33f8e6f..388198a0bf5 100644 --- a/ACE/ace/Message_Queue.inl +++ b/ACE/ace/Message_Queue.inl @@ -25,7 +25,7 @@ ACE_Message_Queue_Vx::msgq (void) #endif /* ACE_VXWORKS */ -#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) +#if defined (ACE_WIN32) && (ACE_HAS_WINNT4 != 0) ACE_INLINE int ACE_Message_Queue_NT::enqueue_tail (ACE_Message_Block *new_item, @@ -143,6 +143,6 @@ ACE_Message_Queue_NT::notification_strategy (ACE_Notification_Strategy *) { } -#endif /* ACE_HAS_WIN32_OVERLAPPED_IO */ +#endif /* ACE_WIN32 && ACE_HAS_WINNT4 != 0 */ ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Message_Queue_T.cpp b/ACE/ace/Message_Queue_T.cpp index 4eabd618369..9052769d52f 100644 --- a/ACE/ace/Message_Queue_T.cpp +++ b/ACE/ace/Message_Queue_T.cpp @@ -2791,7 +2791,7 @@ ACE_Message_Queue_Factory<ACE_SYNCH_USE>::create_Vx_message_queue (size_t max_me } // factory method for a wrapped VxWorks message queue -#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) +#if defined (ACE_WIN32) && (ACE_HAS_WINNT4 != 0) template <ACE_SYNCH_DECL> ACE_Message_Queue_NT * @@ -2805,7 +2805,7 @@ ACE_Message_Queue_Factory<ACE_SYNCH_USE>::create_NT_message_queue (size_t max_th return tmp; } -#endif /* ACE_HAS_WIN32_OVERLAPPED_IO */ +#endif /* ACE_WIN32 && ACE_HAS_WINNT4 != 0 */ #endif /* defined (ACE_VXWORKS) */ ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Message_Queue_T.h b/ACE/ace/Message_Queue_T.h index b1695c84248..329258fabd0 100644 --- a/ACE/ace/Message_Queue_T.h +++ b/ACE/ace/Message_Queue_T.h @@ -28,9 +28,9 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Message_Queue_Vx; #endif /* defined (ACE_VXWORKS) */ -#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) +#if defined (ACE_WIN32) && (ACE_HAS_WINNT4 != 0) class ACE_Message_Queue_NT; -#endif /* ACE_HAS_WIN32_OVERLAPPED_IO*/ +#endif /* ACE_WIN32 && ACE_HAS_WINNT4 != 0 */ /** * @class ACE_Message_Queue @@ -933,13 +933,13 @@ public: #endif /* defined (ACE_VXWORKS) */ -#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) +#if defined (ACE_WIN32) && (ACE_HAS_WINNT4 != 0) /// Factory method for a NT message queue. static ACE_Message_Queue_NT * create_NT_message_queue (size_t max_threads); -#endif /* ACE_HAS_WIN32_OVERLAPPED_IO */ +#endif /* ACE_WIN32 && ACE_HAS_WINNT4 != 0 */ }; /** diff --git a/ACE/ace/Msg_WFMO_Reactor.cpp b/ACE/ace/Msg_WFMO_Reactor.cpp index bbc95b948fa..aaedb391b51 100644 --- a/ACE/ace/Msg_WFMO_Reactor.cpp +++ b/ACE/ace/Msg_WFMO_Reactor.cpp @@ -39,11 +39,20 @@ ACE_Msg_WFMO_Reactor::wait_for_multiple_events (int timeout, // ReadFile and WriteFile operations. QS_ALLINPUT allows // <MsgWaitForMultipleObjectsEx> to wait for any message is in the // queue. +#if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) return ::MsgWaitForMultipleObjectsEx (this->handler_rep_.max_handlep1 (), this->handler_rep_.handles (), timeout, QS_ALLINPUT, alertable); +#else + ACE_UNUSED_ARG (alertable); + return ::MsgWaitForMultipleObjects (this->handler_rep_.max_handlep1 (), + this->handler_rep_.handles (), + FALSE, + timeout, + QS_ALLINPUT); +#endif /* (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) */ } int @@ -59,7 +68,7 @@ ACE_Msg_WFMO_Reactor::dispatch_window_messages (void) if (msg.message == WM_QUIT) { // Should inform the main thread - ::PostQuitMessage (LOWORD (msg.wParam)); + ::PostQuitMessage (msg.wParam); return -1; } diff --git a/ACE/ace/Name_Proxy.cpp b/ACE/ace/Name_Proxy.cpp index e33237069fd..82d0bd27eca 100644 --- a/ACE/ace/Name_Proxy.cpp +++ b/ACE/ace/Name_Proxy.cpp @@ -166,7 +166,7 @@ ACE_Name_Proxy::recv_reply (ACE_Name_Request &reply) case sizeof (ACE_UINT32): { // Transform the length into host byte order. - ssize_t length = ACE_NTOHL (reply.length ()); + ssize_t length = ntohl (reply.length ()); // Receive the rest of the request message. // @@ beware of blocking read!!!. diff --git a/ACE/ace/Name_Request_Reply.cpp b/ACE/ace/Name_Request_Reply.cpp index e066b2ef4ac..f92bbf3c15d 100644 --- a/ACE/ace/Name_Request_Reply.cpp +++ b/ACE/ace/Name_Request_Reply.cpp @@ -269,17 +269,17 @@ ACE_Name_Request::encode (void *&buf) for (size_t i = 0; i < nv_data_len; i++) this->transfer_.data_[i] = - ACE_HTONS (this->transfer_.data_[i]); + htons (this->transfer_.data_[i]); buf = (void *) &this->transfer_; - this->transfer_.block_forever_ = ACE_HTONL (this->transfer_.block_forever_); - this->transfer_.usec_timeout_ = ACE_HTONL (this->transfer_.usec_timeout_); - this->transfer_.sec_timeout_ = ACE_HTONL (this->transfer_.sec_timeout_); - this->transfer_.length_ = ACE_HTONL (this->transfer_.length_); - this->transfer_.msg_type_ = ACE_HTONL (this->transfer_.msg_type_); - this->transfer_.name_len_ = ACE_HTONL (this->transfer_.name_len_); - this->transfer_.value_len_ = ACE_HTONL (this->transfer_.value_len_); - this->transfer_.type_len_ = ACE_HTONL (this->transfer_.type_len_); + this->transfer_.block_forever_ = htonl (this->transfer_.block_forever_); + this->transfer_.usec_timeout_ = htonl (this->transfer_.usec_timeout_); + this->transfer_.sec_timeout_ = htonl (this->transfer_.sec_timeout_); + this->transfer_.length_ = htonl (this->transfer_.length_); + this->transfer_.msg_type_ = htonl (this->transfer_.msg_type_); + this->transfer_.name_len_ = htonl (this->transfer_.name_len_); + this->transfer_.value_len_ = htonl (this->transfer_.value_len_); + this->transfer_.type_len_ = htonl (this->transfer_.type_len_); return len; } @@ -292,14 +292,14 @@ ACE_Name_Request::decode (void) { ACE_TRACE ("ACE_Name_Request::decode"); // Decode the fixed-sized portion first. - this->transfer_.block_forever_ = ACE_NTOHL (this->transfer_.block_forever_); - this->transfer_.usec_timeout_ = ACE_NTOHL (this->transfer_.usec_timeout_); - this->transfer_.sec_timeout_ = ACE_NTOHL (this->transfer_.sec_timeout_); - this->transfer_.length_ = ACE_NTOHL (this->transfer_.length_); - this->transfer_.msg_type_ = ACE_NTOHL (this->transfer_.msg_type_); - this->transfer_.name_len_ = ACE_NTOHL (this->transfer_.name_len_); - this->transfer_.value_len_ = ACE_NTOHL (this->transfer_.value_len_); - this->transfer_.type_len_ = ACE_NTOHL (this->transfer_.type_len_); + this->transfer_.block_forever_ = ntohl (this->transfer_.block_forever_); + this->transfer_.usec_timeout_ = ntohl (this->transfer_.usec_timeout_); + this->transfer_.sec_timeout_ = ntohl (this->transfer_.sec_timeout_); + this->transfer_.length_ = ntohl (this->transfer_.length_); + this->transfer_.msg_type_ = ntohl (this->transfer_.msg_type_); + this->transfer_.name_len_ = ntohl (this->transfer_.name_len_); + this->transfer_.value_len_ = ntohl (this->transfer_.value_len_); + this->transfer_.type_len_ = ntohl (this->transfer_.type_len_); size_t nv_data_len = (this->transfer_.name_len_ + this->transfer_.value_len_) @@ -307,7 +307,7 @@ ACE_Name_Request::decode (void) for (size_t i = 0; i < nv_data_len; i++) this->transfer_.data_[i] = - ACE_NTOHS (this->transfer_.data_[i]); + ntohs (this->transfer_.data_[i]); this->name_ = this->transfer_.data_; this->value_ = &this->name_[this->transfer_.name_len_ / sizeof (ACE_WCHAR_T)]; @@ -513,9 +513,9 @@ ACE_Name_Reply::encode (void *&buf) ACE_TRACE ("ACE_Name_Reply::encode"); int len = this->length (); // Get length *before* marshaling. - this->transfer_.length_ = ACE_HTONL (this->transfer_.length_); - this->transfer_.type_ = ACE_HTONL (this->transfer_.type_); - this->transfer_.errno_ = ACE_HTONL (this->transfer_.errno_); + this->transfer_.length_ = htonl (this->transfer_.length_); + this->transfer_.type_ = htonl (this->transfer_.type_); + this->transfer_.errno_ = htonl (this->transfer_.errno_); buf = (void *) &this->transfer_; return len; } @@ -527,9 +527,9 @@ int ACE_Name_Reply::decode (void) { ACE_TRACE ("ACE_Name_Reply::decode"); - this->transfer_.length_ = ACE_NTOHL (this->transfer_.length_); - this->transfer_.type_ = ACE_NTOHL (this->transfer_.type_); - this->transfer_.errno_ = ACE_NTOHL (this->transfer_.errno_); + this->transfer_.length_ = ntohl (this->transfer_.length_); + this->transfer_.type_ = ntohl (this->transfer_.type_); + this->transfer_.errno_ = ntohl (this->transfer_.errno_); return 0; } diff --git a/ACE/ace/Null_Mutex.h b/ACE/ace/Null_Mutex.h index 2072bf2db52..4d83ae67802 100644 --- a/ACE/ace/Null_Mutex.h +++ b/ACE/ace/Null_Mutex.h @@ -18,10 +18,6 @@ // All methods in this class are inline, so there is no // need to import or export on Windows. -- CAE 12/18/2003 -// Update... leaving off the ACE_Export causes compile warnings in some -// cases with Microsoft Visual Studio .NET 2005, so I added the ACE_Export -// to these class declarations. Steve Huston, 12/8/2006. - #include "ace/os_include/os_errno.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -42,7 +38,7 @@ class ACE_Time_Value; * @brief Implement a do nothing ACE_Mutex, i.e., all the methods are * no ops. */ -class ACE_Export ACE_Null_Mutex +class ACE_Null_Mutex { public: ACE_Null_Mutex (const ACE_TCHAR * = 0) @@ -101,7 +97,7 @@ public: * This class is obsolete and should be replaced by * ACE_Guard<ACE_Null_Mutex>. */ -class ACE_Export ACE_Null_Mutex_Guard +class ACE_Null_Mutex_Guard { public: ACE_Null_Mutex_Guard (ACE_Null_Mutex &) {} @@ -133,7 +129,7 @@ class ACE_Guard; * performance of the "Null_Mutex" considerably. */ template<> -class ACE_Export ACE_Guard<ACE_Null_Mutex> +class ACE_Guard<ACE_Null_Mutex> { public: // = Initialization and termination methods. @@ -168,8 +164,7 @@ class ACE_Write_Guard; * */ template<> -class ACE_Export ACE_Write_Guard<ACE_Null_Mutex> - : public ACE_Guard<ACE_Null_Mutex> +class ACE_Write_Guard<ACE_Null_Mutex> : public ACE_Guard<ACE_Null_Mutex> { public: ACE_Write_Guard (ACE_Null_Mutex &m) @@ -192,8 +187,7 @@ class ACE_Read_Guard; * */ template<> -class ACE_Export ACE_Read_Guard<ACE_Null_Mutex> - : public ACE_Guard<ACE_Null_Mutex> +class ACE_Read_Guard<ACE_Null_Mutex> : public ACE_Guard<ACE_Null_Mutex> { public: ACE_Read_Guard (ACE_Null_Mutex &m) @@ -215,7 +209,7 @@ template <class T> class ACE_Malloc_Lock_Adapter_T; * */ template<> -class ACE_Export ACE_Malloc_Lock_Adapter_T<ACE_Null_Mutex> +class ACE_Malloc_Lock_Adapter_T<ACE_Null_Mutex> { public: ACE_Null_Mutex * operator () (const ACE_TCHAR *name) diff --git a/ACE/ace/OS_Errno.cpp b/ACE/ace/OS_Errno.cpp index 6f9905cad1f..25266ae5c55 100644 --- a/ACE/ace/OS_Errno.cpp +++ b/ACE/ace/OS_Errno.cpp @@ -6,10 +6,9 @@ ACE_RCSID(ace, OS_Errno, "$Id$") // Inlining this class on debug builds with gcc on Solaris can cause -// deadlocks during static initialization. On non debug builds it -// causes compilation errors. +// deadlocks during static initialization. #if !defined (ACE_HAS_INLINED_OSCALLS) || \ - (defined (__GNUG__) && defined (__sun__)) + (defined (__GNUG__) && defined (__sun__) && !defined (ACE_NDEBUG)) # if defined (ACE_INLINE) # undef ACE_INLINE # endif /* ACE_INLINE */ diff --git a/ACE/ace/OS_Errno.h b/ACE/ace/OS_Errno.h index 077aff14ff8..d67868631c1 100644 --- a/ACE/ace/OS_Errno.h +++ b/ACE/ace/OS_Errno.h @@ -86,10 +86,9 @@ private: ACE_END_VERSIONED_NAMESPACE_DECL // Inlining this class on debug builds with gcc on Solaris can cause -// deadlocks during static initialization. On non debug builds it -// causes compilation errors. +// deadlocks during static initialization. #if defined (ACE_HAS_INLINED_OSCALLS) && \ - (!defined (__GNUG__) || !defined (__sun__)) + (!defined (__GNUG__) || !defined (__sun__) || defined (ACE_NDEBUG)) # if defined (ACE_INLINE) # undef ACE_INLINE # endif /* ACE_INLINE */ diff --git a/ACE/ace/OS_Memory.h b/ACE/ace/OS_Memory.h index 70716bedfc2..2ca472e762e 100644 --- a/ACE/ace/OS_Memory.h +++ b/ACE/ace/OS_Memory.h @@ -81,19 +81,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL # endif #endif -// The Windows MFC exception mechanism requires that a caught CException -// (including the CMemoryException in use here) be freed using its Delete() -// method. Thus, when MFC is in use and we're catching exceptions as a result -// of new(), the exception's Delete() method has to be called. No other -// platform imposes this sort of restriction/requirement. The Windows -// config stuff (at least for MSVC/MFC) defines a ACE_del_bad_alloc macro -// that works with its ACE_bad_alloc macro to implement this cleanup -// requirement. Since no other platform requires this, define it as -// empty here. -#if !defined (ACE_del_bad_alloc) -# define ACE_del_bad_alloc -#endif - #if defined (ACE_NEW_THROWS_EXCEPTIONS) // Since new() throws exceptions, we need a way to avoid passing @@ -158,7 +145,12 @@ ACE_END_VERSIONED_NAMESPACE_DECL # elif defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) # include /**/ <new> # if !defined (ACE_bad_alloc) -# define ACE_bad_alloc std::bad_alloc + // MFC changes the behavior of operator new at all MSVC versions from 6 up. +# if defined (ACE_HAS_MFC) && (ACE_HAS_MFC == 1) +# define ACE_bad_alloc CMemoryException* +# else +# define ACE_bad_alloc std::bad_alloc +# endif # endif # define ACE_nothrow std::nothrow # define ACE_nothrow_t std::nothrow_t @@ -171,7 +163,12 @@ ACE_END_VERSIONED_NAMESPACE_DECL # else # include /**/ <new> # if !defined (ACE_bad_alloc) -# define ACE_bad_alloc bad_alloc + // MFC changes the behavior of operator new at all MSVC versions from 6 up. +# if defined (ACE_HAS_MFC) && (ACE_HAS_MFC == 1) +# define ACE_bad_alloc CMemoryException* +# else +# define ACE_bad_alloc bad_alloc +# endif # endif # define ACE_nothrow nothrow # define ACE_nothrow_t nothrow_t @@ -201,17 +198,17 @@ ACE_END_VERSIONED_NAMESPACE_DECL # define ACE_NEW_RETURN(POINTER,CONSTRUCTOR,RET_VAL) \ do { try { POINTER = new CONSTRUCTOR; } \ - catch (ACE_bad_alloc) { ACE_del_bad_alloc errno = ENOMEM; POINTER = 0; return RET_VAL; } \ + catch (ACE_bad_alloc) { errno = ENOMEM; POINTER = 0; return RET_VAL; } \ } while (0) # define ACE_NEW(POINTER,CONSTRUCTOR) \ do { try { POINTER = new CONSTRUCTOR; } \ - catch (ACE_bad_alloc) { ACE_del_bad_alloc errno = ENOMEM; POINTER = 0; return; } \ + catch (ACE_bad_alloc) { errno = ENOMEM; POINTER = 0; return; } \ } while (0) # define ACE_NEW_NORETURN(POINTER,CONSTRUCTOR) \ do { try { POINTER = new CONSTRUCTOR; } \ - catch (ACE_bad_alloc) { ACE_del_bad_alloc errno = ENOMEM; POINTER = 0; } \ + catch (ACE_bad_alloc) { errno = ENOMEM; POINTER = 0; } \ } while (0) # endif /* ACE_HAS_NEW_NOTHROW */ diff --git a/ACE/ace/OS_NS_Thread.cpp b/ACE/ace/OS_NS_Thread.cpp index 014226cbbe2..fa59249af77 100644 --- a/ACE/ace/OS_NS_Thread.cpp +++ b/ACE/ace/OS_NS_Thread.cpp @@ -102,6 +102,19 @@ ACE_Thread_ID::to_string (char *thr_string) const ACE_OS::sprintf (thr_string, format, static_cast <unsigned> (thread_id_)); +#elif defined (ACE_AIX_VERS) && (ACE_AIX_VERS <= 402) + // AIX's pthread_t (ACE_hthread_t) is a pointer, and it's + // a little ugly to send that through a %u format. So, + // get the kernel thread ID (tid_t) via thread_self() and + // display that instead. + // This isn't conditionalized on ACE_HAS_THREAD_SELF because + // 1. AIX 4.2 doesn't have that def anymore (it messes up + // other things) + // 2. OSF/1 V3.2 has that def, and I'm not sure what affect + // this would have on that. + // -Steve Huston, 19-Aug-97 + ACE_OS::strcpy (fp, "u"); + ACE_OS::sprintf (thr_string, format, thread_id_); #elif defined (DIGITAL_UNIX) ACE_OS::strcpy (fp, "u"); ACE_OS::sprintf (thr_string, format, @@ -2599,31 +2612,15 @@ ACE_OS::event_init (ACE_event_t *event, if (type == USYNC_PROCESS) { - const char *name_p = 0; -# if defined (ACE_SHM_OPEN_REQUIRES_ONE_SLASH) - char adj_name[MAXPATHLEN]; - if (name[0] != '/') - { - adj_name[0] = '/'; - ACE_OS::strsncpy (&adj_name[1], name, MAXPATHLEN-1); - name_p = adj_name; - } - else - { - name_p = name; - } -# else - name_p = name; -# endif /* ACE_SHM_OPEN_REQUIRES_ONE_SLASH */ int owner = 0; // Let's see if the shared memory entity already exists. - ACE_HANDLE fd = ACE_OS::shm_open (ACE_TEXT_CHAR_TO_TCHAR (name_p), + ACE_HANDLE fd = ACE_OS::shm_open (ACE_TEXT_CHAR_TO_TCHAR (name), O_RDWR | O_CREAT | O_EXCL, ACE_DEFAULT_FILE_PERMS); if (fd == ACE_INVALID_HANDLE) { if (errno == EEXIST) - fd = ACE_OS::shm_open (ACE_TEXT_CHAR_TO_TCHAR (name_p), + fd = ACE_OS::shm_open (ACE_TEXT_CHAR_TO_TCHAR (name), O_RDWR | O_CREAT, ACE_DEFAULT_FILE_PERMS); if (fd == ACE_INVALID_HANDLE) // Still can't get it. @@ -2651,16 +2648,16 @@ ACE_OS::event_init (ACE_event_t *event, if (evtdata == MAP_FAILED) { if (owner) - ACE_OS::shm_unlink (ACE_TEXT_CHAR_TO_TCHAR (name_p)); + ACE_OS::shm_unlink (ACE_TEXT_CHAR_TO_TCHAR (name)); return -1; } if (owner) { - event->name_ = ACE_OS::strdup (name_p); + event->name_ = ACE_OS::strdup (name); if (event->name_ == 0) { - ACE_OS::shm_unlink (ACE_TEXT_CHAR_TO_TCHAR (name_p)); + ACE_OS::shm_unlink (ACE_TEXT_CHAR_TO_TCHAR (name)); return -1; } event->eventdata_ = evtdata; @@ -3629,8 +3626,6 @@ ACE_OS::sched_params (const ACE_Sched_Params &sched_params, return -1; } -# endif /* ACE_HAS_PHARLAP_RT */ - if (sched_params.scope () == ACE_SCOPE_THREAD) { @@ -3651,16 +3646,13 @@ ACE_OS::sched_params (const ACE_Sched_Params &sched_params, } #endif /* ACE_DISABLE_WIN32_INCREASE_PRIORITY */ +# endif /* ACE_HAS_PHARLAP_RT */ // Now that we have set the priority class of the process, set the // priority of the current thread to the desired value. return ACE_OS::thr_setprio (sched_params.priority ()); } else if (sched_params.scope () == ACE_SCOPE_PROCESS) { - -# if defined (ACE_HAS_PHARLAP_RT) - ACE_NOTSUP_RETURN (-1); -# else HANDLE hProcess = ::OpenProcess (PROCESS_SET_INFORMATION, FALSE, id); @@ -3687,8 +3679,6 @@ ACE_OS::sched_params (const ACE_Sched_Params &sched_params, } ::CloseHandle (hProcess); return 0; -#endif /* ACE_HAS_PHARLAP_RT */ - } else { @@ -4080,6 +4070,25 @@ ACE_OS::thr_create (ACE_THR_FUNC func, else spolicy = SCHED_RR; +# if defined (ACE_HAS_FSU_PTHREADS) + int ret; + switch (spolicy) + { + case SCHED_FIFO: + case SCHED_RR: + ret = 0; + break; + default: + ret = 22; + break; + } + if (ret != 0) + { + ::pthread_attr_destroy (&attr); + return -1; + } +# endif /* ACE_HAS_FSU_PTHREADS */ + # endif /* ACE_HAS_ONLY_SCHED_OTHER */ # if defined (ACE_HAS_PTHREADS_DRAFT4) @@ -4152,6 +4161,17 @@ ACE_OS::thr_create (ACE_THR_FUNC func, sparam.sched_priority = priority; # endif /* ACE_HAS_IRIX62_THREADS */ +# if defined (ACE_HAS_FSU_PTHREADS) + if (sparam.sched_priority >= PTHREAD_MIN_PRIORITY + && sparam.sched_priority <= PTHREAD_MAX_PRIORITY) + attr.prio = sparam.sched_priority; + else + { + pthread_attr_destroy (&attr); + errno = EINVAL; + return -1; + } +# else { # if defined (sun) && defined (ACE_HAS_ONLY_SCHED_OTHER) // SunOS, through 5.6, POSIX only allows priorities > 0 to @@ -4178,6 +4198,7 @@ ACE_OS::thr_create (ACE_THR_FUNC func, } } } +# endif /* ACE_HAS_FSU_PTHREADS */ } // *** Set scheduling explicit or inherited @@ -4248,7 +4269,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 @@ -4275,7 +4295,6 @@ ACE_OS::thr_create (ACE_THR_FUNC func, return -1; } } -# endif /* ! ACE_LACKS_THR_CONCURRENCY_FUNCS */ } # if defined (ACE_HAS_PTHREADS_DRAFT4) @@ -5109,6 +5128,16 @@ ACE_OS::thr_setspecific_native (ACE_OS_thread_key_t key, void *data) // ACE_OS_TRACE ("ACE_OS::thr_setspecific_native"); # if defined (ACE_HAS_THREADS) # if defined (ACE_HAS_PTHREADS) +# if defined (ACE_HAS_FSU_PTHREADS) + // Call pthread_init() here to initialize threads package. FSU + // threads need an initialization before the first thread constructor. + // This seems to be the one; however, a segmentation fault may + // indicate that another pthread_init() is necessary, perhaps in + // Synch.cpp or Synch_T.cpp. FSU threads will not reinit if called + // more than once, so another call to pthread_init will not adversely + // affect existing threads. + pthread_init (); +# endif /* ACE_HAS_FSU_PTHREADS */ # if defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6) ACE_OSCALL_RETURN (::pthread_setspecific (key, data), int, -1); # else @@ -5532,3 +5561,18 @@ vx_execae (FUNCPTR entry, char* arg, int prio, int opt, int stacksz, ...) } #endif /* ACE_VXWORKS && !__RTP__ */ +#if defined (__DGUX) && defined (ACE_HAS_THREADS) && defined (_POSIX4A_DRAFT10_SOURCE) +extern "C" int __d6_sigwait (sigset_t *set); + +extern "C" int __d10_sigwait (const sigset_t *set, int *sig) +{ + sigset_t unconst_set = *set; + int caught_sig = __d6_sigwait (&unconst_set); + + if (caught == -1) + return -1; + + *sig = caught_sig; + return 0; +} +#endif /* __DGUX && PTHREADS && _POSIX4A_DRAFT10_SOURCE */ diff --git a/ACE/ace/OS_NS_Thread.h b/ACE/ace/OS_NS_Thread.h index c9f6c261a87..e6628d14f9b 100644 --- a/ACE/ace/OS_NS_Thread.h +++ b/ACE/ace/OS_NS_Thread.h @@ -313,7 +313,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL # define THR_SCHED_RR 0 # define THR_SCHED_DEFAULT 0 # define THR_INHERIT_SCHED 0 -# define THR_EXPLICIT_SCHED 0 # define THR_SCOPE_PROCESS 0 # define THR_SCOPE_SYSTEM 0 # endif /* ACE_HAS_PTHREADS / STHREADS / VXWORKS / WTHREADS **********/ diff --git a/ACE/ace/OS_NS_arpa_inet.cpp b/ACE/ace/OS_NS_arpa_inet.cpp index d1d3b2d23d5..8c026593b2c 100644 --- a/ACE/ace/OS_NS_arpa_inet.cpp +++ b/ACE/ace/OS_NS_arpa_inet.cpp @@ -36,7 +36,7 @@ ACE_OS::inet_aton (const char *host_name, struct in_addr *addr) addr->s_addr = ip_addr; // Network byte ordered return 1; } -#elif defined (ACE_VXWORKS) && (ACE_VXWORKS <= 0x640) +#elif defined (ACE_VXWORKS) && (ACE_VXWORKS <= 0x630) // inet_aton() returns OK (0) on success and ERROR (-1) on failure. // Must reset errno first. Refer to WindRiver SPR# 34949, SPR# 36026 ::errnoSet(0); diff --git a/ACE/ace/OS_NS_arpa_inet.inl b/ACE/ace/OS_NS_arpa_inet.inl index 3f0b768adff..547d30cdaf1 100644 --- a/ACE/ace/OS_NS_arpa_inet.inl +++ b/ACE/ace/OS_NS_arpa_inet.inl @@ -69,7 +69,6 @@ ACE_OS::inet_ntop (int family, const void *addrptr, char *strptr, size_t len) ACE_NOTSUP_RETURN(0); #endif /* ACE_HAS_IPV6 */ } - ACE_INLINE int ACE_OS::inet_pton (int family, const char *strptr, void *addrptr) { diff --git a/ACE/ace/OS_NS_dirent.cpp b/ACE/ace/OS_NS_dirent.cpp index b18ddc6928a..0fa32cc497e 100644 --- a/ACE/ace/OS_NS_dirent.cpp +++ b/ACE/ace/OS_NS_dirent.cpp @@ -13,6 +13,21 @@ ACE_RCSID(ace, OS_NS_dirent, "$Id$") #include "ace/Log_Msg.h" #include "ace/OS_NS_stdlib.h" + +/* + These definitions are missing on the original VC6 distribution. The new + headers that define these are available in the Platform SDK and are defined + for those that don't have it. + */ +#if defined (ACE_WIN32) +# if !defined (INVALID_FILE_ATTRIBUTES) +# define INVALID_FILE_ATTRIBUTES ((DWORD)-1) +# endif /* INVALID_FILE_ATTRIBUTES */ +# if !defined (INVALID_SET_FILE_POINTER) +# define INVALID_SET_FILE_POINTER ((DWORD)-1) +# endif /* INVALID_SET_FILE_POINTER */ +#endif /* ACE_WIN32 */ + ACE_BEGIN_VERSIONED_NAMESPACE_DECL #if defined (ACE_LACKS_CLOSEDIR) diff --git a/ACE/ace/OS_NS_dirent.inl b/ACE/ace/OS_NS_dirent.inl index a768a914887..862dd7d07c3 100644 --- a/ACE/ace/OS_NS_dirent.inl +++ b/ACE/ace/OS_NS_dirent.inl @@ -47,17 +47,18 @@ opendir (const ACE_TCHAR *filename) #endif /* ACE_HAS_DIRENT */ } -ACE_INLINE struct ACE_DIRENT * +ACE_INLINE +struct ACE_DIRENT * readdir (ACE_DIR *d) { #if defined (ACE_HAS_DIRENT) -# if defined (ACE_WIN32) && defined (ACE_LACKS_READDIR) - return ACE_OS::readdir_emulation (d); +# if defined (ACE_WIN32) && defined (ACE_LACKS_READDIR) + return ACE_OS::readdir_emulation (d); # elif defined (ACE_HAS_WREADDIR) && defined (ACE_USES_WCHAR) - return ::wreaddir (d); -# else /* ACE_WIN32 && ACE_LACKS_READDIR */ - return ::readdir (d); -# endif /* ACE_WIN32 && ACE_LACKS_READDIR */ + return ::wreaddir (d); +# else /* ACE_WIN32 && ACE_LACKS_READDIR */ + return ::readdir (d); +# endif /* ACE_WIN32 && ACE_LACKS_READDIR */ #else ACE_UNUSED_ARG (d); ACE_NOTSUP_RETURN (0); @@ -66,8 +67,8 @@ readdir (ACE_DIR *d) ACE_INLINE int readdir_r (ACE_DIR *dirp, - struct ACE_DIRENT *entry, - struct ACE_DIRENT **result) + struct ACE_DIRENT *entry, + struct ACE_DIRENT **result) { #if !defined (ACE_HAS_REENTRANT_FUNCTIONS) ACE_UNUSED_ARG (entry); @@ -77,14 +78,29 @@ readdir_r (ACE_DIR *dirp, return 0; // Keep iterating else return 1; // Oops, some type of error! -#elif defined (ACE_HAS_DIRENT) && !defined (ACE_LACKS_READDIR_R) -# if defined (ACE_HAS_3_PARAM_READDIR_R) - return ::readdir_r (dirp, entry, result); -# else - // <result> had better not be 0! - *result = ::readdir_r (dirp, entry); - return 0; -# endif /* sun */ +#elif defined (ACE_HAS_DIRENT) && !defined (ACE_LACKS_READDIR_R) +# if (defined (sun) && (defined (_POSIX_PTHREAD_SEMANTICS) || \ + (_FILE_OFFSET_BITS == 64) || \ + (_POSIX_C_SOURCE - 0 >= 199506L))) || \ + (!defined (sun) && (defined (ACE_HAS_PTHREADS_STD) || \ + defined (ACE_HAS_PTHREADS_DRAFT7) || \ + defined (_POSIX_SOURCE) || \ + defined (__FreeBSD__) || \ + defined (HPUX_11))) +# if defined (__GNUG__) && defined (DIGITAL_UNIX) + return readdir_r (dirp, entry, result); +# else + return ::readdir_r (dirp, entry, result); +# endif /* defined (__GNUG__) && defined (DIGITAL_UNIX) */ +# else /* ! POSIX.1c - this is draft 4 or draft 6 */ +# if defined(__GNUC__) && defined (_AIX) + return ::readdir_r (dirp, entry, result); +# else + // <result> had better not be 0! + *result = ::readdir_r (dirp, entry); + return 0; +# endif /* AIX */ +# endif /* ! POSIX.1c */ #else /* ! ACE_HAS_DIRENT || ACE_LACKS_READDIR_R */ ACE_UNUSED_ARG (dirp); ACE_UNUSED_ARG (entry); @@ -145,7 +161,7 @@ scandir (const ACE_TCHAR *dirname, ACE_INLINE void seekdir (ACE_DIR *d, long loc) { -#if defined (ACE_HAS_DIRENT) && !defined (ACE_LACKS_SEEKDIR) +#if defined (ACE_HAS_DIRENT) && !defined (ACE_LACKS_SEEKDIR) ::seekdir (d, loc); #else /* ! ACE_HAS_DIRENT || ACE_LACKS_SEEKDIR */ ACE_UNUSED_ARG (d); @@ -156,7 +172,7 @@ seekdir (ACE_DIR *d, long loc) ACE_INLINE long telldir (ACE_DIR *d) { -#if defined (ACE_HAS_DIRENT) && !defined (ACE_LACKS_TELLDIR) +#if defined (ACE_HAS_DIRENT) && !defined (ACE_LACKS_TELLDIR) return ::telldir (d); #else /* ! ACE_HAS_DIRENT || ACE_LACKS_TELLDIR */ ACE_UNUSED_ARG (d); diff --git a/ACE/ace/OS_NS_netdb.cpp b/ACE/ace/OS_NS_netdb.cpp index a788714eefd..92a853b2895 100644 --- a/ACE/ace/OS_NS_netdb.cpp +++ b/ACE/ace/OS_NS_netdb.cpp @@ -356,7 +356,7 @@ ACE_OS::getmacaddress (struct macaddr_node_t *node) return 0; -#elif defined (linux) && !defined (ACE_LACKS_NETWORKING) +#elif defined (linux) struct ifreq ifr; diff --git a/ACE/ace/OS_NS_signal.h b/ACE/ace/OS_NS_signal.h index bb5b03b1c0d..ec59a0e91a1 100644 --- a/ACE/ace/OS_NS_signal.h +++ b/ACE/ace/OS_NS_signal.h @@ -81,7 +81,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL // Also see ChangeLog entries: // Mon Jan 23 16:35:40 UTC 2006 Steve Huston <shuston@riverace.com> // Mon Jan 23 22:08:56 UTC 2006 Steve Huston <shuston@riverace.com> -#if defined (__HP_aCC) && (__HP_aCC <= 37300) +#if defined (__HP_aCC) && (__HP_aCC <= 36500) typedef extern "C" struct sigaction ACE_SIGACTION; #else typedef struct sigaction ACE_SIGACTION; diff --git a/ACE/ace/OS_NS_signal.inl b/ACE/ace/OS_NS_signal.inl index df71ce0eb23..172bf82c7eb 100644 --- a/ACE/ace/OS_NS_signal.inl +++ b/ACE/ace/OS_NS_signal.inl @@ -127,7 +127,7 @@ sigemptyset (sigset_t *s) return -1; } *s = 0 ; - return 0; + return 0 ; #else ACE_OSCALL_RETURN (::sigemptyset (s), int, -1); #endif /* ACE_LACKS_SIGSET || ACE_LACKS_SIGSET_DEFINITIONS */ diff --git a/ACE/ace/OS_NS_stdio.cpp b/ACE/ace/OS_NS_stdio.cpp index c4b23cb1904..c428ab2f762 100644 --- a/ACE/ace/OS_NS_stdio.cpp +++ b/ACE/ace/OS_NS_stdio.cpp @@ -299,7 +299,7 @@ ACE_OS::fprintf (FILE *fp, const wchar_t *format, ...) int ACE_OS::printf (const char *format, ...) { - // ACE_OS_TRACE ("ACE_OS::printf"); + ACE_OS_TRACE ("ACE_OS::printf"); int result; va_list ap; va_start (ap, format); @@ -312,12 +312,41 @@ int ACE_OS::snprintf (char *buf, size_t maxlen, const char *format, ...) { // ACE_OS_TRACE ("ACE_OS::snprintf"); +#if defined (ACE_HAS_SNPRINTF) int result; va_list ap; va_start (ap, format); - result = ACE_OS::vsnprintf (buf, maxlen, format, ap); +# if !defined (ACE_WIN32) || (defined (__BORLANDC__) && (__BORLANDC__ >= 0x600)) + ACE_OSCALL (ACE_SPRINTF_ADAPTER (::vsnprintf (buf, maxlen, format, ap)), + int, -1, result); +# else + ACE_OSCALL (ACE_SPRINTF_ADAPTER (::_vsnprintf (buf, maxlen, format, ap)), + int, -1, result); + // Win32 doesn't regard a full buffer with no 0-terminate as an + // overrun. + if (result == static_cast <int> (maxlen)) + result = -1; + + // Win32 doesn't 0-terminate the string if it overruns maxlen. + if (result == -1) + buf[maxlen-1] = '\0'; +# endif /* !ACE_WIN32 || __BORLANDC__ >= 0x600 */ va_end (ap); + // In out-of-range conditions, C99 defines vsnprintf to return the number + // of characters that would have been written if enough space was available. + // Earlier variants of the vsnprintf() (e.g. UNIX98) defined it to return + // -1. This method follows the C99 standard, but needs to guess at the + // value; uses maxlen + 1. + if (result == -1) + result = static_cast <int> (maxlen + 1); return result; + +#else + ACE_UNUSED_ARG (buf); + ACE_UNUSED_ARG (maxlen); + ACE_UNUSED_ARG (format); + ACE_NOTSUP_RETURN (-1); +#endif /* ACE_HAS_SNPRINTF */ } #if defined (ACE_HAS_WCHAR) @@ -336,8 +365,10 @@ ACE_OS::snprintf (wchar_t *buf, size_t maxlen, const wchar_t *format, ...) // Microsoft's vswprintf() doesn't have the maxlen argument that // XPG4/UNIX98 define. They do, however, recommend use of _vsnwprintf() // as a substitute, which does have the same signature as the UNIX98 one. - ACE_OSCALL (::_vsnwprintf (buf, maxlen, format, ap), int, -1, result); - // Win32 doesn't regard a full buffer with no 0-terminate as an overrun. + ACE_OSCALL (ACE_SPRINTF_ADAPTER (::_vsnwprintf (buf, maxlen, format, ap)), + int, -1, result); + // Win32 doesn't regard a full buffer with no 0-terminate as an + // overrun. if (result == static_cast <int> (maxlen)) result = -1; @@ -345,7 +376,8 @@ ACE_OS::snprintf (wchar_t *buf, size_t maxlen, const wchar_t *format, ...) if (result == -1) buf[maxlen-1] = '\0'; # else - ACE_OSCALL (::vswprintf (buf, maxlen, format, ap), int, -1, result); + ACE_OSCALL (ACE_SPRINTF_ADAPTER (::vswprintf (buf, maxlen, format, ap)), + int, -1, result); # endif /* ACE_WIN32 */ va_end (ap); // In out-of-range conditions, C99 defines vsnprintf to return the number @@ -357,12 +389,12 @@ ACE_OS::snprintf (wchar_t *buf, size_t maxlen, const wchar_t *format, ...) result = static_cast <int> (maxlen + 1); return result; -# else +#else ACE_UNUSED_ARG (buf); ACE_UNUSED_ARG (maxlen); ACE_UNUSED_ARG (format); ACE_NOTSUP_RETURN (-1); -# endif /* _XOPEN_SOURCE ... */ +#endif /* ACE_HAS_SNPRINTF */ } #endif /* ACE_HAS_WCHAR */ @@ -374,7 +406,7 @@ ACE_OS::sprintf (char *buf, const char *format, ...) int result; va_list ap; va_start (ap, format); - ACE_OSCALL (::vsprintf (buf, format, ap), int, -1, result); + ACE_OSCALL (ACE_SPRINTF_ADAPTER (::vsprintf (buf, format, ap)), int, -1, result); va_end (ap); return result; } diff --git a/ACE/ace/OS_NS_stdio.h b/ACE/ace/OS_NS_stdio.h index 18ca767ddab..bc3e5569fcf 100644 --- a/ACE/ace/OS_NS_stdio.h +++ b/ACE/ace/OS_NS_stdio.h @@ -367,7 +367,7 @@ namespace ACE_OS { # if defined (ACE_HAS_WCHAR) extern ACE_Export - int snprintf (wchar_t *buf, size_t maxlen, const wchar_t *format, ...); + int snprintf (wchar_t *buf, size_t maxlen, const wchar_t *format,...); # endif /* ACE_HAS_WCHAR */ extern ACE_Export diff --git a/ACE/ace/OS_NS_stdio.inl b/ACE/ace/OS_NS_stdio.inl index 72a13d34b1f..ce74c3a21cb 100644 --- a/ACE/ace/OS_NS_stdio.inl +++ b/ACE/ace/OS_NS_stdio.inl @@ -12,9 +12,11 @@ #include "ace/OS_NS_sys_stat.h" #include "ace/OS_Memory.h" -#if defined (ACE_HAS_TRIO) -# include <trio.h> -#endif /* ACE_HAS_TRIO */ +#if defined (ACE_HAS_CHARPTR_SPRINTF) +# define ACE_SPRINTF_ADAPTER(X) ACE_OS::strlen (X) +#else +# define ACE_SPRINTF_ADAPTER(X) X +#endif /* ACE_HAS_CHARPTR_SPRINTF */ /*****************************************************************************/ @@ -794,7 +796,7 @@ ACE_OS::rename (const char *old_name, ACE_TEXT_CHAR_TO_TCHAR (new_name))) ACE_FAIL_RETURN (-1); return 0; -# elif defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_MOVEFILEEX) +# elif defined (ACE_WIN32) && defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 == 1) // 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 // <new_name> it is removed before the file is renamed/moved. The @@ -826,7 +828,7 @@ ACE_OS::rename (const wchar_t *old_name, if (MoveFileW (old_name, new_name) != 0) ACE_FAIL_RETURN (-1); return 0; -# elif defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_MOVEFILEEX) +# elif defined (ACE_WIN32) && defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 == 1) // 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 // <new_name> it is removed before the file is renamed/moved. The @@ -915,47 +917,41 @@ ACE_OS::tempnam (const wchar_t *dir, const wchar_t *pfx) ACE_INLINE int ACE_OS::vsprintf (char *buffer, const char *format, va_list argptr) { - return ::vsprintf (buffer, format, argptr); + return ACE_SPRINTF_ADAPTER (::vsprintf (buffer, format, argptr)); } ACE_INLINE int ACE_OS::vsnprintf (char *buffer, size_t maxlen, const char *format, va_list ap) { -#if !defined (ACE_LACKS_VSNPRINTF) - int result; -# if !defined (ACE_WIN32) - result = ::vsnprintf (buffer, maxlen, format, ap); +#if defined (ACE_HAS_SNPRINTF) + +# if !defined (ACE_WIN32) \ + || (defined (__BORLANDC__) && (__BORLANDC__ >= 0x600)) + return ACE_SPRINTF_ADAPTER (::vsnprintf (buffer, maxlen, format, ap)); # else - result = ::_vsnprintf (buffer, maxlen, format, ap); - // Win32 doesn't regard a full buffer with no 0-terminate as an overrun. + int result = + ACE_SPRINTF_ADAPTER (::_vsnprintf (buffer, maxlen, format, ap)); + + // Win32 doesn't regard a full buffer with no 0-terminate as an + // overrun. if (result == static_cast<int> (maxlen)) - buffer[maxlen-1] = '\0'; + result = -1; // Win32 doesn't 0-terminate the string if it overruns maxlen. if (result == -1) buffer[maxlen-1] = '\0'; -# endif - // In out-of-range conditions, C99 defines vsnprintf() to return the number - // of characters that would have been written if enough space was available. - // Earlier variants of the vsnprintf() (e.g. UNIX98) defined it to return - // -1. This method follows the C99 standard, but needs to guess at the - // value; uses maxlen + 1. - if (result == -1) - { - result = static_cast <int> (maxlen + 1); - } return result; -#elif defined (ACE_HAS_TRIO) - return trio_vsnprintf (buffer, maxlen, format, ap); + +# endif #else ACE_UNUSED_ARG (buffer); ACE_UNUSED_ARG (maxlen); ACE_UNUSED_ARG (format); ACE_UNUSED_ARG (ap); ACE_NOTSUP_RETURN (-1); -#endif /* ACE_LACKS_VSNPRINTF */ +#endif /* ACE_HAS_SNPRINTF */ } #if defined (ACE_HAS_WCHAR) @@ -1001,7 +997,8 @@ ACE_OS::vsnprintf (wchar_t *buffer, size_t maxlen, const wchar_t *format, va_lis # elif defined (ACE_WIN32) - int result = ::_vsnwprintf (buffer, maxlen, format, ap); + int result = + ACE_SPRINTF_ADAPTER (::_vsnwprintf (buffer, maxlen, format, ap)); // Win32 doesn't regard a full buffer with no 0-terminate as an // overrun. diff --git a/ACE/ace/OS_NS_stdlib.cpp b/ACE/ace/OS_NS_stdlib.cpp index cd2005eb041..0850b2a63df 100644 --- a/ACE/ace/OS_NS_stdlib.cpp +++ b/ACE/ace/OS_NS_stdlib.cpp @@ -6,8 +6,6 @@ ACE_RCSID (ace, OS_NS_stdlib, "$Id$") -#include "ace/Default_Constants.h" - #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_NS_stdlib.inl" #endif /* ACE_HAS_INLINED_OSCALLS */ @@ -103,76 +101,6 @@ ACE_OS::getenvstrings (void) #endif /* ACE_WIN32 */ } -// Return a dynamically allocated duplicate of <str>, substituting the -// environment variables of form $VAR_NAME. Note that the pointer is -// allocated with <ACE_OS::malloc> and must be freed by -// <ACE_OS::free>. - -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_ENV) - ACE_UNUSED_ARG (str); - ACE_NOTSUP_RETURN (0); -#else - const ACE_TCHAR * start = 0; - if ((start = ACE_OS::strchr (str, ACE_LIB_TEXT ('$'))) != 0) - { - ACE_TCHAR buf[ACE_DEFAULT_ARGV_BUFSIZ]; - size_t var_len = ACE_OS::strcspn (&start[1], - ACE_LIB_TEXT ("$~!#%^&*()-+=\\|/?,.;:'\"`[]{} \t\n\r")); - ACE_OS::strncpy (buf, &start[1], var_len); - buf[var_len++] = ACE_LIB_TEXT ('\0'); -# if defined (ACE_WIN32) - // Always use the ACE_TCHAR for Windows. - ACE_TCHAR *temp = ACE_OS::getenv (buf); -# else - // Use char * for environment on non-Windows. - char *temp = ACE_OS::getenv (ACE_TEXT_ALWAYS_CHAR (buf)); -# endif /* ACE_WIN32 */ - size_t buf_len = ACE_OS::strlen (str) + 1; - if (temp != 0) - buf_len += ACE_OS::strlen (temp) - var_len; - ACE_TCHAR * buf_p = buf; - if (buf_len > ACE_DEFAULT_ARGV_BUFSIZ) - { - buf_p = - (ACE_TCHAR *) ACE_OS::malloc (buf_len * sizeof (ACE_TCHAR)); - if (buf_p == 0) - { - errno = ENOMEM; - return 0; - } - } - ACE_TCHAR * p = buf_p; - size_t len = start - str; - ACE_OS::strncpy (p, str, len); - p += len; - if (temp != 0) - { -# if defined (ACE_WIN32) - p = ACE_OS::strecpy (p, temp) - 1; -# else - p = ACE_OS::strecpy (p, ACE_TEXT_CHAR_TO_TCHAR (temp)) - 1; -# endif /* ACE_WIN32 */ - } - else - { - ACE_OS::strncpy (p, start, var_len); - p += var_len; - *p = ACE_LIB_TEXT ('\0'); - } - ACE_OS::strcpy (p, &start[var_len]); - return (buf_p == buf) ? ACE_OS::strdup (buf) : buf_p; - } - else - return ACE_OS::strdup (str); -#endif /* ACE_HAS_WINCE */ -} - #if !defined (ACE_HAS_ITOA) char * ACE_OS::itoa_emulation (int value, char *string, int radix) diff --git a/ACE/ace/OS_NS_stdlib.h b/ACE/ace/OS_NS_stdlib.h index b90205fb328..26c555db656 100644 --- a/ACE/ace/OS_NS_stdlib.h +++ b/ACE/ace/OS_NS_stdlib.h @@ -225,7 +225,7 @@ namespace ACE_OS { void srand (u_int seed); // not in spec - extern ACE_Export + ACE_NAMESPACE_INLINE_FUNCTION ACE_TCHAR *strenvdup (const ACE_TCHAR *str); #if !defined (ACE_LACKS_STRTOD) diff --git a/ACE/ace/OS_NS_stdlib.inl b/ACE/ace/OS_NS_stdlib.inl index 8a33ed3ae7f..3099a5e2c70 100644 --- a/ACE/ace/OS_NS_stdlib.inl +++ b/ACE/ace/OS_NS_stdlib.inl @@ -10,7 +10,7 @@ #include "ace/os_include/os_errno.h" #include "ace/os_include/os_search.h" -#if defined (ACE_WCHAR_IN_STD_NAMESPACE) +#if defined(ACE_WCHAR_IN_STD_NAMESPACE) # define ACE_WCHAR_STD_NAMESPACE std #else # define ACE_WCHAR_STD_NAMESPACE ACE_STD_NAMESPACE @@ -64,7 +64,7 @@ ACE_OS::atoi (const wchar_t *s) #if defined (ACE_WIN32) ACE_OSCALL_RETURN (::_wtoi (s), int, -1); #else /* ACE_WIN32 */ - return ACE_OS::atoi (ACE_Wide_To_Ascii (s).char_rep ()); + return ACE_OS::atoi (ACE_Wide_To_Ascii(s).char_rep()); #endif /* ACE_WIN32 */ } #endif /* ACE_HAS_WCHAR */ @@ -221,7 +221,7 @@ ACE_OS::mktemp (wchar_t *s) return ::_wmktemp (s); # else // For narrow-char filesystems, we must convert the wide-char input to - // a narrow-char string for mktemp (), then convert the name back to + // a narrow-char string for mktemp(), then convert the name back to // wide-char for the caller. ACE_Wide_To_Ascii narrow_s (s); if (::mktemp (narrow_s.char_rep ()) == 0) @@ -235,9 +235,9 @@ ACE_OS::mktemp (wchar_t *s) #endif /* !ACE_LACKS_MKTEMP */ -#if defined (INTEGRITY) +#if defined(INTEGRITY) extern "C" { - int putenv (char *string); + int putenv(char *string); } #endif @@ -251,14 +251,14 @@ ACE_OS::putenv (const char *string) ACE_NOTSUP_RETURN (-1); #elif defined (ACE_LACKS_PUTENV) && defined (ACE_HAS_SETENV) int result = 0; - char *sp = ACE_OS::strchr (const_cast <char *> (string), '='); + char* sp = ACE_OS::strchr (const_cast <char *> (string), '='); if (sp) { - char *stmp = ACE_OS::strdup (string); + char* stmp = ACE_OS::strdup (string); if (stmp) { stmp[sp - string] = '\0'; - ACE_OSCALL (::setenv (stmp, sp+sizeof (char), 1), int, -1, result); + ACE_OSCALL (::setenv(stmp, sp+sizeof(char), 1), int, -1, result); ACE_OS::free (stmp); } else @@ -268,8 +268,9 @@ ACE_OS::putenv (const char *string) } } else - ACE_OSCALL (::setenv (string, "", 1), int, -1, result); - + { + ACE_OSCALL (::setenv(string, "", 1), int, -1, result); + } return result; #elif defined (ACE_LACKS_ENV) || defined (ACE_LACKS_PUTENV) ACE_UNUSED_ARG (string); @@ -345,15 +346,15 @@ ACE_OS::rand_r (ACE_RANDR_TYPE& seed) { ACE_OS_TRACE ("ACE_OS::rand_r"); - long new_seed = (long) (seed); + long new_seed = (long)(seed); if (new_seed == 0) new_seed = 0x12345987; long temp = new_seed / 127773; new_seed = 16807 * (new_seed - temp * 127773) - 2836 * temp; if (new_seed < 0) new_seed += 2147483647; - (seed) = (unsigned int)new_seed; - return (int) (new_seed & RAND_MAX); + (seed) = (unsigned int)new_seed; + return (int)(new_seed & RAND_MAX); } #endif /* !ACE_WIN32 */ @@ -409,6 +410,41 @@ ACE_OS::srand (u_int seed) ::srand (seed); } +// Return a dynamically allocated duplicate of <str>, substituting the +// environment variable if <str[0] == '$'>. Note that the pointer is +// allocated with <ACE_OS::malloc> and must be freed by +// <ACE_OS::free>. + +ACE_INLINE 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_ENV) + ACE_UNUSED_ARG (str); + ACE_NOTSUP_RETURN (0); +#else + if (str[0] == ACE_LIB_TEXT ('$')) + { +# if defined (ACE_WIN32) + // Always use the ACE_TCHAR for Windows. + ACE_TCHAR *temp = 0; + if ((temp = ACE_OS::getenv (&str[1])) != 0) + return ACE_OS::strdup (temp); +# else + // Use char * for environment on non-Windows. + char *temp = 0; + if ((temp = ACE_OS::getenv (ACE_TEXT_ALWAYS_CHAR (&str[1]))) != 0) + return ACE_OS::strdup (ACE_TEXT_CHAR_TO_TCHAR (temp)); +# endif /* ACE_WIN32 */ + return ACE_OS::strdup (str); + } + else + return ACE_OS::strdup (str); +#endif /* ACE_HAS_WINCE */ +} + #if !defined (ACE_LACKS_STRTOD) ACE_INLINE double ACE_OS::strtod (const char *s, char **endptr) @@ -470,7 +506,7 @@ ACE_OS::system (const ACE_TCHAR *s) ACE_NOTSUP_RETURN (-1); #elif defined (ACE_WIN32) && defined (ACE_USES_WCHAR) ACE_OSCALL_RETURN (::_wsystem (s), int, -1); -#elif defined (ACE_TANDEM_T1248_PTHREADS) +#elif defined(ACE_TANDEM_T1248_PTHREADS) ACE_OSCALL_RETURN (::spt_system (s), int, -1); #else ACE_OSCALL_RETURN (::system (ACE_TEXT_ALWAYS_CHAR (s)), int, -1); diff --git a/ACE/ace/OS_NS_string.inl b/ACE/ace/OS_NS_string.inl index 204ea5db435..c1b8aef93e5 100644 --- a/ACE/ace/OS_NS_string.inl +++ b/ACE/ace/OS_NS_string.inl @@ -525,7 +525,7 @@ ACE_INLINE wchar_t * ACE_OS::strtok (wchar_t *s, const wchar_t *tokens) { #if defined (ACE_HAS_3_PARAM_WCSTOK) - static wchar_t *lasts = 0; + static wchar_t *lasts; return ::wcstok (s, tokens, &lasts); #else return ::wcstok (s, tokens); diff --git a/ACE/ace/OS_NS_sys_mman.inl b/ACE/ace/OS_NS_sys_mman.inl index cd9a65d5a84..422d07e9c35 100644 --- a/ACE/ace/OS_NS_sys_mman.inl +++ b/ACE/ace/OS_NS_sys_mman.inl @@ -91,19 +91,41 @@ ACE_OS::mmap (void *addr, // Only create a new handle if we didn't have a valid one passed in. if (*file_mapping == ACE_INVALID_HANDLE) { - SECURITY_ATTRIBUTES sa_buffer; - SECURITY_DESCRIPTOR sd_buffer; - const LPSECURITY_ATTRIBUTES attr = - ACE_OS::default_win32_security_attributes_r (sa, - &sa_buffer, - &sd_buffer); +# if !defined(ACE_HAS_WINCE) && (!defined (ACE_HAS_WINNT4) || (ACE_HAS_WINNT4 == 0)) + int try_create = 1; + if ((file_mapping_name != 0) && (*file_mapping_name != 0)) + { + // On Win9x, we first try to OpenFileMapping to + // file_mapping_name. Only if there is no mapping object + // with that name, and the desired name is valid, do we try + // CreateFileMapping. - *file_mapping = ACE_TEXT_CreateFileMapping (file_handle, - attr, - prot, - 0, - 0, - file_mapping_name); + *file_mapping = ACE_TEXT_OpenFileMapping (nt_flags, + 0, + file_mapping_name); + if (*file_mapping != 0 + || (::GetLastError () == ERROR_INVALID_NAME + && ::GetLastError () == ERROR_FILE_NOT_FOUND)) + try_create = 0; + } + + if (try_create) +# endif /* !ACE_HAS_WINCE && (ACE_HAS_WINNT4 || ACE_HAS_WINNT4 == 0) */ + { + SECURITY_ATTRIBUTES sa_buffer; + SECURITY_DESCRIPTOR sd_buffer; + const LPSECURITY_ATTRIBUTES attr = + ACE_OS::default_win32_security_attributes_r (sa, + &sa_buffer, + &sd_buffer); + + *file_mapping = ACE_TEXT_CreateFileMapping (file_handle, + attr, + prot, + 0, + 0, + file_mapping_name); + } } if (*file_mapping == 0) diff --git a/ACE/ace/OS_NS_sys_time.inl b/ACE/ace/OS_NS_sys_time.inl index 9300e4ac011..8849e37d96b 100644 --- a/ACE/ace/OS_NS_sys_time.inl +++ b/ACE/ace/OS_NS_sys_time.inl @@ -66,7 +66,7 @@ ACE_OS::gettimeofday (void) #else # if defined (ACE_HAS_TIMEZONE_GETTIMEOFDAY) || \ defined(ACE_HAS_VOIDPTR_GETTIMEOFDAY) || \ - (defined (ACE_HAS_SVR4_GETTIMEOFDAY) && !defined (SCO)) + (defined (ACE_HAS_SVR4_GETTIMEOFDAY) && !defined (m88k) && !defined (SCO)) ACE_OSCALL (::gettimeofday (&tv, 0), int, -1, result); # elif defined (ACE_VXWORKS) // Assumes that struct timespec is same size as struct timeval, diff --git a/ACE/ace/OS_NS_sys_wait.inl b/ACE/ace/OS_NS_sys_wait.inl index 2503d509828..e273b5602d4 100644 --- a/ACE/ace/OS_NS_sys_wait.inl +++ b/ACE/ace/OS_NS_sys_wait.inl @@ -15,7 +15,11 @@ ACE_OS::wait (int *status) ACE_UNUSED_ARG (status); ACE_NOTSUP_RETURN (0); #else +# if defined (ACE_HAS_UNION_WAIT) + ACE_OSCALL_RETURN (::wait ((union wait *) status), pid_t, -1); +# else ACE_OSCALL_RETURN (::wait (status), pid_t, -1); +# endif /* ACE_HAS_UNION_WAIT */ #endif /* ACE_LACKS_WAIT */ } diff --git a/ACE/ace/OS_NS_unistd.cpp b/ACE/ace/OS_NS_unistd.cpp index 81b2c9e3aa9..4fd4401c3d9 100644 --- a/ACE/ace/OS_NS_unistd.cpp +++ b/ACE/ace/OS_NS_unistd.cpp @@ -2,7 +2,7 @@ #include "ace/OS_NS_unistd.h" -ACE_RCSID (ace, OS_NS_unistd, "$Id$") +ACE_RCSID(ace, OS_NS_unistd, "$Id$") #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_NS_unistd.inl" @@ -39,8 +39,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL int ACE_OS::argv_to_string (ACE_TCHAR **argv, ACE_TCHAR *&buf, - bool substitute_env_args, - bool quote_args) + bool substitute_env_args) { if (argv == 0 || argv[0] == 0) return 0; @@ -49,90 +48,35 @@ ACE_OS::argv_to_string (ACE_TCHAR **argv, // Determine the length of the buffer. - int argc; - for (argc = 0; argv[argc] != 0; ++argc) - continue; - ACE_TCHAR **argv_p = argv; - - for (int i = 0; i < argc; ++i) + for (int i = 0; argv[i] != 0; i++) { #if !defined (ACE_LACKS_ENV) // Account for environment variables. - if (substitute_env_args - && ACE_OS::strchr (argv[i], ACE_LIB_TEXT ('$')) != 0) - { - if (argv_p == argv) - { - argv_p = (ACE_TCHAR **) ACE_OS::malloc (argc * sizeof (ACE_TCHAR *)); - if (argv_p == 0) - { - errno = ENOMEM; - return 0; - } - ACE_OS::memcpy (argv_p, argv, argc * sizeof (ACE_TCHAR *)); - } - argv_p[i] = ACE_OS::strenvdup (argv[i]); - if (argv_p[i] == 0) - { - ACE_OS::free (argv_p); - errno = ENOMEM; - return 0; - } - } -#endif /* ACE_LACKS_ENV */ - if (quote_args - && ACE_OS::strchr (argv_p[i], ACE_LIB_TEXT (' ')) != 0) + if (substitute_env_args && argv[i][0] == ACE_LIB_TEXT ('$')) { - if (argv_p == argv) - { - argv_p = (ACE_TCHAR **) ACE_OS::malloc (argc * sizeof (ACE_TCHAR *)); - if (argv_p == 0) - { - errno = ENOMEM; - return 0; - } - ACE_OS::memcpy (argv_p, argv, argc * sizeof (ACE_TCHAR *)); - } - int quotes = 0; - ACE_TCHAR *temp = argv_p[i]; - if (ACE_OS::strchr (temp, ACE_LIB_TEXT ('"')) != 0) - { - for (int j = 0; temp[j] != 0; ++j) - if (temp[j] == ACE_LIB_TEXT ('"')) - ++quotes; - } - argv_p[i] = - (ACE_TCHAR *) ACE_OS::malloc (ACE_OS::strlen (temp) * sizeof (ACE_TCHAR) + quotes + 3); - if (argv_p[i] == 0) - { - ACE_OS::free (argv_p); - errno = ENOMEM; - return 0; - } - ACE_TCHAR *end = argv_p[i]; - - *end++ = ACE_LIB_TEXT ('"'); - - if (quotes > 0) - { - for (ACE_TCHAR *p = temp; - *p != 0; - *end++ = *p++) - if (*p == ACE_LIB_TEXT ('"')) - *end++ = ACE_LIB_TEXT ('\\'); - - *end++ = ACE_LIB_TEXT ('\0'); - } +# if defined (ACE_WIN32) || !defined (ACE_HAS_WCHAR) + ACE_TCHAR *temp = 0; + // Win32 is the only platform with a wide-char ACE_OS::getenv(). + if ((temp = ACE_OS::getenv (&argv[i][1])) != 0) + buf_len += ACE_OS::strlen (temp); else - end = ACE_OS::strecpy (end, temp); - - end[-1] = ACE_LIB_TEXT ('"'); - - *end = ACE_LIB_TEXT ('\0'); - if (temp != argv[i]) - ACE_OS::free (temp); + buf_len += ACE_OS::strlen (argv[i]); +# else + // This is an ACE_HAS_WCHAR platform and not ACE_WIN32. + // Convert the env variable name for getenv(), then add + // the length of the returned char *string. Later, when we + // actually use the returned env variable value, convert it + // as well. + char *ctemp = ACE_OS::getenv (ACE_TEXT_ALWAYS_CHAR (&argv[i][1])); + if (ctemp == 0) + buf_len += ACE_OS::strlen (argv[i]); + else + buf_len += ACE_OS::strlen (ctemp); +# endif /* ACE_WIN32 || !ACE_HAS_WCHAR */ } - buf_len += ACE_OS::strlen (argv_p[i]); + else +#endif /* ACE_LACKS_ENV */ + buf_len += ACE_OS::strlen (argv[i]); // Add one for the extra space between each string. buf_len++; @@ -146,27 +90,48 @@ ACE_OS::argv_to_string (ACE_TCHAR **argv, 0); // Initial null charater to make it a null string. - buf[0] = ACE_LIB_TEXT ('\0'); + buf[0] = '\0'; ACE_TCHAR *end = buf; + int j; - for (int i = 0; i < argc; ++i) + for (j = 0; argv[j] != 0; j++) { - end = ACE_OS::strecpy (end, argv_p[i]); - if (argv_p[i] != argv[i]) - ACE_OS::free (argv_p[i]); + +#if !defined (ACE_LACKS_ENV) + // Account for environment variables. + if (substitute_env_args && argv[j][0] == ACE_LIB_TEXT ('$')) + { +# if defined (ACE_WIN32) || !defined (ACE_HAS_WCHAR) + // Win32 is the only platform with a wide-char ACE_OS::getenv(). + ACE_TCHAR *temp = ACE_OS::getenv (&argv[j][1]); + if (temp != 0) + end = ACE_OS::strecpy (end, temp); + else + end = ACE_OS::strecpy (end, argv[j]); +# else + // This is an ACE_HAS_WCHAR platform and not ACE_WIN32. + // Convert the env variable name for getenv(), then convert + // the returned char *string back to wchar_t. + char *ctemp = ACE_OS::getenv (ACE_TEXT_ALWAYS_CHAR (&argv[j][1])); + if (ctemp == 0) + end = ACE_OS::strecpy (end, argv[j]); + else + end = ACE_OS::strecpy (end, ACE_TEXT_CHAR_TO_TCHAR (ctemp)); +# endif /* ACE_WIN32 || !ACE_HAS_WCHAR */ + } + else +#endif /* ACE_LACKS_ENV */ + end = ACE_OS::strecpy (end, argv[j]); // Replace the null char that strecpy put there with white // space. - end[-1] = ACE_LIB_TEXT (' '); + end[-1] = ' '; } - // Null terminate the string. - *end = ACE_LIB_TEXT ('\0'); - - if (argv_p != argv) - ACE_OS::free (argv_p); + // Null terminate the string. + *end = '\0'; // The number of arguments. - return argc; + return j; } int @@ -278,7 +243,7 @@ ACE_OS::fork_exec (ACE_TCHAR *argv[]) # if defined (ACE_USES_WCHAR) // Wide-char builds need to convert the command-line args to - // narrow char strings for execv (). + // narrow char strings for execv(). char **cargv = 0; int arg_count; # endif /* ACE_HAS_WCHAR */ @@ -341,10 +306,9 @@ ACE_OS::num_processors (void) int num_processors; int mib[2] = { CTL_HW, HW_NCPU }; size_t len = sizeof (num_processors); - if (::sysctl (mib, 2, &num_processors, &len, NULL, 0) != -1) - return num_processors; - else - return -1; + + sysctl(mib, 2, &num_processors, &len, NULL, 0); + return num_processors; #else ACE_NOTSUP_RETURN (-1); #endif @@ -367,10 +331,9 @@ ACE_OS::num_processors_online (void) int num_processors; int mib[2] = { CTL_HW, HW_NCPU }; size_t len = sizeof (num_processors); - if (::sysctl (mib, 2, &num_processors, &len, NULL, 0) != -1) - return num_processors; - else - return -1; + + sysctl(mib, 2, &num_processors, &len, NULL, 0); + return num_processors; #elif defined (__hpux) struct pst_dynamic psd; if (::pstat_getdynamic (&psd, sizeof (psd), (size_t) 1, 0) != -1) @@ -397,7 +360,7 @@ ACE_OS::read_n (ACE_HANDLE handle, bytes_transferred += n) { n = ACE_OS::read (handle, - (char *) buf + bytes_transferred, + (char *) buf + bytes_transferred, len - bytes_transferred); if (n == -1 || n == 0) @@ -426,7 +389,7 @@ ACE_OS::pread (ACE_HANDLE handle, FILE_CURRENT); if (original_low_position == INVALID_SET_FILE_POINTER - && GetLastError () != NO_ERROR) + && GetLastError() != NO_ERROR) return -1; // Go to the correct position @@ -437,12 +400,12 @@ ACE_OS::pread (ACE_HANDLE handle, &high_offset, FILE_BEGIN); if (altered_position == INVALID_SET_FILE_POINTER - && GetLastError () != NO_ERROR) + && GetLastError() != NO_ERROR) return -1; DWORD bytes_read; -# if defined (ACE_HAS_WIN32_OVERLAPPED_IO) +# if defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0) OVERLAPPED overlapped; overlapped.Internal = 0; @@ -473,7 +436,7 @@ ACE_OS::pread (ACE_HANDLE handle, } } -# else /* ACE_HAS_WIN32_OVERLAPPED_IO */ +# else /* ACE_HAS_WINNT4 && (ACE_HAS_WINNT4 != 0) */ BOOL result = ::ReadFile (handle, buf, @@ -483,14 +446,14 @@ ACE_OS::pread (ACE_HANDLE handle, if (result == FALSE) return -1; -# endif /* ACE_HAS_WIN32_OVERLAPPED_IO */ +# endif /* ACE_HAS_WINNT4 && (ACE_HAS_WINNT4 != 0) */ // Reset the original file pointer position if (::SetFilePointer (handle, original_low_position, &original_high_position, FILE_BEGIN) == INVALID_SET_FILE_POINTER - && GetLastError () != NO_ERROR) + && GetLastError() != NO_ERROR) return -1; return (ssize_t) bytes_read; @@ -521,9 +484,9 @@ ACE_OS::pread (ACE_HANDLE handle, if (altered_position == -1) return -1; - ssize_t const bytes_read = ACE_OS::read (handle, - buf, - nbytes); + ssize_t bytes_read = ACE_OS::read (handle, + buf, + nbytes); if (bytes_read == -1) return -1; @@ -564,7 +527,7 @@ ACE_OS::pwrite (ACE_HANDLE handle, LARGE_INTEGER loffset; loffset.QuadPart = offset; -# if defined (ACE_HAS_WIN32_OVERLAPPED_IO) +# if defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0) OVERLAPPED overlapped; overlapped.Internal = 0; @@ -592,7 +555,7 @@ ACE_OS::pwrite (ACE_HANDLE handle, return -1; } -# else /* ACE_HAS_WIN32_OVERLAPPED_IO */ +# else /* ACE_HAS_WINNT4 && (ACE_HAS_WINNT4 != 0) */ // Go to the correct position if (! ::SetFilePointerEx (handle, loffset, 0, FILE_BEGIN)) @@ -609,7 +572,7 @@ ACE_OS::pwrite (ACE_HANDLE handle, if (result == FALSE) return -1; -# endif /* ACE_HAS_WIN32_OVERLAPPED_IO */ +# endif /* ACE_HAS_WINNT4 && (ACE_HAS_WINNT4 != 0) */ // Reset the original file pointer position if (::SetFilePointer (handle, @@ -679,11 +642,11 @@ ACE_OS::string_to_argv (ACE_TCHAR *buf, { // Skip whitespace.. while (ACE_OS::ace_isspace (*cp)) - ++cp; + cp++; // Increment count and move to next whitespace.. if (*cp != ACE_LIB_TEXT ('\0')) - ++argc; + argc++; while (*cp != ACE_LIB_TEXT ('\0') && !ACE_OS::ace_isspace (*cp)) { @@ -693,21 +656,20 @@ ACE_OS::string_to_argv (ACE_TCHAR *buf, ACE_TCHAR quote = *cp; // Scan past the string.. - for (++cp; *cp != ACE_LIB_TEXT ('\0') - && (*cp != quote || cp[-1] == ACE_LIB_TEXT ('\\')); ++cp) + for (cp++; *cp != ACE_LIB_TEXT ('\0') && *cp != quote; cp++) continue; // '\0' implies unmatched quote.. if (*cp == ACE_LIB_TEXT ('\0')) { - --argc; + argc--; break; } else - ++cp; + cp++; } else - ++cp; + cp++; } } @@ -729,11 +691,11 @@ ACE_OS::string_to_argv (ACE_TCHAR *buf, ACE_TCHAR *ptr = buf; - for (int i = 0; i < argc; ++i) + for (int i = 0; i < argc; i++) { // Skip whitespace.. while (ACE_OS::ace_isspace (*ptr)) - ++ptr; + ptr++; // Copy next argument and move to next whitespace.. cp = argp; @@ -742,15 +704,11 @@ ACE_OS::string_to_argv (ACE_TCHAR *buf, { ACE_TCHAR quote = *ptr++; - while (*ptr != ACE_LIB_TEXT ('\0') - && (*ptr != quote || ptr[-1] == ACE_LIB_TEXT ('\\'))) - { - if (*ptr == quote && ptr[-1] == ACE_LIB_TEXT ('\\')) --cp; - *cp++ = *ptr++; - } + while (*ptr != ACE_LIB_TEXT ('\0') && *ptr != quote) + *cp++ = *ptr++; if (*ptr == quote) - ++ptr; + ptr++; } else *cp++ = *ptr++; @@ -760,7 +718,7 @@ ACE_OS::string_to_argv (ACE_TCHAR *buf, #if !defined (ACE_LACKS_ENV) // Check for environment variable substitution here. if (substitute_env_args) { - argv[i] = ACE_OS::strenvdup (argp); + argv[i] = ACE_OS::strenvdup(argp); if (argv[i] == 0) { @@ -773,7 +731,7 @@ ACE_OS::string_to_argv (ACE_TCHAR *buf, else #endif /* ACE_LACKS_ENV */ { - argv[i] = ACE_OS::strdup (argp); + argv[i] = ACE_OS::strdup(argp); if (argv[i] == 0) { @@ -810,7 +768,7 @@ ACE_OS::write_n (ACE_HANDLE handle, bytes_transferred += n) { n = ACE_OS::write (handle, - (char *) buf + bytes_transferred, + (char *) buf + bytes_transferred, len - bytes_transferred); if (n == -1 || n == 0) diff --git a/ACE/ace/OS_NS_unistd.h b/ACE/ace/OS_NS_unistd.h index f076594de80..3f51db36c3f 100644 --- a/ACE/ace/OS_NS_unistd.h +++ b/ACE/ace/OS_NS_unistd.h @@ -64,8 +64,7 @@ namespace ACE_OS extern ACE_Export int argv_to_string (ACE_TCHAR **argv, ACE_TCHAR *&buf, - bool substitute_env_args = true, - bool quote_args = false); + bool substitute_env_args = true); #if !defined (ACE_LACKS_CHDIR) ACE_NAMESPACE_INLINE_FUNCTION diff --git a/ACE/ace/OS_NS_unistd.inl b/ACE/ace/OS_NS_unistd.inl index 5883dc4cf6f..35aedac07ec 100644 --- a/ACE/ace/OS_NS_unistd.inl +++ b/ACE/ace/OS_NS_unistd.inl @@ -21,7 +21,7 @@ #if defined (ACE_VXWORKS) || defined (ACE_HAS_WINCE) # include "ace/os_include/os_unistd.h" -# if defined (ACE_VXWORKS) && ((ACE_VXWORKS == 0x620) || (ACE_VXWORKS == 0x630) || (ACE_VXWORKS == 0x640)) +# if defined (ACE_VXWORKS) && ((ACE_VXWORKS == 0x620) || (ACE_VXWORKS == 0x630)) # if defined (__RTP__) # include "ace/os_include/os_strings.h" # else diff --git a/ACE/ace/OS_TLI.h b/ACE/ace/OS_TLI.h index cc686df968b..4744c2b8536 100644 --- a/ACE/ace/OS_TLI.h +++ b/ACE/ace/OS_TLI.h @@ -160,7 +160,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL // Also see ChangeLog entries: // Mon Jan 23 16:35:40 UTC 2006 Steve Huston <shuston@riverace.com> // Mon Jan 23 22:08:56 UTC 2006 Steve Huston <shuston@riverace.com> -#if defined (__HP_aCC) && (__HP_aCC <= 37300) +#if defined (__HP_aCC) && (__HP_aCC <= 36500) typedef extern "C" struct t_optmgmt ACE_TOPTMGMT; typedef extern "C" struct t_bind ACE_TBIND; #else diff --git a/ACE/ace/Object_Manager_Base.cpp b/ACE/ace/Object_Manager_Base.cpp index d79791311f2..0f5b350bcef 100644 --- a/ACE/ace/Object_Manager_Base.cpp +++ b/ACE/ace/Object_Manager_Base.cpp @@ -407,7 +407,7 @@ ACE_OS_Object_Manager::print_error_message (unsigned int line_number, { // To avoid duplication of these const strings in OS.o. #if !defined (ACE_HAS_WINCE) - fprintf (stderr, "ace/Object_Manager_Base.cpp, line %u: %s ", + fprintf (stderr, "ace/OS.cpp, line %u: %s ", line_number, ACE_TEXT_ALWAYS_CHAR (message)); perror ("failed"); diff --git a/ACE/ace/POSIX_Asynch_IO.h b/ACE/ace/POSIX_Asynch_IO.h index 243fddc990f..97f5120d0ae 100644 --- a/ACE/ace/POSIX_Asynch_IO.h +++ b/ACE/ace/POSIX_Asynch_IO.h @@ -71,11 +71,12 @@ public: * This is the ACT associated with the handle on which the * Asynch_Operation takes place. * - * @note This is not implemented for POSIX4 platforms. + * @@ This is not implemented for POSIX4 platforms. + * */ const void *completion_key (void) const; - /// Error value if the operation fails. + /// Error value if the operation fail. u_long error (void) const; /// This returns ACE_INVALID_HANDLE on POSIX4 platforms. diff --git a/ACE/ace/POSIX_CB_Proactor.h b/ACE/ace/POSIX_CB_Proactor.h index 2b844c180a8..0daea7aea41 100644 --- a/ACE/ace/POSIX_CB_Proactor.h +++ b/ACE/ace/POSIX_CB_Proactor.h @@ -27,7 +27,7 @@ #include "ace/POSIX_Proactor.h" -#if defined (ACE_LACKS_SIGVAL_T) +#if defined(AIX) || defined(sun) || defined(__APPLE__) || defined (ACE_VXWORKS) typedef union sigval sigval_t; #endif @@ -83,13 +83,13 @@ protected: virtual int notify_completion (int sig_num); /** - * Dispatch a single set of events. If @a milli_seconds elapses + * Dispatch a single set of events. If <milli_seconds> elapses * before any events occur, return 0. Return 1 if a completion is * dispatched. Return -1 on errors. */ int handle_events_i (u_long milli_seconds); - /// Semaphore variable to notify + /// semaphore variable to notify /// used to wait the first AIO start ACE_SYNCH_SEMAPHORE sema_; }; diff --git a/ACE/ace/POSIX_Proactor.cpp b/ACE/ace/POSIX_Proactor.cpp index 395f5a08a32..1664200ecf6 100644 --- a/ACE/ace/POSIX_Proactor.cpp +++ b/ACE/ace/POSIX_Proactor.cpp @@ -1720,7 +1720,7 @@ int ACE_POSIX_SIG_Proactor::notify_completion (int sig_num) { // Get this process id. - pid_t const pid = ACE_OS::getpid (); + pid_t pid = ACE_OS::getpid (); if (pid == (pid_t) -1) ACE_ERROR_RETURN ((LM_ERROR, "Error:%N:%l(%P | %t):%p", @@ -1729,11 +1729,11 @@ ACE_POSIX_SIG_Proactor::notify_completion (int sig_num) // Set the signal information. sigval value; -#if defined (ACE_HAS_SIGVAL_SIGVAL_INT) +#if defined (__FreeBSD__) value.sigval_int = -1; #else value.sival_int = -1; -#endif /* ACE_HAS_SIGVAL_SIGVAL_INT */ +#endif /* __FreeBSD__ */ // Queue the signal. if (sigqueue (pid, sig_num, value) == 0) @@ -1870,11 +1870,11 @@ ACE_POSIX_SIG_Proactor::allocate_aio_slot (ACE_POSIX_Asynch_Result *result) // store index!!, not pointer in signal info result->aio_sigevent.sigev_notify = SIGEV_SIGNAL; result->aio_sigevent.sigev_signo = result->signal_number (); -#if defined (ACE_HAS_SIGVAL_SIGVAL_INT) +#if defined (__FreeBSD__) result->aio_sigevent.sigev_value.sigval_int = static_cast<int> (i); #else result->aio_sigevent.sigev_value.sival_int = static_cast<int> (i); -#endif /* ACE_HAS_SIGVAL_SIGVAL_INT */ +#endif /* __FreeBSD__ */ return static_cast<ssize_t> (i); } @@ -1922,11 +1922,11 @@ ACE_POSIX_SIG_Proactor::handle_events_i (const ACE_Time_Value *timeout) flg_aio = 1; // AIO signal received // define index to start // nothing will happen if it contains garbage -#if defined (ACE_HAS_SIGVAL_SIGVAL_INT) +#if defined (__FreeBSD__) index = static_cast<size_t> (sig_info.si_value.sigval_int); #else index = static_cast<size_t> (sig_info.si_value.sival_int); -#endif /* ACE_HAS_SIGVAL_SIGVAL_INT */ +#endif // 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 diff --git a/ACE/ace/POSIX_Proactor.h b/ACE/ace/POSIX_Proactor.h index 82489dd66ff..2accb9fe4b1 100644 --- a/ACE/ace/POSIX_Proactor.h +++ b/ACE/ace/POSIX_Proactor.h @@ -523,7 +523,7 @@ public: */ ACE_POSIX_SIG_Proactor (size_t nmaxop = ACE_AIO_DEFAULT_SIZE); - virtual Proactor_Type get_impl_type (void); + virtual Proactor_Type get_impl_type (void); /** * This constructor should be used to tell the Proactor to mask and diff --git a/ACE/ace/Pagefile_Memory_Pool.cpp b/ACE/ace/Pagefile_Memory_Pool.cpp index fcad91bfe93..125dd041f9e 100644 --- a/ACE/ace/Pagefile_Memory_Pool.cpp +++ b/ACE/ace/Pagefile_Memory_Pool.cpp @@ -229,7 +229,7 @@ ACE_Pagefile_Memory_Pool::map (int &first_time, // Create file mapping, if not yet done if (object_handle_ == 0) { -#if !defined (ACE_LACKS_WIN32_SECURITY_DESCRIPTORS) +#if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) // Allow access by all users. SECURITY_ATTRIBUTES sa; SECURITY_DESCRIPTOR sd; @@ -242,7 +242,7 @@ ACE_Pagefile_Memory_Pool::map (int &first_time, sa.nLength = sizeof (SECURITY_ATTRIBUTES); sa.lpSecurityDescriptor = &sd; sa.bInheritHandle = FALSE; -#endif /* ACE_LACKS_WIN32_SECURITY_DESCRIPTORS */ +#endif /* (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) */ // Get an object handle to the named reserved memory object. DWORD size_high; @@ -257,11 +257,11 @@ ACE_Pagefile_Memory_Pool::map (int &first_time, object_handle_ = ACE_TEXT_CreateFileMapping (INVALID_HANDLE_VALUE, -#if !defined (ACE_LACKS_WIN32_SECURITY_DESCRIPTORS) +#if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) &sa, #else 0, -#endif /* !ACE_LACKS_WIN32_SECURITY_DESCRIPTORS */ +#endif /* (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) */ PAGE_READWRITE | SEC_RESERVE, size_high, size_low, diff --git a/ACE/ace/Parse_Node.cpp b/ACE/ace/Parse_Node.cpp index 110e52f4673..42a7123dc76 100644 --- a/ACE/ace/Parse_Node.cpp +++ b/ACE/ace/Parse_Node.cpp @@ -669,8 +669,6 @@ ACE_Dummy_Node::apply (ACE_Service_Gestalt *, int &yyerrno) ACE_LIB_TEXT ("did operations on stream %s, error = %d\n"), this->name (), yyerrno)); -#else - ACE_UNUSED_ARG (yyerrno); #endif /* ACE_NLOGGING */ } diff --git a/ACE/ace/Proactor.cpp b/ACE/ace/Proactor.cpp index 481c7eef5b5..1a7106ad0af 100644 --- a/ACE/ace/Proactor.cpp +++ b/ACE/ace/Proactor.cpp @@ -2,7 +2,7 @@ #include "ace/config-lite.h" #include "ace/Proactor.h" -#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS) +#if ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS))) // This only works on Win32 platforms and on Unix platforms with aio // calls. @@ -1174,4 +1174,4 @@ ACE_Proactor::event_loop_done (void) ACE_END_VERSIONED_NAMESPACE_DECL -#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */ +#endif /* ACE_WIN32 || ACE_HAS_AIO_CALLS*/ diff --git a/ACE/ace/Proactor.h b/ACE/ace/Proactor.h index bcea10ec0fa..cff212a4f39 100644 --- a/ACE/ace/Proactor.h +++ b/ACE/ace/Proactor.h @@ -25,7 +25,7 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS) +#if ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS))) // This only works on Win32 platforms and on Unix platforms supporting // POSIX aio calls. @@ -684,7 +684,7 @@ public: ACE_END_VERSIONED_NAMESPACE_DECL -#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */ +#endif /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS*/ #include /**/ "ace/post.h" diff --git a/ACE/ace/Proactor_Impl.cpp b/ACE/ace/Proactor_Impl.cpp index fe08453778e..0ab848c5920 100644 --- a/ACE/ace/Proactor_Impl.cpp +++ b/ACE/ace/Proactor_Impl.cpp @@ -6,8 +6,8 @@ ACE_RCSID (ace, Proactor_Impl, "$Id$") -#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS) -// This only works on standard Win32 platforms and on Unix platforms supporting +#if ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS))) +// This only works on Win32 platforms and on Unix platforms supporting // aio calls. ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Proactor_Impl.h b/ACE/ace/Proactor_Impl.h index 607fbd0af09..0081010d8e6 100644 --- a/ACE/ace/Proactor_Impl.h +++ b/ACE/ace/Proactor_Impl.h @@ -18,8 +18,8 @@ #include /**/ "ace/config-all.h" -#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS) -// This only works on standard Win32 platforms and on Unix platforms supporting +#if ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS))) +// This only works on Win32 platforms and on Unix platforms supporting // aio calls. #include "ace/Asynch_IO.h" @@ -260,6 +260,6 @@ public: ACE_END_VERSIONED_NAMESPACE_DECL -#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */ +#endif /* (ACE_WIN32 && ACE_HAS_WINCE) || ACE_HAS_AIO_CALLS */ #include /**/ "ace/post.h" #endif /* ACE_PROACTOR_IMPL_H */ diff --git a/ACE/ace/Process.cpp b/ACE/ace/Process.cpp index b79fbcbd0f9..70b95d500e3 100644 --- a/ACE/ace/Process.cpp +++ b/ACE/ace/Process.cpp @@ -18,7 +18,6 @@ #include "ace/OS_NS_unistd.h" #include "ace/OS_Memory.h" #include "ace/Countdown_Time.h" -#include "ace/Truncate.h" #if defined (ACE_VXWORKS) && (ACE_VXWORKS > 0x600) && defined (__RTP__) # include <rtpLib.h> @@ -842,72 +841,29 @@ int ACE_Process_Options::setenv (const ACE_TCHAR *variable_name, const ACE_TCHAR *format, ...) { - // To address the potential buffer overflow, - // we now allocate the buffer on heap with a variable size. - size_t const buflen = ACE_OS::strlen (variable_name) + ACE_OS::strlen (format) + 2; - ACE_TCHAR *newformat = 0; - ACE_NEW_RETURN (newformat, ACE_TCHAR[buflen], -1); - ACE_Auto_Basic_Array_Ptr<ACE_TCHAR> safe_newformat (newformat); + ACE_TCHAR newformat[DEFAULT_COMMAND_LINE_BUF_LEN]; // Add in the variable name. - ACE_OS::sprintf (safe_newformat.get (), + ACE_OS::sprintf (newformat, ACE_LIB_TEXT ("%s=%s"), variable_name, format); + ACE_TCHAR stack_buf[DEFAULT_COMMAND_LINE_BUF_LEN]; + // Start varargs. va_list argp; va_start (argp, format); // Add the rest of the varargs. - size_t tmp_buflen = DEFAULT_COMMAND_LINE_BUF_LEN > buflen - ? static_cast<size_t> (DEFAULT_COMMAND_LINE_BUF_LEN) : buflen; - int retval = 0; - - ACE_TCHAR *stack_buf = 0; - ACE_NEW_RETURN (stack_buf, ACE_TCHAR[tmp_buflen], -1); - ACE_Auto_Basic_Array_Ptr<ACE_TCHAR> safe_stack_buf (stack_buf); - - do - { - retval = ACE_OS::vsnprintf (safe_stack_buf.get (), tmp_buflen, safe_newformat.get (), argp); - if (retval > ACE_Utils::Truncate<int> (tmp_buflen)) - { - tmp_buflen *= 2; - ACE_NEW_RETURN (stack_buf, ACE_TCHAR[tmp_buflen], -1); - safe_stack_buf.reset (stack_buf); - } - else - break; - } - while (1); - - if (retval == -1) - { - // In case that vsnprintf is not supported, - // e.g., LynxOS and VxWorks 5, we have to - // fall back to vsprintf. - if (errno == ENOTSUP) - { - // ALERT: Since we have to use vsprintf here, there is still a chance that - // the stack_buf overflows, i.e., the length of the resulting string - // can still possibly go beyond the allocated stack_buf. - retval = ACE_OS::vsprintf (safe_stack_buf.get (), safe_newformat.get (), argp); - if (retval == -1) - // vsprintf is failed. - return -1; - } - else - // vsnprintf is failed. - return -1; - } + ACE_OS::vsprintf (stack_buf, newformat, argp); // End varargs. va_end (argp); // Append the string to our environment buffer. - if (this->setenv_i (safe_stack_buf.get (), - ACE_OS::strlen (safe_stack_buf.get ())) == -1) + if (this->setenv_i (stack_buf, + ACE_OS::strlen (stack_buf)) == -1) return -1; #if defined (ACE_WIN32) @@ -923,7 +879,7 @@ ACE_Process_Options::setenv_i (ACE_TCHAR *assignment, size_t len) { // Add one for the null char. - ++len; + len++; // If environment larger than allocated buffer return. Also check to // make sure we have enough room. @@ -1066,7 +1022,7 @@ ACE_Process_Options::command_line (const ACE_TCHAR *format, ...) if (command_line_buf_len_ < 1) return -1; -#if !defined (ACE_LACKS_VSNPRINTF) +#if defined (ACE_HAS_SNPRINTF) // sprintf the format and args into command_line_buf__. ACE_OS::vsnprintf (command_line_buf_, command_line_buf_len_ - 1, diff --git a/ACE/ace/QoS/Makefile.am b/ACE/ace/QoS/Makefile.am index c48750d77a7..22ff2031cba 100644 --- a/ACE/ace/QoS/Makefile.am +++ b/ACE/ace/QoS/Makefile.am @@ -57,7 +57,7 @@ CLEANFILES = \ ACE_QoS.pc ACE_QoS.pc: ${top_builddir}/config.status ${srcdir}/ACE_QoS.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/ACE_QoS.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/ACE_QoS.pc.in endif BUILD_QOS diff --git a/ACE/ace/QoS/qos.mpc b/ACE/ace/QoS/qos.mpc index bb916932991..cf50f96b557 100644 --- a/ACE/ace/QoS/qos.mpc +++ b/ACE/ace/QoS/qos.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(QoS) : acelib, install { +project(QoS) : acelib, core { requires += qos sharedname = ACE_QoS dynamicflags = ACE_QoS_BUILD_DLL diff --git a/ACE/ace/QtReactor/QtReactor.cpp b/ACE/ace/QtReactor.cpp index 28682e17109..a6983ab9463 100644 --- a/ACE/ace/QtReactor/QtReactor.cpp +++ b/ACE/ace/QtReactor.cpp @@ -1,6 +1,6 @@ //$Id$ -#include "ace/QtReactor/QtReactor.h" +#include "ace/QtReactor.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -565,12 +565,6 @@ ACE_QtReactor::QtWaitForMultipleEvents (int width, ACE_Select_Reactor_Handle_Set &wait_set, ACE_Time_Value * /*max_wait_time*/) { - // Keep a copy of the wait set in case the wait_set be changed - // between the two select calls in this function. It could happen - // while waiting for an event, another event is handled and dispatched - // which changes the dispatch_set_/wait_set. - ACE_Select_Reactor_Handle_Set orig_wait_set = wait_set; - // Check to make sure our handle's are all usable. ACE_Select_Reactor_Handle_Set temp_set = wait_set; @@ -590,9 +584,9 @@ ACE_QtReactor::QtWaitForMultipleEvents (int width, // Now actually read the result needed by the <Select_Reactor> using // <select>. return ACE_OS::select(width, - orig_wait_set.rd_mask_, - orig_wait_set.wr_mask_, - orig_wait_set.ex_mask_, + wait_set.rd_mask_, + wait_set.wr_mask_, + wait_set.ex_mask_, (ACE_Time_Value *) &ACE_Time_Value::zero); } diff --git a/ACE/ace/QtReactor/QtReactor.h b/ACE/ace/QtReactor.h index 33e50058c15..c3ccb82f7f3 100644 --- a/ACE/ace/QtReactor/QtReactor.h +++ b/ACE/ace/QtReactor.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "ace/QtReactor/ACE_QtReactor_export.h" +#include "ace/ACE_QtReactor_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ACE/ace/README b/ACE/ace/README index 13743b8c708..e9c6d84f739 100644 --- a/ACE/ace/README +++ b/ACE/ace/README @@ -201,6 +201,7 @@ ACE_HAS_STDARG_THR_DEST Platform has void (*)(...) prototype for pthread_key_create() destructor (e.g., LynxOS). +ACE_HAS_SNPRINTF Platform offers snprintf(). ACE_HAS_STL_MAP_CONFLICT Used when users want to compile ACE with STL and STL map class conflicts with @@ -286,6 +287,9 @@ ACE_HAS_CHARPTR_DL OS/platform uses char * for ACE_HAS_CHARPTR_SOCKOPT OS/platform uses char * for sockopt, rather than const char * +ACE_HAS_CHARPTR_SPRINTF sprintf() returns char * + rather than int (e.g., SunOS + 4.x) ACE_HAS_CLOCK_GETTIME Platform supports POSIX.1b clock_gettime () at least for clock-id CLOCK_REALTIME ACE_HAS_CLOCK_GETTIME_MONOTONIC Platform supports POSIX.1b @@ -829,8 +833,6 @@ ACE_HAS_VOIDPTR_SOCKOPT OS/compiler uses void * arg 4 setsockopt() rather than const char * ACE_HAS_WCSNLEN Platform supports wcsnlen(3). -ACE_HAS_WIN32_OVERLAPPED_IO Platform has Windows overlapped I/O; - requires I/O completion ports. ACE_HAS_WIN32_TRYLOCK The Win32 platform support TryEnterCriticalSection() (WinNT 4.0 and beyond) @@ -949,11 +951,10 @@ ACE_LACKS_MEMORY_H Platform lacks memory.h (e.g., VxWorks and Chorus) ACE_LACKS_MKFIFO Platform lacks mkfifo() e.g., VxWorks, Chorus, pSoS, and WinNT. -ACE_LACKS_MKTEMP Platform lacks the mktemp() function. +ACE_LACKS_MKTEMP ACE has no mktemp() ACE_LACKS_MKTEMP_PROTOTYPE Platform/compiler lacks the mktemp() prototype (e.g., LynxOS) -ACE_LACKS_MKSTEMP Platform lacks the mkstemp() function. ACE_LACKS_MKSTEMP_PROTOTYPE Platform/compiler lacks the mkstemp() prototype (e.g., LynxOS) @@ -1113,17 +1114,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 @@ -1164,10 +1154,7 @@ ACE_LACKS_UNAME Platform lacks uname calls ACE_LACKS_WAIT The platform lacks wait ACE_LACKS_WILDCARD_BIND The bind() call will not select the port if it's 0. -ACE_LACKS_WIN32_MOVEFILEEX The Windows platforms doesn't have - MoveFileEx(). -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 @@ -1212,10 +1199,6 @@ ACE_ONLY_LATEST_AND_GREATEST A macro that indicates that which has the opposite meaning but serves the same purpose. -ACE_SHM_OPEN_REQUIRES_ONE_SLASH The path specified on shm_open() must - have a leading, single slash and not - have any other slashes. - ACE_WSTRING_HAS_USHORT_SUPPORT If a platform has wchar_t as a separate type, then ACE_WString doesn't have a diff --git a/ACE/ace/Reactor.cpp b/ACE/ace/Reactor.cpp index c71089fb62f..4921135bd3a 100644 --- a/ACE/ace/Reactor.cpp +++ b/ACE/ace/Reactor.cpp @@ -399,7 +399,8 @@ ACE_Reactor::timer_queue (ACE_Timer_Queue *tq) ACE_Timer_Queue * ACE_Reactor::timer_queue (void) const { - return this->implementation ()->timer_queue (); + ACE_Reactor_Impl *impl = this->implementation_; + return impl->timer_queue (); } int diff --git a/ACE/ace/Reactor_Impl.h b/ACE/ace/Reactor_Impl.h index 47800975214..51cca18517e 100644 --- a/ACE/ace/Reactor_Impl.h +++ b/ACE/ace/Reactor_Impl.h @@ -500,7 +500,7 @@ public: /// Returns true if Reactor has been successfully initialized, else /// false. - virtual bool initialized (void) = 0; + virtual int initialized (void) = 0; /// Returns the current size of the Reactor's internal descriptor /// table. diff --git a/ACE/ace/Read_Buffer.cpp b/ACE/ace/Read_Buffer.cpp index f57feff1e4a..9401048f148 100644 --- a/ACE/ace/Read_Buffer.cpp +++ b/ACE/ace/Read_Buffer.cpp @@ -33,7 +33,7 @@ ACE_Read_Buffer::dump (void) const } ACE_Read_Buffer::ACE_Read_Buffer (FILE *fp, - bool close_on_delete, + int close_on_delete, ACE_Allocator *alloc) : stream_ (fp), close_on_delete_ (close_on_delete), @@ -46,7 +46,7 @@ ACE_Read_Buffer::ACE_Read_Buffer (FILE *fp, #if !defined (ACE_HAS_WINCE) ACE_Read_Buffer::ACE_Read_Buffer (ACE_HANDLE handle, - bool close_on_delete, + int close_on_delete, ACE_Allocator *alloc) : stream_ (ACE_OS::fdopen (handle, ACE_LIB_TEXT ("r"))), close_on_delete_ (close_on_delete), @@ -121,7 +121,7 @@ ACE_Read_Buffer::rec_read (int term, int search, int replace) // Check for possible substitutions. if (c == search) { - ++this->occurrences_; + this->occurrences_++; if (replace >= 0) c = replace; @@ -141,7 +141,7 @@ ACE_Read_Buffer::rec_read (int term, int search, int replace) if (this->size_ == 0) return 0; - char *result = 0; + char *result; // Recurse, when the recursion bottoms out, allocate the result // buffer. diff --git a/ACE/ace/Read_Buffer.h b/ACE/ace/Read_Buffer.h index cfa0dd0f791..937152a7498 100644 --- a/ACE/ace/Read_Buffer.h +++ b/ACE/ace/Read_Buffer.h @@ -39,7 +39,7 @@ class ACE_Allocator; * Processing. * * This implementation is optimized to do a single dynamic - * allocation and make only one copy of the data. It uses + * allocation and make only one copy of the data. It uses * recursion and the run-time stack to accomplish this * efficiently. */ @@ -49,7 +49,7 @@ public: // = Initialization and termination methods. /// Read from a FILE *. ACE_Read_Buffer (FILE *fp, - bool close_on_delete = false, + int close_on_delete = 0, ACE_Allocator * = 0); #if !defined (ACE_HAS_WINCE) @@ -57,7 +57,7 @@ public: /// Read from an open HANDLE. ACE_Read_Buffer (ACE_HANDLE handle, - bool close_on_delete = false, + int close_on_delete = 0, ACE_Allocator * = 0); #endif // ACE_HAS_WINCE @@ -66,19 +66,19 @@ public: /** * Returns a pointer dynamically allocated with - * ACE_Allocator::malloc to data from the input stream up to (and - * including) the @a terminator. If @a search is >= 0 then all - * occurrences of the @a search value are substituted with the - * @a replace value. The last of the byte of data is a 0, so that - * @c strlen can be used on it. The caller is responsible for + * <ACE_Allocator::malloc> to data from the input stream up to (and + * including) the <terminator>. If <search> is >= 0 then all + * occurrences of the <search> value are substituted with the + * <replace> value. The last of the byte of data is a 0, so that + * <strlen> can be used on it. The caller is responsible for * freeing the pointer returned from this method using the - * ACE_Allocator::free. + * <ACE_Allocator::free>. */ char *read (int terminator = EOF, int search = '\n', int replace = '\0'); - /// Returns the number of characters replaced during a @c read. + /// Returns the number of characters replaced during a <read>. size_t replaced (void) const; /// Returns the size of the allocated buffer obtained during a @@ -112,10 +112,11 @@ private: /// Keeps track of whether we should close the FILE in the /// destructor. - bool const close_on_delete_; + int close_on_delete_; /// Pointer to the allocator. ACE_Allocator *allocator_; + }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Rtems_init.c b/ACE/ace/Rtems_init.c index b0c548c4fd3..4ed83fd7696 100644 --- a/ACE/ace/Rtems_init.c +++ b/ACE/ace/Rtems_init.c @@ -1,46 +1,49 @@ /* + * RTEMS Network configuration/initialization + * + * This file is a merger of the netdemo/init.c and networkconfig.h + * with some modifications to support loopback only. This file + * is OK for a starting point for a real networked application. + * --joel sherrill 16 Mar 2001 + * + * This program may be distributed and used for any purpose. + * I ask only that you: + * 1. Leave this author information intact. + * 2. Document any changes you make. + * + * W. Eric Norum + * Saskatchewan Accelerator Laboratory + * University of Saskatchewan + * Saskatoon, Saskatchewan, CANADA + * eric@skatter.usask.ca + * * $Id$ */ #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) +#include <bsp.h> + +char *rtems_progname; #define CONFIGURE_TEST_NEEDS_CONSOLE_DRIVER #define CONFIGURE_TEST_NEEDS_CLOCK_DRIVER +#define CONFIGURE_RTEMS_INIT_TASKS_TABLE #define CONFIGURE_EXECUTIVE_RAM_SIZE (512*1024) +#define CONFIGURE_MAXIMUM_SEMAPHORES 20 +#define CONFIGURE_MAXIMUM_TASKS 20 #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_STACK_SIZE (10*1024) +#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> @@ -50,6 +53,7 @@ rtems_task Init (rtems_task_argument argument); #if !defined (ACE_LACKS_NETWORKING) #include <rtems/rtems_bsdnet.h> +/* start of #include "../networkconfig.h" */ /* * Network configuration @@ -58,6 +62,8 @@ rtems_task Init (rtems_task_argument argument); * EDIT THIS FILE TO REFLECT YOUR NETWORK CONFIGURATION * * BEFORE RUNNING ANY RTEMS PROGRAMS WHICH USE THE NETWORK! * ************************************************************ + * + * $Id$ */ #ifndef _RTEMS_NETWORKCONFIG_H_ @@ -84,12 +90,13 @@ rtems_task Init (rtems_task_argument argument); */ #define RTEMS_SET_ETHERNET_ADDRESS #if (defined (RTEMS_SET_ETHERNET_ADDRESS)) +/* static char ethernet_address[6] = { 0x08, 0x00, 0x3e, 0x12, 0x28, 0xb1 }; */ static char ethernet_address[6] = { 0x00, 0x80, 0x7F, 0x22, 0x61, 0x77 }; #endif #define RTEMS_USE_LOOPBACK - +#define RTEMS_USE_LOOPBACK_ONLY #ifdef RTEMS_USE_LOOPBACK /* * Loopback interface @@ -129,7 +136,7 @@ static struct rtems_bsdnet_ifconfig netdriver_config = { NULL, /* BOOTP supplies IP address */ NULL, /* BOOTP supplies IP net mask */ #else - "XXX.YYY.ZZZ.XYZ", /* IP address */ + "XXX.YYY.ZZZ.XYZ", /* IP address */ "255.255.255.0", /* IP net mask */ #endif /* !RTEMS_USE_BOOTP */ @@ -161,9 +168,9 @@ struct rtems_bsdnet_config rtems_bsdnet_config = { #if (!defined (RTEMS_USE_BOOTP)) "rtems_host", /* Host name */ "nodomain.com", /* Domain name */ - "XXX.YYY.ZZZ.1", /* Gateway */ + "XXX.YYY.ZZZ.1", /* Gateway */ "XXX.YYY.ZZZ.1", /* Log host */ - {"XXX.YYY.ZZZ.1" }, /* Name server(s) */ + {"XXX.YYY.ZZZ.1" }, /* Name server(s) */ {"XXX.YYY.ZZZ.1" }, /* NTP server(s) */ /* @@ -194,25 +201,23 @@ struct rtems_bsdnet_config rtems_bsdnet_config = { #endif #endif /* _RTEMS_NETWORKCONFIG_H_ */ +/* end of #include "../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; + int doSocket(void); + #if !defined (ACE_LACKS_NETWORKING) - retval = rtems_bsdnet_initialize_network (); + rtems_bsdnet_initialize_network (); + rtems_bsdnet_show_inet_routes (); #endif /* ACE_LACKS_NETWORKING */ - if (retval == 0) - { - retval = main (0, 0); - } + exit (0); } #elif !defined (__GNUC__) diff --git a/ACE/ace/SOCK_Dgram.cpp b/ACE/ace/SOCK_Dgram.cpp index d2a5e4cf8f3..51b200fdc83 100644 --- a/ACE/ace/SOCK_Dgram.cpp +++ b/ACE/ace/SOCK_Dgram.cpp @@ -9,7 +9,6 @@ #include "ace/OS_NS_sys_select.h" #include "ace/OS_NS_ctype.h" #include "ace/os_include/net/os_if.h" -#include "ace/Truncate.h" #if !defined (__ACE_INLINE__) # include "ace/SOCK_Dgram.inl" @@ -98,23 +97,14 @@ ACE_SOCK_Dgram::recv (iovec *io_vec, ACE_NEW_RETURN (io_vec->iov_base, char[inlen], -1); - ssize_t rcv_len = ACE_OS::recvfrom (this->get_handle (), + io_vec->iov_len = ACE_OS::recvfrom (this->get_handle (), (char *) io_vec->iov_base, inlen, flags, (sockaddr *) saddr, &addr_len); - if (rcv_len < 0) - { - delete [] (char *)io_vec->iov_base; - io_vec->iov_base = 0; - } - else - { - io_vec->iov_len = ACE_Utils::Truncate<size_t> (rcv_len); - addr.set_size (addr_len); - } - return rcv_len; + addr.set_size (addr_len); + return io_vec->iov_len; } else return 0; @@ -625,6 +615,8 @@ ACE_SOCK_Dgram::make_multicast_ifaddr (ip_mreq *ret_mreq, return -1; lmreq.imr_interface.s_addr = ACE_HTONL (interface_addr.get_ip_address ()); +#elif defined (ACE_LACKS_IFREQ) + // Do nothing #else ifreq if_address; diff --git a/ACE/ace/SOCK_Dgram.inl b/ACE/ace/SOCK_Dgram.inl index c365a6bb7b7..55343b13668 100644 --- a/ACE/ace/SOCK_Dgram.inl +++ b/ACE/ace/SOCK_Dgram.inl @@ -53,12 +53,12 @@ ACE_SOCK_Dgram::recv (void *buf, sockaddr *saddr = (sockaddr *) addr.get_addr (); int addr_len = addr.get_size (); - ssize_t const status = ACE_OS::recvfrom (this->get_handle (), - (char *) buf, - n, - flags, - (sockaddr *) saddr, - &addr_len); + ssize_t status = ACE_OS::recvfrom (this->get_handle (), + (char *) buf, + n, + flags, + (sockaddr *) saddr, + &addr_len); addr.set_size (addr_len); addr.set_type (reinterpret_cast<sockaddr_in *> (saddr)->sin_family); return status; diff --git a/ACE/ace/SOCK_Dgram_Bcast.cpp b/ACE/ace/SOCK_Dgram_Bcast.cpp index 639a86d1612..2bca65d6538 100644 --- a/ACE/ace/SOCK_Dgram_Bcast.cpp +++ b/ACE/ace/SOCK_Dgram_Bcast.cpp @@ -236,8 +236,8 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name) IFF_UP) == 0) { ACE_ERROR ((LM_ERROR, "%p [%s]\n", - "ACE_SOCK_Dgram_Bcast::mk_broadcast: Network interface is not up", - flags.ifr_name)); + "ACE_SOCK_Dgram_Bcast::mk_broadcast: Network interface is not up", + flags.ifr_name)); continue; } @@ -252,8 +252,8 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name) SIOCGIFBRDADDR, (char *) &if_req) == -1) ACE_ERROR ((LM_ERROR, "%p [%s]\n", - "ACE_SOCK_Dgram_Bcast::mk_broadcast: ioctl (get broadaddr)", - flags.ifr_name)); + "ACE_SOCK_Dgram_Bcast::mk_broadcast: ioctl (get broadaddr)", + flags.ifr_name)); else { ACE_INET_Addr addr (reinterpret_cast <sockaddr_in *> diff --git a/ACE/ace/SOCK_IO.h b/ACE/ace/SOCK_IO.h index 252ec68d0cd..b59421602ac 100644 --- a/ACE/ace/SOCK_IO.h +++ b/ACE/ace/SOCK_IO.h @@ -70,10 +70,21 @@ public: const ACE_Time_Value *timeout = 0) const; /// Recv an <iovec> of size <n> from the connected socket. + /** + * @note The value of @a n will be silently reduced to the maximum + * value an @c int can hold if needed. This is due to the underlying + * system calls on many OSes limiting the number of @c iovec structures + * that can be passed in one call. + */ ssize_t recvv (iovec iov[], - int n, + size_t n, const ACE_Time_Value *timeout = 0) const; + /// @deprecated Same as above. Deprecated. + ssize_t recv (iovec iov[], + size_t n, + const ACE_Time_Value *timeout = 0) const; + /** * Allows a client to read from a socket without having to provide a * buffer to read. This method determines how much data is in the @@ -85,6 +96,10 @@ public: ssize_t recvv (iovec *io_vec, const ACE_Time_Value *timeout = 0) const; + /// Same as above. Deprecated. + ssize_t recv (iovec *io_vec, + const ACE_Time_Value *timeout = 0) const; + /// Recv <n> varargs messages to the connected socket. ssize_t recv (size_t n, ...) const; @@ -106,10 +121,21 @@ public: const ACE_Time_Value *timeout = 0) const; /// Send an <iovec> of size <n> to the connected socket. + /** + * @note The value of @a n will be silently reduced to the maximum + * value an @c int can hold if needed. This is due to the underlying + * system calls on many OSes limiting the number of @c iovec structures + * that can be passed in one call. + */ ssize_t sendv (const iovec iov[], - int n, + size_t n, const ACE_Time_Value *timeout = 0) const; + /// Same as above. Deprecated. + ssize_t send (const iovec iov[], + size_t n, + const ACE_Time_Value *timeout = 0) const; + /// Send <n> varargs messages to the connected socket. ssize_t send (size_t n, ...) const; diff --git a/ACE/ace/SOCK_IO.inl b/ACE/ace/SOCK_IO.inl index 0721c33fd0d..f1aec4af3b8 100644 --- a/ACE/ace/SOCK_IO.inl +++ b/ACE/ace/SOCK_IO.inl @@ -3,6 +3,7 @@ // $Id$ #include "ace/OS_NS_unistd.h" +#include "ace/Truncate.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -48,17 +49,37 @@ ACE_SOCK_IO::recv (void *buf, ACE_INLINE ssize_t ACE_SOCK_IO::recvv (iovec iov[], - int n, + size_t n, const ACE_Time_Value *timeout) const { ACE_TRACE ("ACE_SOCK_IO::recvv"); return ACE::recvv (this->get_handle (), iov, - n, + ACE_Utils::Truncate<size_t> (n), timeout); } ACE_INLINE ssize_t +ACE_SOCK_IO::recv (iovec iov[], + size_t n, + const ACE_Time_Value *timeout) const +{ + ACE_TRACE ("ACE_SOCK_IO::recv"); + return this->recvv (iov, + n, + timeout); +} + +ACE_INLINE ssize_t +ACE_SOCK_IO::recv (iovec *io_vec, + const ACE_Time_Value *timeout) const +{ + ACE_TRACE ("ACE_SOCK_IO::recv"); + return this->recvv (io_vec, + timeout); +} + +ACE_INLINE ssize_t ACE_SOCK_IO::recv (void *buf, size_t n, ACE_OVERLAPPED *overlapped) const @@ -98,17 +119,28 @@ ACE_SOCK_IO::send (const void *buf, ACE_INLINE ssize_t ACE_SOCK_IO::sendv (const iovec iov[], - int n, + size_t n, const ACE_Time_Value *timeout) const { ACE_TRACE ("ACE_SOCK_IO::sendv"); return ACE::sendv (this->get_handle (), iov, - n, + ACE_Utils::Truncate<size_t> (n), timeout); } ACE_INLINE ssize_t +ACE_SOCK_IO::send (const iovec iov[], + size_t n, + const ACE_Time_Value *timeout) const +{ + ACE_TRACE ("ACE_SOCK_IO::send"); + return this->sendv (iov, + n, + timeout); +} + +ACE_INLINE ssize_t ACE_SOCK_IO::send (const void *buf, size_t n, ACE_OVERLAPPED *overlapped) const diff --git a/ACE/ace/SPIPE_Acceptor.cpp b/ACE/ace/SPIPE_Acceptor.cpp index ba5806bae29..960adfc786c 100644 --- a/ACE/ace/SPIPE_Acceptor.cpp +++ b/ACE/ace/SPIPE_Acceptor.cpp @@ -14,9 +14,9 @@ ACE_RCSID(ace, SPIPE_Acceptor, "$Id$") ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_SPIPE_Acceptor::ACE_SPIPE_Acceptor (void) -#if defined (ACE_HAS_WIN32_NAMED_PIPES) +#if (defined (ACE_WIN32) && defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) : sa_ (0), pipe_handle_ (ACE_INVALID_HANDLE) -#endif /* ACE_HAS_WIN32_NAMED_PIPES */ +#endif /* ACE_WIN32 */ { ACE_TRACE ("ACE_SPIPE_Acceptor::ACE_SPIPE_Acceptor"); } @@ -61,13 +61,13 @@ ACE_SPIPE_Acceptor::open (const ACE_SPIPE_Addr &local_sap, this->local_addr_ = local_sap; this->set_handle (ACE_INVALID_HANDLE); -#if defined (ACE_HAS_WIN32_NAMED_PIPES) +#if (defined (ACE_WIN32) && defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) this->sa_ = sa; this->pipe_mode_ = pipe_mode; #else ACE_UNUSED_ARG (sa); ACE_UNUSED_ARG (pipe_mode); -#endif /* ACE_HAS_WIN32_NAMED_PIPES */ +#endif /* ACE_WIN32 */ return this->create_new_instance (perms); } @@ -100,7 +100,7 @@ ACE_SPIPE_Acceptor::create_new_instance (int perms) this->set_handle (spipe[1]); return 0; -#elif defined (ACE_HAS_WIN32_NAMED_PIPES) +#elif (defined (ACE_WIN32) && defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) // Create a new instance of the Named Pipe (WIN32). A new instance // of the named pipe must be created for every client process. If // an instance of the named pipe that is already connected to a @@ -183,7 +183,7 @@ ACE_SPIPE_Acceptor::close (void) { ACE_TRACE ("ACE_SPIPE_Acceptor::close"); -#if defined (ACE_HAS_WIN32_NAMED_PIPES) +#if (defined (ACE_WIN32) && defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) // Check to see if we have a valid pipe; if not, nothing to do. if (this->pipe_handle_ == ACE_INVALID_HANDLE) @@ -194,7 +194,7 @@ ACE_SPIPE_Acceptor::close (void) // hanging overlapped operation afterwards. this->set_handle (this->pipe_handle_); -#endif /* ACE_HAS_WIN32_NAMED_PIPES */ +#endif /* ACE_WIN32 */ // This behavior is shared by UNIX and Win32... int result = this->ACE_SPIPE::close (); @@ -202,7 +202,7 @@ ACE_SPIPE_Acceptor::close (void) #if defined (ACE_HAS_STREAM_PIPES) ACE_OS::fdetach (ACE_TEXT_ALWAYS_CHAR (this->local_addr_.get_path_name ())); -#elif defined (ACE_HAS_WIN32_NAMED_PIPES) +#elif (defined (ACE_WIN32) && defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) // open () started the Connect in asynchronous mode, and accept() restarts // the ConnectNamedPipe in overlapped mode. To avoid leaving a hanging @@ -283,7 +283,7 @@ ACE_SPIPE_Acceptor::accept (ACE_SPIPE_Stream &new_io, *remote_addr = new_io.remote_addr_; return 0; -#elif defined (ACE_HAS_WIN32_NAMED_PIPES) +#elif (defined (ACE_WIN32) && defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) ACE_UNUSED_ARG (restart); ACE_UNUSED_ARG (remote_addr); diff --git a/ACE/ace/SPIPE_Acceptor.h b/ACE/ace/SPIPE_Acceptor.h index 2c7d9958756..6e0bb7ed8aa 100644 --- a/ACE/ace/SPIPE_Acceptor.h +++ b/ACE/ace/SPIPE_Acceptor.h @@ -22,9 +22,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if defined (ACE_HAS_WIN32_NAMED_PIPES) +#if (defined (ACE_WIN32) && defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) #include "ace/Manual_Event.h" -#endif /* ACE_HAS_WIN32_NAMED_PIPES */ +#endif /* ACE_WIN32 */ ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -138,7 +138,7 @@ private: /// Create a new instance of an SPIPE. int create_new_instance (int perms = 0); -#if defined (ACE_HAS_WIN32_NAMED_PIPES) +#if (defined (ACE_WIN32) && defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) // On Windows, the SECURITY_ATTRIBUTES specified for the initial accept // operation is reused on all subsequent pipe instances as well. LPSECURITY_ATTRIBUTES sa_; @@ -158,7 +158,7 @@ private: ACE_Manual_Event event_; ACE_HANDLE pipe_handle_; int already_connected_; -#endif /* ACE_HAS_WIN32_NAMED_PIPES */ +#endif /* ACE_WIN32 */ }; diff --git a/ACE/ace/SSL/Makefile.am b/ACE/ace/SSL/Makefile.am index 135fa9b937b..b5ca23f600e 100644 --- a/ACE/ace/SSL/Makefile.am +++ b/ACE/ace/SSL/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu includedir = @includedir@/ace/SSL pkgconfigdir = @libdir@/pkgconfig @@ -18,7 +18,6 @@ ACE_ROOT = $(top_srcdir) ## Makefile.SSL.am if BUILD_SSL -if !BUILD_ACE_FOR_TAO lib_LTLIBRARIES = libACE_SSL.la @@ -67,9 +66,8 @@ CLEANFILES = \ ACE_SSL.pc ACE_SSL.pc: ${top_builddir}/config.status ${srcdir}/ACE_SSL.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/ACE_SSL.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/ACE_SSL.pc.in -endif !BUILD_ACE_FOR_TAO endif BUILD_SSL EXTRA_DIST = \ diff --git a/ACE/ace/SSL/ssl.mpc b/ACE/ace/SSL/ssl.mpc index 723f22c311d..1095488afe8 100644 --- a/ACE/ace/SSL/ssl.mpc +++ b/ACE/ace/SSL/ssl.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(SSL) : acelib, install, ace_openssl { +project(SSL) : acelib, core, ace_openssl { avoids += ace_for_tao requires += ssl sharedname = ACE_SSL diff --git a/ACE/ace/SSL/ssl_for_tao.mpc b/ACE/ace/SSL/ssl_for_tao.mpc index 50117aed740..11a06071d9d 100644 --- a/ACE/ace/SSL/ssl_for_tao.mpc +++ b/ACE/ace/SSL/ssl_for_tao.mpc @@ -2,7 +2,7 @@ // // $Id$ -project(SSL_FOR_TAO) : acelib, install, ace_openssl { +project(SSL_FOR_TAO) : acelib, core, ace_openssl { requires += ssl ace_for_tao sharedname = ACE_SSL_FOR_TAO dynamicflags = ACE_SSL_BUILD_DLL diff --git a/ACE/ace/SStringfwd.h b/ACE/ace/SStringfwd.h index 26f4810674c..315553751ce 100644 --- a/ACE/ace/SStringfwd.h +++ b/ACE/ace/SStringfwd.h @@ -25,12 +25,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if ((36300 <= __HP_aCC) && (__HP_aCC <= 37300)) -// Due to a bug in the aCC 3.xx compiler need to define the ACE_String_Base -// template before we can typedef ACE_CString -# include "ace/String_Base.h" -#endif /* __HP_aCC */ - ACE_BEGIN_VERSIONED_NAMESPACE_DECL template <class CHAR> class ACE_String_Base; // Forward declaration. diff --git a/ACE/ace/Sample_History.cpp b/ACE/ace/Sample_History.cpp index 832029e4dde..ffa138571d0 100644 --- a/ACE/ace/Sample_History.cpp +++ b/ACE/ace/Sample_History.cpp @@ -50,9 +50,6 @@ ACE_Sample_History::dump_samples (const ACE_TCHAR *msg, const ACE_UINT32 val = ACE_CU64_TO_CU32 (x); ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT("%s: %d %u\n"), msg, i, val)); } -#else - ACE_UNUSED_ARG (msg); - ACE_UNUSED_ARG (scale_factor); #endif /* ACE_NLOGGING */ } diff --git a/ACE/ace/Select_Reactor_Base.h b/ACE/ace/Select_Reactor_Base.h index 9ec4e642210..118a03de8ae 100644 --- a/ACE/ace/Select_Reactor_Base.h +++ b/ACE/ace/Select_Reactor_Base.h @@ -39,10 +39,6 @@ # include "ace/Array_Base.h" #endif /* ACE_WIN32 */ -#if !defined (ACE_DISABLE_NOTIFY_PIPE_DEFAULT) -# define ACE_DISABLE_NOTIFY_PIPE_DEFAULT 0 -#endif /* ACE_DISABLE_NOTIFY_PIPE_DEFAULT */ - ACE_BEGIN_VERSIONED_NAMESPACE_DECL // Add useful typedefs to simplify the following code. @@ -144,7 +140,7 @@ public: /// Initialize. virtual int open (ACE_Reactor_Impl *, ACE_Timer_Queue * = 0, - int disable_notify_pipe = ACE_DISABLE_NOTIFY_PIPE_DEFAULT); + int disable_notify_pipe = 0); /// Destroy. virtual int close (void); @@ -260,7 +256,7 @@ protected: // more notifications to be stored than would otherwise be the case. /// Keeps track of allocated arrays of type - /// ACE_Notification_Buffer. + /// <ACE_Notification_Buffer>. ACE_Unbounded_Queue <ACE_Notification_Buffer *> alloc_queue_; /// Keeps track of all pending notifications. @@ -325,7 +321,7 @@ public: /// Default "do-nothing" constructor. ACE_Select_Reactor_Handler_Repository (ACE_Select_Reactor_Impl &); - /// Initialize a repository of the appropriate @a size. + /// Initialize a repository of the appropriate <size>. /** * On Unix platforms, the size parameter should be as large as the * maximum number of file descriptors allowed for a given process. @@ -390,7 +386,7 @@ private: int unbind (ACE_HANDLE handle, map_type::iterator pos, ACE_Reactor_Mask mask); - + /** * @return @c iterator corresponding @c ACE_Event_Handler* * associated with @c ACE_HANDLE. @@ -398,7 +394,7 @@ private: map_type::iterator find_eh (ACE_HANDLE handle); private: - /// Reference to our @c Select_Reactor. + /// Reference to our <Select_Reactor>. ACE_Select_Reactor_Impl &select_reactor_; #ifndef ACE_WIN32 @@ -429,7 +425,7 @@ public: // = Iteration methods. - /// Pass back the @a next_item that hasn't been seen in the Set. + /// Pass back the <next_item> that hasn't been seen in the Set. /// Returns @c false when all items have been seen, else @c true. bool next (ACE_Event_Handler* & next_item); @@ -460,7 +456,7 @@ private: * * @brief This class simply defines how Select_Reactor's basic interface * functions should look like and provides a common base class for - * @c Select_Reactor using various locking mechanism. + * <Select_Reactor> using various locking mechanism. */ class ACE_Export ACE_Select_Reactor_Impl : public ACE_Reactor_Impl { diff --git a/ACE/ace/Select_Reactor_T.cpp b/ACE/ace/Select_Reactor_T.cpp index c7cde626b0a..f6fc77b5cb5 100644 --- a/ACE/ace/Select_Reactor_T.cpp +++ b/ACE/ace/Select_Reactor_T.cpp @@ -40,7 +40,15 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_Select_Reactor_T) -template <class ACE_SELECT_REACTOR_TOKEN> int +#if defined (ACE_WIN32) +#define ACE_SELECT_REACTOR_HANDLE(H) (this->event_handlers_[(H)].handle_) +#define ACE_SELECT_REACTOR_EVENT_HANDLER(THIS,H) ((THIS)->event_handlers_[(H)].event_handler_) +#else +#define ACE_SELECT_REACTOR_HANDLE(H) (H) +#define ACE_SELECT_REACTOR_EVENT_HANDLER(THIS,H) ((THIS)->event_handlers_[(H)]) +#endif /* ACE_WIN32 */ + + template <class ACE_SELECT_REACTOR_TOKEN> int ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::any_ready (ACE_Select_Reactor_Handle_Set &wait_set) { @@ -58,7 +66,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::any_ready return this->any_ready_i (wait_set); } -template <class ACE_SELECT_REACTOR_TOKEN> int + template <class ACE_SELECT_REACTOR_TOKEN> int ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::any_ready_i (ACE_Select_Reactor_Handle_Set &wait_set) { @@ -100,15 +108,14 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::handler_i (int signum, return 0; } -template <class ACE_SELECT_REACTOR_TOKEN> bool +template <class ACE_SELECT_REACTOR_TOKEN> int ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::initialized (void) { ACE_TRACE ("ACE_Select_Reactor_T::initialized"); - ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, false)); + ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, 0)); return this->initialized_; } - template <class ACE_SELECT_REACTOR_TOKEN> int ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::owner (ACE_thread_t tid, ACE_thread_t *o_id) @@ -210,7 +217,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::notify (ACE_Event_Handler *eh, // caller to dictate which Event_Handler method the receiver // invokes. Note that this call can timeout. - ssize_t const n = this->notify_handler_->notify (eh, mask, timeout); + ssize_t n = this->notify_handler_->notify (eh, mask, timeout); return n == -1 ? -1 : 0; } @@ -407,7 +414,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::open if (this->timer_queue_ == 0) result = -1; else - this->delete_timer_queue_ = true; + this->delete_timer_queue_ = 1; } // Allows the Notify_Handler to be overridden. @@ -420,7 +427,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::open if (this->notify_handler_ == 0) result = -1; else - this->delete_notify_handler_ = true; + this->delete_notify_handler_ = 1; } if (result != -1 && this->handler_rep_.open (size) == -1) @@ -437,7 +444,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::open if (result != -1) // We're all set to go. - this->initialized_ = true; + this->initialized_ = 1; else // This will close down all the allocated resources properly. this->close (); @@ -466,10 +473,10 @@ template <class ACE_SELECT_REACTOR_TOKEN> int ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::timer_queue (ACE_Timer_Queue *tq) { - if (this->timer_queue_ != 0 && this->delete_timer_queue_) + if (this->timer_queue_ != 0 && this->delete_timer_queue_ != 0) delete this->timer_queue_; this->timer_queue_ = tq; - this->delete_timer_queue_ = false; + this->delete_timer_queue_ = 0; return 0; } @@ -575,7 +582,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::close (void) { delete this->timer_queue_; this->timer_queue_ = 0; - this->delete_timer_queue_ = false; + this->delete_timer_queue_ = 0; } if (this->notify_handler_ != 0) @@ -585,10 +592,10 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::close (void) { delete this->notify_handler_; this->notify_handler_ = 0; - this->delete_notify_handler_ = false; + this->delete_notify_handler_ = 0; } - this->initialized_ = false; + this->initialized_ = 0; return 0; } diff --git a/ACE/ace/Select_Reactor_T.h b/ACE/ace/Select_Reactor_T.h index 638e71185c5..bb9cdceed61 100644 --- a/ACE/ace/Select_Reactor_T.h +++ b/ACE/ace/Select_Reactor_T.h @@ -67,7 +67,7 @@ public: /// fine if your application doesn't use the reactor to handle signals). ACE_Select_Reactor_T (ACE_Sig_Handler * = 0, ACE_Timer_Queue * = 0, - int disable_notify_pipe = ACE_DISABLE_NOTIFY_PIPE_DEFAULT, + int disable_notify_pipe = 0, ACE_Reactor_Notify *notify = 0, int mask_signals = 1, int s_queue = ACE_SELECT_TOKEN::FIFO); @@ -92,7 +92,7 @@ public: int restart = 0, ACE_Sig_Handler * = 0, ACE_Timer_Queue * = 0, - int disable_notify_pipe = ACE_DISABLE_NOTIFY_PIPE_DEFAULT, + int disable_notify_pipe = 0, ACE_Reactor_Notify *notify = 0, int mask_signals = 1, int s_queue = ACE_SELECT_TOKEN::FIFO); @@ -118,11 +118,11 @@ public: int restart = 0, ACE_Sig_Handler * = 0, ACE_Timer_Queue * = 0, - int disable_notify_pipe = ACE_DISABLE_NOTIFY_PIPE_DEFAULT, + int disable_notify_pipe = 0, ACE_Reactor_Notify * = 0); /// Returns -1 (not used in this implementation); - virtual int current_info (ACE_HANDLE, size_t &size); + virtual int current_info (ACE_HANDLE, size_t & /* size */); /// Use a user specified signal handler instead. virtual int set_sig_handler (ACE_Sig_Handler *signal_handler); @@ -146,7 +146,7 @@ public: * but does not actually dispatch the event handlers. By default, * don't block while checking this, i.e., "poll". */ - virtual int work_pending (const ACE_Time_Value &max_wait_time = ACE_Time_Value::zero); + virtual int work_pending (const ACE_Time_Value &max_wait_time = ACE_Time_Value::zero); /** * This event loop driver that blocks for @a max_wait_time before @@ -200,7 +200,7 @@ public: // = Register and remove ACE_Event_Handlers. /** - * Register a @a eh with a particular @a mask. Note that the + * Register a <eh> with a particular <mask>. Note that the * <Select_Reactor> will call <ACE_Event_Handler::get_handle> to * extract the underlying I/O handle. */ @@ -244,9 +244,9 @@ public: ACE_Reactor_Mask mask); /** - * Register @a new_sh to handle the signal @a signum using the - * @a new_disp. Returns the @a old_sh that was previously registered - * (if any), along with the @a old_disp of the signal handler. + * Register <new_sh> to handle the signal <signum> using the + * <new_disp>. Returns the <old_sh> that was previously registered + * (if any), along with the <old_disp> of the signal handler. */ virtual int register_handler (int signum, ACE_Event_Handler *new_sh, @@ -254,8 +254,8 @@ public: ACE_Event_Handler **old_sh = 0, ACE_Sig_Action *old_disp = 0); - /// Registers @a new_sh to handle a set of signals @a sigset using the - /// @a new_disp. + /// Registers <new_sh> to handle a set of signals <sigset> using the + /// <new_disp>. virtual int register_handler (const ACE_Sig_Set &sigset, ACE_Event_Handler *new_sh, ACE_Sig_Action *new_disp = 0); @@ -523,7 +523,7 @@ public: ACE_Event_Handler ** = 0); /// Returns true if we've been successfully initialized, else false. - virtual bool initialized (void); + virtual int initialized (void); /// Returns the current size of the Reactor's internal descriptor /// table. diff --git a/ACE/ace/Select_Reactor_T.inl b/ACE/ace/Select_Reactor_T.inl index ebbdfba1e5f..0ad9033f9a0 100644 --- a/ACE/ace/Select_Reactor_T.inl +++ b/ACE/ace/Select_Reactor_T.inl @@ -4,7 +4,6 @@ #include "ace/Reactor.h" #include "ace/Signal.h" -#include "ace/Sig_Handler.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Service_Config.cpp b/ACE/ace/Service_Config.cpp index a44998d066c..81a8536cf02 100644 --- a/ACE/ace/Service_Config.cpp +++ b/ACE/ace/Service_Config.cpp @@ -21,6 +21,7 @@ #include "ace/OS_NS_unistd.h" #include "ace/Get_Opt.h" #include "ace/ARGV.h" +#include "ace/Static_Object_Lock.h" ACE_RCSID (ace, Service_Config, @@ -130,9 +131,9 @@ ACE_Service_Config::parse_args_i (int argc, ACE_TCHAR *argv[]) -1); #endif /* ACE_LACKS_UNIX_SIGNALS */ break; - } default: - superargv.add ( argv[getopt.opt_ind () - 1]); + superargv.add ( argv[getopt.opt_ind () - 1]); + } } // Collect any argumets that were left @@ -325,19 +326,12 @@ ACE_Service_Config::impl_ (void) static TSS_Service_Gestalt_Ptr * instance_ = 0; - // We can't possibly rely on ACE_STATIC_OBJECT_LOCK or any other - // object that may be managed by the Object Manager. It is very - // likely we are called in a static initializer context, before the - // ACE_Object_Manager has been instantiated. This of course only - // matters for threaded environments. - ACE_MT (static ACE_SYNCH_RECURSIVE_MUTEX guardian_); - if (instance_ == 0) { // TSS not initialized yet - first thread to hit this, so doing // the double-checked locking thing ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, - guardian_, 0)); + *ACE_Static_Object_Lock::instance (), 0)); if (instance_ == 0) ACE_NEW_RETURN (instance_, @@ -452,6 +446,8 @@ ACE_Service_Config::ACE_Service_Config (int ignore_static_svcs, { ACE_TRACE ("ACE_Service_Config::ACE_Service_Config"); + // this->no_static_svcs_ = (ignore_static_svcs); + ACE_Service_Config::signum_ = signum; } @@ -591,7 +587,7 @@ ACE_Service_Config::close_svcs (void) ACE_TRACE ("ACE_Service_Config::close_svcs"); ACE_Service_Repository::close_singleton (); - ACE_Service_Config::current (0); + return 0; } diff --git a/ACE/ace/Service_Config.h b/ACE/ace/Service_Config.h index 8a9621b90b0..fbe63edc87e 100644 --- a/ACE/ace/Service_Config.h +++ b/ACE/ace/Service_Config.h @@ -274,9 +274,9 @@ public: */ static int open (const ACE_TCHAR program_name[], const ACE_TCHAR *logger_key = ACE_DEFAULT_LOGGER_KEY, - bool ignore_static_svcs = true, - bool ignore_default_svc_conf_file = false, - bool ignore_debug_flag = false); + int ignore_static_svcs = 1, + int ignore_default_svc_conf_file = 0, + int ignore_debug_flag = 0); /** * This is the primary entry point into the ACE_Service_Config (the @@ -331,9 +331,9 @@ public: static int open (int argc, ACE_TCHAR *argv[], const ACE_TCHAR *logger_key = ACE_DEFAULT_LOGGER_KEY, - bool ignore_static_svcs = true, - bool ignore_default_svc_conf_file = false, - bool ignore_debug_flag = false); + int ignore_static_svcs = 1, + int ignore_default_svc_conf_file = 0, + int ignore_debug_flag = 0); /// Tidy up and perform last rites when ACE_Service_Config is shut /// down. This method calls <close_svcs>. Returns 0. diff --git a/ACE/ace/Service_Config.inl b/ACE/ace/Service_Config.inl index 895c2340232..6719682dfef 100644 --- a/ACE/ace/Service_Config.inl +++ b/ACE/ace/Service_Config.inl @@ -12,9 +12,9 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE int ACE_Service_Config::open (const ACE_TCHAR program_name[], const ACE_TCHAR *logger_key, - bool ignore_static_svcs, - bool ignore_default_svc_conf, - bool ignore_debug_flag) + int ignore_static_svcs, + int ignore_default_svc_conf, + int ignore_debug_flag) { ACE_TRACE ("ACE_Service_Config::open"); return ACE_Service_Config::current()->open (program_name, @@ -29,9 +29,9 @@ ACE_INLINE int ACE_Service_Config::open (int argc, ACE_TCHAR *argv[], const ACE_TCHAR *logger_key, - bool ignore_static_svcs, - bool ignore_default_svc_conf, - bool ignore_debug_flag) + int ignore_static_svcs, + int ignore_default_svc_conf, + int ignore_debug_flag) { ACE_TRACE ("ACE_Service_Config::open"); return ACE_Service_Config::current()->open (argc, diff --git a/ACE/ace/Service_Gestalt.cpp b/ACE/ace/Service_Gestalt.cpp index 4d2492daac2..eeae45e785d 100644 --- a/ACE/ace/Service_Gestalt.cpp +++ b/ACE/ace/Service_Gestalt.cpp @@ -138,13 +138,12 @@ ACE_Service_Type_Dynamic_Guard::~ACE_Service_Type_Dynamic_Guard (void) // Lookup without ignoring suspended services. Making sure // not to ignore any inactive services, since those may be forward // declarations - size_t slot = 0; - int const ret = this->repo_.find_i (this->name_, slot, &tmp, false); + int ret = this->repo_.find_i (this->name_, &tmp, 0); // We inserted it (as inactive), so we expect to find it, right? if (ret < 0 && ret != -2) { - if (ACE::debug ()) + if(ACE::debug ()) ACE_ERROR ((LM_WARNING, ACE_LIB_TEXT ("ACE (%P|%t) STDG::<dtor> - Failed (%d) to find %s\n"), ret, this->name_)); @@ -242,21 +241,16 @@ ACE_Service_Gestalt::Processed_Static_Svc:: ACE_Service_Gestalt::~ACE_Service_Gestalt (void) { + ACE_ASSERT (this->repo_ != 0); + if (this->svc_repo_is_owned_) delete this->repo_; - - this->repo_ =0; - delete this->static_svcs_; - this->static_svcs_ = 0; - // Delete the dynamically allocated static_svcs instance. -#ifndef ACE_NLOGGING if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE (%P|%t) SG::dtor - this=%@, pss = %@\n"), this, this->processed_static_svcs_)); -#endif if (this->processed_static_svcs_ && !this->processed_static_svcs_->is_empty()) @@ -270,53 +264,36 @@ ACE_Service_Gestalt::~ACE_Service_Gestalt (void) } } delete this->processed_static_svcs_; - this->processed_static_svcs_ = 0; } ACE_Service_Gestalt::ACE_Service_Gestalt (size_t size, bool svc_repo_is_owned, bool no_static_svcs) : svc_repo_is_owned_ (svc_repo_is_owned) - , svc_repo_size_ (size) , is_opened_ (0) , logger_key_ (ACE_DEFAULT_LOGGER_KEY) , no_static_svcs_ (no_static_svcs) , svc_queue_ (0) , svc_conf_file_queue_ (0) - , static_svcs_ (0) - , processed_static_svcs_ (0) { - (void)this->init_i (); + if (svc_repo_is_owned) + ACE_NEW_NORETURN (this->repo_, + ACE_Service_Repository (size)); + else + this->repo_ = + ACE_Service_Repository::instance (size); + + ACE_NEW_NORETURN (this->static_svcs_, + ACE_STATIC_SVCS); + + this->processed_static_svcs_ = 0; -#ifndef ACE_NLOGGING if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE (%P|%t) SG::ctor - this = %@, pss = %@\n"), this, this->processed_static_svcs_)); -#endif } -/// Performs the common initialization tasks for a new or previously -/// closed instance. Must not be virtual, as it is called from the -/// constructor. -int -ACE_Service_Gestalt::init_i (void) -{ - if (this->svc_repo_is_owned_) - { - ACE_NEW_NORETURN (this->repo_, - ACE_Service_Repository (this->svc_repo_size_)); - } - else - { - this->repo_ = - ACE_Service_Repository::instance (this->svc_repo_size_); - } - - return 0; -} - - // Add the default statically-linked services to the Service // Repository. @@ -377,9 +354,6 @@ ACE_Service_Gestalt::find_static_svc_descriptor (const ACE_TCHAR* name, const ACE_Static_Svc_Descriptor* ACE_Service_Gestalt::find_processed_static_svc (const ACE_TCHAR* name) { - if (this->processed_static_svcs_ == 0 || name == 0) - return 0; - Processed_Static_Svc **pss = 0; for (ACE_PROCESSED_STATIC_SVCS_ITERATOR iter (*this->processed_static_svcs_); iter.next (pss) != 0; @@ -414,7 +388,7 @@ ACE_Service_Gestalt::add_processed_static_svc /// /// In contrast a "dynamic" directive, when processed through the /// overloaded process_directives(string) both creates the SO - /// locally and initializes it, where the statics directive must + /// locally and initializes it, where the statis directive must /// first locate the SO and then calls the init() method. This means /// that durig the "static" initialization there's no specific /// information about the hosting repository and the gestalt must @@ -475,11 +449,6 @@ ACE_Service_Gestalt::insert (ACE_Static_Svc_Descriptor *stsd) stsd->active_); } - if (this->static_svcs_ == 0) - ACE_NEW_RETURN (this->static_svcs_, - ACE_STATIC_SVCS, - -1); - // Inserting a service after the Gestalt has been opened makes it // impossible to activate it later. Perhaps open came too soon? //ACE_ASSERT (this->is_opened_ == 0); @@ -523,7 +492,7 @@ ACE_Service_Gestalt::initialize (const ACE_TCHAR *svc_name, #endif const ACE_Service_Type *srp = 0; - for (int i = 0; this->find (svc_name, &srp) == -1 && i < 2; i++) + for (int i = 0; this->repo_->find (svc_name, &srp) == -1 && i < 2; i++) // if (this->repo_->find (svc_name, &srp) == -1) { const ACE_Static_Svc_Descriptor *assd = @@ -676,8 +645,8 @@ ACE_Service_Gestalt::initialize (const ACE_Service_Type *sr, if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE (%P|%t) SG::initialize - looking up dynamic ") - ACE_LIB_TEXT (" service %s to initialize, repo=%@\n"), - sr->name (), this->repo_)); + ACE_LIB_TEXT (" service \'%s\' to initialize\n"), + sr->name ())); ACE_Service_Type *srp = 0; if (this->repo_->find (sr->name (), @@ -744,9 +713,6 @@ int ACE_Service_Gestalt::remove (const ACE_TCHAR svc_name[]) { ACE_TRACE ("ACE_Service_Gestalt::remove"); - if (this->repo_ == 0) - return -1; - return this->repo_->remove (svc_name); } @@ -760,9 +726,6 @@ int ACE_Service_Gestalt::suspend (const ACE_TCHAR svc_name[]) { ACE_TRACE ("ACE_Service_Gestalt::suspend"); - if (this->repo_ == 0) - return -1; - return this->repo_->suspend (svc_name); } @@ -773,9 +736,6 @@ int ACE_Service_Gestalt::resume (const ACE_TCHAR svc_name[]) { ACE_TRACE ("ACE_Service_Gestalt::resume"); - if (this->repo_ == 0) - return -1; - return this->repo_->resume (svc_name); } @@ -796,9 +756,6 @@ int ACE_Service_Gestalt::process_directive_i (const ACE_Static_Svc_Descriptor &ssd, int force_replace) { - if (this->repo_ == 0) - return -1; - if (!force_replace) { if (this->repo_->find (ssd.name_, 0, 0) >= 0) @@ -1018,7 +975,9 @@ ACE_Service_Gestalt::process_directive (const ACE_TCHAR directive[]) ACE_Svc_Conf_Param d (this, directive); - return this->process_directives_i (&d); + int result = this->process_directives_i (&d); + + return result; #else ACE_DLL dll; @@ -1100,10 +1059,7 @@ ACE_Service_Gestalt::open_i (const ACE_TCHAR /*program_name*/[], if (this->is_opened_++ != 0) return 0; - if (this->init_i () != 0) - return -1; - - if (!ignore_debug_flag) + if (ignore_debug_flag == 0) { // If -d was included as a startup parameter, the user wants debug // information printed during service initialization. @@ -1133,7 +1089,7 @@ ACE_Service_Gestalt::open_i (const ACE_TCHAR /*program_name*/[], // Make sure to save/restore errno properly. ACE_Errno_Guard error (errno); - if (!ignore_debug_flag) + if (ignore_debug_flag == 0) { log_msg->priority_mask (old_process_mask, ACE_Log_Msg::PROCESS); log_msg->priority_mask (old_thread_mask, ACE_Log_Msg::THREAD); @@ -1307,6 +1263,9 @@ ACE_Service_Gestalt::close (void) this, this->repo_, this->processed_static_svcs_)); #endif + delete this->static_svcs_; + this->static_svcs_ = 0; + if (this->processed_static_svcs_ && !this->processed_static_svcs_->is_empty()) { @@ -1321,9 +1280,6 @@ ACE_Service_Gestalt::close (void) delete this->processed_static_svcs_; this->processed_static_svcs_ = 0; - if (this->svc_repo_is_owned_) - delete this->repo_; - #ifndef ACE_NLOGGING if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, @@ -1331,8 +1287,6 @@ ACE_Service_Gestalt::close (void) this, this->repo_)); #endif - this->repo_ = 0; - return 0; } /* close () */ diff --git a/ACE/ace/Service_Gestalt.h b/ACE/ace/Service_Gestalt.h index a5d656a53a5..1476020fe38 100644 --- a/ACE/ace/Service_Gestalt.h +++ b/ACE/ace/Service_Gestalt.h @@ -110,9 +110,9 @@ public: */ int open (const ACE_TCHAR program_name[], const ACE_TCHAR *logger_key = ACE_DEFAULT_LOGGER_KEY, - bool ignore_static_svcs = true, - bool ignore_default_svc_conf_file = false, - bool ignore_debug_flag = false); + int ignore_static_svcs = 1, + int ignore_default_svc_conf_file = 0, + int ignore_debug_flag = 0); /** * This is the primary entry point into the ACE_Service_Config (the @@ -150,11 +150,11 @@ public: * @param logger_key Indicates where to write the logging output, * which is typically either a STREAM pipe or a * socket address. - * @param ignore_static_svcs If true then static services are not loaded, + * @param ignore_static_svcs If 1 then static services are not loaded, * otherwise, they are loaded. - * @param ignore_default_svc_conf_file If false then the @c svc.conf + * @param ignore_default_svc_conf_file If non-0 then the @c svc.conf * configuration file will be ignored. - * @param ignore_debug_flag If false then the application is responsible + * @param ignore_debug_flag If non-0 then the application is responsible * for setting the @c ACE_Log_Msg::priority_mask * appropriately. * @@ -167,9 +167,9 @@ public: int open (int argc, ACE_TCHAR *argv[], const ACE_TCHAR *logger_key = ACE_DEFAULT_LOGGER_KEY, - bool ignore_static_svcs = true, - bool ignore_default_svc_conf_file = false, - bool ignore_debug_flag = false); + int ignore_static_svcs = 1, + int ignore_default_svc_conf_file = 0, + int ignore_debug_flag = 0); /// Has it been opened? Returns the difference between the times /// open and close have been called on this instance @@ -367,14 +367,10 @@ protected: // the designated shared object in this file. int initialize_i (const ACE_Service_Type *sr, const ACE_TCHAR *parameters); - const ACE_Static_Svc_Descriptor* find_processed_static_svc (const ACE_TCHAR*); - void add_processed_static_svc (const ACE_Static_Svc_Descriptor *); - - /// Performs the common initialization tasks for a new or previously - /// closed instance. Must not be virtual, as it is called from the - /// constructor. - int init_i (void); +const ACE_Static_Svc_Descriptor* + find_processed_static_svc (const ACE_TCHAR* ); +void add_processed_static_svc (const ACE_Static_Svc_Descriptor *); protected: @@ -402,14 +398,10 @@ protected: protected: - /// Do we own the service repository instance, or have only been - /// given a ptr to the singleton? + /// Do we own the service repository instance or have only been given a ptr + /// to the singleton one? bool svc_repo_is_owned_; - /// Repository size is necessary, so that we can close (which may - /// destroy the repository instance), and then re-open again. - size_t svc_repo_size_; - /// Keep track of the number of times the instance has been /// initialized (opened). "If so, we can't allow <yyparse> to be called since /// it's not reentrant" is the original motivation, but that does not seem @@ -423,7 +415,7 @@ protected: const ACE_TCHAR *logger_key_; /// Should we avoid loading the static services? - bool no_static_svcs_; + int no_static_svcs_; /// Queue of services specified on the command-line. ACE_SVC_QUEUE* svc_queue_; diff --git a/ACE/ace/Service_Gestalt.inl b/ACE/ace/Service_Gestalt.inl index db9e9ad6d80..9897b83c681 100644 --- a/ACE/ace/Service_Gestalt.inl +++ b/ACE/ace/Service_Gestalt.inl @@ -12,9 +12,9 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE int ACE_Service_Gestalt::open (const ACE_TCHAR program_name[], const ACE_TCHAR *logger_key, - bool ignore_static_svcs, - bool ignore_default_svc_conf, - bool ignore_debug_flag) + int ignore_static_svcs, + int ignore_default_svc_conf, + int ignore_debug_flag) { ACE_TRACE ("ACE_Service_Gestalt::open"); this->no_static_svcs_ = ignore_static_svcs; @@ -30,9 +30,9 @@ ACE_INLINE int ACE_Service_Gestalt::open (int argc, ACE_TCHAR *argv[], const ACE_TCHAR *logger_key, - bool ignore_static_svcs, - bool ignore_default_svc_conf, - bool ignore_debug_flag) + int ignore_static_svcs, + int ignore_default_svc_conf, + int ignore_debug_flag) { ACE_TRACE ("ACE_Service_Gestalt::open"); this->no_static_svcs_ = ignore_static_svcs; @@ -55,14 +55,8 @@ ACE_Service_Gestalt::find (const ACE_TCHAR name[], const ACE_Service_Type **srp, int ignore_suspended) const { - // Closing the gestalt will have disassociated it from the - // repository. If the repository used to be owned by the gestalt, it - // will also have been destroyed - so just check for repo_ before - // doing anything with it. - if (this->repo_ != 0) - return this->repo_->find (name, srp, ignore_suspended); - - return 0; + ACE_ASSERT (this->repo_ != 0); + return this->repo_->find (name, srp, ignore_suspended); } diff --git a/ACE/ace/Service_Manager.h b/ACE/ace/Service_Manager.h index c0d0c7e0fa7..02d955a7a30 100644 --- a/ACE/ace/Service_Manager.h +++ b/ACE/ace/Service_Manager.h @@ -34,11 +34,11 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * * This implementation is simple and just handles each client * request one at a time. There are currently 3 types of requests: - * - List services: If the string "help" is sent, return a list of all + * + List services: If the string "help" is sent, return a list of all * the services supported by the Service Configurator. - * - Reconfigure: If the string "reconfigure" is sent trigger a + * + Reconfigure: If the string "reconfigure" is sent trigger a * reconfiguration, which will re-read the local <svc.conf> file. - * - Process directive: If neither "help" nor "reconfigure" is sent, + * + Process directive: If neither "help" nor "reconfigure" is sent, * simply treat the incoming string as a process directive and pass * it along to <ACE_Service_Config::process_directive>. This allows * remote configuration via command-line instructions like diff --git a/ACE/ace/Service_Repository.cpp b/ACE/ace/Service_Repository.cpp index 2c9d6920d78..c3b63ac5a97 100644 --- a/ACE/ace/Service_Repository.cpp +++ b/ACE/ace/Service_Repository.cpp @@ -247,9 +247,8 @@ ACE_Service_Repository::~ACE_Service_Repository (void) int ACE_Service_Repository::find_i (const ACE_TCHAR name[], - size_t &slot, const ACE_Service_Type **srp, - bool ignore_suspended) const + int ignore_suspended) const { ACE_TRACE ("ACE_Service_Repository::find_i"); size_t i; @@ -261,7 +260,6 @@ ACE_Service_Repository::find_i (const ACE_TCHAR name[], if (i < this->current_size_) { - slot = i; if (this->service_vector_[i]->fini_called ()) { if (srp != 0) @@ -274,7 +272,7 @@ ACE_Service_Repository::find_i (const ACE_TCHAR name[], if (ignore_suspended && this->service_vector_[i]->active () == 0) return -2; - return 0; + return i; } else return -1; @@ -312,8 +310,6 @@ ACE_Service_Repository::relocate_i (size_t begin, this, i, this->total_size_, type->name (), old_handle, new_handle)); -#else - ACE_UNUSED_ARG (new_handle); #endif type->dll (adll); } @@ -324,12 +320,12 @@ ACE_Service_Repository::relocate_i (size_t begin, int ACE_Service_Repository::find (const ACE_TCHAR name[], const ACE_Service_Type **srp, - bool ignore_suspended) const + int ignore_suspended) const { ACE_TRACE ("ACE_Service_Repository::find"); ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, this->lock_, -1)); - size_t ignore_location = 0; - return this->find_i (name, ignore_location, srp, ignore_suspended); + + return this->find_i (name, srp, ignore_suspended); } @@ -418,8 +414,9 @@ ACE_Service_Repository::resume (const ACE_TCHAR name[], ACE_TRACE ("ACE_Service_Repository::resume"); ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, this->lock_, -1)); - size_t i = 0; - if (-1 == this->find_i (name, i, srp, 0)) + int i = this->find_i (name, srp, 0); + + if (i == -1) return -1; return this->service_vector_[i]->resume (); @@ -434,8 +431,9 @@ ACE_Service_Repository::suspend (const ACE_TCHAR name[], { ACE_TRACE ("ACE_Service_Repository::suspend"); ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, this->lock_, -1)); - size_t i = 0; - if (-1 == this->find_i (name, i, srp, 0)) + int i = this->find_i (name, srp, 0); + + if (i == -1) return -1; return this->service_vector_[i]->suspend (); @@ -493,19 +491,21 @@ ACE_Service_Repository::remove (const ACE_TCHAR name[], ACE_Service_Type **ps) int ACE_Service_Repository::remove_i (const ACE_TCHAR name[], ACE_Service_Type **ps) { - size_t i = 0; - if (-1 == this->find_i (name, i, 0, false)) - return -1; // Not found + int i = this->find_i (name, 0, 0); - // We may need the old ptr - to be delete outside the lock! - *ps = const_cast<ACE_Service_Type *> (this->service_vector_[i]); + // Not found + if (i == -1) + return -1; - // Pack the array - --this->current_size_; - for (size_t j = i; j < this->current_size_; j++) - this->service_vector_[j] = this->service_vector_[j+1]; + // We may need the old ptr - to be delete outside the lock! + *ps = const_cast<ACE_Service_Type *> (this->service_vector_[i]); - return 0; + // Pack the array + --this->current_size_; + for (size_t j = i; j < this->current_size_; j++) + this->service_vector_[j] = this->service_vector_[j+1]; + + return 0; } ACE_ALLOC_HOOK_DEFINE(ACE_Service_Repository_Iterator) diff --git a/ACE/ace/Service_Repository.h b/ACE/ace/Service_Repository.h index 4041688ee9a..8cd55344d29 100644 --- a/ACE/ace/Service_Repository.h +++ b/ACE/ace/Service_Repository.h @@ -95,24 +95,16 @@ public: int insert (const ACE_Service_Type *); /** - * Locate a named entry in the service table, optionally ignoring - * suspended entries. - * - * @param service_name The name of the service to search for. - * @param srp Optional; if not 0, it is a pointer to a location - * to receive the ACE_Service_Type pointer for the - * located service. Meaningless if this method - * returns -1. - * @param ignore_suspended If true, the search ignores suspended services. - * - * @retval 0 Named service was located. - * @retval -1 Named service was not found. - * @retval -2 Named service was found, but is suspended and - * @a ignore_suspended is true. + * Locate an entry with <name> in the table. If <ignore_suspended> + * is set then only consider services marked as resumed. If the + * caller wants the located entry, pass back a pointer to the + * located entry via <srp>. If <name> is not found, -1 is returned. + * If <name> is found, but it is suspended and the caller wants to + * ignore suspended services a -2 is returned. */ int find (const ACE_TCHAR name[], const ACE_Service_Type **srp = 0, - bool ignore_suspended = true) const; + int ignore_suspended = 1) const; /// Remove an existing service record. If @a sr == 0, the service record /// is deleted before control is returned to the caller. If @a sr != 0, @@ -149,30 +141,12 @@ private: /// responsible for properly disposing of it. int remove_i (const ACE_TCHAR[], ACE_Service_Type **sr); - /** - * Locate a named entry in the service table, optionally ignoring - * suspended entries. - * - * @param service_name The name of the service to search for. - * @param slot Receives the position index of the service if it - * is found. Contents are meaningless if this method - * returns -1. - * @param srp Optional; if not 0, it is a pointer to a location - * to receive the ACE_Service_Type pointer for the - * located service. Meaningless if this method - * returns -1. - * @param ignore_suspended If true, the search ignores suspended services. - * - * @retval 0 Named service was located; index in the table is set in - * @a slot. - * @retval -1 Named service was not found. - * @retval -2 Named service was found, but is suspended and - * @a ignore_suspended is true. - */ + /// Locates <service_name>. Must be called without locks being + /// held... + int find_i (const ACE_TCHAR service_name[], - size_t &slot, - const ACE_Service_Type **srp = 0, - bool ignore_suspended = true) const; + const ACE_Service_Type ** = 0, + int ignore_suspended = 1) const; /// @brief Relocate (static) services to another DLL. /// diff --git a/ACE/ace/Sock_Connect.cpp b/ACE/ace/Sock_Connect.cpp index 6dd4e67f624..5737aff7f2e 100644 --- a/ACE/ace/Sock_Connect.cpp +++ b/ACE/ace/Sock_Connect.cpp @@ -49,7 +49,7 @@ extern "C" { #include "ace/OS_NS_stdio.h" #endif /* ACE_VXWORKS < 0x600 */ -#if defined (ACE_VXWORKS) && ((ACE_VXWORKS == 0x630) || (ACE_VXWORKS == 0x640)) && defined (__RTP__) && defined (ACE_HAS_IPV6) +#if defined (ACE_VXWORKS) && (ACE_VXWORKS == 0x630) && defined (__RTP__) && defined (ACE_HAS_IPV6) const struct in6_addr in6addr_any = IN6ADDR_ANY_INIT; const struct in6_addr in6addr_nodelocal_allnodes = IN6ADDR_NODELOCAL_ALLNODES_INIT; const struct in6_addr in6addr_linklocal_allnodes = IN6ADDR_LINKLOCAL_ALLNODES_INIT; @@ -162,6 +162,201 @@ ACE_RCSID (ace, "$Id$") +#if defined (ACE_WIN32) && \ + (!defined (ACE_HAS_WINSOCK2) \ + || (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 == 0))) + +static int +get_reg_subkeys (const ACE_TCHAR *key, + ACE_TCHAR *buffer, + DWORD &buf_len) +{ + HKEY hk; + LONG rc = ACE_TEXT_RegOpenKeyEx (HKEY_LOCAL_MACHINE, + key, + 0, + KEY_READ, + &hk); + + if (rc != ERROR_SUCCESS) + return -1; + + ACE_TCHAR subkeyname[ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 1]; + DWORD subkeyname_len = ACE_MAX_FULLY_QUALIFIED_NAME_LEN; + FILETIME update_dummy; + + DWORD total = 0; + + for (int i = 0; + (rc = ACE_TEXT_RegEnumKeyEx (hk, i, + subkeyname, + &subkeyname_len, + 0, 0, 0, + &update_dummy)) != ERROR_NO_MORE_ITEMS; + ++i) + { + if (subkeyname_len < buf_len - total) + { + ACE_OS::strcpy(buffer + total, subkeyname); + total += subkeyname_len + 1; + // Reset: was changed by RegEnumKeyEx call. + subkeyname_len = ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 1; + } + else + return -1; + } + + buf_len = total; + + ::RegCloseKey (hk); + return 0; +} + +// Return value in buffer for a key/name pair from the Windows +// Registry up to buf_len size. +// If all_subkeys == 1, look for name under all subkeys of key. + +static int +get_reg_value (const ACE_TCHAR *key, + const ACE_TCHAR *name, + ACE_TCHAR *buffer, + DWORD &buf_len, + int all_subkeys = 0) +{ + HKEY hk; + DWORD buf_type; + LONG rc = ACE_TEXT_RegOpenKeyEx (HKEY_LOCAL_MACHINE, + key, + 0, + KEY_READ, + &hk); + + if (rc != ERROR_SUCCESS) + // print_error_string(ACE_LIB_TEXT ("RegOpenKeyEx"), rc); + return -1; + + if (all_subkeys) + { + ACE_TCHAR ifname[ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 1]; + DWORD ifname_len = ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 1; + FILETIME update_dummy; + + DWORD total = 0; + DWORD size = buf_len; + + for (int i = 0; + (rc = ACE_TEXT_RegEnumKeyEx (hk, i, ifname, &ifname_len, + 0, 0, 0, + &update_dummy)) != ERROR_NO_MORE_ITEMS; + ++i) + { + HKEY ifkey; + if (rc != ERROR_SUCCESS + || ACE_TEXT_RegOpenKeyEx (hk, ifname, 0, + KEY_READ, &ifkey) != ERROR_SUCCESS) + continue; + + if (ACE_TEXT_RegQueryValueEx (ifkey, name, 0, 0, + (u_char*) (buffer + total), + &size) != ERROR_SUCCESS) + { + RegCloseKey(ifkey); + continue; + } + else + { + total += size; + size = buf_len - total; + } + // Needs to be reset. + ifname_len = ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 1; + } + + if (total == 0) + { + ::RegCloseKey (hk); + return -2; + } + else + { + buf_len = total; + } + } + else + { + + rc = ACE_TEXT_RegQueryValueEx (hk, + name, + 0, + &buf_type, + (u_char *) buffer, + &buf_len); + if (rc != ERROR_SUCCESS) + { + // print_error_string(ACE_LIB_TEXT ("RegEnumKeyEx"), rc); + RegCloseKey (hk); + return -2; + } + } + + ::RegCloseKey (hk); + return 0; +} + +enum ACE_WINDOWS_VERSION { + ACE_WINDOWS_IS_UNKNOWN, + ACE_WINDOWS_IS_WIN95, + ACE_WINDOWS_IS_WIN98, + ACE_WINDOWS_IS_WINME, + ACE_WINDOWS_IS_WINNT, + ACE_WINDOWS_IS_WIN2K, + ACE_WINDOWS_IS_WINCE +}; + +static ACE_WINDOWS_VERSION +get_windows_version() +{ + OSVERSIONINFO vinfo; + vinfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); + if (::GetVersionEx(&vinfo) == 0) + { + return ACE_WINDOWS_IS_UNKNOWN; + } + + switch (vinfo.dwPlatformId) + { + case VER_PLATFORM_WIN32_NT: + if (vinfo.dwMajorVersion <= 4) + return ACE_WINDOWS_IS_WINNT; + else + return ACE_WINDOWS_IS_WIN2K; + case VER_PLATFORM_WIN32_WINDOWS: + if (vinfo.dwMajorVersion == 4) + { + if (vinfo.dwMinorVersion == 0) + return ACE_WINDOWS_IS_WIN95; + else if (vinfo.dwMinorVersion == 10) + return ACE_WINDOWS_IS_WIN98; + else if (vinfo.dwMinorVersion == 90) + return ACE_WINDOWS_IS_WINME; + } +#if defined (VER_PLATFORM_WIN32_CE) + case VER_PLATFORM_WIN32_CE: + if (vinfo.dwMajorVersion >= 3) { + return ACE_WINDOWS_IS_WINCE; + } + else { + return ACE_WINDOWS_IS_UNKNOWN; + } +#endif /* VER_PLATFORM_WIN32_CE */ + // If no match we fall throu. + default: + return ACE_WINDOWS_IS_UNKNOWN; + } +} + +#endif //(ACE_WIN32) && !(ACE_HAS_WINSOCK2) || (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 == 0) + ACE_BEGIN_VERSIONED_NAMESPACE_DECL // Bind socket to an unused port. @@ -628,89 +823,9 @@ get_ip_interfaces_win32 (size_t &count, delete [] octet_buffer; return 0; -# elif 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) - ACE_NOTSUP_RETURN (-1); -# endif /* ACE_HAS_PHARLAP_RT */ - - // Locate all of the IP devices in the system, saving a DEVHANDLE - // for each. Then allocate the ACE_INET_Addrs needed and fetch all - // the IP addresses. To locate the devices, try the available - // device name roots and increment the device number until the - // kernel says there are no more of that type. - const size_t ACE_MAX_ETS_DEVICES = 64; // Arbitrary, but should be enough. - DEVHANDLE ip_dev[ACE_MAX_ETS_DEVICES]; - EK_TCPIPCFG *devp; - size_t i, j; - ACE_TCHAR dev_name[16]; - - count = 0; - for (i = 0; count < ACE_MAX_ETS_DEVICES; i++, ++count) - { - // Ethernet. - ACE_OS::sprintf (dev_name, - "ether%d", - i); - ip_dev[count] = EtsTCPGetDeviceHandle (dev_name); - if (ip_dev[count] == 0) - break; - } - for (i = 0; count < ACE_MAX_ETS_DEVICES; i++, ++count) - { - // SLIP. - ACE_OS::sprintf (dev_name, - "sl%d", - i); - ip_dev[count] = EtsTCPGetDeviceHandle (dev_name); - if (ip_dev[count] == 0) - break; - } - for (i = 0; count < ACE_MAX_ETS_DEVICES; i++, ++count) - { - // PPP. - ACE_OS::sprintf (dev_name, - "ppp%d", - i); - ip_dev[count] = EtsTCPGetDeviceHandle (dev_name); - if (ip_dev[count] == 0) - break; - } - - if (count > 0) - ACE_NEW_RETURN (addrs, - ACE_INET_Addr[count], - -1); - else - addrs = 0; - - for (i = 0, j = 0; i < count; i++) - { - devp = EtsTCPGetDeviceCfg (ip_dev[i]); - if (devp != 0) - { - addrs[j].set (0, - devp->nwIPAddress, - 0); // Already in net order. - ++j; - } - // There's no call to close the DEVHANDLE. - } - - count = j; - if (count == 0 && addrs != 0) - { - delete [] addrs; - addrs = 0; - } - - return 0; - - -# else - // All non-CE, non-Pharlap Windows. Must support Winsock2. - +# elif defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) + // Win32 can do this by a simple API call if MSVC 5 or later is the compiler. + // Not sure if Borland supplies the needed header/lib, but it might. int i, n_interfaces, status; INTERFACE_INFO info[64]; @@ -828,7 +943,263 @@ get_ip_interfaces_win32 (size_t &count, return 0; -# endif /* ACE_HAS_WINCE */ +#else /* Winsock 2 && MSVC 5 or later */ + + // PharLap ETS has kernel routines to rummage through the device + // configs and extract the interface info. Sort of a pain in the + // butt, but better than trying to figure out where it moved to in + // the registry... :-| +# if defined (ACE_HAS_PHARLAP) +# if !defined (ACE_HAS_PHARLAP_RT) + ACE_NOTSUP_RETURN (-1); +# endif /* ACE_HAS_PHARLAP_RT */ + + // Locate all of the IP devices in the system, saving a DEVHANDLE + // for each. Then allocate the ACE_INET_Addrs needed and fetch all + // the IP addresses. To locate the devices, try the available + // device name roots and increment the device number until the + // kernel says there are no more of that type. + const size_t ACE_MAX_ETS_DEVICES = 64; // Arbitrary, but should be enough. + DEVHANDLE ip_dev[ACE_MAX_ETS_DEVICES]; + EK_TCPIPCFG *devp; + size_t i, j; + ACE_TCHAR dev_name[16]; + + count = 0; + for (i = 0; count < ACE_MAX_ETS_DEVICES; i++, ++count) + { + // Ethernet. + ACE_OS::sprintf (dev_name, + "ether%d", + i); + ip_dev[count] = EtsTCPGetDeviceHandle (dev_name); + if (ip_dev[count] == 0) + break; + } + for (i = 0; count < ACE_MAX_ETS_DEVICES; i++, ++count) + { + // SLIP. + ACE_OS::sprintf (dev_name, + "sl%d", + i); + ip_dev[count] = EtsTCPGetDeviceHandle (dev_name); + if (ip_dev[count] == 0) + break; + } + for (i = 0; count < ACE_MAX_ETS_DEVICES; i++, ++count) + { + // PPP. + ACE_OS::sprintf (dev_name, + "ppp%d", + i); + ip_dev[count] = EtsTCPGetDeviceHandle (dev_name); + if (ip_dev[count] == 0) + break; + } + + if (count > 0) + ACE_NEW_RETURN (addrs, + ACE_INET_Addr[count], + -1); + else + addrs = 0; + + for (i = 0, j = 0; i < count; i++) + { + devp = EtsTCPGetDeviceCfg (ip_dev[i]); + if (devp != 0) + { + addrs[j].set (0, + devp->nwIPAddress, + 0); // Already in net order. + j++; + } + // There's no call to close the DEVHANDLE. + } + + count = j; + if (count == 0 && addrs != 0) + { + delete [] addrs; + addrs = 0; + } + + return 0; + +# else /* ACE_HAS_PHARLAP */ + // + // No Winsock2. + // Get interface information from the registry. + // As this information is in different locations of the registry + // on different windows versions, we need to ask at runtime. + // + + // Normally we have to look under one key for interfaces name, + // and under a second key for ip address of those interfaces. + // Exact values and the way to search depend on windows version. + + // This is the first key we have to look for. + const ACE_TCHAR *BASE_KEY1; + + // This is the name we have to look for under the first key. + // If this is == 0, we need to look for subkeys, not the values from + // a name. + const ACE_TCHAR *KEY1_NAME_ID; + + // The second key is normally constructed concatenating a prefix, + // the value found on KEY1_NAME_ID stripped from the first s_offset + // characters, and a suffix. + unsigned int s_offset; + const ACE_TCHAR *PREFFIX_KEY2; + const ACE_TCHAR *SUFFIX_KEY2; + + // If != 0, look for the value of KEY1_NAME_ID not directly under + // BASE_KEY1, but on every subkey of BASE_KEY1. + int use_subkeys; + + // When we search for IP Addresses below, we look for a key with a + // name in this array (null terminated). + // For some windows versions, there is an + // aditional key for ppp interfaces that will be stored on [1]. + const ACE_TCHAR *IPADDR_NAME_ID[3] = { + ACE_LIB_TEXT ("IPAddress"), 0, 0 + }; + + // Skip addresses that match this. + const ACE_TCHAR *INVALID_TCPIP_DEVICE_ADDR = ACE_LIB_TEXT ("0.0.0.0"); + + ACE_WINDOWS_VERSION winver = get_windows_version(); + + switch (winver) + { + case ACE_WINDOWS_IS_WINNT: + PREFFIX_KEY2 = ACE_LIB_TEXT ("SYSTEM\\CurrentControlSet\\Services\\"); + BASE_KEY1 = + ACE_LIB_TEXT ("SYSTEM\\CurrentControlSet\\Services") + ACE_LIB_TEXT ("\\Tcpip\\Linkage"); + SUFFIX_KEY2 = ACE_LIB_TEXT ("\\Parameters\\Tcpip"); + KEY1_NAME_ID = ACE_LIB_TEXT ("Bind"); + s_offset = 8; + use_subkeys = 0; + break; + + case ACE_WINDOWS_IS_WIN2K: + BASE_KEY1 = + ACE_LIB_TEXT ("SYSTEM\\CurrentControlSet\\Services") + ACE_LIB_TEXT ("\\Tcpip\\Parameters\\Interfaces\\"); + PREFFIX_KEY2 = BASE_KEY1; + SUFFIX_KEY2 = ACE_LIB_TEXT (""); + KEY1_NAME_ID = 0; + s_offset = 0; + use_subkeys = 1; + // PPP. + IPADDR_NAME_ID[1] = ACE_LIB_TEXT ("DhcpIPAddress"); + break; + + // If ACE_HAS_WINNT4 we can safely assume the ones below will + // not be needed. +# if !defined(ACE_HAS_WINNT4) || (ACE_HAS_WINNT4 == 0) + case ACE_WINDOWS_IS_WIN95: + case ACE_WINDOWS_IS_WIN98: + case ACE_WINDOWS_IS_WINME: + PREFFIX_KEY2 = + ACE_LIB_TEXT ("SYSTEM\\CurrentControlSet\\Services\\Class\\"); + BASE_KEY1 = ACE_LIB_TEXT ("Enum\\Network\\MSTCP"); + SUFFIX_KEY2 = ACE_LIB_TEXT (""); + KEY1_NAME_ID = ACE_LIB_TEXT ("Driver"); + use_subkeys = 1; + s_offset = 0; + break; +# endif /* !ACE_HAS_WINNT4 */ + + default: + return -1; + } + + ACE_TCHAR raw_buffer[ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 1]; + DWORD raw_buflen = ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 1; + + if (KEY1_NAME_ID == 0) + { + if (::get_reg_subkeys (BASE_KEY1, + raw_buffer, + raw_buflen)) + return -1; + } + else + { + if (::get_reg_value (BASE_KEY1, + KEY1_NAME_ID, + raw_buffer, + raw_buflen, + use_subkeys)) + return -1; + } + // return buffer contains 0 delimited strings + + ACE_Tokenizer dev_names (raw_buffer); + dev_names.delimiter (ACE_LIB_TEXT ('\0')); + int n_interfaces = 0; + + // Count the number of interfaces + while (dev_names.next () != 0) + ++n_interfaces; + + // case 1. no interfaces present, empty string? OS version change? + if (n_interfaces == 0) + return 0; + + ACE_NEW_RETURN (addrs, + ACE_INET_Addr[n_interfaces], + -2); + + ACE_TCHAR buffer[ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 1]; + DWORD buf_len = ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 1; + + count = 0; + for (int i = 0; i < n_interfaces; i++) + { + for (const ACE_TCHAR **ipaddr_name_id = IPADDR_NAME_ID; + *ipaddr_name_id != 0; + ++ipaddr_name_id) + { + // a. construct name to access IP Address for this interface + ACE_TString ifdevkey (PREFFIX_KEY2); + ACE_TString the_dev = dev_names.next (); + + if (the_dev.length() < s_offset) + { + return -3; // Something's wrong + } + + // rest of string from offset. + the_dev = the_dev.substring (s_offset); + + ifdevkey += the_dev; + ifdevkey += SUFFIX_KEY2; + + // b. extract value + // Gets overwritten on each call + buf_len = sizeof (buffer); + if (get_reg_value (ifdevkey.fast_rep (), + *ipaddr_name_id, + buffer, + buf_len)) + continue; // Skip unknown devices. + + if (ACE_OS::strcmp (buffer, + INVALID_TCPIP_DEVICE_ADDR) == 0) + continue; // Don't count this device + + // c. store in hostinfo object array and up the counter + addrs[count++] = + ACE_INET_Addr ((u_short) 0, buffer); + } + } + + return 0; +# endif /* ACE_HAS_PHARLAP */ +# endif /* Winsock 2 && MSVC 5 or later */ } #elif defined (ACE_HAS_GETIFADDRS) static int @@ -1120,7 +1491,7 @@ get_ip_interfaces_aix (size_t &count, || req->ifr_addr.sa_family == AF_INET6 # endif ) - ++num_ifs; + num_ifs++; } ACE_NEW_RETURN (addrs,ACE_INET_Addr[num_ifs], -1); @@ -1228,7 +1599,7 @@ ACE::get_ip_interfaces (size_t &count, #elif defined (ACE_VXWORKS) && (ACE_VXWORKS < 0x600) return get_ip_interfaces_vxworks_lt600 (count, addrs); -#elif (defined (__unix) || defined (__unix__) || defined (__Lynx__) || defined (ACE_OPENVMS) || defined (ACE_HAS_RTEMS)) && !defined (ACE_LACKS_NETWORKING) +#elif defined (__unix) || defined (__unix__) || defined (__Lynx__) || defined (ACE_OPENVMS) // COMMON (SVR4 and BSD) UNIX CODE size_t num_ifs, num_ifs_found; @@ -1331,13 +1702,13 @@ ACE::get_ip_interfaces (size_t &count, # endif ) { - int addrlen = static_cast<int> (sizeof (struct sockaddr_in)); + int addrlen = static_cast<int> (sizeof (struct sockaddr_in)); # if defined (ACE_HAS_IPV6) if (addr->sin_family == AF_INET6) addrlen = static_cast<int> (sizeof (struct sockaddr_in6)); # endif addrs[count].set (addr, addrlen); - ++count; + count++; } # else /* ! _UNICOS */ // need to explicitly copy on the Cray, since the bitfields kinda @@ -1358,7 +1729,7 @@ ACE::get_ip_interfaces (size_t &count, # endif /* ! _UNICOS */ } -#if !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined (ACE_HAS_RTEMS) +#if !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) ++pcur; #else if (pcur->ifr_addr.sa_len <= sizeof (struct sockaddr)) @@ -1464,7 +1835,7 @@ ACE::count_interfaces (ACE_HANDLE handle, # endif /* SIOCGLIFNUM */ return 0; -#elif (defined (__unix) || defined (__unix__) || defined (__Lynx__) || defined (ACE_OPENVMS) || defined (ACE_HAS_RTEMS)) && !defined (ACE_LACKS_NETWORKING) +#elif defined (__unix) || defined (__unix__) || defined (__Lynx__) || defined (ACE_OPENVMS) // Note: DEC CXX doesn't define "unix". BSD compatible OS: HP UX, // AIX, SunOS 4.x perform some ioctls to retrieve ifconf list of // ifreq structs no SIOCGIFNUM on SunOS 4.x, so use guess and scan @@ -1518,13 +1889,13 @@ return 0; if (ifcfg.ifc_len < 0) break; - ++if_count; -#if !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined (ACE_HAS_RTEMS) - ++p_ifs; + if_count++; +#if !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) + p_ifs++; #else if (p_ifs->ifr_addr.sa_len <= sizeof (struct sockaddr)) { - ++p_ifs; + p_ifs++; } else { @@ -1537,14 +1908,14 @@ return 0; ACE_OS::free (ifcfg.ifc_req); # if defined (ACE_HAS_IPV6) - FILE* fp = 0; + FILE* fp; if ((fp = ACE_OS::fopen (ACE_LIB_TEXT ("/proc/net/if_inet6"), ACE_LIB_TEXT ("r"))) != NULL) { // Scan the lines according to the expected format but don't really read any input while (fscanf (fp, "%*32s %*02x %*02x %*02x %*02x %*8s\n") != EOF) { - ++if_count; + if_count++; } ACE_OS::fclose (fp); } @@ -1568,7 +1939,7 @@ ACE::get_handle (void) ACE_HANDLE handle = ACE_INVALID_HANDLE; #if defined (sparc) handle = ACE_OS::open ("/dev/udp", O_RDONLY); -#elif defined (__unix) || defined (__unix__) || defined (__Lynx__) || defined (_AIX) || defined (__hpux) || (defined (ACE_VXWORKS) && (ACE_VXWORKS >= 0x600)) || defined (ACE_OPENVMS) || defined (ACE_HAS_RTEMS) +#elif defined (__unix) || defined (__unix__) || defined (__Lynx__) || defined (_AIX) || defined (__hpux) || (defined (ACE_VXWORKS) && (ACE_VXWORKS >= 0x600)) || defined (ACE_OPENVMS) // Note: DEC CXX doesn't define "unix" BSD compatible OS: HP UX, // AIX, SunOS 4.x diff --git a/ACE/ace/String_Base.cpp b/ACE/ace/String_Base.cpp index 525dcbc2553..01de0963b72 100644 --- a/ACE/ace/String_Base.cpp +++ b/ACE/ace/String_Base.cpp @@ -267,29 +267,19 @@ ACE_String_Base<CHAR>::resize (typename ACE_String_Base<CHAR>::size_type len, { ACE_TRACE ("ACE_String_Base<CHAR>::resize"); - fast_resize(len); - ACE_OS::memset (this->rep_, c, this->buf_len_ * sizeof (CHAR)); -} - -template <class CHAR> void -ACE_String_Base<CHAR>::fast_resize (size_t len) -{ - ACE_TRACE ("ACE_String_Base<CHAR>::fast_resize"); - // Only reallocate if we don't have enough space... if (this->buf_len_ <= len) { - if (this->buf_len_ != 0 && this->release_ != 0) + if (this->buf_len_ != 0 && this->release_ != 0) this->allocator_->free (this->rep_); - this->rep_ = static_cast<CHAR*> - (this->allocator_->malloc ((len + 1) * sizeof (CHAR))); + this->rep_ = static_cast<CHAR*>( + this->allocator_->malloc ((len + 1) * sizeof (CHAR))); this->buf_len_ = len + 1; this->release_ = 1; } this->len_ = 0; - if (len > 0) - this->rep_[0] = 0; + ACE_OS::memset (this->rep_, c, this->buf_len_ * sizeof (CHAR)); } template <class CHAR> void diff --git a/ACE/ace/String_Base.h b/ACE/ace/String_Base.h index 239019b0fae..a2d565a8420 100644 --- a/ACE/ace/String_Base.h +++ b/ACE/ace/String_Base.h @@ -337,15 +337,6 @@ public: size_type length (void) const; /** - * Return the number of allocated CHARs in the string object. - * This may be greater than the current length of the string. - * - * @return Maximum number of CHAR units that can be stored, including - * any terminating nul that may be needed. - */ - size_t capacity (void) const; - - /** * Return @c true if the length of the string is zero, else @c false. */ bool is_empty (void) const; @@ -474,7 +465,7 @@ public: /** * Inequality comparison operator. * - * @param s String to compare against stored string. + * @param s Input ACE_String_Base string to compare against stored string. * @return @c true if not equal, @c false otherwise. */ bool operator != (const ACE_String_Base<CHAR> &s) const; @@ -514,14 +505,10 @@ public: * Rather than fix the method to work as documented, the code is * left as is, but the second parameter should probably not be used. * - * fast_resize just adjusts the buffer if needed and sets the length, - * it doesn't fill the buffer, so is much faster. - * * @param len The number of CHARs to reserve * @param c The CHAR to use when filling the string. */ void resize (size_type len, CHAR c = 0); - void fast_resize (size_t len); /// Swap the contents of this @c ACE_String_Base with @a str. /** diff --git a/ACE/ace/String_Base.inl b/ACE/ace/String_Base.inl index e244cf4ed6d..45abd5eb83b 100644 --- a/ACE/ace/String_Base.inl +++ b/ACE/ace/String_Base.inl @@ -33,13 +33,6 @@ ACE_String_Base<CHAR>::length (void) const return this->len_; } -template <class CHAR> ACE_INLINE size_t -ACE_String_Base<CHAR>::capacity (void) const -{ - ACE_TRACE ("ACE_String_Base<CHAR>::capacity"); - return this->buf_len_; -} - template <class CHAR> ACE_INLINE bool ACE_String_Base<CHAR>::is_empty (void) const { diff --git a/ACE/ace/System_Time.h b/ACE/ace/System_Time.h index e40b21299f5..bf58d4d5640 100644 --- a/ACE/ace/System_Time.h +++ b/ACE/ace/System_Time.h @@ -25,7 +25,6 @@ #include "ace/Global_Macros.h" #include "ace/os_include/os_time.h" /* For time_t. */ #include "ace/os_include/os_limits.h" /* For MAXPATHLEN. */ -#include "ace/MMAP_Memory_Pool.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/TP_Reactor.cpp b/ACE/ace/TP_Reactor.cpp index 73557515dcb..1dcc78f04b3 100644 --- a/ACE/ace/TP_Reactor.cpp +++ b/ACE/ace/TP_Reactor.cpp @@ -102,7 +102,7 @@ ACE_TP_Reactor::ACE_TP_Reactor (ACE_Sig_Handler *sh, ACE_Timer_Queue *tq, int mask_signals, int s_queue) - : ACE_Select_Reactor (sh, tq, ACE_DISABLE_NOTIFY_PIPE_DEFAULT, 0, mask_signals, s_queue) + : ACE_Select_Reactor (sh, tq, 0, 0, mask_signals, s_queue) { ACE_TRACE ("ACE_TP_Reactor::ACE_TP_Reactor"); this->supress_notify_renew (1); @@ -114,7 +114,7 @@ ACE_TP_Reactor::ACE_TP_Reactor (size_t max_number_of_handles, ACE_Timer_Queue *tq, int mask_signals, int s_queue) - : ACE_Select_Reactor (max_number_of_handles, restart, sh, tq, ACE_DISABLE_NOTIFY_PIPE_DEFAULT, 0, mask_signals, s_queue) + : ACE_Select_Reactor (max_number_of_handles, restart, sh, tq, 0, 0, mask_signals, s_queue) { ACE_TRACE ("ACE_TP_Reactor::ACE_TP_Reactor"); this->supress_notify_renew (1); diff --git a/ACE/ace/Time_Request_Reply.cpp b/ACE/ace/Time_Request_Reply.cpp index 7692b73bf45..e7524ce6ce7 100644 --- a/ACE/ace/Time_Request_Reply.cpp +++ b/ACE/ace/Time_Request_Reply.cpp @@ -130,11 +130,11 @@ ACE_Time_Request::encode (void *&buf) // Compute the length *before* doing the marshaling. buf = (void *) &this->transfer_; - this->transfer_.block_forever_ = ACE_HTONL (this->transfer_.block_forever_); - this->transfer_.usec_timeout_ = ACE_HTONL (this->transfer_.usec_timeout_); - this->transfer_.sec_timeout_ = ACE_HTONL (this->transfer_.sec_timeout_); - this->transfer_.msg_type_ = ACE_HTONL (this->transfer_.msg_type_); - this->transfer_.time_ = ACE_HTONL (this->transfer_.time_); + this->transfer_.block_forever_ = htonl (this->transfer_.block_forever_); + this->transfer_.usec_timeout_ = htonl (this->transfer_.usec_timeout_); + this->transfer_.sec_timeout_ = htonl (this->transfer_.sec_timeout_); + this->transfer_.msg_type_ = htonl (this->transfer_.msg_type_); + this->transfer_.time_ = htonl (this->transfer_.time_); return this->size (); // Always fixed } @@ -146,11 +146,11 @@ ACE_Time_Request::decode (void) { ACE_TRACE ("ACE_Time_Request::decode"); // Decode - this->transfer_.block_forever_ = ACE_NTOHL (this->transfer_.block_forever_); - this->transfer_.usec_timeout_ = ACE_NTOHL (this->transfer_.usec_timeout_); - this->transfer_.sec_timeout_ = ACE_NTOHL (this->transfer_.sec_timeout_); - this->transfer_.msg_type_ = ACE_NTOHL (this->transfer_.msg_type_); - this->transfer_.time_ = ACE_NTOHL (this->transfer_.time_); + this->transfer_.block_forever_ = ntohl (this->transfer_.block_forever_); + this->transfer_.usec_timeout_ = ntohl (this->transfer_.usec_timeout_); + this->transfer_.sec_timeout_ = ntohl (this->transfer_.sec_timeout_); + this->transfer_.msg_type_ = ntohl (this->transfer_.msg_type_); + this->transfer_.time_ = ntohl (this->transfer_.time_); this->time_ = this->transfer_.time_; return 0; diff --git a/ACE/ace/Timer_Queue_Adapters.cpp b/ACE/ace/Timer_Queue_Adapters.cpp index 738e8f1d225..4a3c45dc399 100644 --- a/ACE/ace/Timer_Queue_Adapters.cpp +++ b/ACE/ace/Timer_Queue_Adapters.cpp @@ -54,7 +54,7 @@ template <class TQ> int ACE_Async_Timer_Queue_Adapter<TQ>::schedule_ualarm (void) { ACE_Time_Value tv = this->timer_queue_.earliest_time () - - this->timer_queue_.gettimeofday (); + - ACE_OS::gettimeofday (); // Beware of negative times and zero times (which cause problems for // <ualarm>). diff --git a/ACE/ace/Timer_Queue_T.cpp b/ACE/ace/Timer_Queue_T.cpp index 246700f6aa2..82030315aab 100644 --- a/ACE/ace/Timer_Queue_T.cpp +++ b/ACE/ace/Timer_Queue_T.cpp @@ -9,11 +9,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -/* - * Hook to specialize to add includes - */ -//@@ REACTOR_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK - #include "ace/Timer_Queue_T.h" #include "ace/Guard_T.h" #include "ace/Log_Msg.h" @@ -83,7 +78,7 @@ ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK>::calculate_timeout (ACE_Time_Value *m return max_wait_time; else { - ACE_Time_Value const cur_time = this->gettimeofday (); + ACE_Time_Value cur_time = this->gettimeofday (); if (this->earliest_time () > cur_time) { @@ -412,7 +407,7 @@ ACE_Event_Handler_Handle_Timeout_Upcall<ACE_LOCK>::timeout (TIMER_QUEUE &timer_q // Upcall to the <handler>s handle_timeout method. if (event_handler->handle_timeout (cur_time, act) == -1) { - if (event_handler->reactor_timer_interface ()) + if (event_handler->reactor ()) event_handler->reactor_timer_interface ()->cancel_timer (event_handler, 0); else timer_queue.cancel (event_handler, 0); // 0 means "call handle_close()". diff --git a/ACE/ace/TkReactor/TkReactor.cpp b/ACE/ace/TkReactor.cpp index 942f66d7d1d..7f6ae69e320 100644 --- a/ACE/ace/TkReactor/TkReactor.cpp +++ b/ACE/ace/TkReactor.cpp @@ -1,4 +1,4 @@ -#include "ace/TkReactor/TkReactor.h" +#include "ace/TkReactor.h" #include "ace/SOCK_Acceptor.h" #include "ace/SOCK_Connector.h" diff --git a/ACE/ace/TkReactor/TkReactor.h b/ACE/ace/TkReactor.h index 80583bb8999..ca3f39474f6 100644 --- a/ACE/ace/TkReactor/TkReactor.h +++ b/ACE/ace/TkReactor.h @@ -21,7 +21,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/TkReactor/ACE_TkReactor_export.h" +#include "ace/ACE_TkReactor_export.h" #include "ace/Select_Reactor.h" #include /**/ <tk.h> diff --git a/ACE/ace/Truncate.h b/ACE/ace/Truncate.h index efae24177d6..6ec6f9557bf 100644 --- a/ACE/ace/Truncate.h +++ b/ACE/ace/Truncate.h @@ -27,16 +27,16 @@ #include "ace/If_Then_Else.h" #include "ace/Numeric_Limits.h" -#if defined (__BORLANDC__) && __BORLANDC__ <= 0x590 +#if defined (__BORLANDC__) && __BORLANDC__ <= 0x582 # include "ace/Basic_Types.h" -#endif /* __BORLANDC__ <= 0x590 */ +#endif /* __BORLANDC__ <= 0x582 */ ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_Utils { -#if !defined (__BORLANDC__) || __BORLANDC__ > 0x590 +#if !defined (__BORLANDC__) || __BORLANDC__ > 0x582 template<typename T> struct Sign_Check; @@ -895,7 +895,7 @@ namespace ACE_Utils return truncator() (val); } -#endif /* !__BORLANDC__ || __BORLANDC__ > 0x590 */ +#endif /* !__BORLANDC__ || __BORLANDC__ > 0x582 */ } // namespace ACE_Utils diff --git a/ACE/ace/UUID.cpp b/ACE/ace/UUID.cpp index 9b35fe76a52..65eac030b59 100644 --- a/ACE/ace/UUID.cpp +++ b/ACE/ace/UUID.cpp @@ -113,7 +113,7 @@ namespace ACE_Utils // Get a buffer exactly the correct size. Use the nil UUID as a // gauge. Don't forget the trailing nul. size_t UUID_STRING_LENGTH = 36 + thr_id_.length () + pid_.length (); - char *buf = 0; + char *buf; if ((thr_id_.length () != 0) && (pid_.length () != 0)) { @@ -161,20 +161,10 @@ namespace ACE_Utils ); } - // We allocated 'buf' above dynamically, so we shouldn't use - // ACE_NEW_RETURN here to avoid a possible memory leak. - ACE_NEW_NORETURN (this->as_string_, - ACE_CString (buf, UUID_STRING_LENGTH)); - - // we first free the dynamically allocated 'buf'. + ACE_NEW_RETURN (this->as_string_, + ACE_CString (buf, UUID_STRING_LENGTH), + 0); delete [] buf; - - // then we test that ACE_NEW succeded for 'as_string_' - // if not, we return 0 (NULL) to indicate failure. - if( this->as_string_ == 0 ) - { - return 0; - } } return as_string_; diff --git a/ACE/ace/Version.h b/ACE/ace/Version.h index 3cede3b8bba..c940def3699 100644 --- a/ACE/ace/Version.h +++ b/ACE/ace/Version.h @@ -5,5 +5,5 @@ #define ACE_MAJOR_VERSION 5 #define ACE_MINOR_VERSION 5 -#define ACE_BETA_VERSION 4 -#define ACE_VERSION "5.5.4" +#define ACE_BETA_VERSION 3 +#define ACE_VERSION "5.5.3" diff --git a/ACE/ace/WFMO_Reactor.cpp b/ACE/ace/WFMO_Reactor.cpp index 29fec88714b..70447271dca 100644 --- a/ACE/ace/WFMO_Reactor.cpp +++ b/ACE/ace/WFMO_Reactor.cpp @@ -1192,7 +1192,7 @@ ACE_WFMO_Reactor::open (size_t size, this->atomic_wait_array_[0] = this->lock_.lock ().proc_mutex_; this->atomic_wait_array_[1] = this->ok_to_wait_.handle (); - // Prevent memory leaks when the ACE_WFMO_Reactor is reopened. + // Prevent memory leaks when the ACE_WFMO_Reactor is reopened. if (this->delete_handler_rep_) { if (this->handler_rep_.changes_required ()) @@ -2423,7 +2423,7 @@ ACE_WFMO_Reactor_Notify::handle_signal (int signum, ACE_Event_Handler *event_handler = buffer->eh_; - bool const requires_reference_counting = + int requires_reference_counting = event_handler->reference_counting_policy ().value () == ACE_Event_Handler::Reference_Counting_Policy::ENABLED; diff --git a/ACE/ace/WFMO_Reactor.h b/ACE/ace/WFMO_Reactor.h index e6d7c67e55e..a1ca110520e 100644 --- a/ACE/ace/WFMO_Reactor.h +++ b/ACE/ace/WFMO_Reactor.h @@ -1096,7 +1096,7 @@ public: /// Returns true if WFMO_Reactor has been successfully initialized, else /// false. - virtual bool initialized (void); + virtual int initialized (void); /// Returns the current size of the WFMO_Reactor's internal /// descriptor table. diff --git a/ACE/ace/WFMO_Reactor.inl b/ACE/ace/WFMO_Reactor.inl index 7f72fdbe8f6..b2d24fb05d7 100644 --- a/ACE/ace/WFMO_Reactor.inl +++ b/ACE/ace/WFMO_Reactor.inl @@ -1132,7 +1132,7 @@ ACE_WFMO_Reactor::handler (ACE_HANDLE handle, event_handler); } -ACE_INLINE bool +ACE_INLINE int ACE_WFMO_Reactor::initialized (void) { return this->open_for_business_; diff --git a/ACE/ace/WIN32_Asynch_IO.cpp b/ACE/ace/WIN32_Asynch_IO.cpp index 2ed1311936e..afe50d51c05 100644 --- a/ACE/ace/WIN32_Asynch_IO.cpp +++ b/ACE/ace/WIN32_Asynch_IO.cpp @@ -6,8 +6,7 @@ ACE_RCSID (ace, Win32_Asynch_IO, "$Id$") -#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) && \ - (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 == 1)) +#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) #include "ace/WIN32_Proactor.h" #include "ace/Message_Block.h" @@ -167,7 +166,7 @@ ACE_WIN32_Asynch_Operation::open (const ACE_Handler::Proxy_Ptr &handler_proxy, int ACE_WIN32_Asynch_Operation::cancel (void) { -#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) \ +#if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) \ && ( (defined (_MSC_VER)) \ || (defined (__BORLANDC__)) \ || (defined (__MINGW32))) @@ -187,7 +186,7 @@ ACE_WIN32_Asynch_Operation::cancel (void) // result is non-zero. All the operations are cancelled then. return 0; -#else /* Not ACE_HAS_WIN32_OVERLAPPED_IO && _MSC... */ +#else /* Not ACE_HAS_WINNT4 && ACE_HAS_WINNT4!=0 && _MSC... */ ACE_NOTSUP_RETURN (-1); #endif /* ACE_HAS_AIO_CALLS */ } @@ -1300,7 +1299,7 @@ ACE_WIN32_Asynch_Read_File::readv (ACE_Message_Block &message_block, int priority, int signal_number) { -#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) +#if ((ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) static const size_t page_size = ACE_OS::getpagesize(); FILE_SEGMENT_ELEMENT buffer_pointers[ACE_IOV_MAX + 1]; @@ -1400,9 +1399,9 @@ ACE_WIN32_Asynch_Read_File::readv (ACE_Message_Block &message_block, } return initiate_result; -#else +#else /*#if ( (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0))*/ ACE_NOTSUP_RETURN (-1); -#endif /* ACE_WIN32_OVERLAPPED_IO */ +#endif /*#if ( (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0))*/ } @@ -1700,7 +1699,7 @@ ACE_WIN32_Asynch_Write_File::writev (ACE_Message_Block &message_block, int priority, int signal_number) { -#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) +#if ((ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) static const size_t page_size = ACE_OS::getpagesize(); FILE_SEGMENT_ELEMENT buffer_pointers[ACE_IOV_MAX + 1]; @@ -1805,11 +1804,11 @@ ACE_WIN32_Asynch_Write_File::writev (ACE_Message_Block &message_block, } return initiate_result; -#else +#else /*#if ((ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0))*/ ACE_NOTSUP_RETURN (-1); -#endif /* ACE_HAS_WIN32_OVERLAPPED_IO */ +#endif /* */ } @@ -2042,7 +2041,7 @@ ACE_WIN32_Asynch_Accept::accept (ACE_Message_Block &message_block, int signal_number, int addr_family) { -#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) +#if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) || (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) // Sanity check: make sure that enough space has been allocated by // the caller. size_t address_size = @@ -2146,7 +2145,7 @@ ACE_WIN32_Asynch_Accept::accept (ACE_Message_Block &message_block, } return -1; } -#else +#else /* ACE_HAS_WINNT4 .......|| ACE_HAS_AIO_CALLS */ ACE_UNUSED_ARG (message_block); ACE_UNUSED_ARG (bytes_to_read); ACE_UNUSED_ARG (accept_handle); @@ -2155,7 +2154,7 @@ ACE_WIN32_Asynch_Accept::accept (ACE_Message_Block &message_block, ACE_UNUSED_ARG (signal_number); ACE_UNUSED_ARG (addr_family); ACE_NOTSUP_RETURN (-1); -#endif /* defined (ACE_HAS_WIN32_OVERLAPPED_IO) || (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) */ +#endif /* (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) || (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) || (defined (ACE_HAS_AIO_CALLS) */ } ACE_WIN32_Asynch_Accept::~ACE_WIN32_Asynch_Accept (void) @@ -2461,12 +2460,8 @@ ACE_WIN32_Asynch_Connect::connect (ACE_HANDLE connect_handle, int ACE_WIN32_Asynch_Connect::post_result (ACE_WIN32_Asynch_Connect_Result * result, bool post_enable) { - ACE_HANDLE handle = result->connect_handle (); if (this->flg_open_ && post_enable) { - // NOTE: result is invalid after post_completion(). It's either deleted - // or will be shortly via the proactor dispatch, regardless of success - // or fail of the call. if (this->win32_proactor_ ->post_completion (result) == 0) return 0; @@ -2475,15 +2470,14 @@ int ACE_WIN32_Asynch_Connect::post_result (ACE_WIN32_Asynch_Connect_Result * res ACE_LIB_TEXT ("ACE_WIN32_Asynch_Connect::post_result: ") ACE_LIB_TEXT (" <post_completion> failed"))); } - else - { - // There was no call to post_completion() so manually delete result. - delete result; - } + + ACE_HANDLE handle = result->connect_handle (); if (handle != ACE_INVALID_HANDLE) ACE_OS::closesocket (handle); + delete result; + return -1; } @@ -2957,7 +2951,7 @@ ACE_WIN32_Asynch_Transmit_File::transmit_file (ACE_HANDLE file, int priority, int signal_number) { -#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) +#if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) || (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) // TransmitFile API limits us to DWORD range. if (bytes_to_write > MAXDWORD || bytes_per_send > MAXDWORD) @@ -3025,7 +3019,7 @@ ACE_WIN32_Asynch_Transmit_File::transmit_file (ACE_HANDLE file, } return -1; } -#else +#else /* (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) || (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) */ ACE_UNUSED_ARG (file); ACE_UNUSED_ARG (header_and_trailer); ACE_UNUSED_ARG (bytes_to_write); @@ -3037,7 +3031,7 @@ ACE_WIN32_Asynch_Transmit_File::transmit_file (ACE_HANDLE file, ACE_UNUSED_ARG (priority); ACE_UNUSED_ARG (signal_number); ACE_NOTSUP_RETURN (-1); -#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_WINSOCK2 */ +#endif /* ACE_HAS_AIO_CALLS */ } ACE_WIN32_Asynch_Transmit_File::~ACE_WIN32_Asynch_Transmit_File (void) @@ -3758,4 +3752,4 @@ ACE_WIN32_Asynch_Write_Dgram::ACE_WIN32_Asynch_Write_Dgram (ACE_WIN32_Proactor * ACE_END_VERSIONED_NAMESPACE_DECL -#endif /* ACE_HAS_WIN32_OVERLAPPED_IO && ACE_HAS_WINSOCK2 */ +#endif /* ACE_WIN32 || ACE_HAS_WINCE */ diff --git a/ACE/ace/WIN32_Asynch_IO.h b/ACE/ace/WIN32_Asynch_IO.h index d49072e9fe8..66e30b20584 100644 --- a/ACE/ace/WIN32_Asynch_IO.h +++ b/ACE/ace/WIN32_Asynch_IO.h @@ -32,8 +32,7 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) && \ - (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 == 1)) +#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) #include "ace/Asynch_IO_Impl.h" #include "ace/Addr.h" @@ -1932,6 +1931,6 @@ protected: ACE_END_VERSIONED_NAMESPACE_DECL -#endif /* ACE_HAS_WIN32_OVERLAPPED_IO && ACE_HAS_WINSOCK2 */ +#endif /* ACE_WIN32 && !ACE_HAS_WINCE */ #include /**/ "ace/post.h" #endif /* ACE_WIN32_ASYNCH_IO_H */ diff --git a/ACE/ace/WIN32_Proactor.cpp b/ACE/ace/WIN32_Proactor.cpp index e35c3b01d64..7ace0d987b0 100644 --- a/ACE/ace/WIN32_Proactor.cpp +++ b/ACE/ace/WIN32_Proactor.cpp @@ -4,7 +4,7 @@ #include "ace/WIN32_Proactor.h" -#if defined (ACE_WIN32) && defined (ACE_HAS_WIN32_OVERLAPPED_IO) +#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) // WIN implemenatation of the Proactor. #include "ace/Log_Msg.h" diff --git a/ACE/ace/WIN32_Proactor.h b/ACE/ace/WIN32_Proactor.h index e6db85ba930..addc5bfd94e 100644 --- a/ACE/ace/WIN32_Proactor.h +++ b/ACE/ace/WIN32_Proactor.h @@ -24,7 +24,7 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if defined (ACE_WIN32) && defined (ACE_HAS_WIN32_OVERLAPPED_IO) +#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) // WIN32 implementation of the Proactor. #include "ace/WIN32_Asynch_IO.h" diff --git a/ACE/ace/XtReactor/XtReactor.cpp b/ACE/ace/XtReactor.cpp index 7bdef11b936..ab4612c9472 100644 --- a/ACE/ace/XtReactor/XtReactor.cpp +++ b/ACE/ace/XtReactor.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "ace/XtReactor/XtReactor.h" +#include "ace/XtReactor.h" #include "ace/SOCK_Acceptor.h" #include "ace/SOCK_Connector.h" diff --git a/ACE/ace/XtReactor/XtReactor.h b/ACE/ace/XtReactor.h index 22fb39ceeed..c0d0a25ab80 100644 --- a/ACE/ace/XtReactor/XtReactor.h +++ b/ACE/ace/XtReactor.h @@ -22,10 +22,12 @@ #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/XtReactor/ACE_XtReactor_export.h" +#include "ace/ACE_XtReactor_export.h" #include "ace/Select_Reactor.h" +//#define String XtString #include /**/ <X11/Intrinsic.h> +//#undef String ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/ace.mpc b/ACE/ace/ace.mpc index 4b6aca6fd21..dc92a721395 100644 --- a/ACE/ace/ace.mpc +++ b/ACE/ace/ace.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- now wouldn't this be cool... // $Id$ -project(ACE) : acedefaults, install, other, codecs, token, svcconf, uuid, filecache, versioned_namespace, pkgconfig { +project(ACE) : acedefaults, core, other, codecs, token, svcconf, uuid, filecache, versioned_namespace, pkgconfig { avoids = ace_for_tao libout = $(ACE_ROOT)/lib sharedname = ACE @@ -367,7 +367,6 @@ project(ACE) : acedefaults, install, other, codecs, token, svcconf, uuid, fileca Swap.inl TSS_T.inl ace_wchar.inl - OS.inl } Header_Files { diff --git a/ACE/ace/ace_flreactor.mpc b/ACE/ace/ace_flreactor.mpc index b5c2c277bfb..af3f7afaf9c 100644 --- a/ACE/ace/ace_flreactor.mpc +++ b/ACE/ace/ace_flreactor.mpc @@ -1,32 +1,30 @@ // -*- MPC -*- now wouldn't this be cool... // $Id$ -project(ACE_FlReactor) : acedefaults, install, acelib, ace_fl{ +project(ACE_FlReactor) : acedefaults, core, acelib, ace_fl{ sharedname = ACE_FlReactor dynamicflags = ACE_FLREACTOR_BUILD_DLL Source_Files { - FlReactor + FlReactor.cpp } Header_Files { - FlReactor + ACE_FlReactor_export.h + FlReactor.h } Inline_Files { - FlReactor } Template_Files { - FlReactor } Resource_Files { - FlReactor } Pkgconfig_Files { - FlReactor/ACE_FlReactor.pc.in + ACE_FlReactor.pc.in } } diff --git a/ACE/ace/ace_for_tao.mpc b/ACE/ace/ace_for_tao.mpc index 58b7a928fe5..cd28be5635b 100644 --- a/ACE/ace/ace_for_tao.mpc +++ b/ACE/ace/ace_for_tao.mpc @@ -11,7 +11,7 @@ // link. This ACE_FOR_TAO subset library must remain as small as // possible. -project(ACE_FOR_TAO) : acedefaults, install, svcconf, uuid, versioned_namespace, pkgconfig { +project(ACE_FOR_TAO) : acedefaults, core, svcconf, versioned_namespace, pkgconfig { macros += ACE_LACKS_ACE_TOKEN requires = ace_for_tao ace_svcconf libout = $(ACE_ROOT)/lib diff --git a/ACE/ace/ace_qtreactor.mpc b/ACE/ace/ace_qtreactor.mpc index 324a29d02c6..549181b1348 100644 --- a/ACE/ace/ace_qtreactor.mpc +++ b/ACE/ace/ace_qtreactor.mpc @@ -1,38 +1,34 @@ // -*- MPC -*- now wouldn't this be cool... // $Id$ -project(ACE_QtReactor) : acedefaults, install, acelib, ace_qt { +project(ACE_QtReactor) : acedefaults, core, acelib, ace_qt { sharedname = ACE_QtReactor dynamicflags = ACE_QTREACTOR_BUILD_DLL MOC_Files { - QtReactor + QtReactor.h } Source_Files { - - QtReactor/QtReactor_moc.cpp - QtReactor + QtReactor_moc.cpp + QtReactor.cpp } Header_Files { - QtReactor + ACE_QtReactor_export.h } Inline_Files { - QtReactor } Template_Files { - QtReactor } Resource_Files { - QtReactor } Pkgconfig_Files { - QtReactor/ACE_QtReactor.pc.in + ACE_QtReactor.pc.in } } diff --git a/ACE/ace/ace_tkreactor.mpc b/ACE/ace/ace_tkreactor.mpc index 544c9185c23..fbbda18160c 100644 --- a/ACE/ace/ace_tkreactor.mpc +++ b/ACE/ace/ace_tkreactor.mpc @@ -1,32 +1,30 @@ // -*- MPC -*- now wouldn't this be cool... // $Id$ -project(ACE_TkReactor) : acedefaults, install, acelib, ace_tk { +project(ACE_TkReactor) : acedefaults, core, acelib, ace_tk { sharedname = ACE_TkReactor dynamicflags = ACE_TKREACTOR_BUILD_DLL Source_Files { - TkReactor + TkReactor.cpp } Header_Files { - TkReactor + ACE_TkReactor_export.h + TkReactor.h } Inline_Files { - TkReactor } Template_Files { - TkReactor } Resource_Files { - TkReactor } Pkgconfig_Files { - TkReactor/ACE_TkReactor.pc.in + ACE_TkReactor.pc.in } } diff --git a/ACE/ace/ace_xtreactor.mpc b/ACE/ace/ace_xtreactor.mpc index 5efdaaed5ca..9d8c44e666f 100644 --- a/ACE/ace/ace_xtreactor.mpc +++ b/ACE/ace/ace_xtreactor.mpc @@ -1,32 +1,30 @@ // -*- MPC -*- now wouldn't this be cool... // $Id$ -project(ACE_XtReactor) : acedefaults, install, acelib, ace_xt { +project(ACE_XtReactor) : acedefaults, core, acelib, ace_xt { sharedname = ACE_XtReactor dynamicflags = ACE_XTREACTOR_BUILD_DLL Source_Files { - XtReactor + XtReactor.cpp } Header_Files { - XtReactor + XtReactor.h + ACE_XtReactor_export.h } Inline_Files { - XtReactor } Template_Files { - XtReactor } Resource_Files { - XtReactor } Pkgconfig_Files { - XtReactor/ACE_XtReactor.pc.in + ACE_XtReactor.pc.in } } diff --git a/ACE/ace/config-WinCE.h b/ACE/ace/config-WinCE.h index 70a9694c857..8a31e29f9fd 100644 --- a/ACE/ace/config-WinCE.h +++ b/ACE/ace/config-WinCE.h @@ -68,6 +68,12 @@ #define ACE_HAS_POSITION_INDEPENDENT_POINTERS 1 +// CE is not NT. +#if defined (ACE_HAS_WINNT4) +# undef ACE_HAS_WINNT4 +#endif // ACE_HAS_WINNT4 +#define ACE_HAS_WINNT4 0 + #define ACE_LACKS_MSG_WFMO #define ACE_LACKS_UMASK diff --git a/ACE/ace/config-aix-4.1.x.h b/ACE/ace/config-aix-4.1.x.h new file mode 100644 index 00000000000..a739c1ae49a --- /dev/null +++ b/ACE/ace/config-aix-4.1.x.h @@ -0,0 +1,8 @@ +/* -*- C++ -*- */ +// $Id$ + +#ifndef ACE_AIX_VERS +# define ACE_AIX_VERS 401 +#endif + +#include "ace/config-aix-4.x.h" diff --git a/ACE/ace/config-aix-4.2.x.h b/ACE/ace/config-aix-4.2.x.h new file mode 100644 index 00000000000..b44c851a437 --- /dev/null +++ b/ACE/ace/config-aix-4.2.x.h @@ -0,0 +1,8 @@ +/* -*- C++ -*- */ +// $Id$ + +#ifndef ACE_AIX_VERS +# define ACE_AIX_VERS 402 +#endif + +#include "ace/config-aix-4.x.h" diff --git a/ACE/ace/config-aix-4.3.x.h b/ACE/ace/config-aix-4.3.x.h new file mode 100644 index 00000000000..d6b2824ec35 --- /dev/null +++ b/ACE/ace/config-aix-4.3.x.h @@ -0,0 +1,8 @@ +/* -*- C++ -*- */ +// $Id$ + +#ifndef ACE_AIX_VERS +# define ACE_AIX_VERS 403 +#endif + +#include "ace/config-aix-4.x.h" diff --git a/ACE/ace/config-aix-4.x.h b/ACE/ace/config-aix-4.x.h new file mode 100644 index 00000000000..d434ad61003 --- /dev/null +++ b/ACE/ace/config-aix-4.x.h @@ -0,0 +1,347 @@ +/* -*- C++ -*- */ +// $Id$ + +// The following configuration file is designed to work for OS +// platforms running AIX 4.x using the IBM C++ compiler (xlC), +// Visual Age C++ or g++. + +#ifndef ACE_CONFIG_H +#define ACE_CONFIG_H +#include /**/ "ace/pre.h" + +// 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 (__xlC__) || defined (__IBMCPP__) + // AIX xlC, IBM C/C++, and Visual Age C++ compilers + //******************************************************************** + // + +// 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 + +// When using the preprocessor, Ignore info msg; invalid #pragma +# if defined (__IBMCPP__) && (__IBMCPP__ < 400) // IBM C++ 3.6 +# define ACE_CC_PREPROCESSOR_ARGS "-E -qflag=w:w" +# endif /* (__IBMCPP__) && (__IBMCPP__ < 400) */ + + // Keep an eye on this as the compiler and standards converge... +# define ACE_LACKS_LINEBUFFERED_STREAMBUF +# define ACE_LACKS_PRAGMA_ONCE + + // C Set++ 3.1, IBM C/C++ 3.6, and Visual Age C++ 5 batch (__xlC__) +# if defined (__xlC__) +# if (__xlC__ < 0x0500) +# define ACE_LACKS_PLACEMENT_OPERATOR_DELETE +# endif /* __xlC__ < 0x0500 */ +# endif + + // These are for Visual Age C++ only +# if defined (__IBMCPP__) && (__IBMCPP__ >= 400) +# define ACE_EXPLICIT_TEMPLATE_DESTRUCTOR_TAKES_ARGS +# define ACE_HAS_TYPENAME_KEYWORD + // 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 + +# if (__IBMCPP__ >= 500) /* Visual Age C++ 5 */ +# define ACE_HAS_STANDARD_CPP_LIBRARY 1 +# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 +# endif /* __IBMCPP__ >= 500 */ + +# if (__IBMCPP__ >= 600) /* Visual Age 6 and XL C/C++ 7 and up */ +# define ACE_HAS_TEMPLATE_TYPEDEFS +# endif /* __IBMCPP__ >= 600 */ +# endif /* __IBMCPP__ */ + +#elif defined (__GNUG__) + // config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so + // this must appear before its #include. +# define ACE_HAS_STRING_CLASS + +# include "ace/config-g++-common.h" + // Denotes that GNU has cstring.h as standard, to redefine memchr(). +# define ACE_HAS_GNU_CSTRING_H +# define ACE_HAS_SSIZE_T + +# if (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ == 0)) +// We have to explicitly instantiate static template members prior to g++ 4.1 +# define ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION +#endif /* g++ prior to 4.1 */ + +# 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 /* ! __xlC__ && ! __GNUG__ */ +# ifdef __cplusplus /* Let it slide for C compilers. */ +# error unsupported compiler in ace/config-aix-4.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" + +#if defined (ACE_HAS_POSIX_SEM_TIMEOUT) +# undef ACE_HAS_POSIX_SEM_TIMEOUT +#endif /* ACE_HAS_POSIX_SEM_TIMEOUT */ + +// AIX shared libs look strangely like archive libs until you look inside +// them. +#if defined (ACE_DLL_SUFFIX) +# undef ACE_DLL_SUFFIX +#endif +#define ACE_DLL_SUFFIX ".a" + +// Use BSD 4.4 socket definitions for pre-AIX 4.2. The _BSD setting also +// controls the data type used for waitpid(), wait(), and wait3(). +#if (ACE_AIX_VERS < 402) +# define _BSD 44 +# define ACE_HAS_UNION_WAIT +#endif /* ACE_AIX_VERS < 402 */ + +// This environment requires this thing, pre-AIX 4.3 +#if (ACE_AIX_VERS < 403) +# define _BSD_INCLUDES +#endif /* ACE_AIX_VERS < 403 */ + +#define ACE_DEFAULT_BASE_ADDR ((char *) 0x80000000) + +#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R + +// ACE_HAS_AIX_BROKEN_SOCKET_HEADER may be required if your OS patches are +// not up to date. On up-to-date 4.2+ systems, it should not be required. +// 4.2+ has 4.4 BSD sendmsg/recvmsg +#if (ACE_AIX_VERS < 402) +# define ACE_HAS_AIX_BROKEN_SOCKET_HEADER +#else +# if (ACE_AIX_VERS == 402) +# define ACE_HAS_SIZET_SOCKET_LEN +# else +# define ACE_HAS_SOCKLEN_T +# endif +# define ACE_HAS_4_4BSD_SENDMSG_RECVMSG +#endif /* ACE_AIX_VERS < 402 */ + +#if (ACE_AIX_VERS >= 403) +// 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 +#endif /* ACE_AIX_VERS >= 403 */ + +#define ACE_HAS_AIX_HI_RES_TIMER + +// Compiler/platform has correctly prototyped header files. +#define ACE_HAS_CPLUSPLUS_HEADERS +#if (ACE_AIX_VERS < 403) +# define ACE_HAS_CHARPTR_DL +#endif /* ACE_AIX_VERS < 403 */ + +// 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_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 +#if (ACE_AIX_VERS < 402) +# define ACE_LACKS_MSG_ACCRIGHTS +# define ACE_LACKS_RLIMIT +#endif + +// 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+ +#if (ACE_AIX_VERS >= 402) +# define ACE_HAS_BROKEN_POSIX_TIME +#endif /* ACE_AIX_VERS > 402 */ +// ... and needs another typedef +#define ACE_LACKS_TIMESPEC_T +#define ACE_HAS_SELECT_H + +#define ACE_HAS_REENTRANT_FUNCTIONS + +// Compiler/platform defines the sig_atomic_t typedef +#define ACE_HAS_SIG_ATOMIC_T +#if (ACE_AIX_VERS >= 402) +# define ACE_HAS_SIGINFO_T +# define ACE_LACKS_SIGINFO_H +#endif /* ACE_AIX_VERS >= 402 */ +#if (ACE_AIX_VERS >= 403) +// it may exist in earlier revs, but I'm not sure and I don't have a +// system to validate +# define ACE_HAS_P_READ_WRITE +#endif /* ACE_AIX_VERS >= 403 */ + +#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 + +// Compiler/platform supports strerror (). +#define ACE_HAS_STRERROR + +// 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 + +#if (ACE_AIX_VERS >= 402) +# define ACE_HAS_UCONTEXT_T +#endif /* ACE_AIX_VERS >= 402 */ + +#define ACE_HAS_UTIME + +// 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 "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 +// 4.3 and up has 1003.1c standard; 4.2 has draft 7 +# if (ACE_AIX_VERS >= 403) +# define ACE_HAS_PTHREADS_STD +# define ACE_HAS_PTHREADS_UNIX98_EXT +# define ACE_HAS_PTHREAD_CONTINUE_NP +# define ACE_HAS_PTHREAD_SUSPEND_NP +# define ACE_HAS_RECURSIVE_MUTEXES +# else +# define ACE_HAS_PTHREADS_DRAFT7 +# define ACE_LACKS_RWLOCK_T +# define ACE_LACKS_THREAD_STACK_ADDR +// If ACE doesn't compile due to the lack of these methods, please +// send email to ace-users@cs.wustl.edu reporting this. +// #define ACE_LACKS_CONDATTR_PSHARED +// #define ACE_LACKS_MUTEXATTR_PSHARED +# define ACE_LACKS_SETSCHED +# endif /* ACE_AIX_VERS >= 403 */ + +# 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 */ + +#include /**/ "ace/post.h" +#endif /* ACE_CONFIG_H */ diff --git a/ACE/ace/config-aix-5.x.h b/ACE/ace/config-aix-5.x.h index 36d31fb2900..42cb40b96db 100644 --- a/ACE/ace/config-aix-5.x.h +++ b/ACE/ace/config-aix-5.x.h @@ -26,285 +26,7 @@ #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 (__xlC__) || defined (__IBMCPP__) - // AIX xlC, IBM C/C++, and Visual Age C++ compilers - //******************************************************************** - // - -// 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 - -// When using the preprocessor, Ignore info msg; invalid #pragma -# if defined (__IBMCPP__) && (__IBMCPP__ < 400) // IBM C++ 3.6 -# define ACE_CC_PREPROCESSOR_ARGS "-E -qflag=w:w" -# endif /* (__IBMCPP__) && (__IBMCPP__ < 400) */ - - // Keep an eye on this as the compiler and standards converge... -# define ACE_LACKS_LINEBUFFERED_STREAMBUF -# define ACE_LACKS_PRAGMA_ONCE - - // C Set++ 3.1, IBM C/C++ 3.6, and Visual Age C++ 5 batch (__xlC__) -# if defined (__xlC__) -# if (__xlC__ < 0x0500) -# define ACE_LACKS_PLACEMENT_OPERATOR_DELETE -# endif /* __xlC__ < 0x0500 */ -# endif - - // These are for Visual Age C++ only -# if defined (__IBMCPP__) && (__IBMCPP__ >= 400) -# define ACE_EXPLICIT_TEMPLATE_DESTRUCTOR_TAKES_ARGS -# define ACE_HAS_TYPENAME_KEYWORD - // 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 - -# if (__IBMCPP__ >= 500) /* Visual Age C++ 5 */ -# define ACE_HAS_STANDARD_CPP_LIBRARY 1 -# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 -# endif /* __IBMCPP__ >= 500 */ - -# if (__IBMCPP__ >= 600) /* Visual Age 6 and XL C/C++ 7 and up */ -# define ACE_HAS_TEMPLATE_TYPEDEFS -# endif /* __IBMCPP__ >= 600 */ -# endif /* __IBMCPP__ */ - -#elif defined (__GNUG__) - // config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so - // this must appear before its #include. -# define ACE_HAS_STRING_CLASS - -# include "ace/config-g++-common.h" - // Denotes that GNU has cstring.h as standard, to redefine memchr(). -# define ACE_HAS_GNU_CSTRING_H -# define ACE_HAS_SSIZE_T - -# if (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ == 0)) -// We have to explicitly instantiate static template members prior to g++ 4.1 -# define ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION -#endif /* g++ prior to 4.1 */ - -# 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 /* ! __xlC__ && ! __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" - -#if defined (ACE_HAS_POSIX_SEM_TIMEOUT) -# undef ACE_HAS_POSIX_SEM_TIMEOUT -#endif /* ACE_HAS_POSIX_SEM_TIMEOUT */ - -// AIX shared libs look strangely like archive libs until you look inside -// them. -#if defined (ACE_DLL_SUFFIX) -# undef ACE_DLL_SUFFIX -#endif -#define ACE_DLL_SUFFIX ".a" - -#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 - -// Compiler/platform has correctly prototyped header files. -#define ACE_HAS_CPLUSPLUS_HEADERS - -// 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_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 - -// 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 - -// Compiler/platform supports strerror (). -#define ACE_HAS_STRERROR - -// 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_UTIME - -// 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 "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_STD -# 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 */ - +#include "ace/config-aix-4.x.h" #if defined (_ACE_DISABLE_AIO_CALLS_) # if defined (ACE_HAS_AIO_CALLS) # undef ACE_HAS_AIO_CALLS @@ -327,13 +49,11 @@ // AIX 5.1 has netinet/tcp.h #undef ACE_LACKS_NETINET_TCP_H -#define ACE_HAS_3_PARAM_READDIR_R #define ACE_HAS_POSIX_GETPWNAM_R #define ACE_HAS_SCANDIR -#define ACE_SCANDIR_CMP_USES_VOIDPTR -#define ACE_SCANDIR_SEL_LACKS_CONST +# 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_SIGVAL_T #endif /* ACE_CONFIG_AIX_5_X_H */ diff --git a/ACE/ace/config-cygwin32.h b/ACE/ace/config-cygwin32.h index 215ffb8e37f..60fcf4576f3 100644 --- a/ACE/ace/config-cygwin32.h +++ b/ACE/ace/config-cygwin32.h @@ -80,7 +80,6 @@ #define ACE_HAS_POSITION_INDEPENDENT_POINTERS 1 #define ACE_HAS_SOCKADDR_MSG_NAME 1 #define ACE_LACKS_PRI_T 1 -#define ACE_HAS_3_PARAM_READDIR_R // Compiler/platform supports alloca(). // Although ACE does have alloca() on this compiler/platform combination, it is @@ -146,6 +145,7 @@ #define ACE_LACKS_FPUTWS 1 #define ACE_HAS_AUTOMATIC_INIT_FINI +#define ACE_HAS_SNPRINTF #define ACE_HAS_SIGWAIT #define ACE_HAS_SIGINFO_T diff --git a/ACE/ace/config-dgux-4.11-epc.h b/ACE/ace/config-dgux-4.11-epc.h new file mode 100644 index 00000000000..4ac2079a768 --- /dev/null +++ b/ACE/ace/config-dgux-4.11-epc.h @@ -0,0 +1,189 @@ +/* -*- C++ -*- */ +// $Id$ + +// The following configuration file is designed to work for DG/UX +// 4.11 platforms using the EPC compiler. + +#ifndef ACE_CONFIG_H +#define ACE_CONFIG_H +#include /**/ "ace/pre.h" + +#define ACE_DGUX + +// Platform requires (struct sockaddr *) for msg_name field of struct +// msghdr. +#define ACE_HAS_SOCKADDR_MSG_NAME + +// Platform lacks strcasecmp(). +#define ACE_LACKS_STRCASECMP + +// 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_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 supports reentrant functions (i.e., all the POSIX *_r functions). +#define ACE_HAS_REENTRANT_FUNCTIONS + +// 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 has correctly prototyped header files. +#define ACE_HAS_CPLUSPLUS_HEADERS + +// 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() +// #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 +#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 + +// 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 strerror (). +#define ACE_HAS_STRERROR + +// 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 + +// DG/UX uses the same gettimeofday() prototype as OSF/1. +#define ACE_HAS_OSF1_GETTIMEOFDAY + +// Compiler/platform supports SVR4 signal typedef. +#define ACE_HAS_SVR4_SIGNAL_T + +// 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 + +// Compiler/platform supports sys_siglist array. +#define ACE_HAS_SYS_SIGLIST + +/* Turn off the following four defines if you want to disable threading. */ +// Compile using multi-thread libraries. +#if !defined (ACE_MT_SAFE) +# define ACE_MT_SAFE 0 +#endif + +// Platform supports threads. +// #define ACE_HAS_THREADS + +// Platform supports POSIX pthreads *and* Solaris threads! +// #define ACE_HAS_STHREADS +// #define ACE_HAS_PTHREADS +#define ACE_HAS_SIGWAIT +// If ACE doesn't compile due to the lack of these methods, please +// send email to schmidt@cs.wustl.edu reporting this. +// #define ACE_LACKS_CONDATTR_PSHARED +// #define ACE_LACKS_MUTEXATTR_PSHARED + +// Compiler/platform has thread-specific storage +// +#define ACE_HAS_THREAD_SPECIFIC_STORAGE + +// 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 + +// 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 _USING_POSIX4A_DRAFT6 +#define _POSIX_SOURCE +#define _DGUX_SOURCE +// #define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION +#define ACE_HAS_UCONTEXT_T +#define ACE_HAS_NONCONST_GETBY +#define ACE_LACKS_MADVISE + +#if !defined (IP_ADD_MEMBERSHIP) +# define IP_ADD_MEMBERSHIP 0x13 +#endif + +#if !defined (IP_DROP_MEMBERSHIP) +# define IP_DROP_MEMBERSHIP 0x14 +#endif + +// Header files lack t_errno for ACE_TLI. +#define ACE_LACKS_T_ERRNO + +// Optimize ACE_Handle_Set for select(). +#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT +#define ACE_HAS_IDTYPE_T + +#include /**/ "ace/post.h" +#endif /* ACE_CONFIG_H */ diff --git a/ACE/ace/config-dgux-4.x-ghs.h b/ACE/ace/config-dgux-4.x-ghs.h new file mode 100644 index 00000000000..67b028c3bf4 --- /dev/null +++ b/ACE/ace/config-dgux-4.x-ghs.h @@ -0,0 +1,208 @@ +/* -*- C++ -*- */ +// $Id$ + +// The following configuration file is designed to work for DG/UX +// 4.x platforms using the Green Hills Multi C++ compiler. + +#ifndef ACE_CONFIG_H +#define ACE_CONFIG_H +#include /**/ "ace/pre.h" + +#define ACE_DGUX + +# define ACE_CONFIG_INCLUDE_GHS_COMMON +# include "ace/config-ghs-common.h" + +// Static objects do not get initialized correctly, so this is needed. +#define ACE_HAS_NONSTATIC_OBJECT_MANAGER + +// Platform requires (struct sockaddr *) for msg_name field of struct +// msghdr. +#define ACE_HAS_SOCKADDR_MSG_NAME + +// Platform lacks strcasecmp(). +#define ACE_LACKS_STRCASECMP + +// 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_SYSINFO + +// Platform supports the POSIX regular expression library. +#define ACE_HAS_REGEX + +// Platform supports recvmsg and sendmsg. +#define ACE_HAS_MSG + +// Platform supports reentrant functions (i.e., all the POSIX *_r functions). +//#define ACE_HAS_REENTRANT_FUNCTIONS + +// 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 has correctly prototyped header files. +#define ACE_HAS_CPLUSPLUS_HEADERS + +// Compiler/platform supports SunOS high resolution timers. +// #define ACE_HAS_HI_RES_TIMER + +// Platform supports IP multicast +#define ACE_HAS_IP_MULTICAST + +// Green Hills doesn't give a preprocessor symbol for long double +#define ACE_SIZEOF_LONG_DOUBLE 8 + +// 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 +#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 + +// 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 strerror (). +#define ACE_HAS_STRERROR + +// Compiler/platform supports struct strbuf. +#define ACE_HAS_STRBUF_T + +// Compiler/platform supports SVR4 dynamic linking semantics. +#define ACE_HAS_SVR4_DYNAMIC_LINKING +// ... but redefines the entrypoint names with a leading underscore +#define dlopen _dlopen +#define dlclose _dlclose +#define dlerror _dlerror +#define dlsym _dlsym +// ... and uses 'char *' rather than 'const char *' +#define ACE_HAS_CHARPTR_DL + +// DG/UX uses the same gettimeofday() prototype as OSF/1. +#define ACE_HAS_OSF1_GETTIMEOFDAY + +// Compiler/platform supports SVR4 signal typedef. +#define ACE_HAS_SVR4_SIGNAL_T + +// Compiler/platform supports SVR4 ACE_TLI (in particular, T_GETNAME stuff)... +#define ACE_HAS_SVR4_TLI + +// Compiler/platform supports sys_siglist array. +// On DG/UX this is only done if the /usr/include/sys/_int_dg_features.h +// file determines it should be turned on. It will take some work to +// figure out the magic options to turn it on reliably, so it'll have to +// be delayed for now. +//#define _TARGETTING_DGUXELF 1 +//#define _IX86_DG 1 +//#define _DGUX_TARGET 1 +//#define ACE_HAS_SYS_SIGLIST + +/* Turn off the following four 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 threads. +#define ACE_HAS_THREADS +#define ACE_HAS_PTHREADS +// DG/UX claims to implement draft 10 of the pthreads standard (which became +// (with editorial change only) the final standard. To get the behavior, some +// further macros need to be defined which are specific to DG/UX. +// _POSIX4A_DRAFT10_SOURCE turns on the draft 10 variant of threads. +// _POSIX4A_DRAFT_SOURCE turns on sched_yield(). +#define _POSIX4A_DRAFT10_SOURCE +#define ACE_HAS_PTHREADS_STD +#define _POSIX4_DRAFT_SOURCE +// Well, here are some from the standard they don't have... +#define ACE_LACKS_PTHREAD_THR_SIGSETMASK +#define ACE_HAS_SIGWAIT +#define ACE_LACKS_CONDATTR_PSHARED +#define ACE_LACKS_THREAD_PROCESS_SCOPING +// The default thread stacksize on DG/UX 4.x is 4096. This needs to be bumped +// up to do anything real in ACE. +#define ACE_NEEDS_HUGE_THREAD_STACKSIZE 65536 + +// Need to #include <sched.h> +#define ACE_NEEDS_SCHED_H + +// Compiler/platform has thread-specific storage +// +#define ACE_HAS_THREAD_SPECIFIC_STORAGE + +// 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 + +// Platform doesn't have read-write locks natively. +#define ACE_LACKS_RWLOCK_T + +// Platform doesn't have timespec_t data type. +#define ACE_LACKS_TIMESPEC_T + +// 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_TEMPLATES_REQUIRE_SOURCE + +#define ACE_HAS_UCONTEXT_T +#define ACE_HAS_NONCONST_GETBY +#define ACE_LACKS_MADVISE + +#if !defined (IP_ADD_MEMBERSHIP) +#define IP_ADD_MEMBERSHIP 0x13 +#endif + +#if !defined (IP_DROP_MEMBERSHIP) +# define IP_DROP_MEMBERSHIP 0x14 +#endif + +// Header files lack t_errno for ACE_TLI. +#define ACE_LACKS_T_ERRNO + +// Optimize ACE_Handle_Set for select(). +#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT + +#include /**/ "ace/post.h" +#endif /* ACE_CONFIG_H */ diff --git a/ACE/ace/config-freebsd.h b/ACE/ace/config-freebsd.h index 28c7744900e..6ed6e250bcc 100644 --- a/ACE/ace/config-freebsd.h +++ b/ACE/ace/config-freebsd.h @@ -225,7 +225,7 @@ extern "C" { char * cuserid (char *s); } #define ACE_HAS_SIGWAIT // Platform has POSIX terminal interface. -#define ACE_HAS_TERMIOS +#define ACE_HAS_TERMIOS #if (__FreeBSD_version > 400000) #define ACE_HAS_UCONTEXT_T @@ -234,6 +234,10 @@ extern "C" { char * cuserid (char *s); } #define ACE_HAS_PTHREADS_UNIX98_EXT #endif +#ifndef ACE_HAS_SNPRINTF +#define ACE_HAS_SNPRINTF +#endif + // Note, on FreeBSD 5, POSIX aio is now an optional kernel module which // must be loaded. // Read the aio(4) man page for what to do, otherwise any aio_* call @@ -258,21 +262,11 @@ typedef union sigval sigval_t; #define ACE_LACKS_WCSDUP #define ACE_LACKS_ITOW #define ACE_HAS_3_PARAM_WCSTOK -#define ACE_HAS_3_PARAM_READDIR_R #if (__FreeBSD_version >= 501000) # define ACE_HAS_PTHREAD_SETSTACK #endif -#if (__FreeBSD_version < 700007) -# define ACE_HAS_SIGVAL_SIGVAL_INT -#endif - -#if (__FreeBSD_version >= 700028) -# define ACE_HAS_SCTP -# define ACE_HAS_LKSCTP -#endif - #include /**/ "ace/post.h" #endif /* ACE_CONFIG_H */ diff --git a/ACE/ace/config-g++-common.h b/ACE/ace/config-g++-common.h index 83b9350b8e1..0886e0442a0 100644 --- a/ACE/ace/config-g++-common.h +++ b/ACE/ace/config-g++-common.h @@ -67,7 +67,7 @@ // Take advantage of G++ (>= 4.x) visibility attributes to generate // improved shared library binaries. -#if (__GNUC__ >= 4) +#if (__GNUC__ > 3) # if defined (ACE_HAS_CUSTOM_EXPORT_MACROS) && ACE_HAS_CUSTOM_EXPORT_MACROS == 0 # undef ACE_HAS_CUSTOM_EXPORT_MACROS @@ -78,24 +78,15 @@ # define ACE_Proper_Export_Flag __attribute__ ((visibility("default"))) # define ACE_Proper_Import_Flag -# if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) // Sadly, G++ 4.x silently ignores visibility attributes on // template instantiations, which breaks singletons. // As a workaround, we use the GCC visibility pragmas. // And to make them fit in a macro, we use C99's _Pragma() // http://gcc.gnu.org/bugzilla/show_bug.cgi?id=17470 -// This has been fixed in GCC 4.1.1 with FC6 but not with SuSE 10.2 -// that gets shipped with GCC 4.1.2 so we assume that with GCC 4.2 -// this will be fixed on the head. With FC6 just set this define yourself -# ifndef ACE_GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS -# define ACE_GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS 1 -# endif -# endif - -# if defined (ACE_GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS) && GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS == 1 +# if 0 /* ... replace if/when gcc bug 17470 is fixed */ # 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>; -# else /* ACE_GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS */ +# else /* ! GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS */ # define ACE_EXPORT_SINGLETON_DECLARATION(T) \ _Pragma ("GCC visibility push(default)") \ template class T \ @@ -104,15 +95,16 @@ _Pragma ("GCC visibility push(default)") \ template class SINGLETON_TYPE<CLASS, LOCK>; \ _Pragma ("GCC visibility pop") -# endif /* ACE_GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS */ +# endif /* ! GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS */ // Note that the "__extension__" is needed to prevent g++ from issuing // an error when using its "-pedantic" command line flag. # define ACE_IMPORT_SINGLETON_DECLARATION(T) __extension__ extern template class T # define ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) __extension__ extern template class SINGLETON_TYPE<CLASS, LOCK>; + # endif /* ACE_HAS_CUSTOM_EXPORT_MACROS == 0 */ -#endif /* __GNU__ >= 4 */ +#endif /* __GNU__ > 3 */ #if defined (ACE_HAS_GNU_REPO) // -frepo causes unresolved symbols of basic_string left- and diff --git a/ACE/ace/config-hpux-11.00.h b/ACE/ace/config-hpux-11.00.h index 4e60f220cf0..a06e7bb84d0 100644 --- a/ACE/ace/config-hpux-11.00.h +++ b/ACE/ace/config-hpux-11.00.h @@ -135,8 +135,17 @@ // Compiler supports template specialization. # define ACE_HAS_TEMPLATE_SPECIALIZATION +// Preprocessor needs some help with data types +# if defined (__LP64__) +# define ACE_SIZEOF_LONG 8 +# else +# define ACE_SIZEOF_LONG 4 +# endif + // Platform has XPG4 wide character support # define ACE_HAS_XPG4_MULTIBYTE_CHAR +# define ACE_HAS_WCHAR +# define ACE_SIZEOF_WCHAR _WCHAR_T # endif /* __cplusplus < 199707L */ @@ -166,6 +175,10 @@ #include /**/ <sys/stdsyms.h> +#if defined (_INCLUDE_HPUX_SOURCE) +# define ACE_HAS_SNPRINTF +#endif + // HP-UX is a POSIX-compliant system - see what's available. #include "ace/config-posix.h" @@ -200,13 +213,6 @@ # 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 @@ -411,9 +417,6 @@ # define ACE_HAS_3_PARAM_WCSTOK #endif -#define ACE_HAS_3_PARAM_READDIR_R - - ////////////////////////////////////////////////////////////////////////// // // STREAMS information diff --git a/ACE/ace/config-irix5.2.h b/ACE/ace/config-irix5.2.h new file mode 100644 index 00000000000..cdb1fb49bdd --- /dev/null +++ b/ACE/ace/config-irix5.2.h @@ -0,0 +1,67 @@ +/* -*- C++ -*- */ +// $Id$ + +// The following configuration file is designed to work for the SGI +// Indigo2EX running Irix 5.2 platform using the gcc v2.6.x compiler +// and libg++ v2.6.x. + +#ifndef ACE_CONFIG_H +#define ACE_CONFIG_H +#include /**/ "ace/pre.h" + +// Platform supports STREAM pipes (note that this is disabled by +// default, see the manual page on pipe(2) to find out how to enable +// it). +//#define ACE_HAS_STREAM_PIPES + +// Platform supports getpagesize() call. +#define ACE_HAS_GETPAGESIZE +// Optimize ACE_Handle_Set for select(). +#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT + +#define ACE_HAS_SIGWAIT + +// Platform supports System V IPC (most versions of UNIX, but not Win32) +#define ACE_HAS_SYSV_IPC + +// Platform requires void * for mmap(). +#define ACE_HAS_VOIDPTR_MMAP + +// Compiler/platform contains the <sys/syscall.h> file. +#define ACE_HAS_SYS_SYSCALL_H + +// Platform supports recvmsg and sendmsg. +#define ACE_HAS_MSG + +#define ACE_SIZEOF_LONG_DOUBLE 8 + +#define IRIX5 +// 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 +#define ACE_HAS_BSTRING +#define ACE_HAS_GETRUSAGE +#define ACE_HAS_POSIX_NONBLOCK +#define ACE_HAS_POSIX_TIME +#define ACE_HAS_CPLUSPLUS_HEADERS +#define ACE_HAS_POLL +#define ACE_HAS_PROC_FS +#define ACE_HAS_SIG_ATOMIC_T +#define ACE_HAS_SIGINFO_T +#define ACE_HAS_UCONTEXT_T +#define ACE_HAS_STREAMS +#define ACE_HAS_SSIZE_T +#define ACE_HAS_STRERROR +#define ACE_HAS_STRBUF_T +#define ACE_HAS_SVR4_DYNAMIC_LINKING +#define ACE_HAS_SVR4_SIGNAL_T +#define ACE_HAS_SYS_SIGLIST +#define ACE_HAS_SYS_FILIO_H +#define ACE_HAS_SEMUN +#define ACE_NEEDS_DEV_IO_CONVERSION + +#include /**/ "ace/post.h" +#endif /* ACE_CONFIG_H */ diff --git a/ACE/ace/config-irix5.3-g++.h b/ACE/ace/config-irix5.3-g++.h new file mode 100644 index 00000000000..c9f3cc99773 --- /dev/null +++ b/ACE/ace/config-irix5.3-g++.h @@ -0,0 +1,117 @@ +/* -*- C++ -*- */ +// $Id$ + +// The following configuration file is designed to work for the SGI +// Indigo2EX running Irix 5.3 platform using the GNU C++ Compiler + +#ifndef ACE_CONFIG_H +#define ACE_CONFIG_H +#include /**/ "ace/pre.h" + +// config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so +// this must appear before its #include. +#define ACE_HAS_STRING_CLASS + +#include "ace/config-g++-common.h" + +#define ACE_SIZEOF_LONG_DOUBLE 8 + +// Platform supports getpagesize() call. +#define ACE_HAS_GETPAGESIZE +#define IRIX5 +#define ACE_HAS_SIGWAIT +#define ACE_HAS_DIRENT + +// Optimize ACE_Handle_Set for select(). +#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT + +// Platform supports System V IPC (most versions of UNIX, but not Win32) +#define ACE_HAS_SYSV_IPC + +// Platform requires void * for mmap(). +#define ACE_HAS_VOIDPTR_MMAP + +// 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 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 + +// IRIX5 needs to define bzero() in this odd file <bstring.h> +#define ACE_HAS_BSTRING + +// Compiler/platform has the getrusage() system call. +#define ACE_HAS_GETRUSAGE + +// Denotes that GNU has cstring.h as standard +// which redefines memchr() +#define ACE_HAS_GNU_CSTRING_H + +// Platform supports POSIX O_NONBLOCK semantics. +#define ACE_HAS_POSIX_NONBLOCK + +// Platform supports POSIX timers via timestruc_t. +#define ACE_HAS_POSIX_TIME + +// Compiler/platform has correctly prototyped header files. +#define ACE_HAS_CPLUSPLUS_HEADERS + +// Platform contains <poll.h>. +#define ACE_HAS_POLL + +// Platform supports the /proc file system. +#define ACE_HAS_PROC_FS + +// 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 supports the ssize_t typedef. +#define ACE_HAS_SSIZE_T + +// Platform supports STREAMS. +#define ACE_HAS_STREAMS + +// Platform supports STREAM pipes (note that this is disabled by +// default, see the manual page on pipe(2) to find out how to enable +// it). +// #define ACE_HAS_STREAM_PIPES + +// Compiler/platform supports strerror (). +#define ACE_HAS_STRERROR + +// 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 signal typedef. +#define ACE_HAS_IRIX_53_SIGNALS + +// Compiler/platform supports sys_siglist array. +// #define ACE_HAS_SYS_SIGLIST + +// Platform provides <sys/filio.h> header. +#define ACE_HAS_SYS_FILIO_H + +// Compiler/platform defines a union semun for SysV shared memory. +#define ACE_HAS_SEMUN + +// Platform supports IP multicast +#define ACE_HAS_IP_MULTICAST + +#include /**/ "ace/post.h" +#endif /* ACE_CONFIG_H */ diff --git a/ACE/ace/config-irix5.3-sgic++.h b/ACE/ace/config-irix5.3-sgic++.h new file mode 100644 index 00000000000..b1a4e4cb13c --- /dev/null +++ b/ACE/ace/config-irix5.3-sgic++.h @@ -0,0 +1,120 @@ +/* -*- C++ -*- */ +// $Id$ + +// The following configuration file is designed to work +// for the SGI Indigo2EX running Irix 5.3 platform using +// the SGI C++ Compiler. + +#ifndef ACE_CONFIG_H +#define ACE_CONFIG_H +#include /**/ "ace/pre.h" + +#define IRIX5 + +#include <sys/bsd_types.h> +#define _BSD_TYPES + +#define ACE_SIZEOF_LONG_DOUBLE 8 + +#define ACE_LACKS_STDINT_H +// Optimize ACE_Handle_Set for select(). +#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT + +// Platform supports getpagesize() call. +#define ACE_HAS_GETPAGESIZE + +#define ACE_HAS_SIGWAIT + +// Platform supports System V IPC (most versions of UNIX, but not Win32) +#define ACE_HAS_SYSV_IPC + +// Platform requires void * for mmap(). +#define ACE_HAS_VOIDPTR_MMAP + +// 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 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 + +// IRIX5 needs to define bzero() in this odd file <bstring.h> +#define ACE_HAS_BSTRING + +// Compiler/platform has the getrusage() system call. +#define ACE_HAS_GETRUSAGE + +// Platform supports POSIX O_NONBLOCK semantics. +#define ACE_HAS_POSIX_NONBLOCK + +// Platform supports POSIX timers via timestruc_t. +#define ACE_HAS_POSIX_TIME + +// Compiler/platform has correctly prototyped header files. +#define ACE_HAS_CPLUSPLUS_HEADERS + +// Platform contains <poll.h>. +#define ACE_HAS_POLL + +// No multi-threading so use poll() call +// - for easier debugging, if nothing else +// #define ACE_USE_POLL + +// Platform supports the /proc file system. +// #define ACE_HAS_PROC_FS + +// 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 +#define ACE_LACKS_UCONTEXT_H + +// Compiler supports the ssize_t typedef. +#define ACE_HAS_SSIZE_T + +// Platform supports STREAMS. +#define ACE_HAS_STREAMS + +// Platform supports STREAM pipes (note that this is disabled by +// default, see the manual page on pipe(2) to find out how to enable +// it). +// #define ACE_HAS_STREAM_PIPES + +// Compiler/platform supports strerror (). +#define ACE_HAS_STRERROR + +// 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 signal typedef. +#define ACE_HAS_IRIX_53_SIGNALS + +// Compiler/platform supports sys_siglist array. +// #define ACE_HAS_SYS_SIGLIST + +// Platform provides <sys/filio.h> header. +#define ACE_HAS_SYS_FILIO_H + +// Compiler/platform defines a union semun for SysV shared memory. +#define ACE_HAS_SEMUN + +// Platform supports IP multicast +#define ACE_HAS_IP_MULTICAST + +#define ACE_NEEDS_DEV_IO_CONVERSION + +#include /**/ "ace/post.h" +#endif /* ACE_CONFIG_H */ diff --git a/ACE/ace/config-irix6.x-common.h b/ACE/ace/config-irix6.x-common.h index 82a419edd59..dc6350b6717 100644 --- a/ACE/ace/config-irix6.x-common.h +++ b/ACE/ace/config-irix6.x-common.h @@ -77,6 +77,9 @@ // Compiler/platform contains the <sys/syscall.h> file. #define ACE_HAS_SYS_SYSCALL_H +// Compiler/platform supports snprintf +#define ACE_HAS_SNPRINTF + // 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 @@ -101,6 +104,10 @@ // Platform contains <poll.h>. #define ACE_HAS_POLL +// No multi-threading so use poll() call +// - for easier debugging, if nothing else +// #define ACE_USE_POLL + // Platform supports the /proc file system. #define ACE_HAS_PROC_FS @@ -117,6 +124,11 @@ // Platform supports STREAMS. #define ACE_HAS_STREAMS +// Platform supports STREAM pipes (note that this is disabled by +// default, see the manual page on pipe(2) to find out how to enable +// it). +// #define ACE_HAS_STREAM_PIPES + // Compiler/platform supports strerror (). #define ACE_HAS_STRERROR diff --git a/ACE/ace/config-irix6.x-sgic++-nothreads.h b/ACE/ace/config-irix6.x-sgic++-nothreads.h new file mode 100644 index 00000000000..a2a0efb02ea --- /dev/null +++ b/ACE/ace/config-irix6.x-sgic++-nothreads.h @@ -0,0 +1,5 @@ +/* -*- C++ -*- */ +// $Id$ + +#error "Please use config-irix6.x-sgic++.h." +#error "Set threads=0 in your platform_macros.GNU to disable multi-threading." diff --git a/ACE/ace/config-linux-common.h b/ACE/ace/config-linux-common.h index 1a7c31a2246..95a7a07d8c0 100644 --- a/ACE/ace/config-linux-common.h +++ b/ACE/ace/config-linux-common.h @@ -43,11 +43,9 @@ // with shm_open/shm_unlink pairing in ACE which needs to be fixed when I have time. # if defined (ACE_HAS_SHM_OPEN) # undef ACE_HAS_SHM_OPEN -# endif /* ACE_HAS_SHM_OPEN */ +# endif -# if !defined (ACE_LACKS_LINUX_VERSION_H) -# include <linux/version.h> -# endif /* !ACE_LACKS_LINUX_VERSION_H */ +# include <linux/version.h> # if defined (ACE_USES_FIFO_SEM) // Don't use this for Linux NPTL since this has complete @@ -124,6 +122,16 @@ # define ACE_LACKS_STRTOK_R_PROTOTYPE // @note end of glibc 2.0 (0.961212-5)-specific configuration. +// These macros determined by reading <stdio.h> on RH 7.1 and glibc's +// <features.h>. +# if defined (_BSD_SOURCE) \ + || defined (_ISOC99_SOURCE) \ + || defined (_ISOC9X_SOURCE) \ + || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) \ + || (defined _XOPEN_SOURCE && (_XOPEN_SOURCE - 0) >= 500) +# define ACE_HAS_SNPRINTF +# endif + # if __GLIBC__ > 1 && __GLIBC_MINOR__ >= 1 // These were suggested by Robert Hanzlik <robi@codalan.cz> to get // ACE to compile on Linux using glibc 2.1 and libg++/gcc 2.8. @@ -237,7 +245,6 @@ #if __GLIBC__ >= 2 // glibc 2 and higher has wchar support # define ACE_HAS_XPG4_MULTIBYTE_CHAR -# define ACE_HAS_VFWPRINTF #endif #if __GLIBC__ < 2 @@ -254,8 +261,6 @@ # define ACE_HAS_3_PARAM_WCSTOK #endif -#define ACE_HAS_3_PARAM_READDIR_R - #if !defined (ACE_DEFAULT_BASE_ADDR) # define ACE_DEFAULT_BASE_ADDR ((char *) 0x80000000) #endif /* ! ACE_DEFAULT_BASE_ADDR */ @@ -390,20 +395,13 @@ #define ACE_HAS_VOIDPTR_MMAP -#if defined (ACE_LACKS_NETWORKING) -# include "ace/config-posix-nonetworking.h" -#else -# define ACE_HAS_NETLINK -# define ACE_HAS_GETIFADDRS -#endif +#define ACE_HAS_NETLINK #if !defined (ACE_GETNAME_RETURNS_RANDOM_SIN_ZERO) // Detect if getsockname() and getpeername() returns random values in // the sockaddr_in::sin_zero field by evaluation of the kernel // version. Since version 2.5.47 this problem is fixed. -# if !defined (ACE_LACKS_LINUX_VERSION_H) -# include <linux/version.h> -# endif /* !ACE_LACKS_LINUX_VERSION_H */ +#include <linux/version.h> # if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,47)) # define ACE_GETNAME_RETURNS_RANDOM_SIN_ZERO 0 # else diff --git a/ACE/ace/config-linux.h b/ACE/ace/config-linux.h index ee3ca24eeeb..402ef191e16 100644 --- a/ACE/ace/config-linux.h +++ b/ACE/ace/config-linux.h @@ -58,6 +58,10 @@ #endif /* ACE_MT_SAFE */ +// This is certainly true for newer distributions. I'm not sure how +// far back this goes. +#define ACE_HAS_GETIFADDRS + #include /**/ "ace/post.h" #endif /* ACE_CONFIG_LINUX_H */ diff --git a/ACE/ace/config-lite.h b/ACE/ace/config-lite.h index f8edd3b9192..e36f2c525a5 100644 --- a/ACE/ace/config-lite.h +++ b/ACE/ace/config-lite.h @@ -122,14 +122,12 @@ ACE_END_VERSIONED_NAMESPACE_DECL // 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 <= 0x580 \ - && !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. +#if defined (__SUNPRO_CC) && __SUNPRO_CC <= 0x580 + // We need to ensure that this is included in order to test + // _RWSTD_NO_CLASS_PARTIAL_SPEC below # include <Cstd/stdcomp.h> #endif /* __SUNPRO_CC <= 0x580 */ -#if defined (_MSC_VER) && (_MSC_VER < 1310) && !defined (_CPPLIB_VER) +#if defined (_MSC_VER) && !defined (_CPPLIB_VER) // MSVC++ 6 and the latest platform SDKs don't define a standard // compliant reverse_iterator adapter. // diff --git a/ACE/ace/config-lynxos.h b/ACE/ace/config-lynxos.h index 3d2ec76c8d5..739ecee49c8 100644 --- a/ACE/ace/config-lynxos.h +++ b/ACE/ace/config-lynxos.h @@ -54,6 +54,7 @@ #define ACE_HAS_MEMCHR #define ACE_HAS_MSG #define ACE_HAS_NONCONST_CLOCK_SETTIME +#define ACE_HAS_NONCONST_GETBY #define ACE_HAS_NONCONST_MSGSND #define ACE_HAS_NONCONST_READV #define ACE_HAS_NONCONST_SELECT_TIMEVAL @@ -78,24 +79,29 @@ #define ACE_HAS_TIMEZONE_GETTIMEOFDAY #define ACE_HAS_TYPENAME_KEYWORD #define ACE_LACKS_CONST_TIMESPEC_PTR +#define ACE_LACKS_GETOPT_PROTOTYPE #define ACE_LACKS_GETPGID +#define ACE_LACKS_INET_ATON_PROTOTYPE #define ACE_LACKS_MADVISE #define ACE_LACKS_MKSTEMP_PROTOTYPE #define ACE_LACKS_MKTEMP_PROTOTYPE #define ACE_LACKS_PUTENV_PROTOTYPE #define ACE_LACKS_REALPATH +#define ACE_LACKS_REGEX_H #define ACE_LACKS_RWLOCK_T #define ACE_LACKS_SCANDIR_PROTOTYPE #define ACE_LACKS_SETEGID #define ACE_LACKS_SETEUID #define ACE_LACKS_SIGINFO_H +#define ACE_LACKS_STRCASECMP_PROTOTYPE +#define ACE_LACKS_STRNCASECMP_PROTOTYPE #define ACE_LACKS_STRPTIME #define ACE_LACKS_SUSECONDS_T #define ACE_LACKS_SWAB_PROTOTYPE +#define ACE_LACKS_SYS_SELECT_H #define ACE_LACKS_TIMESPEC_T #define ACE_LACKS_UCONTEXT_H #define ACE_LACKS_USECONDS_T -#define ACE_LACKS_VSNPRINTF #define ACE_LACKS_WCHAR_H #define ACE_MALLOC_ALIGN 8 #define ACE_NEEDS_IPC_1C_H @@ -107,11 +113,9 @@ # define ACE_HAS_PTHREADS # define ACE_HAS_THREAD_SPECIFIC_STORAGE # define ACE_LACKS_NULL_PTHREAD_STATUS -# if ACE_LYNXOS_MAJOR == 4 && ACE_LYNXOS_MINOR == 0 -# define ACE_LACKS_SETDETACH -# define ACE_LACKS_THREAD_PROCESS_SCOPING -# define ACE_LACKS_THREAD_STACK_ADDR -# endif +# define ACE_LACKS_SETDETACH +# define ACE_LACKS_THREAD_PROCESS_SCOPING +# define ACE_LACKS_THREAD_STACK_ADDR #endif /* ACE_MT_SAFE */ #define ACE_POSIX_AIOCB_PROACTOR @@ -142,25 +146,5 @@ #define ALIGNBYTES (sizeof(int) - 1) #define ALIGN(p) (((unsigned)p + ALIGNBYTES) & ~ALIGNBYTES) -#if ACE_LYNXOS_MAJOR == 4 && ACE_LYNXOS_MINOR == 0 -# define ACE_LACKS_GETOPT_PROTOTYPE -# define ACE_LACKS_INET_ATON_PROTOTYPE -# define ACE_LACKS_REGEX_H -# define ACE_LACKS_STRCASECMP_PROTOTYPE -# define ACE_LACKS_STRNCASECMP_PROTOTYPE -# define ACE_LACKS_SYS_SELECT_H -# define ACE_HAS_NONCONST_GETBY -#endif - -#if (ACE_LYNXOS_MAJOR > 4) || (ACE_LYNXOS_MAJOR == 4 && ACE_LYNXOS_MINOR >= 2) -// LynxOS 4.2 additons -# define ACE_HAS_POSIX_SEM_TIMEOUT -# define ACE_HAS_MUTEX_TIMEOUTS -#endif - -#if defined (ACE_HAS_SVR4_DYNAMIC_LINKING) -# define ACE_HAS_BROKEN_THREAD_KEYFREE -#endif /* ACE_HAS_SVR4_DYNAMIC_LINKING */ - #include /**/ "ace/post.h" #endif /* ACE_CONFIG_H */ diff --git a/ACE/ace/config-m88k.h b/ACE/ace/config-m88k.h new file mode 100644 index 00000000000..8409f53cd3b --- /dev/null +++ b/ACE/ace/config-m88k.h @@ -0,0 +1,225 @@ +/* -*- C++ -*- */ +// $Id$ + +// The following configuration file is designed to work for Motorola +// 88k SVR4 platforms using pthreads from Florida State (ACE_HAS_FSU_PTHREADS). + +#ifndef ACE_CONFIG_H +#define ACE_CONFIG_H +#include /**/ "ace/pre.h" + +#if ! defined (__ACE_INLINE__) +# define __ACE_INLINE__ +#endif /* ! __ACE_INLINE__ */ + +#if defined (__GNUG__) +# include "ace/config-g++-common.h" + // This config file has not been tested with ACE_HAS_TEMPLATE_SPECIALIZATION. + // Maybe it will work? +# undef ACE_HAS_TEMPLATE_SPECIALIZATION +#endif /* __GNUG__ */ + +#if !defined (m88k) +#define m88k +#endif + +extern "C" void pthread_init(); + +#define PTHREAD_STACK_MIN 1024 + +// Optimize ACE_Handle_Set for select(). +#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT + +#if !defined (IP_ADD_MEMBERSHIP) +#define IP_ADD_MEMBERSHIP 0x13 +#endif /* m88k */ + +#if !defined (IP_DROP_MEMBERSHIP) +#define IP_DROP_MEMBERSHIP 0x14 +#endif /* m88k */ + +struct sched_param +{ + int sched_priority; + int prio; +}; + +// This seems to be necessary for m88k. +struct ip_mreq +{ + struct in_addr imr_multiaddr; // IP multicast address of the group + struct in_addr imr_interface; // local IP address of the interface +}; + +#if !defined (ACE_HAS_FSU_PTHREADS) +# define ACE_HAS_FSU_PTHREADS +#endif +#if !defined (ACE_HAS_PTHREADS_DRAFT6) +# define ACE_HAS_PTHREADS_DRAFT6 +#endif + +// Added for compilation on the m88k +#if defined (m88k) +# define ACE_LACKS_T_ERRNO +# define ACE_LACKS_MADVISE +# define ACE_HAS_GNU_CSTRING_H +#endif /* m88k */ + +// 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 + +// The SunOS 5.x version of rand_r is inconsistent with the header files... +#define ACE_HAS_BROKEN_RANDR + +// Platform supports system configuration information. +#define ACE_HAS_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 + +#if !defined (ACE_HAS_FSU_PTHREADS) +// Platform supports reentrant functions (i.e., all the POSIX *_r functions). +#define ACE_HAS_REENTRANT_FUNCTIONS +#endif /* ACE_HAS_FSU_PTHREADS */ + +// 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 has correctly prototyped header files. +#define ACE_HAS_CPLUSPLUS_HEADERS + +#if !defined (m88k) +// Compiler/platform supports SunOS high resolution timers. +# define ACE_HAS_HI_RES_TIMER +#endif /* m88k */ + +// 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 + +#if !defined (m88k) +// Compiler/platform has <alloca.h> +#define ACE_HAS_ALLOCA_H +#endif /* m88k */ + +// 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 + +#if !defined (m88k) +// Platform supports the prusage_t struct. +#define ACE_HAS_PRUSAGE_T +#endif /* m88k */ + +// 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 strerror (). +#define ACE_HAS_STRERROR + +// 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 + +// 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 + +#if !defined (m88k) +// Compiler/platform supports sys_siglist array. +#define ACE_HAS_SYS_SIGLIST +#endif /* m88k */ + +/* Turn off the following five defines if you want to disable threading. */ +// Compile using multi-thread libraries. +#if !defined (ACE_MT_SAFE) +# define ACE_MT_SAFE 1 +#endif + +#define ACE_HAS_PTHREADS +#define ACE_LACKS_RWLOCK_T + +// Platform supports threads. +#define ACE_HAS_THREADS + +#if defined (ACE_HAS_FSU_PTHREADS) +#define ACE_LACKS_THREAD_STACK_ADDR +#endif /* ACE_HAS_FSU_PTHREADS */ + +// Compiler/platform has thread-specific storage +#define ACE_HAS_THREAD_SPECIFIC_STORAGE + +// 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 + +// Use the poll() event demultiplexor rather than select(). +//#define ACE_USE_POLL + +// Defines the page size of the system. +#define ACE_PAGE_SIZE 4096 + +#include /**/ "ace/post.h" +#endif /* ACE_CONFIG_H */ diff --git a/ACE/ace/config-macosx-panther.h b/ACE/ace/config-macosx-panther.h index 840d6a8f28a..52d8778d2b1 100644 --- a/ACE/ace/config-macosx-panther.h +++ b/ACE/ace/config-macosx-panther.h @@ -111,6 +111,9 @@ #define ACE_HAS_IP_MULTICAST #define ACE_LACKS_PERFECT_MULTICAST_FILTERING 1 +//platform supports snprintf () +#define ACE_HAS_SNPRINTF + // Compiler/platform has the getrusage() system call. #define ACE_HAS_GETRUSAGE @@ -171,7 +174,6 @@ #define ACE_HAS_GETIFADDRS #define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES #define ACE_LACKS_UNNAMED_SEMAPHORE -#define ACE_LACKS_SIGVAL_T // dlcompat package (not part of base Darwin) is needed for dlopen(). // You may download directly from sourceforge and install or use fink diff --git a/ACE/ace/config-macosx-tiger.h b/ACE/ace/config-macosx-tiger.h index 4201ac8ddb6..4da967cd1a2 100644 --- a/ACE/ace/config-macosx-tiger.h +++ b/ACE/ace/config-macosx-tiger.h @@ -143,6 +143,9 @@ #define ACE_HAS_IP_MULTICAST #define ACE_LACKS_PERFECT_MULTICAST_FILTERING 1 +//platform supports snprintf () +#define ACE_HAS_SNPRINTF + // Compiler/platform has the getrusage() system call. #define ACE_HAS_GETRUSAGE @@ -206,7 +209,6 @@ #define ACE_HAS_GETIFADDRS #define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES #define ACE_LACKS_UNNAMED_SEMAPHORE -#define ACE_LACKS_SIGVAL_T // dlcompat package (not part of base Darwin) is needed for dlopen(). // You may download directly from sourceforge and install or use fink diff --git a/ACE/ace/config-macosx.h b/ACE/ace/config-macosx.h index 215894604c6..6cfaa1eec67 100644 --- a/ACE/ace/config-macosx.h +++ b/ACE/ace/config-macosx.h @@ -113,6 +113,9 @@ #define ACE_HAS_IP_MULTICAST #define ACE_LACKS_PERFECT_MULTICAST_FILTERING 1 +//platform supports snprintf () +#define ACE_HAS_SNPRINTF + // Compiler/platform has the getrusage() system call. #define ACE_HAS_GETRUSAGE @@ -171,7 +174,6 @@ #define ACE_HAS_GETIFADDRS #define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES #define ACE_LACKS_UNNAMED_SEMAPHORE -#define ACE_LACKS_SIGVAL_T // dlcompat package (not part of base Darwin) is needed for dlopen(). // You may download directly from sourceforge and install or use fink diff --git a/ACE/ace/config-mit-pthread.h b/ACE/ace/config-mit-pthread.h new file mode 100644 index 00000000000..afaf665c383 --- /dev/null +++ b/ACE/ace/config-mit-pthread.h @@ -0,0 +1,49 @@ +// $Id$ + +#ifndef ACE_CONFIG_MIT_PTHREAD_H +#define ACE_CONFIG_MIT_PTHREAD_H +#include /**/ "ace/pre.h" + +// Platform uses int for select() rather than fd_set. +#if !defined(ACE_HAS_SELECT_H) +#define ACE_HAS_SELECT_H +#endif + +// Threads +#define ACE_HAS_THREADS +#if !defined (ACE_MT_SAFE) + #define ACE_MT_SAFE 1 +#endif +#define ACE_HAS_THREAD_SPECIFIC_STORAGE +#define ACE_HAS_PTHREADS +#define ACE_HAS_PTHREADS_STD +#define ACE_LACKS_PTHREAD_CANCEL +#define ACE_HAS_SIGWAIT +#define ACE_LACKS_THREAD_PROCESS_SCOPING +//#define ACE_LACKS_THREAD_STACK_ADDR +// If ACE doesn't compile due to the lack of these methods, please +// send email to schmidt@cs.wustl.edu reporting this. +// #define ACE_LACKS_CONDATTR_PSHARED +// #define ACE_LACKS_MUTEXATTR_PSHARED +#define ACE_LACKS_RWLOCK_T +#define ACE_LACKS_SETSCHED + +#include <pthread.h> +#if defined(_M_UNIX) +#include <sys/regset.h> +#endif + +#define ACE_LACKS_TIMEDWAIT_PROTOTYPES +#define ACE_HAS_RECV_TIMEDWAIT +#define ACE_HAS_RECVFROM_TIMEDWAIT +#define ACE_HAS_RECVMSG_TIMEDWAIT +#define ACE_HAS_SEND_TIMEDWAIT +#define ACE_HAS_SENDTO_TIMEDWAIT +#define ACE_HAS_SENDMSG_TIMEDWAIT +#define ACE_HAS_READ_TIMEDWAIT +#define ACE_HAS_READV_TIMEDWAIT +#define ACE_HAS_WRITE_TIMEDWAIT +#define ACE_HAS_WRITEV_TIMEDWAIT + +#include /**/ "ace/post.h" +#endif /* ACE_CONFIG_MIT_PTHREAD_H */ diff --git a/ACE/ace/config-mklinux.h b/ACE/ace/config-mklinux.h new file mode 100644 index 00000000000..7487484f103 --- /dev/null +++ b/ACE/ace/config-mklinux.h @@ -0,0 +1,20 @@ +/* -*- C++ -*- */ +// $Id$ + +// The following configuration file is designed to work for MkLinux +// platforms using GNU C++. + +#ifndef ACE_CONFIG_H +#define ACE_CONFIG_H +#include /**/ "ace/pre.h" + +#include "ace/config-linux-common.h" + +#define ACE_HAS_SVR4_DYNAMIC_LINKING +#define ACE_HAS_AUTOMATIC_INIT_FINI + +#undef ACE_HAS_SOCKLEN_T +#define ACE_HAS_SIZET_SOCKET_LEN + +#include /**/ "ace/post.h" +#endif /* ACE_CONFIG_H */ diff --git a/ACE/ace/config-netbsd.h b/ACE/ace/config-netbsd.h index 931b473102e..c7508bba3bb 100644 --- a/ACE/ace/config-netbsd.h +++ b/ACE/ace/config-netbsd.h @@ -4,28 +4,12 @@ #ifndef ACE_CONFIG_H #define ACE_CONFIG_H -#ifndef ACE_MT_SAFE -#define ACE_MT_SAFE 1 -#endif - -#if defined(ACE_MT_SAFE) && (ACE_MT_SAFE != 0) -# define ACE_HAS_THREADS 1 -# define ACE_HAS_PTHREADS 1 -# define ACE_HAS_PTHREADS_STD 1 -# define ACE_HAS_PTHREADS_UNIX98_EXT 1 -# define ACE_HAS_PTHREAD_RESUME_NP 1 -# define ACE_HAS_PTHREAD_SUSPEND_NP 1 -# define ACE_LACKS_PTHREAD_THR_SIGSETMASK 1 -# define ACE_LACKS_PTHREAD_YIELD 1 -#endif /* ACE_MT_SAFE */ - #define ACE_HAS_CLOCK_SETTIME 1 #define ACE_HAS_CLOCK_GETTIME 1 #define ACE_HAS_SETTIMEOFDAY 1 #define ACE_HAS_GETTIMEOFDAY 1 #define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R 1 #define ACE_HAS_3_PARAM_WCSTOK 1 -#define ACE_HAS_3_PARAM_READDIR_R 1 #define ACE_HAS_4_4BSD_SENDMSG_RECVMSG 1 #define ACE_HAS_ALT_CUSERID 1 #define ACE_HAS_AUTOMATIC_INIT_FINI 1 @@ -52,6 +36,11 @@ #define ACE_HAS_POSITION_INDEPENDENT_POINTERS 1 #define ACE_HAS_POSIX_NONBLOCK 1 #define ACE_HAS_POSIX_TIME 1 +#define ACE_HAS_PTHREADS 1 +#define ACE_HAS_PTHREADS_STD 1 +#define ACE_HAS_PTHREADS_UNIX98_EXT 1 +#define ACE_HAS_PTHREAD_RESUME_NP 1 +#define ACE_HAS_PTHREAD_SUSPEND_NP 1 #define ACE_HAS_P_READ_WRITE 1 #define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS 1 #define ACE_HAS_REENTRANT_FUNCTIONS 1 @@ -65,6 +54,7 @@ #define ACE_HAS_SIG_C_FUNC 1 #define ACE_HAS_SOCKADDR_IN_SIN_LEN 1 #define ACE_HAS_SOCKADDR_IN6_SIN6_LEN 1 +#define ACE_HAS_SNPRINTF 1 #define ACE_HAS_SOCKADDR_MSG_NAME 1 #define ACE_HAS_SOCKLEN_T 1 #define ACE_HAS_SSIZE_T 1 @@ -85,6 +75,7 @@ #define ACE_HAS_TEMPLATE_SPECIALIZATION 1 #define ACE_HAS_TEMPLATE_TYPEDEFS 1 #define ACE_HAS_TERMIOS 1 +#define ACE_HAS_THREADS 1 #define ACE_HAS_THREAD_SPECIFIC_STORAGE 1 #define ACE_HAS_TIMEZONE 1 #define ACE_HAS_TIMEZONE_GETTIMEOFDAY 1 @@ -125,6 +116,7 @@ #define ACE_LACKS_WCSDUP 1 #define ACE_LACKS_WCSICMP 1 #define ACE_LACKS_WCSNICMP 1 +#define ACE_MT_SAFE 1 #define ACE_NEW_THROWS_EXCEPTIONS 1 #define ACE_SCANDIR_CMP_USES_CONST_VOIDPTR 1 #define ACE_TEMPLATES_REQUIRE_SOURCE 1 diff --git a/ACE/ace/config-openbsd.h b/ACE/ace/config-openbsd.h index ff7ca61e423..ff5de9d77dd 100644 --- a/ACE/ace/config-openbsd.h +++ b/ACE/ace/config-openbsd.h @@ -229,6 +229,8 @@ // bogus compiler syntax error. #define ACE_LACKS_CLEARERR +#define ACE_HAS_SNPRINTF + // OpenBSD 3.2 lacks sched_setscheduler (see /usr/src/lib/libc_r/TODO) #define ACE_LACKS_SETSCHED diff --git a/ACE/ace/config-openvms.h b/ACE/ace/config-openvms.h index 24eaceceb3c..39b488e49bf 100644 --- a/ACE/ace/config-openvms.h +++ b/ACE/ace/config-openvms.h @@ -84,6 +84,7 @@ #define ACE_LACKS_PWD_REENTRANT_FUNCTIONS 1 #define ACE_LACKS_RAND_REENTRANT_FUNCTIONS 1 +#define ACE_HAS_SNPRINTF 1 #define ACE_HAS_P_READ_WRITE #define ACE_HAS_CHARPTR_DL 1 #define ACE_HAS_CLOCK_GETTIME 1 diff --git a/ACE/ace/config-pharlap.h b/ACE/ace/config-pharlap.h index 739a424ce19..fa274e22383 100644 --- a/ACE/ace/config-pharlap.h +++ b/ACE/ace/config-pharlap.h @@ -21,7 +21,8 @@ #endif // Fortunately, PharLap ETS offers much of the Win32 API. But it's still on -// Winsock 1.1 +// WinNT 3.5, Winsock 1.1 +#define ACE_HAS_WINNT4 0 #define ACE_HAS_WINSOCK2 0 // The TSS implementation doesn't pass muster on the TSS_Test, but it works @@ -33,8 +34,6 @@ #define ACE_LACKS_MSYNC #define ACE_LACKS_TCP_NODELAY #define ACE_LACKS_MSG_WFMO -#define ACE_LACKS_WIN32_MOVEFILEEX -#define ACE_LACKS_WIN32_SECURITY_DESCRIPTORS // There's no host table, by default. So using "localhost" won't work. // If your system does have the ability to use "localhost" and you want to, @@ -48,9 +47,8 @@ #define ACE_PAGE_SIZE 4096 #if defined (ACE_HAS_PHARLAP_RT) -# define ACE_HAS_IP_MULTICAST // ETS winsock doesn't define IP level socket options -//# define IP_TOS 8 +# define IP_TOS 8 #endif /* ACE_HAS_PHARLAP_RT */ // Let the config-win32.h file do its thing diff --git a/ACE/ace/config-posix-nonetworking.h b/ACE/ace/config-posix-nonetworking.h deleted file mode 100644 index d87b20c340b..00000000000 --- a/ACE/ace/config-posix-nonetworking.h +++ /dev/null @@ -1,86 +0,0 @@ -/* -*- C -*- */ -// $Id$ - -/* The following configuration file is designed to work for RTEMS - platforms using GNU C. -*/ - -#ifndef ACE_CONFIG_POSIX_NONETWORKING_H -#define ACE_CONFIG_POSIX_NONETWORKING_H - -// Missing header files -# define ACE_LACKS_SYS_UIO_H -# define ACE_LACKS_SYS_SOCKET_H -# define ACE_LACKS_NETINET_IN_H -# define ACE_LACKS_NETDB_H -# define ACE_LACKS_ARPA_INET_H -# define ACE_LACKS_SYS_SELECT_H -# define ACE_LACKS_NET_IF_H -# define ACE_LACKS_SYSLOG_H -# define ACE_LACKS_SYS_UN_H -# define ACE_LACKS_MEMORY_H -# define ACE_LACKS_SYS_SYSCTL_H -# define ACE_LACKS_NETINET_TCP_H - -// Missing types -# define ACE_LACKS_IOVEC -# define ACE_LACKS_IN_ADDR -# define ACE_LACKS_SOCKADDR_IN -# define ACE_LACKS_SOCKADDR_UN -# define ACE_LACKS_HOSTENT -# define ACE_LACKS_SOCKADDR -# define ACE_LACKS_IP_MREQ -# define ACE_LACKS_PROTOENT -# define ACE_LACKS_SERVENT -# define ACE_LACKS_IFREQ -# define ACE_LACKS_IFCONF -# define ACE_LACKS_LINGER - -// Missing methods -# define ACE_LACKS_GETHOSTBYADDR -# define ACE_LACKS_GETHOSTBYNAME -# define ACE_LACKS_GETIPNODEBYADDR -# define ACE_LACKS_LISTEN -# define ACE_LACKS_BIND -# define ACE_LACKS_NTOHL -# define ACE_LACKS_HTONL -# define ACE_LACKS_HTONS -# define ACE_LACKS_NTOHS -# define ACE_LACKS_SELECT -# define ACE_LACKS_SOCKET -# define ACE_LACKS_SHUTDOWN -# define ACE_LACKS_SETSOCKOPT -# define ACE_LACKS_INET_ATON -# define ACE_LACKS_INET_ADDR -# define ACE_LACKS_INET_NTOA -# define ACE_LACKS_GET_BCAST_ADDR -# define ACE_LACKS_GETHOSTENT -# define ACE_LACKS_GETSERVBYNAME -# define ACE_LACKS_ACCEPT -# define ACE_LACKS_CONNECT -# define ACE_LACKS_GETPEERNAME -# define ACE_LACKS_GETSOCKNAME -# define ACE_LACKS_GETSOCKOPT -# define ACE_LACKS_RECV -# define ACE_LACKS_SEND -# define ACE_LACKS_SENDTO -# define ACE_LACKS_RECVFROM -# define ACE_LACKS_RECVMSG -# define ACE_LACKS_SENDMSG -# define ACE_LACKS_GETHOSTBYADDR_R -# define ACE_LACKS_GETPROTOBYNAME -# define ACE_LACKS_GETPROTOBYNUMBER -# define ACE_LACKS_GETSERVBYNAME -# define ACE_LACKS_READV -# define ACE_LACKS_WRITEV -# define ACE_LACKS_SOCKETPAIR -# undef ACE_HAS_MSG - -// Missing OS features -# define ACE_LACKS_UNIX_SYSLOG -# define ACE_LACKS_TCP_NODELAY - -// Missing ACE features -# define ACE_DISABLE_NOTIFY_PIPE_DEFAULT 1 - -#endif /* ACE_CONFIG_POSIX_NONETWORKING_H */ diff --git a/ACE/ace/config-posix.h b/ACE/ace/config-posix.h index dc1f0091ab5..42656c9989e 100644 --- a/ACE/ace/config-posix.h +++ b/ACE/ace/config-posix.h @@ -49,18 +49,17 @@ # undef ACE_HAS_THREADS # else # if defined(_POSIX_THREADS) && (_POSIX_THREADS-0 != -1 ) -# if !defined(ACE_HAS_THREADS) -# define ACE_HAS_THREADS -# endif /* ACE_HAS_THREADS */ +# if !defined(ACE_HAS_THREADS) +# define ACE_HAS_THREADS +# endif /* ACE_HAS_THREADS */ -# if !defined(ACE_HAS_PTHREADS) -# define ACE_HAS_PTHREADS -# endif /* ACE_HAS_PTHREADS */ - -# if !defined(ACE_HAS_PTHREADS_STD) -# define ACE_HAS_PTHREADS_STD -# endif /* ACE_HAS_PTHREADS_STD */ +# if !defined(ACE_HAS_PTHREADS) +# define ACE_HAS_PTHREADS +# endif /* ACE_HAS_PTHREADS */ +# if !defined(ACE_HAS_PTHREADS_STD) +# define ACE_HAS_PTHREADS_STD +# endif /* ACE_HAS_PTHREADS_STD */ # endif /* _POSIX_THREADS */ # endif /* ACE_HAS_THREADS */ #endif /* !ACE_MT_SAFE */ @@ -71,4 +70,8 @@ # endif /* ACE_HAS_POSIX_MESSAGE_PASSING */ #endif /* _POSIX_MESSAGE_PASSING */ +#if (defined _XOPEN_SOURCE && (_XOPEN_SOURCE - 0) >= 500) +# define ACE_HAS_SNPRINTF +#endif /* _XOPEN_SOURCE */ + #endif /* ACE_CONFIG_POSIX_H */ diff --git a/ACE/ace/config-qnx-neutrino.h b/ACE/ace/config-qnx-neutrino.h index d8fedf532fe..32549c1aa87 100644 --- a/ACE/ace/config-qnx-neutrino.h +++ b/ACE/ace/config-qnx-neutrino.h @@ -15,6 +15,13 @@ #define _POSIX_NAME_MAX 14 /* Max bytes in a filename */ #define _POSIX_PATH_MAX 256 /* Num. bytes in pathname (excl. NULL) */ +// gcc can do inline +#if __GNUC__ > 2 || ( __GNUC__ == 2 && __GNUC_MINOR__ >= 8) +# if !defined (__ACE_INLINE__) +# define __ACE_INLINE__ +# endif /* ! __ACE_INLINE__ */ +#endif + #if defined(__OPTIMIZE__) # if defined(__X86__) // string.h can't be used by ACE with __OPTIMIZE__. @@ -64,7 +71,6 @@ #define ACE_HAS_MT_SAFE_MKTIME #define ACE_HAS_MUTEX_TIMEOUTS #define ACE_HAS_NONCONST_SELECT_TIMEVAL -#define ACE_HAS_NONCONST_SWAB #define ACE_HAS_POSIX_SEM #define ACE_HAS_POSIX_TIME #define ACE_HAS_PTHREADS @@ -78,6 +84,7 @@ #define ACE_HAS_SIG_ATOMIC_T #define ACE_HAS_SIG_MACROS #define ACE_HAS_SOCKADDR_IN_SIN_LEN +#define ACE_HAS_SIZET_SOCKET_LEN #define ACE_HAS_SSIZE_T #define ACE_HAS_STRERROR #define ACE_HAS_STRINGS @@ -92,9 +99,9 @@ #define ACE_HAS_UCONTEXT_T #define ACE_HAS_VOIDPTR_MMAP #define ACE_HAS_VOIDPTR_SOCKOPT +#define ACE_LACKS_CMSG_DATA_MEMBER #define ACE_LACKS_CONDATTR_PSHARED #define ACE_LACKS_CONST_TIMESPEC_PTR -#define ACE_LACKS_CUSERID #define ACE_LACKS_FORK #define ACE_LACKS_LINEBUFFERED_STREAMBUF #define ACE_LACKS_MADVISE @@ -102,19 +109,17 @@ #define ACE_LACKS_NAMED_POSIX_SEM #define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS #define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS -#define ACE_LACKS_POLL_H #define ACE_LACKS_PTHREAD_THR_SIGSETMASK +#define ACE_LACKS_RTTI #define ACE_LACKS_RWLOCK_T #define ACE_LACKS_SBRK #define ACE_LACKS_SEEKDIR #define ACE_LACKS_SOCKET_BUFSIZ #define ACE_LACKS_SOCKETPAIR -#define ACE_LACKS_STROPTS_H #define ACE_LACKS_STREAM_MODULES #define ACE_LACKS_STRRECVFD #define ACE_LACKS_SYSCALL #define ACE_LACKS_SYS_MSG_H -#define ACE_LACKS_SYS_SHM_H #define ACE_LACKS_SYSV_SHMEM #define ACE_LACKS_TCP_NODELAY #define ACE_LACKS_TELLDIR diff --git a/ACE/ace/config-qnx-rtp-62x.h b/ACE/ace/config-qnx-rtp-62x.h index a8f5b35ec92..a54bc100225 100644 --- a/ACE/ace/config-qnx-rtp-62x.h +++ b/ACE/ace/config-qnx-rtp-62x.h @@ -52,6 +52,7 @@ #define ACE_HAS_SIG_ATOMIC_T #define ACE_HAS_SIG_MACROS #define ACE_HAS_SOCKADDR_IN_SIN_LEN +#define ACE_HAS_SNPRINTF #define ACE_HAS_SOCKLEN_T #define ACE_HAS_SSIZE_T #define ACE_HAS_STRERROR @@ -74,6 +75,7 @@ // // ACE_LACKS Section ///////////////////////////////////////////////////////////////// +#define ACE_LACKS_CMSG_DATA_MEMBER #define ACE_LACKS_CONST_TIMESPEC_PTR #define ACE_LACKS_LINEBUFFERED_STREAMBUF #define ACE_LACKS_MADVISE diff --git a/ACE/ace/config-qnx-rtp-pre62x.h b/ACE/ace/config-qnx-rtp-pre62x.h index c1ba745d664..46734ef8670 100644 --- a/ACE/ace/config-qnx-rtp-pre62x.h +++ b/ACE/ace/config-qnx-rtp-pre62x.h @@ -73,6 +73,7 @@ // // ACE_LACKS Section ///////////////////////////////////////////////////////////////// +#define ACE_LACKS_CMSG_DATA_MEMBER #define ACE_LACKS_CONDATTR_PSHARED #define ACE_LACKS_CONST_TIMESPEC_PTR #define ACE_LACKS_LINEBUFFERED_STREAMBUF diff --git a/ACE/ace/config-rtems.h b/ACE/ace/config-rtems.h index e2bf828b966..9379c2ffc19 100644 --- a/ACE/ace/config-rtems.h +++ b/ACE/ace/config-rtems.h @@ -33,12 +33,14 @@ # endif /* __cplusplus */ #endif /* ! __GNUG__ && ! __KCC */ -#include "ace/config-posix.h" - // Completely common part :-) #define ACE_HAS_NONSTATIC_OBJECT_MANAGER +#if !defined (ACE_MAIN) +# define ACE_MAIN ace_main +#endif /* ! ACE_MAIN */ + #define ACE_LACKS_REGEX_H #define ACE_LACKS_STROPTS_H #define ACE_LACKS_DLFCN_H @@ -54,11 +56,13 @@ #define ACE_HAS_NONCONST_SELECT_TIMEVAL #define ACE_LACKS_STRCASECMP #define ACE_LACKS_MKSTEMP +#define ACE_LACKS_PUTENV #define ACE_LACKS_STRDUP #define ACE_LACKS_STRTOK_R #define ACE_LACKS_RAND_REENTRANT_FUNCTIONS #define ACE_LACKS_REALPATH #define ACE_LACKS_TEMPNAM +#define ACE_LACKS_INTPTR_T // Temporarily, enabling this results in compile errors with // rtems 4.6.6. @@ -71,15 +75,12 @@ // ... and the final standard even! #define ACE_HAS_PTHREADS_STD #define ACE_HAS_THREAD_SPECIFIC_STORAGE -#define ACE_HAS_PTHREAD_SCHEDPARAM -#define ACE_LACKS_THREAD_PROCESS_SCOPING // XXX thread defines go here #define ACE_MT_SAFE 1 #define ACE_PAGE_SIZE 4096 #define ACE_HAS_ALT_CUSERID #define ACE_HAS_4_4BSD_SENDMSG_RECVMSG -#define ACE_HAS_3_PARAM_READDIR_R #define ACE_HAS_CLOCK_GETTIME #define ACE_HAS_CLOCK_SETTIME #define ACE_HAS_DIRENT @@ -87,7 +88,6 @@ #define ACE_HAS_MEMCHR #define ACE_HAS_MSG #define ACE_HAS_MT_SAFE_MKTIME -#define ACE_HAS_NONCONST_READV #define ACE_HAS_POSIX_SEM #define ACE_HAS_POSIX_TIME #define ACE_HAS_REENTRANT_FUNCTIONS @@ -106,6 +106,7 @@ #define ACE_LACKS_GETPGID #define ACE_LACKS_TIMESPEC_T #define ACE_LACKS_MADVISE +#define ACE_LACKS_MKFIFO #define ACE_LACKS_MMAP #define ACE_LACKS_MPROTECT #define ACE_LACKS_MSYNC @@ -113,6 +114,7 @@ #define ACE_LACKS_PTHREAD_THR_SIGSETMASK #define ACE_LACKS_READDIR_R #define ACE_LACKS_READLINK +#define ACE_HAS_NONCONST_READV #define ACE_LACKS_READV #define ACE_LACKS_RLIMIT #define ACE_LACKS_RLIMIT_PROTOTYPE @@ -123,7 +125,6 @@ #define ACE_LACKS_SETREUID_PROTOTYPE #define ACE_LACKS_SETREGID #define ACE_LACKS_SETREGID_PROTOTYPE -#define ACE_LACKS_SIGVAL_T #define ACE_LACKS_STRPTIME #define ACE_LACKS_STRRECVFD #define ACE_LACKS_SI_ADDR @@ -137,26 +138,76 @@ #define ACE_NEEDS_HUGE_THREAD_STACKSIZE 65536 #define ACE_NEEDS_SCHED_H #define ACE_HAS_POSIX_NONBLOCK +#define ACE_LACKS_FDOPEN #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_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 (ACE_LACKS_NETWORKING) -#if !defined (_POSIX_REALTIME_SIGNALS) -# define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES -#endif +// Missing header files +# define ACE_LACKS_SYS_UIO_H +# define ACE_LACKS_SYS_SOCKET_H +# define ACE_LACKS_NETINET_IN_H +# define ACE_LACKS_NETDB_H +# define ACE_LACKS_ARPA_INET_H +# define ACE_LACKS_SYS_SELECT_H +# define ACE_LACKS_NET_IF_H +# define ACE_LACKS_SYSLOG_H +# define ACE_LACKS_SYS_UN_H +# define ACE_LACKS_MEMORY_H +# define ACE_LACKS_SYS_SYSCTL_H +# define ACE_LACKS_NETINET_TCP_H + +// Missing types +# define ACE_LACKS_IOVEC +# define ACE_LACKS_IN_ADDR +# define ACE_LACKS_SOCKADDR_IN +# define ACE_LACKS_HOSTENT +# define ACE_LACKS_SOCKADDR +# define ACE_LACKS_IP_MREQ +# define ACE_LACKS_PROTOENT +# define ACE_LACKS_SERVENT +# define ACE_LACKS_IFREQ + +// Missing methods +# define ACE_LACKS_GETHOSTBYADDR +# define ACE_LACKS_GETHOSTBYNAME +# define ACE_LACKS_GETIPNODEBYADDR +# define ACE_LACKS_LISTEN +# define ACE_LACKS_BIND +# define ACE_LACKS_NTOHL +# define ACE_LACKS_HTONL +# define ACE_LACKS_HTONS +# define ACE_LACKS_NTOHS +# define ACE_LACKS_SELECT +# define ACE_LACKS_SOCKET +# define ACE_LACKS_SHUTDOWN +# define ACE_LACKS_SETSOCKOPT +# define ACE_LACKS_INET_ATON +# define ACE_LACKS_INET_ADDR +# define ACE_LACKS_INET_NTOA +# define ACE_LACKS_GET_BCAST_ADDR +# define ACE_LACKS_GETSERVBYNAME +# define ACE_LACKS_ACCEPT +# define ACE_LACKS_CONNECT +# define ACE_LACKS_GETPEERNAME +# define ACE_LACKS_GETSOCKNAME +# define ACE_LACKS_GETSOCKOPT +# define ACE_LACKS_RECV +# define ACE_LACKS_SEND +# define ACE_LACKS_SENDTO +# define ACE_LACKS_RECVFROM +# define ACE_LACKS_RECVMSG +# define ACE_LACKS_SENDMSG +# define ACE_LACKS_GETHOSTBYADDR_R +# define ACE_LACKS_GETPROTOBYNAME +# define ACE_LACKS_GETPROTOBYNUMBER +# define ACE_LACKS_GETSERVBYNAME +# undef ACE_HAS_MSG + +// Missing OS features +# define ACE_LACKS_UNIX_SYSLOG +# define ACE_LACKS_TCP_NODELAY -#if defined (ACE_LACKS_NETWORKING) -# include "ace/config-posix-nonetworking.h" #endif #endif /* ACE_CONFIG_H */ diff --git a/ACE/ace/config-sco-4.2-nothread.h b/ACE/ace/config-sco-4.2-nothread.h new file mode 100644 index 00000000000..67ff29a6333 --- /dev/null +++ b/ACE/ace/config-sco-4.2-nothread.h @@ -0,0 +1,110 @@ +/* -*- C++ -*- */ +// $Id$ + +// The following configuration file is designed to work for SCO UNIX +// version 4.2 without threads. + +#ifndef ACE_CONFIG_H +#define ACE_CONFIG_H +#include /**/ "ace/pre.h" + +#if defined (__GNUG__) +# include "ace/config-g++-common.h" + // This config file has not been tested with ACE_HAS_TEMPLATE_SPECIALIZATION. + // Maybe it will work? +# undef ACE_HAS_TEMPLATE_SPECIALIZATION +#endif /* __GNUG__ */ + +// Compiling for SCO. +#if !defined (SCO) +#define SCO +#endif /* SCO */ + +#if ! defined (__ACE_INLINE__) +#define __ACE_INLINE__ +#endif /* ! __ACE_INLINE__ */ + +// Optimize ACE_Handle_Set for select(). +#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT +#define ACE_DEFAULT_CLOSE_ALL_HANDLES 0 + +#if defined (SCO) && !defined (MAXPATHLEN) +#define MAXPATHLEN 1023 +#endif /* SCO */ + +#define ACE_HAS_SIG_MACROS +#define ACE_LACKS_UNIX_DOMAIN_SOCKETS +#define ACE_LACKS_SYSCALL +#define ACE_LACKS_STRRECVFD +#define ACE_LACKS_MMAP +#define ACE_LACKS_SOCKETPAIR +#define ACE_HAS_SEMUN +#define ACE_LACKS_MSYNC +#define ACE_LACKS_MADVISE +#define ACE_LACKS_WRITEV +#define ACE_LACKS_READV +#define ACE_NEEDS_FTRUNCATE +#define ACE_LACKS_RLIMIT +#define ACE_LACKS_RECVMSG +#define ACE_LACKS_SENDMSG + +// Platform supports System V IPC (most versions of UNIX, but not Win32) +#define ACE_HAS_SYSV_IPC + +// Platform supports recvmsg and sendmsg. +//#define ACE_HAS_MSG + +// Compiler/platform contains the <sys/syscall.h> file. +//#define ACE_HAS_SYS_SYSCALL_H + +// Fixes a problem with HP/UX not wrapping the mmap(2) header files +// with extern "C". +//#define ACE_HAS_BROKEN_MMAP_H + +// Prototypes for both signal() and struct sigaction are consistent. +#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES + +// Compiler/platform has correctly prototyped header files. +#define ACE_HAS_CPLUSPLUS_HEADERS + +// Header files lack t_errno for ACE_TLI. +//#define ACE_LACKS_T_ERRNO + +// Compiler/platform supports poll(). +#define ACE_HAS_POLL + +// Platform supports POSIX O_NONBLOCK semantics. +#define ACE_HAS_POSIX_NONBLOCK + +// Compiler/platform defines the sig_atomic_t typedef +#define ACE_HAS_SIG_ATOMIC_T + +// Compiler supports the ssize_t typedef. +//#define ACE_HAS_SSIZE_T + +// Defines the page size of the system. +#define ACE_PAGE_SIZE 4096 + +// Compiler/platform supports strerror (). +#define ACE_HAS_STRERROR + +// Platform/compiler supports void * as second parameter to gettimeofday(). +#define ACE_HAS_VOIDPTR_GETTIMEOFDAY + +// Note, this only works if the flag is set above! +//#define ACE_HAS_GETRUSAGE + +// Platform uses int for select() rather than fd_set. +#define ACE_SELECT_USES_INT + +// Platform has prototypes for ACE_TLI. +//#define ACE_HAS_TLI_PROTOTYPES +// Platform has the XLI version of ACE_TLI. +// #define ACE_HAS_XLI + +#define ACE_HAS_GNU_CSTRING_H + +#define ACE_HAS_DIRENT + +#include /**/ "ace/post.h" +#endif /* ACE_CONFIG_H */ diff --git a/ACE/ace/config-sco-5.0.0-fsu-pthread.h b/ACE/ace/config-sco-5.0.0-fsu-pthread.h new file mode 100644 index 00000000000..6d94c55d3a8 --- /dev/null +++ b/ACE/ace/config-sco-5.0.0-fsu-pthread.h @@ -0,0 +1,15 @@ +/* -*- C++ -*- */ +// $Id$ + +#ifndef ACE_CONFIG_H +#define ACE_CONFIG_H +#include /**/ "ace/pre.h" + +#include "ace/config-g++-common.h" +#include "ace/config-sco-5.0.0.h" +#include "ace/config-fsu-pthread.h" + +#define ACE_HAS_GNU_CSTRING_H + +#include /**/ "ace/post.h" +#endif /* ACE_CONFIG_H */ diff --git a/ACE/ace/config-sco-5.0.0-mit-pthread.h b/ACE/ace/config-sco-5.0.0-mit-pthread.h new file mode 100644 index 00000000000..bfc938a9213 --- /dev/null +++ b/ACE/ace/config-sco-5.0.0-mit-pthread.h @@ -0,0 +1,164 @@ +/* -*- C++ -*- */ +// $Id$ + +// The following configuration file is designed to work for SCO UNIX +// version 5.0 with MIT pthreads. + +#ifndef ACE_CONFIG_H +#define ACE_CONFIG_H +#include /**/ "ace/pre.h" + +#if !defined (__ACE_INLINE__) +#define __ACE_INLINE__ +#endif /* ! __ACE_INLINE__ */ + +#if defined (__GNUG__) +# include "ace/config-g++-common.h" + // This config file has not been tested with ACE_HAS_TEMPLATE_SPECIALIZATION. + // Maybe it will work? +# undef ACE_HAS_TEMPLATE_SPECIALIZATION +#endif /* __GNUG__ */ + +// Compiling for SCO. +#if !defined (SCO) +#define SCO +#define _SVID3 +#endif /* SCO */ + +#define ACE_DEFAULT_CLOSE_ALL_HANDLES 0 +#define ACE_HAS_SIG_MACROS +// Optimize ACE_Handle_Set for select(). +#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT + +#if defined (SCO) && !defined (MAXPATHLEN) +#define MAXPATHLEN 1023 +#endif /* SCO */ + +#define ACE_LACKS_PWD_FUNCTIONS +#define ACE_HAS_BIG_FD_SET + +//#define ACE_LACKS_SYSCALL +//#define ACE_LACKS_STRRECVFD +//#define ACE_NEEDS_FTRUNCATE +#define ACE_LACKS_RLIMIT +#define ACE_LACKS_MADVISE + +#define ACE_HAS_REENTRANT_FUNCTIONS + +// Platform supports System V IPC (most versions of UNIX, but not Win32) +#define ACE_HAS_SYSV_IPC +#define ACE_HAS_NONCONST_MSGSND +#define ACE_HAS_SVR4_DYNAMIC_LINKING +#define ACE_HAS_AUTOMATIC_INIT_FINI + +// Platform has POSIX terminal interface. +#define ACE_HAS_TERMIOS + +// Platform supports recvmsg and sendmsg. +#define ACE_HAS_MSG + +// Compiler/platform contains the <sys/syscall.h> file. +//#define ACE_HAS_SYS_SYSCALL_H + +// Fixes a problem with HP/UX not wrapping the mmap(2) header files +// with extern "C". +//#define ACE_HAS_BROKEN_MMAP_H + +// Prototypes for both signal() and struct sigaction are consistent. +#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES + +// Compiler/platform has correctly prototyped header files. +#define ACE_HAS_CPLUSPLUS_HEADERS + +// Header files lack t_errno for ACE_TLI. +//#define ACE_LACKS_T_ERRNO + +// Compiler/platform supports poll(). +// #define ACE_HAS_POLL + +// Platform supports POSIX O_NONBLOCK semantics. +#define ACE_HAS_POSIX_NONBLOCK + +// Compiler/platform defines the sig_atomic_t typedef +#define ACE_HAS_SIG_ATOMIC_T + +// Compiler supports the ssize_t typedef. +//#define ACE_HAS_SSIZE_T + +// Defines the page size of the system. +#define ACE_PAGE_SIZE 4096 + +// Compiler/platform supports strerror (). +#define ACE_HAS_STRERROR + +// ??? +// #define ACE_HAS_VOIDPTR_GETTIMEOFDAY +#define ACE_HAS_TIMEZONE_GETTIMEOFDAY + +// Note, this only works if the flag is set above! +//#define ACE_HAS_GETRUSAGE + +// Platform uses int for select() rather than fd_set. +#define ACE_HAS_SELECT_H + +// Platform has prototypes for ACE_TLI. +#define ACE_HAS_TLI +//#define ACE_HAS_SVR4_TLI +#define ACE_HAS_TLI_PROTOTYPES +#define ACE_HAS_TIMOD_H +#define ACE_HAS_TIUSER_H +#define ACE_LACKS_T_ERRNO + +// Platform has the XLI version of ACE_TLI. +// #define ACE_HAS_XLI + +#define ACE_HAS_GNU_CSTRING_H + +#define ACE_HAS_SIGINFO_T +#define ACE_HAS_UCONTEXT_T + +#define ACE_HAS_INLINED_OSCALLS + +#define ACE_HAS_STRBUF_T +#define ACE_HAS_STREAMS +//#define ACE_HAS_STREAM_PIPES +#define ACE_HAS_IP_MULTICAST + +// Threads +#define ACE_HAS_THREADS +#if !defined (ACE_MT_SAFE) +# define ACE_MT_SAFE 1 +#endif +#define ACE_HAS_THREAD_SPECIFIC_STORAGE +#define ACE_HAS_PTHREADS +#define ACE_HAS_PTHREADS_STD +#define ACE_LACKS_PTHREAD_CANCEL +#define ACE_HAS_SIGWAIT +#define ACE_LACKS_THREAD_PROCESS_SCOPING +//#define ACE_LACKS_THREAD_STACK_ADDR +// If ACE doesn't compile due to the lack of these methods, please +// send email to schmidt@cs.wustl.edu reporting this. +// #define ACE_LACKS_CONDATTR_PSHARED +// #define ACE_LACKS_MUTEXATTR_PSHARED +#define ACE_LACKS_RWLOCK_T +#define ACE_LACKS_SETSCHED +#define ACE_HAS_POSIX_TIME + +#include <pthread.h> +#include <sys/regset.h> + +#define ACE_LACKS_TIMEDWAIT_PROTOTYPES +#define ACE_HAS_RECV_TIMEDWAIT +#define ACE_HAS_RECVFROM_TIMEDWAIT +#define ACE_HAS_RECVMSG_TIMEDWAIT +#define ACE_HAS_SEND_TIMEDWAIT +#define ACE_HAS_SENDTO_TIMEDWAIT +#define ACE_HAS_SENDMSG_TIMEDWAIT +#define ACE_HAS_READ_TIMEDWAIT +#define ACE_HAS_READV_TIMEDWAIT +#define ACE_HAS_WRITE_TIMEDWAIT +#define ACE_HAS_WRITEV_TIMEDWAIT +#define ACE_HAS_DIRENT + +#include /**/ "ace/post.h" +#endif /* ACE_CONFIG_H */ diff --git a/ACE/ace/config-sunos5.4-centerline-2.x.h b/ACE/ace/config-sunos5.4-centerline-2.x.h new file mode 100644 index 00000000000..2aa9e407c43 --- /dev/null +++ b/ACE/ace/config-sunos5.4-centerline-2.x.h @@ -0,0 +1,157 @@ +/* -*- C++ -*- */ +// $Id$ + +// The following configuration file is designed to work for SunOS 5.4 +// platforms using the Centerline 2.x C++ compiler. + +#ifndef ACE_CONFIG_H +#define ACE_CONFIG_H +#include /**/ "ace/pre.h" + +#define ACE_HAS_TEMPLATE_SPECIALIZATION + +// Platform supports pread() and pwrite() +#define ACE_HAS_P_READ_WRITE + +#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT + +#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 + +// The SunOS 5.x version of rand_r is inconsistent with the header files... +#define ACE_HAS_BROKEN_RANDR + +// Platform supports system configuration information. +#define ACE_HAS_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 has correctly prototyped header files. +#define ACE_HAS_CPLUSPLUS_HEADERS + +// Compiler/platform supports SunOS high resolution timers. +#define ACE_HAS_HI_RES_TIMER + +// Platform supports IP multicast +#define ACE_HAS_IP_MULTICAST + +// 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 strerror (). +#define ACE_HAS_STRERROR + +// 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 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 + +// Compiler/platform supports sys_siglist array. +#define ACE_HAS_SYS_SIGLIST + +/* 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 threads. +#define ACE_HAS_THREADS + +// Platform supports Solaris threads. +#define ACE_HAS_STHREADS + +// 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 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_NEEDS_DEV_IO_CONVERSION + +// Defines the page size of the system. +#define ACE_PAGE_SIZE 4096 +#define ACE_HAS_IDTYPE_T +#define ACE_HAS_DIRENT + +#include /**/ "ace/post.h" +#endif /* ACE_CONFIG_H */ diff --git a/ACE/ace/config-sunos5.4-g++.h b/ACE/ace/config-sunos5.4-g++.h index cb431bf7520..8530ebdecde 100644 --- a/ACE/ace/config-sunos5.4-g++.h +++ b/ACE/ace/config-sunos5.4-g++.h @@ -15,7 +15,6 @@ // config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so // this must appear before its #include. #define ACE_HAS_STRING_CLASS -#define ACE_LACKS_SIGVAL_T #include "ace/config-g++-common.h" #define ACE_HAS_GNU_CSTRING_H @@ -28,7 +27,7 @@ #define ACE_HAS_XPG4_MULTIBYTE_CHAR // Platform has POSIX terminal interface. -#define ACE_HAS_TERMIOS +#define ACE_HAS_TERMIOS // Platform supports System V IPC (most versions of UNIX, but not Win32) #define ACE_HAS_SYSV_IPC diff --git a/ACE/ace/config-sunos5.4-sunc++-4.x.h b/ACE/ace/config-sunos5.4-sunc++-4.x.h index bb8e4a17a76..882307aab64 100644 --- a/ACE/ace/config-sunos5.4-sunc++-4.x.h +++ b/ACE/ace/config-sunos5.4-sunc++-4.x.h @@ -12,7 +12,6 @@ # define __ACE_INLINE__ #endif /* ! __ACE_INLINE__ */ -#define ACE_LACKS_SIGVAL_T #define ACE_HAS_TEMPLATE_SPECIALIZATION // Optimize ACE_Handle_Set for select(). diff --git a/ACE/ace/config-sunos5.5.h b/ACE/ace/config-sunos5.5.h index 5fe33487e16..3323074f951 100644 --- a/ACE/ace/config-sunos5.5.h +++ b/ACE/ace/config-sunos5.5.h @@ -384,9 +384,9 @@ # endif /* __GNUC_MINOR__ */ #endif /* __GNUG__ */ -#if defined (i386) && (_FILE_OFFSET_BITS==32) +#if defined (i386) # define ACE_HAS_X86_STAT_MACROS -#endif /* i386 && _FILE_OFFSET_BITS==32 */ +#endif /* i386 */ #define ACE_MALLOC_ALIGN 8 #define ACE_LACKS_SETREUID_PROTOTYPE @@ -402,12 +402,5 @@ #undef ACE_HAS_PROC_FS #undef ACE_HAS_PRUSAGE_T #endif /* (_LARGEFILE_SOURCE) || (_FILE_OFFSET_BITS==64) */ - -#if defined (_POSIX_PTHREAD_SEMANTICS) || (_FILE_OFFSET_BITS == 64) || (_POSIX_C_SOURCE - 0 >= 199506L) -# define ACE_HAS_3_PARAM_READDIR_R -#endif - -#define ACE_LACKS_SIGVAL_T - #include /**/ "ace/post.h" #endif /* ACE_CONFIG_H */ diff --git a/ACE/ace/config-sunos5.7.h b/ACE/ace/config-sunos5.7.h index 239fba2d8c9..5e8b21a6469 100644 --- a/ACE/ace/config-sunos5.7.h +++ b/ACE/ace/config-sunos5.7.h @@ -69,6 +69,11 @@ // SunOS 5.7 has socklen_t #define ACE_HAS_SOCKLEN_T +// snprintf() is available at least from Solaris 7 on. If it can be determined +// that it's also available in Solaris 2.6, this can be moved into +// config-sunos5.6.h. +#define ACE_HAS_SNPRINTF + #if defined (__sparcv9) #define _LP64 #define ACE_SIZEOF_LONG 8 /* Needed to circumvent compiler bug #4294969 */ diff --git a/ACE/ace/config-sunos5.8.h b/ACE/ace/config-sunos5.8.h index 1d9df968710..fdaa9c3bbe2 100644 --- a/ACE/ace/config-sunos5.8.h +++ b/ACE/ace/config-sunos5.8.h @@ -16,7 +16,6 @@ // This may be true for earlier Solaris versions, but I can only verify it // for Solaris 8 and later. #define ACE_HAS_VFWPRINTF -#define ACE_SHM_OPEN_REQUIRES_ONE_SLASH // This may be true for versions prior to Solaris 8 as well, but I don't // have any to try it on. diff --git a/ACE/ace/config-sunos5.9.h b/ACE/ace/config-sunos5.9.h index 42043928fec..fd2cdd82acb 100644 --- a/ACE/ace/config-sunos5.9.h +++ b/ACE/ace/config-sunos5.9.h @@ -13,6 +13,5 @@ #include "ace/config-sunos5.8.h" #define ACE_HAS_SENDFILE -#define ACE_LACKS_THR_CONCURRENCY_FUNCS #endif /* ACE_CONFIG_H */ diff --git a/ACE/ace/config-tandem-nsk-mips-v2.h b/ACE/ace/config-tandem-nsk-mips-v2.h index 102092a9ea5..cba5b7b8148 100644 --- a/ACE/ace/config-tandem-nsk-mips-v2.h +++ b/ACE/ace/config-tandem-nsk-mips-v2.h @@ -109,6 +109,10 @@ typedef enum CMA_T_SCHED_POLICY { // Platform supports recvmsg and sendmsg #define ACE_HAS_MSG +// Platform has ACE_HAS_4_4BSD_SENDMSG_RECVMSG but its cmsghdr +// structure does not contain an 'unsigned char cmsg_data[0]' member. +#define ACE_LACKS_CMSG_DATA_MEMBER + // Platform defines ACE_HAS_MSG, but lacks msg_accrights{,len}. #define ACE_LACKS_MSG_ACCRIGHTS diff --git a/ACE/ace/config-tandem-nsk-mips-v3.h b/ACE/ace/config-tandem-nsk-mips-v3.h index f975a979561..bd3500e0d5f 100644 --- a/ACE/ace/config-tandem-nsk-mips-v3.h +++ b/ACE/ace/config-tandem-nsk-mips-v3.h @@ -110,6 +110,10 @@ typedef enum CMA_T_SCHED_POLICY { // Platform supports recvmsg and sendmsg #define ACE_HAS_MSG +// Platform has ACE_HAS_4_4BSD_SENDMSG_RECVMSG but its cmsghdr +// structure does not contain an 'unsigned char cmsg_data[0]' member. +#define ACE_LACKS_CMSG_DATA_MEMBER + // Platform defines ACE_HAS_MSG, but lacks msg_accrights{,len}. #define ACE_LACKS_MSG_ACCRIGHTS diff --git a/ACE/ace/config-tru64.h b/ACE/ace/config-tru64.h index d34d7e0f68a..d0e6556bd23 100644 --- a/ACE/ace/config-tru64.h +++ b/ACE/ace/config-tru64.h @@ -23,7 +23,8 @@ #define ACE_LACKS_CLEARERR #endif /* ACE_MT_SAFE == 0 */ -#include "ace/config-posix.h" +// Include unistd.h to define _POSIX_C_SOURCE. +#include <unistd.h> // Configuration-specific #defines: // 1) g++ or cxx @@ -168,6 +169,9 @@ #define ACE_HAS_NONSTATIC_OBJECT_MANAGER #if DIGITAL_UNIX >= 0x500 +# ifndef ACE_HAS_SNPRINTF +# define ACE_HAS_SNPRINTF +# endif /* ACE_HAS_SNPRINTF */ # define ACE_HAS_XPG4_MULTIBYTE_CHAR 1 #endif /* DIGITAL_UNIX >= 0x500 */ diff --git a/ACE/ace/config-unixware-7.1.0.udk.h b/ACE/ace/config-unixware-7.1.0.udk.h index 33f4205fb04..549db4416dd 100644 --- a/ACE/ace/config-unixware-7.1.0.udk.h +++ b/ACE/ace/config-unixware-7.1.0.udk.h @@ -199,9 +199,24 @@ /* Platform supports POSIX Threads */ #define ACE_HAS_PTHREADS +/* Platform supports POSIX Threads .4a Draft 4 */ +/* #undef ACE_HAS_PTHREADS_DRAFT4 */ + +/* Platform supports POSIX Threads .4a Draft 6 */ +/* #undef ACE_HAS_PTHREADS_DRAFT6 */ + +/* Platform supports POSIX Threads .1c Draft 7 */ +/* #undef ACE_HAS_PTHREADS_DRAFT7 */ + /* Platform supports POSIX.1c-1995 threads */ #define ACE_HAS_PTHREADS_STD +/* Platform has pthread_condattr_setkind_np(). */ +/* #undef ACE_HAS_PTHREAD_CONDATTR_SETKIND_NP */ + +/* Platform has pthread_mutexattr_setkind_np(). */ +/* #undef ACE_HAS_PTHREAD_MUTEXATTR_SETKIND_NP */ + /* pthread.h declares an enum with PTHREAD_PROCESS_PRIVATE and PTHREAD_PROCESS_SHARED values */ #define ACE_HAS_PTHREAD_PROCESS_ENUM @@ -394,6 +409,9 @@ /* Platform needs to #include <sched.h> to get thread scheduling defs. */ #define ACE_NEEDS_SCHED_H 1 +/* Turns off the LM_DEBUG and LM_ERROR logging macros... */ +/* #undef ACE_NLOGGING */ + /* The OS/platform supports the poll() event demultiplexor */ #define ACE_USE_POLL 1 diff --git a/ACE/ace/config-vxworks5.x.h b/ACE/ace/config-vxworks5.x.h index af1cedc425e..df5faa15189 100644 --- a/ACE/ace/config-vxworks5.x.h +++ b/ACE/ace/config-vxworks5.x.h @@ -194,7 +194,6 @@ #define ACE_LACKS_UTSNAME_T #define ACE_LACKS_UNAME #define ACE_LACKS_STRPTIME -#define ACE_LACKS_VSNPRINTF #define ACE_LACKS_WAIT #define ACE_LACKS_WAITPID #define ACE_LACKS_DUP2 @@ -246,7 +245,6 @@ #define ACE_LACKS_TERMIOS_H #define ACE_LACKS_POLL_H #define ACE_LACKS_WCTYPE_H -#define ACE_LACKS_SIGVAL_T // Not sure if these should always be defined. #define ACE_LACKS_SYS_UN_H diff --git a/ACE/ace/config-vxworks6.2.h b/ACE/ace/config-vxworks6.2.h index 36069489479..fa680b8c6e4 100644 --- a/ACE/ace/config-vxworks6.2.h +++ b/ACE/ace/config-vxworks6.2.h @@ -109,6 +109,7 @@ #define ACE_HAS_SIGINFO_T #define ACE_HAS_SIGWAIT #define ACE_HAS_SIG_ATOMIC_T +#define ACE_HAS_SNPRINTF #define ACE_HAS_STRERROR #define ACE_HAS_THREADS #define ACE_HAS_SYSCTL @@ -131,7 +132,6 @@ #define ACE_LACKS_MPROTECT #define ACE_LACKS_MSYNC #define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS -#define ACE_LACKS_SIGVAL_T #define ACE_LACKS_SYS_PARAM_H #define ACE_LACKS_PWD_FUNCTIONS #define ACE_LACKS_READDIR_R @@ -210,7 +210,6 @@ #define ACE_HAS_SETENV #define ACE_HAS_3_PARAM_WCSTOK #define ACE_HAS_WCHAR - #define ACE_HAS_VFWPRINTF #define ACE_SIZEOF_WCHAR 2 #else // We are building for kernel mode diff --git a/ACE/ace/config-vxworks6.3.h b/ACE/ace/config-vxworks6.3.h index 25a36d9bc44..0cd0d9fa800 100644 --- a/ACE/ace/config-vxworks6.3.h +++ b/ACE/ace/config-vxworks6.3.h @@ -2,7 +2,7 @@ // $Id$ // The following configuration file is designed to work for VxWorks -// 6.3 platforms using one of these compilers: +// 6.2 platforms using one of these compilers: // 1) The GNU g++ compiler that is shipped with VxWorks 6.3 #ifndef ACE_CONFIG_H @@ -49,6 +49,7 @@ #define ACE_HAS_4_4BSD_SENDMSG_RECVMSG #define ACE_HAS_NONCONST_GETBY #define ACE_HAS_NONCONST_SWAB +#define ACE_HAS_NONCONST_READV #define ACE_LACKS_UNIX_SYSLOG #define ACE_DEFAULT_MAX_SOCKET_BUFSIZ 32768 #define ACE_DEFAULT_THREAD_KEYS 16 @@ -73,6 +74,7 @@ #define ACE_HAS_SIGINFO_T #define ACE_HAS_SIGWAIT #define ACE_HAS_SIG_ATOMIC_T +#define ACE_HAS_SNPRINTF #define ACE_HAS_STRERROR #define ACE_HAS_THREADS #define ACE_HAS_SYSCTL @@ -103,7 +105,6 @@ #define ACE_LACKS_RWLOCK_T #define ACE_LACKS_SBRK #define ACE_LACKS_SEEKDIR -#define ACE_LACKS_SIGVAL_T #define ACE_LACKS_SEMBUF_T #define ACE_LACKS_SIGINFO_H #define ACE_LACKS_SI_ADDR @@ -123,6 +124,9 @@ #define ACE_THR_PRI_OTHER_DEF ACE_THR_PRI_FIFO_DEF #define ACE_HAS_SIGTIMEDWAIT #define ACE_HAS_SIGSUSPEND +#if !defined (ACE_VXWORKS_SPARE) +# define ACE_VXWORKS_SPARE spare4 +#endif /* ! ACE_VXWORKS_SPARE */ #define ACE_HAS_GETIFADDRS #define ACE_LACKS_SETEGID @@ -169,7 +173,6 @@ #define ACE_HAS_SETENV #define ACE_HAS_3_PARAM_WCSTOK #define ACE_HAS_WCHAR - #define ACE_HAS_VFWPRINTF #define ACE_SIZEOF_WCHAR 2 #define ACE_HAS_SHM_OPEN #define ACE_HAS_AIO_CALLS @@ -180,7 +183,6 @@ #else // We are building for kernel mode #define ACE_LACKS_SUSECONDS_T - #define ACE_LACKS_INTPTR_T #define ACE_LACKS_INTTYPES_H #define ACE_LACKS_STDINT_H #define ACE_LACKS_UNAME @@ -249,9 +251,6 @@ // Only when building for kernel mode we can use TSS emulation, in rtp mode // we can't use the WIND_TCB struct anymore # define ACE_HAS_TSS_EMULATION -# if !defined (ACE_VXWORKS_SPARE) -# define ACE_VXWORKS_SPARE spare4 -# endif /* ! ACE_VXWORKS_SPARE */ # endif // VxWorks has no recursive mutexes. This was set in the past but it doesn't // work with the pthread support, so only set it for the time being when pthread @@ -267,10 +266,10 @@ // Needed include to get all VxWorks CPU types #include "types/vxCpu.h" -#if defined (CPU) && (CPU == PENTIUM || CPU == PENTIUM2 || CPU == PENTIUM3 || CPU == PENTIUM4) - // If running an Intel Pentium the - // ACE_OS::gethrtime () can use the RDTSC instruction. - # define ACE_HAS_PENTIUM +#if (CPU == PENTIUM || CPU == PENTIUM2 || CPU == PENTIUM3 || CPU == PENTIUM4) +// If running an Intel Pentium the +// ACE_OS::gethrtime () can use the RDTSC instruction. +# define ACE_HAS_PENTIUM #endif // VxWorks defines the CPU define MAP, undef it to prevent problems with diff --git a/ACE/ace/config-vxworks6.4.h b/ACE/ace/config-vxworks6.4.h deleted file mode 100644 index fbc957b9b85..00000000000 --- a/ACE/ace/config-vxworks6.4.h +++ /dev/null @@ -1,312 +0,0 @@ -//* -*- C++ -*- */ -// $Id$ - -// The following configuration file is designed to work for VxWorks -// 6.4 platforms using one of these compilers: -// 1) The GNU g++ compiler that is shipped with VxWorks 6.4 - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include /**/ "ace/pre.h" - -#if ! defined (VXWORKS) -# define VXWORKS -#endif /* ! VXWORKS */ - -#if ! defined (ACE_VXWORKS) -# define ACE_VXWORKS 0x640 -#endif /* ! ACE_VXWORKS */ - -#if !defined (__RTP__) - // Fix for wrong typedef of time_t in kernel mode - #ifndef _TIME_T - #define _TIME_T - typedef long time_t; - #endif -#endif - - -#if ! defined (__ACE_INLINE__) -# define __ACE_INLINE__ -#endif /* ! __ACE_INLINE__ */ - -// Compiler-specific configuration. -#if defined (__GNUG__) -# include "ace/config-g++-common.h" - -# define ACE_LACKS_IOSTREAM_FX -# define ACE_LACKS_LINEBUFFERED_STREAMBUF - -# if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) - // GNU 3.3+ toolchain supports long long types but fails to define this so STL - // skips some definitions -# if !defined (_GLIBCPP_USE_LONG_LONG) -# define _GLIBCPP_USE_LONG_LONG -# endif -# endif /* (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) */ - -#elif defined (__DCC__) -# define ACE_HAS_STANDARD_CPP_LIBRARY 1 -# define ACE_TEMPLATES_REQUIRE_SOURCE -#else /* ! __GNUG__ && ! ghs && !__DCC__ */ -# ifdef __cplusplus /* Let it slide for C compilers. */ -# error unsupported compiler on VxWorks -# endif /* __cplusplus */ -#endif /* ! __GNUG__ && ! ghs */ - -// OS-specific configuration -#define ACE_HAS_4_4BSD_SENDMSG_RECVMSG -#define ACE_HAS_3_PARAM_READDIR_R -#define ACE_HAS_NONCONST_GETBY -#define ACE_HAS_NONCONST_SWAB -#define ACE_LACKS_UNIX_SYSLOG -#define ACE_DEFAULT_MAX_SOCKET_BUFSIZ 32768 -#define ACE_DEFAULT_THREAD_KEYS 16 -#define ACE_HAS_BROKEN_ACCEPT_ADDR -#define ACE_HAS_NONCONST_SENDMSG -#define ACE_HAS_NONCONST_WRITEV -#define ACE_HAS_CHARPTR_DL -#define ACE_HAS_CLOCK_GETTIME -#define ACE_HAS_CLOCK_SETTIME -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES -#define ACE_HAS_CPLUSPLUS_HEADERS -#define ACE_HAS_DIRENT -#define ACE_HAS_DLL 0 -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT -#define ACE_HAS_MSG -#define ACE_HAS_NONCONST_READV -#define ACE_HAS_NONCONST_SELECT_TIMEVAL -#define ACE_HAS_NONSTATIC_OBJECT_MANAGER -#define ACE_HAS_POSIX_NONBLOCK -#define ACE_HAS_POSIX_TIME -#define ACE_HAS_REENTRANT_FUNCTIONS -#define ACE_HAS_SIGINFO_T -#define ACE_HAS_SIGWAIT -#define ACE_HAS_SIG_ATOMIC_T -#define ACE_HAS_STRERROR -#define ACE_HAS_THREADS -#define ACE_HAS_SYSCTL -#define ACE_LACKS_EXEC -#define ACE_LACKS_RLIMIT -#define ACE_LACKS_FILELOCKS -#define ACE_LACKS_FORK -#define ACE_LACKS_GETHOSTENT -#define ACE_LACKS_GETSERVBYNAME -#define ACE_LACKS_GETPROTOBYNAME -#define ACE_LACKS_GETPROTOBYNUMBER -#define ACE_LACKS_GETIPNODEBYADDR -#define ACE_LACKS_GETIPNODEBYNAME_IPV6 -#define ACE_LACKS_LSTAT -#define ACE_LACKS_MADVISE -#define ACE_LACKS_MALLOC_H -#define ACE_LACKS_MEMORY_H -#define ACE_LACKS_MKFIFO -#define ACE_LACKS_MKSTEMP -#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS -#define ACE_LACKS_SYS_PARAM_H -#define ACE_LACKS_PWD_FUNCTIONS -#define ACE_LACKS_READLINK -#define ACE_LACKS_REALPATH -#define ACE_LACKS_PIPE -#define ACE_LACKS_RWLOCK_T -#define ACE_LACKS_SBRK -#define ACE_LACKS_SEEKDIR -#define ACE_LACKS_SEMBUF_T -#define ACE_LACKS_SIGINFO_H -#define ACE_LACKS_SIGVAL_T -#define ACE_LACKS_SI_ADDR -#define ACE_LACKS_SOCKETPAIR -#define ACE_LACKS_STRRECVFD -#define ACE_LACKS_SYSV_SHMEM -#define ACE_LACKS_TELLDIR -#define ACE_LACKS_TIMESPEC_T -#define ACE_LACKS_TRUNCATE -#define ACE_LACKS_UCONTEXT_H -#define ACE_LACKS_USECONDS_T -#define ACE_LACKS_UMASK -#define ACE_LACKS_STRPTIME -#define ACE_LACKS_MKTEMP -#define ACE_LACKS_TEMPNAM -#define ACE_PAGE_SIZE 4096 -#define ACE_THR_PRI_FIFO_DEF 101 -#define ACE_THR_PRI_OTHER_DEF ACE_THR_PRI_FIFO_DEF -#define ACE_HAS_SIGTIMEDWAIT -#define ACE_HAS_SIGSUSPEND -#define ACE_HAS_GETIFADDRS - -#define ACE_LACKS_SETEGID -#define ACE_LACKS_SETPGID -#define ACE_LACKS_SETREGID -#define ACE_LACKS_SETREUID -#define ACE_LACKS_SETSID -#define ACE_LACKS_SETUID -#define ACE_LACKS_SETEUID -#define ACE_LACKS_GETEUID -#define ACE_LACKS_GETUID -#define ACE_LACKS_GETPGID -#define ACE_LACKS_GETEGID -#define ACE_LACKS_GETGID -#define ACE_LACKS_SETGID - -#define ACE_LACKS_SYS_UIO_H -#define ACE_LACKS_SYS_IPC_H -#define ACE_LACKS_SYS_SEM_H -#define ACE_LACKS_STROPTS_H -#define ACE_LACKS_SYS_MSG_H -#define ACE_LACKS_PWD_H -#define ACE_LACKS_SYS_SHM_H -#define ACE_LACKS_TERMIOS_H -#define ACE_LACKS_POLL_H -#define ACE_LACKS_FCNTL - -// Some string things -#define ACE_LACKS_STRCASECMP -#define ACE_LACKS_ITOW -#define ACE_LACKS_WCSDUP -#define ACE_LACKS_WCSICMP -#define ACE_LACKS_WCSNICMP - -#define ACE_HAS_CHARPTR_SOCKOPT -#define ACE_LACKS_SYMLINKS - -#if defined __RTP__ - // We are building for RTP mode - #define ACE_HAS_SVR4_DYNAMIC_LINKING - #define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R - #define ACE_LACKS_REGEX_H - #define ACE_HAS_SETENV - #define ACE_HAS_3_PARAM_WCSTOK - #define ACE_HAS_WCHAR - #define ACE_HAS_VFWPRINTF - #define ACE_SIZEOF_WCHAR 2 - #define ACE_HAS_SHM_OPEN - #define ACE_HAS_AIO_CALLS - // VxWorks seems to either not define this or define as zero up till now - #if !defined (IOV_MAX) || (IOV_MAX == 0) - #define ACE_IOV_MAX 16 - #endif -#else - // We are building for kernel mode - #define ACE_LACKS_SUSECONDS_T - #define ACE_LACKS_INTPTR_T - #define ACE_LACKS_INTTYPES_H - #define ACE_LACKS_STDINT_H - #define ACE_LACKS_UNAME - #define ACE_LACKS_UTSNAME_T - #define ACE_LACKS_RAND_REENTRANT_FUNCTIONS - #define ACE_LACKS_DLFCN_H - #define ACE_LACKS_WAIT - #define ACE_LACKS_WAITPID - #define ACE_LACKS_SYS_TIME_H - #define ACE_LACKS_SYS_SELECT_H - #define ACE_LACKS_STRINGS_H - #define ACE_MKDIR_LACKS_MODE - #define ACE_HAS_SIZET_PTR_ASCTIME_R_AND_CTIME_R - #define ACE_LACKS_SEARCH_H - #define ACE_LACKS_SYSCONF - #define ACE_LACKS_GETPPID - #define ACE_LACKS_WCHAR_H - #define ACE_LACKS_WCTYPE_H - #define ACE_LACKS_WCSCAT - #define ACE_LACKS_WCSCHR - #define ACE_LACKS_WCSCMP - #define ACE_LACKS_WCSCPY - #define ACE_LACKS_WCSCSPN - #define ACE_LACKS_WCSLEN - #define ACE_LACKS_WCSNCAT - #define ACE_LACKS_WCSNCMP - #define ACE_LACKS_WCSNCPY - #define ACE_LACKS_WCSPBRK - #define ACE_LACKS_WCSRCHR - #define ACE_LACKS_WCSSPN - #define ACE_LACKS_WCSSTR - #define ACE_LACKS_WCSTOK - #define ACE_LACKS_TOWLOWER - #define ACE_LACKS_TOWUPPER - #define ACE_LACKS_WCSTOD - #define ACE_LACKS_WCSTOL - #define ACE_LACKS_WCSTOUL - #define ACE_LACKS_FGETWC - #define ACE_LACKS_FGETWS - #define ACE_LACKS_FPUTWS - #define ACE_HAS_IOCTL_INT_3_PARAM - #define ACE_LACKS_MMAP - #define ACE_LACKS_MSYNC - #define ACE_LACKS_MPROTECT - #if !defined (ACE_MAIN) - # define ACE_MAIN ace_main - #endif /* ! ACE_MAIN */ -#endif - -// It is possible to enable pthread support with VxWorks, when the user decides -// to use this, we need some more defines -#if defined ACE_HAS_PTHREADS -# define ACE_HAS_PTHREADS_STD -# define ACE_HAS_THREAD_SPECIFIC_STORAGE -# define ACE_HAS_POSIX_SEM -# define ACE_LACKS_MUTEXATTR_PSHARED -# define ACE_LACKS_CONDATTR_PSHARED -// Include this file, the sys/stat.h file shipped with VxWorks has old types -// and without this include we get a lot of compile errors. A TSR has been filed -// so that hopefully in the future we can zap this include -#include "types/vxTypesOld.h" -#else -# define ACE_LACKS_PTHREAD_H -# if !defined __RTP__ -// Only when building for kernel mode we can use TSS emulation, in rtp mode -// we can't use the WIND_TCB struct anymore -# define ACE_HAS_TSS_EMULATION -# if !defined (ACE_VXWORKS_SPARE) -# define ACE_VXWORKS_SPARE spare4 -# endif /* ! ACE_VXWORKS_SPARE */ -# endif -// VxWorks has no recursive mutexes. This was set in the past but it doesn't -// work with the pthread support, so only set it for the time being when pthread -// is disabled -# define ACE_HAS_RECURSIVE_MUTEXES -# define ACE_LACKS_COND_T -# define ACE_HAS_MUTEX_TIMEOUTS -#endif - -#if !defined (ACE_MT_SAFE) -# define ACE_MT_SAFE 1 -#endif - -// Needed include to get all VxWorks CPU types -#include "types/vxCpu.h" -#if defined __RTP__ - #if defined (_VX_CPU) && (_VX_CPU == _VX_PENTIUM || _VX_CPU == _VX_PENTIUM2 || _VX_CPU == _VX_PENTIUM3 || _VX_CPU == _VX_PENTIUM4) - // If running an Intel Pentium the - // ACE_OS::gethrtime () can use the RDTSC instruction. - # define ACE_HAS_PENTIUM - #endif -#else - #if defined (CPU) && (CPU == PENTIUM || CPU == PENTIUM2 || CPU == PENTIUM3 || CPU == PENTIUM4) - // If running an Intel Pentium the - // ACE_OS::gethrtime () can use the RDTSC instruction. - # define ACE_HAS_PENTIUM - #endif -#endif - -// VxWorks defines the CPU define MAP, undef it to prevent problems with -// application code -#if defined (MAP) -#undef MAP -#endif /* MAP */ - -#if !defined (ACE_NEEDS_HUGE_THREAD_STACKSIZE) -# define ACE_NEEDS_HUGE_THREAD_STACKSIZE 65536 -#endif /* ACE_NEEDS_HUGE_THREAD_STACKSIZE */ - -#if !defined (ACE_NTRACE) -# define ACE_NTRACE 1 -#endif /* ACE_NTRACE */ - -// By default, don't include RCS Id strings in object code. -#if !defined (ACE_USE_RCSID) -#define ACE_USE_RCSID 0 -#endif /* !ACE_USE_RCSID */ - -#include /**/ "ace/post.h" -#endif /* ACE_CONFIG_H */ - diff --git a/ACE/ace/config-win32-borland.h b/ACE/ace/config-win32-borland.h index 2646135e8a8..91b81ece8a1 100644 --- a/ACE/ace/config-win32-borland.h +++ b/ACE/ace/config-win32-borland.h @@ -110,10 +110,21 @@ # define ACE_LACKS_INLINE_ASSEMBLY #endif -#define ACE_WCSDUP_EQUIVALENT ::_wcsdup -#define ACE_STRCASECMP_EQUIVALENT ::stricmp -#define ACE_STRNCASECMP_EQUIVALENT ::strnicmp -#define ACE_HAS_ITOA 1 +#if (__BORLANDC__ >= 0x600) +# define ACE_LACKS_PTRDIFF_T +# define ACE_PTRDIFF_T_TYPE std::ptrdiff_t +# define ACE_HAS_DINKUM_STL +# undef ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS +# define ACE_STRCASECMP_EQUIVALENT std::strcasecmp +# define ACE_STRNCASECMP_EQUIVALENT std::strncasecmp +# define ACE_LACKS_WCSDUP +# define ACE_HAS_3_PARAM_WCSTOK +#else +# define ACE_WCSDUP_EQUIVALENT ::_wcsdup +# define ACE_STRCASECMP_EQUIVALENT ::stricmp +# define ACE_STRNCASECMP_EQUIVALENT ::strnicmp +# define ACE_HAS_ITOA 1 +#endif #include /**/ "ace/post.h" #endif /* ACE_CONFIG_WIN32_BORLAND_H */ diff --git a/ACE/ace/config-win32-common.h b/ACE/ace/config-win32-common.h index 7beabb8ded6..18ae219fe3d 100644 --- a/ACE/ace/config-win32-common.h +++ b/ACE/ace/config-win32-common.h @@ -37,8 +37,24 @@ # endif /* !_FILE_OFFSET_BITS */ #endif /* _WIN64 || WIN64 */ -#if !defined (_WIN32_WINNT) -# define _WIN32_WINNT 0x0400 +// Define this if you're running NT >= 4.0 (Win2K == NT 5). +// Setting applies to : building ACE +// Runtime restrictions: System must be Windows NT => 4.0 +#if !defined (ACE_HAS_WINNT4) +# define ACE_HAS_WINNT4 1 /* assuming Win NT 4.0 or greater */ +#endif + +#if (defined (ACE_HAS_WINNT4) && ACE_HAS_WINNT4 != 0) +# if !defined (_WIN32_WINNT) +# define _WIN32_WINNT 0x0400 +# endif +#else +// On Win9X, a shared address SHOULD be between the 2nd and 3rd Gb. +// Note this will not work for NT: The addresses above 2Gb are +// reserved for the system, so this one will fail. +# if !defined (ACE_DEFAULT_BASE_ADDR) +# define ACE_DEFAULT_BASE_ADDR ((char*) ((2048UL+512UL)*1024UL*1024UL)) +# endif #endif // If the invoking procedure turned off debugging by setting NDEBUG, then @@ -185,8 +201,14 @@ // probably don't want too big a value for ACE_IOV_MAX since it may // mostly go to waste or the size of the activation record may become // excessively large. + #if !defined (ACE_IOV_MAX) +#if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) # define ACE_IOV_MAX 64 +#else +// Win 95/98/me need a smaller value than WinNT versions of Windows. +# define ACE_IOV_MAX 16 +#endif /* #if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) */ #endif /* ACE_IOV_MAX */ #if !defined (ACE_HAS_WINCE) @@ -265,7 +287,9 @@ #define ACE_LACKS_WAIT #define ACE_LACKS_IOVEC +#define ACE_HAS_SNPRINTF #define ACE_HAS_VFWPRINTF +#define ACE_HAS_VSWPRINTF #define ACE_MKDIR_LACKS_MODE @@ -302,8 +326,10 @@ // Platform supports the /proc file system. //define ACE_HAS_PROC_FS +#if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) // Platform supports the rusage struct. #define ACE_HAS_GETRUSAGE +#endif /* (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) */ // Compiler/platform supports SVR4 signal typedef. //define ACE_HAS_SVR4_SIGNAL_T @@ -524,19 +550,20 @@ # define ACE_HAS_IP_MULTICAST #endif /* ACE_HAS_WINSOCK2 */ -#if !defined (ACE_HAS_WINCE) || defined (PPC) /* CE only on some CPUs */ -# define ACE_HAS_INTERLOCKED_EXCHANGEADD +#if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) || \ + defined (ACE_HAS_WINCE) /* WinCE 3 has these */ +# if !defined (ACE_HAS_WINCE) || defined (PPC) /* CE only on some CPUs */ +# define ACE_HAS_INTERLOCKED_EXCHANGEADD +# endif +# define ACE_HAS_WIN32_TRYLOCK #endif -#define ACE_HAS_WIN32_TRYLOCK -#if !defined (ACE_HAS_WINCE) && !defined (ACE_HAS_PHARLAP) +#if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) && !defined (ACE_USES_WINCE_SEMA_SIMULATION) # define ACE_HAS_SIGNAL_OBJECT_AND_WAIT // If CancelIO is undefined get the updated sp2-sdk from MS # define ACE_HAS_CANCEL_IO -# define ACE_HAS_WIN32_OVERLAPPED_IO -# define ACE_HAS_WIN32_NAMED_PIPES -#endif /* !defined (ACE_USES_WINCE_SEMA_SIMULATION) && !ACE_HAS_PHARLAP */ +#endif /* (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) && !defined (ACE_USES_WINCE_SEMA_SIMULATION) */ #if !defined (ACE_SEH_DEFAULT_EXCEPTION_HANDLING_ACTION) # define ACE_SEH_DEFAULT_EXCEPTION_HANDLING_ACTION EXCEPTION_CONTINUE_SEARCH @@ -550,15 +577,6 @@ # endif /* WINSOCK_VERSION */ #endif /* ACE_HAS_WINSOCK2_GQOS */ -// These are the defaults and can be overridden by a user's config.h -#if !defined (ACE_DEFAULT_FILE_PERMS) -# define ACE_DEFAULT_FILE_PERMS (FILE_SHARE_READ | FILE_SHARE_WRITE | \ - FILE_SHARE_DELETE) -// This alternate used to be used for pre-NT4 systems; may still be needed -// by knock-offs such as CE and Pharlap. -//# define ACE_DEFAULT_FILE_PERMS (FILE_SHARE_READ | FILE_SHARE_WRITE) -#endif /* !defined (ACE_DEFAULT_FILE_PERMS) */ - #define ACE_SIZEOF_WCHAR 2 #define ACE_HAS_MUTEX_TIMEOUTS #define ACE_LACKS_STRUCT_DIR diff --git a/ACE/ace/config-win32-interix.h b/ACE/ace/config-win32-interix.h index 954bc24cc45..53ace409799 100644 --- a/ACE/ace/config-win32-interix.h +++ b/ACE/ace/config-win32-interix.h @@ -53,6 +53,7 @@ #define ACE_SIZEOF_LONG_DOUBLE 12 #define ACE_PAGE_SIZE 4096 +#define ACE_HAS_SNPRINTF #define ACE_HAS_SYSV_IPC #define ACE_HAS_SVR4_SIGNAL_T #define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES diff --git a/ACE/ace/config-win32-mingw.h b/ACE/ace/config-win32-mingw.h index b9c59685622..50b78b4f4ef 100644 --- a/ACE/ace/config-win32-mingw.h +++ b/ACE/ace/config-win32-mingw.h @@ -88,6 +88,15 @@ # define ACE_HAS_PENTIUM #endif +#if !defined (ACE_HAS_WINNT4) +# if (defined (WINNT) && WINNT == 1) \ + || (defined (__WINNT__) && __WINNT__ == 1) +# define ACE_HAS_WINNT4 1 +# else +# define ACE_HAS_WINNT4 0 +# endif +#endif + #define ACE_INT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64d") #define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64u") diff --git a/ACE/ace/config-win32-msvc.h b/ACE/ace/config-win32-msvc.h index b6758dfa96f..9b85888b05b 100644 --- a/ACE/ace/config-win32-msvc.h +++ b/ACE/ace/config-win32-msvc.h @@ -65,22 +65,12 @@ # error This version of Microsoft Visual C++ is not supported. #endif -// MFC changes the behavior of operator new at all MSVC versions from 6 up -// by throwing a static CMemoryException* instead of std::bad_alloc -// (see ace/OS_Memory.h). This MFC exception object needs to be cleaned up -// by calling its Delete() method. +// MFC changes the behavior of operator new at all MSVC versions from 6 up, +// see ace/OS_Memory.h (throws a static CMemoryException* instead of std::bad_alloc) #if defined (ACE_HAS_MFC) && (ACE_HAS_MFC == 1) # if !defined (ACE_NEW_THROWS_EXCEPTIONS) # define ACE_NEW_THROWS_EXCEPTIONS # endif -# if defined (ACE_bad_alloc) -# undef ACE_bad_alloc -# endif -# define ACE_bad_alloc CMemoryException *e -# if defined (ACE_del_bad_alloc) -# undef ACE_del_bad_alloc -# endif -# define ACE_del_bad_alloc e->Delete(); #endif /* ACE_HAS_MFC && ACE_HAS_MFC==1 */ #if defined(ACE_MT_SAFE) && (ACE_MT_SAFE != 0) diff --git a/ACE/ace/os_include/net/os_if.h b/ACE/ace/os_include/net/os_if.h index c689e07ab7e..9c312425649 100644 --- a/ACE/ace/os_include/net/os_if.h +++ b/ACE/ace/os_include/net/os_if.h @@ -49,10 +49,6 @@ # endif /* HPUX && IOR */ #endif /* !ACE_LACKS_NET_IF_H */ -#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) -# include /**/ <ws2tcpip.h> -#endif /* ACE_HAS_WINSOCK2 */ - // Place all additions (especially function declarations) within extern "C" {} #ifdef __cplusplus extern "C" @@ -63,59 +59,6 @@ extern "C" struct ifafilt; #endif /* ACE_HAS_BROKEN_IF_HEADER */ -#if defined (ACE_LACKS_IFREQ) -struct ifreq { -#define IFNAMSIZ 16 - char ifr_name[IFNAMSIZ]; /* if name, e.g. "en0" */ - union { - struct sockaddr ifru_addr; - struct sockaddr ifru_dstaddr; - struct sockaddr ifru_broadaddr; - short ifru_flags; - int ifru_metric; - int ifru_mtu; - int ifru_phys; - int ifru_media; - caddr_t ifru_data; - int (*ifru_tap)(struct ifnet *, struct ether_header *, struct mbuf *); - } ifr_ifru; -#define ifr_addr ifr_ifru.ifru_addr /* address */ -#define ifr_dstaddr ifr_ifru.ifru_dstaddr /* other end of p-to-p link */ -#define ifr_broadaddr ifr_ifru.ifru_broadaddr /* broadcast address */ -#define ifr_flags ifr_ifru.ifru_flags /* flags */ -#define ifr_metric ifr_ifru.ifru_metric /* metric */ -#define ifr_mtu ifr_ifru.ifru_mtu /* mtu */ -#define ifr_phys ifr_ifru.ifru_phys /* physical wire */ -#define ifr_media ifr_ifru.ifru_media /* physical media */ -#define ifr_data ifr_ifru.ifru_data /* for use by interface */ -#define ifr_tap ifr_ifru.ifru_tap /* tap function */ -}; -#endif /* ACE_LACKS_IFREQ */ - -#if defined (ACE_LACKS_IFCONF) -struct ifconf { - int ifc_len; - union { - caddr_t ifcu_buf; - struct ifreq *ifcu_req; - } ifc_ifcu; -#define ifc_buf ifc_ifcu.ifcu_buf /* buffer address */ -#define ifc_req ifc_ifcu.ifcu_req /* array of structures returned */ - }; -#endif /* ACE_LACKS_IFCONF */ - -#if !defined (IFF_UP) -# define IFF_UP 0x1 -#endif /* IFF_UP */ - -#if !defined (IFF_LOOPBACK) -# define IFF_LOOPBACK 0x8 -#endif /* IFF_LOOPBACK */ - -#if !defined (IFF_BROADCAST) -# define IFF_BROADCAST 0x2 -#endif /* IFF_BROADCAST */ - #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/ACE/ace/os_include/netinet/os_in.h b/ACE/ace/os_include/netinet/os_in.h index f8af16f84fb..9b43db20e0a 100644 --- a/ACE/ace/os_include/netinet/os_in.h +++ b/ACE/ace/os_include/netinet/os_in.h @@ -85,14 +85,6 @@ extern "C" }; # endif /* ACE_LACKS_SOCKADDR_IN */ -# if defined (ACE_LACKS_SOCKADDR_UN) - struct sockaddr_un { - u_char sun_len; /* sockaddr len including null */ - u_char sun_family; /* AF_UNIX */ - char sun_path[104]; /* path name (gag) */ - }; -#endif /* ACE_LACKS_SOCKADDR_UN */ - # if defined (ACE_LACKS_IP_MREQ) struct ip_mreq { @@ -169,10 +161,6 @@ extern "C" # define IPPROTO_IP 0 # endif /* IPPROTO_IP */ -# if !defined (IPPROTO_TCP) -# define IPPROTO_TCP 6 -# endif /* IPPROTO_TCP */ - # if !defined (INADDR_ANY) # define INADDR_ANY (u_long)0x00000000 # endif /* INADDR_ANY */ diff --git a/ACE/ace/os_include/netinet/os_tcp.h b/ACE/ace/os_include/netinet/os_tcp.h index e0d6c4124d6..45fa48657e2 100644 --- a/ACE/ace/os_include/netinet/os_tcp.h +++ b/ACE/ace/os_include/netinet/os_tcp.h @@ -34,10 +34,6 @@ extern "C" { #endif /* __cplusplus */ -# if !defined (TCP_NODELAY) -# define TCP_NODELAY 0x01 -# endif /* TCP_NODELAY */ - #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/ACE/ace/os_include/os_errno.h b/ACE/ace/os_include/os_errno.h index 6d2656dba16..9c9be161384 100644 --- a/ACE/ace/os_include/os_errno.h +++ b/ACE/ace/os_include/os_errno.h @@ -141,10 +141,6 @@ extern int t_errno; # define EBUSY ETIME #endif /* EBUSY */ -#if !defined (ECANCELED) -# define ECANCELED 125 -#endif /* ECANCELED */ - #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/ACE/ace/os_include/os_limits.h b/ACE/ace/os_include/os_limits.h index ea66cdefd93..17dba75622a 100644 --- a/ACE/ace/os_include/os_limits.h +++ b/ACE/ace/os_include/os_limits.h @@ -102,11 +102,11 @@ extern "C" # define ACE_IOV_MAX IOV_MAX #endif /* ACE_IOV_MAX */ -#if defined (ACE_VXWORKS) && ((ACE_VXWORKS == 0x620) || (ACE_VXWORKS == 0x630) || (ACE_VXWORKS == 0x640)) && !defined (__RTP__) +#if defined (ACE_VXWORKS) && (ACE_VXWORKS == 0x620) # if defined (PIPE_BUF) && (PIPE_BUF == -1) # undef PIPE_BUF # endif -#endif /* ACE_VXWORKS */ +#endif /* ACE_VXWORKS == 0x620 */ #if !defined (PIPE_BUF) # define PIPE_BUF 5120 diff --git a/ACE/ace/os_include/os_signal.h b/ACE/ace/os_include/os_signal.h index c1a4511041c..8266d4b365f 100644 --- a/ACE/ace/os_include/os_signal.h +++ b/ACE/ace/os_include/os_signal.h @@ -157,8 +157,12 @@ 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) +#elif defined (ACE_HAS_RTEMS) +# define ACE_NSIG (SIGRTMAX) +#elif defined(__BORLANDC__) && (__BORLANDC__ >= 0x600) +# define ACE_NSIG _NSIG #else // All other platforms set NSIG to one greater than the // highest-numbered signal. @@ -167,15 +171,37 @@ extern "C" #if defined (ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES) // Prototypes for both signal() and struct sigaction are consistent.. + //# if defined (ACE_HAS_SIG_C_FUNC) + // extern "C" { + //# endif /* ACE_HAS_SIG_C_FUNC */ typedef void (*ACE_SignalHandler)(int); typedef void (*ACE_SignalHandlerV)(int); -#elif defined (ACE_HAS_LYNXOS_SIGNALS) || defined (ACE_HAS_TANDEM_SIGNALS) + //# if defined (ACE_HAS_SIG_C_FUNC) + // } + //# endif /* ACE_HAS_SIG_C_FUNC */ +#elif defined (ACE_HAS_LYNXOS_SIGNALS) + typedef void (*ACE_SignalHandler)(...); + typedef void (*ACE_SignalHandlerV)(...); +#elif defined (ACE_HAS_TANDEM_SIGNALS) + typedef void (*ACE_SignalHandler)(...); + typedef void (*ACE_SignalHandlerV)(...); +#elif defined (ACE_HAS_IRIX_53_SIGNALS) + typedef void (*ACE_SignalHandler)(...); + typedef void (*ACE_SignalHandlerV)(...); +#elif defined (ACE_HAS_SPARCWORKS_401_SIGNALS) + typedef void (*ACE_SignalHandler)(int, ...); + typedef void (*ACE_SignalHandlerV)(int,...); +#elif defined (ACE_HAS_SUNOS4_SIGNAL_T) typedef void (*ACE_SignalHandler)(...); typedef void (*ACE_SignalHandlerV)(...); #elif defined (ACE_HAS_SVR4_SIGNAL_T) // SVR4 Signals are inconsistent (e.g., see struct sigaction).. typedef void (*ACE_SignalHandler)(int); - typedef void (*ACE_SignalHandlerV)(void); +# if !defined (m88k) /* with SVR4_SIGNAL_T */ + typedef void (*ACE_SignalHandlerV)(void); +# else + typedef void (*ACE_SignalHandlerV)(int); +# endif /* m88k */ /* with SVR4_SIGNAL_T */ #elif defined (ACE_WIN32) typedef void (__cdecl *ACE_SignalHandler)(int); typedef void (__cdecl *ACE_SignalHandlerV)(int); @@ -208,15 +234,19 @@ extern "C" // Defining POSIX4 real-time signal range. #if defined(ACE_HAS_POSIX_REALTIME_SIGNALS) -# define ACE_SIGRTMIN SIGRTMIN -# define ACE_SIGRTMAX SIGRTMAX +#define ACE_SIGRTMIN SIGRTMIN +#define ACE_SIGRTMAX SIGRTMAX + #else /* !ACE_HAS_POSIX_REALTIME_SIGNALS */ -# ifndef ACE_SIGRTMIN -# define ACE_SIGRTMIN 0 -# endif /* ACE_SIGRTMIN */ -# ifndef ACE_SIGRTMAX -# define ACE_SIGRTMAX 0 -# endif /* ACE_SIGRTMAX */ + +#ifndef ACE_SIGRTMIN +#define ACE_SIGRTMIN 0 +#endif /* ACE_SIGRTMIN */ + +#ifndef ACE_SIGRTMAX +#define ACE_SIGRTMAX 0 +#endif /* ACE_SIGRTMAX */ + #endif /* ACE_HAS_POSIX_REALTIME_SIGNALS */ #if defined (DIGITAL_UNIX) diff --git a/ACE/ace/os_include/os_stdio.h b/ACE/ace/os_include/os_stdio.h index cfb1843c563..feeb4371fec 100644 --- a/ACE/ace/os_include/os_stdio.h +++ b/ACE/ace/os_include/os_stdio.h @@ -37,7 +37,7 @@ # include /**/ <ioLib.h> // for remCurIdGet() # include /**/ <remLib.h> -# if defined (__RTP__) && ((ACE_VXWORKS == 0x620) || (ACE_VXWORKS == 0x630) || (ACE_VXWORKS == 0x640)) +# if defined (__RTP__) && ((ACE_VXWORKS == 0x620) || (ACE_VXWORKS == 0x630)) # define L_cuserid _PARM_L_cuserid # endif #endif /* ACE_VXWORKS */ diff --git a/ACE/ace/os_include/sys/os_resource.h b/ACE/ace/os_include/sys/os_resource.h index 4fa753431de..cd28e932fa1 100644 --- a/ACE/ace/os_include/sys/os_resource.h +++ b/ACE/ace/os_include/sys/os_resource.h @@ -70,6 +70,10 @@ extern "C" FILETIME ru_utime; FILETIME ru_stime; }; +#else /* !ACE_WIN32 */ +# if defined (m88k) +# define RUSAGE_SELF 1 +# endif /* m88k */ #endif /* ACE_WIN32 */ #if defined (ACE_LACKS_RLIMIT_PROTOTYPE) diff --git a/ACE/ace/os_include/sys/os_socket.h b/ACE/ace/os_include/sys/os_socket.h index 7b18c047b25..376cf548555 100644 --- a/ACE/ace/os_include/sys/os_socket.h +++ b/ACE/ace/os_include/sys/os_socket.h @@ -27,7 +27,13 @@ #include "ace/os_include/sys/os_uio.h" #if !defined (ACE_LACKS_SYS_SOCKET_H) +# if defined (ACE_HAS_AIX_BROKEN_SOCKET_HEADER) +# undef __cplusplus +# endif /* ACE_HAS_AIX_BROKEN_SOCKET_HEADER */ # include /**/ <sys/socket.h> +# if defined (ACE_HAS_AIX_BROKEN_SOCKET_HEADER) +# define __cplusplus +# endif /* ACE_HAS_AIX_BROKEN_SOCKET_HEADER */ #endif /* !ACE_LACKS_SYS_SOCKET_H */ #if defined (ACE_VXWORKS) && (ACE_VXWORKS < 0x620) @@ -64,13 +70,6 @@ extern "C" }; # endif /* ACE_LACKS_SOCKADDR */ -# if defined (ACE_LACKS_LINGER) - struct linger { - int l_onoff; /* option on/off */ - int l_linger; /* linger time */ - }; -# endif /* ACE_LACKS_LINGER */ - #if defined (ACE_WIN32) struct msghdr { @@ -96,6 +95,13 @@ extern "C" #if defined (ACE_HAS_4_4BSD_SENDMSG_RECVMSG) // Control message size to pass a file descriptor. # define ACE_BSD_CONTROL_MSG_LEN sizeof (struct cmsghdr) + sizeof (ACE_HANDLE) +# if defined (ACE_LACKS_CMSG_DATA_MACRO) +# if defined (ACE_LACKS_CMSG_DATA_MEMBER) +# define CMSG_DATA(cmsg) ((unsigned char *) ((struct cmsghdr *) (cmsg) + 1)) +# else +# define CMSG_DATA(cmsg) ((cmsg)->cmsg_data) +# endif /* ACE_LACKS_CMSG_DATA_MEMBER */ +# endif /* ACE_LACKS_CMSG_DATA_MACRO */ #endif /* ACE_HAS_4_4BSD_SENDMSG_RECVMSG */ // Increase the range of "address families". Please note that this @@ -113,10 +119,6 @@ extern "C" # define AF_LOCAL 1 #endif /* AF_LOCAL */ -#if !defined (AF_UNIX) -# define AF_UNIX AF_LOCAL -#endif /* AF_UNIX */ - #if !defined (AF_INET) # define AF_INET 2 #endif /* AF_INET */ @@ -164,10 +166,6 @@ extern "C" # define SOCK_DGRAM 2 #endif /* SOCK_DGRAM */ -#if !defined (SOCK_SEQPACKET) -# define SOCK_SEQPACKET 5 -#endif /* SOCK_SEQPACKET */ - #if !defined (SOL_SOCKET) # define SOL_SOCKET 0xffff #endif /* SOL_SOCKET */ @@ -176,10 +174,6 @@ extern "C" # define SO_REUSEADDR 0x0004 #endif /* SO_REUSEADDR */ -#if !defined (SO_LINGER) -# define SO_LINGER 0x0080 -#endif /* SO_LINGER */ - #if !defined (SO_SNDBUF) # define SO_SNDBUF 0x1001 #endif /* SO_SNDBUF */ @@ -188,14 +182,6 @@ extern "C" # define SO_RCVBUF 0x1002 #endif /* SO_RCVBUF */ -#if !defined (SO_BROADCAST) -# define SO_BROADCAST 0x0020 -#endif /* SO_BROADCAST */ - -#if !defined (SO_ERROR) -# define SO_ERROR 0x1007 -#endif /* SO_ERROR */ - #if defined (ACE_HAS_IPV6) # if defined (ACE_USES_IPV4_IPV6_MIGRATION) # define ACE_ADDRESS_FAMILY_INET AF_UNSPEC diff --git a/ACE/ace/os_include/sys/os_time.h b/ACE/ace/os_include/sys/os_time.h index d8d061b5d62..7f65f5cb568 100644 --- a/ACE/ace/os_include/sys/os_time.h +++ b/ACE/ace/os_include/sys/os_time.h @@ -41,11 +41,11 @@ extern "C" #endif /* __cplusplus */ #if defined (ACE_HAS_SVR4_GETTIMEOFDAY) -# if !defined (SCO) +# if !defined (m88k) && !defined (SCO) int gettimeofday (struct timeval *tp, void * = 0); # else int gettimeofday (struct timeval *tp); -# endif /* !SCO */ +# endif /* !m88k && !SCO */ #elif defined (ACE_HAS_OSF1_GETTIMEOFDAY) int gettimeofday (struct timeval *tp, struct timezone * = 0); #elif defined (ACE_HAS_VOIDPTR_GETTIMEOFDAY) diff --git a/ACE/ace/os_include/sys/os_types.h b/ACE/ace/os_include/sys/os_types.h index d9895abdecc..dbf1cfa412f 100644 --- a/ACE/ace/os_include/sys/os_types.h +++ b/ACE/ace/os_include/sys/os_types.h @@ -77,7 +77,7 @@ typedef double ACE_timer_t; #else typedef off_t ACE_OFF_T; #endif - + #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__) || \ @@ -89,7 +89,7 @@ typedef double ACE_timer_t; typedef offset_t ACE_LOFF_T; #elif defined (WIN32) typedef __int64 ACE_LOFF_T; -#elif (defined (ACE_VXWORKS) && (ACE_VXWORKS == 0x640 || ACE_VXWORKS == 0x630 || ACE_VXWORKS == 0x620 || ACE_VXWORKS == 0x551)) || \ +#elif (defined (ACE_VXWORKS) && (ACE_VXWORKS == 0x630 || ACE_VXWORKS == 0x620 || ACE_VXWORKS == 0x551)) || \ defined (ACE_LYNXOS_MAJOR) || \ (defined (ACE_OPENVMS) && !defined (_LARGEFILE)) typedef long long ACE_LOFF_T; diff --git a/ACE/apps/Gateway/Gateway/Makefile.am b/ACE/apps/Gateway/Gateway/Makefile.am index 5312eb331cb..83392e20564 100644 --- a/ACE/apps/Gateway/Gateway/Makefile.am +++ b/ACE/apps/Gateway/Gateway/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -44,7 +44,6 @@ noinst_HEADERS = \ Options.h ## Makefile.gatewayd.am - noinst_PROGRAMS = gatewayd gatewayd_CPPFLAGS = \ diff --git a/ACE/apps/Gateway/Makefile.am b/ACE/apps/Gateway/Makefile.am index e0b818fd319..ff47f4b6ecd 100644 --- a/ACE/apps/Gateway/Makefile.am +++ b/ACE/apps/Gateway/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ Gateway \ diff --git a/ACE/apps/Gateway/Peer/Makefile.am b/ACE/apps/Gateway/Peer/Makefile.am index b17b963b7b8..843f407270a 100644 --- a/ACE/apps/Gateway/Peer/Makefile.am +++ b/ACE/apps/Gateway/Peer/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -28,7 +28,6 @@ noinst_HEADERS = \ Peer.h ## Makefile.gateway_peerd.am - noinst_PROGRAMS = peerd peerd_CPPFLAGS = \ diff --git a/ACE/apps/JAWS/Makefile.am b/ACE/apps/JAWS/Makefile.am index c922c992902..5703744183c 100644 --- a/ACE/apps/JAWS/Makefile.am +++ b/ACE/apps/JAWS/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ clients \ diff --git a/ACE/apps/JAWS/clients/Blobby/Makefile.am b/ACE/apps/JAWS/clients/Blobby/Makefile.am index 1e0071f74d1..e3846028703 100644 --- a/ACE/apps/JAWS/clients/Blobby/Makefile.am +++ b/ACE/apps/JAWS/clients/Blobby/Makefile.am @@ -6,13 +6,12 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) ## Makefile.blobby.am - noinst_PROGRAMS = blobby blobby_CPPFLAGS = \ diff --git a/ACE/apps/JAWS/clients/Caching/Makefile.am b/ACE/apps/JAWS/clients/Caching/Makefile.am index fa89230d919..ba2cde63635 100644 --- a/ACE/apps/JAWS/clients/Caching/Makefile.am +++ b/ACE/apps/JAWS/clients/Caching/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -16,24 +16,22 @@ ACE_ROOT = $(top_srcdir) if BUILD_ACE_FILECACHE if !BUILD_ACE_FOR_TAO +noinst_LTLIBRARIES = libhttp_client.la -noinst_PROGRAMS = http_client - -http_client_CPPFLAGS = \ +libhttp_client_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) -http_client_SOURCES = \ +libhttp_client_la_SOURCES = \ http_client.cpp \ - http_handler.cpp \ + http_handler.cpp + +noinst_HEADERS = \ Local_Locator.inl \ Locator_Request_Reply.inl \ URL_Properties.inl \ http_handler.h -http_client_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - endif !BUILD_ACE_FOR_TAO endif BUILD_ACE_FILECACHE diff --git a/ACE/apps/JAWS/clients/Caching/caching.mpc b/ACE/apps/JAWS/clients/Caching/caching.mpc index 98481c0972e..fce9d81df4f 100644 --- a/ACE/apps/JAWS/clients/Caching/caching.mpc +++ b/ACE/apps/JAWS/clients/Caching/caching.mpc @@ -5,7 +5,6 @@ project(http_client) : aceexe { avoids += ace_for_tao requires += ace_filecache - exename = http_client Source_Files { http_handler.cpp http_client.cpp diff --git a/ACE/apps/JAWS/clients/Makefile.am b/ACE/apps/JAWS/clients/Makefile.am index 76571aa387d..6f338fd5cc8 100644 --- a/ACE/apps/JAWS/clients/Makefile.am +++ b/ACE/apps/JAWS/clients/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ Blobby \ diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/README b/ACE/apps/JAWS/clients/WebSTONE/src/README index 2061342b7ae..2061342b7ae 100644..100755 --- a/ACE/apps/JAWS/clients/WebSTONE/src/README +++ b/ACE/apps/JAWS/clients/WebSTONE/src/README diff --git a/ACE/apps/JAWS/server/Makefile.am b/ACE/apps/JAWS/server/Makefile.am index 206dce1d281..d13d91ad381 100644 --- a/ACE/apps/JAWS/server/Makefile.am +++ b/ACE/apps/JAWS/server/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -58,7 +58,6 @@ endif BUILD_ACE_FILECACHE if BUILD_ACE_FILECACHE if !BUILD_ACE_FOR_TAO if !BUILD_USES_WCHAR - noinst_PROGRAMS = main main_CPPFLAGS = \ diff --git a/ACE/apps/JAWS2/HTTPU/Makefile.am b/ACE/apps/JAWS2/HTTPU/Makefile.am deleted file mode 100644 index cd9ae09ec7d..00000000000 --- a/ACE/apps/JAWS2/HTTPU/Makefile.am +++ /dev/null @@ -1,65 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.HTTPU.am - -if !BUILD_ACE_FOR_TAO -if !BUILD_USES_WCHAR - -noinst_LTLIBRARIES = libHTTPU.la - -libHTTPU_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(srcdir)/.. \ - -DHTTPU_BUILD_DLL - -libHTTPU_la_SOURCES = \ - http_base.cpp \ - http_headers.cpp \ - http_request.cpp \ - http_response.cpp \ - http_status.cpp \ - parse_http_request.cpp \ - parse_http_response.cpp \ - parse_url.cpp - -noinst_HEADERS = \ - http_base.h \ - http_base.inl \ - http_export.h \ - http_headers.h \ - http_headers.inl \ - http_request.h \ - http_request.inl \ - http_response.h \ - http_response.inl \ - http_status.h \ - http_status.inl \ - parse_http_request.h \ - parse_http_request.inl \ - parse_http_response.h \ - parse_http_response.inl \ - parse_url.h - -endif !BUILD_USES_WCHAR -endif !BUILD_ACE_FOR_TAO - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/apps/JAWS2/HTTPU/http_base.cpp b/ACE/apps/JAWS2/HTTPU/http_base.cpp index 80e6e844614..4ffa4f74fde 100644 --- a/ACE/apps/JAWS2/HTTPU/http_base.cpp +++ b/ACE/apps/JAWS2/HTTPU/http_base.cpp @@ -26,11 +26,11 @@ HTTP_Base::receive (ACE_Message_Block &mb) switch (this->info_.status ()) { - case JAWS_Header_Info::STATUS_CODE_OK: + case JAWS_Header_Info::OK: break; - case JAWS_Header_Info::STATUS_CODE_NO_MEMORY: - case JAWS_Header_Info::STATUS_CODE_TOO_LONG: + case JAWS_Header_Info::NO_MEMORY: + case JAWS_Header_Info::TOO_LONG: default: this->status_ = STATUS_INTERNAL_SERVER_ERROR; break; diff --git a/ACE/apps/JAWS2/HTTPU/http_headers.cpp b/ACE/apps/JAWS2/HTTPU/http_headers.cpp index 77db706dc15..3f1f5bc27bb 100644 --- a/ACE/apps/JAWS2/HTTPU/http_headers.cpp +++ b/ACE/apps/JAWS2/HTTPU/http_headers.cpp @@ -3,83 +3,74 @@ #include "ace/RB_Tree.h" #include "HTTPU/http_headers.h" -HTTP_Hdr_Node HTTP_HCodes::HTTP ("HTTP", "HTTP%s %s"); -HTTP_Hdr_Node HTTP_HCodes::ACCEPT ("Accept", "Accept: %s\r\n"); -HTTP_Hdr_Node HTTP_HCodes::ACCEPTCHARSET ("Accept-Charset", - "Accept-Charset: %s\r\n"); -HTTP_Hdr_Node HTTP_HCodes::ACCEPTENCODING ("Accept-Encoding", - "Accept-Encoding: %s\r\n"); -HTTP_Hdr_Node HTTP_HCodes::ACCEPTLANGUAGE ("Accept-Language", - "Accept-Language: %s\r\n"); -HTTP_Hdr_Node HTTP_HCodes::ACCEPTRANGES ("Accept-Ranges", - "Accept-Ranges: %s\r\n"); -HTTP_Hdr_Node HTTP_HCodes::AGE ("Age", "Age: %s\r\n"); -HTTP_Hdr_Node HTTP_HCodes::ALLOW ("Allow", "Allow: %s\r\n"); -HTTP_Hdr_Node HTTP_HCodes::AUTHORIZATION ("Authorization", - "Authorization: %s\r\n"); -HTTP_Hdr_Node HTTP_HCodes::CACHECONTROL ("Cache-Control", - "Cache-Control: %s\r\n"); -HTTP_Hdr_Node HTTP_HCodes::CONNECTION ("Connection", "Connection: %s\r\n"); -HTTP_Hdr_Node HTTP_HCodes::CONTENTENCODING ("Content-Encoding", - "Content-Encoding: %d\r\n"); -HTTP_Hdr_Node HTTP_HCodes::CONTENTLENGTH ("Content-Length", - "Content-Length: %d\r\n"); -HTTP_Hdr_Node HTTP_HCodes::CONTENTLOCATION ("Content-Location", - "Content-Location: %s\r\n"); -HTTP_Hdr_Node HTTP_HCodes::CONTENTMD5 ("Content-MD5", - "Content-MD5: %s\r\n"); -HTTP_Hdr_Node HTTP_HCodes::CONTENTRANGE ("Content-Range", - "Content-Range: %s\r\n"); -HTTP_Hdr_Node HTTP_HCodes::CONTENTTYPE ("Content-Type", - "Content-Type: %s\r\n"); -HTTP_Hdr_Node HTTP_HCodes::DATE ("Date", "Date: %s\r\n"); -HTTP_Hdr_Node HTTP_HCodes::ETAG ("ETag", "ETag: %s\r\n"); -HTTP_Hdr_Node HTTP_HCodes::EXPECT ("Expect", "Expect: %s\r\n"); -HTTP_Hdr_Node HTTP_HCodes::EXPIRES ("Expires", "Expires: %s\r\n"); -HTTP_Hdr_Node HTTP_HCodes::FROM ("From", "From: %s\r\n"); -HTTP_Hdr_Node HTTP_HCodes::HOST ("Host", "Host: %s\r\n"); -HTTP_Hdr_Node HTTP_HCodes::IFMATCH ("If-Match", "If-Match: %s\r\n"); -HTTP_Hdr_Node HTTP_HCodes::IFMODIFIEDSINCE ("If-Modified-Since", - "If-Modified-Since: %s\r\n"); -HTTP_Hdr_Node HTTP_HCodes::IFNONEMATCH ("If-None-Match", - "If-None-Match: %s\r\n"); -HTTP_Hdr_Node HTTP_HCodes::IFRANGE ("If-Range", "If-Range: %s\r\n"); -HTTP_Hdr_Node HTTP_HCodes::IFUNMODIFIEDSINCE ("If-Unmodified-Since", - "If-Unmodified-Since: %s\r\n"); -HTTP_Hdr_Node HTTP_HCodes::LASTMODIFIED ("Last-Modified", - "Last-Modified: %s\r\n"); -HTTP_Hdr_Node HTTP_HCodes::LOCATION ("Location", "Location: %s\r\n"); -HTTP_Hdr_Node HTTP_HCodes::MAXFORWARDS ("Max-Forwards", - "Max-Forwards: %s\r\n"); -HTTP_Hdr_Node HTTP_HCodes::PRAGMA ("Pragma", "Pragma: %s\r\n"); -HTTP_Hdr_Node HTTP_HCodes::PROXYAUTHENTICATE ("Proxy-Authenticate", - "Proxy-Authenticate: %s\r\n"); -HTTP_Hdr_Node HTTP_HCodes::PROXYAUTHORIZATION ("Proxy-Authorization", - "Proxy-Authorization: %s\r\n"); -HTTP_Hdr_Node HTTP_HCodes::RANGE ("Range", "Range: %s\r\n"); -HTTP_Hdr_Node HTTP_HCodes::REFERER ("Referer", "Referer: %s\r\n"); -HTTP_Hdr_Node HTTP_HCodes::SERVER ("Server", "Server: %s\r\n"); -HTTP_Hdr_Node HTTP_HCodes::TE ("TE", "TE: %s\r\n"); -HTTP_Hdr_Node HTTP_HCodes::TRAILER ("Trailer", "Trailer: %s\r\n"); -HTTP_Hdr_Node HTTP_HCodes::TRANSFERENCODING ("Transfer-Encoding", - "Transfer-Encoding: %s\r\n"); -HTTP_Hdr_Node HTTP_HCodes::UPGRADE ("Ugrade", "Ugrade: %s\r\n"); -HTTP_Hdr_Node HTTP_HCodes::USERAGENT ("User-Agent", "User-Agent: %s\r\n"); -HTTP_Hdr_Node HTTP_HCodes::VARY ("Vary", "Vary: %s\r\n"); -HTTP_Hdr_Node HTTP_HCodes::VIA ("Via", "Via: %s\r\n"); -HTTP_Hdr_Node HTTP_HCodes::WARNING ("Warning", "Warning: %s\r\n"); -HTTP_Hdr_Node HTTP_HCodes::WWWAUTHENTICATE ("WWW-Authenticate", - "WWW-Authenticate: %s\r\n"); -HTTP_Hdr_Node HTTP_HCodes::GET ("GET", "GET %s HTTP/%s\r\n"); -HTTP_Hdr_Node HTTP_HCodes::HEAD ("HEAD", "HEAD %s HTTP/%s\r\n"); -HTTP_Hdr_Node HTTP_HCodes::POST ("POST", "POST %s HTTP/%s\r\n"); -HTTP_Hdr_Node HTTP_HCodes::PUT ("PUT", "PUT %s HTTP/%s\r\n"); -HTTP_Hdr_Node HTTP_HCodes::QUIT ("QUIT", "QUIT %s HTTP/%s\r\n"); -HTTP_Hdr_Node HTTP_HCodes::DUNNO ("", ""); -HTTP_Hdr_Node HTTP_HCodes::META ("<META", "<META %s>"); -HTTP_Hdr_Node HTTP_HCodes::A ("<A", "<A %s>"); -HTTP_Hdr_Node HTTP_HCodes::SCRIPT ("<SCRIPT", "<SCRIPT %s>"); -HTTP_Hdr_Node HTTP_HCodes::APPLET ("<APPLET", "<APPLET %s>"); +HTTP_Hdr_Node + + HTTP_HCodes::HTTP ("HTTP", "HTTP%s %s"), + HTTP_HCodes::ACCEPT ("Accept", "Accept: %s\r\n"), + HTTP_HCodes::ACCEPTCHARSET ("Accept-Charset", "Accept-Charset: %s\r\n"), + HTTP_HCodes::ACCEPTENCODING ("Accept-Encoding", "Accept-Encoding: %s\r\n"), + HTTP_HCodes::ACCEPTLANGUAGE ("Accept-Language", "Accept-Language: %s\r\n"), + HTTP_HCodes::ACCEPTRANGES ("Accept-Ranges", "Accept-Ranges: %s\r\n"), + HTTP_HCodes::AGE ("Age", "Age: %s\r\n"), + HTTP_HCodes::ALLOW ("Allow", "Allow: %s\r\n"), + HTTP_HCodes::AUTHORIZATION ("Authorization", "Authorization: %s\r\n"), + HTTP_HCodes::CACHECONTROL ("Cache-Control", "Cache-Control: %s\r\n"), + HTTP_HCodes::CONNECTION ("Connection", "Connection: %s\r\n"), + HTTP_HCodes::CONTENTENCODING ("Content-Encoding", + "Content-Encoding: %d\r\n"), + HTTP_HCodes::CONTENTLENGTH ("Content-Length", "Content-Length: %d\r\n"), + HTTP_HCodes::CONTENTLOCATION ("Content-Location", "Content-Location: %s\r\n"), + HTTP_HCodes::CONTENTMD5 ("Content-MD5", "Content-MD5: %s\r\n"), + HTTP_HCodes::CONTENTRANGE ("Content-Range", "Content-Range: %s\r\n"), + HTTP_HCodes::CONTENTTYPE ("Content-Type", "Content-Type: %s\r\n"), + HTTP_HCodes::DATE ("Date", "Date: %s\r\n"), + HTTP_HCodes::ETAG ("ETag", "ETag: %s\r\n"), + HTTP_HCodes::EXPECT ("Expect", "Expect: %s\r\n"), + HTTP_HCodes::EXPIRES ("Expires", "Expires: %s\r\n"), + HTTP_HCodes::FROM ("From", "From: %s\r\n"), + HTTP_HCodes::HOST ("Host", "Host: %s\r\n"), + HTTP_HCodes::IFMATCH ("If-Match", "If-Match: %s\r\n"), + HTTP_HCodes::IFMODIFIEDSINCE ("If-Modified-Since", + "If-Modified-Since: %s\r\n"), + HTTP_HCodes::IFNONEMATCH ("If-None-Match", "If-None-Match: %s\r\n"), + HTTP_HCodes::IFRANGE ("If-Range", "If-Range: %s\r\n"), + HTTP_HCodes::IFUNMODIFIEDSINCE ("If-Unmodified-Since", + "If-Unmodified-Since: %s\r\n"), + HTTP_HCodes::LASTMODIFIED ("Last-Modified", "Last-Modified: %s\r\n"), + HTTP_HCodes::LOCATION ("Location", "Location: %s\r\n"), + HTTP_HCodes::MAXFORWARDS ("Max-Forwards", "Max-Forwards: %s\r\n"), + HTTP_HCodes::PRAGMA ("Pragma", "Pragma: %s\r\n"), + HTTP_HCodes::PROXYAUTHENTICATE ("Proxy-Authenticate", + "Proxy-Authenticate: %s\r\n"), + HTTP_HCodes::PROXYAUTHORIZATION ("Proxy-Authorization", + "Proxy-Authorization: %s\r\n"), + HTTP_HCodes::RANGE ("Range", "Range: %s\r\n"), + HTTP_HCodes::REFERER ("Referer", "Referer: %s\r\n"), + HTTP_HCodes::SERVER ("Server", "Server: %s\r\n"), + HTTP_HCodes::TE ("TE", "TE: %s\r\n"), + HTTP_HCodes::TRAILER ("Trailer", "Trailer: %s\r\n"), + HTTP_HCodes::TRANSFERENCODING ("Transfer-Encoding", + "Transfer-Encoding: %s\r\n"), + HTTP_HCodes::UPGRADE ("Ugrade", "Ugrade: %s\r\n"), + HTTP_HCodes::USERAGENT ("User-Agent", "User-Agent: %s\r\n"), + HTTP_HCodes::VARY ("Vary", "Vary: %s\r\n"), + HTTP_HCodes::VIA ("Via", "Via: %s\r\n"), + HTTP_HCodes::WARNING ("Warning", "Warning: %s\r\n"), + HTTP_HCodes::WWWAUTHENTICATE ("WWW-Authenticate", + "WWW-Authenticate: %s\r\n"), + HTTP_HCodes::GET ("GET", "GET %s HTTP/%s\r\n"), + HTTP_HCodes::HEAD ("HEAD", "HEAD %s HTTP/%s\r\n"), + HTTP_HCodes::POST ("POST", "POST %s HTTP/%s\r\n"), + HTTP_HCodes::PUT ("PUT", "PUT %s HTTP/%s\r\n"), + HTTP_HCodes::QUIT ("QUIT", "QUIT %s HTTP/%s\r\n"), + HTTP_HCodes::DUNNO ("", ""), + HTTP_HCodes::META ("<META", "<META %s>"), + HTTP_HCodes::A ("<A", "<A %s>"), + HTTP_HCodes::SCRIPT ("<SCRIPT", "<SCRIPT %s>"), + HTTP_HCodes::APPLET ("<APPLET", "<APPLET %s>") + + ////////////// + ; const int &HTTP_HCodes::NUM_HEADER_STRINGS diff --git a/ACE/apps/JAWS2/HTTPU/http_headers.h b/ACE/apps/JAWS2/HTTPU/http_headers.h index 67e423bad83..0e23b23abf4 100644 --- a/ACE/apps/JAWS2/HTTPU/http_headers.h +++ b/ACE/apps/JAWS2/HTTPU/http_headers.h @@ -18,11 +18,6 @@ #include "JAWS/Parse_Headers.h" #include "HTTPU/http_export.h" -// A header file on HP-UX defines SERVER -#if defined (SERVER) -#undef SERVER -#endif /* SERVER */ - class HTTP_Headers; class HTTPU_Export HTTP_Hdr_Node @@ -31,7 +26,7 @@ class HTTPU_Export HTTP_Hdr_Node friend class HTTP_HCodes; public: - operator int (void) const; + operator const int (void) const; operator const char * (void) const; const char * format (void) const; diff --git a/ACE/apps/JAWS2/HTTPU/http_headers.inl b/ACE/apps/JAWS2/HTTPU/http_headers.inl index 3cfbaddae1b..73ea46e57b6 100644 --- a/ACE/apps/JAWS2/HTTPU/http_headers.inl +++ b/ACE/apps/JAWS2/HTTPU/http_headers.inl @@ -7,7 +7,7 @@ #endif /* ACE_HAS_INLINED_OSCALLS */ ACE_INLINE -HTTP_Hdr_Node::operator int (void) const +HTTP_Hdr_Node::operator const int (void) const { return this->index_; } diff --git a/ACE/apps/JAWS2/HTTPU/http_status.cpp b/ACE/apps/JAWS2/HTTPU/http_status.cpp index 99ce69f1f58..4bf70926a97 100644 --- a/ACE/apps/JAWS2/HTTPU/http_status.cpp +++ b/ACE/apps/JAWS2/HTTPU/http_status.cpp @@ -5,33 +5,28 @@ const char * HTTP_SCode::table_ [HTTP_SCode::SC_TABLE_SIZE]; -HTTP_SCode_Node HTTP_SCode_Base::STATUS_OK (200, "OK"); -HTTP_SCode_Node HTTP_SCode_Base::STATUS_CREATED (201, "Created"); -HTTP_SCode_Node HTTP_SCode_Base::STATUS_ACCEPTED (202, "Accepted"); -HTTP_SCode_Node HTTP_SCode_Base::STATUS_NO_CONTENT (204, "No Content"); -HTTP_SCode_Node HTTP_SCode_Base::STATUS_MULTIPLE_CHOICES (300, - "Multiple Choices"); -HTTP_SCode_Node HTTP_SCode_Base::STATUS_MOVED_PERMANENTLY (301, - "Moved Permanently"); -HTTP_SCode_Node HTTP_SCode_Base::STATUS_MOVED_TEMPORARILY (302, - "Moved Temporarily"); -HTTP_SCode_Node HTTP_SCode_Base::STATUS_NOT_MODIFIED (304, "Not Modified"); -HTTP_SCode_Node HTTP_SCode_Base::STATUS_INSUFFICIENT_DATA (399, - "Insufficient Data"); -HTTP_SCode_Node HTTP_SCode_Base::STATUS_BAD_REQUEST (400, "Bad Request"); -HTTP_SCode_Node HTTP_SCode_Base::STATUS_UNAUTHORIZED (401, "Unauthorized"); -HTTP_SCode_Node HTTP_SCode_Base::STATUS_FORBIDDEN (403, "Forbidden"); -HTTP_SCode_Node HTTP_SCode_Base::STATUS_NOT_FOUND (404, "Not Found"); -HTTP_SCode_Node HTTP_SCode_Base::STATUS_INTERNAL_SERVER_ERROR (500, - "Internal Server Error"); -HTTP_SCode_Node HTTP_SCode_Base::STATUS_NOT_IMPLEMENTED (501, - "Not Implemented"); -HTTP_SCode_Node HTTP_SCode_Base::STATUS_BAD_GATEWAY (502, "Bad Gateway"); -HTTP_SCode_Node HTTP_SCode_Base::STATUS_SERVICE_UNAVAILABLE (503, - "Service Unavailable"); -HTTP_SCode_Node HTTP_SCode_Base::STATUS_QUIT (599, "Quit"); +HTTP_SCode_Node -HTTP_SCode_Node HTTP_SCode_Base::DUMMY (0, 0); + HTTP_SCode_Base::STATUS_OK (200, "OK"), + HTTP_SCode_Base::STATUS_CREATED (201, "Created"), + HTTP_SCode_Base::STATUS_ACCEPTED (202, "Accepted"), + HTTP_SCode_Base::STATUS_NO_CONTENT (204, "No Content"), + HTTP_SCode_Base::STATUS_MULTIPLE_CHOICES (300, "Multiple Choices"), + HTTP_SCode_Base::STATUS_MOVED_PERMANENTLY (301, "Moved Permanently"), + HTTP_SCode_Base::STATUS_MOVED_TEMPORARILY (302, "Moved Temporarily"), + HTTP_SCode_Base::STATUS_NOT_MODIFIED (304, "Not Modified"), + HTTP_SCode_Base::STATUS_INSUFFICIENT_DATA (399, "Insufficient Data"), + HTTP_SCode_Base::STATUS_BAD_REQUEST (400, "Bad Request"), + HTTP_SCode_Base::STATUS_UNAUTHORIZED (401, "Unauthorized"), + HTTP_SCode_Base::STATUS_FORBIDDEN (403, "Forbidden"), + HTTP_SCode_Base::STATUS_NOT_FOUND (404, "Not Found"), + HTTP_SCode_Base::STATUS_INTERNAL_SERVER_ERROR (500, "Internal Server Error"), + HTTP_SCode_Base::STATUS_NOT_IMPLEMENTED (501, "Not Implemented"), + HTTP_SCode_Base::STATUS_BAD_GATEWAY (502, "Bad Gateway"), + HTTP_SCode_Base::STATUS_SERVICE_UNAVAILABLE (503, "Service Unavailable"), + HTTP_SCode_Base::STATUS_QUIT (599, "Quit"), + + HTTP_SCode_Base::DUMMY (0, 0); HTTP_SCode_Node::HTTP_SCode_Node (int code, const char *code_str) : code_ (code), diff --git a/ACE/apps/JAWS2/HTTPU/httpu.mpc b/ACE/apps/JAWS2/HTTPU/httpu.mpc deleted file mode 100644 index 8f7aa2ecf5e..00000000000 --- a/ACE/apps/JAWS2/HTTPU/httpu.mpc +++ /dev/null @@ -1,30 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project(HTTPU) : acelib { - sharedname = HTTPU - dynamicflags += HTTPU_BUILD_DLL - avoids += uses_wchar ace_for_tao - after += JAWS2 - libs += JAWS2 - - specific (automake) { - includes += $(srcdir)/.. - } else { - includes += .. - } - - Source_Files { - *.cpp - } - - Template_Files{ - } - - Header_Files{ - *.h - } - - Inline_Files{ - } -} diff --git a/ACE/apps/JAWS2/HTTPU/parse_url.cpp b/ACE/apps/JAWS2/HTTPU/parse_url.cpp index 9519ced6897..c1c753d0784 100644 --- a/ACE/apps/JAWS2/HTTPU/parse_url.cpp +++ b/ACE/apps/JAWS2/HTTPU/parse_url.cpp @@ -13,7 +13,7 @@ HTTP_Parse_URL::HTTP_Parse_URL (const char *url) host_ (0), port_ (-1), url_path_ (0), - error_ (URL_ERROR_NONE), + error_ (NONE), is_cgi_ (0) { this->init (url); @@ -47,7 +47,7 @@ HTTP_Parse_URL::init( const char *url ) url_ = ACE_OS::strdup( url ); if ( url_ == 0 ) { - error_ = URL_ERROR_STRDUP; + error_ = STRDUP; return; } @@ -77,14 +77,14 @@ HTTP_Parse_URL::parse_url (void) this->parse_scheme (p); if (*p == '\0') { - this->error_ = URL_ERROR_SCHEME; + this->error_ = SCHEME; return; } // Parse past "//" if (*p != '/' || *(p+1) != '/') { - this->error_ = URL_ERROR_SLASHSLASH; + this->error_ = SLASHSLASH; return; } p += 2; diff --git a/ACE/apps/JAWS2/HTTPU/parse_url.h b/ACE/apps/JAWS2/HTTPU/parse_url.h index fa05b72ceb3..64260edd2a8 100644 --- a/ACE/apps/JAWS2/HTTPU/parse_url.h +++ b/ACE/apps/JAWS2/HTTPU/parse_url.h @@ -31,7 +31,7 @@ public: int port (void) const; const char *url_path (void) const; - enum URL_ERROR { URL_ERROR_NONE, URL_ERROR_STRDUP, URL_ERROR_SCHEME, URL_ERROR_SLASHSLASH }; + enum URL_ERROR { NONE, STRDUP, SCHEME, SLASHSLASH }; int error (void) const { return( error_ ); } @@ -49,12 +49,12 @@ private: private: char *url_; - const char *scheme_; - const char *user_; - const char *passwd_; - const char *host_; + char *scheme_; + char *user_; + char *passwd_; + char *host_; int port_; - const char *url_path_; + char *url_path_; int error_; int is_cgi_; diff --git a/ACE/apps/JAWS2/JAWS/Concurrency.cpp b/ACE/apps/JAWS2/JAWS/Concurrency.cpp index bc557137ac7..955fc4e244a 100644 --- a/ACE/apps/JAWS2/JAWS/Concurrency.cpp +++ b/ACE/apps/JAWS2/JAWS/Concurrency.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "JAWS/JAWS.h" #include "JAWS/Concurrency.h" #include "JAWS/IO_Handler.h" #include "JAWS/Pipeline.h" diff --git a/ACE/apps/JAWS2/JAWS/Export.h b/ACE/apps/JAWS2/JAWS/Export.h index 68f8d135ddf..432b23f6984 100644 --- a/ACE/apps/JAWS2/JAWS/Export.h +++ b/ACE/apps/JAWS2/JAWS/Export.h @@ -1,57 +1,38 @@ -// -*- C++ -*- // $Id$ + // Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl -s JAWS +// This file is generated automatically by +// ${TAO_ROOT}/TAO_IDL/GenExportH.BAT // ------------------------------ #ifndef JAWS_EXPORT_H #define JAWS_EXPORT_H #include "ace/config-all.h" -#if defined (ACE_AS_STATIC_LIBS) && !defined (JAWS_HAS_DLL) -# define JAWS_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && JAWS_HAS_DLL */ - -#if !defined (JAWS_HAS_DLL) -# define JAWS_HAS_DLL 1 -#endif /* ! JAWS_HAS_DLL */ - -#if defined (JAWS_HAS_DLL) && (JAWS_HAS_DLL == 1) -# if defined (JAWS_BUILD_DLL) -# define JAWS_Export ACE_Proper_Export_Flag -# define JAWS_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define JAWS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* JAWS_BUILD_DLL */ -# define JAWS_Export ACE_Proper_Import_Flag -# define JAWS_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define JAWS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* JAWS_BUILD_DLL */ -#else /* JAWS_HAS_DLL == 1 */ +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#if defined (JAWS_HAS_DLL) +# if (JAWS_HAS_DLL == 1) +# if defined (JAWS_BUILD_DLL) +# define JAWS_Export ACE_Proper_Export_Flag +# define JAWS_SINGLETON_DECLARATION(T) \ + ACE_EXPORT_SINGLETON_DECLARATION (T) +# else +# define JAWS_Export ACE_Proper_Import_Flag +# define JAWS_SINGLETON_DECLARATION(T) \ + ACE_IMPORT_SINGLETON_DECLARATION (T) +# endif /* JAWS_BUILD_DLL */ +# else +# define JAWS_Export +# define JAWS_SINGLETON_DECLARATION(T) +# endif /* ! JAWS_HAS_DLL == 1 */ +#else # define JAWS_Export # define JAWS_SINGLETON_DECLARATION(T) -# define JAWS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* JAWS_HAS_DLL == 1 */ - -// Set JAWS_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (JAWS_NTRACE) -# if (ACE_NTRACE == 1) -# define JAWS_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define JAWS_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !JAWS_NTRACE */ - -#if (JAWS_NTRACE == 1) -# define JAWS_TRACE(X) -#else /* (JAWS_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define JAWS_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (JAWS_NTRACE == 1) */ +#endif /* JAWS_HAS_DLL */ -#endif /* JAWS_EXPORT_H */ +#endif /* JAWS_EXPORT_H */ + // End of auto generated file. -// End of auto generated file. diff --git a/ACE/apps/JAWS2/JAWS/IO.cpp b/ACE/apps/JAWS2/JAWS/IO.cpp index 210502b391d..3e1873bc0f9 100644 --- a/ACE/apps/JAWS2/JAWS/IO.cpp +++ b/ACE/apps/JAWS2/JAWS/IO.cpp @@ -9,6 +9,7 @@ #include "ace/OS_NS_sys_socket.h" #include "ace/Min_Max.h" +#include "JAWS/JAWS.h" #include "JAWS/Data_Block.h" #include "JAWS/Policy.h" #include "JAWS/IO.h" diff --git a/ACE/apps/JAWS2/JAWS/IO_Handler.cpp b/ACE/apps/JAWS2/JAWS/IO_Handler.cpp index 0a96db64f5d..fe957a82103 100644 --- a/ACE/apps/JAWS2/JAWS/IO_Handler.cpp +++ b/ACE/apps/JAWS2/JAWS/IO_Handler.cpp @@ -4,6 +4,7 @@ #include "ace/Filecache.h" #include "ace/OS_NS_unistd.h" +#include "JAWS/JAWS.h" #include "JAWS/IO.h" #include "JAWS/IO_Handler.h" #include "JAWS/IO_Acceptor.h" diff --git a/ACE/apps/JAWS2/JAWS/JAWS.h b/ACE/apps/JAWS2/JAWS/JAWS.h new file mode 100644 index 00000000000..3078ea3a8af --- /dev/null +++ b/ACE/apps/JAWS2/JAWS/JAWS.h @@ -0,0 +1,15 @@ +// $Id$ + +#if defined (JAWS_NTRACE) && (JAWS_NTRACE == 1) +# define JAWS_TRACE(X) +#else +# define JAWS_TRACE(X) ACE_Trace ____ (ACE_TEXT (X), \ + __LINE__, \ + ACE_TEXT (__FILE__)) +#include "ace/Trace.h" +#endif /* JAWS_NTRACE */ + +#ifndef JAWS_JAWS_H +#define JAWS_JAWS_H + +#endif /* JAWS_JAWS_H */ diff --git a/ACE/apps/JAWS2/JAWS/Makefile.am b/ACE/apps/JAWS2/JAWS/Makefile.am index dd00e5870ea..b201afa54bd 100644 --- a/ACE/apps/JAWS2/JAWS/Makefile.am +++ b/ACE/apps/JAWS2/JAWS/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -68,6 +68,7 @@ noinst_HEADERS = \ IO.h \ IO_Acceptor.h \ IO_Handler.h \ + JAWS.h \ Parse_Headers.h \ Pipeline.h \ Pipeline_Handler_T.cpp \ diff --git a/ACE/apps/JAWS2/JAWS/Pipeline_Tasks.cpp b/ACE/apps/JAWS2/JAWS/Pipeline_Tasks.cpp index 0368acfc6c4..e40809887c5 100644 --- a/ACE/apps/JAWS2/JAWS/Pipeline_Tasks.cpp +++ b/ACE/apps/JAWS2/JAWS/Pipeline_Tasks.cpp @@ -1,5 +1,7 @@ // $Id$ +#include "JAWS/JAWS.h" + #include "JAWS/IO.h" #include "JAWS/Pipeline_Tasks.h" #include "JAWS/Pipeline_Handler_T.h" diff --git a/ACE/apps/JAWS2/JAWS/jaws2.mpc b/ACE/apps/JAWS2/JAWS/jaws2.mpc index 9326bc5bdc3..a7d5754b11a 100644 --- a/ACE/apps/JAWS2/JAWS/jaws2.mpc +++ b/ACE/apps/JAWS2/JAWS/jaws2.mpc @@ -3,15 +3,9 @@ project(JAWS2) : acelib { sharedname = JAWS2 - dynamicflags += JAWS_BUILD_DLL + dynamicflags = JAWS_BUILD_DLL avoids += uses_wchar ace_for_tao - - specific (automake) { - includes += $(srcdir)/.. - } else { - includes += .. - } - + includes += .. Source_Files { Assoc_Array.cpp Cache_Manager.cpp diff --git a/ACE/apps/JAWS2/Makefile.am b/ACE/apps/JAWS2/Makefile.am index d3e0377d4f4..5bc7afdf9fd 100644 --- a/ACE/apps/JAWS2/Makefile.am +++ b/ACE/apps/JAWS2/Makefile.am @@ -6,9 +6,8 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ - JAWS \ - HTTPU + JAWS diff --git a/ACE/apps/JAWS3/Makefile.am b/ACE/apps/JAWS3/Makefile.am index 84294e864f3..647eab9416b 100644 --- a/ACE/apps/JAWS3/Makefile.am +++ b/ACE/apps/JAWS3/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ jaws3 diff --git a/ACE/apps/JAWS3/jaws3/Makefile.am b/ACE/apps/JAWS3/jaws3/Makefile.am index d140de85b12..549790b885c 100644 --- a/ACE/apps/JAWS3/jaws3/Makefile.am +++ b/ACE/apps/JAWS3/jaws3/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -85,7 +85,6 @@ endif !BUILD_ACE_FOR_TAO if !BUILD_ACE_FOR_TAO if !BUILD_USES_WCHAR - noinst_PROGRAMS = main main_CPPFLAGS = \ diff --git a/ACE/apps/JAWS3/jaws3/jaws3.mpc b/ACE/apps/JAWS3/jaws3/jaws3.mpc index 061c1952cd4..eaa9ecd0196 100644 --- a/ACE/apps/JAWS3/jaws3/jaws3.mpc +++ b/ACE/apps/JAWS3/jaws3/jaws3.mpc @@ -6,13 +6,7 @@ project(JAWS3) : acelib { dynamicflags = JAWS_BUILD_DLL avoids += uses_wchar avoids += ace_for_tao - - specific(automake) { - includes += $(srcdir)/.. - } else { - includes += .. - } - + includes += .. Source_Files { Asynch_IO.cpp Concurrency.cpp @@ -78,13 +72,7 @@ project(JAWS3) : acelib { project(JAWS3_server) : aceexe { avoids += uses_wchar avoids += ace_for_tao - - specific(automake) { - includes += $(srcdir)/.. - } else { - includes += .. - } - + includes += .. exename = main after += JAWS3 libs += JAWS3 diff --git a/ACE/apps/drwho/Makefile.am b/ACE/apps/drwho/Makefile.am index 286cd94c343..8a6e815e167 100644 --- a/ACE/apps/drwho/Makefile.am +++ b/ACE/apps/drwho/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -18,7 +18,6 @@ noinst_PROGRAMS = if BUILD_RWHO if !BUILD_ACE_FOR_TAO if !BUILD_USES_WCHAR - noinst_PROGRAMS += client client_CPPFLAGS = \ @@ -114,7 +113,6 @@ endif BUILD_RWHO if BUILD_RWHO if !BUILD_ACE_FOR_TAO if !BUILD_USES_WCHAR - noinst_PROGRAMS += server server_CPPFLAGS = \ diff --git a/ACE/apps/gperf/Makefile.am b/ACE/apps/gperf/Makefile.am index 6e296291251..a6030210b21 100644 --- a/ACE/apps/gperf/Makefile.am +++ b/ACE/apps/gperf/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ @@ -18,6 +18,7 @@ SUBDIRS = \ man_MANS = gperf.1 + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/ACE/apps/gperf/src/.cvsignore b/ACE/apps/gperf/src/.cvsignore new file mode 100644 index 00000000000..977dce99c7d --- /dev/null +++ b/ACE/apps/gperf/src/.cvsignore @@ -0,0 +1,2 @@ +gperf +gperf diff --git a/ACE/apps/gperf/src/Makefile.am b/ACE/apps/gperf/src/Makefile.am index fedfd8649ac..623c9054179 100644 --- a/ACE/apps/gperf/src/Makefile.am +++ b/ACE/apps/gperf/src/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -15,7 +15,6 @@ ACE_ROOT = $(top_srcdir) ## Makefile.gperf.am if !BUILD_USES_WCHAR - bin_PROGRAMS = gperf gperf_CPPFLAGS = \ diff --git a/ACE/apps/gperf/src/gperf.mpc b/ACE/apps/gperf/src/gperf.mpc index 81976d37aba..b8dc0ad1d74 100644 --- a/ACE/apps/gperf/src/gperf.mpc +++ b/ACE/apps/gperf/src/gperf.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(gperf) : aceexe, install, crosscompile { +project(gperf) : aceexe, core, crosscompile { install = $(ACE_ROOT)/bin avoids += uses_wchar exename = gperf diff --git a/ACE/apps/gperf/tests/.cvsignore b/ACE/apps/gperf/tests/.cvsignore new file mode 100644 index 00000000000..d805133eaae --- /dev/null +++ b/ACE/apps/gperf/tests/.cvsignore @@ -0,0 +1,58 @@ +ada.cpp +ada.cpp +adadefs.cpp +adadefs.cpp +aout +aout +aout.out +aout.out +c.cpp +c.cpp +corba.cpp +corba.cpp +cout +cout +cout.out +cout.out +cpp.cpp +cpp.cpp +cppout +cppout +cppout.out +cppout.out +idl.cpp +idl.cpp +iout +iout +iout.out +iout.out +iout2 +iout2 +iout2.out +iout2.out +m3out +m3out +m3out.out +m3out.out +modula3.cpp +modula3.cpp +pascal.cpp +pascal.cpp +pout +pout +pout.out +pout.out +preout +preout +preout.out +preout.out +tao.cpp +tao.cpp +taoout +taoout +taoout.out +taoout.out +tout +tout +tout.out +tout.out diff --git a/ACE/apps/gperf/tests/Makefile.am b/ACE/apps/gperf/tests/Makefile.am index 027d848b869..2a5fb70ce2f 100644 --- a/ACE/apps/gperf/tests/Makefile.am +++ b/ACE/apps/gperf/tests/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -15,7 +15,7 @@ CLEANFILES = BUILT_SOURCES = noinst_PROGRAMS = -## Makefile.adainset.am +## Makefile.adainset.am if !BUILD_USES_WCHAR @@ -23,10 +23,14 @@ BUILT_SOURCES += \ ada.cpp CLEANFILES += \ - ada.cpp + ada.cpp \ + ada-stamp -ada.cpp: $(srcdir)/ada.gperf +ada.cpp: ada-stamp + +ada-stamp: $(srcdir)/ada.gperf ../src/gperf -a -k1,4,$$ $(srcdir)/ada.gperf > ada.cpp + @touch $@ noinst_PROGRAMS += aout @@ -43,7 +47,7 @@ aout_LDADD = \ endif !BUILD_USES_WCHAR -## Makefile.cinset.am +## Makefile.cinset.am if !BUILD_USES_WCHAR @@ -51,10 +55,14 @@ BUILT_SOURCES += \ c.cpp CLEANFILES += \ - c.cpp + c.cpp \ + c-stamp + +c.cpp: c-stamp -c.cpp: $(srcdir)/c.gperf +c-stamp: $(srcdir)/c.gperf ../src/gperf -a -p -c -l -S1 -o $(srcdir)/c.gperf > c.cpp + @touch $@ noinst_PROGRAMS += cout @@ -71,7 +79,7 @@ cout_LDADD = \ endif !BUILD_USES_WCHAR -## Makefile.cppinset.am +## Makefile.cppinset.am if !BUILD_USES_WCHAR @@ -79,10 +87,14 @@ BUILT_SOURCES += \ cpp.cpp CLEANFILES += \ - cpp.cpp + cpp.cpp \ + cpp-stamp -cpp.cpp: $(srcdir)/cpp.gperf +cpp.cpp: cpp-stamp + +cpp-stamp: $(srcdir)/cpp.gperf ../src/gperf -a -D $(srcdir)/cpp.gperf > cpp.cpp + @touch $@ noinst_PROGRAMS += cppout @@ -99,7 +111,7 @@ cppout_LDADD = \ endif !BUILD_USES_WCHAR -## Makefile.iinset.am +## Makefile.iinset.am if !BUILD_USES_WCHAR @@ -107,10 +119,14 @@ BUILT_SOURCES += \ idl.cpp CLEANFILES += \ - idl.cpp + idl.cpp \ + idl-stamp + +idl.cpp: idl-stamp -idl.cpp: $(srcdir)/idl.gperf +idl-stamp: $(srcdir)/idl.gperf ../src/gperf -m -M -c -C -D -S1 -E -T -a -o -p $(srcdir)/idl.gperf > idl.cpp + @touch $@ noinst_PROGRAMS += iout @@ -127,7 +143,7 @@ iout_LDADD = \ endif !BUILD_USES_WCHAR -## Makefile.iinset2.am +## Makefile.iinset2.am if !BUILD_USES_WCHAR @@ -135,11 +151,15 @@ BUILT_SOURCES += \ iout2_gen/idl.cpp CLEANFILES += \ - iout2_gen/idl.cpp + iout2_gen/idl.cpp \ + iout2_gen/idl-stamp + +iout2_gen/idl.cpp: iout2_gen/idl-stamp -iout2_gen/idl.cpp: $(srcdir)/idl.gperf +iout2_gen/idl-stamp: $(srcdir)/idl.gperf mkdir -p iout2_gen ../src/gperf -m -M -c -C -D -E -T -a -o -p $(srcdir)/idl.gperf > iout2_gen/idl.cpp + @touch $@ noinst_PROGRAMS += iout2 @@ -156,7 +176,7 @@ iout2_LDADD = \ endif !BUILD_USES_WCHAR -## Makefile.m3inset.am +## Makefile.m3inset.am if !BUILD_USES_WCHAR @@ -164,10 +184,14 @@ BUILT_SOURCES += \ modula3.cpp CLEANFILES += \ - modula3.cpp + modula3.cpp \ + modula3-stamp -modula3.cpp: $(srcdir)/modula3.gperf +modula3.cpp: modula3-stamp + +modula3-stamp: $(srcdir)/modula3.gperf ../src/gperf -a -k1,2,$$ $(srcdir)/modula3.gperf > modula3.cpp + @touch $@ noinst_PROGRAMS += m3out @@ -184,7 +208,7 @@ m3out_LDADD = \ endif !BUILD_USES_WCHAR -## Makefile.pinset.am +## Makefile.pinset.am if !BUILD_USES_WCHAR @@ -192,10 +216,14 @@ BUILT_SOURCES += \ pascal.cpp CLEANFILES += \ - pascal.cpp + pascal.cpp \ + pascal-stamp + +pascal.cpp: pascal-stamp -pascal.cpp: $(srcdir)/pascal.gperf +pascal-stamp: $(srcdir)/pascal.gperf ../src/gperf -a -o -S2 -p $(srcdir)/pascal.gperf > pascal.cpp + @touch $@ noinst_PROGRAMS += pout @@ -212,7 +240,7 @@ pout_LDADD = \ endif !BUILD_USES_WCHAR -## Makefile.preinset.am +## Makefile.preinset.am if !BUILD_USES_WCHAR @@ -220,10 +248,14 @@ BUILT_SOURCES += \ adadefs.cpp CLEANFILES += \ - adadefs.cpp + adadefs.cpp \ + adadefs-stamp -adadefs.cpp: $(srcdir)/adadefs.gperf +adadefs.cpp: adadefs-stamp + +adadefs-stamp: $(srcdir)/adadefs.gperf ../src/gperf -a -p -D -k1,$$ -s 2 -o $(srcdir)/adadefs.gperf > adadefs.cpp + @touch $@ noinst_PROGRAMS += preout @@ -240,7 +272,7 @@ preout_LDADD = \ endif !BUILD_USES_WCHAR -## Makefile.taoinset.am +## Makefile.taoinset.am if !BUILD_USES_WCHAR @@ -248,10 +280,14 @@ BUILT_SOURCES += \ tao.cpp CLEANFILES += \ - tao.cpp + tao.cpp \ + tao-stamp + +tao.cpp: tao-stamp -tao.cpp: $(srcdir)/tao.gperf +tao-stamp: $(srcdir)/tao.gperf ../src/gperf -c -C -D -E -f 0 -a -o $(srcdir)/tao.gperf > tao.cpp + @touch $@ noinst_PROGRAMS += taoout @@ -268,7 +304,7 @@ taoout_LDADD = \ endif !BUILD_USES_WCHAR -## Makefile.tinset.am +## Makefile.tinset.am if !BUILD_USES_WCHAR @@ -276,10 +312,14 @@ BUILT_SOURCES += \ corba.cpp CLEANFILES += \ - corba.cpp + corba.cpp \ + corba-stamp + +corba.cpp: corba-stamp -corba.cpp: $(srcdir)/corba.gperf +corba-stamp: $(srcdir)/corba.gperf ../src/gperf -a -o $(srcdir)/corba.gperf > corba.cpp + @touch $@ noinst_PROGRAMS += tout diff --git a/ACE/apps/mkcsregdb/Makefile.am b/ACE/apps/mkcsregdb/Makefile.am index 8c78d17d238..a08f795e30a 100644 --- a/ACE/apps/mkcsregdb/Makefile.am +++ b/ACE/apps/mkcsregdb/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -15,7 +15,6 @@ ACE_ROOT = $(top_srcdir) ## Makefile.mkcsregdb.am if !BUILD_USES_WCHAR - noinst_PROGRAMS = mkcsregdb mkcsregdb_CPPFLAGS = \ diff --git a/ACE/apps/soreduce/Makefile.am b/ACE/apps/soreduce/Makefile.am index 6b0efcb4b99..4f50d294e0d 100644 --- a/ACE/apps/soreduce/Makefile.am +++ b/ACE/apps/soreduce/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -16,7 +16,6 @@ ACE_ROOT = $(top_srcdir) if !BUILD_ACE_FOR_TAO if !BUILD_USES_WCHAR - noinst_PROGRAMS = soreduce soreduce_CPPFLAGS = \ diff --git a/ACE/bin/FOCUS/ChangeLog b/ACE/bin/FOCUS/ChangeLog index b1c66f1ad67..b5323e5e749 100644 --- a/ACE/bin/FOCUS/ChangeLog +++ b/ACE/bin/FOCUS/ChangeLog @@ -1,33 +1,3 @@ -Wed Dec 20 10:00:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * specializations/Reactor_Family/TP_Reactor.spl: - Removed specialization of Reactor.inl, the added include - is not necessary and causes a circular include problem - -Tue Nov 14 12:57:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * specializations/Wait_Strategy/Wait_On_Leader_Follower.spl: - * FOCUS.pl: - Added new lf specialization - - * specializations/Wait_Strategy/Wait_On_Read.spl: - Updated to work with head - -Tue Nov 14 12:17:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * specializations/Messaging_Strategy/GIOP.spl: - Updated to work with current svn head - -Tue Nov 14 11:30:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * specializations/Reactor_Family/TP_Reactor.spl: - Updated to work with current svn head - -Fri Nov 10 09:38:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> - - * docs/FOCUS.html: - Added tp-reactor reference - Fri Nov 18 17:05:49 2005 Arvind S. Krishna <arvindk@dre.vanderbilt.edu> * specializations/Reactor_Family/Select_Reactor_ST.spl: diff --git a/ACE/bin/FOCUS/FOCUS.pl b/ACE/bin/FOCUS/FOCUS.pl index d1d4e0e2cb6..e82acfe63cc 100755 --- a/ACE/bin/FOCUS/FOCUS.pl +++ b/ACE/bin/FOCUS/FOCUS.pl @@ -48,7 +48,7 @@ sub usage . " \n --prefix-path=<path to module root>" . " [\n --reactor-spl=<select-mt, select-st, tp-reactor>" . " \n --protocol-spl=<iiop>" - . " \n --wait-strategy-spl=<rw, lf>" + . " \n --wait-strategy-spl=<rw>" . " \n --output-prefix=<output path>" . " \n --messaging-spl=<giop>" . " \n --context-specific-optimizations=<dispatch>" @@ -94,7 +94,6 @@ my %specialization_table = ( "giop", $spl_prefix_path . "specializations/Messaging_Strategy/GIOP.spl", "iiop", $spl_prefix_path . "specializations/Protocol_Family/IIOP/iiop.spl", "rw", $spl_prefix_path . "specializations/Wait_Strategy/Wait_On_Read.spl", - "lf", $spl_prefix_path . "specializations/Wait_Strategy/Wait_On_Leader_Follower.spl", "dispatch", $spl_prefix_path . "specializations/Context-Specific-Optimizations/Dispatch-Resolution-Optimization.spl"); # Get the command line options diff --git a/ACE/bin/FOCUS/docs/FOCUS.html b/ACE/bin/FOCUS/docs/FOCUS.html index ca0c85a0a28..6b00dfb020d 100644 --- a/ACE/bin/FOCUS/docs/FOCUS.html +++ b/ACE/bin/FOCUS/docs/FOCUS.html @@ -76,7 +76,7 @@ and specialization: </td> </tr> <tr> - <td>--reactor-spl <em>select-st</em>, <em>select-mt</em>, <em>tp-reactor</em></td> + <td>--reactor-spl <em>select-st</em>, <em>select-mt</em>, <em>tp</em></td> <td>Option to specialize the reactor framework with the concrete reactor type. <p>select-st: select reactor which no locking. Single threaded case.</p> diff --git a/ACE/bin/FOCUS/specializations/Messaging_Strategy/GIOP.spl b/ACE/bin/FOCUS/specializations/Messaging_Strategy/GIOP.spl index eeed13dba37..76e27509848 100644 --- a/ACE/bin/FOCUS/specializations/Messaging_Strategy/GIOP.spl +++ b/ACE/bin/FOCUS/specializations/Messaging_Strategy/GIOP.spl @@ -36,13 +36,6 @@ </file> -<file name="On_Demand_Fragmentation_Strategy.cpp"> - -<!-- Remove Pluggable Messaging include directive --> -<remove>#include "tao/Pluggable_Messaging.h"</remove> - -</file> - <file name="GIOP_Message_Base.h"> <!-- Remove Pluggable Messaging include directive --> @@ -107,7 +100,7 @@ protected: <file name="TAO_Server_Request.cpp"> <!-- Remove Pluggable messaging include altogether --> -<remove>#include "tao/Pluggable_Messaging.h"</remove> +<remove>#include "Pluggable_Messaging.h"</remove> </file> @@ -120,7 +113,7 @@ protected: </file> <file name="Transport.cpp"> - <remove>#include "tao/Pluggable_Messaging.h"</remove> + <remove>#include "Pluggable_Messaging.h"</remove> </file> </module> @@ -150,7 +143,6 @@ protected: <file name="Asynch_Invocation.cpp"> <remove>#include "tao/Pluggable_Messaging.h"</remove> - <replace>#include "tao/GIOP_Message_Base.h"</replace> </file> </module> @@ -178,7 +170,6 @@ protected: <data> ACE_NEW (this->messaging_object_, TAO_GIOP_Message_Base (orb_core, - this, ACE_MAX_DGRAM_SIZE)); </data> </add> @@ -205,7 +196,7 @@ protected: <data> ACE_NEW (this->messaging_object_, TAO_GIOP_Message_Base (orb_core, - this)); + ACE_MAX_DGRAM_SIZE)); </data> </add> @@ -236,7 +227,7 @@ protected: <data> ACE_NEW (this->messaging_object_, TAO_GIOP_Message_Base (orb_core, - this)); + ACE_MAX_DGRAM_SIZE)); </data> </add> <remove>#include "tao/GIOP_Message_Lite.h"</remove> diff --git a/ACE/bin/FOCUS/specializations/Reactor_Family/TP_Reactor.spl b/ACE/bin/FOCUS/specializations/Reactor_Family/TP_Reactor.spl index 48b17f05e60..f25c5fe5416 100644 --- a/ACE/bin/FOCUS/specializations/Reactor_Family/TP_Reactor.spl +++ b/ACE/bin/FOCUS/specializations/Reactor_Family/TP_Reactor.spl @@ -196,10 +196,16 @@ virtual int register_handler (ACE_HANDLE handle, <!-- Remove the Reactor_Timer_Interface include --> <remove>#include "ace/Reactor_Timer_Interface.h"</remove> +</file> + +<!-- Transformations to Reactor.inl --> +<file name="Reactor.inl"> + <add> <hook>REACTOR_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK</hook> <data> -#include "ace/Reactor.h" +// Check if this is necessary +#include "ace/Select_Reactor.h" </data> </add> @@ -326,12 +332,14 @@ ACE_TP_Reactor::register_handler (int signum, <replace>// Dev_Poll_Reactor.cpp</replace> </substitute> + <!-- Do not build the Msg_WFMO_Reactor --> <substitute> <search>Msg_WFMO_Reactor.cpp</search> <replace>// Msg_WFMO_Reactor.cpp</replace> </substitute> + <!-- Do not build the priority Reactor --> <substitute> <search>Priority_Reactor.cpp</search> @@ -374,24 +382,6 @@ ACE_TP_Reactor::register_handler (int signum, </file> -<file name="GUIResource_Factory.cpp"> - -<substitute> - <search>ACE_Reactor_Impl</search> - <replace>ACE_TP_Reactor</replace> -</substitute> - -</file> - -<file name="GUIResource_Factory.h"> - -<substitute> - <search>ACE_Reactor_Impl</search> - <replace>ACE_TP_Reactor</replace> -</substitute> - -</file> - </module> <module name="TAO/tao/Strategies"> diff --git a/ACE/bin/FOCUS/specializations/Wait_Strategy/Wait_On_Leader_Follower.spl b/ACE/bin/FOCUS/specializations/Wait_Strategy/Wait_On_Leader_Follower.spl deleted file mode 100644 index 004ba08fc2d..00000000000 --- a/ACE/bin/FOCUS/specializations/Wait_Strategy/Wait_On_Leader_Follower.spl +++ /dev/null @@ -1,141 +0,0 @@ -<?xml version="1.0"?> - -<!-- Wait Strategy Specialization - * =============================== - * Details all the specialization transformations necessary - * to specialize the Wait_Strategy with the TAO_Wait_On_Leader_Follower strategy - * - * @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu> - * $Id$ ---> - -<transform> - -<module name="TAO/tao"> - -<file name="Wait_Strategy.cpp"> - -<!-- Copy specialized code from the Wait_On_Leader_Follower strategy - to this file --> - -<copy-from-source> - - <!-- Name of the source file from which to copy. In this case, this is - the Wait_On_Read source file --> - <source>Wait_On_Leader_Follower.cpp</source> - - <!-- Copy data between the following hooks defined in the aforementioned - file --> - <copy-hook-start>WAIT_STRATEGY_SPL_COPY_HOOK_START</copy-hook-start> - <copy-hook-end>WAIT_STRATEGY_SPL_COPY_HOOK_END</copy-hook-end> - - <!-- Destination hook in the Wait_Strategy.h file where the code - should be placed --> - <dest-hook>TAO_WAIT_STRATEGY_SPL_ADD_HOOK</dest-hook> - -</copy-from-source> - -<!-- Copy include files to the hook to get the necessary include files --> -<add> - <hook>WAIT_STRATEGY_SPL_COPY_HOOK_START</hook> - <data> -#include "tao/Wait_On_Leader_Follower.h" -#include "tao/LF_Follower.h" -#include "tao/Leader_Follower.h" -#include "tao/Transport.h" -#include "tao/Synch_Reply_Dispatcher.h" -#include "tao/ORB_Core.h" - </data> -</add> - -<!-- Once this is done, replace all occurences of TAO_Wait_On_Leader_Follower with - TAO_Wait_Strategy --> -<substitute> - <search>TAO_Wait_On_Leader_Follower</search> - <replace>TAO_Wait_Strategy</replace> -</substitute> - -<comment> - <start-hook>LF_WAIT_STRATEGY_SPL_COMMENT_HOOK_START</start-hook> - <end-hook>LF_WAIT_STRATEGY_SPL_COMMENT_HOOK_END</end-hook> -</comment> - -<add> - <hook>LF_WAIT_STRATEGY_SPL_SENDING_REQUEST_HOOK</hook> - <data> - return 0; - </data> -</add> - -</file> - -<file name="Wait_Strategy.h"> - -<!-- Remove all occurances of virtual --> -<remove>virtual</remove> -<remove>= 0</remove> - -</file> - -<file name="default_client.cpp"> - -<comment> - <start-hook>WAIT_STRATEGY_SPL_COMMENT_HOOK_START</start-hook> - <end-hook>WAIT_STRATEGY_SPL_COMMENT_HOOK_END</end-hook> -</comment> - -<add> - <hook>WAIT_STRATEGY_SPL_COMMENT_HOOK_END</hook> - <data> - ACE_NEW_RETURN (ws, - TAO_Wait_Strategy (transport), - 0); - </data> -</add> - -</file> - -<file name="tao.mpc"> - -<!-- Do not build the other Wait strategy classes --> -<substitute> - <search>Wait_On_Read.h</search> - <replace>// Wait_On_Read.cpp</replace> -</substitute> -<substitute> - <search>Wait_On_Read.cpp</search> - <replace>// Wait_On_Read.cpp</replace> -</substitute> - -<substitute> - <search>Wait_On_Reactor.h</search> - <replace>// Wait_On_Reactor.cpp</replace> -</substitute> -<substitute> - <search>Wait_On_Reactor.cpp</search> - <replace>// Wait_On_Reactor.cpp</replace> -</substitute> - -<substitute> - <search>Wait_On_Leader_Follower.h</search> - <replace>// Wait_On_Leader_Follower.cpp</replace> -</substitute> -<substitute> - <search>Wait_On_Leader_Follower.cpp</search> - <replace>// Wait_On_Leader_Follower.cpp</replace> -</substitute> - -<substitute> - <search>Wait_On_LF_No_Upcall.h</search> - <replace>// Wait_On_LF_No_Upcall.cpp</replace> -</substitute> -<substitute> - <search>Wait_On_LF_No_Upcall.cpp</search> - <replace>// Wait_On_LF_No_Upcall.cpp</replace> -</substitute> - -</file> - -</module> - -</transform> diff --git a/ACE/bin/FOCUS/specializations/Wait_Strategy/Wait_On_Read.spl b/ACE/bin/FOCUS/specializations/Wait_Strategy/Wait_On_Read.spl index 65d6ff48fe7..ab76b9c8eef 100644 --- a/ACE/bin/FOCUS/specializations/Wait_Strategy/Wait_On_Read.spl +++ b/ACE/bin/FOCUS/specializations/Wait_Strategy/Wait_On_Read.spl @@ -39,12 +39,12 @@ <add> <hook>WAIT_STRATEGY_SPL_COPY_HOOK_START</hook> <data> -#include "tao/Wait_On_Read.h" -#include "tao/Transport.h" -#include "tao/Resume_Handle.h" -#include "tao/Synch_Reply_Dispatcher.h" -#include "tao/Client_Strategy_Factory.h" -#include "tao/ORB_Core.h" +#include "Wait_On_Read.h" +#include "Transport.h" +#include "Resume_Handle.h" +#include "Synch_Reply_Dispatcher.h" +#include "Client_Strategy_Factory.h" +#include "ORB_Core.h" #include "ace/Reactor.h" #include "ace/Countdown_Time.h" </data> @@ -59,32 +59,6 @@ </file> -<file name="Wait_Strategy.h"> - -<!-- Remove all occurances of virtual --> -<remove>virtual</remove> -<remove>= 0</remove> - -</file> - -<file name="default_client.cpp"> - -<comment> - <start-hook>WAIT_STRATEGY_SPL_COMMENT_HOOK_START</start-hook> - <end-hook>WAIT_STRATEGY_SPL_COMMENT_HOOK_END</end-hook> -</comment> - -<add> - <hook>WAIT_STRATEGY_SPL_COMMENT_HOOK_END</hook> - <data> - ACE_NEW_RETURN (ws, - TAO_Wait_Strategy (transport), - 0); - </data> -</add> - -</file> - <file name="tao.mpc"> <!-- Do not build the other Wait strategy classes --> diff --git a/ACE/bin/MakeProjectCreator/config/MPC.cfg b/ACE/bin/MakeProjectCreator/config/MPC.cfg deleted file mode 100644 index f155b2b5ba5..00000000000 --- a/ACE/bin/MakeProjectCreator/config/MPC.cfg +++ /dev/null @@ -1,2 +0,0 @@ -includes = $TAO_ROOT/MPC/config, $CIAO_ROOT/MPC/config, $DDS_ROOT/MPC/config -dynamic_types = $ACE_ROOT/bin/MakeProjectCreator diff --git a/ACE/bin/MakeProjectCreator/config/ace_for_tao.mpb b/ACE/bin/MakeProjectCreator/config/ace_for_tao.mpb index 36b8309f1fc..809140c3fae 100644 --- a/ACE/bin/MakeProjectCreator/config/ace_for_tao.mpb +++ b/ACE/bin/MakeProjectCreator/config/ace_for_tao.mpb @@ -3,7 +3,7 @@ // $Id$ feature(ace_for_tao) { - macros += ACE_LACKS_ACE_TOKEN ACE_LACKS_MSG_WFMO + macros += ACE_LACKS_ACE_TOKEN after += ACE_FOR_TAO libs += ACE_FOR_TAO diff --git a/ACE/bin/MakeProjectCreator/config/acedefaults.mpb b/ACE/bin/MakeProjectCreator/config/acedefaults.mpb index 99cf8d75eec..57348fbca5b 100644 --- a/ACE/bin/MakeProjectCreator/config/acedefaults.mpb +++ b/ACE/bin/MakeProjectCreator/config/acedefaults.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project: ipv6 { +project: zlib, zzip, ipv6 { staticflags += ACE_AS_STATIC_LIBS includes += $(ACE_ROOT) libpaths += $(ACE_ROOT)/lib diff --git a/ACE/bin/MakeProjectCreator/config/acexml.mpb b/ACE/bin/MakeProjectCreator/config/acexml.mpb index 1ff98f3f917..7097de92b92 100644 --- a/ACE/bin/MakeProjectCreator/config/acexml.mpb +++ b/ACE/bin/MakeProjectCreator/config/acexml.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project: zzip, zlib { +project { avoids += ace_for_tao after += ACEXML_Parser ACEXML libs += ACEXML_Parser ACEXML diff --git a/ACE/bin/MakeProjectCreator/config/amh.mpb b/ACE/bin/MakeProjectCreator/config/amh.mpb new file mode 100644 index 00000000000..56648343ec1 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/amh.mpb @@ -0,0 +1,6 @@ +// -*- MPC -*- +// $Id$ + +project: taoidldefaults, messaging { + idlflags += -GH +} diff --git a/ACE/bin/MakeProjectCreator/config/ami.mpb b/ACE/bin/MakeProjectCreator/config/ami.mpb new file mode 100644 index 00000000000..9735a3b293d --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/ami.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : taoidldefaults, messaging { + requires += ami + idlflags += -GC +} diff --git a/ACE/bin/MakeProjectCreator/config/anytypecode.mpb b/ACE/bin/MakeProjectCreator/config/anytypecode.mpb new file mode 100644 index 00000000000..4207be85db8 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/anytypecode.mpb @@ -0,0 +1,9 @@ +// -*- MPC -*- +// $Id$ + +project : taolib, taoidldefaults { + after += AnyTypeCode + libs += TAO_AnyTypeCode + + idlflags -= -Sa -St +} diff --git a/ACE/bin/MakeProjectCreator/config/automake.features b/ACE/bin/MakeProjectCreator/config/automake.features index 77109ba3a07..d78fdef842f 100644 --- a/ACE/bin/MakeProjectCreator/config/automake.features +++ b/ACE/bin/MakeProjectCreator/config/automake.features @@ -30,9 +30,3 @@ ace_xtreactor=1 tao_xtresource=1 wxWindows=1 - -stl=1 -boost=1 -java=1 -zlib=1 -zzip=1 diff --git a/ACE/bin/MakeProjectCreator/config/avoids_ace_for_tao.mpb b/ACE/bin/MakeProjectCreator/config/avoids_ace_for_tao.mpb deleted file mode 100644 index d9a8a0a7fd9..00000000000 --- a/ACE/bin/MakeProjectCreator/config/avoids_ace_for_tao.mpb +++ /dev/null @@ -1,6 +0,0 @@ -// -*- MPC -*- -// $Id$ - -feature(ace_for_tao) { - avoids += ace_for_tao -} diff --git a/ACE/bin/MakeProjectCreator/config/avoids_corba_e_compact.mpb b/ACE/bin/MakeProjectCreator/config/avoids_corba_e_compact.mpb new file mode 100644 index 00000000000..919f0c4c2c2 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/avoids_corba_e_compact.mpb @@ -0,0 +1,6 @@ +// -*- MPC -*- +// $Id$ + +feature(avoids_corba_e_compact) : taoidldefaults { + avoids += corba_e_compact +} diff --git a/ACE/bin/MakeProjectCreator/config/avoids_corba_e_micro.mpb b/ACE/bin/MakeProjectCreator/config/avoids_corba_e_micro.mpb new file mode 100644 index 00000000000..919f0c4c2c2 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/avoids_corba_e_micro.mpb @@ -0,0 +1,6 @@ +// -*- MPC -*- +// $Id$ + +feature(avoids_corba_e_compact) : taoidldefaults { + avoids += corba_e_compact +} diff --git a/ACE/bin/MakeProjectCreator/config/avstreams.mpb b/ACE/bin/MakeProjectCreator/config/avstreams.mpb new file mode 100644 index 00000000000..b48daeacc30 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/avstreams.mpb @@ -0,0 +1,10 @@ +// -*- MPC -*- +// $Id$ + +project: property_serv, naming, qos { + avoids += ace_for_tao + after += AV + libs += TAO_AV + tagchecks += AV +} + diff --git a/ACE/bin/MakeProjectCreator/config/avstreamsexe.mpb b/ACE/bin/MakeProjectCreator/config/avstreamsexe.mpb new file mode 100644 index 00000000000..80ab5507cbf --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/avstreamsexe.mpb @@ -0,0 +1,6 @@ +// -*- MPC -*- +// $Id$ + +project: namingexe, avstreams { +} + diff --git a/ACE/bin/MakeProjectCreator/config/bidir_giop.mpb b/ACE/bin/MakeProjectCreator/config/bidir_giop.mpb new file mode 100644 index 00000000000..55b448e4f6a --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/bidir_giop.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : taolib, pi { + after += BiDir_GIOP + libs += TAO_BiDirGIOP +} diff --git a/ACE/bin/MakeProjectCreator/config/ciao_client_dnc.mpb b/ACE/bin/MakeProjectCreator/config/ciao_client_dnc.mpb new file mode 100644 index 00000000000..5824333c36c --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/ciao_client_dnc.mpb @@ -0,0 +1,9 @@ +// -*- MPC -*- +// $Id$ + +project : security, ifr_client, valuetype, pi, codecfactory { + after += CIAO_DnC_Client + includes += $(CIAO_ROOT) $(CIAO_ROOT)/ciao $(CIAO_ROOT)/DAnCE + idlflags += -I$(CIAO_ROOT) -I$(CIAO_ROOT)/ciao -I$(CIAO_ROOT)/DAnCE + libs += CIAO_DnC_Client +} diff --git a/ACE/bin/MakeProjectCreator/config/ciao_component_dnc.mpb b/ACE/bin/MakeProjectCreator/config/ciao_component_dnc.mpb new file mode 100644 index 00000000000..9cabf46cf83 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/ciao_component_dnc.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : portableserver, ciao_server_dnc, ciao_events_dnc { + after += CIAO_DnC_Container + libs += CIAO_DnC_Container +} diff --git a/ACE/bin/MakeProjectCreator/config/ciao_config_handlers.mpb b/ACE/bin/MakeProjectCreator/config/ciao_config_handlers.mpb new file mode 100644 index 00000000000..69412b873f1 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/ciao_config_handlers.mpb @@ -0,0 +1,25 @@ +// -*- MPC -*- +// $Id$ + +project : ciao_config_handlers_base, dynamicany, typecodefactory { + verbatim(gnuace, macros) { + override no_hidden_visibility = 1 + } + after += CIAO_XML_Utils \ + XSC_DynAny_Handler \ + XSC_Config_Handlers \ + XSC_XML_Handlers \ + RT_CCM_Config_Handlers \ + CIAO_Events_Handlers \ + Package_Config_Handlers \ + XSC_Config_Handlers_Common + + libs += CIAO_XML_Utils \ + XSC_Config_Handlers \ + RT_CCM_Config_Handlers \ + CIAO_Events_Handlers \ + Package_Config_Handlers \ + XSC_XML_Handlers \ + XSC_Config_Handlers_Common \ + XSC_DynAny_Handler +} diff --git a/ACE/bin/MakeProjectCreator/config/ciao_config_handlers_base.mpb b/ACE/bin/MakeProjectCreator/config/ciao_config_handlers_base.mpb new file mode 100644 index 00000000000..9d36eda836b --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/ciao_config_handlers_base.mpb @@ -0,0 +1,13 @@ +// $Id$ + +project : ciao_xml_utils, dynamicany, typecodefactory, exceptions { + after += XSC_XML_Handlers + libs += XSC_XML_Handlers + macros += XML_USE_PTHREADS + includes += $(CIAO_ROOT)/tools/Config_Handlers + + verbatim(gnuace, macros) { + override no_hidden_visibility = 1 + } + +} diff --git a/ACE/bin/MakeProjectCreator/config/ciao_container_dnc.mpb b/ACE/bin/MakeProjectCreator/config/ciao_container_dnc.mpb new file mode 100644 index 00000000000..7875cd5d088 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/ciao_container_dnc.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : portableserver, ciao_client_dnc { + after += CIAO_DnC_Container + libs += CIAO_DnC_Container +} diff --git a/ACE/bin/MakeProjectCreator/config/ciao_deployment_stub.mpb b/ACE/bin/MakeProjectCreator/config/ciao_deployment_stub.mpb new file mode 100644 index 00000000000..45e0fb77341 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/ciao_deployment_stub.mpb @@ -0,0 +1,9 @@ +// -*- MPC -*- +// $Id$ + +project : ciao_client_dnc, ciao_events_base_dnc { + after += Deployment_stub + libs += CIAO_Deployment_stub + includes += $(CIAO_ROOT)/DAnCE + idlflags += -I$(CIAO_ROOT)/DAnCE +} diff --git a/ACE/bin/MakeProjectCreator/config/ciao_deployment_svnt.mpb b/ACE/bin/MakeProjectCreator/config/ciao_deployment_svnt.mpb new file mode 100644 index 00000000000..c62fe02d199 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/ciao_deployment_svnt.mpb @@ -0,0 +1,9 @@ +// -*- MPC -*- +// $Id$ + +project : ciao_deployment_stub, portableserver, ciao_events_dnc { + after += Deployment_svnt + libs += CIAO_Deployment_svnt + includes += $(CIAO_ROOT)/DAnCE/ciao + idlflags += -I$(CIAO_ROOT)/DAnCE +} diff --git a/ACE/bin/MakeProjectCreator/config/ciao_domainapplicationmanager_dnc.mpb b/ACE/bin/MakeProjectCreator/config/ciao_domainapplicationmanager_dnc.mpb new file mode 100644 index 00000000000..31731a84d5d --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/ciao_domainapplicationmanager_dnc.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +project : ciao_deployment_svnt { + includes += $(CIAO_ROOT)/DomainApplicationManager + libs += DomainApplicationManager + after += DomainApplicationManager +} diff --git a/ACE/bin/MakeProjectCreator/config/ciao_events_base_dnc.mpb b/ACE/bin/MakeProjectCreator/config/ciao_events_base_dnc.mpb new file mode 100644 index 00000000000..de2c8d5a7b9 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/ciao_events_base_dnc.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : orbsvcslib, ciao_container_dnc, ciao_client_dnc { + libs += CIAO_DnC_Events_Base + after += CIAO_DnC_Events_Base +} diff --git a/ACE/bin/MakeProjectCreator/config/ciao_events_dnc.mpb b/ACE/bin/MakeProjectCreator/config/ciao_events_dnc.mpb new file mode 100644 index 00000000000..e3c19ae53d1 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/ciao_events_dnc.mpb @@ -0,0 +1,9 @@ +// -*- MPC -*- +// $Id$ + +project : security, ifr_client, valuetype, pi, codecfactory, ciao_container_dnc, ciao_client_dnc, ciao_rtevent_dnc { + includes += $(CIAO_ROOT)/ciaosvcs/Events + idlflags += -I$(CIAO_ROOT)/ciaosvcs/Events + libs += CIAO_DnC_Events + after += CIAO_DnC_Events +} diff --git a/ACE/bin/MakeProjectCreator/config/ciao_executionmanager_stub.mpb b/ACE/bin/MakeProjectCreator/config/ciao_executionmanager_stub.mpb new file mode 100644 index 00000000000..bea046abd2d --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/ciao_executionmanager_stub.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +project : ciao_deployment_stub { + includes += $(CIAO_ROOT)/DAnCE/ExecutionManager + libs += ExecutionManager_stub + after += ExecutionManager_stub +} diff --git a/ACE/bin/MakeProjectCreator/config/ciao_nodeapplicationmanager.mpb b/ACE/bin/MakeProjectCreator/config/ciao_nodeapplicationmanager.mpb new file mode 100644 index 00000000000..d082eb93f04 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/ciao_nodeapplicationmanager.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id + +project : ciao_targetmanager_stub { + includes += $(CIAO_ROOT)/DAnCE/NodeApplicationManager + libs += NodeApplicationManager + after += NodeApplicationManager +} diff --git a/ACE/bin/MakeProjectCreator/config/ciao_nodemanager_stub.mpb b/ACE/bin/MakeProjectCreator/config/ciao_nodemanager_stub.mpb new file mode 100644 index 00000000000..3208af9bd00 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/ciao_nodemanager_stub.mpb @@ -0,0 +1,9 @@ +// -*- MPC -*- +// $Id + +project : ciao_deployment_stub { + includes += $(CIAO_ROOT)/DAnCE/Interfaces + includes += $(CIAO_ROOT)/DAnCE/NodeManager + libs += NodeManager_stub + after += NodeManager_stub +} diff --git a/ACE/bin/MakeProjectCreator/config/ciao_nodemanager_svnt.mpb b/ACE/bin/MakeProjectCreator/config/ciao_nodemanager_svnt.mpb new file mode 100644 index 00000000000..4856402b74b --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/ciao_nodemanager_svnt.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id + +project : ciao_nodemanager_stub { + libs += NodeManager + after += NodeManager_svnt +} diff --git a/ACE/bin/MakeProjectCreator/config/ciao_plan_generator.mpb b/ACE/bin/MakeProjectCreator/config/ciao_plan_generator.mpb new file mode 100644 index 00000000000..e234ead3e67 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/ciao_plan_generator.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +project : ciao_component_dnc { + includes += $(CIAO_ROOT)/DAnCE/Plan_Generator + libs += Plan_Generator + after += Plan_Generator +} diff --git a/ACE/bin/MakeProjectCreator/config/ciao_race_component.mpb b/ACE/bin/MakeProjectCreator/config/ciao_race_component.mpb new file mode 100644 index 00000000000..dc78b44764f --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/ciao_race_component.mpb @@ -0,0 +1,8 @@ +// $Id$ + +project : ciaocidldefaults { + after += RACE_common_stub + libs += RACE_common_stub CIAO_Deployment_stub + includes += $(CIAO_ROOT)/RACE + idlflags += -I$(CIAO_ROOT)/RACE +} diff --git a/ACE/bin/MakeProjectCreator/config/ciao_race_default.mpb b/ACE/bin/MakeProjectCreator/config/ciao_race_default.mpb new file mode 100644 index 00000000000..26f9fb038c5 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/ciao_race_default.mpb @@ -0,0 +1,4 @@ +project : ciaocidldefaults { + includes += $(CIAO_ROOT)/RACE + idlflags += -I$(CIAO_ROOT)/RACE +} diff --git a/ACE/bin/MakeProjectCreator/config/ciao_race_monitor.mpb b/ACE/bin/MakeProjectCreator/config/ciao_race_monitor.mpb new file mode 100644 index 00000000000..7bf423b3d0d --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/ciao_race_monitor.mpb @@ -0,0 +1,4 @@ +project : ciao_race_default { + after += Local_Monitor + libs += Local_Monitor +} diff --git a/ACE/bin/MakeProjectCreator/config/ciao_rtevent_dnc.mpb b/ACE/bin/MakeProjectCreator/config/ciao_rtevent_dnc.mpb new file mode 100644 index 00000000000..0d370eca8d8 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/ciao_rtevent_dnc.mpb @@ -0,0 +1,9 @@ +// -*- MPC -*- +// $Id$ + +project : rtevent_serv, ciao_events_base_dnc { + includes += $(CIAO_ROOT)/ciaosvcs/Events + idlflags += -I$(CIAO_ROOT)/ciaosvcs/Events + libs += CIAO_RTEvent + after += CIAO_RTEvent +} diff --git a/ACE/bin/MakeProjectCreator/config/ciao_servant_dnc.mpb b/ACE/bin/MakeProjectCreator/config/ciao_servant_dnc.mpb new file mode 100644 index 00000000000..6bc5c8d52a0 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/ciao_servant_dnc.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : ciao_component_dnc, ciao_deployment_svnt, ciao_events_dnc, ciaocidldefaults, utils, naming { + after += CIAO_DnC_Server + libs += CIAO_DnC_Server +} diff --git a/ACE/bin/MakeProjectCreator/config/ciao_server_dnc.mpb b/ACE/bin/MakeProjectCreator/config/ciao_server_dnc.mpb new file mode 100644 index 00000000000..380c9d22c90 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/ciao_server_dnc.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : ciao_client_dnc, ciao_deployment_svnt, utils, naming, ciao_events_dnc { + after += CIAO_DnC_Server + libs += CIAO_DnC_Server +} diff --git a/ACE/bin/MakeProjectCreator/config/ciao_static_dnc_app.mpb b/ACE/bin/MakeProjectCreator/config/ciao_static_dnc_app.mpb new file mode 100644 index 00000000000..f6792f1f9eb --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/ciao_static_dnc_app.mpb @@ -0,0 +1,5 @@ +// -*- MPC -*- +// $Id$ + +project : ciao_component_dnc, iortable, ciao_nodeapplicationmanager, ciao_nodemanager_svnt { +} diff --git a/ACE/bin/MakeProjectCreator/config/ciao_targetmanager_stub.mpb b/ACE/bin/MakeProjectCreator/config/ciao_targetmanager_stub.mpb new file mode 100644 index 00000000000..107f41f94a7 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/ciao_targetmanager_stub.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id + +project : ciao_nodemanager_stub { + includes += $(CIAO_ROOT)/DAnCE/TargetManager + libs += TargetManager_stub + after += CIAO_TargetManager_stub +} diff --git a/ACE/bin/MakeProjectCreator/config/ciao_xml_utils.mpb b/ACE/bin/MakeProjectCreator/config/ciao_xml_utils.mpb new file mode 100644 index 00000000000..1167281994f --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/ciao_xml_utils.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +project : xerces, exceptions { + includes += $(CIAO_ROOT)/tools + after += CIAO_XML_Utils + libs += CIAO_XML_Utils +} diff --git a/ACE/bin/MakeProjectCreator/config/ciaocidldefaults.mpb b/ACE/bin/MakeProjectCreator/config/ciaocidldefaults.mpb new file mode 100644 index 00000000000..3521ffebf88 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/ciaocidldefaults.mpb @@ -0,0 +1,24 @@ +// -*- MPC -*- +// $Id$ + +project { + // Set the cidl compiler and flags as template values + specific { + cidlc = $(CIAO_ROOT)/bin/cidlc + cidlc_dep = $(CIAO_ROOT)/bin/cidlc + cidlc_flags = -I $(CIAO_ROOT) -I$(CIAO_ROOT)/DAnCE -I$(CIAO_ROOT)/ciao -I$(TAO_ROOT) -I$(TAO_ROOT)/tao -I$(TAO_ROOT)/orbsvcs + } + + Define_Custom(CIDL) { + automatic = 0 + dependent = $(CIDLC_DEP) + command = $(CIDLC) + commandflags = $(CIDLC_FLAGS) + inputext = .cidl + source_outputext = _svnt.cpp + header_outputext = _svnt.h + generic_outputext = E.idl + keyword cidlflags = commandflags + } + +} diff --git a/ACE/bin/MakeProjectCreator/config/cidlc.mpb b/ACE/bin/MakeProjectCreator/config/cidlc.mpb new file mode 100644 index 00000000000..38fa6d65e0d --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/cidlc.mpb @@ -0,0 +1,15 @@ +// $Id$ + +project: boost_filesystem, boost_regex, exceptions { + requires += cidl + includes += $(CIAO_ROOT) $(CIAO_ROOT)/CCF $(ACE_ROOT)/contrib/utility + libpaths += $(CIAO_ROOT)/CCF/CCF $(ACE_ROOT)/lib + + specific(nmake, vc71, vc8) { + compile_flags += /wd4290 /wd4800 /wd4250 /wd4355 + } + + verbatim(gnuace, top) { + include $(CIAO_ROOT)/CCF/Config.rules + } +} diff --git a/ACE/bin/MakeProjectCreator/config/codecfactory.mpb b/ACE/bin/MakeProjectCreator/config/codecfactory.mpb new file mode 100644 index 00000000000..3d2a4cbdf68 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/codecfactory.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : taolib, anytypecode { + after += CodecFactory + libs += TAO_CodecFactory +} diff --git a/ACE/bin/MakeProjectCreator/config/codeset.mpb b/ACE/bin/MakeProjectCreator/config/codeset.mpb new file mode 100644 index 00000000000..5ed18925513 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/codeset.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project { + after += Codeset + libs += TAO_Codeset +} diff --git a/ACE/bin/MakeProjectCreator/config/concurrency.mpb b/ACE/bin/MakeProjectCreator/config/concurrency.mpb new file mode 100644 index 00000000000..7f93021e1a1 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/concurrency.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +project : orbsvcslib { + after += CosConcurrency + libs += TAO_CosConcurrency + tagchecks += Concurrency +} diff --git a/ACE/bin/MakeProjectCreator/config/concurrency_serv.mpb b/ACE/bin/MakeProjectCreator/config/concurrency_serv.mpb new file mode 100644 index 00000000000..0d1a4092e57 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/concurrency_serv.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : orbsvcslib, concurrency_skel { + after += CosConcurrency_Serv + libs += TAO_CosConcurrency_Serv +} diff --git a/ACE/bin/MakeProjectCreator/config/concurrency_skel.mpb b/ACE/bin/MakeProjectCreator/config/concurrency_skel.mpb new file mode 100644 index 00000000000..0806aa30cbb --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/concurrency_skel.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : orbsvcslib, concurrency, portableserver { + after += CosConcurrency_Skel + libs += TAO_CosConcurrency_Skel +} diff --git a/ACE/bin/MakeProjectCreator/config/corba_e_compact.mpb b/ACE/bin/MakeProjectCreator/config/corba_e_compact.mpb new file mode 100644 index 00000000000..7e7627a4878 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/corba_e_compact.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +feature (corba_e_compact) : taoidldefaults { + macros += CORBA_E_COMPACT + idlflags += -DCORBA_E_COMPACT +} diff --git a/ACE/bin/MakeProjectCreator/config/corba_e_micro.mpb b/ACE/bin/MakeProjectCreator/config/corba_e_micro.mpb new file mode 100644 index 00000000000..5f14ae228b9 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/corba_e_micro.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +feature (corba_e_micro) : taoidldefaults { + macros += CORBA_E_MICRO + idlflags += -DCORBA_E_MICRO +} diff --git a/ACE/bin/MakeProjectCreator/config/corba_messaging.mpb b/ACE/bin/MakeProjectCreator/config/corba_messaging.mpb new file mode 100644 index 00000000000..e2b65dbade4 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/corba_messaging.mpb @@ -0,0 +1,6 @@ +// -*- MPC -*- +// $Id$ + +project { + requires += corba_messaging +} diff --git a/ACE/bin/MakeProjectCreator/config/core_anytypecode.mpb b/ACE/bin/MakeProjectCreator/config/core_anytypecode.mpb new file mode 100755 index 00000000000..dfa65b169aa --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/core_anytypecode.mpb @@ -0,0 +1,9 @@ +// -*- MPC -*- +// $Id$ +// N.B. This project is only intended for use within ORB core mpc files. +// Use anytypecode.mpb in all other circumstances. + +project { + after += AnyTypeCode + libs += TAO_AnyTypeCode +} diff --git a/ACE/bin/MakeProjectCreator/config/core_minimum_corba.mpb b/ACE/bin/MakeProjectCreator/config/core_minimum_corba.mpb new file mode 100644 index 00000000000..dd8dc2f75a4 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/core_minimum_corba.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +feature(minimum_corba) : taoidldefaults { + idlflags += -DTAO_HAS_MINIMUM_POA + macros += TAO_HAS_MINIMUM_CORBA=1 +} diff --git a/ACE/bin/MakeProjectCreator/config/csd_framework.mpb b/ACE/bin/MakeProjectCreator/config/csd_framework.mpb new file mode 100644 index 00000000000..27dd3f56694 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/csd_framework.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +//$Id$ + +project : taolib, portableserver, pi, codecfactory { + after += CSD_Framework + libs += TAO_CSD_Framework +} diff --git a/ACE/bin/MakeProjectCreator/config/csd_pt_test_exe.mpb b/ACE/bin/MakeProjectCreator/config/csd_pt_test_exe.mpb new file mode 100644 index 00000000000..5641add5436 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/csd_pt_test_exe.mpb @@ -0,0 +1,4 @@ +// -*- MPC -*- +//$Id$ +project : csd_pt_testinf_lib, csd_pt_testservant_lib, taoexe, pi { +} diff --git a/ACE/bin/MakeProjectCreator/config/csd_pt_testinf_lib.mpb b/ACE/bin/MakeProjectCreator/config/csd_pt_testinf_lib.mpb new file mode 100644 index 00000000000..0c9a8dffa27 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/csd_pt_testinf_lib.mpb @@ -0,0 +1,9 @@ +// -*- MPC -*- +//$Id$ + +project : csd_threadpool, taolib_with_idl { + after += csd_pt_testinf + includes += $(TAO_ROOT)/performance-tests/CSD_Strategy + libs += CSD_PT_TestInf + idlflags += -I$(TAO_ROOT)/performance-tests/CSD_Strategy +} diff --git a/ACE/bin/MakeProjectCreator/config/csd_pt_testservant_lib.mpb b/ACE/bin/MakeProjectCreator/config/csd_pt_testservant_lib.mpb new file mode 100644 index 00000000000..1eba36eae83 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/csd_pt_testservant_lib.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +//$Id$ + +project : csd_pt_testinf_lib { + after += csd_pt_testservant + libs += CSD_PT_TestServant +} diff --git a/ACE/bin/MakeProjectCreator/config/csd_threadpool.mpb b/ACE/bin/MakeProjectCreator/config/csd_threadpool.mpb new file mode 100644 index 00000000000..6f6cb86f1b2 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/csd_threadpool.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +//$Id$ + +project : csd_framework, threads { + after += CSD_ThreadPool + libs += TAO_CSD_ThreadPool +} diff --git a/ACE/bin/MakeProjectCreator/config/csd_tp_foo_a_lib.mpb b/ACE/bin/MakeProjectCreator/config/csd_tp_foo_a_lib.mpb new file mode 100644 index 00000000000..e9d3edd980e --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/csd_tp_foo_a_lib.mpb @@ -0,0 +1,9 @@ +// -*- MPC -*- +//$Id$ + +project : csd_tp_test_lib { + after += csd_tp_foo_a_lib + includes += $(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A + libs += CSD_TP_Foo_A + libpaths += $(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A +} diff --git a/ACE/bin/MakeProjectCreator/config/csd_tp_foo_b_lib.mpb b/ACE/bin/MakeProjectCreator/config/csd_tp_foo_b_lib.mpb new file mode 100644 index 00000000000..298cd700ece --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/csd_tp_foo_b_lib.mpb @@ -0,0 +1,9 @@ +// -*- MPC -*- +//$Id$ + +project : csd_tp_test_lib { + after += csd_tp_foo_b_lib + includes += $(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_B + libs += CSD_TP_Foo_B + libpaths += $(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_B +} diff --git a/ACE/bin/MakeProjectCreator/config/csd_tp_foo_c_lib.mpb b/ACE/bin/MakeProjectCreator/config/csd_tp_foo_c_lib.mpb new file mode 100644 index 00000000000..4c51d30d318 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/csd_tp_foo_c_lib.mpb @@ -0,0 +1,9 @@ +// -*- MPC -*- +//$Id$ + +project : csd_tp_test_lib { + after += csd_tp_foo_c_lib + includes += $(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_C + libs += CSD_TP_Foo_C + libpaths += $(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_C +} diff --git a/ACE/bin/MakeProjectCreator/config/csd_tp_test_exe_a.mpb b/ACE/bin/MakeProjectCreator/config/csd_tp_test_exe_a.mpb new file mode 100644 index 00000000000..7e1cfa624a8 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/csd_tp_test_exe_a.mpb @@ -0,0 +1,4 @@ +// -*- MPC -*- +//$Id$ +project : csd_tp_foo_a_lib, taoexe { +} diff --git a/ACE/bin/MakeProjectCreator/config/csd_tp_test_exe_b.mpb b/ACE/bin/MakeProjectCreator/config/csd_tp_test_exe_b.mpb new file mode 100644 index 00000000000..c7209d22fc2 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/csd_tp_test_exe_b.mpb @@ -0,0 +1,4 @@ +// -*- MPC -*- +//$Id$ +project : csd_tp_foo_b_lib, taoexe { +} diff --git a/ACE/bin/MakeProjectCreator/config/csd_tp_test_exe_c.mpb b/ACE/bin/MakeProjectCreator/config/csd_tp_test_exe_c.mpb new file mode 100644 index 00000000000..efe525aff98 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/csd_tp_test_exe_c.mpb @@ -0,0 +1,4 @@ +// -*- MPC -*- +//$Id$ +project : csd_tp_foo_c_lib, taoexe { +} diff --git a/ACE/bin/MakeProjectCreator/config/csd_tp_test_lib.mpb b/ACE/bin/MakeProjectCreator/config/csd_tp_test_lib.mpb new file mode 100644 index 00000000000..f5227147178 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/csd_tp_test_lib.mpb @@ -0,0 +1,10 @@ +// -*- MPC -*- +//$Id$ + +project : taolib_with_idl, csd_threadpool, pi { + after += CSD_TP_Test_Lib + includes += $(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common + libs += CSD_TP_Test + libpaths += $(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common + idlflags += -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common +} diff --git a/ACE/bin/MakeProjectCreator/config/dance_extension_stub.mpb b/ACE/bin/MakeProjectCreator/config/dance_extension_stub.mpb new file mode 100644 index 00000000000..4f5353b87bb --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/dance_extension_stub.mpb @@ -0,0 +1,6 @@ +// -*- MPC -*- +// $Id$ + +project : ciao_deployment_stub { + includes += $(CIAO_ROOT)/DAnCE/Interfaces +} diff --git a/ACE/bin/MakeProjectCreator/config/dseventlogadmin.mpb b/ACE/bin/MakeProjectCreator/config/dseventlogadmin.mpb new file mode 100644 index 00000000000..72855e6ced4 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/dseventlogadmin.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +project : orbsvcslib, dslogadmin, event { + after += DsEventLogAdmin + libs += TAO_DsEventLogAdmin + tagchecks += EventLog +} diff --git a/ACE/bin/MakeProjectCreator/config/dseventlogadmin_serv.mpb b/ACE/bin/MakeProjectCreator/config/dseventlogadmin_serv.mpb new file mode 100644 index 00000000000..b8eb9882ad3 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/dseventlogadmin_serv.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : orbsvcslib, dseventlogadmin_skel, dslogadmin_serv, event_serv { + after += DsEventLogAdmin_Serv + libs += TAO_DsEventLogAdmin_Serv +} diff --git a/ACE/bin/MakeProjectCreator/config/dseventlogadmin_skel.mpb b/ACE/bin/MakeProjectCreator/config/dseventlogadmin_skel.mpb new file mode 100644 index 00000000000..5b39b780f82 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/dseventlogadmin_skel.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : orbsvcslib, dseventlogadmin, dslogadmin_skel, event_skel, portableserver { + after += DsEventLogAdmin_Skel + libs += TAO_DsEventLogAdmin_Skel +} diff --git a/ACE/bin/MakeProjectCreator/config/dslogadmin.mpb b/ACE/bin/MakeProjectCreator/config/dslogadmin.mpb new file mode 100644 index 00000000000..0207a0450ff --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/dslogadmin.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +project : orbsvcslib { + after += DsLogAdmin + libs += TAO_DsLogAdmin + tagchecks += Log +} diff --git a/ACE/bin/MakeProjectCreator/config/dslogadmin_serv.mpb b/ACE/bin/MakeProjectCreator/config/dslogadmin_serv.mpb new file mode 100644 index 00000000000..da0d0c7dae7 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/dslogadmin_serv.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : orbsvcslib, dslogadmin_skel, dynamicany, etcl, svc_utils, utils { + after += DsLogAdmin_Serv + libs += TAO_DsLogAdmin_Serv +} diff --git a/ACE/bin/MakeProjectCreator/config/dslogadmin_skel.mpb b/ACE/bin/MakeProjectCreator/config/dslogadmin_skel.mpb new file mode 100644 index 00000000000..7a235c2058c --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/dslogadmin_skel.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : orbsvcslib, dslogadmin, portableserver { + after += DsLogAdmin_Skel + libs += TAO_DsLogAdmin_Skel +} diff --git a/ACE/bin/MakeProjectCreator/config/dsnotifylogadmin.mpb b/ACE/bin/MakeProjectCreator/config/dsnotifylogadmin.mpb new file mode 100644 index 00000000000..fcd49678617 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/dsnotifylogadmin.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : orbsvcslib, dslogadmin, dseventlogadmin, event, notification { + after += DsNotifyLogAdmin + libs += TAO_DsNotifyLogAdmin +} diff --git a/ACE/bin/MakeProjectCreator/config/dsnotifylogadmin_serv.mpb b/ACE/bin/MakeProjectCreator/config/dsnotifylogadmin_serv.mpb new file mode 100644 index 00000000000..6ca347eb674 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/dsnotifylogadmin_serv.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : orbsvcslib, dsnotifylogadmin_skel, dslogadmin_serv, notification_serv { + after += DsNotifyLogAdmin_Serv + libs += TAO_DsNotifyLogAdmin_Serv +} diff --git a/ACE/bin/MakeProjectCreator/config/dsnotifylogadmin_skel.mpb b/ACE/bin/MakeProjectCreator/config/dsnotifylogadmin_skel.mpb new file mode 100644 index 00000000000..401b2ff3d75 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/dsnotifylogadmin_skel.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : orbsvcslib, dsnotifylogadmin, dseventlogadmin_skel, dslogadmin_skel, event_skel, notification_skel, portableserver { + after += DsNotifyLogAdmin_Skel + libs += TAO_DsNotifyLogAdmin_Skel +} diff --git a/ACE/bin/MakeProjectCreator/config/dynamicany.mpb b/ACE/bin/MakeProjectCreator/config/dynamicany.mpb new file mode 100644 index 00000000000..24c60ed00c8 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/dynamicany.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : taolib, anytypecode, valuetype { + after += DynamicAny + libs += TAO_DynamicAny +} diff --git a/ACE/bin/MakeProjectCreator/config/dynamicinterface.mpb b/ACE/bin/MakeProjectCreator/config/dynamicinterface.mpb new file mode 100644 index 00000000000..b2ecd077abe --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/dynamicinterface.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : valuetype, messaging, portableserver { + after += DynamicInterface + libs += TAO_DynamicInterface +} diff --git a/ACE/bin/MakeProjectCreator/config/ec_use_typed_events.mpb b/ACE/bin/MakeProjectCreator/config/ec_use_typed_events.mpb new file mode 100644 index 00000000000..5d0d9adef6f --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/ec_use_typed_events.mpb @@ -0,0 +1,6 @@ +// -*- MPC -*- +// $Id$ + +feature(ec_typed_events) { + macros += TAO_HAS_TYPED_EVENT_CHANNEL +} diff --git a/ACE/bin/MakeProjectCreator/config/ec_use_typed_events_serv.mpb b/ACE/bin/MakeProjectCreator/config/ec_use_typed_events_serv.mpb new file mode 100644 index 00000000000..fedf2d3f1ef --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/ec_use_typed_events_serv.mpb @@ -0,0 +1,5 @@ +// -*- MPC -*- +// $Id$ + +feature(ec_typed_events) : dynamicinterface, ifr_client { +} diff --git a/ACE/bin/MakeProjectCreator/config/endpointpolicy.mpb b/ACE/bin/MakeProjectCreator/config/endpointpolicy.mpb new file mode 100644 index 00000000000..740b240e816 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/endpointpolicy.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : taolib, core, portableserver, pi { + after += EndpointPolicy + libs += TAO_EndpointPolicy +} diff --git a/ACE/bin/MakeProjectCreator/config/etcl.mpb b/ACE/bin/MakeProjectCreator/config/etcl.mpb new file mode 100644 index 00000000000..95e84d4ee9a --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/etcl.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +project : taolib { + after += ETCL + libs += TAO_ETCL + tagchecks += Notify +} diff --git a/ACE/bin/MakeProjectCreator/config/event.mpb b/ACE/bin/MakeProjectCreator/config/event.mpb new file mode 100644 index 00000000000..36f868262fe --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/event.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +project : orbsvcslib, ec_use_typed_events, minimum_corba { + after += CosEvent + libs += TAO_CosEvent + tagchecks += CosEvent +} diff --git a/ACE/bin/MakeProjectCreator/config/event_serv.mpb b/ACE/bin/MakeProjectCreator/config/event_serv.mpb new file mode 100644 index 00000000000..1c536f434b5 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/event_serv.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : orbsvcslib, event_skel, ec_use_typed_events_serv, messaging_optional, naming, svc_utils, minimum_corba { + after += CosEvent_Serv + libs += TAO_CosEvent_Serv +} diff --git a/ACE/bin/MakeProjectCreator/config/event_skel.mpb b/ACE/bin/MakeProjectCreator/config/event_skel.mpb new file mode 100644 index 00000000000..7b21eb7c9db --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/event_skel.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : orbsvcslib, event, ec_use_typed_events, portableserver, minimum_corba { + after += CosEvent_Skel + libs += TAO_CosEvent_Skel +} diff --git a/ACE/bin/MakeProjectCreator/config/fault_tolerance.mpb b/ACE/bin/MakeProjectCreator/config/fault_tolerance.mpb new file mode 100644 index 00000000000..35e964d4df6 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/fault_tolerance.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +project : naming, notification, portablegroup, messaging, ftorb, pi, pi_server { + after += FaultTolerance + libs += TAO_FaultTolerance + tagchecks += FaultTolerance +} diff --git a/ACE/bin/MakeProjectCreator/config/ftclientorb.mpb b/ACE/bin/MakeProjectCreator/config/ftclientorb.mpb new file mode 100644 index 00000000000..126330da041 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/ftclientorb.mpb @@ -0,0 +1,10 @@ +// -*- MPC -*- +// $Id$ + +project : ftorbutils, pi, interceptors { + avoids += ace_for_tao // Requires ace/UUID + after += FT_ClientORB + libs += TAO_FT_ClientORB + requires += ace_uuid + tagchecks += FT_ClientORB +} diff --git a/ACE/bin/MakeProjectCreator/config/ftorb.mpb b/ACE/bin/MakeProjectCreator/config/ftorb.mpb new file mode 100644 index 00000000000..94bafab311a --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/ftorb.mpb @@ -0,0 +1,5 @@ +// -*- MPC -*- +// $Id$ + +project : ftclientorb, ftserverorb { +} diff --git a/ACE/bin/MakeProjectCreator/config/ftorbutils.mpb b/ACE/bin/MakeProjectCreator/config/ftorbutils.mpb new file mode 100644 index 00000000000..f06e082ba2f --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/ftorbutils.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +project : iormanip, portableserver, orbsvcslib, portablegroup, minimum_corba { + after += FTORB_Utils + libs += TAO_FTORB_Utils + tagchecks += FTORB_Utils +} diff --git a/ACE/bin/MakeProjectCreator/config/ftrtevent.mpb b/ACE/bin/MakeProjectCreator/config/ftrtevent.mpb new file mode 100644 index 00000000000..a165bf52c67 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/ftrtevent.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +project : ftorbutils, rtevent_serv, naming, messaging, pi_server, minimum_corba { + after += FtRtEvent + libs += TAO_FtRtEvent + tagchecks += FtRtEvent +} diff --git a/ACE/bin/MakeProjectCreator/config/ftrteventchannel.mpb b/ACE/bin/MakeProjectCreator/config/ftrteventchannel.mpb new file mode 100644 index 00000000000..ca9cfdc46f7 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/ftrteventchannel.mpb @@ -0,0 +1,9 @@ +// -*- MPC -*- +// $Id$ + +project : ftrtevent, utils, corba_messaging, pi_server { + after += FTRT_EventChannel + libs += TAO_FTRT_EventChannel + includes += $(TAO_ROOT)/orbsvcs/FtRtEvent/EventChannel + tagchecks += FTRT_EventChannel +} diff --git a/ACE/bin/MakeProjectCreator/config/ftrteventclient.mpb b/ACE/bin/MakeProjectCreator/config/ftrteventclient.mpb new file mode 100644 index 00000000000..a25da42abaf --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/ftrteventclient.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +project : ftclientorb, ftrtevent { + after += FTRT_ClientORB + libs += TAO_FTRT_ClientORB + tagchecks += FTRT_ClientORB +}
\ No newline at end of file diff --git a/ACE/bin/MakeProjectCreator/config/ftserverorb.mpb b/ACE/bin/MakeProjectCreator/config/ftserverorb.mpb new file mode 100644 index 00000000000..5d1b388707f --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/ftserverorb.mpb @@ -0,0 +1,9 @@ +// -*- MPC -*- +// $Id$ + +project : ftorbutils, portablegroup, pi_server, interceptors { + after += FT_ServerORB + libs += TAO_FT_ServerORB + tagchecks += FT_ServerORB +} + diff --git a/ACE/bin/MakeProjectCreator/config/global.features b/ACE/bin/MakeProjectCreator/config/global.features index 975a1baad49..099d5403b20 100644 --- a/ACE/bin/MakeProjectCreator/config/global.features +++ b/ACE/bin/MakeProjectCreator/config/global.features @@ -36,9 +36,9 @@ ipv6 = 0 mfc = 0 rpc = 0 sctp = 0 -boost = 0 dummy_label = 0 cidl = 0 +boost = 0 wince = 0 uses_wchar = 0 ziparchive = 0 @@ -103,7 +103,8 @@ ZIP_Wrapper = 0 // Feature for CORBA subsets corba_e_compact = 0 -corba_e_micro = 0 +corba_e_micro = 0 +minimum_corba = 0 // Option to disable iiop tao_no_iiop = 0 diff --git a/ACE/bin/MakeProjectCreator/config/htiop.mpb b/ACE/bin/MakeProjectCreator/config/htiop.mpb new file mode 100644 index 00000000000..cbeec43da74 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/htiop.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +project : htbp { + after += HTIOP + libs += TAO_HTIOP + tagchecks += HTIOP +} diff --git a/ACE/bin/MakeProjectCreator/config/ifr_client.mpb b/ACE/bin/MakeProjectCreator/config/ifr_client.mpb new file mode 100644 index 00000000000..89cee167fd2 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/ifr_client.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : taolib, anytypecode { + libs += TAO_IFR_Client + after += IFR_Client +} diff --git a/ACE/bin/MakeProjectCreator/config/ifrservice.mpb b/ACE/bin/MakeProjectCreator/config/ifrservice.mpb new file mode 100644 index 00000000000..a580d2d0660 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/ifrservice.mpb @@ -0,0 +1,9 @@ +// -*- MPC -*- +// $Id$ + +project : iortable, svc_utils, typecodefactory, pi_server, minimum_corba { + avoids += ace_for_tao // Requires ace/Configuration + after += IFRService + libs += TAO_IFRService + tagchecks += IFRService +} diff --git a/ACE/bin/MakeProjectCreator/config/imr_activator.mpb b/ACE/bin/MakeProjectCreator/config/imr_activator.mpb new file mode 100644 index 00000000000..d3363a4ec1b --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/imr_activator.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : minimum_corba { + after += ImR_Activator + libs += TAO_ImR_Activator +} diff --git a/ACE/bin/MakeProjectCreator/config/imr_client.mpb b/ACE/bin/MakeProjectCreator/config/imr_client.mpb new file mode 100644 index 00000000000..41f5d7eb480 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/imr_client.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : taolib { + libs += TAO_ImR_Client + after += ImR_Client +} diff --git a/ACE/bin/MakeProjectCreator/config/imr_locator.mpb b/ACE/bin/MakeProjectCreator/config/imr_locator.mpb new file mode 100644 index 00000000000..21068dfa9ca --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/imr_locator.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : orbsvcsexe, minimum_corba { + after += ImR_Locator + libs += TAO_ImR_Locator +} diff --git a/ACE/bin/MakeProjectCreator/config/interceptors.mpb b/ACE/bin/MakeProjectCreator/config/interceptors.mpb new file mode 100644 index 00000000000..eda8c6d1bc3 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/interceptors.mpb @@ -0,0 +1,6 @@ +// -*- MPC -*- +// $Id$ + +project { + requires += interceptors +} diff --git a/ACE/bin/MakeProjectCreator/config/iorinterceptor.mpb b/ACE/bin/MakeProjectCreator/config/iorinterceptor.mpb new file mode 100644 index 00000000000..d55e844d244 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/iorinterceptor.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : taolib, portableserver, pi, objreftemplate, valuetype { + after += IORInterceptor + libs += TAO_IORInterceptor +} diff --git a/ACE/bin/MakeProjectCreator/config/iormanip.mpb b/ACE/bin/MakeProjectCreator/config/iormanip.mpb new file mode 100644 index 00000000000..7fd064393ef --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/iormanip.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : taolib, anytypecode { + after += IORManipulation + libs += TAO_IORManip +} diff --git a/ACE/bin/MakeProjectCreator/config/iortable.mpb b/ACE/bin/MakeProjectCreator/config/iortable.mpb new file mode 100644 index 00000000000..c8795c0d2b9 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/iortable.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : taolib { + after += IORTable + libs += TAO_IORTable +} diff --git a/ACE/bin/MakeProjectCreator/config/ipv6.mpb b/ACE/bin/MakeProjectCreator/config/ipv6.mpb index 60ceabf96f0..08ab8437535 100755 --- a/ACE/bin/MakeProjectCreator/config/ipv6.mpb +++ b/ACE/bin/MakeProjectCreator/config/ipv6.mpb @@ -2,7 +2,7 @@ // $Id$ feature(ipv6) { - specific(vc6, vc7, vc71, vc8, nmake, borland, bmake, bds4) { + specific(vc6, vc7, vc71, vc8, nmake, borland, bmake, cbx) { lit_libs += iphlpapi } diff --git a/ACE/bin/MakeProjectCreator/config/kokyu_dsrt_scheduler_client.mpb b/ACE/bin/MakeProjectCreator/config/kokyu_dsrt_scheduler_client.mpb new file mode 100644 index 00000000000..fdab6656196 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/kokyu_dsrt_scheduler_client.mpb @@ -0,0 +1,5 @@ +// -*- MPC -*- +// $Id$ + +project : taoclient, kokyu_dsrt_schedulers { +} diff --git a/ACE/bin/MakeProjectCreator/config/kokyu_dsrt_scheduler_server.mpb b/ACE/bin/MakeProjectCreator/config/kokyu_dsrt_scheduler_server.mpb new file mode 100644 index 00000000000..9277bc2c867 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/kokyu_dsrt_scheduler_server.mpb @@ -0,0 +1,5 @@ +// -*- MPC -*- +// $Id$ + +project: taoserver, kokyu_dsrt_schedulers { +} diff --git a/ACE/bin/MakeProjectCreator/config/kokyu_dsrt_schedulers.mpb b/ACE/bin/MakeProjectCreator/config/kokyu_dsrt_schedulers.mpb new file mode 100644 index 00000000000..7974628140c --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/kokyu_dsrt_schedulers.mpb @@ -0,0 +1,12 @@ +// -*- MPC -*- +// $Id$ + +project: codecfactory, rtcorba, kokyu, rtscheduling { + after += Kokyu_DSRT_Schedulers + libs += Kokyu_DSRT_Schedulers + includes += $(TAO_ROOT)/examples/Kokyu_dsrt_schedulers + + specific(automake) { + includes += $(TAO_BUILDDIR)/examples/Kokyu_dsrt_schedulers + } +} diff --git a/ACE/bin/MakeProjectCreator/config/lifecycle.mpb b/ACE/bin/MakeProjectCreator/config/lifecycle.mpb new file mode 100644 index 00000000000..db47576564a --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/lifecycle.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +project : naming, portableserver { + libs += TAO_CosLifeCycle + after += CosLifeCycle + tagchecks += LifeCycle +} diff --git a/ACE/bin/MakeProjectCreator/config/loadbalancing.mpb b/ACE/bin/MakeProjectCreator/config/loadbalancing.mpb new file mode 100644 index 00000000000..edd897f4798 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/loadbalancing.mpb @@ -0,0 +1,9 @@ +// -*- MPC -*- +// $Id$ + +project : messaging, naming, portablegroup, pi, pi_server, iorinterceptor { + libs += TAO_CosLoadBalancing + after += CosLoadBalancing + tagchecks += CosLoadBalancing + requires += ami +} diff --git a/ACE/bin/MakeProjectCreator/config/messaging.mpb b/ACE/bin/MakeProjectCreator/config/messaging.mpb new file mode 100644 index 00000000000..2de4ac8046c --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/messaging.mpb @@ -0,0 +1,6 @@ +// -*- MPC -*- +// $Id$ + +project : valuetype, portableserver, pi, corba_messaging, messaging_optional { + after += Messaging +} diff --git a/ACE/bin/MakeProjectCreator/config/messaging_optional.mpb b/ACE/bin/MakeProjectCreator/config/messaging_optional.mpb new file mode 100644 index 00000000000..ee8637a4d1b --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/messaging_optional.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +feature(corba_messaging) : valuetype, portableserver, pi { + libs += TAO_Messaging + after += Messaging +} + diff --git a/ACE/bin/MakeProjectCreator/config/minimum_corba.mpb b/ACE/bin/MakeProjectCreator/config/minimum_corba.mpb new file mode 100644 index 00000000000..be960c02b54 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/minimum_corba.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +feature(minimum_corba) : taoidldefaults { + avoids += minimum_corba + idlflags += -DTAO_HAS_MINIMUM_POA + macros += TAO_HAS_MINIMUM_CORBA=1 +} diff --git a/ACE/bin/MakeProjectCreator/config/naming.mpb b/ACE/bin/MakeProjectCreator/config/naming.mpb new file mode 100644 index 00000000000..a1f4d3b6014 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/naming.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +project : orbsvcslib { + after += CosNaming + libs += TAO_CosNaming + tagchecks += Naming +} diff --git a/ACE/bin/MakeProjectCreator/config/naming_serv.mpb b/ACE/bin/MakeProjectCreator/config/naming_serv.mpb new file mode 100644 index 00000000000..7b1e8caf783 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/naming_serv.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +project : orbsvcslib, naming_skel, iortable, messaging_optional, svc_utils { + avoids += ace_for_tao // Requires MMAP_Memory_Pool + after += CosNaming_Serv + libs += TAO_CosNaming_Serv +} diff --git a/ACE/bin/MakeProjectCreator/config/naming_skel.mpb b/ACE/bin/MakeProjectCreator/config/naming_skel.mpb new file mode 100644 index 00000000000..18e010ed2a0 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/naming_skel.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : orbsvcslib, naming, portableserver { + after += CosNaming_Skel + libs += TAO_CosNaming_Skel +} diff --git a/ACE/bin/MakeProjectCreator/config/namingexe.mpb b/ACE/bin/MakeProjectCreator/config/namingexe.mpb new file mode 100644 index 00000000000..dd564b37aab --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/namingexe.mpb @@ -0,0 +1,5 @@ +// -*- MPC -*- +// $Id$ + +project : orbsvcsexe, naming { +} diff --git a/ACE/bin/MakeProjectCreator/config/negotiate_codesets.mpb b/ACE/bin/MakeProjectCreator/config/negotiate_codesets.mpb new file mode 100644 index 00000000000..52e80a81b22 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/negotiate_codesets.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +feature(negotiate_codesets) { + after += Codeset + libs += TAO_Codeset +} diff --git a/ACE/bin/MakeProjectCreator/config/notification.mpb b/ACE/bin/MakeProjectCreator/config/notification.mpb new file mode 100644 index 00000000000..4893c915927 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/notification.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +project : orbsvcslib, event { + after += CosNotification + libs += TAO_CosNotification + tagchecks += Notify +} diff --git a/ACE/bin/MakeProjectCreator/config/notification_serv.mpb b/ACE/bin/MakeProjectCreator/config/notification_serv.mpb new file mode 100644 index 00000000000..08198cb5825 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/notification_serv.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : orbsvcslib, svc_utils, notification_skel, etcl, dynamicany { + after += CosNotification_Serv + libs += TAO_CosNotification_Serv +} diff --git a/ACE/bin/MakeProjectCreator/config/notification_skel.mpb b/ACE/bin/MakeProjectCreator/config/notification_skel.mpb new file mode 100644 index 00000000000..bba3b2453ee --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/notification_skel.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : orbsvcslib, notification, event_skel, portableserver { + after += CosNotification_Skel + libs += TAO_CosNotification_Skel +} diff --git a/ACE/bin/MakeProjectCreator/config/notify.mpb b/ACE/bin/MakeProjectCreator/config/notify.mpb new file mode 100644 index 00000000000..e9f226cf312 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/notify.mpb @@ -0,0 +1,4 @@ +// $Id$ + +project : notification { +} diff --git a/ACE/bin/MakeProjectCreator/config/notify_serv.mpb b/ACE/bin/MakeProjectCreator/config/notify_serv.mpb new file mode 100644 index 00000000000..e8360b407c5 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/notify_serv.mpb @@ -0,0 +1,10 @@ +// -*- MPC -*- +// $Id$ +// NOTE: this is for *users* of CosNotification_serv. Use +// Notification_serv.mpb to build CosNotification_serv. + +project : orbsvcslib, notification, event_serv, etcl, dynamicany { + after += CosNotification_Serv + libs += TAO_CosNotification_Serv + libs += TAO_CosNotification_Skel +} diff --git a/ACE/bin/MakeProjectCreator/config/notifytest.mpb b/ACE/bin/MakeProjectCreator/config/notifytest.mpb new file mode 100644 index 00000000000..be766db59e0 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/notifytest.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +project: orbsvcsexe, notification, notification_skel, notification_serv, naming, svc_utils, event_serv, ifr_client, dynamicinterface, messaging, pi, codecfactory, valuetype { + after += NotifyTests_Lib + libs += TAO_NotifyTests + includes += $(TAO_ROOT)/orbsvcs/tests/Notify/lib +} diff --git a/ACE/bin/MakeProjectCreator/config/objreftemplate.mpb b/ACE/bin/MakeProjectCreator/config/objreftemplate.mpb new file mode 100644 index 00000000000..e887919b2c7 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/objreftemplate.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : portableserver, valuetype { + after += ObjRefTemplate + libs += TAO_ObjRefTemplate +} diff --git a/ACE/bin/MakeProjectCreator/config/orbsvcs_output.mpb b/ACE/bin/MakeProjectCreator/config/orbsvcs_output.mpb new file mode 100644 index 00000000000..95d1feb1d9c --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/orbsvcs_output.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +project { + // We tested with all orbsvcs libs going to $(TAO_ROOT)/orbsvcs/lib, but + // decided that it was easier to deal with all libs in one place. + libout = $(ACE_ROOT)/lib +} diff --git a/ACE/bin/MakeProjectCreator/config/orbsvcsexe.mpb b/ACE/bin/MakeProjectCreator/config/orbsvcsexe.mpb new file mode 100644 index 00000000000..b4521e70641 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/orbsvcsexe.mpb @@ -0,0 +1,5 @@ +// -*- MPC -*- +// $Id$ + +project : taoexe, negotiate_codesets, anytypecode { +} diff --git a/ACE/bin/MakeProjectCreator/config/orbsvcslib.mpb b/ACE/bin/MakeProjectCreator/config/orbsvcslib.mpb new file mode 100644 index 00000000000..80575b1d459 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/orbsvcslib.mpb @@ -0,0 +1,12 @@ +// -*- MPC -*- +// $Id$ + +project : taolib_with_idl, orbsvcs_output, anytypecode { + tagname = TAO_ORBSVCS + includes += $(TAO_ROOT)/orbsvcs + idlflags += -I$(TAO_ROOT)/orbsvcs -GT + + specific(automake) { + includes += $(TAO_BUILDDIR)/orbsvcs + } +} diff --git a/ACE/bin/MakeProjectCreator/config/pi.mpb b/ACE/bin/MakeProjectCreator/config/pi.mpb new file mode 100644 index 00000000000..ec5eee5f587 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/pi.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : taolib, codecfactory { + after += PI + libs += TAO_PI +} diff --git a/ACE/bin/MakeProjectCreator/config/pi_server.mpb b/ACE/bin/MakeProjectCreator/config/pi_server.mpb new file mode 100644 index 00000000000..fe48f397cfe --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/pi_server.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : taolib, pi, portableserver { + after += PI_Server + libs += TAO_PI_Server +} diff --git a/ACE/bin/MakeProjectCreator/config/pidl.mpb b/ACE/bin/MakeProjectCreator/config/pidl.mpb new file mode 100644 index 00000000000..d9c507e5249 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/pidl.mpb @@ -0,0 +1,9 @@ +// -*- MPC -*- +// $Id$ + +project { + Define_Custom(PIDL) { + automatic = 1 + inputext = .pidl + } +} diff --git a/ACE/bin/MakeProjectCreator/config/portablegroup.mpb b/ACE/bin/MakeProjectCreator/config/portablegroup.mpb new file mode 100644 index 00000000000..351cbcb67c1 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/portablegroup.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +project : naming, messaging, minimum_corba, iormanip { + libs += TAO_PortableGroup + after += PortableGroup + tagchecks += PortableGroup +} diff --git a/ACE/bin/MakeProjectCreator/config/portableserver.mpb b/ACE/bin/MakeProjectCreator/config/portableserver.mpb new file mode 100644 index 00000000000..2fc99e7a876 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/portableserver.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : taolib, anytypecode { + after += PortableServer + libs += TAO_PortableServer +} diff --git a/ACE/bin/MakeProjectCreator/config/property.mpb b/ACE/bin/MakeProjectCreator/config/property.mpb new file mode 100644 index 00000000000..a2e1c197764 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/property.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +project : orbsvcslib { + after += CosProperty + libs += TAO_CosProperty + tagchecks += Property +} diff --git a/ACE/bin/MakeProjectCreator/config/property_serv.mpb b/ACE/bin/MakeProjectCreator/config/property_serv.mpb new file mode 100644 index 00000000000..95588edd33a --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/property_serv.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : orbsvcslib, property_skel { + after += CosProperty_Serv + libs += TAO_CosProperty_Serv +} diff --git a/ACE/bin/MakeProjectCreator/config/property_skel.mpb b/ACE/bin/MakeProjectCreator/config/property_skel.mpb new file mode 100644 index 00000000000..6904c4f9cbc --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/property_skel.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : orbsvcslib, property, portableserver { + after += CosProperty_Skel + libs += TAO_CosProperty_Skel +} diff --git a/ACE/bin/MakeProjectCreator/config/psdl.mpb b/ACE/bin/MakeProjectCreator/config/psdl.mpb new file mode 100644 index 00000000000..fcc0e4edaa2 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/psdl.mpb @@ -0,0 +1,19 @@ +// -*- MPC -*- +// $Id$ + +project { + after += PSDL_Parser PSDL PSDL_Datastore + libs += TAO_PSDL TAO_PSDL_Datastore + + Define_Custom(PSDL) { + dependent = $(TAO_ROOT)/orbsvcs/PSS/psdl_tao + command = $(TAO_ROOT)/orbsvcs/PSS/psdl_tao + libpath = $(ACE_ROOT)/lib + inputext = .psdl + source_outputext = .cpp + header_outputext = .h + inline_outputext = .i + // unlike idl, the psdl compiler doesn't seem to generate *S.* files. + pre_extension = C + } +}
\ No newline at end of file diff --git a/ACE/bin/MakeProjectCreator/config/rt_client.mpb b/ACE/bin/MakeProjectCreator/config/rt_client.mpb new file mode 100644 index 00000000000..5f8981e1035 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/rt_client.mpb @@ -0,0 +1,5 @@ +// -*- MPC -*- +// $Id$ + +project : taoexe, negotiate_codesets, rtcorba { +} diff --git a/ACE/bin/MakeProjectCreator/config/rt_server.mpb b/ACE/bin/MakeProjectCreator/config/rt_server.mpb new file mode 100644 index 00000000000..6449c3d7762 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/rt_server.mpb @@ -0,0 +1,5 @@ +// -*- MPC -*- +// $Id$ + +project : taoexe, negotiate_codesets, rtportableserver, rtcorba { +} diff --git a/ACE/bin/MakeProjectCreator/config/rtcorba.mpb b/ACE/bin/MakeProjectCreator/config/rtcorba.mpb new file mode 100644 index 00000000000..4068c3bcce9 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/rtcorba.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +project : taolib, pi { + after += RTCORBA + libs += TAO_RTCORBA + requires += rt_corba +} diff --git a/ACE/bin/MakeProjectCreator/config/rtcorbacommon.mpb b/ACE/bin/MakeProjectCreator/config/rtcorbacommon.mpb new file mode 100644 index 00000000000..12251e5c162 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/rtcorbacommon.mpb @@ -0,0 +1,13 @@ +// -*- MPC -*- +// $Id$ + +project : portableserver, minimum_corba { + after += RTCORBA_Common + libs += RTCORBA_Common + + specific (automake) { + includes += $(srcdir)/../Common + } + + includes += ../Common +} diff --git a/ACE/bin/MakeProjectCreator/config/rtcorbaevent.mpb b/ACE/bin/MakeProjectCreator/config/rtcorbaevent.mpb new file mode 100644 index 00000000000..f085b540b53 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/rtcorbaevent.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +project : rtportableserver, rtevent_serv, naming { + after += RTCORBAEvent + libs += TAO_RTCORBAEvent + tagchecks += RTCORBAEvent +} diff --git a/ACE/bin/MakeProjectCreator/config/rtcosscheduling.mpb b/ACE/bin/MakeProjectCreator/config/rtcosscheduling.mpb new file mode 100644 index 00000000000..fabb84f7dd8 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/rtcosscheduling.mpb @@ -0,0 +1,9 @@ +// -*- MPC -*- +// $Id$ + +project : rtportableserver, interceptors, codecfactory, orbsvcslib { + after += RTCosScheduling + libs += TAO_RTCosScheduling + tagchecks += RTCosScheduling + requires += dummy_label +} diff --git a/ACE/bin/MakeProjectCreator/config/rtevent.mpb b/ACE/bin/MakeProjectCreator/config/rtevent.mpb new file mode 100644 index 00000000000..7383523938a --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/rtevent.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +project : messaging, svc_utils { + after += RTEvent + libs += TAO_RTEvent + tagchecks += RTEvent +} diff --git a/ACE/bin/MakeProjectCreator/config/rtevent_serv.mpb b/ACE/bin/MakeProjectCreator/config/rtevent_serv.mpb new file mode 100644 index 00000000000..60a356c41cc --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/rtevent_serv.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +project : orbsvcslib, rtevent_skel { + avoids += ace_for_tao // Requires ACE_crc32 + after += RTEvent_Serv + libs += TAO_RTEvent_Serv +} diff --git a/ACE/bin/MakeProjectCreator/config/rtevent_skel.mpb b/ACE/bin/MakeProjectCreator/config/rtevent_skel.mpb new file mode 100644 index 00000000000..ba53e2ae8bc --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/rtevent_skel.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : orbsvcslib, rtevent, portableserver { + after += RTEvent_Skel + libs += TAO_RTEvent_Skel +} diff --git a/ACE/bin/MakeProjectCreator/config/rteventexe.mpb b/ACE/bin/MakeProjectCreator/config/rteventexe.mpb new file mode 100644 index 00000000000..6f2dc9d6f02 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/rteventexe.mpb @@ -0,0 +1,5 @@ +// -*- MPC -*- +// $Id$ + +project: orbsvcsexe, rtevent_skel { +} diff --git a/ACE/bin/MakeProjectCreator/config/rteventlogadmin.mpb b/ACE/bin/MakeProjectCreator/config/rteventlogadmin.mpb new file mode 100644 index 00000000000..4150b18e7e7 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/rteventlogadmin.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +project : orbsvcslib, dslogadmin, rtevent { + after += RTEventLogAdmin + libs += TAO_RTEventLogAdmin + tagchecks += RTEventLog +} diff --git a/ACE/bin/MakeProjectCreator/config/rteventlogadmin_serv.mpb b/ACE/bin/MakeProjectCreator/config/rteventlogadmin_serv.mpb new file mode 100644 index 00000000000..dbc14cf067f --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/rteventlogadmin_serv.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : orbsvcslib, rteventlogadmin_skel, dslogadmin_serv, rtevent_serv, rtsched { + after += RTEventLogAdmin_Serv + libs += TAO_RTEventLogAdmin_Serv +} diff --git a/ACE/bin/MakeProjectCreator/config/rteventlogadmin_skel.mpb b/ACE/bin/MakeProjectCreator/config/rteventlogadmin_skel.mpb new file mode 100644 index 00000000000..920e65f4ab6 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/rteventlogadmin_skel.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : orbsvcslib, rteventlogadmin, dslogadmin_skel, rtevent_skel, portableserver { + after += RTEventLogAdmin_Skel + libs += TAO_RTEventLogAdmin_Skel +} diff --git a/ACE/bin/MakeProjectCreator/config/rtkokyuevent.mpb b/ACE/bin/MakeProjectCreator/config/rtkokyuevent.mpb new file mode 100644 index 00000000000..a57c8b8017c --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/rtkokyuevent.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +project : rtevent, rtsched, kokyu { + after += RTKokyuEvent + libs += TAO_RTKokyuEvent + tagchecks += RTKokyuEvent +} diff --git a/ACE/bin/MakeProjectCreator/config/rtnotify.mpb b/ACE/bin/MakeProjectCreator/config/rtnotify.mpb new file mode 100644 index 00000000000..1a04eb83922 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/rtnotify.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +project : notification_serv, rtcorba { + after += RT_Notification + libs += TAO_RT_Notification + tagchecks += RT_Notify +} diff --git a/ACE/bin/MakeProjectCreator/config/rtportableserver.mpb b/ACE/bin/MakeProjectCreator/config/rtportableserver.mpb new file mode 100644 index 00000000000..ee3d17fe942 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/rtportableserver.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : pi, portableserver, rtcorba { + after += RTPortableServer + libs += TAO_RTPortableServer +} diff --git a/ACE/bin/MakeProjectCreator/config/rtsched.mpb b/ACE/bin/MakeProjectCreator/config/rtsched.mpb new file mode 100644 index 00000000000..bb435139cf7 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/rtsched.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +project : naming, svc_utils { + after += RTSched + libs += TAO_RTSched + tagchecks += Sched +} diff --git a/ACE/bin/MakeProjectCreator/config/rtschedevent.mpb b/ACE/bin/MakeProjectCreator/config/rtschedevent.mpb new file mode 100644 index 00000000000..9c03534d9e0 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/rtschedevent.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +project : rtsched, rtevent { + after += RTSchedEvent + libs += TAO_RTSchedEvent + tagchecks += RTSchedEvent +} diff --git a/ACE/bin/MakeProjectCreator/config/rtscheduling.mpb b/ACE/bin/MakeProjectCreator/config/rtscheduling.mpb new file mode 100644 index 00000000000..a746dc72693 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/rtscheduling.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : rtcorba, portableserver, pi, pi_server { + after += RTScheduler + libs += TAO_RTScheduler +} diff --git a/ACE/bin/MakeProjectCreator/config/rtscheduling_client.mpb b/ACE/bin/MakeProjectCreator/config/rtscheduling_client.mpb new file mode 100644 index 00000000000..c026daffbdc --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/rtscheduling_client.mpb @@ -0,0 +1,5 @@ +// -*- MPC -*- +// $Id$ + +project : rt_client, rtscheduling { +} diff --git a/ACE/bin/MakeProjectCreator/config/rtscheduling_server.mpb b/ACE/bin/MakeProjectCreator/config/rtscheduling_server.mpb new file mode 100644 index 00000000000..06b97cea148 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/rtscheduling_server.mpb @@ -0,0 +1,5 @@ +// -*- MPC -*- +// $Id$ + +project : rt_server, rtscheduling { +} diff --git a/ACE/bin/MakeProjectCreator/config/security.mpb b/ACE/bin/MakeProjectCreator/config/security.mpb new file mode 100644 index 00000000000..8a192c2d077 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/security.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +project : interceptors, portableserver, valuetype, corba_messaging, orbsvcslib, pi { + after += Security + libs += TAO_Security + tagchecks += Security +} diff --git a/ACE/bin/MakeProjectCreator/config/smart_proxies.mpb b/ACE/bin/MakeProjectCreator/config/smart_proxies.mpb new file mode 100644 index 00000000000..b1fc95d4b6c --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/smart_proxies.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +project: taolib_with_idl { + after += SmartProxies + libs += TAO_SmartProxies + idlflags += -Gsp +} diff --git a/ACE/bin/MakeProjectCreator/config/ssliop.mpb b/ACE/bin/MakeProjectCreator/config/ssliop.mpb new file mode 100644 index 00000000000..3ccf7b3e877 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/ssliop.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +project: interceptors, security, portableserver, ssl, pi_server { + after += SSLIOP + libs += TAO_SSLIOP + tagchecks += SSLIOP +} diff --git a/ACE/bin/MakeProjectCreator/config/strategies.mpb b/ACE/bin/MakeProjectCreator/config/strategies.mpb new file mode 100644 index 00000000000..c087499d5fd --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/strategies.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ +project : taolib, anytypecode { + avoids += ace_for_tao // Requires Unix domain sockets and MEM stuff + after += Strategies + libs += TAO_Strategies +} diff --git a/ACE/bin/MakeProjectCreator/config/svc_utils.mpb b/ACE/bin/MakeProjectCreator/config/svc_utils.mpb new file mode 100644 index 00000000000..a38a4a962cc --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/svc_utils.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : portableserver, orbsvcslib { + after += Svc_Utils + libs += TAO_Svc_Utils +} diff --git a/ACE/bin/MakeProjectCreator/config/tao_flresource.mpb b/ACE/bin/MakeProjectCreator/config/tao_flresource.mpb new file mode 100644 index 00000000000..a3baaa8cb43 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/tao_flresource.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +project: taolib, ace_flreactor { + requires += tao_flresource + after += TAO_FlResource + libs += TAO_FlResource +} diff --git a/ACE/bin/MakeProjectCreator/config/tao_no_iiop.mpb b/ACE/bin/MakeProjectCreator/config/tao_no_iiop.mpb new file mode 100644 index 00000000000..a6fc53b3881 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/tao_no_iiop.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +feature(tao_no_iiop) : taoidldefaults { + idlflags += -DTAO_LACKS_IIOP + macros += TAO_HAS_IIOP=0 +} diff --git a/ACE/bin/MakeProjectCreator/config/tao_output.mpb b/ACE/bin/MakeProjectCreator/config/tao_output.mpb new file mode 100644 index 00000000000..12124d9eb31 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/tao_output.mpb @@ -0,0 +1,9 @@ +// -*- MPC -*- +// $Id$ + +project { + // We tested with all tao libs going to $(TAO_ROOT)/lib, but + // decided that it was easier to deal with all libs in one place. + libout = $(ACE_ROOT)/lib +} + diff --git a/ACE/bin/MakeProjectCreator/config/tao_qtresource.mpb b/ACE/bin/MakeProjectCreator/config/tao_qtresource.mpb new file mode 100644 index 00000000000..43bd3fca0b6 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/tao_qtresource.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +project : taolib, ace_qtreactor { + requires += tao_qtresource + after += TAO_QtResource + libs += TAO_QtResource +} diff --git a/ACE/bin/MakeProjectCreator/config/tao_tkresource.mpb b/ACE/bin/MakeProjectCreator/config/tao_tkresource.mpb new file mode 100644 index 00000000000..150a42ab082 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/tao_tkresource.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +project: acelib, ace_tkreactor { + requires += tao_tkresource + after += TAO_TkResource + libs += TAO_TkResource +} diff --git a/ACE/bin/MakeProjectCreator/config/tao_versioning_idl_defaults.mpb b/ACE/bin/MakeProjectCreator/config/tao_versioning_idl_defaults.mpb new file mode 100644 index 00000000000..0d0352fa5fa --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/tao_versioning_idl_defaults.mpb @@ -0,0 +1,14 @@ +// -*- MPC -*- +// +// $Id$ + +// This base project is only meant to be used by the core TAO +// libraries and the orbsvcs libraries. + +project : taoidldefaults { + + after += TAO_IDL_EXE + idlflags += -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ + -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL + +} diff --git a/ACE/bin/MakeProjectCreator/config/tao_xtresource.mpb b/ACE/bin/MakeProjectCreator/config/tao_xtresource.mpb new file mode 100644 index 00000000000..1907319b457 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/tao_xtresource.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +project : taolib, ace_xtreactor { + requires += tao_xtresource + after += TAO_XtResource + libs += TAO_XtResource +} diff --git a/ACE/bin/MakeProjectCreator/config/taoclient.mpb b/ACE/bin/MakeProjectCreator/config/taoclient.mpb new file mode 100644 index 00000000000..fe00c22e960 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/taoclient.mpb @@ -0,0 +1,6 @@ +// -*- MPC -*- +// $Id$ + +project : taoexe, negotiate_codesets { + exename = client +} diff --git a/ACE/bin/MakeProjectCreator/config/taodefaults.mpb b/ACE/bin/MakeProjectCreator/config/taodefaults.mpb new file mode 100644 index 00000000000..0343a1e0814 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/taodefaults.mpb @@ -0,0 +1,20 @@ +// -*- MPC -*- +// $Id$ + +project : exceptions { + staticflags += TAO_AS_STATIC_LIBS + includes += $(TAO_ROOT) + libpaths += $(ACE_ROOT)/lib + + specific(automake) { + am_version = @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ + includes += $(TAO_BUILDDIR) + libpaths -= $(ACE_ROOT)/lib + } +} + +// If the corba_messaging feature is disabled, then we need +// to add the TAO_HAS_CORBA_MESSAGING=0 macro onto the command line. +feature(!corba_messaging) { + macros += TAO_HAS_CORBA_MESSAGING=0 +} diff --git a/ACE/bin/MakeProjectCreator/config/taoexe.mpb b/ACE/bin/MakeProjectCreator/config/taoexe.mpb new file mode 100644 index 00000000000..a026aaab695 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/taoexe.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : aceexe, taodefaults, taoidldefaults, core_minimum_corba, corba_e_compact, corba_e_micro { + after += TAO Codeset + libs += TAO +} diff --git a/ACE/bin/MakeProjectCreator/config/taoidl3toidl2defaults.mpb b/ACE/bin/MakeProjectCreator/config/taoidl3toidl2defaults.mpb new file mode 100644 index 00000000000..58e2fb2f896 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/taoidl3toidl2defaults.mpb @@ -0,0 +1,23 @@ +// -*- MPC -*- +// $Id$ + +project { + // Set the idl3_to_idl2 compiler and flags as template values + specific { + tao_idl3_to_idl2 = $(ACE_ROOT)/bin/tao_idl3_to_idl2 + tao_idl3_to_idl2_dep = $(ACE_ROOT)/bin/tao_idl3_to_idl2 + } + + Define_Custom(IDL3TOIDL2) { + automatic = 1 + dependent = $(TAO_IDL3_TO_IDL2_DEP) + command = $(TAO_IDL3_TO_IDL2) + commandflags = -I$(CIAO_ROOT)/ciao -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs + libpath = $(ACE_ROOT)/lib + inputext = .idl + generic_outputext = _IDL2.idl + keyword idl3toidl2flags = commandflags + } + + after += TAO_IDL3_TO_IDL2_EXE +} diff --git a/ACE/bin/MakeProjectCreator/config/taoidldefaults.mpb b/ACE/bin/MakeProjectCreator/config/taoidldefaults.mpb new file mode 100644 index 00000000000..f62d55ffa67 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/taoidldefaults.mpb @@ -0,0 +1,65 @@ +// -*- MPC -*- +// $Id$ + +project { + // Set the idl compiler and flags as template values + specific { + tao_idl = $(ACE_ROOT)/bin/tao_idl + tao_idl_dep = $(ACE_ROOT)/bin/tao_idl + tao_idlflags = -Ge 1 -Wb,pre_include=ace/pre.h \ + -Wb,post_include=ace/post.h -I$(TAO_ROOT) + } + + Define_Custom(IDL) { + automatic = 1 + dependent = $(TAO_IDL_DEP) + command = $(TAO_IDL) + libpath = $(ACE_ROOT)/lib + inputext = .idl + source_pre_extension = C + header_pre_extension = C, S + source_outputext = .cpp, .cxx, .cc, .C + header_outputext = .h, .hpp, .hxx, .hh + keyword idlflags = commandflags + + // Inline related options + optional(inline_outputext) { + commandflags(!-SS && !-Ssi || !-Sci || -GT && !-SS && !-oS) += .inl, .i + } + optional(inline_pre_extension) { + commandflags(!-SS && !-Ssi && !-oS) += S + } + optional(inline_pre_extension) { + commandflags(!-Sci) += C + } + optional(inline_pre_extension) { + commandflags(-GT && !-SS && !-oS) += S_T + } + + // Source related options + optional(source_pre_extension) { + commandflags(!-SS && !-oS) += S + } + optional(source_pre_extension) { + commandflags(-GA && !-oA) += A + } + optional(header_outputext) { + commandflags(-SS && !-oS) += S + } + + // Other + optional(template_outputext) { + commandflags(-GT && !-SS && !-oS) += S_T.cpp, S_T.cxx, S_T.cc, S_T.C + } + optional(header_pre_extension) { + commandflags(-GT && !-SS && !-oS) += S_T + } + optional(header_pre_extension) { + commandflags(-GA && !-oA || -GX) += A + } + } + + after += TAO_IDL_EXE + idlflags += $(TAO_IDLFLAGS) + idlflags += -Sa -St +} diff --git a/ACE/bin/MakeProjectCreator/config/taolib.mpb b/ACE/bin/MakeProjectCreator/config/taolib.mpb new file mode 100644 index 00000000000..778075809be --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/taolib.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : acelib, ace_for_tao, tao_output, taodefaults, pidl, corba_e_micro, corba_e_compact, core_minimum_corba { + after += TAO Codeset + libs += TAO +} diff --git a/ACE/bin/MakeProjectCreator/config/taolib_with_idl.mpb b/ACE/bin/MakeProjectCreator/config/taolib_with_idl.mpb new file mode 100644 index 00000000000..cc36293c909 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/taolib_with_idl.mpb @@ -0,0 +1,5 @@ +// -*- MPC -*- +// $Id$ + +project : taolib, taoidldefaults { +} diff --git a/ACE/bin/MakeProjectCreator/config/taoserver.mpb b/ACE/bin/MakeProjectCreator/config/taoserver.mpb new file mode 100644 index 00000000000..8c081dfb029 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/taoserver.mpb @@ -0,0 +1,6 @@ +// -*- MPC -*- +// $Id$ + +project : taoexe, negotiate_codesets, portableserver { + exename = server +} diff --git a/ACE/bin/MakeProjectCreator/config/time.mpb b/ACE/bin/MakeProjectCreator/config/time.mpb new file mode 100644 index 00000000000..4e5fce894f0 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/time.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +project : orbsvcslib, svc_utils, portableserver { + after += CosTime + libs += TAO_CosTime + tagchecks += Time +} diff --git a/ACE/bin/MakeProjectCreator/config/trading.mpb b/ACE/bin/MakeProjectCreator/config/trading.mpb new file mode 100644 index 00000000000..63db829c0cd --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/trading.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +project : orbsvcslib { + after += CosTrading + libs += TAO_CosTrading + tagchecks += Trader +} diff --git a/ACE/bin/MakeProjectCreator/config/trading_serv.mpb b/ACE/bin/MakeProjectCreator/config/trading_serv.mpb new file mode 100644 index 00000000000..2b2f3988b3d --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/trading_serv.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : orbsvcslib, trading_skel, dynamicany, svc_utils, iortable { + after += CosTrading_Serv + libs += TAO_CosTrading_Serv +} diff --git a/ACE/bin/MakeProjectCreator/config/trading_skel.mpb b/ACE/bin/MakeProjectCreator/config/trading_skel.mpb new file mode 100644 index 00000000000..ee926a85d59 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/trading_skel.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : orbsvcslib, trading, portableserver { + after += CosTrading_Skel + libs += TAO_CosTrading_Skel +} diff --git a/ACE/bin/MakeProjectCreator/config/typecodefactory.mpb b/ACE/bin/MakeProjectCreator/config/typecodefactory.mpb new file mode 100644 index 00000000000..7eadcd76a75 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/typecodefactory.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : ifr_client { + libs += TAO_TypeCodeFactory + after += TypeCodeFactory +} diff --git a/ACE/bin/MakeProjectCreator/config/utils.mpb b/ACE/bin/MakeProjectCreator/config/utils.mpb new file mode 100644 index 00000000000..0c9d37b2dea --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/utils.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : portableserver, pi { + after += Utils + libs += TAO_Utils +} diff --git a/ACE/bin/MakeProjectCreator/config/valuetype.mpb b/ACE/bin/MakeProjectCreator/config/valuetype.mpb new file mode 100644 index 00000000000..47edd4e94c4 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/valuetype.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project: taolib, anytypecode { + after += Valuetype + libs += TAO_Valuetype +} diff --git a/ACE/bin/MakeProjectCreator/modules/AutomakeWorkspaceHelper.pm b/ACE/bin/MakeProjectCreator/modules/AutomakeWorkspaceHelper.pm index cdd86016c4d..57ce339f7a9 100644 --- a/ACE/bin/MakeProjectCreator/modules/AutomakeWorkspaceHelper.pm +++ b/ACE/bin/MakeProjectCreator/modules/AutomakeWorkspaceHelper.pm @@ -30,7 +30,7 @@ my(%vals) = ('ACE_ROOT' => '$(top_srcdir)', 'CIAO_BUILDDIR' => '$(top_builddir)', 'TAO_IDL' => 'ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl' . "\n" . 'TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl' . "\n" . - 'TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf', + 'TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf', ); my(%addon) = ('ACE_ROOT' => {'CIAO_ROOT' => '/../..', 'TAO_ROOT' => '/..', diff --git a/ACE/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm b/ACE/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm index fbadaae83c3..8ae76531b3c 100644 --- a/ACE/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm +++ b/ACE/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm @@ -13,11 +13,10 @@ package GNUACEWorkspaceCreator; use strict; use GNUACEProjectCreator; -use MakeWorkspaceBase; use WorkspaceCreator; use vars qw(@ISA); -@ISA = qw(MakeWorkspaceBase WorkspaceCreator); +@ISA = qw(WorkspaceCreator); # ************************************************************ # Data Section @@ -35,9 +34,15 @@ sub generate_implicit_project_dependencies { } -sub workspace_file_prefix { +sub workspace_file_name { + my($self) = shift; + return $self->get_modified_workspace_name($base, ''); +} + + +sub workspace_per_project { #my($self) = shift; - return $base; + return 1; } @@ -46,31 +51,22 @@ sub pre_workspace { my($fh) = shift; my($crlf) = $self->crlf(); - print $fh '# -*- makefile -*-', $crlf; - $self->workspace_preamble($fh, $crlf, 'GNU ACE Workspace', - '$Id$'); - print $fh 'MAKEFILE = ', $self->get_modified_workspace_name($base, '', 1), + print $fh '# -*- makefile -*-', $crlf, + '#-------------------------------------------------------------------------', $crlf, + '# GNU ACE Workspace', $crlf, + '#', $crlf, + '# $Id$', $crlf, + '#', $crlf, + '# This file was generated by MPC. Any changes made directly to', $crlf, + '# this file will be lost the next time it is generated.', $crlf, + '#', $crlf, + '# MPC Command:', $crlf, + '# ', $self->create_command_line_string($0, @ARGV), $crlf, + '#', $crlf, + '#-------------------------------------------------------------------------', $crlf, + 'MAKEFILE = ', $self->get_modified_workspace_name($base, '', 1), $crlf; } - - -sub write_project_targets { - my($self) = shift; - my($fh) = shift; - my($crlf) = shift; - my($target) = shift; - my($list) = shift; - - foreach my $project (@$list) { - my($dname) = $self->mpc_dirname($project); - my($chdir) = ($dname ne '.'); - print $fh "\t\@", - ($chdir ? "cd $dname && " : ''), - "\$(MAKE) -f ", - ($chdir ? $self->mpc_basename($project) : $project), - " $target$crlf"; - } -} sub write_comps { @@ -89,14 +85,11 @@ sub write_comps { "ifeq (\$(findstring k,\$(MAKEFLAGS)),k)$crlf", " KEEP_GOING = -$crlf", "endif$crlf$crlf", - "include \$(ACE_ROOT)/include/makeinclude/macros.GNU$crlf"; + "include \$(ACE_ROOT)/include/makeinclude/macros.GNU$crlf", + $crlf; if ($named) { - $self->write_named_targets($fh, $crlf, \%targnum, \@list, - 'REMAINING_TARGETS := ' . - '$(subst all, , $(TARGETS_NESTED:.nested=)) $(CUSTOM_TARGETS)' . - "$crlf$crlf\$(REMAINING_TARGETS)", '', '', - $self->project_target_translation(1), 1); + $self->write_named_targets($fh, $crlf, \%targnum, \@list); } else { ## Determine the ordering of the sub-directories @@ -215,4 +208,58 @@ sub write_comps { } } +sub write_named_targets { + my($self) = shift; + my($fh) = shift; + my($crlf) = shift; + my($targnum) = shift; + my($list) = shift; + my($trans) = $self->project_target_translation(1); + + ## Print out the "all" target + print $fh 'all:'; + foreach my $project (@$list) { + print $fh " $$trans{$project}"; + } + + ## Print out all other targets here + print $fh $crlf, + 'REMAINING_TARGETS := ', + '$(subst all, , $(TARGETS_NESTED:.nested=)) $(CUSTOM_TARGETS)', + "$crlf$crlf\$(REMAINING_TARGETS):$crlf"; + foreach my $project (@$list) { + my($dname) = $self->mpc_dirname($project); + print $fh "\t\@", + ($dname ne '.' ? "cd $dname && " : ''), + "\$(MAKE) -f ", + ($dname eq '.' ? $project : $self->mpc_basename($project)), + " \$(\@)$crlf"; + } + + ## Print out each target separately + foreach my $project (@$list) { + my($dname) = $self->mpc_dirname($project); + print $fh $crlf, '.PHONY: ', $$trans{$project}, + $crlf, $$trans{$project}, ':'; + if (defined $$targnum{$project}) { + foreach my $number (@{$$targnum{$project}}) { + print $fh " $$trans{$$list[$number]}"; + } + } + + print $fh $crlf, + "\t\@", + ($dname ne '.' ? "cd $dname && " : ''), + "\$(MAKE) -f ", + ($dname eq '.' ? $project : $self->mpc_basename($project)), + ' all', $crlf; + } + + ## Print out the project_name_list target + print $fh $crlf, "project_name_list:$crlf"; + foreach my $project (sort @$list) { + print $fh "\t\@echo $$trans{$project}$crlf"; + } +} + 1; diff --git a/ACE/bin/MakeProjectCreator/templates/gnu.mpd b/ACE/bin/MakeProjectCreator/templates/gnu.mpd index 72812a24622..7b4339c1c16 100644 --- a/ACE/bin/MakeProjectCreator/templates/gnu.mpd +++ b/ACE/bin/MakeProjectCreator/templates/gnu.mpd @@ -453,13 +453,13 @@ lib_warning: <%if(requires)%> require_warning: - @echo <%project_name%> will not be built due to one of the following disabled make macros: + @echo <%project_name%> will not be built due to one of the following disabled features: @echo<%foreach(requires)%> <%require%><%endfor%> <%endif%> <%if(avoids)%> avoid_warning: - @echo <%project_name%> will not be built due to one of the following enabled make macros: + @echo <%project_name%> will not be built due to one of the following enabled features: @echo<%foreach(avoids)%> <%avoid%><%endfor%> <%endif%> @@ -484,7 +484,7 @@ PATH := $(PATH):<%custom_type->libpath%> <%endif%> <%foreach(custom_type->input_files)%> <%if(custom_type->input_file->output_files)%> -GENERATED_DIRTY +=<%foreach(custom_type->input_file->output_files)%> <%if(flag_overrides(custom_type->input_file, gendir))%><%if(!compares(flag_overrides(custom_type->input_file, gendir),.))%><%flag_overrides(custom_type->input_file, gendir)%>/<%endif%><%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%><%endfor%> +GENERATED_DIRTY +=<%foreach(custom_type->input_file->output_files)%> <%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>/<%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%><%endfor%> <%if(custom_type->input_file->non_source_output_files)%> OBJS_DEPEND_ON_GENERATED = 1 <%endif%> @@ -533,12 +533,10 @@ else endif <%endif%> <%endfor%> -<%foreach(custom_type->input_file->output_files)%><%if(flag_overrides(custom_type->input_file, gendir))%><%if(!compares(flag_overrides(custom_type->input_file, gendir),.))%><%flag_overrides(custom_type->input_file, gendir)%>/<%endif%><%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%><%fornotlast(" ")%><%endfor%>: <%custom_type->input_file%><%if(custom_type->input_file->dependencies)%> <%custom_type->input_file->dependencies%><%endif%><%if(flag_overrides(custom_type->input_file, dependent))%> <%flag_overrides(custom_type->input_file, dependent)%><%else%><%if(custom_type->dependent)%> <%custom_type->dependent%><%endif%><%endif%> +<%foreach(custom_type->input_file->output_files)%><%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>/<%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%><%fornotlast(" ")%><%endfor%>: <%custom_type->input_file%><%if(custom_type->input_file->dependencies)%> <%custom_type->input_file->dependencies%><%endif%><%if(flag_overrides(custom_type->input_file, dependent))%> <%flag_overrides(custom_type->input_file, dependent)%><%else%><%if(custom_type->dependent)%> <%custom_type->dependent%><%endif%><%endif%> <%if(flag_overrides(custom_type->input_file, gendir))%> -<%if(!compares(flag_overrides(custom_type->input_file, gendir),.))%> $(MKDIR) <%flag_overrides(custom_type->input_file, gendir)%> <%endif%> -<%endif%> <%if(flag_overrides(custom_type->input_file, command))%><%flag_overrides(custom_type->input_file, command)%><%else%><%custom_type->command%><%endif%> <%if(flag_overrides(custom_type->input_file, commandflags))%><%flag_overrides(custom_type->input_file, commandflags)%><%else%><%custom_type->commandflags%><%endif%> <%if(custom_type->output_option)%><%custom_type->input_file%> <%custom_type->output_option%> $@<%else%><%custom_type->input_file%><%endif%> <%if(flag_overrides(custom_type->input_file, postcommand))%> <%foreach(custom_type->input_file)%> @@ -591,7 +589,7 @@ endif <%endif%> <%if(idl_files)%> -ADDITIONAL_IDL_TARGETS +=<%foreach(idl_files)%> <%if(flag_overrides(idl_file, gendir))%><%if(!compares(flag_overrides(idl_file, gendir),.))%><%flag_overrides(idl_file, gendir)%>/<%endif%><%basenoextension(idl_file)%>$(IDL_CLIENT_HDR_EXT)<%else%><%noextension(idl_file)%>$(IDL_CLIENT_HDR_EXT)<%endif%><%endfor%> +ADDITIONAL_IDL_TARGETS +=<%foreach(idl_files)%> <%if(flag_overrides(idl_file, gendir))%><%flag_overrides(idl_file, gendir)%>/<%basenoextension(idl_file)%>$(IDL_CLIENT_HDR_EXT)<%else%><%noextension(idl_file)%>$(IDL_CLIENT_HDR_EXT)<%endif%><%endfor%> idl_stubs: $(ADDITIONAL_IDL_TARGETS) <%if(source_files)%> @@ -602,7 +600,7 @@ FORCED_IDL_STUBS = <%source_files%> <%foreach(custom_type->input_files)%> <%if(custom_type->input_file->source_output_files)%> <%foreach(custom_type->input_file->source_output_files)%> -FORCED_IDL_STUBS := $(FORCED_IDL_STUBS:<%if(flag_overrides(custom_type->input_file, gendir))%><%if(!compares(flag_overrides(custom_type->input_file, gendir),.))%><%flag_overrides(custom_type->input_file, gendir)%>/<%endif%><%basename(custom_type->input_file->source_output_file)%><%else%><%custom_type->input_file->source_output_file%><%endif%>=) +FORCED_IDL_STUBS := $(FORCED_IDL_STUBS:<%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>/<%basename(custom_type->input_file->source_output_file)%><%else%><%custom_type->input_file->source_output_file%><%endif%>=) <%endfor%> <%endif%> <%endfor%> diff --git a/ACE/bin/Makefile.am b/ACE/bin/Makefile.am index bc5c70469dc..996040dd287 100644 --- a/ACE/bin/Makefile.am +++ b/ACE/bin/Makefile.am @@ -29,7 +29,7 @@ envinfo_SOURCES = \ envinfo.cpp envinfo_LDADD = \ - $(ACE_BUILDDIR)/ace/$(ACE_BUILDDIR)/ace/libACE.la + $(ACE_BUILDDIR)/ace/libACE.la ## Clean up template repositories, etc. clean-local: diff --git a/ACE/bin/auto_run_tests.pl b/ACE/bin/auto_run_tests.pl index 6c7a98aae67..21327ed75ab 100755 --- a/ACE/bin/auto_run_tests.pl +++ b/ACE/bin/auto_run_tests.pl @@ -17,7 +17,7 @@ use English; use Getopt::Std; use Cwd; -use Env qw(ACE_ROOT PATH TAO_ROOT CIAO_ROOT); +use Env qw(ACE_ROOT PATH); ################################################################################ @@ -118,24 +118,19 @@ foreach my $test_lst (@file_list) { print "auto_run_tests: $test\n"; } - if ($directory =~ m:^TAO/(.*):) { - $directory = $1; + $status = 0; + if (-d $ACE_ROOT."/$directory") { + $status = chdir ($ACE_ROOT."/$directory"); } - - $status = undef; - foreach my $path ($ACE_ROOT."/$directory", - $startdir."/$directory", - $TAO_ROOT."/$directory" ) - { - if (-d $path) { - $status = chdir ($path); - last; - } + elsif (-d $startdir."/$directory") { + $status = chdir ($startdir."/$directory"); + } + else { + $status = chdir ($directory); } - $status = chdir ($directory) if (! defined($status)); if (!$status) { - print STDERR "ERROR: Cannot chdir to $ACE_ROOT/$directory\n"; + print STDERR "ERROR: Cannot chdir to $ACE_ROOT/$directory"; next; } diff --git a/ACE/bin/ciao_tests.lst b/ACE/bin/ciao_tests.lst index 062bf79a4c8..57aa377b432 100644 --- a/ACE/bin/ciao_tests.lst +++ b/ACE/bin/ciao_tests.lst @@ -5,12 +5,11 @@ # Each line has its own test, and a test can be followed by a # list of configurations it does _not_ run on. # -# Example: TAO\examples\foo\run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST +# Example: TAO\examples\foo\run_test.pl: !MINIMUM !ST # -TAO/CIAO/examples/Hello/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO -TAO/CIAO/examples/Hello/descriptors/run_test_without_ns.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO -TAO/CIAO/examples/Hello/descriptors_RTCCM/rt_run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO -TAO/CIAO/DAnCE/tests/NodeApplicationTest/run_test_simple.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO -TAO/CIAO/DAnCE/tests/NodeApplicationTest/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO -TAO/CIAO/DAnCE/tests/NodeApplicationTest/run_test_ex.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO -TAO/CIAO/tests/IDL3/Events/Any/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO +TAO/CIAO/examples/Hello/descriptors/run_test.pl: !STATIC !MINIMUM !NOXERCES !ACE_FOR_TAO +TAO/CIAO/examples/Hello/descriptors/run_test_without_ns.pl: !STATIC !MINIMUM !NOXERCES !ACE_FOR_TAO +TAO/CIAO/DAnCE/tests/NodeApplicationTest/run_test_simple.pl: !STATIC !MINIMUM !ACE_FOR_TAO +TAO/CIAO/DAnCE/tests/NodeApplicationTest/run_test.pl: !STATIC !MINIMUM !ACE_FOR_TAO +TAO/CIAO/DAnCE/tests/NodeApplicationTest/run_test_ex.pl: !STATIC !MINIMUM !ACE_FOR_TAO +TAO/CIAO/tests/IDL3/Events/Any/run_test.pl: !STATIC !MINIMUM !ACE_FOR_TAO diff --git a/ACE/bin/cltime.pl b/ACE/bin/cltime.pl index a962a20912a..d28eea7b9dc 100755 --- a/ACE/bin/cltime.pl +++ b/ACE/bin/cltime.pl @@ -1,4 +1,3 @@ -# $Id$ use strict; my($name) = shift; diff --git a/ACE/bin/fuzz.pl b/ACE/bin/fuzz.pl index a0e49ede380..6aa58c130fe 100755 --- a/ACE/bin/fuzz.pl +++ b/ACE/bin/fuzz.pl @@ -123,7 +123,7 @@ sub store_file ($) elsif ($name =~ /\/GNUmakefile.*.[^~]$/) { push @files_makefile, ($name); } - elsif ($name =~ /\.(mpc|mwc|mpb|mpt)$/i) { + elsif ($name =~ /\.(mpc|mwc|mpb|mpt)/i) { push @files_mpc, ($name); } elsif ($name =~ /\.(icc|ncb|opt|zip)$/i) { @@ -277,12 +277,12 @@ sub check_for_newline () } -# This test checks for files that are not allowed to be in svn +# This test checks for files that are not allowed to be in cvs sub check_for_noncvs_files () { - print "Running non svn files check\n"; + print "Running non cvs files check\n"; foreach $file (@files_noncvs, @files_dsp, @files_dsw, @files_makefile) { - print_error ("File $file should not be in svn!"); + print_error ("File $file should not be in cvs!"); } } @@ -589,7 +589,7 @@ sub check_for_dependency_file () $depend = $path . $depend; unless (open (DFILE, $depend)) { print_error ("DEPENDENCY_FILE \"$depend\" not found"); - print " Either add \"$depend\" to svn "; + print " Either add \"$depend\" to cvs "; print "or remove DEPENDENCY_FILE variable\n"; print " from $file\n\n"; } @@ -747,8 +747,7 @@ sub check_for_versioned_namespace_begin_end () if (/^\s*\w+_END_VERSIONED_NAMESPACE_DECL/) { ++$end_count; } - if ($begin_count > $end_count and - /^\s*#\s*include(\s*\/\*\*\/)?\s*"/) { + if ($begin_count > $end_count and /^\s*#\s*include\s*/) { print_error ("$file:$.: #include directive within Versioned namespace block"); } } @@ -1449,7 +1448,7 @@ check_for_streams_include () if ($opt_l >= 6); check_for_dependency_file () if ($opt_l >= 1); check_for_makefile_variable () if ($opt_l >= 1); check_for_inline_in_cpp () if ($opt_l >= 2); -check_for_id_string () if ($opt_l >= 1); +# check_for_id_string () if ($opt_l >= 1); check_for_newline () if ($opt_l >= 1); check_for_inline () if ($opt_l >= 2); check_for_math_include () if ($opt_l >= 3); diff --git a/ACE/bin/generate_doxygen.pl b/ACE/bin/generate_doxygen.pl index 3ff3da8e6c8..20365f58fd6 100755 --- a/ACE/bin/generate_doxygen.pl +++ b/ACE/bin/generate_doxygen.pl @@ -31,8 +31,6 @@ $html_output_dir = '.'; ,'tao_pi' ,'tao_pi_server' ,'tao_rtportableserver' - ,'tao_compression' - ,'tao_transportcurrent' ,'tao_rtcorba' ,'tao_dynamicany' ,'tao_dynamicinterface' diff --git a/ACE/bin/make_release b/ACE/bin/make_release index 0077bb83598..17fd6602c9f 100755 --- a/ACE/bin/make_release +++ b/ACE/bin/make_release @@ -4,7 +4,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' # $Id$ # -# Creates an ACE or TAO kit. +# Creates an ACE or TAO kit. Intended to be called from the +# ACE or TAO top-level GNUmakefiles. # # The first three lines above let this script run without specifying the # full path to perl, as long as it is in the user's PATH. @@ -98,7 +99,7 @@ my $release_filter = '-iname build -prune -o ' . '! -name \'*.MAK\' ! -name \'.cvsignore\' -print'; my $update_versions = 0; my $create_zips = 1; -my $package_dest = "/export/anduriltmp/bczar/packages"; +my $package_dest = "."; ######## ######## Process command line args. ######## @@ -164,7 +165,7 @@ if ($kit eq 'ace') { sub which { my $command = shift; - + my $cmd = `which $command`; chomp ($cmd); return $cmd; @@ -192,7 +193,7 @@ my $touch = which ("touch"); my $whoami = which ("whoami"); chop (my $now = `$date +"%a %b %d %T %Y"`); -my $log_line = "$now $ENV{'SIGNATURE'} <$ENV{'MAILID'}>"; +my $log_line = "$now $ENV{'SIGNATURE'} $ENV{'MAILID'}"; # unless ("$controlled_files") { # chomp ($controlled_files = `$make show_controlled_files`); @@ -261,7 +262,7 @@ if ($update_versions) { $status = &check_workspace () || &get_and_update_versions () || &tag (); - + if ($status != 0) { print "Exited with an error!\n"; } @@ -289,56 +290,56 @@ if ($update_versions) { &ex ("$svn export $repo_root/MPC/tags/$kit_tag $stage_dir/ACE_wrappers/MPC") && die "$0: failed cvs export of MPC in $stage_dir\n"; } else { - &ex ("$svn export ./ACE $stage_dir/ACE_wrappers") && + &ex ("$svn export ./ACE $stage_dir/ACE_wrappers") && die "$0: failed svn export of ACE to $stage_dir/ACE_wrappers\n"; &ex ("$svn export ./ACE/MPC $stage_dir/ACE_wrappers/MPC") && die "$0: failed svn export of MPC to $stage_dir/ACE_wrapper/MPC\n"; } - + &ex ("cd $stage_dir/ACE_wrappers && $make ACE-INSTALL") && die "$0: failed make ACE-INSTALL in $stage_dir/ACE_wrappers\n"; } - + if ($kit =~ /tao/) { if ("$kit_tag") { &ex ("$svn export $repo_root/Middleware/tags/$kit_tag/TAO $stage_dir/ACE_wrappers/TAO > /dev/null") && die "$0: failed cvs export of $kit_tag in $stage_dir\n"; } else { - &ex ("$svn export ./TAO $stage_dir/ACE_wrappers/TAO") && + &ex ("$svn export ./TAO $stage_dir/ACE_wrappers/TAO") && die "$0: failed svn export of TAO to $stage_dir/ACE_wrappers/TAO\n"; } &ex ("cd $stage_dir/ACE_wrappers/TAO && $make TAO-INSTALL") && die "$0: failed make INSTALL in " . "$stage_dir/ACE_wrappers/TAO\n"; } - + if ($kit =~ /ciao/) { if ("$kit_tag") { &ex ("$svn export $repo_root/Middleware/tags/$kit_tag/CIAO $stage_dir/ACE_wrappers/TAO/CIAO > /dev/null") && die "$0: failed cvs export of $kit_tag in $stage_dir\n"; } else { - &ex ("$svn export ./CIAO $stage_dir/ACE_wrappers/TAO/CIAO") && + &ex ("$svn export ./CIAO $stage_dir/ACE_wrappers/TAO/CIAO") && die "$0: failed svn export of CIAO to $stage_dir/ACE_wrappers/TAO/CIAO\n"; } - + &ex ("cd $stage_dir/ACE_wrappers/TAO/CIAO && $make CIAO-INSTALL") && die "$0: failed make INSTALL in " . "$stage_dir/ACE_wrappers/TAO/CIAO\n"; - + } - + chdir $stage_dir; - + print "Creating source-only kits\n"; $status = &create_kit (1); print "Generating makefiles\n"; $status = &generate_makefiles (); - if ($status != 0) { - die "$0: failed to generate GNUmakefiles\n"; - } - + if ($status != 0) { + die "$0: failed to generate GNUmakefiles\n"; + } + print "Creating kits with build files\n"; $status = &create_kit (); @@ -380,7 +381,7 @@ sub check_workspace () { "MPC/trunk checked out as ACE_ROOT/MPC.\n"; if ("$exec_prefix") { - print "$svn status $module\n"; + print "$svn status $module\n"; } else { open (SVNSTATUS, "$svn status $module 2>&1 |") || die "$0: unable to open $svn for status\n"; @@ -388,7 +389,7 @@ sub check_workspace () { next if m%^\? ACE/include/makeinclude/platform_macros.GNU$%; next if m%^\? ACE/ace/config.h$%; next if m%^\s*\?\s*ACE/MPC\s*$%; - + push (@out_of_date, $_) if "$_"; } close SVNSTATUS; @@ -406,7 +407,7 @@ sub check_workspace () { sub get_and_update_versions () { # Update the version numbers for the various components. - my $retval = + my $retval = get_version ("ACE", 1) || update_version_files ("ACE") || update_changelog ("ACE") || @@ -416,10 +417,10 @@ sub get_and_update_versions () { get_version ("CIAO", 1) || update_version_files ("CIAO") || update_changelog ("CIAO"); - + # Commit changes &ex ("$svn commit -m '$log_line'"); - + $retval = 1 if $? >> 8; return $retval; } @@ -428,7 +429,7 @@ sub get_version { my $component = shift; my $update_version = shift; print "Getting version information for $component\n"; - + open (VERSION, "< $component/VERSION") || die "$0: unable to open $component/VERSION: $!\n"; while (<VERSION>) { @@ -452,7 +453,7 @@ sub get_version { } } close VERSION; - + if ($update_version) { # Increment the version count if ($release_type eq 'beta') { @@ -461,12 +462,12 @@ sub get_version { $comp_versions{"$component" . "_beta"} = 0; ++$comp_versions{"$component" . "_minor"}; } elsif ($release_type eq 'major' ) { - $comp_versions{"$component" . "_beta"} = + $comp_versions{"$component" . "_beta"} = $comp_versions{"$component" . "_minor"} = 0; ++$comp_versions{"$component" . "_major"}; } } - + if ($release_type eq 'beta') { $comp_versions{"$component" . "_version"} = $comp_versions{"$component" . "_major"} . '.' . @@ -477,7 +478,7 @@ sub get_version { $comp_versions{"$component" . "_major"} . '.' . $comp_versions{"$component" . "_minor"}; } - + return 0; } @@ -490,14 +491,14 @@ sub update_version_files { print "Updating version files for $component\n"; my $comp_version = $comp_versions{"$component" . "_version"}; - + chdir $component || die "Unable to chdir to $component\n"; - + # Needs to be done for all: &ex ("perl -pi -e " . "'s/$component version .*/$component version $comp_version, released $now./' VERSION"); return 1 if $? >> 8; - + if ("$exec_prefix") { print "$component version " . $comp_versions{$component . "_version"} . "\n"; } else { @@ -515,15 +516,10 @@ sub update_version_files { close VERSION_H; } - + # Component specific PRF. if ($component eq "CIAO") { # For CIAO we need to add ACE + TAO versions.. - &ex ("perl -pi -e 's/CIAO VERSION :.*/CIAO VERSION : " . - $comp_versions{"CIAO_version"} . - "/' PROBLEM-REPORT-FORM"); - return 1 if $? >> 8; - &ex ("perl -pi -e 's/TAO VERSION :.*/TAO VERSION : " . $comp_versions{"TAO_version"} . "/' PROBLEM-REPORT-FORM"); @@ -533,22 +529,17 @@ sub update_version_files { $comp_versions{"ACE_version"} . "/' PROBLEM-REPORT-FORM"); return 1 if $? >> 8; - + chdir "../"; } if ($component eq "TAO") { - &ex ("perl -pi -e 's/TAO VERSION :.*/TAO VERSION : " . - $comp_versions{"TAO_version"} . - "/' PROBLEM-REPORT-FORM"); - return 1 if $? >> 8; - - &ex ("perl -pi -e 's/ACE VERSION:.*/ACE VERSION: " . - $comp_versions{"ACE_version"} . + &ex ("perl -pi -e 's/ACE VERSION:.*/ACE VERSION: " . + $comp_versions{"ACE_version"} . "/' PROBLEM-REPORT-FORM"); return 1 if $? >> 8; - + chdir "../"; } @@ -557,7 +548,7 @@ sub update_version_files { &ex ("perl -pi -e 's/$component VERSION:.*/$component VERSION: $comp_version/' " . "PROBLEM-REPORT-FORM"); return 1 if $? >> 8; - + chdir "../"; } @@ -598,7 +589,7 @@ sub update_changelog { || return 1; rename "ChangeLog.bak", "ChangeLog" || return 1; - + chdir "../"; 0; @@ -715,11 +706,12 @@ sub create_kit { get_version ("ACE_wrappers", 0); - # Get version but don't update version count + + # Get version but don't udpate version count (my $local_ace_tag = $comp_versions{"ACE_wrappers_version"}) =~ s|_|.|g; my $suffix = ""; - + if ($src_only) { $suffix = "-src"; } @@ -728,17 +720,21 @@ sub create_kit { #### Create kits with group write permission. umask 002; - + my $dest = $install ? "$export_dir" : 'created'; my $dispose = $install ? "$mv" : 'echo'; - my $checksum = "$md5sum"; + my $checksum = $install ? "$md5sum" : 'echo'; my $cksum_ext = 'md5'; my $redirect = $install ? '>' : '\>'; my $shell_cd = $install ? 'cd' : 'echo cd'; + +# (my $local_tao_tag = $kit_tag) =~ s|_|.|g; +# (my $local_ciao_tag = $kit_tag) =~ s|_|.|g; + # These files don't get LF->CRLF conversions done when making the zip. my $bin_files = - "\"\\.mak|\\.mdp|\\.ide|\\.exe\|\\.ico\|\\.gz\|\\.zip\|\\.xls\|" . + "\"\\.dsp|\\.dsw|\\.mak|\\.mdp|\\.ide|\\.exe\|\\.ico\|\\.gz\|\\.zip\|\\.xls\|" . "\\.sxd|\\.gif|\\.vcp|\\.vcproj|\\.vcw|\\.sln\|\\.dfm\|\\.jpg\|\\.png\|\\.vsd\|\\.bz2\""; my $build_command; @@ -791,18 +787,18 @@ sub create_kit { &ex ($checksum_command); if ($kit eq 'ace+tao' || $kit eq 'ace+tao+ciao') { - # Set the release files once again + # Set the relese files once again my $tmp_rel_file = ''; - + if ($src_only == 0) { $status = &bootstrap_autotools (); - + if ($status != 0) { die "$0: failed to bootstrap autotools\n"; } } - chomp ($tmp_rel_file = `$regmake -f $ace_root/Release show_release_files`); + chomp ($tmp_rel_file = `$regmake -f $tao_root/Release show_release_files`); $release_files = $base_release_files; $release_files .= ' '; $release_files .= $tmp_rel_file; @@ -877,12 +873,12 @@ sub create_kit { "$package_dest/ACE$suffix.zip $package_dest/ACE$suffix-lib.zip && " . "$dispose $package_dest/ACE$suffix.zip $package_dest/ACE$suffix-lib.zip $dest && " . "$dispose $package_dest/ACE$suffix.tar.gz $package_dest/ACE$suffix-lib.tar.gz $package_dest/ACE$suffix.tar.bz2 $package_dest/ACE$suffix-lib.tar.bz2 $dest && " . - "$cp $dest/ACE$suffix.zip $old_versions_dir/ACE$suffix-$local_ace_tag.zip &&". - "$cp $dest/ACE$suffix-lib.zip $old_versions_dir/ACE$suffix-$local_ace_tag-lib.zip &&". - "$cp $dest/ACE$suffix.tar.gz $old_versions_dir/ACE$suffix-$local_ace_tag.tar.gz &&". - "$cp $dest/ACE$suffix-lib.tar.gz $old_versions_dir/ACE$suffix-$local_ace_tag-lib.tar.gz &&". - "$cp $dest/ACE$suffix.tar.bz2 $old_versions_dir/ACE$suffix-$local_ace_tag.tar.bz2 &&". - "$cp $dest/ACE$suffix-lib.tar.bz2 $old_versions_dir/ACEsuffix-$local_ace_tag-lib.tar.bz2;"; + "$cp $dest/ACE$suffix.zip $old_versions_dir/$local_ace_tag.zip &&". + "$cp $dest/ACE$suffix-lib.zip $old_versions_dir/$local_ace_tag-lib.zip &&". + "$cp $dest/ACE$suffix.tar.gz $old_versions_dir/$local_ace_tag.tar.gz &&". + "$cp $dest/ACE$suffix-lib.tar.gz $old_versions_dir/$local_ace_tag-lib.tar.gz &&". + "$cp $dest/ACE$suffix.tar.bz2 $old_versions_dir/$local_ace_tag.tar.bz2 &&". + "$cp $dest/ACE$suffix-lib.tar.bz2 $old_versions_dir/$local_ace_tag-lib.tar.bz2;"; $archives = " $package_dest/ACE$suffix.tar.gz $package_dest/ACE$suffix-lib.tar.gz ". "$package_dest/ACE$suffix.zip $package_dest/ACE$suffix-lib.zip $package_dest/ACE$suffix.tar.bz2 $package_dest/ACE$suffix-lib.tar.bz2 "; } diff --git a/ACE/bin/mpc.pl b/ACE/bin/mpc.pl index c547851e21d..c9a7e37d796 100755 --- a/ACE/bin/mpc.pl +++ b/ACE/bin/mpc.pl @@ -15,6 +15,7 @@ eval '(exit $?0)' && eval 'exec perl -w -S $0 ${1+"$@"}' require 5.006; use strict; +use Config; use FindBin; use File::Spec; use File::Basename; @@ -25,6 +26,7 @@ if ($^O eq 'VMS') { $basePath = VMS::Filespec::unixify($basePath); } $basePath .= '/MakeProjectCreator'; +unshift(@INC, $basePath . '/modules'); my($mpcroot) = $ENV{MPC_ROOT}; my($mpcpath) = (defined $mpcroot ? $mpcroot : @@ -48,7 +50,15 @@ if (! -d "$mpcpath/modules") { exit(255); } -require Driver; +require MPC; + +# ************************************************************ +# Data Section +# ************************************************************ + +my(@creators) = ('GNUACEProjectCreator', + 'BorlandProjectCreator', + ); # ************************************************************ # Subroutine Section @@ -62,5 +72,18 @@ sub getBasePath { # Main Section # ************************************************************ -my($driver) = new Driver($basePath, basename($0)); -exit($driver->run(@ARGV)); +## Allocate a driver +my($driver) = new MPC(); + +## Add our creators to the front of the list +my($creators) = $driver->getCreatorList(); +unshift(@$creators, @creators); + +## Add the mpc path to the include paths, but preserve +## the original @ARGV as it is included in the output of +## most of the workspace creators. +my(@args) = ('-include', "$mpcpath/config", + '-include', "$mpcpath/templates", @ARGV); + +## Execute the driver +exit($driver->execute($basePath, basename($0), \@args)); diff --git a/ACE/bin/msvc_mpc_auto_compile.pl b/ACE/bin/msvc_mpc_auto_compile.pl index bc190118b9f..e8d33a815c3 100755 --- a/ACE/bin/msvc_mpc_auto_compile.pl +++ b/ACE/bin/msvc_mpc_auto_compile.pl @@ -22,9 +22,9 @@ else { @ace_core_dirs = ("$ACE_ROOT\\ace", "$ACE_ROOT\\Kokyu", "$ACE_ROOT\\ACEXML", + "$ACE_ROOT\\protocols", "$ACE_ROOT\\examples", - "$ACE_ROOT\\tests", - "$ACE_ROOT\\protocols"); + "$ACE_ROOT\\tests"); @tao_core_dirs = ("$ACE_ROOT\\apps", "$ACE_ROOT\\TAO\\TAO_IDL", diff --git a/ACE/bin/msvc_static_order.lst b/ACE/bin/msvc_static_order.lst index c8a5171ecd6..23815a851d3 100644 --- a/ACE/bin/msvc_static_order.lst +++ b/ACE/bin/msvc_static_order.lst @@ -118,21 +118,12 @@ TAO/orbsvcs/tests/Trading/Trading_Test_Lib TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEC_RtEC_Based_lib TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf TAO/tests/CSD_Strategy_Tests/TP_Common/CSD_TP_Test_Lib -TAO/tests/Smart_Proxies/Collocation/SP_Collocation_Idl TAO/tests/Smart_Proxies/Collocation/SP_Collocation_TestStubsLib -TAO/tests/Collocation/Collocation_Idl TAO/tests/Collocation/Collocation_Test_Stub -TAO/tests/Collocation/Collocation_Diamond -TAO/tests/TransportCurrent/lib/Current_Test_Lib_Idl -TAO/tests/TransportCurrent/lib/Current_Test_Lib_Client -TAO/tests/TransportCurrent/lib/Current_Test_Lib_Server TAO/examples/POA/Generic_Servant/POA_Generic_Servant_Lib TAO/examples/Simple/time-date/Simple_Time_Date_Lib TAO/docs/tutorials/Quoter/idl/Quoter_Idl_Lib TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/RTCORBA_Common -TAO/examples/RTScheduling/Job -TAO/examples/RTScheduling/RTSchedSynch -TAO/examples/RTScheduling/RTSchedTestLib tests/Test_Output tests/DLL_Test_Parent TAO/tests/CSD_Strategy_Tests/TP_Common/CSD_TP_Test_Lib diff --git a/ACE/bin/mwc.pl b/ACE/bin/mwc.pl index c547851e21d..607bccbb8bc 100755 --- a/ACE/bin/mwc.pl +++ b/ACE/bin/mwc.pl @@ -15,6 +15,7 @@ eval '(exit $?0)' && eval 'exec perl -w -S $0 ${1+"$@"}' require 5.006; use strict; +use Config; use FindBin; use File::Spec; use File::Basename; @@ -25,6 +26,7 @@ if ($^O eq 'VMS') { $basePath = VMS::Filespec::unixify($basePath); } $basePath .= '/MakeProjectCreator'; +unshift(@INC, $basePath . '/modules'); my($mpcroot) = $ENV{MPC_ROOT}; my($mpcpath) = (defined $mpcroot ? $mpcroot : @@ -48,7 +50,15 @@ if (! -d "$mpcpath/modules") { exit(255); } -require Driver; +require MWC; + +# ************************************************************ +# Data Section +# ************************************************************ + +my(@creators) = ('GNUACEWorkspaceCreator', + 'BorlandWorkspaceCreator', + ); # ************************************************************ # Subroutine Section @@ -62,5 +72,18 @@ sub getBasePath { # Main Section # ************************************************************ -my($driver) = new Driver($basePath, basename($0)); -exit($driver->run(@ARGV)); +## Allocate a driver +my($driver) = new MWC(); + +## Add our creators to the front of the list +my($creators) = $driver->getCreatorList(); +unshift(@$creators, @creators); + +## Add the mpc path to the include paths, but preserve +## the original @ARGV as it is included in the output of +## most of the workspace creators. +my(@args) = ('-include', "$mpcpath/config", + '-include', "$mpcpath/templates", @ARGV); + +## Execute the driver +exit($driver->execute($basePath, basename($0), \@args)); diff --git a/ACE/bin/tao_orb_tests.lst b/ACE/bin/tao_orb_tests.lst index 6f65775fa24..9afcd94e43f 100644 --- a/ACE/bin/tao_orb_tests.lst +++ b/ACE/bin/tao_orb_tests.lst @@ -5,26 +5,24 @@ # Each line has its own test, and a test can be followed by a # list of configurations it does _not_ run on. # -# Example: TAO\examples\foo\run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST +# Example: TAO\examples\foo\run_test.pl: !MINIMUM !ST # # NOTE: This file contains tests only for TAO's ORB. Please do not # include things like performance-tests, and examples here. -TAO/tests/Bug_2702_Regression/run_test.pl: TAO/tests/ORB_Local_Config/Bunch/run_test.pl: TAO/tests/ORB_Local_Config/Bug_1459/run_test.pl: SSL !STATIC -TAO/tests/ORB_Local_Config/Bug_2612/run_test.pl: !ST !STATIC !ACE_FOR_TAO TAO/tests/ORB_Local_Config/Separation/run_test.pl: TAO/tests/ORB_Local_Config/Service_Dependency/run_test.pl: !ST !STATIC TAO/tests/ORB_Local_Config/Shared/run_test.pl: TAO/tests/ORB_Local_Config/Simple/run_test.pl: TAO/tests/ORB_Local_Config/Two_DLL_ORB/run_test.pl: !ST !STATIC -TAO/tests/Param_Test/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO -TAO/tests/Param_Test/run_test_dii.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO -TAO/tests/AMI/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO -TAO/tests/AMI_Timeouts/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST -TAO/tests/AMH_Exceptions/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_ToFix_LynxOS_x86 !ACE_FOR_TAO -TAO/tests/AMH_Oneway/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_ToFix_LynxOS_x86 !ACE_FOR_TAO +TAO/tests/Param_Test/run_test.pl: !MINIMUM !ACE_FOR_TAO +TAO/tests/Param_Test/run_test_dii.pl: !MINIMUM !ACE_FOR_TAO +TAO/tests/AMI/run_test.pl: !MINIMUM +TAO/tests/AMI_Timeouts/run_test.pl: !MINIMUM !ST +TAO/tests/AMH_Exceptions/run_test.pl: !MINIMUM !DISABLE_ToFix_LynxOS_x86 !ACE_FOR_TAO +TAO/tests/AMH_Oneway/run_test.pl: !MINIMUM !DISABLE_ToFix_LynxOS_x86 !ACE_FOR_TAO TAO/tests/Collocation/run_test.pl: !ACE_FOR_TAO TAO/tests/Collocation_Tests/run_test.pl: !ST TAO/tests/Collocation_Opportunities/run_test.pl: !ST @@ -34,74 +32,74 @@ TAO/tests/CollocationLockup/run_test.pl: !ST !DISABLE_ToFix_LynxOS_x86 TAO/tests/OctetSeq/run_test.pl: !ACE_FOR_TAO TAO/tests/OctetSeq/run_test1.pl: !STATIC !ACE_FOR_TAO TAO/tests/OctetSeq/run_test2.pl: !STATIC !ACE_FOR_TAO -TAO/tests/BiDirectional/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !GIOP10 !DISABLE_BIDIR !DISABLE_ToFix_LynxOS_PPC !DISABLE_ToFix_LynxOS_x86 -TAO/tests/BiDirectional/run_test_ipv6.pl: IPV6 !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !GIOP10 !DISABLE_BIDIR -TAO/tests/BiDirectional_NestedUpcall/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !GIOP10 !DISABLE_BIDIR !DISABLE_ToFix_LynxOS_PPC -TAO/tests/BiDirectional_DelayedUpcall/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !GIOP10 !DISABLE_BIDIR !DISABLE_ToFix_LynxOS_PPC +TAO/tests/BiDirectional/run_test.pl: !MINIMUM !GIOP10 !DISABLE_BIDIR !DISABLE_ToFix_LynxOS_PPC !DISABLE_ToFix_LynxOS_x86 +TAO/tests/BiDirectional/run_test_ipv6.pl: IPV6 !MINIMUM !GIOP10 !DISABLE_BIDIR +TAO/tests/BiDirectional_NestedUpcall/run_test.pl: !MINIMUM !STATIC !GIOP10 !DISABLE_BIDIR !DISABLE_ToFix_LynxOS_PPC +TAO/tests/BiDirectional_DelayedUpcall/run_test.pl: !MINIMUM !STATIC !GIOP10 !DISABLE_BIDIR !DISABLE_ToFix_LynxOS_PPC TAO/tests/Leader_Followers/run_test.pl: !ST !ACE_FOR_TAO TAO/tests/Leader_Followers/run_test_mt.pl: !ST !ACE_FOR_TAO TAO/tests/Multiple_Inheritance/run_test.pl: -TAO/tests/Bug_1269_Regression/run_test.pl: !Win32 !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO -TAO/tests/Bug_1495_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !DISABLE_INTERCEPTORS +TAO/tests/Bug_1269_Regression/run_test.pl: !Win32 !MINIMUM +TAO/tests/Bug_1495_Regression/run_test.pl: !MINIMUM !ST !DISABLE_INTERCEPTORS TAO/tests/Bug_1568_Regression/run_test.pl: !NO_MESSAGING TAO/tests/Bug_1670_Regression/run_test.pl: !NO_MESSAGING -TAO/tests/Bug_1270_Regression/run_test.pl: !Win32 !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_ToFix_LynxOS_PPC -TAO/tests/Bug_1020_Basic_Regression/run_test.pl: !Win32 !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST -TAO/tests/Bug_1020_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !Win32 +TAO/tests/Bug_1270_Regression/run_test.pl: !Win32 !MINIMUM !DISABLE_ToFix_LynxOS_PPC +TAO/tests/Bug_1020_Basic_Regression/run_test.pl: !Win32 !MINIMUM !ST +TAO/tests/Bug_1020_Regression/run_test.pl: !MINIMUM !ST !Win32 TAO/tests/Bug_1254_Regression/run_test.pl: -TAO/tests/Bug_1361_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !Win32 !IRIX -TAO/tests/Bug_1482_Regression/run_test.pl: !VxWorks !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !DISABLE_ToFix_LynxOS_PPC -TAO/tests/Bug_1551_Regression/run_test.pl: !VxWorks !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !IRIX +TAO/tests/Bug_1361_Regression/run_test.pl: !MINIMUM !ST !Win32 !IRIX +TAO/tests/Bug_1482_Regression/run_test.pl: !VxWorks !MINIMUM !ST !DISABLE_ToFix_LynxOS_PPC +TAO/tests/Bug_1551_Regression/run_test.pl: !VxWorks !MINIMUM !ST !IRIX TAO/tests/Bug_1676_Regression/run_test.pl: TAO/tests/Bug_2084_Regression/run_test.pl: !ST -TAO/tests/Bug_2134_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO -TAO/tests/Bug_2174_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO +TAO/tests/Bug_2134_Regression/run_test.pl: !MINIMUM +TAO/tests/Bug_2174_Regression/run_test.pl: !MINIMUM TAO/tests/Bug_2183_Regression/run_test.pl: !ACE_FOR_TAO -TAO/tests/Bug_2186_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO +TAO/tests/Bug_2186_Regression/run_test.pl: !MINIMUM !ACE_FOR_TAO TAO/tests/Bug_2188_Regression/run_test.pl: TAO/tests/Bug_2201_Regression/run_test.pl: -TAO/tests/Bug_2234_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS +TAO/tests/Bug_2234_Regression/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS TAO/tests/Bug_2289_Regression/run_test.pl: -TAO/tests/Bug_2319_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_ToFix_LynxOS_PPC !DISABLE_ToFix_LynxOS_x86 +TAO/tests/Bug_2319_Regression/run_test.pl: !MINIMUM !DISABLE_ToFix_LynxOS_PPC !DISABLE_ToFix_LynxOS_x86 TAO/tests/Bug_2328_Regression/run_test.pl: TAO/tests/Bug_2345_Regression/run_test.pl: !DISABLE_ToFix_LynxOS_PPC !DISABLE_ToFix_LynxOS_x86 TAO/tests/Bug_2349_Regression/run_test.pl: !DISABLE_ToFix_LynxOS_x86 -TAO/tests/Bug_2417_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST -TAO/tests/Bug_2429_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO +TAO/tests/Bug_2417_Regression/run_test.pl: !MINIMUM !ST +TAO/tests/Bug_2429_Regression/run_test.pl: !MINIMUM TAO/tests/Bug_2494_Regression/run_test.pl: !ST TAO/tests/Bug_2503_Regression/run_test.pl: !ST TAO/tests/Bug_2542_Regression/run_test.pl: TAO/tests/Bug_2560_Regression/run_test.pl: !ST -TAO/tests/Bug_2593_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !ACE_FOR_TAO +TAO/tests/Bug_2593_Regression/run_test.pl: !MINIMUM !STATIC !ACE_FOR_TAO TAO/tests/Bug_2595_Regression/run_test.pl: -TAO/tests/Bug_2654_Regression/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO -TAO/tests/Bug_2669_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO +TAO/tests/Bug_2654_Regression/run_test.pl: !ST !MINIMUM +TAO/tests/Bug_2669_Regression/run_test.pl: !MINIMUM TAO/tests/Bug_2683_Regression/run_test.pl: TAO/tests/Bug_1476_Test/run_test.pl: -TAO/tests/RTCORBA/Banded_Connections/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST -TAO/tests/RTCORBA/Client_Propagated/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST -TAO/tests/RTCORBA/Client_Protocol/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !IPV6 !ACE_FOR_TAO -TAO/tests/RTCORBA/Collocation/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST -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 -TAO/tests/RTCORBA/Linear_Priority/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !DISABLE_ToFix_LynxOS_PPC -TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !DISABLE_ToFix_LynxOS_PPC !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 !DISABLE_ToFix_LynxOS_PPC !DISABLE_ToFix_LynxOS_x86 -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 !DISABLE_ToFix_LynxOS_PPC !ACE_FOR_TAO -TAO/tests/RTCORBA/RTMutex/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST -TAO/tests/RTCORBA/Server_Declared/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST -TAO/tests/RTCORBA/Server_Protocol/run_test.pl: !VxWorks !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !IPV6 !ACE_FOR_TAO -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 -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 +TAO/tests/RTCORBA/Banded_Connections/run_test.pl: !MINIMUM !ST +TAO/tests/RTCORBA/Client_Propagated/run_test.pl: !MINIMUM !ST +TAO/tests/RTCORBA/Client_Protocol/run_test.pl: !MINIMUM !IPV6 !ACE_FOR_TAO +TAO/tests/RTCORBA/Collocation/run_test.pl: !MINIMUM !ST +TAO/tests/RTCORBA/Destroy_Thread_Pool/run_test.pl: !MINIMUM !ST +TAO/tests/RTCORBA/Explicit_Binding/run_test.pl: !VxWorks !MINIMUM !IPV6 !ACE_FOR_TAO +TAO/tests/RTCORBA/Linear_Priority/run_test.pl: !MINIMUM !ST !DISABLE_ToFix_LynxOS_PPC +TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl: !MINIMUM !ST !DISABLE_ToFix_LynxOS_PPC !ACE_FOR_TAO +TAO/tests/RTCORBA/ORB_init/run_test.pl: !MINIMUM +TAO/tests/RTCORBA/Persistent_IOR/run_test.pl: !MINIMUM !ST +TAO/tests/RTCORBA/Policies/run_test.pl: !MINIMUM !ST +TAO/tests/RTCORBA/Policy_Combinations/run_test.pl: !MINIMUM !ST !DISABLE_ToFix_LynxOS_PPC !DISABLE_ToFix_LynxOS_x86 +TAO/tests/RTCORBA/Priority_Inversion_With_Bands/run_test.pl: !MINIMUM !ST !ACE_FOR_TAO +TAO/tests/RTCORBA/Private_Connection/run_test.pl: !MINIMUM +TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/run_test.pl: !VxWorks !MINIMUM !ST !IPV6 !DISABLE_ToFix_LynxOS_PPC !ACE_FOR_TAO +TAO/tests/RTCORBA/RTMutex/run_test.pl: !MINIMUM !ST +TAO/tests/RTCORBA/Server_Declared/run_test.pl: !MINIMUM !ST +TAO/tests/RTCORBA/Server_Protocol/run_test.pl: !VxWorks !MINIMUM !IPV6 !ACE_FOR_TAO +TAO/tests/RTCORBA/Thread_Pool/run_test.pl: !MINIMUM !ST !ACE_FOR_TAO +TAO/tests/RTScheduling/VoidData/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS +TAO/tests/RTScheduling/Thread_Cancel/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !ST +TAO/tests/RTScheduling/DT_Spawn/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS +TAO/tests/RTScheduling/Current/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !ST +TAO/tests/RTScheduling/Scheduling_Interceptor/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !STATIC TAO/tests/OBV/Any/run_test.pl: TAO/tests/OBV/Collocated/Forward/run_test.pl: !ST !DISABLE_ToFix_LynxOS_PPC !DISABLE_ToFix_LynxOS_x86 TAO/tests/OBV/Factory/run_test.pl: @@ -118,10 +116,10 @@ TAO/tests/Cache_Growth_Test/run_test.pl: TAO/tests/Muxing/run_test.pl: !ST TAO/tests/Muxed_GIOP_Versions/run_test.pl: !VxWorks !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 -TAO/tests/File_IO/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO +TAO/tests/MT_BiDir/run_test.pl: !ST !MINIMUM !GIOP10 !DISABLE_BIDIR +TAO/tests/File_IO/run_test.pl: !ST !MINIMUM TAO/tests/MT_Server/run_test.pl: !ST -TAO/tests/No_Server_MT_Connect_Test/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO +TAO/tests/No_Server_MT_Connect_Test/run_test.pl: !ST !MINIMUM TAO/tests/Connect_Strategy_Test/run_test.pl: # DISABLED TAO/tests/Client_Leaks/run_test.pl: !VxWorks !ST !Tru64 TAO/tests/Server_Leaks/run_test.pl: !DISABLE_ToFix_LynxOS_PPC !DISABLE_ToFix_LynxOS_x86 @@ -129,119 +127,114 @@ TAO/tests/Smart_Proxies/Policy/run_test.pl: !VxWorks TAO/tests/Smart_Proxies/run_test.pl: TAO/tests/Smart_Proxies/dtor/run_test.pl: TAO/tests/Stack_Recursion/run_test.pl: !ST !DISABLE_ToFix_LynxOS_PPC -TAO/tests/Faults/run_test.pl: !VxWorks !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 +TAO/tests/Faults/run_test.pl: !VxWorks !MINIMUM !ST +TAO/tests/CallbackTest/run_test.pl: !MINIMUM +TAO/tests/CallbackTest/run_test_ipv6.pl: IPV6 !MINIMUM +TAO/tests/CallbackTest/run_test_mixed_ip.pl: IPV6 !MINIMUM +TAO/tests/Crashed_Callback/run_test.pl: !MINIMUM # Disabled Crash On Write on Win32, see bugzilla 959 why TAO/tests/Crash_On_Write/run_test.pl: !VxWorks !ST !Win32 -TAO/tests/Nested_Upcall_Crash/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO +TAO/tests/Nested_Upcall_Crash/run_test.pl: !MINIMUM TAO/tests/NestedUpcall/Simple/run_test.pl: !ST TAO/tests/NestedUpcall/MT_Client_Test/run_test.pl: !ST TAO/tests/NestedUpcall/Triangle_Test/run_test.pl: TAO/tests/Nested_Event_Loop/run_test.pl: !ACE_FOR_TAO -TAO/tests/POA/Identity/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO +TAO/tests/POA/Identity/run_test.pl: !MINIMUM TAO/tests/POA/Policies/run_test.pl: TAO/tests/POA/Excessive_Object_Deactivations/run_test.pl: TAO/tests/POA/Persistent_ID/run_test.pl: -TAO/tests/POA/Etherealization/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO +TAO/tests/POA/Etherealization/run_test.pl: !MINIMUM TAO/tests/POA/Object_Reactivation/run_test.pl: !ST TAO/tests/POA/POA_Destruction/run_test.pl: -TAO/tests/POA/Default_Servant/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO -TAO/tests/POA/Single_Threaded_POA/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST +TAO/tests/POA/Default_Servant/run_test.pl: !MINIMUM +TAO/tests/POA/Single_Threaded_POA/run_test.pl: !MINIMUM !ST TAO/tests/POA/Non_Servant_Upcalls/run_test.pl: !SUNCC5_1 -TAO/tests/POA/MT_Servant_Locator/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST -TAO/tests/POA/Bug_2511_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO -TAO/tests/POA/Nested_Non_Servant_Upcalls/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST +TAO/tests/POA/MT_Servant_Locator/run_test.pl: !MINIMUM !ST +TAO/tests/POA/Bug_2511_Regression/run_test.pl: !MINIMUM +TAO/tests/POA/Nested_Non_Servant_Upcalls/run_test.pl: !MINIMUM !ST TAO/tests/POA/Deactivate_Object/run_test.pl TAO/tests/POA/Reference_Counting/run_test.pl TAO/tests/POA/Current/run_test.pl: TAO/tests/POA/wait_for_completion/run_test.pl: -TAO/tests/POA/POAManagerFactory/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO -TAO/tests/POA/EndpointPolicy/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO +TAO/tests/POA/POAManagerFactory/run_test.pl: !MINIMUM +TAO/tests/POA/EndpointPolicy/run_test.pl: !MINIMUM TAO/tests/IORManipulation/run_test.pl: -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 -TAO/tests/Timed_Buffered_Oneways/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO +TAO/tests/Policies/run_test.pl: !MINIMUM !ST +TAO/tests/Timeout/run_test.pl: !MINIMUM +TAO/tests/MT_Timeout/run_test.pl: !MINIMUM !ST +TAO/tests/Timed_Buffered_Oneways/run_test.pl: !MINIMUM TAO/tests/Single_Read/run_test.pl: -TAO/tests/Connection_Timeout/run_test.pl: !VxWorks !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO +TAO/tests/Connection_Timeout/run_test.pl: !VxWorks !MINIMUM !ACE_FOR_TAO #TAO/tests/Connection_Failure/run_test.pl ! Timesout for good reasons -TAO/tests/MProfile_Connection_Timeout/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO +TAO/tests/MProfile_Connection_Timeout/run_test.pl: !MINIMUM !ACE_FOR_TAO TAO/tests/Codec/run_test.pl: TAO/tests/Bug_1693_Test/run_test.pl: TAO/tests/IDL_Test/run_test.pl: !NO_MESSAGING TAO/tests/ORB_init/run_test.pl: TAO/tests/ORB_destroy/run_test.pl: TAO/tests/ORB_shutdown/run_test.pl: -TAO/tests/DSI_Gateway/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO -TAO/tests/DynAny_Test/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO +TAO/tests/DSI_Gateway/run_test.pl: !MINIMUM +TAO/tests/DynAny_Test/run_test.pl: !MINIMUM TAO/tests/Connection_Purging/run_test.pl: !VxWorks !ST !ACE_FOR_TAO TAO/tests/Server_Connection_Purging/run_test.pl: !VxWorks !Win32 -TAO/tests/LongUpcalls/run_test.pl: !VxWorks !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO -TAO/tests/Reliable_Oneways/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO -TAO/tests/Blocking_Sync_None/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO -TAO/tests/Oneway_Buffering/run_message_count.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO -TAO/tests/Oneway_Buffering/run_buffer_size.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO -TAO/tests/Oneway_Buffering/run_timeout.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO -TAO/tests/Oneway_Buffering/run_timeout_reactive.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO -TAO/tests/Oneway_Timeouts/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NO_MESSAGING !ACE_FOR_TAO -TAO/tests/AMI_Buffering/run_message_count.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST -TAO/tests/AMI_Buffering/run_buffer_size.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST -TAO/tests/AMI_Buffering/run_timeout.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST -TAO/tests/AMI_Buffering/run_timeout_reactive.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST -TAO/tests/Big_AMI/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO +TAO/tests/LongUpcalls/run_test.pl: !VxWorks !MINIMUM +TAO/tests/Reliable_Oneways/run_test.pl: !MINIMUM +TAO/tests/Blocking_Sync_None/run_test.pl: !MINIMUM +TAO/tests/Oneway_Buffering/run_message_count.pl: !MINIMUM +TAO/tests/Oneway_Buffering/run_buffer_size.pl: !MINIMUM +TAO/tests/Oneway_Buffering/run_timeout.pl: !MINIMUM +TAO/tests/Oneway_Buffering/run_timeout_reactive.pl: !MINIMUM +TAO/tests/Oneway_Timeouts/run_test.pl: !MINIMUM !NO_MESSAGING !ACE_FOR_TAO +TAO/tests/AMI_Buffering/run_message_count.pl: !MINIMUM !ST +TAO/tests/AMI_Buffering/run_buffer_size.pl: !MINIMUM !ST +TAO/tests/AMI_Buffering/run_timeout.pl: !MINIMUM !ST +TAO/tests/AMI_Buffering/run_timeout_reactive.pl: !MINIMUM !ST +TAO/tests/Big_AMI/run_test.pl: !MINIMUM TAO/tests/Big_Oneways/run_test.pl: !ST TAO/tests/Big_Twoways/run_test.pl: !ST TAO/tests/Big_Reply/run_test.pl: !ST -TAO/tests/Big_Request_Muxing/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO +TAO/tests/Big_Request_Muxing/run_test.pl: !ST !MINIMUM TAO/tests/Oneways_Invoking_Twoways/run_test.pl: !ST TAO/tests/Queued_Message_Test/run_test.pl: TAO/tests/DLL_ORB/run_test.pl: !STATIC -TAO/tests/InterOp-Naming/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO +TAO/tests/InterOp-Naming/run_test.pl: !MINIMUM TAO/tests/Multiple/run_test.pl: !VxWorks !SUNCC5_1 -TAO/tests/Exposed_Policies/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !ACE_FOR_TAO -TAO/tests/Portable_Interceptors/Bug_1559/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS -TAO/tests/Portable_Interceptors/Bug_2510_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ST -TAO/tests/Portable_Interceptors/Collocated/Dynamic/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ST -TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ST -TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ST -TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ST -TAO/tests/Portable_Interceptors/Dynamic/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS -TAO/tests/Portable_Interceptors/IORInterceptor/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !GIOP10 -TAO/tests/Portable_Interceptors/ForwardRequest/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS -TAO/tests/Portable_Interceptors/Service_Context_Manipulation/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS -TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !HAS_EXTENDED_FT_INTERCEPTORS -TAO/tests/Portable_Interceptors/PICurrent/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS -TAO/tests/Portable_Interceptors/AMI/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS -TAO/tests/Portable_Interceptors/ORB_Shutdown/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS -TAO/tests/Portable_Interceptors/PolicyFactory/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS -TAO/tests/Portable_Interceptors/Bug_2088/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS -TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS -TAO/tests/Portable_Interceptors/Register_Initial_References/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS -TAO/tests/Portable_Interceptors/Slot/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS -TAO/tests/Portable_Interceptors/AdvSlot/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS -TAO/tests/Portable_Interceptors/AdvSlotDblCpy/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS -TAO/tests/Portable_Interceptors/AdvSlotExt/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS -TAO/tests/Portable_Interceptors/Redirection/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS -TAO/tests/ORT/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS +TAO/tests/Exposed_Policies/run_test.pl: !MINIMUM !ST !ACE_FOR_TAO +TAO/tests/Portable_Interceptors/Bug_1559/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS +TAO/tests/Portable_Interceptors/Bug_2510_Regression/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !ST +TAO/tests/Portable_Interceptors/Collocated/Dynamic/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !ST +TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !ST +TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !ST +TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !ST +TAO/tests/Portable_Interceptors/Dynamic/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS +TAO/tests/Portable_Interceptors/IORInterceptor/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !GIOP10 +TAO/tests/Portable_Interceptors/ForwardRequest/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS +TAO/tests/Portable_Interceptors/Service_Context_Manipulation/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS +TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !HAS_EXTENDED_FT_INTERCEPTORS +TAO/tests/Portable_Interceptors/PICurrent/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS +TAO/tests/Portable_Interceptors/AMI/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS +TAO/tests/Portable_Interceptors/ORB_Shutdown/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS +TAO/tests/Portable_Interceptors/PolicyFactory/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS +TAO/tests/Portable_Interceptors/Bug_2088/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS +TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS +TAO/tests/Portable_Interceptors/Register_Initial_References/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS +TAO/tests/Portable_Interceptors/Slot/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS +TAO/tests/Portable_Interceptors/AdvSlot/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS +TAO/tests/Portable_Interceptors/AdvSlotDblCpy/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS +TAO/tests/Portable_Interceptors/AdvSlotExt/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS +TAO/tests/ORT/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS TAO/tests/Object_Loader/run_test.pl: !VxWorks !STATIC TAO/tests/Two_Objects/run_test.pl: !ST -TAO/tests/TransportCurrent/Framework/run_test.pl -dynamic: !STATIC !DISABLE_INTERCEPTORS !MINIMUM -TAO/tests/TransportCurrent/Framework/run_test.pl -static: STATIC !DISABLE_INTERCEPTORS !MINIMUM -TAO/tests/TransportCurrent/IIOP/run_test.pl -dynamic: !STATIC !DISABLE_INTERCEPTORS !MINIMUM -TAO/tests/TransportCurrent/IIOP/run_test.pl -static: STATIC !DISABLE_INTERCEPTORS !MINIMUM TAO/tests/UNKNOWN_Exception/run_test.pl: Exceptions TAO/tests/Native_Exceptions/run_test.pl: Exceptions -TAO/tests/Servant_To_Reference_Test/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST +TAO/tests/Servant_To_Reference_Test/run_test.pl: !MINIMUM !ST TAO/tests/Sequence_Unit_Tests/run_test.pl: TAO/tests/Typedef_String_Array/run_test.pl: -TAO/tests/Bug_1535_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO +TAO/tests/Bug_1535_Regression/run_test.pl: !MINIMUM TAO/tests/GIOP_Fragments/PMB_With_Fragments/run_test.pl: TAO/tests/CodeSets/simple/run_test.pl: !VxWorks !GIOP10 !STATIC TAO/tests/Hang_Shutdown/run_test.pl: !ST !ACE_FOR_TAO -TAO/tests/Any/Recursive/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO +TAO/tests/Any/Recursive/run_test.pl: TAO/tests/CSD_Strategy_Tests/TP_Test_1/run_test.pl: !ST !VxWorks TAO/tests/CSD_Strategy_Tests/TP_Test_2/run_test.pl: !ST !VxWorks TAO/tests/CSD_Strategy_Tests/TP_Test_2/run_test.pl remote: !ST !VxWorks @@ -271,6 +264,5 @@ TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/run_test.pl: !STATIC !ST !VxWorks TAO/tests/CSD_Strategy_Tests/TP_Test_Static/run_test.pl: !ST !VxWorks TAO/tests/Permanent_Forward/run_test.pl: TAO/tests/Parallel_Connect_Strategy/run_test.pl: -TAO/tests/DII_Collocation_Tests/oneway/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO -TAO/tests/DII_Collocation_Tests/twoway/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO -TAO/tests/Compression/run_test.pl: ZLIB +TAO/tests/DII_Collocation_Tests/oneway/run_test.pl: !ST !MINIMUM +TAO/tests/DII_Collocation_Tests/twoway/run_test.pl: !ST !MINIMUM diff --git a/ACE/bin/tao_other_tests.lst b/ACE/bin/tao_other_tests.lst index 4b9d8a0be31..61dbeef9e75 100644 --- a/ACE/bin/tao_other_tests.lst +++ b/ACE/bin/tao_other_tests.lst @@ -5,137 +5,136 @@ # Each line has its own test, and a test can be followed by a # list of configurations it does _not_ run on. # -# Example: TAO\examples\foo\run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST +# Example: TAO\examples\foo\run_test.pl: !MINIMUM !ST # # 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: !DISABLE_ToFix_LynxOS_PPC !DISABLE_ToFix_LynxOS_x86 !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !Win32 !ACE_FOR_TAO !OpenVMS -#TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test_lite.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !STATIC !Win32 !ACE_FOR_TAO !OpenVMS +TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl: !DISABLE_ToFix_LynxOS_PPC !DISABLE_ToFix_LynxOS_x86 !MINIMUM !ST !Win32 !ACE_FOR_TAO !OpenVMS +#TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test_lite.pl: !MINIMUM !ST !STATIC !Win32 !ACE_FOR_TAO !OpenVMS TAO/performance-tests/Cubit/TAO/MT_Cubit/run_test.pl: !ST !OpenBSD !Win32 !ACE_FOR_TAO !OpenVMS 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 !DISABLE_ToFix_LynxOS_PPC !ACE_FOR_TAO !OpenVMS TAO/performance-tests/Latency/Thread_Per_Connection/run_test.pl -n 1000: !ST !Win32 !DISABLE_ToFix_LynxOS_PPC !ACE_FOR_TAO !OpenVMS -TAO/performance-tests/Latency/AMI/run_test.pl: !DISABLE_ToFix_LynxOS_PPC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !Win32 !ACE_FOR_TAO !OpenVMS -TAO/performance-tests/Latency/DSI/run_test.pl: !DISABLE_ToFix_LynxOS_PPC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !ACE_FOR_TAO !OpenVMS -TAO/performance-tests/Latency/DII/run_test.pl: !DISABLE_ToFix_LynxOS_PPC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !ACE_FOR_TAO !OpenVMS -TAO/performance-tests/Latency/Deferred/run_test.pl: !DISABLE_ToFix_LynxOS_PPC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !ACE_FOR_TAO !OpenVMS +TAO/performance-tests/Latency/AMI/run_test.pl: !DISABLE_ToFix_LynxOS_PPC !MINIMUM !ST !Win32 !ACE_FOR_TAO !OpenVMS +TAO/performance-tests/Latency/DSI/run_test.pl: !DISABLE_ToFix_LynxOS_PPC !MINIMUM !Win32 !ACE_FOR_TAO !OpenVMS +TAO/performance-tests/Latency/DII/run_test.pl: !DISABLE_ToFix_LynxOS_PPC !MINIMUM !Win32 !ACE_FOR_TAO !OpenVMS +TAO/performance-tests/Latency/Deferred/run_test.pl: !DISABLE_ToFix_LynxOS_PPC !MINIMUM !Win32 !ACE_FOR_TAO !OpenVMS TAO/performance-tests/Sequence_Latency/Single_Threaded/run_test.pl: !Win32 !DISABLE_ToFix_LynxOS_PPC !ACE_FOR_TAO !OpenVMS TAO/performance-tests/Sequence_Latency/Thread_Pool/run_test.pl: !ST !Win32 !DISABLE_ToFix_LynxOS_PPC !ACE_FOR_TAO !OpenVMS TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/run_test.pl: !ST !Win32 !DISABLE_ToFix_LynxOS_PPC !ACE_FOR_TAO !OpenVMS -TAO/performance-tests/Sequence_Latency/AMI/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !Win32 !DISABLE_ToFix_LynxOS_PPC !ACE_FOR_TAO !OpenVMS -TAO/performance-tests/Sequence_Latency/DSI/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !DISABLE_ToFix_LynxOS_PPC !ACE_FOR_TAO !OpenVMS -TAO/performance-tests/Sequence_Latency/DII/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !DISABLE_ToFix_LynxOS_PPC !ACE_FOR_TAO !OpenVMS -TAO/performance-tests/Sequence_Latency/Deferred/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !DISABLE_ToFix_LynxOS_PPC !ACE_FOR_TAO !OpenVMS +TAO/performance-tests/Sequence_Latency/AMI/run_test.pl: !MINIMUM !ST !Win32 !DISABLE_ToFix_LynxOS_PPC !ACE_FOR_TAO !OpenVMS +TAO/performance-tests/Sequence_Latency/DSI/run_test.pl: !MINIMUM !Win32 !DISABLE_ToFix_LynxOS_PPC !ACE_FOR_TAO !OpenVMS +TAO/performance-tests/Sequence_Latency/DII/run_test.pl: !MINIMUM !Win32 !DISABLE_ToFix_LynxOS_PPC !ACE_FOR_TAO !OpenVMS +TAO/performance-tests/Sequence_Latency/Deferred/run_test.pl: !MINIMUM !Win32 !DISABLE_ToFix_LynxOS_PPC !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 -TAO/performance-tests/RTCorba/Oneways/Reliable/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !OpenVMS -TAO/performance-tests/Protocols/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !Win32 !ACE_FOR_TAO !OpenVMS -TAO/examples/POA/Adapter_Activator/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !SUNCC5_1 !ACE_FOR_TAO -TAO/examples/POA/POA_BiDir/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_BIDIR -TAO/examples/POA/DSI/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO -TAO/examples/POA/Default_Servant/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO -TAO/examples/POA/Explicit_Activation/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO -TAO/examples/POA/FindPOA/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO -TAO/examples/POA/Forwarding/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO -TAO/examples/POA/NewPOA/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO -TAO/examples/POA/On_Demand_Activation/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !ACE_FOR_TAO -TAO/examples/POA/On_Demand_Loading/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !KCC_Linux !ACE_FOR_TAO -TAO/examples/POA/Reference_Counted_Servant/run_test.pl: !SUNCC5_1 !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO -TAO/examples/POA/Loader/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !KCC_Linux !ACE_FOR_TAO +TAO/performance-tests/RTCorba/Oneways/Reliable/run_test.pl: !MINIMUM !Win32 !OpenVMS +TAO/performance-tests/Protocols/run_test.pl: !MINIMUM !STATIC !Win32 !ACE_FOR_TAO !OpenVMS +TAO/examples/POA/Adapter_Activator/run_test.pl: !MINIMUM !SUNCC5_1 !ACE_FOR_TAO +TAO/examples/POA/POA_BiDir/run_test.pl: !MINIMUM !DISABLE_BIDIR +TAO/examples/POA/DSI/run_test.pl: !MINIMUM +TAO/examples/POA/Default_Servant/run_test.pl: !MINIMUM +TAO/examples/POA/Explicit_Activation/run_test.pl: !MINIMUM !ACE_FOR_TAO +TAO/examples/POA/FindPOA/run_test.pl: !MINIMUM +TAO/examples/POA/Forwarding/run_test.pl: !MINIMUM +TAO/examples/POA/NewPOA/run_test.pl: !MINIMUM +TAO/examples/POA/On_Demand_Activation/run_test.pl: !MINIMUM !STATIC !ACE_FOR_TAO +TAO/examples/POA/On_Demand_Loading/run_test.pl: !MINIMUM !STATIC !KCC_Linux !ACE_FOR_TAO +TAO/examples/POA/Reference_Counted_Servant/run_test.pl: !SUNCC5_1 !MINIMUM !ACE_FOR_TAO +TAO/examples/POA/Loader/run_test.pl: !MINIMUM !STATIC !KCC_Linux !ACE_FOR_TAO TAO/examples/POA/RootPOA/run_test.pl TAO/examples/Simple/bank/run_test.pl: !NO_MESSAGING TAO/examples/Simple/grid/run_test.pl: !NO_MESSAGING TAO/examples/Simple/time-date/run_test.pl: !ST !STATIC !NO_MESSAGING !Win32 TAO/examples/Simple/time/run_test.pl: !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 !SUNCC5_1 !ACE_FOR_TAO +TAO/examples/Quoter/run_test.pl: !DISABLE_ToFix_LynxOS_PPC !MINIMUM !Win32 !ACE_FOR_TAO +TAO/examples/Load_Balancing/run_test.pl: !MINIMUM !SUNCC5_1 !ACE_FOR_TAO TAO/examples/PluggableUDP/tests/Basic/run_test.pl: !STATIC !ST !NO_DIOP !ACE_FOR_TAO TAO/examples/PluggableUDP/tests/SimplePerformance/run_test.pl: !NO_DIOP !ACE_FOR_TAO -TAO/examples/AMH/Sink_Server/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !Win32 !DISABLE_ToFix_LynxOS_PPC !DISABLE_ToFix_LynxOS_x86 !ACE_FOR_TAO -TAO/orbsvcs/tests/AVStreams/Pluggable/run_test.pl -p TCP,UDP,RTP_UDP: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_ToFix_LynxOS_x86 !ACE_FOR_TAO -TAO/orbsvcs/tests/AVStreams/Pluggable/run_test.pl -p SCTP_SEQ: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO SCTP !DISABLE_ToFix_LynxOS_x86 !ACE_FOR_TAO -TAO/orbsvcs/tests/AVStreams/Full_Profile/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_PPC !DISABLE_ToFix_LynxOS_x86 -TAO/orbsvcs/tests/AVStreams/Multicast/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_PPC !DISABLE_ToFix_LynxOS_x86 -#TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO -#TAO/orbsvcs/tests/AVStreams/Latency/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO -TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl -p TCP,UDP,RTP_UDP: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO -TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl -p SCTP_SEQ: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO SCTP !ACE_FOR_TAO -TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl -p TCP,UDP,RTP_UDP: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO -TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl -p SCTP_SEQ: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO SCTP !ACE_FOR_TAO -TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_x86 -TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO -TAO/orbsvcs/tests/AVStreams/Component_Switching/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO +TAO/examples/AMH/Sink_Server/run_test.pl: !MINIMUM !Win32 !DISABLE_ToFix_LynxOS_PPC !DISABLE_ToFix_LynxOS_x86 !ACE_FOR_TAO +TAO/orbsvcs/tests/AVStreams/Pluggable/run_test.pl -p TCP,UDP,RTP_UDP: !MINIMUM !DISABLE_ToFix_LynxOS_x86 !ACE_FOR_TAO +TAO/orbsvcs/tests/AVStreams/Pluggable/run_test.pl -p SCTP_SEQ: !MINIMUM SCTP !DISABLE_ToFix_LynxOS_x86 !ACE_FOR_TAO +TAO/orbsvcs/tests/AVStreams/Full_Profile/run_test.pl: !MINIMUM !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_PPC !DISABLE_ToFix_LynxOS_x86 +TAO/orbsvcs/tests/AVStreams/Multicast/run_test.pl: !MINIMUM !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_PPC !DISABLE_ToFix_LynxOS_x86 +#TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl: !MINIMUM !ACE_FOR_TAO +#TAO/orbsvcs/tests/AVStreams/Latency/run_test.pl: !MINIMUM !ACE_FOR_TAO +TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl -p TCP,UDP,RTP_UDP: !MINIMUM !ACE_FOR_TAO +TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl -p SCTP_SEQ: !MINIMUM SCTP !ACE_FOR_TAO +TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl -p TCP,UDP,RTP_UDP: !MINIMUM !ACE_FOR_TAO +TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl -p SCTP_SEQ: !MINIMUM SCTP !ACE_FOR_TAO +TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/run_test.pl: !MINIMUM !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_x86 +TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl: !MINIMUM !ACE_FOR_TAO +TAO/orbsvcs/tests/AVStreams/Component_Switching/run_test.pl: !MINIMUM !ACE_FOR_TAO TAO/orbsvcs/tests/Bug_1334_Regression/run_test.pl: !ACE_FOR_TAO -TAO/orbsvcs/tests/Bug_1393_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NO_IFR !ACE_FOR_TAO -TAO/orbsvcs/tests/Bug_1395_Regression/run_test.pl: !LynxOS !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NO_MESSAGING !ACE_FOR_TAO -TAO/orbsvcs/tests/Bug_1436_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NO_IFR !ACE_FOR_TAO -TAO/orbsvcs/tests/Bug_1437_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NO_MESSAGING !ACE_FOR_TAO -TAO/orbsvcs/tests/Bug_1630_Regression/run_test.pl: !NO_IFR !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO -TAO/orbsvcs/tests/Bug_2074_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !NO_MESSAGING -TAO/orbsvcs/tests/Bug_2247_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO -TAO/orbsvcs/tests/Bug_2248_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO -TAO/orbsvcs/tests/Bug_2285_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO -TAO/orbsvcs/tests/Bug_2285_Regression/run_test2.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO -TAO/orbsvcs/tests/Bug_2287_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO -TAO/orbsvcs/tests/Bug_2316_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !SUNCC5_1 -TAO/orbsvcs/tests/Bug_2377_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC -TAO/orbsvcs/tests/Bug_2615_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO -TAO/orbsvcs/tests/CosEvent/Basic/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO +TAO/orbsvcs/tests/Bug_1393_Regression/run_test.pl: !MINIMUM !NO_IFR !ACE_FOR_TAO +TAO/orbsvcs/tests/Bug_1395_Regression/run_test.pl: !LynxOS !MINIMUM !NO_MESSAGING !ACE_FOR_TAO +TAO/orbsvcs/tests/Bug_1436_Regression/run_test.pl: !MINIMUM !NO_IFR !ACE_FOR_TAO +TAO/orbsvcs/tests/Bug_1437_Regression/run_test.pl: !MINIMUM !NO_MESSAGING !ACE_FOR_TAO +TAO/orbsvcs/tests/Bug_1630_Regression/run_test.pl: !NO_IFR !MINIMUM !ACE_FOR_TAO +TAO/orbsvcs/tests/Bug_2074_Regression/run_test.pl: !MINIMUM !ST !NO_MESSAGING +TAO/orbsvcs/tests/Bug_2247_Regression/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !ACE_FOR_TAO +TAO/orbsvcs/tests/Bug_2248_Regression/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !ACE_FOR_TAO +TAO/orbsvcs/tests/Bug_2285_Regression/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !ACE_FOR_TAO +TAO/orbsvcs/tests/Bug_2285_Regression/run_test2.pl: !MINIMUM !DISABLE_INTERCEPTORS !ACE_FOR_TAO +TAO/orbsvcs/tests/Bug_2287_Regression/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !ACE_FOR_TAO +TAO/orbsvcs/tests/Bug_2316_Regression/run_test.pl: !MINIMUM !STATIC !SUNCC5_1 +TAO/orbsvcs/tests/Bug_2377_Regression/run_test.pl: !MINIMUM !STATIC +TAO/orbsvcs/tests/Bug_2615_Regression/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !ACE_FOR_TAO +TAO/orbsvcs/tests/CosEvent/Basic/run_test.pl: !ST !MINIMUM !ACE_FOR_TAO TAO/orbsvcs/tests/Simple_Naming/run_test.pl: !ST !SUNCC5_1 !NO_MESSAGING !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_x86 !DISABLE_ToFix_LynxOS_PPC -TAO/orbsvcs/tests/Simple_Naming/run_test_ffp.pl: !ST !SUNCC5_1 !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NO_MESSAGING !ACE_FOR_TAO -TAO/orbsvcs/tests/Redundant_Naming/run_test.pl: !ST !SUNCC5_1 !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO -TAO/orbsvcs/tests/Trading/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !SUNCC5_1 -TAO/orbsvcs/tests/unit/Trading/Interpreter/run_test.pl: -TAO/orbsvcs/tests/Event/Basic/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO -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 -TAO/orbsvcs/tests/EC_MT_Mcast/run_test.pl:!ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO -TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/run_test.pl: !NO_MCAST !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO -TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/run_test.pl:!MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO -TAO/orbsvcs/tests/FaultTolerance/IOGR/run_test.pl:!MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO -TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/run_test.pl:!MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO -TAO/orbsvcs/tests/Bug_2137_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO -TAO/orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NO_IFR !STATIC !ACE_FOR_TAO -TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NO_IFR !ACE_FOR_TAO -TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NO_IFR !ACE_FOR_TAO -TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NO_IFR !ACE_FOR_TAO -TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NO_IFR !ACE_FOR_TAO -TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NO_IFR !ACE_FOR_TAO -TAO/orbsvcs/tests/ImplRepo/run_test.pl both_ir: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO -TAO/orbsvcs/tests/ImplRepo/run_test.pl nestea_ir: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO -TAO/orbsvcs/tests/ImplRepo/run_test.pl airplane_ir: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO -TAO/orbsvcs/tests/ImplRepo/run_test.pl persistent_ir: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO -TAO/orbsvcs/tests/ImplRepo/run_test.pl nt_service_ir: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO Win32 !ACE_FOR_TAO -TAO/orbsvcs/tests/ImplRepo/run_test.pl shutdown: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_ToFix_LynxOS_x86 !DISABLE_ToFix_LynxOS_PPC !ACE_FOR_TAO -TAO/orbsvcs/tests/ImplRepo/run_test.pl perclient: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO -TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO -TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_ToFix_LynxOS_x86 !DISABLE_ToFix_LynxOS_PPC !ACE_FOR_TAO -TAO/orbsvcs/tests/ImplRepo/scale/run_test.pl -servers 5 -objects 5: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO -TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NO_EXCEPTIONS !ACE_FOR_TAO -TAO/orbsvcs/examples/ImR/Combined_Service/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !ST !ACE_FOR_TAO -TAO/orbsvcs/examples/CosEC/TypedSimple/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NO_IFR !ACE_FOR_TAO -TAO/orbsvcs/tests/CosEvent/Timeout/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !NO_MESSAGING !ACE_FOR_TAO +TAO/orbsvcs/tests/Simple_Naming/run_test_ffp.pl: !ST !SUNCC5_1 !MINIMUM !NO_MESSAGING !ACE_FOR_TAO +TAO/orbsvcs/tests/Redundant_Naming/run_test.pl: !ST !SUNCC5_1 !MINIMUM !ACE_FOR_TAO +TAO/orbsvcs/tests/Trading/run_test.pl: !MINIMUM !SUNCC5_1 +TAO/orbsvcs/tests/Event/Basic/run_test.pl: !ST !MINIMUM !ACE_FOR_TAO +TAO/orbsvcs/tests/Event/Performance/run_test.pl: !ST !MINIMUM !ACE_FOR_TAO +TAO/orbsvcs/tests/Event/UDP/run_test.pl: !MINIMUM !ACE_FOR_TAO !NO_DIOP +TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl: !ST !MINIMUM !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_x86 +TAO/orbsvcs/tests/EC_Throughput/run_test.pl: !ST !MINIMUM !DISABLE_ToFix_LynxOS_x86 !ACE_FOR_TAO +TAO/orbsvcs/tests/EC_MT_Mcast/run_test.pl:!ST !MINIMUM !ACE_FOR_TAO +TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/run_test.pl:!ST !MINIMUM !ACE_FOR_TAO +TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/run_test.pl:!MINIMUM !DISABLE_INTERCEPTORS !ACE_FOR_TAO +TAO/orbsvcs/tests/FaultTolerance/IOGR/run_test.pl:!MINIMUM !DISABLE_INTERCEPTORS !ACE_FOR_TAO +TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/run_test.pl:!MINIMUM !DISABLE_INTERCEPTORS !ACE_FOR_TAO +TAO/orbsvcs/tests/Bug_2137_Regression/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !ACE_FOR_TAO +TAO/orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl: !MINIMUM !NO_IFR !STATIC !ACE_FOR_TAO +TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/run_test.pl: !MINIMUM !NO_IFR !ACE_FOR_TAO +TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/run_test.pl: !MINIMUM !NO_IFR !ACE_FOR_TAO +TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/run_test.pl: !MINIMUM !NO_IFR !ACE_FOR_TAO +TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/run_test.pl: !MINIMUM !NO_IFR !ACE_FOR_TAO +TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl: !MINIMUM !NO_IFR !ACE_FOR_TAO +TAO/orbsvcs/tests/ImplRepo/run_test.pl both_ir: !MINIMUM !ACE_FOR_TAO +TAO/orbsvcs/tests/ImplRepo/run_test.pl nestea_ir: !MINIMUM !ACE_FOR_TAO +TAO/orbsvcs/tests/ImplRepo/run_test.pl airplane_ir: !MINIMUM !ACE_FOR_TAO +TAO/orbsvcs/tests/ImplRepo/run_test.pl persistent_ir: !MINIMUM !ACE_FOR_TAO +TAO/orbsvcs/tests/ImplRepo/run_test.pl nt_service_ir: !MINIMUM Win32 !ACE_FOR_TAO +TAO/orbsvcs/tests/ImplRepo/run_test.pl shutdown: !MINIMUM !DISABLE_ToFix_LynxOS_x86 !DISABLE_ToFix_LynxOS_PPC !ACE_FOR_TAO +TAO/orbsvcs/tests/ImplRepo/run_test.pl perclient: !MINIMUM !ACE_FOR_TAO +TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl: !MINIMUM !ACE_FOR_TAO +TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl: !MINIMUM !DISABLE_ToFix_LynxOS_x86 !DISABLE_ToFix_LynxOS_PPC !ACE_FOR_TAO +TAO/orbsvcs/tests/ImplRepo/scale/run_test.pl -servers 5 -objects 5: !MINIMUM !ACE_FOR_TAO +TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/run_test.pl: !MINIMUM !NO_EXCEPTIONS !ACE_FOR_TAO +TAO/orbsvcs/examples/ImR/Combined_Service/run_test.pl: !MINIMUM !STATIC !ST !ACE_FOR_TAO +TAO/orbsvcs/examples/CosEC/TypedSimple/run_test.pl: !MINIMUM !NO_IFR !ACE_FOR_TAO +TAO/orbsvcs/tests/CosEvent/Timeout/run_test.pl: !MINIMUM !ST !NO_MESSAGING !ACE_FOR_TAO TAO/orbsvcs/tests/Log/Basic_Log_Test/run_test.pl: !NO_MESSAGING !ACE_FOR_TAO -TAO/orbsvcs/tests/Notify/Basic/run_test.pl notify.reactive.conf: !ST !NO_MESSAGING !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO -TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl notify.reactive.conf: IPV6 !ST !NO_MESSAGING !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO -TAO/orbsvcs/tests/Notify/Basic/run_test.pl notify.mt.conf: !ST !NOTIFY !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO -TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl notify.mt.conf: IPV6 !ST !NOTIFY !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO -TAO/orbsvcs/tests/Notify/Basic/run_test.pl notify.rt.conf: !ST !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO -TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl notify.rt.conf: IPV6 !ST !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO -TAO/orbsvcs/tests/Notify/Blocking/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_x86 -TAO/orbsvcs/tests/Notify/Discarding/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_x86 -TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO -TAO/orbsvcs/tests/Notify/Ordering/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_x86 -TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !IRIX !ACE_FOR_TAO -TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO -TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO -TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO -TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_x86 -TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO -TAO/orbsvcs/tests/Notify/Reconnecting/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !ACE_FOR_TAO -TAO/orbsvcs/tests/Notify/XML_Persistence/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !ACE_FOR_TAO +TAO/orbsvcs/tests/Notify/Basic/run_test.pl notify.reactive.conf: !ST !NO_MESSAGING !STATIC !MINIMUM !ACE_FOR_TAO +TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl notify.reactive.conf: IPV6 !ST !NO_MESSAGING !STATIC !MINIMUM !ACE_FOR_TAO +TAO/orbsvcs/tests/Notify/Basic/run_test.pl notify.mt.conf: !ST !NOTIFY !NO_MESSAGING !MINIMUM !ACE_FOR_TAO +TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl notify.mt.conf: IPV6 !ST !NOTIFY !NO_MESSAGING !MINIMUM !ACE_FOR_TAO +TAO/orbsvcs/tests/Notify/Basic/run_test.pl notify.rt.conf: !ST !STATIC !MINIMUM !ACE_FOR_TAO +TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl notify.rt.conf: IPV6 !ST !STATIC !MINIMUM !ACE_FOR_TAO +TAO/orbsvcs/tests/Notify/Blocking/run_test.pl: !ST !NO_MESSAGING !MINIMUM !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_x86 +TAO/orbsvcs/tests/Notify/Discarding/run_test.pl: !ST !NO_MESSAGING !MINIMUM !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_x86 +TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl: !ST !NO_MESSAGING !MINIMUM !ACE_FOR_TAO +TAO/orbsvcs/tests/Notify/Ordering/run_test.pl: !ST !NO_MESSAGING !MINIMUM !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_x86 +TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl: !ST !NO_MESSAGING !MINIMUM !IRIX !ACE_FOR_TAO +TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl: !ST !NO_MESSAGING !MINIMUM !ACE_FOR_TAO +TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl: !ST !NO_MESSAGING !MINIMUM !ACE_FOR_TAO +TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl: !ST !NO_MESSAGING !MINIMUM !ACE_FOR_TAO +TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl: !ST !NO_MESSAGING !MINIMUM !ACE_FOR_TAO !DISABLE_ToFix_LynxOS_x86 +TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl: !ST !NO_MESSAGING !MINIMUM !ACE_FOR_TAO +TAO/orbsvcs/tests/Notify/Reconnecting/run_test.pl: !ST !NO_MESSAGING !MINIMUM !STATIC !ACE_FOR_TAO +TAO/orbsvcs/tests/Notify/XML_Persistence/run_test.pl: !ST !NO_MESSAGING !MINIMUM !STATIC !ACE_FOR_TAO TAO/orbsvcs/tests/EC_Mcast/run_test.pl: !NO_MCAST !NO_MESSAGING !DISABLE_ToFix_LynxOS_PPC !ACE_FOR_TAO # FAILS 'TAO/orbsvcs/tests/EC_Multiple/run_test.pl # NO REDIRECTION TAO/examples/Simple/echo/run_test.pl < Echo.idl @@ -150,16 +149,15 @@ TAO/orbsvcs/tests/Security/MT_IIOP_SSL/run_test.pl: !ST SSL !STATIC !DISABLE_INT #Bug 1647. run_test_harsh.pl takes 5 minutes; but there aren't many SSL builds TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test_harsh.pl: !ST SSL !STATIC !DISABLE_INTERCEPTORS !ACE_FOR_TAO TAO/orbsvcs/tests/Security/Crash_Test/run_test.pl: SSL !STATIC !DISABLE_INTERCEPTORS !ACE_FOR_TAO -TAO/orbsvcs/tests/Miop/McastHello/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !SUNCC5_1 !NO_MCAST +TAO/orbsvcs/tests/Miop/McastHello/run_test.pl: !MINIMUM !STATIC !SUNCC5_1 !NO_MCAST # The following 2 tests use dynamic loading to change the default reactor on Windows -TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !STATIC !ACE_FOR_TAO -TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !STATIC !ACE_FOR_TAO -TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !NO_LOADAVG !DISABLE_ToFix_LynxOS_x86 -TAO/examples/RTCORBA/Activity/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !ACE_FOR_TAO -TAO/examples/RTScheduling/Fixed_Priority_Scheduler/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !STATIC !ST !ACE_FOR_TAO -TAO/examples/RTScheduling/MIF_Scheduler/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !STATIC !ST !ACE_FOR_TAO +TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !STATIC !ACE_FOR_TAO +TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !STATIC !ACE_FOR_TAO +TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !NO_LOADAVG !DISABLE_ToFix_LynxOS_x86 +TAO/examples/RTCORBA/Activity/run_test.pl: !MINIMUM !ST !ACE_FOR_TAO +TAO/examples/RTScheduling/Fixed_Priority_Scheduler/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !STATIC !ST !ACE_FOR_TAO +TAO/examples/RTScheduling/MIF_Scheduler/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !STATIC !ST !ACE_FOR_TAO TAO/examples/ior_corbaloc/run_test.pl: !NO_MESSAGING !ACE_FOR_TAO TAO/utils/nslist/run_test.pl: !ST !SUNCC5_1 !NO_MESSAGING !ACE_FOR_TAO TAO/orbsvcs/tests/BiDir_CORBALOC/run_test.pl: !NO_MESSAGING !ACE_FOR_TAO -TAO/orbsvcs/tests/IOR_MCast/run_test_ipv6.pl: IPV6 !NO_MCAST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO -TAO/orbsvcs/tests/Bug_2709_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO +TAO/orbsvcs/tests/IOR_MCast/run_test_ipv6.pl: IPV6 !MINIMUM diff --git a/ACE/bin/vx_repo_link.pl b/ACE/bin/vx_repo_link.pl deleted file mode 100755 index b4ec5f82ed8..00000000000 --- a/ACE/bin/vx_repo_link.pl +++ /dev/null @@ -1,217 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -# $Id$ -# - - -use FindBin; -use lib $FindBin::Bin; - -use diagnostics; -use Time::Local; -use File::Basename; -use File::Spec; -use FileHandle; -use Cwd; - -my $VXDEBUG = (defined $ENV{'VX_REPO_LINK_DEBUG'}) ? $ENV{'VX_REPO_LINK_DEBUG'} : 0; -my $ace_root = $ENV{'ACE_ROOT'}; -$ace_root =~ s/\//\\/g; -my $wind_base = $ENV{'WIND_BASE'}; -$wind_base =~ s/\//\\/g; -my $AR = $ENV{'AR'}; -my $RANLIB = $ENV{'RANLIB'}; -my @lib_arr; -my $lib; -my $curdir = cwd(); -$curdir =~ s/\//\\/g; - - -if ($VXDEBUG > 1) -{ - print STDERR "AR = ". $AR . "\n"; - print STDERR "ACE_ROOT = " . $ace_root . "\n"; - print STDERR "WIND_BASE = " . $wind_base, "\n"; - print STDERR "curdir = " . $curdir, "\n"; -} - -if ($VXDEBUG > 1) { - print STDERR "LINKLIBS are:\n"; -} - -while ($#ARGV >= 0) -{ - if ($ARGV[0] =~ /^-l/) { - $lib = shift; - $lib =~ s/^-l//; - if ($VXDEBUG > 1) { - print STDERR $ace_root."/lib/lib".$lib.".a\n"; - } - push @lib_arr, $lib; - } -} - -my @lib_registry = (); - -my $LINKLIBS = ""; - -my $libobj_dir = ".lib"; -system("if not exist ".$libobj_dir." mkdir ".$libobj_dir); -foreach $lib (@lib_arr) { - my $libname = $ace_root."\\lib\\lib".$lib.".a"; - if (-e $libname) { - if (! -e $libobj_dir."\\lib".$lib.".a") { - if ($VXDEBUG) { - print STDERR "Unpacking ".$lib."...\n"; - } - system("cmd /c if exist ".$libobj_dir."\\".$lib." del /q/f ".$libobj_dir."\\".$lib."\\*.*"); - system("cmd /c (mkdir ".$libobj_dir."\\".$lib." && cd ".$libobj_dir."\\".$lib." && ".$AR." -x ".$libname." && cd ".$curdir.")"); - - if ($VXDEBUG) { - print STDERR "Processing ".$lib."...\n"; - } - - my @rpo_arr = glob ($libobj_dir."\\".$lib."\\*.rpo"); - - if ($VXDEBUG > 1) { - print STDERR "Read #".$#rpo_arr." filenames\n"; - } - - my $line; - my $fh; - my $newfh; - my $module; - foreach $rpo (@rpo_arr) { - if ($VXDEBUG > 2) { - print STDERR $rpo."\n"; - } - $fh = new FileHandle(); - $newfh = new FileHandle(); - $module = basename($rpo, ".rpo"); - open ($newfh, '>', dirname($rpo)."\\".$module.".__rpo"); - open ($fh, '<', $rpo); - while (defined ($line = readline $fh)) { - if ($line =~ /^M /) { - $line =~ s/\//\\/g; - } - elsif ($line =~ /^D /) { - $line =~ s/(^D[ ])(.*ACE_wrappers)(.*)/${1}$ace_root${3}/; - $line =~ s/\//\\/g; - } - elsif ($line =~ /^A /) { - $line =~ s/('-I)([^ ]*ACE_wrappers)([']|[^']+')/${1}$ace_root${3}/g; - $line =~ s/('-I)([^ ]*Tornado[^\/\\]+)([']|[^']+')/${1}$wind_base${3}/g; - $line =~ s/('-o' )('.*')/'-o' '$curdir\/$libobj_dir\/$lib\/$module.o'/g; - $line =~ s/\//\\/g; - } - print $newfh $line; - } - close ($fh); - close ($newfh); - - system("cmd /c (del /f/q ".$rpo." && rename ".dirname($rpo)."\\".$module.".__rpo ".basename($rpo).")"); - } - - $fh = new FileHandle(); - open($fh, '<', $libobj_dir."\\".$lib."\\.prelink.spec"); - my $lnkcmd = readline($fh); - my $arcmd = readline($fh); - my $libdeps = readline($fh); - close($fh); - - $lib_registry[++$#lib_registry] = { - lib => $lib, - linkcmd => $lnkcmd, - arcmd => $arcmd, - libdeps => (defined $libdeps ? $libdeps : '') - }; - } - - $LINKLIBS = $LINKLIBS." ".$libobj_dir."\\lib".$lib.".a"; - } - else { - $LINKLIBS = "-l".$lib." ".$LINKLIBS; - } -} - -sub _find_lib_entry -{ - my $lib = shift; - foreach my $reg (@lib_registry) { - if ($reg->{lib} =~ /(^| )$lib( |$)/) { - return $reg; - } - } - return undef; -} - -sub _prelink_lib -{ - my $lentry = shift; - my $stack = shift; - my $lib = $lentry->{lib}; - my $lnkcmd = $lentry->{linkcmd}; - my $arcmd = $lentry->{arcmd}; - my @deps = split(' ', $lentry->{libdeps}); - - $lnkcmd =~ s/\n//g; - $arcmd =~ s/\n//g; - - if ($VXDEBUG) { - print STDERR "Prelink requested for ".$lib." (dependend on ".join(' ', @deps).")...\n"; - } - - # check dependencies - foreach my $dep (@deps) { - if ($VXDEBUG > 1) { - print STDERR " Checking dependency ".$dep."(stack = ".$stack.")...\n"; - } - if (($stack !~ /\<$dep\>/) && !(-e $libobj_dir."\\lib".$dep.".a")) { - my $le = _find_lib_entry ($dep); - if (defined $le) { - _prelink_lib ($le, $stack." <".$lib.">"); - } - } - } - - # prelink library - if ($VXDEBUG) { - print STDERR "Prelinking ".$lib."...\n"; - } - - my $objs = join(' ', glob ($libobj_dir."\\".$lib."\\*.o")); - my $libs = join(' ', glob ($libobj_dir."\\*.a")); - if ($VXDEBUG > 1) { - print STDERR " > cmd /c ".$lnkcmd." ".$libobj_dir."\\.prelink_lib ".$objs." ".$libs."\n"; - } - system("cmd /c ".$lnkcmd." ".$libobj_dir."\\.prelink_lib ".$objs." ".$libs); - system("cmd /c del /f/q ".$libobj_dir."\\.prelink_lib"); - - # build prelinked library - if ($VXDEBUG) { - print STDERR "Building prelinked lib ".$lib."...\n"; - } - - $arcmd =~ s/lib$lib/$libobj_dir\\lib$lib/; - #$arcmd = $AR." r ".$libobj_dir."\\lib".$lib.".a"; - $arcmd =~ s/ rv / rc /g; - if ($VXDEBUG > 1) { - print STDERR "cmd /c echo ".$objs." | ".$arcmd."\n"; - print STDERR "cmd /c (".$RANLIB." ".$libobj_dir."\\lib".$lib.".a && rmdir /s/q ".$libobj_dir."\\".$lib.")"."\n"; - } - system("cmd /c echo ".$objs." | ".$arcmd); - system("cmd /c (".$RANLIB." ".$libobj_dir."\\lib".$lib.".a && rmdir /s/q ".$libobj_dir."\\".$lib.")"); -} - -foreach my $libentry (@lib_registry) { - if (! -e $libobj_dir."\\lib".$libentry->{lib}.".a") { - _prelink_lib ($libentry, ""); - } -} - -print $LINKLIBS."\n"; - -1; diff --git a/ACE/configure.ac b/ACE/configure.ac index 3d61783c164..8d95e990321 100644 --- a/ACE/configure.ac +++ b/ACE/configure.ac @@ -11,7 +11,7 @@ dnl dnl Note that this macro removes the newline output by the M4 dnl "esyscmd" built-in. Unless you understand what you're doing, dnl particularly with M4, do not modify this macro definition. -define([ACE_VERSION], patsubst(esyscmd(grep ACE_VERSION ace/Version.h | sed 's/.*\" *\(.*\)\".*/\1/'), [ +define([ACE_VERSION], patsubst(esyscmd(grep ACE_VERSION ace/Version.h | sed 's/.*\"\(.*\)\".*/\1/'), [ ]))dnl remove newline ending every `esyscmd' answer AC_INIT([ACE], @@ -210,7 +210,7 @@ dnl Determine which subsets to build dnl This is done using the autoconf "--enable-foobar" mechanism. ACE_CHECK_SUBSETS -dnl Some of the third party libraries (X11, openssl, etc.) depend on +dnl Some of the third party libraries (X11, openssl, etc.) depend on dnl other libraries. Check for those before the processing --enable dnl options. @@ -492,7 +492,7 @@ AC_CHECK_HEADER([dlfcn.h], case "$host_os" in darwin*) - AC_DEFINE([ACE_LD_SEARCH_PATH], + AC_DEFINE([ACE_LD_SEARCH_PATH], [ACE_LIB_TEXT ("DYLD_LIBRARY_PATH")], [Define to environment variable used for DLL search path]) AC_DEFINE([ACE_DLL_SUFFIX], @@ -664,7 +664,7 @@ dnl Test for <sys/types.h> out of alphabetical order, since it must dnl be (conditionally) #included in other feature tests. ACE_CHECK_LACKS_HEADERS(sys/types.h) -ACE_CHECK_LACKS_HEADERS(sys/sysctl.h, [], [], +ACE_CHECK_LACKS_HEADERS(sys/sysctl.h, [], [], [ #ifndef ACE_LACKS_SYS_TYPES_H # include <sys/types.h> @@ -1167,32 +1167,6 @@ AC_CHECK_TYPE([sig_atomic_t], [], [#include <signal.h>]) -AC_CHECK_TYPE([sigval_t], - [], - [AC_DEFINE([ACE_LACKS_SIGVAL_T], 1, - [Define to 1 if the system lacks the type 'sigval_t'.])], - [#include <signal.h>]) - -if test "$ac_cv_type_sigval_t" = yes; then - dnl Depending on the system, the field names of union sigval have - dnl either a sival_ (POSIX) or sigval_ (older versions of FreeBSD) - dnl prefix. Define ACE_HAS_SIGVAL_SIGVAL_INT accordingly. - AC_CHECK_MEMBER([sigval_t.sigval_int], - [AC_DEFINE([ACE_HAS_SIGVAL_SIGVAL_INT], 1, - [Define to 1 if `sigval_int' is a member of `sigval_t'.])], - [], - [#include <signal.h>]) - - dnl Depending on the system, the field names of union sigval have - dnl either a sival_ (POSIX) or sigval_ (older versions of FreeBSD) - dnl prefix. Define ACE_HAS_SIGVAL_SIGVAL_PTR accordingly. - AC_CHECK_MEMBER([sigval_t.sigval_ptr], - [AC_DEFINE([ACE_HAS_SIGVAL_SIGVAL_PTR], 1, - [Define to 1 if `sigval_ptr' is a member of `sigval_t'.])], - [], - [#include <signal.h>]) -fi - AC_CHECK_TYPE([ssize_t], [AC_DEFINE([ACE_HAS_SSIZE_T], 1, [Define to 1 if the system has the type `ssize_t'.])], @@ -1389,7 +1363,6 @@ if test "$ac_cv_type_siginfo_t" = yes; then #endif]) fi - dnl Some platforms need to include sys/types.h before sys/socket.h dnl in order for struct msghdr to work. dnl Check for msghdr structure. @@ -1988,13 +1961,17 @@ AC_CHECK_TYPE([uint64_t], #include <inttypes.h> #endif]) -ACE_CACHE_CHECK([for std::numeric_limits<>], -[ace_cv_func_numeric_limits], +AC_CACHE_CHECK([for std::numeric_limits<>], +[ace_func_numeric_limits], [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <limits>], [return std::numeric_limits<int>::max();])], [ace_cv_func_numeric_limits=yes], - [ace_cv_func_numeric_limits=no]) -],,[AC_DEFINE([ACE_LACKS_NUMERIC_LIMITS])]) + [ace_cv_func_numeric_limits=no])]) +if test $ace_cv_func_numeric_limits = no; then + AC_DEFINE([ACE_LACKS_NUMERIC_LIMITS], 1, + [Define to 1 if platfom lacks std::numeric_limits<>.]) +fi + dnl Other checks @@ -2407,7 +2384,7 @@ ACE_CACHE_CHECK([for C++ typename keyword], ], [AC_DEFINE([ACE_HAS_TYPENAME_KEYWORD])], [ - AC_MSG_WARN([$CXX does not support the C++ "typename" keyword. + AC_MSG_WARN([$CXX does not support the C++ \"typename\" keyword. ACE will require it in the near future.]) ]) @@ -3551,16 +3528,6 @@ ACE_CHECK_LACKS_FUNCS(inet_aton) ACE_CHECK_LACKS_FUNCS(isatty) -AC_CHECK_FUNC(isastream) -if test $ac_cv_func_isastream = yes; then - AC_CHECK_DECL([isastream], - [AC_DEFINE([ACE_HAS_ISASTREAM_PROTOTYPE], 1, - [Define to 1 if platform has the declaration - of isastream().])], - [], - [#include <stropts.h>]) -fi - ACE_CHECK_HAS_FUNCS(itoa) dnl Check for 64 bit llseek() or lseek64() @@ -3596,27 +3563,7 @@ fi ACE_CHECK_HAS_FUNCS(memchr) -ACE_CHECK_LACKS_FUNCS(mkfifo) - -ACE_CHECK_LACKS_FUNCS(mkstemp) -if test $ac_cv_func_mkstemp = yes; then - AC_CHECK_DECL([mkstemp], - [], - [AC_DEFINE([ACE_LACKS_MKSTEMP_PROTOTYPE], 1, - [Define to 1 if platform lacks the declaration - of mkstemp().])], - [#include <stdlib.h>]) -fi - -ACE_CHECK_LACKS_FUNCS(mktemp) -if test $ac_cv_func_mktemp = yes; then - AC_CHECK_DECL([mktemp], - [], - [AC_DEFINE([ACE_LACKS_MKTEMP_PROTOTYPE], 1, - [Define to 1 if platform lacks the declaration - of mktemp().])], - [#include <stdlib.h>]) -fi +ACE_CHECK_LACKS_FUNCS(mkfifo mkstemp mktemp) ACE_CHECK_LACKS_FUNCS(msync mprotect) @@ -3624,8 +3571,6 @@ ACE_CHECK_LACKS_FUNCS(pipe) ACE_CHECK_LACKS_FUNCS(qsort) -ACE_CHECK_LACKS_FUNCS(realpath) - ACE_CHECK_LACKS_FUNCS(setegid seteuid setgid) ACE_CHECK_LACKS_FUNCS([setpgid]) @@ -3708,7 +3653,7 @@ ACE_CHECK_HAS_FUNCS(strnlen) ACE_CHECK_LACKS_FUNCS(strchr) -# believe it or not, both ACE_LACKS_STRERROR and ACE_HAS_STRERROR +# believe it or not, both ACE_LACKS_STRERROR and ACE_HAS_STRERROR # feature test macros are currently used. ACE_CHECK_HAS_FUNCS(strerror) ACE_CHECK_LACKS_FUNCS(strerror) @@ -4149,64 +4094,18 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM( [ AC_DEFINE([ACE_HAS_SHM_OPEN]) AC_MSG_RESULT([yes]) - - dnl Now see if running it requires a leading slash. - ACE_CACHE_CHECK([if shm_open requires one slash], - [ace_cv_shm_open_requires_one_slash], - [ - AC_RUN_IFELSE([AC_LANG_SOURCE([[ -#ifndef ACE_LACKS_SYS_TYPES_H -# include <sys/types.h> -#endif -#include <fcntl.h> -#include <unistd.h> -#include <sys/stat.h> -#include <sys/mman.h> - -int main (int argc, char *argv[]) -{ - const char name[] = "ACE_Foo"; - const char name2[] = "/ACE_Foo"; - const int oflag = O_RDWR | O_CREAT; - const mode_t mode = 0400; /* Whatever */ - int fd = shm_open (name, oflag, mode); - if (fd != -1) - { - close (fd); - shm_unlink (name); - return 1; /* Don't need the slash */ - } - fd = shm_open (name2, oflag, mode); - if (fd != -1) - { - close (fd); - shm_unlink (name2); - return 0; - } - return 1; /* Nothing worked, so say 'no' */ -} - ]])],[ - ace_cv_shm_open_requires_one_slash=yes - ],[ - ace_cv_shm_open_requires_one_slash=no - ],[ - dnl action if cross-compiling - ace_cv_shm_open_requires_one_slash=no - ]) - ],AC_DEFINE([ACE_SHM_OPEN_REQUIRES_ONE_SLASH]),) ], [ AC_MSG_RESULT([no]) ]) -dnl if test "$ace_cv_shm_open_requires_one_slash" = yes; then -dnl AC_DEFINE([ACE_SHM_OPEN_REQUIRES_ONE_SLASH]) -dnl fi - ACE_CHECK_HAS_FUNCS(snprintf) ACE_CHECK_LACKS_FUNCS(tempnam truncate) +dnl Check for MIT pthreads APIs for timed send/recv operations +ACE_CHECK_HAS_FUNCS(read_timedwait readv_timedwait recv_timedwait recvfrom_timedwait recvmsg_timedwait send_timedwait sendmsg_timedwait sendto_timedwait write_timedwait writev_timedwait) + dnl Save the cache for debugging purposes AC_CACHE_SAVE @@ -4368,15 +4267,6 @@ dnl backwards compatibility with Pthread Draft 4 functions of the same dnl name. ACE_CHECK_LACKS_FUNCS(pthread_sigmask) - if test $ac_cv_func_pthread_sigmask = yes; then - AC_CHECK_DECL([pthread_sigmask], - [AC_DEFINE([ACE_HAS_PTHREAD_SIGMASK_PROTOTYPE], 1, - [Define to 1 if platform has the declaration - of pthread_sigmask().])], - [], - [#include <pthread.h> - #include <signal.h>]) - fi AC_CHECK_FUNC([pthread_key_create], [AC_DEFINE([ACE_HAS_THREAD_SPECIFIC_STORAGE])], @@ -4534,9 +4424,9 @@ dnl Check for Unix98 pthreads extensions dnl Linux's sched_{set,get}affinity interface has changed three times: dnl -dnl In glibc 2.3.2, it was: +dnl In glibc 2.3.2, it was: dnl -dnl int sched_setaffinity(pid_t __pid, +dnl int sched_setaffinity(pid_t __pid, dnl unsigned int __len, unsigned long * __mask); dnl dnl In glibc 2.3.3, it was changed to: @@ -4545,7 +4435,7 @@ dnl int sched_setaffinity(pid_t __pid, const cpu_set_t* __mask); dnl dnl And in glibc ?.?.?, it was changed again to: dnl -dnl int sched_setaffinity(pid_t __pid, size_t __cpusetsize, +dnl int sched_setaffinity(pid_t __pid, size_t __cpusetsize, dnl const cpu_set_t* __cpuset); dnl dnl The following feature tests attempt to determine which (if any) @@ -4591,7 +4481,7 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM( ], [ AC_MSG_RESULT([2]) - AC_DEFINE([ACE_HAS_2_PARAM_SCHED_GETAFFINITY], 1, + AC_DEFINE([ACE_HAS_2_PARAM_SCHED_GETAFFINITY], 1, [Define to 1 if platform has 2 parameter sched_getaffinity()]) ]) fi dnl test "$ac_cv_func_sched_getaffinity" = yes @@ -4620,7 +4510,7 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM( ], [ AC_MSG_RESULT([2]) - AC_DEFINE([ACE_HAS_2_PARAM_SCHED_SETAFFINITY], 1, + AC_DEFINE([ACE_HAS_2_PARAM_SCHED_SETAFFINITY], 1, [Define to 1 if platform has 2 parameter sched_setaffinity()]) ]) fi dnl test "$ac_cv_func_sched_setaffinity" = yes @@ -4992,26 +4882,6 @@ fi dnl End checks for reentrant functions ACE_CHECK_LACKS_FUNCS(readdir_r) -if test "$ac_cv_func_readdir_r" = yes; then -dnl The readdir_r() function varies with standards. Check which one we have. -AC_MSG_CHECKING([for 2- or 3-param readdir_r]) -AC_LINK_IFELSE([AC_LANG_PROGRAM( - [[ -#include <dirent.h> - ]], - [[ -readdir_r(0, 0, 0); - ]])], - [ - AC_DEFINE([ACE_HAS_3_PARAM_READDIR_R], 1, - [Define to 1 if platform has 3 parameter readdir_r()]) - AC_MSG_RESULT([3]) - ], - [ - AC_MSG_RESULT([2]) - ]) -fi dnl test "$ac_cv_func_readdir" = yes - dnl Disabled until we figure out what to do with the comparator dnl function argument inconsistencies between different platforms. @@ -6223,6 +6093,42 @@ if test "$ace_cv_lib_posix_sigaction_constp_2" = yes; then AC_DEFINE([ACE_HAS_SIGACTION_CONSTP2]) fi +dnl Check if the wait() system call takes a (union wait *) rather than int * +ACE_CACHE_CHECK([if wait() takes a (union wait *) rather than int *], + [ace_cv_lib_wait_takes_union_wait_ptr], + [ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ +#include <sys/wait.h> + ]], [[ + int* status = 0; + int result = 0; + result=wait(status); + ]])],[ + ace_cv_lib_wait_takes_union_wait_ptr=no + ],[ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM( + [[ +#include <sys/wait.h> + ]], + [[ + union wait* status = 0; + int result = 0; + result=wait(status); + ]])], + [ + ace_cv_lib_wait_takes_union_wait_ptr=yes + ], + [ +dnl If we get here then we're screwed! We can't use int* or union wait*. +dnl It is very unlikely that we will ever get this far. For the sake +dnl of setting some result, we'll assume that we can actually use int*. + ace_cv_lib_wait_takes_union_wait_ptr=no + AC_MSG_WARN([wait() doesn't seem to take either int* or union wait*]) + AC_MSG_WARN([as an argument. Going to assume that int* will work.]) + ]) + ]) + ], [AC_DEFINE([ACE_HAS_UNION_WAIT])],) + dnl We need to use the ACE_CONVERT_WARNINGS_TO_ERRORS() macro since dnl passing a void * just caused implicit conversion warnings when dnl using GNU C++, for example. @@ -6279,28 +6185,36 @@ fi dnl test "$ace_cv_lib_voidptr_gettimeofday" = no dnl Check for gettimeofday() protoype if test "$ace_cv_lib_voidptr_gettimeofday" = yes || test "$ace_cv_lib_timezone_gettimeofday" = yes; then - -AC_CHECK_DECL([gettimeofday], - [ -if test "$ace_cv_lib_voidptr_gettimeofday" = yes; then - AC_DEFINE([ACE_HAS_VOIDPTR_GETTIMEOFDAY]) -else - AC_DEFINE([ACE_HAS_TIMEZONE_GETTIMEOFDAY]) -fi - ],[ -if test "$ace_cv_lib_voidptr_gettimeofday" = yes; then - AC_DEFINE([ACE_HAS_SVR4_GETTIMEOFDAY]) -else - AC_DEFINE([ACE_HAS_OSF1_GETTIMEOFDAY]) -fi - ], - [ -#include <sys/time.h> -#ifndef ACE_LACKS_UNISTD_H -# include <unistd.h> -#endif - ]) - + ACE_CACHE_CHECK([for gettimeofday() protoype], + [ace_cv_lib_has_gettimeofday_prototype], + [ + AC_EGREP_CPP([gettimeofday], + [ +#include <time.h> + ], + [ +dnl We have a gettimeofday prototype + ace_cv_lib_has_gettimeofday_prototype=yes + ], + [ +dnl We don't have a gettimeofday prototype + ace_cv_lib_has_gettimeofday_prototype=no + ]) + ], + [ + if test "$ace_cv_lib_voidptr_gettimeofday" = yes; then + AC_DEFINE([ACE_HAS_VOIDPTR_GETTIMEOFDAY]) + else + AC_DEFINE([ACE_HAS_TIMEZONE_GETTIMEOFDAY]) + fi + ], + [ + if test "$ace_cv_lib_voidptr_gettimeofday" = yes; then + AC_DEFINE([ACE_HAS_SVR4_GETTIMEOFDAY]) + else + AC_DEFINE([ACE_HAS_OSF1_GETTIMEOFDAY]) + fi + ]) fi dnl Check for gettimeofday() protoype @@ -6393,6 +6307,94 @@ dnl The following test should only be run if the above two testsfail. ]) fi +dnl Now check if CMSG_DATA is defined if and only if we have 4.4 BSD +dnl style struct msghdr members. If CMSG_DATA isn't defined, then +dnl we try to figure out what it should be defined to. + if test "$ace_cv_lib_4_4bsd_msghdr" = yes; then + ACE_CACHE_CHECK([if CMSG_DATA is defined], + [ace_cv_lib_cmsg_data], + [ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM( + [[ +#ifndef ACE_LACKS_SYS_TYPES_H +# include <sys/types.h> +#endif +#include <sys/socket.h> +#include <sys/un.h> /* @@ Is this header necessary? */ + ]], + [[ + cmsghdr ace_cmsg; + void * c = CMSG_DATA (&ace_cmsg); + ]])], + [ + ace_cv_lib_cmsg_data=yes + ], + [ + ace_cv_lib_cmsg_data=no +dnl Now check which type of CMSG_DATA #define we need. + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ +#ifndef ACE_LACKS_SYS_TYPES_H +# include <sys/types.h> +#endif +#include <sys/socket.h> +#include <sys/un.h> + ]], [[ + /* This is sloppy. Oh well. */ + unsigned char ace_cmsg_data[0]; + + cmsghdr ace_cmsg; + ace_cmsg.cmsg_data = ace_cmsg_data; + ]])],,[ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM( + [[ +#ifndef ACE_LACKS_SYS_TYPES_H +# include <sys/types.h> +#endif +#include <sys/socket.h> +#include <sys/un.h> + ]], + [[ + /* This is sloppy. Oh well. */ + unsigned char ace_cmsg_data[0]; + + cmsghdr ace_cmsg; + ace_cmsg.__cmsg_data = ace_cmsg_data; + ]])], + [ + AC_MSG_ERROR([cmsgmdr member '__cmsg_data[0]' not supported by ACE's CMSG_DATA macro]) + ], + [ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM( + [[ +#ifndef ACE_LACKS_SYS_TYPES_H +# include <sys/types.h> +#endif +#include <sys/socket.h> +#include <sys/un.h> + ]], + [[ + cmsghdr ace_cmsg; + ]])], + [ + AC_CACHE_VAL([ace_cv_lib_cmsg_data_member], + [ace_cv_lib_cmsg_data_member=no]) + ], + [ + AC_MSG_ERROR([No supported cmsghdr structure exists. ACE cannot be built without one.]) + ]) + ]) + ]) + ]) + ], , + [ + AC_DEFINE([ACE_LACKS_CMSG_DATA_MACRO]) + if test "$ace_cv_lib_cmsg_data_member"=no; then + AC_DEFINE([ACE_LACKS_CMSG_DATA_MEMBER]) + fi + + ]) + fi dnl test "$ace_cv_lib_4_4bsd_msghdr" = yes + fi dnl End struct msghdr_stuff dnl @@ -6687,9 +6689,9 @@ smemcpy (void* dest, const void* src, const size_t n) // Function pointer void* (* test_func) (void *dst, const void* src, size_t); - + namespace { enum { ITERATIONS = 100000 }; } - + #include <sys/time.h> #include <time.h> @@ -6698,35 +6700,35 @@ main(int argc, char* argv[]) { struct timeval start, now; double value; - + // Test buffer char dest [16]; const void* src = " THIS IS A TEST"; - + // We want to test if the loop unrolling is faster for sizes // from 1..16 for (size_t counter = 16; counter >=1; counter--) { test_func = smemcpy; - + // Warm up for (int i = ITERATIONS ; i > 0 ; --i) test_func ((void *)dest, src, counter); - + gettimeofday (&start, 0) ; for (int j = ITERATIONS ; j > 0 ; --j) test_func ((void *)dest, src, counter); gettimeofday (&now, 0); - + double fast = 1000000 * (now.tv_sec - start.tv_sec) + now.tv_usec - start.tv_usec ; - + test_func = memcpy; - + // Warm up for (int k = ITERATIONS ; k > 0 ; --k) test_func ((void *)dest, src, counter); - + gettimeofday (&start, 0) ; for (int l = ITERATIONS ; l > 0 ; --l) test_func ((void *)dest, src, counter); @@ -6736,7 +6738,7 @@ main(int argc, char* argv[]) now.tv_usec - start.tv_usec ; if (fast > slow) return 1; // Unrolling was slower than actual memcpy - + if (1.10*fast > slow) return 1; // Unrolling was not faster by 10% } @@ -7817,6 +7819,16 @@ AC_CONFIG_FILES([ ace/Makefile ace/QoS/Makefile ace/SSL/Makefile + ASNMP/Makefile + ASNMP/asnmp/Makefile + ASNMP/agent/Makefile + ASNMP/examples/Makefile + ASNMP/examples/get/Makefile + ASNMP/examples/next/Makefile + ASNMP/examples/set/Makefile + ASNMP/examples/trap/Makefile + ASNMP/examples/walk/Makefile + ASNMP/tests/Makefile apps/Makefile apps/Gateway/Makefile apps/Gateway/Gateway/Makefile @@ -7827,7 +7839,6 @@ AC_CONFIG_FILES([ apps/JAWS/clients/Caching/Makefile apps/JAWS/server/Makefile apps/JAWS2/Makefile - apps/JAWS2/HTTPU/Makefile apps/JAWS2/JAWS/Makefile apps/JAWS3/Makefile apps/JAWS3/jaws3/Makefile @@ -7847,13 +7858,21 @@ AC_CONFIG_FILES([ netsvcs/clients/Naming/Client/Makefile netsvcs/clients/Naming/Dump_Restore/Makefile netsvcs/servers/Makefile + protocols/Makefile + protocols/ace/Makefile + protocols/ace/HTBP/Makefile + protocols/ace/RMCast/Makefile + protocols/ace/TMCast/Makefile + protocols/examples/Makefile + protocols/examples/RMCast/Makefile + protocols/examples/RMCast/Send_Msg/Makefile websvcs/Makefile websvcs/lib/Makefile websvcs/tests/Makefile ]) dnl Configure examples if configured... -if test "$ace_build_examples" = yes; then +if test $ace_build_examples = yes; then AC_CONFIG_FILES([ examples/Makefile examples/APG/Makefile @@ -7886,7 +7905,6 @@ if test "$ace_build_examples" = yes; then examples/Bounded_Packet_Relay/Makefile examples/C++NPv1/Makefile examples/C++NPv2/Makefile - examples/ConfigViewer/Makefile examples/Connection/Makefile examples/Connection/blocking/Makefile examples/Connection/misc/Makefile @@ -7949,28 +7967,37 @@ if test "$ace_build_examples" = yes; then examples/System_V_IPC/Makefile examples/System_V_IPC/SV_Message_Queues/Makefile examples/System_V_IPC/SV_Semaphores/Makefile + examples/TMCast/Makefile + examples/TMCast/Member/Makefile examples/Threads/Makefile examples/Timer_Queue/Makefile examples/Web_Crawler/Makefile ]) fi -dnl Configure tests if configured... -if test "$ace_build_tests" = yes; then +dnl Configure examples if configured... +if test $ace_build_tests = yes; then AC_CONFIG_FILES([ performance-tests/Makefile performance-tests/Misc/Makefile performance-tests/SCTP/Makefile - performance-tests/Server_Concurrency/Leader_Follower/Makefile performance-tests/Server_Concurrency/Makefile + performance-tests/Server_Concurrency/Leader_Follower/Makefile performance-tests/Server_Concurrency/Queue_Based_Workers/Makefile - performance-tests/Synch-Benchmarks/Base_Test/Makefile performance-tests/Synch-Benchmarks/Makefile - performance-tests/Synch-Benchmarks/Perf_Test/Makefile performance-tests/Synch-Benchmarks/Synch_Lib/Makefile + performance-tests/Synch-Benchmarks/Base_Test/Makefile + performance-tests/Synch-Benchmarks/Perf_Test/Makefile performance-tests/TCP/Makefile performance-tests/UDP/Makefile + protocols/tests/Makefile + protocols/tests/RMCast/Makefile tests/Makefile + tests/HTBP/Makefile + tests/HTBP/Reactor_Tests/Makefile + tests/HTBP/Send_Large_Msg/Makefile + tests/HTBP/Send_Recv_Tests/Makefile + tests/HTBP/ping/Makefile tests/SSL/Makefile ]) fi @@ -7989,23 +8016,6 @@ if test -d $srcdir/ACEXML; then ACEXML/tests/Makefile ACEXML/tests/util/Makefile ]) - AC_SUBST([ACEXML],[ACEXML]) -fi - -if test -d $srcdir/ASNMP; then - AC_CONFIG_FILES([ - ASNMP/Makefile - ASNMP/asnmp/Makefile - ASNMP/agent/Makefile - ASNMP/examples/Makefile - ASNMP/examples/get/Makefile - ASNMP/examples/next/Makefile - ASNMP/examples/set/Makefile - ASNMP/examples/trap/Makefile - ASNMP/examples/walk/Makefile - ASNMP/tests/Makefile - ]) - AC_SUBST([ASNMP],[ASNMP]) fi if test -d $srcdir/Kokyu; then @@ -8018,46 +8028,15 @@ if test -d $srcdir/Kokyu; then ]) AC_SUBST([KOKYU],[Kokyu]) fi - -if test -d $srcdir/protocols; then - AC_CONFIG_FILES([ - protocols/Makefile - protocols/ace/Makefile - protocols/ace/HTBP/Makefile - protocols/ace/RMCast/Makefile - protocols/ace/TMCast/Makefile - ]) - - dnl Configure examples if configured... - if test "$ace_build_examples" = yes; then - AC_CONFIG_FILES([ - protocols/examples/Makefile - protocols/examples/RMCast/Makefile - protocols/examples/RMCast/Send_Msg/Makefile - protocols/examples/TMCast/Makefile - protocols/examples/TMCast/Member/Makefile - ]) - fi - - dnl Configure tests if configured... - if test "$ace_build_tests" = yes; then - AC_CONFIG_FILES([ - protocols/tests/HTBP/Makefile - protocols/tests/HTBP/Reactor_Tests/Makefile - protocols/tests/HTBP/Send_Large_Msg/Makefile - protocols/tests/HTBP/Send_Recv_Tests/Makefile - protocols/tests/HTBP/ping/Makefile - protocols/tests/Makefile - protocols/tests/RMCast/Makefile - ]) - fi - AC_SUBST([protocols],[protocols]) -fi +AM_CONDITIONAL([BUILD_KOKYU], + [test -d $srcdir/Kokyu]) if test -d $srcdir/TAO -a X$ace_user_with_tao = Xyes; then AC_CONFIG_SUBDIRS([TAO]) AC_SUBST([TAO],[TAO]) fi +AM_CONDITIONAL([BUILD_TAO], + [test -d $srcdir/TAO -a X$ace_user_with_tao = Xyes]) dnl Note that the "ACE_VERSION" in the message below is an M4 macro dnl that expands to the version of ACE being configured. diff --git a/ACE/contrib/minizip/crypt.h b/ACE/contrib/minizip/crypt.h index 94d682073a4..1d6da3d57ad 100644 --- a/ACE/contrib/minizip/crypt.h +++ b/ACE/contrib/minizip/crypt.h @@ -1,6 +1,5 @@ /* crypt.h -- base code for crypt/uncrypt ZIPfile -$Id$ Version 1.01e, February 12th, 2005 @@ -39,9 +38,9 @@ static int decrypt_byte(unsigned long* pkeys, const unsigned long* pcrc_32_tab) unsigned temp; /* POTENTIAL BUG: temp*(temp^1) may overflow in an * unpredictable manner on 16-bit systems; not a problem * with any known compiler so far, though */ - + MINIZIP_UNUSED_ARG(pcrc_32_tab); - + temp = ((unsigned)(*(pkeys+2)) & 0xffff) | 2; return (int)(((temp * (temp ^ 1)) >> 8) & 0xff); } diff --git a/ACE/contrib/minizip/ioapi.c b/ACE/contrib/minizip/ioapi.c index 2c1867b7670..34775a0a99b 100644 --- a/ACE/contrib/minizip/ioapi.c +++ b/ACE/contrib/minizip/ioapi.c @@ -4,8 +4,6 @@ Version 1.01e, February 12th, 2005 Copyright (C) 1998-2005 Gilles Vollant - - $Id$ */ #include <stdio.h> @@ -88,18 +86,18 @@ voidpf ZCALLBACK fopen_file_func ( voidpf opaque,const char* filename,int mode) uLong ZCALLBACK fread_file_func (voidpf opaque,voidpf stream,void* buf,uLong size) -{ +{ uLong ret; - + MINIZIP_UNUSED_ARG (opaque); - + ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream); return ret; } uLong ZCALLBACK fwrite_file_func (voidpf opaque,voidpf stream,const void* buf,uLong size) - + { uLong ret; MINIZIP_UNUSED_ARG (opaque); @@ -141,7 +139,7 @@ long ZCALLBACK fseek_file_func (voidpf opaque,voidpf stream,uLong offset,int ori } int ZCALLBACK fclose_file_func (voidpf opaque,voidpf stream) -{ +{ int ret; MINIZIP_UNUSED_ARG (opaque); ret = fclose((FILE *)stream); @@ -149,7 +147,7 @@ int ZCALLBACK fclose_file_func (voidpf opaque,voidpf stream) } int ZCALLBACK ferror_file_func (voidpf opaque,voidpf stream) -{ +{ int ret; MINIZIP_UNUSED_ARG (opaque); ret = ferror((FILE *)stream); @@ -157,7 +155,7 @@ int ZCALLBACK ferror_file_func (voidpf opaque,voidpf stream) } void fill_fopen_filefunc (zlib_filefunc_def* pzlib_filefunc_def) - { + { pzlib_filefunc_def->zopen_file = fopen_file_func; pzlib_filefunc_def->zread_file = fread_file_func; pzlib_filefunc_def->zwrite_file = fwrite_file_func; diff --git a/ACE/contrib/minizip/ioapi.h b/ACE/contrib/minizip/ioapi.h index 9b695ffaa37..d0b61d4949f 100644 --- a/ACE/contrib/minizip/ioapi.h +++ b/ACE/contrib/minizip/ioapi.h @@ -4,8 +4,6 @@ Version 1.01e, February 12th, 2005 Copyright (C) 1998-2005 Gilles Vollant - - $Id$ */ #ifndef _ZLIBIOAPI_H diff --git a/ACE/contrib/minizip/miniunz.c b/ACE/contrib/minizip/miniunz.c index 3a1d67d2495..f599938884e 100644 --- a/ACE/contrib/minizip/miniunz.c +++ b/ACE/contrib/minizip/miniunz.c @@ -3,8 +3,6 @@ Version 1.01e, February 12th, 2005 Copyright (C) 1998-2005 Gilles Vollant - - $Id$ */ diff --git a/ACE/contrib/minizip/minizip.c b/ACE/contrib/minizip/minizip.c index 1b13ce369c9..f2dfecd8b12 100644 --- a/ACE/contrib/minizip/minizip.c +++ b/ACE/contrib/minizip/minizip.c @@ -3,8 +3,6 @@ Version 1.01e, February 12th, 2005 Copyright (C) 1998-2005 Gilles Vollant - - $Id$ */ #include <stdio.h> diff --git a/ACE/contrib/minizip/minizip.mpc b/ACE/contrib/minizip/minizip.mpc index 99be0e5b02a..10442db1ff4 100644 --- a/ACE/contrib/minizip/minizip.mpc +++ b/ACE/contrib/minizip/minizip.mpc @@ -1,6 +1,3 @@ -// -*- MPC -*- -// $Id$ - project (minizip) : zlib{ sharedname = minizip diff --git a/ACE/contrib/minizip/mztools.c b/ACE/contrib/minizip/mztools.c index e722a424900..8a50ee43925 100644 --- a/ACE/contrib/minizip/mztools.c +++ b/ACE/contrib/minizip/mztools.c @@ -2,7 +2,6 @@ Additional tools for Minizip Code: Xavier Roche '2004 License: Same as ZLIB (www.gzip.org) - $Id$ */ /* Code */ @@ -63,7 +62,7 @@ uLong* bytesRecovered; unsigned int fnsize = READ_16(header + 26); /* file name length */ unsigned int extsize = READ_16(header + 28); /* extra field length */ filename[0] = extra[0] = '\0'; - + /* Header */ if (fwrite(header, 1, 30, fpOut) == 30) { offset += 30; @@ -71,7 +70,7 @@ uLong* bytesRecovered; err = Z_ERRNO; break; } - + /* Filename */ if (fnsize > 0) { if (fread(filename, 1, fnsize, fpZip) == fnsize) { @@ -104,7 +103,7 @@ uLong* bytesRecovered; break; } } - + /* Data */ { int dataSize = cpsize; @@ -134,7 +133,7 @@ uLong* bytesRecovered; } } } - + /* Central directory entry */ { char header[46]; @@ -160,7 +159,7 @@ uLong* bytesRecovered; /* Header */ if (fwrite(header, 1, 46, fpOutCD) == 46) { offsetCD += 46; - + /* Filename */ if (fnsize > 0) { if (fwrite(filename, 1, fnsize, fpOutCD) == fnsize) { @@ -173,7 +172,7 @@ uLong* bytesRecovered; err = Z_STREAM_ERROR; break; } - + /* Extra field */ if (extsize > 0) { if (fwrite(extra, 1, extsize, fpOutCD) == extsize) { @@ -183,7 +182,7 @@ uLong* bytesRecovered; break; } } - + /* Comment field */ if (comsize > 0) { if ((int)fwrite(comment, 1, comsize, fpOutCD) == comsize) { @@ -193,8 +192,8 @@ uLong* bytesRecovered; break; } } - - + + } else { err = Z_ERRNO; break; diff --git a/ACE/contrib/minizip/mztools.h b/ACE/contrib/minizip/mztools.h index 6e0ddaaf796..eee78dc56b5 100644 --- a/ACE/contrib/minizip/mztools.h +++ b/ACE/contrib/minizip/mztools.h @@ -2,7 +2,6 @@ Additional tools for Minizip Code: Xavier Roche '2004 License: Same as ZLIB (www.gzip.org) - $Id$ */ #ifndef _zip_tools_H @@ -18,14 +17,14 @@ extern "C" { #include "unzip.h" -/* Repair a ZIP file (missing central directory) +/* Repair a ZIP file (missing central directory) file: file to recover fileOut: output file after recovery fileOutTmp: temporary file name used for recovery */ -extern int ZEXPORT unzRepair(const char* file, - const char* fileOut, - const char* fileOutTmp, +extern int ZEXPORT unzRepair(const char* file, + const char* fileOut, + const char* fileOutTmp, uLong* nRecovered, uLong* bytesRecovered); diff --git a/ACE/contrib/minizip/unzip.c b/ACE/contrib/minizip/unzip.c index 63f5ce589b5..260c225f477 100644 --- a/ACE/contrib/minizip/unzip.c +++ b/ACE/contrib/minizip/unzip.c @@ -4,7 +4,6 @@ Copyright (C) 1998-2005 Gilles Vollant Read unzip.h for more info - $Id$ */ /* Decryption code comes from crypt.c by Info-ZIP but has been greatly reduced in terms of @@ -170,7 +169,7 @@ local int unzlocal_getByte OF(( int *pi)); local int unzlocal_getByte(const zlib_filefunc_def* pzlib_filefunc_def,voidpf filestream,int *pi) - + { unsigned char c; int err = (int)ZREAD(*pzlib_filefunc_def,filestream,&c,1); @@ -198,10 +197,10 @@ local int unzlocal_getShort OF(( uLong *pX)); local int unzlocal_getShort (const zlib_filefunc_def* pzlib_filefunc_def,voidpf filestream,uLong *pX) - + { uLong x ; - int i = 0; + int i; int err; err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i); @@ -224,10 +223,10 @@ local int unzlocal_getLong OF(( uLong *pX)); local int unzlocal_getLong (const zlib_filefunc_def* pzlib_filefunc_def,voidpf filestream,uLong *pX) - + { uLong x ; - int i = 0; + int i; int err; err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i); @@ -255,7 +254,7 @@ local int unzlocal_getLong (const zlib_filefunc_def* pzlib_filefunc_def,voidpf f /* My own strcmpi / strcasecmp */ local int strcmpcasenosensitive_internal(const char* fileName1,const char* fileName2) - + { for (;;) { @@ -297,7 +296,7 @@ local int strcmpcasenosensitive_internal(const char* fileName1,const char* fileN */ extern MINIZIP_EXPORT int unzStringFileNameCompare (const char* fileName1,const char* fileName2,int iCaseSensitivity) - + { if (iCaseSensitivity==0) iCaseSensitivity=CASESENSITIVITYDEFAULTVALUE; @@ -321,7 +320,7 @@ local uLong unzlocal_SearchCentralDir OF(( voidpf filestream)); local uLong unzlocal_SearchCentralDir(const zlib_filefunc_def* pzlib_filefunc_def,voidpf filestream) - + { unsigned char* buf; uLong uSizeFile; @@ -487,7 +486,7 @@ extern MINIZIP_EXPORT unzFile unzOpen2 (const char *path, zlib_filefunc_def* pzl extern MINIZIP_EXPORT unzFile unzOpen (const char *path) - + { return unzOpen2(path, NULL); } @@ -564,7 +563,7 @@ local int unzlocal_GetCurrentFileInfoInternal (unzFile file, char *szFileName,uLong fileNameBufferSize, void *extraField,uLong extraFieldBufferSize, char *szComment,uLong commentBufferSize) - + { unz_s* s; unz_file_info file_info; @@ -669,7 +668,7 @@ local int unzlocal_GetCurrentFileInfoInternal (unzFile file, else err=UNZ_ERRNO; } - if ((file_info.size_file_extra>0) && (extraFieldBufferSize>0)) + if ((file_info.size_file_extra>0) && (extraFieldBufferSize>0)) { if (ZREAD(s->z_filefunc, s->filestream,extraField,uSizeRead)!=uSizeRead) err=UNZ_ERRNO; lSeek += file_info.size_file_extra - uSizeRead; diff --git a/ACE/contrib/minizip/unzip.h b/ACE/contrib/minizip/unzip.h index fc219be38dd..ce87ac196f4 100644 --- a/ACE/contrib/minizip/unzip.h +++ b/ACE/contrib/minizip/unzip.h @@ -32,7 +32,6 @@ misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. - $Id$ */ diff --git a/ACE/contrib/minizip/zip.c b/ACE/contrib/minizip/zip.c index b875cd133f1..05d90481f53 100644 --- a/ACE/contrib/minizip/zip.c +++ b/ACE/contrib/minizip/zip.c @@ -7,7 +7,6 @@ Copyright (C) 1998-2005 Gilles Vollant Read zip.h for more info - $Id$ */ @@ -173,7 +172,7 @@ local linkedlist_datablock_internal* allocate_new_datablock() return ldi; } -local void free_datablock( linkedlist_datablock_internal* ldi) +local void free_datablock( linkedlist_datablock_internal* ldi) { while (ldi!=NULL) { @@ -183,7 +182,7 @@ local void free_datablock( linkedlist_datablock_internal* ldi) } } -local void init_linkedlist(linkedlist_data* ll) +local void init_linkedlist(linkedlist_data* ll) { ll->first_block = ll->last_block = NULL; } @@ -196,7 +195,7 @@ local void init_linkedlist(linkedlist_data* ll) local int add_data_in_datablock(linkedlist_data* ll,const void* buf,uLong len) - + { linkedlist_datablock_internal* ldi; const unsigned char* from_copy; @@ -260,7 +259,7 @@ local int add_data_in_datablock(linkedlist_data* ll,const void* buf,uLong len) local int ziplocal_putValue OF((const zlib_filefunc_def* pzlib_filefunc_def, voidpf filestream, uLong x, int nbByte)); local int ziplocal_putValue (const zlib_filefunc_def* pzlib_filefunc_def,voidpf filestream,uLong x,int nbByte) - + { unsigned char buf[4]; int n; @@ -285,7 +284,7 @@ local int ziplocal_putValue (const zlib_filefunc_def* pzlib_filefunc_def,voidpf local void ziplocal_putValue_inmemory OF((void* dest, uLong x, int nbByte)); local void ziplocal_putValue_inmemory (void* dest,uLong x,int nbByte) - + { unsigned char* buf=(unsigned char*)dest; int n; @@ -307,7 +306,7 @@ local void ziplocal_putValue_inmemory (void* dest,uLong x,int nbByte) local uLong ziplocal_TmzDateToDosDate(const tm_zip* ptm,uLong dosDate) - + { uLong year = (uLong)ptm->tm_year; MINIZIP_UNUSED_ARG(dosDate); @@ -329,7 +328,7 @@ local int ziplocal_getByte OF(( int *pi)); local int ziplocal_getByte(const zlib_filefunc_def* pzlib_filefunc_def,voidpf filestream,int *pi) - + { unsigned char c; int err = (int)ZREAD(*pzlib_filefunc_def,filestream,&c,1); @@ -357,10 +356,10 @@ local int ziplocal_getShort OF(( uLong *pX)); local int ziplocal_getShort (const zlib_filefunc_def* pzlib_filefunc_def,voidpf filestream,uLong *pX) - + { uLong x ; - int i = 0; + int i; int err; err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i); @@ -383,10 +382,10 @@ local int ziplocal_getLong OF(( uLong *pX)); local int ziplocal_getLong (const zlib_filefunc_def* pzlib_filefunc_def,voidpf filestream,uLong *pX) - + { uLong x ; - int i = 0; + int i; int err; err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i); @@ -423,7 +422,7 @@ local uLong ziplocal_SearchCentralDir OF(( voidpf filestream)); local uLong ziplocal_SearchCentralDir(const zlib_filefunc_def* pzlib_filefunc_def,voidpf filestream) - + { unsigned char* buf; uLong uSizeFile; @@ -481,7 +480,7 @@ local uLong ziplocal_SearchCentralDir(const zlib_filefunc_def* pzlib_filefunc_de /************************************************************/ extern MINIZIP_EXPORT zipFile zipOpen2 (const char *pathname,int append,zipcharpc* globalcomment,zlib_filefunc_def* pzlib_filefunc_def) - + { zip_internal ziinit; zip_internal* zi; @@ -661,7 +660,7 @@ extern MINIZIP_EXPORT zipFile zipOpen2 (const char *pathname,int append,zipcharp } } -extern MINIZIP_EXPORT zipFile zipOpen (const char *pathname,int append) +extern MINIZIP_EXPORT zipFile zipOpen (const char *pathname,int append) { return zipOpen2(pathname,append,NULL,NULL); } @@ -672,7 +671,7 @@ extern MINIZIP_EXPORT int zipOpenNewFileInZip3 (zipFile file,const char* filenam const char* comment,int method,int level,int raw, int windowBits,int memLevel,int strategy, const char* password,uLong crcForCrypting) - + { zip_internal* zi; uInt size_filename; @@ -864,7 +863,7 @@ extern MINIZIP_EXPORT int zipOpenNewFileInZip2(zipFile file,const char* filename const void* extrafield_local,uInt size_extrafield_local, const void* extrafield_global,uInt size_extrafield_global, const char* comment,int method,int level,int raw) - + { return zipOpenNewFileInZip3 (file, filename, zipfi, extrafield_local, size_extrafield_local, @@ -878,7 +877,7 @@ extern MINIZIP_EXPORT int zipOpenNewFileInZip (zipFile file,const char* filename const void* extrafield_local,uInt size_extrafield_local, const void* extrafield_global,uInt size_extrafield_global, const char* comment,int method,int level) - + { return zipOpenNewFileInZip2 (file, filename, zipfi, extrafield_local, size_extrafield_local, diff --git a/ACE/contrib/minizip/zip.h b/ACE/contrib/minizip/zip.h index 85cda0ebd7b..1de5d815d6d 100644 --- a/ACE/contrib/minizip/zip.h +++ b/ACE/contrib/minizip/zip.h @@ -33,7 +33,6 @@ misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. - $Id$ */ diff --git a/ACE/docs/Download.html b/ACE/docs/Download.html index b2f5f49cfc1..d525f45434e 100644 --- a/ACE/docs/Download.html +++ b/ACE/docs/Download.html @@ -1,5 +1,3 @@ -<!-- $Id$ --> - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <HTML> <HEAD> @@ -327,8 +325,6 @@ please use the links below to download it. <A HREF="https://svn.dre.vanderbilt.edu/viewvc/Middleware/trunk/"> via the web</A>. </LI> - <li>ACE+TAO+CIAO source code may be obtained from the - <a href="https://svn.dre.vanderbilt.edu/viewvc/Middleware/trunk/ACE/ACE-INSTALL.html?revision=HEAD#power">Subversion repository</a>.</li> <LI>Stable commercially supported versions of ACE are available from the Riverace <A HREF="http://www.riverace.com/"> diff --git a/ACE/docs/ace_guidelines.vsmacros b/ACE/docs/ace_guidelines.vsmacros Binary files differindex 4609babc863..2218c1a14ba 100644 --- a/ACE/docs/ace_guidelines.vsmacros +++ b/ACE/docs/ace_guidelines.vsmacros diff --git a/ACE/docs/bczar/bczar.html b/ACE/docs/bczar/bczar.html index d7f652acfa9..bc8c7f2778b 100644 --- a/ACE/docs/bczar/bczar.html +++ b/ACE/docs/bczar/bczar.html @@ -1,5 +1,3 @@ -<!-- $Id$ --> - <html> <head> <title>The realm of the build czar</title> @@ -84,122 +82,121 @@ well. Here is the procedure followed while cutting a beta: <li>The whole process takes somewhere between 8-9 hours, about 2 hours for making the release itself and the remaining time for generating the doxygen documentation.</li> -<li>I suggest you take advantage of GNU Screen so that even if your SSH session -is interrupted, the cutting process can continue. -<ul> -<li> type <code>screen</code> to start screen.</li> -<li> execute commands as normal. Note that Ctrl-A is special in screen, so you -need to type Ctrl-A-A to send a Ctrl-A to the shell</li> -<li> should your sesssion be interrupted, reconnect and type <code>screen -x</code></li> -<li> when finished, just type exit twice</li> -</ul> <li>Prior to starting this, gather aggregate release notes from all developers. This is usually in the form of an email plea asking for a writeup of significant changes since the last beta. Add these notes to the NEWS files before cutting the release so that all notes are part of the release.</li> -<li>Checkout a new workspace on <tt>anduril.dre.vanderbilt.edu</tt></li> +<li>Checkout a new workspace on <tt>deuce.doc.wustl.edu</tt></li> <ul> +<li>In order to do this you must have ssh identity set up, and + (unless you like typing your passphrase <b>A LOT</b>) have your +environment configured so that you can access the CVS repo transparently. +When you are using the bugzilla account the best you can add the +public key in .ssh/id_rsa.pub into your .ssh/authorized_keys on +cvs.doc.wustl.edu +<em>Need a link here!</em> +</li> <li> -The best place to create the workspace is under /export/anduriltmp/bczar. Don't use +The best place to create the workspace is under /project/acetmp. Don't use the home directory itself, it is an NFS share and not really fast. </li> -<li>Checkout like this: -<ul><li>svn co https://svn.dre.vanderbilt.edu/DOC/Middleware/trunk DOC_ROOT</li> - <li>svn co https://svn.dre.vanderbilt.edu/DOC/MPC/trunk DOC_ROOT/ACE/MPC</li> -</ul> +<li>Set the <code>CVSROOT</code> variable to yourusers@cvs.doc.wustl.edu:/project +/cvs-repository and CVS_RSH to ssh using SETENV +</li> +<li>Checkout like this: <tt>cvs -z 9 checkout ACE_wrappers</tt></li> </ul> -<li> Set $DOC_ROOT to point to the new -workspace you checked out.</li> +<li> Do not forget to checkout your MPC repository. Do it like this: + <tt>cvs -z 9 co -P ACE_MPC</tt></li> +<li> If the repository is frozen, remove all users from that file and +place your user name in the FROZEN file </li> +<li> Set $ACE_ROOT, $TAO_ROOT and $CIAO_ROOT to point to the new +workspace you checked out. You must also set <code>$MPC_ROOT</code> to +be <code>$ACE_ROOT/MPC</code>.</li> <li> Set an environment variable SIGNATURE indicating your full name. This is used to fill the ChangeLog entry.</li> -<ul><li>For example,<tt>export SIGNATURE="Chris Cleeland"</tt></li></ul> +<ul><li>For example,<tt>setenv SIGNATURE "Chris Cleeland"</tt></li></ul> <li> Set an environment variable MAILID indicating your mail id. This is used to fill the mail id portion of the ChangeLog entry.</li> -<ul><li>For example,<tt>export MAILID="cleeland@ociweb.com"</tt></li></ul> -<li> Change directories to to <tt>$DOC_ROOT</tt> </li> -<li> Tag the release by executing <code>ACE/bin/make_release -v beta -u</code> This will only -take a couple minutes to complete.</li> -<li> Create the kits by executing <code>ACE/bin/make_release -k ace+tao+ciao </code> - -<ul><li>These commands only tags and creates the kits for the +<ul><li>For example,<tt>setenv MAILID "cleeland@ociweb.com"</tt></li></ul> +<li> Change directories to to <tt>$ACE_ROOT</tt> </li> +<li> Do a <tt>make -f Release allsources</tt> to create a beta kit</li> +<li> Or do a <tt>make -f Release allsources REL=minor</tt> to create a minor kit</li> +<ul><li>This command only tags and creates the kits for the software itself, not documentation. </li> -<li>The kits end up in <tt>/export/anduriltmp/bczar/packages</tt></li> +<li>The kits end up in <tt>/export/project/deuce/ftp/pub/ACE+TAO-distribution</tt></li> </ul> <p> To summarise, the following is a transcript of the steps up to this point executing successfully (assumes /project/acetmp/sm exists and is empty): <p> <code> sm@beatrice ~<br> -$ ssh bczar@anduril.dre.vanderbilt.edu<br> +$ ssh bugzilla@deuce.doc.wustl.edu<br> No default printer<br> --bash-3.00$ cd /export/anduriltmp/bczar<br> --bash-3.00$ export DOC_ROOT=$PWD/DOC_ROOT<br> --bash-3.00$ export SIGNATURE "Simon McQueen"<br> --bash-3.00$ export MAILID sm@prismtech.com<br> --bash-3.00$ svn co https://svn.dre.vanderbilt.edu/DOC/Middleware/trunk DOC_ROOT<br> --bash-3.00$ svn co https://svn.dre.vanderbilt.edu/DOC/MPC/trunk DOC_ROOT/ACE/MPC<br> --bash-3.00$ cd DOC_ROOT/<br> --bash-3.00$ ACE/bin/make_release -v beta -u<br> --bash-3.00$ ACE/bin/make_release -i -k ace+tao+ciao<br> +bugzilla@deuce cs/group/bugzilla> cd /project/acetmp/sm<br> +bugzilla@deuce /project/acetmp/sm> setenv CVSROOT bugzilla@cvs.doc.wustl.edu:/project/cvs-repository<br> +bugzilla@deuce /project/acetmp/sm> setenv CVS_RSH ssh<br> +bugzilla@deuce /project/acetmp/sm> setenv ACE_ROOT $PWD/ACE_wrappers<br> +bugzilla@deuce /project/acetmp/sm> setenv TAO_ROOT $PWD/ACE_wrappers/TAO<br> +bugzilla@deuce /project/acetmp/sm> setenv CIAO_ROOT $PWD/ACE_wrappers/TAO/CIAO<br> +bugzilla@deuce /project/acetmp/sm> setenv MPC_ROOT $PWD/ACE_wrappers/MPC<br> +bugzilla@deuce /project/acetmp/sm> setenv SIGNATURE "Simon McQueen"<br> +bugzilla@deuce /project/acetmp/sm> setenv MAILID sm@prismtech.com<br> +bugzilla@deuce /project/acetmp/sm> cvs -z 9 checkout ACE_wrappers<br> +bugzilla@deuce /project/acetmp/sm> cvs -z 9 co -P ACE_MPC<br> +bugzilla@deuce /project/acetmp/sm> cd ACE_wrappers/<br> +bugzilla@deuce acetmp/sm/ACE_wrappers> make -f Release allsources | & tee ../release.log<br> </code> <p> Feel free to cut and paste with suitable edits. -<li>In the <em>EXTREMELY</em> unlikely event that something goes wrong during the -<em>tagging</em> of the repo (ie, make_release -v beta -u), +<li>If something goes wrong and the build needs to be restarted for some reason the following files must be returned to the state they were in before the release -process started and then checked back into SVN:<br><code> -ACE/ChangeLog<br> -ACE/PROBLEM-REPORT-FORM<br> -ACE/VERSION<br> -ACE/TAO/ChangeLog<br> -ACE/TAO/PROBLEM-REPORT-FORM<br> -TAO/VERSION<br> -CIAO/ChangeLog<br> -CIAO/PROBLEM-REPORT-FORM<br> -CIAO/VERSION<br> -CIAO/ciao/Version.h<br> -TAO/tao/Version.h<br> -ace/Version.h<br></code><p> -The tag will also need to be removed: ACE+TAO+CIAO-X_Y_Z +process started and then checked back into CVS:<br><code> +ACE_wrappers/ChangeLog<br> +ACE_wrappers/PROBLEM-REPORT-FORM<br> +ACE_wrappers/VERSION<br> +ACE_wrappers/TAO/ChangeLog<br> +ACE_wrappers/TAO/PROBLEM-REPORT-FORM<br> +ACE_wrappers/TAO/VERSION<br> +ACE_wrappers/TAO/CIAO/ChangeLog<br> +ACE_wrappers/TAO/CIAO/PROBLEM-REPORT-FORM<br> +ACE_wrappers/TAO/CIAO/VERSION<br> +ACE_wrappers/TAO/CIAO/ciao/Version.h<br> +ACE_wrappers/TAO/tao/Version.h<br> +ACE_wrappers/ace/Version.h<br></code><p> +The following tags will also need to be removed: CIAO-0_X_Y, TAO-1_X_Y, and ACE-5_X_Y (wher X and Y are the minor and beta release numbers of the release that is to be restarted).<p> E.g.:<br> <code> -svn rm https://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-X_Y_Z<br /> +cvs tag -d CIAO-0_4_8<br> +cvs tag -d TAO-1_4_8<br> +cvs tag -d ACE-5_4_8<br> </code> -Note that this <em>only</em> needs to be done if the <em>tagging</em> fails. If kit creation -fails, simply restart that process. -<li>The packages and up by default under /export/doc/latest, you can copy them to the webserver using the following commands. At the moment -you execute these commands all users can download these packages.</li> -<code> -cp /export/doc/latest/ACE* /export/www/download.dre/ACE+TAO-distribution<br> -cp /export/doc/previous-versions/ACE* /export/www/download.dre/previous_versions<br> -</code> +<li>When ready, create a manual tag ACE+TAO+CIAO-X_Y_Z, where X_Y_Z must be replaced by major/minor/beta version (for example 1_4_7). + For example, the tag might be: ACE+TAO+CIAO-1_4_8</li> <li>Once the distribution is ready, get ready for creating doxygen documentation. This is slightly complicated than it requires. We will address the complexity soon.</li> <li>Login to naboo.dre.vanderbilt.edu as bczar</li> -<ul><li>After login, ssh to bczar@download.dre.vanderbilt.edu as bczar and check whether ssh succeeds. If not fix the problem. The make script tries to copy the tar.gz files to the website using ssh.</li></ul> -<li> go to /web/users/isisbuilds/tmp/ACE_wrappers and remove the contents of this directory</li> +<ul><li>After login, ssh to deuce.doc.wustl.edu as bugzilla and check whether ssh succeeds. If not fix the problem. The make script tries to copy the tar.gz files to the website using ssh.</li></ul> +<li> go to /web/users/isisbuilds/tmp/ACE_wrappers </li> +<li> Set the environment variables pointed above. </li> <li> Update the workspace with the right version tag </li> <code> svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-X_Y_Z/ACE ACE_wrappers<br> svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-X_Y_Z/TAO ACE_wrappers/TAO<br> svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-X_Y_Z/CIAO ACE_wrappers/TAO/CIAO<br> </code> -<li> Set the needed environment variables using</li> -<code> -export ACE_ROOT=/web/users/isisbuilds/tmp/ACE_wrappers/ACE_wrappers -</code> + <li> Run doxygen --version within the shell. </li> -<li> Open up $ACE_ROOT/bin/generate_rel_manpages in your favorite editor.</li> +<li> Open up $ACE_ROOT/bin/generate_rel_mangpages in your favorite editor.</li> <li> Search for the string 'doxy_version'. </li> <li> Check the version specified here. If it is the same as the one you got using doxygen --version then you don't have to worry. </li> <li> If it is different change the value of the doxy_version to the one installed on naboo.dre.vanderbilt.edu.</li> <li> Now you are ready to create documentation </li> -<li> Do a <code>cd $ACE_ROOT</code> and then run <tt>make -f Release manpages</tt> to create the doxygen +<li> Run <tt>make -f Release manpages</tt> to create the doxygen documentation.</li> <ul><li><b>If you can't leave the terminal window active for 6-9 hours, consider prefixing this command with <tt>nohup</tt></b></li></ul> diff --git a/ACE/docs/bczar/privileges.html b/ACE/docs/bczar/privileges.html index 299b88c299f..38bd3f26c35 100644 --- a/ACE/docs/bczar/privileges.html +++ b/ACE/docs/bczar/privileges.html @@ -1,5 +1,3 @@ -<!-- $Id$ --> - <html> <head> <title> Build Czar powers </title> @@ -11,7 +9,7 @@ failure to do so may result in some form of revolution (picture a firing squad). </P> - + <P> Previous generations of the honorable royal family have automated the build process as much as possible, but all machines require attention: @@ -40,7 +38,7 @@ if needed. </P> <P>The build Czar should also investigate the errors and warnings - reported by a build, + reported by a build, contact the person or persons responsible for the failed build and prompt them to fix the situation. If that process above fails the build Czar should request help from a volunteer or proceed to fix @@ -49,7 +47,7 @@ forced to excomunicate the original developer and report him or her to the highest court of the land for whatever punishment is deemed appropriate (lashing or bone breaking where not prohibited - by law). + by law). </P> <P>It is extremely important to fix broken builds within the day, otherwise the errors tend to accumulate and once the process diff --git a/ACE/docs/run_test.txt b/ACE/docs/run_test.txt index e236bcaa4cb..bd483b3105b 100644 --- a/ACE/docs/run_test.txt +++ b/ACE/docs/run_test.txt @@ -201,31 +201,13 @@ used when the server doesn't shut down itself. WaitKill is used when it does (such as when the client calls a shutdown method). Once again, we check the return status. + @verbatim unlink $server_ior; exit $status; @endverbatim -When you need the hostname the test is running on be aware of the -fact that with VxWorks we do cross host testing, part of the test -runs on the target, the other part on the host system. In your test -program add functionality to handle a commandline argument to pass -in the hostname of the target. In the run_test.pl script you can -then use the following code as example. - -@verbatim -$TARGETHOSTNAME = "localhost"; -if (PerlACE::is_vxworks_test()) { - $TARGETHOSTNAME = $ENV{'ACE_RUN_VX_TGT_HOST'}; - $SV = new PerlACE::ProcessVX ("server", "-ORBEndpoint iiop://$TARGETHOSTNAME:43210"); - } - else { - $SV = new PerlACE::Process ("server", "-ORBEndpoint iiop://$TARGETHOSTNAME:43210"); - } -$CL = new PerlACE::Process ("client", " -p 43210 -h $TARGETHOSTNAME"); -@endverbatim - And finally, we unlink any files that were created and then just exit with $status. diff --git a/ACE/docs/svn/config b/ACE/docs/svn/config index b7399bb1636..3c2c12ba42a 100644 --- a/ACE/docs/svn/config +++ b/ACE/docs/svn/config @@ -127,6 +127,4 @@ enable-auto-props = yes *.ps=svn:mime-type=application/postscript *.pdf=svn:mime-type=application/postscript *.tab=svn:eol-style=native;svn:keywords=Author Date Id Revision -*.doxygen=svn:eol-style=native;svn:keywords=Author Date Id Revision -*.rc=svn:eol-style=native;svn:keywords=Author Date Id Revision Change?og*=svn:eol-style=native;svn:keywords=Author Date Id Revision diff --git a/ACE/docs/svn/svn-prefs.reg b/ACE/docs/svn/svn-prefs.reg index 200045b5189..9ace7caa0e1 100644 --- a/ACE/docs/svn/svn-prefs.reg +++ b/ACE/docs/svn/svn-prefs.reg @@ -31,6 +31,7 @@ REGEDIT4 "use-commit-times"="yes" "#template-root"="" "enable-auto-props"="yes" + [HKEY_CURRENT_USER\Software\Tigris.org\Subversion\Config\tunnels] [HKEY_CURRENT_USER\Software\Tigris.org\Subversion\Config\auto-props] @@ -82,6 +83,4 @@ REGEDIT4 "*.pdf"="svn:mime-type=application/postscript" "*.ps"="svn:eol-style=native;svn:keywords=Author Date Id Revision" "*.tab"="svn:eol-style=native;svn:keywords=Author Date Id Revision" -"*.doxygen"="svn:eol-style=native;svn:keywords=Author Date Id Revision" -"*.rc"="svn:eol-style=native;svn:keywords=Author Date Id Revision" "Change?og*"="svn:eol-style=native;svn:keywords=Author Date Id Revision" diff --git a/ACE/etc/tao_compression.doxygen b/ACE/etc/tao_compression.doxygen deleted file mode 100644 index 5ab55ee5206..00000000000 --- a/ACE/etc/tao_compression.doxygen +++ /dev/null @@ -1,171 +0,0 @@ -# Doxyfile 1.1.5 -# -# $Id$ -# - -PROJECT_NAME = TAO_Compression -PROJECT_NUMBER = Snapshot -OUTPUT_DIRECTORY = . -OUTPUT_LANGUAGE = English -DISABLE_INDEX = NO -EXTRACT_ALL = YES -EXTRACT_PRIVATE = YES -EXTRACT_STATIC = YES -HIDE_UNDOC_MEMBERS = NO -HIDE_UNDOC_CLASSES = NO -BRIEF_MEMBER_DESC = YES -REPEAT_BRIEF = YES -ALWAYS_DETAILED_SEC = NO -FULL_PATH_NAMES = NO -STRIP_FROM_PATH = -INTERNAL_DOCS = YES -CLASS_DIAGRAMS = YES -SOURCE_BROWSER = YES -INLINE_SOURCES = YES -STRIP_CODE_COMMENTS = NO -CASE_SENSE_NAMES = YES -HIDE_SCOPE_NAMES = NO -VERBATIM_HEADERS = YES -SHOW_INCLUDE_FILES = YES -JAVADOC_AUTOBRIEF = NO -INHERIT_DOCS = YES -INLINE_INFO = YES -SORT_MEMBER_DOCS = YES -DISTRIBUTE_GROUP_DOC = YES -TAB_SIZE = 8 -ENABLED_SECTIONS = -SHORT_NAMES = YES - -#--------------------------------------------------------------------------- -# configuration options related to warning and progress messages -#--------------------------------------------------------------------------- - -QUIET = YES -WARNINGS = NO -WARN_IF_UNDOCUMENTED = YES -WARN_FORMAT = "$file:$line: $text" - -#--------------------------------------------------------------------------- -# configuration options related to the input files -#--------------------------------------------------------------------------- - -INPUT = TAO/tao/Compression -FILE_PATTERNS = *.cpp *.h *.inl *.pidl -RECURSIVE = -EXCLUDE = -EXCLUDE_PATTERNS = -EXAMPLE_PATH = -EXAMPLE_PATTERNS = -IMAGE_PATH = -INPUT_FILTER = - -#--------------------------------------------------------------------------- -# configuration options related to the alphabetical class index -#--------------------------------------------------------------------------- - -ALPHABETICAL_INDEX = YES -COLS_IN_ALPHA_INDEX = 1 -IGNORE_PREFIX = - -#--------------------------------------------------------------------------- -# configuration options related to the HTML output -#--------------------------------------------------------------------------- - -GENERATE_HTML = YES -HTML_OUTPUT = html/tao/compression -HTML_HEADER = -HTML_FOOTER = -HTML_STYLESHEET = -HTML_ALIGN_MEMBERS = YES -GENERATE_HTMLHELP = YES - -#--------------------------------------------------------------------------- -# configuration options related to the LaTeX output -#--------------------------------------------------------------------------- - -GENERATE_LATEX = NO -LATEX_OUTPUT = latex -COMPACT_LATEX = NO -PAPER_TYPE = a4wide -EXTRA_PACKAGES = -LATEX_HEADER = -PDF_HYPERLINKS = NO -LATEX_BATCHMODE = NO - -#--------------------------------------------------------------------------- -# configuration options related to the RTF output -#--------------------------------------------------------------------------- - -GENERATE_RTF = NO -RTF_OUTPUT = rtf -COMPACT_RTF = NO -RTF_HYPERLINKS = NO -RTF_STYLESHEET_FILE = - -#--------------------------------------------------------------------------- -# configuration options related to the man page output -#--------------------------------------------------------------------------- - -GENERATE_MAN = NO -MAN_OUTPUT = man -MAN_EXTENSION = .3 - -#--------------------------------------------------------------------------- -# Configuration options related to the preprocessor -#--------------------------------------------------------------------------- - -ENABLE_PREPROCESSING = YES -MACRO_EXPANSION = YES -EXPAND_ONLY_PREDEF = YES -SEARCH_INCLUDES = YES -INCLUDE_PATH = TAO . -PREDEFINED = -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC \ - ACE_ENV_ARG_DECL_NOT_USED \ - ACE_ENV_SINGLE_ARG_DECL_NOT_USED \ - ACE_ENV_ARG_DECL_WITH_DEFAULTS \ - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \ - ACE_ENV_ARG_DECL \ - ACE_ENV_SINGLE_ARG_DECL \ - ACE_ENV_SINGLE_ARG_PARAMETER \ - ACE_ENV_ARG_PARAMETER - -#--------------------------------------------------------------------------- -# Configuration::addtions related to external references -#--------------------------------------------------------------------------- - -TAGFILES = html/ace/ACE.tag=../../ace \ - html/tao/TAO.tag=.. -GENERATE_TAGFILE = html/tao/compression/TAO_Compression.tag -ALLEXTERNALS = NO -PERL_PATH = /usr/bin/perl - -#--------------------------------------------------------------------------- -# Configuration options related to the dot tool -#--------------------------------------------------------------------------- - -# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is -# available from the path. This tool is part of Graphviz - -HAVE_DOT = YES -CLASS_GRAPH = YES -COLLABORATION_GRAPH = YES -INCLUDE_GRAPH = YES -INCLUDED_BY_GRAPH = YES -GRAPHICAL_HIERARCHY = YES -DOT_MULTI_TARGETS = YES -# The tag DOT_PATH can be used to specify the path where the dot tool can be -# found. If left blank, it is assumed the dot tool can be found on the path. -DOT_PATH = -MAX_DOT_GRAPH_WIDTH = 1024 -MAX_DOT_GRAPH_HEIGHT = 1024 - -#--------------------------------------------------------------------------- -# Configuration::addtions related to the search engine -#--------------------------------------------------------------------------- - -SEARCHENGINE = YES - diff --git a/ACE/etc/tao_transportcurrent.doxygen b/ACE/etc/tao_transportcurrent.doxygen deleted file mode 100644 index 9db09e4d6d8..00000000000 --- a/ACE/etc/tao_transportcurrent.doxygen +++ /dev/null @@ -1,172 +0,0 @@ -# Doxyfile 1.1.5 -# -# $Id$ -# - -PROJECT_NAME = TAO_TransportCurrent -PROJECT_NUMBER = Snapshot -OUTPUT_DIRECTORY = . -OUTPUT_LANGUAGE = English -DISABLE_INDEX = NO -EXTRACT_ALL = YES -EXTRACT_PRIVATE = YES -EXTRACT_STATIC = YES -HIDE_UNDOC_MEMBERS = NO -HIDE_UNDOC_CLASSES = NO -BRIEF_MEMBER_DESC = YES -REPEAT_BRIEF = YES -ALWAYS_DETAILED_SEC = NO -FULL_PATH_NAMES = NO -STRIP_FROM_PATH = -INTERNAL_DOCS = YES -CLASS_DIAGRAMS = YES -SOURCE_BROWSER = YES -INLINE_SOURCES = YES -STRIP_CODE_COMMENTS = NO -CASE_SENSE_NAMES = YES -HIDE_SCOPE_NAMES = NO -VERBATIM_HEADERS = YES -SHOW_INCLUDE_FILES = YES -JAVADOC_AUTOBRIEF = NO -INHERIT_DOCS = YES -INLINE_INFO = YES -SORT_MEMBER_DOCS = YES -DISTRIBUTE_GROUP_DOC = YES -TAB_SIZE = 8 -ENABLED_SECTIONS = -SHORT_NAMES = YES - -#--------------------------------------------------------------------------- -# configuration options related to warning and progress messages -#--------------------------------------------------------------------------- - -QUIET = YES -WARNINGS = NO -WARN_IF_UNDOCUMENTED = YES -WARN_FORMAT = "$file:$line: $text" - -#--------------------------------------------------------------------------- -# configuration options related to the input files -#--------------------------------------------------------------------------- - -INPUT = TAO/tao/TransportCurrent -FILE_PATTERNS = *.cpp *.h *.inl *.pidl -RECURSIVE = -EXCLUDE = -EXCLUDE_PATTERNS = -EXAMPLE_PATH = -EXAMPLE_PATTERNS = -IMAGE_PATH = -INPUT_FILTER = - -#--------------------------------------------------------------------------- -# configuration options related to the alphabetical class index -#--------------------------------------------------------------------------- - -ALPHABETICAL_INDEX = YES -COLS_IN_ALPHA_INDEX = 1 -IGNORE_PREFIX = - -#--------------------------------------------------------------------------- -# configuration options related to the HTML output -#--------------------------------------------------------------------------- - -GENERATE_HTML = YES -HTML_OUTPUT = html/tao/transportcurrent -HTML_HEADER = -HTML_FOOTER = -HTML_STYLESHEET = -HTML_ALIGN_MEMBERS = YES -GENERATE_HTMLHELP = YES - -#--------------------------------------------------------------------------- -# configuration options related to the LaTeX output -#--------------------------------------------------------------------------- - -GENERATE_LATEX = NO -LATEX_OUTPUT = latex -COMPACT_LATEX = NO -PAPER_TYPE = a4wide -EXTRA_PACKAGES = -LATEX_HEADER = -PDF_HYPERLINKS = NO -LATEX_BATCHMODE = NO - -#--------------------------------------------------------------------------- -# configuration options related to the RTF output -#--------------------------------------------------------------------------- - -GENERATE_RTF = NO -RTF_OUTPUT = rtf -COMPACT_RTF = NO -RTF_HYPERLINKS = NO -RTF_STYLESHEET_FILE = - -#--------------------------------------------------------------------------- -# configuration options related to the man page output -#--------------------------------------------------------------------------- - -GENERATE_MAN = NO -MAN_OUTPUT = man -MAN_EXTENSION = .3 - -#--------------------------------------------------------------------------- -# Configuration options related to the preprocessor -#--------------------------------------------------------------------------- - -ENABLE_PREPROCESSING = YES -MACRO_EXPANSION = YES -EXPAND_ONLY_PREDEF = YES -SEARCH_INCLUDES = YES -INCLUDE_PATH = TAO . -PREDEFINED = -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC \ - ACE_ENV_ARG_DECL_NOT_USED \ - ACE_ENV_SINGLE_ARG_DECL_NOT_USED \ - ACE_ENV_ARG_DECL_WITH_DEFAULTS \ - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \ - ACE_ENV_ARG_DECL \ - ACE_ENV_SINGLE_ARG_DECL \ - ACE_ENV_SINGLE_ARG_PARAMETER \ - ACE_ENV_ARG_PARAMETER - -#--------------------------------------------------------------------------- -# Configuration::addtions related to external references -#--------------------------------------------------------------------------- - -TAGFILES = html/ace/ACE.tag=../../ace \ - html/tao/TAO.tag=.. \ - html/tao/pi/TAO_PI.tag=../pi -GENERATE_TAGFILE = html/tao/transportcurrent/TAO_TransportCurrent.tag -ALLEXTERNALS = NO -PERL_PATH = /usr/bin/perl - -#--------------------------------------------------------------------------- -# Configuration options related to the dot tool -#--------------------------------------------------------------------------- - -# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is -# available from the path. This tool is part of Graphviz - -HAVE_DOT = YES -CLASS_GRAPH = YES -COLLABORATION_GRAPH = YES -INCLUDE_GRAPH = YES -INCLUDED_BY_GRAPH = YES -GRAPHICAL_HIERARCHY = YES -DOT_MULTI_TARGETS = YES -# The tag DOT_PATH can be used to specify the path where the dot tool can be -# found. If left blank, it is assumed the dot tool can be found on the path. -DOT_PATH = -MAX_DOT_GRAPH_WIDTH = 1024 -MAX_DOT_GRAPH_HEIGHT = 1024 - -#--------------------------------------------------------------------------- -# Configuration::addtions related to the search engine -#--------------------------------------------------------------------------- - -SEARCHENGINE = YES - diff --git a/ACE/examples/APG/Active_Objects/.cvsignore b/ACE/examples/APG/Active_Objects/.cvsignore new file mode 100644 index 00000000000..2af94b7dd8c --- /dev/null +++ b/ACE/examples/APG/Active_Objects/.cvsignore @@ -0,0 +1,4 @@ +AO +AO +AO2 +AO2 diff --git a/ACE/examples/APG/Active_Objects/Makefile.am b/ACE/examples/APG/Active_Objects/Makefile.am index 0ef7451c6c1..4562743bc87 100644 --- a/ACE/examples/APG/Active_Objects/Makefile.am +++ b/ACE/examples/APG/Active_Objects/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -16,7 +16,6 @@ noinst_PROGRAMS = ## Makefile.AO.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += AO AO_CPPFLAGS = \ @@ -34,7 +33,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.AO2.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += AO2 AO2_CPPFLAGS = \ diff --git a/ACE/examples/APG/Config/.cvsignore b/ACE/examples/APG/Config/.cvsignore new file mode 100644 index 00000000000..b9f807ab7a6 --- /dev/null +++ b/ACE/examples/APG/Config/.cvsignore @@ -0,0 +1,6 @@ +ARGV_Example +ARGV_Example +Get_Opt +Get_Opt +Get_Opt_Long +Get_Opt_Long diff --git a/ACE/examples/APG/Config/Makefile.am b/ACE/examples/APG/Config/Makefile.am index 5eb39fe51e0..5320bfdf85c 100644 --- a/ACE/examples/APG/Config/Makefile.am +++ b/ACE/examples/APG/Config/Makefile.am @@ -6,14 +6,13 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) ## Makefile.ARGV_Example.am - noinst_PROGRAMS = ARGV_Example ARGV_Example_CPPFLAGS = \ @@ -30,7 +29,6 @@ ARGV_Example_LDADD = \ ## Makefile.Config_HA_Status.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += HA_Status HA_Status_CPPFLAGS = \ @@ -47,7 +45,6 @@ HA_Status_LDADD = \ endif !BUILD_ACE_FOR_TAO ## Makefile.Get_Opt.am - noinst_PROGRAMS += Get_Opt Get_Opt_CPPFLAGS = \ @@ -62,7 +59,6 @@ Get_Opt_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Get_Opt_Long.am - noinst_PROGRAMS += Get_Opt_Long Get_Opt_Long_CPPFLAGS = \ diff --git a/ACE/examples/APG/Containers/.cvsignore b/ACE/examples/APG/Containers/.cvsignore new file mode 100644 index 00000000000..20d09b55a72 --- /dev/null +++ b/ACE/examples/APG/Containers/.cvsignore @@ -0,0 +1,24 @@ +Allocator +Allocator +Array +Array +DLList +DLList +Hash_Map +Hash_Map +Hash_Map_Hash +Hash_Map_Hash +Map_Manager +Map_Manager +Map_Manager_Specialization +Map_Manager_Specialization +Queues +Queues +RB_Tree +RB_Tree +RB_Tree_Functors +RB_Tree_Functors +Sets +Sets +Stacks +Stacks diff --git a/ACE/examples/APG/Containers/Makefile.am b/ACE/examples/APG/Containers/Makefile.am index 4be38993e5a..e5ef96ad6dc 100644 --- a/ACE/examples/APG/Containers/Makefile.am +++ b/ACE/examples/APG/Containers/Makefile.am @@ -6,14 +6,13 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) ## Makefile.Allocator.am - noinst_PROGRAMS = Allocator Allocator_CPPFLAGS = \ @@ -31,7 +30,6 @@ Allocator_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Array.am - noinst_PROGRAMS += Array Array_CPPFLAGS = \ @@ -49,7 +47,6 @@ Array_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Containers_Hash_Map.am - noinst_PROGRAMS += Hash_Map Hash_Map_CPPFLAGS = \ @@ -67,7 +64,6 @@ Hash_Map_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Containers_Map_Manager.am - noinst_PROGRAMS += Map_Manager Map_Manager_CPPFLAGS = \ @@ -87,7 +83,6 @@ Map_Manager_LDADD = \ ## Makefile.DLList.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += DLList DLList_CPPFLAGS = \ @@ -107,7 +102,6 @@ DLList_LDADD = \ endif !BUILD_ACE_FOR_TAO ## Makefile.Hash_Map_Hash.am - noinst_PROGRAMS += Hash_Map_Hash Hash_Map_Hash_CPPFLAGS = \ @@ -122,7 +116,6 @@ Hash_Map_Hash_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Map_Manager_Specialization.am - noinst_PROGRAMS += Map_Manager_Specialization Map_Manager_Specialization_CPPFLAGS = \ @@ -140,7 +133,6 @@ Map_Manager_Specialization_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Queues.am - noinst_PROGRAMS += Queues Queues_CPPFLAGS = \ @@ -158,7 +150,6 @@ Queues_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.RB_Tree.am - noinst_PROGRAMS += RB_Tree RB_Tree_CPPFLAGS = \ @@ -176,7 +167,6 @@ RB_Tree_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.RB_Tree_Functors.am - noinst_PROGRAMS += RB_Tree_Functors RB_Tree_Functors_CPPFLAGS = \ @@ -191,7 +181,6 @@ RB_Tree_Functors_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Sets.am - noinst_PROGRAMS += Sets Sets_CPPFLAGS = \ @@ -209,7 +198,6 @@ Sets_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Stacks.am - noinst_PROGRAMS += Stacks Stacks_CPPFLAGS = \ diff --git a/ACE/examples/APG/Logging/.cvsignore b/ACE/examples/APG/Logging/.cvsignore new file mode 100644 index 00000000000..821ee0bc87c --- /dev/null +++ b/ACE/examples/APG/Logging/.cvsignore @@ -0,0 +1,36 @@ +Change_Instance_Default +Change_Instance_Default +Change_Mask +Change_Mask +Howto_Syslog +Howto_Syslog +Simple1 +Simple1 +Simple2 +Simple2 +Trace_Return +Trace_Return +Use_Callback +Use_Callback +Use_Callback2 +Use_Callback2 +Use_LogManager +Use_LogManager +Use_Logger +Use_Logger +Use_Logging_Server +Use_Logging_Server +Use_Logging_Strategy +Use_Logging_Strategy +Use_Multiple_Sinks +Use_Multiple_Sinks +Use_Ostream +Use_Ostream +Use_Stderr +Use_Stderr +Use_Syslog +Use_Syslog +Wrap_Macros +Wrap_Macros +Wrap_Macros_Alt +Wrap_Macros_Alt diff --git a/ACE/examples/APG/Logging/Makefile.am b/ACE/examples/APG/Logging/Makefile.am index 5a6f92b9fa6..69564edb197 100644 --- a/ACE/examples/APG/Logging/Makefile.am +++ b/ACE/examples/APG/Logging/Makefile.am @@ -6,13 +6,12 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) ## Makefile.Change_Instance_Default.am - noinst_PROGRAMS = Change_Instance_Default Change_Instance_Default_CPPFLAGS = \ @@ -32,7 +31,6 @@ Change_Instance_Default_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Change_Mask.am - noinst_PROGRAMS += Change_Mask Change_Mask_CPPFLAGS = \ @@ -52,7 +50,6 @@ Change_Mask_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Howto_Syslog.am - noinst_PROGRAMS += Howto_Syslog Howto_Syslog_CPPFLAGS = \ @@ -72,7 +69,6 @@ Howto_Syslog_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Simple1.am - noinst_PROGRAMS += Simple1 Simple1_CPPFLAGS = \ @@ -92,7 +88,6 @@ Simple1_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Simple2.am - noinst_PROGRAMS += Simple2 Simple2_CPPFLAGS = \ @@ -112,7 +107,6 @@ Simple2_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Trace_Return.am - noinst_PROGRAMS += Trace_Return Trace_Return_CPPFLAGS = \ @@ -132,7 +126,6 @@ Trace_Return_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Use_Callback.am - noinst_PROGRAMS += Use_Callback Use_Callback_CPPFLAGS = \ @@ -152,7 +145,6 @@ Use_Callback_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Use_Callback2.am - noinst_PROGRAMS += Use_Callback2 Use_Callback2_CPPFLAGS = \ @@ -172,7 +164,6 @@ Use_Callback2_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Use_LogManager.am - noinst_PROGRAMS += Use_LogManager Use_LogManager_CPPFLAGS = \ @@ -192,7 +183,6 @@ Use_LogManager_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Use_Logger.am - noinst_PROGRAMS += Use_Logger Use_Logger_CPPFLAGS = \ @@ -212,7 +202,6 @@ Use_Logger_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Use_Logging_Server.am - noinst_PROGRAMS += Use_Logging_Server Use_Logging_Server_CPPFLAGS = \ @@ -232,7 +221,6 @@ Use_Logging_Server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Use_Logging_Strategy.am - noinst_PROGRAMS += Use_Logging_Strategy Use_Logging_Strategy_CPPFLAGS = \ @@ -252,7 +240,6 @@ Use_Logging_Strategy_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Use_Multiple_Sinks.am - noinst_PROGRAMS += Use_Multiple_Sinks Use_Multiple_Sinks_CPPFLAGS = \ @@ -272,7 +259,6 @@ Use_Multiple_Sinks_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Use_Ostream.am - noinst_PROGRAMS += Use_Ostream Use_Ostream_CPPFLAGS = \ @@ -292,7 +278,6 @@ Use_Ostream_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Use_Stderr.am - noinst_PROGRAMS += Use_Stderr Use_Stderr_CPPFLAGS = \ @@ -312,7 +297,6 @@ Use_Stderr_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Use_Syslog.am - noinst_PROGRAMS += Use_Syslog Use_Syslog_CPPFLAGS = \ @@ -332,7 +316,6 @@ Use_Syslog_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Wrap_Macros.am - noinst_PROGRAMS += Wrap_Macros Wrap_Macros_CPPFLAGS = \ @@ -352,7 +335,6 @@ Wrap_Macros_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Wrap_Macros_Alt.am - noinst_PROGRAMS += Wrap_Macros_Alt Wrap_Macros_Alt_CPPFLAGS = \ diff --git a/ACE/examples/APG/Logging/Trace.h b/ACE/examples/APG/Logging/Trace.h index 782a610558e..9c71bad13e3 100644 --- a/ACE/examples/APG/Logging/Trace.h +++ b/ACE/examples/APG/Logging/Trace.h @@ -77,10 +77,6 @@ private: // Listing 2 code/ch03 #define TRACE_PREFIX ACE_TEXT ("TRACE ") -#if defined (TRACE) -#undef TRACE -#endif /* TRACE */ - #if (ACE_NTRACE == 1) # define TRACE(X) # define TRACE_RETURN(V) return V; diff --git a/ACE/examples/APG/Makefile.am b/ACE/examples/APG/Makefile.am index 5a191de8a82..f79765c9348 100644 --- a/ACE/examples/APG/Makefile.am +++ b/ACE/examples/APG/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ Active_Objects \ diff --git a/ACE/examples/APG/Misc_IPC/.cvsignore b/ACE/examples/APG/Misc_IPC/.cvsignore new file mode 100644 index 00000000000..155f8a18824 --- /dev/null +++ b/ACE/examples/APG/Misc_IPC/.cvsignore @@ -0,0 +1,6 @@ +UDP_Broadcast +UDP_Broadcast +UDP_Multicast +UDP_Multicast +UDP_Unicast +UDP_Unicast diff --git a/ACE/examples/APG/Misc_IPC/Makefile.am b/ACE/examples/APG/Misc_IPC/Makefile.am index 7c9daa10038..656f63fb00c 100644 --- a/ACE/examples/APG/Misc_IPC/Makefile.am +++ b/ACE/examples/APG/Misc_IPC/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -16,7 +16,6 @@ noinst_PROGRAMS = ## Makefile.UDP_Broadcast.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += UDP_Broadcast UDP_Broadcast_CPPFLAGS = \ @@ -32,7 +31,6 @@ UDP_Broadcast_LDADD = \ endif !BUILD_ACE_FOR_TAO ## Makefile.UDP_Multicast.am - noinst_PROGRAMS += UDP_Multicast UDP_Multicast_CPPFLAGS = \ @@ -48,7 +46,6 @@ UDP_Multicast_LDADD = \ ## Makefile.UDP_Unicast.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += UDP_Unicast UDP_Unicast_CPPFLAGS = \ diff --git a/ACE/examples/APG/Naming/.cvsignore b/ACE/examples/APG/Naming/.cvsignore new file mode 100644 index 00000000000..e5fd579f85d --- /dev/null +++ b/ACE/examples/APG/Naming/.cvsignore @@ -0,0 +1,10 @@ +Netlocal +Netlocal +Netlocal_reader +Netlocal_reader +Nodelocal +Nodelocal +Nodelocal_shared +Nodelocal_shared +Nodelocal_shared_reader +Nodelocal_shared_reader diff --git a/ACE/examples/APG/Naming/Makefile.am b/ACE/examples/APG/Naming/Makefile.am index 29b98dd43d6..f73b1258348 100644 --- a/ACE/examples/APG/Naming/Makefile.am +++ b/ACE/examples/APG/Naming/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -16,7 +16,6 @@ noinst_PROGRAMS = ## Makefile.Netlocal.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Netlocal Netlocal_CPPFLAGS = \ @@ -36,7 +35,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Netlocal_Reader.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Netlocal_reader Netlocal_reader_CPPFLAGS = \ @@ -58,7 +56,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Nodelocal.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Nodelocal Nodelocal_CPPFLAGS = \ @@ -78,7 +75,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Nodelocal_Shared.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Nodelocal_shared Nodelocal_shared_CPPFLAGS = \ @@ -98,7 +94,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Nodelocal_Shared_Reader.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Nodelocal_shared_reader Nodelocal_shared_reader_CPPFLAGS = \ diff --git a/ACE/examples/APG/Proactor/.cvsignore b/ACE/examples/APG/Proactor/.cvsignore new file mode 100644 index 00000000000..64b35fb3d57 --- /dev/null +++ b/ACE/examples/APG/Proactor/.cvsignore @@ -0,0 +1,2 @@ +HA_Proactive_Status +HA_Proactive_Status diff --git a/ACE/examples/APG/Proactor/Makefile.am b/ACE/examples/APG/Proactor/Makefile.am index 9d23599bcd0..a7632af1d4f 100644 --- a/ACE/examples/APG/Proactor/Makefile.am +++ b/ACE/examples/APG/Proactor/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -15,7 +15,6 @@ ACE_ROOT = $(top_srcdir) ## Makefile.HA_Proactive_Status.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS = HA_Proactive_Status HA_Proactive_Status_CPPFLAGS = \ diff --git a/ACE/examples/APG/Processes/.cvsignore b/ACE/examples/APG/Processes/.cvsignore new file mode 100644 index 00000000000..187cf413af2 --- /dev/null +++ b/ACE/examples/APG/Processes/.cvsignore @@ -0,0 +1,8 @@ +Process_Manager_Death +Process_Manager_Death +Process_Manager_Spawn +Process_Manager_Spawn +Process_Mutex +Process_Mutex +Spawn +Spawn diff --git a/ACE/examples/APG/Processes/Makefile.am b/ACE/examples/APG/Processes/Makefile.am index ea828036b0f..5c45a506304 100644 --- a/ACE/examples/APG/Processes/Makefile.am +++ b/ACE/examples/APG/Processes/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -16,7 +16,6 @@ noinst_PROGRAMS = ## Makefile.Process_Manager_Death.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Process_Manager_Death Process_Manager_Death_CPPFLAGS = \ @@ -34,7 +33,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Process_Manager_Spawn.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Process_Manager_Spawn Process_Manager_Spawn_CPPFLAGS = \ @@ -52,7 +50,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Process_Mutex.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Process_Mutex Process_Mutex_CPPFLAGS = \ @@ -70,7 +67,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Spawn.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Spawn Spawn_CPPFLAGS = \ diff --git a/ACE/examples/APG/Reactor/.cvsignore b/ACE/examples/APG/Reactor/.cvsignore new file mode 100644 index 00000000000..c2d63b45dcf --- /dev/null +++ b/ACE/examples/APG/Reactor/.cvsignore @@ -0,0 +1,16 @@ +Client +Client +HAStatus +HAStatus +HAStatus-AC +HAStatus-AC +Reschedule +Reschedule +Schedule_Timers +Schedule_Timers +Timer_Cancel +Timer_Cancel +Timer_State_Data +Timer_State_Data +Timers +Timers diff --git a/ACE/examples/APG/Reactor/Makefile.am b/ACE/examples/APG/Reactor/Makefile.am index 9e7d494af62..789c0ce7785 100644 --- a/ACE/examples/APG/Reactor/Makefile.am +++ b/ACE/examples/APG/Reactor/Makefile.am @@ -6,13 +6,12 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) ## Makefile.Client.am - noinst_PROGRAMS = Client Client_CPPFLAGS = \ @@ -27,7 +26,6 @@ Client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.HAStatus.am - noinst_PROGRAMS += HAStatus HAStatus_CPPFLAGS = \ @@ -43,7 +41,6 @@ HAStatus_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.HAStatus_AC.am - noinst_PROGRAMS += HAStatus-AC HAStatus_AC_CPPFLAGS = \ @@ -59,7 +56,6 @@ HAStatus_AC_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Reactor_Timers.am - noinst_PROGRAMS += Timers Timers_CPPFLAGS = \ @@ -75,7 +71,6 @@ Timers_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Reschedule.am - noinst_PROGRAMS += Reschedule Reschedule_CPPFLAGS = \ @@ -91,7 +86,6 @@ Reschedule_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Schedule_Timers.am - noinst_PROGRAMS += Schedule_Timers Schedule_Timers_CPPFLAGS = \ @@ -107,7 +101,6 @@ Schedule_Timers_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Timer_Cancel.am - noinst_PROGRAMS += Timer_Cancel Timer_Cancel_CPPFLAGS = \ @@ -123,7 +116,6 @@ Timer_Cancel_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Timer_State_Data.am - noinst_PROGRAMS += Timer_State_Data Timer_State_Data_CPPFLAGS = \ diff --git a/ACE/examples/APG/Shared_Memory/.cvsignore b/ACE/examples/APG/Shared_Memory/.cvsignore new file mode 100644 index 00000000000..4fbe7c66db3 --- /dev/null +++ b/ACE/examples/APG/Shared_Memory/.cvsignore @@ -0,0 +1,10 @@ +Hash_Map +Hash_Map +Malloc +Malloc +Mem_Map +Mem_Map +PI_Malloc +PI_Malloc +Pool_Growth +Pool_Growth diff --git a/ACE/examples/APG/Shared_Memory/Makefile.am b/ACE/examples/APG/Shared_Memory/Makefile.am index f5e7623d13b..b114eb0153a 100644 --- a/ACE/examples/APG/Shared_Memory/Makefile.am +++ b/ACE/examples/APG/Shared_Memory/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -16,7 +16,6 @@ noinst_PROGRAMS = ## Makefile.Malloc.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Malloc Malloc_CPPFLAGS = \ @@ -35,7 +34,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Mem_Map.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Mem_Map Mem_Map_CPPFLAGS = \ @@ -54,7 +52,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.PI_Malloc.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += PI_Malloc PI_Malloc_CPPFLAGS = \ @@ -73,7 +70,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Pool_Growth.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Pool_Growth Pool_Growth_CPPFLAGS = \ @@ -92,7 +88,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Shared_Memory_Hash_Map.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Hash_Map Hash_Map_CPPFLAGS = \ diff --git a/ACE/examples/APG/Signals/.cvsignore b/ACE/examples/APG/Signals/.cvsignore new file mode 100644 index 00000000000..23774a5d6a0 --- /dev/null +++ b/ACE/examples/APG/Signals/.cvsignore @@ -0,0 +1,10 @@ +SigAction +SigAction +SigGuard +SigGuard +SigHandler +SigHandler +SigHandlers +SigHandlers +SigInfo +SigInfo diff --git a/ACE/examples/APG/Signals/Makefile.am b/ACE/examples/APG/Signals/Makefile.am index 6106f743c45..ffc67bdd0f0 100644 --- a/ACE/examples/APG/Signals/Makefile.am +++ b/ACE/examples/APG/Signals/Makefile.am @@ -6,13 +6,12 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) ## Makefile.SigAction.am - noinst_PROGRAMS = SigAction SigAction_CPPFLAGS = \ @@ -26,7 +25,6 @@ SigAction_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.SigGuard.am - noinst_PROGRAMS += SigGuard SigGuard_CPPFLAGS = \ @@ -40,7 +38,6 @@ SigGuard_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.SigHandler.am - noinst_PROGRAMS += SigHandler SigHandler_CPPFLAGS = \ @@ -54,7 +51,6 @@ SigHandler_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.SigHandlers.am - noinst_PROGRAMS += SigHandlers SigHandlers_CPPFLAGS = \ @@ -68,7 +64,6 @@ SigHandlers_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.SigInfo.am - noinst_PROGRAMS += SigInfo SigInfo_CPPFLAGS = \ diff --git a/ACE/examples/APG/Sockets/.cvsignore b/ACE/examples/APG/Sockets/.cvsignore new file mode 100644 index 00000000000..0b2c9d92db4 --- /dev/null +++ b/ACE/examples/APG/Sockets/.cvsignore @@ -0,0 +1,8 @@ +Basic +Basic +Basic_Robust +Basic_Robust +Iovec +Iovec +Server +Server diff --git a/ACE/examples/APG/Sockets/Makefile.am b/ACE/examples/APG/Sockets/Makefile.am index 99c4308137c..3409703f567 100644 --- a/ACE/examples/APG/Sockets/Makefile.am +++ b/ACE/examples/APG/Sockets/Makefile.am @@ -6,13 +6,12 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) ## Makefile.Sockets_Basic.am - noinst_PROGRAMS = Basic Basic_CPPFLAGS = \ @@ -26,7 +25,6 @@ Basic_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Sockets_Basic_Robust.am - noinst_PROGRAMS += Basic_Robust Basic_Robust_CPPFLAGS = \ @@ -40,7 +38,6 @@ Basic_Robust_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Sockets_Iovec.am - noinst_PROGRAMS += Iovec Iovec_CPPFLAGS = \ @@ -54,7 +51,6 @@ Iovec_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Sockets_Server.am - noinst_PROGRAMS += Server Server_CPPFLAGS = \ diff --git a/ACE/examples/APG/Streams/.cvsignore b/ACE/examples/APG/Streams/.cvsignore new file mode 100644 index 00000000000..ff318c0de98 --- /dev/null +++ b/ACE/examples/APG/Streams/.cvsignore @@ -0,0 +1,2 @@ +Answerer +Answerer diff --git a/ACE/examples/APG/Streams/Makefile.am b/ACE/examples/APG/Streams/Makefile.am index c8992474495..e23f2f22143 100644 --- a/ACE/examples/APG/Streams/Makefile.am +++ b/ACE/examples/APG/Streams/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -16,7 +16,6 @@ ACE_ROOT = $(top_srcdir) if BUILD_THREADS if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS = Answerer Answerer_CPPFLAGS = \ diff --git a/ACE/examples/APG/Svc_Config/.cvsignore b/ACE/examples/APG/Svc_Config/.cvsignore new file mode 100644 index 00000000000..c508d301216 --- /dev/null +++ b/ACE/examples/APG/Svc_Config/.cvsignore @@ -0,0 +1,4 @@ +HA_Configurable_Server_Dynamic +HA_Configurable_Server_Dynamic +HA_Configurable_Server_Static +HA_Configurable_Server_Static diff --git a/ACE/examples/APG/Svc_Config/Makefile.am b/ACE/examples/APG/Svc_Config/Makefile.am index 4cde367f194..9fa3e2f18b6 100644 --- a/ACE/examples/APG/Svc_Config/Makefile.am +++ b/ACE/examples/APG/Svc_Config/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -16,7 +16,6 @@ noinst_PROGRAMS = ## Makefile.HA_Configurable_Server_Dynamic.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += HA_Configurable_Server_Dynamic HA_Configurable_Server_Dynamic_CPPFLAGS = \ @@ -37,7 +36,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.HA_Configurable_Server_Static.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += HA_Configurable_Server_Static HA_Configurable_Server_Static_CPPFLAGS = \ diff --git a/ACE/examples/APG/ThreadManagement/.cvsignore b/ACE/examples/APG/ThreadManagement/.cvsignore new file mode 100644 index 00000000000..535a0039a50 --- /dev/null +++ b/ACE/examples/APG/ThreadManagement/.cvsignore @@ -0,0 +1,18 @@ +Async_Cancel +Async_Cancel +Coop_Cancel +Coop_Cancel +ExitHandler +ExitHandler +Pool +Pool +Priorities +Priorities +Signals +Signals +Signals2 +Signals2 +Start_Hook +Start_Hook +State +State diff --git a/ACE/examples/APG/ThreadManagement/Makefile.am b/ACE/examples/APG/ThreadManagement/Makefile.am index 6c555b3c86d..0ed91996db2 100644 --- a/ACE/examples/APG/ThreadManagement/Makefile.am +++ b/ACE/examples/APG/ThreadManagement/Makefile.am @@ -6,13 +6,12 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) ## Makefile.Async_Cancel.am - noinst_PROGRAMS = Async_Cancel Async_Cancel_CPPFLAGS = \ @@ -27,7 +26,6 @@ Async_Cancel_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Coop_Cancel.am - noinst_PROGRAMS += Coop_Cancel Coop_Cancel_CPPFLAGS = \ @@ -42,7 +40,6 @@ Coop_Cancel_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.ExitHandler.am - noinst_PROGRAMS += ExitHandler ExitHandler_CPPFLAGS = \ @@ -57,7 +54,6 @@ ExitHandler_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Pool.am - noinst_PROGRAMS += Pool Pool_CPPFLAGS = \ @@ -72,7 +68,6 @@ Pool_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Priorities.am - noinst_PROGRAMS += Priorities Priorities_CPPFLAGS = \ @@ -87,7 +82,6 @@ Priorities_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Signals.am - noinst_PROGRAMS += Signals Signals_CPPFLAGS = \ @@ -102,7 +96,6 @@ Signals_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Signals2.am - noinst_PROGRAMS += Signals2 Signals2_CPPFLAGS = \ @@ -117,7 +110,6 @@ Signals2_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Start_Hook.am - noinst_PROGRAMS += Start_Hook Start_Hook_CPPFLAGS = \ @@ -132,7 +124,6 @@ Start_Hook_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.State.am - noinst_PROGRAMS += State State_CPPFLAGS = \ diff --git a/ACE/examples/APG/ThreadPools/.cvsignore b/ACE/examples/APG/ThreadPools/.cvsignore new file mode 100644 index 00000000000..7052a85815f --- /dev/null +++ b/ACE/examples/APG/ThreadPools/.cvsignore @@ -0,0 +1,10 @@ +Futures +Futures +LF_ThreadPool +LF_ThreadPool +TP_Reactor +TP_Reactor +Task_ThreadPool +Task_ThreadPool +ThreadPool +ThreadPool diff --git a/ACE/examples/APG/ThreadPools/Makefile.am b/ACE/examples/APG/ThreadPools/Makefile.am index f9e97f36719..f1167e857c5 100644 --- a/ACE/examples/APG/ThreadPools/Makefile.am +++ b/ACE/examples/APG/ThreadPools/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -16,7 +16,6 @@ noinst_PROGRAMS = ## Makefile.Futures.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Futures Futures_CPPFLAGS = \ @@ -33,7 +32,6 @@ Futures_LDADD = \ endif !BUILD_ACE_FOR_TAO ## Makefile.LF_ThreadPool.am - noinst_PROGRAMS += LF_ThreadPool LF_ThreadPool_CPPFLAGS = \ @@ -48,7 +46,6 @@ LF_ThreadPool_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.TP_Reactor.am - noinst_PROGRAMS += TP_Reactor TP_Reactor_CPPFLAGS = \ @@ -63,7 +60,6 @@ TP_Reactor_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Task_ThreadPool.am - noinst_PROGRAMS += Task_ThreadPool Task_ThreadPool_CPPFLAGS = \ @@ -78,7 +74,6 @@ Task_ThreadPool_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.ThreadPool.am - noinst_PROGRAMS += ThreadPool ThreadPool_CPPFLAGS = \ diff --git a/ACE/examples/APG/ThreadSafety/.cvsignore b/ACE/examples/APG/ThreadSafety/.cvsignore new file mode 100644 index 00000000000..7fe1b99d03f --- /dev/null +++ b/ACE/examples/APG/ThreadSafety/.cvsignore @@ -0,0 +1,16 @@ +Atomic_Op +Atomic_Op +Barrier +Barrier +Mutex +Mutex +RW_Lock +RW_Lock +Semaphore +Semaphore +TSS +TSS +Tokens +Tokens +Tokens_Deadlock +Tokens_Deadlock diff --git a/ACE/examples/APG/ThreadSafety/Makefile.am b/ACE/examples/APG/ThreadSafety/Makefile.am index 35b216c41fc..e7c52980171 100644 --- a/ACE/examples/APG/ThreadSafety/Makefile.am +++ b/ACE/examples/APG/ThreadSafety/Makefile.am @@ -6,14 +6,13 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) ## Makefile.Atomic_Op.am - noinst_PROGRAMS = Atomic_Op Atomic_Op_CPPFLAGS = \ @@ -28,7 +27,6 @@ Atomic_Op_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Barrier.am - noinst_PROGRAMS += Barrier Barrier_CPPFLAGS = \ @@ -43,7 +41,6 @@ Barrier_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Mutex.am - noinst_PROGRAMS += Mutex Mutex_CPPFLAGS = \ @@ -60,7 +57,6 @@ Mutex_LDADD = \ ## Makefile.RW_Lock.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += RW_Lock RW_Lock_CPPFLAGS = \ @@ -79,7 +75,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Semaphore.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Semaphore Semaphore_CPPFLAGS = \ @@ -96,7 +91,6 @@ Semaphore_LDADD = \ endif !BUILD_ACE_FOR_TAO ## Makefile.TSS.am - noinst_PROGRAMS += TSS TSS_CPPFLAGS = \ @@ -111,7 +105,6 @@ TSS_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Tokens.am - noinst_PROGRAMS += Tokens Tokens_CPPFLAGS = \ @@ -126,7 +119,6 @@ Tokens_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Tokens_Deadlock.am - noinst_PROGRAMS += Tokens_Deadlock Tokens_Deadlock_CPPFLAGS = \ diff --git a/ACE/examples/APG/Threads/.cvsignore b/ACE/examples/APG/Threads/.cvsignore new file mode 100644 index 00000000000..feb9ec3ab97 --- /dev/null +++ b/ACE/examples/APG/Threads/.cvsignore @@ -0,0 +1,12 @@ +Activate +Activate +Condition_Variables +Condition_Variables +Guards +Guards +Message_Blocks +Message_Blocks +Message_Queue +Message_Queue +Mutexes +Mutexes diff --git a/ACE/examples/APG/Threads/Makefile.am b/ACE/examples/APG/Threads/Makefile.am index c580c298dbd..a5a1b77d76a 100644 --- a/ACE/examples/APG/Threads/Makefile.am +++ b/ACE/examples/APG/Threads/Makefile.am @@ -6,13 +6,12 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) ## Makefile.Activate.am - noinst_PROGRAMS = Activate Activate_CPPFLAGS = \ @@ -27,7 +26,6 @@ Activate_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Condition_Variables.am - noinst_PROGRAMS += Condition_Variables Condition_Variables_CPPFLAGS = \ @@ -42,7 +40,6 @@ Condition_Variables_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Guards.am - noinst_PROGRAMS += Guards Guards_CPPFLAGS = \ @@ -57,7 +54,6 @@ Guards_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Message_Blocks.am - noinst_PROGRAMS += Message_Blocks Message_Blocks_CPPFLAGS = \ @@ -72,7 +68,6 @@ Message_Blocks_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Message_Queue.am - noinst_PROGRAMS += Message_Queue Message_Queue_CPPFLAGS = \ @@ -87,7 +82,6 @@ Message_Queue_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Mutexes.am - noinst_PROGRAMS += Mutexes Mutexes_CPPFLAGS = \ diff --git a/ACE/examples/APG/Timers/.cvsignore b/ACE/examples/APG/Timers/.cvsignore new file mode 100644 index 00000000000..9137f2e897a --- /dev/null +++ b/ACE/examples/APG/Timers/.cvsignore @@ -0,0 +1,8 @@ +Alarm +Alarm +Task +Task +Timers +Timers +Upcall +Upcall diff --git a/ACE/examples/APG/Timers/Makefile.am b/ACE/examples/APG/Timers/Makefile.am index 9c09e5a22b8..33976800fec 100644 --- a/ACE/examples/APG/Timers/Makefile.am +++ b/ACE/examples/APG/Timers/Makefile.am @@ -6,13 +6,12 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) ## Makefile.Alarm.am - noinst_PROGRAMS = Alarm Alarm_CPPFLAGS = \ @@ -31,7 +30,6 @@ Alarm_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Task.am - noinst_PROGRAMS += Task Task_CPPFLAGS = \ @@ -50,7 +48,6 @@ Task_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Timers.am - noinst_PROGRAMS += Timers Timers_CPPFLAGS = \ @@ -68,7 +65,6 @@ Timers_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Upcall.am - noinst_PROGRAMS += Upcall Upcall_CPPFLAGS = \ diff --git a/ACE/examples/ASX/.cvsignore b/ACE/examples/ASX/.cvsignore new file mode 100644 index 00000000000..1eb7e8a0b93 --- /dev/null +++ b/ACE/examples/ASX/.cvsignore @@ -0,0 +1 @@ +Mess diff --git a/ACE/examples/ASX/CCM_App/.cvsignore b/ACE/examples/ASX/CCM_App/.cvsignore new file mode 100644 index 00000000000..955ffdc75d5 --- /dev/null +++ b/ACE/examples/ASX/CCM_App/.cvsignore @@ -0,0 +1,4 @@ +client +client +server +server diff --git a/ACE/examples/ASX/CCM_App/Makefile.am b/ACE/examples/ASX/CCM_App/Makefile.am index 78ded02a046..e4051c952ad 100644 --- a/ACE/examples/ASX/CCM_App/Makefile.am +++ b/ACE/examples/ASX/CCM_App/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -23,7 +23,6 @@ libccm_app_la_SOURCES = \ CCM_App.cpp ## Makefile.ASX_CCM_App_Server.am - noinst_PROGRAMS = server server_CPPFLAGS = \ @@ -37,7 +36,6 @@ server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.ASX_CCM_App_Client.am - noinst_PROGRAMS += client client_CPPFLAGS = \ diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Makefile.am b/ACE/examples/ASX/Event_Server/Event_Server/Makefile.am index aefe1873d9d..1664c15834f 100644 --- a/ACE/examples/ASX/Event_Server/Event_Server/Makefile.am +++ b/ACE/examples/ASX/Event_Server/Event_Server/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -15,7 +15,6 @@ ACE_ROOT = $(top_srcdir) ## Makefile.Event_Server.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS = Event_Server Event_Server_CPPFLAGS = \ diff --git a/ACE/examples/ASX/Event_Server/Makefile.am b/ACE/examples/ASX/Event_Server/Makefile.am index f00f4c3dd09..b337a11860a 100644 --- a/ACE/examples/ASX/Event_Server/Makefile.am +++ b/ACE/examples/ASX/Event_Server/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ Event_Server \ diff --git a/ACE/examples/ASX/Event_Server/Transceiver/Makefile.am b/ACE/examples/ASX/Event_Server/Transceiver/Makefile.am index f4ba3b5bf56..9407ab5873b 100644 --- a/ACE/examples/ASX/Event_Server/Transceiver/Makefile.am +++ b/ACE/examples/ASX/Event_Server/Transceiver/Makefile.am @@ -6,13 +6,12 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) ## Makefile.Transceiver.am - noinst_PROGRAMS = Transceiver Transceiver_CPPFLAGS = \ diff --git a/ACE/examples/ASX/Makefile.am b/ACE/examples/ASX/Makefile.am index 22df464dcfc..ecfcb575851 100644 --- a/ACE/examples/ASX/Makefile.am +++ b/ACE/examples/ASX/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ CCM_App \ diff --git a/ACE/examples/ASX/Message_Queue/.cvsignore b/ACE/examples/ASX/Message_Queue/.cvsignore new file mode 100644 index 00000000000..2b68761db9c --- /dev/null +++ b/ACE/examples/ASX/Message_Queue/.cvsignore @@ -0,0 +1,6 @@ +bounded_buffer +bounded_buffer +buffer_stream +buffer_stream +priority_buffer +priority_buffer diff --git a/ACE/examples/ASX/Message_Queue/Makefile.am b/ACE/examples/ASX/Message_Queue/Makefile.am index 3305b17bf1f..67e75b6c241 100644 --- a/ACE/examples/ASX/Message_Queue/Makefile.am +++ b/ACE/examples/ASX/Message_Queue/Makefile.am @@ -6,14 +6,13 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) ## Makefile.ASX_Message_Queue_Bounded_Buffer.am - noinst_PROGRAMS = bounded_buffer bounded_buffer_CPPFLAGS = \ @@ -29,7 +28,6 @@ bounded_buffer_LDADD = \ ## Makefile.ASX_Message_Queue_Buffer_Stream.am if !BUILD_USES_WCHAR - noinst_PROGRAMS += buffer_stream buffer_stream_CPPFLAGS = \ @@ -45,7 +43,6 @@ buffer_stream_LDADD = \ endif !BUILD_USES_WCHAR ## Makefile.ASX_Message_Queue_Priority_Buffer.am - noinst_PROGRAMS += priority_buffer priority_buffer_CPPFLAGS = \ diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Makefile.am b/ACE/examples/ASX/UPIPE_Event_Server/Makefile.am index f8ac89a7479..094c82c0f1b 100644 --- a/ACE/examples/ASX/UPIPE_Event_Server/Makefile.am +++ b/ACE/examples/ASX/UPIPE_Event_Server/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -15,7 +15,6 @@ ACE_ROOT = $(top_srcdir) ## Makefile.UPIPE_Event_Server.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS = UPIPE_Event_Server UPIPE_Event_Server_CPPFLAGS = \ diff --git a/ACE/examples/Bounded_Packet_Relay/.cvsignore b/ACE/examples/Bounded_Packet_Relay/.cvsignore new file mode 100644 index 00000000000..2f50e8efaee --- /dev/null +++ b/ACE/examples/Bounded_Packet_Relay/.cvsignore @@ -0,0 +1,2 @@ +bpr_thread +bpr_thread diff --git a/ACE/examples/Bounded_Packet_Relay/Makefile.am b/ACE/examples/Bounded_Packet_Relay/Makefile.am index 46e3ffc8ff4..5fb14ba2d05 100644 --- a/ACE/examples/Bounded_Packet_Relay/Makefile.am +++ b/ACE/examples/Bounded_Packet_Relay/Makefile.am @@ -6,13 +6,12 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) ## Makefile.Bounded_Packet_Relay.am - noinst_PROGRAMS = bpr_thread bpr_thread_CPPFLAGS = \ diff --git a/ACE/examples/C++NPv1/.cvsignore b/ACE/examples/C++NPv1/.cvsignore new file mode 100644 index 00000000000..7735c154a0c --- /dev/null +++ b/ACE/examples/C++NPv1/.cvsignore @@ -0,0 +1,14 @@ +RTTPC_logging_server +RTTPC_logging_server +iterative_logging_server +iterative_logging_server +logging_client +logging_client +ppc_logging_server +ppc_logging_server +reactive_logging_server +reactive_logging_server +reactive_logging_server_ex +reactive_logging_server_ex +tpc_logging_server +tpc_logging_server diff --git a/ACE/examples/C++NPv1/Makefile.am b/ACE/examples/C++NPv1/Makefile.am index 7a1b1afee8d..5c46ae7f00d 100644 --- a/ACE/examples/C++NPv1/Makefile.am +++ b/ACE/examples/C++NPv1/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -17,7 +17,6 @@ noinst_PROGRAMS = if !BUILD_ACE_FOR_TAO if !BUILD_USES_WCHAR - noinst_PROGRAMS += iterative_logging_server iterative_logging_server_CPPFLAGS = \ @@ -41,7 +40,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.C++NPv1_Logging_Client.am if !BUILD_USES_WCHAR - noinst_PROGRAMS += logging_client logging_client_CPPFLAGS = \ @@ -68,7 +66,6 @@ endif !BUILD_USES_WCHAR if !BUILD_ACE_FOR_TAO if !BUILD_USES_WCHAR - noinst_PROGRAMS += ppc_logging_server ppc_logging_server_CPPFLAGS = \ @@ -93,7 +90,6 @@ endif !BUILD_ACE_FOR_TAO if !BUILD_ACE_FOR_TAO if !BUILD_USES_WCHAR - noinst_PROGRAMS += RTTPC_logging_server RTTPC_logging_server_CPPFLAGS = \ @@ -118,7 +114,6 @@ endif !BUILD_ACE_FOR_TAO if !BUILD_ACE_FOR_TAO if !BUILD_USES_WCHAR - noinst_PROGRAMS += reactive_logging_server reactive_logging_server_CPPFLAGS = \ @@ -143,7 +138,6 @@ endif !BUILD_ACE_FOR_TAO if !BUILD_ACE_FOR_TAO if !BUILD_USES_WCHAR - noinst_PROGRAMS += reactive_logging_server_ex reactive_logging_server_ex_CPPFLAGS = \ @@ -168,7 +162,6 @@ endif !BUILD_ACE_FOR_TAO if !BUILD_ACE_FOR_TAO if !BUILD_USES_WCHAR - noinst_PROGRAMS += tpc_logging_server tpc_logging_server_CPPFLAGS = \ diff --git a/ACE/examples/C++NPv2/.cvsignore b/ACE/examples/C++NPv2/.cvsignore new file mode 100644 index 00000000000..560cd9f1c78 --- /dev/null +++ b/ACE/examples/C++NPv2/.cvsignore @@ -0,0 +1,14 @@ +configurable_logging_server +configurable_logging_server +display_logfile +display_logfile +reactor_logging_server +reactor_logging_server +select_reactor_loggin_server +select_reactor_loggin_server +sr_configurable_logging_server +sr_configurable_logging_server +tp_reactor_logging_server +tp_reactor_logging_server +x +x diff --git a/ACE/examples/C++NPv2/Makefile.am b/ACE/examples/C++NPv2/Makefile.am index f6c3d89bc4e..e15da126644 100644 --- a/ACE/examples/C++NPv2/Makefile.am +++ b/ACE/examples/C++NPv2/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -18,7 +18,7 @@ noinst_PROGRAMS = ## Makefile.C++NPv2_AC_CLD.am if BUILD_SSL -if BUILD_THREADS +if !BUILD_ACE_FOR_TAO if !BUILD_USES_WCHAR noinst_LTLIBRARIES += libAC_CLD.la @@ -43,12 +43,13 @@ noinst_HEADERS += \ Reactor_Logging_Server_T.cpp endif !BUILD_USES_WCHAR -endif BUILD_THREADS +endif !BUILD_ACE_FOR_TAO endif BUILD_SSL ## Makefile.C++NPv2_AIO_CLD.am if BUILD_SSL +if !BUILD_ACE_FOR_TAO noinst_LTLIBRARIES += libAIO_CLD.la @@ -69,6 +70,7 @@ noinst_HEADERS += \ AIO_Client_Logging_Daemon.h \ Reactor_Logging_Server_T.cpp +endif !BUILD_ACE_FOR_TAO endif BUILD_SSL ## Makefile.C++NPv2_CLD.am @@ -101,7 +103,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.C++NPv2_Configurable_Log_Server.am if !BUILD_USES_WCHAR - noinst_PROGRAMS += configurable_logging_server configurable_logging_server_CPPFLAGS = \ @@ -121,7 +122,6 @@ endif !BUILD_USES_WCHAR ## Makefile.C++NPv2_Display_Logfile.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += display_logfile display_logfile_CPPFLAGS = \ @@ -159,7 +159,6 @@ endif !BUILD_ACE_FOR_TAO if !BUILD_ACE_FOR_TAO if !BUILD_USES_WCHAR - noinst_PROGRAMS += reactor_logging_server reactor_logging_server_CPPFLAGS = \ @@ -243,7 +242,6 @@ endif !BUILD_USES_WCHAR endif !BUILD_ACE_FOR_TAO ## Makefile.C++NPv2_SR_Configurable_Log_Server.am - noinst_PROGRAMS += sr_configurable_logging_server sr_configurable_logging_server_CPPFLAGS = \ @@ -279,7 +277,6 @@ sr_configurable_logging_server_LDADD = \ if !BUILD_ACE_FOR_TAO if !BUILD_USES_WCHAR - noinst_PROGRAMS += select_reactor_logging_server select_reactor_logging_server_CPPFLAGS = \ @@ -306,6 +303,7 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.C++NPv2_TPCLS.am if BUILD_SSL +if !BUILD_ACE_FOR_TAO if !BUILD_USES_WCHAR noinst_LTLIBRARIES += libTPCLS.la @@ -330,6 +328,7 @@ noinst_HEADERS += \ TPC_Logging_Server.h endif !BUILD_USES_WCHAR +endif !BUILD_ACE_FOR_TAO endif BUILD_SSL ## Makefile.C++NPv2_TPLS.am @@ -364,7 +363,6 @@ endif !BUILD_ACE_FOR_TAO if !BUILD_ACE_FOR_TAO if !BUILD_USES_WCHAR - noinst_PROGRAMS += tp_reactor_logging_server tp_reactor_logging_server_CPPFLAGS = \ @@ -393,7 +391,6 @@ endif !BUILD_ACE_FOR_TAO if BUILD_WFMO if !BUILD_ACE_FOR_TAO if !BUILD_USES_WCHAR - noinst_PROGRAMS += wfmo_reactor_logging_server wfmo_reactor_logging_server_CPPFLAGS = \ diff --git a/ACE/examples/ConfigViewer/Makefile.am b/ACE/examples/ConfigViewer/Makefile.am deleted file mode 100644 index af88c534c34..00000000000 --- a/ACE/examples/ConfigViewer/Makefile.am +++ /dev/null @@ -1,54 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc - -ACE_BUILDDIR = $(top_builddir) -ACE_ROOT = $(top_srcdir) - - -## Makefile.ConfigViewer.am - -if BUILD_WXWINDOWS - -noinst_LTLIBRARIES = libConfigViewer.la - -libConfigViewer_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - $(ACE_WX_CPPFLAGS) - -libConfigViewer_la_SOURCES = \ - ConfigTreeCtrl.cpp \ - ConfigurationViewer.cpp \ - MainFrame.cpp \ - ValueDlg.cpp \ - ValueListCtrl.cpp - -libConfigViewer_la_LDFLAGS = \ - $(ACE_WX_LDFLAGS) - -noinst_HEADERS = \ - ConfigTreeCtrl.h \ - MainFrame.h \ - ValueDlg.h \ - ValueListCtrl.h - -endif BUILD_WXWINDOWS - -EXTRA_DIST = \ - ConfigurationViewer.rc - - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/ACE/examples/Connection/Makefile.am b/ACE/examples/Connection/Makefile.am index 36a9cc8383a..8aa21d598ff 100644 --- a/ACE/examples/Connection/Makefile.am +++ b/ACE/examples/Connection/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ blocking \ diff --git a/ACE/examples/Connection/blocking/.cvsignore b/ACE/examples/Connection/blocking/.cvsignore new file mode 100644 index 00000000000..07fde30990a --- /dev/null +++ b/ACE/examples/Connection/blocking/.cvsignore @@ -0,0 +1,4 @@ +acceptor +acceptor +connector +connector diff --git a/ACE/examples/Connection/blocking/Makefile.am b/ACE/examples/Connection/blocking/Makefile.am index 60957cddcb2..a12eab920b8 100644 --- a/ACE/examples/Connection/blocking/Makefile.am +++ b/ACE/examples/Connection/blocking/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -16,7 +16,6 @@ noinst_PROGRAMS = ## Makefile.Connection_Blocking_Acceptor.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += acceptor acceptor_CPPFLAGS = \ @@ -36,7 +35,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Connection_Blocking_Connector.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += connector connector_CPPFLAGS = \ diff --git a/ACE/examples/Connection/misc/.cvsignore b/ACE/examples/Connection/misc/.cvsignore new file mode 100644 index 00000000000..444ad7e1b3a --- /dev/null +++ b/ACE/examples/Connection/misc/.cvsignore @@ -0,0 +1,4 @@ +handler +handler +test_upipe +test_upipe diff --git a/ACE/examples/Connection/misc/Makefile.am b/ACE/examples/Connection/misc/Makefile.am index 58a17aad6c8..ce3790d2851 100644 --- a/ACE/examples/Connection/misc/Makefile.am +++ b/ACE/examples/Connection/misc/Makefile.am @@ -6,14 +6,13 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) ## Makefile.Connection_Misc_Handler.am - noinst_PROGRAMS = handler handler_CPPFLAGS = \ @@ -30,7 +29,6 @@ handler_LDADD = \ ## Makefile.Connection_Misc_Test_Upipe.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += test_upipe test_upipe_CPPFLAGS = \ diff --git a/ACE/examples/Connection/non_blocking/.cvsignore b/ACE/examples/Connection/non_blocking/.cvsignore new file mode 100644 index 00000000000..0cbd7c83956 --- /dev/null +++ b/ACE/examples/Connection/non_blocking/.cvsignore @@ -0,0 +1,16 @@ +lsock_client +lsock_client +lsock_server +lsock_server +sock_client +sock_client +sock_server +sock_server +spipe_client +spipe_client +spipe_server +spipe_server +tli_client +tli_client +tli_server +tli_server diff --git a/ACE/examples/Connection/non_blocking/Makefile.am b/ACE/examples/Connection/non_blocking/Makefile.am index 3f168c27031..8395e3a9fbb 100644 --- a/ACE/examples/Connection/non_blocking/Makefile.am +++ b/ACE/examples/Connection/non_blocking/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -16,7 +16,6 @@ noinst_PROGRAMS = ## Makefile.Connection_Non_Blocking_LSockClient.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += lsock_client lsock_client_CPPFLAGS = \ @@ -36,7 +35,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Connection_Non_Blocking_LSockServer.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += lsock_server lsock_server_CPPFLAGS = \ @@ -54,7 +52,6 @@ lsock_server_LDADD = \ endif !BUILD_ACE_FOR_TAO ## Makefile.Connection_Non_Blocking_SPipeClient.am - noinst_PROGRAMS += spipe_client spipe_client_CPPFLAGS = \ @@ -70,7 +67,6 @@ spipe_client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Connection_Non_Blocking_SPipeServer.am - noinst_PROGRAMS += spipe_server spipe_server_CPPFLAGS = \ @@ -86,7 +82,6 @@ spipe_server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Connection_Non_Blocking_SockClient.am - noinst_PROGRAMS += sock_client sock_client_CPPFLAGS = \ @@ -102,7 +97,6 @@ sock_client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Connection_Non_Blocking_SockServer.am - noinst_PROGRAMS += sock_server sock_server_CPPFLAGS = \ @@ -118,7 +112,6 @@ sock_server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Connection_Non_Blocking_TLIClient.am - noinst_PROGRAMS += tli_client tli_client_CPPFLAGS = \ @@ -134,7 +127,6 @@ tli_client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Connection_Non_Blocking_TLIServer.am - noinst_PROGRAMS += tli_server tli_server_CPPFLAGS = \ diff --git a/ACE/examples/DLL/.cvsignore b/ACE/examples/DLL/.cvsignore new file mode 100644 index 00000000000..c2d3a626997 --- /dev/null +++ b/ACE/examples/DLL/.cvsignore @@ -0,0 +1,2 @@ +test_dll +test_dll diff --git a/ACE/examples/DLL/Makefile.am b/ACE/examples/DLL/Makefile.am index 5e76d980938..4973af35bf9 100644 --- a/ACE/examples/DLL/Makefile.am +++ b/ACE/examples/DLL/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -40,7 +40,6 @@ noinst_HEADERS += \ Newsweek.h ## Makefile.DLL_Main.am - noinst_PROGRAMS = test_dll test_dll_CPPFLAGS = \ diff --git a/ACE/examples/Export/.cvsignore b/ACE/examples/Export/.cvsignore new file mode 100644 index 00000000000..dec2cbe1fa3 --- /dev/null +++ b/ACE/examples/Export/.cvsignore @@ -0,0 +1,2 @@ +test +test diff --git a/ACE/examples/Export/Makefile.am b/ACE/examples/Export/Makefile.am index 671f716aaae..74baf4baf66 100644 --- a/ACE/examples/Export/Makefile.am +++ b/ACE/examples/Export/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -27,7 +27,6 @@ noinst_HEADERS = \ dll.h ## Makefile.Export_Test.am - noinst_PROGRAMS = test test_CPPFLAGS = \ diff --git a/ACE/examples/IOStream/Makefile.am b/ACE/examples/IOStream/Makefile.am index 3ad9fe59404..0a99932ce34 100644 --- a/ACE/examples/IOStream/Makefile.am +++ b/ACE/examples/IOStream/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ client \ diff --git a/ACE/examples/IOStream/client/.cvsignore b/ACE/examples/IOStream/client/.cvsignore new file mode 100644 index 00000000000..957822b2487 --- /dev/null +++ b/ACE/examples/IOStream/client/.cvsignore @@ -0,0 +1 @@ +iostream_client diff --git a/ACE/examples/IOStream/client/Makefile.am b/ACE/examples/IOStream/client/Makefile.am index 28b28e0941c..e1225bbb6d5 100644 --- a/ACE/examples/IOStream/client/Makefile.am +++ b/ACE/examples/IOStream/client/Makefile.am @@ -6,25 +6,21 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) ## Makefile.IOStream_Client.am +noinst_LTLIBRARIES = libIOStream_Client.la -noinst_PROGRAMS = iostream_client - -iostream_client_CPPFLAGS = \ +libIOStream_Client_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) -iostream_client_SOURCES = \ +libIOStream_Client_la_SOURCES = \ iostream_client.cpp -iostream_client_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/ACE/examples/IOStream/server/.cvsignore b/ACE/examples/IOStream/server/.cvsignore new file mode 100644 index 00000000000..8cf9727e75f --- /dev/null +++ b/ACE/examples/IOStream/server/.cvsignore @@ -0,0 +1 @@ +iostream_server diff --git a/ACE/examples/IOStream/server/Makefile.am b/ACE/examples/IOStream/server/Makefile.am index f3d195a413b..8b72a1adb62 100644 --- a/ACE/examples/IOStream/server/Makefile.am +++ b/ACE/examples/IOStream/server/Makefile.am @@ -6,25 +6,23 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) ## Makefile.IOStream_Server.am +noinst_LTLIBRARIES = libIOStream_Server.la -noinst_PROGRAMS = iostream_server - -iostream_server_CPPFLAGS = \ +libIOStream_Server_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) -iostream_server_SOURCES = \ - iostream_server.cpp \ - iostream_server.h +libIOStream_Server_la_SOURCES = \ + iostream_server.cpp -iostream_server_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la +noinst_HEADERS = \ + iostream_server.h ## Clean up template repositories, etc. clean-local: diff --git a/ACE/examples/IPC_SAP/ATM_SAP/.cvsignore b/ACE/examples/IPC_SAP/ATM_SAP/.cvsignore new file mode 100644 index 00000000000..955ffdc75d5 --- /dev/null +++ b/ACE/examples/IPC_SAP/ATM_SAP/.cvsignore @@ -0,0 +1,4 @@ +client +client +server +server diff --git a/ACE/examples/IPC_SAP/ATM_SAP/Makefile.am b/ACE/examples/IPC_SAP/ATM_SAP/Makefile.am index 45504c71ea1..e3ee4011b05 100644 --- a/ACE/examples/IPC_SAP/ATM_SAP/Makefile.am +++ b/ACE/examples/IPC_SAP/ATM_SAP/Makefile.am @@ -6,13 +6,12 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) ## Makefile.atm_sap_client.am - noinst_PROGRAMS = client client_CPPFLAGS = \ @@ -26,7 +25,6 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.atm_sap_server.am - noinst_PROGRAMS += server server_CPPFLAGS = \ diff --git a/ACE/examples/IPC_SAP/DEV_SAP/Makefile.am b/ACE/examples/IPC_SAP/DEV_SAP/Makefile.am index ecc65507d22..bb95a489da6 100644 --- a/ACE/examples/IPC_SAP/DEV_SAP/Makefile.am +++ b/ACE/examples/IPC_SAP/DEV_SAP/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ reader \ diff --git a/ACE/examples/IPC_SAP/DEV_SAP/reader/.cvsignore b/ACE/examples/IPC_SAP/DEV_SAP/reader/.cvsignore new file mode 100644 index 00000000000..a8dd7d50c82 --- /dev/null +++ b/ACE/examples/IPC_SAP/DEV_SAP/reader/.cvsignore @@ -0,0 +1,2 @@ +reader +reader diff --git a/ACE/examples/IPC_SAP/DEV_SAP/reader/Makefile.am b/ACE/examples/IPC_SAP/DEV_SAP/reader/Makefile.am index ebd4eb798b8..bff70f43cd3 100644 --- a/ACE/examples/IPC_SAP/DEV_SAP/reader/Makefile.am +++ b/ACE/examples/IPC_SAP/DEV_SAP/reader/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -15,7 +15,6 @@ ACE_ROOT = $(top_srcdir) ## Makefile.dev_sap_reader.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS = reader reader_CPPFLAGS = \ diff --git a/ACE/examples/IPC_SAP/DEV_SAP/writer/.cvsignore b/ACE/examples/IPC_SAP/DEV_SAP/writer/.cvsignore new file mode 100644 index 00000000000..d66df395ab8 --- /dev/null +++ b/ACE/examples/IPC_SAP/DEV_SAP/writer/.cvsignore @@ -0,0 +1,2 @@ +writer +writer diff --git a/ACE/examples/IPC_SAP/DEV_SAP/writer/Makefile.am b/ACE/examples/IPC_SAP/DEV_SAP/writer/Makefile.am index b660839e482..613a8d08102 100644 --- a/ACE/examples/IPC_SAP/DEV_SAP/writer/Makefile.am +++ b/ACE/examples/IPC_SAP/DEV_SAP/writer/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -15,7 +15,6 @@ ACE_ROOT = $(top_srcdir) ## Makefile.dev_sap_writer.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS = writer writer_CPPFLAGS = \ diff --git a/ACE/examples/IPC_SAP/FIFO_SAP/.cvsignore b/ACE/examples/IPC_SAP/FIFO_SAP/.cvsignore new file mode 100644 index 00000000000..5d0734ead63 --- /dev/null +++ b/ACE/examples/IPC_SAP/FIFO_SAP/.cvsignore @@ -0,0 +1,10 @@ +FIFO-Msg-client +FIFO-Msg-client +FIFO-Msg-server +FIFO-Msg-server +FIFO-client +FIFO-client +FIFO-server +FIFO-server +FIFO-test +FIFO-test diff --git a/ACE/examples/IPC_SAP/FIFO_SAP/Makefile.am b/ACE/examples/IPC_SAP/FIFO_SAP/Makefile.am index b207926d2c8..9a9cba4b837 100644 --- a/ACE/examples/IPC_SAP/FIFO_SAP/Makefile.am +++ b/ACE/examples/IPC_SAP/FIFO_SAP/Makefile.am @@ -6,14 +6,13 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) ## Makefile.Fifo_Sap_Msg_Client.am - noinst_PROGRAMS = FIFO-Msg-client FIFO_Msg_client_CPPFLAGS = \ @@ -27,7 +26,6 @@ FIFO_Msg_client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Fifo_Sap_Msg_Server.am - noinst_PROGRAMS += FIFO-Msg-server FIFO_Msg_server_CPPFLAGS = \ @@ -43,7 +41,6 @@ FIFO_Msg_server_LDADD = \ ## Makefile.fifo_sap_client.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += FIFO-client FIFO_client_CPPFLAGS = \ @@ -61,7 +58,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.fifo_sap_server.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += FIFO-server FIFO_server_CPPFLAGS = \ @@ -79,7 +75,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.fifo_sap_test.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += FIFO-test FIFO_test_CPPFLAGS = \ diff --git a/ACE/examples/IPC_SAP/FILE_SAP/.cvsignore b/ACE/examples/IPC_SAP/FILE_SAP/.cvsignore new file mode 100644 index 00000000000..db648aa002d --- /dev/null +++ b/ACE/examples/IPC_SAP/FILE_SAP/.cvsignore @@ -0,0 +1,2 @@ +client +client diff --git a/ACE/examples/IPC_SAP/FILE_SAP/Makefile.am b/ACE/examples/IPC_SAP/FILE_SAP/Makefile.am index 64d2126adcf..e39aa964edf 100644 --- a/ACE/examples/IPC_SAP/FILE_SAP/Makefile.am +++ b/ACE/examples/IPC_SAP/FILE_SAP/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -15,7 +15,6 @@ ACE_ROOT = $(top_srcdir) ## Makefile.file_sap_client.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS = client client_CPPFLAGS = \ diff --git a/ACE/examples/IPC_SAP/Makefile.am b/ACE/examples/IPC_SAP/Makefile.am index 31c046f885a..87f2a00844b 100644 --- a/ACE/examples/IPC_SAP/Makefile.am +++ b/ACE/examples/IPC_SAP/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ ATM_SAP \ diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/.cvsignore b/ACE/examples/IPC_SAP/SOCK_SAP/.cvsignore new file mode 100644 index 00000000000..07a07ab2d27 --- /dev/null +++ b/ACE/examples/IPC_SAP/SOCK_SAP/.cvsignore @@ -0,0 +1,18 @@ +C-inclient +C-inclient +C-inserver +C-inserver +CPP-inclient +CPP-inclient +CPP-inserver +CPP-inserver +CPP-memclient +CPP-memclient +CPP-memserver +CPP-memserver +CPP-unclient +CPP-unclient +CPP-unserver +CPP-unserver +FD-unclient +FD-unclient diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/Makefile.am b/ACE/examples/IPC_SAP/SOCK_SAP/Makefile.am index 803dc5bbf7f..50260dc7343 100644 --- a/ACE/examples/IPC_SAP/SOCK_SAP/Makefile.am +++ b/ACE/examples/IPC_SAP/SOCK_SAP/Makefile.am @@ -6,14 +6,13 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) ## Makefile.Sock_Sap_CPP_Inclient.am - noinst_PROGRAMS = CPP-inclient CPP_inclient_CPPFLAGS = \ @@ -30,7 +29,6 @@ CPP_inclient_LDADD = \ ## Makefile.Sock_Sap_CPP_Inserver.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += CPP-inserver CPP_inserver_CPPFLAGS = \ @@ -50,7 +48,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Sock_Sap_CPP_Memclient.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += CPP-memclient CPP_memclient_CPPFLAGS = \ @@ -70,7 +67,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Sock_Sap_CPP_Memserver.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += CPP-memserver CPP_memserver_CPPFLAGS = \ @@ -90,7 +86,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Sock_Sap_CPP_Unclient.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += CPP-unclient CPP_unclient_CPPFLAGS = \ @@ -110,7 +105,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Sock_Sap_CPP_Unserver.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += CPP-unserver CPP_unserver_CPPFLAGS = \ @@ -128,7 +122,6 @@ CPP_unserver_LDADD = \ endif !BUILD_ACE_FOR_TAO ## Makefile.Sock_Sap_C_Inclient.am - noinst_PROGRAMS += C-inclient C_inclient_CPPFLAGS = \ @@ -144,7 +137,6 @@ C_inclient_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Sock_Sap_C_Inserver.am - noinst_PROGRAMS += C-inserver C_inserver_CPPFLAGS = \ @@ -162,7 +154,6 @@ C_inserver_LDADD = \ ## Makefile.Sock_Sap_FD_Unclient.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += FD-unclient FD_unclient_CPPFLAGS = \ diff --git a/ACE/examples/IPC_SAP/SPIPE_SAP/.cvsignore b/ACE/examples/IPC_SAP/SPIPE_SAP/.cvsignore new file mode 100644 index 00000000000..46bf34bbdfd --- /dev/null +++ b/ACE/examples/IPC_SAP/SPIPE_SAP/.cvsignore @@ -0,0 +1,16 @@ +NPClient +NPClient +NPServer +NPServer +client +client +consumer_msg +consumer_msg +consumer_read +consumer_read +producer_msg +producer_msg +producer_read +producer_read +server +server diff --git a/ACE/examples/IPC_SAP/SPIPE_SAP/Makefile.am b/ACE/examples/IPC_SAP/SPIPE_SAP/Makefile.am index 9979c8a5751..662c99fc452 100644 --- a/ACE/examples/IPC_SAP/SPIPE_SAP/Makefile.am +++ b/ACE/examples/IPC_SAP/SPIPE_SAP/Makefile.am @@ -6,13 +6,12 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) ## Makefile.SPIPE_SAP_Client.am - noinst_PROGRAMS = client client_CPPFLAGS = \ @@ -27,7 +26,6 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.SPIPE_SAP_Consumer_Msg.am - noinst_PROGRAMS += consumer_msg consumer_msg_CPPFLAGS = \ @@ -42,7 +40,6 @@ consumer_msg_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.SPIPE_SAP_Consumer_Read.am - noinst_PROGRAMS += consumer_read consumer_read_CPPFLAGS = \ @@ -57,7 +54,6 @@ consumer_read_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.SPIPE_SAP_NPClient.am - noinst_PROGRAMS += NPClient NPClient_CPPFLAGS = \ @@ -72,7 +68,6 @@ NPClient_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.SPIPE_SAP_NPServer.am - noinst_PROGRAMS += NPServer NPServer_CPPFLAGS = \ @@ -87,7 +82,6 @@ NPServer_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.SPIPE_SAP_Producer_Msg.am - noinst_PROGRAMS += producer_msg producer_msg_CPPFLAGS = \ @@ -102,7 +96,6 @@ producer_msg_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.SPIPE_SAP_Producer_Read.am - noinst_PROGRAMS += producer_read producer_read_CPPFLAGS = \ @@ -117,7 +110,6 @@ producer_read_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.SPIPE_SAP_Server.am - noinst_PROGRAMS += server server_CPPFLAGS = \ diff --git a/ACE/examples/IPC_SAP/SSL_SAP/Makefile.am b/ACE/examples/IPC_SAP/SSL_SAP/Makefile.am index 5a0e4bc3dfb..3df4d11db5b 100644 --- a/ACE/examples/IPC_SAP/SSL_SAP/Makefile.am +++ b/ACE/examples/IPC_SAP/SSL_SAP/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/examples/IPC_SAP/TLI_SAP/.cvsignore b/ACE/examples/IPC_SAP/TLI_SAP/.cvsignore new file mode 100644 index 00000000000..db59757e191 --- /dev/null +++ b/ACE/examples/IPC_SAP/TLI_SAP/.cvsignore @@ -0,0 +1,16 @@ +ATM-client +ATM-client +ATM-server +ATM-server +CPP-client +CPP-client +CPP-server +CPP-server +db-client +db-client +db-server +db-server +ftp-client +ftp-client +ftp-server +ftp-server diff --git a/ACE/examples/IPC_SAP/TLI_SAP/Makefile.am b/ACE/examples/IPC_SAP/TLI_SAP/Makefile.am index 3f9a09726d2..80b48222d22 100644 --- a/ACE/examples/IPC_SAP/TLI_SAP/Makefile.am +++ b/ACE/examples/IPC_SAP/TLI_SAP/Makefile.am @@ -6,13 +6,12 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) ## Makefile.TLI_SAP_ATM_Client.am - noinst_PROGRAMS = ATM-client ATM_client_CPPFLAGS = \ @@ -26,7 +25,6 @@ ATM_client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.TLI_SAP_ATM_Server.am - noinst_PROGRAMS += ATM-server ATM_server_CPPFLAGS = \ @@ -40,7 +38,6 @@ ATM_server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.TLI_SAP_CPP_Client.am - noinst_PROGRAMS += CPP-client CPP_client_CPPFLAGS = \ @@ -54,7 +51,6 @@ CPP_client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.TLI_SAP_CPP_Server.am - noinst_PROGRAMS += CPP-server CPP_server_CPPFLAGS = \ @@ -68,7 +64,6 @@ CPP_server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.TLI_SAP_Db_Client.am - noinst_PROGRAMS += db-client db_client_CPPFLAGS = \ @@ -82,7 +77,6 @@ db_client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.TLI_SAP_Db_Server.am - noinst_PROGRAMS += db-server db_server_CPPFLAGS = \ @@ -96,7 +90,6 @@ db_server_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.TLI_SAP_Ftp_Client.am - noinst_PROGRAMS += ftp-client ftp_client_CPPFLAGS = \ @@ -110,7 +103,6 @@ ftp_client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.TLI_SAP_Ftp_Server.am - noinst_PROGRAMS += ftp-server ftp_server_CPPFLAGS = \ diff --git a/ACE/examples/IPC_SAP/UPIPE_SAP/.cvsignore b/ACE/examples/IPC_SAP/UPIPE_SAP/.cvsignore new file mode 100644 index 00000000000..66a3e2ba941 --- /dev/null +++ b/ACE/examples/IPC_SAP/UPIPE_SAP/.cvsignore @@ -0,0 +1,6 @@ +ex1 +ex1 +ex2 +ex2 +ex3 +ex3 diff --git a/ACE/examples/IPC_SAP/UPIPE_SAP/Makefile.am b/ACE/examples/IPC_SAP/UPIPE_SAP/Makefile.am index 90563ab7883..60054e3c7c0 100644 --- a/ACE/examples/IPC_SAP/UPIPE_SAP/Makefile.am +++ b/ACE/examples/IPC_SAP/UPIPE_SAP/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -16,7 +16,6 @@ noinst_PROGRAMS = ## Makefile.UPIPE_SAP_Ex1.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += ex1 ex1_CPPFLAGS = \ @@ -34,7 +33,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.UPIPE_SAP_Ex2.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += ex2 ex2_CPPFLAGS = \ @@ -52,7 +50,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.UPIPE_SAP_Ex3.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += ex3 ex3_CPPFLAGS = \ diff --git a/ACE/examples/Log_Msg/.cvsignore b/ACE/examples/Log_Msg/.cvsignore new file mode 100644 index 00000000000..c4e57879139 --- /dev/null +++ b/ACE/examples/Log_Msg/.cvsignore @@ -0,0 +1,6 @@ +test_callback +test_callback +test_log_msg +test_log_msg +test_ostream +test_ostream diff --git a/ACE/examples/Log_Msg/Makefile.am b/ACE/examples/Log_Msg/Makefile.am index 9653b5933dc..c5d038d332d 100644 --- a/ACE/examples/Log_Msg/Makefile.am +++ b/ACE/examples/Log_Msg/Makefile.am @@ -6,13 +6,12 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) ## Makefile.Log_Msg_Test_Callback.am - noinst_PROGRAMS = test_callback test_callback_CPPFLAGS = \ @@ -26,7 +25,6 @@ test_callback_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Log_Msg_Test_Log_Msg.am - noinst_PROGRAMS += test_log_msg test_log_msg_CPPFLAGS = \ @@ -40,7 +38,6 @@ test_log_msg_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Log_Msg_Test_Ostream.am - noinst_PROGRAMS += test_ostream test_ostream_CPPFLAGS = \ diff --git a/ACE/examples/Logger/Acceptor-server/.cvsignore b/ACE/examples/Logger/Acceptor-server/.cvsignore new file mode 100644 index 00000000000..76c31d8c56f --- /dev/null +++ b/ACE/examples/Logger/Acceptor-server/.cvsignore @@ -0,0 +1,2 @@ +server_loggerd +server_loggerd diff --git a/ACE/examples/Logger/Acceptor-server/Makefile.am b/ACE/examples/Logger/Acceptor-server/Makefile.am index b970349c834..bf1824c86d3 100644 --- a/ACE/examples/Logger/Acceptor-server/Makefile.am +++ b/ACE/examples/Logger/Acceptor-server/Makefile.am @@ -6,13 +6,12 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) ## Makefile.Logger_Acceptor_Server.am - noinst_PROGRAMS = server_loggerd server_loggerd_CPPFLAGS = \ diff --git a/ACE/examples/Logger/Makefile.am b/ACE/examples/Logger/Makefile.am index 29e3225dcbe..3aa67282ba4 100644 --- a/ACE/examples/Logger/Makefile.am +++ b/ACE/examples/Logger/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ Acceptor-server \ diff --git a/ACE/examples/Logger/client/.cvsignore b/ACE/examples/Logger/client/.cvsignore new file mode 100644 index 00000000000..6c538132cc9 --- /dev/null +++ b/ACE/examples/Logger/client/.cvsignore @@ -0,0 +1,2 @@ +logging_app +logging_app diff --git a/ACE/examples/Logger/client/Makefile.am b/ACE/examples/Logger/client/Makefile.am index 008d881f350..d38d5699588 100644 --- a/ACE/examples/Logger/client/Makefile.am +++ b/ACE/examples/Logger/client/Makefile.am @@ -6,13 +6,12 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) ## Makefile.Logger_client.am - noinst_PROGRAMS = logging_app logging_app_CPPFLAGS = \ diff --git a/ACE/examples/Logger/simple-server/.cvsignore b/ACE/examples/Logger/simple-server/.cvsignore new file mode 100644 index 00000000000..76c31d8c56f --- /dev/null +++ b/ACE/examples/Logger/simple-server/.cvsignore @@ -0,0 +1,2 @@ +server_loggerd +server_loggerd diff --git a/ACE/examples/Logger/simple-server/Makefile.am b/ACE/examples/Logger/simple-server/Makefile.am index d9a43e17ee6..a018d587b98 100644 --- a/ACE/examples/Logger/simple-server/Makefile.am +++ b/ACE/examples/Logger/simple-server/Makefile.am @@ -6,13 +6,12 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) ## Makefile.Logger_Simple_Server.am - noinst_PROGRAMS = server_loggerd server_loggerd_CPPFLAGS = \ diff --git a/ACE/examples/Makefile.am b/ACE/examples/Makefile.am index 9582b2deca2..1e8ba6f626f 100644 --- a/ACE/examples/Makefile.am +++ b/ACE/examples/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ APG \ @@ -14,7 +14,6 @@ SUBDIRS = \ Bounded_Packet_Relay \ C++NPv1 \ C++NPv2 \ - ConfigViewer \ Connection \ DLL \ Export \ @@ -28,6 +27,7 @@ SUBDIRS = \ NT_Service \ Naming \ OS \ + QOS \ Reactor \ Registry \ Service_Configurator \ @@ -36,6 +36,7 @@ SUBDIRS = \ Smart_Pointers \ Synch \ System_V_IPC \ + TMCast \ Threads \ Timer_Queue \ Web_Crawler diff --git a/ACE/examples/Map_Manager/Makefile.am b/ACE/examples/Map_Manager/Makefile.am index b5fc458338f..d5f39e68514 100644 --- a/ACE/examples/Map_Manager/Makefile.am +++ b/ACE/examples/Map_Manager/Makefile.am @@ -6,13 +6,12 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) ## Makefile.Map_Manager.am - noinst_PROGRAMS = Map_Manager Map_Manager_CPPFLAGS = \ diff --git a/ACE/examples/Mem_Map/IO-tests/.cvsignore b/ACE/examples/Mem_Map/IO-tests/.cvsignore new file mode 100644 index 00000000000..80ea1892dab --- /dev/null +++ b/ACE/examples/Mem_Map/IO-tests/.cvsignore @@ -0,0 +1,2 @@ +test_io +test_io diff --git a/ACE/examples/Mem_Map/IO-tests/Makefile.am b/ACE/examples/Mem_Map/IO-tests/Makefile.am index 6466b5e8bb5..9a6e3638c29 100644 --- a/ACE/examples/Mem_Map/IO-tests/Makefile.am +++ b/ACE/examples/Mem_Map/IO-tests/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -15,7 +15,6 @@ ACE_ROOT = $(top_srcdir) ## Makefile.Mem_Map_IO_Tests.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS = test_io test_io_CPPFLAGS = \ diff --git a/ACE/examples/Mem_Map/Makefile.am b/ACE/examples/Mem_Map/Makefile.am index 4dec1a54c74..9d8830d2147 100644 --- a/ACE/examples/Mem_Map/Makefile.am +++ b/ACE/examples/Mem_Map/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ IO-tests \ diff --git a/ACE/examples/Mem_Map/file-reverse/.cvsignore b/ACE/examples/Mem_Map/file-reverse/.cvsignore new file mode 100644 index 00000000000..cf791234c5e --- /dev/null +++ b/ACE/examples/Mem_Map/file-reverse/.cvsignore @@ -0,0 +1 @@ +file-reverse diff --git a/ACE/examples/Mem_Map/file-reverse/Makefile.am b/ACE/examples/Mem_Map/file-reverse/Makefile.am index 16376720175..02a081a6c88 100644 --- a/ACE/examples/Mem_Map/file-reverse/Makefile.am +++ b/ACE/examples/Mem_Map/file-reverse/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -15,7 +15,6 @@ ACE_ROOT = $(top_srcdir) ## Makefile.Mem_Map_File_Reverse.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS = file-reverse file_reverse_CPPFLAGS = \ diff --git a/ACE/examples/Misc/.cvsignore b/ACE/examples/Misc/.cvsignore new file mode 100644 index 00000000000..a31a7786288 --- /dev/null +++ b/ACE/examples/Misc/.cvsignore @@ -0,0 +1,16 @@ +test_XtReactor1 +test_XtReactor2 +test_dump +test_dump +test_get_opt +test_get_opt +test_profile_timer +test_profile_timer +test_read_buffer +test_read_buffer +test_set +test_set +test_sstring +test_sstring +test_trace +test_trace diff --git a/ACE/examples/Misc/Makefile.am b/ACE/examples/Misc/Makefile.am index f1b726742c1..8bb0b8dc8d8 100644 --- a/ACE/examples/Misc/Makefile.am +++ b/ACE/examples/Misc/Makefile.am @@ -6,14 +6,13 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) ## Makefile.Misc_Test_Dump.am - noinst_PROGRAMS = test_dump test_dump_CPPFLAGS = \ @@ -28,7 +27,6 @@ test_dump_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Misc_Test_Get_Opt.am - noinst_PROGRAMS += test_get_opt test_get_opt_CPPFLAGS = \ @@ -45,7 +43,6 @@ test_get_opt_LDADD = \ ## Makefile.Misc_Test_Profile_Timer.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += test_profile_timer test_profile_timer_CPPFLAGS = \ @@ -62,7 +59,6 @@ test_profile_timer_LDADD = \ endif !BUILD_ACE_FOR_TAO ## Makefile.Misc_Test_Read_Buffer.am - noinst_PROGRAMS += test_read_buffer test_read_buffer_CPPFLAGS = \ @@ -77,7 +73,6 @@ test_read_buffer_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Misc_Test_Set.am - noinst_PROGRAMS += test_set test_set_CPPFLAGS = \ @@ -92,7 +87,6 @@ test_set_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Misc_Test_Sstring.am - noinst_PROGRAMS += test_sstring test_sstring_CPPFLAGS = \ @@ -106,23 +100,7 @@ test_sstring_SOURCES = \ test_sstring_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la -## Makefile.Misc_Test_Timestamp.am - -noinst_PROGRAMS += test_timestamp - -test_timestamp_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -test_timestamp_SOURCES = \ - test_timestamp.cpp \ - test_dump.h - -test_timestamp_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.Misc_Test_Trace.am - noinst_PROGRAMS += test_trace test_trace_CPPFLAGS = \ diff --git a/ACE/examples/Misc/test_XtReactor1.cpp b/ACE/examples/Misc/test_XtReactor1.cpp index 62137744cc3..f4bef54aeae 100644 --- a/ACE/examples/Misc/test_XtReactor1.cpp +++ b/ACE/examples/Misc/test_XtReactor1.cpp @@ -4,7 +4,7 @@ // <ecn@clark.net> XtReactor implementation. #include "ace/OS_main.h" -#include "ace/XtReactor/XtReactor.h" +#include "ace/XtReactor.h" #include "ace/Reactor.h" #include "ace/Message_Block.h" #include "ace/Log_Msg.h" diff --git a/ACE/examples/Misc/test_XtReactor2.cpp b/ACE/examples/Misc/test_XtReactor2.cpp index 32bf1c9aa6a..2e2f4be0ba2 100644 --- a/ACE/examples/Misc/test_XtReactor2.cpp +++ b/ACE/examples/Misc/test_XtReactor2.cpp @@ -4,7 +4,7 @@ // XtReactor implementation. #include "ace/OS_main.h" -#include "ace/XtReactor/XtReactor.h" +#include "ace/XtReactor.h" #include "ace/Reactor.h" #include "ace/Message_Block.h" #include "ace/Log_Msg.h" diff --git a/ACE/examples/NT_Service/Makefile.am b/ACE/examples/NT_Service/Makefile.am index c52c27430d7..fbc93c45f6d 100644 --- a/ACE/examples/NT_Service/Makefile.am +++ b/ACE/examples/NT_Service/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -17,7 +17,6 @@ ACE_ROOT = $(top_srcdir) if BUILD_WINREGISTRY if !BUILD_ACE_FOR_TAO if !BUILD_WINCE - noinst_PROGRAMS = main main_CPPFLAGS = \ diff --git a/ACE/examples/Naming/.cvsignore b/ACE/examples/Naming/.cvsignore new file mode 100644 index 00000000000..5e535209538 --- /dev/null +++ b/ACE/examples/Naming/.cvsignore @@ -0,0 +1,4 @@ +multiple_contexts +non_existent +open +writers diff --git a/ACE/examples/Naming/Makefile.am b/ACE/examples/Naming/Makefile.am index a98ffabba50..de8e2353f18 100644 --- a/ACE/examples/Naming/Makefile.am +++ b/ACE/examples/Naming/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -16,7 +16,6 @@ noinst_PROGRAMS = ## Makefile.Naming_Multiple_Contexts.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += multiple_contexts multiple_contexts_CPPFLAGS = \ @@ -34,7 +33,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Naming_Non_Existent.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += non_existent non_existent_CPPFLAGS = \ @@ -52,7 +50,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Naming_Open.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += open open_CPPFLAGS = \ @@ -70,7 +67,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Naming_Writers.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += writers writers_CPPFLAGS = \ diff --git a/ACE/examples/OS/Makefile.am b/ACE/examples/OS/Makefile.am index 7547a62a438..73458dccc45 100644 --- a/ACE/examples/OS/Makefile.am +++ b/ACE/examples/OS/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ Process diff --git a/ACE/examples/OS/Process/.cvsignore b/ACE/examples/OS/Process/.cvsignore new file mode 100644 index 00000000000..c52eac932e5 --- /dev/null +++ b/ACE/examples/OS/Process/.cvsignore @@ -0,0 +1,4 @@ +imore +imore +process +process diff --git a/ACE/examples/OS/Process/Makefile.am b/ACE/examples/OS/Process/Makefile.am index 70dec285bde..88eac9e35bd 100644 --- a/ACE/examples/OS/Process/Makefile.am +++ b/ACE/examples/OS/Process/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -16,7 +16,6 @@ noinst_PROGRAMS = ## Makefile.OS_Process_Imore.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += imore imore_CPPFLAGS = \ @@ -32,7 +31,6 @@ imore_LDADD = \ endif !BUILD_ACE_FOR_TAO ## Makefile.OS_Process_Process.am - noinst_PROGRAMS += process process_CPPFLAGS = \ diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/Makefile.am b/ACE/examples/QOS/Change_Receiver_FlowSpec/Makefile.am index 18d655299e0..c4d51897787 100644 --- a/ACE/examples/QOS/Change_Receiver_FlowSpec/Makefile.am +++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/Makefile.am @@ -35,8 +35,8 @@ receiver_SOURCES = \ Receiver_QoS_Event_Handler.h receiver_LDADD = \ - $(ACE_BUILDDIR)/ace/QoS/$(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \ - $(ACE_BUILDDIR)/ace/$(ACE_BUILDDIR)/ace/libACE.la + $(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \ + $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_QOS @@ -62,8 +62,8 @@ sender_SOURCES = \ Sender_QoS_Event_Handler.h sender_LDADD = \ - $(ACE_BUILDDIR)/ace/QoS/$(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \ - $(ACE_BUILDDIR)/ace/$(ACE_BUILDDIR)/ace/libACE.la + $(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \ + $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_QOS diff --git a/ACE/examples/QOS/Change_Sender_TSpec/Makefile.am b/ACE/examples/QOS/Change_Sender_TSpec/Makefile.am index 2968f73620a..980d5cf3422 100644 --- a/ACE/examples/QOS/Change_Sender_TSpec/Makefile.am +++ b/ACE/examples/QOS/Change_Sender_TSpec/Makefile.am @@ -35,8 +35,8 @@ receiver_SOURCES = \ Receiver_QoS_Event_Handler.h receiver_LDADD = \ - $(ACE_BUILDDIR)/ace/QoS/$(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \ - $(ACE_BUILDDIR)/ace/$(ACE_BUILDDIR)/ace/libACE.la + $(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \ + $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_QOS @@ -62,8 +62,8 @@ sender_SOURCES = \ Sender_QoS_Event_Handler.h sender_LDADD = \ - $(ACE_BUILDDIR)/ace/QoS/$(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \ - $(ACE_BUILDDIR)/ace/$(ACE_BUILDDIR)/ace/libACE.la + $(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \ + $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_QOS diff --git a/ACE/examples/QOS/Diffserv/Makefile.am b/ACE/examples/QOS/Diffserv/Makefile.am index ae36afe7032..e94221278a2 100644 --- a/ACE/examples/QOS/Diffserv/Makefile.am +++ b/ACE/examples/QOS/Diffserv/Makefile.am @@ -28,8 +28,8 @@ client_SOURCES = \ diffserv_test.cpp client_LDADD = \ - $(ACE_BUILDDIR)/ace/QoS/$(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \ - $(ACE_BUILDDIR)/ace/$(ACE_BUILDDIR)/ace/libACE.la + $(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \ + $(ACE_BUILDDIR)/ace/libACE.la endif !BUILD_ACE_FOR_TAO endif BUILD_QOS @@ -48,8 +48,8 @@ server_SOURCES = \ server.cpp server_LDADD = \ - $(ACE_BUILDDIR)/ace/QoS/$(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \ - $(ACE_BUILDDIR)/ace/$(ACE_BUILDDIR)/ace/libACE.la + $(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \ + $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_QOS diff --git a/ACE/examples/QOS/Simple/Makefile.am b/ACE/examples/QOS/Simple/Makefile.am index 2bda6a145a3..d86d7cd43eb 100644 --- a/ACE/examples/QOS/Simple/Makefile.am +++ b/ACE/examples/QOS/Simple/Makefile.am @@ -35,8 +35,8 @@ receiver_SOURCES = \ Receiver_QoS_Event_Handler.h receiver_LDADD = \ - $(ACE_BUILDDIR)/ace/QoS/$(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \ - $(ACE_BUILDDIR)/ace/$(ACE_BUILDDIR)/ace/libACE.la + $(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \ + $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_QOS @@ -62,8 +62,8 @@ sender_SOURCES = \ Sender_QoS_Event_Handler.h sender_LDADD = \ - $(ACE_BUILDDIR)/ace/QoS/$(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \ - $(ACE_BUILDDIR)/ace/$(ACE_BUILDDIR)/ace/libACE.la + $(ACE_BUILDDIR)/ace/QoS/libACE_QoS.la \ + $(ACE_BUILDDIR)/ace/libACE.la endif BUILD_QOS diff --git a/ACE/examples/Reactor/Dgram/.cvsignore b/ACE/examples/Reactor/Dgram/.cvsignore new file mode 100644 index 00000000000..94126b14c4e --- /dev/null +++ b/ACE/examples/Reactor/Dgram/.cvsignore @@ -0,0 +1,4 @@ +codgram +codgram +dgram +dgram diff --git a/ACE/examples/Reactor/Dgram/Makefile.am b/ACE/examples/Reactor/Dgram/Makefile.am index eb7ba9825aa..797f4b3d75e 100644 --- a/ACE/examples/Reactor/Dgram/Makefile.am +++ b/ACE/examples/Reactor/Dgram/Makefile.am @@ -6,14 +6,13 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) ## Makefile.Reactor_Dgram.am - noinst_PROGRAMS = dgram dgram_CPPFLAGS = \ @@ -29,7 +28,6 @@ dgram_LDADD = \ ## Makefile.Reactor_Dgram_CO.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += codgram codgram_CPPFLAGS = \ diff --git a/ACE/examples/Reactor/FIFO/.cvsignore b/ACE/examples/Reactor/FIFO/.cvsignore new file mode 100644 index 00000000000..955ffdc75d5 --- /dev/null +++ b/ACE/examples/Reactor/FIFO/.cvsignore @@ -0,0 +1,4 @@ +client +client +server +server diff --git a/ACE/examples/Reactor/FIFO/Makefile.am b/ACE/examples/Reactor/FIFO/Makefile.am index 07f8503af79..5540e860968 100644 --- a/ACE/examples/Reactor/FIFO/Makefile.am +++ b/ACE/examples/Reactor/FIFO/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -16,7 +16,6 @@ noinst_PROGRAMS = ## Makefile.Reactor_FIFO_Client.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += client client_CPPFLAGS = \ @@ -34,7 +33,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Reactor_FIFO_Server.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += server server_CPPFLAGS = \ diff --git a/ACE/examples/Reactor/Makefile.am b/ACE/examples/Reactor/Makefile.am index aced36e2c87..24d9217302d 100644 --- a/ACE/examples/Reactor/Makefile.am +++ b/ACE/examples/Reactor/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ Dgram \ diff --git a/ACE/examples/Reactor/Misc/.cvsignore b/ACE/examples/Reactor/Misc/.cvsignore new file mode 100644 index 00000000000..f7cc1865efa --- /dev/null +++ b/ACE/examples/Reactor/Misc/.cvsignore @@ -0,0 +1,16 @@ +demuxing +demuxing +early_timeouts +early_timeouts +notification +notification +pingpong +pingpong +reactors +reactors +signals_1 +signals_1 +signals_2 +signals_2 +timer_queue +timer_queue diff --git a/ACE/examples/Reactor/Misc/Makefile.am b/ACE/examples/Reactor/Misc/Makefile.am index 94afaf14865..47111585f87 100644 --- a/ACE/examples/Reactor/Misc/Makefile.am +++ b/ACE/examples/Reactor/Misc/Makefile.am @@ -6,13 +6,12 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) ## Makefile.Reactor_Misc_Demuxing.am - noinst_PROGRAMS = demuxing demuxing_CPPFLAGS = \ @@ -26,7 +25,6 @@ demuxing_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Reactor_Misc_Early_Timeouts.am - noinst_PROGRAMS += early_timeouts early_timeouts_CPPFLAGS = \ @@ -40,7 +38,6 @@ early_timeouts_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Reactor_Misc_Event_Handler_t.am - noinst_PROGRAMS += event_handler_t event_handler_t_CPPFLAGS = \ @@ -54,7 +51,6 @@ event_handler_t_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Reactor_Misc_Notification.am - noinst_PROGRAMS += notification notification_CPPFLAGS = \ @@ -68,7 +64,6 @@ notification_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Reactor_Misc_Pingpong.am - noinst_PROGRAMS += pingpong pingpong_CPPFLAGS = \ @@ -82,7 +77,6 @@ pingpong_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Reactor_Misc_Reactors.am - noinst_PROGRAMS += reactors reactors_CPPFLAGS = \ @@ -96,7 +90,6 @@ reactors_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Reactor_Misc_Signals_1.am - noinst_PROGRAMS += signals_1 signals_1_CPPFLAGS = \ @@ -110,7 +103,6 @@ signals_1_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Reactor_Misc_Signals_2.am - noinst_PROGRAMS += signals_2 signals_2_CPPFLAGS = \ @@ -124,7 +116,6 @@ signals_2_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Reactor_Misc_Timer_Queue.am - noinst_PROGRAMS += timer_queue timer_queue_CPPFLAGS = \ diff --git a/ACE/examples/Reactor/Multicast/.cvsignore b/ACE/examples/Reactor/Multicast/.cvsignore new file mode 100644 index 00000000000..955ffdc75d5 --- /dev/null +++ b/ACE/examples/Reactor/Multicast/.cvsignore @@ -0,0 +1,4 @@ +client +client +server +server diff --git a/ACE/examples/Reactor/Multicast/Makefile.am b/ACE/examples/Reactor/Multicast/Makefile.am index 0c533d3670e..60d65e7ebe8 100644 --- a/ACE/examples/Reactor/Multicast/Makefile.am +++ b/ACE/examples/Reactor/Multicast/Makefile.am @@ -6,13 +6,12 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) ## Makefile.Reactor_Multicast_Client.am - noinst_PROGRAMS = client client_CPPFLAGS = \ @@ -28,7 +27,6 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Reactor_Multicast_Server.am - noinst_PROGRAMS += server server_CPPFLAGS = \ diff --git a/ACE/examples/Reactor/Ntalker/.cvsignore b/ACE/examples/Reactor/Ntalker/.cvsignore new file mode 100644 index 00000000000..a9350d173bf --- /dev/null +++ b/ACE/examples/Reactor/Ntalker/.cvsignore @@ -0,0 +1,2 @@ +ntalker +ntalker diff --git a/ACE/examples/Reactor/Ntalker/Makefile.am b/ACE/examples/Reactor/Ntalker/Makefile.am index 8226305413b..6efc3521a32 100644 --- a/ACE/examples/Reactor/Ntalker/Makefile.am +++ b/ACE/examples/Reactor/Ntalker/Makefile.am @@ -6,13 +6,12 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) ## Makefile.Reactor_Ntalker.am - noinst_PROGRAMS = ntalker ntalker_CPPFLAGS = \ diff --git a/ACE/examples/Reactor/Proactor/.cvsignore b/ACE/examples/Reactor/Proactor/.cvsignore new file mode 100644 index 00000000000..34179361b75 --- /dev/null +++ b/ACE/examples/Reactor/Proactor/.cvsignore @@ -0,0 +1,7 @@ +test_cancel +test_end_event_loop +test_multiple_loops +test_post_completions +test_proactor +test_timeout +test_udp_proactor diff --git a/ACE/examples/Reactor/Proactor/Makefile.am b/ACE/examples/Reactor/Proactor/Makefile.am index a77fead97ec..7f1bc4b8a57 100644 --- a/ACE/examples/Reactor/Proactor/Makefile.am +++ b/ACE/examples/Reactor/Proactor/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -16,7 +16,6 @@ noinst_PROGRAMS = ## Makefile.Proactor_Cancel.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += test_cancel test_cancel_CPPFLAGS = \ @@ -35,7 +34,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Proactor_End_Event_Loops.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += test_end_event_loop test_end_event_loop_CPPFLAGS = \ @@ -55,7 +53,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Proactor_Multiple_Loops.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += test_multiple_loops test_multiple_loops_CPPFLAGS = \ @@ -75,7 +72,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Proactor_Post_Completions.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += test_post_completions test_post_completions_CPPFLAGS = \ @@ -95,7 +91,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Proactor_Proactor.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += test_proactor test_proactor_CPPFLAGS = \ @@ -114,7 +109,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Proactor_Timeout.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += test_timeout test_timeout_CPPFLAGS = \ @@ -134,7 +128,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Proactor_Udp_Proactor.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += test_udp_proactor test_udp_proactor_CPPFLAGS = \ diff --git a/ACE/examples/Reactor/TP_Reactor/Makefile.am b/ACE/examples/Reactor/TP_Reactor/Makefile.am index 17eda0d0046..5407cbb10e1 100644 --- a/ACE/examples/Reactor/TP_Reactor/Makefile.am +++ b/ACE/examples/Reactor/TP_Reactor/Makefile.am @@ -6,13 +6,12 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) ## Makefile.TP_Reactor_Client.am - noinst_PROGRAMS = client client_CPPFLAGS = \ @@ -29,7 +28,6 @@ client_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.TP_Reactor_Server.am - noinst_PROGRAMS += server server_CPPFLAGS = \ diff --git a/ACE/examples/Reactor/WFMO_Reactor/Makefile.am b/ACE/examples/Reactor/WFMO_Reactor/Makefile.am index c844b6654bd..cfa1c687b6c 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Makefile.am +++ b/ACE/examples/Reactor/WFMO_Reactor/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -17,7 +17,6 @@ noinst_PROGRAMS = if BUILD_WFMO if !BUILD_WINCE - noinst_PROGRAMS += apc apc_CPPFLAGS = \ @@ -36,7 +35,6 @@ endif BUILD_WFMO ## Makefile.WFMO_Reactor_Abandoned.am if BUILD_WFMO - noinst_PROGRAMS += abandoned abandoned_CPPFLAGS = \ @@ -54,7 +52,6 @@ endif BUILD_WFMO ## Makefile.WFMO_Reactor_Console_Input.am if BUILD_WFMO - noinst_PROGRAMS += console_input console_input_CPPFLAGS = \ @@ -72,7 +69,6 @@ endif BUILD_WFMO ## Makefile.WFMO_Reactor_Directory_Changes.am if BUILD_WFMO - noinst_PROGRAMS += directory_changes directory_changes_CPPFLAGS = \ @@ -90,7 +86,6 @@ endif BUILD_WFMO ## Makefile.WFMO_Reactor_Exceptions.am if BUILD_WFMO - noinst_PROGRAMS += exceptions exceptions_CPPFLAGS = \ @@ -108,7 +103,6 @@ endif BUILD_WFMO ## Makefile.WFMO_Reactor_Handle_Close.am if BUILD_WFMO - noinst_PROGRAMS += handle_close handle_close_CPPFLAGS = \ @@ -126,7 +120,6 @@ endif BUILD_WFMO ## Makefile.WFMO_Reactor_Multithreading.am if BUILD_WFMO - noinst_PROGRAMS += multithreading multithreading_CPPFLAGS = \ @@ -144,7 +137,6 @@ endif BUILD_WFMO ## Makefile.WFMO_Reactor_Network_Events.am if BUILD_WFMO - noinst_PROGRAMS += network_events network_events_CPPFLAGS = \ @@ -162,7 +154,6 @@ endif BUILD_WFMO ## Makefile.WFMO_Reactor_Prerun_State_Changes.am if BUILD_WFMO - noinst_PROGRAMS += prerun_state_changes prerun_state_changes_CPPFLAGS = \ @@ -180,7 +171,6 @@ endif BUILD_WFMO ## Makefile.WFMO_Reactor_Registration.am if BUILD_WFMO - noinst_PROGRAMS += registration registration_CPPFLAGS = \ @@ -200,7 +190,6 @@ endif BUILD_WFMO if BUILD_WFMO if !BUILD_ACE_FOR_TAO if !BUILD_WINCE - noinst_PROGRAMS += registry_changes registry_changes_CPPFLAGS = \ @@ -220,7 +209,6 @@ endif BUILD_WFMO ## Makefile.WFMO_Reactor_Removals.am if BUILD_WFMO - noinst_PROGRAMS += removals removals_CPPFLAGS = \ @@ -238,7 +226,6 @@ endif BUILD_WFMO ## Makefile.WFMO_Reactor_Suspended_Removals.am if BUILD_WFMO - noinst_PROGRAMS += suspended_removals suspended_removals_CPPFLAGS = \ @@ -258,7 +245,6 @@ endif BUILD_WFMO if BUILD_WFMO if !BUILD_ACE_FOR_TAO if !BUILD_WINCE - noinst_PROGRAMS += talker talker_CPPFLAGS = \ @@ -278,7 +264,6 @@ endif BUILD_WFMO ## Makefile.WFMO_Reactor_Timeouts.am if BUILD_WFMO - noinst_PROGRAMS += timeouts timeouts_CPPFLAGS = \ @@ -298,7 +283,6 @@ endif BUILD_WFMO if BUILD_WFMO if !BUILD_ACE_FOR_TAO if !BUILD_WINCE - noinst_PROGRAMS += window_messages window_messages_CPPFLAGS = \ diff --git a/ACE/examples/Registry/Makefile.am b/ACE/examples/Registry/Makefile.am index 5118f95341c..1e02e33abb2 100644 --- a/ACE/examples/Registry/Makefile.am +++ b/ACE/examples/Registry/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -17,7 +17,6 @@ noinst_PROGRAMS = if BUILD_WINREGISTRY if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += iterator iterator_CPPFLAGS = \ @@ -37,7 +36,6 @@ endif BUILD_WINREGISTRY if BUILD_WINREGISTRY if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += update update_CPPFLAGS = \ diff --git a/ACE/examples/Service_Configurator/IPC-tests/Makefile.am b/ACE/examples/Service_Configurator/IPC-tests/Makefile.am index 3ad9fe59404..0a99932ce34 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/Makefile.am +++ b/ACE/examples/Service_Configurator/IPC-tests/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ client \ diff --git a/ACE/examples/Service_Configurator/IPC-tests/client/.cvsignore b/ACE/examples/Service_Configurator/IPC-tests/client/.cvsignore new file mode 100644 index 00000000000..121d4de020f --- /dev/null +++ b/ACE/examples/Service_Configurator/IPC-tests/client/.cvsignore @@ -0,0 +1,10 @@ +local_dgram_test +local_fifo_test +local_pipe_test +local_spipe_test +local_stream_test +remote_broadcast_test +remote_dgram_test +remote_service_directory_test +remote_stream_test +remote_thr_stream_test diff --git a/ACE/examples/Service_Configurator/IPC-tests/client/Makefile.am b/ACE/examples/Service_Configurator/IPC-tests/client/Makefile.am index be9dce0feff..b6dd5a3d7b8 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/client/Makefile.am +++ b/ACE/examples/Service_Configurator/IPC-tests/client/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -16,7 +16,6 @@ noinst_PROGRAMS = ## Makefile.Svc_Cfg_IPC_Client_Bcast.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += remote_broadcast_test remote_broadcast_test_CPPFLAGS = \ @@ -34,7 +33,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Svc_Cfg_IPC_Client_Loc_Dgram.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += local_dgram_test local_dgram_test_CPPFLAGS = \ @@ -52,7 +50,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Svc_Cfg_IPC_Client_Loc_Fifo.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += local_fifo_test local_fifo_test_CPPFLAGS = \ @@ -70,7 +67,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Svc_Cfg_IPC_Client_Loc_Pipe.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += local_pipe_test local_pipe_test_CPPFLAGS = \ @@ -86,7 +82,6 @@ local_pipe_test_LDADD = \ endif !BUILD_ACE_FOR_TAO ## Makefile.Svc_Cfg_IPC_Client_Loc_Spipe.am - noinst_PROGRAMS += local_spipe_test local_spipe_test_CPPFLAGS = \ @@ -102,7 +97,6 @@ local_spipe_test_LDADD = \ ## Makefile.Svc_Cfg_IPC_Client_Loc_Stream.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += local_stream_test local_stream_test_CPPFLAGS = \ @@ -120,7 +114,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Svc_Cfg_IPC_Client_Rem_Dgram.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += remote_dgram_test remote_dgram_test_CPPFLAGS = \ @@ -138,7 +131,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Svc_Cfg_IPC_Client_Rem_Stream.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += remote_stream_test remote_stream_test_CPPFLAGS = \ @@ -154,7 +146,6 @@ remote_stream_test_LDADD = \ endif !BUILD_ACE_FOR_TAO ## Makefile.Svc_Cfg_IPC_Client_Rem_Svc_Dir.am - noinst_PROGRAMS += remote_service_directory_test remote_service_directory_test_CPPFLAGS = \ @@ -168,7 +159,6 @@ remote_service_directory_test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Svc_Cfg_IPC_Client_Rem_Thr_Stream.am - noinst_PROGRAMS += remote_thr_stream_test remote_thr_stream_test_CPPFLAGS = \ diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/.cvsignore b/ACE/examples/Service_Configurator/IPC-tests/server/.cvsignore new file mode 100644 index 00000000000..74fdfbc7f93 --- /dev/null +++ b/ACE/examples/Service_Configurator/IPC-tests/server/.cvsignore @@ -0,0 +1 @@ +server_test diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Makefile.am b/ACE/examples/Service_Configurator/IPC-tests/server/Makefile.am index fbc788f8cd3..954697dfba3 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Makefile.am +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -61,7 +61,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Svc_Cfg_IPC_Server_Test.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS = server_test server_test_CPPFLAGS = \ diff --git a/ACE/examples/Service_Configurator/Makefile.am b/ACE/examples/Service_Configurator/Makefile.am index 8a3ecc74489..1b78bb27757 100644 --- a/ACE/examples/Service_Configurator/Makefile.am +++ b/ACE/examples/Service_Configurator/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ IPC-tests \ diff --git a/ACE/examples/Service_Configurator/Misc/.cvsignore b/ACE/examples/Service_Configurator/Misc/.cvsignore new file mode 100644 index 00000000000..ba2906d0666 --- /dev/null +++ b/ACE/examples/Service_Configurator/Misc/.cvsignore @@ -0,0 +1 @@ +main diff --git a/ACE/examples/Service_Configurator/Misc/Makefile.am b/ACE/examples/Service_Configurator/Misc/Makefile.am index 8006a87957e..f0de4232add 100644 --- a/ACE/examples/Service_Configurator/Misc/Makefile.am +++ b/ACE/examples/Service_Configurator/Misc/Makefile.am @@ -6,28 +6,27 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) ## Makefile.Service_Configurator_Misc_Timer.am -noinst_LTLIBRARIES = libTimer.la +noinst_LTLIBRARIES = libtimer.la -libTimer_la_CPPFLAGS = \ +libtimer_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -DACE_BUILD_SVC_DLL -libTimer_la_SOURCES = \ +libtimer_la_SOURCES = \ Timer_Service.cpp noinst_HEADERS = \ Timer_Service.h ## Makefile.Service_Configurator_Misc_Main.am - noinst_PROGRAMS = main main_CPPFLAGS = \ @@ -39,7 +38,7 @@ main_SOURCES = \ Timer_Service.h main_LDADD = \ - libTimer.la \ + libtimer.la \ $(ACE_BUILDDIR)/ace/libACE.la ## Clean up template repositories, etc. diff --git a/ACE/examples/Shared_Malloc/.cvsignore b/ACE/examples/Shared_Malloc/.cvsignore new file mode 100644 index 00000000000..c5ad2e56e0e --- /dev/null +++ b/ACE/examples/Shared_Malloc/.cvsignore @@ -0,0 +1,4 @@ +malloc +multiple +persistence +posind diff --git a/ACE/examples/Shared_Malloc/Makefile.am b/ACE/examples/Shared_Malloc/Makefile.am index e1f9f4a5ade..baccb0359e0 100644 --- a/ACE/examples/Shared_Malloc/Makefile.am +++ b/ACE/examples/Shared_Malloc/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -16,7 +16,6 @@ noinst_PROGRAMS = ## Makefile.Shared_Malloc.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += malloc malloc_CPPFLAGS = \ @@ -38,7 +37,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Shared_Malloc_Multiple.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += multiple multiple_CPPFLAGS = \ @@ -60,7 +58,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Shared_Malloc_Persistence.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += persistence persistence_CPPFLAGS = \ @@ -81,7 +78,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Shared_Malloc_Posind.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += posind posind_CPPFLAGS = \ diff --git a/ACE/examples/Shared_Memory/.cvsignore b/ACE/examples/Shared_Memory/.cvsignore new file mode 100644 index 00000000000..7f6e8a792c5 --- /dev/null +++ b/ACE/examples/Shared_Memory/.cvsignore @@ -0,0 +1,2 @@ +testmm +testsv diff --git a/ACE/examples/Shared_Memory/Makefile.am b/ACE/examples/Shared_Memory/Makefile.am index f7e9517e1dc..864c7a5b071 100644 --- a/ACE/examples/Shared_Memory/Makefile.am +++ b/ACE/examples/Shared_Memory/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -16,7 +16,6 @@ noinst_PROGRAMS = ## Makefile.Shared_Memory_MM.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += testmm testmm_CPPFLAGS = \ @@ -34,7 +33,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Shared_Memory_SV.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += testsv testsv_CPPFLAGS = \ diff --git a/ACE/examples/Smart_Pointers/.cvsignore b/ACE/examples/Smart_Pointers/.cvsignore new file mode 100644 index 00000000000..f309b7d5f8b --- /dev/null +++ b/ACE/examples/Smart_Pointers/.cvsignore @@ -0,0 +1,2 @@ +Widget +gadget diff --git a/ACE/examples/Smart_Pointers/Makefile.am b/ACE/examples/Smart_Pointers/Makefile.am index 88aab9e31d0..4595d7dafaa 100644 --- a/ACE/examples/Smart_Pointers/Makefile.am +++ b/ACE/examples/Smart_Pointers/Makefile.am @@ -6,13 +6,12 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) ## Makefile.Smart_Pointers_Gadget.am - noinst_PROGRAMS = gadget gadget_CPPFLAGS = \ @@ -38,7 +37,6 @@ gadget_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Smart_Pointers_Widget.am - noinst_PROGRAMS += Widget Widget_CPPFLAGS = \ diff --git a/ACE/examples/Synch/.cvsignore b/ACE/examples/Synch/.cvsignore new file mode 100644 index 00000000000..eea98594a4b --- /dev/null +++ b/ACE/examples/Synch/.cvsignore @@ -0,0 +1 @@ +proc_sema diff --git a/ACE/examples/Synch/Makefile.am b/ACE/examples/Synch/Makefile.am index 7e3243cb3b4..09319f393b3 100644 --- a/ACE/examples/Synch/Makefile.am +++ b/ACE/examples/Synch/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -15,7 +15,6 @@ ACE_ROOT = $(top_srcdir) ## Makefile.Synch.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS = proc_sema proc_sema_CPPFLAGS = \ diff --git a/ACE/examples/System_V_IPC/Makefile.am b/ACE/examples/System_V_IPC/Makefile.am index a505dc9b737..23b52ee8b29 100644 --- a/ACE/examples/System_V_IPC/Makefile.am +++ b/ACE/examples/System_V_IPC/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ SV_Message_Queues \ diff --git a/ACE/examples/System_V_IPC/SV_Message_Queues/.cvsignore b/ACE/examples/System_V_IPC/SV_Message_Queues/.cvsignore new file mode 100644 index 00000000000..bcdb18d69d8 --- /dev/null +++ b/ACE/examples/System_V_IPC/SV_Message_Queues/.cvsignore @@ -0,0 +1,4 @@ +mqclient +mqserver +tmqclient +tmqserver diff --git a/ACE/examples/System_V_IPC/SV_Message_Queues/Makefile.am b/ACE/examples/System_V_IPC/SV_Message_Queues/Makefile.am index 8b8ea29e204..eadb6b8df53 100644 --- a/ACE/examples/System_V_IPC/SV_Message_Queues/Makefile.am +++ b/ACE/examples/System_V_IPC/SV_Message_Queues/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -16,7 +16,6 @@ noinst_PROGRAMS = ## Makefile.SV_Message_Queues_MQ_Client.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += mqclient mqclient_CPPFLAGS = \ @@ -35,7 +34,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.SV_Message_Queues_MQ_Server.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += mqserver mqserver_CPPFLAGS = \ @@ -54,7 +52,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.SV_Message_Queues_TMQ_Client.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += tmqclient tmqclient_CPPFLAGS = \ @@ -73,7 +70,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.SV_Message_Queues_TMQ_Server.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += tmqserver tmqserver_CPPFLAGS = \ diff --git a/ACE/examples/System_V_IPC/SV_Semaphores/.cvsignore b/ACE/examples/System_V_IPC/SV_Semaphores/.cvsignore new file mode 100644 index 00000000000..bb37ee6c9a7 --- /dev/null +++ b/ACE/examples/System_V_IPC/SV_Semaphores/.cvsignore @@ -0,0 +1,2 @@ +sem1 +sem2 diff --git a/ACE/examples/System_V_IPC/SV_Semaphores/Makefile.am b/ACE/examples/System_V_IPC/SV_Semaphores/Makefile.am index 14fa043d43b..de9a88952a6 100644 --- a/ACE/examples/System_V_IPC/SV_Semaphores/Makefile.am +++ b/ACE/examples/System_V_IPC/SV_Semaphores/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -16,7 +16,6 @@ noinst_PROGRAMS = ## Makefile.SV_Semaphores_1.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += sem1 sem1_CPPFLAGS = \ @@ -34,7 +33,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.SV_Semaphores_2.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += sem2 sem2_CPPFLAGS = \ diff --git a/ACE/protocols/examples/TMCast/Makefile.am b/ACE/examples/TMCast/Makefile.am index 358fc18ef31..ad8cc650602 100644 --- a/ACE/protocols/examples/TMCast/Makefile.am +++ b/ACE/examples/TMCast/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ Member diff --git a/ACE/examples/TMCast/Member/.cvsignore b/ACE/examples/TMCast/Member/.cvsignore new file mode 100644 index 00000000000..fa6ecc72251 --- /dev/null +++ b/ACE/examples/TMCast/Member/.cvsignore @@ -0,0 +1 @@ +member diff --git a/ACE/protocols/examples/TMCast/Member/Makefile.am b/ACE/examples/TMCast/Member/Makefile.am index c5c5c31c34f..fe970a85ef5 100644 --- a/ACE/protocols/examples/TMCast/Member/Makefile.am +++ b/ACE/examples/TMCast/Member/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/protocols/examples/TMCast/Member/Member.mpc b/ACE/examples/TMCast/Member/Member.mpc index 29f274f51f3..29f274f51f3 100644 --- a/ACE/protocols/examples/TMCast/Member/Member.mpc +++ b/ACE/examples/TMCast/Member/Member.mpc diff --git a/ACE/protocols/examples/TMCast/Member/README b/ACE/examples/TMCast/Member/README index 6a62a107a77..6a62a107a77 100644 --- a/ACE/protocols/examples/TMCast/Member/README +++ b/ACE/examples/TMCast/Member/README diff --git a/ACE/protocols/examples/TMCast/Member/member.cpp b/ACE/examples/TMCast/Member/member.cpp index f89c68564ea..f89c68564ea 100644 --- a/ACE/protocols/examples/TMCast/Member/member.cpp +++ b/ACE/examples/TMCast/Member/member.cpp diff --git a/ACE/examples/Threads/.cvsignore b/ACE/examples/Threads/.cvsignore new file mode 100644 index 00000000000..29680be7dcc --- /dev/null +++ b/ACE/examples/Threads/.cvsignore @@ -0,0 +1,22 @@ +auto_event +barrier1 +barrier2 +cancel +future1 +future2 +manual_event +process_mutex +process_semaphore +reader_writer +recursive_mutex +task_five +task_four +task_one +task_three +task_two +thread_manager +thread_pool +thread_specific +token +tss1 +tss2 diff --git a/ACE/examples/Threads/Makefile.am b/ACE/examples/Threads/Makefile.am index d9bd5ba8fa5..edd80b72542 100644 --- a/ACE/examples/Threads/Makefile.am +++ b/ACE/examples/Threads/Makefile.am @@ -6,14 +6,13 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) ## Makefile.Threads_Auto_Event.am - noinst_PROGRAMS = auto_event auto_event_CPPFLAGS = \ @@ -31,7 +30,6 @@ auto_event_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Threads_Barrier1.am - noinst_PROGRAMS += barrier1 barrier1_CPPFLAGS = \ @@ -49,7 +47,6 @@ barrier1_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Threads_Barrier2.am - noinst_PROGRAMS += barrier2 barrier2_CPPFLAGS = \ @@ -67,7 +64,6 @@ barrier2_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Threads_Cancel.am - noinst_PROGRAMS += cancel cancel_CPPFLAGS = \ @@ -87,7 +83,6 @@ cancel_LDADD = \ ## Makefile.Threads_Future1.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += future1 future1_CPPFLAGS = \ @@ -109,7 +104,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Threads_Future2.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += future2 future2_CPPFLAGS = \ @@ -129,7 +123,6 @@ future2_LDADD = \ endif !BUILD_ACE_FOR_TAO ## Makefile.Threads_Manual_Event.am - noinst_PROGRAMS += manual_event manual_event_CPPFLAGS = \ @@ -149,7 +142,6 @@ manual_event_LDADD = \ ## Makefile.Threads_Process_Mutex.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += process_mutex process_mutex_CPPFLAGS = \ @@ -171,7 +163,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Threads_Process_Semaphore.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += process_semaphore process_semaphore_CPPFLAGS = \ @@ -191,7 +182,6 @@ process_semaphore_LDADD = \ endif !BUILD_ACE_FOR_TAO ## Makefile.Threads_Reader_Writer.am - noinst_PROGRAMS += reader_writer reader_writer_CPPFLAGS = \ @@ -209,7 +199,6 @@ reader_writer_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Threads_Recursive_Mutex.am - noinst_PROGRAMS += recursive_mutex recursive_mutex_CPPFLAGS = \ @@ -227,7 +216,6 @@ recursive_mutex_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Threads_Task_Five.am - noinst_PROGRAMS += task_five task_five_CPPFLAGS = \ @@ -245,7 +233,6 @@ task_five_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Threads_Task_Four.am - noinst_PROGRAMS += task_four task_four_CPPFLAGS = \ @@ -263,7 +250,6 @@ task_four_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Threads_Task_One.am - noinst_PROGRAMS += task_one task_one_CPPFLAGS = \ @@ -281,7 +267,6 @@ task_one_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Threads_Task_Three.am - noinst_PROGRAMS += task_three task_three_CPPFLAGS = \ @@ -299,7 +284,6 @@ task_three_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Threads_Task_Two.am - noinst_PROGRAMS += task_two task_two_CPPFLAGS = \ @@ -317,7 +301,6 @@ task_two_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Threads_Thread_Manager.am - noinst_PROGRAMS += thread_manager thread_manager_CPPFLAGS = \ @@ -335,7 +318,6 @@ thread_manager_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Threads_Thread_Pool.am - noinst_PROGRAMS += thread_pool thread_pool_CPPFLAGS = \ @@ -353,7 +335,6 @@ thread_pool_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Threads_Thread_Specific.am - noinst_PROGRAMS += thread_specific thread_specific_CPPFLAGS = \ @@ -368,7 +349,6 @@ thread_specific_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Threads_Token.am - noinst_PROGRAMS += token token_CPPFLAGS = \ @@ -386,7 +366,6 @@ token_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Threads_Tss1.am - noinst_PROGRAMS += tss1 tss1_CPPFLAGS = \ @@ -404,7 +383,6 @@ tss1_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Threads_Tss2.am - noinst_PROGRAMS += tss2 tss2_CPPFLAGS = \ diff --git a/ACE/examples/Timer_Queue/.cvsignore b/ACE/examples/Timer_Queue/.cvsignore new file mode 100644 index 00000000000..6f1917f64c8 --- /dev/null +++ b/ACE/examples/Timer_Queue/.cvsignore @@ -0,0 +1,3 @@ +Asynch_Timer_Queue_Test +Reactor_Timer_Queue_Test +Thread_Timer_Queue_Test diff --git a/ACE/examples/Timer_Queue/Async_Timer_Queue_Test.cpp b/ACE/examples/Timer_Queue/Async_Timer_Queue_Test.cpp index f8b3f9793ab..18d12b8017a 100644 --- a/ACE/examples/Timer_Queue/Async_Timer_Queue_Test.cpp +++ b/ACE/examples/Timer_Queue/Async_Timer_Queue_Test.cpp @@ -206,14 +206,12 @@ signal_handler (int signum) break; /* NOTREACHED */ -#if !defined (ACE_LACKS_UNIX_SIGNALS) case SIGQUIT: ACE_ERROR ((LM_ERROR, "shutting down on SIGQUIT%a\n", 1)); /* NOTREACHED */ break; -#endif } } @@ -224,12 +222,10 @@ signal_handler (int signum) static void register_signal_handlers (void) { -#if !defined (ACE_LACKS_UNIX_SIGNALS) // Register SIGQUIT (never blocked). ACE_Sig_Action sigquit ((ACE_SignalHandler) signal_handler, SIGQUIT); ACE_UNUSED_ARG (sigquit); -#endif // Don't let the SIGALRM interrupt the SIGINT handler! ACE_Sig_Set ss; diff --git a/ACE/examples/Timer_Queue/Makefile.am b/ACE/examples/Timer_Queue/Makefile.am index e969ce3129a..e2109fde6d6 100644 --- a/ACE/examples/Timer_Queue/Makefile.am +++ b/ACE/examples/Timer_Queue/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -33,7 +33,6 @@ noinst_HEADERS = \ Thread_Timer_Queue_Test.h ## Makefile.Timer_Queue_Async.am - noinst_PROGRAMS = Asynch_Timer_Queue_Test Asynch_Timer_Queue_Test_CPPFLAGS = \ @@ -52,7 +51,6 @@ Asynch_Timer_Queue_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Timer_Queue_Reactor.am - noinst_PROGRAMS += Reactor_Timer_Queue_Test Reactor_Timer_Queue_Test_CPPFLAGS = \ @@ -71,7 +69,6 @@ Reactor_Timer_Queue_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Timer_Queue_Thread.am - noinst_PROGRAMS += Thread_Timer_Queue_Test Thread_Timer_Queue_Test_CPPFLAGS = \ diff --git a/ACE/examples/Web_Crawler/.cvsignore b/ACE/examples/Web_Crawler/.cvsignore new file mode 100644 index 00000000000..ba2906d0666 --- /dev/null +++ b/ACE/examples/Web_Crawler/.cvsignore @@ -0,0 +1 @@ +main diff --git a/ACE/examples/Web_Crawler/Makefile.am b/ACE/examples/Web_Crawler/Makefile.am index e805ea1e807..00a30a4d2e1 100644 --- a/ACE/examples/Web_Crawler/Makefile.am +++ b/ACE/examples/Web_Crawler/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -15,7 +15,6 @@ ACE_ROOT = $(top_srcdir) ## Makefile.Web_Crawler.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS = main main_CPPFLAGS = \ diff --git a/ACE/html/index.html b/ACE/html/index.html index c9a823179e0..4160b9807f2 100644 --- a/ACE/html/index.html +++ b/ACE/html/index.html @@ -108,16 +108,6 @@ <p><a href="tao/anytypecode/index.html">TAO_AnyTypeCode:</a> TAO AnyTypeCode support</p> </li> - - <li> - <p><a href="tao/compression/index.html">TAO_Compression:</a> - TAO Compression support</p> - </li> - - <li> - <p><a href="tao/transportcurrent/index.html">TAO_TransportCurrent:</a> - TAO Transport Current support</p> - </li> </ul> <hr /> diff --git a/ACE/include/makeinclude/macros.GNU b/ACE/include/makeinclude/macros.GNU index 0ee539d5fb2..b6751f04c2d 100644 --- a/ACE/include/makeinclude/macros.GNU +++ b/ACE/include/makeinclude/macros.GNU @@ -20,8 +20,7 @@ TARGETS_LOCAL = \ clobber.local \ depend.local \ rcs_info.local \ - idl_stubs.local \ - svnignore.local + idl_stubs.local TARGETS_NESTED = \ $(TARGETS_LOCAL:.local=.nested) diff --git a/ACE/include/makeinclude/platform_aix.GNU b/ACE/include/makeinclude/platform_aix.GNU index 33e9c785263..675b1af991b 100644 --- a/ACE/include/makeinclude/platform_aix.GNU +++ b/ACE/include/makeinclude/platform_aix.GNU @@ -1,110 +1,3 @@ # $Id$ -# 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 -exceptions ?= 1 -optimize ?= 0 -threads ?= 1 - -# There's no way to turn off exceptions with IBM C/C++ -ifeq (0,$(exceptions)) - exceptions = 1 -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_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 = +include $(ACE_ROOT)/include/makeinclude/platform_aix4_cset++.GNU diff --git a/ACE/include/makeinclude/platform_aix4.2.GNU b/ACE/include/makeinclude/platform_aix4.2.GNU new file mode 100644 index 00000000000..395f30adbcb --- /dev/null +++ b/ACE/include/makeinclude/platform_aix4.2.GNU @@ -0,0 +1,3 @@ +# $Id$ + +include $(ACE_ROOT)/include/makeinclude/platform_aix4_cset++.GNU
\ No newline at end of file diff --git a/ACE/include/makeinclude/platform_aix4_cset++.GNU b/ACE/include/makeinclude/platform_aix4_cset++.GNU new file mode 100644 index 00000000000..8bc2b0b3929 --- /dev/null +++ b/ACE/include/makeinclude/platform_aix4_cset++.GNU @@ -0,0 +1,110 @@ +# $Id$ + +# AIX 4.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 +exceptions ?= 1 +optimize ?= 0 +threads ?= 1 + +# There's no way to turn off exceptions with IBM C/C++ +ifeq (0,$(exceptions)) + exceptions = 1 +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_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_dgux4_epc.GNU b/ACE/include/makeinclude/platform_dgux4_epc.GNU new file mode 100644 index 00000000000..96080eca81a --- /dev/null +++ b/ACE/include/makeinclude/platform_dgux4_epc.GNU @@ -0,0 +1,23 @@ +# $Id$ + +# Digital Unix v.4.X using epc? +# (Apparently based on SunOS 5.x (Solaris 2.x) with SunC++ 4.x) + +debug = 1 + +CC = gcc +CXX = ec++ +## CCFLAGS += -relax -tproff +CCFLAGS += $(CFLAGS) -relax -v -eh +DCFLAGS += -g +DLD = $(CXX) +LIBS += -lgen -lsocket -ldl -lnsl -lc +PIC = -KPIC +AR = ar +ARFLAGS = -ruv +RANLIB = echo +SOFLAGS += -G $(CPPFLAGS) +#SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \ +# $(SOLINK.cc) -o $@ -h $@ $(LDFLAGS) $(VSHDIR)$*.o +SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \ + $(SOLINK.cc) -o $@ $(LDFLAGS) $(VSHDIR)$*.o diff --git a/ACE/include/makeinclude/platform_dgux4_ghs.GNU b/ACE/include/makeinclude/platform_dgux4_ghs.GNU new file mode 100644 index 00000000000..05c5b3ad787 --- /dev/null +++ b/ACE/include/makeinclude/platform_dgux4_ghs.GNU @@ -0,0 +1,27 @@ +# $Id$ + +# DG/UX 4.x using Green Hills Multi's C++ compiler. + +debug = 1 +#shared_libs_only = 0 +#static_libs_only = 1 +#static_libs = 1 + +CC = cc +CXX = ghcx +CCFLAGS += $(CFLAGS) -elf -template=noauto # -ansicxx +# There was a link-time failure if -g (debugging) was turned on, and Green +# Hills was not able to try to fix it, so debugging is via ACE_OS::printf :-( +DCFLAGS += # -g +DLD = $(CXX) -shared +LD = $(CXX) +LIBS += -lthread -lrte -lgen -lsocket -ldl -lnsl # -lc +PIC = -pic +AR = $(CXX) -archive -o +ARFLAGS = +RANLIB = echo +#SOFLAGS = -G $(CPPFLAGS) +#SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \ +# $(SOLINK.cc) -o $@ -h $@ $(LDFLAGS) $(VSHDIR)$*.o +#SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \ +# $(SOLINK.cc) -o $@ $(LDFLAGS) $(VSHDIR)$*.o diff --git a/ACE/include/makeinclude/platform_hpux_aCC.GNU b/ACE/include/makeinclude/platform_hpux_aCC.GNU index 83dce0bb58a..a32d995bd36 100644 --- a/ACE/include/makeinclude/platform_hpux_aCC.GNU +++ b/ACE/include/makeinclude/platform_hpux_aCC.GNU @@ -135,6 +135,14 @@ ifneq ($(exceptions),1) CCFLAGS += +noeh endif +# Additionally, on HP-UX 10.20, suppress 495 to shut up the warnings from +# the system header files. 667 is also suppressed, but the compiler still +# tells you there was a future error, but at least you can pick out any real +# errors by quickly scanning the output. 829 is suppressed because the +# system headers have offending string literals assigned to char *. +ifeq ($(word 2,$(HPVERS_WORDS)), 10) +CCFLAGS += +W495,667,829,908 +endif DCCFLAGS += -g DLD = $(CXX) $(CCFLAGS) LD = $(CXX) @@ -150,6 +158,9 @@ SOFLAGS += -b ifeq ($(distrib),1) +ifeq ($(word 2,$(HPVERS_WORDS)), 10) +SOFLAGS += -Wl,-x -Wl,+h/usr/lib/$(@F) +else ifeq ($(buildbits),32) SOFLAGS += -Wl,-x -Wl,+h$(@F) -Wl,+b/usr/lib endif @@ -160,6 +171,7 @@ ifeq ($(buildbits),64) SOFLAGS += -Wl,-x -Wl,+h$(@F) -Wl,+b/usr/lib/pa20_64 endif endif +endif endif @@ -202,13 +214,29 @@ else 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 +# +# 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) + # 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 + +else + + # 10.x: + LIBS += -lxti -ldld + ifeq ($(threads),1) + LIBS += -lcma endif + endif -LIBS += -lxti -lrt -ldld diff --git a/ACE/include/makeinclude/platform_irix5.2.GNU b/ACE/include/makeinclude/platform_irix5.2.GNU new file mode 100644 index 00000000000..f21ebcb8356 --- /dev/null +++ b/ACE/include/makeinclude/platform_irix5.2.GNU @@ -0,0 +1,28 @@ +# $Id$ + +# Irix 5.2 with gcc 2.6.1 + +debug = 1 +optimize = 1 + +MAKE = gmake +CC = gcc +CXX = g++ + +DCFLAGS += -g +DLD = $(CXX) +LD = $(CXX) +LDFLAGS += +LIBS += -ldl +OCFLAGS += -O2 +PIC = -fpic +RANLIB = echo +SOFLAGS = +SOBUILD = + +# 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 + +CCFLAGS += $(CFLAGS) $(TEMPLATES_FLAG) diff --git a/ACE/include/makeinclude/platform_irix5.3_g++.GNU b/ACE/include/makeinclude/platform_irix5.3_g++.GNU new file mode 100644 index 00000000000..83512d62179 --- /dev/null +++ b/ACE/include/makeinclude/platform_irix5.3_g++.GNU @@ -0,0 +1,27 @@ +# $Id$ + +# Irix 5.3 with GNU C++ + +debug = 1 +optimize = 1 + +CC = gcc +CXX = g++ + +DCFLAGS += -g +DLD = $(CXX) +LD = $(CXX) +LDFLAGS += -L$(ACE_ROOT)/lib +OCFLAGS += -O2 +PIC = -fpic +RANLIB = echo +SOFLAGS += -shared $(CPPFLAGS) +SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \ + $(SOLINK.cc) -o $@ $(LDFLAGS) $(VSHDIR)$*.o + +# 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 + +CCFLAGS += $(CFLAGS) $(TEMPLATES_FLAG) diff --git a/ACE/include/makeinclude/platform_irix5.3_sgic++.GNU b/ACE/include/makeinclude/platform_irix5.3_sgic++.GNU new file mode 100644 index 00000000000..00cd1f6c2e9 --- /dev/null +++ b/ACE/include/makeinclude/platform_irix5.3_sgic++.GNU @@ -0,0 +1,25 @@ +# $Id$ + +# Irix 5.3 with SGI C++ + +# This suppresses common compiler warnings which appear in the +# ACE code but should not matter. The warnings can be turned on +# again by removing the -woff clause in the CPPFLAGS definition. + +debug = 1 + +CC = cc +CXX = CC +CCFLAGS += $(CFLAGS) +DCFLAGS += -g +DLD = $(CXX) +LD = $(CXX) +CPPFLAGS += -ptused -prelink +pp -woff 3203,3209,3161,3262,3665 +LIBS = +PIC = -KPIC +AR = ar +ARFLAGS = r +RANLIB = echo +SOFLAGS += -shared $(CPPFLAGS) -all +SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \ + $(SOLINK.cc) -o $@ $(LDFLAGS) $(VSHDIR)$*.o diff --git a/ACE/include/makeinclude/platform_irix6.x_common.GNU b/ACE/include/makeinclude/platform_irix6.x_common.GNU index a496845a0d7..5338d972dcd 100644 --- a/ACE/include/makeinclude/platform_irix6.x_common.GNU +++ b/ACE/include/makeinclude/platform_irix6.x_common.GNU @@ -1,7 +1,7 @@ # $Id$ -xt_reactor ?= 1 -exceptions ?= 1 +xt_reactor = 1 +exceptions = 1 PLATFORM_XT_CPPFLAGS= PLATFORM_XT_LIBS=-lXm -lXt -lX11 diff --git a/ACE/include/makeinclude/platform_lynxos.GNU b/ACE/include/makeinclude/platform_lynxos.GNU index 6249592e166..4e8ca06a59f 100644 --- a/ACE/include/makeinclude/platform_lynxos.GNU +++ b/ACE/include/makeinclude/platform_lynxos.GNU @@ -1,7 +1,7 @@ # $Id$ # -# LynxOS with g++. Defaults to LynxOS Version 4.0.0. For Version 4.2.0, -# for example, add "VERSION=4.2.0" to your make invocation. +# LynxOS with g++. Defaults to LynxOS Version 4.0.0. For Version 3.1.0, +# for example, add "VERSION=3.1.0" to your make invocation. #### NOTE: It's best to create a file that includes this one, instead #### of symlinking it. That way, you can easily override the default @@ -67,7 +67,15 @@ endif # ! LynxOS LYNXOS_MAJOR = $(shell echo $(VERSION) | awk -F. '{print $$1;}') LYNXOS_MINOR = $(shell echo $(VERSION) | awk -F. '{print $$2;}') -shared_libs ?= 1 +ifeq ($(shared_libs_only),1) + shared_libs = 1 + static_libs = +endif +ifeq ($(static_libs_only),1) + shared_libs = + static_libs = 1 +endif + optimize ?= 1 debug ?= 1 pipes ?= 1 @@ -100,9 +108,9 @@ ifeq ($(threads),1) endif ifeq ($(shared_libs),1) - CPPFLAGS += -DACE_HAS_SVR4_DYNAMIC_LINKING - CFLAGS += -mshared - SOFLAGS += -mshared + CFLAGS += -mshared -DACE_HAS_SVR4_DYNAMIC_LINKING + CFLAGS += -DACE_HAS_BROKEN_THREAD_KEYFREE + SOFLAGS += -mshared -DACE_HAS_SVR4_DYNAMIC_LINKING LIBS += -ldl else LIBS += -lnetinet -lnsl @@ -111,7 +119,7 @@ endif CC = gcc CXX = g++ CFLAGS += -Wpointer-arith -Wall -CPPFLAGS += -DACE_LYNXOS_MAJOR=$(LYNXOS_MAJOR) -DACE_LYNXOS_MINOR=$(LYNXOS_MINOR) +CFLAGS += -DACE_LYNXOS_MAJOR=$(LYNXOS_MAJOR) -DACE_LYNXOS_MINOR=$(LYNXOS_MINOR) DCFLAGS += -g PIC = -fPIC DLD = $(CXX) @@ -125,7 +133,7 @@ SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<; \ $(SOLINK.cc) -o $@ $(LDFLAGS) $(VSHDIR)$*.o PRELIB = @true -# Test for template instantiation, add to SOFLAGS if SONAME set, +# 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 diff --git a/ACE/include/makeinclude/platform_m88k.GNU b/ACE/include/makeinclude/platform_m88k.GNU new file mode 100644 index 00000000000..0155a3f5e54 --- /dev/null +++ b/ACE/include/makeinclude/platform_m88k.GNU @@ -0,0 +1,37 @@ +# $Id$ + +# SunOS 5.x (Solaris 2.x) with SunC++ 4.x + +debug = 1 +optimize = 1 + +CC = gcc +CXX = g++ + + +CFLAGS += -w +DCFLAGS += -g +DLD = $(CXX) +LD = $(CXX) +INCLDIRS += -I$(ACE_ROOT) -I. +INCLDIRS += -I/devel/rmm/v1.0/local/src/threads/include +LDFLAGS += -L $(ACE_ROOT)/lib -L ./ +LDFLAGS += -L/devel/rmm/v1.0/local/src/threads/lib +LIBS += -lsocket -ldl -lnsl -lgen -lstdc++ -lg++ +LIBS += -lgthreads -lgmalloc +OCFLAGS += -O2 +PIC = -fpic +AR = ar +ARFLAGS = ruv +RANLIB = /bin/true +SOFLAGS += -G $(CPPFLAGS) +SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \ + $(SOLINK.cc) -o $@ -h $@ $(LDFLAGS) $(VSHDIR)$*.o +PRELIB = @true + +# 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 + +CCFLAGS += $(CFLAGS) -D__m88k__ $(TEMPLATES_FLAG) -fno-strict-prototypes diff --git a/ACE/include/makeinclude/platform_osf1_3.2_cxx.GNU b/ACE/include/makeinclude/platform_osf1_3.2_cxx.GNU new file mode 100644 index 00000000000..a39e943248c --- /dev/null +++ b/ACE/include/makeinclude/platform_osf1_3.2_cxx.GNU @@ -0,0 +1,35 @@ +# $Id$ + +# This platform macros file is intended to work with Digital UNIX 3.2 +# (OSF/1 3.2g) with CXX 5.7 or later. +debug ?= 1 + +# exceptions=1 is the default on this platform. exceptions=0 has not +# been tested. See the bottom of this file for more. Turning off exceptions +# on this platform can cause bad things to happen. +exceptions ?= 1 + +# We want to test with rtti=1 +rtti ?= 1 +threads ?= 1 + +CC = cxx +CXX = $(CC) +CFLAGS += -threads +#### CCFLAGS += -x cxx +CCFLAGS += $(CFLAGS) -w0 +DCFLAGS += -g -O0 +#### DLD = ld -shared -expect_unresolved '*' +DLD = ld +LD = $(CXX) +#### LIBS += -lpthreads -lmach -lsys5 -lxti -ltli -lcxx -lexc -lc -lrt +LIBS += -qltli_r -ltli -qlrt_r -lrt -qlcxxstd_r -lcxxstd -qlcxx_r \ + -lcxx -qlots_r -lots -lpthreads -lmach -lexc -lc_r -lc +#### PIC = -pic +ARFLAGS = cruv +RANLIB = /usr/bin/true +#### SOFLAGS = -shared +SOFLAGS += -L/usr/lib/cmplrs/cxx -rpath /usr/lib/cmplrs/cxx \ + -L$(ACE_ROOT)/lib -L./ -g2 -O0 -shared +SOBUILD = $(RM) $@; $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $< && \ + ln $(VSHDIR)$*.o $@ diff --git a/ACE/include/makeinclude/platform_osf1_4.x_cxx.GNU b/ACE/include/makeinclude/platform_osf1_4.x_cxx.GNU new file mode 100644 index 00000000000..9f6ba9b0ae2 --- /dev/null +++ b/ACE/include/makeinclude/platform_osf1_4.x_cxx.GNU @@ -0,0 +1,133 @@ +# $Id$ + +# This platform macros file is intended to work with +# Digital UNIX 4.x (OSF/1 4.x), using the cxx compiler.. + +# Note that TAO has not been tested with debug=0 on this platform. So +# you should be careful when turning off debug. +debug ?= 1 + +# exceptions=1 is the default on this platform. exceptions=0 has not +# been tested. See the bottom of this file for more. Turning off exceptions +# on this platform can cause bad things to happen. +exceptions ?= 1 + +# We want to test with rtti=1 +rtti ?= 1 +threads ?= 1 + +# Use of Standard C++ Library requires some flags to be added to the +# compile line +# +stdcpplib ?= 1 + +CC = cxx +CXX = $(CC) + +# Note: Just get the version if it hasnt been defined so far. +# +ifndef CXX_VERSION + CXX_VERSION := $(shell $(CXX) -V) +endif # ! CXX_VERSION + +#### Note: -thread uses POSIX threads. If you want to use DCE threads +#### instead, change "-pthread" to "-threads". +ifeq ($(threads),1) + CFLAGS += -pthread +endif + + + +#### These flags can only be used with cxx Version 6.0 and later. +#### They are enabled by default; they can be disabled by settting +#### CXX_VER to CXX_5 either on the make command line, or by +#### or by setting the CXX_VER environment variable to CXX_5. +ifneq ($(CXX_VER),CXX_5) + WARNING_FLAGS += -w0 + ifneq (,$(VERBOSE_WARNING)) + WARNING_FLAGS += -msg_display_number -msg_display_tag + endif # VERBOSE_WARNING + + ifneq (,$(optimize)) + #### See ace/config-cxx-common.h for the meaning of this warning. + #### It's not necessary on DU 5.0. + WARNING_FLAGS += -msg_disable 1016 + endif # optimize + ifeq (4.,$(findstring 4.,$(shell uname -r))) + # 9: nested comment not allowed. But there's one in /usr/include/pdsc.h! + WARNING_FLAGS += -msg_disable 9 + endif +endif # 6.0 or later + +templates ?= automatic + +# Turn on the appropriate flags +# +ifeq ($(templates), automatic) + ifeq ($(TEMPLATES_FLAG),) # Turn on flags if none is speficied. + TEMPLATES_FLAG = -pt + SOFLAGS += -tall + endif +else + ifeq ($(templates), used) + ifeq ($(TEMPLATES_FLAG),) # Turn on flags if none is speficied. + TEMPLATES_FLAG = -pt + SOFLAGS += -tused + endif + endif # templates == used +endif # templates == automatic + +# Add the extra definitions needed to use the Standard Template Library +# +ifeq ($(stdcpplib), 1) + CPPFLAGS += -D__USE_STD_IOSTREAM +endif + +# The correct flags to pass to the linker for ELF dynamic shared library +# versioning +# +ifneq ($(SONAME),) + SOFLAGS += -soname $(SONAME) +endif + +CCFLAGS += $(CFLAGS) $(WARNING_FLAGS) $(TEMPLATES_FLAG) +DCFLAGS += -g -O0 +DLD = $(CXX) +LD = $(CXX) +#### The -hidden [...] -non_hidden business avoids multiply defined +#### symbols between the shared library and libcxxstd.a. It's the +#### workaround recommended in PTR 43-4-204. It must appear before any +#### linker commands. +LDFLAGS += -hidden $(wildcard /usr/lib/libcxxstd.a) -non_hidden +LIBS += $(CFLAGS) -lxti -lrt +MATHLIB = -lm +OCFLAGS += -O3 +PIC = +ARFLAGS = cruvZ +# This is needed to pull in all the template instantiations from the +# repository into the library. +# +TMPINCDIR = cxx_repository + +# When libraries are archived, a hash index is automatically created +# so there is no need for ranlib +# +RANLIB = @true +SOFLAGS += -shared -use_ld_input $(ACELIB) + +LIBS := $(LIBS) +SOBUILD = $(RM) $@; $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $< && \ + ln $(VSHDIR)$*.o $@ +ifeq (0,$(rtti)) + CCFLAGS += -nortti +endif # rtti + + +ifeq (0,$(exceptions)) + #### Disable the default exception handling of cxx >= 6.0. + #### This is untested. exceptions=1 is the default, so it's not used + #### by default. + ifeq (6.,$(findstring 6.,$(CXX_VERSION))) + CCFLAGS += -nocleanup + endif # 6.x +endif # ! exceptions diff --git a/ACE/include/makeinclude/platform_osf1_4.x_g++.GNU b/ACE/include/makeinclude/platform_osf1_4.x_g++.GNU new file mode 100644 index 00000000000..0a3b841d4cd --- /dev/null +++ b/ACE/include/makeinclude/platform_osf1_4.x_g++.GNU @@ -0,0 +1,34 @@ +# $Id$ + +# This platform macros file is intended to work with Digital UNIX 4.x +# (OSF/1 4.x) and GCC in version 2.9.6 or newer +debug ?= 1 +exceptions ?= 1 +rtti ?= 1 +threads ?= 1 +optimize ?= 1 + +CC = gcc +CXX = g++ +CFLAGS += -D_REENTRANT + +DCFLAGS += -g +LD = $(CXX) +DLD = $(CXX) +LIBS += -lpthread -lmach -lexc -lxti -lrt +OCFLAGS += -O3 +PIC = -fpic +ARFLAGS = cruvZ +# When libraries are archived, a hash index is automatically created so there +# is no need for ranlib +RANLIB = /usr/bin/true +SOFLAGS += -shared $(CPPFLAGS) $(ACELIB) +SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $< +PRELIB = @true + +# 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 + +CCFLAGS += $(CFLAGS) $(TEMPLATES_FLAG) diff --git a/ACE/include/makeinclude/platform_osf1_4.x_rcc.GNU b/ACE/include/makeinclude/platform_osf1_4.x_rcc.GNU new file mode 100644 index 00000000000..ec88239b058 --- /dev/null +++ b/ACE/include/makeinclude/platform_osf1_4.x_rcc.GNU @@ -0,0 +1,28 @@ +# $Id$ + +# This platform macros file is intended to work with Rational C++ (2.4.1) on +# Digital UNIX 4.0 (OSF/1 4.0). + +debug ?= 1 +exceptions ?= 1 +rtti ?= 1 +threads ?= 1 +optimize ?= 1 + +CC = rcc +CXX = RCC +CFLAGS += -D_REENTRANT +CCFLAGS += $(CFLAGS) -nosienna +DCFLAGS += -g -O0 +DLD = $(CXX) +LD = $(CXX) +LIBS += -lpthread -lc_r -lxti -lrt +OCFLAGS += -O4 +PIC = -pic +ARFLAGS = cruvZ +# When libraries are archived, a hash index is automatically created +# so there is no need for ranlib +RANLIB = /usr/bin/true +SOFLAGS += -shared # -use_ld_input $(ACELIB) +SOBUILD = $(RM) $@; $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $< && \ + ln $(VSHDIR)$*.o $@ diff --git a/ACE/include/makeinclude/platform_qnx_neutrino.GNU b/ACE/include/makeinclude/platform_qnx_neutrino.GNU index 2bd92551f7b..68bdb5ff4dc 100644 --- a/ACE/include/makeinclude/platform_qnx_neutrino.GNU +++ b/ACE/include/makeinclude/platform_qnx_neutrino.GNU @@ -7,10 +7,12 @@ static_libs_only = 1 debug ?= 1 optimize ?= 1 +repo ?= 1 + pipes ?= 1 -CC ?= i386-nto-gcc -CXX ?= i386-nto-g++ +CC = i386-nto-gcc +CXX = i386-nto-g++ CFLAGS += -W -Wall -Wpointer-arith DCFLAGS += -g @@ -20,9 +22,9 @@ LDFLAGS += LIBS += -lsocket -lstdc++ OCFLAGS += -O2 PIC = -fPIC -AR ?= i386-nto-ar +AR = i386-nto-ar ARFLAGS = ruv -RANLIB ?= i386-nto-ranlib +RANLIB = i386-nto-ranlib SOFLAGS += -G $(CPPFLAGS) -shared SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $< PRELIB = @true diff --git a/ACE/include/makeinclude/platform_qnx_rtp_gcc.GNU b/ACE/include/makeinclude/platform_qnx_rtp_gcc.GNU index 344ca621a8e..7c13b512c11 100644 --- a/ACE/include/makeinclude/platform_qnx_rtp_gcc.GNU +++ b/ACE/include/makeinclude/platform_qnx_rtp_gcc.GNU @@ -4,7 +4,7 @@ nto_version := $(shell uname -a | awk '{ gsub("\\.","", $$3 ); print $$3;}') -inline ?= 1 +inline = 1 debug ?= 1 optimize ?= 0 exceptions ?= 1 @@ -30,8 +30,8 @@ else # debug excludes optimize due to g++ internal compiler error OCFLAGS += -O3 endif #optimize endif #debug -CC ?= gcc -CXX ?= g++ +CC = gcc +CXX = g++ CFLAGS += -pipe -W -Wall -Wpointer-arith -DACE_NTO_VERS=$(nto_version) CPPFLAGS += -DACE_NTO_VERS=$(nto_version) @@ -41,13 +41,14 @@ LD = $(CXX) LIBS += -lsocket -lstdc++ -lm PIC = -fPIC -AR ?= ar +AR = ar ARFLAGS = ruv +#RANLIB = ranlib SOFLAGS += $(CPPFLAGS) -shared SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $< PRELIB = @true -# Test for template instantiation, add to SOFLAGS if SONAME set, +# 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 diff --git a/ACE/include/makeinclude/platform_rtems.x_g++.GNU b/ACE/include/makeinclude/platform_rtems.x_g++.GNU index 00813ebcffd..0110c5805a3 100644 --- a/ACE/include/makeinclude/platform_rtems.x_g++.GNU +++ b/ACE/include/makeinclude/platform_rtems.x_g++.GNU @@ -12,7 +12,6 @@ threads ?= 1 shared_libs = static_libs = 1 -rwho = 0 ifeq (,$(RTEMS_MAKEFILE_PATH)) default: @@ -44,7 +43,7 @@ DLD = $(LD) INCLDIRS += LD = $(CXX) -LDFLAGS += -Wl,--allow-multiple-definition -B$(RTEMS_MAKEFILE_PATH)/lib -Wl,-Ttext,0x00100000 +LDFLAGS += -Wl,--allow-multiple-definition -B$(RTEMS_MAKEFILE_PATH)/lib OCFLAGS += -O PIC = diff --git a/ACE/include/makeinclude/platform_sunos4_g++.GNU b/ACE/include/makeinclude/platform_sunos4_g++.GNU new file mode 100644 index 00000000000..b80e9a14c2b --- /dev/null +++ b/ACE/include/makeinclude/platform_sunos4_g++.GNU @@ -0,0 +1,33 @@ +# $Id$ + +# SunOS 4.x (Solaris 1.x) with g++ + +debug ?= 1 +optimize ?= 1 + +CC = gcc +CXX = g++ +CFLAGS += -fno-strict-prototypes + +DCFLAGS += -g +DLD = /bin/ld +LD = $(CXX) +# +# for G++ v2.6.0 +OCFLAGS += -O2 +PIC = -fpic +AR = ar +ARFLAGS = ruv +RANLIB = ranlib +SOFLAGS += -assert pure-text +# SOBUILD - compile into .so directly +SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $< +# SOLINK = $(SOLINK.cc) -o $@ $(LDFLAGS) $< +PRELIB = @true + +# 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 + +CCFLAGS += $(CFLAGS) $(TEMPLATES_FLAG) diff --git a/ACE/include/makeinclude/platform_sunos4_lucid.GNU b/ACE/include/makeinclude/platform_sunos4_lucid.GNU new file mode 100644 index 00000000000..e062639afca --- /dev/null +++ b/ACE/include/makeinclude/platform_sunos4_lucid.GNU @@ -0,0 +1,21 @@ +# $Id$ + +# SunOS 4.x (Solaris 1.x) with Lucid + +debug = 1 + +CC = lcc +CXX = lcc +CFLAGS = -Xa # use ANSI c complier +CCFLAGS = -XF -Xpt- # use c++ ARM compiler with auto templates turned off +DCFLAGS += -g +DCCFLAGS += $(DCFLAGS) +DLD = /bin/ld +LD = $(CXX) +LIBS += +PIC = -pic +ARFLAGS = ruv +RANLIB = ranlib +SOFLAGS += -assert pure-text +SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \ + $(SOLINK.cc) -o $@ $(LDFLAGS) $(VSHDIR)$*.o diff --git a/ACE/include/makeinclude/platform_sunos4_sunc++3.x.GNU b/ACE/include/makeinclude/platform_sunos4_sunc++3.x.GNU new file mode 100644 index 00000000000..2727c38e9f9 --- /dev/null +++ b/ACE/include/makeinclude/platform_sunos4_sunc++3.x.GNU @@ -0,0 +1,27 @@ +# $Id$ + +# SunOS 4.x (Solaris 1.x) with SunC++ 3.x (note that this is a very old C++ +# compiler, based on cfront. In paricular, it's not the same thing as +# SunC++ 4.x (which is also known as SPARCWorks 3.x). + +debug = 1 + +CC = cc +CXX = CC +CCFLAGS += $(CFLAGS) +DCFLAGS += -g +DLD = /bin/ld +LD = $(CXX) +LIBS += +PIC = -pic +AR = ar +ARFLAGS = ruv +RANLIB = ranlib +SOFLAGS += -assert pure-text +SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \ + $(RM) -rf $(VSHDIR)pt$*; mkdir $(VSHDIR)pt$*; \ + YYZ="`$(CXX) $(CCFLAGS) $(CPPFLAGS) \ + -ptr$(VSHDIR)pt$* -ptr./ptrepository $<`"; \ + $(RM) -rf a.out; \ + YYZ="`echo $(VSHDIR)pt$*/*.o`"; \ + $(SOLINK.cc) -o $@ ./$(VSHDIR)$*.o $(YYZ) diff --git a/ACE/include/makeinclude/platform_sunos4_sunc++4.x.GNU b/ACE/include/makeinclude/platform_sunos4_sunc++4.x.GNU new file mode 100644 index 00000000000..5aa1e54ceab --- /dev/null +++ b/ACE/include/makeinclude/platform_sunos4_sunc++4.x.GNU @@ -0,0 +1,24 @@ +# $Id$ + +# SunOS 4.x (Solaris 1.x) with SunC++ 4.x + +debug = 1 + +CC = cc +CXX = CC +CCFLAGS += $(CFLAGS) +DCFLAGS += -g +DLD = $(CXX) +LD = $(CXX) +LIBS += +LDFLAGS += $(PIC) +AR = CC +ARFLAGS = -xar -o +PIC = -PIC +RANLIB = ranlib +SOFLAGS += -G $(CPPFLAGS) +SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \ + $(SOLINK.cc) $(PIC) -o $@ $(LDFLAGS) $(VSHDIR)$*.o + +#### Create template repository to avoid compiler warning. +TEMPLATE_REPOSITORY = Templates.DB diff --git a/ACE/include/makeinclude/platform_sunos5_centerline.GNU b/ACE/include/makeinclude/platform_sunos5_centerline.GNU new file mode 100644 index 00000000000..e70dc213e9d --- /dev/null +++ b/ACE/include/makeinclude/platform_sunos5_centerline.GNU @@ -0,0 +1,22 @@ +# $Id$ + +# SunOS 5.x (Solaris 2.x) with Centerline C++ + +debug = 1 + +CC = cc +CXX = CC +CFLAGS += -mt +CCFLAGS += $(CFLAGS) +DCFLAGS += -g +DLD = $(CXX) -mt +LD = $(CXX) -mt +LIBS += -lsocket -ldl -lnsl -lgen +PIC = -PIC +#AR = CC +#ARFLAGS = -xar -o +ARFLAGS = ruv +RANLIB = echo +SOFLAGS += -G $(CPPFLAGS) $(PTDIRS) +SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \ + $(SOLINK.cc) $(PIC) -o $@ $(LDFLAGS) $(VSHDIR)$*.o diff --git a/ACE/include/makeinclude/platform_tru64_cxx.GNU b/ACE/include/makeinclude/platform_tru64_cxx.GNU index 335c10f362a..72bedef2735 100644 --- a/ACE/include/makeinclude/platform_tru64_cxx.GNU +++ b/ACE/include/makeinclude/platform_tru64_cxx.GNU @@ -7,131 +7,11 @@ # include $(ACE_ROOT)/include/makeinclude/platform_tru64_pre.GNU -# Note that TAO has not been tested with debug=0 on this platform. So -# you should be careful when turning off debug. -debug ?= 1 -# exceptions=1 is the default on this platform. exceptions=0 has not -# been tested. See the bottom of this file for more. Turning off exceptions -# on this platform can cause bad things to happen. -exceptions ?= 1 - -# We want to test with rtti=1 -rtti ?= 1 -threads ?= 1 - -# Use of Standard C++ Library requires some flags to be added to the -# compile line -# -stdcpplib ?= 1 - -CC = cxx -CXX = $(CC) - -# Note: Just get the version if it hasnt been defined so far. -# -ifndef CXX_VERSION - CXX_VERSION := $(shell $(CXX) -V) -endif # ! CXX_VERSION - -#### Note: -thread uses POSIX threads. If you want to use DCE threads -#### instead, change "-pthread" to "-threads". -ifeq ($(threads),1) - CFLAGS += -pthread -endif - -#### These flags can only be used with cxx Version 6.0 and later. -#### They are enabled by default; they can be disabled by settting -#### CXX_VER to CXX_5 either on the make command line, or by -#### or by setting the CXX_VER environment variable to CXX_5. -ifneq ($(CXX_VER),CXX_5) - WARNING_FLAGS += -w0 - ifneq (,$(VERBOSE_WARNING)) - WARNING_FLAGS += -msg_display_number -msg_display_tag - endif # VERBOSE_WARNING - - ifneq (,$(optimize)) - #### See ace/config-cxx-common.h for the meaning of this warning. - #### It's not necessary on DU 5.0. - WARNING_FLAGS += -msg_disable 1016 - endif # optimize - ifeq (4.,$(findstring 4.,$(shell uname -r))) - # 9: nested comment not allowed. But there's one in /usr/include/pdsc.h! - WARNING_FLAGS += -msg_disable 9 - endif -endif # 6.0 or later - -templates ?= automatic - -# Turn on the appropriate flags +# Include the macro file for osf1_4.x # -ifeq ($(templates), automatic) - ifeq ($(TEMPLATES_FLAG),) # Turn on flags if none is speficied. - TEMPLATES_FLAG = -pt - SOFLAGS += -tall - endif -else - ifeq ($(templates), used) - ifeq ($(TEMPLATES_FLAG),) # Turn on flags if none is speficied. - TEMPLATES_FLAG = -pt - SOFLAGS += -tused - endif - endif # templates == used -endif # templates == automatic +include $(ACE_ROOT)/include/makeinclude/platform_osf1_4.x_cxx.GNU -# Add the extra definitions needed to use the Standard Template Library -# -ifeq ($(stdcpplib), 1) - CPPFLAGS += -D__USE_STD_IOSTREAM -endif - -# The correct flags to pass to the linker for ELF dynamic shared library -# versioning -# -ifneq ($(SONAME),) - SOFLAGS += -soname $(SONAME) -endif - -CCFLAGS += $(CFLAGS) $(WARNING_FLAGS) $(TEMPLATES_FLAG) -DCFLAGS += -g -O0 -DLD = $(CXX) -LD = $(CXX) -#### The -hidden [...] -non_hidden business avoids multiply defined -#### symbols between the shared library and libcxxstd.a. It's the -#### workaround recommended in PTR 43-4-204. It must appear before any -#### linker commands. -LDFLAGS += -hidden $(wildcard /usr/lib/libcxxstd.a) -non_hidden -LIBS += $(CFLAGS) -lxti -lrt -MATHLIB = -lm -OCFLAGS += -O3 -PIC = -ARFLAGS = cruvZ -# This is needed to pull in all the template instantiations from the -# repository into the library. -# -TMPINCDIR = cxx_repository - -# When libraries are archived, a hash index is automatically created -# so there is no need for ranlib -# -RANLIB = @true -SOFLAGS += -shared -use_ld_input $(ACELIB) - -LIBS := $(LIBS) -SOBUILD = $(RM) $@; $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $< && \ - ln $(VSHDIR)$*.o $@ -ifeq (0,$(rtti)) - CCFLAGS += -nortti -endif # rtti - -ifeq (0,$(exceptions)) - #### Disable the default exception handling of cxx >= 6.0. - #### This is untested. exceptions=1 is the default, so it's not used - #### by default. - ifeq (6.,$(findstring 6.,$(CXX_VERSION))) - CCFLAGS += -nocleanup - endif # 6.x -endif # ! exceptions ### There is a bug with pthreads header file shipped with v1885 of ### V5.1. We need to turn this flag to get asm () inline for diff --git a/ACE/include/makeinclude/platform_tru64_g++.GNU b/ACE/include/makeinclude/platform_tru64_g++.GNU index 980c13635e8..155d71109f8 100644 --- a/ACE/include/makeinclude/platform_tru64_g++.GNU +++ b/ACE/include/makeinclude/platform_tru64_g++.GNU @@ -11,36 +11,9 @@ # include $(ACE_ROOT)/include/makeinclude/platform_tru64_pre.GNU -debug ?= 1 -exceptions ?= 1 -rtti ?= 1 -threads ?= 1 -optimize ?= 1 - -CC = gcc -CXX = g++ -CFLAGS += -D_REENTRANT - -DCFLAGS += -g -LD = $(CXX) -DLD = $(CXX) -LIBS += -lpthread -lmach -lexc -lxti -lrt -OCFLAGS += -O3 -PIC = -fpic -ARFLAGS = cruvZ -# When libraries are archived, a hash index is automatically created so there -# is no need for ranlib -RANLIB = /usr/bin/true -SOFLAGS += -shared $(CPPFLAGS) $(ACELIB) -SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $< -PRELIB = @true - -# Test for template instantiation, add to SOFLAGS if SONAME set, -# add -E to LDFLAGS if using GNU ld +# Include the macro file for osf1_4.x # -include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU - -CCFLAGS += $(CFLAGS) $(TEMPLATES_FLAG) +include $(ACE_ROOT)/include/makeinclude/platform_osf1_4.x_g++.GNU # Include the common macros for all compilers # diff --git a/ACE/include/makeinclude/platform_vxworks5.5.x.GNU b/ACE/include/makeinclude/platform_vxworks5.5.x.GNU index c73e42594b1..df071f82675 100644 --- a/ACE/include/makeinclude/platform_vxworks5.5.x.GNU +++ b/ACE/include/makeinclude/platform_vxworks5.5.x.GNU @@ -161,25 +161,15 @@ ifeq ("$(VXWORKSLINK)","true") ifeq ($(SHARED_LIBS),1) ##LD_PARTIAL += -L$(ACE_ROOT)/lib -L./ $(LDLIBPATH) $(LD_LINK_PATH) PRJ_OBJS_FOR_LD_PARTIAL=$(addprefix $(VDIR), $(OBJS)) $(VSHOBJS) - ifeq ($(VX_SO_BUILD),1) + ifeq ($(VX_SO_BUILD),1) ## Shared lib builds for VxWorks will also build 'import' libraries - LIB_INSTALL += $(VLIB:%=$(INSLIB)/%) - CLEANUP_INSTALL += $(CLEANUP_VLIB:%=$(INSLIB)/%) + LIB_INSTALL += $(VLIB:%=$(INSLIB)/%) + CLEANUP_INSTALL += $(CLEANUP_VLIB:%=$(INSLIB)/%) REALCLEAN_FILES += $(CLEANUP_LIB:%=%) $(CLEANUP_LIB:%=%_debug) $(CLEANUP_LIB:%=%_profile) $(CLEANUP_LIB:%=%_optimize) - endif + endif else LD_PARTIAL += -L$(ACE_ROOT)/ace -L./ $(LDLIBPATH) $(LD_LINK_PATH) - ifeq (1,$(repo)) - PRJ_OBJS_FOR_LD_PARTIAL=$(addprefix $(VDIR), $(OBJS)) $(VSHOBJS) $(shell set AR=$(AR) && set RANLIB=$(RANLIB) && perl $(ACE_ROOT)/bin/vx_repo_link.pl $(VLDLIBS)) $(ACE_SHLIBS) - ifneq (1,$(VX_KEEP_PRELINK_LIB)) - POSTLINK = rmdir /s/q .lib && rmdir /s/q $(subst /,\,$(VDIR)) - REALCLEAN_FILES += .lib - else - POSTLINK = rmdir /s/q $(subst /,\,$(VDIR)) - endif - else - PRJ_OBJS_FOR_LD_PARTIAL=$(addprefix $(VDIR), $(OBJS)) $(VSHOBJS) $(VLDLIBS) $(ACE_SHLIBS) - endif + PRJ_OBJS_FOR_LD_PARTIAL=$(addprefix $(VDIR), $(OBJS)) $(VSHOBJS) $(VLDLIBS) $(ACE_SHLIBS) $(LIBS) endif PRJ_OBJS_FOR_LD=$(addprefix $(VDIR), $(OBJS)) $(VSHOBJS) PRJ_OBJS_FOR_NM=$(addprefix $(VDIR), $(OBJS)) $(VSHOBJS) @@ -208,22 +198,22 @@ ifeq ("$(TOOL)","gnu") include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU ifeq ("$(templates)","automatic") - ifdef repo - ifeq ("$(VXWORKSLINK)","true") - ifeq ($(VX_APP_BUILD),1) - ifneq ($(SHARED_LIBS),1) - LD_PARTIAL += -frepo - endif - endif - else - #ace_lib_prelink := 1 - LINK.cc = override - LINK.cc.override = $(LD_PARTIAL) -frepo - LDFLAGS = $(ACE_SHLIBS) - endif - else - C++FLAGS += -fmerge-templates +ifdef repo +ifeq ("$(VXWORKSLINK)","true") + ifeq ($(VX_APP_BUILD),1) + ifneq ($(SHARED_LIBS),1) + LD_PARTIAL += -frepo endif + endif +else + ace_lib_prelink := 1 + LINK.cc = override + LINK.cc.override = $(LD_PARTIAL) -frepo -L$(ACE_ROOT)/ace -L$(INSLIB) -L./ $(LDLIBPATH) $(LD_LINK_PATH) + LDFLAGS = $(ACE_SHLIBS) +endif +else + C++FLAGS += -fmerge-templates +endif endif # TEMPLATES_FLAG is set by platform_g++_common.GNU diff --git a/ACE/include/makeinclude/platform_vxworks6.3.GNU b/ACE/include/makeinclude/platform_vxworks6.3.GNU index 91c59adc0da..05568999af5 100644 --- a/ACE/include/makeinclude/platform_vxworks6.3.GNU +++ b/ACE/include/makeinclude/platform_vxworks6.3.GNU @@ -88,7 +88,7 @@ ifeq ($(TOOL_FAMILY),) endif endif -ifeq ("$(TOOL_FAMILY)","gnu") +ifeq ("$(TOOL)","gnu") templates ?= automatic endif @@ -169,11 +169,9 @@ endif ifeq ($(rtp),1) include $(WIND_USR)/make/defs.default - include $(WIND_USR)/tool/$(TOOL_FAMILY)/make.$(CPU)$(TOOL) include $(WIND_USR)/make/defs.$(WIND_HOST_TYPE) - ifeq ("$(TOOL_FAMILY)","gnu") - CPPFLAGS += -mrtp - endif + include $(WIND_USR)/tool/$(TOOL_FAMILY)/make.$(CPU)$(TOOL) + CPPFLAGS += -mrtp LDFLAGS := $(filter-out -X, $(LDFLAGS)) LDFLAGS := $(filter-out -N, $(LDFLAGS)) LD := $(CPLUS) @@ -238,7 +236,7 @@ ifeq ($(pthread),1) CPPFLAGS += -DACE_HAS_PTHREADS endif -ifeq ("$(TOOL_FAMILY)","gnu") +ifeq ("$(TOOL)","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 @@ -268,16 +266,16 @@ endif ifneq ($(TEMPLATES_FLAG),) # If specified, add it to the CCFLAGS CPPFLAGS += $(TEMPLATES_FLAG) endif -endif # TOOL_FAMILY == gnu +endif # TOOL == gnu -ifeq ("$(TOOL_FAMILY)","diab") +ifeq ("$(TOOL)","diab") ifeq ($(exceptions),1) C++FLAGS += -Xexceptions else C++FLAGS += -Xexceptions-off endif else -ifeq ("$(TOOL_FAMILY)","gnu") +ifeq ("$(TOOL)","gnu") ifeq ($(exceptions),1) C++FLAGS += -fexceptions else @@ -288,22 +286,18 @@ endif ifeq (0,$(rtti)) C++FLAGS += -DACE_LACKS_RTTI -ifeq ("$(TOOL_FAMILY)","gnu") +ifeq ("$(TOOL)","gnu") C++FLAGS += -fno-rtti else C++FLAGS += -Xrtti-off endif endif # rtti -ifeq ("$(TOOL_FAMILY)","diab") - LDLIBS += -lstlstd -endif - ifneq ($(findstring $(VX_CPU_FAMILY),ppc arm),) -ifeq ("$(TOOL_FAMILY)","diab") +ifeq ("$(TOOL)","diab") C++FLAGS += -Xchar-signed else -ifeq ("$(TOOL_FAMILY)","gnu") +ifeq ("$(TOOL)","gnu") C++FLAGS += -fsigned-char endif endif @@ -322,10 +316,10 @@ CCFLAGS += $(C++FLAGS) ifeq (0,$(rtp)) PIC = else - ifeq ("$(TOOL_FAMILY)","diab") + ifeq ("$(TOOL)","diab") PIC = -Xpic else - ifeq ("$(TOOL_FAMILY)","gnu") + ifeq ("$(TOOL)","gnu") PIC = -fpic endif endif diff --git a/ACE/include/makeinclude/platform_vxworks6.4.GNU b/ACE/include/makeinclude/platform_vxworks6.4.GNU deleted file mode 100644 index 25716f6c6eb..00000000000 --- a/ACE/include/makeinclude/platform_vxworks6.4.GNU +++ /dev/null @@ -1,16 +0,0 @@ -# $Id$ -# VxWorks 6.4 - -#### Notes: -#### 1) This file requires that the WIND_BASE and WIND_HOST_TYPE environment -#### variables be set. If the target CPU is not SIMNT, then your CPU -#### environment variable must be set. -#### 2) The TOOL environment variable may be set to "diab" (default is "gnu"). -#### 3) If perl is not on your path, you'll also need to set your PERL_PATH -#### environment variable to the full path to perl. - -ifeq ($(VXWORKS_VERSION_FLAG),) - VXWORKS_VERSION_FLAG = -DACE_VXWORKS=0x640 -endif # VXWORKS_VERSION_FLAG - -include $(ACE_ROOT)/include/makeinclude/platform_vxworks6.3.GNU diff --git a/ACE/include/makeinclude/rules.bin.GNU b/ACE/include/makeinclude/rules.bin.GNU index 1e30819c6de..9337721ce52 100644 --- a/ACE/include/makeinclude/rules.bin.GNU +++ b/ACE/include/makeinclude/rules.bin.GNU @@ -42,6 +42,16 @@ ifeq ($(VXWORKSLINK),true) $(BIN): $(DEFAULTRULE) mv $(DEFAULTRULE) $@ else # !VXWORKSLINK +ifeq ($(CHORUSLINK),true) +$(BIN): %: $(VDIR)%.$(OBJEXT) $(VOBJS) + $(LINK.cc) $(CC_OUTPUT_FLAG) $@ $(sort $(VDIR)$@.$(OBJEXT) $(VOBJS)) $(VLDLIBS) $(LDFLAGS) $(POSTLINK) +# $(MERGEDIR)/dtool/mkctors $@.xp.o > $@.ct.s +# $(CXX) -c $@.ct.s +# $(RM) $@.ct.s +# $(LD) $(LDOPTIONS) -e _start -o $@ $(MERGEDIR)/lib/crt/crth.u.o $(MERGEDIR)/lib/crt/crt0.o $(MERGEDIR)/lib/crt/crti.o $@.xp.o $@.ct.o $(MERGEDIR)/lib/crt/crtn.o -dn -T $(MERGEDIR)/src/act/slots/act_u.ld +# $(RM) $@.xp.o +# $(RM) $@.ct.o +else # !CHORUSLINK ifeq (1,$(using_aix_vacpp)) $(BIN): %: %.icc $(SRC) vacbld_r $< -severitylevel=warning @@ -50,3 +60,4 @@ $(BIN): %: $(VDIR)%.$(OBJEXT) $(VOBJS) $(LINK.cc) $(LDFLAGS) $(CC_OUTPUT_FLAG) $@ $(sort $(VDIR)$@.$(OBJEXT) $(VOBJS)) $(VLDLIBS) $(POSTLINK) endif # using_aix_vacpp endif +endif diff --git a/ACE/include/makeinclude/rules.common.GNU b/ACE/include/makeinclude/rules.common.GNU index dd354e41a3f..f0b50695f1a 100644 --- a/ACE/include/makeinclude/rules.common.GNU +++ b/ACE/include/makeinclude/rules.common.GNU @@ -19,4 +19,3 @@ clobber: clobber.nested clobber.local depend: depend.nested depend.local rcs_info: rcs_info.nested rcs_info.local idl_stubs: idl_stubs.nested idl_stubs.local -svnignore: svnignore.nested svnignore.local diff --git a/ACE/include/makeinclude/rules.lib.GNU b/ACE/include/makeinclude/rules.lib.GNU index 2b0ded6127f..49a2ba2dae1 100644 --- a/ACE/include/makeinclude/rules.lib.GNU +++ b/ACE/include/makeinclude/rules.lib.GNU @@ -79,12 +79,12 @@ else # VLIBS endif # IDL_SRC endif # !VLIBS -VLOBJS = $(addprefix $(VDIR),$(foreach var, $(addsuffix .$(OBJEXT), $(basename $(LSRC)) $(RESOURCES)), $(patsubst ../%,$(notdir $(var)),$(var)))) +VLOBJS = $(addprefix $(VDIR),$(foreach var, $(addsuffix .$(OBJEXT), $(basename $(LSRC)) $(RESOURCES)), $(if $(findstring ../,$(var)),$(notdir $(var)),$(var)))) ifdef LSRC2 LSRC += $(LSRC2) endif -VSHOBJS = $(addprefix $(VSHDIR),$(foreach var, $(addsuffix .$(OBJEXT), $(basename $(LSRC)) $(RESOURCES)), $(patsubst ../%,$(notdir $(var)),$(var)))) +VSHOBJS = $(addprefix $(VSHDIR),$(foreach var, $(addsuffix .$(OBJEXT), $(basename $(LSRC)) $(RESOURCES)), $(if $(findstring ../,$(var)),$(notdir $(var)),$(var)))) ifneq ($(IDL_SRC),) $(VLOBJS) $(VSHOBJS): $(IDL_SRC) @@ -108,56 +108,34 @@ endif # shared_libs ace_lib_prelink ?= 0 aix_build ?= 0 -ifeq (1,$(VXWORKS)) - - ifeq (1,$(ace_lib_prelink)) -.PHONY: ace-templ_inst - -ace-templ_inst: - -$(LINK.cc) $(LINK_OUTPUT_FLAG) ace-templ_inst $(VLOBJS) $(LDFLAGS) $(ACE_SHLIBS) - -$(RM) ace-templ_inst - -$(VLIB): $(VLOBJS) ace-templ_inst - else $(VLIB): $(VLOBJS) - endif - ifeq (1,$(repo)) - @echo $(LINK.cc) $(LINK_OUTPUT_FLAG) > .prelink.spec - @echo xargs $(AR) $(ARFLAGS) $(notdir $@) $(AREXTRA) >> .prelink.spec - @if not [""]==["$(ACE_SHLIBS)"] @echo $(subst -l,,$(ACE_SHLIBS)) >> .prelink.spec - @echo Add .rpo files - echo .prelink.spec $(foreach rpo,$(patsubst %.o,%.rpo,$(filter %.o, $?)),$(shell if exist $(rpo) echo $(rpo))) | xargs $(AR) $(ARFLAGS) $@ $(AREXTRA) - endif - @echo Add .o files - echo $(TMPINCDIR:%=%/*.o) $(filter %.o, $?) | xargs $(AR) $(ARFLAGS) $@ $(AREXTRA) - -chmod a+r $@ - ifneq (,$(RANLIB)) - -$(RANLIB) $@ - endif # RANLIB - -else # !VXWORKS -$(VLIB): $(VLOBJS) - ifeq (1,$(repo)) - ifneq (,$(ACELIB)) +ifeq (1,$(repo)) + ifneq (,$(ACELIB)) #### With repo, link in all of the ace object files to the lib. #### This avoids multiple instantiations. We haven't found it to #### be necessary with shared libs, so just do it for static libs. vpath %.$(OBJEXT) $(ACE_ROOT)/ace/$(VDIR) $(VLIB): $(ACE_ROOT)/ace/$(VDIR)*.$(OBJEXT) - endif # ! ACELIB - endif # repo - ifdef PRELIB + endif # ! ACELIB +endif # repo + +ifdef PRELIB $(PRELIB) - endif - ifeq (1,$(ace_lib_prelink)) +endif +ifeq (1,$(ace_lib_prelink)) #### Attempt a link (which will fail), to add template instantiations #### to lib files, for example. + ifeq (1,$(VXWORKS)) + #### In VxWorks builds we would like to see the output here. + -$(LINK.cc) $(LINK_OUTPUT_FLAG) ace-templ_inst $? $(LDFLAGS) + else -$(LINK.cc) $(LINK_OUTPUT_FLAG) ace-templ_inst $? $(LDFLAGS) $(ACE_NUL_STDERR) - endif # ace_lib_prelink + endif +endif # ace_lib_prelink echo $(TMPINCDIR:%=%/*.o) $(filter %.o, $?) | xargs $(AR) $(ARFLAGS) $@ $(AREXTRA) - ifdef ibmcxx_build +ifdef ibmcxx_build # This is required to get AIX IBM C/C++ to instantiate and compile the needed # templates. if test -s ./$(TEMPINCDIR)/*.C; \ @@ -166,13 +144,11 @@ $(VLIB): $(VLOBJS) $(RM) dummy; \ $(AR) $(ARFLAGS) $@ $(TEMPINCDIR)/*.$(OBJEXT); \ fi - endif +endif -chmod a+r $@ - ifneq (,$(RANLIB)) +ifneq (,$(RANLIB)) -$(RANLIB) $@ - endif # RANLIB - -endif # !VXWORKS +endif # RANLIB # Note that if you don't want to build shared libraries, just remove the # $(VSHOBJS) diff --git a/ACE/include/makeinclude/rules.local.GNU b/ACE/include/makeinclude/rules.local.GNU index 67878326f76..71e37f61733 100644 --- a/ACE/include/makeinclude/rules.local.GNU +++ b/ACE/include/makeinclude/rules.local.GNU @@ -90,46 +90,28 @@ endif # static_link = 1 OS ?= -# Define a canned command set to create the output object directory if needed. -ifeq ($(vxworks_ntbuild),1) -define mk_obj_out_dir -@if not exist $(dir $@) $(MKDIR) $(dir $@) $(ACE_NUL_STDERR) -@echo > $(dir $@).creation_stamp -endef -else -define mk_obj_out_dir -@-test -d $(dir $@) || $(MKDIR) $(dir $@) $(ACE_NUL_STDERR) -endef -endif - -$(VDIR)%.o: %.c - $(mk_obj_out_dir) +$(VDIR)%.o: %.c $(VDIR)%.creation_stamp $(COMPILE.c) $(CC_OUTPUT_FLAG) $@ $< ${MVCMD} -$(VDIR)%.o: %.cpp - $(mk_obj_out_dir) +$(VDIR)%.o: %.cpp $(VDIR)%.creation_stamp $(COMPILE.cc) $(CC_OUTPUT_FLAG) $@ $< ${MVCMD} -$(VDIR)%.o: %.C - $(mk_obj_out_dir) +$(VDIR)%.o: %.C $(VDIR)%.creation_stamp $(COMPILE.cc) $(CC_OUTPUT_FLAG) $@ $< ${MVCMD} -$(VDIR)%.o: %.cc - $(mk_obj_out_dir) +$(VDIR)%.o: %.cc $(VDIR)%.creation_stamp $(COMPILE.cc) $(CC_OUTPUT_FLAG) $@ $< ${MVCMD} -$(VDIR)%.o: %.cxx - $(mk_obj_out_dir) +$(VDIR)%.o: %.cxx $(VDIR)%.creation_stamp $(COMPILE.cc) $(CC_OUTPUT_FLAG) $@ $< ${MVCMD} ifneq (,$(COMPILE.rc)) -$(VDIR)%.rc.o: %.rc - $(mk_obj_out_dir) +$(VDIR)%.rc.o: %.rc $(VDIR)%.creation_stamp $(COMPILE.rc) $< $@ ${MVCMD} endif # COMPILE.rc @@ -144,55 +126,67 @@ ifndef SOLINK # that the service configurator needs to be able to function). # 970104 Marius Kjeldahl <mariusk@sn.no, marius@funcom.com> ifdef (ESOBUILD) -$(VSHDIR)%.$(SOEXT): %.cpp - $(mk_obj_out_dir) +$(VSHDIR)%.$(SOEXT): %.cpp $(VSHDIR)%.creation_stamp $(ESOBUILD) else # ! ESOBUILD -$(VSHDIR)%.$(SOEXT): %.cpp - $(mk_obj_out_dir) +$(VSHDIR)%.$(SOEXT): %.cpp $(VSHDIR)%.creation_stamp $(SOBUILD) endif # ESOBUILD ifeq ($(split), 1) -$(VSHDIR)%.$(OBJEXT): %.cpp - $(mk_obj_out_dir) +$(VSHDIR)%.$(OBJEXT): %.cpp $(VSHDIR)%.creation_stamp $(COMPILE.cc) $(PIC) SPLIT/`echo $< | sed "s/.cpp/_S\*/"` mv *.$(OBJEXT) $(VSHDIR) else # ! split -$(VSHDIR)%.$(OBJEXT): %.cpp - $(mk_obj_out_dir) +$(VSHDIR)%.$(OBJEXT): %.cpp $(VSHDIR)%.creation_stamp $(COMPILE.cc) $(PIC) $(CC_OUTPUT_FLAG) $@ $< endif # split -$(VSHDIR)%.$(OBJEXT): %.cc - $(mk_obj_out_dir) +$(VSHDIR)%.$(OBJEXT): %.cc $(VSHDIR)%.creation_stamp $(COMPILE.cc) $(PIC) $(CC_OUTPUT_FLAG) $@ $< -$(VSHDIR)%.$(OBJEXT): %.C - $(mk_obj_out_dir) +$(VSHDIR)%.$(OBJEXT): %.C $(VSHDIR)%.creation_stamp $(COMPILE.cc) $(PIC) $(CC_OUTPUT_FLAG) $@ $< -$(VSHDIR)%.$(OBJEXT): %.cxx - $(mk_obj_out_dir) +$(VSHDIR)%.$(OBJEXT): %.cxx $(VSHDIR)%.creation_stamp $(COMPILE.cc) $(PIC) $(CC_OUTPUT_FLAG) $@ $< -$(VSHDIR)%.$(OBJEXT): %.c - $(mk_obj_out_dir) +$(VSHDIR)%.$(OBJEXT): %.c $(VSHDIR)%.creation_stamp $(COMPILE.c) $(PIC) $(CC_OUTPUT_FLAG) $@ $< ifneq (,$(COMPILE.rc)) -$(VSHDIR)%.rc.$(OBJEXT): %.rc - $(mk_obj_out_dir) +$(VSHDIR)%.rc.$(OBJEXT): %.rc $(VSHDIR)%.creation_stamp $(COMPILE.rc) $< $@ endif # COMPILE.rc -$(VSHDIR)%.$(SOEXT): $(VSHDIR)%.$(OBJEXT) - $(mk_obj_out_dir) +$(VSHDIR)%.$(SOEXT): $(VSHDIR)%.$(OBJEXT) $(VSHDIR)%.creation_stamp $(SOLINK) endif # SOLINK +ifeq ($(vxworks_ntbuild),1) +$(VDIR)%.creation_stamp: + @if not exist $(dir $@) $(MKDIR) $(dir $@) $(ACE_NUL_STDERR) + @echo > $@ +else +.PHONY: $(VDIR)%.creation_stamp +$(VDIR)%.creation_stamp: + @-test -d $(dir $@) || $(MKDIR) $(dir $@) $(ACE_NUL_STDERR) +endif + +ifneq ($(VDIR),$(VSHDIR)) + ifeq ($(vxworks_ntbuild),1) +$(VSHDIR)%.creation_stamp: + @if not exist $(dir $@) $(MKDIR) $(dir $@) $(ACE_NUL_STDERR) + @echo > $@ + else +.PHONY: $(VSHDIR)%.creation_stamp +$(VSHDIR)%.creation_stamp: + @-test -d $(dir $@) || $(MKDIR) $(dir $@) $(ACE_NUL_STDERR) + endif +endif + #---------------------------------------------------------------------------- # Library generation targets #---------------------------------------------------------------------------- @@ -497,10 +491,3 @@ SPLIT: @echo "Splitting source files..." @$(ACE_ROOT)/bin/split-cpp -s Svc_Conf_l.cpp -s Svc_Conf_y.cpp $(LSRC) @echo "done." - -svnignore.local: - if [ "n$(BIN)" != "n" ]; then \ - (svn propget svn:ignore .; echo $(BIN)) | sort | uniq | sed '/^$$/d' >SvNiGnOrE; \ - svn propset svn:ignore -F SvNiGnOrE .; \ - rm SvNiGnOrE; \ - fi diff --git a/ACE/include/makeinclude/wrapper_macros.GNU b/ACE/include/makeinclude/wrapper_macros.GNU index e3f13eb7363..77b1aed4442 100644 --- a/ACE/include/makeinclude/wrapper_macros.GNU +++ b/ACE/include/makeinclude/wrapper_macros.GNU @@ -57,10 +57,6 @@ # templates Type of template instantiation to perform. Can be one of # automatic, used. Defaults to automatic. # threads Build with thread support. -# trio Indicate build with trio; adds PLATFORM_TRIO_CPPFLAGS -# to CPPFLAGS, PLATFORM_TRIO_LDFLAGS to LDFLAGS, and -# PLATFORM_TRIO_LIBS to LIBS. For more information on -# trio, see http://sourceforge.net/projects/ctrio/ # xt Build with Xt (X11 Toolkit) support. # fl Build with FlTk (Fast Light Toolkit) support. # tk Build with Tk (Tcl/Tk) support. @@ -462,18 +458,6 @@ ifeq ($(threads),0) override threads = endif # threads -trio ?= -ifeq ($(trio),0) - override trio = -endif # trio - -ifdef trio - CPPFLAGS += -DACE_HAS_TRIO $(PLATFORM_TRIO_CPPFLAGS) - LDFLAGS += $(PLATFORM_TRIO_LDFLAGS) - LIBS += -ltrio $(PLATFORM_TRIO_LIBS) - ACE_MAKE_OPTIONS += trio -endif # trio - # ace_for_tao subsetting is disabled by default. ace_for_tao ?= ifeq ($(ace_for_tao),0) @@ -557,7 +541,7 @@ endif rapi ?= ifeq ($(rapi),0) - override rapi = + override rapi = endif #rapi ifneq ($(rapi),) @@ -574,9 +558,9 @@ endif #rapi # if any sctp implementation is present then add ifneq ($(sctp),) - CPPFLAGS += -DACE_HAS_SCTP $(PLATFORM_SCTP_CPPFLAGS) - LDFLAGS += $(PLATFORM_SCTP_LDFLAGS) - LIBS += $(PLATFORM_SCTP_LIBS) + CPPFLAGS += -DACE_HAS_SCTP $(PLATFORM_SCTP_CPPFLAGS) + LDFLAGS += $(PLATFORM_SCTP_LDFLAGS) + LIBS += $(PLATFORM_SCTP_LIBS) ACE_MAKE_OPTIONS += sctp endif @@ -602,21 +586,17 @@ else ACE_MAKE_OPTIONS += ssl endif endif - -## These are related to MPC. When 'requires' is used in a project -## it controls whether or not the project is generated. There is also -## a second level of control in platform macros and thus requires -## some features to be set here as well. ec_typed_events ?= 1 -zlib ?= 1 ifeq ($(exceptions),0) + ifeq ($(ACE_HAS_GNUG_PRE_2_8),0) #### Disable the default exception handling of g++ >= 2.8.0. ifneq ($(ACE_GNUG_ON_UNIXWARE),) CCFLAGS += -fcheck-new else CCFLAGS += -fno-exceptions -fcheck-new endif # ! ACE_GNUG_ON_UNIXWARE + endif # ! ACE_HAS_GNUG_PRE_2_8 else # exceptions CPPFLAGS += -DACE_HAS_EXCEPTIONS ifndef include_env @@ -625,6 +605,17 @@ else # exceptions ifeq ($(include_env),1) CPPFLAGS += -DACE_ENV_BKWD_COMPAT endif + ifeq ($(ACE_HAS_GNUG_PRE_2_8),1) + #### Enable exception handling with g++ < 2.8.0. Not recommended, + #### but provided here for completeness. + CCFLAGS += -fhandle-exceptions +# else # ! ACE_HAS_GNUG_PRE_2_8 +# ifeq ($(ACE_HAS_GNUG_PRE_2_8),0) +# #### Disable this warning on g++ >= 2.8.0 if exceptions are enabled, +# #### it gets confused and reports too many bogus warnings. +# CCFLAGS += -Wno-uninitialized +# endif # g++ > 2.8.0 + endif # ! ACE_HAS_GNUG_PRE_2_8 ACE_MAKE_OPTIONS += exceptions endif # exceptions diff --git a/ACE/m4/ace.m4 b/ACE/m4/ace.m4 index 4d91810008d..96b7d334767 100644 --- a/ACE/m4/ace.m4 +++ b/ACE/m4/ace.m4 @@ -487,12 +487,6 @@ AC_DEFUN([ACE_CONFIGURATION_OPTIONS], ACE_ENABLE_TK_REACTOR ACE_ENABLE_XT_REACTOR - # placeholder for WxWindows/wxWidgets support - AM_CONDITIONAL([BUILD_WXWINDOWS], false) - - ACE_PATH_ZLIB - ACE_PATH_ZZIP - AC_ARG_ENABLE([gperf], AS_HELP_STRING(--enable-gperf,compile the gperf program [[[yes]]]), [ @@ -625,7 +619,6 @@ AC_DEFUN([ACE_CONFIGURATION_OPTIONS], ACE_ENABLE_CDR_SWAP_ON_READ ACE_ENABLE_CDR_SWAP_ON_WRITE ACE_ENABLE_CDR_ALIGNMENT - ACE_ENABLE_REACTOR_NOTIFICATION_QUEUE ACE_ENABLE_STRDUP_EMULATION ACE_ENABLE_WCSDUP_EMULATION ]) @@ -1010,32 +1003,6 @@ if test X$ace_user_cdr_alignment = Xno; then fi ]) -# ACE_ENABLE_REACTOR_NOTIFICATION_QUEUE -#--------------------------------------------------------------------------- -AC_DEFUN([ACE_ENABLE_REACTOR_NOTIFICATION_QUEUE], -[AC_ARG_ENABLE([ace-reactor-notification-queue], - AS_HELP_STRING([--enable-ace-reactor-notification-queue], - [configure Reactor to use a user-space queue for notifications [[no]]]), - [case "${enableval}" in - yes) - ace_user_reactor_notification_queue=yes - ;; - no) - ace_user_reactor_notification_queue=no - ;; - *) - AC_MSG_ERROR(bad value ${enableval} for --enable-ace-reactor-notification-queue) - ;; - esac],[ - ace_user_reactor_notification_queue=no - ]) -if test X$ace_user_reactor_notification_queue = Xyes; then - AC_DEFINE([ACE_HAS_REACTOR_NOTIFICATION_QUEUE], 1, - [Define to 1 to configure Reactor to use a user-space queue for notifications]) -fi -]) - - # ACE_ENABLE_STRDUP_EMULATION #--------------------------------------------------------------------------- AC_DEFUN([ACE_ENABLE_STRDUP_EMULATION], @@ -1317,115 +1284,6 @@ AM_CONDITIONAL([BUILD_X11], [test X$no_x != Xyes]) ]) -# ACE_PATH_ZLIB -#--------------------------------------------------------------------------- -# Find zlib Libraries, flags, etc. -AC_DEFUN([ACE_PATH_ZLIB], -[ -ACE_ZLIB_CPPFLAGS="" -ACE_ZLIB_LDFLAGS="" - -dnl TODO: default to false, at least until we add a check to see if -dnl the zlib library is usable. -AC_ARG_WITH([zlib], - AS_HELP_STRING([--with-zlib@<:@=DIR@:>@], - [root directory of zlib installation]), - [ - ace_with_zlib="${withval}" - if test "${ace_with_zlib}" != yes; then - ace_zlib_include="${ace_with_zlib}/include" - ace_zlib_libdir="${ace_with_zlib}/lib" - fi - ],[ace_with_zlib=no]) - -dnl TODO: let's wait and see before adding options to specify header -dnl and library location separately. -dnl -dnl AC_ARG_WITH([zlib_include], -dnl AS_HELP_STRING([--with-zlib-include=DIR], -dnl [specify exact include dir for zlib headers]), -dnl [ace_zlib_include="$withval"]) -dnl -dnl AC_ARG_WITH([zlib_libdir], -dnl AS_HELP_STRING([--with-zlib-libdir=DIR], -dnl [specify exact include dir for zlib libraries]), -dnl [ace_zlib_libdir="$withval"]) - -if test "${ace_zlib_include}"; then - ACE_ZLIB_CPPFLAGS="-I$ace_zlib_include" -fi - -if test "${ace_zlib_libdir}"; then - ACE_ZLIB_LDFLAGS="-L$ace_zlib_libdir" -fi - -ACE_ZLIB_CPPFLAGS="${ACE_ZLIB_CPPFLAGS} -DZLIB" - -if test "${ace_with_zlib}" != no; then - ACE_ZLIB_LIBS="-lz" - AC_SUBST(ACE_ZLIB_CPPFLAGS) - AC_SUBST(ACE_ZLIB_LDFLAGS) - AC_SUBST(ACE_ZLIB_LIBS) -fi -AM_CONDITIONAL([BUILD_ZLIB], test "${ace_with_zlib}" != no) -]) - - -# ACE_PATH_ZZIP -#--------------------------------------------------------------------------- -# Find zziplib Libraries, flags, etc. -AC_DEFUN([ACE_PATH_ZZIP], -[AC_REQUIRE([ACE_PATH_ZLIB]) - -ACE_ZZIP_CPPFLAGS="" -ACE_ZZIP_LDFLAGS="" - -dnl TODO: default to false, at least until we add a check to see if -dnl the zlib library is usable. -AC_ARG_WITH([zzip], - AS_HELP_STRING([--with-zzip@<:@=DIR@:>@], - [root directory of zzip installation]), - [ - ace_with_zzip="${withval}" - if test "${ace_with_zzip}" != yes; then - ace_zzip_include="${ace_with_zzip}/include" - ace_zzip_libdir="${ace_with_zzip}/lib" - fi - ],[ace_with_zzip=no]) - -dnl TODO: let's wait and see before adding options to specify header -dnl and library location separately. -dnl -dnl AC_ARG_WITH([zzip_include], -dnl AS_HELP_STRING([--with-zzip-include=DIR], -dnl [specify exact include dir for zzip headers]), -dnl [ace_zzip_include="$withval"]) -dnl -dnl AC_ARG_WITH([zzip_libdir], -dnl AS_HELP_STRING([--with-zzip-libdir=DIR], -dnl [specify exact include dir for zzip libraries]), -dnl [ace_zzip_libdir="$withval"]) - -if test "${ace_zzip_include}"; then - ACE_ZZIP_CPPFLAGS="-I$ace_zzip_include" -fi - -if test "${ace_zzip_libdir}"; then - ACE_ZZIP_LDFLAGS="-L$ace_zzip_libdir" -fi - -ACE_ZZIP_CPPFLAGS="${ACE_ZZIP_CPPFLAGS} -DUSE_ZZIP" - -if test "${ace_with_zzip}" != no; then - ACE_ZZIP_LIBS="-lzzip" - AC_SUBST(ACE_ZZIP_CPPFLAGS) - AC_SUBST(ACE_ZZIP_LDFLAGS) - AC_SUBST(ACE_ZZIP_LIBS) -fi -AM_CONDITIONAL([BUILD_ZZIP], test "${ace_with_zzip}" != no) -]) - - # ACE_ENABLE_FL_REACTOR #--------------------------------------------------------------------------- AC_DEFUN([ACE_ENABLE_FL_REACTOR], @@ -1559,5 +1417,3 @@ AM_CONDITIONAL([BUILD_ACE_XTREACTOR], AM_CONDITIONAL([BUILD_TAO_XTRESOURCE], [test X$ace_user_enable_xt_reactor = Xyes]) ]) - - diff --git a/ACE/m4/config_h.m4 b/ACE/m4/config_h.m4 index 20f03f2be12..09a7dbac2b4 100644 --- a/ACE/m4/config_h.m4 +++ b/ACE/m4/config_h.m4 @@ -573,6 +573,16 @@ AH_TEMPLATE([ACE_AUTO_PTR_LACKS_RESET], [Compiler/platform standard C++ auto_ptr implementation lacks reset() method]) +AH_TEMPLATE([ACE_LACKS_CMSG_DATA_MACRO], +[Platform has ACE_HAS_4_4BSD_SENDMSG_RECVMSG but does not define + CMSG_DATA (cmsg) macro.]) + +AH_TEMPLATE([ACE_LACKS_CMSG_DATA_MEMBER], +[Platform has ACE_HAS_4_4BSD_SENDMSG_RECVMSG but its cmsghdr + structure does not contain an 'unsigned char cmsg_data[0]' member. + (This may be 'unsigned char __cmsg_data[0]' on some platforms, in + which case we need another macro.)]) + AH_TEMPLATE([ACE_LACKS_READDIR_R],[Platform lacks readdir_r()]) AH_TEMPLATE([ACE_LACKS_INLINE_FUNCTIONS], @@ -593,7 +603,6 @@ AH_TEMPLATE([ACE_HAS_SEMUN], [Compiler/platform defines a union semun for SysV shared memory ]) AH_TEMPLATE([ACE_HAS_SHM_OPEN],[Platform has shm_open()]) -AH_TEMPLATE([ACE_SHM_OPEN_REQUIRES_ONE_SLASH],[shm_open() requires a leading slash in name]) AH_TEMPLATE([ACE_HAS_SIGISMEMBER_BUG], [Platform has bug with sigismember() (HP/UX 11).]) @@ -731,6 +740,9 @@ AH_TEMPLATE([ACE_HAS_TSS_EMULATION], AH_TEMPLATE([ACE_HAS_UCONTEXT_T], [Platform supports ucontext_t (which is used in the extended signal API).]) +AH_TEMPLATE([ACE_HAS_UNION_WAIT], +[The wait() system call takes a (union wait *) rather than int *]) + AH_TEMPLATE([ACE_HAS_UNIXWARE_SVR4_SIGNAL_T], [Has inconsistent SVR4 signal stuff, but not the same as the other platforms]) @@ -960,8 +972,6 @@ AH_TEMPLATE([ACE_LACKS_CHAR_STAR_RIGHT_SHIFTS], [Compiler does not have operator>> (istream &, u_char *) or operator>> (istream &, signed char *)]) -AH_TEMPLATE([ACE_LACKS_NUMERIC_LIMITS],[Platform lacks std::numeric_limits<>]) - AH_TEMPLATE([ACE_LACKS_UNIX_DOMAIN_SOCKETS], [ACE platform has no UNIX domain sockets]) diff --git a/ACE/netsvcs/Makefile.am b/ACE/netsvcs/Makefile.am index d4bf0e1c092..422221e4029 100644 --- a/ACE/netsvcs/Makefile.am +++ b/ACE/netsvcs/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ lib \ diff --git a/ACE/netsvcs/clients/Logger/Makefile.am b/ACE/netsvcs/clients/Logger/Makefile.am index e5877d7e6f2..8c3ae8decb3 100644 --- a/ACE/netsvcs/clients/Logger/Makefile.am +++ b/ACE/netsvcs/clients/Logger/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -16,7 +16,6 @@ noinst_PROGRAMS = ## Makefile.direct_logging.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += direct_logging direct_logging_CPPFLAGS = \ @@ -35,7 +34,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.indirect_logging.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += indirect_logging indirect_logging_CPPFLAGS = \ diff --git a/ACE/netsvcs/clients/Makefile.am b/ACE/netsvcs/clients/Makefile.am index 5d7b4bd7e99..c959505ff73 100644 --- a/ACE/netsvcs/clients/Makefile.am +++ b/ACE/netsvcs/clients/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ Logger \ diff --git a/ACE/netsvcs/clients/Naming/Client/Makefile.am b/ACE/netsvcs/clients/Naming/Client/Makefile.am index 7298e846310..548b9be4a8e 100644 --- a/ACE/netsvcs/clients/Naming/Client/Makefile.am +++ b/ACE/netsvcs/clients/Naming/Client/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -34,7 +34,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Netsvcs_Client_Test.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS = main main_CPPFLAGS = \ diff --git a/ACE/netsvcs/clients/Naming/Dump_Restore/Makefile.am b/ACE/netsvcs/clients/Naming/Dump_Restore/Makefile.am index 0d0cced7cb4..38ed1977b42 100644 --- a/ACE/netsvcs/clients/Naming/Dump_Restore/Makefile.am +++ b/ACE/netsvcs/clients/Naming/Dump_Restore/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -34,7 +34,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Netsvcs_Dump_Restore.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS = main main_CPPFLAGS = \ diff --git a/ACE/netsvcs/clients/Naming/Makefile.am b/ACE/netsvcs/clients/Naming/Makefile.am index ad4d7a0b8af..883b9bab54d 100644 --- a/ACE/netsvcs/clients/Naming/Makefile.am +++ b/ACE/netsvcs/clients/Naming/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ Client \ diff --git a/ACE/netsvcs/clients/Tokens/collection/Makefile.am b/ACE/netsvcs/clients/Tokens/collection/Makefile.am index d2aa7bf8c1b..9d3fbcc5ddd 100644 --- a/ACE/netsvcs/clients/Tokens/collection/Makefile.am +++ b/ACE/netsvcs/clients/Tokens/collection/Makefile.am @@ -15,4 +15,4 @@ noinst_PROGRAMS = \ collection_SOURCES = collection.cpp collection_LDADD = $(top_builddir)/netsvcs/lib/libnetsvcs.la \ - $(top_builddir)/ace/$(ACE_BUILDDIR)/ace/libACE.la + $(top_builddir)/ace/libACE.la diff --git a/ACE/netsvcs/clients/Tokens/deadlock/Makefile.am b/ACE/netsvcs/clients/Tokens/deadlock/Makefile.am index 5e25ccd0fb3..d995e71620b 100644 --- a/ACE/netsvcs/clients/Tokens/deadlock/Makefile.am +++ b/ACE/netsvcs/clients/Tokens/deadlock/Makefile.am @@ -16,4 +16,4 @@ noinst_PROGRAMS = \ deadlock_detection_test_SOURCES = deadlock_detection_test.cpp deadlock_detection_test_LDADD = \ $(top_builddir)/netsvcs/lib/libnetsvcs.la \ - $(top_builddir)/ace/$(ACE_BUILDDIR)/ace/libACE.la + $(top_builddir)/ace/libACE.la diff --git a/ACE/netsvcs/clients/Tokens/invariant/Makefile.am b/ACE/netsvcs/clients/Tokens/invariant/Makefile.am index 83b621b5a42..37817911015 100644 --- a/ACE/netsvcs/clients/Tokens/invariant/Makefile.am +++ b/ACE/netsvcs/clients/Tokens/invariant/Makefile.am @@ -16,5 +16,5 @@ noinst_PROGRAMS = \ invariant_SOURCES = invariant.cpp invariant_LDADD = \ $(top_builddir)/netsvcs/lib/libnetsvcs.la \ - $(top_builddir)/ace/$(ACE_BUILDDIR)/ace/libACE.la + $(top_builddir)/ace/libACE.la diff --git a/ACE/netsvcs/clients/Tokens/manual/Makefile.am b/ACE/netsvcs/clients/Tokens/manual/Makefile.am index 4a2cbf60788..b2945a96bd3 100644 --- a/ACE/netsvcs/clients/Tokens/manual/Makefile.am +++ b/ACE/netsvcs/clients/Tokens/manual/Makefile.am @@ -16,7 +16,7 @@ noinst_PROGRAMS = \ manual_SOURCES = manual.cpp manual_LDADD = \ $(top_builddir)/netsvcs/lib/libnetsvcs.la \ - $(top_builddir)/ace/$(ACE_BUILDDIR)/ace/libACE.la + $(top_builddir)/ace/libACE.la ## Clean up template repositories, etc. clean-local: diff --git a/ACE/netsvcs/clients/Tokens/mutex/Makefile.am b/ACE/netsvcs/clients/Tokens/mutex/Makefile.am index 56dd1efccf2..63d02af7d97 100644 --- a/ACE/netsvcs/clients/Tokens/mutex/Makefile.am +++ b/ACE/netsvcs/clients/Tokens/mutex/Makefile.am @@ -16,6 +16,6 @@ noinst_PROGRAMS = \ test_mutex_SOURCES = test_mutex.cpp test_mutex_LDADD = \ $(top_builddir)/netsvcs/lib/libnetsvcs.la \ - $(top_builddir)/ace/$(ACE_BUILDDIR)/ace/libACE.la + $(top_builddir)/ace/libACE.la diff --git a/ACE/netsvcs/clients/Tokens/rw_lock/Makefile.am b/ACE/netsvcs/clients/Tokens/rw_lock/Makefile.am index 972d8a64faa..265a3a09558 100644 --- a/ACE/netsvcs/clients/Tokens/rw_lock/Makefile.am +++ b/ACE/netsvcs/clients/Tokens/rw_lock/Makefile.am @@ -16,5 +16,5 @@ noinst_PROGRAMS = \ rw_locks_SOURCES = rw_locks.cpp rw_locks_LDADD = \ $(top_builddir)/netsvcs/lib/libnetsvcs.la \ - $(top_builddir)/ace/$(ACE_BUILDDIR)/ace/libACE.la + $(top_builddir)/ace/libACE.la diff --git a/ACE/netsvcs/lib/Makefile.am b/ACE/netsvcs/lib/Makefile.am index 54b8ed75617..7614800dc4e 100644 --- a/ACE/netsvcs/lib/Makefile.am +++ b/ACE/netsvcs/lib/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/netsvcs/servers/Makefile.am b/ACE/netsvcs/servers/Makefile.am index 576581b8be5..ded1ad91998 100644 --- a/ACE/netsvcs/servers/Makefile.am +++ b/ACE/netsvcs/servers/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -15,7 +15,6 @@ ACE_ROOT = $(top_srcdir) ## Makefile.Netsvcs_server.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS = main main_CPPFLAGS = \ diff --git a/ACE/performance-tests/Makefile.am b/ACE/performance-tests/Makefile.am index 8893d7354cb..1aac8a5c388 100644 --- a/ACE/performance-tests/Makefile.am +++ b/ACE/performance-tests/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ Misc \ diff --git a/ACE/performance-tests/Misc/Makefile.am b/ACE/performance-tests/Misc/Makefile.am index e454644170b..d6b7af67f43 100644 --- a/ACE/performance-tests/Misc/Makefile.am +++ b/ACE/performance-tests/Misc/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -16,7 +16,6 @@ noinst_PROGRAMS = ## Makefile.Misc_Basic_Perf.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += basic_perf basic_perf_CPPFLAGS = \ @@ -36,7 +35,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Misc_Childbirth_Time.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += childbirth_time childbirth_time_CPPFLAGS = \ @@ -56,7 +54,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Misc_Context_Switch_Time.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += context_switch_time context_switch_time_CPPFLAGS = \ @@ -74,7 +71,6 @@ context_switch_time_LDADD = \ endif !BUILD_ACE_FOR_TAO ## Makefile.Misc_Preempt.am - noinst_PROGRAMS += preempt preempt_CPPFLAGS = \ @@ -92,7 +88,6 @@ preempt_LDADD = \ ## Makefile.Misc_Test_Mutex.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += test_mutex test_mutex_CPPFLAGS = \ @@ -112,7 +107,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Misc_Test_Naming.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += test_naming test_naming_CPPFLAGS = \ @@ -132,7 +126,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Misc_Test_Singleton.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += test_singleton test_singleton_CPPFLAGS = \ diff --git a/ACE/performance-tests/SCTP/Makefile.am b/ACE/performance-tests/SCTP/Makefile.am index 31ae3d50200..8532440e3f6 100644 --- a/ACE/performance-tests/SCTP/Makefile.am +++ b/ACE/performance-tests/SCTP/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -16,7 +16,6 @@ noinst_PROGRAMS = ## Makefile.SCTP_SOCK_SEQPACK_Association_Test.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += SOCK_SEQPACK_Association_Test SOCK_SEQPACK_Association_Test_CPPFLAGS = \ @@ -36,7 +35,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.SCTP_SOCK_SEQPACK_Clt.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += SOCK_SEQPACK_clt SOCK_SEQPACK_clt_CPPFLAGS = \ @@ -58,7 +56,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.SCTP_SOCK_SEQPACK_Srv.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += SOCK_SEQPACK_srv SOCK_SEQPACK_srv_CPPFLAGS = \ @@ -78,7 +75,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.SCTP_SOCK_STREAM_Clt.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += SOCK_STREAM_clt SOCK_STREAM_clt_CPPFLAGS = \ @@ -98,7 +94,6 @@ SOCK_STREAM_clt_LDADD = \ endif !BUILD_ACE_FOR_TAO ## Makefile.SCTP_SOCK_STREAM_Srv.am - noinst_PROGRAMS += SOCK_STREAM_srv SOCK_STREAM_srv_CPPFLAGS = \ diff --git a/ACE/performance-tests/Server_Concurrency/Leader_Follower/Makefile.am b/ACE/performance-tests/Server_Concurrency/Leader_Follower/Makefile.am index f4369f7ad34..38021abd626 100644 --- a/ACE/performance-tests/Server_Concurrency/Leader_Follower/Makefile.am +++ b/ACE/performance-tests/Server_Concurrency/Leader_Follower/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -16,7 +16,6 @@ noinst_PROGRAMS = ## Makefile.Svr_Conc_Leader_Follower.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += leader_follower leader_follower_CPPFLAGS = \ @@ -35,7 +34,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Svr_Conc_Leader_Follower_RT_CORBA.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += RT_CORBA_Leader_Follower RT_CORBA_Leader_Follower_CPPFLAGS = \ diff --git a/ACE/performance-tests/Server_Concurrency/Makefile.am b/ACE/performance-tests/Server_Concurrency/Makefile.am index 5d8482ab96d..9a5b0c57e66 100644 --- a/ACE/performance-tests/Server_Concurrency/Makefile.am +++ b/ACE/performance-tests/Server_Concurrency/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ Leader_Follower \ diff --git a/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/Makefile.am b/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/Makefile.am index a2573d401c8..feb7783689d 100644 --- a/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/Makefile.am +++ b/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -16,7 +16,6 @@ noinst_PROGRAMS = ## Makefile.Svr_Conc_Queue_Based_Workers.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += workers workers_CPPFLAGS = \ @@ -35,7 +34,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Svr_Conc_Queue_Based_Workers_RTCorba.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += RT_CORBA_Workers RT_CORBA_Workers_CPPFLAGS = \ diff --git a/ACE/performance-tests/Synch-Benchmarks/Base_Test/Makefile.am b/ACE/performance-tests/Synch-Benchmarks/Base_Test/Makefile.am index f5f4158d270..b050480b9bc 100644 --- a/ACE/performance-tests/Synch-Benchmarks/Base_Test/Makefile.am +++ b/ACE/performance-tests/Synch-Benchmarks/Base_Test/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -16,27 +16,18 @@ ACE_ROOT = $(top_srcdir) if !BUILD_ACE_FOR_TAO -noinst_LTLIBRARIES = libBase_Test.la +noinst_LTLIBRARIES = libSynch_Benchmarks_Base_Test.la -libBase_Test_la_CPPFLAGS = \ +libSynch_Benchmarks_Base_Test_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(srcdir)/.. -libBase_Test_la_SOURCES = \ +libSynch_Benchmarks_Base_Test_la_SOURCES = \ Baseline_Test.cpp \ base_test.cpp \ mutex_test.cpp -../Synch_Lib: - mkdir -p ../Synch_Lib - -libBase_Test_la_DEPENDENCIES = \ - ../Synch_Lib - -libBase_Test_la_LDFLAGS = \ - -L../Synch_Lib - noinst_HEADERS = \ Baseline_Test.h \ Baseline_Test.inl diff --git a/ACE/performance-tests/Synch-Benchmarks/Base_Test/Synch_Benchmarks_Base_Test.mpc b/ACE/performance-tests/Synch-Benchmarks/Base_Test/Synch_Benchmarks_Base_Test.mpc index 47d16a47bb3..7b0de88e4c9 100644 --- a/ACE/performance-tests/Synch-Benchmarks/Base_Test/Synch_Benchmarks_Base_Test.mpc +++ b/ACE/performance-tests/Synch-Benchmarks/Base_Test/Synch_Benchmarks_Base_Test.mpc @@ -7,10 +7,5 @@ project : acelib { after += Synch_Lib libs += Synch_Lib libpaths += ../Synch_Lib - - specific (automake) { - includes += $(srcdir)/.. - } else { - includes += .. - } + includes += .. } diff --git a/ACE/performance-tests/Synch-Benchmarks/Makefile.am b/ACE/performance-tests/Synch-Benchmarks/Makefile.am index 068a35d9c61..f0272750af1 100644 --- a/ACE/performance-tests/Synch-Benchmarks/Makefile.am +++ b/ACE/performance-tests/Synch-Benchmarks/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -18,7 +18,6 @@ SUBDIRS = \ . ## Makefile.Synch_Benchmarks.am - noinst_PROGRAMS = synch_driver synch_driver_CPPFLAGS = \ @@ -28,9 +27,6 @@ synch_driver_CPPFLAGS = \ synch_driver_SOURCES = \ synch_driver.cpp -synch_driver_LDFLAGS = \ - -LSynch_Lib - synch_driver_LDADD = \ $(top_builddir)/performance-tests/Synch-Benchmarks/Synch_Lib/libSynch_Lib.la \ $(ACE_BUILDDIR)/ace/libACE.la diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Makefile.am b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Makefile.am index ac4f8fc9a00..99d37c3aa72 100644 --- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Makefile.am +++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -16,14 +16,14 @@ ACE_ROOT = $(top_srcdir) if !BUILD_ACE_FOR_TAO -noinst_LTLIBRARIES = libPerf_Test.la +noinst_LTLIBRARIES = libSynch_Benchmarks_Perf_Test.la -libPerf_Test_la_CPPFLAGS = \ +libSynch_Benchmarks_Perf_Test_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ -I$(srcdir)/.. -libPerf_Test_la_SOURCES = \ +libSynch_Benchmarks_Perf_Test_la_SOURCES = \ Adaptive_Lock_Performance_Test_Base.cpp \ Benchmark_Performance.cpp \ Performance_Test.cpp \ @@ -46,15 +46,6 @@ libPerf_Test_la_SOURCES = \ sysvsema_test.cpp \ token_test.cpp -../Synch_Lib: - mkdir -p ../Synch_Lib - -libPerf_Test_la_DEPENDENCIES = \ - ../Synch_Lib - -libPerf_Test_la_LDFLAGS = \ - -L../Synch_Lib - noinst_HEADERS = \ Adaptive_Lock_Performance_Test_Base.h \ Benchmark_Performance.h \ diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Synch_Benchmarks_Perf_Test.mpc b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Synch_Benchmarks_Perf_Test.mpc index a76c10f94ee..f6a879deacd 100644 --- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Synch_Benchmarks_Perf_Test.mpc +++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Synch_Benchmarks_Perf_Test.mpc @@ -7,10 +7,5 @@ project : acelib { after += Synch_Lib libs += Synch_Lib libpaths += ../Synch_Lib - - specific (automake) { - includes += $(srcdir)/.. - } else { - includes += .. - } + includes += .. } diff --git a/ACE/performance-tests/Synch-Benchmarks/Synch_Lib/Makefile.am b/ACE/performance-tests/Synch-Benchmarks/Synch_Lib/Makefile.am index 673ec4a0155..05c71adde0c 100644 --- a/ACE/performance-tests/Synch-Benchmarks/Synch_Lib/Makefile.am +++ b/ACE/performance-tests/Synch-Benchmarks/Synch_Lib/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/performance-tests/TCP/Makefile.am b/ACE/performance-tests/TCP/Makefile.am index 828ad0bbbb5..3ebae23da8e 100644 --- a/ACE/performance-tests/TCP/Makefile.am +++ b/ACE/performance-tests/TCP/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -15,7 +15,6 @@ ACE_ROOT = $(top_srcdir) ## Makefile.TCP.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS = tcp_test tcp_test_CPPFLAGS = \ diff --git a/ACE/performance-tests/UDP/Makefile.am b/ACE/performance-tests/UDP/Makefile.am index 011333ed50e..e9dc7db03f2 100644 --- a/ACE/performance-tests/UDP/Makefile.am +++ b/ACE/performance-tests/UDP/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -15,7 +15,6 @@ ACE_ROOT = $(top_srcdir) ## Makefile.UDP.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS = udp_test udp_test_CPPFLAGS = \ diff --git a/ACE/protocols/Makefile.am b/ACE/protocols/Makefile.am index 3547585e9d1..4c77b57e08a 100644 --- a/ACE/protocols/Makefile.am +++ b/ACE/protocols/Makefile.am @@ -9,13 +9,7 @@ ## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ - ace - -if BUILD_EXAMPLES -SUBDIRS += examples -endif - -if BUILD_TESTS -SUBDIRS += tests -endif + ace \ + examples \ + tests diff --git a/ACE/protocols/ace/HTBP/HTBP.mpc b/ACE/protocols/ace/HTBP/HTBP.mpc index 4684bb8fee1..ada3fc8530d 100644 --- a/ACE/protocols/ace/HTBP/HTBP.mpc +++ b/ACE/protocols/ace/HTBP/HTBP.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(HTBP) : acelib, install { +project(HTBP) : acelib, core { avoids += ace_for_tao sharedname = ACE_HTBP dynamicflags = HTBP_BUILD_DLL diff --git a/ACE/protocols/ace/HTBP/Makefile.am b/ACE/protocols/ace/HTBP/Makefile.am index bd824576b86..7c777cfec2b 100644 --- a/ACE/protocols/ace/HTBP/Makefile.am +++ b/ACE/protocols/ace/HTBP/Makefile.am @@ -6,9 +6,9 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu -includedir = @includedir@/ace/HTBP +includedir = @includedir@/protocols/ace/HTBP pkgconfigdir = @libdir@/pkgconfig ACE_BUILDDIR = $(top_builddir) @@ -72,7 +72,7 @@ CLEANFILES = \ ACE_HTBP.pc ACE_HTBP.pc: ${top_builddir}/config.status ${srcdir}/ACE_HTBP.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/ACE_HTBP.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/ACE_HTBP.pc.in endif !BUILD_ACE_FOR_TAO diff --git a/ACE/protocols/ace/Makefile.am b/ACE/protocols/ace/Makefile.am index c476b3583bc..d62d1164dcc 100644 --- a/ACE/protocols/ace/Makefile.am +++ b/ACE/protocols/ace/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ HTBP \ diff --git a/ACE/protocols/ace/RMCast/Makefile.am b/ACE/protocols/ace/RMCast/Makefile.am index 51e73d4041e..3859cf8563f 100644 --- a/ACE/protocols/ace/RMCast/Makefile.am +++ b/ACE/protocols/ace/RMCast/Makefile.am @@ -6,9 +6,9 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu -includedir = @includedir@/ace/RMCast +includedir = @includedir@/protocols/ace/RMCast pkgconfigdir = @libdir@/pkgconfig ACE_BUILDDIR = $(top_builddir) @@ -67,7 +67,7 @@ CLEANFILES = \ ACE_RMCast.pc ACE_RMCast.pc: ${top_builddir}/config.status ${srcdir}/ACE_RMCast.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/ACE_RMCast.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/ACE_RMCast.pc.in endif !BUILD_ACE_FOR_TAO endif BUILD_THREADS diff --git a/ACE/protocols/ace/RMCast/RMCast.mpc b/ACE/protocols/ace/RMCast/RMCast.mpc index 98ada5b3d6c..f77bd4d942c 100644 --- a/ACE/protocols/ace/RMCast/RMCast.mpc +++ b/ACE/protocols/ace/RMCast/RMCast.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(RMCast) : acelib, install, threads { +project(RMCast) : acelib, core, threads { avoids = ace_for_tao sharedname = ACE_RMCast dynamicflags = ACE_RMCAST_BUILD_DLL diff --git a/ACE/protocols/ace/TMCast/Makefile.am b/ACE/protocols/ace/TMCast/Makefile.am index c524083fd92..13f369142f4 100644 --- a/ACE/protocols/ace/TMCast/Makefile.am +++ b/ACE/protocols/ace/TMCast/Makefile.am @@ -6,9 +6,9 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu -includedir = @includedir@/ace/TMCast +includedir = @includedir@/protocols/ace/TMCast pkgconfigdir = @libdir@/pkgconfig ACE_BUILDDIR = $(top_builddir) @@ -57,7 +57,7 @@ CLEANFILES = \ ACE_TMCast.pc ACE_TMCast.pc: ${top_builddir}/config.status ${srcdir}/ACE_TMCast.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/ACE_TMCast.pc.in + ${top_builddir}/config.status --file "$@":${srcdir}/ACE_TMCast.pc.in endif !BUILD_ACE_FOR_TAO endif BUILD_THREADS diff --git a/ACE/protocols/ace/TMCast/TMCast.mpc b/ACE/protocols/ace/TMCast/TMCast.mpc index 7e09cb3e822..1ff937a0a1a 100644 --- a/ACE/protocols/ace/TMCast/TMCast.mpc +++ b/ACE/protocols/ace/TMCast/TMCast.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : acelib, install, exceptions, threads { +project : acelib, core, exceptions, threads { avoids = ace_for_tao sharedname = ACE_TMCast dynamicflags += TMCAST_BUILD_DLL diff --git a/ACE/protocols/examples/Makefile.am b/ACE/protocols/examples/Makefile.am index b435d1c3fe2..fd0f6f9494d 100644 --- a/ACE/protocols/examples/Makefile.am +++ b/ACE/protocols/examples/Makefile.am @@ -6,9 +6,8 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ - RMCast \ - TMCast + RMCast diff --git a/ACE/protocols/examples/RMCast/Makefile.am b/ACE/protocols/examples/RMCast/Makefile.am index ef4f29c4f65..784d3215def 100644 --- a/ACE/protocols/examples/RMCast/Makefile.am +++ b/ACE/protocols/examples/RMCast/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ Send_Msg diff --git a/ACE/protocols/examples/RMCast/Send_Msg/Makefile.am b/ACE/protocols/examples/RMCast/Send_Msg/Makefile.am index eb9a09d771f..a49d0afa6c7 100644 --- a/ACE/protocols/examples/RMCast/Send_Msg/Makefile.am +++ b/ACE/protocols/examples/RMCast/Send_Msg/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/protocols/tests/Makefile.am b/ACE/protocols/tests/Makefile.am index 7bb6fdd829e..fd0f6f9494d 100644 --- a/ACE/protocols/tests/Makefile.am +++ b/ACE/protocols/tests/Makefile.am @@ -6,9 +6,8 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ - HTBP \ RMCast diff --git a/ACE/protocols/tests/RMCast/Makefile.am b/ACE/protocols/tests/RMCast/Makefile.am index dadabcac905..3c832d00c1c 100644 --- a/ACE/protocols/tests/RMCast/Makefile.am +++ b/ACE/protocols/tests/RMCast/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/tests/.cvsignore b/ACE/tests/.cvsignore new file mode 100755 index 00000000000..052901de3e2 --- /dev/null +++ b/ACE/tests/.cvsignore @@ -0,0 +1,306 @@ +ACE_Init_Test +ACE_Init_Test +ACE_Test +ACE_Test +ARGV_Test +ARGV_Test +Aio_Platform_Test +Aio_Platform_Test +Arg_Shifter_Test +Arg_Shifter_Test +Atomic_Op_Test +Atomic_Op_Test +Auto_IncDec_Test +Auto_IncDec_Test +Barrier_Test +Barrier_Test +Basic_Types_Test +Basic_Types_Test +Bound_Ptr_Test +Bound_Ptr_Test +Buffer_Stream_Test +Buffer_Stream_Test +Bug_1576_Regression_Test +Bug_1576_Regression_Test +CDR_Array_Test +CDR_Array_Test +CDR_File_Test +CDR_File_Test +CDR_Test +CDR_Test +Cache_Map_Manager_Test +Cache_Map_Manager_Test +Cached_Accept_Conn_Test +Cached_Accept_Conn_Test +Cached_Allocator_Test +Cached_Allocator_Test +Cached_Conn_Test +Cached_Conn_Test +Capabilities_Test +Capabilities_Test +Codecs_Test +Codecs_Test +Collection_Test +Collection_Test +Config_Test +Config_Test +Conn_Test +Conn_Test +DLL_Test +DLL_Test +DLList_Test +DLList_Test +Date_Time_Test +Date_Time_Test +Dev_Poll_Reactor_Test +Dev_Poll_Reactor_Test +Dirent_Test +Dirent_Test +Dynamic_Priority_Test +Dynamic_Priority_Test +Enum_Interfaces_Test +Enum_Interfaces_Test +Env_Value_Test +Env_Value_Test +FIFO_Test +FIFO_Test +FlReactor_Test +FlReactor_Test +Framework_Component_Test +Framework_Component_Test +Future_Set_Test +Future_Set_Test +Future_Test +Future_Test +Get_Opt_Test +Get_Opt_Test +Handle_Set_Test +Handle_Set_Test +Hash_Map_Bucket_Iterator_Test +Hash_Map_Bucket_Iterator_Test +Hash_Map_Manager_Test +Hash_Map_Manager_Test +High_Res_Timer_Test +High_Res_Timer_Test +INET_Addr_Test +INET_Addr_Test +INET_Addr_Test_IPV6 +INET_Addr_Test_IPV6 +IOStream_Test +IOStream_Test +Lazy_Map_Manager_Test +Lazy_Map_Manager_Test +Log_Msg_Test +Log_Msg_Test +Logging_Strategy_Test +Logging_Strategy_Test +MEM_Stream_Test +MEM_Stream_Test +MM_Shared_Memory_Test +MM_Shared_Memory_Test +MT_Reactor_Timer_Test +MT_Reactor_Timer_Test +MT_Reactor_Upcall_Test +MT_Reactor_Upcall_Test +MT_Reference_Counted_Event_Handler_Test +MT_Reference_Counted_Event_Handler_Test +MT_Reference_Counted_Notify_Test +MT_Reference_Counted_Notify_Test +MT_SOCK_Test +MT_SOCK_Test +Malloc_Test +Malloc_Test +Map_Manager_Test +Map_Manager_Test +Map_Test +Map_Test +Max_Default_Port_Test +Max_Default_Port_Test +Max_Default_Port_Test_IPV6 +Max_Default_Port_Test_IPV6 +Memcpy_Test +Mem_Map_Test +Mem_Map_Test +Message_Block_Test +Message_Block_Test +Message_Queue_Notifications_Test +Message_Queue_Notifications_Test +Message_Queue_Test +Message_Queue_Test +Message_Queue_Test_Ex +Message_Queue_Test_Ex +Multicast_Test +Multicast_Test +Multicast_Test_IPV6 +Multicast_Test_IPV6 +Multihomed_INET_Addr_Test +Multihomed_INET_Addr_Test +Multihomed_INET_Addr_Test_IPV6 +Multihomed_INET_Addr_Test_IPV6 +Naming_Test +Naming_Test +Network_Adapters_Test +Network_Adapters_Test +New_Fail_Test +New_Fail_Test +NonBlocking_Conn_Test +NonBlocking_Conn_Test +Notify_Performance_Test +Notify_Performance_Test +OS_Test +OS_Test +Object_Manager_Test +Object_Manager_Test +Obstack_Test +Obstack_Test +OrdMultiSet_Test +OrdMultiSet_Test +Pipe_Test +Pipe_Test +Priority_Buffer_Test +Priority_Buffer_Test +Priority_Reactor_Test +Priority_Reactor_Test +Priority_Task_Test +Priority_Task_Test +Proactor_Scatter_Gather_Test +Proactor_Scatter_Gather_Test +Proactor_Test +Proactor_Test +Proactor_Test_IPV6 +Proactor_Test_IPV6 +Proactor_Timer_Test +Proactor_Timer_Test +Process_Manager_Test +Process_Manager_Test +Process_Mutex_Test +Process_Mutex_Test +Process_Strategy_Test +Process_Strategy_Test +QtReactor_Test +QtReactor_Test +QtReactor_Test_moc.cpp +QtReactor_Test_moc.cpp +RB_Tree_Test +RB_Tree_Test +Reactor_Dispatch_Order_Test +Reactor_Dispatch_Order_Test +Reactor_Exceptions_Test +Reactor_Exceptions_Test +Reactor_Notification_Queue_Test +Reactor_Notification_Queue_Test +Reactor_Notify_Test +Reactor_Notify_Test +Reactor_Performance_Test +Reactor_Performance_Test +Reactor_Registration_Test +Reactor_Registration_Test +Reactor_Timer_Test +Reactor_Timer_Test +Reactors_Test +Reactors_Test +Reader_Writer_Test +Reader_Writer_Test +Recursive_Condition_Bug_Test +Recursive_Condition_Bug_Test +Recursive_Condition_Test +Recursive_Condition_Test +Recursive_Mutex_Test +Recursive_Mutex_Test +Refcounted_Auto_Ptr_Test +Refcounted_Auto_Ptr_Test +Reference_Counted_Event_Handler_Test +Reference_Counted_Event_Handler_Test +Reverse_Lock_Test +Reverse_Lock_Test +SOCK_Connector_Test +SOCK_Connector_Test +SOCK_Dgram_Bcast_Test +SOCK_Dgram_Bcast_Test +SOCK_Dgram_Test +SOCK_Dgram_Test +SOCK_SEQPACK_SCTP_Test +SOCK_SEQPACK_SCTP_Test +SOCK_Send_Recv_Test +SOCK_Send_Recv_Test +SOCK_Send_Recv_Test_IPV6 +SOCK_Send_Recv_Test_IPV6 +SOCK_Test +SOCK_Test +SOCK_Test_IPv6 +SOCK_Test_IPv6 +SPIPE_Test +SPIPE_Test +SString_Test +SString_Test +SV_Shared_Memory_Test +SV_Shared_Memory_Test +Semaphore_Test +Semaphore_Test +Service_Config_Test +Service_Config_Test +Signal_Test +Signal_Test +Sigset_Ops_Test +Sigset_Ops_Test +Simple_Message_Block_Test +Simple_Message_Block_Test +Svc_Handler_Test +Svc_Handler_Test +TP_Reactor_Test +TP_Reactor_Test +TSS_Static_Test +TSS_Static_Test +TSS_Test +TSS_Test +Task_Ex_Test +Task_Ex_Test +Task_Test +Task_Test +Thread_Manager_Test +Thread_Manager_Test +Thread_Mutex_Test +Thread_Mutex_Test +Thread_Pool_Reactor_Resume_Test +Thread_Pool_Reactor_Resume_Test +Thread_Pool_Reactor_Test +Thread_Pool_Reactor_Test +Thread_Pool_Test +Thread_Pool_Test +Time_Service_Test +Time_Service_Test +Time_Value_Test +Time_Value_Test +Timeprobe_Test +Timeprobe_Test +Timer_Cancellation_Test +Timer_Cancellation_Test +Timer_Queue_Reference_Counting_Test +Timer_Queue_Reference_Counting_Test +Timer_Queue_Test +Timer_Queue_Test +TkReactor_Test +TkReactor_Test +Token_Strategy_Test +Token_Strategy_Test +Tokens_Test +Tokens_Test +UPIPE_SAP_Test +UPIPE_SAP_Test +UUIDTest +UUIDTest +Unbounded_Set_Test +Unbounded_Set_Test_Ex +Unbounded_Set_Test_Ex +Upgradable_RW_Test +Upgradable_RW_Test +Vector_Test +Vector_Test +WFMO_Reactor_Test +WFMO_Reactor_Test +XtAthenaReactor_Test +XtAthenaReactor_Test +XtMotifReactor_Test +XtMotifReactor_Test +XtReactor_Test +test.reg diff --git a/ACE/tests/ARGV_Test.cpp b/ACE/tests/ARGV_Test.cpp index 0e7e18f52d8..bb06c6b8d31 100644 --- a/ACE/tests/ARGV_Test.cpp +++ b/ACE/tests/ARGV_Test.cpp @@ -21,51 +21,21 @@ #include "ace/Argv_Type_Converter.h" #include "test_config.h" -ACE_RCSID (tests, ARGV_Test, "$Id$") +ACE_RCSID(tests, ARGV_Test, "$Id$") static void -consume_arg (int argc, ACE_TCHAR *argv[]) +consume_arg (int &argc, ACE_TCHAR *argv[]) { ACE_Arg_Shifter arg_shifter (argc, argv); - if (arg_shifter.is_anything_left ()) + if (arg_shifter.is_anything_left ()) arg_shifter.consume_arg (1); // Once we initialize an arg_shifter, we must iterate through it all! - while ((arg_shifter.is_anything_left ())) + while ((arg_shifter.is_anything_left ())) arg_shifter.ignore_arg (1); } static int -test_simple_argv (ACE_TCHAR *argv[]) -{ - // From command line. - ACE_ARGV cl (argv); - - // My own stuff. - ACE_ARGV my; - - // Add to my stuff. - my.add (ACE_TEXT ("-ORBEndpoint iiop://localhost:12345")); - - // Combine the two (see the ace/ARGV.h constructors documentation). - ACE_ARGV a (cl.argv (), - my.argv ()); - - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("argc = %d\n"), - a.argc ())); - - // Print the contents of the combined <ACE_ARGV>. - for (int i = 0; i < a.argc (); i++) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT (" (%d) %s\n"), - i, - a.argv ()[i])); - - return 0; -} - -static int test_argv_type_converter (void) { char *argv[20]; @@ -95,7 +65,7 @@ test_argv_type_converter (void) consume_arg ( ct3.get_argc (), ct3.get_TCHAR_argv ()); } - { + { for (size_t i = 0; i < 4; i++) ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" (%d) %s\n"), @@ -103,7 +73,7 @@ test_argv_type_converter (void) ACE_TEXT_CHAR_TO_TCHAR (argv[i]))); } - for (size_t i = 0; save_argv[i]; ++i) + for (size_t i = 0; save_argv[i]; ++i) ACE_OS_Memory::free (save_argv[i]); return 0; @@ -130,146 +100,53 @@ test_argv_type_converter2 (void) consume_arg ( ct.get_argc (), ct.get_TCHAR_argv ()); } - consume_arg (argc, argv); + consume_arg ( argc, argv); { for (size_t i = 0; i < 4; i++) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT (" (%d) %s\n"), + ACE_TEXT (" (%d) %s\n"), i, argv[i])); } - for (size_t i = 0; save_argv[i]; ++i) + for (size_t i = 0; save_argv[i]; ++i) ACE_OS_Memory::free (save_argv[i]); return 0; } -static int -test_argv_buf (void) -{ - pid_t parent_pid = ACE_OS::getpid (); - - ACE_TCHAR *l_argv[3]; - ACE_TCHAR pid_str[100]; - // Store the parent's process id so we can pass it to the child - // portably. Also, pass the test number, as well. - ACE_OS::sprintf (pid_str, - ACE_TEXT ("-p %ld -t %d"), - static_cast <long> (parent_pid), - 1); - - // We're going to create a new process that runs this program again, - // so we need to indicate that it's the child. - const ACE_TCHAR *t = ACE_TEXT (".") - ACE_DIRECTORY_SEPARATOR_STR - ACE_TEXT ("Signal_Test") - ACE_PLATFORM_EXE_SUFFIX - ACE_TEXT (" -c"); - l_argv[0] = const_cast <ACE_TCHAR *> (t); - l_argv[1] = pid_str; - l_argv[2] = 0; - - ACE_ARGV my_argv (l_argv); - - // This shouldn't have any quotes in it. - ACE_DEBUG ((LM_DEBUG, "%s\n", my_argv.buf ())); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("argc: %d\n"), my_argv.argc ())); - return 0; -} - -static int -test_argv_quotes (void) +int +run_main (int, ACE_TCHAR *argv[]) { - const ACE_TCHAR *argv[] = { ACE_TEXT ("first without quotes"), - ACE_TEXT ("'second in single quotes'"), - ACE_TEXT ("\"third in double quotes\""), - 0 - }; - int argc = 3; - - // (argc, argv) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n*** argv ***\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("argc: %d\n"), argc)); - - for (int i = 0; i < argc; ++i) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("argv[%02d] = %s\n"), i, argv[i])); - - // args - ACE_ARGV args; - for (int i = 0; i < argc; ++i) - args.add (argv[i]); - args.add (ACE_TEXT ("'fourth in single quotes'")); - args.add (ACE_TEXT ("\"fifth in double quotes\"")); - args.add (ACE_TEXT ("sixth without any quotes")); - - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n*** args-1 ***\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("args.argc (): %d\n"), args.argc ())); - - for (int i = 0; i < args.argc (); ++i) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("args[%02d]: %s\n"), i, args[i])); - - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("args.argc (): %d\n"), args.argc ())); - - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n*** args-2 ***\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("args.argc (): %d\n"), args.argc ())); - - for (int i = 0; i < args.argc (); ++i) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("args.argv ()[%02d]: %s\n"), - i, args.argv ()[i])); - - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("args.argc (): %d\n"), args.argc ())); - - // args2 - ACE_ARGV args2; - for (int i = 0; i < argc; ++i) - args2.add (argv[i], true); - args2.add (ACE_TEXT ("'fourth in single quotes'"), true); - args2.add (ACE_TEXT ("\"fifth in double quotes\""), true); - args2.add (ACE_TEXT ("sixth without any quotes"), true); - - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n*** args-3 ***\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("args.argc (): %d\n"), args2.argc ())); - - for (int i = 0; i < args2.argc (); ++i) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("args[%02d]: %s\n"), i, args2[i])); - - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("args.argc (): %d\n"), args2.argc ())); - - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n*** args-4 ***\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("args.argc (): %d\n"), args2.argc ())); - - for (int i = 0; i < args2.argc (); ++i) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("args.argv ()[%02d]: %s\n"), - i, args2.argv ()[i])); - - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("args.argc (): %d\n"), args2.argc ())); + ACE_START_TEST (ACE_TEXT ("ARGV_Test")); - // args3 - ACE_ARGV args3(argv); + // From command line. + ACE_ARGV cl (argv); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n*** args-5 ***\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("args.argc (): %d\n"), args3.argc ())); + // My own stuff. + ACE_ARGV my; - for (int i = 0; i < args3.argc (); ++i) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("args[%02d]: %s\n"), i, args3[i])); + // Add to my stuff. + my.add (ACE_TEXT ("-ORBEndpoint iiop://localhost:12345")); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("args.argc (): %d\n"), args3.argc ())); + // Combine the two (see the ace/ARGV.h constructors documentation). + ACE_ARGV a (cl.argv (), + my.argv ()); - return 0; -} + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("argc = %d\n"), + a.argc ())); -int -run_main (int, ACE_TCHAR *argv[]) -{ - ACE_START_TEST (ACE_TEXT ("ARGV_Test")); + // Print the contents of the combined <ACE_ARGV>. + for (int i = 0; i < a.argc (); i++) + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT (" (%d) %s\n"), + i, + a.argv ()[i])); - test_simple_argv (argv); test_argv_type_converter2 (); test_argv_type_converter (); - test_argv_quotes (); - test_argv_buf (); ACE_END_TEST; return 0; diff --git a/ACE/tests/Bug_1890_Regression_Test.cpp b/ACE/tests/Bug_1890_Regression_Test.cpp index 8a8cade4d90..a28c8302b77 100644 --- a/ACE/tests/Bug_1890_Regression_Test.cpp +++ b/ACE/tests/Bug_1890_Regression_Test.cpp @@ -14,7 +14,7 @@ #include "ace/Pipe.h" #include "ace/Event_Handler.h" -#include "ace/Select_Reactor.h" +#include "ace/Reactor.h" ACE_RCSID (tests, Bug_1890_Regression_Test, @@ -95,19 +95,18 @@ run_main (int, ACE_TCHAR *[]) { ACE_START_TEST (ACE_TEXT ("Bug_1890_Regression_Test")); - ACE_Select_Reactor select_reactor; - ACE_Reactor reactor (&select_reactor); + ACE_Reactor * reactor = ACE_Reactor::instance(); // Create the timer, this is the main driver for the test Timer * timer = new Timer; // Initialize the timer and register with the reactor - if (-1 == timer->open(&reactor)) + if (-1 == timer->open(reactor)) { ACE_ERROR_RETURN ((LM_ERROR, "Cannot initialize timer\n"), -1); } - reactor.run_reactor_event_loop(); + reactor->run_reactor_event_loop(); // Verify that the results are what we expect if (!timer->check_expected_results()) @@ -117,7 +116,6 @@ run_main (int, ACE_TCHAR *[]) // Cleanup timer->close(); - delete timer; ACE_END_TEST; @@ -246,7 +244,7 @@ int Timer::handle_timeout(ACE_Time_Value const &, void const *) return 0; } - reactor()->end_reactor_event_loop(); + reactor()->end_event_loop(); return 0; } diff --git a/ACE/tests/Bug_2368_Regression_Test.cpp b/ACE/tests/Bug_2368_Regression_Test.cpp index 94e11107e7d..8441abe346f 100644 --- a/ACE/tests/Bug_2368_Regression_Test.cpp +++ b/ACE/tests/Bug_2368_Regression_Test.cpp @@ -111,13 +111,11 @@ run_main (int, ACE_TCHAR *[]) if (!handleA_close_called) ACE_ERROR ((LM_ERROR, - "Handle close hasn't been called for A. " - "This test failure caused by the unresolved bug is EXPECTED!\n")); + "Handle close hasn't been called for A\n")); if (!handleB_close_called) ACE_ERROR ((LM_ERROR, - "Handle close hasn't been called for B. " - "This test failure caused by the unresolved bug is EXPECTED!\n")); + "Handle close hasn't been called for B\n")); ACE_END_TEST; diff --git a/ACE/tests/Bug_2653_Regression_Test.cpp b/ACE/tests/Bug_2653_Regression_Test.cpp index 74b87288894..6735eab20e5 100644 --- a/ACE/tests/Bug_2653_Regression_Test.cpp +++ b/ACE/tests/Bug_2653_Regression_Test.cpp @@ -211,7 +211,6 @@ run_main (int, ACE_TCHAR *[]) wd.activate (THR_DETACHED); test_for_spin(tp_reactor); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing for spin\n"))); - wd.wait (); ACE_END_TEST; return 0; diff --git a/ACE/tests/Bug_2659_Regression_Test.cpp b/ACE/tests/Bug_2659_Regression_Test.cpp deleted file mode 100644 index 2dd48ea3bce..00000000000 --- a/ACE/tests/Bug_2659_Regression_Test.cpp +++ /dev/null @@ -1,178 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// tests -// -// = FILENAME -// Bug_2659_Regression_Test.cpp -// -// = DESCRIPTION -// Reproduces the problems reported in bug 2659: -// http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=2659 -// -// = AUTHOR -// Ciju John <johnc at ociweb> -// -// ============================================================================ - -#include "test_config.h" - -#include "ace/Log_Msg.h" -#include "ace/Task.h" -#include "ace/OS_NS_unistd.h" -#include "ace/Thread_Manager.h" -#include "ace/TP_Reactor.h" - -#if !defined (ACE_LACKS_UNIX_SIGNALS) - -bool reactor_task_ready = false; - - -//#define RUN_DEBUG 1 - -#if defined RUN_DEBUG - -#define EE_DEBUG(CNAME,MNAME,LOC) \ -EntryExit ee (CNAME,MNAME,LOC) - -class EntryExit -{ -public: - EntryExit (const ACE_TCHAR* class_name, const ACE_TCHAR *method_name - , void *location = 0) - { - class_name_ [20] = method_name_[20] = 0; - - ACE_OS::strncpy (class_name_, class_name, 20); - ACE_OS::strncpy (method_name_, method_name, 20); - location_ = location; - - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Entry %@ %s::%s\n") - , location, class_name, method_name)); - }; - - ~EntryExit () - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Exit %@ %s::%s\n") - , location_, class_name_, method_name_)); - }; - -private: - ACE_TCHAR class_name_[21]; - ACE_TCHAR method_name_[21]; - void *location_; -}; - -#else - -#define EE_DEBUG(CNAME,MNAME,LOC) - -#endif // if defined RUN_DEBUG - - - -static void -handle_signal (int ) -{ - EE_DEBUG ("", "handle_signal", 0); - - // Dummy signal handler -} - -class ReactorTask : public ACE_Task_Base -{ -public: - - virtual ~ReactorTask () - { - EE_DEBUG ("ReactorTask", "~ReactorTask", this); - }; - - virtual int svc (void ) - { - EE_DEBUG ("ReactorTask", "svc", this); - - // Register a valid signal handler - // so process doesn't die upon receiving signal - ACE_Sig_Action sa ((ACE_SignalHandler) &::handle_signal, SIGUSR1); - ACE_UNUSED_ARG (sa); - - if (simulate_perform_work () == -1) { - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%P|%t) ERROR: simulated_perform_work failed.\n")) - , -1); - } - - return 0; - }; - -private: - int simulate_perform_work () - { - EE_DEBUG ("ReactorTask", "simulate_perform_work", this); - - // Create a reactor which doesn't automatically restart - // upon interruption - ACE_TP_Reactor tp_reactor (ACE_TP_Reactor::DEFAULT_SIZE - , 0); - - reactor_task_ready = true; - - // This will return upon signal interruption - return tp_reactor.handle_events (); - } -}; - -int -run_main (int, ACE_TCHAR *[]) -{ - ACE_START_TEST (ACE_TEXT ("Bug_2659_Regression_Test")); - EE_DEBUG ("", "run_main", 0); - - ReactorTask reactor_task; - - if (reactor_task.activate () == -1) { - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%P|%t) Task activation failed.\n")) - , -1); - } - - ACE_Thread_Manager *thread_manager = reactor_task.thr_mgr (); - if (thread_manager == 0) { - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%P|%t) No Thread Manager found.\n")) - , -1); - } - - while (!reactor_task_ready) { - ACE_OS:: sleep (1); - } - - if (thread_manager->kill_all (SIGUSR1) == -1) { - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) Task signalling failed.\n")) - , -1); - } - - if (reactor_task.wait () == -1) { - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) Task wait failed.\n")) - , -1); - } - - ACE_END_TEST; - - return 0; -} - -#else -int -run_main (int, ACE_TCHAR *[]) -{ - ACE_START_TEST (ACE_TEXT ("Bug_2659_Regression_Test")); - ACE_ERROR ((LM_INFO, - ACE_TEXT ("The Unix Signals capability is not supported on this platform\n"))); - ACE_END_TEST; - return 0; -} -#endif /* !defined (ACE_LACKS_UNIX_SIGNALS) */ diff --git a/ACE/tests/CDR_File_Test.cpp b/ACE/tests/CDR_File_Test.cpp index 92f92631073..ec837123c5d 100644 --- a/ACE/tests/CDR_File_Test.cpp +++ b/ACE/tests/CDR_File_Test.cpp @@ -406,7 +406,9 @@ run_main (int argc, ACE_TCHAR *argv[]) filename.get_path_name ()), 1); -#if !defined (VXWORKS) +#if (!defined (ACE_WIN32) \ + || (defined (ACE_HAS_WINNT4) && ACE_HAS_WINNT4 == 1)) && \ + !defined (VXWORKS) # define TEST_CAN_UNLINK_IN_ADVANCE #endif diff --git a/ACE/tests/CDR_Test.cpp b/ACE/tests/CDR_Test.cpp index b4f2c206f72..ca61076c4ed 100644 --- a/ACE/tests/CDR_Test.cpp +++ b/ACE/tests/CDR_Test.cpp @@ -560,44 +560,7 @@ run_main (int argc, ACE_TCHAR *argv[]) } ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Long stream[2] - no errors\n\n") - ACE_TEXT ("Testing consolidation\n\n"))); - - ACE_OutputCDR output (30); - CDR_Test_Types test_types; - - if (test_types.test_put (output) != 0) - return 1; - - if (output.begin () == output.end ()) - ACE_DEBUG ((LM_WARNING, - ACE_TEXT ("Only one block needed; test no effective.\n"))); - else - { - if (output.consolidate () != 0) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("consolidate"))); - } - - ACE_InputCDR input (output); - if (debug > 0) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Output CDR: \n"))); - ACE_HEX_DUMP ((LM_DEBUG, - input.rd_ptr(), - 64)); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Input CDR: \n"))); - ACE_HEX_DUMP ((LM_DEBUG, - input.rd_ptr(), - 64)); - } - - if (test_types.test_get (input) != 0) - return 1; - - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Consolidation - no errors\n\n"))); + ACE_TEXT ("Long stream[2] - no errors\n\n"))); ACE_END_TEST; return 0; diff --git a/ACE/tests/FlReactor_Test.cpp b/ACE/tests/FlReactor_Test.cpp index 7e476287853..0b34751da3c 100644 --- a/ACE/tests/FlReactor_Test.cpp +++ b/ACE/tests/FlReactor_Test.cpp @@ -27,7 +27,7 @@ ACE_RCSID(tests, FlReactor_Test, "$Id$") -#include "ace/FlReactor/FlReactor.h" +#include "ace/FlReactor.h" #include "ace/Event_Handler.h" #include "ace/Acceptor.h" #include "ace/SOCK_Acceptor.h" diff --git a/ACE/protocols/tests/HTBP/HTBP_Config.conf b/ACE/tests/HTBP/HTBP_Config.conf index 49dfd238ec3..49dfd238ec3 100644 --- a/ACE/protocols/tests/HTBP/HTBP_Config.conf +++ b/ACE/tests/HTBP/HTBP_Config.conf diff --git a/ACE/protocols/tests/HTBP/Makefile.am b/ACE/tests/HTBP/Makefile.am index d38309ca6a4..7fd964b7c84 100644 --- a/ACE/protocols/tests/HTBP/Makefile.am +++ b/ACE/tests/HTBP/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ Reactor_Tests \ diff --git a/ACE/protocols/tests/HTBP/README b/ACE/tests/HTBP/README index 65a2bde0320..65a2bde0320 100644 --- a/ACE/protocols/tests/HTBP/README +++ b/ACE/tests/HTBP/README diff --git a/ACE/tests/HTBP/Reactor_Tests/.cvsignore b/ACE/tests/HTBP/Reactor_Tests/.cvsignore new file mode 100644 index 00000000000..955ffdc75d5 --- /dev/null +++ b/ACE/tests/HTBP/Reactor_Tests/.cvsignore @@ -0,0 +1,4 @@ +client +client +server +server diff --git a/ACE/protocols/tests/HTBP/Reactor_Tests/Makefile.am b/ACE/tests/HTBP/Reactor_Tests/Makefile.am index 153e1206bb1..813229103d5 100644 --- a/ACE/protocols/tests/HTBP/Reactor_Tests/Makefile.am +++ b/ACE/tests/HTBP/Reactor_Tests/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/protocols/tests/HTBP/Reactor_Tests/Reactor_Tests.mpc b/ACE/tests/HTBP/Reactor_Tests/Reactor_Tests.mpc index 61e59146a93..61e59146a93 100755 --- a/ACE/protocols/tests/HTBP/Reactor_Tests/Reactor_Tests.mpc +++ b/ACE/tests/HTBP/Reactor_Tests/Reactor_Tests.mpc diff --git a/ACE/protocols/tests/HTBP/Reactor_Tests/client.cpp b/ACE/tests/HTBP/Reactor_Tests/client.cpp index 2813d9116f3..2813d9116f3 100644 --- a/ACE/protocols/tests/HTBP/Reactor_Tests/client.cpp +++ b/ACE/tests/HTBP/Reactor_Tests/client.cpp diff --git a/ACE/protocols/tests/HTBP/Reactor_Tests/inside.conf b/ACE/tests/HTBP/Reactor_Tests/inside.conf index a5bcbc14420..a5bcbc14420 100644 --- a/ACE/protocols/tests/HTBP/Reactor_Tests/inside.conf +++ b/ACE/tests/HTBP/Reactor_Tests/inside.conf diff --git a/ACE/protocols/tests/HTBP/Reactor_Tests/run_test.pl b/ACE/tests/HTBP/Reactor_Tests/run_test.pl index ae4c56c7fb2..ae4c56c7fb2 100755 --- a/ACE/protocols/tests/HTBP/Reactor_Tests/run_test.pl +++ b/ACE/tests/HTBP/Reactor_Tests/run_test.pl diff --git a/ACE/protocols/tests/HTBP/Reactor_Tests/server.cpp b/ACE/tests/HTBP/Reactor_Tests/server.cpp index 87a914163c2..87a914163c2 100644 --- a/ACE/protocols/tests/HTBP/Reactor_Tests/server.cpp +++ b/ACE/tests/HTBP/Reactor_Tests/server.cpp diff --git a/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h b/ACE/tests/HTBP/Reactor_Tests/test_config.h index efd4eb7bcc6..efd4eb7bcc6 100644 --- a/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h +++ b/ACE/tests/HTBP/Reactor_Tests/test_config.h diff --git a/ACE/tests/HTBP/Send_Large_Msg/.cvsignore b/ACE/tests/HTBP/Send_Large_Msg/.cvsignore new file mode 100644 index 00000000000..955ffdc75d5 --- /dev/null +++ b/ACE/tests/HTBP/Send_Large_Msg/.cvsignore @@ -0,0 +1,4 @@ +client +client +server +server diff --git a/ACE/protocols/tests/HTBP/Send_Large_Msg/Makefile.am b/ACE/tests/HTBP/Send_Large_Msg/Makefile.am index 870836f47f4..2773356439b 100644 --- a/ACE/protocols/tests/HTBP/Send_Large_Msg/Makefile.am +++ b/ACE/tests/HTBP/Send_Large_Msg/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/protocols/tests/HTBP/Send_Large_Msg/Send_Large_Msg.mpc b/ACE/tests/HTBP/Send_Large_Msg/Send_Large_Msg.mpc index d973b59748f..d973b59748f 100644 --- a/ACE/protocols/tests/HTBP/Send_Large_Msg/Send_Large_Msg.mpc +++ b/ACE/tests/HTBP/Send_Large_Msg/Send_Large_Msg.mpc diff --git a/ACE/protocols/tests/HTBP/Send_Large_Msg/client.cpp b/ACE/tests/HTBP/Send_Large_Msg/client.cpp index 62cd9140da8..62cd9140da8 100644 --- a/ACE/protocols/tests/HTBP/Send_Large_Msg/client.cpp +++ b/ACE/tests/HTBP/Send_Large_Msg/client.cpp diff --git a/ACE/protocols/tests/HTBP/Send_Large_Msg/run_test.pl b/ACE/tests/HTBP/Send_Large_Msg/run_test.pl index 6b295afbf17..6b295afbf17 100755 --- a/ACE/protocols/tests/HTBP/Send_Large_Msg/run_test.pl +++ b/ACE/tests/HTBP/Send_Large_Msg/run_test.pl diff --git a/ACE/protocols/tests/HTBP/Send_Large_Msg/server.cpp b/ACE/tests/HTBP/Send_Large_Msg/server.cpp index 7b7f51cf1b9..7b7f51cf1b9 100644 --- a/ACE/protocols/tests/HTBP/Send_Large_Msg/server.cpp +++ b/ACE/tests/HTBP/Send_Large_Msg/server.cpp diff --git a/ACE/tests/HTBP/Send_Recv_Tests/.cvsignore b/ACE/tests/HTBP/Send_Recv_Tests/.cvsignore new file mode 100644 index 00000000000..b82dc859445 --- /dev/null +++ b/ACE/tests/HTBP/Send_Recv_Tests/.cvsignore @@ -0,0 +1,2 @@ +SendRecv_Test +SendRecv_Test diff --git a/ACE/protocols/tests/HTBP/Send_Recv_Tests/Makefile.am b/ACE/tests/HTBP/Send_Recv_Tests/Makefile.am index c9628903cf1..03775f077a4 100644 --- a/ACE/protocols/tests/HTBP/Send_Recv_Tests/Makefile.am +++ b/ACE/tests/HTBP/Send_Recv_Tests/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/protocols/tests/HTBP/Send_Recv_Tests/SendRecv_Test.cpp b/ACE/tests/HTBP/Send_Recv_Tests/SendRecv_Test.cpp index d462a11c3d3..d462a11c3d3 100644 --- a/ACE/protocols/tests/HTBP/Send_Recv_Tests/SendRecv_Test.cpp +++ b/ACE/tests/HTBP/Send_Recv_Tests/SendRecv_Test.cpp diff --git a/ACE/protocols/tests/HTBP/Send_Recv_Tests/SendRecv_Test.mpc b/ACE/tests/HTBP/Send_Recv_Tests/SendRecv_Test.mpc index 64a40f688d1..64a40f688d1 100644 --- a/ACE/protocols/tests/HTBP/Send_Recv_Tests/SendRecv_Test.mpc +++ b/ACE/tests/HTBP/Send_Recv_Tests/SendRecv_Test.mpc diff --git a/ACE/protocols/tests/HTBP/htbptest.mpb b/ACE/tests/HTBP/htbptest.mpb index ca87bbf8542..c12f33ef7ba 100644 --- a/ACE/protocols/tests/HTBP/htbptest.mpb +++ b/ACE/tests/HTBP/htbptest.mpb @@ -2,6 +2,5 @@ // // $Id$ project : aceexe, htbp { - after += Test_Output libs += Test_Output } diff --git a/ACE/tests/HTBP/ping/.cvsignore b/ACE/tests/HTBP/ping/.cvsignore new file mode 100644 index 00000000000..955ffdc75d5 --- /dev/null +++ b/ACE/tests/HTBP/ping/.cvsignore @@ -0,0 +1,4 @@ +client +client +server +server diff --git a/ACE/protocols/tests/HTBP/ping/Makefile.am b/ACE/tests/HTBP/ping/Makefile.am index b59b297e535..279d82a03c0 100644 --- a/ACE/protocols/tests/HTBP/ping/Makefile.am +++ b/ACE/tests/HTBP/ping/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/protocols/tests/HTBP/ping/client.cpp b/ACE/tests/HTBP/ping/client.cpp index e7753faab6d..e7753faab6d 100644 --- a/ACE/protocols/tests/HTBP/ping/client.cpp +++ b/ACE/tests/HTBP/ping/client.cpp diff --git a/ACE/protocols/tests/HTBP/ping/ping.mpc b/ACE/tests/HTBP/ping/ping.mpc index 61e59146a93..61e59146a93 100755 --- a/ACE/protocols/tests/HTBP/ping/ping.mpc +++ b/ACE/tests/HTBP/ping/ping.mpc diff --git a/ACE/protocols/tests/HTBP/ping/run_test.pl b/ACE/tests/HTBP/ping/run_test.pl index ae4c56c7fb2..ae4c56c7fb2 100755 --- a/ACE/protocols/tests/HTBP/ping/run_test.pl +++ b/ACE/tests/HTBP/ping/run_test.pl diff --git a/ACE/protocols/tests/HTBP/ping/server.cpp b/ACE/tests/HTBP/ping/server.cpp index d20d46b8b09..d20d46b8b09 100644 --- a/ACE/protocols/tests/HTBP/ping/server.cpp +++ b/ACE/tests/HTBP/ping/server.cpp diff --git a/ACE/tests/Integer_Truncate_Test.cpp b/ACE/tests/Integer_Truncate_Test.cpp index f9c60764bca..f9c60764bca 100644..100755 --- a/ACE/tests/Integer_Truncate_Test.cpp +++ b/ACE/tests/Integer_Truncate_Test.cpp diff --git a/ACE/tests/Log_Msg_Test.cpp b/ACE/tests/Log_Msg_Test.cpp index 71645e2ca0b..4436a90b26c 100644 --- a/ACE/tests/Log_Msg_Test.cpp +++ b/ACE/tests/Log_Msg_Test.cpp @@ -231,7 +231,7 @@ test_log_msg_features (const ACE_TCHAR *program) cleanup)); // Don't try this on VxWorks, it will result in an overflow and end the test. -// Platforms that define ACE_LACKS_VSNPRINTF are candidates to fail here. +// Platforms that don't define ACE_HAS_SNPRINTF are candidates to fail here. // This then proves that logging to big messages is problematic but on VxWorks // we know this and we want to rest of the test to continue #if !defined (VXWORKS) @@ -503,14 +503,14 @@ Log_Spec_Verify::log (ACE_Log_Record &log_record) ACE_ERROR ((LM_ERROR, ACE_TEXT ("Log_Spec_Verify, unrecognized test: %s\n"), b)); - ++this->fail_; + this->fail_++; } if (b != log_record.msg_data () && ACE_OS::strcmp (b, expect) != 0) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("Test %s failed; expected %s\n"), log_record.msg_data (), expect)); - ++this->fail_; + this->fail_++; } return; @@ -557,9 +557,6 @@ test_format_specs (void) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%}%ITWO\n"))); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%}%IONE\n"))); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%}%IENDINDENTING\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%W\n"), ACE_TEXT_WIDE ("My string test\n"))); - ACE_TCHAR* nill_string = 0; - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%W\n"), nill_string)); errno = ENOENT; ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%m %p\n"), ACE_TEXT("perror"))); return 0; diff --git a/ACE/tests/Makefile.am b/ACE/tests/Makefile.am index 72f1f504760..0de38407ea0 100644 --- a/ACE/tests/Makefile.am +++ b/ACE/tests/Makefile.am @@ -6,24 +6,25 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) SUBDIRS = \ . \ + HTBP \ SSL ## Makefile.Test_Output.am noinst_SCRIPTS = run_test.pl run_test.lst + dist_check_SCRIPTS = run_test.pl run_test.lst TESTS = $(noinst_PROGRAMS) TESTS_ENVIRONMENT = $(srcdir)/run_test.pl -t - noinst_LTLIBRARIES = libTest_Output.la libTest_Output_la_CPPFLAGS = \ @@ -39,7 +40,6 @@ noinst_HEADERS = \ test_config.h ## Makefile.ACE_Init_Test.am - noinst_PROGRAMS = ACE_Init_Test ACE_Init_Test_CPPFLAGS = \ @@ -60,7 +60,6 @@ EXTRA_DIST = \ ## Makefile.ACE_Test.am - noinst_PROGRAMS += ACE_Test ACE_Test_CPPFLAGS = \ @@ -76,7 +75,6 @@ ACE_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.ARGV_Test.am - noinst_PROGRAMS += ARGV_Test ARGV_Test_CPPFLAGS = \ @@ -92,7 +90,6 @@ ARGV_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Aio_Platform_Test.am - noinst_PROGRAMS += Aio_Platform_Test Aio_Platform_Test_CPPFLAGS = \ @@ -108,7 +105,6 @@ Aio_Platform_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Arg_Shifter_Test.am - noinst_PROGRAMS += Arg_Shifter_Test Arg_Shifter_Test_CPPFLAGS = \ @@ -124,7 +120,6 @@ Arg_Shifter_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Array_Map_Test.am - noinst_PROGRAMS += Array_Map_Test Array_Map_Test_CPPFLAGS = \ @@ -140,7 +135,6 @@ Array_Map_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Atomic_Op_Test.am - noinst_PROGRAMS += Atomic_Op_Test Atomic_Op_Test_CPPFLAGS = \ @@ -156,7 +150,6 @@ Atomic_Op_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Auto_Event_Test.am - noinst_PROGRAMS += Auto_Event_Test Auto_Event_Test_CPPFLAGS = \ @@ -172,7 +165,6 @@ Auto_Event_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Auto_IncDec_Test.am - noinst_PROGRAMS += Auto_IncDec_Test Auto_IncDec_Test_CPPFLAGS = \ @@ -188,7 +180,6 @@ Auto_IncDec_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Barrier_Test.am - noinst_PROGRAMS += Barrier_Test Barrier_Test_CPPFLAGS = \ @@ -268,7 +259,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Based_Pointer_Test.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Based_Pointer_Test Based_Pointer_Test_CPPFLAGS = \ @@ -286,7 +276,6 @@ Based_Pointer_Test_LDADD = \ endif !BUILD_ACE_FOR_TAO ## Makefile.Basic_Types_Test.am - noinst_PROGRAMS += Basic_Types_Test Basic_Types_Test_CPPFLAGS = \ @@ -304,7 +293,6 @@ Basic_Types_Test_LDADD = \ ## Makefile.Bound_Ptr_Test.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Bound_Ptr_Test Bound_Ptr_Test_CPPFLAGS = \ @@ -323,7 +311,6 @@ Bound_Ptr_Test_LDADD = \ endif !BUILD_ACE_FOR_TAO ## Makefile.Buffer_Stream_Test.am - noinst_PROGRAMS += Buffer_Stream_Test Buffer_Stream_Test_CPPFLAGS = \ @@ -339,7 +326,6 @@ Buffer_Stream_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Bug_1576_Regression_Test.am - noinst_PROGRAMS += Bug_1576_Regression_Test Bug_1576_Regression_Test_CPPFLAGS = \ @@ -354,24 +340,7 @@ Bug_1576_Regression_Test_LDADD = \ libTest_Output.la \ $(ACE_BUILDDIR)/ace/libACE.la -## Makefile.Bug_1890_Regression_Test.am - -noinst_PROGRAMS += Bug_1890_Regression_Test - -Bug_1890_Regression_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Bug_1890_Regression_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Bug_1890_Regression_Test.cpp - -Bug_1890_Regression_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.Bug_2368_Regression_Test.am - noinst_PROGRAMS += Bug_2368_Regression_Test Bug_2368_Regression_Test_CPPFLAGS = \ @@ -387,7 +356,6 @@ Bug_2368_Regression_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Bug_2497_Regression_Test.am - noinst_PROGRAMS += Bug_2497_Regression_Test Bug_2497_Regression_Test_CPPFLAGS = \ @@ -402,58 +370,9 @@ Bug_2497_Regression_Test_LDADD = \ libTest_Output.la \ $(ACE_BUILDDIR)/ace/libACE.la -## Makefile.Bug_2540_Regression_Test.am - -noinst_PROGRAMS += Bug_2540_Regression_Test - -Bug_2540_Regression_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Bug_2540_Regression_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Bug_2540_Regression_Test.cpp - -Bug_2540_Regression_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Bug_2653_Regression_Test.am - -noinst_PROGRAMS += Bug_2653_Regression_Test - -Bug_2653_Regression_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Bug_2653_Regression_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Bug_2653_Regression_Test.cpp - -Bug_2653_Regression_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.Bug_2659_Regression_Test.am - -noinst_PROGRAMS += Bug_2659_Regression_Test - -Bug_2659_Regression_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Bug_2659_Regression_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Bug_2659_Regression_Test.cpp - -Bug_2659_Regression_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.CDR_Array_Test.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += CDR_Array_Test CDR_Array_Test_CPPFLAGS = \ @@ -473,7 +392,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.CDR_File_Test.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += CDR_File_Test CDR_File_Test_CPPFLAGS = \ @@ -493,7 +411,6 @@ CDR_File_Test_LDADD = \ endif !BUILD_ACE_FOR_TAO ## Makefile.CDR_Test.am - noinst_PROGRAMS += CDR_Test CDR_Test_CPPFLAGS = \ @@ -509,7 +426,6 @@ CDR_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Cache_Map_Manager_Test.am - noinst_PROGRAMS += Cache_Map_Manager_Test Cache_Map_Manager_Test_CPPFLAGS = \ @@ -528,7 +444,6 @@ Cache_Map_Manager_Test_LDADD = \ ## Makefile.Cached_Accept_Conn_Test.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Cached_Accept_Conn_Test Cached_Accept_Conn_Test_CPPFLAGS = \ @@ -549,7 +464,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Cached_Allocator_Test.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Cached_Allocator_Test Cached_Allocator_Test_CPPFLAGS = \ @@ -569,7 +483,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Cached_Conn_Test.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Cached_Conn_Test Cached_Conn_Test_CPPFLAGS = \ @@ -590,7 +503,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Capabilities_Test.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Capabilities_Test Capabilities_Test_CPPFLAGS = \ @@ -611,7 +523,6 @@ endif !BUILD_ACE_FOR_TAO if BUILD_ACE_CODECS if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Codecs_Test Codecs_Test_CPPFLAGS = \ @@ -630,7 +541,6 @@ endif !BUILD_ACE_FOR_TAO endif BUILD_ACE_CODECS ## Makefile.Collection_Test.am - noinst_PROGRAMS += Collection_Test Collection_Test_CPPFLAGS = \ @@ -649,7 +559,6 @@ Collection_Test_LDADD = \ ## Makefile.Config_Test.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Config_Test Config_Test_CPPFLAGS = \ @@ -670,7 +579,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Conn_Test.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Conn_Test Conn_Test_CPPFLAGS = \ @@ -722,7 +630,6 @@ noinst_HEADERS += \ test_config.h ## Makefile.DLL_Test.am - noinst_PROGRAMS += DLL_Test DLL_Test_CPPFLAGS = \ @@ -743,7 +650,6 @@ DLL_Test_LDADD = \ ## Makefile.DLList_Test.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += DLList_Test DLList_Test_CPPFLAGS = \ @@ -763,7 +669,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Date_Time_Test.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Date_Time_Test Date_Time_Test_CPPFLAGS = \ @@ -781,7 +686,6 @@ Date_Time_Test_LDADD = \ endif !BUILD_ACE_FOR_TAO ## Makefile.Dev_Poll_Reactor_Test.am - noinst_PROGRAMS += Dev_Poll_Reactor_Test Dev_Poll_Reactor_Test_CPPFLAGS = \ @@ -797,7 +701,6 @@ Dev_Poll_Reactor_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Dirent_Test.am - noinst_PROGRAMS += Dirent_Test Dirent_Test_CPPFLAGS = \ @@ -813,7 +716,6 @@ Dirent_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Dynamic_Priority_Test.am - noinst_PROGRAMS += Dynamic_Priority_Test Dynamic_Priority_Test_CPPFLAGS = \ @@ -829,7 +731,6 @@ Dynamic_Priority_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Enum_Interfaces_Test.am - noinst_PROGRAMS += Enum_Interfaces_Test Enum_Interfaces_Test_CPPFLAGS = \ @@ -845,7 +746,6 @@ Enum_Interfaces_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Env_Value_Test.am - noinst_PROGRAMS += Env_Value_Test Env_Value_Test_CPPFLAGS = \ @@ -863,7 +763,6 @@ Env_Value_Test_LDADD = \ ## Makefile.FIFO_Test.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += FIFO_Test FIFO_Test_CPPFLAGS = \ @@ -929,7 +828,6 @@ noinst_HEADERS += \ Framework_Component_DLL_Export.h ## Makefile.Framework_Component_Test.am - noinst_PROGRAMS += Framework_Component_Test Framework_Component_Test_CPPFLAGS = \ @@ -948,7 +846,6 @@ Framework_Component_Test_LDADD = \ ## Makefile.Future_Set_Test.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Future_Set_Test Future_Set_Test_CPPFLAGS = \ @@ -968,7 +865,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Future_Test.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Future_Test Future_Test_CPPFLAGS = \ @@ -986,7 +882,6 @@ Future_Test_LDADD = \ endif !BUILD_ACE_FOR_TAO ## Makefile.Get_Opt_Test.am - noinst_PROGRAMS += Get_Opt_Test Get_Opt_Test_CPPFLAGS = \ @@ -1004,7 +899,6 @@ Get_Opt_Test_LDADD = \ ## Makefile.Handle_Set_Test.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Handle_Set_Test Handle_Set_Test_CPPFLAGS = \ @@ -1022,7 +916,6 @@ Handle_Set_Test_LDADD = \ endif !BUILD_ACE_FOR_TAO ## Makefile.Hash_Map_Bucket_Iterator_Test.am - noinst_PROGRAMS += Hash_Map_Bucket_Iterator_Test Hash_Map_Bucket_Iterator_Test_CPPFLAGS = \ @@ -1038,7 +931,6 @@ Hash_Map_Bucket_Iterator_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Hash_Map_Manager_Test.am - noinst_PROGRAMS += Hash_Map_Manager_Test Hash_Map_Manager_Test_CPPFLAGS = \ @@ -1054,7 +946,6 @@ Hash_Map_Manager_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Hash_Multi_Map_Manager_Test.am - noinst_PROGRAMS += Hash_Multi_Map_Manager_Test Hash_Multi_Map_Manager_Test_CPPFLAGS = \ @@ -1072,7 +963,6 @@ Hash_Multi_Map_Manager_Test_LDADD = \ ## Makefile.High_Res_Timer_Test.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += High_Res_Timer_Test High_Res_Timer_Test_CPPFLAGS = \ @@ -1090,7 +980,6 @@ High_Res_Timer_Test_LDADD = \ endif !BUILD_ACE_FOR_TAO ## Makefile.INET_Addr_Test.am - noinst_PROGRAMS += INET_Addr_Test INET_Addr_Test_CPPFLAGS = \ @@ -1106,7 +995,6 @@ INET_Addr_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.INET_Addr_Test_IPV6.am - noinst_PROGRAMS += INET_Addr_Test_IPV6 INET_Addr_Test_IPV6_CPPFLAGS = \ @@ -1122,7 +1010,6 @@ INET_Addr_Test_IPV6_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.IOStream_Test.am - noinst_PROGRAMS += IOStream_Test IOStream_Test_CPPFLAGS = \ @@ -1137,24 +1024,7 @@ IOStream_Test_LDADD = \ libTest_Output.la \ $(ACE_BUILDDIR)/ace/libACE.la -## Makefile.Integer_Truncate_Test.am - -noinst_PROGRAMS += Integer_Truncate_Test - -Integer_Truncate_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -Integer_Truncate_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - Integer_Truncate_Test.cpp - -Integer_Truncate_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - ## Makefile.Lazy_Map_Manager_Test.am - noinst_PROGRAMS += Lazy_Map_Manager_Test Lazy_Map_Manager_Test_CPPFLAGS = \ @@ -1170,9 +1040,6 @@ Lazy_Map_Manager_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Library_Unload.am - -if !BUILD_WINCE - noinst_PROGRAMS += UnloadLibACE UnloadLibACE_SOURCES = \ @@ -1222,12 +1089,9 @@ UnloadLibACE_SOURCES = \ Upgradable_RW_Test.h \ test_config.h -endif !BUILD_WINCE - ## Makefile.Log_Msg_Test.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Log_Msg_Test Log_Msg_Test_CPPFLAGS = \ @@ -1245,7 +1109,6 @@ Log_Msg_Test_LDADD = \ endif !BUILD_ACE_FOR_TAO ## Makefile.Logging_Strategy_Test.am - noinst_PROGRAMS += Logging_Strategy_Test Logging_Strategy_Test_CPPFLAGS = \ @@ -1263,7 +1126,6 @@ Logging_Strategy_Test_LDADD = \ ## Makefile.MEM_Stream_Test.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += MEM_Stream_Test MEM_Stream_Test_CPPFLAGS = \ @@ -1284,7 +1146,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.MM_Shared_Memory_Test.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += MM_Shared_Memory_Test MM_Shared_Memory_Test_CPPFLAGS = \ @@ -1302,7 +1163,6 @@ MM_Shared_Memory_Test_LDADD = \ endif !BUILD_ACE_FOR_TAO ## Makefile.MT_Reactor_Timer_Test.am - noinst_PROGRAMS += MT_Reactor_Timer_Test MT_Reactor_Timer_Test_CPPFLAGS = \ @@ -1319,7 +1179,6 @@ MT_Reactor_Timer_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.MT_Reactor_Upcall_Test.am - noinst_PROGRAMS += MT_Reactor_Upcall_Test MT_Reactor_Upcall_Test_CPPFLAGS = \ @@ -1335,7 +1194,6 @@ MT_Reactor_Upcall_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.MT_Ref_Counted_Event_Handler_Test.am - noinst_PROGRAMS += MT_Reference_Counted_Event_Handler_Test MT_Reference_Counted_Event_Handler_Test_CPPFLAGS = \ @@ -1351,7 +1209,6 @@ MT_Reference_Counted_Event_Handler_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.MT_Reference_Counted_Notify_Test.am - noinst_PROGRAMS += MT_Reference_Counted_Notify_Test MT_Reference_Counted_Notify_Test_CPPFLAGS = \ @@ -1367,7 +1224,6 @@ MT_Reference_Counted_Notify_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.MT_SOCK_Test.am - noinst_PROGRAMS += MT_SOCK_Test MT_SOCK_Test_CPPFLAGS = \ @@ -1385,7 +1241,6 @@ MT_SOCK_Test_LDADD = \ ## Makefile.Malloc_Test.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Malloc_Test Malloc_Test_CPPFLAGS = \ @@ -1404,7 +1259,6 @@ Malloc_Test_LDADD = \ endif !BUILD_ACE_FOR_TAO ## Makefile.Manual_Event_Test.am - noinst_PROGRAMS += Manual_Event_Test Manual_Event_Test_CPPFLAGS = \ @@ -1422,7 +1276,6 @@ Manual_Event_Test_LDADD = \ ## Makefile.Map_Manager_Test.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Map_Manager_Test Map_Manager_Test_CPPFLAGS = \ @@ -1442,7 +1295,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Map_Test.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Map_Test Map_Test_CPPFLAGS = \ @@ -1461,7 +1313,6 @@ Map_Test_LDADD = \ endif !BUILD_ACE_FOR_TAO ## Makefile.Max_Default_Port_Test.am - noinst_PROGRAMS += Max_Default_Port_Test Max_Default_Port_Test_CPPFLAGS = \ @@ -1478,7 +1329,6 @@ Max_Default_Port_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Max_Default_Port_Test_IPV6.am - noinst_PROGRAMS += Max_Default_Port_Test_IPV6 Max_Default_Port_Test_IPV6_CPPFLAGS = \ @@ -1496,7 +1346,6 @@ Max_Default_Port_Test_IPV6_LDADD = \ ## Makefile.Mem_Map_Test.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Mem_Map_Test Mem_Map_Test_CPPFLAGS = \ @@ -1516,7 +1365,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Memcpy_Test.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Memcpy_Test Memcpy_Test_CPPFLAGS = \ @@ -1536,7 +1384,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Message_Block_Test.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Message_Block_Test Message_Block_Test_CPPFLAGS = \ @@ -1554,7 +1401,6 @@ Message_Block_Test_LDADD = \ endif !BUILD_ACE_FOR_TAO ## Makefile.Message_Queue_Notifications_Test.am - noinst_PROGRAMS += Message_Queue_Notifications_Test Message_Queue_Notifications_Test_CPPFLAGS = \ @@ -1572,7 +1418,6 @@ Message_Queue_Notifications_Test_LDADD = \ ## Makefile.Message_Queue_Test.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Message_Queue_Test Message_Queue_Test_CPPFLAGS = \ @@ -1592,7 +1437,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Message_Queue_Test_Ex.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Message_Queue_Test_Ex Message_Queue_Test_Ex_CPPFLAGS = \ @@ -1611,7 +1455,6 @@ Message_Queue_Test_Ex_LDADD = \ endif !BUILD_ACE_FOR_TAO ## Makefile.Multicast_Test.am - noinst_PROGRAMS += Multicast_Test Multicast_Test_CPPFLAGS = \ @@ -1627,7 +1470,6 @@ Multicast_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Multicast_Test_IPV6.am - noinst_PROGRAMS += Multicast_Test_IPV6 Multicast_Test_IPV6_CPPFLAGS = \ @@ -1645,7 +1487,6 @@ Multicast_Test_IPV6_LDADD = \ ## Makefile.Multihomed_INET_Addr_Test.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Multihomed_INET_Addr_Test Multihomed_INET_Addr_Test_CPPFLAGS = \ @@ -1665,7 +1506,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Multihomed_INET_Addr_Test_IPV6.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Multihomed_INET_Addr_Test_IPV6 Multihomed_INET_Addr_Test_IPV6_CPPFLAGS = \ @@ -1686,7 +1526,6 @@ endif !BUILD_ACE_FOR_TAO if BUILD_ACE_OTHER if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Naming_Test Naming_Test_CPPFLAGS = \ @@ -1705,7 +1544,6 @@ endif !BUILD_ACE_FOR_TAO endif BUILD_ACE_OTHER ## Makefile.Network_Adapters_Test.am - noinst_PROGRAMS += Network_Adapters_Test Network_Adapters_Test_CPPFLAGS = \ @@ -1722,7 +1560,6 @@ Network_Adapters_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.New_Fail_Test.am - noinst_PROGRAMS += New_Fail_Test New_Fail_Test_CPPFLAGS = \ @@ -1738,7 +1575,6 @@ New_Fail_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.NonBlocking_Conn_Test.am - noinst_PROGRAMS += NonBlocking_Conn_Test NonBlocking_Conn_Test_CPPFLAGS = \ @@ -1757,7 +1593,6 @@ NonBlocking_Conn_Test_LDADD = \ ## Makefile.Notify_Performance_Test.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Notify_Performance_Test Notify_Performance_Test_CPPFLAGS = \ @@ -1775,7 +1610,6 @@ Notify_Performance_Test_LDADD = \ endif !BUILD_ACE_FOR_TAO ## Makefile.OS_Test.am - noinst_PROGRAMS += OS_Test OS_Test_CPPFLAGS = \ @@ -1791,7 +1625,6 @@ OS_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Object_Manager_Test.am - noinst_PROGRAMS += Object_Manager_Test Object_Manager_Test_CPPFLAGS = \ @@ -1807,7 +1640,6 @@ Object_Manager_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Obstack_Test.am - noinst_PROGRAMS += Obstack_Test Obstack_Test_CPPFLAGS = \ @@ -1823,7 +1655,6 @@ Obstack_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.OrdMultiSet_Test.am - noinst_PROGRAMS += OrdMultiSet_Test OrdMultiSet_Test_CPPFLAGS = \ @@ -1839,7 +1670,6 @@ OrdMultiSet_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Pipe_Test.am - noinst_PROGRAMS += Pipe_Test Pipe_Test_CPPFLAGS = \ @@ -1855,7 +1685,6 @@ Pipe_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Priority_Buffer_Test.am - noinst_PROGRAMS += Priority_Buffer_Test Priority_Buffer_Test_CPPFLAGS = \ @@ -1873,7 +1702,6 @@ Priority_Buffer_Test_LDADD = \ ## Makefile.Priority_Reactor_Test.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Priority_Reactor_Test Priority_Reactor_Test_CPPFLAGS = \ @@ -1892,7 +1720,6 @@ Priority_Reactor_Test_LDADD = \ endif !BUILD_ACE_FOR_TAO ## Makefile.Priority_Task_Test.am - noinst_PROGRAMS += Priority_Task_Test Priority_Task_Test_CPPFLAGS = \ @@ -1910,7 +1737,6 @@ Priority_Task_Test_LDADD = \ ## Makefile.Proactor_Scatter_Gather_Test.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Proactor_Scatter_Gather_Test Proactor_Scatter_Gather_Test_CPPFLAGS = \ @@ -1930,7 +1756,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Proactor_Test.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Proactor_Test Proactor_Test_CPPFLAGS = \ @@ -1951,7 +1776,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Proactor_Test_IPV6.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Proactor_Test_IPV6 Proactor_Test_IPV6_CPPFLAGS = \ @@ -1971,7 +1795,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Proactor_Timer_Test.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Proactor_Timer_Test Proactor_Timer_Test_CPPFLAGS = \ @@ -1991,7 +1814,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Process_Manager_Test.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Process_Manager_Test Process_Manager_Test_CPPFLAGS = \ @@ -2009,7 +1831,6 @@ Process_Manager_Test_LDADD = \ endif !BUILD_ACE_FOR_TAO ## Makefile.Process_Manual_Event_Test.am - noinst_PROGRAMS += Process_Manual_Event_Test Process_Manual_Event_Test_CPPFLAGS = \ @@ -2027,7 +1848,6 @@ Process_Manual_Event_Test_LDADD = \ ## Makefile.Process_Mutex_Test.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Process_Mutex_Test Process_Mutex_Test_CPPFLAGS = \ @@ -2047,7 +1867,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Process_Semaphore_Test.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Process_Semaphore_Test Process_Semaphore_Test_CPPFLAGS = \ @@ -2067,7 +1886,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Process_Strategy_Test.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Process_Strategy_Test Process_Strategy_Test_CPPFLAGS = \ @@ -2097,7 +1915,7 @@ CLEANFILES = \ QtReactor_Test_moc.cpp QtReactor_Test_moc.cpp: $(srcdir)/QtReactor_Test.h - $(QTDIR)/bin/moc $(srcdir)/QtReactor_Test.h -o QtReactor_Test_moc.cpp + $(QTDIR)/bin/moc -o QtReactor_Test_moc.cpp $(srcdir)/QtReactor_Test.h noinst_PROGRAMS += QtReactor_Test @@ -2125,7 +1943,6 @@ endif BUILD_QT endif BUILD_ACE_QTREACTOR ## Makefile.RB_Tree_Test.am - noinst_PROGRAMS += RB_Tree_Test RB_Tree_Test_CPPFLAGS = \ @@ -2142,7 +1959,6 @@ RB_Tree_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Reactor_Dispatch_Order_Test.am - noinst_PROGRAMS += Reactor_Dispatch_Order_Test Reactor_Dispatch_Order_Test_CPPFLAGS = \ @@ -2158,7 +1974,6 @@ Reactor_Dispatch_Order_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Reactor_Exceptions_Test.am - noinst_PROGRAMS += Reactor_Exceptions_Test Reactor_Exceptions_Test_CPPFLAGS = \ @@ -2174,7 +1989,6 @@ Reactor_Exceptions_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Reactor_Notification_Queue_Test.am - noinst_PROGRAMS += Reactor_Notification_Queue_Test Reactor_Notification_Queue_Test_CPPFLAGS = \ @@ -2192,7 +2006,6 @@ Reactor_Notification_Queue_Test_LDADD = \ ## Makefile.Reactor_Notify_Test.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Reactor_Notify_Test Reactor_Notify_Test_CPPFLAGS = \ @@ -2212,7 +2025,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Reactor_Performance_Test.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Reactor_Performance_Test Reactor_Performance_Test_CPPFLAGS = \ @@ -2231,7 +2043,6 @@ Reactor_Performance_Test_LDADD = \ endif !BUILD_ACE_FOR_TAO ## Makefile.Reactor_Registration_Test.am - noinst_PROGRAMS += Reactor_Registration_Test Reactor_Registration_Test_CPPFLAGS = \ @@ -2249,7 +2060,6 @@ Reactor_Registration_Test_LDADD = \ ## Makefile.Reactor_Timer_Test.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Reactor_Timer_Test Reactor_Timer_Test_CPPFLAGS = \ @@ -2267,7 +2077,6 @@ Reactor_Timer_Test_LDADD = \ endif !BUILD_ACE_FOR_TAO ## Makefile.Reactors_Test.am - noinst_PROGRAMS += Reactors_Test Reactors_Test_CPPFLAGS = \ @@ -2283,7 +2092,6 @@ Reactors_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Reader_Writer_Test.am - noinst_PROGRAMS += Reader_Writer_Test Reader_Writer_Test_CPPFLAGS = \ @@ -2299,7 +2107,6 @@ Reader_Writer_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Recursive_Condition_Bug_Test.am - noinst_PROGRAMS += Recursive_Condition_Bug_Test Recursive_Condition_Bug_Test_CPPFLAGS = \ @@ -2315,7 +2122,6 @@ Recursive_Condition_Bug_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Recursive_Condition_Test.am - noinst_PROGRAMS += Recursive_Condition_Test Recursive_Condition_Test_CPPFLAGS = \ @@ -2331,7 +2137,6 @@ Recursive_Condition_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Recursive_Mutex_Test.am - noinst_PROGRAMS += Recursive_Mutex_Test Recursive_Mutex_Test_CPPFLAGS = \ @@ -2349,7 +2154,6 @@ Recursive_Mutex_Test_LDADD = \ ## Makefile.Refcounted_Auto_Ptr_Test.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Refcounted_Auto_Ptr_Test Refcounted_Auto_Ptr_Test_CPPFLAGS = \ @@ -2368,7 +2172,6 @@ Refcounted_Auto_Ptr_Test_LDADD = \ endif !BUILD_ACE_FOR_TAO ## Makefile.Reference_Counted_Event_Handler_Test.am - noinst_PROGRAMS += Reference_Counted_Event_Handler_Test Reference_Counted_Event_Handler_Test_CPPFLAGS = \ @@ -2384,7 +2187,6 @@ Reference_Counted_Event_Handler_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Reverse_Lock_Test.am - noinst_PROGRAMS += Reverse_Lock_Test Reverse_Lock_Test_CPPFLAGS = \ @@ -2400,7 +2202,6 @@ Reverse_Lock_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.SOCK_Connector_Test.am - noinst_PROGRAMS += SOCK_Connector_Test SOCK_Connector_Test_CPPFLAGS = \ @@ -2418,7 +2219,6 @@ SOCK_Connector_Test_LDADD = \ ## Makefile.SOCK_Dgram_Bcast_Test.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += SOCK_Dgram_Bcast_Test SOCK_Dgram_Bcast_Test_CPPFLAGS = \ @@ -2436,7 +2236,6 @@ SOCK_Dgram_Bcast_Test_LDADD = \ endif !BUILD_ACE_FOR_TAO ## Makefile.SOCK_Dgram_Test.am - noinst_PROGRAMS += SOCK_Dgram_Test SOCK_Dgram_Test_CPPFLAGS = \ @@ -2451,30 +2250,9 @@ SOCK_Dgram_Test_LDADD = \ libTest_Output.la \ $(ACE_BUILDDIR)/ace/libACE.la -## Makefile.SOCK_Netlink_Test.am - -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += SOCK_Netlink_Test - -SOCK_Netlink_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -SOCK_Netlink_Test_SOURCES = \ - $(ACE_ROOT)/tests/Main.cpp \ - SOCK_Netlink_Test.cpp - -SOCK_Netlink_Test_LDADD = \ - libTest_Output.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO - ## Makefile.SOCK_SEQPACK_SCTP_Test.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += SOCK_SEQPACK_SCTP_Test SOCK_SEQPACK_SCTP_Test_CPPFLAGS = \ @@ -2492,7 +2270,6 @@ SOCK_SEQPACK_SCTP_Test_LDADD = \ endif !BUILD_ACE_FOR_TAO ## Makefile.SOCK_Send_Recv_Test.am - noinst_PROGRAMS += SOCK_Send_Recv_Test SOCK_Send_Recv_Test_CPPFLAGS = \ @@ -2508,7 +2285,6 @@ SOCK_Send_Recv_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.SOCK_Send_Recv_Test_IPV6.am - noinst_PROGRAMS += SOCK_Send_Recv_Test_IPV6 SOCK_Send_Recv_Test_IPV6_CPPFLAGS = \ @@ -2524,7 +2300,6 @@ SOCK_Send_Recv_Test_IPV6_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.SOCK_Test.am - noinst_PROGRAMS += SOCK_Test SOCK_Test_CPPFLAGS = \ @@ -2540,7 +2315,6 @@ SOCK_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.SOCK_Test_IPv6.am - noinst_PROGRAMS += SOCK_Test_IPv6 SOCK_Test_IPv6_CPPFLAGS = \ @@ -2558,7 +2332,6 @@ SOCK_Test_IPv6_LDADD = \ ## Makefile.SPIPE_Test.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += SPIPE_Test SPIPE_Test_CPPFLAGS = \ @@ -2576,7 +2349,6 @@ SPIPE_Test_LDADD = \ endif !BUILD_ACE_FOR_TAO ## Makefile.SString_Test.am - noinst_PROGRAMS += SString_Test SString_Test_CPPFLAGS = \ @@ -2594,7 +2366,6 @@ SString_Test_LDADD = \ ## Makefile.SV_Shared_Memory_Test.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += SV_Shared_Memory_Test SV_Shared_Memory_Test_CPPFLAGS = \ @@ -2614,7 +2385,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.Semaphore_Test.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Semaphore_Test Semaphore_Test_CPPFLAGS = \ @@ -2632,7 +2402,6 @@ Semaphore_Test_LDADD = \ endif !BUILD_ACE_FOR_TAO ## Makefile.Sendfile_Test.am - noinst_PROGRAMS += Sendfile_Test Sendfile_Test_CPPFLAGS = \ @@ -2664,7 +2433,6 @@ noinst_HEADERS += \ Service_Config_DLL_Export.h ## Makefile.Service_Config_Test.am - noinst_PROGRAMS += Service_Config_Test Service_Config_Test_CPPFLAGS = \ @@ -2680,7 +2448,6 @@ Service_Config_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Signal_Test.am - noinst_PROGRAMS += Signal_Test Signal_Test_CPPFLAGS = \ @@ -2696,7 +2463,6 @@ Signal_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Sigset_Ops_Test.am - noinst_PROGRAMS += Sigset_Ops_Test Sigset_Ops_Test_CPPFLAGS = \ @@ -2712,7 +2478,6 @@ Sigset_Ops_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Simple_Message_Block_Test.am - noinst_PROGRAMS += Simple_Message_Block_Test Simple_Message_Block_Test_CPPFLAGS = \ @@ -2730,7 +2495,6 @@ Simple_Message_Block_Test_LDADD = \ ## Makefile.Svc_Handler_Test.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Svc_Handler_Test Svc_Handler_Test_CPPFLAGS = \ @@ -2750,7 +2514,6 @@ endif !BUILD_ACE_FOR_TAO ## Makefile.TP_Reactor_Test.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += TP_Reactor_Test TP_Reactor_Test_CPPFLAGS = \ @@ -2769,7 +2532,6 @@ TP_Reactor_Test_LDADD = \ endif !BUILD_ACE_FOR_TAO ## Makefile.TSS_Static_Test.am - noinst_PROGRAMS += TSS_Static_Test TSS_Static_Test_CPPFLAGS = \ @@ -2785,7 +2547,6 @@ TSS_Static_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.TSS_Test.am - noinst_PROGRAMS += TSS_Test TSS_Test_CPPFLAGS = \ @@ -2801,7 +2562,6 @@ TSS_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Task_Ex_Test.am - noinst_PROGRAMS += Task_Ex_Test Task_Ex_Test_CPPFLAGS = \ @@ -2818,7 +2578,6 @@ Task_Ex_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Task_Test.am - noinst_PROGRAMS += Task_Test Task_Test_CPPFLAGS = \ @@ -2834,7 +2593,6 @@ Task_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Thread_Manager_Test.am - noinst_PROGRAMS += Thread_Manager_Test Thread_Manager_Test_CPPFLAGS = \ @@ -2850,7 +2608,6 @@ Thread_Manager_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Thread_Mutex_Test.am - noinst_PROGRAMS += Thread_Mutex_Test Thread_Mutex_Test_CPPFLAGS = \ @@ -2868,7 +2625,6 @@ Thread_Mutex_Test_LDADD = \ ## Makefile.Thread_Pool_Reactor_Resume_Test.am if BUILD_ACE_OTHER - noinst_PROGRAMS += Thread_Pool_Reactor_Resume_Test Thread_Pool_Reactor_Resume_Test_CPPFLAGS = \ @@ -2889,7 +2645,6 @@ endif BUILD_ACE_OTHER ## Makefile.Thread_Pool_Reactor_Test.am if BUILD_ACE_OTHER - noinst_PROGRAMS += Thread_Pool_Reactor_Test Thread_Pool_Reactor_Test_CPPFLAGS = \ @@ -2908,7 +2663,6 @@ Thread_Pool_Reactor_Test_LDADD = \ endif BUILD_ACE_OTHER ## Makefile.Thread_Pool_Test.am - noinst_PROGRAMS += Thread_Pool_Test Thread_Pool_Test_CPPFLAGS = \ @@ -2924,7 +2678,6 @@ Thread_Pool_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Time_Service_Test.am - noinst_PROGRAMS += Time_Service_Test Time_Service_Test_CPPFLAGS = \ @@ -2940,7 +2693,6 @@ Time_Service_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Time_Value_Test.am - noinst_PROGRAMS += Time_Value_Test Time_Value_Test_CPPFLAGS = \ @@ -2956,7 +2708,6 @@ Time_Value_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Timeprobe_Test.am - noinst_PROGRAMS += Timeprobe_Test Timeprobe_Test_CPPFLAGS = \ @@ -2972,7 +2723,6 @@ Timeprobe_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Timer_Cancellation_Test.am - noinst_PROGRAMS += Timer_Cancellation_Test Timer_Cancellation_Test_CPPFLAGS = \ @@ -2988,7 +2738,6 @@ Timer_Cancellation_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.Timer_Queue_Reference_Counting_Test.am - noinst_PROGRAMS += Timer_Queue_Reference_Counting_Test Timer_Queue_Reference_Counting_Test_CPPFLAGS = \ @@ -3006,7 +2755,6 @@ Timer_Queue_Reference_Counting_Test_LDADD = \ ## Makefile.Timer_Queue_Test.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Timer_Queue_Test Timer_Queue_Test_CPPFLAGS = \ @@ -3054,7 +2802,6 @@ endif BUILD_TK endif BUILD_ACE_TKREACTOR ## Makefile.Token_Strategy_Test.am - noinst_PROGRAMS += Token_Strategy_Test Token_Strategy_Test_CPPFLAGS = \ @@ -3072,7 +2819,6 @@ Token_Strategy_Test_LDADD = \ ## Makefile.Tokens_Test.am if BUILD_ACE_TOKEN - noinst_PROGRAMS += Tokens_Test Tokens_Test_CPPFLAGS = \ @@ -3092,7 +2838,6 @@ endif BUILD_ACE_TOKEN ## Makefile.UPIPE_SAP_Test.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += UPIPE_SAP_Test UPIPE_SAP_Test_CPPFLAGS = \ @@ -3113,7 +2858,6 @@ endif !BUILD_ACE_FOR_TAO if BUILD_ACE_UUID if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += UUIDTest UUIDTest_CPPFLAGS = \ @@ -3132,7 +2876,6 @@ endif !BUILD_ACE_FOR_TAO endif BUILD_ACE_UUID ## Makefile.Unbounded_Set_Test.am - noinst_PROGRAMS += Unbounded_Set_Test Unbounded_Set_Test_CPPFLAGS = \ @@ -3150,7 +2893,6 @@ Unbounded_Set_Test_LDADD = \ ## Makefile.Upgradable_RW_Test.am if !BUILD_ACE_FOR_TAO - noinst_PROGRAMS += Upgradable_RW_Test Upgradable_RW_Test_CPPFLAGS = \ @@ -3169,7 +2911,6 @@ Upgradable_RW_Test_LDADD = \ endif !BUILD_ACE_FOR_TAO ## Makefile.Vector_Test.am - noinst_PROGRAMS += Vector_Test Vector_Test_CPPFLAGS = \ @@ -3185,7 +2926,6 @@ Vector_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la ## Makefile.WFMO_Reactor_Test.am - noinst_PROGRAMS += WFMO_Reactor_Test WFMO_Reactor_Test_CPPFLAGS = \ diff --git a/ACE/tests/Malloc_Test.cpp b/ACE/tests/Malloc_Test.cpp index 5b260a680a0..88c2bd5e669 100644 --- a/ACE/tests/Malloc_Test.cpp +++ b/ACE/tests/Malloc_Test.cpp @@ -44,7 +44,9 @@ typedef ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex> MALLOC; #if !defined (linux) && !defined (ACE_OPENVMS) \ && !(defined (ACE_WIN32) \ - && (defined (ghs) || defined (__MINGW32__) )) \ + && (defined (ghs) \ + || defined (__MINGW32__) \ + || (!defined(ACE_HAS_WINNT4) || (ACE_HAS_WINNT4 == 0)))) \ && !(defined (__OpenBSD__) && defined (ACE_HAS_PTHREADS)) #define ACE_TEST_REMAP_ON_FAULT // Linux seems to have problem when calling mmap from the signal handler. @@ -74,9 +76,12 @@ static const void *PARENT_BASE_ADDR = ACE_DEFAULT_BASE_ADDR; // Note that on HP-UX on PA-RISC hardware, a single range of a file // cannot be mapped into multiple virtual address ranges, even across // processes. So, though the whole PI pointer thing is tested here, -// it isn't actually using multiple address ranges. +// it isn't actually using multiple address ranges. Also, on Win9x, +// you need to map shared views to the same address. -#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 && !defined (HPUX)) +#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 && !defined (HPUX)) \ + && !(defined (ACE_WIN32) \ + && (!defined (ACE_HAS_WINNT4) || (ACE_HAS_WINNT4 == 0))) # define CHILD_ADDR_DELTA (1024*1024) #else # define CHILD_ADDR_DELTA 0 @@ -302,16 +307,14 @@ child (void) return 0; } -#if defined (ACE_WIN32) +#if defined (ACE_WIN32) \ + && (!defined (ACE_HAS_WINNT4) || (ACE_HAS_WINNT4 == 0)) // On Win9x/Me, a shared address needs to be on the shared arena, // betweeen the second and third megabyte in the virtual address space // of the process. Also, a mapped view of a file is shared on the same // 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 -// 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 get_base_addrs (void) { @@ -320,20 +323,20 @@ get_base_addrs (void) if (::GetVersionEx(&vinfo) == 0) return; - if (vinfo.dwPlatformId == VER_PLATFORM_WIN32_NT && - vinfo.dwMajorVersion >= 4) + if (vinfo.dwPlatformId == VER_PLATFORM_WIN32_NT) PARENT_BASE_ADDR = (char*) (64 * 1024*1024); else PARENT_BASE_ADDR = (char*) ((2048UL + 512UL)*(1024UL*1024UL)); CHILD_BASE_ADDR = CHILD_ADDR_DELTA + (char*) PARENT_BASE_ADDR; } -#endif /* defined (ACE_WIN32) */ +#endif /* defined (ACE_WIN32) && (!defined (ACE_HAS_WINNT4) || (ACE_HAS_WINNT4 == 0)) */ int run_main (int argc, ACE_TCHAR *[]) { -#if defined (ACE_WIN32) +#if defined (ACE_WIN32) \ + && (!defined (ACE_HAS_WINNT4) || (ACE_HAS_WINNT4 == 0)) get_base_addrs(); #endif diff --git a/ACE/tests/Manual_Event_Test.cpp b/ACE/tests/Manual_Event_Test.cpp index 3c914698d56..1b28d846a71 100644 --- a/ACE/tests/Manual_Event_Test.cpp +++ b/ACE/tests/Manual_Event_Test.cpp @@ -47,6 +47,9 @@ static int test_result = 0; // state is 0). static ACE_Manual_Event evt ((unsigned int) 0); +// Default number of iterations. +static int n_iterations = 10; + // Number of worker threads. static long n_workers = 10; @@ -71,7 +74,7 @@ print_usage_and_die (void) static void parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("w:")); + ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("w:n:")); int c; @@ -81,6 +84,9 @@ parse_args (int argc, ACE_TCHAR *argv[]) case 'w': n_workers = ACE_OS::atoi (get_opt.opt_arg ()); break; + case 'n': + n_iterations = ACE_OS::atoi (get_opt.opt_arg ()); + break; default: print_usage_and_die (); break; diff --git a/ACE/tests/Message_Queue_Test.cpp b/ACE/tests/Message_Queue_Test.cpp index 27ae29f0470..4198ca5b6fd 100644 --- a/ACE/tests/Message_Queue_Test.cpp +++ b/ACE/tests/Message_Queue_Test.cpp @@ -299,7 +299,7 @@ single_thread_performance_test (int queue_type = 0) -1); message = "ACE_Message_Queue_Vx, single thread test"; } -#elif defined (ACE_WIN32) && defined (ACE_HAS_WIN32_OVERLAPPED_IO) +#elif defined (ACE_WIN32) && (ACE_HAS_WINNT4 != 0) else { ACE_NEW_RETURN (msgq, @@ -495,7 +495,7 @@ performance_test (int queue_type = 0) -1); message = "ACE_Message_Queue_Vx"; } -#elif defined (ACE_WIN32) && defined (ACE_HAS_WIN32_OVERLAPPED_IO) +#elif defined (ACE_WIN32) && (ACE_HAS_WINNT4 != 0) else { ACE_NEW_RETURN (queue_wrapper.q_, @@ -659,7 +659,7 @@ run_main (int argc, ACE_TCHAR *argv[]) if (status == 0) status = single_thread_performance_test (); -# if defined (VXWORKS) || defined (ACE_HAS_WIN32_OVERLAPPED_IO) +# if defined (VXWORKS) || (defined (ACE_WIN32) && (ACE_HAS_WINNT4 != 0)) // Test ACE_Message_Queue_Vx. or ACE_Message_Queue_NT if (status == 0) status = single_thread_performance_test (1); @@ -668,7 +668,7 @@ run_main (int argc, ACE_TCHAR *argv[]) if (status == 0) status = performance_test (); -# if defined (VXWORKS) || defined (ACE_HAS_WIN32_OVERLAPPED_IO) +# if defined (VXWORKS) || (defined (ACE_WIN32) && (ACE_HAS_WINNT4 != 0)) // Test ACE_Message_Queue_Vx or ACE_Message_Queue_NT if (status == 0) status = performance_test (1); diff --git a/ACE/tests/OS_Test.cpp b/ACE/tests/OS_Test.cpp index d270a19d66c..fa7b058e4e4 100644 --- a/ACE/tests/OS_Test.cpp +++ b/ACE/tests/OS_Test.cpp @@ -92,7 +92,7 @@ rename_test (void) } ACE_OS::fclose (f); -#if defined (ACE_WIN32) && defined (ACE_LACKS_WIN32_MOVEFILEEX) +#if defined (ACE_WIN32) && defined (ACE_HAS_WINNT4) && ACE_HAS_WINNT4 == 0 // Can't rename if new_file exists already. ACE_OS::unlink (new_file); #endif @@ -524,78 +524,6 @@ string_emulation_test (void) return 0; } -// Test ACE_OS::snprintf -int -snprintf_test (void) -{ - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing snprintf\n"))); - - int error_count = 0; - const int BUFFER_SIZE = 4; - char buf[2*BUFFER_SIZE]; - int retval; - - ACE_OS::memset(buf, 0xab, 2*BUFFER_SIZE); - retval = ACE_OS::snprintf (buf, BUFFER_SIZE, "%d", 123); - if (retval != 3) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("[1] ACE_OS::snprintf() returns %d, should be 3\n"), - retval)); - ++error_count; - } - - ACE_OS::memset(buf, 0xab, 2*BUFFER_SIZE); - retval = ACE_OS::snprintf (buf, BUFFER_SIZE, "%d", 1234); - - // HP-UX has broken vsnprintf -#if !defined (HPUX) - if (retval != 4) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("[2] ACE_OS::snprintf() returns %d, should be 4\n"), - retval)); - ++error_count; - } -#endif /* !HPUX */ - - if (buf[3] != 0) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("[3] ACE_OS::snprintf() doesn't terminate string correctly\n"))); - ++error_count; - } - else if (ACE_OS::strcmp(buf, "123") != 0) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("[4] ACE_OS::snprintf() incorrect output\n"))); - ++error_count; - } - - ACE_OS::memset(buf, 0xab, 2*BUFFER_SIZE); - retval = ACE_OS::snprintf (buf, BUFFER_SIZE, "%d", 12345); - if (retval != 5) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("[5] ACE_OS::snprintf() returns %d, should be 5\n"), - retval)); - ++error_count; - } - else if (buf[3] != 0) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("[6] ACE_OS::snprintf() doesn't terminate string correctly\n"))); - ++error_count; - } - else if (ACE_OS::strcmp(buf, "123") != 0) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("[6] ACE_OS::snprintf() incorrect output\n"))); - ++error_count; - } - - return error_count; -} static int ctime_r_test (void) @@ -911,11 +839,6 @@ run_main (int, ACE_TCHAR *[]) if ((result = string_emulation_test ()) != 0) status = result; -#if !defined (ACE_LACKS_VSNPRINTF) || defined (ACE_HAS_TRIO) - if ((result = snprintf_test ()) != 0) - status = result; -#endif /* !ACE_LACKS_VSNPRINTF || ACE_HAS_TRIO */ - if ((result = ctime_r_test ()) != 0) status = result; diff --git a/ACE/tests/Proactor_Scatter_Gather_Test.cpp b/ACE/tests/Proactor_Scatter_Gather_Test.cpp index acc7e11c5b7..a3cbb335a34 100644 --- a/ACE/tests/Proactor_Scatter_Gather_Test.cpp +++ b/ACE/tests/Proactor_Scatter_Gather_Test.cpp @@ -28,7 +28,7 @@ #include "test_config.h" -#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) +#if ((defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) && !defined (ACE_HAS_WINCE)) // This currently only works on Win32 platforms (NT SP2 and above). // Support for Unix platforms supporting POSIX aio calls should be added in future. @@ -1482,4 +1482,4 @@ run_main (int, ACE_TCHAR *[]) return 0; } -#endif /* ACE_HAS_WIN32_OVERLAPPED_IO */ +#endif /* (ACE_HAS_WINNT4 && ACE_HAS_WINNT4 != 0) && !ACE_HAS_WINCE) */ diff --git a/ACE/tests/Proactor_Test.cpp b/ACE/tests/Proactor_Test.cpp index 28a5dbcff8a..9d739b2d5e3 100644 --- a/ACE/tests/Proactor_Test.cpp +++ b/ACE/tests/Proactor_Test.cpp @@ -20,7 +20,7 @@ ACE_RCSID (tests, Proactor_Test, "$Id$") -#if defined (ACE_HAS_THREADS) && (defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)) +#if defined (ACE_HAS_THREADS) && ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS))) // This only works on Win32 platforms and on Unix platforms // supporting POSIX aio calls. @@ -50,7 +50,7 @@ ACE_RCSID (tests, #include "ace/Atomic_Op.h" #include "ace/Synch_Traits.h" -#if defined (ACE_WIN32) +#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) # include "ace/WIN32_Proactor.h" @@ -60,7 +60,7 @@ ACE_RCSID (tests, # include "ace/POSIX_CB_Proactor.h" # include "ace/SUN_Proactor.h" -#endif /* ACE_WIN32 */ +#endif /* defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) */ #include "Proactor_Test.h" @@ -205,7 +205,7 @@ MyTask::create_proactor (ProactorType type_proactor, size_t max_op) ACE_ASSERT (this->proactor_ == 0); -#if defined (ACE_WIN32) +#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) ACE_UNUSED_ARG (type_proactor); ACE_UNUSED_ARG (max_op); @@ -269,7 +269,7 @@ MyTask::create_proactor (ProactorType type_proactor, size_t max_op) break; } -#endif /* ACE_WIN32 */ +#endif // (ACE_WIN32) && !defined (ACE_HAS_WINCE) // always delete implementation 1 , not !(proactor_impl == 0) ACE_NEW_RETURN (this->proactor_, @@ -1281,7 +1281,7 @@ Client::initiate_write_stream (void) static const size_t complete_message_length = ACE_OS::strlen (complete_message); -#if defined (ACE_WIN32) +#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) ACE_Message_Block *mb1 = 0, *mb2 = 0, @@ -1319,7 +1319,7 @@ Client::initiate_write_stream (void) ACE_TEXT ("Client::ACE_Asynch_Stream::writev")), -1); } -#else /* ACE_WIN32 */ +#else /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ ACE_Message_Block *mb = 0; @@ -1346,7 +1346,7 @@ Client::initiate_write_stream (void) ACE_TEXT ("write")), -1); } -#endif /* ACE_WIN32 */ +#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ this->io_count_++; this->total_w_++; @@ -1362,7 +1362,7 @@ Client::initiate_read_stream (void) static const size_t complete_message_length = ACE_OS::strlen (complete_message); -#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) +#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) ACE_Message_Block *mb1 = 0, *mb2 = 0, *mb3 = 0, @@ -1411,7 +1411,7 @@ Client::initiate_read_stream (void) ACE_TEXT ("Client::ACE_Asynch_Read_Stream::readv")), -1); } -#else /* ACE_HAS_WIN32_OVERLAPPED_IO */ +#else /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ // Try to read more chunks size_t blksize = ( complete_message_length > BUFSIZ ) ? @@ -1444,7 +1444,7 @@ Client::initiate_read_stream (void) ACE_TEXT ("read")), -1); } -#endif /* ACE_HAS_WIN32_OVERLAPPED_IO */ +#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ this->io_count_++; this->total_r_++; @@ -1495,7 +1495,7 @@ Client::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result) ACE_TEXT ("error"), result.error ())); -#if defined (ACE_WIN32) +#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) size_t bytes_transferred = result.bytes_transferred (); char index = 0; for (ACE_Message_Block* mb_i = &mb; @@ -1526,7 +1526,7 @@ Client::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result) index, mb_i->rd_ptr ())); } -#else /* ACE_WIN32 */ +#else /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ // 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 @@ -1535,7 +1535,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 /* ACE_WIN32 */ +#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("**** end of message ****************\n"))); @@ -1638,7 +1638,7 @@ Client::handle_read_stream (const ACE_Asynch_Read_Stream::Result &result) ACE_TEXT ("error"), result.error ())); -#if defined (ACE_WIN32) +#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) char index = 0; for (ACE_Message_Block* mb_i = &mb; mb_i != 0; @@ -1654,14 +1654,14 @@ Client::handle_read_stream (const ACE_Asynch_Read_Stream::Result &result) index, mb_i->rd_ptr ())); } -#else /* ACE_WIN32 */ +#else /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ // write 0 at string end for proper printout mb.rd_ptr()[result.bytes_transferred ()] = '\0'; // for proper printout ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%s = %s\n"), ACE_TEXT ("message_block"), mb.rd_ptr ())); -#endif /* ACE_WIN32 */ +#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("**** end of message ****************\n"))); @@ -1934,4 +1934,4 @@ run_main (int, ACE_TCHAR *[]) return 0; } -#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */ +#endif /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS */ diff --git a/ACE/tests/Proactor_Test_IPV6.cpp b/ACE/tests/Proactor_Test_IPV6.cpp index 003f6915612..7ac9443d0ae 100644 --- a/ACE/tests/Proactor_Test_IPV6.cpp +++ b/ACE/tests/Proactor_Test_IPV6.cpp @@ -20,7 +20,7 @@ ACE_RCSID (tests, Proactor_Test, "$Id$") -#if defined (ACE_HAS_THREADS) && (defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)) +#if defined (ACE_HAS_THREADS) && ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS))) // This only works on Win32 platforms and on Unix platforms // supporting POSIX aio calls. @@ -50,7 +50,7 @@ ACE_RCSID (tests, #include "ace/Atomic_Op.h" #include "ace/Synch_Traits.h" -#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) +#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) # include "ace/WIN32_Proactor.h" @@ -60,7 +60,7 @@ ACE_RCSID (tests, # include "ace/POSIX_CB_Proactor.h" # include "ace/SUN_Proactor.h" -#endif /* defined (ACE_HAS_WIN32_OVERLAPPED_IO) */ +#endif /* defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) */ #include "Proactor_Test.h" @@ -1678,7 +1678,7 @@ Client::handle_read_stream (const ACE_Asynch_Read_Stream::Result &result) ACE_TEXT ("error"), result.error ())); -#if defined (ACE_WIN32) +#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) char index = 0; for (ACE_Message_Block* mb_i = &mb; mb_i != 0; @@ -1694,14 +1694,14 @@ Client::handle_read_stream (const ACE_Asynch_Read_Stream::Result &result) index, mb_i->rd_ptr ())); } -#else /* ACE_WIN32 */ +#else /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ // write 0 at string end for proper printout mb.rd_ptr()[result.bytes_transferred ()] = '\0'; // for proper printout ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%s = %s\n"), ACE_TEXT ("message_block"), mb.rd_ptr ())); -#endif /* ACE_WIN32 */ +#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("**** end of message ****************\n"))); @@ -1981,4 +1981,4 @@ run_main (int, ACE_TCHAR *[]) return 0; } -#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */ +#endif /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS */ diff --git a/ACE/tests/Proactor_Timer_Test.cpp b/ACE/tests/Proactor_Timer_Test.cpp index 7d81bcb5ef1..b93bc7dc78f 100644 --- a/ACE/tests/Proactor_Timer_Test.cpp +++ b/ACE/tests/Proactor_Timer_Test.cpp @@ -27,7 +27,7 @@ ACE_RCSID (tests, Proactor_Timer_Test, "$Id$") -#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS) +#if ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS))) // This only works on Win32 platforms and on Unix platforms // supporting POSIX aio calls. @@ -38,7 +38,7 @@ ACE_RCSID (tests, #include "ace/Asynch_IO.h" static int done = 0; -static size_t counter = 0; +static size_t count = 0; static int odd = 0; class Time_Handler : public ACE_Handler @@ -100,29 +100,29 @@ Time_Handler::Time_Handler (void) void Time_Handler::handle_time_out (const ACE_Time_Value &, const void *arg) { - size_t current_counter = *(reinterpret_cast<const size_t *> (arg)); - if (current_counter != counter) + size_t current_count = *(reinterpret_cast<const size_t *> (arg)); + if (current_count != count) ACE_ERROR ((LM_ERROR, ACE_TEXT ("Expected timer %d, not %d\n"), - counter, - current_counter)); + count, + current_count)); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("[%@] Timer id %d with counter #%d|%d expired.\n"), + ACE_TEXT ("[%@] Timer id %d with count #%d|%d expired.\n"), this, this->timer_id (), - counter, - current_counter)); + count, + current_count)); - if (current_counter == (ACE_MAX_TIMERS - 1)) + if (current_count == (ACE_MAX_TIMERS - 1)) done = 1; - else if (counter == ACE_MAX_TIMERS - 1) + else if (count == ACE_MAX_TIMERS - 1) { done = 1; return; } - counter += (1 + odd); + count += (1 + odd); return; } @@ -213,7 +213,7 @@ test_registering_one_handler (void) size_t which[ACE_MAX_TIMERS]; done = 0; - counter = 0; + count = 0; long secs = 0; size_t i = 0; for ( ; i < ACE_MAX_TIMERS; i++, secs++) @@ -241,7 +241,7 @@ test_canceling_odd_timers (void) size_t which[ACE_MAX_TIMERS]; done = 0; - counter = 1; + count = 1; odd = 1; size_t i = 0; long secs = 0; @@ -340,4 +340,4 @@ run_main (int, ACE_TCHAR *[]) return 0; } -#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */ +#endif /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS */ diff --git a/ACE/tests/QtReactor_Test.cpp b/ACE/tests/QtReactor_Test.cpp index 1bbb2d43c74..c228802988b 100644 --- a/ACE/tests/QtReactor_Test.cpp +++ b/ACE/tests/QtReactor_Test.cpp @@ -51,7 +51,7 @@ ACE_RCSID (tests, #include "ace/OS_NS_time.h" #include "ace/Time_Value.h" -#include "ace/QtReactor/QtReactor.h" +#include "ace/QtReactor.h" #include "ace/Event_Handler.h" #include "ace/Acceptor.h" #include "ace/Connector.h" diff --git a/ACE/tests/RB_Tree_Test.cpp b/ACE/tests/RB_Tree_Test.cpp index 1b3658d72b1..c276a96cafd 100644 --- a/ACE/tests/RB_Tree_Test.cpp +++ b/ACE/tests/RB_Tree_Test.cpp @@ -97,413 +97,279 @@ run_main (int, ACE_TCHAR *[]) str_int_test.run_test (); str_str_test.run_test (); -// ======= Stress Test contributed by Klaus H. Wolf <hw@cyland.com> ========= +// ======= Stress Test contributed by Klaus H. Wolf <hw@cyland.com> ================== ACE_RB_Tree<ACE_CString, int, ACE_Less_Than<ACE_CString>, ACE_Null_Mutex> tree; tree.bind (ACE_CString ("51"), 1); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("13"), 2); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("36"), 3); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("15"), 4); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("22"), 5); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("25"), 6); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("42"), 7); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("48"), 8); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("03"), 9); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("56"), 10); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("28"), 11); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("55"), 12); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("21"), 13); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("62"), 14); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("18"), 15); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("20"), 16); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("26"), 17); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("29"), 18); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("50"), 19); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("05"), 20); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("59"), 21); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("65"), 22); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("66"), 23); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("45"), 24); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("34"), 25); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("27"), 26); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("40"), 27); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("30"), 28); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("64"), 29); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("11"), 30); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("16"), 31); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("47"), 32); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("10"), 33); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("37"), 34); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("09"), 35); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("54"), 36); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("23"), 37); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("44"), 38); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("19"), 39); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("00"), 40); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("04"), 41); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("63"), 42); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("08"), 43); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("39"), 44); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("31"), 45); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("02"), 46); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("33"), 47); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("60"), 48); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("61"), 49); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("57"), 50); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("43"), 51); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("46"), 52); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("38"), 53); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("01"), 54); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("12"), 55); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("24"), 56); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("52"), 57); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("07"), 58); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("14"), 59); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("06"), 60); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("58"), 61); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("49"), 62); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("17"), 63); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("53"), 64); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("32"), 65); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("35"), 66); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.bind (ACE_CString ("41"), 67); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("51")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("13")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("36")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("15")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("22")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("25")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("42")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("48")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("03")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("56")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("28")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("55")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("21")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("62")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("18")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("20")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("26")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("29")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("50")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("05")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("59")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("65")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("66")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("45")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("34")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("27")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("40")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("30")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("64")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("11")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("16")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("47")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("10")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("37")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("09")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("54")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("23")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("44")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("19")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("00")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("04")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("63")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("08")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("39")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("31")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("02")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("33")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("60")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("61")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("57")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("43")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("46")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("38")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("01")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("12")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("24")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("52")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("07")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("14")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("06")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("58")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("49")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("17")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("53")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("32")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("35")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); tree.unbind (ACE_CString ("41")); - if (0 != tree.test_invariant ()) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Invariant failure at line %l\n"))); + ACE_ASSERT (tree.test_invariant () == 0); // ======== End Stress Test =================== @@ -566,32 +432,20 @@ ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_tree_insertion (v { INT_ID item; int k = order_index_ [i]; - if (!(k >= 0 && k < entry_count_)) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Assert failure at line %l\n"))); + ACE_ASSERT (k >= 0 && k < entry_count_); // Test the new stable ACE_Hash_Map_Manager_Ex compliant interface. - if (0 != stable_tree_.bind (key_array_ [k], item_array_ [k])) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Stable bind %p\n"), - ACE_TEXT ("failure"))); - - if (0 != stable_tree_.find (key_array_ [k], item) || - item != item_array_ [k]) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Stable find %p\n"), - ACE_TEXT ("failure"))); + ACE_ASSERT (stable_tree_.bind (key_array_ [k], + item_array_ [k]) == 0); + ACE_ASSERT (stable_tree_.find (key_array_ [k], item) == 0 + && item == item_array_ [k]); // Test the deprecated interface. - if (0 == deprecated_tree_.insert (key_array_ [k], item_array_ [k])) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Deprecated insert %p\n"), - ACE_TEXT ("failure"))); - - if (0 == deprecated_tree_.find (key_array_ [k]) || - *deprecated_tree_.find (key_array_ [k]) != item_array_ [k]) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Deprecated find %p\n"), - ACE_TEXT ("failure"))); + ACE_ASSERT (deprecated_tree_.insert (key_array_ [k], + item_array_ [k]) != 0); + ACE_ASSERT (deprecated_tree_.find (key_array_ [k]) != 0 + && *deprecated_tree_.find (key_array_ [k]) == + item_array_ [k]); } } @@ -615,32 +469,16 @@ ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_post_insertion_it INT_ID item; item = (*stable_fwd_iter_).item (); - if (item != item_array_ [i]) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Stable fwd iter, pass %d %p\n"), - i, - ACE_TEXT ("failure"))); + ACE_ASSERT (item == item_array_ [i]); item = (*stable_rev_iter_).item (); - if (item != item_array_ [entry_count_ - i - 1]) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Stable rev iter, pass %d %p\n"), - i, - ACE_TEXT ("failure"))); + ACE_ASSERT (item == item_array_ [entry_count_ - i - 1]); item = (*deprecated_fwd_iter_).item (); - if (item != item_array_ [i]) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Deprecated fwd iter, pass %d %p\n"), - i, - ACE_TEXT ("failure"))); + ACE_ASSERT (item == item_array_ [i]); item = (*deprecated_rev_iter_).item (); - if (item != item_array_ [entry_count_ - i - 1]) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Deprecated rev iter, pass %d %p\n"), - i, - ACE_TEXT ("failure"))); + ACE_ASSERT (item == item_array_ [entry_count_ - i - 1]); // Advance each iterator. ++stable_fwd_iter_; @@ -657,18 +495,11 @@ ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_post_insertion_it // Make sure each item in each tree has been visited - if (stable_fwd_iter_.done () != 1) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Stable fwd iter not done but should be\n"))); - if (stable_rev_iter_.done () != 1) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Stable fwd iter not done but should be\n"))); - if (deprecated_fwd_iter_.done () != 1) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Stable fwd iter not done but should be\n"))); - if (deprecated_rev_iter_.done () != 1) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Stable fwd iter not done but should be\n"))); + ACE_ASSERT (stable_fwd_iter_.done () == 1); + ACE_ASSERT (stable_rev_iter_.done () == 1); + ACE_ASSERT (deprecated_fwd_iter_.done () == 1); + ACE_ASSERT (deprecated_rev_iter_.done () == 1); + } template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> void @@ -683,11 +514,7 @@ ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_partial_iteration INT_ID item; item = (*part_rev_iter_).item (); - if (item != item_array_ [i]) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Partial rev iter, pass %d %p\n"), - i, - ACE_TEXT ("failure"))); + ACE_ASSERT (item == item_array_ [i]); part_rev_iter_++; } @@ -697,11 +524,7 @@ ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_partial_iteration INT_ID item; item = (*part_fwd_iter_).item (); - if (item != item_array_ [k]) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Partial fwd iter, pass %d %p\n"), - k, - ACE_TEXT ("failure"))); + ACE_ASSERT (item == item_array_ [k]); part_fwd_iter_++; } } @@ -717,18 +540,10 @@ ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_tree_deletion (vo { // Test the new stable ACE_Hash_Map_Manager_Ex compliant // interface. - if (stable_tree_.unbind (key_array_ [i]) != 0) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Stable tree, failure pass %d %p\n"), - i, - ACE_TEXT ("unbind"))); + ACE_ASSERT (stable_tree_.unbind (key_array_ [i]) == 0); // Test the deprecated interface. - if (deprecated_tree_.remove (key_array_ [i]) != 1) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Deprecated tree, failure pass %d %p\n"), - i, - ACE_TEXT ("remove"))); + ACE_ASSERT (deprecated_tree_.remove (key_array_ [i]) == 1); } } @@ -753,32 +568,17 @@ ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_post_deletion_ite INT_ID item; item = (*stable_fwd_iter_).item (); - if (item != item_array_ [i]) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Stable fwd iter, pass %d %p\n"), - i, - ACE_TEXT ("failure"))); + ACE_ASSERT (item == item_array_ [i]); + item = (*stable_rev_iter_).item (); - if (item != item_array_ [entry_count_ - i]) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Stable rev iter, pass %d %p\n"), - i, - ACE_TEXT ("failure"))); + ACE_ASSERT (item == item_array_ [entry_count_ - i]); item = (*deprecated_fwd_iter_).item (); - if (item != item_array_ [i]) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Deprecated fwd iter, pass %d %p\n"), - i, - ACE_TEXT ("failure"))); + ACE_ASSERT (item == item_array_ [i]); item = (*deprecated_rev_iter_).item (); - if (item != item_array_ [entry_count_ - i]) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Deprecated rev iter, pass %d %p\n"), - i, - ACE_TEXT ("failure"))); + ACE_ASSERT (item == item_array_ [entry_count_ - i]); // Advance each iterator via postfix increment. stable_fwd_iter_++; @@ -788,18 +588,10 @@ ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_post_deletion_ite } // Make sure each item in each tree has been visited a second time. - if (stable_fwd_iter_.done () != 1) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Stable fwd iter not done but should be\n"))); - if (stable_rev_iter_.done () != 1) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Stable rev iter not done but should be\n"))); - if (deprecated_fwd_iter_.done () != 1) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Deprecated fwd iter not done but should be\n"))); - if (deprecated_rev_iter_.done () != 1) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Deprecated rev iter not done but should be\n"))); + ACE_ASSERT (stable_fwd_iter_.done () == 1); + ACE_ASSERT (stable_rev_iter_.done () == 1); + ACE_ASSERT (deprecated_fwd_iter_.done () == 1); + ACE_ASSERT (deprecated_rev_iter_.done () == 1); } diff --git a/ACE/tests/SPIPE_Test.cpp b/ACE/tests/SPIPE_Test.cpp index 31e0ae86653..22a4427af44 100644 --- a/ACE/tests/SPIPE_Test.cpp +++ b/ACE/tests/SPIPE_Test.cpp @@ -32,7 +32,9 @@ ACE_RCSID(tests, SPIPE_Test, "SPIPE_Test.cpp,v 4.36 2002/03/06 21:48:03 nanbor Exp") -#if defined (ACE_HAS_STREAM_PIPES) || defined (ACE_HAS_WIN32_NAMED_PIPES) +#if defined (ACE_HAS_STREAM_PIPES) \ + || (defined (ACE_WIN32) && defined(ACE_HAS_WINNT4) \ + && (ACE_HAS_WINNT4 !=0)) # define TEST_HAS_STREAM_PIPES #endif @@ -62,7 +64,7 @@ client (void *) if (cli_stream.close () == -1) ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("close"))); -#if defined (ACE_HAS_WIN32_NAMED_PIPES) +#if (defined (ACE_WIN32) && defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) // Wait for server to get ready... ACE_OS::sleep (1); @@ -132,7 +134,7 @@ server (void *) new_stream.close (); acceptor.close (); -#if defined (ACE_HAS_WIN32_NAMED_PIPES) +#if (defined (ACE_WIN32) && defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) // Initialize an NT bytestream named pipe listener. if (acceptor.open (ACE_SPIPE_Addr (rendezvous), 1, @@ -175,7 +177,7 @@ server (void *) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("End of connection. Closing handle\n"))); new_stream.close (); acceptor.close (); -#endif /* defined (ACE_HAS_WIN32NAMED_PIPES) */ +#endif /* (defined (ACE_WIN32) && defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) */ return 0; } diff --git a/ACE/tests/SSL/Makefile.am b/ACE/tests/SSL/Makefile.am index ee10293e8ca..c3ae6261b1b 100644 --- a/ACE/tests/SSL/Makefile.am +++ b/ACE/tests/SSL/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) @@ -45,6 +45,7 @@ endif BUILD_SSL ## Makefile.Thread_Pool_Reactor_SSL_Test.am if BUILD_SSL +if !BUILD_ACE_FOR_TAO noinst_PROGRAMS += Thread_Pool_Reactor_SSL_Test @@ -68,6 +69,7 @@ Thread_Pool_Reactor_SSL_Test_LDADD = \ $(ACE_BUILDDIR)/ace/libACE.la \ @ACE_TLS_LIBS@ +endif !BUILD_ACE_FOR_TAO endif BUILD_SSL ## Clean up template repositories, etc. diff --git a/ACE/tests/SV_Shared_Memory_Test.cpp b/ACE/tests/SV_Shared_Memory_Test.cpp index 305e3785c96..f8351395346 100644 --- a/ACE/tests/SV_Shared_Memory_Test.cpp +++ b/ACE/tests/SV_Shared_Memory_Test.cpp @@ -140,15 +140,6 @@ run_main (int, ACE_TCHAR *[]) #if defined (ACE_HAS_SYSV_IPC) && !defined (ACE_LACKS_FORK) && \ !defined(ACE_LACKS_SYSV_SHMEM) - - // Check whether allocator was initialized. - if (myallocator ().bad ()) - { - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("Unable to initialize allocator\n")), - -1); - } - char *shm = reinterpret_cast<char *> (myallocator ().malloc (SHMSZ)); // Create the mutex and synch before spawning the child process, to diff --git a/ACE/tests/Svc_Handler_Test.cpp b/ACE/tests/Svc_Handler_Test.cpp index 09393447ba2..c36d8483e08 100644 --- a/ACE/tests/Svc_Handler_Test.cpp +++ b/ACE/tests/Svc_Handler_Test.cpp @@ -101,7 +101,9 @@ run_main (int argc, ACE_TCHAR *argv[]) file.get_path_name ()), 1); -#if !defined (VXWORKS) +#if (!defined (ACE_WIN32) \ + || (defined (ACE_HAS_WINNT4) && ACE_HAS_WINNT4 == 1)) && \ + !defined (VXWORKS) # define TEST_CAN_UNLINK_IN_ADVANCE #endif diff --git a/ACE/tests/Thread_Creation_Threshold_Test.cpp b/ACE/tests/Thread_Creation_Threshold_Test.cpp deleted file mode 100644 index c31e7ec2223..00000000000 --- a/ACE/tests/Thread_Creation_Threshold_Test.cpp +++ /dev/null @@ -1,230 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// tests -// -// = FILENAME -// Thread_Creation_Threshold_Test.cpp -// -// = DESCRIPTION -// 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). -// -// = AUTHOR -// Chris Cleeland <cleeland@ociweb.com> -// -// ============================================================================ - -#include "test_config.h" -#include "ace/Task.h" - -ACE_RCSID(tests, Thread_Pool_Test, "$Id$") - -#if defined (ACE_HAS_THREADS) -#include "ace/Lock_Adapter_T.h" -#include "ace/OS_NS_stdio.h" -#include "ace/OS_NS_string.h" -#include "ace/OS_NS_unistd.h" - -// Number of iterations to run the test. -const int THREADS_PER_POOL = 1000; -const unsigned long MAX_THREAD = 100000; - -namespace -{ - // Change this to 'true' if you want lots of debugging messages in the log - const bool PRINT_DEBUG_MSGS = true; -} - -class Thread_Pool : public ACE_Task<ACE_MT_SYNCH> -{ - // = TITLE - // Defines a thread pool abstraction based on the <ACE_Task>. -public: - Thread_Pool (int n_threads); - // Create the thread pool containing <n_threads>. - - ~Thread_Pool (void); - // Destructor... - - virtual int svc (void); - // Iterate <n_iterations> time printing off a message and "waiting" - // for all other threads to complete this iteration. - - void start(); - // Start the threads in the pool. - - unsigned long total_threads() - { - return this->total_activated_threads_.value(); - } - - int n_threads_; - // Number of threads to spawn. - - bool operator! (); - // Returns true iff failed_ == false. - -private: - virtual int open (void * = 0); - // Spawn the threads in the pool. - - virtual int close (u_long); - // Close hook. - - ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long> total_activated_threads_; - // Total number of threads activated through this thread pool ever. - - bool doprint_; - // Flag set only in worker threads to indicate whether they should print - // debug messages. - - bool failed_; - // Flag indicating that start() failed. -}; - -bool -Thread_Pool::operator!() -{ - return ! this->failed_; -} - -Thread_Pool::~Thread_Pool (void) -{ -} - -int -Thread_Pool::close (u_long) -{ - if (this->doprint_) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) worker thread closing down\n"))); - return 0; -} - -Thread_Pool::Thread_Pool (int n_threads) - : n_threads_ (n_threads) - , total_activated_threads_ (0) - , doprint_ (false) - , failed_ (false) -{ -} - -void -Thread_Pool::start () -{ - this->failed_ = false; - if (this->open () == -1) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) thread activation ") - ACE_TEXT ("failed after %u threads\n"), - this->total_threads())); - this->failed_ = true; - } -} - -int -Thread_Pool::svc (void) -{ - unsigned long t = ++this->total_activated_threads_; - if (PRINT_DEBUG_MSGS) // change this to 'true' for debugging - this->doprint_ = (t > 65530); - - if (this->doprint_) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT(" (%P|%t) thread started.\n"))); - - // Note that the <ACE_Task::svc_run> method automatically removes us - // from the <ACE_Thread_Manager> when the thread exits. - return 0; -} - -namespace { - void no_op() { } -} - -int -Thread_Pool::open (void *) -{ - if (PRINT_DEBUG_MSGS) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) pool start %d threads..."), - this->n_threads_)); - - if (this->total_activated_threads_ >= (65534 - this->n_threads_)) - no_op (); - - // Create a pool of worker threads. - if (this->activate (THR_NEW_LWP, - this->n_threads_) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("activate failed")), - -1); - - return 0; -} - -#endif /* ACE_HAS_THREADS */ - - -int -run_main (int, ACE_TCHAR *[]) -{ - ACE_START_TEST (ACE_TEXT ("Thread_Creation_Threshold_Test")); - -#if defined (ACE_HAS_THREADS) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) will try to start and kill up") - ACE_TEXT (" to %u threads sequentially\n"), - MAX_THREAD)); - int initial_pool_size = 50; - - // Create the worker tasks. - Thread_Pool thread_pool (initial_pool_size); - - while (!thread_pool && thread_pool.total_threads() < MAX_THREAD) - { - // Activate the task's thread pool, produce the messages that are, - // produce the messages that are consumed by the threads in the - // thread pool, and demonstrate how to shutdown by enqueueing - // "empty" messages into the queue. - thread_pool.start (); - - // Wait for all the threads to reach their exit point, at which - // point the barrier in the destructor of the <ACE_Task> portion of - // <Thread_Pool> will return. - if (thread_pool.wait () == -1) - return 1; - - if (PRINT_DEBUG_MSGS) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("%u total threads\n"), - thread_pool.total_threads())); - - int& n_threads = thread_pool.n_threads_; - const unsigned long THREAD_THRESHOLD = 63336; - if (thread_pool.total_threads() >= (THREAD_THRESHOLD - n_threads)) - n_threads = 1; - } - - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("%u total threads successfully started and died;") - ACE_TEXT (" expected %u.\n"), - thread_pool.total_threads (), - MAX_THREAD)); -#else - ACE_ERROR ((LM_INFO, - ACE_TEXT ("threads not supported on this platform\n"))); -#endif /* ACE_HAS_THREADS */ - ACE_END_TEST; - return 0; -} diff --git a/ACE/tests/Time_Value_Test.cpp b/ACE/tests/Time_Value_Test.cpp index 764b23f406d..13fd8fe3bda 100644 --- a/ACE/tests/Time_Value_Test.cpp +++ b/ACE/tests/Time_Value_Test.cpp @@ -227,10 +227,6 @@ run_main (int, ACE_TCHAR *[]) ACE_ASSERT (tv7 == tv8); // That's right! See above . . . ACE_ASSERT (tv9 == tv6); - ACE_Time_Value tv10 (1); - - ACE_ASSERT (tv10.sec() == 1); - // test multiplication by double // test simple multiplication tv1.set (1, 1); diff --git a/ACE/tests/TkReactor_Test.cpp b/ACE/tests/TkReactor_Test.cpp index 7987d44dcce..cee329ef5b2 100644 --- a/ACE/tests/TkReactor_Test.cpp +++ b/ACE/tests/TkReactor_Test.cpp @@ -34,7 +34,7 @@ ACE_RCSID (tests, #include "ace/SOCK_Connector.h" #include "ace/Service_Config.h" #include "ace/Thread_Manager.h" -#include "ace/TkReactor/TkReactor.h" +#include "ace/TkReactor.h" #include "ace/OS_NS_unistd.h" #include <tcl.h> diff --git a/ACE/tests/UPIPE_SAP_Test.cpp b/ACE/tests/UPIPE_SAP_Test.cpp index 296d746fbb6..24d08fdc5f7 100644 --- a/ACE/tests/UPIPE_SAP_Test.cpp +++ b/ACE/tests/UPIPE_SAP_Test.cpp @@ -27,8 +27,9 @@ ACE_RCSID(tests, UPIPE_SAP_Test, "$Id$") -#if defined (ACE_HAS_THREADS) && \ - (defined (ACE_HAS_STREAM_PIPES) || defined (ACE_HAS_WIN32_NAMED_PIPES)) +#if defined (ACE_HAS_THREADS) && (defined (ACE_HAS_STREAM_PIPES) || \ + (defined (ACE_WIN32) && \ + defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0))) // Global pattern static ACE_UPIPE_Addr addr (ACE_TEXT ("pattern")); @@ -137,15 +138,16 @@ acceptor (void *args) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) exiting thread\n"))); return 0; } -#endif /* ACE_HAS_THREADS && (ACE_HAS_STREAM_PIPES || ACE_HAS_WIN32_NAMED_PIPES) */ +#endif /* ACE_HAS_THREADS && defined ACE_HAS_STREAM_PIPES || (ACE_WIN32&&NT4)*/ int run_main (int, ACE_TCHAR *[]) { ACE_START_TEST (ACE_TEXT ("UPIPE_SAP_Test")); -#if defined (ACE_HAS_THREADS) && \ - (defined (ACE_HAS_STREAM_PIPES) || defined (ACE_HAS_WIN32_NAMED_PIPES)) +#if defined (ACE_HAS_THREADS) && (defined (ACE_HAS_STREAM_PIPES) || \ + (defined (ACE_WIN32) && \ + defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0))) ACE_UPIPE_Acceptor acc (addr); @@ -176,7 +178,7 @@ run_main (int, ACE_TCHAR *[]) #else ACE_ERROR ((LM_INFO, ACE_TEXT ("UPIPE is not supported on this platform\n"))); #endif /* !defined (ACE_HAS_THREADS) */ -#endif /* ACE_HAS_THREADS && (ACE_HAS_STREAM_PIPES || ACE_HAS_WIN32_NAMED_PIPES) */ +#endif /* defined (ACE_HAS_THREADS) && (defined (ACE_HAS_STREAM_PIPES) || defined (ACE_WIN32) && NT4) */ ACE_END_TEST; return 0; diff --git a/ACE/tests/Unload_libACE.cpp b/ACE/tests/Unload_libACE.cpp index 8d30c021f08..f18484b6b82 100644 --- a/ACE/tests/Unload_libACE.cpp +++ b/ACE/tests/Unload_libACE.cpp @@ -150,16 +150,10 @@ main (int, char **) char buf[BUFSIZ]; strcpy (buf, ace_root); - strcat (buf, "/lib/lib"); -#if defined (ACE_LIB_NAME) - strcat (buf, ACE_LIB_NAME); -#else - strcat (buf, "ACE"); -#endif /* ACE_LIB_NAME */ #if defined (__hpux) && !(defined (__ia64) && (__ia64 == 1)) - strcat (buf, ".sl"); + strcat (buf, "/lib/libACE.sl"); #else - strcat (buf, ".so"); + strcat (buf, "/lib/libACE.so"); #endif /* (__hpux) */ handle = dlopen (buf, RTLD_LAZY); diff --git a/ACE/tests/XtAthenaReactor_Test.cpp b/ACE/tests/XtAthenaReactor_Test.cpp index cf0530ee552..d5abb90c4e0 100644 --- a/ACE/tests/XtAthenaReactor_Test.cpp +++ b/ACE/tests/XtAthenaReactor_Test.cpp @@ -32,7 +32,7 @@ ACE_RCSID (tests, XtAthenaReactor_Test, "$Id$") -#include "ace/XtReactor/XtReactor.h" +#include "ace/XtReactor.h" #include "ace/Event_Handler.h" #include "ace/Acceptor.h" #include "ace/SOCK_Acceptor.h" diff --git a/ACE/tests/XtMotifReactor_Test.cpp b/ACE/tests/XtMotifReactor_Test.cpp index 7aabc230fbb..643b1e9dfbd 100644 --- a/ACE/tests/XtMotifReactor_Test.cpp +++ b/ACE/tests/XtMotifReactor_Test.cpp @@ -31,7 +31,7 @@ ACE_RCSID (tests, XtMotifReactor_Test, "$Id$") -#include "ace/XtReactor/XtReactor.h" +#include "ace/XtReactor.h" #include "ace/Event_Handler.h" #include "ace/Acceptor.h" #include "ace/SOCK_Acceptor.h" diff --git a/ACE/tests/log/.cvsignore b/ACE/tests/log/.cvsignore new file mode 100755 index 00000000000..397b4a7624e --- /dev/null +++ b/ACE/tests/log/.cvsignore @@ -0,0 +1 @@ +*.log diff --git a/ACE/tests/run_test.lst b/ACE/tests/run_test.lst index 4568e8ba530..3efda344bde 100644 --- a/ACE/tests/run_test.lst +++ b/ACE/tests/run_test.lst @@ -19,7 +19,6 @@ ACE_Init_Test: MSVC ACE_Test Aio_Platform_Test Arg_Shifter_Test -ARGV_Test Array_Map_Test Atomic_Op_Test Auto_Event_Test @@ -34,7 +33,6 @@ Bug_1890_Regression_Test Bug_2368_Regression_Test Bug_2497_Regression_Test Bug_2540_Regression_Test -Bug_2659_Regression_Test: !ST Bug_2653_Regression_Test: !ST CDR_Array_Test: !ACE_FOR_TAO CDR_File_Test: !ACE_FOR_TAO @@ -151,7 +149,6 @@ Thread_Mutex_Test: !DISABLE_ToFix_LynxOS_PPC Thread_Pool_Reactor_Resume_Test: !DISABLE_ToFix_LynxOS_PPC !ST Thread_Pool_Reactor_Test: !DISABLE_ToFix_LynxOS_PPC Thread_Pool_Test: !DISABLE_ToFix_LynxOS_PPC -Thread_Creation_Threshold_Test Time_Service_Test: !STATIC !DISABLED !missing_netsvcs TOKEN !Unicos Time_Value_Test Timeprobe_Test diff --git a/ACE/tests/run_test.pl b/ACE/tests/run_test.pl index 6b3a49fe7b3..b7fc961454e 100755 --- a/ACE/tests/run_test.pl +++ b/ACE/tests/run_test.pl @@ -107,11 +107,6 @@ sub run_program ($) { my $program = shift; - ## Print it out before we check for the executable - ## if the executable doesn't exist, the error will show - ## up as part of the previous test. - print "auto_run_tests: tests/$program\n"; - unlink <log/$program*.log>; unlink "core"; @@ -133,6 +128,7 @@ sub run_program ($) } } + print "auto_run_tests: tests/$program\n"; my $start_time = time(); $status = $P->SpawnWaitKill (400); my $time = time() - $start_time; diff --git a/ACE/tests/test_config.h b/ACE/tests/test_config.h index 135b001628c..21ff4cdf67c 100644 --- a/ACE/tests/test_config.h +++ b/ACE/tests/test_config.h @@ -72,20 +72,16 @@ const size_t ACE_MAX_ITERATIONS = 10; const size_t ACE_MAX_PROCESSES = 10; const size_t ACE_MAX_THREADS = 4; -#ifndef ACE_START_TEST #define ACE_START_TEST(NAME) \ const ACE_TCHAR *program = NAME; \ ACE_LOG_MSG->open (program, ACE_Log_Msg::OSTREAM | ACE_Log_Msg::VERBOSE_LITE); \ if (ace_file_stream::instance()->set_output (program) != 0) \ ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("set_output failed")), -1); \ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Starting %s test at %D\n"), program)) -#endif /* ACE_START_TEST */ -#ifndef ACE_END_TEST #define ACE_END_TEST \ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Ending %s test at %D\n"), program)); \ ace_file_stream::instance()->close () -#endif /* ACE_END_TEST */ #define ACE_CLOSE_TEST_LOG ace_file_stream::instance()->close () @@ -101,9 +97,9 @@ const size_t ACE_MAX_THREADS = 4; ACE_LOG_MSG->set_flags(ACE_Log_Msg::SILENT); \ ace_file_stream::instance()->close (); -#if defined (ACE_VXWORKS) +#if defined (VXWORKS) // This is the only way I could figure out to avoid an error - // about attempting to unlink a non-existent file. + // about attempting to unlink a non-existant file. #include "ace/OS_NS_fcntl.h" diff --git a/ACE/tests/tests.mpc b/ACE/tests/tests.mpc index 64b74caa8aa..5efee793fd4 100644 --- a/ACE/tests/tests.mpc +++ b/ACE/tests/tests.mpc @@ -999,13 +999,6 @@ project(Thread Pool Test) : acetest { } } -project(Thread Creation Threshold Test) : acetest { - exename = Thread_Creation_Threshold_Test - Source_Files { - Thread_Creation_Threshold_Test.cpp - } -} - project(Timeprobe Test) : acetest { exename = Timeprobe_Test Source_Files { @@ -1374,7 +1367,7 @@ project(Based Pointer Test) : acetest { } } -project(Library Unload): unload_libace { +project(Library Unload) { avoids += wince exename = UnloadLibACE staticflags += ACE_AS_STATIC_LIBS @@ -1384,10 +1377,3 @@ project(Library Unload): unload_libace { Resource_Files { } } - -project(Bug_2659_Regression_Test) : acetest { - exename = Bug_2659_Regression_Test - Source_Files { - Bug_2659_Regression_Test.cpp - } -} diff --git a/ACE/tests/unload_libace.mpb b/ACE/tests/unload_libace.mpb deleted file mode 100644 index 7fe13bae305..00000000000 --- a/ACE/tests/unload_libace.mpb +++ /dev/null @@ -1,6 +0,0 @@ -// -*- MPC -*- -// $Id$ - -feature(ace_for_tao) { - macros += ACE_LIB_NAME=\\"ACE_FOR_TAO\\" -}
\ No newline at end of file diff --git a/ACE/websvcs/Makefile.am b/ACE/websvcs/Makefile.am index 038bf2ff84f..be02feea0e1 100644 --- a/ACE/websvcs/Makefile.am +++ b/ACE/websvcs/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu SUBDIRS = \ lib \ diff --git a/ACE/websvcs/lib/Makefile.am b/ACE/websvcs/lib/Makefile.am index 689c2933594..0536fecbb66 100644 --- a/ACE/websvcs/lib/Makefile.am +++ b/ACE/websvcs/lib/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) diff --git a/ACE/websvcs/tests/Makefile.am b/ACE/websvcs/tests/Makefile.am index 7e366240ae7..868befa72a0 100644 --- a/ACE/websvcs/tests/Makefile.am +++ b/ACE/websvcs/tests/Makefile.am @@ -6,13 +6,12 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ./bin/mwc.pl -type automake -noreldefs ACE.mwc +## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) ## Makefile.Websvcs_Test.am - noinst_PROGRAMS = Test_Url_Addr Test_Url_Addr_CPPFLAGS = \ |