diff --git a/ChangeLog b/ChangeLog index 13d1d3372..c3a3c8090 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ MaNGOS 0.17 (??? ??? 2010) ==== Server Features ==== * Improved: Updated MySQL client libs to 5.1.49. + * Improved: Updated ACE framework to 5.8.2. ==== Statistics ==== * Fixed Bugs: ??? tickets and many bugs reported at forum resolved diff --git a/NEWS b/NEWS index 9beb3d33d..f00ae4fdf 100644 --- a/NEWS +++ b/NEWS @@ -15,7 +15,8 @@ http://mangos.lighthouseapp.com/ Version 0.17 * Under discussion. - * MySQL client libs updated to MySQL 5.1.49 + * ACE Framework updated to ACE 5.8.2. + * MySQL client libs updated to MySQL 5.1.49. * Upgrade to client version 3.3.5a (build 12340). Version 0.16 diff --git a/dep/ACE_wrappers/ACE-INSTALL.html b/dep/ACE_wrappers/ACE-INSTALL.html new file mode 100644 index 000000000..5a906165b --- /dev/null +++ b/dep/ACE_wrappers/ACE-INSTALL.html @@ -0,0 +1,3044 @@ + + + Building and Installing ACE and Its Auxiliary Libraries and Services + + + + + +
+

Building and Installing ACE and Its Auxiliary Libraries and Services

+ +

Synopsis

+ +The file explains how to build and install ACE, its Network Services, +test suite and examples on the various OS platforms and compilers that +it has been ported to. Please consult the NEWS and +ChangeLog files to see whether any recent changes +to the release will affect your code. In addition, you should check +out our development +process. As you start working with ACE, we suggest you get copies +of the C++NPv1, C++NPv2, and +APG books to help +guide you after you've built and installed ACE. You should also +consult the ACE +Frequently Made Mistakes page. If you encounter any problems or +would like to request an enhancement, then use our bug +tracking system to submit a report in accordance with our bug +report process.

+ +

Document Index

+ + + + +

+

Platforms, C++ Compilers, and Support

+ +

ACE has been ported to a large number of platforms using many different +compilers over the years. +The DOC group, +Riverace, +OCI, +Remedy IT, and members of the ACE +user community have all contributed ports to make ACE the successful +and far-reaching toolkit it is today. Any UNIX/POSIX/Windows +variation is probably an easy target platform for ACE. If you have +porting questions or have a problem +compiling the ACE source distribution, please contact one of the +commercial support companies, or send a copy of the +PROBLEM-REPORT-FORM, located in the +ACE_wrappers directory, to either the ACE +Newsgroup or the ace-users +mailing list. +The DOC groups at Washington University, UC Irvine, and Vanderbilt +University provide only "best effort" support for non-sponsors for the +latest release, as described in +docs/ACE-bug-process.html. +Thus, if you need more "predictable" help, or help with earlier versions of +ACE, it's recommend that you check out the +list of +commercial support companies for additional assistance. +

+

The responsibility for maintaining ACE across the wide range of +supported platforms is divided among a few different groups: +

+The +build scoreboard +records the current status of build and regression testing during +development by all of the above groups. It is available to all users wishing +to provide build results. Members of the ACE community that maintain ACE on +platforms not maintained by the DOC group, Riverace, OCI, or Remedy IT are +encouraged to provide build and regression test results for the scoreboard +to ensure that all in-use platforms are represented. +See the autobuild README for more information about +how to set up a build; contact one of the above groups to inquire about how +to get your build results recorded on the scoreboard.

+

Because older +platforms that are not maintained tend to fall into a broken state and +clutter the ACE sources with code that is no longer used, the development +team reserves the right to remove ACE configuration files and source code +specific to inactive platform configurations that are not +listed on the scoreboard.

+

The table below summarizes each group's role and where you can get more +detailed information. For information on TAO's platform coverage and +support, please also see TAO's install +document.

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Groups Involved in ACE Development and Support
GroupPlatformsFor more information
DOC GroupWindows 2000, XP (MSVC++ 7.1, and 8); + many versions of Linux/Intel (many compilers). + DOC sites at ISIS, + UCI and + Washington University +
RiveraceOffers ACE + training, + support and + consulting services + for many platforms including AIX, HP-UX, Linux, Solaris, and Windows. + Riverace's ACE + Support page.
OCIMaintains ACE on certain platforms required for their TAO + software and service offerings. + OCI's web site and + the TAO install document
Remedy ITMaintains ACE on many platforms required for their ACE and + TAO service offerings. We support AIX, + CodeGear C++ Builder 2007/2009, CodeGear RAD Studio 2007, Embarcadero C++ Builder 2010, + CBuilderX 1.0, Windows CE, MinGW, Microsoft Visual C++ 7.1/8/9, GCC, + Cygwin, VxWorks 5.5.x - 6.x (kernel and rtp), OpenVMS 8.2-1 & 8.3 on Alpha and IA64, + BlueCAT Linux, RedHat Linux, Fedora, MacOSX, Solaris, + 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 + HPUX 11i v2/v3 on IA64. The Intel C++ compiler is supported on + Windows 32/64bit, Linux IA32/EM64T/IA64, MacOSX. + Remedy IT web site and + the TAO install document +
PrismTechMaintains ACE on certain platforms required for their TAO + software and service offerings, including LynxOS. + PrismTech's web site
ACE user communityResponsible for continued maintenance and testing of platforms + to which ACE has been ported, but aren't supported by the + above groups. These include + Digital UNIX (Compaq Tru64) 4.0 and 5.0; + IRIX 6.x; UnixWare 7.1.0; + Linux on PPC; OpenMVS; + Tandem; SCO; FreeBSD; NetBSD; OpenBSD; + Macintosh OS X; OS/9; PharLap ETS 13; + QNX RTP and Neutrino 2.0; Interix (Windows Services for Unix) +
Not maintainedThe following platforms have been ported to in the past but are + no longer maintained and may be removed from ACE at any time. + If you want to have support for these environments contact one + of the commercial support organisations. The platforms include: + Chorus; DG/UX; HP-UX 9, 10 and 11.00; pSOS; + SunOS 4.x and Solaris with SunC++ 4.x; VxWorks 5.4 and earlier; + Microsoft Visual C++ 5, 6, and 7.0; Borland C++ Builder 4, 5, 6, and 2006. + For up-to-date listings on platform that are deprecated and pending + removal from ACE, please see the NEWS file. +

+ +

Although the DOC group has provided outstanding support for ACE +over the years, ACE's success has greatly increased the amount of +effort required to keep up with its maintenance, answer users' +questions, and give design guidance. Riverace offers world-class +commercial services to support ACE users. OCI, PrismTech, and Remedy +offer similar services for TAO, allowing the DOC group's primary focus +to shift back to their main goal: research. The DOC group is +fundamentally focused on (and funded +by) advanced R&D projects. The group continues to be +intimately involved in ACE+TAO development and maintenance, but with +revised priorities for maintenance. The bug +fixing policies followed by the DOC group are designed to strike a +balance between their many research +projects and their commitment to the ACE+TAO user +community. Naturally, we will be happy to accept well-tested +patches from the ACE+TAO user community for any platforms that aren't +supported by the DOC group, Riverace, OCI or Remedy IT.

+ +

+

Installation prerequisites

+ +

ACE (as well as TAO and CIAO) use MPC +(MakeProjectCreator) to generate files used by all supported build +tools (such as GNUmakefiles for UNIX based platforms, sln and vcproj +files for VC71/VC8 and CodeGear makefiles) on various platforms. To +help new users to bootstrap quickly the release bundles of ACE (as +well as TAO and CIAO) include all needed files to use the build +instructions in this document. + +

+

+If it is necessary to generate +files for build tools for other compilers, one must +run MPC to generate the +appropriate files. Please see USAGE, README, and README for ACE files for +details. The options that have been used to generate the above build +files can be found in +global.features file. +

+ +
+

Building and Installing ACE

+ +The following sections explain how to build ACE on: + + +

General Rules

+ + +
+

Building and Installing ACE on UNIX

+ +As of ACE 5.4, you can choose between two methods of building ACE on +UNIX: +
    +
  1. GNU Autoconf
    2. +
  2. Traditional ACE/GNU Make Configuration
    3. +
+The build process for Windows is different from both of +the UNIX methods. + +

Building ACE with GNU Autoconf

+

+GNU Autoconf support is available in the ACE and ACE+TAO distributions +in the DOC group website. Support for Autoconf is not included in +distributions that contain CIAO. +

+

+GNU Autoconf support has been partially present in a number of ACE +versions. However, ACE 5.4 was the first version that supported it in +earnest. The range of platforms on which GNU autoconf support is regularly +tested is not as broad as for the traditional configuration method, so you +should be careful to test the resulting ACE library before using it in +your applications. You can review the + +build scoreboard to check the currently tested set of autoconfigured +platforms (look for autoconf in the platform name). +Any help you can lend to improve the ACE build process using GNU Autoconf +would be very much appreciated. Please send any fixes to the +ACE users mailing list +using the standard PROBLEM-REPORT-FORM. +

+

+The kit has been bootstrapped so you do not need to install the GNU +Autotools (autoconf, automake, libtool) unless you want to participate +in testing and developing this +process further or if you are working directly off of sources in the +ACE subversion repository. To simply configure and build ACE, do: +

    +
  1. cd to the top-level ACE_wrappers directory.
    2. +
  2. Create a subdirectory to hold your build's configuration and built + ACE version, and then change to the new directory: + 
           mkdir build
+       cd build
    + Note that you do not run the create_ace_build.pl utility + mentioned in the Cloning the Source Tree + section. The configure script takes care of creating all files + and links that are needed.
    3. +
  3. Configure ACE for your platform by issuing the following command: + 
           ../configure [options]
    + options can be a variable setting (such as setting + CXX to your C++ compiler command) any standard GNU + configure options, or any of the following ACE configure options + (default values are in parentheses): + +
    4. +
  4. Build ACE by typing make. +
  5. (Optional) Install ACE by typing make install. +
+ +

Testing and Developing GNU Autotool +Support in ACE

+

+In order to test and develop the GNU Autotool support in ACE or +bootstrap autotool support into ACE when working directly off of ACE +sources in the subversion repository, you must have recent versions of GNU +Autoconf, Automake and Libtool installed on your host. Once +installed, autotool support may be bootstrapped into your workspace by +doing the following: +

+ + cd ACE_wrappers
+ ./bin/bootstrap
+ +
+After doing so, you will be able to run the configure +script. + +

Using the Traditional ACE/GNU Configuration

+

+Here's what you need to do to build ACE using GNU Make and ACE's traditional +per-platform configuration method:

+ +
    +
  1. Install GNU make + 3.79.1 or greater on your system (available via http + anonymous ftp from ftp.gnu.org in the + pub/gnu/make/ directory). + You must use GNU make when using ACE's traditional + per-platform configuration method or ACE won't compile. +
    2. +
  2. Add an environment variable called ACE_ROOT that contains the + name of the root of the directory where you keep the ACE wrapper + source tree. The ACE recursive Makefile scheme needs this information. + There are several ways to set the ACE_ROOT variable. For example: +
    + TSCH/CSH: + setenv ACE_ROOT /home/cs/faculty/schmidt/ACE_wrappers +
    +
    + BASH or Bourne Shell: + ACE_ROOT=/home/cs/faculty/schmidt/ACE_wrappers; export ACE_ROOT + +
    +

    + If you're building a number of versions of ACE, however, (e.g., for + different OS platforms or for different releases of ACE) you might use + the following approach (assuming TCSH/CSH): +

    setenv ACE_ROOT $cwd +
    +
    3. +
  3. Create a configuration file, $ACE_ROOT/ace/config.h, + that includes the appropriate platform/compiler-specific + header configurations from the ACE source directory. For example: +
    +#include "ace/config-linux.h" +
    + The platform/compiler-specific configuration file + contains the #defines that are used throughout ACE to indicate + which features your system supports. See the + $ACE_ROOT/ace/README file for a description of these + macro settings. If you desire to add some site-specific or build-specific + changes, you can add them to your config.h file; place them + before the inclusion of the platform-specific + header file. +

    + There are config files for most versions of UNIX. If there + isn't a version of this file that matches your + platform/compiler, you'll need to make one. Please send email + to the ace-users list + if you get it working so it can be added to the master ACE + release.

    +
    4. + +
  4. Create a build configuration file, + $ACE_ROOT/include/makeinclude/platform_macros.GNU, + that contains the appropriate platform/compiler-specific + Makefile configurations, e.g., +
    +include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU +
    + This file contains the compiler and Makefile directives that are + platform/compiler-specific. If you'd like to add make options, you + can add them before including the platform-specific configuration.

    + NOTE! There really is not a # character before 'include' in the + platform_macros.GNU file. # is a comment character. +

    5. +
  5. If you wish to install ACE (using "make install"), set the + installation prefix in platform_macros.GNU. +
    +INSTALL_PREFIX = /usr/local +
    + Headers will be installed to $INSTALL_PREFIX/include, executables to + $INSTALL_PREFIX/bin, documentation and build system files to + $INSTALL_PREFIX/share and libraries to $INSTALL_PREFIX/lib. The library + directory can be customized by setting INSTALL_LIB (for example, + INSTALL_LIB=lib64). With INSTALL_PREFIX set, RPATH will be enabled for + all executables and shared libraries. To disable RPATH (for example, + if $INSTALL_PREFIX/$INSTALL_LIB is already a system-known location for + shared libraries such as those listed in /etc/ld.so.conf), set the make + macro install_rpath to 0 by adding install_rpath=0 to platform_macros.GNU. +
    6. +
  6. Note that because ACE builds shared libraries, you'll need to set + LD_LIBRARY_PATH (or equivalent for your platform) to the directory + where binary version of the ACE library is built into. For example, + you probably want to do something like the following: +
    + % setenv LD_LIBRARY_PATH $ACE_ROOT/lib:$LD_LIBRARY_PATH
    +
    7. +
  7. When all this is done, hopefully all you'll need to do is type: +
    + % make
    + at the ACE_ROOT directory. This will build the ACE + library, tests, the examples, and the sample applications. + Building the entire ACE release can take a long time and consume + lots of disk space, however. Therefore, you might consider + cd'ing into the $ACE_ROOT/ace directory and + running make there to build just the ACE library. + As a sanity check, you might also want to build and run the + automated "one-button" tests in + $ACE_ROOT/tests. Finally, if you're also + planning on building TAO, you + should build the gperf + perfect hash function generator application in + $ACE_ROOT/apps/gperf. +
    8. +
  8. If you've set the INSTALL_PREFIX before building, now run +
    % make install
    +
    9. +
  9. If you need to regenerate the ace/Svc_Conf_y.cpp file, + you'll need to + get GNU Bison. + However, you should rarely, if ever, need to do this. +
    10. +
+ +
+ +

Building and Installing ACE on Windows

+ +

This section contains instructions for building ACE on Microsoft +Windows with a variety of compilers and development environments.

+ +

First, if you are upgrading from an older release, the recommended practice +is to start with a clean directory. Unpacking the newer release over an older +one will not clean up any old files, and trying to use the environment's +"Clean" command will probably not account for all existing files.

+ + + +

+

Building and Installing ACE on Windows with +Microsoft Visual Studio

+ +

ACE contains project files for Microsoft Visual Studio .NET 2003 (VC7.1) +and Visual Studio 2005 (VC8). Visual Studio 2005 supports building for +desktop/server Windows as well as for Windows CE and Windows Mobile. Since +not all users will be interested in the CE/Mobile capability, these platforms +have separate solution and project files from the desktop/server Windows. +Furthermore, VC7.1 and VC8 use different file formats but the same file +suffixes (.sln and .vcproj). To support both +environments, ACE supplies files with different names for the different +development and target platforms. The platform/name mapping is shown below. +All solution files have a .sln suffix and all project files have +a .vcproj suffix.

+ +

Visual Studio 2008 (VC9) is also supported.

+ +

+The free Visual C++ 2008 Express Edition will work in place of the traditional +Visual Studio editions. All the other notes in this document +that are for VC8 / VC9 also apply to the express edition. MFC, 64-bit, and +CE/mobile options are not available with the express edition. 64-bit binaries +can be built with the compiler and linker included in the Windows SDK, using nmake as the build system (generate nmake makefiles with mwc.pl -type nmake).

+ + + + + + + + + + + + + + + + + + + + + + + + + +
Mapping of Platform to Solution/Project File Name
PlatformFile Name
VC7.1name_vc71 +
VC8 for desktop/servername_vc8 +
VC8 for Windows CE/Mobilename_WinCE +
VC9 for desktop/servername_vc9 +
+ +

The VC++ compiler and linker can now be invoked from GNU make just like +most UNIX builds. Follow the instructions in the +ACE/GNU Configuration sections and see the additional information in the +comments of +platform_win32_msvc.GNU. +

+ +

If you happen to open a VC7.1 file from within VC8, it will offer to convert +the file to the newer format for you. With the stock VC8, do not do this; +Visual Studio will crash while attempting to convert the large +solution and project files to build ACE. Simply refuse the conversion and +open the file with the correct format. Note that Microsoft has fixed this +problem. See + +https://msdn.microsoft.com/visualc/downloads/default.aspx for information. +

+ +
    +
  1. Uncompress the ACE distribution into a directory, where it will + create a ACE_wrappers directory containing the distribution. The + ACE_wrappers directory will be referred to as ACE_ROOT in the + following steps -- so ACE_ROOT\ace would be C:\ACE_wrappers\ace if + you uncompressed into the root directory.
    +
    +
  2. Create a file called config.h in the ACE_ROOT\ace + directory that contains:
    +
    + #include "ace/config-win32.h"
    +
    + +
  3. The static, DLL and MFC library builds are kept in + different workspaces. Files with names *_Static contain project + files for static builds. Workspaces for static and DLL builds will be + available through the stock release at DOC group's website. The + workspaces for MFC are not available and have to be generated using + MPC. Please see MPC's README for + details.

    +
  4. Now load the solution file for ACE (ACE_ROOT/ACE.sln).
    +
    +
  5. Make sure you are building the configuration (i.e, Debug/Release) + the one you'll use (for example, the debug tests need the debug + version of ACE, and so on). All these different configurations are + provided for your convenience. You can either adopt the scheme to + build your applications with different configurations, or use + ace/config.h to tweak with the default settings on + NT.
    Note: If you use the dynamic libraries, + make sure you include ACE_ROOT\lib in your PATH whenever you run + programs that uses ACE. Otherwise you may experience problems + finding ace.dll or aced.dll.
    +
    +
  6. To use ACE with MFC libraries, also add the following to + your config.h file. Notice that if you want to + spawn a new thread with CWinThread, make sure you spawn the + thread with THR_USE_AFX flag set.
    +
    + #define ACE_HAS_MFC 1
    +
    + By default, all of the ACE projects use the DLL versions of the + MSVC run-time libraries. You can still choose use the static (LIB) + versions of ACE libraries regardless of run-time libraries. The + reason we chose to link only the dynamic run-time library is that + almost every NT box has these library installed and to save disk + space. If you prefer to link MFC as a static library into ACE, you + can do this by defining ACE_USES_STATIC_MFC in your + config.h file. However, if you would like to link + everything (including the MSVC run-time libraries) statically, + you'll need to modify the project files in ACE yourself.

    +

  7. Static version of ACE libraries are built with + ACE_AS_STATIC_LIBS
    defined. This macro should + also be used in application projects that link to static ACE + libraries
    +
    + Optionally you can also add the line
    +
    + #define ACE_NO_INLINE
    +
    + before the #include statement in ACE_ROOT\ace\config.h to disable + inline function and reduce the size of static libraries (and your + executables.)
    +
    +
  8. ACE DLL and LIB naming scheme:
    +
    + We use the following rules to name the DLL and LIB files in ACE + when using MSVC.
    +
    + "Library/DLL name" + (Is static library ? "s" : + "") + (Is Debugging enable ? "d" : "") + + {".dll"|".lib"}
    +
    +
+ +

More information for ACE/TAO on MSVC can be found +here. The doxygen version of this +document is available under Related Topics in the ACE Library.

+ +ACE TESTS

+ +The tests are located in ACE_ROOT\tests. There is also a solution in +that directory to build all the tests (tests.sln)

+ +Once you build all the tests (Batch Build works well for this), you +can run perl script run_test.pl in the +tests directory to try all the tests.

+ + + BUILDING ACE ON A WIN32 MACHINE THAT LACKS A NETWORK CARD

+ +You may want to run ACE on a non-networked machine. To do so, you must +install TCP/IP and configure it to ignore the absence of a network +card. This is one method: + +

    +
  1. Run Control Panel +
  2. Choose Network from Control Panel +
  3. Add Adapter: MS Loopback Adapter +
  4. Configure MS Loopback Adapter with 802.3 (default) +
  5. Add Protocol: TCP/IP Protocol +
  6. Configure TCP/IP Protocol with a valid IP address and subnet mask. + Leave everything else at the default settings. +
  7. Add Service: Workstation +
  8. Exit and Restart System +
  9. Run Control Panel again +
  10. Choose Services from Control Panel +
  11. The following services are not necessary and may + be set to Disabled Startup:
    + Alerter
    + Computer Browser
    + Net logon
    + Messanger
    +
  12. Choose Network from Control Panel +
  13. Confirm the following setup. This is all you need to run ACE:
    + Installed Software:
    + Computer Browser
    + MS Loopback Adapter Driver
    + TCP/IP Protocol
    + Workstation
    + Installed Adapter Cards:
    + MS Loopback Adapter

    +

+ +WIN32 ALPHA CONFIGURATIONS + +

The project files for Visual C++ no longer contain any configurations +targetted to Windows NT on the DEC Alpha. Below are the steps needed to +recreate the Alpha configurations:

+ +
    +
  1. Load the project on the Alpha machine. +
  2. Go to the Build menu and then select Configurations. +
  3. Select the project that you want to convert. +
  4. Click on Add. +
  5. Select the x86 configuration to "Copy settings from" + (either Debug or Release versions). +
  6. Prepend "Alpha " to the beginning of the name under + "Configuration". +
  7. Click OK. +
  8. Close the "Configurations" window. +
  9. Now go to the Project settings. +
  10. For the General Settings, change the output directories to standard ACE + output directories. Intermediate Directories are "Debug" and + "Release" in most cases. The Output Directories are blank, + except for Release versions of executables, in which it is also + "Release". +
  11. For the C/C++ Settings, make sure that the Code Generation's runtime + library is set to "Multithreaded DLL" or "Debug Multithreaded + DLL". +
+ +

Note: MSVC 6 has a bug where if a .dsp is converted from version 5 to 6 on +x86, the Alpha configuration can get corrupted. This seems to happen when additional +include or library directories are specified using backslashes instead of forward +slashes. If this occurs, the easiest way to fix it is to recreate it.

+ +

 

+

Building and Installing ACE on Windows with CodeGear C++

+ +If you are building for a machine without a network card, you may want +to check here first.

+ +

    +
  1. Uncompress the ACE distribution into a directory, where it will + create an + ACE_wrappers directory containing the source. The ACE_wrappers + directory will be referred to as ACE_ROOT in the following steps -- so + ACE_ROOT\ace would be C:\ACE_wrappers\ace if you uncompressed into the + root directory.
    +
    +
  2. Create a file called config.h in the ACE_ROOT\ace + directory that contains:
    +
    + #include "ace/config-win32.h"
    +
    +
  3. Open a Command Prompt (DOS Box).
    +
    +
  4. Set the ACE_ROOT environment variable to point to the ACE_wrappers + directory. For example:
    +
    + set ACE_ROOT=C:\ACE_wrappers
    +
    +
  5. Add ACE_wrappers\lib and ACE_wrappers\bin to the PATH environment variable:
    +
    + set PATH=C:\ACE_wrappers\lib;C:\ACE_wrappers\bin;%PATH%
    +
    +
  6. Generate the bmake makefiles using MPC. Use the bmake project type for C++ Builder. +

    +
  7. Change to the ACE_ROOT\ace directory.
    +
    +
  8. Build release DLLs for ACE by going:
    +
    + make -f Makefile.bmak all
    +
    +
  9. You can build several different versions of ACE by setting environment + variables before you run make:
    +
    + Set the environment variable below to build a debug version of ACE
    + set DEBUG=1
    +
    + Set the environment variable below to build a unicode version of ACE
    + set UNICODE=1
    +
    + Set the environment variable below to build a version of ACE with + Codeguard support. Should only be used when DEBUG is also set
    + set CODEGUARD=1
    +
    + Set the environment variable below to build a version of ACE optimized + for a certain CPU. For this there are special compiler flags + (-3/-4/-5/-6), see the CodeGear help for more info.
    + set CPU_FLAG=-6
    +
    + You can then start the build with the command +
    make -f Makefile.bmak all
    +
    + You may also enable the options by passing them as command line options to make, for example:
    + make -f Makefile.bmak -DDEBUG all
    +
    +
+ +

+ +Note that when you run make in a sub directory you give make -f Makefile.bmak all. The all is needed to make sure the complete project is build.

+ +The Borland/CodeGear C++ Builder 4.0/5.0/6.0/2006/2007/2009/2010 port has been done by Jody Hagins, Christopher Kohlhoff and Johnny Willemsen.

+ +ACE TESTS

+ +Before you can build the tests you need to build the protocols directory. +Change the directory to ACE_ROOT\protocols and start the build with:

+

+make -f Makefile.bmak all +

+ +The tests are located in ACE_ROOT\tests, change to this directory. +You build then the tests with the following command:

+

+make -f Makefile.bmak all +

+ +Once you build all the tests, you can run the automated test script using:

+

perl run_test.pl

in the +tests directory to try all the tests. You need to make +sure the ACE bin and lib directory (in this case +ACE_ROOT\bin and ACE_ROOT\lib) +are on the path before you try to run the tests.

+ +

+

Building and Installing ACE on Win32 with MinGW/ MSYS

+ +

+If you are building for a machine without a network card, you may want +to check here first. + +

+Building and installing ACE on MinGW +uses a mix of a UNIX building process and +Win32 configuration files. +Also, as MinGW uses GNU g++, you may want to take +a look at the Compiling ACE with GNU g++ section. + +

+You will need the MinGW build tools and libraries, downloable from +http://www.mingw.org. + +
+For our build we require the packages +MinGW and MSYS. + +

    + +
  1. Install the MinGW tools into a common directory, say c:/mingw. +

    + +
  2. Install the MSYS tools into a common directory, say c:/msys. +

    + +
  3. Open a MSYS shell. Set your PATH environment variable so + your MinGW's bin directory is first: + + 
           % export PATH=/c/mingw/bin:$PATH
+
    + +
  4. Add an ACE_ROOT environment variable pointing to the + root of your ACE wrappers source tree: + + 
           % export ACE_ROOT=/c/work/mingw/ACE_wrappers
+
    + + From now on, we will refer to the root directory of the ACE + source tree as $ACE_ROOT. +

    + +
  5. Create a file called config.h in the + $ACE_ROOT/ace directory that contains: + + 
           #include "ace/config-win32.h"
+
    + +
  6. Create a file called platform_macros.GNU in the + $ACE_ROOT/include/makeinclude directory containing: + + 
           include $(ACE_ROOT)/include/makeinclude/platform_mingw32.GNU
+
    + + In the above text, don't replace $(ACE_ROOT) with the + actual directory, GNU make will take the value from the + environment variable you defined previously. + +

    + If you lack Winsock 2, add the line + + 

           winsock2 = 0
+
    + + before the previous one. +

    + +
  7. In the MSYS shell, change to the $ACE_ROOT/ace directory and + run make: + + 
           % cd $ACE_ROOT/ace
+       % make
+
    + +

    + This should create libACE.dll (the Win32 shared library) and + libACE.dll.a (the Win32 import library for the DLL). + Note that the name for the ACE DLL follows the MinGW convention, which itself + resembles UNIX. + +

    + If you want static libs also, you may run: + + 

           % make static_libs=1
+
    + +
  8. + The same rules for Win32 search of DLLs apply for MinGW. If you + want to run some ACE programs from the MSYS shell, you may + need to add the directory for libACE.dll to your PATH: + + 
           % export PATH=/c/work/mingw/ACE_wrappers/ace:$PATH
+
    + +
+ +ACE TESTS

+ +The tests are located in $ACE_ROOT/tests. +After building the library, you can change to that directory and run +make: + + 

       % cd $ACE_ROOT/tests
+       % make
+
+ +

+Once you build all the tests, you can run +run_tests.pl in the +tests directory to try all the tests: + + 

       % perl run_test.pl
+
+ +

+If you are using ACE as a DLL, you will need to modify your PATH +variable as explained above. + +

+You may want to check $ACE_ROOT/tests/README for the status +of the various tests on MinGW and the different Windows flavors. + +

+

Building and Installing ACE on Win32 with Cygwin

+ +

+If you are building for a machine without a network card, you may want +to check here first. + +

+Building and installing ACE on Cygwin +uses the UNIX building process. +Also, as Cygwin uses GNU g++, you may want to take +a look at the Compiling ACE with GNU g++ section. + +

+You will need the Cygwin build tools and libraries, downloable from +http://www.cygwin.com. +For our build we require the following packages besides the packages the +setup selects by default: + +

+gcc (version 3.3.3), cygserver, make, perl, binutils. +
+ +
    + +
  1. Install Cygwin (this can be easy downloading and running + setup.exe + from the Cygwin site). For working with ACE we recommend + to select DOS as default text file type. +

    + +
  2. Open a Cygwin shell. Set your PATH environment variable so + your Cygwin bin directory is first: + + 
           % export PATH=//c/cygwin/bin:$PATH
+
    + + or + + 
           % export PATH=/cygdrive/c/cygwin/bin:$PATH
+
    + +

    + Note Cygwin uses ``/'' as directory separator, + and ``//X'' as a notation for Win32 drive X. + Note also that you can't use ``c:/cygwin/bin'' + because, for Cygwin, + ``:'' is path separator character, as in UNIX. +

    + +

  3. Add an ACE_ROOT environment variable pointing to the + root of your ACE wrappers source tree: + + 
           % export ACE_ROOT=c:/work/cygwin/ACE_wrappers
+
    + +

    + Note here you can't use the ``//X'' Cygwin + notation as this is seen by Cygwin's compiler and it doesn't + support that (it does support ``/'' as directory + separator however). + +

    + From now on, we will refer to the root directory of the ACE + source tree as $ACE_ROOT. +

    + +

  4. Create a file called config.h in the + $ACE_ROOT/ace directory that contains: + + 
           #include "ace/config-cygwin32.h"
+
    + +
  5. Create a file called platform_macros.GNU in the + $ACE_ROOT/include/makeinclude directory containing: + + 
           include $(ACE_ROOT)/include/makeinclude/platform_cygwin32.GNU
+
    + + In the above text, don't replace $(ACE_ROOT) with the + actual directory, GNU make will take the value from the + environment variable you defined previously. + +
  6. On the Cygwin shell, change to the $ACE_ROOT/ace directory and + run make: + + 
           % cd $ACE_ROOT/ace
+       % make
+
    + +

    + This should create libACE.dll (the Win32 shared library) and + libACE.dll.a (the Win32 import library for the DLL). + Note the name for the ACE DLL on Cygwin follows the UNIX convention. +

    + +

    + If you want static libs also, you may run: + + 

           % make static_libs=1
+
    + +
  7. + The same rules for Win32 search of DLLs apply for Cygwin. If you + want to run some ACE programs from the Cygwin shell, you may + need to add the directory for libACE.dll to your PATH: + + 
           # export PATH=//c/work/cygwin/ACE_wrappers/ace:$PATH
+
    + + If you are using MPC-generated Makefiles, then the DLLs have been + placed in the lib directory instead of ace and thus your PATH + addition would need to look like this: + + 
           # export PATH=//c/work/mingw/ACE_wrappers/lib:$PATH
+
    + + +
+ +ACE TESTS

+ +The tests are located in $ACE_ROOT/tests. +After building the library, you can change to that directory and run +make: + + 

       % cd $ACE_ROOT/tests
+       % make
+
+ +

+Once you build all the tests, you can run +run_tests.pl in the +tests directory to try all the tests: + + 

       % perl run_test.pl
+
+ +

+If you are using ACE as a DLL, you will need to modify your PATH +variable as explained above. + +

+You may want to check $ACE_ROOT/tests/README for the status +of the various tests on Cygwin and the different Windows flavors. +

+ +

+
+ +

+

Building and Installing ACE on Win32 with Interix

+

Interix comes with a BSD style make; you need GNU make. +Make builds easily under Interix or there is a prebuilt +package at:

+

http://www.interopsystems.com/tools/warehouse.htm

+

If you are building for a machine without a network +card, you may want to check here first.

+

This port was built and tested under Interix 3.5. a.k.a. +Windows +Services for UNIX 3.5.

+

To build follow the Traditional ACE/GNU Make +Configuration instructions replacing the following include directives:

+

#include +"ace/config-win32-interix.h"

+

for the config.h header

+

and:

+

include +$(ACE_ROOT)/include/makeinclude/platform_win32_interix.GNU

+

for your platform_macros.GNU file.

+

ACE should build fine with just 'make', the only other option tried thus far is +'make static_libs_only=1' which also works. Any +other options may not work.

+

ACE TESTS

+

The tests are located in $ACE_ROOT/tests. After building the library, you can +change to that directory and run make:

+

% cd $ACE_ROOT/tests
% make +

Once you build all the tests, you can run run_test.pl in the tests directory to try all the tests:

+

% run_test.pl

+

If you are using ACE as a shared library, you will need +to modify your LD_LIBRARY_PATH as explained inTraditional ACE/GNU Make Configuration.

+

+ +

+

Building and Installing ACE on VxWorks

+For the most part, you should be able to follow the instructions above +to build ACE and applications that use it. Start with the +Unix instructions above to build ACE and the +applications that use it. Please see below for more information on +building ACE on NT hosts for VxWorks targets.

+ +A few notes on VxWorks builds (thanks to +Paul von Behren and +Remedy IT for these notes):

+

+

+ +You'll have to let ACE know the target type at compile time. There +are several ways to do this; please see the +$ACE_ROOT/include/makeinclude/platform_vxworks5.5.x.GNU +platform file for detailed information.

+ +The VxWorks platform_vxworks*.GNU files are set up so that shared +libraries are not built on VxWorks, by default. Only static +libraries, with .a extension, are built. Therefore, it's not +necessary to set the LD_LIBRARY_PATH environment variable on your host +system when building for VxWorks targets. Please note, however, if +you use TAO on VxWorks that you will need to set your LD_LIBRARY_PATH +to find the TAO IDL compiler libraries (installed in the ace +directory) on the host.

+ +These non-default VxWorks kernel configuration #defines +are required with ACE:

+ +

#define INCLUDE_CPLUS           /* include C++ support */
+#define INCLUDE_CPLUS_IOSTREAMS /* include iostreams classes */
+#define INCLUDE_POSIX_ALL       /* include all available POSIX functions */
+
+ +For completeness, here are the non-default #defines that +we used for VxWorks 5.3.1/g++ 2.7.2: + +
#define INCLUDE_CPLUS           /* include C++ support */
+#define INCLUDE_CPLUS_IOSTREAMS /* include iostreams classes */
+#define INCLUDE_CONFIGURATION_5_2 /* pre-tornado tools */
+#define INCLUDE_DEBUG           /* pre-tornado debugging */
+#define INCLUDE_LOADER          /* object module loading */
+#define INCLUDE_NET_SYM_TBL     /* load symbol table from network */
+#define INCLUDE_SYM_TBL_SYNC    /* synchronize host and target symbol tables */
+#define INCLUDE_NFS             /* nfs package */
+#define INCLUDE_PING            /* ping() utility */
+#define INCLUDE_POSIX_ALL       /* include all available POSIX functions */
+#define INCLUDE_RDB             /* remote debugging package */
+#define INCLUDE_RLOGIN          /* remote login */
+#define INCLUDE_RPC             /* rpc package */
+#define INCLUDE_SECURITY        /* shell security for network access */
+#define INCLUDE_SHELL           /* interactive c-expression interpreter */
+#define INCLUDE_SHOW_ROUTINES   /* show routines for system facilities*/
+#define INCLUDE_SPY             /* spyLib for task monitoring */
+#define INCLUDE_STARTUP_SCRIPT  /* execute start-up script */
+#define INCLUDE_STAT_SYM_TBL    /* create user-readable error status */
+#define INCLUDE_SYM_TBL         /* symbol table package */
+#define INCLUDE_UNLOADER        /* object module unloading */
+#define INCLUDE_WINDVIEW        /* WindView command server */
+
+ +Also, automatic construction/destruction of static objects +should be enabled.

+ +If you use TAO, it's also a good idea to increase the +NUM_FILES parameter from its default of 50 to, +say, 1000.

+ +Please note that those VxWorks kernel configuration parameters +are set in the VxWorks configAll.h file. You must rebuild your +VxWorks kernel after modifying that file.

+ +If you're first getting started with ACE and/or VxWorks, I recommend +just building the ACE library and tests first. (Some of the ACE +examples, in System_V_IPC, don't build on VxWorks yet.) Then try +running the tests. Please see $ACE_ROOT/tests/README for the latest +status of the ACE tests on VxWorks.

+ +Please note that the main entry point is renamed to +ace_main (configurable via ACE_MAIN) on VxWorks with g++, +to comply with its restriction against using main. +In addition, ACE_HAS_NONSTATIC_OBJECT_MANAGER is enabled by default +to cleanly support construction and destruction of static objects. +Please see the Non-static +ACE_Object_Manager discussion for the important implication +of this feature.

+ +ACE threads (VxWorks tasks) can be named, for example, by supplying a +non-null argument to the Thread_Manager spawn routines. However, +names beginning with "==ace_t==" are forbidden because +that prefix is used internally by ACE.

+ +You can spawn a new task to run ace_main, using either +VxWorks sp, or ACE'S spa. +spa can be used from the VxWorks shell to pass arguments +to ace_main. Its usage is: + +


+spa ace_main, "arg1" [, ...]
+
+ +All arguments must be quoted, even numbers. You can start also ace_main +without spawning another thread by using:

+ +


+spaef ace_main, "arg1" [, ...]
+
+ +ACE also provides the function vx_execae which is capable of running +ace_main in a separate thread, wait for the task to finish and return +the return code from ace_main: + +

+int vx_execae (FUNCPTR acemain,char* arguments, int prio = 0, int opt = 0, int stacksz = 0);
+
+

+You could call this from the VxWorks shell like: +

+

+my_rc = vx_execae ace_main, "-o server.ior -ORBDottedDecimalAddresses 1"
+

+ +When prio, opt or stacksz are omitted or specified +as 0 default values will be used. See the VxWorks shell documentation for the +defaults for prio and opt. For stacksz the default is +ACE_NEEDS_HUGE_THREAD_STACKSIZE. +The arguments string will be parsed and passed on to ace_main as +a regular argc and argv.

+ +Be aware of the fact that when you execute ace_main directly from the VxWorks +shell argc will be zero and argv* will also be zero. Using argv[0] will not return +the program name, but will result in a crash.
+The ACE helper functions spa, spaef and vx_execae prevent +this problem by building a regular argc and argv which also contain a +valid argv[0] element.

+ +

Building Shared Libraries for VxWorks.

+ +NOTE: Since VxWorks support is currently being reworked with +an initial focus on static builds the support for shared builds is momentarily +broken. This will be remedied(!) as soon as possible.

+ +ACE supports shared libraries for VxWorks, but only with the g++ +compiler. To build shared libraries instead of the default static +libraries, added shared_libs=1 (not +shared_libs_only=1) to either your +ACE_wrappers/include/makeinclude/platform_macros.GNU or +your make invocation. Then, be sure to load the ACE (and +any other) shared library before loading your executable(s).

+ +A shared library for VxWorks uses the same code as for a static +(non-shared) library. However, calls to static constructors/ +destructors are added. The code in the shared library must +be reentrant if you shared it between programs (tasks). The +ACE library meets this requirement.

+ +Shared libraries reduce build time, executable size, and load +time of the executable. But, you must manually load the shared +library before loading your executable(s) with a command such as: +


+-> ld < libACE.so
+
+Shared libraries can be unloaded the same way an executable +(module) is unloaded.

+ +NOTE: Shared libraries on VxWorks aren't the same as +shared libraries on other operating systems. In particular, there is +no support for creating copies of writeable global (static) data in +the shared library. This includes the singleton ACE_Object_Manager +instance pointer. If you share global data between separate programs, +they may not work properly. See the discussion of shared code and +reentrancy in the VxWorks' Programmers Guide.

+ +Instead of trying to run separate programs onto a VxWorks target, we +recommend creating just one program, and spawning a thread for each +task. The TAO IDL_Cubit test collocation +test is a good example.

+ +

Linking ACE and/or TAO Libraries into the VxWorks Kernel.

+ +It's easy to link your ACE and/or TAO libraries into the VxWorks kernel. +Just build shared versions, but +disable the munch step. The easiest way to do that is to set the +LD make variable to the name of your linker. For +example, to build a libACE.so for PowerPC that can be linked into +the kernel: +
% cd $ACE_ROOT/ace
+% make LD=ldppc shared_libs=1
+
+After building the shared lib, link it into the kernel by setting +the MACH_EXTRA make variable in the kernel configuration +Makefile. Then, build the kernel using make exe.

+ +

Using the one-button ACE tests with VxWorks.

+ +It is possible to generate a script to execute all ACE tests. You can do this by executing +

% perl run_test.pl -v -o > run_test.vxworks
+
+ +The ACE tests write their output files in a directory named +log/, below the current (tests) directory.
+

+

+To run the tests from the build directory on an NT host where you crossbuild your +VxWorks ACE/TAO you can set up the Target Server File System (TSFS) in your Target Server +configuration. If you f.i. set the root for the TSFS to the root directory of your builddisk +you can set the default directory for the target by issueing the following command +from a Host shell: '@cd "/tgtsvr/{path to ACE}/ACE_wrappers/tests"'. +The '@' addition makes sure this command is executed for the target environment and not the +local host shell environment. +If you also issue the command 'cd {path to ACE}/ACE_wrappers/tests' you can execute the +generated one button testscript like: '< run_test.vxworks'. +

+

+Running the ACE tests automatically from the ACE autobuild tool using Target Server and Host +shell options is also supported. +

+

+If you don't have NFS included in your VxWorks kernel, you can use these steps, provided by +Clarence M. Weaver, +to run the tests and capture their output:

+

    +
  1. What I did was create a log directory on the boot NT host of my VxWorks + target.

    +

  2. I copied all the test applications and the run_test.vxworks script to + the parent of the log directory.

    +

  3. Using the target shell not the host shell, I "cd" to the directory + containing the script and test programs.

    +

  4. Invoked the script using < run_test.vxworks from this target shell.

    +

+ +Kirk Davies provided this +approach for running the ACE tests on Tornado II: + + + +

Building ACE on Tornado/NT hosts for VxWorks targets.

+The following, very useful information was contributed by +Chris Ryan +and Paul von Behren. +Please submit corrections, additions, or clarifications to the +the ACE mailing list.

+ +NOTE:The make (version 3.74) that is provided with +Tornado 2.2 cannot be used to build ACE. A working version is available +from the WindRiver support site, download the + +make3_80.gvk_patches and the + +make3_80.tor2_2.new_dependency_rules package and install them.

+ +Using the Cygnus tools, this approach works: +

+ +A few additional Windows Notes, from Paul von Behren:

+

+ +And Chris Ryan's instructions for building for VxWorks targets +on Windows NT hosts: + +
    +
  1. Path setting that seems to be working is:

    + 

          /tornado/host/x86-win32/bin:
+      /tornado/host/x86-win32/lib/gcc-lib/i386-wrs-vxworks/cygnus-2.7.2-960126:
+      /tornado/host/x86-win32/i386-wrs-vxworks/bin:
+      /ace/ace_wrappers/bin:
+      /gnuwin32/b18/H-i386-cygwin32/bin:
+      /gnuwin32/b18/tcl/bin:
+      /WINNT/system32:
+      /WINNT:
+      /WINNT/system32/nls/ENGLISH:
+      /bin
+
    + + Other environment variables:

    + 

          WIND_BASE=/tornado
+      SHELL=/bin/sh.exe
+      TERM=pcbios
+      TAO_ROOT=/ace/ACE_wrappers.vxworks/TAO
+      CPP_LOCATION=/Program Files/DevStudio/VC/bin/CL.EXE
+      GCC_EXEC_PREFIX=/tornado/host/x86-win32/lib/gcc-lib/
+      WIND_HOST_TYPE=x86-win32
+      ACE_ROOT=/ace/ACE_wrappers.vxworks
+
    + +
  2. /tornado is the root of the Tornado install + ($WIND_BASE). + +
  3. /gnuwin32 is the root of a Cygnus GNU download and install. + +
  4. /bin content is:

    + 

          aced.dll
+      cygwin.dll
+      perl.exe
+      rm.exe
+      sh.exe
+      true
+
    + + aced.dll is produced in an ACE NT source tree according to + documented procedure for Windows VC++ ACE build. + + cygwin.dll is from the Cygnus GNU software download and install. + +
  5. Basically, follow documented procedure for ACE build/install on UNIX + platform. Create a $ACE_ROOT/ace/config.h that looks + like:

    + 

          #include "config-vxworks5.x.h"
+
    + + And create a + $ACE_ROOT/include/makeinclude/platform_macros.GNU + that looks like:

    + 

    +      WIND_BASE = /tornado
+      WIND_HOST_TYPE = x86-win32
+      CPU = I80486
+      include $(ACE_ROOT)/include/makeinclude/platform_vxworks5.5.x.GNU
+
    + +
  6. When using cygnus windows GNUTools on WinNT you have to start + make with "--unix" option, otherwise WinNT shell cmd.exe is responded and + not sh.exe, i.e., + 
     make --unix static_libs=1
+
    +
+ +

TAO on NT Tornado host, VxWorks target.

+ +
    +
  1. Build ACE and TAO_IDL in the NT tree as already documented. + Be sure to build ACE's gperf on NT, in + ACE_wrappers/apps/gperf/src.

    + +

  2. Build $TAO_ROOT/tao + 
          CPP_LOCATION=/Program Files/DevStudio/VC/bin/CL.exe
+      cd $TAO_ROOT/tao
+      /gnuwin32/b18/H-i386-cygwin32/bin/make
+
    + +
  3. Build orbsvcs. + 
          CPP_LOCATION=/Program Files/DevStudio/VC/bin/CL.exe
+      cd $TAO_ROOT/orbsvcs/orbsvcs
+      /gnuwin32/b18/H-i386-cygwin32/bin/make
+
    + +
  4. Build $TAO_ROOT/tests

    +

+ + +

Jaffar Shaikh's +Notes for Building ACE and TAO for VxWorks on NT host

+

Scenario: I was building the ACE and TAO for VxWorks +on NT. The target system was a PPC860 based chassis and another a NT +host based card.

+

Host System:

+

NT 4.0 workstation with 128 M RAM, 266MHz Pentium.

+ +

Software Needed For Building TAO

+

1) Active State's ActivePerl from +http://www.activestate.com/software/default.htm +

+ +

2) Tornado 2.2.1 from Windriver.

+ +

3) Cygwin GNU to build TAO. It is available for NT as a freeware +from the Cygwin site

+

The Cygwin Make (version 3.75) can only build the TAO not the +Tornado II make (version 3.74)

+ +

Environment Variables:

+

On NT the environment Variables are set as follows, (from +Control Panel-> System -> Environment)

+

I added following Environment variable entries to PATH

+ +

C:\Perl\bin\;

+

C:\tornado\host\x86-win32\bin;

+

C:\tornado\host\x86-win32\powerpc-wrs-vxworks\bin;

+

C:\tornado\host\x86-win32\lib\gcc-lib\powerpc-wrs-vxworks\cygnus-2.7.2-960126;

+

C:\Corba\Ace_wrappers\bin;

+

C:\Cygwin\bin;

+

C:\Cygwin\usr\bin;

+

C:\bin

+ +

Additional Environmental variables and the values,

+

CPU=PPC860

+

LD_LIBRARY_PATH=

+

SHELL=/bin/sh.exe

+ +

ACE_ROOT=/Corba/ACE_wrappers

+

WIND_BASE=/tornado

+

SHELL=/bin/sh.exe

+

TERM=pcbios

+

TAO_ROOT=/Corba/ACE_wrapper/Tao

+

CPP_LOCATION=/Program Files/Microsoft Visual Studio/VC98/Bin/CL.exe

+

GCC_EXEC_PREFIX=/tornado/host/x86-win32/lib/gcc-lib/

+

WIND_HOST_TYPE=x86-win32

+

PERL_PATH=/perl/bin/perl.exe

+ +

Directories of importance

+

C:\Corba <-- Ace_wrappers (uzipped)

+

C:\tornado <-- Tornado installed

+

C:\Perl <-- Perl installed

+

C:\Cygwin <-- Cygwin installed

+

C:\bin <-- Copy these files,

+

Ace.dll, <-- After you build Ace

+

gperf.exe <-- After you build gperf

+

Cygwin1.dll, <-- After you install Cygwin

+

perl.exe, <-- After you install Perl

+

rm.exe <-- After you install Cygwin

+

sh.exe <-- After you install Cygwin

+

true <-- After you install Cygwin

+

Create Files

+

1) C:\Corba\ACE_Wrappers\ace\config.h

+

with entry

+

#if defined (_MSC_VER) || (__BORLANDC__)

+

#include "ace/config-win32.h"

+

#else

+

#define ACE_HAS_IP_MULTICAST

+

#include "ace/config-vxworks5.x.h"

+

#endif

+ +

2) C:\Corba\ACE_wrappers\include\makeinclude\platform_macros.GNU

+

WIND_BASE = /tornado

+

WIND_HOST_TYPE = x86-win32

+

include +$(ACE_ROOT)/include/makeinclude/platform_vxworks5.5.x.GNU

+

ACE_COMPONENTS=FOR_TAO (you may choose this option to build ACE +library that supports TAO)

+ +

+

Steps to Build

+

1) Build Ace.dll under NT

+

In MS Visual C++ open C:\Corba\ACE_wrappers\ace.sln And build Ace +DLL

+

Copy Ace.dll in C:\bin

+ +

2) Build gperf utility under NT

+

In MS Visual C++ open +C:\Corba\ACE_wrappers\apps\gperf\src\gperf.sln. Build gperf.exe

+

Copy gperf.exe to C:\bin

+ +

3) Mount Directries in Cygwin

+

Click on Cygnus Solutions -> Cygwin Bash Shell

+

Mount following directories by using mount command.

+

create respective directories first then use mount command

+ +

e.g. Create /Corba directory then use $mount -s "C:\Corba" +/Corba

+ +

C:\Corba mount to /Corba

+

C:\tornado mount to /tornado

+

C:\Perl mount to /perl

+

C:\Cygwin mount to /cygwin

+

C:\bin mount to /bin

+

C:\Program Files mount to /Program Files

+ +

4) Build ACE in Cygwin

+

$cd /Corba/ACE_wrappers/ace

+

$make static_libs=1

+

This will build your ace library libACE.a for VxWorks. If you use +option shared_libs=1 then the build will be libACE.so. The other +options are same as follows.

+ +

5) Build TAO in Cygwin

+

$cd $TAO_ROOT/tao

+

$make debug=0 optimize=1 static_libs_only=1 minimum_orb=1 +

+

for shared libs use shared_libs=1

+ +

The minimum Tao does not have following components,

+

Dynamic Skeleton Interface

+

Dynamic Invocation Interface

+

Dynamic Any

+

Interceptors

+

Interface Repository

+

Advanced POA features

+

CORBA/COM interworking

+ +

You may play around with above options to find suitable build for +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.

+ +

+
+

Building and Installing ACE Network Services

+ +The following explains how to build the ACE network services on UNIX and Win32. + +

+

Building and Installing ACE Network Services on UNIX

+ +Building and installing ACE Network Services on UNIX is relatively +simple (the process for Win32 is different). +Here's what you need to do:

+ +

    + +
  1. Build and install ACE on UNIX as described earlier. If ACE is built at the root of the ACE + source tree (and ACE has been ported to your platform, of course) the + netsvcs static and shared object libraries should be built + automatically. In addition, the server driver program + (main) contained in $ACE_ROOT/netsvcs/servers/main.cpp + should also be compiled and ready to run.

    + +

  2. Set your LD_LIBRARY_PATH environment variable to + where the binary version of the ACE netsvcs library. For + example, you probably want to do something like the following

    + + 

    
+      % setenv LD_LIBRARY_PATH $ACE_ROOT/ace:$ACE_ROOT/lib:$LD_LIBRARY_PATH
+

    + +

  3. By default, if the shared object library is built, the services + are linked into the main driver program dynamically. + To specify which services should be linked in and executed, edit the + $ACE_ROOT/netsvcs/servers/svc.conf + file. During your editing, you should update information (such as the + default service port numbers) that affects the initialization of + services in this file. Refer to the + Service Configurator + documentation to learn how the configuration file is parsed and + how the services are dynamically linked and executed. In + addition, refer to the Network + Services documentation to learn more about how to configure + each network service.

    + +

  4. If you only want to link the services statically, simply remove + or rename the svc.conf file.

    +

+ +

+

Building and Installing ACE Network Services on Win32

+ +Once again, there are supplied project for Visual C++ 7.1 or later for +the Network Services.

+ +

+

Building and Installing the ACE_SSL Library

+ +

The first step for all platforms is to build and install the +OpenSSL distribution. The +ACE_SSL library must then be built according to the instructions +below.

+

Unix

+
    +
  1. Make sure the OpenSSL header file directory is in your compiler's + include path, and that OpenSSL libraries are in your library link/load + path (e.g. LD_LIBRARY_PATH). If you + installed OpenSSL into a set of directories unknown by the compiler, + set the SSL_ROOT environment variable to point to the + top level directory of your OpenSSL distribution, i.e. the one + containing OpenSSL's include and lib + directories.
    2. +
  2. Build ACE as described above. When building ACE, add + ssl=1 + to your make + command line invocation, or add it to your + platform_macros.GNU file.
    3. +
  3. Build the ACE_SSL library in the $ACE_ROOT/ace/SSL + directory. The ACE_ROOT environment variable should be set + prior to this point.
    4. +
+

Microsoft Visual Studio

+
    +
  1. Set the SSL_ROOT environment variable to the location + of the directory containing the OpenSSL inc32 and + out32dll directories. +
  2. Add ssl=1 to your MPC + $ACE_ROOT/bin/MakeProjectCreator/config/default.features + or $ACE_ROOT/local.features file, and re-run MPC to add + support for building the ACE_SSL library to your MSVC++ + workspaces and projects. +
  3. Open the ACE.sln solution, and refer to the ACE build + and installation instructions above for details on creating a + config.h configuration header for this platform. Once + the config.h file has been created, build the + ACE_SSL project.
    4. +
+

CodeGear C++

+

Support for building ACE's ACE_SSL library and TAO's SSLIOP + pluggable protocol with CodeGear C++ does exist. +

    +
  1. Set the SSL_ROOT environment variable to the location + of the directory containing the OpenSSL inc32 and + out32 directories. +
  2. Add ssl=1 to your MPC + $ACE_ROOT/bin/MakeProjectCreator/config/default.features + or $ACE_ROOT/local.features file, and re-run MPC to add + support for building the ACE_SSL library to your CodeGear C++ makefiles. +
  3. Build ACE and TAO. +
+

+ +

+

Building and Using GUI Reactors Libraries

+There is a general method for building and using ACE_Reactors for various GUI +libraries. +

Building GUI Reactor Library

+
    +
  1. Try to generate build files using MPC. Inspect the output of MPC to find out which features are + necessary to build given reactor. Add these features to + ACE_wrappers/bin/MakeProjectCreator/*.features file, or pass them directly to MPC + using -features command line option. For example, for FlReactor the procedure + consists of five steps +
      +
    1. In the first pass one gets that x11 (X11 libraries) is missing.
      + $ mwc.pl -type gnuace + Skipping ACE_FlReactor (ace_flreactor.mpc), it requires x11. +
      2. + Ensure that X11 libraries are installed, then pass x11=1 feature to MPC. +
    2. In the second pass one gets that gl (OpenGL library) is missing.
      + $ mwc.pl -type gnuace -features x11=1 ace.mwc + Skipping ACE_FlReactor (ace_flreactor.mpc), it requires gl. +
      3. + Ensure that OpenGL libraries are installed, then pass gl=1 feature to MPC. +
    3. In the third pass one gets that fl (Fast Light Toolkit) is missing.
      + $ mwc.pl -type gnuace -features x11=1,gl=1 ace.mwc + Skipping ACE_FlReactor (ace_flreactor.mpc), it requires fl. +
      4. + Ensure that Fast Light Toolkit libraries are installed, then pass fl=1 + feature to MPC. +
    4. In the fourth pass one gets that ace_flreactor feature is missing
      + $ mwc.pl -type gnuace -features x11=1,gl=1,fl=1 ace.mwc + Skipping ACE_FlReactor (ace_flreactor.mpc), it requires ace_flreactor. +
      5. + Allow MPC to generate makefiles for FlReactor by setting ace_flreactor=1 feature. +
    5. In the last pass one obtains files for building FlReactor.
      + $ mwc.pl -type gnuace -features x11=1,gl=1,fl=1,ace_flreactor=1 ace.mwc +
      6. +
    + Currently to simplify MPC generation some of features are turned on by default in + ACE_wrappers/bin/MakeProjectCreator/global.features. For examples to generate + files related with Fl one has to provide only fl=1 feature. To obtain a more fine grained controll + over MPC generation process one may modify ACE_wrappers/bin/MakeProjectCreator/*.features + files. +
    2. +
  2. Required build files are generated now, it is enough then to invoke build tool. + For example for under MPC::gnuace one has to call + make fl=1. For MPC::vc7 target all features are + encoded in generated project files, thus it is enough to compile ACE using MSVC. +
    3. +
+ The build procedure leads to a specific GUI Reactor library. For example, for + Qt and Linux one gets libQtReactor.so, while for + Windows the results are shared QtReactor.dll and import + QtReactor.lib libraries or their variants depending on build options. + When compiling TAO also GUI related libraries are created like libTAO_QtResource.so. +

Using GUI Reactor Library

+ Here one has at least three use cases: +
    +
  1. Applications with their own build system. + To use ACE support for GUI one has to include specific GUI headers and + link with specific ACE_[GUI]Reactor library. When using TAO support for GUI one has + also to link with specific TAO_[GUI]Resource library.
    2. +
  2. Applications with build system using MPC. + In general, it is better to create specific base projects for using ACE GUI support in such application. + Base projects provided by ACE ACE_wrappers/bin/MakeProjectCreator/[ace,tao]_[gui][reactor,resource].mpb + may be an examples of how to do this.
    3. +
  3. Internal ACE applications like tests or examples. + MPC project for internal ACE application using GUI support should be derived from + ace_[gui]reactor.mpb base projects. To employ TAO support for GUI one should derive + the project from tao_[gui]resource.mpb These base projects ensure that all necessary libraries + are linked to the application, specifies features necessary to build a project and moreover impose a + build order consistant with ACE. For example, the application project using XtReactor should be + derived from ace_xtreactor.mpb.
    4. +
+

Notes on specific GUI Reactors

+ + +
+

Installation Notes

+ + + + +
+

Compiling ACE with GNU g++

+ +If you use the GNU GCC g++ compiler please note the following: + + + + +

+

What Do I Need to Build for TAO?

+Toshio Hori <toshi@etl.go.jp> provided these suggestions on building +just what's needed for (a subset of) TAO:

+ +I usually make: +

    $ACE_ROOT/ace,
+    $ACE_ROOT/apps/gperf,
+    $TAO_ROOT/tao,
+    $TAO_ROOT/TAO_IDL, and
+    $TAO_ROOT/orbsvcs/orbsvcs
+
+and the whole make takes less than an hour on my Solaris 7 for intel, +Pentium-III/550MHz, 256MB memory, 512MB swap machine. (Top secret: I +renice the 'make' process to the highest priority, -20... ;-) + +To save time and space, I set +
    TAO_ORBSVCS = Naming Time Trader ImplRepo
+
+in $ACE_ROOT/include/makeinclude/platform_macros.GNU also. See +TAO's orbsvcs +library customization instructions for more information.

+ + +

System Resource +Requirements

The amount of system resources required to build +ACE and TAO varies greatly. The required system resources are +influenced by OS and compiler platform, build options, and component +configurations. As a rough guide, the typical peak memory requirement +can be well over 512 MB (notably, for TAO's orbsvcs). Depending on +your OS and compiler configuration, an entire build +of ACE and TAO can use well over 4 GB of disk space. It's usually not +necessary to build all of ACE and TAO, though.

+ +Much less disk space is required for just the libraries. For example, +see the ACE +library subset sizes.

+ +If you run out of memory when building, you might consider trying +some or all of these suggestions:

+

+ +

+

General MPC information

+ +The USAGE, README for documentation on MPC.

+ +A common usage for creating a Windows workspace containing just the +core ACE and TAO libraries and executables is the following: + +


+C:> cd %TAO_ROOT%
+C:> %ACE_ROOT%\bin\mwc.pl -type vc71 TAO_ACE.mwc
+
+ +Replace vc71 with whatever project type you want to use. On Linux and +other UNIX platform use the gnuace type:

+ +


+% cd $TAO_ROOT
+% $ACE_ROOT/bin/mwc.pl -type gnuace TAO_ACE.mwc
+
+ +this creates the appropriate GNUmakefiles. Additional information on +how to obtain, configuration, and build ACE+TAO using MPC appear at +the OCI FAQ.

+ +If you are attempting to generate project files using MPC, and you get +the following error message:
+ +

ERROR: Unable to find the MPC modules in /builds/ACE_wrappers/MPC.
+You can set the MPC_ROOT environment variable to the location of MPC.
+
+ +You need to do one of the following: + +
    +
  1. If you have already obtained MPC, either move it underneath the +ACE_wrappers directory or set your MPC_ROOT environment variable to point +to the full path of MPC.
    2. +
  2. Check out MPC from the DOC Group subversion repository +and set your MPC_ROOT environment variable.
    3. +
+ +You can check +out MPC from the doc_group subversion server using the following command. + +
svn co svn://svn.dre.vanderbilt.edu/DOC/MPC/trunk MPC
+
+ +The README and USAGE files in the MPC/docs directory are an up-to-date +source of documentation, however it is not a complete set of +documentation. The TAO Developer's Guide from OCI starting with the +1.3a version contains more information about MPC.

+ +The MPC chapter from the TAO Developer's Guide is available at +http://downloads.ociweb.com/MPC/. Some of MPC has changed since +this version, but it is largely accurate. An updated version will be +available as newer versions of the TAO Developer's Guide are released. +In the meantime, please see the README and USAGE files in the MPC +directory. + +

+

+

Working with ACE in Eclipse

+ + +

+The Eclipse CDT C++ development environment can be used to develop ACE applications. You can configure a new CDT project to build ACE using either a local source distribution or checking out ACE from CVS in Eclipse. These are the steps to create the CDT project to build ACE. +

+ +

+

To create an Eclipse project for ACE starting from CVS:

+
    +
  1. In the "CVS Repository Exploring" perspective, navigate to the module containing ACE.
    2. +
  2. Checkout the module using "Check Out As" and select the "project configured using the New Project Wizard" option.
    3. +
  3. Select "Standard Make C++ Project" for the project type.
    4. +
  4. Follow the steps outlined above, up to the point of running make, for building ACE on your platform. Use "path_to_your_eclipse_workspace"/"project_name" as your $ACE_ROOT. +
  5. If you had to regenerate the makefiles using MPC, select the root folder for your poject and use the import wizard to add them to your project.
    6. +
  6. Select the root folder for the project and use the "Create Make Target" wizard to setup the appropriate make command and options.
    7. +
  7. Select the root folder and run "Build Make Target." This will build ACE.
    8. +
+

+ + + +

+

To create an Eclipse project for ACE from a local source distribution:

+
    +
  1. Launch the "New Project Wizard" in Eclipse.
    2. +
  2. Select "Standard Make C++ Project" for the project type.
    3. +
  3. On the project name page, uncheck the "use default" location option and replace the default path with the path to your source distribution.
    4. +
  4. Follow the steps, up to the point of running make, for building ACE on your platform. +
  5. If you had to regenerate the makefiles using MPC, select the root folder for your poject and use the import wizard to add them to your project.
    6. +
  6. Select the root folder for the project and use the "Create Make Target" wizard to setup the appropriate make command and options.
    7. +
  7. Select the root folder and run "Build Make Target." This will build ACE.
    8. + + +
+

+ +

+ +

+

Advanced Topics

+ + + +

+

Non-static +ACE_Object_Manager

The ACE_Object_Manager can be instantiated +as a static object, can be instantiated on the stack of the main +program thread, or can be explicitly instantiated and destroyed by the +application with ACE::init () and ACE::fini +(). The comments in the header file, +ace/Object_Manager.h, as well as Section 1.6.3 in +The ACE Programmer's Guide +provide more detail.

+ +NOTE: +Special requirements are imposed on applications if the +ACE_Object_Manager is instantiated, by ACE, on the stack of the main +thread. This behavior is selected by defining +ACE_HAS_NONSTATIC_OBJECT_MANAGER in +ace/config.h. Again, see the ACE Object_Manager header file, +ace/Object_Manager.h for more information. One of +these requirements is discussed here, because it is so important. +Please note that ACE_HAS_NONSTATIC_OBJECT_MANAGER is +defined in the distributed ACE config.h headers for +VxWorks and Win32.

+ +The important requirement is that the program must +declare its main function with two arguments, even if +they're not used, and with int return type: + +


+int
+main (int, char *[])
+
+ +If you don't declare main exactly that +way, then you'll see a link error about ace_main_i being +undefined.

+ +Alternatively, this feature can be disabled by commenting out the +#define ACE_HAS_NONSTATIC_OBJECT_MANAGER in the +ace/config.h. But, that will make repeated testing more +difficult on VxWorks. And, you'd either have to call static +constructors and destructors manually or unload/load the program +between runs. On Win32, disabling the feature can possibly lead to +shutdown difficulties.

+ +WARNING: +ACE_HAS_NONSTATIC_OBJECT_MANAGER assumes that your +main function is named main. Any violation +of this assumption is at your peril. If you really need to call your +entry point something other than main, you'll need to +construct and destroy the ACE_Object_Manager. The best way to do that +is to call ACE::init () and ACE::fini (). +Or, see the #define of main (int, char *[]) +in ace/OS_main.h to see how ACE does +that for entry points named main. + +

+

Cloning the Source Tree

+ +On UNIX platforms, we typically like to support multiple platform +builds using the same ACE source tree. This idiom is supported by ACE +using the $ACE_ROOT/bin/create_ace_build.pl script. + +To clone the source tree, create ./build and ./build/{your build name} +subdirectories under the ACE_wrappers directory. +Then invoke the create_ace_build.pl script to clone the source tree using +soft links from your build directory back to the actual sources. +Here is an example:

+ +

% cd ACE_wrappers
+% mkdir build build/build-SunOS5
+% perl bin/create_ace_build.pl -a -v build-SunOS5
+% cd build/build-SunOS5
+% setenv ACE_ROOT $cwd
+% make
+

+ +This will establish a complete tree of links. In addition, make sure +you set your LD_LIBRARY_PATH to +$ACE_ROOT/lib:$LD_LIBRARY_PATH on SVR4 UNIX +platforms.

+ +When you do a make in the $ACE_ROOT directory you will be producing +object code that is not stored in the same place as the original +source tree. This way, you can easily build another platform in a +parallel tree structure.

+ +See the comments at the top of the create_ace_build.pl script for +further usage information. + +

+

Additional Build Tips for MVS

+ +For all intents and purpose, MVS OpenEdition (OE) is another flavor of +UNIX, therefore, the instructions under Building +and Installing ACE on Unix can be used along with the following +additional tips:

+ +You can get a copy of GNU make that has been ported to MVS OpenEdition from +the IBM OpenEdition web site. +ACE's make scheme generates compile commands that have options and +operands interspersed. By default, the c89/cc/c++ compiler expects all options to +precede all operands. To get around this, you must set a special +compiler environment variable (_CXX_CCMODE) to 1 which tells the compiler +to allow options and operands to be interspersed.

+ +Note that the environment variable LD_LIBRARY_PATH is +called LIBPATH on MVS.

+ +Shared objects are built a little different on MVS than on +other UNIX implementations. This has been accounted for in the makefiles +that come with ACE When the linker (via the cxx command) builds the +libACE.so file it will also create a file called libACE.x. This is a +side-deck file and it must be included in subsequent link edits with +application code. For more information on this see the C/C++ MVS +Programming Guide. If you want to build your application statically, +i.e., using libACE.a instead of libACE.so, you can set ACELIB to +ACELIB_STATIC in platform_mvs.GNU.

+ +When the libACE.so file is built (via the MVS pre-linker and binder), you +will get a rc=4 from the pre-linker. This is ok. This is due to some +warnings about unresolved references which should get resolved during the +link step. Note, however, there shouldn't be any unresolved references +from the binder (linkage editor). You can get pre-link and link maps by +uncommenting the PMAP and LMAP lines in the platform_mvs.GNU file. + +

+

Makefile Flags

+ +GNU make provides many options to customize its operation. See its +documentation for more information. One example is that for multi-cpu +UNIX machines you will be able to build faster if you use:

+ +


+% make -j n
+

+ +which allows parallel compilation. The number n should +typically be the number of CPUs. It is likely that builds will be +faster even on single-CPU UNIX machines with make -j +2.

+ +ACE further supports the following flags. They can be enabled either +on the command line, e.g., "make purify=1", or added to your +platform_macros.GNU. To disable the option, +set the flag to null, +e.g., "make debug=". Some flags support setting to 0 disable, e.g., +"make debug=0". debug=1 is enabled in the platform files that are +released with ACE.

+ +Please note that the effects of a flag may be platform specific. +Also, combinations of certain flags may or may not be allowed on +specific platforms, e.g., debug=1 opt=1 is supported by g++ but +not all other C++ compilers.

+ +If you use Purify or Quantify: purify or quantify must +be on your PATH. By default, ACE puts the Purify/Quantify +caches below /tmp. To override that, set the +PURE_CACHE_BASE_DIR variable, either in your environment +or on the make make command line, to the destination +directory for your instrumented libraries.

+ +

Flag             Description
+----             -----------
+debug            Enable debugging; see DCFLAGS and DCCFLAGS.
+exceptions       Enable exception handling (not supported by all platforms).
+include_env      Support old-style ACE_TRY_ENV declarations in methods.
+                 This switch is necessary for compiling TAO applications
+                 in the native exception configuration that were written
+                 for TAO versions before 1.2.2.
+                 In TAO 1.2.2, new macros were introduced that supercede
+                 the direct ACE_TRY_ENV declarations. These are the
+                 ACE_ENV_ARG macros that are defined in ace/CORBA_macros.h
+                 and are documented in docs/exceptions.html.
+                 This switch only affects the exceptions=1 configuration.
+                 It is for backward compatibility only.
+                 There will be warnings about unused _ACE_environment_variable
+                 parameters when using include_env=1.
+                 If possible, do not use it, but instead change your TAO
+                 applications to use the ACE_ENV_ARG macros.
+fast             Enable -fast option, e.g., with Sun C++.
+inline           Enable ACE inlining.  Some platforms enable inlining by
+                   default, others do not.
+optimize         Enable optimization; see OCFLAGS and OCCFLAGS.
+pace             Enable PACE as the underpinnings of ACE_OS.
+probe            Enable ACE_Timeprobes.
+profile          Enable profiling; see PCFLAGS and PCCFLAGS.
+purify           Purify all executables.
+quantify         Quantify all executables.
+repo             Use GNU template repository (g++ with repo patches only).
+rtti             Enable run-time type identification.  On some platforms,
+                   it is enabled by default, so this is ignored.
+shared_libs      Build shared libraries. Ignored if static_libs_only is set.
+static_libs      Build shared libraries. Ignored if shared_libs_only is set.
+shared_libs_only Only build shared libraries.  Ignored if no SHLIBs are
+                   specified by the Makefile, as in performance-tests/Misc.
+static_libs_only Only build static libraries.
+threads          Build with thread support.
+xt               Build with Xt (X11 Toolkit) support.
+fl               Build with FlTk (Fast Light Toolkit) support.
+tk               Build with Tk (Tcl/Tk) support.
+qt               Build with Qt (Trolltech Qt) support.
+ssl              Build with OpenSSL support.
+rapi             Build with RAPI
+split            Build the library by first splitting up the ACE source
+                   to several files, with one object code entity for each
+                   source file. This allows an application that is linked
+                   with ACE to extract _exactly_ what it needs from the
+                   library, resulting in a smaller executable.  Setting this
+                   to 1 overrides debug to 0.
+
+Usually, users do not need to be concerned with make targets.
+Just enter "make" on the command line to build.  A few notable
+targets are listed below.
+
+Target             Description
+------             -----------
+show_statics       Lists all static objects in object files built for
+                     current directory.  Only supported for g++.
+show_uninit        Lists all uninitialized in object files built for
+                     current directory.  Only supported for g++.
+
+
+ +

+

Building from Subversion (anonymous access)

+If users are building from our Subversion repository the +GNUmakefiles, and project files for building on various platforms will +not be available. Subversion users are expected to generate them +using MPC before building ACE, TAO or +CIAO. We point out some suggestions below to get bootstrapped +quickly. + + + +

+ +Back to the ACE +home page. + + + + +

+ + + +Last modified: Wed Jul 5 17:26:22 EST 2006 + + + +

diff --git a/dep/ACE_wrappers/COPYING b/dep/ACE_wrappers/COPYING index 1d96c4905..27a543f49 100644 --- a/dep/ACE_wrappers/COPYING +++ b/dep/ACE_wrappers/COPYING @@ -1,14 +1,14 @@ _________________________________________________________________ - + Copyright and Licensing Information for ACE(TM), TAO(TM), CIAO(TM), and CoSMIC(TM) - + [1]ACE(TM), [2]TAO(TM), [3]CIAO(TM), and [4]CoSMIC(TM) (henceforth 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-2008, all rights reserved. Since DOC software is + Copyright (c) 1993-2010, 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 @@ -16,7 +16,7 @@ include this copyright statement along with any code built using DOC software that you release. No copyright statement needs to be provided if you just ship binary executables of your software products. - + You can use DOC software in commercial and/or binary software releases and are under no obligation to redistribute any of your source code that is built using DOC software. Note, however, that you may not do @@ -27,7 +27,7 @@ software in your software, though we encourage you to let [10]us know so we can promote your project in the [11]DOC software success stories. - + The [12]ACE, [13]TAO, [14]CIAO, and [15]CoSMIC web sites are maintained by the [16]DOC Group at the [17]Institute for Software Integrated Systems (ISIS) and the [18]Center for Distributed Object @@ -50,13 +50,13 @@ University, UC Irvine, or Vanderbilt University, their employees, or students be liable for any lost revenue or profits or other special, indirect and consequential damages. - + DOC software is provided with no support and without any obligation on the part of Washington University, UC Irvine, Vanderbilt University, their employees, or students to assist in its use, correction, modification, or enhancement. A [19]number of companies around the world provide commercial support for DOC software, however. - + DOC software is Y2K-compliant, as long as the underlying OS platform is Y2K-compliant. Likewise, DOC software is compliant with the new US daylight savings rule passed by Congress as "The Energy Policy Act of @@ -65,7 +65,7 @@ obtains time/date and calendaring information from operating systems users will not be affected by the new DST rules as long as they upgrade their operating systems accordingly. - + The names ACE(TM), TAO(TM), CIAO(TM), CoSMIC(TM), Washington University, UC Irvine, and Vanderbilt University, may not be used to endorse or promote products or services derived from this source @@ -75,13 +75,13 @@ CIAO(TM), or CoSMIC(TM), nor does it grant permission for the name Washington University, UC Irvine, or Vanderbilt University to appear in their names. - + If you have any suggestions, additions, comments, or questions, please let [20]me know. - + [21]Douglas C. Schmidt _________________________________________________________________ - + Back to the [22]ACE home page. References @@ -104,7 +104,7 @@ References 16. http://www.dre.vanderbilt.edu/ 17. http://www.isis.vanderbilt.edu/ 18. http://www.cs.wustl.edu/~schmidt/doc-center.html - 19. http://www.cs.wustl.edu/~schmidt/commercial-support.html + 19. http://www.cs.wustl.edu/~schmidt/commercial-support.html 20. mailto:d.schmidt@vanderbilt.edu 21. http://www.dre.vanderbilt.edu/~schmidt/ 22. http://www.cs.wustl.edu/ACE.html diff --git a/dep/ACE_wrappers/ChangeLog b/dep/ACE_wrappers/ChangeLog index 6dc3c9d34..f10cd14c7 100644 --- a/dep/ACE_wrappers/ChangeLog +++ b/dep/ACE_wrappers/ChangeLog @@ -1,6116 +1,1421 @@ -Mon Sep 15 06:08:04 CDT 2008 Simon Massey +Sat Sep 04 11:30:18 CEST 2010 Johnny Willemsen - * ACE version 5.6.6 released. + * ACE version 5.8.2 released. -Fri Sep 12 21:13:04 UTC 2008 Adam Mitz - - * bin/MakeProjectCreator/config/MPC.cfg: - - Changed how DDS_ROOT is referenced (for OpenDDS support). - -Fri Sep 12 12:56:15 UTC 2008 Johnny Willemsen - - Reverted change below, brakes VMS support - - Tue Sep 9 18:46:15 UTC 2008 Johnny Willemsen - * bin/mwc.pl: - * bin/mpc.pl: - Use FindBin::RealScript to get the real script name, that also - works when we have a symbolic link with a different name to - one of these scripts. This fixes bugzilla 3407 - -Thu Sep 11 14:55:00 UTC 2008 Simon Massey - - * bin/diff-builds.pl - * bin/diff-builds-and-group-fixed-tests-only.sh - - Make revision number appending to new test failures optional. - -Tue Sep 9 18:46:15 UTC 2008 Johnny Willemsen - - * bin/mwc.pl: - * bin/mpc.pl: - Use FindBin::RealScript to get the real script name, that also - works when we have a symbolic link with a different name to - one of these scripts. This fixes bugzilla 3407 - -Tue Sep 9 14:05:00 UTC 2008 Simon Massey - - * bin/diff-builds-and-group-fixed-tests-only.sh - Change the sort to cater from revision numbers. - -Tue Sep 9 13:39:00 UTC 2008 Simon Massey - - * bin/diff-builds.pl - typo vi / non-vi edit - -Tue Sep 9 13:35:00 UTC 2008 Simon Massey - - * bin/diff-builds.pl - Adjust for revision numbers. - -Tue Sep 9 11:36:15 UTC 2008 Johnny Willemsen - - * ace/OS_NS_time.cpp (strptime_emulation): - Clear the struct tm before filling it. Without we get a random - value back if the user doesn't use a full date. - -Tue Sep 9 11:31:15 UTC 2008 Johnny Willemsen - - * bin/MakeProjectCreator/modules/VXTestProjectCreator.pm: - * bin/MakeProjectCreator/templates/vxtest.mpd: - Also generate a vxtest file for libraries - -Thu Sep 4 14:39:33 UTC 2008 Ciju John - - * bin/diff-builds-and-group-fixed-tests-only.sh: - '-P' isn't a valid option on Ubantu linux (Bug 15051). Replacing - with Perl alternate. - -Wed Sep 3 10:23:15 UTC 2008 Johnny Willemsen - - * bin/tao_other_tests.lst: - Don't run OBV Typed events with micro and compact configurations - -Wed Sep 3 07:31:15 UTC 2008 Johnny Willemsen - - * bin/PerlACE/ProcessVX_Unix.pm: - * bin/PerlACE/ProcessVX_Win32.pm: - Added support for ACE_RUN_VX_TGTSRV_WORKINGDIR. Before starting - the executable we will do a chdir to this directory when it - is specified - -Wed Sep 3 07:10:15 UTC 2008 Johnny Willemsen - - * tests/Bound_Ptr_Test.cpp: - Don't use ACE_ASSERT, it is disabled in release mode and this test - had some real functionality placed within an ACE_ASSERT. This fixes - bugzilla 3415 - -Tue Sep 2 14:11:15 UTC 2008 Johnny Willemsen - - * bin/MakeProjectCreator/config/acedefaults.mpb: - Don't use ACE_LIB_TEXT but ACE_TEXT, the former has been deprecated - a long time ago - -Thu Aug 28 21:18:11 UTC 2008 Adam Mitz - - * bin/tao_orb_tests.lst: - * bin/tao_other_tests.lst: - - Removed "Exceptions" and "NO_EXCEPTIONS" as -Config options. - -Thu Aug 28 18:33:15 UTC 2008 Johnny Willemsen - - * bin/PerlACE/ProcessVX_Unix.pm: - * bin/PerlACE/ProcessVX_Win32.pm: - Improved prompt matching - -Thu Aug 28 13:04:15 UTC 2008 Johnny Willemsen - - * bin/auto_run_tests.pl: - The error when we can't chdir to a directory was confusing - - * bin/PerlACE/ProcessVX.pm: - * bin/PerlACE/ProcessVX_Unix.pm: - * bin/PerlACE/ProcessVX_Win32.pm: - Reduced duplicate code and added support for ACE_RUN_VX_STARTUP_SCRIPT - and ACE_RUN_VX_STARTUP_SCRIPT_ROOT with which we can specify a - startup script that is executed before the real application is started - - * bin/PerlACE/TestTarget_VxWorks.pm: - A VxWorks target has to be rebooted between tests - -Mon Aug 25 11:15:15 UTC 2008 Johnny Willemsen - - * bin/tao_other_tests.lst: - Added missing run_test.pl to the OBV/Typed_Events test - -Thu Aug 21 09:38:15 UTC 2008 Johnny Willemsen - - * docs/Download.html: - Added OpenSuSE build services as new rpm download location. - Removed ACE-install.sh reference, it is not part of the - archive anymore - -Thu Aug 21 06:54:15 UTC 2008 Johnny Willemsen - - * bin/MakeProjectCreator/templates/gnu.mpd: - Also check /usr/lib64 for the libs - - * bin/depgen.pl: - * bin/mpc.pl: - * bin/mwc.pl: - * bin/PerlACE/ConfigList.pm: - * bin/PerlACE/MSProject.pm: - * bin/PerlACE/Process.pm: - * bin/PerlACE/Process_Unix.pm: - * bin/PerlACE/Process_VMS.pm: - * bin/PerlACE/Process_Win32.pm: - * bin/PerlACE/ProcessLVRT.pm: - * bin/PerlACE/ProcessVX.pm: - * bin/PerlACE/ProcessVX_Unix.pm: - * bin/PerlACE/ProcessVX_Win32.pm: - * bin/PerlACE/Run_Test.pm: - * bin/PerlACE/TestTarget.pm: - * bin/PerlACE/TestTarget_LVRT.pm: - * bin/PerlACE/TestTarget_VxWorks.pm: - * bin/Uniqueid.pm: - Added missing shebang lines to fix rpm packaging warnings - -Wed Aug 20 09:38:15 UTC 2008 Johnny Willemsen - - * bin/MakeProjectCreator/modules/BorlandProjectCreator.pm: - * bin/MMakeProjectCreator/modules/BorlandWorkspaceCreator.pm: - Fixed bugzilla 3403. Migrated parts of the bmake type to this - generator, fixes issues when we need to go a directory up - in the workspace. As side effect the resulting Makefile.bor - is smaller in size which reduces the full size of the - distribution. In the near future I want to remove the borland - MPC generator and only use bmake. - -Wed Aug 20 09:08:15 UTC 2008 Johnny Willemsen - - * bin/PerlACE/ProcessVX_Unix.pm: - * bin/PerlACE/ProcessVX_Win32.pm: - Fixed a bug with putenv with rtp mode - -Tue Aug 19 19:06:15 UTC 2008 Johnny Willemsen - - * bin/PerlACE/ProcessVX_Unix.pm: - * bin/PerlACE/ProcessVX_Win32.pm: - Don't use cmd to send commands through telnet. The disadvantage - of the cmd method is that it only returns when the prompt - appears again. When this doesn't happen we don't get the output - of the last command into our build log or on the telnet client - -Tue Aug 19 14:01:15 UTC 2008 Johnny Willemsen - - * ace/config-win32-borland.h: - * ace/OS_NS_stdlib.inl: - * ace/config-win32-msvc.h: - CodeGear C++ Builder 2009 has wcstoull and strtoull - -Mon Aug 18 11:30:15 UTC 2008 Johnny Willemsen - - * ace/config-win32-borland.h: - CodeGear C++ Builder 2009 doesn't support inline assembly - -Mon Aug 18 10:17:15 UTC 2008 Johnny Willemsen - - * ACE-INSTALL.html: - Improved BCB instructions - -Sun Aug 17 18:04:15 UTC 2008 Johnny Willemsen - - * ACE-INSTALL.html: - * include/makeinclude/compiler.bor: - Added BCBVER 10/11/12 - -Sun Aug 17 07:30:15 UTC 2008 Johnny Willemsen - - * bin/mwc.pl: - * bin/mpc.pl: - Use RealBin to get the location of this script, that gives the - real location also in case we use a symbolic link to these - scripts. Thanks to Adam Mitz for pointing me to RealBin - -Fri Aug 15 11:07:00 UTC 2008 Simon Massey - - * make/makeinclude/platform_aix_ibm.GNU: - Added missing AIX compiler version 0800. - -Wed Aug 13 14:40:15 UTC 2008 Johnny Willemsen - - * ace/Truncate.h: - Added missing specializations for Borland C++. - -Wed Aug 13 14:18:15 UTC 2008 Johnny Willemsen - - * m4/ace_defines.m4: - * m4/ace_functions.m4: - * m4/ace_headers.m4: - Reverted change below, doesn't work on suse 11.1 yet - -Wed Aug 13 13:22:15 UTC 2008 Johnny Willemsen - - * m4/ace_defines.m4: - * m4/ace_functions.m4: - * m4/ace_headers.m4: - Updated these files to work with autoconf 2.62. Thanks to - Philipp Thomas for these patches. These - are needed to use autoconf on OpenSuSE Factory (11.1 beta). - This fixes bugzilla 3396. - -Wed Aug 13 11:55:15 UTC 2008 Johnny Willemsen - - * ace/Truncate.h: - Added missing specializations for Borland C++. - -Wed Aug 13 11:44:15 UTC 2008 Johnny Willemsen - - * rpmbuild/ace-tao-ciao.txt: - Made several improvements to this new spec file. Thanks to - Philipp Thomas for assisting with this - -Tue Aug 12 19:45:16 UTC 2008 Jeff Parsons - - * ace/Time_Value.inl: - * examples/OS/Process/process.cpp: - * examples/Misc/test_dump.h: - * examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp: - * examples/ASX/Event_Server/Event_Server/Event_Analyzer.cpp: - * examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp: - * examples/ASX/Message_Queue/buffer_stream.cpp: - * examples/ASX/Message_Queue/bounded_buffer.cpp: - * examples/ASX/Message_Queue/priority_buffer.cpp: - * examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp: - * examples/ASX/UPIPE_Event_Server/Event_Analyzer.cpp: - * examples/ASX/UPIPE_Event_Server/event_server.cpp: - * examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp: - * examples/Web_Crawler/Iterators.cpp: - * examples/Web_Crawler/URL_Visitor.cpp: - * examples/Web_Crawler/Mem_Map_Stream.cpp: - * examples/Shared_Malloc/test_malloc.cpp: - * examples/QOS/Simple/Sender_QoS_Event_Handler.cpp: - * examples/APG/ThreadPools/TP_Reactor.cpp: - * examples/IPC_SAP/FILE_SAP/client.cpp: - * examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp: - * examples/IPC_SAP/SPIPE_SAP/NPClient.cpp: - * examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp: - * examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp: - * examples/IPC_SAP/SSL_SAP/SSL-client.cpp: - * examples/IPC_SAP/FIFO_SAP/FIFO-client.cpp: - * examples/Logger/client/logging_app.cpp: - * examples/Service_Configurator/IPC-tests/client/remote_stream_client_test.cpp: - * examples/Threads/thread_pool.cpp: - * examples/Threads/thread_specific.cpp: - * examples/Threads/task_four.cpp: - * examples/Reactor/Multicast/Log_Wrapper.cpp: - * examples/Reactor/WFMO_Reactor/Window_Messages.cpp: - * examples/Reactor/Proactor/test_cancel.cpp: - * examples/Reactor/Proactor/test_proactor.cpp: - * examples/Reactor/Misc/notification.cpp: - * examples/Connection/blocking/SPIPE-connector.cpp: - * examples/Mem_Map/file-reverse/file-reverse.cpp: - * examples/C++NPv1/Logging_Handler.cpp: - * examples/C++NPv1/Logging_Client.cpp: - * examples/C++NPv2/AC_Client_Logging_Daemon.cpp: - * examples/C++NPv2/Reactor_Logging_Server_Adapter.cpp: - * examples/C++NPv2/Client_Logging_Daemon.cpp: - * examples/C++NPv2/Service_Reporter.cpp: - * examples/C++NPv2/Logging_Handler.cpp: - - More truncation warning fixes. - -Tue Aug 12 18:15:08 UTC 2008 James H. Hill - - * docs/ace_guidelines.vsmacros: - - Update the macros file to ingore .xsd files. - - * docs/svn/config: - * docs/svn/svn-prefs.reg: - - Added .aspx files to the configuration preferences. - -Tue Aug 12 08:00:15 UTC 2008 Johnny Willemsen - - * ace/Thread_Manager.cpp: - Revert changes of bugzilla 3391, Thread_Pool_Test does fail - with the change - -Mon Aug 11 18:18:15 UTC 2008 Johnny Willemsen - - * tests/Log_Msg_Test.cpp: - Fixed unicode compile error - -Mon Aug 11 16:09:20 UTC 2008 Adam Mitz - - * bin/tao_orb_tests.lst: - - Exclude TAO/tests/Bug_3068_Regression from single-threaded builds. - -Mon Aug 11 13:49:00 UTC 2008 Simon Massey - - * tests/tests.mpc: - There were still some tests that produce test libraries that were - not updated when acelib was devorced from ace_output project. Such - tests need to either add the dependancy (to place their output in - the standard lib directory) or have "libout = ." to specify the - library to be placed locally in the test directory. - -Mon Aug 11 13:37:15 UTC 2008 Johnny Willemsen - - * ace/Thread_Manager.{h,cpp,inl}: - Make sure we don't miss any already terminated threads when doing - a join. Also made some code more readable, removed ancient AIX - workarounds. This fixes bugzilla 3391. Thanks to - for reporting this - - * ace/Containers_T.{h,cpp}: - Changed dont_remove to a bool - -Mon Aug 11 12:45:15 UTC 2008 Johnny Willemsen - - * ace/OS_NS_stdio.cpp: - Simplified some methods - -Mon Aug 11 08:56:15 UTC 2008 Johnny Willemsen - - * tests/Log_Msg_Test.cpp: - Extending testing of ACE_Log_Msg by enabling the format specifiers - tests and add a test for %T. Also removed the check for vsnprintf - to see that VxWorks 5.5.x still has a problem with buffer overflows. - In that case we have to fix that in ACE_Log_Msg. - - * ace/Log_Msg.cpp: - Fixed some buffer size calculations when ACE_TCHAR != char. Fixed - %T when wchar is used, thanks to Nathalie D'Amours - for reporting this. This fixes - bugzilla 3388 - - * ace/ACE.{h,cpp} (timestamp): - Use bool and sizes of buffers should have size_t as type - - * ace/MEM_Stream_Test.cpp: - Removed incorrect comment - -Mon Aug 11 07:36:15 UTC 2008 Johnny Willemsen - - * ace/Makefile.am: - Added missing header files. Thanks to haibin zhang - for reporting this - -Sun Aug 10 23:02:15 UTC 2008 Adam Mitz - - * ace/SSL/SSL_SOCK_Stream.inl (set_handle): - - Reverted back to the C-style cast that was there before Jeff's commit - because many compilers didn't like a reinterpret_cast here. - -Sat Aug 9 17:42:10 UTC 2008 Adam Mitz - - * ace/SSL/SSL_SOCK_Acceptor.cpp: - * ace/SSL/SSL_SOCK_Connector.cpp: - * ace/SSL/SSL_SOCK_Stream.inl: - * ace/SSL/SSL_SOCK_Stream.cpp: - * examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.inl: - - Fixed compile errors in inline=0 and Win32-ssl builds. - ACE_Utils::truncate_cast can't cast ACE_HANDLE to int on Win32. - -Fri Aug 8 20:35:37 UTC 2008 Adam Mitz - - * ace/Stack_Trace.cpp: - - Glibc implementation: fixed whitespace - VxWorks (both kernel and RTP): VxWorks can return -1 for the number - of arguments when the actual number is unknown. - -Fri Aug 8 19:33:42 UTC 2008 Jeff Parsons - - * ace/Message_Queue_T.cpp: - * ace/SSL/SSL_Asynch_BIO.cpp: - * ace/SSL/SSL_SOCK_Acceptor.cpp: - * ace/SSL/SSL_Context.cpp: - * ace/SSL/SSL_Asynch_Stream.cpp: - * ace/SSL/SSL_SOCK_Connector.cpp: - * ace/SSL/SSL_SOCK_Stream.cpp: - * ace/SSL/SSL_SOCK_Stream.inl: - * Kokyu/DSRT_Sched_Queue_T.cpp: - * Kokyu/Default_Dispatcher_Impl.cpp: - * ACEXML/common/Transcode.cpp: - * ACEXML/common/HttpCharStream.cpp: - * ACEXML/common/Mem_Map_Stream.cpp: - * examples/Monitor/MC_Test_Utilities.cpp: - * examples/Service_Configurator/IPC-tests/server/Handle_Timeout.inl: - * examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp: - * examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.inl: - * examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.inl: - * examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.inl: - - Fixes for VC 7.1 warnings, mostly truncation. - -Fri Aug 8 17:58:28 UTC 2008 J.T. Conklin - - * configure.ac: - - Changed the ACE_NEW_THROWS_EXCEPTION feature test to use - setrlimit() (on systems that have it) to reduce the RLIMIT_DATA - limit so the test, which continuously allocates memory in order - to observe the behavior of out-of-memory conditions, will "fail" - quickly without unnecessarily consuming a lot of system - resources. Fixes bugzilla #3090. - -Fri Aug 8 14:42:11 UTC 2008 Johnny Willemsen - - * bin/fuzz.pl: - Also check cpp/inl files for RefCountServantBase - -Fri Aug 8 08:36:11 UTC 2008 Johnny Willemsen - - * ace/Truncate.h: - Added missing specializations for Borland C++. - -Fri Aug 8 08:17:11 UTC 2008 Johnny Willemsen - - * ace/Makefile.am: - Added missing Svc_Conf_Token_Table.h which was already in the MPC - file. Thanks to haibin zhang - for reporting this - -Thu Aug 7 21:59:58 UTC 2008 Adam Mitz - - * bin/tao_orb_tests.lst: - - Added the new test TAO/tests/Bug_3068_Regression. - -Thu Aug 7 20:21:29 UTC 2008 Jeff Parsons - - * ace/Process_Manager.cpp: - * ace/Asynch_IO.cpp: - * ace/Pagefile_Memory_Pool.cpp: - * ace/MEM_IO.cpp: - * ace/Time_Value.inl: - * ace/SV_Semaphore_Simple.cpp: - * ace/Thread_Manager.cpp: - * ace/MEM_IO.inl: - * ace/ETCL/ETCL_Interpreter.cpp: - * ace/UPIPE_Stream.cpp: - * ace/SOCK_Dgram.cpp: - * ace/FILE_IO.cpp: - * ace/OS_NS_unistd.cpp: - * ace/FIFO_Recv_Msg.inl: - * ace/CDR_Size.cpp: - * ace/ACE.cpp: - * ace/CDR_Stream.cpp: - - Added usage of ACE_Utils::truncate_cast<> - to get rid of conversion warnings, mostly from size_t - to ssize_t. - -Thu Aug 7 18:02:11 UTC 2008 Johnny Willemsen - - * NEWS: - ACE/TAO/CIAO now supports CodeGear C++ Builder 2009 - -Thu Aug 7 15:28:13 UTC 2008 Jeff Parsons - - * ace/Monitor_Control/Makefile.am: - - Added source file Null_Network_Interface_Monitor.cpp that - was overlooked until now. - -Wed Aug 6 18:45:11 UTC 2008 Johnny Willemsen - - * ace/ace.mpc: - Added a few missing header files - -Wed Aug 6 18:17:32 UTC 2008 Jeff Parsons - - * protocols/ace/HTBP/HTBP_Channel.cpp: - * ace/SSL/SSL_Asynch_Stream.cpp: - * performance-tests/TCP/tcp_test.cpp: - * performance-tests/UDP/udp_test.cpp: - * tests/Upgradable_RW_Test.cpp: - * tests/ARGV_Test.cpp: - * tests/OrdMultiSet_Test.cpp: - * apps/JAWS/server/HTTP_Server.cpp: - * apps/soreduce/Obj_Module.cpp: - * apps/soreduce/Library.cpp: - * apps/soreduce/soreduce.cpp: - * apps/soreduce/SO_Group.cpp: - * websvcs/lib/URL_Addr.cpp: - * examples/OS/Process/imore.cpp: - * examples/Connection/blocking/SPIPE-connector.cpp: - * examples/C++NPv2/AC_Client_Logging_Daemon.cpp: - * examples/C++NPv2/Client_Logging_Daemon.cpp: - - Cosmetic changes to eliminate warnings from - some Linux compilers. - -Wed Aug 6 13:40:00 UTC 2008 Simon Massey - - * docs/bczar/bczar.html: - Updated the "Bugzilla" section to match the current version - of bugzilla's interface. - -Wed Aug 6 13:01:11 UTC 2008 Johnny Willemsen - - * ace/SOCK_CODgram.cpp: - Fixed gcc 4.3 warnings - -Wed Aug 6 08:49:11 UTC 2008 Johnny Willemsen - - * examples/Connection/blocking/SPIPE-connector.cpp: - * examples/OS/Process/imore.cpp: - Fixed gcc 4.3 warnings - -Wed Aug 6 08:45:11 UTC 2008 Johnny Willemsen - - * examples/C++NPv2/AC_Client_Logging_Daemon.cpp: - * examples/C++NPv2/Client_Logging_Daemon.cpp: - Fixed gcc 4.3 warnings - -Wed Aug 6 08:12:11 UTC 2008 Johnny Willemsen - - * configure.ac: - * m4/ace.m4: - Use more cached values, improved detection of tcl. Add bzip2 - support - -Wed Aug 6 08:01:11 UTC 2008 Johnny Willemsen - - * ACEXML/common/ZipCharStream.cpp: - Fixed compile error in some builds - - * ACEXML/parser/parser/Parser.cpp: - Check for the dtd file using a / and \ path specifier. This - makes it possible to also use a / on windows to specify - the path. This fixes bugzilla 3352 - - * ACEXML/common/FileCharStream.h: - Doxygen fix - - * ACEXML/common/FileCharStream.cpp: - No need to check for a valid pointer before calling delete - -Tue Aug 5 19:33:26 2008 Steve Huston - - * ace/Log_Msg.cpp: Fixed tab characters. - - * ace/config-posix.h: Only set ACE_HAS_POSIX_SEM_TIMEOUT if the - _POSIX_TIMEOUTS feature test is not -1 (disabled). Fixes build - on HP-UX 11iv3. - - * examples/APG/ThreadPools/LF_ThreadPool.cpp (elect_new_leader): Log - the "Resiging and Electing" message at LM_DEBUG severity, not - LM_ERROR. This is on APG page 342. Thanks to Julien Vintrou for - pointing this out. - - * THANKS: Added Julien Vintrou. - -Tue Aug 5 20:19:28 UTC 2008 Steve Huston - - * ace/config-linux-common.h: Removed ACE_HAS_BROKEN_THREAD_KEYFREE. - Reverts change from - Thu Aug 9 13:39:12 UTC 2007 Johnny Willemsen - which is no longer needed. - -Tue Aug 5 18:51:02 UTC 2008 Jeff Parsons - - * ace/MMAP_Memory_Pool.cpp: - * ace/Service_Manager.cpp: - * ace/Stream.cpp: - * Kokyu/Dispatcher_Task.cpp: - * apps/gperf/src/List_Node.cpp: - * apps/gperf/src/Key_List.cpp: - * apps/gperf/src/Gen_Perf.cpp: - * apps/gperf/src/Iterator.cpp: - * apps/gperf/src/Hash_Table.cpp: - * ACEXML/common/ZipCharStream.cpp: - * ACEXML/common/HttpCharStream.cpp: - * ACEXML/parser/parser/Parser.inl: - * ASNMP/asnmp/asn1.cpp: - * ASNMP/asnmp/address.cpp: - - Cosmetic changes to eliminate warnings on - Fedora Rawhide. - -Tue Aug 5 18:37:11 UTC 2008 Johnny Willemsen - - * rpmbuild/ace-tao-init-fedora.tar.bz2: - * rpmbuild/ace-tao-init-suse.tar.bz2: - Seperated distribution specific files in two bz2 archives, - the rpm spec file will use one of them - -Tue Aug 5 16:41:03 UTC 2008 Steve Huston - - * ace/Log_Msg.h: Changed key_created_ from int to bool. - - * ace/Log_Msg.cpp (close): Two changes related to Bugzilla 2980: - - Remove the #if ACE_HAS_BROKEN_THREAD_KEYFREE - the code inside - that block was what should always be done - delete the ACE_Log_Msg - instance and reset the TSS value to 0 so it's not cleaned up again - later when the thread runs down. The whole idea of the - ACE_HAS_BROKEN_THREAD_KEYFREE seems dubious and should probably be - removed, but I haven't gone that far - there's one more use in - OS_NS_Thread which seems pertinent for LynxOS and I can't test - it, so it's still there - but should be reviewed and probably - removed. - - Free the TSS key - if setting key_created_ to 0, what's the point - of leaving the key? Any future attempt to get the per-thread value - would result in a new key being created. Again, freeing the key - has no affect on already-allocated instances. - This should resolve Bugzilla 2980 again. - -Tue Aug 5 14:33:11 UTC 2008 Johnny Willemsen - - * rpmbuild/ace-tao-ciao.txt: - Spec file that is work in progress. Didn't use spec as extension - because that gives problems with rpmbuild. - -Tue Aug 5 13:52:11 UTC 2008 Johnny Willemsen - - * ace/Guard_T.h: - * ace/Guard_T.inl: - * ace/TSS_T.cpp: - Changed block to a bool - - * ace/Guard_T.h: - Initialise owner_ to solve gcc 4.3 warnings - -Tue Aug 05 10:15:00 UTC 2008 Simon Massey - - * tests/Reactor_Remove_Resume_Test_Dev_Poll.cpp: - - I don't know why removing "TP_Reactor.h" stopped ACE.h from - being included; but is seems it was incidently included in - the previous (non-Dev_Poll) test. - -Tue Aug 5 08:02:11 UTC 2008 Johnny Willemsen - - * ACEXML/common/HttpCharStream.cpp: - Fixed gcc4.3 warning - -Tue Aug 5 07:53:11 UTC 2008 Johnny Willemsen - - * tests/Message_Queue_Test.cpp: - * tests/Message_Queue_Test_Ex.cpp: - Fixed gcc4.3 warning - -Tue Aug 5 07:11:11 UTC 2008 Johnny Willemsen - - * examples/IPC_SAP/SOCK_SAP/run_test - * examples/IPC_SAP/SOCK_SAP/summarize - * examples/IPC_SAP/SSL_SAP/summarize - * examples/IPC_SAP/SOCK_SAP/run_test.sh - * examples/IPC_SAP/SOCK_SAP/summarize.pl - * examples/IPC_SAP/SSL_SAP/summarize.pl - Renamed files to have an extension that matches the type of file - -Tue Aug 5 06:45:11 UTC 2008 Johnny Willemsen - - * bin/add_rel_link.sh: - Added missing path - -Mon Aug 4 19:58:20 UTC 2008 Steve Huston - - * ace/Process.cpp (inherit_environment): Re using Unicode from - Thu Jul 31 15:10:16 UTC 2008 Adam Mitz - only do it for systems that have ACE_HAS_WCHAR. Fixes a LabVIEW - Pharlap ETS build issue. - -Mon Aug 04 13:08:00 UTC 2008 Simon Massey - - * tests/Reactor_Remove_Resume_Test.cpp: - * tests/Reactor_Remove_Resume_Test_Dev_Poll.cpp: - * tests/run_test.lst: - * tests/tests.mpc: - - Split out the ACE_Dev_Poll_Reactor part of this test since - this is excersing a known problem with ACE_Dev_Poll_Reactor - (see Bugzilla 3178). - -Mon Aug 4 07:20:12 UTC 2008 Johnny Willemsen - - * ace/config-g++-common.h: - * ace/config-macros.h: - Moved definition of ACE_UNUSED_ARG for GC back to config-macros.h else - it isn't available when doing an autoconf build - -Fri Aug 1 10:59:55 UTC 2008 Adam Mitz - - * tests/Process_Env_Test.cpp: - - #ifdef-out the helper functions in the cases where the body of - run_main is also #ifdef'ed-out. - -Thu Jul 31 15:10:16 UTC 2008 Adam Mitz - - * ace/Process.cpp (inherit_environment): - - When "use_unicode_environment" is in effect, use the unicode env - block (GetEnvironmentStringsW) when copying the current environment - in order to inherit it (Win32 only). - - * tests/Process_Env_Test.cpp: - - Extended this test to verify that a large environment block is indeed - inherited by the spawned process. - -Thu Jul 31 13:16:00 UTC 2008 Simon Massey - - * bin/tao_orb_tests.lst: - - The QUICK test alternatives should have the same configs as - their non-quick alternative tests. This has been playing havok - with !Win32 tests on windows platforms that are using QUICK. - -Thu Jul 31 12:35:00 UTC 2008 Simon Massey - - * tests/run_test.lst: - * tests/tests.mpc: - * tests/Refcounted_Event_Handler_Test_DevPoll.cpp: - * tests/Reference_Counted_Event_Handler_Test_Dev_Poll.cpp: - - Test renamed (has to be less than 38 characters). - -Thu Jul 31 10:25:12 UTC 2008 Johnny Willemsen - - * ace/config-g++-common.h: - Use a different ACE_UNUSED_ARG macro for GCC 4.2 and newer. Moved - also the definition for gcc to this file instead of config-macros.h. - Thanks to Jules Colding , Jonathan Brannan - , and Ken Sedgwick - for providing the patches. This fixes bugzilla 3270 - - * ace/config-macros.h: - Don't define ACE_UNUSED_ARG for GCC - - * rpmbuild/ace-tao.spec: - Removed unused arg patch - - * rpmbuild/ace-tao-unusedarg.patch: - Removed, not needed anymore - -Thu Jul 31 10:20:00 UTC 2008 Simon Massey - - * tests/Reactor_Dispatch_Order_Test_Dev_Poll.cpp: - - To avoid warnings on platforms where: - #if defined (ACE_HAS_DEV_POLL) || defined (ACE_HAS_EVENT_POLL) - is false, this test has now been fully guarded and an alternate - main provided. - - * tests/Reference_Counted_Event_Handler_Test_Dev_Poll.cpp: - * tests/run_test.lst: - * tests/tests.mpc: - - Since the collated test scores are actually grouping both runs - of the original test together (they ignore parameters apparently), - a newly named test was needed. - -Thu Jul 31 10:05:12 UTC 2008 Johnny Willemsen - - * ace/config-macros.h: - Only define ACE_UNUSED_ARG when it is not defined yet. Makes it - easier to test how to resolve warnings with gcc 4.3 - -Wed Jul 30 14:03:12 UTC 2008 Johnny Willemsen - - * include/makeinclude/platform_vxworks6.2.GNU: - * include/makeinclude/platform_vxworks6.3.GNU: - Also convert slashes in HOST_ROOT - -Wed Jul 30 09:55:00 UTC 2008 Simon Massey - - * tests/tests.mpc: - - Missed adding the new Reactor_Dispatch_Order_Test_Dev_Poll - entry. - -Tue Jul 29 22:23:08 UTC 2008 J.T. Conklin - - * m4/ace.m4: - - Add ACE_PATH_BZIP2 feature test, sets ACE_BZIP2_CPPFLAGS, - ACE_BZIP2_LDFLAGS, and ACE_BZIP2_LIBS as needed when - --with-bzip2 is specified on the command line. - -Tue Jul 29 21:33:14 UTC 2008 J.T. Conklin - - * bin/MakeProjectCreator/config/automake.features: - - Add bzip2=1 - -Tue Jul 29 21:29:43 UTC 2008 J.T. Conklin - - * bin/MakeProjectCreator/config/ace_bzip2.mpb: - - New file, overrides definitions from MPC's bzip2.mpb for - automake build. - -Tue Jul 29 19:58:22 UTC 2008 Adam Mitz - - * bin/tao_orb_tests.lst: - - Reverted Tue Jul 29 14:21:32 UTC 2008 Adam Mitz - because the bug should now be fixed in TAO. - -Tue Jul 29 18:11:32 UTC 2008 Johnny Willemsen - - * bin/tao_orb_tests.lst: - TAO/tests/Bug_3000_Regression fails because that issue remains - unresolved, added !FIXED_BUGS_ONLY. - -Tue Jul 29 14:21:32 UTC 2008 Adam Mitz - - * bin/tao_orb_tests.lst: - - TAO/tests/Bug_3163_Regression fails because that issue remains - unresolved, added !FIXED_BUGS_ONLY. - -Tue Jul 29 12:45:00 UTC 2008 Simon Massey - - * tests/run_test.lst: - * tests/Reference_Counted_Event_Handler_Test.cpp: - - Corrected the disabling of ACE_Dev_Poll_Reactor test and split - the test into two runs once with this reactor test disabled - and once with just this reactor test enabled (marked with - !FIXED_BUGS_ONLY) due to internal problems with - ACE_Dev_Poll_Reactor. - -Tue Jul 29 12:14:00 UTC 2008 Simon Massey - - * tests/run_test.lst: - * tests/Reactor_Dispatch_Order_Test.cpp: - * tests/Reactor_Dispatch_Order_Test_Dev_Poll.cpp: - - These tests now actually return a failure if the test failed - instead of always returning 0. I have also split out the - problematic part of this test re-enabled by: - Wed Jul 9 19:07:24 2008 Steve Huston which itself reversed: - Sat Mar 29 08:16:57 UTC 2008 Johnny Willemsen that originally - disabled testing for ACE_Dev_Poll_Reactor due to internal - problems with ACE_Dev_Poll_Reactor. - -Mon Jul 28 13:39:13 2008 Johnny Willemsen - - * ace/config-macros.h: - * ace/streams.h: - Removed workarounds for ancient Borland C++ versions - -Mon Jul 28 13:32:13 2008 Johnny Willemsen - - * ace/Asynch_Acceptor.cpp: - * ace/WIN32_Asynch_IO.cpp: - Removed compiler checks - - * ace/OS_NS_stdio.cpp: - Don't check for Borland C++ but for ACE_HAS_NONCONST_FDOPEN - - * ace/OS_NS_stdio.inl: - Removed workaround for Borland C++ - -Mon Jul 28 13:10:13 2008 Johnny Willemsen - - * ace/Global_Macros.h: - Removed obsolete workaround for Borland C++ - -Mon Jul 28 13:03:13 2008 Johnny Willemsen - - * ace/ace_wchar.h: - Removed obsolete workaround for Borland C++ - -Mon Jul 28 11:52:13 2008 Johnny Willemsen - - * ace/Registry.cpp: - Don't declare a static object within a method because that - could lead to race conditions in a multi threaded program - - * ace/ace_qt4reactor.mpc: - Fixed bug in this file - -Mon Jul 28 11:40:13 2008 Johnny Willemsen - - * ace/ETCL/ETCL_Interpreter.h: - Doxygen fixes and made destructor virtual, this is a base class - - * ace/INET_Addr.cpp: - Const change - -Fri Jul 25 14:21:13 2008 Johnny Willemsen - - * ace/ace_qtreactor.mpc: - * ace/ace_qt3reactor.mpc: - Renamed qt to qt3, this builds and links the qtreactor - with qt3 - - * ace/ace_qt4reactor.mpc: - New project for qt4 - - You can set qt=1 and qt3=1 together or set qt4=1, but not - both at the same time. Thanks to Kees van Marle - for testing qt4 - -Fri Jul 25 14:13:13 2008 Johnny Willemsen - - * ace/QtReactor/QtReactor.cpp: - * ace/QtReactor/QtReactor.h: - Improved qt4 support - -Fri Jul 25 14:09:13 2008 Johnny Willemsen - - * bin/MakeProjectCreator/config/ace_qt3.mpb - * bin/MakeProjectCreator/config/ace_qt4.mpb - * bin/MakeProjectCreator/config/global.features: - Set qt3 and qt4 default to 0. qt4 has different libs - that we need to link with but also the qglobal.h is - located on a different location, so added ACE_HAS_QT4 - which is then used to select which qglobal.h we include. - - * bin/MakeProjectCreator/config/ace_qtreactor.mpb: - This is for qt3 so derive from ace_qt3 - -Thu Jul 24 19:04:13 2008 Steve Huston - - * ace/Containers_T.h: Improved documentation for ACE_DLList, noting - especially that T pointers inserted into the list are not deleted - when removed. Thank you to Bob Fiske for this improvement and sample - code to illustrate. - - * THANKS: Added Bob Fiske. - -Thu Jul 24 12:50:00 UTC 2008 Simon Massey - - * bin/diff-builds-and-group-fixed-tests-only.sh: - This shell script runs the perl diff-builds.pl script between - the date given as the first parameter and the current utc date. - The output is tidied up and any !FIXED_BUGS_ONLY bugs are - removed before being grouped and the failed tests counted. - -Thu Jul 24 08:10:00 UTC 2008 Simon Massey - - * bin/tao_orb_tests.lst: - * bin/tao_other_tests.lst: - Added config item !FIXED_BUGS_ONLY to tests that highlight - problems that have not yet been fixed. Please remove this - config item once the bugs have actually been fixed, and - include this config item with any newly added tests in the - future that fall into this category. - -Wed Jul 23 13:30:28 UTC 2008 Simon Massey - - * bin/PerlACE/Process_Win32.pm: - Allow named .bat files for windows. - -Wed Jul 23 13:08:28 UTC 2008 Johnny Willemsen - - * bin/generate_doxygen.pl: - * etc/tao_ziop.doxygen: - * html/index.html: - Added TAO ZIOP to the documentation - -Wed Jul 23 10:51:28 UTC 2008 Johnny Willemsen - - * ace/Select_Reactor_Base.h: - Doxygen change - - * ace/Select_Reactor_T.cpp: - * ace/Select_Reactor_T.h: - * ace/TP_Reactor.cpp: - * ace/TP_Reactor.h: - mask_signals should be a bool like in the base class - -Wed Jul 23 08:11:28 UTC 2008 Johnny Willemsen - - * ace/SOCK_Dgram_Mcast.cpp: - Use reentrant get_host_addr. This fixes bugzilla 3368. Thanks to - Yongming Wang for reporting this - -Tue Jul 22 15:02:00 UTC 2008 Simon Massey - - * bin/group_test_stats.sh: - Reverse and sort numerically so that highest number of - failures are listed first. - -Tue Jul 22 13:09:28 UTC 2008 Johnny Willemsen - - * bin/tao_orb_tests.lst: - Added ZIOP test - -Tue Jul 22 11:52:28 UTC 2008 Johnny Willemsen - - * bin/make_release.py: - Don't convert line ending for pdf files - -Tue Jul 22 09:55:28 UTC 2008 Johnny Willemsen - - * bin/MakeProjectCreator/config/global.features: - bzip2 is default disabled - -Tue Jul 22 07:36:28 UTC 2008 Johnny Willemsen - - * ace/CDR_Stream.{h,cpp,inl}: - Added setting for alignment which is needed for ZIOP where we want - to place back the wr_ptr to a previous location. Few const and layout - changes - -Mon Jul 21 13:09:28 UTC 2008 Johnny Willemsen - - * bin/tao_other_tests.lst: - Run nslist tests under vxworks - -Sat Jul 19 19:58:54 UTC 2008 Johnny Willemsen - - * ace/config-macosx-tiger.h: - Make sure we set the correct ACE_SIZEOF_LONG_DOUBLE value. Thanks - to Frank Förster for reporting this - -Thu Jul 17 20:24:11 UTC 2008 Steve Huston - - * ace/OS_NS_sys_socket.inl (recvfrom): For Pharlap ETS, correct for - a situation where recvfrom() returns a good address but an - unexpectedly short length. - -Tue Jul 15 17:29:22 UTC 2008 Jeff Parsons - - * examples/Monitor/Bytes_Sent/bytes_sent.cpp: - * examples/Monitor/Message_Queue_Size/message_queue_size.cpp: - * examples/Monitor/Constraint/constraint.cpp: - * examples/Monitor/CPU_Load/cpu_load.cpp: - * examples/Monitor/Num_Threads/num_threads.cpp: - * examples/Monitor/Group/group.cpp: - * examples/Monitor/Memory_Usage/memory_usage.cpp: - - Changes corresponding to the relocation in - - Tue Jul 15 17:19:14 UTC 2008 Jeff Parsons - -Tue Jul 15 17:19:14 UTC 2008 Jeff Parsons - - * ace/Monitor_Size.cpp: - * ace/Monitor_Control_Types.cpp: - * ace/Monitor_Control_Types.h: - * ace/Monitor_Base.cpp: - * ace/Monitor_Base.h: - * ace/Monitor_Base.inl: - * ace/Monitor_Control/Bytes_Received_Monitor.cpp: - * ace/Monitor_Control/Packets_Received_Monitor.cpp: - * ace/Monitor_Control/CPU_Load_Monitor.cpp: - * ace/Monitor_Control/Monitor_Group.cpp: - * ace/Monitor_Control/Memory_Usage_Monitor.cpp: - * ace/Monitor_Control/Monitor_Query.cpp: - * ace/Monitor_Control/Num_Threads_Monitor.cpp: - * ace/Monitor_Control/Bytes_Sent_Monitor.cpp: - * ace/Monitor_Control/Packets_Sent_Monitor.cpp: - - Relocated the statistics-related values from - Monitor_Base to Monitor_Control_Types. Also - inlined the information type accessor, the - constraint list accessor and the refcounting - methods. - -Tue Jul 15 01:27:54 UTC 2008 Johnny Willemsen - - * ace/config-win32-common.h: - Added pragma comment for iphlpapi.lib. Thanks to Yongming Wang - for reporting this - -Mon Jul 14 12:50:34 UTC 2008 Chad Elliott - - * NEWS: - - Added an entry for my change from Mon Jun 30 12:41:00 UTC 2008. - -Mon Jul 14 12:05:00 UTC 2008 Simon Massey - - * ace/Message_Queue_T.cpp: - - Correct void function dump returns from previous commit of: - Fri Jul 11 08:06:40 UTC 2008 James H. Hill - -Sat Jul 12 12:59:19 UTC 2008 Johnny Willemsen - - * ace/config-borland-common.h: - Removed BCB4 support - - * ace/ACE.cpp: - Const/layout changes - - * ace/Configuration.h: - Doxygen changes - - * ace/Monitor_Base.cpp (retrieve_and_clear): - Use clear_i to prevent deadlocks - - * ace/SOCK_IO.cpp: - Const changes - - * ace/Strategies_T.cpp: - layout changes - -Fri Jul 11 23:48:19 UTC 2008 Johnny Willemsen - - * bin/make_release.py: - Don't exclude the mwc files for vc8. Thanks to Michael Guntli - for reporting - this. This fixes bugzilla 3364 - -Fri Jul 11 14:41:19 UTC 2008 James H. Hill - - * NEWS: - - Updated the NEW file to reflect previous ChangeLog entry. - -Fri Jul 11 08:06:40 UTC 2008 James H. Hill - - * ace/Message_Queue_T.h: - * ace/Message_Queue_T.cpp: - - Implemented the iterator and reverse iterator for the - ACE_Message_Queue_Ex class. - -Wed Jul 9 21:20:13 UTC 2008 Ken Sedgwick - - * rpmbuild/README: - Added basic rpmbuild instructions. - -Wed Jul 9 19:07:24 2008 Steve Huston - - * tests/Reactor_Dispatch_Order_Test.cpp: Reversed this change: - Sat Mar 29 08:16:57 UTC 2008 Johnny Willemsen - which disabled testing for ACE_Dev_Poll_Reactor. Let's see what the - issues are then address and/or disable as needed. - Also fixed a cut/paste error. - -Wed Jul 9 18:37:57 2008 Steve Huston - - * tests/Reference_Counted_Event_Handler_Test.cpp: Enabled test for - Winsock 2 systems; previously only ran the ACE_WFMO_Reactor-based - test for non-Winsock 2 systems, where it is not supported. - -Wed Jul 9 17:45:40 UTC 2008 J.T. Conklin - - * m4/config_h.m4: - - Remove autoheader template for ACE_HAS_NON_BLOCKING_CONNECTS. - - * tests/MT_SOCK_Test.cpp: - - Remove use of ACE_HAS_NON_BLOCKING_CONNECTS feature test macro. - It was removed since ACE no longer supports any systems that - required it. - -Wed Jul 9 16:09:30 UTC 2008 J.T. Conklin - - * m4/config_h.m4: - * configure.ac: - - Remove feature test and autoheader template for - ACE_LACKS_WILDCARD_BIND. - - * ace/Sock_Connect.cpp: - - Remove use of ACE_LACKS_WILDCARD_BIND feature test macro. - - * ace/README: - - Remove ACE_LACKS_WILDCARD_BIND from the list of feature test - macros. It was removed since ACE no longer supports any systems - that required it. - -Wed Jul 9 16:02:32 UTC 2008 J.T. Conklin - - * configure.ac: - - Changed ACE_HAS_SIGVAL_SIGVAL_INT and ACE_HAS_SIGVAL_SIGVAL_PTR - feature tests to use "union sigval" instead of "sigval_t". The - former is what ACE uses; while the latter is a common extension, - it is not in the XPG3 specification. Thanks to Olli Savia. - -Wed Jul 9 14:23:00 UTC 2008 J.T. Conklin - - * ace/README: - - Remove ACE_HAS_TEMPLATE_SPECIALIZATION from list of feature - test macros. - -Wed Jul 9 14:18:26 UTC 2008 J.T. Conklin - - * m4/config_h.m4: - * configure.ac: - - Remove feature test and autoheader template for - ACE_HAS_DLFCN_H_BROKEN_EXTERN_C. - - * ace/os_include/os_dlfcn.h: - - Remove use of ACE_HAS_DLFCN_H_BROKEN_EXTERN_C feature test - macro. - - * ace/README: - - Remove ACE_HAS_DLFCN_H_BROKEN_EXTERN_C from the list of feature - test macros. It was removed since ACE no longer supports any - systems that required it. - -Wed Jul 9 09:20:03 UTC 2008 Olli Savia - - * ace/TTY_IO.h: - * ace/TTY_IO.cpp: - Removed deprecated 'parityenb' member from ACE_TTY_IO::Serial_Params - structure. - - * NEWS: - Added a note about change above. - -Tue Jul 8 21:53:31 UTC 2008 Douglas C. Schmidt - - * ace/Service_Manager.cpp (process_request): Ensure that requests - are processed using the global context, rather than the current - one. Thanks to Michael Doubez for suggesting this fix. - -Tue Jul 8 16:44:24 UTC 2008 J.T. Conklin - - * m4/config_h.m4: - - Remove autoheader template for ACE_HAS_BROKEN_HPUX_TEMPLATES. - - * netsvcs/lib/Server_Logging_Handler_T.cpp: - * netsvcs/lib/Server_Logging_Handler_T.h: - - Remove use of ACE_HAS_BROKEN_HPUX_TEMPLATES feature test macro. - - * ace/README: - - Remove ACE_HAS_BROKEN_HPUX_TEMPLATES from the list of feature - test macros. It was removed since ACE no longer supports any - systems that required it. - -Tue Jul 8 16:41:26 2008 Steve Huston - - * ace/WIN32_Asynch_IO.cpp (ACE_WIN32_Asynch_Write_Stream::write): For - Winsock 2-capable platforms, use WSASend() instead of WriteFile(). - The former performs an order of magnitude faster. Thanks to - Namrata Gandhi for running the Win32 native performance tests. - -Tue Jul 8 16:35:57 UTC 2008 J.T. Conklin - - * m4/config_h.m4: - * configure.ac: - - Remove feature test and autoheader template for - ACE_NEEDS_REGEXPR_H. It is no longer used by ACE. - - * ace/config-unixware-7.1.0.h: - * ace/config-unixware-7.1.0.udk.h: - - Remove the ACE_NEEDS_REGEXPR_H feature test macro definition. - It is no longer used by ACE. - -Tue Jul 8 16:06:46 UTC 2008 J.T. Conklin - - * NEWS: - - Document new --enable-rcsid option for autoconf build. - - * m4/ace.m4: - * m4/config_h.m4: - * m4/platform.m4: - - Add support of a new --enable-rcsid option for the autoconf - build. Previously, compiling RCS IDs into object files was - tightly coupled with the --enable-debug option and was always - disabled for certain operating systems. A separate option allows - the user to select this behavior independently. - -Tue Jul 8 14:41:08 2008 Steve Huston - - * tests/Reference_Counted_Event_Handler_Test.cpp: Fixed test cases - that I accidentally reversed in - Fri Jul 4 20:11:02 UTC 2008 Steve Huston - -Tue Jul 08 06:44:09 MST 2008 Trevor Fields - - * bin/PerlACE/Run_Test.pm: - - Added waitforfileoutput and waitforfileoutput_timed - methods that wait for output to appear in a file. - -Sun Jul 6 19:47:27 UTC 2008 Ken Sedgwick - - * rpmbuild/ace-tao.spec: - Added idl and pidl include files to tao-devel package. - -Sun Jul 6 18:28:58 UTC 2008 Ken Sedgwick - - * rpmbuild/ace-tao.spec: - * rpmbuild/ace-tao-orbsvcs-daemon.patch: - * rpmbuild/ace-tao-config.patch: - Updated for latest DOC Group release (x.6.6). - Tracked libACE_Monitor_Control name change. - Fixed broken patches. - -Fri Jul 4 20:11:02 UTC 2008 Steve Huston - - * ace/config-macros.h: Don't set ACE_HAS_PROCESS_SPAWN for - ACE_HAS_PHARLAP - there's only one process available. - - * ace/Recursive_Thread_Mutex.cpp (get_nesting_level): Add Pharlap ETS - to those platforms without access to the recursion count on a - recursive mutex. - - * tests/run_test.lst: Disable Sendfile_Test on LABVIEW_RT - it lacks - sendfile support. - - * tests/Reference_Counted_Event_Handler_Test.cpp: Replaced ACE_ASSERT - with ACE_ERROR; surrounded naked strings with ACE_TEXT; added a test - option for using ACE_Dev_Poll_Reactor where available. - - * tests/Service_Config_Test.cpp: Replaced ACE_ASSERT with ACE_ERROR. - - * tests/Thread_Pool_Reactor_Resume_Test.cpp: - * tests/Thread_Pool_Reactor_Test.cpp: Add ACE_HAS_PHARLAP to those - platforms that need to scale back the max number of connections - due to limited capacity. - -Thu Jul 3 21:42:54 UTC 2008 J.T. Conklin - - * configure.ac: - - Changed the feature test used for the existance of the sigval_t - type not to define ACE_LACKS_SIGVAL_T if it does not exist. - - However, it is still needed to set the ac_cv_type_sigval_t shell - variable, which is used to decide whether to perform the - ACE_HAS_SIGVAL_SIGVAL_INT and ACE_HAS_SIGVAL_SIGVAL_PTR feature - tests. - - This fixes (the newly reopened) bugzilla #2794. Thanks to Olli - Savi for suggesting taking another look. - -Thu Jul 3 16:38:35 UTC 2008 Chad Elliott - - * bin/MakeProjectCreator/templates/gnu.mpd: - - Added the use of 'postclean' to be used during the realclean - target. - -Wed Jul 2 18:30:15 UTC 2008 Jeff Parsons - - * ace/Monitor_Base.cpp (clear_i): - - Added resize of string array (if applicable) to 0. - - * ace/Monitor_Control/CPU_Load_Monitor.h: - * ace/Monitor_Control/Bytes_Received_Monitor.cpp: - * ace/Monitor_Control/Packets_Received_Monitor.cpp: - * ace/Monitor_Control/Memory_Usage_Monitor.h: - * ace/Monitor_Control/Num_Threads_Monitor.h: - * ace/Monitor_Control/CPU_Load_Monitor.cpp: - * ace/Monitor_Control/Memory_Usage_Monitor.cpp: - * ace/Monitor_Control/Num_Threads_Monitor.cpp: - * ace/Monitor_Control/Bytes_Sent_Monitor.cpp: - * ace/Monitor_Control/Packets_Sent_Monitor.cpp: - - Finished implementation of clear_i() method for all - platforms. - -Wed Jul 2 12:45:53 UTC 2008 Douglas C. Schmidt - - * Updated the COPYING file to make it consistent with what's on the website. - -Wed Jul 02 12:30:00 UTC 2008 Simon Massey - - * ace/Monitor_Control/Solaris_Network_Interface_Monitor.cpp: - - ACE_TEXT () and ACE_TEXT_ALWAYS_CHAR () required here. - -Wed Jul 02 12:05:00 UTC 2008 Simon Massey - - * ace/Framework_Component.cpp: - - Annoying text constant problem in a build. No need for ACE_TEXT() - here. - -Wed Jul 2 11:51:03 UTC 2008 Chad Elliott - - * tests/Makefile.am: - - Added the Process_Env_Test. - -Wed Jul 02 11:40:00 UTC 2008 Simon Massey - - * tests/Process_Env_Test.cpp: - - Annoyingly the ACE_RCSID() macro provides it's own ; - This fixes the "Process_Env_Test.cpp:23: error: extra ';'" error. - -Tue Jul 1 22:47:17 UTC 2008 Steve Huston - - * ace/Process.{h cpp}: Can't define or use the new convert_env_buffer() - method unless ACE_HAS_WCHAR is defined. This extra check is needed - for LabVIEW RT / Pharlap ETS because it purports to be Win32 but - does not have wide-char support. - -Tue Jul 1 14:20:00 UTC 2008 Simon Massey - - * bin/PythonACE/fuzz/check_no_tabs.py: - - Attempt to provide tabs check. - -Tue Jul 1 12:29:34 UTC 2008 Jeff Parsons - - * ace/Monitor_Control/Bytes_Received_Monitor.cpp: - * ace/Monitor_Control/Packets_Received_Monitor.cpp: - * ace/Monitor_Control/Bytes_Sent_Monitor.cpp: - * ace/Monitor_Control/Packets_Sent_Monitor.cpp: - - Cosmetic changes. - -Mon Jun 30 16:50:05 UTC 2008 Chad Elliott - - * ace/Process.h: - - Fixed a misplaced bit of code. - -Mon Jun 30 12:41:00 UTC 2008 Chad Elliott - - * ace/Process.h: - * ace/Process.cpp: - - Added an option to ACE_Process_Options to use a wchar_t environment - buffer instead of char. This is useful only on Windows with - ACE_USES_WCHAR undefined. The benefit of using a wchar_t - environment buffer is that it is not limited to 32kb as a char - environment buffer is. - - In ACE_Process::spawn(), convert the char environment buffer to a - wchar_t environment buffer if specified to do so in the process - options. - - * tests/Process_Env_Test.cpp: - * tests/run_test.lst: - * tests/tests.mpc: - - Added a test for the above feature. - -Fri Jun 27 18:04:52 UTC 2008 Steve Huston - - * include/makeinclude/rules.local.GNU: Removed the first setting of - CLEANUP_OBJS by itself - it was a duplicate of what's done in - CLEANUP_BIN's case, but with possibly an incorrect objext. Prevents - a main executable's object file from being deleted twice and ensures - only valid object file extension is used. Thanks to Howard Finer - for pointing this out. - -Fri Jun 27 16:08:27 UTC 2008 Steve Huston - - * include/makeinclude/rules.local.GNU: Add $(VOBJS) to CLEANUP_OBJS to - be sure all objects that go into a binary are cleaned up. - -Fri Jun 27 15:35:58 UTC 2008 J.T. Conklin - - * bin/MakeProjectCreator/modules/AutomakeWorkspaceHelper.pm: - - Changed TAO_IDLFLAGS to Rename executable from gperf to - ace_gperf. - -Fri Jun 27 14:58:17 UTC 2008 Jeff Parsons - - * ace/Monitor_Control/Solaris_Network_Interface_Monitor.h: - - Changed ACE_CString member to ACE_TString, to accommodate - wchar builds. - -Thu Jun 26 20:41:20 UTC 2008 J.T. Conklin - - * ace/Profile_Timer.cpp: - - Explictly #include "ace/OS_NS_fcntl.h" and "ace/OS_NS_unistd.h" - if ACE_HAS_PRUSAGE_T is defined. These headers are implicitly - #included with inline builds, but are required for builds - where inline has been disabled. - -Thu Jun 26 13:13:16 UTC 2008 Jeff Parsons - - * ace/Monitor_Control_Types.h: - * ace/Monitor_Base.cpp: - * ace/Monitor_Base.h: - * ace/Monitor_Control/Monitor_Group.h: - * ace/Monitor_Control/Monitor_Group.cpp: - - Restored support for string data type in - monitor storage, by moving data types, - members and methods from their original - location in an earlier version of the - Notification Service monitor classes, - to the appropriate locations in ACE. - -Thu Jun 26 02:45:21 UTC 2008 Phil Mesnier - - * THANKS: added Ittehad Shaikh - -Wed Jun 25 15:05:29 UTC 2008 J.T. Conklin - - * apps/gperf/src/Makefile.am: - - Rename executable from gperf to ace_gperf. - -Wed Jun 25 14:59:13 UTC 2008 J.T. Conklin - - * apps/gperf/tests/Makefile.am: - - Re-tabify. - -Wed Jun 25 14:09:52 UTC 2008 Johnny Willemsen - - * rpmbuild/ace-tao-config.patch - Removed ACE_GPERF - - * rpmbuild/ace-tao.spec: - Document changes - - * rpmbuild/ace-tao-gperf-info.patch: - Removed, not needed anymore - -Wed Jun 25 13:29:13 UTC 2008 J.T. Conklin - - * m4/config_h.m4: - * configure.ac: - - Remove feature test and autoheader template for - ACE_HAS_BROKEN_NETBSD_MSYNC. - - * ace/OS_NS_sys_mman.inl: - - Remove the use of the ACE_HAS_BROKEN_NETBSD_MSYNC feature test - macro. It was removed since ACE no longer supports the systems - that required it. - -Wed Jun 25 11:23:00 UTC 2008 Simon Massey - - * ace/Monitor_Control/Bytes_Received_Monitor.cpp: - - Tue Jun 24 11:46:41 UTC 2008 Jeff Parsons committed - Miss-cased ACE_TEXT. - -Wed Jun 25 10:00:00 UTC 2008 Simon Massey - - * bin/fuzz.pl: - - Enhance ACE_TMAIN and ORB_init checks for /* .. */ comments. - -Wed Jun 25 06:58:52 UTC 2008 Johnny Willemsen - - * apps/gperf/gperf.1: - * apps/gperf/gperf.info: - * apps/gperf/gperf.mpc: - * apps/gperf/gperf.texi: - * apps/gperf/ace_gperf.1: - * apps/gperf/ace_gperf.info: - * apps/gperf/ace_gperf.mpc: - * apps/gperf/ace_gperf.texi: - * apps/gperf/gperf/src/gperf.mpc: - * apps/gperf/gperf/tests/gperf_test.mpb: - * apps/gperf/gperf/tests/Makefile.am: - Renamed gperf to ace_gperf to make sure we always get the gperf - from ace, fedora also has a regular gperf package - - * include/makeinclude/platform_vxworks5.5.x.GNU: - * include/makeinclude/platform_vxworks6.2.GNU: - * include/makeinclude/platform_vxworks6.3.GNU: - Updated for gperf rename - - * rpmbuild/ace-tao.spec: - Removed gperf rename which only was done in the rpm package. - This fixes bugzilla 3342 - -Wed Jun 25 05:59:52 UTC 2008 J.T. Conklin - - * include/makeinclude/platform_netbsd.GNU: - - Conditionally set no_hidden_visibility to 1. - -Tue Jun 24 13:52:00 UTC 2008 Simon Massey - - * tests/Bug_2980_Regression_Test.cpp: - * tests/tests.mpc: - - Remove ACE_TMAIN from this test and stop it building on - wide systems (as per original test). The test can not use - ace directly. - -Tue Jun 24 13:30:31 2008 Steve Huston - - * ace/CDR_Stream.h: For ACE_OutputCDR, note that attempting to set a - specific byte order requires ACE_ENABLE_SWAP_ON_WRITE to have any - affect. Thanks to Howard Finer for pointing this out. - -Tue Jun 24 11:46:41 UTC 2008 Jeff Parsons - - * ace/Monitor_Control/Bytes_Received_Monitor.cpp: - * ace/Monitor_Control/Packets_Received_Monitor.cpp: - * ace/Monitor_Control/Bytes_Sent_Monitor.cpp: - * ace/Monitor_Control/Packets_Sent_Monitor.cpp: - - For Solaris and *BSD WChar builds, ACE_TEXT-ified the argument - in the call to the platform-specific base class - constructor. - -Tue Jun 24 11:02:00 UTC 2008 Simon Massey - - * ace/Svc_Conf_Token_Table.h: - - commit generated 3rd file. - Fix the dependancies for FC6_Compact_NoInline build. - -Tue Jun 24 09:45:00 UTC 2008 Simon Massey - - * tests/Bug_2980_Regression_Test.cpp: - * tests/tests.mpc: - - Manually add the ACE_TMAIN code to this test. - -Tue Jun 24 00:03:27 UTC 2008 J.T. Conklin - - * ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp: - * ace/Monitor_Control/BSD_Network_Interface_Monitor.h: - - Changed to fetch current value in constructor, and subtract - that from subsequent values in each update() call. - -Mon Jun 23 15:28:00 UTC 2008 Simon Massey - - * ace/Svc_Conf_y.cpp: - - Fix fuzz errors incorrect ACE_TMAIN/main use; commit generated 2nd. - -Mon Jun 23 15:27:00 UTC 2008 Simon Massey - - * ace/Svc_Conf.y: - - Fix fuzz errors incorrect ACE_TMAIN/main use; commit source 1st. - -Mon Jun 23 13:51:23 UTC 2008 Jeff Parsons - - * ace/Monitor_Control/Windows_Monitor.h: - - Changed class member type from ACE_CString to ACE_TString - to accomondate Unicode builds. - - * ace/Monitor_Control/Windows_Monitor.cpp: - - Removed incorrect use of ACE_TEXT wrapper on a non-literal. - -Mon Jun 23 12:34:35 UTC 2008 Chad Elliott - - * bin/tao_other_tests.lst: - - Added the new Notify Timeout test. - -Mon Jun 23 12:09:26 UTC 2008 Douglas C. Schmidt - - * examples/C++NPv2/display_logfile.cpp: Divided an ACE_TCHAR - string by sizeof (ACE_TCHAR) to get the appropriate size. - Thanks to J.T. for reporting - this. - -Mon Jun 23 11:12:00 UTC 2008 Simon Massey - - * ace/Svc_Conf_y.cpp: - * bin/LabVIEW_RT/labview_test_controller/test.cpp: - * ASNMP/examples/trap/trap.cpp: - * ASNMP/examples/get/get.cpp: - * ASNMP/examples/get/get_async.cpp: - * ASNMP/examples/set/set.cpp: - * ASNMP/examples/next/next.cpp: - * ASNMP/examples/walk/walk.cpp: - * netsvcs/clients/Tokens/mutex/test_mutex.cpp: - * performance-tests/RPC/client.cpp: - * tests/Bug_2980_Regression_Test.cpp: - - Fix fuzz errors incorrect ACE_TMAIN/main use. - -Sun Jun 22 17:23:08 UTC 2008 Jeff Parsons - - * ace/Monitor_Control/CPU_Load_Monitor.cpp: - * ace/Monitor_Control/Memory_Usage_Monitor.cpp: - * ace/Monitor_Control/Num_Threads_Monitor.cpp: - - Fix to clear_i() implementation for these monitors that - compiled only on Windows. - -Fri Jun 20 20:40:50 UTC 2008 Jeff Parsons - - * ace/Monitor_Size.cpp: - * ace/Monitor_Base.cpp: - * ace/Monitor_Base.h: - - Moved stats features from the Notification Service monitor - class to the ACE base class. - - * ace/Monitor_Control/Windows_Multi_Instance_Monitor.cpp: - * ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp: - * ace/Monitor_Control/CPU_Load_Monitor.h: - * ace/Monitor_Control/Bytes_Received_Monitor.cpp: - * ace/Monitor_Control/Windows_Monitor.h: - * ace/Monitor_Control/Packets_Received_Monitor.cpp: - * ace/Monitor_Control/Memory_Usage_Monitor.h: - * ace/Monitor_Control/Monitor_Group.h: - * ace/Monitor_Control/Null_Network_Interface_Monitor.cpp: - * ace/Monitor_Control/BSD_Network_Interface_Monitor.h: - * ace/Monitor_Control/Solaris_Network_Interface_Monitor.h: - * ace/Monitor_Control/Num_Threads_Monitor.h: - * ace/Monitor_Control/Bytes_Sent_Monitor.h: - * ace/Monitor_Control/CPU_Load_Monitor.cpp: - * ace/Monitor_Control/Packets_Sent_Monitor.h: - * ace/Monitor_Control/Windows_Monitor.cpp: - * ace/Monitor_Control/Monitor_Group.cpp: - * ace/Monitor_Control/Memory_Usage_Monitor.cpp: - * ace/Monitor_Control/Linux_Network_Interface_Monitor.h: - * ace/Monitor_Control/Windows_Multi_Instance_Monitor.h: - * ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp: - * ace/Monitor_Control/Bytes_Received_Monitor.h: - * ace/Monitor_Control/Solaris_Network_Interface_Monitor.cpp: - * ace/Monitor_Control/Packets_Received_Monitor.h: - * ace/Monitor_Control/Null_Network_Interface_Monitor.h: - * ace/Monitor_Control/Num_Threads_Monitor.cpp: - * ace/Monitor_Control/Bytes_Sent_Monitor.cpp: - * ace/Monitor_Control/Packets_Sent_Monitor.cpp: - - Implemented overrides of clear_i() for all the OS - monitors. - -Fri Jun 20 20:25:12 UTC 2008 Steve Huston - - * bin/PerlACE/README: Edited to reflect the change in process for - referring to test components. Components are now referred to with - numbers instead of names. - - * bin/PerlACE/TestTarget.pm: In create_target(), warn if the component - is not a number. - - * bin/PerlACE/ProcessLVRT.pm: Don't try to close an undefined Telnet. - - * bin/tao_orb_tests.lst: Removed the LabVIEW_RT disabling on - Bug_2702_Regression, Oneway_Send_Timeouts, and Abstract_Interface. - - * tests/run_test.pl: Changed the target component from "ace" to 1 per - new component referring convention. - -Fri Jun 20 18:40:10 UTC 2008 Chad Elliott - - * bin/PerlACE/Run_Test.pm: - - Removed references to HostProcess and TargetProcess. - - * bin/PerlACE/TestTarget.pm: - * bin/PerlACE/TestTarget_VxWorks.pm: - - Added a new test target for VxWorks. It currently has no reboot - related functionality. - - * bin/PerlACE/TestTarget_LVRT.pm: - - Added the ability to accept multiple files for the DeleteFile - method as unlink does. - - * bin/PerlACE/HostProcess.pm: - * bin/PerlACE/TargetProcess.pm: - - Removed these files. - -Fri Jun 20 15:15:00 UTC 2008 Simon Massey - - * bin/fuzz.pl: - - Small bug in white space compaction. - -Fri Jun 20 14:15:00 UTC 2008 Simon Massey - - * bin/fuzz.pl: - - Enhance ACE_TMAIN check for multi-line detection and remove - detection level for this check. - -Fri Jun 20 12:09:53 UTC 2008 Chad Elliott - - * examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp: - * examples/IPC_SAP/SSL_SAP/SSL-client.cpp: - - Added static_cast's to avoid warnings from vc8. - -Thu Jun 19 16:21:07 2008 Steve Huston - - * ace/CDR_Base.h: - * ace/CDR_Stream.h: Added a enum to ACE_CDR with the values for - byte ordering specifier. Moved the setting of ACE_CDR_BYTE_ORDER - from CDR_Stream.h to CDR_Base.h so it can be used in the enum. - These make it easier for users to figure out what to do when they - want to force a specific byte ordering. - Also did a little more doxygen cleanup. - -Thu Jun 19 15:11:00 UTC 2008 Simon Massey - - * bin/fuzz.pl: - - Enable ORB_init() 3rd parameter null string check. - -Thu Jun 19 14:11:04 UTC 2008 J.T. Conklin - - * ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp: - - Explicitly #include and for non-inline - builds. - -Wed Jun 18 17:36:34 UTC 2008 Yan Dai - - * ace/Stack_Trace.cpp: - - Moved pragma disable warning directives from inside of function to - outside to take effect. - -Wed Jun 18 17:27:51 2008 Steve Huston - - * ace/CDR_Stream.h: Some doxygen improvements. - -Wed Jun 18 15:36:11 UTC 2008 Phil Mesnier - - * bin/tao_orb_tests.lst: - - Added new run_test scripts for the special variants of the TAO - POA EndpointPolicy test. - -Wed Jun 18 13:20:00 UTC 2008 Simon Massey - - * bin/fuzz.pl: - - Redo check for wide character incompatabilty ORB_init() miss-use. - Caters for multi-line ORB_init. - -Wed Jun 18 12:16:48 UTC 2008 Chad Elliott - - * bin/PerlACE/Run_Test.pm: - - Increase the process start wait time for QNX. - -Wed Jun 18 10:43:20 UTC 2008 Johnny Willemsen - - * include/makeinclude/platform_linux_icc.GNU: - Don't use deprecated options - -Wed Jun 18 09:50:20 UTC 2008 Johnny Willemsen - - * README: - * ACE-INSTALL.html: - Updated - -Tue Jun 17 22:43:20 2008 Steve Huston - - * ace/Reactor.h: Clarify that calling remove_handler() for a signal - handler does not invoke the handler's handle_close() callback. Also - note that this behavior is under debate in Bugzilla #2368. Thanks to - Bill Kendall for calling this to attention. - - * THANKS: Added Bill Kendall. - -Tue Jun 17 15:36:49 UTC 2008 Yan Dai - - * ace/Stack_Trace.cpp: - - Disabled warning C4706 in load_dbghelp_library_if_needed() - and enabled afterwards on windows. - -Tue Jun 17 13:55:00 UTC 2008 Simon Massey - - * bin/fuzz.pl: - - Add check for wide character incompatabilty ORB_init() miss-use. - -Tue Jun 17 12:40:03 UTC 2008 J.T. Conklin - - * ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp: - - Explicitly #include for non-inline builds. - -Tue Jun 17 09:30:00 UTC 2008 Simon Massey - - * apps/JAWS/clients/WebSTONE/src/bench.c: - * apps/JAWS/clients/WebSTONE/src/errexit.c: - * apps/JAWS/clients/WebSTONE/src/genrand.c: - * apps/JAWS/clients/WebSTONE/src/timefunc.c: - * apps/JAWS/clients/WebSTONE/src/webclient.c: - * apps/JAWS/clients/WebSTONE/src/webmaster.c: - - Fuzz errors, Untabify. - -Tue Jun 17 08:13:00 UTC 2008 Simon Massey - - * include/make_include/platform_sunos5_common.GNU: - - Changed default "kstat ?= 1" at Johnny Willemsens request. - -Tue Jun 17 06:42:51 UTC 2008 Yan Dai - - * ace/Stack_Trace.cpp: - - Fixed declared method (determine_starting_frame) never referenced - warning on HP aCC build. - -Mon Jun 16 21:26:05 UTC 2008 Abdullah Sowayan - - * bin/fuzz.pl: - - Enable check_for_tab for all files in the repository. - -Mon Jun 16 21:22:03 UTC 2008 Abdullah Sowayan - - * apps/JAWS/clients/Caching/Local_Locator.cpp: - * apps/JAWS/clients/WebSTONE/src/bench.c: - * apps/JAWS/clients/WebSTONE/src/errexit.c: - * apps/JAWS/clients/WebSTONE/src/genrand.c: - * apps/JAWS/clients/WebSTONE/src/get.c: - * apps/JAWS/clients/WebSTONE/src/gettimeofday.c: - * apps/JAWS/clients/WebSTONE/src/parse_file_list.c: - * apps/JAWS/clients/WebSTONE/src/rexec.c: - * apps/JAWS/clients/WebSTONE/src/statistics.c: - * apps/JAWS/clients/WebSTONE/src/sysdep.c: - * apps/JAWS/clients/WebSTONE/src/timefunc.c: - * apps/drwho/Hash_Table.cpp: - - Untabify. - -Mon Jun 16 20:24:45 UTC 2008 Abdullah Sowayan - - * apps/Gateway/Gateway/Connection_Handler.cpp: - * apps/Gateway/Gateway/Event_Forwarding_Discriminator.cpp: - * apps/Gateway/Peer/Options.cpp: - * apps/JAWS/clients/Blobby/Options.cpp: - * apps/JAWS/clients/Blobby/blobby.cpp: - * apps/JAWS/clients/Caching/ID_Generator.cpp: - * apps/JAWS/clients/Caching/Local_Locator.cpp: - * apps/JAWS/clients/Caching/Locator_Request_Reply.cpp: - * apps/JAWS/clients/Caching/URL_Properties.inl: - * apps/JAWS/clients/WebSTONE/src/bench.c: - * apps/JAWS/clients/WebSTONE/src/cgi-send.c: - * apps/JAWS/clients/WebSTONE/src/get.c: - * apps/JAWS/clients/WebSTONE/src/getopt.c: - * apps/JAWS/clients/WebSTONE/src/nsapi-send.c: - * apps/JAWS/server/HTTP_Config.cpp: - * apps/JAWS/server/HTTP_Handler.cpp: - * apps/JAWS/server/HTTP_Helpers.cpp: - * apps/JAWS/server/HTTP_Response.cpp: - * apps/JAWS/server/HTTP_Server.h: - * apps/JAWS/server/HTTP_Server.cpp: - * apps/JAWS/stress_testing/benchd.cpp: - * apps/JAWS/stress_testing/connection.cpp: - * apps/JAWS/stress_testing/http_tester.cpp: - * apps/JAWS2/JAWS/Cache_Hash_T.h: - * apps/JAWS2/JAWS/Hash_Bucket_T.h: - * apps/drwho/File_Manager.cpp: - * apps/drwho/Hash_Table.cpp: - * apps/drwho/PMC_All.cpp: - * apps/drwho/PMC_Flo.cpp: - * apps/drwho/PMC_Ruser.cpp: - * apps/drwho/PMC_Usr.cpp: - * apps/drwho/PMS_Ruser.cpp: - * apps/drwho/PM_Client.cpp: - * apps/drwho/Rwho_DB_Manager.cpp: - * apps/gperf/src/Gen_Perf.cpp: - - Untabify. - -Mon Jun 16 19:06:38 UTC 2008 William R. Otte - - * ace/config-borland-common.h: - * ace/config-hpux-11.00.h: - * ace/config-mvs.h: - * ace/config-win32-dmc.h: - * ace/config-win32-ghs.h: - * ace/config-win32-msvc.h: - - Fixes for MCPP preprocessing on Windows. - -Mon Jun 16 19:06:44 UTC 2008 Chad Elliott +Thu Sep 2 14:46:56 UTC 2010 Vladimir Zykov * ace/Acceptor.cpp: - * ace/Connector.cpp: - * ace/Strategies_T.cpp: + * ace/SOCK_IO.cpp: + * ace/SOCK_Dgram.cpp: + * ace/ACE.cpp: + * tests/SOCK_Test.cpp: + * tests/MT_SOCK_Test.cpp: + * NEWS: + Reverted both commits by Steve Huston related to handle_ready() + and a NEWS entry. + Wed Sep 1 19:31:24 UTC 2010 Steve Huston + Fri Aug 27 19:17:11 UTC 2010 Steve Huston + This is necessary for a quick release of 1.8.2. - Use the NORMAL_CLOSE_OPERATION enum value when closing the service - handler during activation. +Wed Sep 1 19:31:24 UTC 2010 Steve Huston -Mon Jun 16 18:33:34 UTC 2008 Abdullah Sowayan + * ace/ACE.cpp (handle_ready): Changed the timeout behavior to just + return 0, no errno, as ACE_OS::poll() and ACE_OS::select() both do. + This restores historic behavior changed inadvertently at + Fri Aug 27 19:17:11 UTC 2010 Steve Huston - * examples/ASX/UPIPE_Event_Server/Peer_Router.cpp: - * examples/OS/Process/imore.cpp: + * ace/SOCK_Dgram.cpp: + * ace/SOCK_IO.cpp: + * tests/MT_SOCK_Test.cpp: + * tests/SOCK_Test.cpp: Re-added the if/switch on return value from + ACE::handle_read|write_ready() to detect timeout and set errno + here. + + These changes were necessary to fix the TAO faults test. Thanks + to Johnny and Simon for narrowing down the cause and testing + the fix. + +Wed Sep 1 15:58:47 UTC 2010 Adam Mitz + + * bin/MakeProjectCreator/templates/gnu.mpd: + + Changed the short-circuit logic for the .NOTPARALLEL checks to || + instead of &&. If any one file is newer, we will have to rebuild. + Also added a missing foreach for the output files with dependent libs. + +Wed Sep 1 09:59:42 UTC 2010 Vladimir Zykov + + * tests/Time_Value_Test.cpp: + Fixed compile warning on QNX. time_t on QNX is defined as unsigned + int. + +Tue Aug 31 16:53:07 UTC 2010 Jeff Parsons + + * THANKS: + + Added Catherine L. Paquin . + +Tue Aug 31 14:40:17 UTC 2010 Adam Mitz + + * NEWS: + + Updated to proper name of Visual Studio 2010, which may assist + those searching for it in the NEWS file. + +Tue Aug 31 12:56:36 UTC 2010 Steve Huston + + * NEWS: Added an entry for the change at + Fri Aug 27 19:17:11 UTC 2010 Steve Huston + + * ace/README: + * ace/config-sunos5.6.h: + * ace/config-sunos5.7.h: Removed all mention of ACE_HAS_LIMITED_SELECT. + +Mon Aug 30 18:41:24 UTC 2010 Johnny Willemsen + + * ace/ace.mpc: + Added Obstack.h + +Mon Aug 30 16:48:34 UTC 2010 Steve Huston + + * ace/FIFO.h: + * ace/FIFO_Recv.h: + * ace/FIFO_Send.h: Clarified initialization and open behavior. + +Mon Aug 30 15:33:57 UTC 2010 Steve Huston + + * ace/Process.h (set_handles): Add a note that passing a socket handle + with this mechanism does not work on Windows. + +Mon Aug 30 10:06:24 UTC 2010 Johnny Willemsen + + * examples/Reactor/Proactor/test_proactor2.cpp: * examples/Reactor/Proactor/test_proactor3.cpp: - * examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.cpp: + * tests/Proactor_Test.cpp: + * tests/Proactor_Test_IPV6.cpp: + * tests/Proactor_UDP_Test.cpp: + ACE_Guard changes - Untabify. +Fri Aug 27 19:17:11 UTC 2010 Steve Huston -Mon Jun 16 18:00:26 UTC 2008 Abdullah Sowayan + * ace/ACE.cpp (handle_ready, handle_timed_complete, + handle_timed_accept): On platforms where poll() is + available, prefer that to using select() for checking a single + handle's state and/or waiting for a condition. This preference + was previously only used if ACE_HAS_LIMITED_SELECT was set. The + ACE_HAS_LIMITED_SELECT choice is removed, making ACE_HAS_POLL the + setting that switches this preference. The driving reason for this + is that if select() is called to detect changes on a handle whose + values falls outside that which can safely be stored in an fdset, + the handle-setting macros/functions will set/clear bits outside + of the fdset. This results in very weird memory changes, often in + the stack, which are very hard to diagnose. poll()'s operation + does not suffer from this affect. With the growing use of large + numbers of handles and use of ACE_Dev_Poll_Reactor on Linux, + the rate at which this problem was cropping up was increasing. + Thanks to Olivier Langlois for diagnosing this problem and + proposing the patch. - * ASNMP/examples/get/get.cpp: - * ASNMP/examples/get/get_async.cpp: - * ASNMP/examples/next/next.cpp: - * ASNMP/examples/set/set.cpp: + (handle_ready): Properly set the poll condition for read and/or + write. Thanks to kumaran.prem@gmail.com for this fix. - Untabify. + * ace/Acceptor.cpp: + * ace/SOCK_IO.cpp: + * ace/SOCK_Dgram.cpp: + * tests/MT_SOCK_Test.cpp: + * tests/SOCK_Test.cpp: Replaced use of ACE_OS::select() with + ACE::handle_ready() and friends. -Mon Jun 16 17:53:00 UTC 2008 Abdullah Sowayan + This all resolves Bugzilla #3606. - * examples/IPC_SAP/SPIPE_SAP/consumer_msg.cpp: - * examples/IPC_SAP/SPIPE_SAP/consumer_read.cpp: - * examples/IPC_SAP/TLI_SAP/db-client.cpp: - * examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFC.h: - * examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFCDlg.h: - * examples/Log_Msg/Log_Msg_MFC/StdAfx.h: - * examples/Log_Msg/Log_Msg_MFC/StdAfx.cpp: - * examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.inl: +Fri Aug 27 19:10:16 UTC 2010 Brian Johnson - Untabify. + * bin/MakeProjectCreator/templates/gnu.mpd: -Mon Jun 16 17:27:36 UTC 2008 Chad Elliott + Merging dependent_libs support for gnuace from TAO 1.5a. + (Bugzilla #3281) - * bin/PerlACE/TargetProcess.pm: +Fri Aug 27 18:36:37 UTC 2010 Johnny Willemsen - Remove the "use" of PerlACE::ProcessVX. It is already used in - PerlACE::Process and using it in this module causes things to be - evaluated incorrectly with respect to @ARGV. + * ace/OS_NS_Thread.h: + * ace/OS_NS_Thread.inl: + Added assignment operator for ACE_Thread_Id -Mon Jun 16 17:01:19 UTC 2008 Abdullah Sowayan +Fri Aug 27 15:01:41 UTC 2010 Steve Huston + + * Connector.{h cpp} (ACE_NonBlocking_Connect_Handler): Add a + handle_close() which calls handle_input() if called by the + ACE_Dev_Poll_Reactor to remove a failed connect. Apparently, + Linux epoll, at least sometimes, signals EPOLLERR on a failed + nonblocking connect, unlike the select() case which selects the + failed fd for read. Thanks to Kannan Ramaswamy for this information and fix. + + * THANKS: Added Kannan to the Hall of Fame. + +Fri Aug 27 14:17:56 UTC 2010 Johnny Willemsen + + * ace/Atomic_Op.h: + Doxygen changes + + * ace/OS_NS_Thread.cpp: + Use ACE_GUARD * bin/fuzz.pl: + Added check for ACE_Guard - Enable check_for_tab check for ACE_ROOT/examples +Fri Aug 27 06:56:11 UTC 2010 Johnny Willemsen -Mon Jun 16 16:54:25 UTC 2008 Abdullah Sowayan + * etc/ace.doxygen: + * etc/acexml.doxygen: + Fuzz fixes - * examples/APG/Logging/Callback-2.h: - * examples/APG/Logging/Callback-3.h: - * examples/APG/Logging/Use_Logger.cpp: - * examples/APG/Threads/Message_Queue.cpp: - * examples/APG/Timers/CB.h: - * examples/APG/Timers/PCB.cpp: - * examples/ASX/CCM_App/SC_Server.cpp: - * examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp: - * examples/ASX/Event_Server/Event_Server/Event_Analyzer.cpp: - * examples/ASX/Event_Server/Event_Server/Peer_Router.cpp: - * examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp: - * examples/ASX/Message_Queue/bounded_buffer.cpp: - * examples/ASX/Message_Queue/priority_buffer.cpp: - * examples/ASX/UPIPE_Event_Server/Peer_Router.cpp: - * examples/Bounded_Packet_Relay/BPR_Drivers.cpp: - * examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.cpp: - * examples/Bounded_Packet_Relay/bpr_thread.cpp: - * examples/C++NPv2/display_logfile.cpp: - * examples/Connection/misc/Connection_Handler.h: - * examples/IPC_SAP/ATM_SAP/CPP-client.cpp: - * examples/IPC_SAP/ATM_SAP/CPP-server.cpp: - * examples/IPC_SAP/DEV_SAP/writer/writer.cpp: - * examples/IPC_SAP/FIFO_SAP/FIFO-Msg-server.cpp: - * examples/IPC_SAP/FIFO_SAP/FIFO-client.cpp: - * examples/IPC_SAP/FIFO_SAP/FIFO-test.cpp: - * examples/IPC_SAP/FILE_SAP/client.cpp: - * examples/IPC_SAP/SOCK_SAP/C-inclient.cpp: - * examples/IPC_SAP/SOCK_SAP/CPP-unclient.cpp: - * examples/IPC_SAP/SPIPE_SAP/NPServer.cpp: - * examples/IPC_SAP/SPIPE_SAP/producer_msg.cpp: - * examples/IPC_SAP/TLI_SAP/CPP-ATM-client.cpp: - * examples/IPC_SAP/TLI_SAP/CPP-ATM-server.cpp: - * examples/IPC_SAP/TLI_SAP/CPP-client.cpp: - * examples/IPC_SAP/TLI_SAP/CPP-server.cpp: - * examples/IPC_SAP/TLI_SAP/db-client.cpp: - * examples/IPC_SAP/TLI_SAP/ftp-client.cpp: - * examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFC.h: - * examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFC.cpp: - * examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFCDlg.h: - * examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFCDlg.cpp: - * examples/Logger/Acceptor-server/server_loggerd.h: - * examples/Logger/Acceptor-server/server_loggerd.cpp: - * examples/Logger/simple-server/Logging_Handler.cpp: - * examples/Logger/simple-server/server_loggerd.cpp: - * examples/Mem_Map/IO-tests/test_io.cpp: - * examples/Misc/test_get_opt.cpp: - * examples/Misc/test_profile_timer.cpp: - * examples/OS/Process/imore.cpp: - * examples/QOS/Change_Receiver_FlowSpec/Receiver_QoS_Event_Handler.cpp: - * examples/Reactor/FIFO/client.cpp: - * examples/Reactor/FIFO/server.cpp: - * examples/Reactor/Misc/notification.cpp: - * examples/Reactor/Misc/test_signals_1.cpp: - * examples/Reactor/Misc/test_signals_2.cpp: - * examples/Reactor/Ntalker/ntalker.cpp: - * examples/Reactor/Proactor/test_cancel.h: - * examples/Reactor/Proactor/test_cancel.cpp: - * examples/Reactor/Proactor/test_multiple_loops.cpp: - * examples/Reactor/Proactor/test_proactor3.cpp: - * examples/Reactor/Proactor/test_timeout.cpp: - * examples/Reactor/Proactor/test_timeout_st.cpp: - * examples/Registry/test_registry_update.cpp: - * examples/Service_Configurator/IPC-tests/client/broadcast_client_test.cpp: - * examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp: - * examples/Service_Configurator/IPC-tests/client/local_pipe_client_test.cpp: - * examples/Service_Configurator/IPC-tests/client/local_stream_client_test.cpp: - * examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.inl: - * examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.inl: - * examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.inl: - * examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.inl: - * examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.inl: - * examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.inl: - * examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.inl: - * examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp: - * examples/Service_Configurator/Misc/Timer_Service.cpp: - * examples/Shared_Memory/test_SV.cpp: - * examples/System_V_IPC/SV_Message_Queues/TMQ_Client.cpp: - * examples/Threads/recursive_mutex.cpp: - * examples/Threads/task_one.cpp: - * examples/Threads/thread_manager.cpp: - * examples/Threads/token.cpp: +Thu Aug 26 13:20:48 UTC 2010 Johnny Willemsen - Untabify. + * bin/diff-builds-and-group-fixed-tests-only.sh: + Added DANCE_ROOT -Mon Jun 16 16:04:40 2008 Steve Huston +Thu Aug 26 13:08:56 UTC 2010 Johnny Willemsen - * bin/PerlACE/TestTarget.pm: When getting the exe subdir for a - target, pick up the command line setting if the "default" target - is in use. This should fix the broken exesubdir TAO builds. + * netsvcs/servers/servers.mpc: + Use ace_netsvcs as executable name, this makes more sense when + we install this file in a target directory -Mon Jun 16 15:45:45 UTC 2008 Jeff Parsons - - * ace/Monitor_Control/Null_Network_Interface_Monitor.cpp: - * ace/Monitor_Control/Null_Network_Interface_Monitor.h: - - New files, defining a base class for tne network interface OS - monitors when the monitor framework itself is enabled but no - platform-specific OS monitor flags are defined, whether because - the platform itself does not support native system-level - monitoring, or because the Linux, Windows or Solaris OS - monitor flags has been turned off for some reason. - - * ace/Monitor_Control/Monitor_Control.mpc: - * ace/Monitor_Control/Bytes_Sent_Monitor.h: - * ace/Monitor_Control/Packets_Sent_Monitor.h: - * ace/Monitor_Control/Linux_Network_Interface_Monitor.h: - * ace/Monitor_Control/Bytes_Received_Monitor.h: - * ace/Monitor_Control/Packets_Received_Monitor.h: - - Incorporated the new no-op network interface monitor base class - into the existing network interface monitor classes. If this - new base class is used, the monitor's value will always be 0, - and its update() method will be a no-op. - -Mon Jun 16 12:12:16 UTC 2008 Jeff Parsons - - * ace/config-sunos5.5.h: - - Reverted addition of ACE_HAS_KSTAT flag in - - Fri Jun 13 14:00:00 UTC 2008 Jeff Parsons - - Thanks to Johnny Willemsen , we now - know that the correct way to do this is to set kstat=1 - in platform_macros.GNU. - -Mon Jun 16 11:28:11 UTC 2008 Abdullah Sowayan +Thu Aug 26 13:04:06 UTC 2010 Johnny Willemsen * bin/fuzz.pl: + Check doxygen files for tabs - Enable check_for_tab check for TAO/tests/examples and TAO/performance-tests + * etc/ace.doxygen: + * etc/ace_inet.doxygen: + * etc/ace_qos.doxygen: + * etc/ace_rmcast.doxygen: + * etc/ace_ssl.doxygen: + * etc/acexml.doxygen: + * html/index.html: + Changed documentation subdirectories to make debian packaging easier -Mon Jun 16 10:30:00 UTC 2008 Simon Massey +Thu Aug 26 12:30:33 UTC 2010 Johnny Willemsen - * tests/Max_Default_Port_Test.cpp: + * debian/control: + Made some fixes for x.8.1 - Un-tabify. +Thu Aug 26 11:54:15 UTC 2010 Johnny Willemsen -Mon Jun 16 10:20:00 UTC 2008 Simon Massey + * bin/auto_run_tests.pl: + Extended script to also check for $DANCE_ROOT/bin/dance_tests.lst - * ace/Monitor_Control/BSD_Network_Interface_Moinitor.cpp: +Thu Aug 26 10:20:41 UTC 2010 Martin Corino - Correct Fuzz errors (removed NULL). + * ace/OS_NS_Thread.cpp: + Changes implementing the patches from Bugzilla #3653 (with + changes and some rejects; *no* asserts allowed in ACE). -Mon Jun 16 01:01:27 UTC 2008 Abdullah Sowayan +Wed Aug 25 19:58:19 UTC 2010 Steve Huston - * bin/fuzz.pl: + * ace/Dev_Poll_Reactor.{h cpp}: Regarding change number 2 at + Fri Mar 26 14:07:55 UTC 2010 Steve Huston + dispatching notifies in only one thread at a time was 1) wrong + (TP_Reactor doesn't do this), 2) broke important existing + applications at a customer site. This has been fixed so that the + notify dispatch behavior is like ACE_TP_Reactor: when the + notify handle is signaled, extract one notification, release + the token, dispatch the notification. Thus, each thread will + dispatch one notification, and multiple threads can dispatch + them at the same time if there are multiples. - Enable check_for_tab check for TAO/tests + Also fixed an error where it was possible to lose notice of a + notification. Resolves Bugzilla #3328. -Sun Jun 15 16:03:29 UTC 2008 Abdullah Sowayan +Wed Aug 25 09:49:41 UTC 2010 Martin Corino - * bin/fuzz.pl: + * ace/Arg_Shifter.h: + * ace/config-macosx-leopard.h: + * ace/Guard_T.h: + * ace/Global_Macros.h: + Selected changes from patches in Bugzilla 3652. - Enable check_for_tab check for TAO/orbsvcs +Tue Aug 24 14:21:01 UTC 2010 Johnny Willemsen -Sun Jun 15 13:23:13 UTC 2008 Johnny Willemsen + * ace/OS_NS_Thread.h: + Layout changes - * ace/config-linux-common.h: - Added ACE_LACKS_STRRECVFD when no streams are available (like fc9) + * ace/config-win32-common.h: + Improved MinGW GCC 4.4 support. Thanks to + Jani Hakala for creating the + patch - * rpmbuild/ace-tao-strrecvfd.patch: - Deleted +Tue Aug 24 14:15:45 UTC 2010 Marijke Hengstmengel + + * ace/Log_Msg.cpp + * ace/Log_Msg.h + * tests/Log_Msg_Test.cpp + Revert changes for logging thread id as argument. + +Tue Aug 24 12:59:30 UTC 2010 Martin Corino + + * protocols/ace/INet/ClientRequestHandler.h: + * protocols/ace/INet/URLBase.h: + * protocols/ace/INet/HTTP_ClientRequestHandler.h: + Changes to fix export problems with nested classes with MSVC 7/8. + +Tue Aug 24 11:29:45 UTC 2010 Marijke Hengstmengel + + * ace/Log_Msg.h: + * ace/Log_Msg.cpp: + * tests/Log_Msg_Test.cpp: + * ChangeLog: + Add %#t to log a thread id that is coming from user code, as argument . + +Mon Aug 23 19:51:59 UTC 2010 Phil Mesnier + + * tests/Missing_Svc_Conf_Test.cpp: + + Fix some scoreboard problems. + +Mon Aug 23 15:05:56 UTC 2010 Adam Mitz + + * ace/Select_Reactor.h: + + vc10 needs an "ACE_Export" declaration on the explicit template + instantiation of ACE_Select_Reactor. + +Mon Aug 23 13:23:03 UTC 2010 Johnny Willemsen + + * ace/config-kfreebsd.h: + New config file for kfreebsd + + * ace/config-win32-common.h: + Removed commented out defines + +Mon Aug 23 11:57:30 UTC 2010 Martin Corino + + * protocols/ace/INet/INet_SSL_Export.h: + * protocols/ace/INet/HTTPS_Context.h: + * protocols/ace/INet/HTTPS_SessionFactory.h: + * protocols/ace/INet/HTTPS_URL.h: + * protocols/ace/INet/SSL_CallbackManager.h: + * protocols/ace/INet/SSL_CertificateCallback.h: + * protocols/ace/INet/SSL_PasswordCallback.h: + * protocols/ace/INet/SSL_X509Cert.h: + * protocols/ace/INet/inet_ssl.mpc: + Changes to fix MSVC 7/8 link errors. + +Mon Aug 23 11:34:30 UTC 2010 Martin Corino + + * protocols/ace/INet/HTTPS_URL.h: + Fixed GCC41 error concerning comma at end of enum list. + +Sat Aug 21 12:53:05 UTC 2010 Phil Mesnier + + * tests/Missing_Svc_Conf_Test.cpp: + + Added a descriptive comment block to the source. + +Fri Aug 20 13:29:22 UTC 2010 Phil Mesnier + + * ace/Service_Gestalt.cpp: + + One more shot at fixing the behavior of the service configurator + in the face of missing defaulted svc.conf file. + + * tests/Missing_Svc_Conf_Test.cpp: + * tests/run_test.lst: + * tests/tests.mpc: + + Added a proper test to ensure changes to this behavior are caught + in the future. + +Fri Aug 20 11:58:20 UTC 2010 Johnny Willemsen + + * ace/TSS_T.cpp: + Updated comment + + * include/makeinclude/platform_g++_common.GNU: + If minimaltoc is set to 1, add -mminimal-toc to compiler flags + + * include/makeinclude/platform_linux.GNU: + Removed check for ppc64, if you build for ppc64 and need -mminimal-toc + add minimaltoc=1 to your platform_macros.GNU file + +Fri Aug 20 09:52:30 UTC 2010 Martin Corino + + * protocols/ace/INet/inet_ssl.mpb: + Removed feature subproject config. + + * protocols/ace/INet/inet_ssl.mpc: + Added sublibrary project I forgot yesterday. + +Thu Aug 19 12:37:14 UTC 2010 Johnny Willemsen + + * ace/Functor_T.h: + Doxygen changes + + * include/makeinclude/platform_linux.GNU: + Make it possible to control -mminimal-toc through the + platform_macros.GNU file using minimaltoc + +Thu Aug 19 12:09:30 UTC 2010 Martin Corino + + * bin/MakeProjectCreator/config/inet.mpb: + * bin/MakeProjectCreator/config/inetssl.mpb: + * protocols/ace/INet/inet.mpc: + * protocols/ace/INet/inet_ssl.mpb: + Changes to split INet into 2 libraries; regular and SSL. + Fixes dependencies of DAnCE tools on SSL. + +Wed Aug 18 09:26:04 UTC 2010 Vladimir Zykov + + * netsvcs/lib/Client_Logging_Handler.cpp: + Fixed a compile warning. + +Tue Aug 17 07:34:31 UTC 2010 Marijke Hengstmengel + + * ace/CDR_Stream.cpp + Add Id + +Mon Aug 16 22:00:06 UTC 2010 Adam Mitz + + * examples/Reactor/Misc/Reactor_Misc.mpc: + + Explicitly list an empty Template_Files so that the *_t.cpp doesn't + get added to Template_Files. + +Mon Aug 16 12:58:31 UTC 2010 Marijke Hengstmengel + + * ace/Auto_Event.cpp: + * ace/CDR_Stream.cpp: + * ace/Cleanup.cpp: + * ace/Codecs.cpp: + * ace/DEV_Addr.cpp: + * ace/Dynamic_Service_Base.cpp: + * ace/Filecache.cpp: + * ace/Flag_Manip.cpp: + * ace/FlReactor/FlReactor.cpp: + * ace/FoxReactor/FoxReactor.cpp: + * ace/Handle_Ops.cpp: + * ace/Hashable.cpp: + * ace/INET_Addr.cpp: + * ace/Init_ACE.cpp: + * ace/Local_Tokens.cpp: + * ace/Logging_Strategy.cpp: + * ace/Malloc.cpp: + * ace/MEM_Addr.cpp: + * ace/Message_Block.cpp: + * ace/Method_Request.cpp: + * ace/Multihomed_INET_Addr.cpp: + * ace/Name_Request_Reply.cpp: + * ace/OS_NS_string.cpp: + * ace/OS_Thread_Adapter.cpp: + * ace/Parse_Node.cpp: + * ace/Ping_Socket.cpp: + * ace/POSIX_Asynch_IO.cpp: + * ace/POSIX_CB_Proactor.cpp: + * ace/Proactor.cpp: + * ace/Proactor_Impl.cpp: + * ace/Process_Manager.cpp: + * ace/QoS/QoS_Decorator.cpp: + * ace/QoS/QoS_Manager.cpp: + * ace/QoS/QoS_Session_Factory.cpp: + * ace/QoS/QoS_Session_Impl.cpp: + * ace/QoS/SOCK_Dgram_Mcast_QoS.cpp: + * ace/Reactor.cpp: + * ace/Refcountable_T.cpp: + * ace/Remote_Name_Space.cpp: + * ace/Select_Reactor_Base.cpp: + * ace/Service_Config.cpp: + * ace/Service_Gestalt.cpp: + * ace/Shared_Memory_SV.cpp: + * ace/Singleton.cpp: + * ace/Sock_Connect.cpp: + * ace/SSL/SSL_Asynch_BIO.cpp: + * ace/SSL/SSL_Asynch_Stream.cpp: + * ace/SSL/SSL_Context.cpp: + * ace/SSL/SSL_SOCK.cpp: + * ace/SSL/SSL_SOCK_Acceptor.cpp: + * ace/SSL/SSL_SOCK_Connector.cpp: + * ace/SSL/SSL_SOCK_Stream.cpp: + * ace/SString.cpp: + * ace/Svc_Conf.y + * ace/Svc_Conf_y.cpp: + * ace/Task.cpp: + * ace/Thread_Manager.cpp: + * ace/Timer_Hash_T.cpp: + * ace/TkReactor/TkReactor.cpp: + * ace/Token_Collection.cpp: + * ace/WIN32_Asynch_IO.cpp: + * ace/XtReactor/XtReactor.cpp: + Removed ACE_RCSID + +Thu Aug 12 16:07:55 UTC 2010 Steve Huston + + * configure.ac: Added feature test for ACE_LACKS_STRUCT_LIFNUM. + +Thu Aug 12 08:39:31 UTC 2010 Johnny Willemsen * rpmbuild/ace-tao.spec: - Patch 6 is not needed anymore + Fixed problem compiling FC packages on OSB - * ace/Strategies_T.h: - Doxygen change +Wed Aug 11 20:50:37 UTC 2010 Adam Mitz -Sun Jun 15 03:08:53 UTC 2008 J.T. Conklin + * bin/MakeProjectCreator/templates/gnu.mpd: - * ace/Monitor_Control/Monitor_Control.mpc: + With ARCH set, we need to create the local ARCH directory for the + executable in case there are no object files that would otherwise + have required it. - Add BSD_Network_Interface_Monitor.cpp to Source_Files section. +Wed Aug 11 13:45:52 UTC 2010 Johnny Willemsen -Fri Jun 13 14:50:28 UTC 2008 Simon Massey + * ace/config-g++-common.h: + Only enable GCC builtin atomic op when threads are enabled. Thanks to + Rafi for reporting this - Add BSD_Network_Interface_Monitor.cpp and +Tue Aug 10 17:24:05 UTC 2010 Johnny Willemsen - untab-ified to remove fuzz errors. + * ACEXML/apps/svcconf/Svcconf.cpp: + Fixed compile problem -Fri Jun 13 14:45:28 UTC 2008 Jeff Parsons +Tue Aug 10 08:55:17 UTC 2010 Johnny Willemsen - * ace/Monitor_Control/Windows_Multi_Instance_Monitor.cpp: + * ace/Makefile.am: + Removed zapped file - Removed unused local variable. +Mon Aug 9 17:14:27 UTC 2010 Jeff Parsons -Fri Jun 13 14:31:35 UTC 2008 Adam Mitz + * THANKS: - * ace/Stack_Trace.cpp (Solaris section): + Added Robert Shectman - Yesterday's addition of support for 64-bit SPARC broke on x86. +Mon Aug 9 16:02:08 UTC 2010 Adam Mitz -Fri Jun 13 14:00:00 UTC 2008 Jeff Parsons + * include/makeinclude/platform_vxworks6.3.GNU: + * include/makeinclude/platform_vxworks6.8.GNU: + + The location of user-mode (RTP) libraries has changed in 6.8. + +Mon Aug 9 15:14:43 UTC 2010 Johnny Willemsen + + * ACEXML/apps/svcconf/Svcconf_Handler.cpp: + Zap emulated exception macros + + * ace/config-macros.h: + Only define ACE_HAS_EXCEPTIONS when it is not defined yet + +Mon Aug 9 06:38:34 UTC 2010 Johnny Willemsen * ace/config-sunos5.5.h: + Fixed compile error - Added #define of ACE_HAS_KSTAT, used by the OS monitors in - ace/Monitor_Control on Solaris platforms to guard the - visibility of Solaris-specific code and base classes. +Mon Aug 9 06:35:14 UTC 2010 Johnny Willemsen -Fri Jun 13 13:40:39 UTC 2008 J.T. Conklin + * ace/ace.mpc: + Removed zapped file - * ace/Monitor_Control/Makefile.am: +Sun Aug 8 23:31:32 UTC 2010 William R. Otte - Add BSD_Network_Interface_Monitor.cpp and - Solaris_Network_Interface_Monitor.cpp to Headers_File section. + * ace/config-macosx-snowleopard.h: - * ace/Monitor_Control/Bytes_Received_Monitor.cpp: - * ace/Monitor_Control/Bytes_Received_Monitor.h: - * ace/Monitor_Control/Bytes_Sent_Monitor.cpp: - * ace/Monitor_Control/Bytes_Sent_Monitor.h: - * ace/Monitor_Control/Packets_Received_Monitor.cpp: - * ace/Monitor_Control/Packets_Received_Monitor.h: - * ace/Monitor_Control/Packets_Sent_Monitor.cpp: - * ace/Monitor_Control/Packets_Sent_Monitor.h: + Clang uses ACE_ANY_OPS_USE_NAMESPACE. - Inherit from BSD_Network_Interface_Monitor on FreeBSD, - NetBSD, and OpenBSD systems. +Fri Aug 6 17:36:45 UTC 2010 Adam Mitz - * ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp: - * ace/Monitor_Control/BSD_Network_Interface_Monitor.h: + * bin/fuzz.pl: - New files, network interface monitor for systems with 4.4BSD - derived network stack. + Added a "trailing whitespace" check (not enabled by default). + Added the ability to pass multiple test names on the command line. + Extend the "too long file name" check to some additional file types. -Fri Jun 13 13:24:11 UTC 2008 Jeff Parsons +Fri Aug 6 08:39:38 UTC 2010 Johnny Willemsen - * ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp: - * ace/Monitor_Control/Bytes_Received_Monitor.cpp: - * ace/Monitor_Control/Packets_Received_Monitor.cpp: - * ace/Monitor_Control/Bytes_Sent_Monitor.h: - * ace/Monitor_Control/Packets_Sent_Monitor.h: - * ace/Monitor_Control/Linux_Network_Interface_Monitor.h: - * ace/Monitor_Control/Bytes_Received_Monitor.h: - * ace/Monitor_Control/Packets_Received_Monitor.h: - * ace/Monitor_Control/Bytes_Sent_Monitor.cpp: - * ace/Monitor_Control/Packets_Sent_Monitor.cpp: + * protocols/ace/TMCast/TMCast.mpc: + Removed exceptions as base project - Added '|| defined (AIX)' to every occurrence of - '#if defined (linux)' to eliminate build errors on the - latter platform. +Thu Aug 5 16:56:01 UTC 2010 Johnny Willemsen -Thu Jun 12 21:57:33 UTC 2008 J.T. Conklin + * bin/MakeProjectCreator/config/tmcast.mpb: + * protocols/tests/RMCast/RMCast.mpc: + Removed exceptions as base project - * m4/config_h.m4: - * configure.ac: +Thu Aug 5 09:00:49 UTC 2010 Johnny Willemsen - Remove feature test for ACE_HAS_TEMPLATE_SPECIALIZATION. + * ace/ACE.cpp: + * ace/ACE_crc32.cpp: + * ace/ACE_crc_ccitt.cpp: + * ace/ARGV.cpp: + * ace/ATM_Acceptor.cpp: + * ace/ATM_Addr.cpp: + * ace/ATM_Connector.cpp: + * ace/ATM_Params.cpp: + * ace/ATM_QoS.cpp: + * ace/ATM_Stream.cpp: + * ace/Acceptor.cpp: + * ace/Activation_Queue.cpp: + * ace/Active_Map_Manager.cpp: + * ace/Addr.cpp: + * ace/Arg_Shifter.cpp: + * ace/Argv_Type_Converter.cpp: + * ace/Assert.cpp: + * ace/Asynch_Acceptor.cpp: + * ace/Asynch_IO.cpp: + * ace/Asynch_Pseudo_Task.cpp: + * ace/Atomic_Op.cpp: + * ace/Atomic_Op_GCC_T.cpp: + * ace/Atomic_Op_T.cpp: + * ace/Auto_Ptr.cpp: + * ace/Barrier.cpp: + * ace/Base_Thread_Adapter.cpp: + * ace/Basic_Stats.cpp: + * ace/CDR_Base.cpp: + * ace/Capabilities.cpp: + * ace/Codeset_IBM1047.cpp: + * ace/Codeset_Registry.cpp: + * ace/Condition_Thread_Mutex.cpp: + * ace/Connection_Recycling_Strategy.cpp: + * ace/Containers.cpp: + * ace/Copy_Disabled.cpp: + * ace/Countdown_Time.cpp: + * ace/DEV.cpp: + * ace/DEV_Connector.cpp: + * ace/DEV_IO.cpp: + * ace/DLL.cpp: + * ace/DLL_Manager.cpp: + * ace/Date_Time.cpp: + * ace/Dev_Poll_Reactor.cpp: + * ace/Dirent_Selector.cpp: + * ace/Dump.cpp: + * ace/Dynamic.cpp: + * ace/Dynamic_Message_Strategy.cpp: + * ace/Dynamic_Service_Dependency.cpp: + * ace/Event.cpp: + * ace/Event_Handler.cpp: + * ace/FIFO.cpp: + * ace/FIFO_Recv.cpp: + * ace/FIFO_Recv_Msg.cpp: + * ace/FIFO_Send.cpp: + * ace/FIFO_Send_Msg.cpp: + * ace/FILE.cpp: + * ace/FILE_Addr.cpp: + * ace/FILE_Connector.cpp: + * ace/FILE_IO.cpp: + * ace/File_Lock.cpp: + * ace/Framework_Component.cpp: + * ace/Functor.cpp: + * ace/Functor_String.cpp: + * ace/Future.cpp: + * ace/Get_Opt.cpp: + * ace/Handle_Set.cpp: + * ace/High_Res_Timer.cpp: + * ace/ICMP_Socket.cpp: + * ace/IOStream.cpp: + * ace/IO_Cntl_Msg.cpp: + * ace/IO_SAP.cpp: + * ace/IPC_SAP.cpp: + * ace/LSOCK.cpp: + * ace/LSOCK_Acceptor.cpp: + * ace/LSOCK_CODgram.cpp: + * ace/LSOCK_Connector.cpp: + * ace/LSOCK_Dgram.cpp: + * ace/LSOCK_Stream.cpp: + * ace/Lib_Find.cpp: + * ace/Local_Memory_Pool.cpp: + * ace/Local_Name_Space.cpp: + * ace/Lock.cpp: + * ace/Log_Msg.cpp: + * ace/Log_Msg_Backend.cpp: + * ace/Log_Msg_Callback.cpp: + * ace/Log_Msg_IPC.cpp: + * ace/Log_Msg_NT_Event_Log.cpp: + * ace/Log_Record.cpp: + * ace/MEM_Acceptor.cpp: + * ace/MEM_Connector.cpp: + * ace/MEM_IO.cpp: + * ace/MEM_SAP.cpp: + * ace/MEM_Stream.cpp: + * ace/MMAP_Memory_Pool.cpp: + * ace/Malloc_Allocator.cpp: + * ace/Manual_Event.cpp: + * ace/Mem_Map.cpp: + * ace/Message_Queue.cpp: + * ace/Message_Queue_NT.cpp: + * ace/Message_Queue_Vx.cpp: + * ace/Msg_WFMO_Reactor.cpp: + * ace/Mutex.cpp: + * ace/Name_Proxy.cpp: + * ace/Name_Space.cpp: + * ace/Naming_Context.cpp: + * ace/Notification_Strategy.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_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_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_utsname.cpp: + * ace/OS_NS_sys_wait.cpp: + * ace/OS_NS_time.cpp: + * ace/OS_NS_unistd.cpp: + * ace/OS_NS_wchar.cpp: + * ace/OS_NS_wctype.cpp: + * ace/OS_TLI.cpp: + * ace/OS_main.cpp: + * ace/Obchunk.cpp: + * ace/Object_Manager.cpp: + * ace/Object_Manager_Base.cpp: + * ace/PI_Malloc.cpp: + * ace/Pagefile_Memory_Pool.cpp: + * ace/Pipe.cpp: + * ace/Priority_Reactor.cpp: + * ace/Process.cpp: + * ace/Process_Mutex.cpp: + * ace/Process_Semaphore.cpp: + * ace/Profile_Timer.cpp: + * ace/RW_Mutex.cpp: + * ace/RW_Process_Mutex.cpp: + * ace/RW_Thread_Mutex.cpp: + * ace/Reactor_Impl.cpp: + * ace/Reactor_Notification_Strategy.cpp: + * ace/Reactor_Timer_Interface.cpp: + * ace/Read_Buffer.cpp: + * ace/Recursive_Thread_Mutex.cpp: + * ace/Recyclable.cpp: + * ace/Registry.cpp: + * ace/Registry_Name_Space.cpp: + * ace/Remote_Tokens.cpp: + * ace/SOCK.cpp: + * ace/SOCK_Acceptor.cpp: + * ace/SOCK_CODgram.cpp: + * ace/SOCK_Connector.cpp: + * ace/SOCK_Dgram.cpp: + * ace/SOCK_Dgram_Bcast.cpp: + * ace/SOCK_Dgram_Mcast.cpp: + * ace/SOCK_IO.cpp: + * ace/SOCK_SEQPACK_Acceptor.cpp: + * ace/SOCK_SEQPACK_Association.cpp: + * ace/SOCK_SEQPACK_Connector.cpp: + * ace/SOCK_Stream.cpp: + * ace/SPIPE.cpp: + * ace/SPIPE_Acceptor.cpp: + * ace/SPIPE_Addr.cpp: + * ace/SPIPE_Connector.cpp: + * ace/SPIPE_Stream.cpp: + * ace/SUN_Proactor.cpp: + * ace/SV_Message.cpp: + * ace/SV_Message_Queue.cpp: + * ace/SV_Semaphore_Complex.cpp: + * ace/SV_Semaphore_Simple.cpp: + * ace/SV_Shared_Memory.cpp: + * ace/Sample_History.cpp: + * ace/Sbrk_Memory_Pool.cpp: + * ace/Sched_Params.cpp: + * ace/Select_Reactor_T.cpp: + * ace/Semaphore.cpp: + * ace/Service_Manager.cpp: + * ace/Service_Object.cpp: + * ace/Service_Repository.cpp: + * ace/Service_Types.cpp: + * ace/Shared_Memory.cpp: + * ace/Shared_Memory_MM.cpp: + * ace/Shared_Memory_Pool.cpp: + * ace/Shared_Object.cpp: + * ace/Sig_Adapter.cpp: + * ace/Sig_Handler.cpp: + * ace/Signal.cpp: + * ace/Stack_Trace.cpp: + * ace/Stats.cpp: + * ace/Synch_Options.cpp: + * ace/System_Time.cpp: + * ace/TLI.cpp: + * ace/TLI_Acceptor.cpp: + * ace/TLI_Connector.cpp: + * ace/TLI_Stream.cpp: + * ace/TP_Reactor.cpp: + * ace/TSS_Adapter.cpp: + * ace/TTY_IO.cpp: + * ace/Thread.cpp: + * ace/Thread_Adapter.cpp: + * ace/Thread_Control.cpp: + * ace/Thread_Exit.cpp: + * ace/Thread_Hook.cpp: + * ace/Thread_Mutex.cpp: + * ace/Thread_Semaphore.cpp: + * ace/Throughput_Stats.cpp: + * ace/Time_Value.cpp: + * ace/Timeprobe.cpp: + * ace/Timer_List_T.cpp: + * ace/Token.cpp: + * ace/Token_Invariants.cpp: + * ace/Token_Manager.cpp: + * ace/Token_Request_Reply.cpp: + * ace/Trace.cpp: + * ace/UNIX_Addr.cpp: + * ace/UPIPE_Acceptor.cpp: + * ace/UPIPE_Connector.cpp: + * ace/UPIPE_Stream.cpp: + * ace/UUID.cpp: + * ace/WFMO_Reactor.cpp: + * ace/WIN32_Proactor.cpp: + * ace/XTI_ATM_Mcast.cpp: + * ace/ace_wchar.cpp: + * ace/gethrtime.cpp: + Removed ACE_RCSID - * ace/config-borland-common.h: - * ace/config-cray.h: +Thu Aug 5 08:13:51 UTC 2010 Johnny Willemsen + + * ace/CORBA_macros.h: + * ace/Global_Macros.h: + * ace/Vector_T.h: + * ace/ace_wchar.h: * ace/config-cxx-common.h: + * ace/config-doxygen.h: * ace/config-g++-common.h: * ace/config-hpux-11.00.h: * ace/config-icc-common.h: * ace/config-integritySCA.h: - * ace/config-irix6.x-sgic++.h: - * ace/config-mvs.h: + * ace/config-macros.h: + * ace/config-netbsd.h: * ace/config-openvms.h: * ace/config-suncc-common.h: * ace/config-sunos5.4-sunc++-4.x.h: * ace/config-sunos5.5.h: - * ace/config-sunos5.6.h: * ace/config-tandem-nsk-mips-v2.h: * ace/config-tandem-nsk-mips-v3.h: - * ace/config-tru64.h: - * ace/config-unixware-7.1.0.udk.h: - * ace/config-win32-dmc.h: - * ace/config-win32-ghs.h: - * ace/config-win32-msvc-8.h: - * ace/config-win32-msvc-9.h: - * ace/config-win32-msvc-7.h: - - Remove unused #define of ACE_HAS_TEMPLATE_SPECIALIZATION. This - feature test macro is no longer used. - -Thu Jun 12 18:47:54 UTC 2008 Jeff Parsons - - * ace/Monitor_Control/Solaris_Network_Interface_Monitor.h: - * ace/Monitor_Control/Solaris_Network_Interface_Monitor.cpp: - - New files, containing a base class used with - Bytes_Received_Monitor, Bytes_Sent_Monitor, - Packets_Received_Monitor and Packets_Sent_Monitor - when they are compiled on Solaris platforms. - - * ace/Monitor_Control/Windows_Multi_Instance_Monitor.cpp: - * ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp: - * ace/Monitor_Control/CPU_Load_Monitor.h: - * ace/Monitor_Control/Bytes_Received_Monitor.cpp: - * ace/Monitor_Control/Windows_Monitor.h: - * ace/Monitor_Control/Packets_Received_Monitor.cpp: - * ace/Monitor_Control/Memory_Usage_Monitor.h: - * ace/Monitor_Control/Monitor_Control.mpc: - * ace/Monitor_Control/Num_Threads_Monitor.h: - * ace/Monitor_Control/Bytes_Sent_Monitor.h: - * ace/Monitor_Control/CPU_Load_Monitor.cpp: - * ace/Monitor_Control/Packets_Sent_Monitor.h: - * ace/Monitor_Control/Windows_Monitor.cpp: - * ace/Monitor_Control/Memory_Usage_Monitor.cpp: - * ace/Monitor_Control/Linux_Network_Interface_Monitor.h: - * ace/Monitor_Control/Windows_Multi_Instance_Monitor.h: - * ace/Monitor_Control/Bytes_Received_Monitor.h: - * ace/Monitor_Control/Packets_Received_Monitor.h: - * ace/Monitor_Control/Num_Threads_Monitor.cpp: - * ace/Monitor_Control/Bytes_Sent_Monitor.cpp: - * ace/Monitor_Control/Packets_Sent_Monitor.cpp: - - - Changed required to complete the support of - network interface monitors on Solaris. - - - Changed guards for Windows-specific header file - inclusion to use the recently added ACE_HAS_PDH_H, - which in turn guards the definition of the - ACE_HAS_WIN32_PDH flag used in source code. - - - Changed the names of the platform-specific monitor - update methods to update_i(), from the distinct - names they had before. This changed allowed the - elimination of many #ifdef guards in source code. - -Thu Jun 12 17:42:47 UTC 2008 Steve Huston - - * bin/PerlACE/Process.pm: - * bin/PerlACE/Process_Win32.pm: Moved the Target sub from Process_Win32 - to Process so everybody can see it. Thanks to Chad Elliott for - finding and suggesting the correction for it. - -Thu Jun 12 16:04:33 UTC 2008 Steve Huston - - * bin/tao_orb_tests.lst: Disabled newly added tests on LabVIEW_RT. - - * bin/PerlACE/README: Describes how the ACE+TAO test procedures work. - Includes a description of how to drive the generalized ability to - redirect execution of tests off of the build host. - - * bin/PerlACE/TestTarget.pm: - * bin/PerlACE/TestTarget_LVRT.pm: - * bin/PerlACE/ProcessLVRT.pm: - * bin/PerlACE/Process_Win32.pm: Add the ability to configure various - aspects of ACE+TAO (+CIAO I guess, but haven't tried that) to run - on machines other than the build host and with alternate roots - (ACE_ROOT, TAO_ROOT). This is an effort to generalize the ability - to run off of the build host without adding more switches and options - and convoluted settings and platform-specific code in the main - scripts. The README file explains how to set up modules to extend - testing to other platforms. LabVIEW_RT is the only one there now; - VxWorks is an obvious addition and would allow a bunch of special-case - code to be removed from the main scripts. The test-driving script - does require some change to take advantage of this capability. ACE - tests in ACE_wrappers/tests have the change. A few TAO tests do - (see TAO ChangeLog). Without the changes to the test-driving script - everything behaves as it always did. - - * tests/run_test.pl: Uses the new TestTarget capability, naming the - test target "ace". Thus, to redirect these tests to another machine, - set the DOC_TEST_ACE environment variable with a configuration name - and set configuration variables accordingly. - -Thu Jun 12 14:38:19 UTC 2008 Adam Mitz - - * ace/Stack_Trace.h: - * ace/Stack_Trace.cpp: - - Added support for SPARCv9 (64-bit). - Reverted the Win32 assembly back to the simplest form, we had tried - to make it compatible with Borland but it still didn't work. As of - now ACE compiled by Borland will not generate stack traces. - -Thu Jun 12 12:17:52 UTC 2008 Chad Elliott - - * ace/Stack_Trace.cpp: - - Corrected Win32 assembler compilation error. - -Wed Jun 11 16:24:00 UTC 2008 Phil Mesnier - - * bin/tao_orb_tests.lst: - - Added new test case. - -Wed Jun 11 13:55:00 UTC 2008 Simon Massey - - * ace/Time_Value.inl: - * ace/Time_Value.h: - - Add extra inline void msec(int) that calls void msec(long) - to avoid amiguity between void msec(long) and void msec(_int64 &) - when natual sized integers are given (which seems to be - quite often). - -Wed Jun 11 13:02:22 UTC 2008 Chad Elliott - - * bin/PerlACE/Run_Test.pm: - - Replaced the "use PerlACE::Process". It is necessary to be loaded - inside this module to ensure that all of the command line options - can be processed. - -Wed Jun 11 04:17:42 UTC 2008 J.T. Conklin - - * m4/platform.m4: - - Remove ACE_HAS_AIX_BROKEN_SOCKET_HEADER definitions. - -Wed Jun 11 03:51:32 UTC 2008 J.T. Conklin - - * configure.ac: - * m4/config_h.m4: - - Remove feature test and autoheader template for - ACE_HAS_CHARPTR_SPRINTF. This feature test macro is no longer - used. - -Wed Jun 11 03:39:48 UTC 2008 J.T. Conklin - - * configure.ac: - * m4/config_h.m4: - - Remove feature test and autoheader template for - ACE_LACKS_FLOATING_POINT. This feature test macro is no longer - used. - -Wed Jun 11 03:33:31 UTC 2008 J.T. Conklin - - * configure.ac: - * m4/config_h.m4: - - Remove feature test and autoheader template for - ACE_HAS_TYPENAME_KEYWORD. This feature test macro is no longer - used. - -Wed Jun 11 03:31:02 UTC 2008 J.T. Conklin - - * configure.ac: - * m4/config_h.m4: - - Remove feature test and autoheader template for - ACE_HAS_SPARCWORKS_401_SIGNALS. This feature test macro is no - longer used. - -Wed Jun 11 02:57:12 UTC 2008 J.T. Conklin - - * m4/config_h.m4: - - Remove autoheader template for ACE_HAS_AIX_BROKEN_SOCKET_HEADER. - This feature test macro is no longer used. - -Wed Jun 11 02:52:16 UTC 2008 J.T. Conklin - - * configure.ac: - * m4/config_h.m4: - - Remove feature test and autoheader template for - ACE_SELECT_USES_INT. This feature test macro is no longer used. - -Wed Jun 11 02:48:07 UTC 2008 J.T. Conklin - - * m4/config_h.m4: - - Remove autoheader template for HAVE_RESTARTABLE_SYSCALLS. - This feature test macro is no longer used. - -Wed Jun 11 00:17:01 UTC 2008 J.T. Conklin - - * configure.ac: - * m4/config_h.m4: - - Remove feature test and autoheader template for - ACE_HAS_IRIX_53_SIGNALS. This feature test macro is no longer - used. - -Tue Jun 10 23:57:53 UTC 2008 J.T. Conklin - - * configure.ac: - * m4/config_h.m4: - - Remove feature tests and autoheader templates for - ACE_HAS_STD_TEMPLATE_SPECIALIZATION and - ACE_HAS_STD_TEMPLATE_CLASS_MEMBER_SPECIALIZATION. - These feature test macros are no longer used. - -Tue Jun 10 23:52:19 UTC 2008 J.T. Conklin - - * configure.ac: - * m4/config_h.m4: - - Remove feature test and autoheader template for - ACE_HAS_BROKEN_SAP_ANY. This feature test macro is no longer - used. - -Tue Jun 10 23:49:46 UTC 2008 J.T. Conklin - - * m4/config_h.m4: - - Remove autoheader template for ACE_HAS_BROKEN_NESTED_TEMPLATES. - This feature test macro is no longer used. - -Tue Jun 10 23:47:46 UTC 2008 J.T. Conklin - - * m4/config_h.m4: - - Remove autoheader template for ACE_HAS_SUNOS4_SIGNAL_T. - This feature test macro is no longer used. - -Tue Jun 10 23:45:34 UTC 2008 J.T. Conklin - - * configure.ac: - * m4/config_h.m4: - - Remove feature test and autoheader template for - ACE_HAS_BROKEN_CONDITIONAL_STRING_CAST. This feature test macro - is no longer used. - -Tue Jun 10 23:43:19 UTC 2008 J.T. Conklin - - * configure.ac: - * m4/config_h.m4: - - Remove feature test and autoheader template for - ACE_HAS_BROKEN_CONVERSIONS. This feature test macro is no - longer used. - -Tue Jun 10 23:41:11 UTC 2008 J.T. Conklin - - * configure.ac: - * m4/config_h.m4: - - Remove feature test and autoheader template for - ACE_HAS_BROKEN_NAMESPACES. This feature test macro is no longer - used. - -Tue Jun 10 23:39:09 UTC 2008 J.T. Conklin - - * m4/config_h.m4: - - Remove autoheader template for ACE_HAS_SYSCALL_GETRUSAGE. This - feature test macro is no longer used. - -Tue Jun 10 23:16:31 UTC 2008 J.T. Conklin - - * configure.ac: - * m4/config_h.m4: - - Remove feature test and autoheader template for - ACE_HAS_BROKEN_TIMESPEC_MEMBERS. This feature test macro is no - longer used. - -Tue Jun 10 21:28:23 UTC 2008 J.T. Conklin - - * m4/platform.m4: - - Add ACE_CHECK_GETNAME_RETURNS_RANDOM_SIN_ZERO feature check, - which sets the ACE_GETNAME_RETURNS_RANDOM_SIN_ZERO feature test - macro on Linux systems running kernels older than 2.5.47. This - is a compile time check, like was done in config-linux-common.h, - based on the value of LINUX_VERSION_CODE from . - This means ACE compiled on a newer Linux system but deployed on - an older one could result in run-time failures. - - Fixes Bugzilla #3132. - -Tue Jun 10 21:33:25 UTC 2008 Jeff Parsons - - * ace/CDR_Stream.h: - * ace/CDR_Stream.cpp: - - Replaced a Monitor class forward declaration with the full file - include, moved from the source file to the header file. This - move enables ACE monitor points to compile when inlining is - turned on. - -Tue Jun 10 18:46:24 UTC 2008 Yan Dai - - * ace/Stack_Trace.h: - - Updated comments to not exclude Borland from supported platforms. - - * ace/Stack_Trace.cpp: - - - Moved the label "x" from inside of asm to be outside. Some compiler - does not like it. - - Enabled LynxOS support and excluded support for gcc old versions before 3.3. - -Tue Jun 10 13:56:17 UTC 2008 Adam Mitz - - * ace/Stack_Trace.cpp: - - One more fix for Win32 wchar. - -Tue Jun 10 13:32:57 UTC 2008 Chad Elliott - - * tests/Bug_2980_Regression_Test.cpp: - - Avoid pointer-to-function and pointer-to-object warnings from g++. - -Tue Jun 10 12:53:05 UTC 2008 Chad Elliott - - * tests/SSL/SSL_Asynch_Stream_Test.cpp: - - Modified to avoid virtual method hiding. - -Tue Jun 10 11:37:09 UTC 2008 Chad Elliott - - * tests/Time_Value_Test.cpp: - - Added a static cast to avoid warnings on QNX. - -Tue Jun 10 10:57:00 UTC 2008 Simon Massey - - * ace/ACE.cpp: - - Correct presidence bug highlighted by FC9_GCC_430 build: - ACE.cpp:1429: warning: suggest parentheses around && within || - ACE.cpp:1665: warning: suggest parentheses around && within || - ACE.cpp:1853: warning: suggest parentheses around && within || - The default precidence is && before ||, but the way the || - statements were grouped, it was clear that was not the intended - resolution. - - Correct empty if statement bug highlighted by FC9_GCC_430 build: - ACE.cpp:2773: warning: suggest braces around empty body in an 'if' statement - - Also removed warnings by using empty braces: - ACE.cpp:3389: warning: suggest a space before ';' or explicit braces around empty body in 'while' statement - ACE.cpp:3414: warning: suggest a space before ';' or explicit braces around empty body in 'while' statement - - -Mon Jun 9 21:38:04 UTC 2008 Yan Dai - - * ace/Stack_Trace.cpp: - - Passed string literals instead of ACE_TEXT string to GetProcAddress as it - accepts LPCSTR which is defined as char*. This should fix wchar (Win32) - build errors. - -Mon Jun 9 20:52:52 2008 Steve Huston - - * ace/Asynch_IO.h: Doxygen improvements. - -Mon Jun 9 19:40:56 UTC 2008 Yan Dai - - * ace/Stack_Trace.h: - * ace/Stack_Trace.cpp: - - Excluded LynxOS, MinGW and Borland builds from stack trace supported - platforms. - -Mon Jun 09 14:46:00 UTC 2008 Simon Massey - - * ace/Stack_Trace.cpp: - * ace/Stack_Trace.h: - - Remove TEXT() and TCHAR Fuzz errors. - -Mon Jun 9 11:26:36 UTC 2008 Chad Elliott - - * ace/ace_for_tao.mpc: - - Added Stack_Trace.cpp since Log_Msg.cpp needs it. - -Mon Jun 09 10:42:00 UTC 2008 Simon Massey - - * ace/NT_Service.cpp: - - unambiguated call to time_value msec(long) at line 437 - caused by new uint64 non-const setter provided by: - Thu Jun 5 14:52:43 UTC 2008 Steve Huston - -Sun Jun 8 18:09:22 UTC 2008 J.T. Conklin - - * m4/platform.m4: - - Add ACE_CHECK_HAS_DLSYM_SEGFAULT_ON_INVALID_HANDLE feature - check, which sets the ACE_HAS_DLSYM_SEGFAULT_ON_INVALID_HANDLE - feature test macro on Linux and OpenBSD systems (as is done in - the canned config-*.h files). Fixes Bugzilla #3141. - -Sat Jun 7 13:56:56 UTC 2008 Chad Elliott - - * ace/Log_Msg.cpp: - - Use ACE_TEXT instead of ACE_LIB_TEXT. - -Sat Jun 7 03:28:01 UTC 2008 Yan Dai - - Merged in stack_trace_branch that added stack trace support. - - * NEWS: - - Add an entry for stack trace support. - - * ace/Log_Msg.h: - - Added comments for "%?". - - * ace/Log_Msg.cpp: - - Added new conversion character, the question mark, which gets - replaced by a stack trace on supported platforms. - - * ace/Stack_Trace.h: - * ace/Stack_Trace.cpp: - - Added new class that, on supported platforms, will take a - snapshot of the current stack when instantiated. - - * ace/ace.mpc: - - Added Stack_Trace in as source. - - * ace/config-macosx-leopard.h: - - Added ACE_HAS_EXECINFO_H define. - - * ace/Makefile.am: - - Added Stack_Trace.h and Stack_Trace.cpp. - - * configure.ac: - - Added checks for execinfo.h header. - - * tests/Stack_Trace_Test.cpp: - - New test. - - * tests/run_test.lst: - * tests/tests.mpc: - - Added Stack_Trace_Test in. - -Fri Jun 6 19:05:14 UTC 2008 Chad Elliott - - * bin/PerlACE/ProcessVX_Unix.pm: - * bin/PerlACE/ProcessVX_Win32.pm: - - Put an eval around the require of Net::Telnet so that these - modules can always be "used", but not necessarily employed. - - * bin/PerlACE/Run_Test.pm: - - Use PerlACE::TargetProcess and PerlACE::HostProcess so that all - test scripts may use them. - - * bin/PerlACE/TargetProcess.pm: - * bin/PerlACE/HostProcess.pm: - - Added modules to simplify the writing of test scripts so that - VxWorks testing can be transparent to the script itself. Having - two packages allows for role reversal (using the -reverse_roles - option to run_test.pl). For example, if you have a test that - consists of a server and a client, the script will look like this: - - $SV = new PerlACE::TargetProcess("server", "-o $iorfile"); - $CL = new PerlACE::HostProcess("client", "-k file://$iorfile"); - - If testing for VxWorks, the server process will be run on the - target and the client process will be run on the host. If the - -reverse_roles option is provided to run_test.pl, the server - process will run on the host and the client process will run on - the target. - -Fri Jun 06 13:00:00 UTC 2008 Simon Massey - - * ace/ACE.cpp: - - untabified. - -Fri Jun 06 11:10:00 UTC 2008 Simon Massey - - * ace/ACE.cpp: - - Added #include ace/OS_NS_fcntl.h to previous commit of - Thu Jun 5 23:46:14 UTC 2008 J.T. Conklin. - -Fri Jun 6 08:31:06 UTC 2008 Vladimir Zykov - - * ace/config-hpux-11.00.h: - According to Steve Huston HP-UX does provide strtoull and - wcstoull but they can be used not as straight forward as - in other compilers. I have no access to HP-UX so I added - corresponding TODO comment about ACE_LACKS_STRTOULL and - ACE_LACKS_WCSTOULL that I added previously. - - * ace/config-vxworks6.2.h: - * ace/config-vxworks6.4.h: - * ace/config-vxworks5.x.h: - * ace/config-vxworks6.3.h: - VxWorks doesn't provide wcstoull as well. - Added ACE_LACKS_WCSTOULL. - -Thu Jun 5 23:46:14 UTC 2008 J.T. Conklin - - * ace/ACE.cpp: - - Changed daemonize() to open /dev/null and duplicate the file - descriptor as descriptors 0, 1, and 2 if it is invoked with the - closed_all_handles flag set. This avoids problems with I/O - to/from stdin, stdout, and stderr; cin, cout, and cerr; - etc. being written to/read from whatever files/sockets/devices - associated with descriptors 0, 1, and 2 when they are reopened. - This fixes Bugzilla #3338. - -Thu Jun 5 16:30:58 2008 Steve Huston - - * NEWS: Added note concerning ACE_Time_Value changes from - Thu Jun 5 14:52:43 UTC 2008 Steve Huston - -Tue Jun 3 13:09:27 UTC 2008 Douglas C. Schmidt - - * ace/OS_main.h (wmain): Added - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_END_VERSIONED_NAMESPACE_DECL - - to the ace_wmain_i macro. Thanks to June Fang for reporting this. - -Thu Jun 5 14:52:43 UTC 2008 Steve Huston - - * ace/Time_Value.{h inl}: Added a non-const variant of - void msec(ACE_UINT64&) - this allows the msec(ACE_UINT64&) accessor - to be called on both const and non-const objects without error. - Fixes Bugzilla #3336. Thanks to Simon Massey for this idea. - - * tests/Time_Value_Test.cpp: Added a const-checking msec() call and - corrected the test case. - -Thu Jun 05 13:45:00 UTC 2008 Simon Massey - - * ace/Get_Opt.cpp: - * ace/Get_Opt.h: - * ace/Get_Opt.inl: - - As a conveniance in wide character builds allow the - options string to be specified as a standard narrow - string (that is converted internally). This type of - use is littered throughout the TAO code. - - * ace/OS_NS_stdio.cpp: - * ace/OS_NS_stdio.h: - * ace/OS_NS_stdio.inl: - - As a conveniance in wide character builds allow the - fopen() call to have parameters of mixed wide/narrow - type. This type of use is littered throughout the TAO - code. - - * ace/OS_NS_stdlib.inl: - - Correct the mkstemp facades, they were not returning - the modified template string under wide character builds, - this caused the tao_idl compiler to be unable to find - the pre-processed files to rename that it had just created. - - * examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFC.mpc: - * examples/Log_Msg/Log_Msg_MFC/Log_Msg_Unicode_MFC.mpc: - - Deleted the Unicode specific version, normal one suffices - after all. - - * bin/tao_orb_tests.lst: - - Disabled problematic LynxOS test. - -Wed Jun 4 22:45:20 2008 Steve Huston - - * ace/config-pharlap.h: Added ACE_LACKS_FILELLOCKS. My changes from - Mon Apr 28 21:53:23 UTC 2008 Steve Huston - exposed a call to LockFileEx, which is not present on Pharlap - (and, therefore, not present in LabVIEW RT). The alternate API, - LockFile, is present on Pharlap but documented as unsupported. - Since the OS doesn't do multiple processes, there are more effective - ways to synchronize that file locks anyway. - -Wed Jun 4 20:59:16 UTC 2008 Ciju John - - * ace/SSL/SSL_Context.cpp: - Fix for Bug 3337. ::SSL_add_dir_cert_subjects_to_stack() isn't - ready for Windows. - -Wed Jun 4 17:12:10 UTC 2008 J.T. Conklin - - * ace/ACE.cpp (timestamp): - - Make sure to divide sizeof timebuf by sizeof (ACE_TCHAR) to - avoid buffer overflow. This is another instance of the same - problem fixed in: - - Mon Jun 2 15:26:57 UTC 2008 Douglas C. Schmidt - -Wed Jun 4 16:05:54 UTC 2008 Steve Huston - - * tests/Time_Value_Test.cpp: Added a test case for Bugzilla #3336 - as reported by Aaron Scamehorn. - -Wed Jun 4 14:36:55 UTC 2008 Jeff Parsons - - * ace/Monitor_Point_Registry.cpp: - * ace/Monitor_Base.cpp: - - Disabled warning messages reporting an unsuccessful unbind - of a monitor from the monitor point registry. In some - cases, it appears that the default process reactor singleton - is destroyed before the monitor point registry. The reactor - has an associated ACE_Message_Queue, which in turn has an - associated monitor. Somehow in the destruction of the - singleton, the normal chain of destructor calls, which - would remove the monitor from the registry, is bypassed, - leaving the removal to happen when the registry's - destructor is called and the entry in question is no longer - valid. In any case, this happens only at process shutdown, - and there is no memory leak. Ways to make this happen in - a more friendly fashion are being looked into. - -Tue Jun 3 16:14:39 UTC 2008 Ken Sedgwick - - * rpmbuild/ace-tao.spec: - * rpmbuild/ace-tao-unusedarg.patch: - * rpmbuild/ace-tao-strrecvfd.patch: - - Added ace-tao-strrecvfd.patch (related to bug #3291). - Changed make loop construct to abort when subcomponent fails. - Removed PSS from TAO build list. - Added ace-tao-unusedarg.patch (related to bug #3270). - Made qt3 BuildRequires conditional on Fedora version. - -Mon Jun 2 15:26:57 UTC 2008 Douglas C. Schmidt - - * ace/Log_Record.cpp (format_msg): Make sure to divide sizeof ctp - by sizeof (ACE_TCHAR) to avoid buffer overflow. Thanks to June - Fang for reporting this. - -Sun Jun 1 02:01:38 UTC 2008 Ken Sedgwick - - * rpmbuild/ace-tao.spec: - * rpmbuild/ace-tao-etc.tar.gz: - * rpmbuild/ace-tao-orbsvcs-daemon.patch: - - Added ace-tao-orbsvcs-daemon.patch to workaround - daemonization problems in rpm installed services. - Fixed tao-cosconcurrency command line arguments. - -Fri May 30 13:57:06 UTC 2008 Vladimir Zykov - - * ace/config-vxworks6.2.h: - * ace/config-vxworks6.4.h: - * ace/config-vxworks5.x.h: - * ace/config-vxworks6.3.h: - VxWorks doesn't provide strtoull(). - -Fri May 30 13:48:48 UTC 2008 Vladimir Zykov - - * ace/config-openvms.h: - OpenVMS doesn't provide wcstoull() function. - -Fri May 30 13:37:13 UTC 2008 Vladimir Zykov - - * ace/OS_NS_stdlib.inl: - Fixed MinGW builds. - - * ace/config-cygwin32.h: - Disabled wcstoull() on cygwin since it doesn't provide - such function. - -Fri May 30 13:17:55 UTC 2008 Simon Massey - - * test/INET_Addr_Test_IPV6.cpp: - Resolve Conflict #define INTERFACE with MFC under VC8. - -Fri May 30 10:07:55 UTC 2008 Vladimir Zykov - - * ace/config-win32-borland.h: - Borland compilers doesn't provide strtoull() and wcstoull(). - - * ace/config-sunos5.5.h: - * ace/config-sunos5.10.h: - wcstoull() didn't exist on Solaris until version 10. - - * ace/config-hpux-11.00.h: - HP-UX doesn't provide strtoull() and wcstoull(). - -Thu May 29 16:08:01 UTC 2008 Vladimir Zykov - - * ace/OS_NS_stdlib.cpp: - * ace/OS_NS_stdlib.inl: - * ace/OS_NS_stdlib.h: - - Added strtoull() function to ACE_OS. - - * configure.ac: - - Added a check for presence of strtoull() and wcstoull() - in the build environment. - -Thu May 29 15:15:00 UTC 2008 Simon Massey - - * ace/INET_Addr.cpp: - - Remove tabs to avoid fuzz warning. - -Thu May 29 10:15:00 UTC 2008 Simon Massey - - * tests/Bug_3332_Regression_Test.cpp: - - Remove signed/unsigned comparison warnings. - -Wed May 28 18:13:15 UTC 2008 J.T. Conklin - - * ace/INET_Addr.cpp: - * ace/INET_Addr.h: - - Changed ACE_INET_Addr::get_host_addr(char *, int) to be thread - safe by calling ACE_OS::inet_ntop() instead of - ACE_OS::inet_ntoa(). - - Changed ACE_INET_Addr::get_host_addr(void) to call - INET_Addr::get_host_addr(char *, size) with a static buffer. - - Removed the special cases for VxWorks in both of the above - methods which called inet_ntoa_b() which, according to comments, - was for efficency and thread safety. These are are now as - efficent and thread safe (or not, in the case of ACE_INET_Addr:: - get_host_addr(void)) as any other target platform, but no longer - need a string buffer member in every ACE_INET_Addr instance. - -Wed May 28 13:46:00 UTC 2008 Simon Massey - - * ace/Malloc.h: - Eliminate a warning from some fanicaly builds. - -Wed May 28 08:10:00 UTC 2008 Simon Massey - - * tests/Bug_3332_Regression_Test.cpp: - * tests/Bug_3332_Regression_Test.txt: - * tests/run_test.lst: - * tests/tests.mpc: - - Regression test for the change of: - Fri May 23 12:45:00 UTC 2008 * ace/RB_Tree.cpp. - -Tue May 27 23:10:33 UTC 2008 J.T. Conklin - - * ace/Makefile.am: - - Adding missing template and header files. - -Tue May 27 12:11:07 UTC 2008 Chad Elliott - - * ace/ace.mpc: - - Added missing template and header files. - -Mon May 26 13:54:38 UTC 2008 Olli Savia - - * ace/config-lynxos.h: - Defined ACE_LACKS_POLL_H. - -Mon May 26 07:28:23 UTC 2008 Ken Sedgwick - - * rpmbuild/ace-tao.spec: - Clarified the tao-cosevent and tao-rtevent "Summary" tags. - -Mon May 26 00:31:51 UTC 2008 Ken Sedgwick - - * rpmbuild/ace-tao.spec: - Fixed rpm build error: bad tar extraction command. - -Sun May 25 17:18:20 UTC 2008 Adam Mitz - - * ace/ace.mwc: - - s/MonitorControl/Monitor_Control/ - -Sun May 25 04:11:37 UTC 2008 Ken Sedgwick - - * rpmbuild/ace-tao.spec: - * rpmbuild/ace-tao-rnq.patch: - * rpmbuild/ace-tao-config-tmplvis.patch: - * rpmbuild/ace-tao-hasicmp.patch: - * rpmbuild/ace-tao-obstack.patch: - * rpmbuild/ace-tao-config-ipv6.patch: - Removed ace-tao-obstack.patch, no longer needed. - Converted ace-tao-config-ipv6.patch into conditional rpm script. - Converted ace-tao-rnq.patch into conditional rpm script. - Converted ace-tao-config-tmplvis.patch and ace-tao-hasicmp.patch - into rpm script. - -Sat May 24 19:50:46 UTC 2008 J.T. Conklin - - * bin/MakeProjectCreator/modules/AutomakeWorkspaceHelper.pm: - - Adjust libpaths now that ACE_MonitorControl library has been - renamed to just ACE_Monitor_Control. - -Fri May 23 14:20:48 UTC 2008 J.T. Conklin - - * m4/platform.m4: - - Added *mingw64* case in ACE_SET_PLATFORM_MACROS and - ACE_CHECK_FORMAT_SPECIFIERS feature test macros. - -Fri May 23 12:45:00 UTC 2008 Simon Massey - - * ace/RB_Tree.cpp: - - Enhancement to stop external pointers to retained items being - invalidated upon key deletion. - -Fri May 23 12:14:54 UTC 2008 Jeff Parsons - - * ace/Monitor_Control/Auto_Update_Starter.h: - - Updated filename (which was recently changed) in a comment. - Thanks to Simon Massey for - reporting the fuzz warning. - -Fri May 23 08:14:38 UTC 2008 Olli Savia - - * tests/run_test.lst: - - Run Bug_2980_Regression_Test on LynxOS. - -Fri May 23 00:18:24 UTC 2008 J.T. Conklin - - * ace/Makefile.am: - - Rename MonitorControl subdirectory to Monitor_Control, to - adapt to this change: - - Wed May 21 19:01:10 UTC 2008 Jeff Parsons - -Thu May 22 23:04:38 UTC 2008 J.T. Conklin - - * configure.ac: - - Rename MonitorControl subdirectory to Monitor_Control, to - adapt to this change: - - Wed May 21 19:01:10 UTC 2008 Jeff Parsons - -Thu May 22 19:29:35 UTC 2008 Jeff Parsons - - * ace/Monitor_Base.h (clear): - - Made the method virtual, since it's overridden in the - TAO Notification Service monitors and we are now using - the ACE monitor registry which stores everyhing as the - ACE base class monitor. - -Thu May 22 14:56:10 UTC 2008 Johnny Willemsen - - * bin/PerlACE/ProcessVX_Unix.pm: - * bin/PerlACE/ProcessVX_Win32.pm: - Added support for ACE_RUN_VX_EXE_SUBDIR which can be used when - the vxworks executables are build in a subdirectory - -Thu May 22 09:47:10 UTC 2008 Johnny Willemsen - - * rpmbuild/ace-tao-codeset.patch: - * ace/Codeset_Registry_db.cpp: - Merged patch into the regular registry - - * ace/OS_NS_sys_uio.cpp: - Const change - - * ace/Service_Config.cpp: - Layout change - - * rpmbuild/ace-tao.spec: - Removed codeset patch - -Thu May 22 09:37:10 UTC 2008 Johnny Willemsen - - * rpmbuild/* - New directory with files needed to create rpm's for ACE/TAO. - These files will be improved and we will check whether the - rpm patches can be integrated into the real config files. - Thanks to Ken Sedgwick for - delivering these files. - -Wed May 21 19:01:10 UTC 2008 Jeff Parsons - - * ace/MonitorControl/*: - - Changed directory name to Monitor_Control and renamed all - contained files, classes, libs, MPC projects, ifdef guards, - and macros similarly, to better conform to the ACE style. - - * ace/Monitor_Point_Registry.cpp: - * ace/Monitor_Admin.h: - * ace/Monitor_Admin.cpp: - * bin/MakeProjectCreator/config/ace_mc.mpb: - * examples/Monitor/Bytes_Sent/bytes_sent.cpp: - * examples/Monitor/Bytes_Sent/Makefile.am: - * examples/Monitor/Message_Queue_Size/message_queue_size.cpp: - * examples/Monitor/Message_Queue_Size/Makefile.am: - * examples/Monitor/Constraint/constraint.cpp: - * examples/Monitor/Constraint/Makefile.am: - * examples/Monitor/CPU_Load/cpu_load.cpp: - * examples/Monitor/CPU_Load/Makefile.am: - * examples/Monitor/Num_Threads/Makefile.am: - * examples/Monitor/Num_Threads/num_threads.cpp: - * examples/Monitor/Group/Makefile.am: - * examples/Monitor/Group/group.cpp: - * examples/Monitor/Memory_Usage/Makefile.am: - * examples/Monitor/Memory_Usage/memory_usage.cpp: - - Changes corresponding to the renaming above. - -Wed May 21 14:06:13 UTC 2008 Jeff Parsons - - * ace/Monitor_Base.h: - * ace/Monitor_Base.cpp: - - Made the update() method non pure virtual. - -Tue May 20 19:33:29 UTC 2008 Jeff Parsons - - * ace/Message_Queue_T.cpp: - - Added the stringified process id to the construction of - the message queue size monitor's name, since some tests - were showing that message queues were being created with - the same hex address in different processes. - -Tue May 20 17:55:39 UTC 2008 Chad Elliott - - * ace/Svc_Handler.h: - - Added an enum to be used as flags parameter for close(). - - * ace/Acceptor.cpp: - * ace/Connector.cpp: - * ace/Strategies_T.cpp: - - Use the new enum during the call to close() on the service handler - to indicate the circumstances behind the closure. - - This is part of a set of commits for Bug 2935. - -Tue May 20 09:45:21 UTC 2008 Johnny Willemsen - - * ace/Ping_Socket.{h,cpp}: - Use bool - -Mon May 19 19:26:21 UTC 2008 Johnny Willemsen - - * tests/Log_Msg_Test.cpp: - On VxWorks/LynxOS we didn't test the buffer overflow, but we - shouldn't test this when ACE_LACKS_VSNPRINTF is defined - because it will then fail - -Mon May 19 19:13:21 UTC 2008 Johnny Willemsen - - * ace/Hash_Map_Manager_T.h: - Doxygen change - - * ace/Hash_Map_Manager_T.cpp (shared_find) - Set errno to ENOENT when the size is zero - -Mon May 19 19:08:21 UTC 2008 Johnny Willemsen - - * bin/tao_orb_tests.lst: - Added 2085 and 2243 - -Mon May 19 14:19:21 UTC 2008 Johnny Willemsen - - * docs/bczar/bczar.html: - Updated mailing lists - - * docs/Download.html: - * etc/index.html: - Updated for x.6.5 - - * ace/config-openvms.h: - Removed sock max of 64kb - -Mon May 19 02:53:21 CDT 2008 Johnny Willemsen - - * ACE version 5.6.5 released. - -Fri May 16 10:13:15 UTC 2008 Johnny Willemsen - - Reverted change below, causes problems in the builds - * include/makeinclude/platform_linux.GNU: - Only set DLD and LD when they are not set yet - -Fri May 16 07:50:15 UTC 2008 Johnny Willemsen - - * tests/Based_Pointer_Test.cpp: - Also define a public destructor to silence the gnu warning that - we only have private - -Fri May 16 07:49:15 UTC 2008 Johnny Willemsen - - * examples/Monitor/Num_Threads/num_threads.cpp: - Fixed compile errors when monitoring framework is disabled - -Fri May 16 07:41:15 UTC 2008 Johnny Willemsen - - * examples/APG/Streams/Answerer.cpp: - * examples/APG/Streams/EndTask.h: - Replaced EndTask with TheEndTask to resolve a name conflict - when using MinGW - -Fri May 16 07:18:15 UTC 2008 Johnny Willemsen - - * include/makeinclude/platform_linux.GNU: - * include/makeinclude/platform_linux_common.GNU: - Support lib64 paths to detect certain features. Thanks to Ken - Sedgwick for reporting this - - * include/makeinclude/platform_linux.GNU: - Only set DLD and LD when they are not set yet - -Thu May 15 14:00:15 UTC 2008 Johnny Willemsen - - * ace/Based_Pointer_T.{h,inl}: - * tests/Based_Pointer_Test.cpp: - Fixed bugzilla 3285, make it possible to use - ACE_Based_Pointer. Thanks to Thomas Brownridge - for reporting this. - -Thu May 15 12:36:42 UTC 2008 Phil Mesnier - - * ace/MMAP_Memory_Pool.cpp: - When using a default base address of 0x0 and otherwise wanting - a fixed address, a special flag was used to imply that after the - first address is selected the system in a call to ::mmap() - subsequent calls to ::mmap() reuse the selected base address - as a fixed address. This may cause problems with reloading - persistent data if the stored data contains pointers and the - system selected base address changes from run to run. - - * ace/config-linux-common.h: - The default base address for the x86-64 platform cannot be 0x0. - Doing so causes the system to choose an address which for some - unknown reason causes SEGV errors in Malloc_T. The linux-specific - mmap flag, MAP_32BIT, resolves those segv errors, but on x86-64 - using 0x0 as the default base address on subsequent runs cause - a different assigned base address to be selected. If the data - in the mapped memory contains pointers to mapped memory, those - are then wrong and cause SEGV crashs. By experimentation, it - seems the default base address for powerpc is appropriate for - x86-64. - -Thu May 15 10:19:15 UTC 2008 Johnny Willemsen - - * include/makeinclude/rules.lib.GNU: - Fixed OpenVMS specific part - -Thu May 15 10:17:15 UTC 2008 Johnny Willemsen - - * ace/Unbounded_Set_Ex.cpp: - Fixed bug in the insert method - - * ace/Unbounded_Set_Test.cpp: - Extended this test to reproduce the bug above and replaced all - ACE_ASSERTS with if checks - -Thu May 15 10:05:00 UTC 2008 Simon Massey - - * bin/msvc_mpc_auto_compile.pl: - Split orbsvcs out from ciao build. - -Thu May 15 07:09:15 UTC 2008 Johnny Willemsen - - * ace/ace.mpc: - Added config-win32-msvc9.h, thanks to for - reporting this - -Wed May 14 20:41:17 2008 Steve Huston - - * ace/Thread_Manager.h: Expanded the documentation, particularly for - spawn[_n]. - -Wed May 14 18:30:15 UTC 2008 Johnny Willemsen - - * ace/config-irix6.x-common.h: - * ace/config-linux-common.h: - * ace/config-sunos5.4-g++.h: - * ace/config-sunos5.4-sunc++-4.x.h: - * ace/config-sunos5.5.h: - * ace/config-tandem.h: * ace/config-unixware-7.1.0.h: * ace/config-unixware-7.1.0.udk.h: - * ace/MonitorControl/MemoryUsageMonitor.cpp: - * ace/MonitorControl/MemoryUsageMonitor.h: - * ace/OS.inl: - * ace/os_include/os_unistd.h: - * ace/os_include/sys/os_resource.h: - * ace/POSIX_Proactor.cpp: - * ace/configure.ac: - Seems we already had a ACE_HAS_SYSINFO but this is a different - method but with the same name as we use in the monitoring code. - Added ACE_HAS_SYS_SYSTEMINFO_H as new define, renamed the - linux define to ACE_HAS_LINUX_SYSINFO - -Wed May 14 18:14:15 UTC 2008 Johnny Willemsen - - * ace/ACE.cpp: - Layout changes - - * ace/config-vxworks5.x.h: - * ace/OS_NS_unistd.inl: - * ace/Sock_Connect.cpp: - Extended for VxWorks Medusa - - * ace/Logging_Strategy.cpp: - Initialise pointer with 0 - -Wed May 14 14:26:15 UTC 2008 Johnny Willemsen - - * include/makeinclude/platform_vxworks5.5.x.GNU: - Detect medusa pid/pcd/pne - -Wed May 14 12:34:15 UTC 2008 Johnny Willemsen - - * ace/os_include/os_pdhmsg.h: - New file - - * ace/config-win32-common.h: - Added ACE_HAS_PDHMSG_H - - * ace/config-win32-mingw.h: - * ace/config-WinCE.h: - Added ACE_LACKS_PDHMSG_H - - * ace/Makefile.am: - Added new file - - * ace/MonitorControl/WindowsMultiInstanceMonitor.cpp: - Use new os_pdhmsg.h - -Wed May 14 12:24:15 UTC 2008 Johnny Willemsen - - * ace/os_include/os_kstat.h: - * ace/os_include/sys/os_sysinfo.h: - New header files - - * ace/os_include/os_glob.h: - * ace/os_include/sys/os_statvfs.h: - Removed not needed includes - - * configure.ac: - Added check for sysinfo.h - - * ace/config-linux-common.h: - Added ACE_HAS_SYSINFO and ACE_HAS_SYSINFO_H - - * ace/Makefile.am: - Added new files - - * ace/MonitorControl/CPULoadMonitor.h: - * ace/MonitorControl/MemoryUsageMonitor.cpp: - * ace/MonitorControl/MemoryUsageMonitor.h: - Use the new defines and header files - -Wed May 14 10:41:15 UTC 2008 Johnny Willemsen - - * ace/*: - * examples/Monitor/*: - Renamed MonitorControl namespace to Monitor_Control to comply - to ACE coding guidelines - -Wed May 14 09:48:15 UTC 2008 Johnny Willemsen - - * tests/run_test.lst: - Enabled some more tests on vxworks - -Tue May 13 19:20:15 UTC 2008 Johnny Willemsen - - * bin/diff-builds.pl: - Updated for move of test stats - -Mon May 12 12:19:15 UTC 2008 Jeff Parsons - - * examples/Monitor/MC_Test_Utilities.h: - * examples/Monitor/Bytes_Sent/bytes_sent.cpp: - * examples/Monitor/Message_Queue_Size/message_queue_size.cpp: - * examples/Monitor/Constraint/constraint.cpp: - * examples/Monitor/CPU_Load/cpu_load.cpp: - * examples/Monitor/MC_Test_Utilities.cpp: - * examples/Monitor/Group/group.cpp: - * examples/Monitor/Memory_Usage/memory_usage.cpp: - - Added appropriate preprocessor guards to ensure a - successful build when ACE_HAS_MONITOR_FRAMEWORK is - defined as 0. - - * examples/Monitor/Message_Queue_Size/Message_Queue_Size.mpc: - - Removed outdated macro additions from project. - -Fri May 9 18:58:52 UTC 2008 Iliyan Jeliazkov - - * ace/Service_Config.h: - * ace/Service_Config.inl: - * ace/Service_Config.cpp: - * ace/Service_Gestalt.cpp: - - Calling ACE_Service_Config::open() does not correctly initialize - the SC global state (process name, in particular but others - too). Fixing bug#3319. - -Fri May 9 17:58:21 UTC 2008 J.T. Conklin - - * bin/MakeProjectCreator/modules/AutomakeWorkspaceHelper.pm: - - Revert changes of: - Thu May 8 22:13:24 UTC 2008 J.T. Conklin - - Now that ETCL Parser library has been renamed back to - ACE_ETCL_Parser. - -Fri May 9 17:55:39 UTC 2008 J.T. Conklin - - * examples/Monitor/Bytes_Sent/Makefile.am: - * examples/Monitor/Message_Queue_Size/Makefile.am: - * examples/Monitor/Constraint/Makefile.am: - * examples/Monitor/CPU_Load/Makefile.am: - * examples/Monitor/Num_Threads/Makefile.am: - * examples/Monitor/Group/Makefile.am: - * examples/Monitor/Memory_Usage/Makefile.am: - * ace/ETCL/Makefile.am: - * ace/MonitorControl/Makefile.am: - - Regenerated. - -Fri May 9 14:17:11 UTC 2008 William R. Otte - + * ace/config-win32-borland.h: + * ace/config-win32-dmc.h: + * ace/config-win32-ghs.h: + * ace/config-win32-interix.h: + * ace/config-win32-msvc-10.h: + * ace/config-win32-msvc-7.h: + * ace/config-win32-msvc-8.h: + * ace/config-win32-msvc-9.h: + * include/makeinclude/platform_aix.GNU: + * include/makeinclude/platform_aix_g++.GNU: + * include/makeinclude/platform_aix_ibm.GNU: + * include/makeinclude/platform_cray.GNU: + * include/makeinclude/platform_freebsd.GNU: + * include/makeinclude/platform_gnuwin32_common.GNU: + * include/makeinclude/platform_hpux_aCC.GNU: + * include/makeinclude/platform_hpux_gcc.GNU: + * include/makeinclude/platform_integrity_ghs.GNU: + * include/makeinclude/platform_irix6.x_common.GNU: + * include/makeinclude/platform_linux_common.GNU: + * include/makeinclude/platform_lynxos.GNU: + * include/makeinclude/platform_macosx.GNU: + * include/makeinclude/platform_macosx_common.GNU: * include/makeinclude/platform_macosx_icc.GNU: - - Support for ICC on Intel Macs. - -Fri May 9 12:04:15 UTC 2008 Johnny Willemsen - - * ace/config-all.h: - Added ACE_HAS_MONITOR_POINTS which currently is set to 0. We will - enable this in a few builds to test them in detail. This way the - user can decide to enable the monitor framework but not get the - ACE builtin monitor points - - * ace/CDR_Stream.cpp: - * ace/CDR_Stream.h: - * ace/CDR_Stream.inl: - * ace/Message_Queue_T.cpp: - * ace/Message_Queue_T.h: - Added monitor points - - * ace/Codeset_IBM1047.cpp: - Removed code to silence the hp compiler, this is not needed in other - files - -Fri May 9 11:44:59 UTC 2008 Jeff Parsons - - * bin/MakeProjectCreator/config/ace_etcl_parser.mpb: - - Changed the filename etcl_parser.mpb to the one - above, for consistency in the names of ACE-related - files. Also changed the corresponding library name - to ACE_ETCL_Parser. - - * ace/ETCL/ACE_ETCL_Parser.pc.in: - - Changed the name of ETCL_Parser.pc.in likewise. - Also changed the contents of this file accordingly. - - * ace/ETCL/ETCL.mpc: - * ace/MonitorControl/MonitorControl.mpc: - * bin/MakeProjectCreator/config/ace_mc.mpb: - - Changes corresponding to the name changes above. - -Thu May 8 23:03:15 UTC 2008 J.T. Conklin - - * bin/MakeProjectCreator/config/ace_zlib.mpb: - - ACE-specific zlib base project that overrides library settings - in MPC's own zlib base project for the automake build. - -Thu May 8 22:13:24 UTC 2008 J.T. Conklin - - * bin/MakeProjectCreator/modules/AutomakeWorkspaceHelper.pm: - - Adjust libpaths now that ACE_ETCL_Parser library has been - renamed to just ETCL_Parser. - -Thu May 8 22:07:40 UTC 2008 J.T. Conklin - - * ace/ETCL/Makefile.am: - - Regenerated. - - * ace/ETCL/ACE_ETCL.pc.in: - * ace/ETCL/ETCL_Parser.pc.in: - - New pkg-config template files. - - * ace/ETCL/ETCL.mpc: - - Add Pkgconfig_Files sections for ACE_ETCL and ETCL_Parser - projects. - -Thu May 8 21:06:29 UTC 2008 Jeff Parsons - - * ace/ETCL/ETCL_Constraint_Visitor.h: - * ace/ETCL/ETCL_Constraint_Visitor.cpp: - - Removed a no-op method mean to be overridden - in derived visitors, but then abandoned. - -Fri May 2 17:45:13 UTC 2008 Douglas C. Schmidt - - * docs/ACE-guidelines.html: Updated the style guide to discuss the - use of '_' vs intercaps. - -Thu May 8 10:51:29 UTC 2008 Steve Huston - - * include/makeinclude/platform_sunos5_g++.GNU: Ensure -pipe is not - inserted into CCFLAGS twice. Similar to earlier change from - Wed Jan 23 17:23:31 UTC 2008 Steve Huston - Fixes Bugzilla #3232. - -Thu May 8 08:06:10 UTC 2008 Johnny Willemsen - - * ace/ETCL/ETCL_l.cpp: - * ace/ETCL/ETCL_y.cpp: - Fixed casing of include - -Wed May 7 19:28:35 UTC 2008 Steve Huston - - * ace/Unbounded_Set.{h inl}: Replaced typedef BASE with base_type. - Avoids a BASE macro on AIX. - -Wed May 7 19:02:51 UTC 2008 Jeff Parsons - - * ace/ETCL/ETCL_include: - - Removed this directory. - - * ace/ETCL/etcl_parser_export.h: - - Relocated here from ace/ETCL/ETCL_include. - - * bin/MakeProjectCreator/config/etcl_parser.mpb: - - Renamed this file from ace_etcl_parser.mpb. - - * ace/ETCL/ETCL_l.cpp: - * ace/ETCL/ETCL.yy - * ace/ETCL/ETCL_Interpreter.cpp: - * ace/ETCL/ETCL.ll: - * ace/ETCL/ETCL_y.cpp: - * ace/ETCL/ETCL_Interpreter.h: - * ace/ETCL/ETCL.mpc: - * ace/MonitorControl/MonitorControl.mpc: - * bin/MakeProjectCreator/config/ace_mc.mpb: - - All changes in this checkin are to remove - unnecessary things as a result of making the - ETCL parser the only one used. The corresponding - parser in TAO is eliminated. - -Wed May 7 17:11:10 UTC 2008 Johnny Willemsen - - * include/makeinclude/platform_linux_icc.GNU: - Added ICC 11.0 - -Wed May 7 14:28:54 UTC 2008 Chad Elliott - - * bin/ChangeLogEditor/FileLocatorFactory.pm: - - Changed to detect Subversion before CVS. - -Wed May 7 14:12:10 UTC 2008 Johnny Willemsen - - * tests/Bug_3319_Regression_Test.cpp: - * tests/run_test.lst: + * include/makeinclude/platform_macosx_panther.GNU: + * include/makeinclude/platform_netbsd.GNU: + * include/makeinclude/platform_openbsd.GNU: + * include/makeinclude/platform_openvms.GNU: + * include/makeinclude/platform_qnx_rtp_gcc.GNU: + * include/makeinclude/platform_rtems.x_g++.GNU: + * include/makeinclude/platform_sunos5_g++.GNU: + * include/makeinclude/platform_sunos5_sunc++.GNU: + * include/makeinclude/platform_tandem.GNU: + * include/makeinclude/platform_tru64_cxx.GNU: + * include/makeinclude/platform_tru64_g++.GNU: + * include/makeinclude/platform_unixware_g++.GNU: + * include/makeinclude/platform_vxworks5.5.x.GNU: + * include/makeinclude/platform_vxworks6.2.GNU: + * include/makeinclude/platform_vxworks6.3.GNU: + * include/makeinclude/platform_win32_dmc.GNU: + * include/makeinclude/platform_win32_icc.GNU: + * include/makeinclude/platform_win32_interix.GNU: + * include/makeinclude/wrapper_macros.GNU: + * tests/Bug_3673_Regression_Test.cpp: + * tests/Reactor_Exceptions_Test.cpp: * tests/tests.mpc: - Added regression for bugzilla 3319 + Removed support for non exception builds, ACE_HAS_EXCEPTIONS is + now always defined -Wed May 7 10:52:10 UTC 2008 Johnny Willemsen + * rpmbuild/ace-tao.spec: + Small updates - * ace/Hash_Map_Manager_T.cpp: - Fixed GCC warning about maybe unitialised use and also - use prefix decrement and no need for some intermediate variables + * ace/Exception_Macros.h: + * bin/MakeProjectCreator/config/exceptions.mpb: + Removed these files. -Wed May 7 08:42:10 UTC 2008 Johnny Willemsen +Thu Aug 5 07:40:00 UTC 2010 Build CZar - * ace/config-vxworks5.x.h: - Added ACE_HAS_4_4BSD_SENDMSG_RECVMSG + * ace/OS_NS_Thread.cpp: + Add the missing ; to the lines added by the fix below. + Wed Aug 4 14:16:46 UTC 2010 Johnny Willemsen -Wed May 7 07:03:29 UTC 2008 William R. Otte +Wed Aug 4 17:21:17 UTC 2010 Chris Cleeland - * ace/Unbounded_Set.h + * bin/MakeProjectCreator/config/crosscompile.mpb: + Added specific clause for cdt6. - Fuzz fix. +Wed Aug 4 14:16:46 UTC 2010 Johnny Willemsen -Wed May 7 06:33:30 UTC 2008 William R. Otte + * ace/OS_NS_Thread.cpp: + Check more internal return values - * ace/Unbounded_Set.inl + * rpmbuild/ace-tao.spec-bugfixonly.patch: + Removed this file, not needed - Fix unused argument warning. +Tue Aug 3 12:14:51 UTC 2010 Johnny Willemsen -Tue May 6 17:03:17 UTC 2008 William R. Otte + * bin/generate_doxygen.pl: + * html/index.html: + DAnCE has its own file now and also some documentation got moved + out of the tao directory - * ace/Hash_Map_Manager_T.cpp: - Fixed segfault if shared_find is called on a map of size zero. - - * ace/Log_Msg.h: - - Comments for trace_active were swapped. - - * ace/Node.h: - * ace/Node.cpp: - * ace/Unbounded_Set.h: - * ace/Unbounded_Set.inl: - * ace/Unbounded_Set.cpp: - * ace/Unbounded_Set_Ex.h: - * ace/Unbounded_Set_Ex.inl: - * ace/Unbounded_Set_Ex.cpp: - - Extended the Unbounded_Set to include a comparator template parameter, - which must implement operator (), which returns true if the items are - equivalent. This class has been renamed Unbounded_Set_Ex. - - Unbounded_Set is now implemented in terms of Unbounded_Set_Ex with a - comparator that uses operator== to compare the items. - - * ace/Service_Gestalt.h: - * tests/Unbounded_Set_Test.cpp: - - Slight updates to conform with new implementation. - - * NEWS - - Added description for above. - -Tue May 6 12:37:43 UTC 2008 Jeff Parsons - - * ace/ETCL/ETCL_Constraint.h: - * ace/ETCL/ETCL_Constraint_Visitor.cpp: - * ace/ETCL/ETCL_Constraint_Visitor.h: - * ace/ETCL/ETCL_Constraint.inl: - * ace/ETCL/ETCL_Constraint.cpp: - - Moved code from the TAO ETCL classes to base classes - here. - -Tue May 6 08:27:10 UTC 2008 Johnny Willemsen - - * bin/PerlACE/ProcessVX_Unix.pm: - * bin/PerlACE/ProcessVX_Win32.pm: - Added support for ACE_RUN_VX_TGT_TELNET_HOST and - ACE_RUN_VX_TGT_TELNET_PORT so that an explicit telnet server - can be configured. If not specified we use ACE_RUN_VX_TGTHOST - which also specifies the ip address that is used as endpoint - for the corba servers - -Mon May 5 17:09:10 UTC 2008 Johnny Willemsen - - * include/makeinclude/build_dll.bor: - * include/makeinclude/build_exe.bor: - * include/makeinclude/build_lib.bor: - Handle files with cxx extension just as we could handle cpp files - -Mon May 5 07:53:10 UTC 2008 Johnny Willemsen - - * ace/os_include/os_pdh.h: - New os_include file for pdh.h - - * ace/configure.ac: - Added check for pdh.h - - * ace/Makefile.am: - Added new file - - * ace/config-win32-common.h: - * ace/config-win32-mingw.h: - * ace/config-WinCE.h: - Windows has pdh.h, but not MinGW and not WinCE - - * ace/MonitorControl/BytesReceivedMonitor.cpp: - * ace/MonitorControl/BytesReceivedMonitor.h: - * ace/MonitorControl/BytesSentMonitor.cpp: - * ace/MonitorControl/BytesSentMonitor.h: - * ace/MonitorControl/CPULoadMonitor.cpp: - * ace/MonitorControl/CPULoadMonitor.h: - * ace/MonitorControl/MemoryUsageMonitor.cpp: - * ace/MonitorControl/MemoryUsageMonitor.h: - * ace/MonitorControl/NumThreadsMonitor.cpp: - * ace/MonitorControl/NumThreadsMonitor.h: - * ace/MonitorControl/PacketsReceivedMonitor.cpp: - * ace/MonitorControl/PacketsReceivedMonitor.h: - * ace/MonitorControl/PacketsSentMonitor.cpp: - * ace/MonitorControl/PacketsSentMonitor.h: - * ace/MonitorControl/WindowsMonitor.cpp: - * ace/MonitorControl/WindowsMonitor.h: - * ace/MonitorControl/WindowsMultiInstanceMonitor.cpp: - * ace/MonitorControl/WindowsMultiInstanceMonitor.h: - Use ACE_HAS_WIN32_PDH instead of ACE_WIN32 because with WinCE and - MinGW we don't have pdh on windows - -Mon May 5 07:37:10 UTC 2008 Johnny Willemsen - - * examples/Monitor/CPU_Load/cpu_load.cpp: - * examples/Monitor/Group/group.cpp: - Fixed C90 warnings - -Mon May 5 07:30:10 UTC 2008 Johnny Willemsen - - * examples/Monitor/MC_Test_Utilities.mpc: - Don't build with ace_for_tao enabled - -Sat May 3 17:00:07 UTC 2008 J.T. Conklin - - * bin/MakeProjectCreator/modules/AutomakeWorkspaceHelper.pm: - - Add relative libdirs for new ACE_ETCL, ACE_ETCL_Parser, and - ACE_MonitorControl libraries. - -Sat May 3 13:47:21 UTC 2008 J.T. Conklin - - * examples/Makefile.am: - - Regenerated. - -Fri May 2 23:58:38 UTC 2008 J.T. Conklin - - * configure.ac: - - Build new example directories. - - * examples/Monitor/Bytes_Sent/Makefile.am: - * examples/Monitor/Message_Queue_Size/Makefile.am: - * examples/Monitor/Constraint/Makefile.am: - * examples/Monitor/CPU_Load/Makefile.am: - * examples/Monitor/Num_Threads/Makefile.am: - * examples/Monitor/Group/Makefile.am: - * examples/Monitor/Memory_Usage/Makefile.am: - * examples/Monitor/Makefile.am: - * examples/Semaphores/Makefile.am: - - New Makefile.am's. - -Fri May 2 23:29:06 UTC 2008 J.T. Conklin - - * ace/ETCL/Makefile.am: - - Regenerated. - - * ace/ETCL/ETCL.mpc: - - Add automake specific rule for includes. - -Fri May 2 22:53:46 UTC 2008 J.T. Conklin - - * configure.ac: - - Build ace/ETCL and ace/MonitorControl. - -Fri May 2 21:54:40 UTC 2008 J.T. Conklin - - * ace/ETCL/Makefile.am: - * ace/MonitorControl/Makefile.am: - - New Makefile.am's. - - * ace/Makefile.am: - - Regenerated. - -Fri May 2 18:36:41 UTC 2008 Jeff Parsons - - * ace/ETCL/ETCL_Interpreter.h: - - Fix for build problems with versioned namespaces turned on. - -Fri May 2 17:50:10 UTC 2008 Johnny Willemsen - - * ace/config-vxworks6.2.h: - * ace/config-vxworks6.3.h: - * ace/config-vxworks6.4.h: - Only define _C99 when it is not defined yet - -Fri May 2 17:20:37 UTC 2008 Steve Huston - - * tests/Message_Queue_Test.cpp: Removed the delay sleep between loop - iterations - it causes the test to time out too often. Increased - the message count back to multiples of 100,000. - -Fri May 2 15:34:55 UTC 2008 Steve Huston - - * tests/RW_Process_Mutex_Test.cpp: Fixed compile warning about - redundant variable. - -Fri May 2 11:07:10 UTC 2008 Johnny Willemsen - - * ace/MMAP_Memory_Pool.{h,cpp}: - Doxygen improvements and moved the documentation about the - handle_signal method from the cpp to the header file so that - it appears in the doxygen documentation - -Fri May 2 09:36:10 UTC 2008 Johnny Willemsen - - * bin/tao_orb_tests.lst: - Added Bug_3315_Regression - -Fri May 2 08:25:10 UTC 2008 Johnny Willemsen - - * bin/msvc_static_order.lst: - Added new libs - -Fri May 2 08:15:10 UTC 2008 Johnny Willemsen - - * ace/ace_for_tao.mpc: - Added new monitor files - -Fri May 2 08:04:10 UTC 2008 Johnny Willemsen - - * ace/Monitor_Admin.cpp - * ace/Monitor_Admin.h - * ace/MonitorControl/AutoUpdateStarter.cpp - * ace/MonitorControl/AutoUpdateStarter.h - * ace/MonitorControl/MonitorControl_utils.h - Updated for naming conventions - -Fri May 2 07:47:10 UTC 2008 Johnny Willemsen - - * examples/Monitor/Bytes_Sent/bytes_sent.cpp - * examples/Monitor/Constraint/constraint.cpp - * examples/Monitor/CPU_Load/cpu_load.cpp - * examples/Monitor/Group/group.cpp - * examples/Monitor/Memory_Usage/memory_usage.cpp - * examples/Monitor/Message_Queue_Size/message_queue_size.cpp - * examples/Monitor/Num_Threads/num_threads.cpp - Updated include - - * examples/Monitor/Bytes_Sent/Bytes_Sent.mpc - * examples/Monitor/Constraint/Constraint.mpc - * examples/Monitor/Num_Threads/Num_Threads.mpc - * examples/Monitor/Group/Group.mpc - * examples/Monitor/CPU_Load/CPU_Load.mpc - * examples/Monitor/Message_Queue_Size/Message_Queue_Size.mpc - Don't build with ace_for_tao - -Thu May 1 22:35:17 UTC 2008 Steve Huston - - * ace/MonitorControl/MonitorControl.mpc: - * bin/MakeProjectCreator/config/ace_mc.mpb: - Avoid wince - it lacks the needed PDH capability. - -Thu May 1 18:27:10 UTC 2008 Johnny Willemsen - - * ace/MonitorControl/MonitorControl.mpc: - * bin/MakeProjectCreator/config/ace_mc.mpb: - Use ACE_MonitorControl as shared library name - -Thu May 1 17:31:01 UTC 2008 Iliyan Jeliazkov - - * ace/Service_Config.cpp: Removed an assert guarding the case when - the current thread has no associated configuration context. Added - code that would initialize the thread's configuration context with - the global, instead. This addresses bug# 3315. - -Thu May 1 17:11:48 UTC 2008 Jeff Parsons - - * ace/ace.mwc: - - Added MonitorControl directory to the workspace. - -Thu May 1 17:05:37 UTC 2008 Jeff Parsons - - * ace/MonitorControl/PacketsSentMonitor.h: - * ace/MonitorControl/WindowsMultiInstanceMonitor.cpp: - * ace/MonitorControl/WindowsMonitor.cpp: - * ace/MonitorControl/PacketsReceivedMonitor.cpp: - * ace/MonitorControl/MonitorGroup.h: - * ace/MonitorControl/MonitorQuery.h: - * ace/MonitorControl/NumThreadsMonitor.cpp: - * ace/MonitorControl/PacketsSentMonitor.cpp: - * ace/MonitorControl/MonitorGroup.cpp: - * ace/MonitorControl/WindowsMultiInstanceMonitor.h: - * ace/MonitorControl/WindowsMonitor.h: - * ace/MonitorControl/MonitorControl_utils.h: - * ace/MonitorControl/MonitorQuery.cpp: - * ace/MonitorControl/PacketsReceivedMonitor.h: - * ace/MonitorControl/NumThreadsMonitor.h: - - Changed header includes to be consistently relative - to $ACE_ROOT. - -Thu May 1 16:11:12 UTC 2008 Jeff Parsons - - * MonitorControl/*: - - Moved this directory to $ACE_ROOT/ace. - -Thu May 1 15:56:58 UTC 2008 Steve Huston - - * tests/run_test.lst: Change Bug_2980_Regression_Test's !MSVC to - !Win32. The test won't run on Windows per its comments, but no - XML configs set MSVC - they set Win32. - -Thu May 1 15:27:25 UTC 2008 Steve Huston - - * tests/Message_Queue_Test.cpp: In the counting test, run multiples - of 50,000 instead of 100,000, blocks. The test is timing out on a - number of platforms. - - * tests/RW_Process_Mutex_Test.cpp: Fix signed/unsigned warnings and - wchar build error. Changed the default lock name to something other - than the program's name. Using the program name produces "text - file busy" when attempting a file lock on it... doh... - -Thu May 1 14:47:33 UTC 2008 Jeff Parsons - - * MonitorControl/examples/*: - - Removed this directory and moved its contents to - $ACE_ROOT/examples/Monitor. - - * bin/MakeProjectCreator/config/acelib.mpb: - - Cosmetic changes. - -Thu May 1 14:37:03 UTC 2008 Chad Elliott - - * bin/MakeProjectCreator/modules/VXTestProjectCreator.pm: - - Override the warn_useless_project() method so that we are no - longer warned about "no useful targets" for this project type. - -Wed Apr 30 22:01:10 UTC 2008 Steve Huston - - * tests/RW_Process_Mutex_Test.cpp: New test for proper functioning - of ACE_RW_Process_Mutex. - - * tests/tests.mpc: - * tests/run_test.lst: Add RW_Process_Mutex_Test. - -Wed Apr 30 21:14:45 UTC 2008 James H. Hill - - * ace/Hash_Map_Manager_T.h: - - Two of the backwards compatible iterators for - ACE_Hash_Map_Manager incorrectly defined the iterator_category - trait based on the container_type, which does not have an - iterator_category. Now the trait is defined in terms of its - base class. This resolved Bugzilla Bug #3314. - -Wed Apr 30 16:49:27 UTC 2008 Jeff Parsons - - * MonitorControl/PacketsSentMonitor.h: - * MonitorControl/BytesReceivedMonitor.h: - * MonitorControl/PacketsReceivedMonitor.h: - * MonitorControl/BytesSentMonitor.h: - - Added include of export header file, since it's not - pulled in indirectly on Solaris builds. - - * MonitorControl/WindowsMultiInstanceMonitor.cpp: - - Fixed signed/unsigned comparison warnings on wchar builds. - -Wed Apr 30 16:24:41 UTC 2008 Jeff Parsons - - * MonitorControl/CPULoadMonitor.cpp: - * MonitorControl/WindowsMonitor.cpp: - * MonitorControl/WindowsMultiInstanceMonitor.cpp: - * MonitorControl/MemoryUsageMonitor.cpp: - * MonitorControl/NumThreadsMonitor.cpp: - * MonitorControl/LinuxNetworkInterfaceMonitor.cpp: - - Fixed wchar build errors. - -Wed Apr 30 13:49:52 UTC 2008 Steve Huston - - * ace/UUID.cpp (get_timestamp_and_clocksequence): Case clock sequence - value using ACE_UINT16 instead of u_char to prevent duplicates - when many UUIDs are generated quickly. Thanks to Wim van den Boogaard - for this fix. Resolves Bugzilla #3313. - -Tue Apr 29 19:52:48 UTC 2008 Steve Huston - - * ace/Proactor.cpp: Simplify the timer_handler_ task spawn and - shutdown. Also, if close() sees an error from the implementation's - close, don't stop closing. Things are most likely already ripped - apart too far to recover from, and it's likely to cause a hang to - just try to stop closing now. - - * ace/POSIX_Asynch_IO.cpp: Correctly handle the ACE_Message_Block - pointers passed to operations and later updating when complete. - Thanks to Fernando C. Jeronymo for diagnosing this problem. - - * THANKS: Added Fernando C. Jeronymo to the Hall of Fame. - - * tests/Proactor_UDP_Test.cpp: Fix to close down correctly in - half-duplex mode. - -Tue Apr 29 19:12:53 UTC 2008 Jeff Parsons - - * bin/MakeProjectCreator/config/ace_etcl_parser.mpb: - - Changed the path of the 'includes' line to match - the new location of ETCL. - - * MonitorControl/Constraint_Interpreter.cpp: - * MonitorControl/Constraint_Visitor.h: - * MonitorControl/Constraint_Visitor.cpp: - * MonitorControl/Constraint_Interpreter.h: - - Updated #includes to match the new location of ETCL. - - * MonitorControl/AutoUpdateStarter.h: - - Moved location of enabled monitors check, it was - previous to any place it could see the #define in - an included file. - - * MonitorControl/examples/Constraint/constraint.cpp: - * MonitorControl/examples/CPU_Load/cpu_load.cpp: - * MonitorControl/examples/Group/group.cpp: - - Some compile warnings fixed. - -Tue Apr 29 18:37:10 UTC 2008 Johnny Willemsen - - * MonitorControl/AutoUpdateStarter.h: - * MonitorControl/Constraint_Interpreter.h: - * MonitorControl/Constraint_Visitor.h: - * MonitorControl/LinuxNetworkInterfaceMonitor.h: - * MonitorControl/MonitorControl.h: - * MonitorControl/MonitorQuery.h: - * MonitorControl/WindowsMonitor.h: - * MonitorControl/WindowsMultiInstanceMonitor.h: - Make sure we have at least one include before pragma once - -Tue Apr 29 18:27:10 UTC 2008 Johnny Willemsen - - * docs/bczar/bczar.html: - * etc/index.html: - Updated Beta to Micro - -Tue Apr 29 18:02:22 UTC 2008 Jeff Parsons - - * ETCL/*: - - Moved this directory and all its contents to $ACE_ROOT/ace. - Also changed #includes to be relative to $ACE_ROOT. - - * ace/ace.mwc: - - Added ETCL directory. - - * docs/svn/svn-prefs.reg: - - Added *.diff to list. - -Tue Apr 29 17:45:10 UTC 2008 Johnny Willemsen - - * MonitorControl/examples/Bytes_Sent/bytes_sent.cpp: - * MonitorControl/examples/Constraint/constraint.cpp: - * MonitorControl/examples/CPU_Load/cpu_load.cpp: - * MonitorControl/examples/Group/group.cpp: - * MonitorControl/examples/Memory_Usage/memory_usage.cpp: - * MonitorControl/examples/Message_Queue_Size/message_queue_size.cpp: - * MonitorControl/examples/Num_Threads/num_threads.cpp: - Updated main for unicode - -Tue Apr 29 13:14:10 UTC 2008 Johnny Willemsen - - * tests/Test_Output.cpp: - Check for ACE_VXWORKS - -Tue Apr 29 13:12:10 UTC 2008 Johnny Willemsen - - * MonitorControl/AutoUpdateStarter.cpp: - * MonitorControl/Constraint_Interpreter.cpp: - * MonitorControl/Constraint_Interpreter.h: - * MonitorControl/Constraint_Visitor.cpp: - * MonitorControl/Constraint_Visitor.h: - * MonitorControl/CPULoadMonitor.cpp: - * MonitorControl/LinuxNetworkInterfaceMonitor.cpp: - * MonitorControl/NumThreadsMonitor.cpp: - * MonitorControl/WindowsMonitor.cpp: - * MonitorControl/WindowsMultiInstanceMonitor.cpp: - Updated includes to fix errors and improve compile speed when - this lib is disabled - -Tue Apr 29 08:16:10 UTC 2008 Johnny Willemsen - - * bin/MakeProjectCreator/templates/vxtest.mpd: - Zap empty line - - * bin/PerlACE/ProcessVX.pm: - * bin/PerlACE/ProcessVX_Unix.pm: - * bin/PerlACE/ProcessVX_Win32.pm: - Improved handling of vxtest file - -Tue Apr 29 07:23:10 UTC 2008 Johnny Willemsen - - * ace/MEM_Connector.cpp: - * ace/Service_Manager.cpp: - * ace/SOCK_Dgram_Mcast.cpp: - Reverted accidental commits from Doug - -Tue Apr 29 06:32:10 UTC 2008 Johnny Willemsen - - * bin/MakeProjectCreator/modules/VXTestProjectCreator.pm: - Generate exename.vxtest instead of project name - - * bin/MakeProjectCreator/templates/vxtest.mpd: - Don't generate ld < - -Mon Apr 28 22:34:10 UTC 2008 Steve Huston - - * tests/Proactor_UDP_Test.cpp: Fix compile errors on non-Windows. - -Mon Apr 28 21:53:23 UTC 2008 Steve Huston - - * docs/ACE-development-process.html: Fix a few remaining nits. - - * ace/OS_NS_stdio.inl: Removed all the pre-ACE_HAS_WINNT4 code in the - file locks methods. This was the only place left in ACE that - referred to ACE_HAS_WINNT4; all pre-NT4 support was removed last - year from the rest of ACE. This also corrects behavior of file - locks as well as ACE_RW_Process_Mutex. - - * ace/RW_Process_Mutex.h: Doxygen improvements. - - * ace/SOCK_CODgram.h: Doxygen improvements. - - * ace/SOCK_CODgram.cpp (open): If either of the local or remote - addresses is specified, use its address family rather than the - value of protocol_family. If both are specified, they must match. - - * tests/Message_Queue_Test.cpp: Added a counting test to validate the - queue's message counting. - - * tests/Proactor_UDP_Test.cpp: New test for UDP with ACE_Proactor. - - * tests/tests.mpc: - * tests/run_test.lst: Add Proactor_UDP_Test. - -Mon Apr 28 19:21:54 UTC 2008 Johnny Willemsen - - * bin/PerlACE/ProcessVX.pm: - * bin/PerlACE/ProcessVX_Unix.pm: - * bin/PerlACE/ProcessVX_Win32.pm: - Use the vxtest file when testing shared non rtp - -Mon Apr 28 19:06:10 UTC 2008 Jeff Parsons - - * MonitorControl/MonitorControl.h: - - Added ACE_HAS_MONITOR_FRAMEWORK guard to this file. - -Mon Apr 28 18:24:54 UTC 2008 Johnny Willemsen - - * ace/ace_wchar.h: - Added defines needed to build MonitorControl unicode - - * MonitorControl/WindowsMonitor.cpp: - * MonitorControl/WindowsMultiInstanceMonitor.cpp: - Make a correct difference between unicode and non unicode builds - - * ace/Strategies_T.{h,inl}: - Refcount from base is now a long - -Mon Apr 28 18:23:55 UTC 2008 Adam Mitz - - * bin/PerlACE/ProcessVX_Unix.pm: - - Fixed a bug in my previous commit of this file, - $cmdnr was not updated when the unload commands were added. - -Mon Apr 28 17:59:43 UTC 2008 Jeff Parsons - - * Constraint_Interpreter.cpp: - * Constraint_Visitor.h: - * MonitorGroup.h: - * MonitorQuery.h: - * AutoUpdateStarter.h: - * Constraint_Visitor.cpp: - * MonitorGroup.cpp: - * Constraint_Interpreter.h: - * MonitorQuery.cpp: - * AutoUpdateStarter.cpp: - * MonitorControl_utils.h: - - Added ACE_HAS_MONITOR_FRAMEWORK guards - similarly to the other files in the library. - -Mon Apr 28 17:54:54 UTC 2008 Johnny Willemsen - - * MonitorControl/BytesReceivedMonitor.cpp: - * MonitorControl/BytesSentMonitor.cpp: - * MonitorControl/CPULoadMonitor.cpp: - * MonitorControl/MemoryUsageMonitor.cpp: - * MonitorControl/NumThreadsMonitor.cpp: - * MonitorControl/PacketsReceivedMonitor.cpp: - * MonitorControl/PacketsSentMonitor.cpp: - * MonitorControl/WindowsMonitor.cpp: - * MonitorControl/WindowsMonitor.h: - * MonitorControl/WindowsMultiInstanceMonitor.cpp: - * MonitorControl/WindowsMultiInstanceMonitor.h: - Fixed unicode compile problems on windows - -Mon Apr 28 13:25:54 UTC 2008 Johnny Willemsen - - * examples/APG/Streams/streams.mpc: - * examples/C++NPv2/C++NPv2.mpc: - Use base projects - -Mon Apr 28 13:20:40 UTC 2008 Douglas C. Schmidt - - * ace/Vector_T.inl (ACE_Vector): Take another shot at fixing the - max_size() problem. - -Mon Apr 28 12:45:18 UTC 2008 Chad Elliott - - * bin/tao_orb_tests.lst: - - Added the new TAO HandleExhaustion test for all but Windows. - -Mon Apr 28 12:21:55 UTC 2008 Douglas C. Schmidt - - * ace/Vector_T.inl (ACE_Vector): Zapped the "this->" in "this->max_size()". - Thanks to Karl-Heinz for reporting this. - -Mon Apr 28 12:13:54 UTC 2008 Johnny Willemsen - - * include/makeinclude/platform_sunos5_common.GNU: - Added kstat support needed for monitoring lib on solaris - -Mon Apr 28 12:05:54 UTC 2008 Johnny Willemsen - - * MonitorControl/*: - Merge from MonitorControl branch. - -Mon Apr 28 11:37:54 UTC 2008 Johnny Willemsen - - * ace/config-all.h: - * ace/Global_Macros.h: - Moved set of define to config-all - - * ace/Truncate.h: - * ace/Condition_T.h: - Doxygen fix - -Mon Apr 28 11:36:46 UTC 2008 Chad Elliott - - * ace/Acceptor.h: - * ace/Acceptor.cpp: - - Added a virtual method to facilitate the configurable handling of - accept() errors. - -Mon Apr 28 11:30:54 UTC 2008 Johnny Willemsen - - * ETCL/*: - New ETCL library for ACE - - * bin/MakeProjectCreator/config/ace_etcl.mpb: - * bin/MakeProjectCreator/config/ace_etcl_parser.mpb: - * bin/MakeProjectCreator/config/ace_mc.mpb: - New base projects - - * bin/MakeProjectCreator/config/acenosubsets.mpb: - Layout changes - -Mon Apr 28 10:31:54 UTC 2008 Johnny Willemsen - - * ace/Monitor_Admin.cpp: - * ace/Monitor_Admin.h: - * ace/Monitor_Admin_Manager.cpp: - * ace/Monitor_Admin_Manager.h: - * ace/Monitor_Base.cpp: - * ace/Monitor_Base.h: - * ace/Monitor_Base.inl: - * ace/Monitor_Control_Action.cpp: - * ace/Monitor_Control_Action.h: - * ace/Monitor_Control_Types.cpp: - * ace/Monitor_Control_Types.h: - * ace/Monitor_Point_Registry.cpp: - * ace/Monitor_Point_Registry.h: - * ace/ace.mpc: - * ace/Global_Macros.h: - First commit coming from the Monitor branch. This will add a - monitoring framework to ACE with which size of queues, cpu load - and other resources can be monitored. - -Sun Apr 27 05:55:54 UTC 2008 Johnny Willemsen - - * ace/Service_Object.cpp: - Fixed big introduced by some cleanup I did - -Fri Apr 25 21:47:54 UTC 2008 Adam Mitz - - * bin/MakeProjectCreator/templates/vxtest.mpd: - * bin/PerlACE/ProcessVX_Unix.pm: - - Began integration of the foo.vxtest files into the actual testing - process. This needs to get enhanced in ProcessVX_Win32.pm too. - -Fri Apr 25 21:21:56 UTC 2008 Adam Mitz - - * ace/Object_Manager.cpp: - - Removed a comment that no longer applies. - - * bin/PerlACE/Process_Win32.pm: - - Changed the check for failure to spawn a process, in order to avoid - a race condition (the spawned process exits normally before we even - check its status). - - * bin/auto_run_tests.pl: - - With -s, account for different parameter formatting requirements in - the win32 and posix sandbox programs. - -Fri Apr 25 14:25:00 UTC 2008 Simon Massey - - * tests/Unload_libACE.cpp: - I've backed out this change due to lack of time to chase up - the lack of macro definitions. This will need to be revisited. - -Fri Apr 25 10:40:00 UTC 2008 Simon Massey - - * tests/Unload_libACE.cpp: - This test wasn't using ACE_TMAIN. - -Fri Apr 25 09:10:00 UTC 2008 Simon Massey - - * bin/MakeProjectCreator/config/global.features: - * examples/Log_Mgs/Log_Msg_MFC/Log_Mgs_MFC.mpc: - Feature name "uses_wchar" already used within ACE/TAO. Replaces - the "unicode" feature name. Template / project names within MPC - still named unicode. - -Thu Apr 24 18:45:32 UTC 2008 Johnny Willemsen - - * ace/config-linux-common.h: - When ACE_LACKS_STROPTS_H not is defined we assume we have - strbut so we set ACE_HAS_STRBUF_T - -Thu Apr 24 16:47:16 UTC 2008 Chad Elliott - - * bin/tao_orb_tests.lst: - - The DLL_ORB test requires threads. Disable it when the ST config - is used. - -Thu Apr 24 15:05:50 UTC 2008 Simon McQueen - - * bin/tao_orb_tests.lst: - - Scheduled new regression test for bug #3299. - -Thu Apr 24 09:55:00 UTC 2008 Simon Massey - - * bin/MakeProjectCreator/config/ace_unicode.mpb: - * bin/MakeProjectCreator/config/global.features: - Default unicode=0 feature. Unicode does not depend upon MFC, - may be used together as necessary. - - * examples/Log_Mgs/Log_Msg_MFC/Log_Mgs_MFC.mpc: - * examples/Log_Mgs/Log_Msg_MFC/Log_Mgs_Unicode_MFC.mpc: - Split out the unicode requirements. - -Thu Apr 24 05:58:32 UTC 2008 Johnny Willemsen - - * ace/Refcountable_T.{cpp,inl}: - Use ACE_INLINE - -Thu Apr 24 05:47:32 UTC 2008 Johnny Willemsen - - * ace/config-posix.h: - Reverted change below, already made a similar change which is less risky - - Thu Apr 17 19:27:23 UTC 2008 Douglas C. Schmidt - * ace/config-posix.h: Added a check for - - #if defined _XOPEN_STREAMS && _XOPEN_STREAMS == -1 - # define ACE_LACKS_STROPTS_H - #endif - - so that ACE will compile properly on Fedora 8. Thanks to - Jules Colding for this fix. - -Thu Apr 17 19:27:23 UTC 2008 Douglas C. Schmidt - - * ace/config-posix.h: Added a check for - - #if defined _XOPEN_STREAMS && _XOPEN_STREAMS == -1 - # define ACE_LACKS_STROPTS_H - #endif - - so that ACE will compile properly on Fedora 8. Thanks to - Jules Colding for this fix. - -Wed Apr 23 18:29:32 UTC 2008 Johnny Willemsen - - * ace/Refcountable.{h,cpp,inl}: - * ace/Refcountable_T.{h,cpp,inl}: - Changed ACE_Refcountable to ACE_Refcountable_T which has a - trait for the type of lock. ACE_Refcountable is now a typedef - of ACE_Refcountable_T. Also the refcount - type is now a long so that we can make use of the Atomic_Op - optimizations on some platforms - - * ace/ace.mpc: - * ace/Makefile.am: - Updated for the change above - -Wed Apr 23 14:49:32 UTC 2008 Johnny Willemsen - - * ace/config-linux-common.h: - When _XOPEN_STREAMS is defined to -1 we don't have stropts.h, - this fixes bugzilla 3291. Thanks to Jules Colding - for reporting this - -Wed Apr 23 14:10:32 UTC 2008 Johnny Willemsen - - * docs/ACE-development-process.html: - We are using svn as repository - -Wed Apr 23 14:01:32 UTC 2008 Johnny Willemsen - - * bin/generate_rel_manpages: - Corrected doxygen path - - * bin/group_test_stats.sh: - Helper script to analyze test stat diffs - - * ace/Sig_Handler.{h,cpp}: - Doxygen changes and changed third_party_sig_handler flag to a - bool - - * ace/Service_Repository.{h,cpp}: - Changed ignore_suspended to a bool - - * ace/Intrusive_Auto_Ptr.h: - Fixed typo in comment - - * ace/config-vxworks6.2.h: - * ace/config-vxworks6.3.h: - * ace/config-vxworks6.4.h: - Removed workaround that is only needed with VxWorks 5.5.1 - - * ace/Codeset_Registry_db.cpp: - Added UCS2 and correct short names. This fixes bugzilla 3295 - - * ace/Codeset_IBM1047.h: - Doxygen changes - - * ace/Cleanup_Strategies_T.h: - Layout changes - - * ace/Service_Gestalt.{h,inl}: - No need for virtual methods, use bool and doxygen changes - - * ace/Service_Manager.h: - Explicitly mark destructor as virtual - - * ace/Service_Object.{h,cpp,inl}: - Use bool - -Wed Apr 23 01:53:32 CDT 2008 Johnny Willemsen - - * ACE version 5.6.4 released. - -Wed Apr 16 13:06:05 UTC 2008 Iliyan Jeliazkov - - * ace/ARGV.cpp: - Don't quote quotes already quoted. - -Mon Apr 14 12:10:57 UTC 2008 Johnny Willemsen - - * tests/run_test.pl: - Don't run 2980 when WCHAR is set - -Mon Apr 14 11:08:57 UTC 2008 Johnny Willemsen - - * ace/Threading_Helper_T.cpp: - Removed - - * ace/Makefile.am: - Removed file above - - * ace/Service_Config.{h,cpp,inl}: - Changed the template instantiations like we have for Atomic_Op. - -Mon Apr 14 09:54:57 UTC 2008 Johnny Willemsen - - * tests/tests.mpc: - Don't build 2980 with wchar enabled and added empty resource - file section - -Mon Apr 14 08:59:57 UTC 2008 Johnny Willemsen - - * ace/Threading_Helper_T.cpp: - Added new file with the threading helper template code. This resolves - the strange link problems with BCB. This file is included in the - Service_Config.h file - - * ace/Makefile.am: - Added new files - - * ace/Service_Config.{h,cpp,inl}: - Include the new Threading_Helper_T.cpp and removed the implementation - from these files - - * tests/tests.mpc: - Added missing include for bug 2980 - - * ace/Codeset_Registry.h: - Fixed typo in comment - - * ace/Shared_Object.h: - Doxygen changes - -Mon Apr 14 01:56:06 UTC 2008 Iliyan Jeliazkov - - * ace/Service_Config.h: - * ace/Service_Config.inl: - * ace/Service_Config.cpp: - - Moved ACE_Threading_Helper ctor and dtor implementaion - inline. This makes them available to code that indirectly - references the threadkey_ member (like, in examples/). This - should resolve link-time problems with borland compilers. - - * tests/Bug_2980_Regression_Test.cpp (unloadDll): - - Fixing warnings about missing extern "C" qualifier in call to - pthread_create. - -Sun Apr 13 07:27:57 UTC 2008 Johnny Willemsen - - * ace/OS_NS_Thread.cpp (_vx_call_entry): - Set the sc::current before calling main. This resolves the - sc asserts with vxworks kernel mode. Thanks to Iliyan - for suggesting this addition - -Fri Apr 11 17:36:34 UTC 2008 Douglas C. Schmidt +Sun Aug 1 18:14:03 UTC 2010 Johnny Willemsen + * NEWS: + * bin/diff-builds-and-group-fixed-tests-only.sh: + * bin/make_release.py: * docs/Download.html: - * docs/ACE-development-process.html: - * docs/ACE-bug-process.html: Updated these files to use the major, - minor, and micro release terminology. + * etc/index.html: + Updated because of release -Fri Apr 11 15:26:08 UTC 2008 Iliyan Jeliazkov + * debian/*: + Did rename actions the release script didn't do, have to sort this + out later - * tests/Bug_2980_Regression_Test.cpp: - * tests/run_test.lst: +Sun Aug 01 11:30:54 CEST 2010 Johnny Willemsen - Including config-lite.h: the driver is non-ACE but it still - needs to know platform-specific stuff, like threads usage, - etc. + * ACE version 5.8.1 released. -Fri Apr 11 01:51:13 UTC 2008 Iliyan Jeliazkov +Thu Jul 29 14:41:32 UTC 2010 Steve Huston - * ace/Svc_Conf_Tokens.h: - * ace/svcconf.mpb: + * ace/Process.h (set_handles): Clarify that passing ACE_INVALID_HANDLE + for any of the handle values will cause a duplicate of the + corresponding ACE_STDIN/OUT/ERR to be used in the options. - Fixing a fuzz build warning of a missing $Id. Also, not all - make(1)'s have $(MV), so changing mpb to use just "mv" +Thu Jul 29 10:43:32 UTC 2010 Marcel Smit -Thu Apr 10 22:32:58 UTC 2008 Iliyan Jeliazkov + * bin/MakeProjectCreator/config/global.features: + * bin/MakeProjectCreator/config/inetssl.mpb: + * protocols/ace/INet/inet_ssl.mpb: + Created a new feature, inet_ssl. When set, the INet libary + builds, using SSL. To let the INet libary use SSL, one should + enable the inet_ssl feature in default.features and add ssl=1 to + the platform_macos.GNU. - * ace/Service_Config.h: - * ace/Service_Config.cpp: +Mon Jul 26 20:26:53 UTC 2010 Steve Huston - Fixing compile problems with single-thread-only builds - using - the compiler's abilities (partial specialization) to generate - appropriate code. + * ace/OS_NS_Thread.h: Note that the cpu_set_size to the get/set + affinity methods is a byte count. - * ace/Svc_Conf.h: - * ace/Svc_Conf_Token_Table.h: - * ace/Svc_Conf_Tokens.h: - * ace/Svc_Conf_y.cpp: - * ace/svcconf.mpb: +Mon Jul 26 07:02:30 UTC 2010 Martin Corino - Changes to fix compile problems related to versioned namespace - use. Eliminated custom token file post-processing - replaced - with a wrapper header file (yacc(1) is now producing - Token_Table.h, which gets included in Tokens.h) + * bin/MakeProjectCreator/config/inet.mpb: + * protocols/ace/INet/inet.mpc: + Added avoids += corba_e_compact. -Thu Apr 10 14:42:04 UTC 2008 Iliyan Jeliazkov +Thu Jul 22 04:35:30 UTC 2010 Martin Corino - * ace/Svc_Conf.h: + * bin/MakeProjectCreator/config/inet.mpb: + * protocols/ace/INet/inet.mpc: + Added avoids += ace_for_tao. - Adding YYSTYPE_IS_DECLARED to prevent yacc(1) from trying to use a - trivial definition of YYSTYPE. +Wed Jul 21 18:23:32 UTC 2010 Douglas C. Schmidt - * ace/Svc_Conf.y: + * ace/Basic_Types.h (ACE_INT8_FORMAT_SPECIFIER): Added the missing + "_ASCII" to the ACE_INT8_FORMAT_SPECIFIER macro usage. Thanks + to Andre Kostur for reporting + this. - Fixing an unused variable warning. Adding an YYSTYPE guard. +Wed Jul 21 15:52:32 UTC 2010 Phil Mesnier - * ace/Svc_Conf_Tokens.h: - * ace/Svc_Conf_y.cpp: - * ace/svcconf.mpb: - - Undefining YYSTYPE_IS_DECLARED at the bottom of Svc_Conf_Tokens.h - prevents it from leaking and poluting the global namespace. This - allows other yacc(1) based parsers to be used in ACE - apps. Cleaning up and recording generated files. - -Thu Apr 10 13:27:13 UTC 2008 Chad Elliott - - * tests/Bug_2980_Regression_Test.cpp: - - Fixed compilation issues and reversed the CAN_RUN_TEST check to - get it to run on non-win32 and non-vxworks operating systems. - -Thu Apr 10 10:11:57 UTC 2008 Johnny Willemsen - - * ace/Dynamic_Service.inl: - Corrected method signatures - -Thu Apr 10 10:03:57 UTC 2008 Johnny Willemsen - - * tests/Bug_2980_Regression_Test.cpp: - Fixed BCB compile error - -Thu Apr 10 07:13:57 UTC 2008 Johnny Willemsen - - * include/makeinclude/platform_linux_pgi.GNU: - Removed deprecated linker flags - - * ace/Dev_Poll_Reactor.cpp: - * ace/Notification_Queue.cpp: - * ace/Service_Config.cpp: - * ace/Service_Object.cpp: - * ace/Sock_Connect.cpp: - Added missing includes - - * ace/Notification_Queue.cpp: - * ace/Notification_Queue.inl: - Added missing versioned namespace macros - -Thu Apr 10 06:41:57 UTC 2008 Johnny Willemsen - - * ace/Service_Gestalt.h: - Added include of Guard_T.h - - * include/makeinclude/platform_linux_pgi.GNU: - Updated for latest pgCC version - -Thu Apr 10 00:50:53 UTC 2008 Iliyan Jeliazkov - - * tests/Bug_2980_Regression_Test.cpp: - * tests/tests.mpc: - - Fixing a compile problem with no-threads builds. - -Wed Apr 9 22:05:30 UTC 2008 Iliyan Jeliazkov - - * ace/Svc_Conf.h: - * ace/Svc_Conf.y: - * ace/Svc_Conf_Lexer.h: - * ace/Svc_Conf_Lexer.cpp: - * ace/Svc_Conf_Param.h: - * ace/Svc_Conf_Tokens.h: - * ace/Svc_Conf_y.cpp: - * ace/svcconf.mpb: - - Simplified the build sequence reducing the number of additional - transformations needed for Bison's parser output. That includes - the elimination of the ACE_YY prefix, which was necessary only - because of these transformations. Added ACE_TEXT around naked - string literals. Fixed build warnings with unicode builds. - -Wed Apr 9 20:22:46 UTC 2008 Iliyan Jeliazkov - - * ace/Service_Repository.cpp: - Fixing relocate_i to both account for empty slots _and_ provide - useful logging. - -Wed Apr 9 18:24:57 UTC 2008 Johnny Willemsen - - * bin/tao_orb_tests.lst: - Don't run 3171 with CORBA/e micro - -Wed Apr 9 11:50:27 UTC 2008 Chad Elliott - - * bin/MakeProjectCreator/modules/VXTestProjectCreator.pm: - - Added a need_to_write_project override method to only allow the - project file to be written if it is an executable project. - - * bin/MakeProjectCreator/modules/VXTestWorkspaceCreator.pm: - - Fixed a bug where an invalid base module was used in the @ISA. - -Wed Apr 9 11:41:57 UTC 2008 Johnny Willemsen - - * tests/Bug_2980_Regression_Test.cpp: - Check for ACE_VXWORKS - -Wed Apr 9 11:11:57 UTC 2008 Johnny Willemsen - - * ace/Svc_Conf_y.cpp: - Fixed unicode build problems - -Wed Apr 9 08:06:57 UTC 2008 Johnny Willemsen - - * ace/Svc_Conf.y: - * ace/Svc_Conf_y.cpp: - Fixed unicode build problems - -Wed Apr 9 07:18:57 UTC 2008 Johnny Willemsen - - * ace/Service_Config.h: - Export ACE_Threading_Helper, it is used as protected class - member - - * ace/Service_Gestalt.cpp: - Don't use ACE_LIB_TEXT - - * ace/High_Res_Timer.h: - * ace/Based_Pointer_T.h: - Doxygen changes - - * ace/Naming_Context.cpp: - Fixed gcc 4.3 warning - - * ace/OS_NS_errno.h (last_error): - Give the argument a name so that doxygen can do its work - - * ace/Select_Reactor_T.cpp: - Use scoping - - * ace/MMAP_Memory_Pool.{h,cpp}: - Add a bool flag to indicate whether the signal handler has to - be installed or not. Made some other flags bool and win32 there - is no need have a signal handler as member. This fixes bugzilla - 3290 - -Wed Apr 9 02:43:37 UTC 2008 Iliyan Jeliazkov - - * ace/Dynamic_Service.inl (instance): - Adjusting interface to take a smart pointer. - - * ace/OS_NS_unistd.cpp (argv_to_string): - Adding interpretation for tabs and new line characters as - characters to trigger quoting. - - * ace/Service_Config.h: - * ace/Service_Config.cpp: * ace/Service_Gestalt.h: * ace/Service_Gestalt.inl: * ace/Service_Gestalt.cpp: - * ace/Service_Repository.cpp: - Reformatting, updating comments and logging. -Wed Apr 9 01:21:42 UTC 2008 Douglas C. Schmidt + Reverted for_TAO specific change, revised the processing to + ensure default first, then files, then cmdline directives. - * ace/Condition_T.cpp (wait): Fixed a bug where the mutex - parameter wasn't being used properly if abstime was 0. Thanks - to Andriy Gapon for reporting this. - -Mon Apr 7 18:49:57 UTC 2008 Johnny Willemsen - - * bin/MakeProjectCreator/docs/templates/gnu.txt: - Document linkflags - -Mon Apr 7 15:21:38 UTC 2008 Iliyan Jeliazkov - - This the second part of the SC refatoring. It builds on top of - the intrusive refcounting mechanism introduced earlier to improve - design and eliminate memory issues (leaks, SEGV on shutdown) - - * ace/Service_Config.cpp (open_i,ACE_Service_Config): - - Moved the implicit configuration file handling from open_i to - the SG instance. Eliminated close_svcs() by incorporating its - functionality in close(). - - * ace/Service_Config.inl: - * ace/Service_Config.h (ACE_Service_Config_Guard,ACE_Service_Config): - - Removing the inheritance relationship between Service Config and - Service Gestalt. To simplify the memory management, SC becomes an - interface to the actual configuration data managed by SG. Coupled - with the reference counting of SG instances, this ensures correct - memory management in multi-threaded environments where both the - TSS and the user code may trigger SG finalization. - - Introducing ACE_Threading_Helper to simplify TSS management - (RAII idiom). Changed ACE_Service_Config_Guard to use the new - smart pointer for SG. Doxygen comments cleanup. - - * ace/Svc_Conf.y: - * ace/Svc_Conf_y.cpp: - - Fixing unused function definition - - * tests/Bug_2980_Regression_Test.cpp: - - Updating the test to prevent it from breaking vxWorks builds - which appear to lack a declaration for dlopen() - -Sun Apr 6 01:53:13 UTC 2008 Iliyan Jeliazkov - - * ace/Service_Gestalt.cpp: - - Fixing unused variable warning. - - * ace/Svc_Conf_y.cpp: - * ace/svcconf.mpb: - - Ensuring there are no TAB characters present in the generated - file. - - * tests/run_test.lst: - - Excluding Bug_2980_Regression as it is not runnable on vxWorks. - -Sat Apr 5 16:21:50 UTC 2008 Iliyan Jeliazkov - - * ace/Service_Config.inl: - * ace/Service_Config.cpp: - * ace/Service_Gestalt.cpp: - * ace/Service_Gestalt.h: - - Making SG intrusively refcountable by introducing - intrusive_{add,remove}_ref methods and a refcounter. Adding - skip_default_svc_conf_file parameter in process_directives. - - * ace/svcconf.mpb: - * tests/Object_Manager_Flipping_Test.cpp: - - Reformatting and cleanup. - -Sat Apr 5 13:42:57 UTC 2008 Johnny Willemsen - - * tests/Bug_2980_Regression_Test.cpp: - Fixed argument not used warnings - -Sat Apr 5 13:36:57 UTC 2008 Johnny Willemsen - - * ace/Parse_Node.cpp: - Moved include out of versioned namespace block - -Sat Apr 5 11:50:40 UTC 2008 Iliyan Jeliazkov - - * ace/Parse_Node.cpp: - * ace/Svc_Conf.y: - * ace/Svc_Conf_Tokens.h: - * ace/Svc_Conf_y.cpp: - - Replacing ACE_LIB_TEXT with ACE_TEXT - -Fri Apr 4 21:43:35 UTC 2008 Iliyan Jeliazkov - - * THANKS: - - Adding Michael Carter for reporting - and debugging bug 3007. - - * ace/Base_Thread_Adapter.h: - * ace/Base_Thread_Adapter.cpp: - - Storing a pointer to SG that was current in the parent thread, - which enables correct "inheritance" of the SG in the child thread. - - * ace/Parse_Node.h: - * ace/Parse_Node.cpp: - - Fixing ACE_Stream_Node::{apply,link} to ensure the modules are linked - together and initialized correctly - see bug# 2916. Moving the - initialization code out of the yacc parser, here. - - * ace/Service_Object.cpp: - * ace/Service_Types.cpp: - - Improving the log output in fini(). - - * ace/Service_Repository.h: - - Eliminating an unused parameter static_only from relocate_i() - - * ace/Service_Repository.cpp: - - Simplified relocate_i() and fixed an error that was causing it to - choose incorrect ranges of service indexes to relocate. - Eliminated the boolean static_only parameter as it was always - being set to true. Changed remove() to eliminate the "packing" - code and updated the few other methods, which assumed there are no - "gaps" in the service storage. - - * ace/Svc_Conf.h: - * ace/Svc_Conf.y: - * ace/Svc_Conf_Tokens.h: - * ace/Svc_Conf_y.cpp: - - Adding an overloaded yyerror that takes just a string to comply - with the changed bison template. Moving the module initialization - code out of the parser. See ACE_Stream_Node class and bug# 2916. - - * ace/Thread_Adapter.cpp: - - The invoke() method, which runs in the new thread, initializes the - thread-specific configuration context. This scheme ensures any - newly spawned thread would inherit the spawning thread's service - configuration context. - - * ace/ace.mpc: - - Adding Intrusive_Auto_Ptr to the list. - - * ace/svcconf.mpb: - - Updated for the grammar updates, see bug# 2916. - - * examples/ASX/CCM_App/ASX_CCM_App.mpc: - * examples/ASX/CCM_App/CCM_App.cpp: - - The DLL names are case-sensitive on *nix. Minor layout changes. - - * tests/Object_Manager_Flipping_Test.cpp: - - Updated to use the Intrusive_Auto_Ptr - - * tests/run_test.lst: - * tests/tests.mpc: - - Adding Bug_2980_Regression_Test - -Fri Apr 4 18:27:57 UTC 2008 Johnny Willemsen - - * configure.ac: - Fixed iostream detection. This fixes bugzilla 3288 - This to Thomas Girard - for reporting this. - -Thu Apr 3 14:13:57 UTC 2008 Johnny Willemsen - - * include/makeinclude/platform_vxworks5.5.x.GNU: - * include/makeinclude/platform_vxworks6.2.GNU: - * include/makeinclude/platform_vxworks6.3.GNU: - Changed the make variable from which we zap the -ansi and also support - this with the diab compiler - -Thu Apr 3 09:40:00 UTC 2008 Simon Massey - - * apps/JAWS/stress_testing/benchd.cpp: - - Using "interface" as the descriptive name of a parameter seems to - cause VC8 (when building with MFC) to assume you mean a struct type - and it raises an incorrect systax error. - -Thu Apr 3 07:05:57 UTC 2008 Johnny Willemsen - - * bin/MakeProjectCreator/templates/gnu.mpd: - Generate link_groups also when staticflags are not set - -Wed Apr 2 21:40:00 UTC 2008 J.T. Conklin - - * configure.ac: - - Fix typo in ACE_HAS_BSWAP_{16,32,64} feature tests. - This to Thomas Girard - for reporting this. - -Wed Apr 2 20:22:50 UTC 2008 Iliyan Jeliazkov - - * ace/Intrusive_Auto_Ptr.h: - * ace/Intrusive_Auto_Ptr.inl: - - Correcting a problem with VC71 - -Wed Apr 2 11:06:30 UTC 2008 Vladimir Zykov - - * bin/tao_orb_tests.lst: - - Enabled a TAO/tests/Collocated_Forwarding on vxworks and - vxworks_rtp. - -Wed Apr 2 09:05:57 UTC 2008 Johnny Willemsen - - * include/makeinclude/platform_vxworks5.5.x.GNU: - * include/makeinclude/platform_vxworks6.2.GNU: - * include/makeinclude/platform_vxworks6.3.GNU: - Add no_cflags_ansi and no_ccflags_ansi which if set do remove the - -ansi compiler flag - -Wed Apr 2 08:14:57 UTC 2008 Johnny Willemsen - - * ace/config-linux-common.h: - Replaced ACE_HAS_VOIDPTR_GETTIMEOFDAY with - ACE_HAS_TIMEZONE_GETTIMEOFDAY, this fixes bugzilla 3145 - This to Thomas Girard - for reporting this - -Wed Apr 2 07:51:57 UTC 2008 Johnny Willemsen - - * tests/run_test.lst: - Enabled a few tests on VxWorks again, in the past rebooting a - crashed target was problematic but that is not an issue anymore - -Tue Apr 1 14:20:34 UTC 2008 Vladimir Zykov - - * bin/tao_orb_tests.lst: - Added a new test for collocated forwarding case. - -Tue Apr 1 12:58:57 UTC 2008 Johnny Willemsen - - * bin/tao_other_tests.lst: - Added OBV typed event test - -Tue Apr 1 12:52:57 UTC 2008 Johnny Willemsen - - * bin/tao_orb_tests.lst: - Add the DSI Gateway exception test, they should run, the scoreboard - will show if they run - -Tue Apr 1 08:33:57 UTC 2008 Johnny Willemsen - - * include/makeinclude/platform_openvms.GNU: - Set ACE_OPENVMS_IA64 on Itanium - - * include/makeinclude/rules.lib.GNU: - Only use a special AR rule on OpenVMS IA64 - -Tue Apr 1 07:38:57 UTC 2008 Johnny Willemsen - - * tests/Intrusive_Auto_Ptr_Test.cpp: - Fixed argument not used warning - -Tue Apr 1 07:34:57 UTC 2008 Johnny Willemsen - - * bin/tao_other_tests.lst: - Enabled a few tests for vxworks - -Tue Apr 1 07:12:57 UTC 2008 Johnny Willemsen - - * tests/Reactor_Dispatch_Order_Test.cpp: - Only run the reactor once, this will lead to the failing of this test - when using the WFMO Reactor which seems to be a old issue that needs - to get addressed - -Tue Apr 1 06:54:57 UTC 2008 Johnny Willemsen - - * bin/tao_other_tests.lst: - Disabled most tests for vxworks and vxworks_rtp, we first need to - convert a lot of scripts to support vxworks - -Mon Mar 31 21:48:58 UTC 2008 J.T. Conklin - - * configure.ac: - - Changed to avoid feature test for pthread_getaffinity_np() and - pthread_setaffinity_np() if system does not have cpu_set_t. In - that case, the pthread functions are amost certainly not - compatible. - - * ace/Makefile.am: - - Add Intrusive_Auto_Ptr.cpp, Intrusive_Auto_Ptr.h, and - Intrusive_Auto_ptr.inl to nobase_include_HEADERS. - -Mon Mar 31 18:56:40 UTC 2008 Iliyan Jeliazkov - - * ace/Refcounted_Auto_Ptr.h: - * ace/Refcounted_Auto_Ptr.inl: - * ace/Refcounted_Auto_Ptr.cpp: - - Reverting the changes because a) they are not really necessary - for the refactoring of the service config, and; b) the AIX - compiler appears to not deal well with implicit conversion - definitions, to template member types. - -Mon Mar 31 16:15:17 UTC 2008 Iliyan Jeliazkov - - * tests/tests.mpc: - - Adding Intrusive_Auto_Ptr_Test to the list - -Mon Mar 31 14:52:58 UTC 2008 Iliyan Jeliazkov - - * ace/Intrusive_Auto_Ptr.h: - * ace/Intrusive_Auto_Ptr.cpp: - * ace/Refcounted_Auto_Ptr.h: - * ace/Refcounted_Auto_Ptr.inl: - * ace/Refcounted_Auto_Ptr.cpp: - - Added preprocessor guards for proper inlining. Qualified - the type name in the implementation of opretator - unspecified_bool_type () to appease GCC 3.x - -Mon Mar 31 13:50:45 UTC 2008 Iliyan Jeliazkov - - * tests/run_test.lst: - - Adding Intrusive_Auto_Ptr_Test to the list - -Mon Mar 31 12:09:20 UTC 2008 Chad Elliott - - * bin/MakeProjectCreator/modules/AutomakeWorkspaceHelper.pm: - - Always reference Kokyu libraries from $(ACE_BUILDDIR) instead of - $(top_builddir) so that it will work from both ACE and TAO. - -Mon Mar 31 11:00:57 UTC 2008 Johnny Willemsen - - * tests/Bug_2980_Regression_Dll.cpp: - * tests/Bug_2980_Regression_Test.cpp: - Fixed fuzz errors - -Mon Mar 31 08:59:57 UTC 2008 Johnny Willemsen - - * tests/OS_Test.cpp: - Added test for ACE_OS::last_error() - -Sun Mar 30 19:54:23 UTC 2008 Iliyan Jeliazkov - - This is the first step of merging the changes from the gestalt - refactoring branch. It includes only changes that are merely - peripheral, without impacting the actual configuration mechanism - - yet. - - * ace/ARGV.h: - * ace/ARGV.cpp: - - Introducing a ctor that takes the number of parameters in argv, - thus eliminating the requirement to have argv 0-terminated. This - requirement can be a hard to satisfy in cases where the argv has - been "manualy constructed", i.e. not provided by the OS - environment. - - * ace/Intrusive_Auto_Ptr.h: - * ace/Intrusive_Auto_Ptr.inl: - * ace/Intrusive_Auto_Ptr.cpp: - - Added an intrusive auto pointer implementation. It is a reference - counted auto pointer that can be used for types with explicit - reference management implementations. - - * ace/OS_NS_unistd.h: - * ace/OS_NS_unistd.cpp: - - Introducing new argv_to_string which takes an explicit argc - argument and relaxes the requirement on argv (to be 0-terminated). - - * ace/Refcounted_Auto_Ptr.h: - * ace/Refcounted_Auto_Ptr.inl: - - Adding a mechanism that provides a correct conversion to boolean - for smart pointers, which preserves the smantics of "if (ap) ..." - without the unwanted side effects. Credit goes to Andrei - Alexandrescu's Modern C++ Design book. - - * ace/Service_Types.cpp: - - Cosmetics: adding this-> to member references. - - * examples/ASX/CCM_App/ASX_CCM_App.mpc: - * examples/ASX/CCM_App/CCM_App.cpp: - - Fixing a problem that precludes the test from running correctly - on *nix - the DLL names are not case-insensitive. Minor layout - changes. - - * tests/Intrusive_Auto_Ptr_Test.cpp: - - A test for the new auto ptr. - - * tests/Bug_2980_Regression_Dll.cpp: - * tests/Bug_2980_Regression_Test.cpp: - * tests/run_test.lst: - * tests/tests.mpc: - - Addded a test for bug 2980. Thanks to Lothar Werzinger for contributing the code. - -Sun Mar 30 18:54:57 UTC 2008 Johnny Willemsen - - * bin/PerlACE/ProcessVX_Win32.pm: - Handle single quotes in the executable arguments - -Sat Mar 29 08:16:57 UTC 2008 Johnny Willemsen - - * tests/Reactor_Dispatch_Order_Test.cpp: - Dev_Poll reactor displays other bugs, so disable this part of - the test - - * ace/Select_Reactor_Base.cpp: - Position the iterator on the first element that is none zero, fixes - crashing of the reactor_dispatch_order_test on non windows platforms - -Fri Mar 28 17:18:50 UTC 2008 Steve Huston - - * ace/CDR_Stream.cpp (write_long_placeholder, write_short_placeholder): - Be careful to adjust and grow the stream's block before taking - the pointer that's returned to the user. Thanks to Alain Kocelniak - for this fix. - - * ace/CDR_Stream.h: Note that the placeholder methods return 0 if - the method fails due to insufficient memory. - - * THANKS: Added Alain Kocelniak to the Hall of Fame. - -Fri Mar 28 15:40:03 UTC 2008 Chad Elliott - - * tests/unload_libace.mpb: - - Inhert from vc_warnings instead of duplicating part of it's - functionality. - -Fri Mar 28 09:24:25 UTC 2008 Vladimir Zykov - - * bin/tao_orb_tests.lst: - - Enabled a test to Bug_3276_Regression. - -Fri Mar 28 09:17:57 UTC 2008 Johnny Willemsen - - * tests/Reactor_Dispatch_Order_Test.cpp: - Extended this test to also test suspend/resume_handlers and the - dev_poll reactor. Thanks to Russell Morra for extending this test - - * ace/ACE.cpp: - * ace/High_Res_Timer.inl: - Layout changes - - * ace/Hash_Map_Manager_T.cpp: - Use prefix increment instead of postfix - - * ace/High_Res_Timer.h: - * ace/Reactor.h: - * ace/Select_Reactor_Base.h: - Doxygen changes - - * ace/Select_Reactor_Base.inl: - Fixed done implementation. This fixes bugzilla 3267 - - * ace/String_Base.cpp: - Initialise pointer with 0 - - * ace/WFMO_Reactor.{h,cpp,inl}: - Bool changes, fixed implementation of suspend_handlers/resume_handlers, - the to_be_added set modifications where not done correctly - -Thu Mar 27 19:09:57 UTC 2008 Johnny Willemsen - - * bin/tao_orb_tests.lst: - * bin/tao_other_tests.lst: - Diabled 3251/3252 in a static build - -Thu Mar 27 16:27:44 UTC 2008 Adam Mitz - - * ace/Object_Manager.cpp: - - In Win32 debug builds with ACE_DISABLE_WIN32_ERROR_WINDOWS, also - redirect assert messages to stderr instead of GUI message boxes. - -Thu Mar 27 16:17:57 UTC 2008 Johnny Willemsen - - * docs/ACE-bug-process.html: - * docs/ACE-development-process.html: - * docs/ACE-guidelines.html: - * docs/usage-bugzilla.html: - Updated bugzilla location - -Thu Mar 27 15:52:57 UTC 2008 Johnny Willemsen - - * bin/MakeProjectCreator/modules/VXTestProjectCreator.pm: - * bin/MakeProjectCreator/modules/VXTestWorkspaceCreator.pm: - * bin/MakeProjectCreator/templates/vxtest.mpd: - New MPC generator called vxtest. This will generate the loading - of the downloadable kernel modules for an application. - -Thu Mar 27 14:07:27 UTC 2008 J.T. Conklin - - * configure.ac: - - #include in ACE_HAS_BSWAP_{16,32,64} feature tests. - Resolves bugzilla issue #3134. - -Thu Mar 27 12:54:57 UTC 2008 Johnny Willemsen - - * include/makeinclude/platform_vxworks6.3.GNU: - Small change to get the VxWorks shared library build further - -Thu Mar 27 12:46:48 UTC 2008 Chad Elliott - - * tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp: - - Changed ACE_TMAIN to run_main for the non-threaded portion of the - #ifdef. ACE_TMAIN is defined in Main.cpp. - -Thu Mar 27 12:37:18 UTC 2008 Chad Elliott - - * ASNMP/asnmp/snmperrs.h: - - Added an unknown error code message to the pErrs array to avoid - getting a garbage pointer from Snmp::error_string() in the event - that the error code is outside the valid range. - -Thu Mar 27 11:11:57 UTC 2008 Johnny Willemsen - - * ace/Free_List.cpp: - Fixed ambiguous else with GCC 4.3. Thanks to Jules Colding - for reporting this - -Thu Mar 27 10:36:18 UTC 2008 Simon McQueen - - * include/makeinclude/wrapper_macros.GNU: - - Make it possible to specify an alternate name / location for - platform_macros.GNU. This fixes bug #3269. - -Wed Mar 26 15:32:01 UTC 2008 Adam Mitz - - * bin/MakeProjectCreator/templates/gnu.mpd: - - Corrected my change from yesterday so that it works properly for - executable projects that pull in source files from other directories. - -Tue Mar 25 18:02:52 UTC 2008 Chad Elliott - - * ASNMP/asnmp/wpdu.cpp: - - Added an intermediate integer to avoid type-punned pointer - dereferencing. - -Tue Mar 25 14:19:31 UTC 2008 Adam Mitz - - * bin/MakeProjectCreator/templates/gnu.mpd: - - When generating the linker command line for executable linked against - static libs, exclude the "libFoo.a" form of the libraries. They are - already accounted for by "-lFoo" arguments. This resolved Bugzilla - Bug #3266. - -Tue Mar 25 10:43:57 UTC 2008 Johnny Willemsen - - * netsvcs/lib/Server_Logging_Handler.cpp: - Corrected static template member instantiation to resolve compile - error on OpenVMS Alpha - -Tue Mar 25 10:12:57 UTC 2008 Johnny Willemsen - - * include/makeinclude/platform_openvms.GNU: - Disable warnings on IA64 without using GNV, that doesn't work - in all cases - -Tue Mar 25 09:08:57 UTC 2008 Johnny Willemsen - - * ace/INET_Addr.cpp: - Detect sockets that are bigger then ACE_MAX_DEFAULT_PORT. - Thanks to Patrick Rabau for - reporting this. This fixes bugzilla 3264 - - * tests/INET_Addr_Test.cpp: - Added a test for an overflow of the port number - - * ace/Hash_Map_Manager_T.{h,inl}: - Changed head argument of the iterators to a bool - - * ace/Reactor.h: - * ace/Reactor_Impl.h: - Doxygen changes - -Tue Mar 25 00:38:33 UTC 2008 J.T. Conklin - - * ace/Makefile.am: - - Add Configuration.inl to nobase_include_HEADERS. - -Mon Mar 24 16:21:30 UTC 2008 Douglas C. Schmidt - - * ace/OS_NS_Thread.cpp (event_timedwait): Fixed this code so that - it will treat 0 using "wait indefinitely" semantics for Windows - and all other OS platforms. Thanks to Paul Carter for contributing this. - -Mon Mar 24 16:13:51 UTC 2008 Douglas C. Schmidt - - * tests/Manual_Event_Test.cpp (worker): Added a test to ensure - that a null pointer works properly for the - ACE_Manual_Event::wait() method. Thanks to Paul Carter for contributing this. - -Mon Mar 24 15:43:28 UTC 2008 Abdullah Sowayan - - * bin/MakeProjectCreator/config/MPC.cfg: - - MPC can now be configured to recognize ACE_TMAIN as an executable - entry point. We no longer need to explicitly state that a project will - be an executable in the MPC file, MPC will automatically deduce that - the project is an executable given the presence of ACE_TMAIN. - - This change above relates to the following change in MPC: - Mon Mar 24 15:18:28 UTC 2008 Chad Elliott - -Mon Mar 24 02:25:58 UTC 2008 Douglas C. Schmidt - - * COPYING: Updated the license a bit based on feedback from Tom - Callaway" . These changes will - enable ACE+TAO to be shipped with Fedora. - -Fri Mar 21 16:12:53 UTC 2008 Steve Huston - - * ace/OS_NS_unistd.cpp (num_processors_online): Count the online - processors for Windows, not just the number present. - - * tests/OS_Test.cpp: Sanity-check the num_processors_online() value. - -Fri Mar 21 15:10:57 UTC 2008 Johnny Willemsen - - * ace/FoxReactor/FoxReactor.cpp: - Fix 64bit issues, this fixes bugzilla 3248 - This to Thomas Girard - for reporting this - -Fri Mar 21 10:46:57 UTC 2008 Johnny Willemsen - - * m4/ace.m4: - Changed gperf check - - * apps/Makefile.aml: - Updated gperf check. This fixes bugzilla 3249. - This to Thomas Girard - for reporting this - -Fri Mar 21 10:06:57 UTC 2008 Johnny Willemsen - - * ace/config-vxworks.h: - If ACE_VXWORKS is not defined try to figure out which vxworks - version we are using based on some vxworks version defines - - * ace/Select_Reactor_Base.h: - Doxygen changes and made the constructor of - ACE_Select_Reactor_Handler_Repository_Iterator explicit - - * ace/Process.{h,cpp}: - Layout change - -Thu Mar 20 15:34:18 UTC 2008 Chad Elliott - - * bin/MakeProjectCreator/config/acedefaults.mpb: - - Changed the ACE_LD_DECORATOR_STR macro to use $(LIBMODIFIER) - instead of $(ILIBMODIFIER) for the bmake project type. - -Thu Mar 20 12:42:57 UTC 2008 Johnny Willemsen - - * ace/Addr.h: - Layout change - - * ace/High_Res_Timer.cpp: - Changed supported flag to a bool - - * ace/INET_Addr.h: - Doxygen change - - * ace/Svc_Conf.h: - Moved regular include before pragma once - -Wed Mar 19 13:45:00 UTC 2008 Simon Massey - - * ace/tao_orb_tests.lst: - Remove TAO/tests/Bug_1482_Regression from LynxOS. - -Wed Mar 19 11:41:57 UTC 2008 Johnny Willemsen - - * ace/Process_Manager.h: - * ace/Semaphore.h: - * ace/SOCK.h: - * ace/SOCK_IO.h: - Doxygen changes +Wed Jul 21 03:07:28 UTC 2010 Phil Mesnier * ace/Service_Gestalt.h: - Removed not needed forward declaration + * ace/Service_Gestalt.cpp: - * ace/OS_NS_Thread.h: - Layout change + Fix errors in premature committal. -Tue Mar 18 20:17:55 UTC 2008 Steve Huston +Wed Jul 21 02:30:45 UTC 2010 Phil Mesnier - * bin/PerlACE/ProcessLVRT.pm: - * bin/PerlACE/TestTarget_LVRT.pm: Handle timeouts to the target better - and smarten up the way it gets log files from a failed target. + * ace/Service_Gestalt.h: + * ace/Service_Gestalt.inl: + * ace/Service_Gestalt.cpp: - * bin/PerlACE/TestTarget.pm: - * bin/PerlACE/TestTarget_LVRT.pm: Add a GetFile() method to get a file - from the target to the local machine. By default, it does nothing. - It's meant for use by targets that don't necessarily have locally - accessible file systems, such as LabVIEW RT. + Add a specialized open method to be called by TAO. TAO depends + on a modified order of directive evaluation. - * bin/Run_Test.pm: - * bin/PerlACE/Process_Win32.pm: Add support for running tests on - LabVIEW RT similarly to the way they're done on VxWorks; TAO tests - run the server on the target and the client on the host. - - * bin/LabVIEW_RT/labview_test_controller/labview_test_controller.cpp: - Catch exceptions and try to report it to stderr before the machine - locks up, dies, etc. - -Tue Mar 18 07:33:57 UTC 2008 Johnny Willemsen - - * include/makeinclude/platform_openvms.GNU: - Removed -Wc/DISTINGUISH_NESTED_ENUMS, only needed for one test - -Mon Mar 14 09:17:57 UTC 2008 Johnny Willemsen - - * bin/tao_other_tests.lst: - Added 3252 - -Mon Mar 14 09:07:57 UTC 2008 Johnny Willemsen - - * bin/tao_orb_tests.lst: - Added 3251 - -Fri Mar 14 19:57:57 UTC 2008 Johnny Willemsen - - * include/makeinclude/platform_aix_g++.GNU: - Improved support for buildbits=64 - -Fri Mar 14 19:09:57 UTC 2008 Johnny Willemsen - - * ace/INET_Addr.cpp: - Fixe warning with GCC 4.2 on AIX - -Fri Mar 14 19:07:57 UTC 2008 Johnny Willemsen - - * include/makeinclude/platform_aix_g++.GNU: - Disable visibility by default. With GCC 4.2 on AIX we get warnings - that visibility is not supported in that configuration - -Fri Mar 14 15:02:33 UTC 2008 Ciju John - - * bin/tao_other_tests.lst: - Turn on the Notify Persistent_POA test. - -Fri Mar 14 09:30:57 UTC 2008 Johnny Willemsen - - * include/makeinclude/platform_aix_g++.GNU: - Don't use -mcpu=common, that is an ancient default of AIX 5.1 - -Thu Mar 13 12:41:57 UTC 2008 Johnny Willemsen - - * include/makeinclude/platform_aix_g++.GNU: - Fixed support for buildbits=32/64 - -Wed Mar 12 19:49:57 UTC 2008 Johnny Willemsen - - Reverted the gperf change below, breaks all autoconf builds - - Wed Mar 12 06:55:57 UTC 2008 Johnny Willemsen - * m4/ace.m4: - Added enable-aio, enable-ipo and fixed gperf handling. - This to Thomas Girard - for reporting this - -Wed Mar 12 15:08:57 UTC 2008 Johnny Willemsen - - * bin/PerlACE/ProcessVX.pm: - Fix retry mechanism for the iBoot bar - -Wed Mar 12 12:59:57 UTC 2008 Johnny Willemsen - - * m4/ace.m4: - Added support for fox, thanks to Thomas Girard - for reporting this. - This fixes bugzilla 3147 - -Wed Mar 12 11:59:57 UTC 2008 Johnny Willemsen - - * ace/FoxReactor/FoxReactor.{h,cpp}: - Removed check for ACE_HAS_FOX - - * include/makeinclude/wrapper_macros.GNU: - Changed fox handling, matches the other reactors. Thanks to - Thomas Girard for - reporting this. This resolves bugzilla 3248 - - * include/makeinclude/platform_aix_ibm.GNU: - Added support for Visual Age 9 - -Wed Mar 12 11:53:57 UTC 2008 Johnny Willemsen - - * ace/FoxReactor/FoxReactor.h: - Added missing include, thanks to Thomas Girard - for reporting this - -Wed Mar 12 07:07:57 UTC 2008 Johnny Willemsen - - * ace/FoxReactor/FoxReactor.cpp: - Fixed compile errors, thanks to Thomas Girard - for reporting this - -Wed Mar 12 06:59:57 UTC 2008 Johnny Willemsen - - * ace/ace.mwc: - * bin/MakeProjectCreator/config/global.features: - Added fox reactor, thanks to Thomas Girard - for reporting this - -Wed Mar 12 06:55:57 UTC 2008 Johnny Willemsen - - * m4/ace.m4: - Added enable-aio, enable-ipo and fixed gperf handling. - This to Thomas Girard - for reporting this - -Tue Mar 11 12:24:43 UTC 2008 Steve Huston - - * ace/Svc_Conf.h: Add #include "ace/config.h" so a setting for - ACE_LACKS_PRAGMA_ONCE can be seen. Fixes compile warnings. - -Tue Mar 11 12:20:02 UTC 2008 Steve Huston - - * ace/Log_Msg.cpp (log): Fixed compile error. No need to use - ACE_TEXT_ALWAYS_CHAR for a char* literal. - -Mon Mar 10 22:27:09 UTC 2008 Nanbor Wang - - * ace/Svc_Conf.h: Removed redundant inclusion of Obstack.h. It is - included later in Svc_Conf_Param.h. Removing this extra - inclusion allows us to build on MacOS Leopard with optimization - enabled. - -Mon Mar 10 15:35:02 UTC 2008 Steve Huston - - * ace/Log_Msg.{h cpp} (log): For %C, clearly note that it always prints - a narrow-char string, and adjust the va_arg to match. Thanks to - Russell Morra for reporting this issue. - -Mon Mar 10 13:20:57 UTC 2008 Johnny Willemsen - - * tests/Multicast_Test.cpp: - When sending fails, print the ip address we are using in the error - message. - -Sat Mar 8 16:23:57 UTC 2008 Douglas C. Schmidt - - * ace/WIN32_Asynch_IO.cpp (send): Enhanced the code to allow sends - of 0-sized datagrams. Thanks to Andi Heusser for this fix. - -Thu Mar 6 16:49:18 UTC 2008 Johnny Willemsen - - * include/makeinclude/rules.lib.GNU: - Rearranged some rules to make sure c/C files are compiled with the - C compiler on OpenVMS - -Thu Mar 6 13:10:18 UTC 2008 Johnny Willemsen - - * include/makeinclude/platform_openvms.GNU: - Improved this file - -Thu Mar 6 10:33:18 UTC 2008 Johnny Willemsen - - * include/makeinclude/platform_openvms.GNU: - Removed restriction that only a shared or static build can be done - -Wed Mar 5 07:54:18 UTC 2008 Johnny Willemsen - - * bin/tao_orb_tests.lst: - Don't run the parallel connect strategy test on VxWorks 5.5, the - command length of the shell is not long enough. - -Tue Mar 4 09:27:18 UTC 2008 Johnny Willemsen - - * bin/ProcessVX.pm: - Added a retry to the iPass protocol code, in a full test run - we sometimes see that the reboot has failed. With this retry - we hopefully get rid of those false test failures - -Tue Mar 4 05:54:22 UTC 2008 William Otte - - * bin/svn_props.py: - Automatically set default properties when svn complains. - -Mon Mar 3 11:22:18 UTC 2008 Johnny Willemsen - - * bin/MakeProjectCreator/templates/bor.mpd: - Just single line comments - - * bin/MakeProjectCreator/templates/gnu.mpd: - Check VXWORKSLINK for 1 - -Mon Mar 3 11:10:18 UTC 2008 Johnny Willemsen - - * include/makeinclude/platform_vxworks5.5.x.GNU: - * include/makeinclude/platform_vxworks6.2.GNU: - * include/makeinclude/platform_vxworks6.3.GNU: - * include/makeinclude/rules.bin.GNU: - * include/makeinclude/rules.lib.GNU: - Use 1 for VXWORKSLINK instead of true. Added footprint=1 - as flag to specify that you are doing a footprint build - -Mon Mar 3 10:49:28 UTC 2008 Abdullah Sowayan - - * apps/JAWS/clients/WebSTONE/src/cgi-send.c: - * apps/JAWS/clients/WebSTONE/src/genrand.c: - * apps/JAWS/clients/WebSTONE/src/webmaster.c: - * contrib/utility/Example/CommandLine/Foo/command.cpp: - * contrib/utility/Example/ExH/BadCast/bad_cast.cpp: - * contrib/utility/Example/ExH/Compound/compound.cpp: - * contrib/utility/Example/ExH/HelloWorld/hello_world.cpp: - * contrib/utility/Example/ExH/LogicToSystem/logic_to_system.cpp: - * contrib/utility/Example/Hetero/Container/container.cpp: - * contrib/utility/Example/Introspection/InheritanceTree/inheritance_tree.cpp: - * contrib/utility/Example/Introspection/Traversal/driver.cpp: - * contrib/utility/Test/ExH/Converter/converter.cpp: - * contrib/utility/Test/ExH/Inline/inline.cpp: - * contrib/utility/Test/ExH/Logic/DescriptiveException/descriptive_exception.cpp: - * contrib/utility/Test/ExH/System/DescriptiveException/descriptive_exception.cpp: - * contrib/utility/Test/Introspection/Inline/inline.cpp: - * contrib/utility/Test/Synch/Inline/inline.cpp: - * etc/xlc_dummy.cpp: - * examples/Reactor/Proactor/test_aiocb.cpp: - * examples/Reactor/Proactor/test_aiosig.cpp: - - Disable fuzz's check_for_improper_main_declaration check on these files. - These files don't use ACE. - - * examples/Reactor/WFMO_Reactor/Multithreading.cpp: - * examples/Reactor/WFMO_Reactor/Registration.cpp: - * examples/Reactor/WFMO_Reactor/Registry_Changes.cpp: - * examples/Threads/task_three.cpp: - - Use the proper form of ACE_TMAIN. Namely, the argv parameter - should be "ACE_TCHAR *argv[]" instead of "ACE_TCHAR **argv" - or "ACE_TCHAR *[]" instead of "ACE_TCHAR **" - - * apps/JAWS3/bench/average.cpp: - * netsvcs/clients/Tokens/invariant/invariant.cpp: - - Use ACE_TMAIN instead of main as the program entry point to comply - with ACE/TAO/CIAO coding standards. - -Mon Mar 3 08:58:18 UTC 2008 Johnny Willemsen - - * include/makeinclude/platform_openvms.GNU: - Improved this file - -Mon Mar 3 07:30:18 UTC 2008 Johnny Willemsen - - * include/makeinclude/platform_openvms.GNU: - Don't set INSLIB - -Mon Mar 3 07:00:18 UTC 2008 Johnny Willemsen - - * include/makeinclude/rules.local.GNU: - Rearranged some rules so that C files are compiled with the - C compiler on OpenVMS - -Mon Mar 3 06:57:18 UTC 2008 Johnny Willemsen - - * bin/ProcessVX.pm: - Added support to specify a custom password for the iBoot - -Sun Mar 2 20:04:18 UTC 2008 Johnny Willemsen - - * bin/ProcessVX.pm: - Integrated some OCI changes for the iBoot - -Sun Mar 2 19:32:18 UTC 2008 Johnny Willemsen - - * bin/auto_run_tests.pl: - Use ACE_ROOT as defailt root test directory instead of the current - directory - -Sun Mar 2 18:53:12 UTC 2008 Abdullah Sowayan - - * ASNMP/agent/main.cpp: - * ace/Svc_Conf_y.cpp: - * apps/JAWS3/jaws3/main.cpp: - * examples/Mem_Map/IO-tests/test_io.cpp: - * examples/Reactor/Multicast/client.cpp: - * examples/Reactor/Multicast/server.cpp: - * examples/Reactor/Proactor/test_aiocb_ace.cpp: - * examples/System_V_IPC/SV_Shared_Memory/SV_Shared_Memory_Test.cpp: - * netsvcs/clients/Naming/Dump_Restore/createfile.cpp: - * netsvcs/clients/Tokens/collection/collection.cpp: - * netsvcs/clients/Tokens/collection/rw_locks.cpp: - * netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp: - * netsvcs/clients/Tokens/invariant/invariant.cpp: - * netsvcs/clients/Tokens/manual/manual.cpp: - * netsvcs/clients/Tokens/mutex/test_mutex.cpp: - * netsvcs/clients/Tokens/rw_lock/rw_locks.cpp: - * performance-tests/Misc/context_switch_time.cpp: - * performance-tests/Misc/test_guard.cpp: - * performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.cpp: - * performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.cpp: - * performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp: - - Use ACE_TMAIN instead of main as the program entry point to comply - with ACE/TAO/CIAO coding standards. - - * examples/Mem_Map/IO-tests/Mem_Map_IO_Tests.mpc: - - MPC doesn't recognize ACE_TMAIN as an entry point, as such, we need - to explicitly set exename in the MPC file. - - * apps/JAWS/clients/WebSTONE/src/webclient.c: - * contrib/utility/Example/CommandLine/Foo/foo.cpp: - * performance-tests/Synch-Benchmarks/context.c: - * performance-tests/TTCP/C/new-ttcp.cpp: - * tests/Unload_libACE.cpp: - - Disable fuzz's check_for_improper_main_declaration check on these files. - These files don't use ACE. - -Sat Mar 1 19:09:18 UTC 2008 Johnny Willemsen - - * bin/auto_run_tests.pl: - Added -r as option to specify an alternate root test directory - instead of the current directory. Combined this with -l we can - then run perl scripts for testing project code. - -Thu Feb 28 16:08:18 UTC 2008 Johnny Willemsen - - * bin/generate_compile_stats.sh: - Added --compiler as option so that we can specify a different - compiler then gcc - -Thu Feb 28 08:32:18 UTC 2008 Johnny Willemsen - - * docs/ACE-bug-process.html: - Removed cvs - -Wed Feb 27 19:28:18 UTC 2008 William Otte - - * bin/MakeProjectCreator/config/global.features: - disable mcpp by default. - -Tue Feb 26 15:52:37 UTC 2008 Johnny Willemsen - - * include/makeinclude/platform_openvms.GNU: - Added support for buildbits=64 - -Tue Feb 26 09:18:37 UTC 2008 Johnny Willemsen - - * include/makeinclude/platform_openvms.GNU: - Added some compiler flags to reduce the number of warnings/errors - in the OpenVMS builds - -Mon Feb 25 19:44:37 UTC 2008 Johnny Willemsen - - * bin/PerlACE/Process_Unix.pm: - * bin/PerlACE/Process_Win32.pm: - Added IgnoreHostRoot which can be set from a test script. That way - when doing cross host testing we can make sure we don't get the - executable from the host root directory. This is for example usefull - when we want to spawn perl or another system utility - - * bin/PerlACE/Run_Test.pm: - Removed commented out line - -Mon Feb 25 14:30:37 UTC 2008 Johnny Willemsen - - * include/makeinclude/platform_vxwork6.2.GNU: - * include/makeinclude/platform_vxwork6.3.GNU: - Added LD_PARTIALFLAGS which can be set for footprint builds - -Mon Feb 25 08:13:37 UTC 2008 Johnny Willemsen - - * ace/config-macros.h: - Set ACE_HAS_INTEGRAL_TYPE_THR_FUNC_RETURN when - ACE_THR_FUNC_RETURN is an integral type - - * ace/Task.cpp: - Use ACE_HAS_INTEGRAL_TYPE_THR_FUNC_RETURN to determine whether - we can do a reinterpret_cast or static_cast. This is much easier - then checking all compilers - -Sun Feb 24 19:37:37 UTC 2008 Johnny Willemsen - - * ace/Configuration.cpp: - * ace/Configuration.h: - * ace/Configuration.inl: - Added new inline file - - * ace/Get_Opt.cpp: - Prefix increment - - * ace/Event_Handler.h: - Removed commented out code - -Sat Feb 23 06:56:37 UTC 2008 Johnny Willemsen - - * include/makeinclude/platform_openvms.GNU: - OpenVMS doesn't have rwho - -Fri Feb 22 18:55:37 UTC 2008 Johnny Willemsen - - * ace/Message_Queue_NT.h: - Fixed wrong include - -Fri Feb 22 14:20:37 UTC 2008 Johnny Willemsen - - * ace/Message_Queue.{h,cpp,inl}: - * ace/Message_Queue_NT.{h,cpp,inl}: - * tests/Message_Queue_Test.cpp: - * ace/ace.mpc: - * ace/Makefile.am: - Moved ACE_Message_Queue_NT to its own file - -Fri Feb 22 08:54:37 UTC 2008 Johnny Willemsen - - * bin/global.features: - Default optimize_collocated_invocations to 1 - -Fri Feb 22 00:34:17 UTC 2008 Steve Huston - - * bin/tao_orb_tests.lst: Added !LabVIEW_RT to all tests that haven't - been adapted to the non-local filesystem mechanism I invented to run - tests for LabVIEW RT targets (and can also be used for other target - types). Now I can enable TAO tests for the LabVIEW RT scoreboard - build. - -Thu Feb 21 15:25:37 UTC 2008 Johnny Willemsen +Tue Jul 20 18:02:03 UTC 2010 Johnny Willemsen * docs/Download.html: - Updated download links to point to x.6.3 + Fixed some typos, thanks to Thomas Lockhart + for reporting this + +Tue Jul 20 15:08:49 UTC 2010 Phil Mesnier + + * tests/Bug_3319_Regression_Test.cpp: + + Fix the test to be consistent with revised service config + behavior. The test had assumed that ACE_Service_Config::open() + would return 0 even if svc.conf were not present, but since it + was setting the ignore_default_svc_conf_file to 0, the restore + behavior of the service configurator is to fail with ENOENT in + that case. + +Tue Jul 20 08:48:00 UTC 2010 Vladimir Zykov + + * ace/TSS_T.cpp: + Fixed a bug in ACE_TSS::ts_get() that only exhibited on + SunOS/Studio builds. The later configutsyion uses ACE_HAS_THR_C_DEST + and with that define ts_get() behaved differently. In particular it + didn't create a ts_obj if tss_adapter was not 0. + +Tue Jul 20 07:38:30 UTC 2010 Martin Corino + + * protocols/ace/INet/SSL_CallbackManager.h: + Fixed comment typo. + +Tue Jul 20 05:25:30 UTC 2010 Martin Corino + + * protocols/ace/INet/HTTP_BasicAuthentication.cpp: + * protocols/ace/INet/HTTP_BasicAuthentication.h: + * protocols/ace/INet/HTTP_BasicAuthentication.inl: + * protocols/ace/INet/inet.mpc: + Added basic support for HTTP Basic Authentication scheme. + +Tue Jul 20 03:56:30 UTC 2010 Martin Corino + + * protocols/ace/INet/HTTP_SessionBase.cpp: + Fixed MSVC 7.1 compile problems. + + * protocols/ace/INet/HTTP_Simple_exec.cpp: + Fixed compile problems for non-SSL builds. + +Tue Jul 20 03:25:30 UTC 2010 Martin Corino + + * bin/MakeProjectCreator/config/inetssl.mpb: + * protocols/ace/INet/inet_ssl.mpb: + Fuzz fixes. + +Mon Jul 19 11:50:59 UTC 2010 Vladimir Zykov + + * ace/TSS_T.inl: + * ace/TSS_T.h: + * ace/TSS_T.cpp: + Mostly fixed bug 3539. It doesn't fix a case when main thread + doesn't own ACE_TSS but still uses it. Fixing the later is not + straight forward and will require a lot more efforts. + Also rearranged the code so that it has less duplicates. + + * tests/run_test.lst: + Marked the test as fixed. + +Mon Jul 19 09:15:30 UTC 2010 Martin Corino + + * bin/MakeProjectCreator/config/inet.mpb: + * bin/MakeProjectCreator/config/global.features: + * protocols/ace/INet/inet.mpc: + Added new feature 'exclude_inet' to allow builds to + explicitly exclude building INet. + +Mon Jul 19 08:49:30 UTC 2010 Martin Corino + + * protocols/ace/INet/HTTPS_Session.cpp: + * protocols/ace/INet/HTTPS_Session.h: + Fixed compile errors byadding version check to disable + 'relatively' new OpenSSL functionality for builds using + outdated OpenSSL installations (OpenSSL <= 0.9.8e). + +Sat Jul 17 14:06:30 UTC 2010 Martin Corino + + * protocols/ace/INet/ClientRequestHandler.h: + * protocols/ace/INet/URLBase.h: + Some include shuffling to fix an incomplete type warning + with MSVC. + +Sat Jul 17 11:39:30 UTC 2010 Martin Corino + + * protocols/ace/INet/inet_ssl.mpb: + Replaced ace_openssl base project by ssl. Fixes missing + ACE_SSL lib link errors. + + * protocols/ace/INet/SSL_CallbackManager.cpp: + Fixed MSVC compile errors. + +Sat Jul 17 10:26:30 UTC 2010 Martin Corino + + * bin/MakeProjectCreator/config/inetssl.mpb: + * bin/MakeProjectCreator/config/inet.mpb: + Added feature project for SSL based parts of INet. + Setting feature ssl=1 will automatically cause correct + dependencies for SSL to be generated in INet based projects. + + * protocols/ace/INet/HTTPS_Context.cpp: + * protocols/ace/INet/HTTPS_Context.h: + * protocols/ace/INet/HTTPS_Context.inl: + * protocols/ace/INet/HTTP_SessionBase.cpp: + * protocols/ace/INet/HTTP_SessionBase.h: + * protocols/ace/INet/HTTP_SessionBase.inl: + * protocols/ace/INet/HTTPS_Session.cpp: + * protocols/ace/INet/HTTPS_SessionFactory.cpp: + * protocols/ace/INet/HTTPS_SessionFactory.h: + * protocols/ace/INet/HTTPS_Session.h: + * protocols/ace/INet/HTTPS_URL.cpp: + * protocols/ace/INet/HTTPS_URL.h: + * protocols/ace/INet/HTTPS_URL.inl: + * protocols/ace/INet/SSL_CallbackManager.cpp: + * protocols/ace/INet/SSL_CallbackManager.h: + * protocols/ace/INet/SSL_CallbackManager.inl: + * protocols/ace/INet/SSL_CertificateCallback.cpp: + * protocols/ace/INet/SSL_CertificateCallback.h: + * protocols/ace/INet/SSL_CertificateCallback.inl: + * protocols/ace/INet/SSL_PasswordCallback.cpp: + * protocols/ace/INet/SSL_PasswordCallback.h: + * protocols/ace/INet/SSL_Proxy_Connector.cpp: + * protocols/ace/INet/SSL_Proxy_Connector.h: + * protocols/ace/INet/SSLSock_IOStream.cpp: + * protocols/ace/INet/SSLSock_IOStream.h: + * protocols/ace/INet/SSL_X509Cert.cpp: + * protocols/ace/INet/SSL_X509Cert.h: + * protocols/ace/INet/SSL_X509Cert.inl: + New files implementing SSL/HTTPS support. + Includes support for proxy CONNECT tunneling. + + * protocols/ace/INet/inet_ssl.mpb: + Feature project which will include SSL/HTTPS support + into INet when MPC feature ssl=1 is set. + + * protocols/ace/INet/ClientRequestHandler.cpp: + * protocols/ace/INet/ClientRequestHandler.h: + * protocols/ace/INet/ConnectionCache.cpp: + * protocols/ace/INet/ConnectionCache.h: + * protocols/ace/INet/FTP_ClientRequestHandler.cpp: + * protocols/ace/INet/FTP_URL.cpp: + * protocols/ace/INet/FTP_URL.h: + * protocols/ace/INet/FTP_URL.inl: + * protocols/ace/INet/HeaderBase.h: + * protocols/ace/INet/HTTP_ClientRequestHandler.cpp: + * protocols/ace/INet/HTTP_ClientRequestHandler.h: + * protocols/ace/INet/HTTP_ClientRequestHandler.inl: + * protocols/ace/INet/HTTP_Session.cpp: + * protocols/ace/INet/HTTP_Session.h: + * protocols/ace/INet/HTTP_StreamPolicyBase.h: + * protocols/ace/INet/HTTP_StreamPolicy.h: + * protocols/ace/INet/HTTP_URL.cpp: + * protocols/ace/INet/HTTP_URL.h: + * protocols/ace/INet/HTTP_URL.inl: + * protocols/ace/INet/inet.mpc: + * protocols/ace/INet/RequestHandler.h: + * protocols/ace/INet/StreamHandler.cpp: + * protocols/ace/INet/StreamInterceptor.h: + * protocols/ace/INet/URLBase.h: + Some redesign to accomodate addition of HTTPS. + Some additional logging. + Some additional documentation. + + * protocols/ace/INet/HTTP_Simple_exec.cpp: + Extended to include HTTPS support. + + * protocols/tests/INet/MT_Get/Main.cpp: + Added some traces. + +Fri Jul 16 22:08:05 UTC 2010 Phil Mesnier + + * ace/Service_Gestalt.h: + * ace/Service_Gestalt.cpp: + + Further refinement of service initialization process. This + restores the order of processing, and is more explicit about + handling a defaulted svc.conf. + +Thu Jul 15 17:53:47 UTC 2010 Phil Mesnier + + * ace/Service_Gestalt.cpp: + * THANKS: + + Restore pre-gestalt behavior of returning -1 if svc.conf does + not exist and an ACE_Service_Config::open() is expecting to use + the default file. + + Thanks to Daynesh Mangal (daynesh@gmail.com) for reporting the + errant behavior. + +Thu Jul 15 12:53:53 UTC 2010 Johnny Willemsen + + * etc/ace.doxygen: + * etc/ace_inet.doxygen: + * etc/ace_man.doxygen: + * etc/ace_qos.doxygen: + * etc/ace_rmcast.doxygen: + * etc/ace_ssl.doxygen: + * etc/acexml.doxygen: + Generate deprecated/todo pages + +Thu Jul 15 12:35:30 UTC 2010 Martin Corino + + * ace/SSL/SSL_SOCK_Stream.h: + * ace/SSL/SSL_SOCK_Stream.inl: + Added two method overloads available in ACE_SOCK_Stream but + missing from ACE_SSL_SOCK_Stream. + +Thu Jul 15 09:49:28 UTC 2010 Johnny Willemsen + + * ace/config-doxygen.h: + Added ACE_HAS_POSITION_INDEPENDENT_POINTERS + +Thu Jul 15 09:29:58 UTC 2010 Johnny Willemsen + + * bin/generate_doxygen.pl: + * etc/ace_inet.doxygen: + * html/index.html: + Added ACE INet library + +Thu Jul 15 09:11:51 UTC 2010 William R. Otte + + * ace/config-macosx-snowleopard.h: + * include/makeinclude/platform_clang_common.GNU: + * include/makeinclude/platform_macosx_common.GNU: + + Preliminary support for clang compiler. + +Tue Jul 13 14:39:55 UTC 2010 Johnny Willemsen + + * NEWS: + Updated + +Tue Jul 13 14:33:23 UTC 2010 Johnny Willemsen + + * ace/Cached_Connect_Strategy_T.h: + * ace/Capabilities.h: + Doxygen fixes + +Tue Jul 13 14:20:09 UTC 2010 Johnny Willemsen + + * ace/os_include/os_errno.h: + Fixed problems with msvc 10, , thanks to Max Zhou + for supplying these changes, this fixes + bugzilla 3873 + +Tue Jul 13 11:08:38 UTC 2010 Johnny Willemsen + + * bin/MakeProjectCreator/config/vc10nmake.mpb: + * netsvcs/lib/lib.mpc: + vc10 support, thanks to Max Zhou for + supplying these changes + +Mon Jul 12 11:04:58 UTC 2010 Johnny Willemsen + + * ace/ACE.cpp: + * ace/Activation_Queue.h: + * ace/Active_Map_Manager.h: + * ace/Dev_Poll_Reactor.h: + * ace/Dev_Poll_Reactor.inl: + * ace/Event_Handler.h: + * ace/Filecache.h: + * ace/Manual_Event.h: + * ace/Map_Manager.h: + * ace/Mem_Map.h: + * ace/Message_Block.h: + * ace/OS_Log_Msg_Attributes.h: + * ace/OS_NS_unistd.h: + * ace/Object_Manager.h: + * ace/Recursive_Thread_Mutex.h: + Layout, const, and doxygen fixes + +Mon Jul 12 10:11:24 UTC 2010 Johnny Willemsen + + * ace/DLL.h: + * ace/DLL_Manager.h: + * ace/Dirent.h: + * ace/Dump_T.h: + * ace/Event_Handler.h: + * ace/File_Lock.h: + * ace/INET_Addr.h: + * ace/Log_Msg_Callback.h: + * ace/Log_Record.h: + * ace/Logging_Strategy.h: + Fixed set of doxygen warnings + +Mon Jul 12 08:19:58 UTC 2010 Johnny Willemsen + + * ace/Connector.h: + * ace/Malloc_Base.h: + * ace/SString.h: + * ace/Stream.h: + * ace/Task.h: + Fixed set of doxygen warnings + +Fri Jul 09 09:35:30 UTC 2010 Martin Corino + + * bin/PerlACE/Process_Unix.pm: + Fix killall() valgrind handling. + +Thu Jul 08 14:41:30 UTC 2010 Martin Corino + + * bin/PerlACE/Process_Unix.pm: + Fix killall() valgrind handling. + +Thu Jul 08 07:56:30 UTC 2010 Martin Corino + + * bin/PerlACE/Process_Unix.pm: + Make killall() recognize and handle valgrind runs correctly. + +Wed Jul 7 14:53:12 UTC 2010 Vladimir Zykov + + * tests/run_test.lst: + * tests/Bug_3539_Regression_Test.cpp: + * tests/tests.mpc: + Added a test for bug 3539 as non-fixed. + +Wed Jul 7 11:43:16 UTC 2010 Johnny Willemsen + + * docs/bczar/bczar.html: + Extended instructions + +Tue Jul 6 12:28:43 UTC 2010 Johnny Willemsen + + * docs/Download.html: + CIAO is also online available + +Tue Jul 6 11:29:41 UTC 2010 Johnny Willemsen + + * ace/Message_Queue_T.cpp: + * ace/Service_Repository.h: + * ace/Task_T.h: + Fixed doxygen warnings + +Tue Jul 6 11:22:08 UTC 2010 Johnny Willemsen + + * etc/ace.doxygen: + Improved doxygen configuration + +Tue Jul 6 11:11:06 UTC 2010 Johnny Willemsen + + * etc/ace.doxygen: + * etc/ace_man.doxygen: + * etc/ace_qos.doxygen: + * etc/ace_rmcast.doxygen: + * etc/ace_ssl.doxygen: + * etc/acexml.doxygen: + Reduced the size of the colloboration graphs + +Mon Jul 5 15:20:14 UTC 2010 Johnny Willemsen + + * rpmbuild/ace-tao.spec: + Removed some test code + +Mon Jul 5 14:59:25 UTC 2010 Johnny Willemsen + + * rpmbuild/ace-tao.spec: + Added missing file, thanks to Anatoli Sakhnik + for reporting this, this should fix + bugzilla 3870 + +Mon Jul 05 14:32:30 UTC 2010 Martin Corino + + * bin/PerlACE/Process_Unix.pm: + Fixes problem with killall() function being not selective enough. + +Mon Jul 5 13:56:57 UTC 2010 Johnny Willemsen + + * etc/ace.doxygen: + * etc/ace_qos.doxygen: + * etc/ace_rmcast.doxygen: + * etc/ace_ssl.doxygen: + * etc/acexml.doxygen: + Disable include and included graphs, this should reduce the size + of the documentation a lot + +Mon Jul 5 13:29:23 UTC 2010 Johnny Willemsen + + * bin/generate_doxygen.pl: + Some preparations to move the DAnCE doxygen files to DAnCE + + * docs/bczar/bczar.html: + Updated release notes, made it possible to generate doxygen on + a regular system instead of on naboo, the side effect is that the + doxygen packages on naboo are 350Mb, on FC13 with all latest tools + they are 1.4GB + +Mon Jul 5 11:22:09 UTC 2010 Johnny Willemsen + + * ace/Select_Reactor_Base.cpp: + Fixed doxygen warning + + * etc/ace.doxygen: + * etc/ace_man.doxygen: + * etc/ace_qos.doxygen: + * etc/ace_rmcast.doxygen: + * etc/ace_ssl.doxygen: + * etc/acexml.doxygen: + Define ACE_INLINE as inline and not as 1 + +Mon Jul 5 10:56:15 UTC 2010 Johnny Willemsen + + * rpmbuild/ace-tao.spec-release.patch: + Removed this file. + +Mon Jul 5 09:11:21 UTC 2010 Johnny Willemsen + + * docs/Download.html: + Removed link to very old patches and fixed typo + +Mon Jul 5 09:05:43 UTC 2010 Johnny Willemsen + + * docs/Download.html: + Updated filenames in text + +Mon Jul 5 08:57:09 UTC 2010 Johnny Willemsen + + * docs/Download.html: + Update latest minor release to x.8.0 + +Mon Jul 5 08:19:17 UTC 2010 Johnny Willemsen + + * bin/diff-builds-and-group-fixed-tests-only.sh: + Updated for x.8.0 + + * bin/generate_rel_manpages: + Remove restriction to run on naboo, removed doxygen check, updated + error message + + * docs/Download.html: + Updated to x.8.0 + + * etc/ace.doxygen: + Layout changes * etc/index.html: - Updated for x.6.3 + Added 5.8 -Thu Feb 21 02:34:37 CST 2008 Johnny Willemsen + * rpmbuild/ace-tao.spec: + Changed version numbers to x.8.0 and added new ACE INet library - * ACE version 5.6.3 released. +Sun Jul 04 18:57:33 CEST 2010 Johnny Willemsen + + * ACE version 5.8 released. Local Variables: mode: change-log diff --git a/dep/ACE_wrappers/Makefile.am b/dep/ACE_wrappers/Makefile.am index 2d84dbdad..682f8eed4 100644 --- a/dep/ACE_wrappers/Makefile.am +++ b/dep/ACE_wrappers/Makefile.am @@ -8,8 +8,7 @@ ## MPC Command: ## /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 +SUBDIRS = ace ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = -I m4 diff --git a/dep/ACE_wrappers/NEWS b/dep/ACE_wrappers/NEWS index 1c0f15d2c..9c845b1a7 100644 --- a/dep/ACE_wrappers/NEWS +++ b/dep/ACE_wrappers/NEWS @@ -1,9 +1,300 @@ -PLANNED MAJOR CHANGES "SOMETIME IN THE FUTURE" (i.e., exact beta not known) -=========================================================================== +USER VISIBLE CHANGES BETWEEN ACE-5.8.1 and ACE-5.8.2 +==================================================== -. RPM packaging as part of the release process by the doc_group (Remedy and user community) +. Added support for the Microsoft Visual Studio 2010 IDE (vc10) -. Remove BCB6, BCB2006, and the borland MPC template after the release of x.6.6 +. Removed complete support for emulated C++ exceptions + +USER VISIBLE CHANGES BETWEEN ACE-5.8.0 and ACE-5.8.1 +==================================================== + +. Added support for Microsoft Visual Studio 2010 using nmake + +. Reduced the amount of doxygen pages generated, the original settings caused + a doxygen generated html package of 1.4GB which was way too large + +. Extended ACE INet addon library with: + * HTTP Basic Authentication + * SSL/HTTPS support. + * Proxy CONNECT tunneling. + +USER VISIBLE CHANGES BETWEEN ACE-5.7.9 and ACE-5.8.0 +==================================================== + +. There are two new ACE_Time_Value methods for getting and setting millisecond + values to/from ACE_UINT64 values: + + ACE_UINT64 ACE_Time_Value::get_msec () const + void ACE_Time_Value::set_msec (const ACE_UINT64 &ms) + + The former is a replacement for the existing msec(ACE_UINT64&) methods that + are "getter" methods whose signatures look confusingly like "setters". See + Bugzilla #3336 for the history behind this change. + + The latter is for consistency and clarity. + +. Added ACE INet addon library for Inet protocol clients (and possibly + servers at some point) like http://, ftp:// etc. + The library implements standard C++ iostream wrapper classes for + ACE Svc_Handler and Reactor based input/output handling, URL classes + and protocol handler classes. + NOTE: This is work in progress! There is no guarentee that the API + won't change in the next few releases. + Protocol handling is currently restricted to client side download + requests for HTTP and FTP. + Handling for upload requests should be added in the near future as well + as HTTP Basic Authentication. + +USER VISIBLE CHANGES BETWEEN ACE-5.7.8 and ACE-5.7.9 +==================================================== + +. ACE's default makefiles (traditional ACE/GNU, not autoconf/automake) + now support installation with "make install". + Please see the ACE-INSTALL.html file for instructions. + +. Support for the ARCH make variable has been enhanced to apply to executables + (in addition to libraries and object files), and the ARCH feature has been + integrated into the MPC-generated makefiles (to work with MPC's requires + and avoids features). + +USER VISIBLE CHANGES BETWEEN ACE-5.7.7 and ACE-5.7.8 +==================================================== + +. ACE now uses GCC builtin Atomic instructions for short, + unsigned short, long, unsigned long, int, unsigned int, + and bool. This makes our Atomic_Op around 7 times faster + +. ACE Service Configuration Framework now process first service + configuration files and then command-line directives. Thus if + application uses both service configuration files and command-line + directives then the command-line directives may override results of + directives in the configuration files. At the same time if the + application uses only the default svc.conf file and command-line + directives then the directives from svc.conf can not override + results of the user provided command-line directives. + +. ACE_Dev_Poll_Reactor now dispatches notifications in only one thread at + a time. This brings notification handling more in line with behavior in + other Reactor implementations. + +USER VISIBLE CHANGES BETWEEN ACE-5.7.6 and ACE-5.7.7 +==================================================== + +. Integrated fix for bug 3104 and regression test for + interval timers. + +. Added support for GCC builtin Atomic instructions which + are enabled with GCC >= 4.1 for PPC32/PPC64/IA64 + +. Improved autoconf support for debian + +. Added support for -mcpu and -mtune. Add TCPU=.. to your + environment/platform_macros.GNU to specify you cpu and + than add cpumodelflag=1 and/or tunemodelflag=1. Using + this with IBM Cell increased the performance significantly + +USER VISIBLE CHANGES BETWEEN ACE-5.7.5 and ACE-5.7.6 +==================================================== + +. Added support for iPhone/iPod Touch/iPad. The following + environment variables are needed: + + IPHONE_TARGET, should be set to either SIMULATOR or + HARDWARE. Set to HARDWARE if you want to deploy + on the iPhone/iPod Touch/iPad device. + + IPHONE_VERSION, should be set to 3.1.2 or 3.2. One can + set the version to any future or past versions, but + only 3.1.2 and 3.2 have been tried. + + Note that one has to compile ACE/TAO statically as + it is believed that the iPhone OS does not support + dynamic loading of external libraries. The usual + procedure of cross compiling ACE/TAO applies + (such as setting HOST_ROOT environment variable). + +. Added support for Embarcadero C++ Builder 2010 + +. Added option to print a given ACE_Time_Value in the log + message instead of system supplied timestamp as in %T + and %D. + The option is implemented as a variant of the %D/%T + options by using the '#' flag character like '%#D' or + '%#T'. When using this flag an ACE_Time_Value pointer is + expected in the argument list supplied with the log message. + This fixed Bugzilla #3221. + +. Fixed problems with ACE_INET_Addr::is_multicast() on + little endian platforms. This fixed bugzilla #3729. + +. Added compilation support for VxWorks 6.8, no runtime + testing has been performed + +USER VISIBLE CHANGES BETWEEN ACE-5.7.4 and ACE-5.7.5 +==================================================== + +. Added MacOSX Snow Leopard support + +. Added strsignal() wrapper + +. Improved LynxOS support + +. Updated Interix port + +. Fixed MinGW compilation problems + +USER VISIBLE CHANGES BETWEEN ACE-5.7.3 and ACE-5.7.4 +==================================================== + +. ACE_CDR::consolidate now returns an int, 0 is ok, -1 is failure + +. Fixed a bug in the realclean feature of the GNU makefiles + +. Improved Sun Studio for Linux support + +. Improved OpenBSD support + +USER VISIBLE CHANGES BETWEEN ACE-5.7.2 and ACE-5.7.3 +==================================================== + +. C++ Builder 2009 Update 3 is the only C++Builder that is supported, older + and newer compilers are not supported anymore + +. Made final changes for the CEGCC port + +. Added a set of tests to validate C++ compiler and the stl implementation + they ship. + +. HP-UX PARISC aCC < 3.80 are deprecated and can't be used anymore. Upgrade + to aCC 3.80 or newer + +USER VISIBLE CHANGES BETWEEN ACE-5.7.1 and ACE-5.7.2 +==================================================== + +. Borland C++ makefiles aren't shipped anymore as part of the release + but have to be generated by the user + +. Refactored gperf to have its own shared library so that we can reuse + that in TAO + +. Added support for SuSE Enterprise 10 + +. ACE_Configuration_Heap::open() now returns -1 with errno EBUSY if it is + called multiple times. Previous versions would allow multiple calls to + open() but leak resources. + +USER VISIBLE CHANGES BETWEEN ACE-5.7.0 and ACE-5.7.1 +==================================================== + +. Added support for Sun Studio 12 Update Pack 1 + +. Fixed compile problems when using Windows CE x86 release mode + +. Fixed compile problems for FreeBSD + +USER VISIBLE CHANGES BETWEEN ACE-5.6.9 and ACE-5.7.0 +==================================================== + +. Added support for the VxWorks vxAtomicLib which is available with VxWorks 6.6 + and newer. If you don't want to use this library undef ACE_HAS_VXATOMICLIB + in your config.h file + +. Added support for C++ Builder 2009 Update 3 + +. Added support for ACE/TAO using the CEGCC project + +. Added support for upcoming Fedora 11 and OpenSuSE Factory + +USER VISIBLE CHANGES BETWEEN ACE-5.6.8 and ACE-5.6.9 +==================================================== + +. Removed Borland/CodeGear C++ Builder 2007 support. If you'd like to + fund this support please let us know. + +. Removed VxWorks 5.5.x, 6.2, and 6.3 support. If you'd like to fund + this support please let us know. + +. Improved Unicode support. + +. Added support for the native Windows Vista and Windows Server 2008 + condition variables. These has to be enabled at compile time, and when + enabled the application can only run on Vista or Server 2008. Add + ACE_HAS_WTHREADS_CONDITION_VARIABLE to your config.h file to enable + these + +. Fixed a bug when trying to read a file of 1 byte when unicode is + enabled + +. Improved the Windows CE port + +. Fixed several Klocwork reported issues + +. Added support for MinGW 3.15 + +. Added support for Incredibuild, which is an MSVC++ feature that + optimizes compiles via distributing builds. + +USER VISIBLE CHANGES BETWEEN ACE-5.6.7 and ACE-5.6.8 +==================================================== + +. Added a new function ACE::isdotdir() which determines if a specified + pathname is "dot dir" (ie. "." or ".."). ACE::isdotdir() is significantly + faster than pair of strcmp() calls. + +. Last micro release that is maintained for Borland/CodeGear C++ + Builder 2007 and Intel C++ on Windows. + +. Fixed crash when ACE thread tries to inherit the logging attributes + from non ACE threads. + +. Fixed many small compile and test errors that occur on some platforms. + +. Fixed log output formatting on some platforms. + +. Bugs fixed: 2748, 3164, 3480, 3494, 3502, 3541, 3542, 3544, 3557. + +USER VISIBLE CHANGES BETWEEN ACE-5.6.6 and ACE-5.6.7 +==================================================== + +. Changed the automake build's feature test for a "usable" config + to warn on failure instead of exiting with an error. This should + make it easier to diagnose configure failures, as the script will + now generate a config.h file even when the test fails. + +. Removed borland MPC template, use the bmake template from now + +. Added Windows Mobile 6 support and improved the WinCE port + +. Removed BCB6 and BCB2006 support + +. Added BCB2009 MPC template + +. Updated stat struct on Windows CE to match the stat struct on other + platforms so that application code can be written portable + +. Added new ACE_OS wrappers: raise, atof, atol, isblank, isascii, + isctype, and iswctype + +. Added ACE_OS wrapper for narrow-char version of strtoll. + +. ACE_OS wrappers for wide-char versions of strtol, strtoul, + strtoll, and strtoll. + +. Added Visual Studio 2010 (vc10) support + +. Added a new feature for the "Traditional Make" build facility to allow + building for multiple architectures out of a single source directory. + To use this facility, set the ARCH make variable. The ARCH value will be + used to add a subdirectory layer below the source directory where the + traditional .shobj, .obj, etc. directories will be placed. + +. Added support for HP-UX 11iv3 on Integrity using aC++ + +. ACE (and TAO) can now be built using GNU make and the Microsoft Visual C++ + compiler and linker. See include/makeinclude/platform_win32_msvc.GNU for + more details. + +. Added support for FC10 USER VISIBLE CHANGES BETWEEN ACE-5.6.5 and ACE-5.6.6 ==================================================== diff --git a/dep/ACE_wrappers/PROBLEM-REPORT-FORM b/dep/ACE_wrappers/PROBLEM-REPORT-FORM index 5382135f4..6aa5988c9 100644 --- a/dep/ACE_wrappers/PROBLEM-REPORT-FORM +++ b/dep/ACE_wrappers/PROBLEM-REPORT-FORM @@ -43,7 +43,7 @@ To: ace-bugs@cs.wustl.edu Subject: [area]: [synopsis] - ACE VERSION: 5.6.6 + ACE VERSION: 5.8.2 HOST MACHINE and OPERATING SYSTEM: If on Windows based OS's, which version of WINSOCK do you @@ -60,6 +60,9 @@ Subject: [area]: [synopsis] (unless this isn't used in this case, e.g., with Microsoft Visual C++)]: + BUILD METHOD USED: +[Experimental ./configure or traditional makefile/project file?] + CONTENTS OF $ACE_ROOT/bin/MakeProjectCreator/config/default.features (used by MPC when you generate your own makefiles): diff --git a/dep/ACE_wrappers/THANKS b/dep/ACE_wrappers/THANKS index 269b5fd7d..90679c225 100644 --- a/dep/ACE_wrappers/THANKS +++ b/dep/ACE_wrappers/THANKS @@ -168,7 +168,7 @@ Jean-Francois Ripouteau Ajit Sagar Ashish Singhai David Sames -Gonzalo Diethelm +Gonzalo Diethelm Raj Darrin Edelman Steve Weismuller @@ -776,7 +776,6 @@ Philipp Slusallek Matthew Davis Janusz Stopa Rusty Conover -Alex Mintz Phillippe Merle Mark Winrock Boris Kaminer @@ -1069,7 +1068,7 @@ Giovanni Zito Matthew Adams Sameer Schabungbam Jeff Butler -Roland Rüdenauer +Roland R�denauer John Buckman Guy Rosen @@ -1140,7 +1139,7 @@ Mike Anderson David Singer Nick Lin Ron Hashimshony -Max Khon +Max Khon Jonas Nordin Jonathan Stockdale Jean-Francois Daune @@ -1963,7 +1962,7 @@ Arto Jalkanen Scott Zionic Diana Ukleja Shaun Cooley -Aapo Mäkinen +Aapo M�kinen Matt Emerson Sean Parker Mark Wilson @@ -2009,7 +2008,7 @@ Timothy Wayne Gomez Ventimiglia Chere Frederick Heckel Ian Zagorskih -Olivier Guérin +Olivier Gu�rin Abdel Rigumye James Damour Alan Anderson @@ -2121,7 +2120,6 @@ Popeye Cai David Highley Sonicfly Zhou Phil Billingham -David Giovannini Paul Daugherty Robert Schwebel William Cote @@ -2166,7 +2164,7 @@ Ray Lischner Sergey Kosenko Pavel Zaichenko Paul Riley -Nelson Filipe Ferreira Gonçalves +Nelson Filipe Ferreira Gon�alves Harry Goldschmitt Sail Zeng Markus Henschel @@ -2222,7 +2220,7 @@ Hayim Shaul Erman Balcik Torsten Saliwada Nathan Glasser -Grégor Boirie +Gr�gor Boirie Alex Solan Venkat Sidhabathuni Nathan Ernst @@ -2251,7 +2249,7 @@ Ittehad Shaikh Michael Doubez Namrata Gandhi <...> Michael Guntli -Frank Förster +Frank F�rster Roger Leblanc Bob Fiske Julien Vintrou @@ -2260,6 +2258,81 @@ antred Nathalie D'Amours Mele Giovanni Philipp Thomas +Mark Hebbel +Tim Pollock +Jack Lavender +Alexandre Skrzyniarz +E Vahala +Christian Fromme +Daniel Lang +Greg Bothe +Anand Kumar +Joe Pallas +Marcel Smit +Florent Vial +Pan Kai Luna +Jesus Martinez +Martin Gaus +Steve Stallion +Ron van Hoof +Joe Lihn +Jani Hakala +Marcus Monaghan +Kashif Khan +JD Robertson +Andreas Drescher +Alon Diamant +Igor Rayak +Shai Kedem +Steve Ramsay + +Skrzyniarz Alexandre +Rob Beekmans +Steven Hartmann +Dicky +Boyan Kasarov +Brendan Murphy +Ryan Carmichael +Koh Onishi +Markus Gaugusch +Annette Wilson +Sharon Mizrahi +William Glenn +Christian Ehrlicher +Hui Zhang +Marijke Hengstmengel +Christian Freund +Chris Shaw +Matthew Carter +Denis Budko +Gaurav Kulshreshtha +Wolfgang Pickartz +Joost Kraaijeveld +Pau Garcia i Quiles +Sail Zeng +Dirk Bonekaemper +Sreejith +Guillaume Lahaye +Andrew Kaplan +Alexander Mintz +Jennifer Kahng +Trent Nadeau +Nick Meyer +Olivier Langlois +Patrick Soboljew +Tim Pinkawa +Ed Blackmond +Dave +Inma Perea +David Ward +Anatoli Sakhnik +Max Zhou +Daynesh Mangal +Robert Shectman +Rafi +Kannan Ramaswamy +Brian Johnson +Catherine L. Paquin 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/dep/ACE_wrappers/VERSION b/dep/ACE_wrappers/VERSION index 0c1423ad0..2e26ed8f5 100644 --- a/dep/ACE_wrappers/VERSION +++ b/dep/ACE_wrappers/VERSION @@ -1,4 +1,4 @@ -This is ACE version 5.6.6, released Mon Sep 15 06:08:04 CDT 2008 +This is ACE version 5.8.2, released Sat Sep 04 11:30:18 CEST 2010 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/dep/ACE_wrappers/ace/ACE.bor b/dep/ACE_wrappers/ace/ACE.bor deleted file mode 100644 index 8bc37a963..000000000 --- a/dep/ACE_wrappers/ace/ACE.bor +++ /dev/null @@ -1,2312 +0,0 @@ -# Makefile for building the ACE library with Borland C++ Make - -NAME = ACE - -NO_FULL_PATH=1 - -OBJFILES = \ - $(OBJDIR)\ACE.$(OBJ_EXT) \ - $(OBJDIR)\ACE_crc32.$(OBJ_EXT) \ - $(OBJDIR)\ACE_crc_ccitt.$(OBJ_EXT) \ - $(OBJDIR)\ace_wchar.$(OBJ_EXT) \ - $(OBJDIR)\Activation_Queue.$(OBJ_EXT) \ - $(OBJDIR)\Active_Map_Manager.$(OBJ_EXT) \ - $(OBJDIR)\Addr.$(OBJ_EXT) \ - $(OBJDIR)\Argv_Type_Converter.$(OBJ_EXT) \ - $(OBJDIR)\Assert.$(OBJ_EXT) \ - $(OBJDIR)\Asynch_IO.$(OBJ_EXT) \ - $(OBJDIR)\Asynch_IO_Impl.$(OBJ_EXT) \ - $(OBJDIR)\Asynch_Pseudo_Task.$(OBJ_EXT) \ - $(OBJDIR)\ATM_Acceptor.$(OBJ_EXT) \ - $(OBJDIR)\ATM_Addr.$(OBJ_EXT) \ - $(OBJDIR)\ATM_Connector.$(OBJ_EXT) \ - $(OBJDIR)\ATM_Params.$(OBJ_EXT) \ - $(OBJDIR)\ATM_QoS.$(OBJ_EXT) \ - $(OBJDIR)\ATM_Stream.$(OBJ_EXT) \ - $(OBJDIR)\Atomic_Op.$(OBJ_EXT) \ - $(OBJDIR)\Atomic_Op_Sparc.$(OBJ_EXT) \ - $(OBJDIR)\Auto_Event.$(OBJ_EXT) \ - $(OBJDIR)\Barrier.$(OBJ_EXT) \ - $(OBJDIR)\Base_Thread_Adapter.$(OBJ_EXT) \ - $(OBJDIR)\Based_Pointer_Repository.$(OBJ_EXT) \ - $(OBJDIR)\Basic_Stats.$(OBJ_EXT) \ - $(OBJDIR)\Basic_Types.$(OBJ_EXT) \ - $(OBJDIR)\Capabilities.$(OBJ_EXT) \ - $(OBJDIR)\CDR_Base.$(OBJ_EXT) \ - $(OBJDIR)\CDR_Size.$(OBJ_EXT) \ - $(OBJDIR)\CDR_Stream.$(OBJ_EXT) \ - $(OBJDIR)\Cleanup.$(OBJ_EXT) \ - $(OBJDIR)\Codecs.$(OBJ_EXT) \ - $(OBJDIR)\Codeset_IBM1047.$(OBJ_EXT) \ - $(OBJDIR)\Codeset_Registry.$(OBJ_EXT) \ - $(OBJDIR)\Codeset_Registry_db.$(OBJ_EXT) \ - $(OBJDIR)\Condition_Recursive_Thread_Mutex.$(OBJ_EXT) \ - $(OBJDIR)\Condition_Thread_Mutex.$(OBJ_EXT) \ - $(OBJDIR)\Configuration.$(OBJ_EXT) \ - $(OBJDIR)\Configuration_Import_Export.$(OBJ_EXT) \ - $(OBJDIR)\Connection_Recycling_Strategy.$(OBJ_EXT) \ - $(OBJDIR)\Containers.$(OBJ_EXT) \ - $(OBJDIR)\Copy_Disabled.$(OBJ_EXT) \ - $(OBJDIR)\Countdown_Time.$(OBJ_EXT) \ - $(OBJDIR)\Date_Time.$(OBJ_EXT) \ - $(OBJDIR)\DEV.$(OBJ_EXT) \ - $(OBJDIR)\DEV_Addr.$(OBJ_EXT) \ - $(OBJDIR)\DEV_Connector.$(OBJ_EXT) \ - $(OBJDIR)\DEV_IO.$(OBJ_EXT) \ - $(OBJDIR)\Dev_Poll_Reactor.$(OBJ_EXT) \ - $(OBJDIR)\Dirent.$(OBJ_EXT) \ - $(OBJDIR)\Dirent_Selector.$(OBJ_EXT) \ - $(OBJDIR)\DLL.$(OBJ_EXT) \ - $(OBJDIR)\DLL_Manager.$(OBJ_EXT) \ - $(OBJDIR)\Dump.$(OBJ_EXT) \ - $(OBJDIR)\Dynamic.$(OBJ_EXT) \ - $(OBJDIR)\Dynamic_Message_Strategy.$(OBJ_EXT) \ - $(OBJDIR)\Dynamic_Service_Base.$(OBJ_EXT) \ - $(OBJDIR)\Dynamic_Service_Dependency.$(OBJ_EXT) \ - $(OBJDIR)\Encoding_Converter.$(OBJ_EXT) \ - $(OBJDIR)\Encoding_Converter_Factory.$(OBJ_EXT) \ - $(OBJDIR)\Event.$(OBJ_EXT) \ - $(OBJDIR)\Event_Handler.$(OBJ_EXT) \ - $(OBJDIR)\FIFO.$(OBJ_EXT) \ - $(OBJDIR)\FIFO_Recv.$(OBJ_EXT) \ - $(OBJDIR)\FIFO_Recv_Msg.$(OBJ_EXT) \ - $(OBJDIR)\FIFO_Send.$(OBJ_EXT) \ - $(OBJDIR)\FIFO_Send_Msg.$(OBJ_EXT) \ - $(OBJDIR)\FILE.$(OBJ_EXT) \ - $(OBJDIR)\FILE_Addr.$(OBJ_EXT) \ - $(OBJDIR)\FILE_Connector.$(OBJ_EXT) \ - $(OBJDIR)\FILE_IO.$(OBJ_EXT) \ - $(OBJDIR)\File_Lock.$(OBJ_EXT) \ - $(OBJDIR)\Filecache.$(OBJ_EXT) \ - $(OBJDIR)\Flag_Manip.$(OBJ_EXT) \ - $(OBJDIR)\Framework_Component.$(OBJ_EXT) \ - $(OBJDIR)\Functor.$(OBJ_EXT) \ - $(OBJDIR)\Functor_String.$(OBJ_EXT) \ - $(OBJDIR)\Get_Opt.$(OBJ_EXT) \ - $(OBJDIR)\gethrtime.$(OBJ_EXT) \ - $(OBJDIR)\Handle_Ops.$(OBJ_EXT) \ - $(OBJDIR)\Handle_Set.$(OBJ_EXT) \ - $(OBJDIR)\Hashable.$(OBJ_EXT) \ - $(OBJDIR)\High_Res_Timer.$(OBJ_EXT) \ - $(OBJDIR)\ICMP_Socket.$(OBJ_EXT) \ - $(OBJDIR)\INET_Addr.$(OBJ_EXT) \ - $(OBJDIR)\Init_ACE.$(OBJ_EXT) \ - $(OBJDIR)\IO_Cntl_Msg.$(OBJ_EXT) \ - $(OBJDIR)\IO_SAP.$(OBJ_EXT) \ - $(OBJDIR)\IOStream.$(OBJ_EXT) \ - $(OBJDIR)\IPC_SAP.$(OBJ_EXT) \ - $(OBJDIR)\Lib_Find.$(OBJ_EXT) \ - $(OBJDIR)\Local_Memory_Pool.$(OBJ_EXT) \ - $(OBJDIR)\Local_Name_Space.$(OBJ_EXT) \ - $(OBJDIR)\Local_Tokens.$(OBJ_EXT) \ - $(OBJDIR)\Lock.$(OBJ_EXT) \ - $(OBJDIR)\Log_Msg.$(OBJ_EXT) \ - $(OBJDIR)\Log_Msg_Backend.$(OBJ_EXT) \ - $(OBJDIR)\Log_Msg_Callback.$(OBJ_EXT) \ - $(OBJDIR)\Log_Msg_IPC.$(OBJ_EXT) \ - $(OBJDIR)\Log_Msg_NT_Event_Log.$(OBJ_EXT) \ - $(OBJDIR)\Log_Msg_UNIX_Syslog.$(OBJ_EXT) \ - $(OBJDIR)\Log_Record.$(OBJ_EXT) \ - $(OBJDIR)\Logging_Strategy.$(OBJ_EXT) \ - $(OBJDIR)\LSOCK.$(OBJ_EXT) \ - $(OBJDIR)\LSOCK_Acceptor.$(OBJ_EXT) \ - $(OBJDIR)\LSOCK_CODgram.$(OBJ_EXT) \ - $(OBJDIR)\LSOCK_Connector.$(OBJ_EXT) \ - $(OBJDIR)\LSOCK_Dgram.$(OBJ_EXT) \ - $(OBJDIR)\LSOCK_Stream.$(OBJ_EXT) \ - $(OBJDIR)\Malloc.$(OBJ_EXT) \ - $(OBJDIR)\Malloc_Allocator.$(OBJ_EXT) \ - $(OBJDIR)\Manual_Event.$(OBJ_EXT) \ - $(OBJDIR)\MEM_Acceptor.$(OBJ_EXT) \ - $(OBJDIR)\MEM_Addr.$(OBJ_EXT) \ - $(OBJDIR)\MEM_Connector.$(OBJ_EXT) \ - $(OBJDIR)\MEM_IO.$(OBJ_EXT) \ - $(OBJDIR)\Mem_Map.$(OBJ_EXT) \ - $(OBJDIR)\MEM_SAP.$(OBJ_EXT) \ - $(OBJDIR)\MEM_Stream.$(OBJ_EXT) \ - $(OBJDIR)\Message_Block.$(OBJ_EXT) \ - $(OBJDIR)\Message_Queue.$(OBJ_EXT) \ - $(OBJDIR)\Message_Queue_NT.$(OBJ_EXT) \ - $(OBJDIR)\Message_Queue_Vx.$(OBJ_EXT) \ - $(OBJDIR)\Method_Request.$(OBJ_EXT) \ - $(OBJDIR)\MMAP_Memory_Pool.$(OBJ_EXT) \ - $(OBJDIR)\Monitor_Admin.$(OBJ_EXT) \ - $(OBJDIR)\Monitor_Admin_Manager.$(OBJ_EXT) \ - $(OBJDIR)\Monitor_Base.$(OBJ_EXT) \ - $(OBJDIR)\Monitor_Control_Action.$(OBJ_EXT) \ - $(OBJDIR)\Monitor_Control_Types.$(OBJ_EXT) \ - $(OBJDIR)\Monitor_Point_Registry.$(OBJ_EXT) \ - $(OBJDIR)\Monitor_Size.$(OBJ_EXT) \ - $(OBJDIR)\Msg_WFMO_Reactor.$(OBJ_EXT) \ - $(OBJDIR)\Multihomed_INET_Addr.$(OBJ_EXT) \ - $(OBJDIR)\Mutex.$(OBJ_EXT) \ - $(OBJDIR)\Name_Proxy.$(OBJ_EXT) \ - $(OBJDIR)\Name_Request_Reply.$(OBJ_EXT) \ - $(OBJDIR)\Name_Space.$(OBJ_EXT) \ - $(OBJDIR)\Naming_Context.$(OBJ_EXT) \ - $(OBJDIR)\Netlink_Addr.$(OBJ_EXT) \ - $(OBJDIR)\Notification_Queue.$(OBJ_EXT) \ - $(OBJDIR)\Notification_Strategy.$(OBJ_EXT) \ - $(OBJDIR)\NT_Service.$(OBJ_EXT) \ - $(OBJDIR)\Obchunk.$(OBJ_EXT) \ - $(OBJDIR)\Object_Manager.$(OBJ_EXT) \ - $(OBJDIR)\Object_Manager_Base.$(OBJ_EXT) \ - $(OBJDIR)\OS_Errno.$(OBJ_EXT) \ - $(OBJDIR)\OS_Log_Msg_Attributes.$(OBJ_EXT) \ - $(OBJDIR)\OS_main.$(OBJ_EXT) \ - $(OBJDIR)\OS_NS_arpa_inet.$(OBJ_EXT) \ - $(OBJDIR)\OS_NS_ctype.$(OBJ_EXT) \ - $(OBJDIR)\OS_NS_dirent.$(OBJ_EXT) \ - $(OBJDIR)\OS_NS_dlfcn.$(OBJ_EXT) \ - $(OBJDIR)\OS_NS_errno.$(OBJ_EXT) \ - $(OBJDIR)\OS_NS_fcntl.$(OBJ_EXT) \ - $(OBJDIR)\OS_NS_math.$(OBJ_EXT) \ - $(OBJDIR)\OS_NS_netdb.$(OBJ_EXT) \ - $(OBJDIR)\OS_NS_poll.$(OBJ_EXT) \ - $(OBJDIR)\OS_NS_pwd.$(OBJ_EXT) \ - $(OBJDIR)\OS_NS_regex.$(OBJ_EXT) \ - $(OBJDIR)\OS_NS_signal.$(OBJ_EXT) \ - $(OBJDIR)\OS_NS_stdio.$(OBJ_EXT) \ - $(OBJDIR)\OS_NS_stdlib.$(OBJ_EXT) \ - $(OBJDIR)\OS_NS_string.$(OBJ_EXT) \ - $(OBJDIR)\OS_NS_strings.$(OBJ_EXT) \ - $(OBJDIR)\OS_NS_stropts.$(OBJ_EXT) \ - $(OBJDIR)\OS_NS_sys_mman.$(OBJ_EXT) \ - $(OBJDIR)\OS_NS_sys_msg.$(OBJ_EXT) \ - $(OBJDIR)\OS_NS_sys_resource.$(OBJ_EXT) \ - $(OBJDIR)\OS_NS_sys_select.$(OBJ_EXT) \ - $(OBJDIR)\OS_NS_sys_sendfile.$(OBJ_EXT) \ - $(OBJDIR)\OS_NS_sys_shm.$(OBJ_EXT) \ - $(OBJDIR)\OS_NS_sys_socket.$(OBJ_EXT) \ - $(OBJDIR)\OS_NS_sys_stat.$(OBJ_EXT) \ - $(OBJDIR)\OS_NS_sys_time.$(OBJ_EXT) \ - $(OBJDIR)\OS_NS_sys_uio.$(OBJ_EXT) \ - $(OBJDIR)\OS_NS_sys_utsname.$(OBJ_EXT) \ - $(OBJDIR)\OS_NS_sys_wait.$(OBJ_EXT) \ - $(OBJDIR)\OS_NS_Thread.$(OBJ_EXT) \ - $(OBJDIR)\OS_NS_time.$(OBJ_EXT) \ - $(OBJDIR)\OS_NS_unistd.$(OBJ_EXT) \ - $(OBJDIR)\OS_NS_wchar.$(OBJ_EXT) \ - $(OBJDIR)\OS_QoS.$(OBJ_EXT) \ - $(OBJDIR)\OS_Thread_Adapter.$(OBJ_EXT) \ - $(OBJDIR)\OS_TLI.$(OBJ_EXT) \ - $(OBJDIR)\Pagefile_Memory_Pool.$(OBJ_EXT) \ - $(OBJDIR)\Parse_Node.$(OBJ_EXT) \ - $(OBJDIR)\PI_Malloc.$(OBJ_EXT) \ - $(OBJDIR)\Ping_Socket.$(OBJ_EXT) \ - $(OBJDIR)\Pipe.$(OBJ_EXT) \ - $(OBJDIR)\POSIX_Asynch_IO.$(OBJ_EXT) \ - $(OBJDIR)\POSIX_CB_Proactor.$(OBJ_EXT) \ - $(OBJDIR)\POSIX_Proactor.$(OBJ_EXT) \ - $(OBJDIR)\Priority_Reactor.$(OBJ_EXT) \ - $(OBJDIR)\Proactor.$(OBJ_EXT) \ - $(OBJDIR)\Proactor_Impl.$(OBJ_EXT) \ - $(OBJDIR)\Process.$(OBJ_EXT) \ - $(OBJDIR)\Process_Manager.$(OBJ_EXT) \ - $(OBJDIR)\Process_Mutex.$(OBJ_EXT) \ - $(OBJDIR)\Process_Semaphore.$(OBJ_EXT) \ - $(OBJDIR)\Profile_Timer.$(OBJ_EXT) \ - $(OBJDIR)\Reactor.$(OBJ_EXT) \ - $(OBJDIR)\Reactor_Impl.$(OBJ_EXT) \ - $(OBJDIR)\Reactor_Notification_Strategy.$(OBJ_EXT) \ - $(OBJDIR)\Reactor_Timer_Interface.$(OBJ_EXT) \ - $(OBJDIR)\Read_Buffer.$(OBJ_EXT) \ - $(OBJDIR)\Recursive_Thread_Mutex.$(OBJ_EXT) \ - $(OBJDIR)\Recyclable.$(OBJ_EXT) \ - $(OBJDIR)\Registry.$(OBJ_EXT) \ - $(OBJDIR)\Registry_Name_Space.$(OBJ_EXT) \ - $(OBJDIR)\Remote_Name_Space.$(OBJ_EXT) \ - $(OBJDIR)\Remote_Tokens.$(OBJ_EXT) \ - $(OBJDIR)\Rtems_init.$(OBJ_EXT) \ - $(OBJDIR)\RW_Mutex.$(OBJ_EXT) \ - $(OBJDIR)\RW_Process_Mutex.$(OBJ_EXT) \ - $(OBJDIR)\RW_Thread_Mutex.$(OBJ_EXT) \ - $(OBJDIR)\Sample_History.$(OBJ_EXT) \ - $(OBJDIR)\Sbrk_Memory_Pool.$(OBJ_EXT) \ - $(OBJDIR)\Sched_Params.$(OBJ_EXT) \ - $(OBJDIR)\Select_Reactor_Base.$(OBJ_EXT) \ - $(OBJDIR)\Semaphore.$(OBJ_EXT) \ - $(OBJDIR)\Service_Config.$(OBJ_EXT) \ - $(OBJDIR)\Service_Gestalt.$(OBJ_EXT) \ - $(OBJDIR)\Service_Manager.$(OBJ_EXT) \ - $(OBJDIR)\Service_Object.$(OBJ_EXT) \ - $(OBJDIR)\Service_Repository.$(OBJ_EXT) \ - $(OBJDIR)\Service_Types.$(OBJ_EXT) \ - $(OBJDIR)\Shared_Memory.$(OBJ_EXT) \ - $(OBJDIR)\Shared_Memory_MM.$(OBJ_EXT) \ - $(OBJDIR)\Shared_Memory_Pool.$(OBJ_EXT) \ - $(OBJDIR)\Shared_Memory_SV.$(OBJ_EXT) \ - $(OBJDIR)\Shared_Object.$(OBJ_EXT) \ - $(OBJDIR)\Sig_Adapter.$(OBJ_EXT) \ - $(OBJDIR)\Sig_Handler.$(OBJ_EXT) \ - $(OBJDIR)\Signal.$(OBJ_EXT) \ - $(OBJDIR)\SOCK.$(OBJ_EXT) \ - $(OBJDIR)\SOCK_Acceptor.$(OBJ_EXT) \ - $(OBJDIR)\SOCK_CODgram.$(OBJ_EXT) \ - $(OBJDIR)\Sock_Connect.$(OBJ_EXT) \ - $(OBJDIR)\SOCK_Connector.$(OBJ_EXT) \ - $(OBJDIR)\SOCK_Dgram.$(OBJ_EXT) \ - $(OBJDIR)\SOCK_Dgram_Bcast.$(OBJ_EXT) \ - $(OBJDIR)\SOCK_Dgram_Mcast.$(OBJ_EXT) \ - $(OBJDIR)\SOCK_IO.$(OBJ_EXT) \ - $(OBJDIR)\SOCK_Netlink.$(OBJ_EXT) \ - $(OBJDIR)\SOCK_SEQPACK_Acceptor.$(OBJ_EXT) \ - $(OBJDIR)\SOCK_SEQPACK_Association.$(OBJ_EXT) \ - $(OBJDIR)\SOCK_SEQPACK_Connector.$(OBJ_EXT) \ - $(OBJDIR)\SOCK_Stream.$(OBJ_EXT) \ - $(OBJDIR)\SPIPE.$(OBJ_EXT) \ - $(OBJDIR)\SPIPE_Acceptor.$(OBJ_EXT) \ - $(OBJDIR)\SPIPE_Addr.$(OBJ_EXT) \ - $(OBJDIR)\SPIPE_Connector.$(OBJ_EXT) \ - $(OBJDIR)\SPIPE_Stream.$(OBJ_EXT) \ - $(OBJDIR)\SString.$(OBJ_EXT) \ - $(OBJDIR)\Stack_Trace.$(OBJ_EXT) \ - $(OBJDIR)\Stats.$(OBJ_EXT) \ - $(OBJDIR)\String_Base_Const.$(OBJ_EXT) \ - $(OBJDIR)\SUN_Proactor.$(OBJ_EXT) \ - $(OBJDIR)\SV_Message.$(OBJ_EXT) \ - $(OBJDIR)\SV_Message_Queue.$(OBJ_EXT) \ - $(OBJDIR)\SV_Semaphore_Complex.$(OBJ_EXT) \ - $(OBJDIR)\SV_Semaphore_Simple.$(OBJ_EXT) \ - $(OBJDIR)\SV_Shared_Memory.$(OBJ_EXT) \ - $(OBJDIR)\Svc_Conf_Lexer.$(OBJ_EXT) \ - $(OBJDIR)\Svc_Conf_y.$(OBJ_EXT) \ - $(OBJDIR)\Synch_Options.$(OBJ_EXT) \ - $(OBJDIR)\System_Time.$(OBJ_EXT) \ - $(OBJDIR)\Task.$(OBJ_EXT) \ - $(OBJDIR)\Thread.$(OBJ_EXT) \ - $(OBJDIR)\Thread_Adapter.$(OBJ_EXT) \ - $(OBJDIR)\Thread_Control.$(OBJ_EXT) \ - $(OBJDIR)\Thread_Exit.$(OBJ_EXT) \ - $(OBJDIR)\Thread_Hook.$(OBJ_EXT) \ - $(OBJDIR)\Thread_Manager.$(OBJ_EXT) \ - $(OBJDIR)\Thread_Mutex.$(OBJ_EXT) \ - $(OBJDIR)\Thread_Semaphore.$(OBJ_EXT) \ - $(OBJDIR)\Throughput_Stats.$(OBJ_EXT) \ - $(OBJDIR)\Time_Value.$(OBJ_EXT) \ - $(OBJDIR)\Timeprobe.$(OBJ_EXT) \ - $(OBJDIR)\TLI.$(OBJ_EXT) \ - $(OBJDIR)\TLI_Acceptor.$(OBJ_EXT) \ - $(OBJDIR)\TLI_Connector.$(OBJ_EXT) \ - $(OBJDIR)\TLI_Stream.$(OBJ_EXT) \ - $(OBJDIR)\Token.$(OBJ_EXT) \ - $(OBJDIR)\Token_Collection.$(OBJ_EXT) \ - $(OBJDIR)\Token_Invariants.$(OBJ_EXT) \ - $(OBJDIR)\Token_Manager.$(OBJ_EXT) \ - $(OBJDIR)\Token_Request_Reply.$(OBJ_EXT) \ - $(OBJDIR)\TP_Reactor.$(OBJ_EXT) \ - $(OBJDIR)\Trace.$(OBJ_EXT) \ - $(OBJDIR)\TSS_Adapter.$(OBJ_EXT) \ - $(OBJDIR)\TTY_IO.$(OBJ_EXT) \ - $(OBJDIR)\UNIX_Addr.$(OBJ_EXT) \ - $(OBJDIR)\UPIPE_Acceptor.$(OBJ_EXT) \ - $(OBJDIR)\UPIPE_Connector.$(OBJ_EXT) \ - $(OBJDIR)\UPIPE_Stream.$(OBJ_EXT) \ - $(OBJDIR)\UTF16_Encoding_Converter.$(OBJ_EXT) \ - $(OBJDIR)\UTF32_Encoding_Converter.$(OBJ_EXT) \ - $(OBJDIR)\UTF8_Encoding_Converter.$(OBJ_EXT) \ - $(OBJDIR)\UUID.$(OBJ_EXT) \ - $(OBJDIR)\WFMO_Reactor.$(OBJ_EXT) \ - $(OBJDIR)\WIN32_Asynch_IO.$(OBJ_EXT) \ - $(OBJDIR)\WIN32_Proactor.$(OBJ_EXT) \ - $(OBJDIR)\XML_Svc_Conf.$(OBJ_EXT) \ - $(OBJDIR)\XTI_ATM_Mcast.$(OBJ_EXT) - -LFLAGS = \ - -L"." \ - -j"." \ - -L"..\lib" \ - -j"..\lib" - -RESDIR = . - -RESOURCE = $(OBJDIR)\ace.res - -RC_FLAGS = \ - -i".." - - -!ifdef STATIC -LIB_FLAGS = \ - -DACE_AS_STATIC_LIBS -!else -DLL_FLAGS = \ - -DACE_BUILD_DLL -!endif - -CFLAGS = \ - -I".." \ - $(LIB_FLAGS) \ - $(DLL_FLAGS) - -CPPDIR = . -CDIR = . - -INCDIR_NAME = stage-10168\ACE_wrappers\ace - -# build_files rules - - -# test_files rules - - -# pkgconfig_files rules - - -# Override defaults in outputdir.bor -INSTALL_THIS_TARGET = 1 - -INCLUDES_INSTALL=1 -BINDIR = ..\lib - -!include <$(ACE_ROOT)\include\makeinclude\build_library.bor> - -includes_install: $(INCLUDES) - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Acceptor.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Acceptor.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y ACE.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\ACE.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y ACE_export.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\ACE_export.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y ace_wchar.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\ace_wchar.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Activation_Queue.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Activation_Queue.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Active_Map_Manager.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Active_Map_Manager.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Active_Map_Manager_T.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Active_Map_Manager_T.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Addr.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Addr.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Arg_Shifter.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Arg_Shifter.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y ARGV.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\ARGV.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Argv_Type_Converter.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Argv_Type_Converter.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Array.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Array.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Array_Base.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Array_Base.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Array_Map.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Array_Map.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Assert.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Assert.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Asynch_Acceptor.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Asynch_Acceptor.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Asynch_Connector.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Asynch_Connector.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Asynch_IO.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Asynch_IO.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Asynch_IO_Impl.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Asynch_IO_Impl.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Asynch_Pseudo_Task.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Asynch_Pseudo_Task.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y ATM_Acceptor.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\ATM_Acceptor.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y ATM_Addr.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\ATM_Addr.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y ATM_Connector.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\ATM_Connector.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y ATM_Params.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\ATM_Params.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y ATM_QoS.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\ATM_QoS.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y ATM_Stream.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\ATM_Stream.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Atomic_Op.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Atomic_Op.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Atomic_Op_Sparc.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Atomic_Op_Sparc.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Atomic_Op_T.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Atomic_Op_T.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Auto_Event.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Auto_Event.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Auto_Functor.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Auto_Functor.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Auto_IncDec_T.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Auto_IncDec_T.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Auto_Ptr.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Auto_Ptr.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Barrier.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Barrier.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Base_Thread_Adapter.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Base_Thread_Adapter.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Based_Pointer_Repository.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Based_Pointer_Repository.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Based_Pointer_T.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Based_Pointer_T.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Basic_Stats.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Basic_Stats.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Basic_Types.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Basic_Types.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Bound_Ptr.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Bound_Ptr.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Cache_Map_Manager_T.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Cache_Map_Manager_T.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Cached_Connect_Strategy_T.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Cached_Connect_Strategy_T.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Caching_Strategies_T.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Caching_Strategies_T.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Caching_Utility_T.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Caching_Utility_T.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Capabilities.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Capabilities.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y CDR_Base.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\CDR_Base.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y CDR_Size.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\CDR_Size.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y CDR_Stream.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\CDR_Stream.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y CE_Screen_Output.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\CE_Screen_Output.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y checked_iterator.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\checked_iterator.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Cleanup.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Cleanup.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Cleanup_Strategies_T.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Cleanup_Strategies_T.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Codecs.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Codecs.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Codeset_IBM1047.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Codeset_IBM1047.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Codeset_Registry.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Codeset_Registry.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Codeset_Symbols.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Codeset_Symbols.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Condition_Recursive_Thread_Mutex.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Condition_Recursive_Thread_Mutex.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Condition_T.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Condition_T.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Condition_Thread_Mutex.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Condition_Thread_Mutex.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-aix-5.x.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-aix-5.x.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-all.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-all.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-borland-common.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-borland-common.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-cray.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-cray.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-cxx-common.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-cxx-common.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-cygwin32.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-cygwin32.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-doxygen.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-doxygen.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-freebsd.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-freebsd.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-g++-common.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-g++-common.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-ghs-common.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-ghs-common.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-hpux-11.00.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-hpux-11.00.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-icc-common.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-icc-common.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-integritySCA.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-integritySCA.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-irix6.5.x-sgic++.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-irix6.5.x-sgic++.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-irix6.x-common.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-irix6.x-common.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-irix6.x-g++.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-irix6.x-g++.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-irix6.x-sgic++.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-irix6.x-sgic++.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-linux-common.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-linux-common.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-linux.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-linux.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-lite.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-lite.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-lynxos.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-lynxos.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-macosx-leopard.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-macosx-leopard.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-macosx-panther.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-macosx-panther.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-macosx-tiger.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-macosx-tiger.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-macosx.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-macosx.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-macros.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-macros.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-minimal.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-minimal.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-mvs.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-mvs.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-netbsd.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-netbsd.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-openbsd.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-openbsd.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-openvms.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-openvms.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-pharlap.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-pharlap.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-posix-nonetworking.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-posix-nonetworking.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-posix.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-posix.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-qnx-neutrino.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-qnx-neutrino.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-qnx-rtp-62x.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-qnx-rtp-62x.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-qnx-rtp-common.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-qnx-rtp-common.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-qnx-rtp-pre62x.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-qnx-rtp-pre62x.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-qnx-rtp.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-qnx-rtp.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-rtems.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-rtems.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-sco-5.0.0-nothread.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-sco-5.0.0-nothread.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-sco-5.0.0.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-sco-5.0.0.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-suncc-common.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-suncc-common.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-sunos5.10.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-sunos5.10.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-sunos5.11.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-sunos5.11.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-sunos5.4-g++.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-sunos5.4-g++.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-sunos5.4-sunc++-4.x.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-sunos5.4-sunc++-4.x.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-sunos5.5.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-sunos5.5.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-sunos5.6.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-sunos5.6.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-sunos5.7.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-sunos5.7.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-sunos5.8.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-sunos5.8.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-sunos5.9.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-sunos5.9.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-tandem-nsk-mips-v2.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-tandem-nsk-mips-v2.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-tandem-nsk-mips-v3.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-tandem-nsk-mips-v3.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-tandem.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-tandem.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-tru64.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-tru64.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-unixware-7.1.0.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-unixware-7.1.0.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-unixware-7.1.0.udk.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-unixware-7.1.0.udk.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-visualage.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-visualage.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-vxworks.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-vxworks.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-vxworks5.x.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-vxworks5.x.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-vxworks6.2.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-vxworks6.2.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-vxworks6.3.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-vxworks6.3.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-vxworks6.4.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-vxworks6.4.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-vxworks6.5.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-vxworks6.5.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-vxworks6.6.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-vxworks6.6.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-win32-borland.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-win32-borland.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-win32-common.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-win32-common.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-win32-dmc.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-win32-dmc.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-win32-ghs.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-win32-ghs.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-win32-interix.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-win32-interix.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-win32-mingw.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-win32-mingw.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-win32-msvc-7.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-win32-msvc-7.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-win32-msvc-8.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-win32-msvc-8.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-win32-msvc-9.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-win32-msvc-9.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-win32-msvc.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-win32-msvc.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-win32.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-win32.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config-WinCE.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config-WinCE.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y config.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\config.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Configuration.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Configuration.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Configuration_Import_Export.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Configuration_Import_Export.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Connection_Recycling_Strategy.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Connection_Recycling_Strategy.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Connector.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Connector.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Containers.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Containers.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Containers_T.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Containers_T.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Copy_Disabled.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Copy_Disabled.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y CORBA_macros.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\CORBA_macros.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Countdown_Time.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Countdown_Time.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Date_Time.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Date_Time.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Default_Constants.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Default_Constants.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y DEV.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\DEV.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y DEV_Addr.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\DEV_Addr.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y DEV_Connector.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\DEV_Connector.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y DEV_IO.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\DEV_IO.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Dev_Poll_Reactor.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Dev_Poll_Reactor.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Dirent.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Dirent.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Dirent_Selector.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Dirent_Selector.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y DLL.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\DLL.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y DLL_Manager.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\DLL_Manager.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Dump.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Dump.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Dump_T.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Dump_T.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Dynamic.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Dynamic.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Dynamic_Message_Strategy.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Dynamic_Message_Strategy.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Dynamic_Service.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Dynamic_Service.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Dynamic_Service_Base.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Dynamic_Service_Base.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Dynamic_Service_Dependency.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Dynamic_Service_Dependency.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Encoding_Converter.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Encoding_Converter.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Encoding_Converter_Factory.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Encoding_Converter_Factory.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Env_Value_T.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Env_Value_T.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Event.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Event.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Event_Handler.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Event_Handler.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Event_Handler_T.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Event_Handler_T.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Exception_Macros.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Exception_Macros.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y FIFO.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\FIFO.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y FIFO_Recv.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\FIFO_Recv.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y FIFO_Recv_Msg.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\FIFO_Recv_Msg.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y FIFO_Send.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\FIFO_Send.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y FIFO_Send_Msg.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\FIFO_Send_Msg.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y FILE.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\FILE.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y FILE_Addr.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\FILE_Addr.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y FILE_Connector.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\FILE_Connector.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y FILE_IO.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\FILE_IO.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y File_Lock.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\File_Lock.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Filecache.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Filecache.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Flag_Manip.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Flag_Manip.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Framework_Component.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Framework_Component.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Framework_Component_T.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Framework_Component_T.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Free_List.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Free_List.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Functor.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Functor.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Functor_String.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Functor_String.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Functor_T.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Functor_T.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Future.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Future.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Future_Set.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Future_Set.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Get_Opt.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Get_Opt.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Global_Macros.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Global_Macros.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Guard_T.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Guard_T.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Handle_Gobbler.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Handle_Gobbler.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Handle_Ops.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Handle_Ops.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Handle_Set.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Handle_Set.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Hash_Cache_Map_Manager_T.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Hash_Cache_Map_Manager_T.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Hash_Map_Manager.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Hash_Map_Manager.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Hash_Map_Manager_T.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Hash_Map_Manager_T.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Hash_Map_With_Allocator_T.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Hash_Map_With_Allocator_T.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Hash_Multi_Map_Manager_T.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Hash_Multi_Map_Manager_T.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Hashable.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Hashable.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y High_Res_Timer.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\High_Res_Timer.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y ICMP_Socket.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\ICMP_Socket.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y If_Then_Else.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\If_Then_Else.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y INET_Addr.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\INET_Addr.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Init_ACE.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Init_ACE.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Intrusive_Auto_Ptr.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Intrusive_Auto_Ptr.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Intrusive_List.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Intrusive_List.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Intrusive_List_Node.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Intrusive_List_Node.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y IO_Cntl_Msg.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\IO_Cntl_Msg.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y IO_SAP.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\IO_SAP.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y iosfwd.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\iosfwd.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y IOStream.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\IOStream.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y IOStream_T.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\IOStream_T.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y IPC_SAP.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\IPC_SAP.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Lib_Find.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Lib_Find.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Local_Memory_Pool.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Local_Memory_Pool.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Local_Name_Space.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Local_Name_Space.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Local_Name_Space_T.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Local_Name_Space_T.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Local_Tokens.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Local_Tokens.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Lock.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Lock.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Lock_Adapter_T.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Lock_Adapter_T.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y LOCK_SOCK_Acceptor.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\LOCK_SOCK_Acceptor.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Log_Msg.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Log_Msg.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Log_Msg_Backend.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Log_Msg_Backend.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Log_Msg_Callback.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Log_Msg_Callback.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Log_Msg_IPC.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Log_Msg_IPC.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Log_Msg_NT_Event_Log.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Log_Msg_NT_Event_Log.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Log_Msg_UNIX_Syslog.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Log_Msg_UNIX_Syslog.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Log_Priority.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Log_Priority.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Log_Record.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Log_Record.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Logging_Strategy.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Logging_Strategy.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y LSOCK.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\LSOCK.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y LSOCK_Acceptor.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\LSOCK_Acceptor.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y LSOCK_CODgram.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\LSOCK_CODgram.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y LSOCK_Connector.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\LSOCK_Connector.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y LSOCK_Dgram.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\LSOCK_Dgram.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y LSOCK_Stream.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\LSOCK_Stream.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Malloc.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Malloc.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Malloc_Allocator.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Malloc_Allocator.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Malloc_Base.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Malloc_Base.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Malloc_T.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Malloc_T.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Managed_Object.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Managed_Object.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Manual_Event.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Manual_Event.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Map.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Map.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Map_Manager.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Map_Manager.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Map_T.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Map_T.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y MEM_Acceptor.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\MEM_Acceptor.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y MEM_Addr.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\MEM_Addr.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y MEM_Connector.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\MEM_Connector.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y MEM_IO.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\MEM_IO.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Mem_Map.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Mem_Map.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y MEM_SAP.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\MEM_SAP.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y MEM_Stream.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\MEM_Stream.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Memory_Pool.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Memory_Pool.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Message_Block.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Message_Block.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Message_Block_T.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Message_Block_T.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Message_Queue.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Message_Queue.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Message_Queue_NT.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Message_Queue_NT.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Message_Queue_T.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Message_Queue_T.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Message_Queue_Vx.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Message_Queue_Vx.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Method_Object.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Method_Object.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Method_Request.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Method_Request.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Metrics_Cache.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Metrics_Cache.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Metrics_Cache_T.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Metrics_Cache_T.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Min_Max.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Min_Max.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y MMAP_Memory_Pool.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\MMAP_Memory_Pool.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Module.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Module.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Monitor_Admin.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Monitor_Admin.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Monitor_Admin_Manager.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Monitor_Admin_Manager.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Monitor_Base.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Monitor_Base.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Monitor_Control_Action.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Monitor_Control_Action.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Monitor_Control_Types.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Monitor_Control_Types.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Monitor_Point_Registry.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Monitor_Point_Registry.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Monitor_Size.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Monitor_Size.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Msg_WFMO_Reactor.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Msg_WFMO_Reactor.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Multihomed_INET_Addr.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Multihomed_INET_Addr.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Mutex.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Mutex.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Name_Proxy.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Name_Proxy.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Name_Request_Reply.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Name_Request_Reply.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Name_Space.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Name_Space.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Naming_Context.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Naming_Context.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Netlink_Addr.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Netlink_Addr.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Node.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Node.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Notification_Queue.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Notification_Queue.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Notification_Strategy.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Notification_Strategy.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y NT_Service.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\NT_Service.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Null_Barrier.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Null_Barrier.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Null_Condition.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Null_Condition.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Null_Mutex.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Null_Mutex.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Null_Semaphore.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Null_Semaphore.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Numeric_Limits.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Numeric_Limits.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Obchunk.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Obchunk.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Object_Manager.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Object_Manager.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Object_Manager_Base.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Object_Manager_Base.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Obstack.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Obstack.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Obstack_T.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Obstack_T.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_Dirent.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_Dirent.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_Errno.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_Errno.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\arpa mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\arpa - -© /Y os_include\arpa\os_inet.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\arpa\os_inet.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\net mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\net - -© /Y os_include\net\os_if.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\net\os_if.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\netinet mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\netinet - -© /Y os_include\netinet\os_in.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\netinet\os_in.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\netinet mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\netinet - -© /Y os_include\netinet\os_tcp.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\netinet\os_tcp.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_aio.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_aio.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_assert.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_assert.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_byteswap.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_byteswap.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_complex.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_complex.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_cpio.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_cpio.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_ctype.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_ctype.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_dirent.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_dirent.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_dlfcn.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_dlfcn.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_errno.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_errno.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_fcntl.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_fcntl.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_fenv.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_fenv.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_float.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_float.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_fmtmsg.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_fmtmsg.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_fnmatch.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_fnmatch.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_ftw.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_ftw.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_glob.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_glob.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_grp.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_grp.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_iconv.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_iconv.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_intrin.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_intrin.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_inttypes.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_inttypes.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_iso646.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_iso646.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_kstat.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_kstat.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_langinfo.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_langinfo.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_libgen.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_libgen.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_limits.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_limits.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_local.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_local.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_math.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_math.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_monetary.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_monetary.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_mqueue.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_mqueue.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_ndbm.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_ndbm.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_netdb.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_netdb.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_nl_types.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_nl_types.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_pdh.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_pdh.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_pdhmsg.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_pdhmsg.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_poll.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_poll.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_pthread.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_pthread.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_pwd.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_pwd.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_regex.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_regex.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_sched.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_sched.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_search.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_search.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_semaphore.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_semaphore.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_setjmp.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_setjmp.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_signal.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_signal.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_spawn.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_spawn.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_stdarg.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_stdarg.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_stdbool.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_stdbool.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_stddef.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_stddef.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_stdint.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_stdint.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_stdio.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_stdio.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_stdlib.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_stdlib.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_string.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_string.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_strings.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_strings.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_stropts.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_stropts.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_syslog.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_syslog.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_tar.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_tar.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_termios.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_termios.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_tgmath.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_tgmath.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_time.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_time.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_trace.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_trace.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_ucontext.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_ucontext.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_ulimit.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_ulimit.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_unistd.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_unistd.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_utime.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_utime.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_utmpx.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_utmpx.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_wchar.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_wchar.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_wctype.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_wctype.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include - -© /Y os_include\os_wordexp.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\os_wordexp.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys - -© /Y os_include\sys\os_ipc.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys\os_ipc.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys - -© /Y os_include\sys\os_loadavg.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys\os_loadavg.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys - -© /Y os_include\sys\os_mman.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys\os_mman.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys - -© /Y os_include\sys\os_msg.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys\os_msg.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys - -© /Y os_include\sys\os_pstat.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys\os_pstat.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys - -© /Y os_include\sys\os_resource.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys\os_resource.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys - -© /Y os_include\sys\os_select.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys\os_select.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys - -© /Y os_include\sys\os_sem.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys\os_sem.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys - -© /Y os_include\sys\os_shm.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys\os_shm.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys - -© /Y os_include\sys\os_socket.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys\os_socket.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys - -© /Y os_include\sys\os_stat.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys\os_stat.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys - -© /Y os_include\sys\os_statvfs.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys\os_statvfs.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys - -© /Y os_include\sys\os_sysctl.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys\os_sysctl.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys - -© /Y os_include\sys\os_sysinfo.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys\os_sysinfo.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys - -© /Y os_include\sys\os_time.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys\os_time.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys - -© /Y os_include\sys\os_timeb.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys\os_timeb.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys - -© /Y os_include\sys\os_times.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys\os_times.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys - -© /Y os_include\sys\os_types.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys\os_types.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys - -© /Y os_include\sys\os_uio.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys\os_uio.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys - -© /Y os_include\sys\os_un.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys\os_un.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys - -© /Y os_include\sys\os_utsname.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys\os_utsname.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys - -© /Y os_include\sys\os_wait.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\os_include\sys\os_wait.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_Log_Msg_Attributes.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_Log_Msg_Attributes.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_main.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_main.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_Memory.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_Memory.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_arpa_inet.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_arpa_inet.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_ctype.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_ctype.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_dirent.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_dirent.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_dlfcn.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_dlfcn.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_errno.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_errno.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_fcntl.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_fcntl.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_macros.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_macros.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_math.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_math.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_netdb.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_netdb.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_poll.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_poll.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_pwd.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_pwd.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_regex.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_regex.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_signal.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_signal.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_stdio.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_stdio.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_stdlib.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_stdlib.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_string.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_string.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_strings.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_strings.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_stropts.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_stropts.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_sys_mman.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_sys_mman.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_sys_msg.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_sys_msg.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_sys_resource.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_sys_resource.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_sys_select.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_sys_select.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_sys_sendfile.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_sys_sendfile.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_sys_shm.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_sys_shm.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_sys_socket.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_sys_socket.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_sys_stat.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_sys_stat.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_sys_time.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_sys_time.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_sys_uio.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_sys_uio.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_sys_utsname.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_sys_utsname.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_sys_wait.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_sys_wait.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_Thread.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_Thread.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_time.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_time.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_unistd.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_unistd.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_wchar.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_wchar.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_QoS.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_QoS.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_String.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_String.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_Thread_Adapter.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_Thread_Adapter.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_TLI.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_TLI.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Pagefile_Memory_Pool.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Pagefile_Memory_Pool.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Pair.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Pair.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Pair_T.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Pair_T.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Parse_Node.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Parse_Node.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y PI_Malloc.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\PI_Malloc.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Ping_Socket.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Ping_Socket.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Pipe.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Pipe.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y POSIX_Asynch_IO.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\POSIX_Asynch_IO.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y POSIX_CB_Proactor.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\POSIX_CB_Proactor.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y POSIX_Proactor.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\POSIX_Proactor.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y post.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\post.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y pre.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\pre.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Priority_Reactor.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Priority_Reactor.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Proactor.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Proactor.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Proactor_Impl.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Proactor_Impl.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Process.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Process.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Process_Manager.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Process_Manager.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Process_Mutex.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Process_Mutex.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Process_Semaphore.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Process_Semaphore.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Profile_Timer.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Profile_Timer.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y RB_Tree.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\RB_Tree.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Reactor.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Reactor.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Reactor_Impl.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Reactor_Impl.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Reactor_Notification_Strategy.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Reactor_Notification_Strategy.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Reactor_Timer_Interface.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Reactor_Timer_Interface.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Reactor_Token_T.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Reactor_Token_T.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Read_Buffer.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Read_Buffer.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Recursive_Thread_Mutex.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Recursive_Thread_Mutex.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Recyclable.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Recyclable.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Refcountable.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Refcountable.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Refcountable_T.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Refcountable_T.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Refcounted_Auto_Ptr.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Refcounted_Auto_Ptr.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Registry.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Registry.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Registry_Name_Space.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Registry_Name_Space.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Remote_Name_Space.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Remote_Name_Space.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Remote_Tokens.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Remote_Tokens.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Reverse_Lock_T.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Reverse_Lock_T.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y RW_Mutex.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\RW_Mutex.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y RW_Process_Mutex.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\RW_Process_Mutex.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y RW_Thread_Mutex.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\RW_Thread_Mutex.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Sample_History.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Sample_History.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Sbrk_Memory_Pool.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Sbrk_Memory_Pool.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Sched_Params.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Sched_Params.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Select_Reactor.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Select_Reactor.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Select_Reactor_Base.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Select_Reactor_Base.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Select_Reactor_T.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Select_Reactor_T.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Semaphore.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Semaphore.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Service_Config.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Service_Config.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Service_Gestalt.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Service_Gestalt.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Service_Manager.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Service_Manager.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Service_Object.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Service_Object.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Service_Repository.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Service_Repository.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Service_Templates.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Service_Templates.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Service_Types.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Service_Types.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Shared_Memory.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Shared_Memory.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Shared_Memory_MM.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Shared_Memory_MM.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Shared_Memory_Pool.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Shared_Memory_Pool.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Shared_Memory_SV.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Shared_Memory_SV.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Shared_Object.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Shared_Object.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Sig_Adapter.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Sig_Adapter.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Sig_Handler.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Sig_Handler.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Signal.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Signal.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Singleton.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Singleton.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y SOCK.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\SOCK.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y SOCK_Acceptor.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\SOCK_Acceptor.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y SOCK_CODgram.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\SOCK_CODgram.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Sock_Connect.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Sock_Connect.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y SOCK_Connector.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\SOCK_Connector.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y SOCK_Dgram.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\SOCK_Dgram.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y SOCK_Dgram_Bcast.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\SOCK_Dgram_Bcast.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y SOCK_Dgram_Mcast.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\SOCK_Dgram_Mcast.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y SOCK_IO.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\SOCK_IO.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y SOCK_Netlink.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\SOCK_Netlink.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y SOCK_SEQPACK_Acceptor.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\SOCK_SEQPACK_Acceptor.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y SOCK_SEQPACK_Association.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\SOCK_SEQPACK_Association.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y SOCK_SEQPACK_Connector.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\SOCK_SEQPACK_Connector.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y SOCK_Stream.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\SOCK_Stream.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y SPIPE.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\SPIPE.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y SPIPE_Acceptor.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\SPIPE_Acceptor.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y SPIPE_Addr.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\SPIPE_Addr.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y SPIPE_Connector.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\SPIPE_Connector.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y SPIPE_Stream.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\SPIPE_Stream.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y SString.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\SString.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y SStringfwd.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\SStringfwd.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Stack_Trace.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Stack_Trace.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Static_Object_Lock.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Static_Object_Lock.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Stats.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Stats.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Strategies.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Strategies.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Strategies_T.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Strategies_T.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Stream.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Stream.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Stream_Modules.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Stream_Modules.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y streams.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\streams.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y String_Base.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\String_Base.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y String_Base_Const.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\String_Base_Const.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y SUN_Proactor.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\SUN_Proactor.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y SV_Message.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\SV_Message.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y SV_Message_Queue.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\SV_Message_Queue.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y SV_Semaphore_Complex.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\SV_Semaphore_Complex.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y SV_Semaphore_Simple.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\SV_Semaphore_Simple.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y SV_Shared_Memory.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\SV_Shared_Memory.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Svc_Conf.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Svc_Conf.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Svc_Conf_Lexer.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Svc_Conf_Lexer.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Svc_Conf_Param.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Svc_Conf_Param.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Svc_Conf_Token_Table.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Svc_Conf_Token_Table.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Svc_Conf_Tokens.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Svc_Conf_Tokens.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y svc_export.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\svc_export.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Svc_Handler.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Svc_Handler.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Synch.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Synch.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Synch_Options.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Synch_Options.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Synch_T.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Synch_T.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Synch_Traits.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Synch_Traits.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y System_Time.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\System_Time.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Task.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Task.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Task_Ex_T.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Task_Ex_T.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Task_T.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Task_T.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Test_and_Set.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Test_and_Set.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Thread.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Thread.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Thread_Adapter.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Thread_Adapter.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Thread_Control.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Thread_Control.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Thread_Exit.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Thread_Exit.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Thread_Hook.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Thread_Hook.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Thread_Manager.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Thread_Manager.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Thread_Mutex.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Thread_Mutex.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Thread_Semaphore.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Thread_Semaphore.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Throughput_Stats.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Throughput_Stats.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Time_Value.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Time_Value.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Timeprobe.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Timeprobe.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Timeprobe_T.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Timeprobe_T.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Timer_Hash.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Timer_Hash.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Timer_Hash_T.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Timer_Hash_T.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Timer_Heap.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Timer_Heap.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Timer_Heap_T.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Timer_Heap_T.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Timer_List.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Timer_List.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Timer_List_T.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Timer_List_T.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Timer_Queue.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Timer_Queue.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Timer_Queue_Adapters.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Timer_Queue_Adapters.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Timer_Queue_T.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Timer_Queue_T.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Timer_Queuefwd.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Timer_Queuefwd.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Timer_Wheel.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Timer_Wheel.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Timer_Wheel_T.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Timer_Wheel_T.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y TLI.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\TLI.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y TLI_Acceptor.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\TLI_Acceptor.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y TLI_Connector.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\TLI_Connector.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y TLI_Stream.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\TLI_Stream.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Token.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Token.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Token_Collection.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Token_Collection.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Token_Invariants.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Token_Invariants.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Token_Manager.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Token_Manager.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Token_Request_Reply.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Token_Request_Reply.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y TP_Reactor.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\TP_Reactor.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Trace.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Trace.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Truncate.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Truncate.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y TSS_Adapter.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\TSS_Adapter.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y TSS_T.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\TSS_T.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y TTY_IO.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\TTY_IO.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Typed_SV_Message.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Typed_SV_Message.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Typed_SV_Message_Queue.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Typed_SV_Message_Queue.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Unbounded_Queue.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Unbounded_Queue.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Unbounded_Set.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Unbounded_Set.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Unbounded_Set_Ex.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Unbounded_Set_Ex.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y UNIX_Addr.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\UNIX_Addr.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y UPIPE_Acceptor.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\UPIPE_Acceptor.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y UPIPE_Addr.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\UPIPE_Addr.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y UPIPE_Connector.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\UPIPE_Connector.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y UPIPE_Stream.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\UPIPE_Stream.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y UTF16_Encoding_Converter.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\UTF16_Encoding_Converter.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y UTF32_Encoding_Converter.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\UTF32_Encoding_Converter.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y UTF8_Encoding_Converter.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\UTF8_Encoding_Converter.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y UUID.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\UUID.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Value_Ptr.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Value_Ptr.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Vector_T.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Vector_T.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Version.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Version.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Versioned_Namespace.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\Versioned_Namespace.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y WFMO_Reactor.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\WFMO_Reactor.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y WIN32_Asynch_IO.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\WIN32_Asynch_IO.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y WIN32_Proactor.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\WIN32_Proactor.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y XML_Svc_Conf.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\XML_Svc_Conf.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y XTI_ATM_Mcast.h $(INSTALL_DIR)\include\$(INCDIR_NAME)\XTI_ATM_Mcast.h 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Acceptor.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Acceptor.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Active_Map_Manager_T.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Active_Map_Manager_T.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Arg_Shifter.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Arg_Shifter.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y ARGV.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\ARGV.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Array_Base.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Array_Base.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Array_Map.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Array_Map.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Asynch_Acceptor.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Asynch_Acceptor.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Asynch_Connector.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Asynch_Connector.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Atomic_Op_T.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Atomic_Op_T.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Auto_Functor.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Auto_Functor.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Auto_IncDec_T.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Auto_IncDec_T.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Auto_Ptr.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Auto_Ptr.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Based_Pointer_T.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Based_Pointer_T.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Cache_Map_Manager_T.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Cache_Map_Manager_T.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Cached_Connect_Strategy_T.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Cached_Connect_Strategy_T.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Caching_Strategies_T.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Caching_Strategies_T.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Caching_Utility_T.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Caching_Utility_T.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Cleanup_Strategies_T.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Cleanup_Strategies_T.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Condition_T.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Condition_T.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Connector.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Connector.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Containers_T.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Containers_T.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Dump_T.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Dump_T.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Dynamic_Service.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Dynamic_Service.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Env_Value_T.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Env_Value_T.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Event_Handler_T.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Event_Handler_T.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Framework_Component_T.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Framework_Component_T.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Free_List.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Free_List.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Functor_T.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Functor_T.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Future.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Future.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Future_Set.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Future_Set.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Guard_T.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Guard_T.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Hash_Cache_Map_Manager_T.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Hash_Cache_Map_Manager_T.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Hash_Map_Manager_T.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Hash_Map_Manager_T.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Hash_Map_With_Allocator_T.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Hash_Map_With_Allocator_T.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Hash_Multi_Map_Manager_T.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Hash_Multi_Map_Manager_T.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Intrusive_Auto_Ptr.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Intrusive_Auto_Ptr.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Intrusive_List.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Intrusive_List.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Intrusive_List_Node.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Intrusive_List_Node.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y IOStream_T.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\IOStream_T.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Local_Name_Space_T.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Local_Name_Space_T.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Lock_Adapter_T.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Lock_Adapter_T.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y LOCK_SOCK_Acceptor.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\LOCK_SOCK_Acceptor.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Malloc_T.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Malloc_T.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Managed_Object.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Managed_Object.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Map_Manager.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Map_Manager.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Map_T.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Map_T.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Message_Block_T.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Message_Block_T.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Message_Queue_T.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Message_Queue_T.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Metrics_Cache_T.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Metrics_Cache_T.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Module.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Module.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Node.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Node.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Obstack_T.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Obstack_T.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Pair_T.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Pair_T.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y RB_Tree.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\RB_Tree.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Reactor_Token_T.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Reactor_Token_T.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Refcountable_T.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Refcountable_T.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Refcounted_Auto_Ptr.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Refcounted_Auto_Ptr.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Reverse_Lock_T.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Reverse_Lock_T.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Select_Reactor_T.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Select_Reactor_T.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Singleton.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Singleton.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Strategies_T.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Strategies_T.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Stream.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Stream.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Stream_Modules.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Stream_Modules.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y String_Base.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\String_Base.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Svc_Handler.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Svc_Handler.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Synch_T.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Synch_T.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Task_Ex_T.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Task_Ex_T.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Task_T.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Task_T.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Test_and_Set.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Test_and_Set.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Timeprobe_T.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Timeprobe_T.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Timer_Hash_T.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Timer_Hash_T.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Timer_Heap_T.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Timer_Heap_T.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Timer_List_T.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Timer_List_T.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Timer_Queue_Adapters.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Timer_Queue_Adapters.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Timer_Queue_T.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Timer_Queue_T.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Timer_Wheel_T.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Timer_Wheel_T.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y TSS_T.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\TSS_T.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Typed_SV_Message.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Typed_SV_Message.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Typed_SV_Message_Queue.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Typed_SV_Message_Queue.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Unbounded_Queue.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Unbounded_Queue.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Unbounded_Set.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Unbounded_Set.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Unbounded_Set_Ex.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Unbounded_Set_Ex.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Vector_T.cpp $(INSTALL_DIR)\include\$(INCDIR_NAME)\Vector_T.cpp 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y ACE.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\ACE.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y ace_wchar.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\ace_wchar.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Activation_Queue.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Activation_Queue.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Active_Map_Manager.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Active_Map_Manager.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Active_Map_Manager_T.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Active_Map_Manager_T.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Addr.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Addr.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y ARGV.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\ARGV.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Argv_Type_Converter.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Argv_Type_Converter.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Array_Base.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Array_Base.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Array_Map.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Array_Map.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Asynch_IO_Impl.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Asynch_IO_Impl.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y ATM_Acceptor.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\ATM_Acceptor.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y ATM_Addr.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\ATM_Addr.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y ATM_Connector.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\ATM_Connector.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y ATM_Params.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\ATM_Params.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y ATM_QoS.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\ATM_QoS.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y ATM_Stream.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\ATM_Stream.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Atomic_Op.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Atomic_Op.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Atomic_Op_T.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Atomic_Op_T.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Auto_Event.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Auto_Event.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Auto_Functor.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Auto_Functor.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Auto_IncDec_T.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Auto_IncDec_T.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Auto_Ptr.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Auto_Ptr.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Barrier.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Barrier.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Base_Thread_Adapter.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Base_Thread_Adapter.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Based_Pointer_T.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Based_Pointer_T.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Basic_Stats.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Basic_Stats.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Basic_Types.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Basic_Types.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Bound_Ptr.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Bound_Ptr.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Cache_Map_Manager_T.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Cache_Map_Manager_T.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Caching_Strategies_T.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Caching_Strategies_T.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Capabilities.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Capabilities.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y CDR_Base.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\CDR_Base.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y CDR_Size.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\CDR_Size.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y CDR_Stream.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\CDR_Stream.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Cleanup.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Cleanup.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Codeset_Registry.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Codeset_Registry.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Condition_T.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Condition_T.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Condition_Thread_Mutex.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Condition_Thread_Mutex.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Configuration.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Configuration.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Containers.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Containers.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Containers_T.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Containers_T.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Date_Time.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Date_Time.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y DEV.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\DEV.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y DEV_Addr.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\DEV_Addr.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y DEV_Connector.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\DEV_Connector.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y DEV_IO.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\DEV_IO.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Dev_Poll_Reactor.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Dev_Poll_Reactor.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Dirent.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Dirent.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Dirent_Selector.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Dirent_Selector.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Dynamic.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Dynamic.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Dynamic_Message_Strategy.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Dynamic_Message_Strategy.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Dynamic_Service.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Dynamic_Service.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Env_Value_T.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Env_Value_T.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Event.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Event.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Event_Handler.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Event_Handler.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Event_Handler_T.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Event_Handler_T.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y FIFO.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\FIFO.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y FIFO_Recv.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\FIFO_Recv.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y FIFO_Recv_Msg.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\FIFO_Recv_Msg.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y FIFO_Send.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\FIFO_Send.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y FIFO_Send_Msg.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\FIFO_Send_Msg.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y FILE.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\FILE.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y FILE_Addr.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\FILE_Addr.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y FILE_Connector.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\FILE_Connector.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y FILE_IO.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\FILE_IO.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y File_Lock.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\File_Lock.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Flag_Manip.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Flag_Manip.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Framework_Component.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Framework_Component.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Functor.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Functor.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Functor_String.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Functor_String.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Functor_T.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Functor_T.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Get_Opt.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Get_Opt.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Guard_T.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Guard_T.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Handle_Gobbler.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Handle_Gobbler.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Handle_Set.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Handle_Set.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Hash_Cache_Map_Manager_T.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Hash_Cache_Map_Manager_T.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Hash_Map_Manager_T.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Hash_Map_Manager_T.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Hash_Map_With_Allocator_T.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Hash_Map_With_Allocator_T.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Hash_Multi_Map_Manager_T.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Hash_Multi_Map_Manager_T.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Hashable.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Hashable.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y High_Res_Timer.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\High_Res_Timer.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y INET_Addr.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\INET_Addr.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Intrusive_Auto_Ptr.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Intrusive_Auto_Ptr.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Intrusive_List.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Intrusive_List.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Intrusive_List_Node.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Intrusive_List_Node.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y IO_Cntl_Msg.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\IO_Cntl_Msg.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y IO_SAP.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\IO_SAP.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y IOStream_T.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\IOStream_T.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y IPC_SAP.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\IPC_SAP.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Local_Tokens.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Local_Tokens.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Lock.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Lock.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Lock_Adapter_T.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Lock_Adapter_T.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Log_Msg.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Log_Msg.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Log_Record.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Log_Record.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y LSOCK.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\LSOCK.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y LSOCK_CODgram.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\LSOCK_CODgram.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y LSOCK_Connector.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\LSOCK_Connector.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y LSOCK_Dgram.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\LSOCK_Dgram.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y LSOCK_Stream.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\LSOCK_Stream.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Malloc.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Malloc.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Malloc_Allocator.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Malloc_Allocator.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Malloc_T.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Malloc_T.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Managed_Object.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Managed_Object.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Manual_Event.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Manual_Event.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Map_Manager.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Map_Manager.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Map_T.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Map_T.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y MEM_Acceptor.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\MEM_Acceptor.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y MEM_Addr.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\MEM_Addr.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y MEM_Connector.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\MEM_Connector.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y MEM_IO.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\MEM_IO.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Mem_Map.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Mem_Map.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y MEM_SAP.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\MEM_SAP.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y MEM_Stream.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\MEM_Stream.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Message_Block.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Message_Block.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Message_Block_T.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Message_Block_T.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Message_Queue.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Message_Queue.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Message_Queue_NT.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Message_Queue_NT.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Message_Queue_Vx.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Message_Queue_Vx.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Metrics_Cache_T.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Metrics_Cache_T.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y MMAP_Memory_Pool.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\MMAP_Memory_Pool.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Module.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Module.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Monitor_Base.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Monitor_Base.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Msg_WFMO_Reactor.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Msg_WFMO_Reactor.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Multihomed_INET_Addr.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Multihomed_INET_Addr.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Mutex.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Mutex.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Naming_Context.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Naming_Context.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Netlink_Addr.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Netlink_Addr.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Notification_Queue.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Notification_Queue.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Notification_Strategy.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Notification_Strategy.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y NT_Service.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\NT_Service.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Obchunk.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Obchunk.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Object_Manager.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Object_Manager.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Obstack_T.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Obstack_T.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_Errno.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_Errno.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_Log_Msg_Attributes.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_Log_Msg_Attributes.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_arpa_inet.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_arpa_inet.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_ctype.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_ctype.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_dirent.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_dirent.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_dlfcn.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_dlfcn.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_errno.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_errno.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_fcntl.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_fcntl.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_math.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_math.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_netdb.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_netdb.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_poll.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_poll.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_pwd.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_pwd.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_regex.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_regex.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_signal.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_signal.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_stdio.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_stdio.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_stdlib.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_stdlib.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_string.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_string.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_strings.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_strings.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_stropts.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_stropts.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_sys_mman.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_sys_mman.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_sys_msg.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_sys_msg.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_sys_resource.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_sys_resource.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_sys_select.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_sys_select.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_sys_sendfile.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_sys_sendfile.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_sys_shm.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_sys_shm.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_sys_socket.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_sys_socket.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_sys_stat.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_sys_stat.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_sys_time.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_sys_time.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_sys_uio.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_sys_uio.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_sys_wait.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_sys_wait.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_Thread.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_Thread.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_time.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_time.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_unistd.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_unistd.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_NS_wchar.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_NS_wchar.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y OS_TLI.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\OS_TLI.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Pagefile_Memory_Pool.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Pagefile_Memory_Pool.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Pair_T.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Pair_T.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y PI_Malloc.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\PI_Malloc.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Ping_Socket.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Ping_Socket.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Pipe.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Pipe.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y POSIX_Proactor.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\POSIX_Proactor.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Proactor.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Proactor.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Process.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Process.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Process_Manager.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Process_Manager.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Process_Mutex.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Process_Mutex.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Process_Semaphore.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Process_Semaphore.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Profile_Timer.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Profile_Timer.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y RB_Tree.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\RB_Tree.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Reactor.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Reactor.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Reactor_Notification_Strategy.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Reactor_Notification_Strategy.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Read_Buffer.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Read_Buffer.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Recursive_Thread_Mutex.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Recursive_Thread_Mutex.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Recyclable.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Recyclable.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Refcountable_T.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Refcountable_T.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Refcounted_Auto_Ptr.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Refcounted_Auto_Ptr.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Remote_Tokens.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Remote_Tokens.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Reverse_Lock_T.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Reverse_Lock_T.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y RW_Mutex.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\RW_Mutex.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y RW_Process_Mutex.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\RW_Process_Mutex.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y RW_Thread_Mutex.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\RW_Thread_Mutex.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Sample_History.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Sample_History.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Sched_Params.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Sched_Params.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Select_Reactor_Base.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Select_Reactor_Base.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Select_Reactor_T.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Select_Reactor_T.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Semaphore.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Semaphore.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Service_Config.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Service_Config.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Service_Gestalt.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Service_Gestalt.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Service_Object.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Service_Object.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Service_Repository.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Service_Repository.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Service_Types.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Service_Types.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Shared_Memory_MM.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Shared_Memory_MM.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Shared_Memory_SV.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Shared_Memory_SV.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Shared_Object.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Shared_Object.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Sig_Handler.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Sig_Handler.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Signal.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Signal.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Singleton.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Singleton.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y SOCK.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\SOCK.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y SOCK_Acceptor.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\SOCK_Acceptor.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y SOCK_CODgram.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\SOCK_CODgram.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y SOCK_Connector.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\SOCK_Connector.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y SOCK_Dgram.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\SOCK_Dgram.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y SOCK_Dgram_Bcast.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\SOCK_Dgram_Bcast.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y SOCK_Dgram_Mcast.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\SOCK_Dgram_Mcast.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y SOCK_IO.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\SOCK_IO.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y SOCK_Netlink.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\SOCK_Netlink.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y SOCK_SEQPACK_Acceptor.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\SOCK_SEQPACK_Acceptor.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y SOCK_SEQPACK_Association.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\SOCK_SEQPACK_Association.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y SOCK_SEQPACK_Connector.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\SOCK_SEQPACK_Connector.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y SOCK_Stream.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\SOCK_Stream.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y SPIPE.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\SPIPE.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y SPIPE_Addr.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\SPIPE_Addr.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y SPIPE_Connector.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\SPIPE_Connector.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y SPIPE_Stream.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\SPIPE_Stream.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y SString.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\SString.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Stats.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Stats.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Strategies_T.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Strategies_T.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Stream.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Stream.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y String_Base.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\String_Base.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y SV_Message.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\SV_Message.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y SV_Message_Queue.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\SV_Message_Queue.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y SV_Semaphore_Complex.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\SV_Semaphore_Complex.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y SV_Semaphore_Simple.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\SV_Semaphore_Simple.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y SV_Shared_Memory.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\SV_Shared_Memory.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Task.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Task.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Task_Ex_T.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Task_Ex_T.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Task_T.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Task_T.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Thread.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Thread.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Thread_Adapter.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Thread_Adapter.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Thread_Control.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Thread_Control.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Thread_Manager.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Thread_Manager.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Thread_Mutex.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Thread_Mutex.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Thread_Semaphore.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Thread_Semaphore.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Time_Value.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Time_Value.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Timeprobe.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Timeprobe.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Timer_Queue_Adapters.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Timer_Queue_Adapters.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Timer_Queue_T.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Timer_Queue_T.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y TLI.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\TLI.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y TLI_Connector.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\TLI_Connector.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y TLI_Stream.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\TLI_Stream.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Token.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Token.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Token_Collection.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Token_Collection.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Token_Manager.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Token_Manager.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Token_Request_Reply.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Token_Request_Reply.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y TP_Reactor.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\TP_Reactor.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y TSS_T.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\TSS_T.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Typed_SV_Message.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Typed_SV_Message.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Typed_SV_Message_Queue.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Typed_SV_Message_Queue.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Unbounded_Queue.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Unbounded_Queue.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Unbounded_Set.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Unbounded_Set.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Unbounded_Set_Ex.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Unbounded_Set_Ex.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y UNIX_Addr.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\UNIX_Addr.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y UPIPE_Acceptor.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\UPIPE_Acceptor.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y UPIPE_Connector.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\UPIPE_Connector.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y UPIPE_Stream.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\UPIPE_Stream.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y UTF16_Encoding_Converter.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\UTF16_Encoding_Converter.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y UUID.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\UUID.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y Vector_T.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\Vector_T.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y WFMO_Reactor.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\WFMO_Reactor.inl 1> NUL - -@if not exist $(INSTALL_DIR)\include\$(INCDIR_NAME)\. mkdir $(INSTALL_DIR)\include\$(INCDIR_NAME)\. - -© /Y XTI_ATM_Mcast.inl $(INSTALL_DIR)\include\$(INCDIR_NAME)\XTI_ATM_Mcast.inl 1> NUL - -realclean: - @-rem - diff --git a/dep/ACE_wrappers/ace/ACE.cpp b/dep/ACE_wrappers/ace/ACE.cpp index 4980b2d73..97ed2ae4f 100644 --- a/dep/ACE_wrappers/ace/ACE.cpp +++ b/dep/ACE_wrappers/ace/ACE.cpp @@ -1,4 +1,4 @@ -// $Id: ACE.cpp 82581 2008-08-11 08:58:24Z johnnyw $ +// $Id: ACE.cpp 91604 2010-09-02 14:51:58Z vzykov $ #include "ace/ACE.h" @@ -37,14 +37,8 @@ extern "C" int maxFiles; # include "ace/OS_NS_poll.h" #endif /* ACE_HAS_POLL && ACE_HAS_LIMITED_SELECT */ - -ACE_RCSID (ace, - ACE, - "$Id: ACE.cpp 82581 2008-08-11 08:58:24Z johnnyw $") - - // Open versioned namespace, if enabled by the user. - ACE_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE { @@ -163,11 +157,18 @@ ACE::compiler_beta_version (void) #endif } +ACE_TCHAR +ACE::nibble2hex (u_int n) +{ + // Yes, this works for UNICODE + return ACE_TEXT ("0123456789abcdef")[n & 0x0f]; +} + bool ACE::debug (void) { static const char* debug = ACE_OS::getenv ("ACE_DEBUG"); - return (ACE::debug_ != 0) ? ACE::debug_ : (debug != 0 ? (*debug != '0'): false); + return (ACE::debug_ != 0) ? ACE::debug_ : (debug != 0 ? (*debug != '0') : false); } void @@ -373,7 +374,6 @@ ACE::hash_pjw (const wchar_t *str) } #endif /* ACE_HAS_WCHAR */ -#if !defined (ACE_HAS_WINCE) ACE_TCHAR * ACE::strenvdup (const ACE_TCHAR *str) { @@ -381,7 +381,6 @@ ACE::strenvdup (const ACE_TCHAR *str) return ACE_OS::strenvdup (str); } -#endif /* ACE_HAS_WINCE */ /* @@ -653,8 +652,7 @@ ACE::recv_n_i (ACE_HANDLE handle, errno == EWOULDBLOCK) { // Wait upto for the blocking to subside. - int rtn = ACE::handle_read_ready (handle, - timeout); + int const rtn = ACE::handle_read_ready (handle, timeout); // Did select() succeed? if (rtn != -1) @@ -715,8 +713,7 @@ ACE::t_rcv_n_i (ACE_HANDLE handle, if (errno == EWOULDBLOCK) { // Wait for the blocking to subside. - int result = ACE::handle_read_ready (handle, - 0); + int const result = ACE::handle_read_ready (handle, 0); // Did select() succeed? if (result != -1) @@ -773,8 +770,7 @@ ACE::t_rcv_n_i (ACE_HANDLE handle, errno == EWOULDBLOCK) { // Wait upto for the blocking to subside. - int rtn = ACE::handle_read_ready (handle, - timeout); + int const rtn = ACE::handle_read_ready (handle, timeout); // Did select() succeed? if (rtn != -1) @@ -834,8 +830,7 @@ ACE::recv_n_i (ACE_HANDLE handle, if (errno == EWOULDBLOCK) { // Wait for the blocking to subside. - int result = ACE::handle_read_ready (handle, - 0); + int const result = ACE::handle_read_ready (handle, 0); // Did select() succeed? if (result != -1) @@ -890,8 +885,7 @@ ACE::recv_n_i (ACE_HANDLE handle, errno == EWOULDBLOCK) { // Wait upto for the blocking to subside. - int rtn = ACE::handle_read_ready (handle, - timeout); + int const rtn = ACE::handle_read_ready (handle, timeout); // Did select() succeed? if (rtn != -1) @@ -929,8 +923,8 @@ ssize_t ACE::recv (ACE_HANDLE handle, size_t n, ...) { va_list argp; - int total_tuples = static_cast (n / 2); - iovec *iovp; + int const total_tuples = static_cast (n / 2); + iovec *iovp = 0; #if defined (ACE_HAS_ALLOCA) iovp = (iovec *) alloca (total_tuples * sizeof (iovec)); #else @@ -947,7 +941,7 @@ ACE::recv (ACE_HANDLE handle, size_t n, ...) iovp[i].iov_len = va_arg (argp, int); } - ssize_t result = ACE_OS::recvv (handle, iovp, total_tuples); + ssize_t const result = ACE_OS::recvv (handle, iovp, total_tuples); #if !defined (ACE_HAS_ALLOCA) delete [] iovp; #endif /* !defined (ACE_HAS_ALLOCA) */ @@ -987,14 +981,10 @@ ACE::recvv_n_i (ACE_HANDLE handle, size_t &bytes_transferred = bt == 0 ? temp : *bt; bytes_transferred = 0; - for (int s = 0; - s < iovcnt; - ) + for (int s = 0; s < iovcnt; ) { // Try to transfer as much of the remaining data as possible. - ssize_t n = ACE_OS::recvv (handle, - iov + s, - iovcnt - s); + ssize_t n = ACE_OS::recvv (handle, iov + s, iovcnt - s); // Check EOF. if (n == 0) return 0; @@ -1006,8 +996,7 @@ ACE::recvv_n_i (ACE_HANDLE handle, if (errno == EWOULDBLOCK) { // Wait for the blocking to subside. - int result = ACE::handle_read_ready (handle, - 0); + int const result = ACE::handle_read_ready (handle, 0); // Did select() succeed? if (result != -1) @@ -1055,28 +1044,21 @@ ACE::recvv_n_i (ACE_HANDLE handle, int val = 0; ACE::record_and_set_non_blocking_mode (handle, val); - for (int s = 0; - s < iovcnt; - ) + for (int s = 0; s < iovcnt; ) { // Try to transfer as much of the remaining data as possible. // Since the socket is in non-blocking mode, this call will not // block. - ssize_t n = ACE_OS::recvv (handle, - iov + s, - iovcnt - s); + ssize_t n = ACE_OS::recvv (handle, iov + s, iovcnt - s); // Check for errors. - if (n == 0 || - n == -1) + if (n == 0 || n == -1) { // Check for possible blocking. - if (n == -1 && - errno == EWOULDBLOCK) + if (n == -1 && errno == EWOULDBLOCK) { // Wait upto for the blocking to subside. - int rtn = ACE::handle_read_ready (handle, - timeout); + int const rtn = ACE::handle_read_ready (handle, timeout); // Did select() succeed? if (rtn != -1) @@ -1237,7 +1219,8 @@ ACE::send (ACE_HANDLE handle, return -1; else { - ssize_t bytes_transferred = ACE_OS::send (handle, (const char *) buf, n, flags); + ssize_t const bytes_transferred = + ACE_OS::send (handle, (const char *) buf, n, flags); ACE::restore_non_blocking_mode (handle, val); return bytes_transferred; } @@ -1262,7 +1245,8 @@ ACE::t_snd (ACE_HANDLE handle, return -1; else { - ssize_t bytes_transferred = ACE_OS::t_snd (handle, (const char *) buf, n, flags); + ssize_t const bytes_transferred = + ACE_OS::t_snd (handle, (const char *) buf, n, flags); ACE::restore_non_blocking_mode (handle, val); return bytes_transferred; } @@ -1286,7 +1270,7 @@ ACE::send (ACE_HANDLE handle, return -1; else { - ssize_t bytes_transferred = ACE::send_i (handle, buf, n); + ssize_t const bytes_transferred = ACE::send_i (handle, buf, n); ACE::restore_non_blocking_mode (handle, val); return bytes_transferred; } @@ -1308,7 +1292,8 @@ ACE::sendmsg (ACE_HANDLE handle, return -1; else { - ssize_t bytes_transferred = ACE_OS::sendmsg (handle, msg, flags); + ssize_t const bytes_transferred = + ACE_OS::sendmsg (handle, msg, flags); ACE::restore_non_blocking_mode (handle, val); return bytes_transferred; } @@ -1333,7 +1318,7 @@ ACE::sendto (ACE_HANDLE handle, return -1; else { - ssize_t bytes_transferred = + ssize_t const bytes_transferred = ACE_OS::sendto (handle, buf, len, flags, addr, addrlen); ACE::restore_non_blocking_mode (handle, val); return bytes_transferred; @@ -1376,8 +1361,7 @@ ACE::send_n_i (ACE_HANDLE handle, #endif /* ACE_WIN32 */ { // Wait for the blocking to subside. - int result = ACE::handle_write_ready (handle, - 0); + int const result = ACE::handle_write_ready (handle, 0); // Did select() succeed? if (result != -1) @@ -1430,12 +1414,10 @@ ACE::send_n_i (ACE_HANDLE handle, n == -1) { // Check for possible blocking. - if (n == -1 && - (errno == EWOULDBLOCK || errno == ENOBUFS)) + if (n == -1 && (errno == EWOULDBLOCK || errno == ENOBUFS)) { // Wait upto for the blocking to subside. - int rtn = ACE::handle_write_ready (handle, - timeout); + int const rtn = ACE::handle_write_ready (handle, timeout); // Did select() succeed? if (rtn != -1) @@ -1500,8 +1482,7 @@ ACE::t_snd_n_i (ACE_HANDLE handle, if (errno == EWOULDBLOCK || errno == ENOBUFS) { // Wait for the blocking to subside. - int result = ACE::handle_write_ready (handle, - 0); + int const result = ACE::handle_write_ready (handle, 0); // Did select() succeed? if (result != -1) @@ -1558,8 +1539,7 @@ ACE::t_snd_n_i (ACE_HANDLE handle, errno == EWOULDBLOCK || errno == ENOBUFS) { // Wait upto for the blocking to subside. - int rtn = ACE::handle_write_ready (handle, - timeout); + int const rtn = ACE::handle_write_ready (handle, timeout); // Did select() succeed? if (rtn != -1) @@ -1620,8 +1600,7 @@ ACE::send_n_i (ACE_HANDLE handle, if (errno == EWOULDBLOCK || errno == ENOBUFS) { // Wait for the blocking to subside. - int result = ACE::handle_write_ready (handle, - 0); + int const result = ACE::handle_write_ready (handle, 0); // Did select() succeed? if (result != -1) @@ -1676,8 +1655,7 @@ ACE::send_n_i (ACE_HANDLE handle, (errno == EWOULDBLOCK || errno == ENOBUFS)) { // Wait upto for the blocking to subside. - int rtn = ACE::handle_write_ready (handle, - timeout); + int const rtn = ACE::handle_write_ready (handle, timeout); // Did select() succeed? if (rtn != -1) @@ -1783,9 +1761,8 @@ ACE::sendv_n_i (ACE_HANDLE handle, ) { // Try to transfer as much of the remaining data as possible. - ssize_t n = ACE_OS::sendv (handle, - iov + s, - iovcnt - s); + ssize_t n = ACE_OS::sendv (handle, iov + s, iovcnt - s); + // Check EOF. if (n == 0) return 0; @@ -1797,8 +1774,7 @@ ACE::sendv_n_i (ACE_HANDLE handle, if (errno == EWOULDBLOCK || errno == ENOBUFS) { // Wait for the blocking to subside. - int result = ACE::handle_write_ready (handle, - 0); + int const result = ACE::handle_write_ready (handle, 0); // Did select() succeed? if (result != -1) @@ -1855,9 +1831,7 @@ ACE::sendv_n_i (ACE_HANDLE handle, // Try to transfer as much of the remaining data as possible. // Since the socket is in non-blocking mode, this call will not // block. - ssize_t n = ACE_OS::sendv (handle, - iov + s, - iovcnt - s); + ssize_t n = ACE_OS::sendv (handle, iov + s, iovcnt - s); // Check for errors. if (n == 0 || @@ -1868,8 +1842,7 @@ ACE::sendv_n_i (ACE_HANDLE handle, (errno == EWOULDBLOCK || errno == ENOBUFS)) { // Wait upto for the blocking to subside. - int rtn = ACE::handle_write_ready (handle, - timeout); + int const rtn = ACE::handle_write_ready (handle, timeout); // Did select() succeed? if (rtn != -1) @@ -2330,7 +2303,7 @@ ACE::format_hexdump (const char *buffer, size_t i; - size_t lines = size / 16; + size_t const lines = size / 16; for (i = 0; i < lines; i++) { size_t j; @@ -2354,7 +2327,11 @@ ACE::format_hexdump (const char *buffer, textver[j] = 0; ACE_OS::sprintf (obuf, +#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR) + ACE_TEXT (" %ls\n"), +#else ACE_TEXT (" %s\n"), +#endif textver); while (*obuf != '\0') @@ -2395,7 +2372,11 @@ ACE::format_hexdump (const char *buffer, textver[i] = 0; ACE_OS::sprintf (obuf, +#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR) + ACE_TEXT (" %ls\n"), +#else ACE_TEXT (" %s\n"), +#endif textver); } return size; @@ -2409,6 +2390,22 @@ ACE_TCHAR * ACE::timestamp (ACE_TCHAR date_and_time[], size_t date_and_timelen, bool return_pointer_to_first_digit) +{ + return ACE::timestamp (ACE_Time_Value::zero, + date_and_time, + date_and_timelen, + return_pointer_to_first_digit); +} + +// Returns the given timestamp in the form +// "hour:minute:second:microsecond." The month, day, and year are +// also stored in the beginning of the date_and_time array. + +ACE_TCHAR * +ACE::timestamp (const ACE_Time_Value& time_value, + ACE_TCHAR date_and_time[], + size_t date_and_timelen, + bool return_pointer_to_first_digit) { //ACE_TRACE ("ACE::timestamp"); @@ -2419,52 +2416,57 @@ ACE::timestamp (ACE_TCHAR date_and_time[], } #if defined (WIN32) - // Emulate Unix. Win32 does NOT support all the UNIX versions - // below, so DO we need this ifdef. - static const ACE_TCHAR *day_of_week_name[] = - { - ACE_TEXT ("Sun"), - ACE_TEXT ("Mon"), - ACE_TEXT ("Tue"), - ACE_TEXT ("Wed"), - ACE_TEXT ("Thu"), - ACE_TEXT ("Fri"), - ACE_TEXT ("Sat") - }; - - static const ACE_TCHAR *month_name[] = - { - ACE_TEXT ("Jan"), - ACE_TEXT ("Feb"), - ACE_TEXT ("Mar"), - ACE_TEXT ("Apr"), - ACE_TEXT ("May"), - ACE_TEXT ("Jun"), - ACE_TEXT ("Jul"), - ACE_TEXT ("Aug"), - ACE_TEXT ("Sep"), - ACE_TEXT ("Oct"), - ACE_TEXT ("Nov"), - ACE_TEXT ("Dec") - }; - - SYSTEMTIME local; - ::GetLocalTime (&local); - - ACE_OS::sprintf (date_and_time, - ACE_TEXT ("%3s %3s %2d %04d %02d:%02d:%02d.%06d"), - day_of_week_name[local.wDayOfWeek], - month_name[local.wMonth - 1], - (int) local.wDay, - (int) local.wYear, - (int) local.wHour, - (int) local.wMinute, - (int) local.wSecond, - (int) (local.wMilliseconds * 1000)); - return &date_and_time[15 + (return_pointer_to_first_digit != 0)]; -#else /* UNIX */ + if (time_value == ACE_Time_Value::zero) + { + // Emulate Unix. Win32 does NOT support all the UNIX versions + // below, so DO we need this ifdef. + static const ACE_TCHAR *day_of_week_name[] = + { + ACE_TEXT ("Sun"), + ACE_TEXT ("Mon"), + ACE_TEXT ("Tue"), + ACE_TEXT ("Wed"), + ACE_TEXT ("Thu"), + ACE_TEXT ("Fri"), + ACE_TEXT ("Sat") + }; + + static const ACE_TCHAR *month_name[] = + { + ACE_TEXT ("Jan"), + ACE_TEXT ("Feb"), + ACE_TEXT ("Mar"), + ACE_TEXT ("Apr"), + ACE_TEXT ("May"), + ACE_TEXT ("Jun"), + ACE_TEXT ("Jul"), + ACE_TEXT ("Aug"), + ACE_TEXT ("Sep"), + ACE_TEXT ("Oct"), + ACE_TEXT ("Nov"), + ACE_TEXT ("Dec") + }; + + SYSTEMTIME local; + ::GetLocalTime (&local); + + ACE_OS::sprintf (date_and_time, + ACE_TEXT ("%3s %3s %2d %04d %02d:%02d:%02d.%06d"), + day_of_week_name[local.wDayOfWeek], + month_name[local.wMonth - 1], + (int) local.wDay, + (int) local.wYear, + (int) local.wHour, + (int) local.wMinute, + (int) local.wSecond, + (int) (local.wMilliseconds * 1000)); + return &date_and_time[15 + (return_pointer_to_first_digit != 0)]; + } +#endif /* WIN32 */ ACE_TCHAR timebuf[26]; // This magic number is based on the ctime(3c) man page. - ACE_Time_Value cur_time = ACE_OS::gettimeofday (); + ACE_Time_Value cur_time = + (time_value == ACE_Time_Value::zero) ? + ACE_Time_Value (ACE_OS::gettimeofday ()) : time_value; time_t secs = cur_time.sec (); ACE_OS::ctime_r (&secs, @@ -2493,7 +2495,6 @@ ACE::timestamp (ACE_TCHAR date_and_time[], cur_time.usec ()); date_and_time[33] = '\0'; return &date_and_time[15 + (return_pointer_to_first_digit != 0)]; -#endif /* WIN32 */ } // This function rounds the request to a multiple of the page size. @@ -2538,14 +2539,14 @@ ACE::handle_timed_complete (ACE_HANDLE h, #else ACE_Handle_Set rd_handles; ACE_Handle_Set wr_handles; - rd_handles.set_bit (h); wr_handles.set_bit (h); #endif /* !ACE_WIN32 && ACE_HAS_POLL && ACE_HAS_LIMITED_SELECT */ #if defined (ACE_WIN32) // Winsock is different - it sets the exception bit for failed connect, - // unlike other platforms, where the read bit is set. + // unlike other platforms, where the write bit is set for both success + // and fail. ACE_Handle_Set ex_handles; ex_handles.set_bit (h); #endif /* ACE_WIN32 */ @@ -2565,11 +2566,19 @@ ACE::handle_timed_complete (ACE_HANDLE h, int n = ACE_OS::poll (&fds, 1, timeout); # else - int n = ACE_OS::select (int (h) + 1, - rd_handles, - wr_handles, - 0, - timeout); + int n = 0; + if (is_tli) + n = ACE_OS::select (int (h) + 1, + rd_handles, + wr_handles, + 0, + timeout); + else + n = ACE_OS::select (int (h) + 1, + 0, + wr_handles, + 0, + timeout); # endif /* ACE_HAS_POLL && ACE_HAS_LIMITED_SELECT */ #endif /* ACE_WIN32 */ @@ -2583,11 +2592,14 @@ ACE::handle_timed_complete (ACE_HANDLE h, return ACE_INVALID_HANDLE; } - // Usually, a ready-for-write handle is successfully connected, and - // ready-for-read (exception on Win32) is a failure. On fails, we - // need to grab the error code via getsockopt. On possible success for - // any platform where we can't tell just from select() (e.g. AIX), - // we also need to check for success/fail. + // On Windows, a ready-for-write handle is successfully connected, and + // ready-for-exception is a failure. On fails, we need to grab the error + // code via getsockopt. + // On BSD sockets using select(), the handle becomes writable on + // completion either success or fail, so if the select() does not time + // out, we need to check for success/fail. + // It is believed that TLI sockets use the readable=fail, writeable=success + // but that hasn't been as well tested. #if defined (ACE_WIN32) ACE_UNUSED_ARG (is_tli); @@ -2599,34 +2611,20 @@ ACE::handle_timed_complete (ACE_HANDLE h, need_to_check = true; known_failure = true; } -#elif defined (ACE_VXWORKS) - ACE_UNUSED_ARG (is_tli); - - // Force the check on VxWorks. The read handle for "h" is not set, - // so "need_to_check" is false at this point. The write handle is - // set, for what it's worth. - need_to_check = true; #else if (is_tli) - # if defined (ACE_HAS_POLL) && defined (ACE_HAS_LIMITED_SELECT) need_to_check = (fds.revents & POLLIN) && !(fds.revents & POLLOUT); # else - need_to_check = rd_handles.is_set (h) && !wr_handles.is_set (h); + need_to_check = rd_handles.is_set (h) && !wr_handles.is_set (h); # endif /* ACE_HAS_POLL && ACE_HAS_LIMITED_SELECT */ else -#if defined(AIX) - // AIX is broken... both success and failed connect will set the - // write handle only, so always check. - need_to_check = true; -#else # if defined (ACE_HAS_POLL) && defined (ACE_HAS_LIMITED_SELECT) - need_to_check = (fds.revents & POLLIN); + need_to_check = (fds.revents & POLLIN); # else - need_to_check = rd_handles.is_set (h); + need_to_check = true; # endif /* ACE_HAS_POLL && ACE_HAS_LIMITED_SELECT */ -#endif /* AIX */ #endif /* ACE_WIN32 */ if (need_to_check) @@ -2681,7 +2679,7 @@ ACE::handle_timed_complete (ACE_HANDLE h, int ACE::handle_timed_accept (ACE_HANDLE listener, ACE_Time_Value *timeout, - int restart) + bool restart) { ACE_TRACE ("ACE::handle_timed_accept"); // Make sure we don't bomb out on erroneous values. @@ -2733,9 +2731,7 @@ ACE::handle_timed_accept (ACE_HANDLE listener, return -1; /* NOTREACHED */ case 0: - if (timeout != 0 - && timeout->sec () == 0 - && timeout->usec () == 0) + if (timeout != 0 && *timeout == ACE_Time_Value::zero) errno = EWOULDBLOCK; else errno = ETIMEDOUT; @@ -3386,27 +3382,82 @@ ACE::strnew (const wchar_t *s) } #endif /* ACE_HAS_WCHAR */ -inline static bool equal_char(char a, char b, bool case_sensitive) +// helper functions for ACE::wild_match() +namespace { - if (case_sensitive) - return a == b; - return ACE_OS::ace_tolower(a) == ACE_OS::ace_tolower(b); + + inline bool equal_char (char a, char b, bool case_sensitive) + { + if (case_sensitive) + return a == b; + return ACE_OS::ace_tolower (a) == ACE_OS::ace_tolower (b); + } + + // precond: *p == '[' start of char class + // postcond: *p == ']' end of the char class + inline bool equal_class (char s, const char *&p, bool case_sensitive) + { + ++p; + bool negate = false; + if (*p == '!') + { + negate = true; + ++p; + } + // ] and - are regular in 1st position + for (bool first = true; *p && (first || *p != ']'); ++p) + { + if (!first && *p == '-' && p[1] != ']') + { + if (!p[1] || p[1] <= p[-1]) // invalid range + { + continue; + } + // Since we are in the POSIX locale, only the basic ASCII + // characters are allowed as the range endpoints. These characters + // are the same values in both signed and unsigned chars so we + // don't have to account for any "pathological cases." + for (char range = p[-1] + 1; range <= p[1]; ++range) + { + if (equal_char (s, range, case_sensitive)) + { + while (*++p != ']') {} + return !negate; + } + } + ++p; // consume the character 1 past the - + } + else if (equal_char (s, *p, case_sensitive)) + { + while (*++p != ']') {} + return !negate; + } + first = false; + } + return negate; + } } bool -ACE::wild_match(const char* str, const char* pat, bool case_sensitive) +ACE::wild_match(const char *str, const char *pat, bool case_sensitive, + bool character_classes) { if (str == pat) return true; if (pat == 0 || str == 0) return false; - bool star = false; - const char* s = str; - const char* p = pat; + bool star = false, escape = false; + const char *s = str; + const char *p = pat; while (*s != '\0') { - if (*p == '*') + if (!escape && *p == '\\') + { + ++p; + escape = true; + } + else if (!escape && *p == '*') { star = true; pat = p; @@ -3416,22 +3467,38 @@ ACE::wild_match(const char* str, const char* pat, bool case_sensitive) return true; p = pat; } - else if (*p == '?') + else if (!escape && *p == '?') { ++s; ++p; } - else if (! equal_char(*s, *p, case_sensitive)) + else if (!escape && character_classes && *p == '[') + { + if (equal_class (*s, p, case_sensitive)) + { + ++p; + } + else + { + if (!star) + return false; + p = pat; + } + ++s; + } + else if (!equal_char (*s, *p, case_sensitive)) { if (!star) return false; - s = ++str; + ++s; p = pat; + escape = false; } else { ++s; ++p; + escape = false; } } if (*p == '*') diff --git a/dep/ACE_wrappers/ace/ACE.h b/dep/ACE_wrappers/ace/ACE.h index 654bbb323..f4e6adf16 100644 --- a/dep/ACE_wrappers/ace/ACE.h +++ b/dep/ACE_wrappers/ace/ACE.h @@ -4,7 +4,7 @@ /** * @file ACE.h * - * $Id: ACE.h 82581 2008-08-11 08:58:24Z johnnyw $ + * $Id: ACE.h 91603 2010-09-01 21:02:28Z shuston $ * * This file contains value added ACE functions that extend the * behavior of the UNIX and Win32 OS calls. @@ -90,7 +90,13 @@ namespace ACE /// Simple wildcard matching function supporting '*' and '?' /// return true if string s matches pattern. - extern ACE_Export bool wild_match(const char* s, const char* pattern, bool case_sensitive = true); + /// If character_classes is true, '[' is treated as a wildcard character + /// as described in the fnmatch() POSIX API. The following POSIX "bracket + /// expression" features are not implemented: collating symbols, equivalence + /// class expressions, and character class expressions. The POSIX locale is + /// assumed. + extern ACE_Export bool wild_match(const char* s, const char* pattern, + bool case_sensitive = true, bool character_classes = false); /** * @name I/O operations @@ -354,7 +360,7 @@ namespace ACE */ extern ACE_Export int handle_timed_accept (ACE_HANDLE listener, ACE_Time_Value *timeout, - int restart); + bool restart); /** * Wait up to @a timeout amount of time to complete an actively @@ -384,7 +390,6 @@ namespace ACE extern ACE_Export int max_handles (void); // = String functions -#if !defined (ACE_HAS_WINCE) /** * Return a dynamically allocated duplicate of @a str, substituting * the environment variable if @c str[0] @c == @c '$'. Note that @@ -392,7 +397,6 @@ namespace ACE * by @c ACE_OS::free. */ extern ACE_Export ACE_TCHAR *strenvdup (const ACE_TCHAR *str); -#endif /* ACE_HAS_WINCE */ /// Returns a pointer to the "end" of the string, i.e., the character /// past the '\0'. @@ -414,6 +418,9 @@ namespace ACE /// @c ACE_OS::malloc to allocate the new string. extern ACE_Export char *strnnew (const char *str, size_t n); + /// Determine if a specified pathname is "dot dir" (ie. "." or ".."). + ACE_NAMESPACE_INLINE_FUNCTION bool isdotdir (const char *s); + #if defined (ACE_HAS_WCHAR) extern ACE_Export const wchar_t *strend (const wchar_t *s); @@ -425,6 +432,8 @@ namespace ACE extern ACE_Export wchar_t *strnnew (const wchar_t *str, size_t n); + ACE_NAMESPACE_INLINE_FUNCTION bool isdotdir (const wchar_t *s); + #endif /* ACE_HAS_WCHAR */ /** @@ -464,6 +473,22 @@ namespace ACE ACE_TCHAR delim = ACE_DIRECTORY_SEPARATOR_CHAR); + /** + * Returns the given timestamp in the form + * "hour:minute:second:microsecond." The month, day, and year are + * also stored in the beginning of the @a date_and_time array, which + * is a user-supplied array of size @a time_len> @c ACE_TCHARs. + * Returns 0 if unsuccessful, else returns pointer to beginning of the + * "time" portion of @a date_and_time. If @a + * return_pointer_to_first_digit is 0 then return a pointer to the + * space before the time, else return a pointer to the beginning of + * the time portion. + */ + extern ACE_Export ACE_TCHAR *timestamp (const ACE_Time_Value& time_value, + ACE_TCHAR date_and_time[], + size_t time_len, + bool return_pointer_to_first_digit = false); + /** * Returns the current timestamp in the form * "hour:minute:second:microsecond." The month, day, and year are @@ -618,7 +643,7 @@ namespace ACE ACE_NAMESPACE_INLINE_FUNCTION u_long log2 (u_long num); /// Hex conversion utility. - ACE_NAMESPACE_INLINE_FUNCTION ACE_TCHAR nibble2hex (u_int n); + extern ACE_Export ACE_TCHAR nibble2hex (u_int n); /// Convert a hex character to its byte representation. ACE_NAMESPACE_INLINE_FUNCTION u_char hex2byte (ACE_TCHAR c); @@ -641,21 +666,33 @@ namespace ACE const ACE_Time_Value *timeout = 0); /// Timed wait for handle to get read ready. + /// @retval -1 for error + /// @retval 0 for timeout + /// @retval 1 the handle is ready ACE_NAMESPACE_INLINE_FUNCTION int handle_read_ready (ACE_HANDLE handle, const ACE_Time_Value *timeout); /// Timed wait for handle to get write ready. + /// @retval -1 for error + /// @retval 0 for timeout + /// @retval 1 the handle is ready ACE_NAMESPACE_INLINE_FUNCTION int handle_write_ready (ACE_HANDLE handle, const ACE_Time_Value *timeout); /// Timed wait for handle to get exception ready. + /// @retval -1 for error + /// @retval 0 for timeout + /// @retval 1 the handle is ready ACE_NAMESPACE_INLINE_FUNCTION int handle_exception_ready (ACE_HANDLE handle, const ACE_Time_Value *timeout); /// Timed wait for handle to get read, write, or exception ready. + /// @retval -1 for error + /// @retval 0 for timeout + /// @retval 1 the handle is ready extern ACE_Export int handle_ready (ACE_HANDLE handle, const ACE_Time_Value *timeout, int read_ready, diff --git a/dep/ACE_wrappers/ace/ACE.inl b/dep/ACE_wrappers/ace/ACE.inl index f800ac80a..4be80bfb6 100644 --- a/dep/ACE_wrappers/ace/ACE.inl +++ b/dep/ACE_wrappers/ace/ACE.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: ACE.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: ACE.inl 87366 2009-11-05 20:16:30Z olli $ #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_Thread.h" @@ -284,6 +284,22 @@ ACE::strdelete (wchar_t *s) } #endif /* ACE_HAS_WCHAR */ +ACE_INLINE bool +ACE::isdotdir (const char *s) +{ + return (s[0] == '.' && + ((s[1] == 0) || (s[1] == '.' && s[2] == 0))); +} + +#if defined (ACE_HAS_WCHAR) +ACE_INLINE bool +ACE::isdotdir (const wchar_t *s) +{ + return (s[0] == ACE_TEXT ('.') && + ((s[1] == 0) || (s[1] == ACE_TEXT ('.') && s[2] == 0))); +} +#endif /* ACE_HAS_WCHAR */ + ACE_INLINE void ACE::unique_name (const void *object, ACE_TCHAR *name, @@ -303,24 +319,6 @@ ACE::log2 (u_long num) return log; } -ACE_INLINE ACE_TCHAR -ACE::nibble2hex (u_int n) -{ - // Hexadecimal characters. -#if defined (ACE_VXWORKS) && !defined (__DCPLUSPLUS__) - // temporary solution to prevent Windriver GNU toolchains from spewing - // loads of warnings when inlining. - // problem (incorrect warning leftover from older GNU) has been reported as - // TSR to Windriver. - const ACE_TCHAR hex_chars[] = ACE_TEXT ("0123456789abcdef"); -#else - static const ACE_TCHAR hex_chars[] = ACE_TEXT ("0123456789abcdef"); -#endif - - // Yes, this works for UNICODE - return hex_chars[n & 0x0f]; -} - ACE_INLINE int ACE::map_errno (int error) { diff --git a/dep/ACE_wrappers/ace/ACE.pc.in b/dep/ACE_wrappers/ace/ACE.pc.in new file mode 100644 index 000000000..90b2a9eeb --- /dev/null +++ b/dep/ACE_wrappers/ace/ACE.pc.in @@ -0,0 +1,10 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: ACE +Description: ADAPTIVE Communication Environment +Version: @VERSION@ +Libs: -L${libdir} -lACE @LIBS@ +Cflags: -I${includedir} diff --git a/dep/ACE_wrappers/ace/ACE_crc32.cpp b/dep/ACE_wrappers/ace/ACE_crc32.cpp index 70d93e6b5..f9eb064f5 100644 --- a/dep/ACE_wrappers/ace/ACE_crc32.cpp +++ b/dep/ACE_wrappers/ace/ACE_crc32.cpp @@ -1,12 +1,7 @@ -// $Id: ACE_crc32.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: ACE_crc32.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/ACE.h" -ACE_RCSID (ace, - ACE_crc32, - "$Id: ACE_crc32.cpp 80826 2008-03-04 14:51:23Z wotte $") - - namespace { /*****************************************************************/ diff --git a/dep/ACE_wrappers/ace/ACE_crc_ccitt.cpp b/dep/ACE_wrappers/ace/ACE_crc_ccitt.cpp index ef7f5d65b..7dfefa5c6 100644 --- a/dep/ACE_wrappers/ace/ACE_crc_ccitt.cpp +++ b/dep/ACE_wrappers/ace/ACE_crc_ccitt.cpp @@ -1,11 +1,7 @@ -// $Id: ACE_crc_ccitt.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: ACE_crc_ccitt.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/ACE.h" -ACE_RCSID (ace, - ACE_crc_ccitt, - "$Id: ACE_crc_ccitt.cpp 80826 2008-03-04 14:51:23Z wotte $") - namespace { /*****************************************************************/ diff --git a/dep/ACE_wrappers/ace/ACE_vc71.vcproj b/dep/ACE_wrappers/ace/ACE_vc71.vcproj deleted file mode 100644 index f308d6ec6..000000000 --- a/dep/ACE_wrappers/ace/ACE_vc71.vcproj +++ /dev/null @@ -1,5255 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dep/ACE_wrappers/ace/ACE_vc8.vcproj b/dep/ACE_wrappers/ace/ACE_vc8.vcproj deleted file mode 100644 index 6b05ee9b2..000000000 --- a/dep/ACE_wrappers/ace/ACE_vc8.vcproj +++ /dev/null @@ -1,6640 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dep/ACE_wrappers/ace/ACE_vc9.vcproj b/dep/ACE_wrappers/ace/ACE_vc9.vcproj deleted file mode 100644 index 0bef2b94a..000000000 --- a/dep/ACE_wrappers/ace/ACE_vc9.vcproj +++ /dev/null @@ -1,6640 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dep/ACE_wrappers/ace/ARGV.cpp b/dep/ACE_wrappers/ace/ARGV.cpp index edfd4efa7..3b46459fe 100644 --- a/dep/ACE_wrappers/ace/ARGV.cpp +++ b/dep/ACE_wrappers/ace/ARGV.cpp @@ -1,4 +1,4 @@ -// $Id: ARGV.cpp 81374 2008-04-16 13:07:47Z iliyan $ +// $Id: ARGV.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #ifndef ACE_ARGV_CPP #define ACE_ARGV_CPP @@ -12,8 +12,6 @@ #include "ace/ARGV.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ace, ARGV, "$Id: ARGV.cpp 81374 2008-04-16 13:07:47Z iliyan $") - // Open versioned namespace, if enabled by the user. ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/ATM_Acceptor.cpp b/dep/ACE_wrappers/ace/ATM_Acceptor.cpp index 1aa6c6d70..a225cbf17 100644 --- a/dep/ACE_wrappers/ace/ATM_Acceptor.cpp +++ b/dep/ACE_wrappers/ace/ATM_Acceptor.cpp @@ -1,8 +1,8 @@ -// $Id: ATM_Acceptor.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: ATM_Acceptor.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/ATM_Acceptor.h" -ACE_RCSID(ace, ATM_Acceptor, "$Id: ATM_Acceptor.cpp 80826 2008-03-04 14:51:23Z wotte $") + #if defined (ACE_HAS_ATM) @@ -81,7 +81,7 @@ ACE_ATM_Acceptor::get_local_addr (ACE_ATM_Addr &local_addr) return -1; } - return (0); + return 0; #else ACE_UNUSED_ARG (local_addr); @@ -236,8 +236,8 @@ int ACE_ATM_Acceptor::accept (ACE_ATM_Stream &new_sap, ACE_Addr *remote_addr, ACE_Time_Value *timeout, - int restart, - int reset_new_handle, + bool restart, + bool reset_new_handle, ACE_ATM_Params params, ACE_ATM_QoS qos) { @@ -298,7 +298,7 @@ ACE_ATM_Acceptor::accept (ACE_ATM_Stream &new_sap, ACE_UNUSED_ARG (reset_new_handle); ACE_UNUSED_ARG (params); ACE_UNUSED_ARG (qos); - return (0); + return 0; #endif /* ACE_HAS_FORE_ATM_XTI */ } diff --git a/dep/ACE_wrappers/ace/ATM_Acceptor.h b/dep/ACE_wrappers/ace/ATM_Acceptor.h index c69e2f854..1241a228c 100644 --- a/dep/ACE_wrappers/ace/ATM_Acceptor.h +++ b/dep/ACE_wrappers/ace/ATM_Acceptor.h @@ -4,7 +4,7 @@ /** * @file ATM_Acceptor.h * - * $Id: ATM_Acceptor.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: ATM_Acceptor.h 82723 2008-09-16 09:35:44Z johnnyw $ * * @author Joe Hoffert */ @@ -88,8 +88,8 @@ public: int accept (ACE_ATM_Stream &new_sap, ACE_Addr *remote_addr = 0, ACE_Time_Value *timeout = 0, - int restart = 1, - int reset_new_handle = 0, + bool restart = true, + bool reset_new_handle = false, ACE_ATM_Params params = ACE_ATM_Params(), ACE_ATM_QoS qos = ACE_ATM_QoS()); diff --git a/dep/ACE_wrappers/ace/ATM_Addr.cpp b/dep/ACE_wrappers/ace/ATM_Addr.cpp index 739a80763..47e47e835 100644 --- a/dep/ACE_wrappers/ace/ATM_Addr.cpp +++ b/dep/ACE_wrappers/ace/ATM_Addr.cpp @@ -1,4 +1,4 @@ -// $Id: ATM_Addr.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: ATM_Addr.cpp 91286 2010-08-05 09:04:31Z johnnyw $ // Defines the Internet domain address family address format. @@ -15,7 +15,7 @@ #include "ace/ATM_Addr.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ace, ATM_Addr, "$Id: ATM_Addr.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -338,7 +338,7 @@ ACE_ATM_Addr::string_to_addr (const ACE_TCHAR sap[]) } if (WSALookupServiceEnd (hLookup) == SOCKET_ERROR) { - ACE_OS::printf ("Error : WSALookupServiceEnd failed! %d \n", + ACE_OS::printf ("Error : WSALookupServiceEnd failed! %d\n", ::WSAGetLastError ()); errno = EINVAL; return -1; diff --git a/dep/ACE_wrappers/ace/ATM_Connector.cpp b/dep/ACE_wrappers/ace/ATM_Connector.cpp index c1ce226ad..5328436f8 100644 --- a/dep/ACE_wrappers/ace/ATM_Connector.cpp +++ b/dep/ACE_wrappers/ace/ATM_Connector.cpp @@ -1,12 +1,12 @@ // ATM_Connector.cpp -// $Id: ATM_Connector.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: ATM_Connector.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/ATM_Connector.h" #if defined (ACE_HAS_ATM) #include "ace/Handle_Set.h" -ACE_RCSID(ace, ATM_Connector, "$Id: ATM_Connector.cpp 80826 2008-03-04 14:51:23Z wotte $") + #if !defined (__ACE_INLINE__) #include "ace/ATM_Connector.inl" diff --git a/dep/ACE_wrappers/ace/ATM_Connector.h b/dep/ACE_wrappers/ace/ATM_Connector.h index cbeedeea7..940fc5a30 100644 --- a/dep/ACE_wrappers/ace/ATM_Connector.h +++ b/dep/ACE_wrappers/ace/ATM_Connector.h @@ -4,7 +4,7 @@ /** * @file ATM_Connector.h * - * $Id: ATM_Connector.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: ATM_Connector.h 82723 2008-09-16 09:35:44Z johnnyw $ * * @author Joe Hoffert */ @@ -136,7 +136,7 @@ public: ACE_ATM_QoS &qos); /// Resets any event associations on this handle - int reset_new_handle (ACE_HANDLE handle); + bool reset_new_handle (ACE_HANDLE handle); // = Meta-type info typedef ACE_ATM_Addr PEER_ADDR; diff --git a/dep/ACE_wrappers/ace/ATM_Connector.inl b/dep/ACE_wrappers/ace/ATM_Connector.inl index 0b89cbf08..10d1623f6 100644 --- a/dep/ACE_wrappers/ace/ATM_Connector.inl +++ b/dep/ACE_wrappers/ace/ATM_Connector.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: ATM_Connector.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: ATM_Connector.inl 84565 2009-02-23 08:20:39Z johnnyw $ // Open versioned namespace, if enabled by the user. ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -96,7 +96,7 @@ ACE_ATM_Connector::add_leaf (ACE_ATM_Stream ¤t_stream, return (result != ACE_INVALID_HANDLE); #elif defined (ACE_HAS_LINUX_ATM) - ACE_OS::printf("ATM_Connector(add_leaf): not yet implemented in Linux \n"); + ACE_OS::printf("ATM_Connector(add_leaf): not yet implemented in Linux\n"); ACE_UNUSED_ARG(current_stream); ACE_UNUSED_ARG(remote_sap); @@ -114,7 +114,7 @@ ACE_ATM_Connector::add_leaf (ACE_ATM_Stream ¤t_stream, } ACE_INLINE -int +bool ACE_ATM_Connector::reset_new_handle (ACE_HANDLE handle) { #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) @@ -124,7 +124,7 @@ ACE_ATM_Connector::reset_new_handle (ACE_HANDLE handle) 0); #else /* !defined ACE_HAS_WINSOCK2 */ ACE_UNUSED_ARG (handle); - return 0; + return false; #endif /* ACE_WIN32 */ } diff --git a/dep/ACE_wrappers/ace/ATM_Params.cpp b/dep/ACE_wrappers/ace/ATM_Params.cpp index 70a05f1d7..b8d7600f1 100644 --- a/dep/ACE_wrappers/ace/ATM_Params.cpp +++ b/dep/ACE_wrappers/ace/ATM_Params.cpp @@ -1,10 +1,10 @@ -// $Id: ATM_Params.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: ATM_Params.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/ATM_Params.h" #if defined (ACE_HAS_ATM) -ACE_RCSID(ace, ATM_Params, "$Id: ATM_Params.cpp 80826 2008-03-04 14:51:23Z wotte $") + #if !defined (__ACE_INLINE__) #include "ace/ATM_Params.inl" diff --git a/dep/ACE_wrappers/ace/ATM_QoS.cpp b/dep/ACE_wrappers/ace/ATM_QoS.cpp index d5405d042..841d57f21 100644 --- a/dep/ACE_wrappers/ace/ATM_QoS.cpp +++ b/dep/ACE_wrappers/ace/ATM_QoS.cpp @@ -1,8 +1,8 @@ -// $Id: ATM_QoS.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: ATM_QoS.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/ATM_QoS.h" -ACE_RCSID(ace, ATM_QoS, "$Id: ATM_QoS.cpp 80826 2008-03-04 14:51:23Z wotte $") + #if defined (ACE_HAS_ATM) @@ -451,7 +451,7 @@ ACE_ATM_QoS::construct_options (ACE_HANDLE fd, ACE_UNUSED_ARG (rate); ACE_UNUSED_ARG (flags); ACE_UNUSED_ARG (len); - return (0); + return 0; #elif defined (ACE_HAS_FORE_ATM_XTI) struct t_opthdr *popt; char *buf; @@ -621,7 +621,7 @@ ACE_ATM_QoS::construct_options (ACE_HANDLE fd, ACE_UNUSED_ARG (rate); ACE_UNUSED_ARG (flag); ACE_UNUSED_ARG (len); - return (0); + return 0; #endif /* ACE_HAS_FORE_ATM_WS2 */ } diff --git a/dep/ACE_wrappers/ace/ATM_Stream.cpp b/dep/ACE_wrappers/ace/ATM_Stream.cpp index affb89147..270afab05 100644 --- a/dep/ACE_wrappers/ace/ATM_Stream.cpp +++ b/dep/ACE_wrappers/ace/ATM_Stream.cpp @@ -1,9 +1,7 @@ -// $Id: ATM_Stream.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: ATM_Stream.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/ATM_Stream.h" -ACE_RCSID (ace, ATM_Stream, "$Id: ATM_Stream.cpp 80826 2008-03-04 14:51:23Z wotte $") - #if defined (ACE_HAS_ATM) #if !defined (__ACE_INLINE__) @@ -216,7 +214,7 @@ ACE_ATM_Stream::get_vpi_vci (ACE_UINT16 &vpi, vpi = conn_prop.vpi; vci = conn_prop.vci; - return (0); + return 0; #elif defined (ACE_HAS_FORE_ATM_WS2) ATM_CONNECTION_ID connID; DWORD bytes = 0; @@ -278,10 +276,10 @@ ACE_ATM_Stream::get_vpi_vci (ACE_UINT16 &vpi, ACE_UNUSED_ARG (vci); ACE_UNUSED_ARG (vpi); - return (-1); + return -1; #endif /* SO_ATMPVC || SO_VCID */ #else - return (-1); + return -1; #endif /* ACE_HAS_FORE_ATM_XTI || ACE_HAS_FORE_ATM_WS2 || ACE_HAS_LINUX_ATM */ } diff --git a/dep/ACE_wrappers/ace/ATM_Stream.inl b/dep/ACE_wrappers/ace/ATM_Stream.inl index 087c1ed44..007e25832 100644 --- a/dep/ACE_wrappers/ace/ATM_Stream.inl +++ b/dep/ACE_wrappers/ace/ATM_Stream.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: ATM_Stream.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: ATM_Stream.inl 84262 2009-01-29 10:34:33Z johnnyw $ ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -103,7 +103,7 @@ ACE_ATM_Stream::recv (void *buf, ACE_UNUSED_ARG(buf); ACE_UNUSED_ARG(n); ACE_UNUSED_ARG(flags); - return (0); + return 0; #endif /* ACE_HAS_FORE_ATM_XTI */ } @@ -126,7 +126,7 @@ ACE_ATM_Stream::send_n (const void *buf, ACE_UNUSED_ARG(buf); ACE_UNUSED_ARG(n); ACE_UNUSED_ARG(flags); - return (0); + return 0; #endif /* ACE_HAS_FORE_ATM_XTI */ } diff --git a/dep/ACE_wrappers/ace/Acceptor.cpp b/dep/ACE_wrappers/ace/Acceptor.cpp index 1ba51af5e..859afb12c 100644 --- a/dep/ACE_wrappers/ace/Acceptor.cpp +++ b/dep/ACE_wrappers/ace/Acceptor.cpp @@ -1,3 +1,5 @@ +// $Id: Acceptor.cpp 91604 2010-09-02 14:51:58Z vzykov $ + #ifndef ACE_ACCEPTOR_CPP #define ACE_ACCEPTOR_CPP @@ -15,10 +17,6 @@ #include "ace/OS_NS_string.h" #include "ace/OS_NS_sys_select.h" -ACE_RCSID (ace, - Acceptor, - "$Id: Acceptor.cpp 81991 2008-06-16 19:05:40Z elliott_c $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_Acceptor) @@ -287,12 +285,23 @@ ACE_Acceptor::accept_svc_handler // created handle. This is because the newly created handle will // inherit the properties of the listen handle, including its event // associations. - int reset_new_handle = this->reactor ()->uses_event_associations (); + + ACE_Reactor *reactor = this->reactor (); + bool reset_new_handle; + + if (reactor) + reset_new_handle = reactor->uses_event_associations (); + else + { + // Acceptor is closed, so reject this call + errno = EINVAL; + return -1; + } if (this->acceptor ().accept (svc_handler->peer (), // stream 0, // remote address 0, // timeout - 1, // restart + true, // restart reset_new_handle // reset new handler ) == -1) { @@ -984,7 +993,7 @@ template int ACE_Oneshot_Acceptor::register_handler (SVC_HANDLER *svc_handler, const ACE_Synch_Options &synch_options, - int restart) + bool restart) { ACE_TRACE ("ACE_Oneshot_Acceptor::register_handler"); // Can't do this if we don't have a Reactor. @@ -1037,8 +1046,8 @@ ACE_Oneshot_Acceptor::shared_accept (SVC_HANDLER *svc_handler, ACE_PEER_ACCEPTOR_ADDR *remote_addr, ACE_Time_Value *timeout, - int restart, - int reset_new_handle) + bool restart, + bool reset_new_handle) { ACE_TRACE ("ACE_Oneshot_Acceptor::shared_accept"); if (svc_handler == 0) @@ -1074,8 +1083,8 @@ ACE_Oneshot_Acceptor::accept (SVC_HANDLER *svc_handler, ACE_PEER_ACCEPTOR_ADDR *remote_addr, const ACE_Synch_Options &synch_options, - int restart, - int reset_new_handle) + bool restart, + bool reset_new_handle) { ACE_TRACE ("ACE_Oneshot_Acceptor::accept"); // Note that if timeout == ACE_Time_Value (x, y) where (x > 0 || y > @@ -1128,7 +1137,7 @@ ACE_Oneshot_Acceptor::handle_input (ACE_HANDLE // created handle. This is because the newly created handle will // inherit the properties of the listen handle, including its event // associations. - int reset_new_handle = this->reactor ()->uses_event_associations (); + bool const reset_new_handle = this->reactor ()->uses_event_associations (); // There is a use-case whereby this object will be gone upon return // from shared_accept - if the Svc_Handler deletes this Oneshot_Acceptor diff --git a/dep/ACE_wrappers/ace/Acceptor.h b/dep/ACE_wrappers/ace/Acceptor.h index 88329be53..64cf488b9 100644 --- a/dep/ACE_wrappers/ace/Acceptor.h +++ b/dep/ACE_wrappers/ace/Acceptor.h @@ -4,7 +4,7 @@ /** * @file Acceptor.h * - * $Id: Acceptor.h 81460 2008-04-28 11:34:23Z elliott_c $ + * $Id: Acceptor.h 88800 2010-02-01 23:18:34Z shuston $ * * @author Douglas C. Schmidt */ @@ -89,7 +89,7 @@ public: * @param use_select Affects behavior when called back by the reactor * when a connection can be accepted. If non-zero, * this object will accept all pending connections, - * intead of just the one that triggered the reactor + * instead of just the one that triggered the reactor * callback. Uses ACE_OS::select() internally to * detect any remaining acceptable connections. * The default is 1. @@ -128,7 +128,7 @@ public: * @param use_select Affects behavior when called back by the reactor * when a connection can be accepted. If non-zero, * this object will accept all pending connections, - * intead of just the one that triggered the reactor + * instead of just the one that triggered the reactor * callback. Uses ACE_OS::select() internally to * detect any remaining acceptable connections. * The default is 1. @@ -187,7 +187,7 @@ protected: /** * Bridge method for accepting the new connection into the - * . The default behavior delegates to the + * @a svc_handler. The default behavior delegates to the * PEER_ACCEPTOR::accept. */ virtual int accept_svc_handler (SVC_HANDLER *svc_handler); @@ -293,8 +293,6 @@ public: typedef ACE_Concurrency_Strategy CONCURRENCY_STRATEGY; typedef ACE_Scheduling_Strategy SCHEDULING_STRATEGY; - - /// Default constructor. ACE_Strategy_Acceptor (const ACE_TCHAR service_name[] = 0, const ACE_TCHAR service_description[] = 0, @@ -341,7 +339,7 @@ public: * @param use_select Affects behavior when called back by the reactor * when a connection can be accepted. If non-zero, * this object will accept all pending connections, - * intead of just the one that triggered the reactor + * instead of just the one that triggered the reactor * callback. Uses ACE_OS::select() internally to * detect any remaining acceptable connections. * The default is 1. @@ -505,21 +503,30 @@ protected: * @class ACE_Oneshot_Acceptor * * @brief Generic factory for passively connecting clients and creating - * exactly one service handler (SVC_HANDLER). + * exactly one service handler of the type SVC_HANDLER specified in the + * template. * - * This class works similarly to the regular {ACE_Acceptor}, + * This class works similarly to the regular ACE_Acceptor, but * with the following differences: - * 1. This class doesn't automagically register {this} with the - * {ACE_Reactor} since it expects to have its {accept} method - * called directly. However, it stashes the {ACE_Reactor} - * pointer away in case it's needed later to finish accepting - * a connection asynchronously. - * 2. The class doesn't need an {ACE_Creation_Strategy} (since - * the user supplies the SVC_HANDLER) or an - * {ACE_Accept_Strategy} (since this class only accepts one - * connection and then removes all traces of itself from the - * {ACE_Reactor} if it was registered for asynchronous - * accepts). + * -# ACE_Oneshot_Acceptor doesn't automatically register itself with the + * ACE_Reactor; the caller is expected to call the accept() method + * directly. Since a later call to accept() may require a reactor, + * the constructor and open() methods both accept an ACE_Reactor pointer + * which is saved in case it's needed in accept(). + * -# ACE_Oneshot_Acceptor doesn't need an ACE_Creation_Strategy (because + * the user supplies the SVC_HANDLER) or an ACE_Accept_Strategy (because + * this class only accepts one connection and then removes all traces of + * itself from the ACE_Reactor if it was registered for asynchronous + * accepts). + * + * The usage model for ACE_Oneshot_Acceptor is: + * - Instantiate an object and establish its local address to listen at. + * This can be accomplished using either the address-accepting constructor + * (but there's no error indication) or the default constructor followed + * by a call to open(). + * - Call the accept() method. This will attempt to accept a connection + * immediately. If there is no immediately available connection to accept, + * behavior is governed by the ACE_Synch_Options argument passed to open(). */ template class ACE_Oneshot_Acceptor : public ACE_Service_Object @@ -537,10 +544,10 @@ public: /** * Initialize the appropriate strategies for concurrency and then - * open the {peer_acceptor} at the designated {local_addr}. Note - * that unlike the {ACE_Acceptor} and {ACE_Strategy_Acceptor}, this - * method does NOT register {this} acceptor with the {reactor} at - * this point -- it just stashes the {reactor} away in case it's + * open the acceptor at the designated @a local_addr. Note + * that unlike ACE_Acceptor and ACE_Strategy_Acceptor, this + * method does NOT register this acceptor with the @a reactor at + * this point -- the @a reactor parameter is saved in case it's * needed later. */ ACE_Oneshot_Acceptor (const ACE_PEER_ACCEPTOR_ADDR &local_addr, @@ -549,10 +556,10 @@ public: /** * Initialize the appropriate strategies for concurrency and then - * open the {peer_acceptor} at the designated {local_addr}. Note - * that unlike the {ACE_Acceptor} and {ACE_Strategy_Acceptor}, this - * method does NOT register {this} acceptor with the {reactor} at - * this point -- it just stashes the {reactor} away in case it's + * open the acceptor at the designated @a local_addr. Note + * that unlike ACE_Acceptor and ACE_Strategy_Acceptor, this + * method does NOT register this acceptor with the @a reactor at + * this point -- the @a reactor parameter is saved in case it's * needed later. */ int open (const ACE_PEER_ACCEPTOR_ADDR &, @@ -568,8 +575,8 @@ public: virtual int accept (SVC_HANDLER * = 0, ACE_PEER_ACCEPTOR_ADDR *remote_addr = 0, const ACE_Synch_Options &synch_options = ACE_Synch_Options::defaults, - int restart = 1, - int reset_new_handle = 0); + bool restart = true, + bool reset_new_handle = false); /// Cancel a oneshot acceptor that was started asynchronously. virtual int cancel (void); @@ -605,8 +612,8 @@ protected: int shared_accept (SVC_HANDLER *svc_handler, ACE_PEER_ACCEPTOR_ADDR *remote_addr, ACE_Time_Value *timeout, - int restart, - int reset_new_handle); + bool restart, + bool reset_new_handle); // = Demultiplexing hooks. /// Returns the listening acceptor's {ACE_HANDLE}. @@ -654,13 +661,13 @@ private: */ int register_handler (SVC_HANDLER *svc_handler, const ACE_Synch_Options &options, - int restart); + bool restart); /// Hold the svc_handler_ across asynchrony boundaries. SVC_HANDLER *svc_handler_; /// Hold the restart flag across asynchrony boundaries. - int restart_; + bool restart_; /// Factory that establishes connections passively. ACE_PEER_ACCEPTOR peer_acceptor_; diff --git a/dep/ACE_wrappers/ace/Activation_Queue.cpp b/dep/ACE_wrappers/ace/Activation_Queue.cpp index f18ada06e..777dc3ad0 100644 --- a/dep/ACE_wrappers/ace/Activation_Queue.cpp +++ b/dep/ACE_wrappers/ace/Activation_Queue.cpp @@ -1,3 +1,5 @@ +// $Id: Activation_Queue.cpp 91286 2010-08-05 09:04:31Z johnnyw $ + #include "ace/Activation_Queue.h" #if !defined (__ACE_INLINE__) @@ -9,10 +11,6 @@ #include "ace/Malloc_Base.h" #include "ace/Time_Value.h" -ACE_RCSID (ace, - Activation_Queue, - "$Id: Activation_Queue.cpp 80826 2008-03-04 14:51:23Z wotte $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL void @@ -23,7 +21,7 @@ ACE_Activation_Queue::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("delete_queue_ = %d\n"), this->delete_queue_)); - ACE_DEBUG ((LM_INFO, ACE_TEXT ("queue_: \n"))); + ACE_DEBUG ((LM_INFO, ACE_TEXT ("queue_:\n"))); if (this->queue_) this->queue_->dump(); else diff --git a/dep/ACE_wrappers/ace/Activation_Queue.h b/dep/ACE_wrappers/ace/Activation_Queue.h index 454640474..ab58eedb5 100644 --- a/dep/ACE_wrappers/ace/Activation_Queue.h +++ b/dep/ACE_wrappers/ace/Activation_Queue.h @@ -4,7 +4,7 @@ /** * @file Activation_Queue.h * - * $Id: Activation_Queue.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Activation_Queue.h 91066 2010-07-12 11:05:04Z johnnyw $ * * @author Andres Kruse * @author Douglas C. Schmidt @@ -23,6 +23,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Message_Queue.h" +#include "ace/Copy_Disabled.h" #include "ace/Condition_Thread_Mutex.h" /// Define to be compatible with the terminology in the POSA2 book! @@ -35,7 +36,8 @@ class ACE_Method_Request; /** * @class ACE_Activation_Queue * - * @brief Reifies a method into a request. Subclasses typically + * @brief + * Reifies a method into a request. Subclasses typically * represent necessary state and behavior. * * Maintains a priority-ordered queue of ACE_Method_Request objects. @@ -47,10 +49,9 @@ class ACE_Method_Request; * * @sa ACE_Method_Request */ -class ACE_Export ACE_Activation_Queue +class ACE_Export ACE_Activation_Queue : private ACE_Copy_Disabled { public: - // = Initialization and termination methods. /// Constructor. /** * Initializes a new activation queue. @@ -139,12 +140,6 @@ public: /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; -private: - - // = Prevent copying and assignment. - ACE_Activation_Queue (const ACE_Activation_Queue &); - void operator= (const ACE_Activation_Queue &); - protected: /// Stores the Method_Requests. diff --git a/dep/ACE_wrappers/ace/Active_Map_Manager.cpp b/dep/ACE_wrappers/ace/Active_Map_Manager.cpp index 6ec891b5d..574bcb857 100644 --- a/dep/ACE_wrappers/ace/Active_Map_Manager.cpp +++ b/dep/ACE_wrappers/ace/Active_Map_Manager.cpp @@ -1,9 +1,7 @@ -// $Id: Active_Map_Manager.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Active_Map_Manager.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/Active_Map_Manager.h" -ACE_RCSID(ace, Active_Map_Manager, "$Id: Active_Map_Manager.cpp 80826 2008-03-04 14:51:23Z wotte $") - #if !defined (__ACE_INLINE__) #include "ace/Active_Map_Manager.inl" #endif /* __ACE_INLINE__ */ diff --git a/dep/ACE_wrappers/ace/Active_Map_Manager.h b/dep/ACE_wrappers/ace/Active_Map_Manager.h index d1558b146..a6c167e5f 100644 --- a/dep/ACE_wrappers/ace/Active_Map_Manager.h +++ b/dep/ACE_wrappers/ace/Active_Map_Manager.h @@ -4,7 +4,7 @@ /** * @file Active_Map_Manager.h * - * $Id: Active_Map_Manager.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Active_Map_Manager.h 91066 2010-07-12 11:05:04Z johnnyw $ * * @author Irfan Pyarali */ @@ -78,7 +78,7 @@ public: // = This really should be protected but because of template // friends, they are not. - /// Increment the number. + /// Increment the slot_generation number. void increment_slot_generation_count (void); private: @@ -95,7 +95,7 @@ private: /// Slot index in the active map. ACE_UINT32 slot_index_; - /// Slot generation number of slot in the active map. + /// Slot generation number of @c slot_index_ slot in the active map. ACE_UINT32 slot_generation_; }; diff --git a/dep/ACE_wrappers/ace/Active_Map_Manager_T.h b/dep/ACE_wrappers/ace/Active_Map_Manager_T.h index f63d43537..80eaada26 100644 --- a/dep/ACE_wrappers/ace/Active_Map_Manager_T.h +++ b/dep/ACE_wrappers/ace/Active_Map_Manager_T.h @@ -4,7 +4,7 @@ /** * @file Active_Map_Manager_T.h * - * $Id: Active_Map_Manager_T.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Active_Map_Manager_T.h 84316 2009-02-03 19:46:05Z johnnyw $ * * @author Irfan Pyarali */ @@ -53,22 +53,22 @@ public: typedef REVERSE_ITERATOR reverse_iterator; // = Initialization and termination methods. - /// Initialize a with the ACE_DEFAULT_MAP_SIZE. + /// Initialize a Active_Map_Manager with the ACE_DEFAULT_MAP_SIZE. ACE_Active_Map_Manager (ACE_Allocator *alloc = 0); - /// Initialize a with @a size entries. + /// Initialize a Active_Map_Manager with @a size entries. ACE_Active_Map_Manager (size_t size, ACE_Allocator *alloc = 0); - /// Close down a and release dynamically + /// Close down a Active_Map_Manager and release dynamically /// allocated resources. ~ACE_Active_Map_Manager (void); - /// Initialize a with size @a length. + /// Initialize a Active_Map_Manager with size @a length. int open (size_t length = ACE_DEFAULT_MAP_SIZE, ACE_Allocator *alloc = 0); - /// Close down a and release dynamically + /// Close down a Active_Map_Manager and release dynamically /// allocated resources. int close (void); @@ -84,8 +84,8 @@ public: /** * Reserves a slot in the internal structure and returns the key and * a pointer to the value. User should place their @a value into - * <*internal_value>. This method is useful in reducing the number - * of copies required in some cases. Note that is + * @a internal_value. This method is useful in reducing the number + * of copies required in some cases. Note that @a internal_value is * only a temporary pointer and will change when the map resizes. * Therefore, the user should use the pointer immediately and not * hold on to it. @@ -126,8 +126,8 @@ public: /** * Locate @a value associated with @a key. The value is returned via - * and hence a copy is saved. Note that - * is only a temporary pointer and will change when + * @a internal_value and hence a copy is saved. Note that + * @a internal_value is only a temporary pointer and will change when * the map resizes. Therefore, the user should use the pointer * immediately and not hold on to it. */ @@ -148,8 +148,8 @@ public: /** * Locate @a value associated with @a key. The value is returned via - * and hence a copy is saved. Note that - * is only a temporary pointer and will change when + * @a internal_value and hence a copy is saved. Note that + * @a internal_value is only a temporary pointer and will change when * the map resizes or when this slot is reused. Therefore, the user * should use the pointer immediately and not hold on to it. */ diff --git a/dep/ACE_wrappers/ace/Addr.cpp b/dep/ACE_wrappers/ace/Addr.cpp index fb338f9ac..1caf3f6ae 100644 --- a/dep/ACE_wrappers/ace/Addr.cpp +++ b/dep/ACE_wrappers/ace/Addr.cpp @@ -1,13 +1,7 @@ -// $Id: Addr.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Addr.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/Addr.h" - -ACE_RCSID (ace, - Addr, - "$Id: Addr.cpp 80826 2008-03-04 14:51:23Z wotte $") - - #if !defined (__ACE_INLINE__) #include "ace/Addr.inl" #endif /* __ACE_INLINE__ */ diff --git a/dep/ACE_wrappers/ace/Addr.inl b/dep/ACE_wrappers/ace/Addr.inl index 44fd495a6..0ff355eae 100644 --- a/dep/ACE_wrappers/ace/Addr.inl +++ b/dep/ACE_wrappers/ace/Addr.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: Addr.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Addr.inl 87295 2009-11-02 14:45:59Z johnnyw $ // Return the address of the address. @@ -20,32 +20,28 @@ ACE_Addr::operator != (const ACE_Addr &sap) const sap.addr_size_ != this->addr_size_ ); } -// Return the size of the address. - +/// Return the size of the address. ACE_INLINE int ACE_Addr::get_size (void) const { return this->addr_size_; } -// Sets the size of the address. - +/// Sets the size of the address. ACE_INLINE void ACE_Addr::set_size (int size) { this->addr_size_ = size; } -// Return the type of the address. - +/// Return the type of the address. ACE_INLINE int ACE_Addr::get_type (void) const { return this->addr_type_; } -// Set the type of the address. - +/// Set the type of the address. ACE_INLINE void ACE_Addr::set_type (int type) { diff --git a/dep/ACE_wrappers/ace/Arg_Shifter.cpp b/dep/ACE_wrappers/ace/Arg_Shifter.cpp index 43d5074db..d491f8236 100644 --- a/dep/ACE_wrappers/ace/Arg_Shifter.cpp +++ b/dep/ACE_wrappers/ace/Arg_Shifter.cpp @@ -1,3 +1,5 @@ +// $Id: Arg_Shifter.cpp 91286 2010-08-05 09:04:31Z johnnyw $ + #ifndef ACE_ARG_SHIFTER_T_CPP #define ACE_ARG_SHIFTER_T_CPP @@ -7,11 +9,6 @@ #include "ace/OS_Errno.h" #include "ace/OS_Memory.h" -ACE_RCSID (ace, - Arg_Shifter, - "$Id: Arg_Shifter.cpp 80826 2008-03-04 14:51:23Z wotte $") - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL template @@ -133,8 +130,7 @@ ACE_Arg_Shifter_T::cur_arg_strncasecmp (const CHAR_TYPE *flag) flag, flag_length) == 0) { - if (ACE_OS::strlen(temp_[current_index_]) == - flag_length) + if (ACE_OS::strlen(temp_[current_index_]) == flag_length) { // match and lengths are equal return 0; diff --git a/dep/ACE_wrappers/ace/Arg_Shifter.h b/dep/ACE_wrappers/ace/Arg_Shifter.h index e143e57d1..57cd2b0f5 100644 --- a/dep/ACE_wrappers/ace/Arg_Shifter.h +++ b/dep/ACE_wrappers/ace/Arg_Shifter.h @@ -4,7 +4,7 @@ /** * @file Arg_Shifter.h * - * $Id: Arg_Shifter.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Arg_Shifter.h 91459 2010-08-25 09:51:01Z mcorino $ * * @author Seth Widoff */ @@ -33,13 +33,23 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * @a argv vector, so deeper levels of argument parsing can locate the yet * unprocessed arguments at the beginning of the vector. * + * Nomenclature: + * argument - a member of the argv array + * option - an argument starting with '-' + * flag - synonym for "option" + * parameter value - an argument not starting with '-' + * parameter - synonym for "parameter value" + * * The @c ACE_Arg_Shifter copies the pointers of the @a argv vector - * into a temporary array. As the @c ACE_Arg_Shifter iterates over - * the copied vector, it places known arguments in the rear of the - * vector, leaving the unknown ones in the beginning. So, after having - * visited all the arguments in the temporary vector, @c ACE_Arg_Shifter - * has placed all the unknown arguments in their original order at - * the front of original @a argv. + * into a temporary array, emptying the original. As the @c ACE_Arg_Shifter + * iterates over the temporary array, it places known arguments in the rear + * of the original array and places the unknown ones in the beginning of the + * original array. It modifies argc to be the number of unknown arguments, + * so it looks to the caller as if the original array contains only unknown + * arguments. So, after @c ACE_Arg_Shifter has visited all the arguments + * in the temporary array, the original @a argv array appears to contain + * only the unknown arguments in their original order (but it actually has + * all the known arguments, too, beyond argc). */ template class ACE_Arg_Shifter_T @@ -106,7 +116,7 @@ public: * If the current argument does not match flag * If there is no parameter found after a 'matched' flag * - * If the flag is matched and the flag and paramter DO NOT RUN + * If the flag is matched and the flag and parameter DO NOT RUN * together, the flag is consumed, the parameter is returned, * and the new current argument is the parameter value. * ie '-foobarflag VALUE' leaves the new cur arg == "VALUE" @@ -118,7 +128,7 @@ public: const CHAR_TYPE *get_the_parameter (const CHAR_TYPE* flag); /** - * Check if the current argument matches (case insensitive) + * Check if the current argument matches (case insensitive) @a flag * * ------------------------------------------------------------ * @@ -202,6 +212,9 @@ private: /// The index of in which we'll stick the next known /// argument. int front_; + /* This is not really the "front" at all. It's the point after + * which the unknown arguments end and at which the known arguments begin. + */ }; typedef ACE_Arg_Shifter_T ACE_Arg_Shifter; diff --git a/dep/ACE_wrappers/ace/Argv_Type_Converter.cpp b/dep/ACE_wrappers/ace/Argv_Type_Converter.cpp index d594e6545..68b98d99d 100644 --- a/dep/ACE_wrappers/ace/Argv_Type_Converter.cpp +++ b/dep/ACE_wrappers/ace/Argv_Type_Converter.cpp @@ -1,4 +1,4 @@ -// $Id: Argv_Type_Converter.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Argv_Type_Converter.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/Argv_Type_Converter.h" @@ -6,10 +6,6 @@ #include "ace/Argv_Type_Converter.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (ace, - Argv_Type_Converter, - "$Id: Argv_Type_Converter.cpp 80826 2008-03-04 14:51:23Z wotte $") - #include "ace/OS_NS_string.h" #include "ace/OS_Errno.h" @@ -108,11 +104,10 @@ ACE_Argv_Type_Converter::initialize (void) void ACE_Argv_Type_Converter::align_char_with_wchar (void) { - int wchar_argv_index = 0; - wchar_t* match_argv = this->wchar_argv_[0]; // pick the initial entry - - while (wchar_argv_index < this->saved_argc_) + for (int wchar_argv_index = 0; wchar_argv_index < this->saved_argc_; + ++wchar_argv_index) { + wchar_t *match_argv = this->wchar_argv_[wchar_argv_index]; // if n'th entries of both argv lists are different if (ACE_OS::strcmp (this->char_argv_[wchar_argv_index], ACE_TEXT_ALWAYS_CHAR (match_argv)) != 0) @@ -132,9 +127,6 @@ ACE_Argv_Type_Converter::align_char_with_wchar (void) } } } - - // move to the next wchar argv list entry - match_argv = this->wchar_argv_[++wchar_argv_index]; } this->cleanup (); @@ -143,11 +135,10 @@ ACE_Argv_Type_Converter::align_char_with_wchar (void) void ACE_Argv_Type_Converter::align_wchar_with_char (void) { - int char_argv_index = 0; - char* match_argv = this->char_argv_[0]; // pick the initial entry - - while (char_argv_index < saved_argc_) + for (int char_argv_index = 0; char_argv_index < saved_argc_; + ++char_argv_index) { + char* match_argv = this->char_argv_[char_argv_index]; // if n'th entries of both argv lists are different if (ACE_OS::strcmp ( ACE_TEXT_ALWAYS_CHAR (this->wchar_argv_[char_argv_index]), @@ -168,9 +159,6 @@ ACE_Argv_Type_Converter::align_wchar_with_char (void) } } } - - // move to the next wchar argv list entry - match_argv = this->char_argv_[++char_argv_index]; } this->cleanup(); diff --git a/dep/ACE_wrappers/ace/Argv_Type_Converter.h b/dep/ACE_wrappers/ace/Argv_Type_Converter.h index ee2c541ed..d41d839b6 100644 --- a/dep/ACE_wrappers/ace/Argv_Type_Converter.h +++ b/dep/ACE_wrappers/ace/Argv_Type_Converter.h @@ -4,7 +4,7 @@ /** * @file Argv_Type_Converter.h * - * $Id: Argv_Type_Converter.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Argv_Type_Converter.h 83891 2008-11-28 11:01:50Z johnnyw $ * * @author Si Mong Park */ @@ -29,7 +29,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * * @brief To convert 'char' input/command line parameter to 'wchar_t'. * - * This class is to convert 'char' type command line paramter to + * This class is to convert 'char' type command line parameter to * wide-character (wchar_t) format and stores the copy of it. * This is useful for all classes that use 'char**' argv but cannot * be converted into 'ACE_TCHAR**' version. @@ -54,7 +54,7 @@ public: /// Returns the pointer of ASCII (char) command line. char** get_ASCII_argv (void); - /// Returns the number of sub paramters (argc). + /// Returns the number of sub parameters (argc). int& get_argc (void); private: @@ -83,7 +83,7 @@ private: #endif // ACE_USES_WCHAR private: - /// Original number of input paramter, same as 'argc'. + /// Original number of input parameter, same as 'argc'. int &saved_argc_; /// Data member pointer that contains converted argv in ACE_ANTI_TCHAR. diff --git a/dep/ACE_wrappers/ace/Array_Base.h b/dep/ACE_wrappers/ace/Array_Base.h index 44e281255..0d6620a6c 100644 --- a/dep/ACE_wrappers/ace/Array_Base.h +++ b/dep/ACE_wrappers/ace/Array_Base.h @@ -4,7 +4,7 @@ /** * @file Array_Base.h * - * $Id: Array_Base.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Array_Base.h 84477 2009-02-16 13:30:38Z johnnyw $ * * @author Douglas C. Schmidt */ @@ -118,7 +118,7 @@ public: size_type size (void) const; /** - * Changes the size of the array to match . + * Changes the size of the array to match @a new_size. * It copies the old contents into the new array. * Return -1 on failure. */ @@ -128,7 +128,7 @@ public: size_type max_size (void) const; /** - * Changes the size of the array to match . + * Changes the size of the array to match @a new_size. * It copies the old contents into the new array. * Return -1 on failure. * It does not affect new_size @@ -166,11 +166,11 @@ public: protected: /// Returns 1 if @a slot is within range, i.e., 0 >= @a slot < - /// , else returns 0. + /// @c cur_size_, else returns 0. bool in_range (size_type slot) const; - /// Maximum size of the array, i.e., the total number of elements - /// in . + /// Maximum size of the array, i.e., the total number of @c T elements + /// in @c array_. size_type max_size_; /** @@ -212,7 +212,7 @@ public: // = Iteration methods. - /// Pass back the that hasn't been seen in the Array. + /// Pass back the @a next_item that hasn't been seen in the Array. /// Returns 0 when all items have been seen, else 1. int next (T *&next_item); diff --git a/dep/ACE_wrappers/ace/Array_Map.h b/dep/ACE_wrappers/ace/Array_Map.h index 67aa8d94b..1515ea455 100644 --- a/dep/ACE_wrappers/ace/Array_Map.h +++ b/dep/ACE_wrappers/ace/Array_Map.h @@ -4,7 +4,7 @@ /** * @file Array_Map.h * - * $Id: Array_Map.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Array_Map.h 84136 2009-01-12 11:01:17Z johnnyw $ * * Light weight array-based map with fast iteration but linear * (i.e. O(n)) search times. STL-style interface is exposed. @@ -41,7 +41,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * (i.e. O(n)) search times. * * Map implementation that focuses on small footprint and fast - * iteration. Search times are, however, linear (O(n)) meaning that + * iteration. Search times are, however, linear (O(n)) meaning that * this map isn't suitable for large data sets that will be searched * in performance critical areas of code. Iteration over large data * sets, however, is faster than linked list-based maps, for example, @@ -159,7 +159,7 @@ public: /// Return @c true if the map is empty, else @c false. bool is_empty (void) const; // ACE style - /** + /** * Return @c true if the map is empty, else @c false. We recommend * using @c is_empty() instead since it's more consistent with the * ACE container naming conventions. diff --git a/dep/ACE_wrappers/ace/Assert.cpp b/dep/ACE_wrappers/ace/Assert.cpp index 4a71c9e5a..526899621 100644 --- a/dep/ACE_wrappers/ace/Assert.cpp +++ b/dep/ACE_wrappers/ace/Assert.cpp @@ -1,10 +1,8 @@ -// $Id: Assert.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Assert.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/Assert.h" #include "ace/Log_Msg.h" -ACE_RCSID(ace, Assert, "$Id: Assert.cpp 80826 2008-03-04 14:51:23Z wotte $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL // The following ASSERT macro is courtesy of Alexandre Karev diff --git a/dep/ACE_wrappers/ace/Assert.h b/dep/ACE_wrappers/ace/Assert.h index cf28a4a89..89363d4c6 100644 --- a/dep/ACE_wrappers/ace/Assert.h +++ b/dep/ACE_wrappers/ace/Assert.h @@ -4,7 +4,7 @@ /** * @file Assert.h * - * $Id: Assert.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Assert.h 82808 2008-09-23 11:27:27Z smcqueen $ * * @author Douglas C. Schmidt */ @@ -23,14 +23,16 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_Export void __ace_assert(const char *file, int line, const ACE_TCHAR *expression); ACE_END_VERSIONED_NAMESPACE_DECL +#define ACE_TEST_ASSERT(X) \ + ((X) \ + ? static_cast(0) \ + : ACE_VERSIONED_NAMESPACE_NAME::__ace_assert(__FILE__, __LINE__, ACE_TEXT_CHAR_TO_TCHAR (#X))) + #if defined (ACE_NDEBUG) #define ACE_ASSERT(x) \ (static_cast(0)) #else -#define ACE_ASSERT(X) \ - ((X) \ - ? static_cast(0) \ - : ACE_VERSIONED_NAMESPACE_NAME::__ace_assert(__FILE__, __LINE__, ACE_TEXT_CHAR_TO_TCHAR (#X))) +#define ACE_ASSERT(X) ACE_TEST_ASSERT(X) #endif /* ACE_NDEBUG */ #include /**/ "ace/post.h" diff --git a/dep/ACE_wrappers/ace/Asynch_Acceptor.cpp b/dep/ACE_wrappers/ace/Asynch_Acceptor.cpp index 12aeebe0d..85d656956 100644 --- a/dep/ACE_wrappers/ace/Asynch_Acceptor.cpp +++ b/dep/ACE_wrappers/ace/Asynch_Acceptor.cpp @@ -1,5 +1,5 @@ /* -*- C++ -*- */ -// $Id: Asynch_Acceptor.cpp 82444 2008-07-28 13:33:07Z johnnyw $ +// $Id: Asynch_Acceptor.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #ifndef ACE_ASYNCH_ACCEPTOR_C #define ACE_ASYNCH_ACCEPTOR_C @@ -10,8 +10,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -ACE_RCSID(ace, Asynch_Acceptor, "$Id: Asynch_Acceptor.cpp 82444 2008-07-28 13:33:07Z johnnyw $") - #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS) // This only works on platforms that support async i/o. @@ -338,7 +336,7 @@ ACE_Asynch_Acceptor::handle_accept (const ACE_Asynch_Accept::Result &re && result.error () != ECANCELED #endif ) - this->accept (this->bytes_to_read_); + this->accept (this->bytes_to_read_, result.act ()); } template int diff --git a/dep/ACE_wrappers/ace/Asynch_IO.cpp b/dep/ACE_wrappers/ace/Asynch_IO.cpp index 26bba31a3..1913ae10b 100644 --- a/dep/ACE_wrappers/ace/Asynch_IO.cpp +++ b/dep/ACE_wrappers/ace/Asynch_IO.cpp @@ -1,9 +1,7 @@ -// $Id: Asynch_IO.cpp 82559 2008-08-07 20:23:07Z parsons $ +// $Id: Asynch_IO.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/Asynch_IO.h" -ACE_RCSID(ace, Asynch_IO, "$Id: Asynch_IO.cpp 82559 2008-08-07 20:23:07Z parsons $") - #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS) // This only works on platforms with Asynchronous IO diff --git a/dep/ACE_wrappers/ace/Asynch_IO.h b/dep/ACE_wrappers/ace/Asynch_IO.h index 6aeb21fe5..641e22a8d 100644 --- a/dep/ACE_wrappers/ace/Asynch_IO.h +++ b/dep/ACE_wrappers/ace/Asynch_IO.h @@ -4,7 +4,7 @@ /** * @file Asynch_IO.h * - * $Id: Asynch_IO.h 81870 2008-06-09 20:53:53Z shuston $ + * $Id: Asynch_IO.h 84837 2009-03-16 13:01:15Z johnnyw $ * * This works on Win32 (defined (ACE_WIN32) && !defined * (ACE_HAS_WINCE)) platforms and on POSIX4 platforms with {aio_*} @@ -411,6 +411,9 @@ public: /// The implementation class. ACE_Asynch_Read_Stream_Result_Impl *implementation_; }; +private: + ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Asynch_Read_Stream &)) + ACE_UNIMPLEMENTED_FUNC (ACE_Asynch_Read_Stream (const ACE_Asynch_Read_Stream &)) }; // Forward declarations @@ -564,6 +567,9 @@ public: /// Implementation class. ACE_Asynch_Write_Stream_Result_Impl *implementation_; }; +private: + ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Asynch_Write_Stream &)) + ACE_UNIMPLEMENTED_FUNC (ACE_Asynch_Write_Stream (const ACE_Asynch_Write_Stream &)) }; // Forward declarations @@ -712,6 +718,9 @@ public: /// one auto generated by MSVC is flagged as infinitely recursive void operator= (Result &) {} }; +private: + ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Asynch_Read_File &)) + ACE_UNIMPLEMENTED_FUNC (ACE_Asynch_Read_File (const ACE_Asynch_Read_File &)) }; // Forward declarations @@ -845,6 +854,9 @@ public: /// one auto generated by MSVC is flagged as infinitely recursive void operator= (Result &) {}; }; +private: + ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Asynch_Write_File &)) + ACE_UNIMPLEMENTED_FUNC (ACE_Asynch_Write_File (const ACE_Asynch_Write_File &)) }; // Forward declarations @@ -982,6 +994,9 @@ public: /// Impelmentation class. ACE_Asynch_Accept_Result_Impl *implementation_; }; +private: + ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Asynch_Accept &)) + ACE_UNIMPLEMENTED_FUNC (ACE_Asynch_Accept (const ACE_Asynch_Accept &)) }; // Forward declarations class ACE_Asynch_Connect_Result_Impl; @@ -1076,6 +1091,9 @@ public: /// Impelmentation class. ACE_Asynch_Connect_Result_Impl *implementation_; }; +private: + ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Asynch_Connect &)) + ACE_UNIMPLEMENTED_FUNC (ACE_Asynch_Connect (const ACE_Asynch_Connect &)) }; // Forward declarations @@ -1287,6 +1305,9 @@ public: /// Target data structure. ACE_TRANSMIT_FILE_BUFFERS transmit_buffers_; }; +private: + ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Asynch_Transmit_File &)) + ACE_UNIMPLEMENTED_FUNC (ACE_Asynch_Transmit_File (const ACE_Asynch_Transmit_File &)) }; @@ -1422,6 +1443,9 @@ public: /// The implementation class. ACE_Asynch_Read_Dgram_Result_Impl *implementation_; }; +private: + ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Asynch_Read_Dgram &)) + ACE_UNIMPLEMENTED_FUNC (ACE_Asynch_Read_Dgram (const ACE_Asynch_Read_Dgram &)) }; // Forward declarations @@ -1552,6 +1576,9 @@ public: /// Implementation class. ACE_Asynch_Write_Dgram_Result_Impl *implementation_; }; +private: + ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Asynch_Write_Dgram &)) + ACE_UNIMPLEMENTED_FUNC (ACE_Asynch_Write_Dgram (const ACE_Asynch_Write_Dgram &)) }; diff --git a/dep/ACE_wrappers/ace/Asynch_Pseudo_Task.cpp b/dep/ACE_wrappers/ace/Asynch_Pseudo_Task.cpp index 94f0d6980..e5d4b3b4e 100644 --- a/dep/ACE_wrappers/ace/Asynch_Pseudo_Task.cpp +++ b/dep/ACE_wrappers/ace/Asynch_Pseudo_Task.cpp @@ -1,12 +1,10 @@ -// $Id: Asynch_Pseudo_Task.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Asynch_Pseudo_Task.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/Asynch_Pseudo_Task.h" #include "ace/OS_NS_errno.h" #include "ace/OS_NS_signal.h" -ACE_RCSID(ace, Asynch_Pseudo_Task, "$Id: Asynch_Pseudo_Task.cpp 80826 2008-03-04 14:51:23Z wotte $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_Asynch_Pseudo_Task::ACE_Asynch_Pseudo_Task () diff --git a/dep/ACE_wrappers/ace/Atomic_Op.cpp b/dep/ACE_wrappers/ace/Atomic_Op.cpp index 57139ac85..32e5c1136 100644 --- a/dep/ACE_wrappers/ace/Atomic_Op.cpp +++ b/dep/ACE_wrappers/ace/Atomic_Op.cpp @@ -1,12 +1,8 @@ -// $Id: Atomic_Op.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Atomic_Op.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/Atomic_Op.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID (ace, - Atomic_Op, - "$Id: Atomic_Op.cpp 80826 2008-03-04 14:51:23Z wotte $") - #if !defined (__ACE_INLINE__) #include "ace/Atomic_Op.inl" #endif /* __ACE_INLINE__ */ @@ -34,8 +30,8 @@ single_cpu_increment (volatile long *value) unsigned long addr = reinterpret_cast (value); asm( "xadd %0, (%1)" : "+r"(tmp) : "r"(addr) ); return tmp + 1; -#elif defined (sun) || \ - (defined (__SUNPRO_CC) && (defined (__i386) || defined (__x86_64))) +#elif !defined (ACE_HAS_SOLARIS_ATOMIC_LIB) && (defined (sun) || \ + (defined (__SUNPRO_CC) && (defined (__i386) || defined (__x86_64)))) return ace_atomic_add_long ( reinterpret_cast (value), 1); #elif defined(__GNUC__) && defined(PPC) @@ -58,8 +54,8 @@ single_cpu_decrement (volatile long *value) unsigned long addr = reinterpret_cast (value); asm( "xadd %0, (%1)" : "+r"(tmp) : "r"(addr) ); return tmp - 1; -#elif defined (sun) || \ - (defined (__SUNPRO_CC) && (defined (__i386) || defined (__x86_64))) +#elif !defined (ACE_HAS_SOLARIS_ATOMIC_LIB) && (defined (sun) || \ + (defined (__SUNPRO_CC) && (defined (__i386) || defined (__x86_64)))) return ace_atomic_add_long ( reinterpret_cast (value), -1); #elif defined(__GNUC__) && defined(PPC) @@ -81,8 +77,8 @@ single_cpu_exchange (volatile long *value, long rhs) unsigned long addr = reinterpret_cast (value); asm( "xchg %0, (%1)" : "+r"(rhs) : "r"(addr) ); return rhs; -#elif defined (sun) || \ - (defined (__SUNPRO_CC) && (defined (__i386) || defined (__x86_64))) +#elif !defined (ACE_HAS_SOLARIS_ATOMIC_LIB) && (defined (sun) || \ + (defined (__SUNPRO_CC) && (defined (__i386) || defined (__x86_64)))) return ace_atomic_swap_long ( reinterpret_cast (value), rhs); #elif defined(__GNUC__) && defined(PPC) @@ -104,8 +100,8 @@ single_cpu_exchange_add (volatile long *value, long rhs) unsigned long addr = reinterpret_cast (value); asm( "xadd %0, (%1)" : "+r"(rhs) : "r"(addr) ); return rhs; -#elif defined (sun) || \ - (defined (__SUNPRO_CC) && (defined (__i386) || defined (__x86_64))) +#elif !defined (ACE_HAS_SOLARIS_ATOMIC_LIB) && (defined (sun) || \ + (defined (__SUNPRO_CC) && (defined (__i386) || defined (__x86_64)))) return ace_atomic_swap_add_long ( reinterpret_cast (value), rhs); #elif defined(__GNUC__) && defined(PPC) @@ -147,8 +143,8 @@ multi_cpu_increment (volatile long *value) unsigned long addr = reinterpret_cast (value); asm( "lock ; xadd %0, (%1)" : "+r"(tmp) : "r"(addr) ); return tmp + 1; -#elif defined (sun) || \ - (defined (__SUNPRO_CC) && (defined (__i386) || defined (__x86_64))) +#elif !defined (ACE_HAS_SOLARIS_ATOMIC_LIB) && (defined (sun) || \ + (defined (__SUNPRO_CC) && (defined (__i386) || defined (__x86_64)))) return ace_atomic_add_long ( reinterpret_cast (value), 1); #else /* ACE_HAS_INTEL_ASSEMBLY*/ @@ -165,8 +161,8 @@ multi_cpu_decrement (volatile long *value) unsigned long addr = reinterpret_cast (value); asm( "lock ; xadd %0, (%1)" : "+r"(tmp) : "r"(addr) ); return tmp - 1; -#elif defined (sun) || \ - (defined (__SUNPRO_CC) && (defined (__i386) || defined (__x86_64))) +#elif !defined (ACE_HAS_SOLARIS_ATOMIC_LIB) && (defined (sun) || \ + (defined (__SUNPRO_CC) && (defined (__i386) || defined (__x86_64)))) return ace_atomic_add_long ( reinterpret_cast (value), -1); #else /* ACE_HAS_INTEL_ASSEMBLY*/ @@ -183,8 +179,8 @@ multi_cpu_exchange (volatile long *value, long rhs) // The XCHG instruction automatically follows LOCK semantics asm( "xchg %0, (%1)" : "+r"(rhs) : "r"(addr) ); return rhs; -#elif defined (sun) || \ - (defined (__SUNPRO_CC) && (defined (__i386) || defined (__x86_64))) +#elif !defined (ACE_HAS_SOLARIS_ATOMIC_LIB) && (defined (sun) || \ + (defined (__SUNPRO_CC) && (defined (__i386) || defined (__x86_64)))) return ace_atomic_swap_long ( reinterpret_cast (value), rhs); #else /* ACE_HAS_INTEL_ASSEMBLY*/ @@ -201,8 +197,8 @@ multi_cpu_exchange_add (volatile long *value, long rhs) unsigned long addr = reinterpret_cast (value); asm( "lock ; xadd %0, (%1)" : "+r"(rhs) : "r"(addr) ); return rhs; -#elif defined (sun) || \ - (defined (__SUNPRO_CC) && (defined (__i386) || defined (__x86_64))) +#elif !defined (ACE_HAS_SOLARIS_ATOMIC_LIB) && (defined (sun) || \ + (defined (__SUNPRO_CC) && (defined (__i386) || defined (__x86_64)))) return ace_atomic_swap_add_long ( reinterpret_cast (value), rhs); #elif defined (WIN32) && !defined (ACE_HAS_INTERLOCKED_EXCHANGEADD) diff --git a/dep/ACE_wrappers/ace/Atomic_Op.h b/dep/ACE_wrappers/ace/Atomic_Op.h index 196b9208f..4dee35e6e 100644 --- a/dep/ACE_wrappers/ace/Atomic_Op.h +++ b/dep/ACE_wrappers/ace/Atomic_Op.h @@ -4,7 +4,7 @@ /** * @file Atomic_Op.h * - * $Id: Atomic_Op.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Atomic_Op.h 91523 2010-08-27 14:18:02Z johnnyw $ * * @author Douglas C. Schmidt */ @@ -43,16 +43,26 @@ # endif /* ACE_HAS_INTERLOCKED_EXCHANGEADD */ # elif defined (ACE_HAS_INTEL_ASSEMBLY) # define ACE_HAS_BUILTIN_ATOMIC_OP +# elif defined (ACE_HAS_VXATOMICLIB) +# define ACE_HAS_BUILTIN_ATOMIC_OP +# elif defined (ACE_HAS_SOLARIS_ATOMIC_LIB) && !defined (ACE_HAS_BUILTIN_ATOMIC_OP) +# define ACE_HAS_BUILTIN_ATOMIC_OP # endif /* WIN32 */ #endif /* ACE_HAS_THREADS */ -#if defined (ACE_HAS_BUILTIN_ATOMIC_OP) +// If we have the GCC Atomic builtin support, use it +#if defined (ACE_HAS_GCC_ATOMIC_BUILTINS) && (ACE_HAS_GCC_ATOMIC_BUILTINS == 1) +# undef ACE_HAS_BUILTIN_ATOMIC_OP +#endif + +// Include the templates here. +#include "ace/Atomic_Op_GCC_T.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL +#if defined (ACE_HAS_BUILTIN_ATOMIC_OP) + /** - * @class ACE_Atomic_Op - * * @brief Specialization of ACE_Atomic_Op for platforms that * support atomic integer operations. * @@ -63,64 +73,64 @@ template<> class ACE_Export ACE_Atomic_Op { public: - /// Initialize to 0. + /// Initialize @c value_ to 0. ACE_Atomic_Op (void); - /// Initialize to c. + /// Initialize @c value_ to c. ACE_Atomic_Op (long c); /// Manage copying... ACE_Atomic_Op (const ACE_Atomic_Op &c); - /// Atomically pre-increment . + /// Atomically pre-increment @c value_. long operator++ (void); - /// Atomically post-increment . + /// Atomically post-increment @c value_. long operator++ (int); - /// Atomically increment by rhs. + /// Atomically increment @c value_ by rhs. long operator+= (long rhs); - /// Atomically pre-decrement . + /// Atomically pre-decrement @c value_. long operator-- (void); - /// Atomically post-decrement . + /// Atomically post-decrement @c value_. long operator-- (int); - /// Atomically decrement by rhs. + /// Atomically decrement @c value_ by rhs. long operator-= (long rhs); - /// Atomically compare with rhs. + /// Atomically compare @c value_ with rhs. bool operator== (long rhs) const; - /// Atomically compare with rhs. + /// Atomically compare @c value_ with rhs. bool operator!= (long rhs) const; - /// Atomically check if greater than or equal to rhs. + /// Atomically check if @c value_ greater than or equal to rhs. bool operator>= (long rhs) const; - /// Atomically check if greater than rhs. + /// Atomically check if @c value_ greater than rhs. bool operator> (long rhs) const; - /// Atomically check if less than or equal to rhs. + /// Atomically check if @c value_ less than or equal to rhs. bool operator<= (long rhs) const; - /// Atomically check if less than rhs. + /// Atomically check if @c value_ less than rhs. bool operator< (long rhs) const; - /// Atomically assign rhs to . + /// Atomically assign rhs to @c value_. ACE_Atomic_Op &operator= (long rhs); - /// Atomically assign to . + /// Atomically assign to @c value_. ACE_Atomic_Op &operator= (const ACE_Atomic_Op &rhs); - /// Explicitly return . + /// Explicitly return @c value_. long value (void) const; /// Dump the state of an object. void dump (void) const; - /// Explicitly return (by reference). + /// Explicitly return @c value_ (by reference). volatile long &value_i (void); // ACE_ALLOC_HOOK_DECLARE; @@ -132,9 +142,9 @@ public: private: - // This function cannot be supported by this template specialization. - // If you need access to an underlying lock, use the ACE_Atomic_Op_Ex - // template instead. + /// This function cannot be supported by this template specialization. + /// If you need access to an underlying lock, use the ACE_Atomic_Op_Ex + /// template instead. ACE_Thread_Mutex &mutex (void); private: @@ -142,7 +152,7 @@ private: /// Current object decorated by the atomic op. volatile long value_; - // Pointers to selected atomic op implementations. + /// Pointers to selected atomic op implementations. static long (*increment_fn_) (volatile long *); static long (*decrement_fn_) (volatile long *); static long (*exchange_fn_) (volatile long *, long); @@ -150,8 +160,6 @@ private: }; /** - * @class ACE_Atomic_Op - * * @brief Specialization of ACE_Atomic_Op for platforms that * support atomic integer operations. * @@ -162,64 +170,64 @@ template<> class ACE_Export ACE_Atomic_Op { public: - /// Initialize to 0. + /// Initialize @c value_ to 0. ACE_Atomic_Op (void); - /// Initialize to c. + /// Initialize @c value_ to c. ACE_Atomic_Op (unsigned long c); /// Manage copying... ACE_Atomic_Op (const ACE_Atomic_Op &c); - /// Atomically pre-increment . + /// Atomically pre-increment @c value_. unsigned long operator++ (void); - /// Atomically post-increment . + /// Atomically post-increment @c value_. unsigned long operator++ (int); - /// Atomically increment by rhs. + /// Atomically increment @c value_ by rhs. unsigned long operator+= (unsigned long rhs); - /// Atomically pre-decrement . + /// Atomically pre-decrement @c value_. unsigned long operator-- (void); - /// Atomically post-decrement . + /// Atomically post-decrement @c value_. unsigned long operator-- (int); - /// Atomically decrement by rhs. + /// Atomically decrement @c value_ by rhs. unsigned long operator-= (unsigned long rhs); - /// Atomically compare with rhs. + /// Atomically compare @c value_ with rhs. bool operator== (unsigned long rhs) const; - /// Atomically compare with rhs. + /// Atomically compare @c value_ with rhs. bool operator!= (unsigned long rhs) const; - /// Atomically check if greater than or equal to rhs. + /// Atomically check if @c value_ greater than or equal to rhs. bool operator>= (unsigned long rhs) const; - /// Atomically check if greater than rhs. + /// Atomically check if @c value_ greater than rhs. bool operator> (unsigned long rhs) const; - /// Atomically check if less than or equal to rhs. + /// Atomically check if @c value_ less than or equal to rhs. bool operator<= (unsigned long rhs) const; - /// Atomically check if less than rhs. + /// Atomically check if @c value_ less than rhs. bool operator< (unsigned long rhs) const; - /// Atomically assign rhs to . + /// Atomically assign rhs to @c value_. ACE_Atomic_Op &operator= (unsigned long rhs); - /// Atomically assign to . + /// Atomically assign to @c value_. ACE_Atomic_Op &operator= (const ACE_Atomic_Op &rhs); - /// Explicitly return . + /// Explicitly return @c value_. unsigned long value (void) const; /// Dump the state of an object. void dump (void) const; - /// Explicitly return (by reference). + /// Explicitly return @c value_ (by reference). volatile unsigned long &value_i (void); // ACE_ALLOC_HOOK_DECLARE; @@ -231,9 +239,9 @@ public: private: - // This function cannot be supported by this template specialization. - // If you need access to an underlying lock, use the ACE_Atomic_Op_Ex - // template instead. + /// This function cannot be supported by this template specialization. + /// If you need access to an underlying lock, use the ACE_Atomic_Op_Ex + /// template instead. ACE_Thread_Mutex &mutex (void); private: @@ -248,10 +256,97 @@ private: static long (*exchange_add_fn_) (volatile long *, long); }; -ACE_END_VERSIONED_NAMESPACE_DECL +#endif /* !ACE_HAS_BUILTIN_ATOMIC_OP */ + +#if defined (ACE_HAS_GCC_ATOMIC_BUILTINS) && (ACE_HAS_GCC_ATOMIC_BUILTINS == 1) + +template<> +class ACE_Export ACE_Atomic_Op +: public ACE_Atomic_Op_GCC +{ +public: + ACE_Atomic_Op (void); + ACE_Atomic_Op (int c); + ACE_Atomic_Op (const ACE_Atomic_Op &c); + ACE_Atomic_Op &operator= (int rhs); +}; + +template<> +class ACE_Export ACE_Atomic_Op +: public ACE_Atomic_Op_GCC +{ +public: + ACE_Atomic_Op (void); + ACE_Atomic_Op (unsigned int c); + ACE_Atomic_Op (const ACE_Atomic_Op &c); + ACE_Atomic_Op &operator= (unsigned int rhs); +}; + +// If we have built in atomic op, use that, the assignment operator +// is faster for a long/unsinged long +template<> +class ACE_Export ACE_Atomic_Op +: public ACE_Atomic_Op_GCC +{ +public: + ACE_Atomic_Op (void); + ACE_Atomic_Op (long c); + ACE_Atomic_Op (const ACE_Atomic_Op &c); + ACE_Atomic_Op &operator= (long rhs); +}; + +template<> +class ACE_Export ACE_Atomic_Op +: public ACE_Atomic_Op_GCC +{ +public: + ACE_Atomic_Op (void); + ACE_Atomic_Op (unsigned long c); + ACE_Atomic_Op (const ACE_Atomic_Op &c); + ACE_Atomic_Op &operator= (unsigned long rhs); +}; + +#if !defined (ACE_LACKS_GCC_ATOMIC_BUILTINS_2) +template<> +class ACE_Export ACE_Atomic_Op +: public ACE_Atomic_Op_GCC +{ +public: + ACE_Atomic_Op (void); + ACE_Atomic_Op (short c); + ACE_Atomic_Op (const ACE_Atomic_Op &c); + ACE_Atomic_Op &operator= (short rhs); +}; + +template<> +class ACE_Export ACE_Atomic_Op +: public ACE_Atomic_Op_GCC +{ +public: + ACE_Atomic_Op (void); + ACE_Atomic_Op (unsigned short c); + ACE_Atomic_Op (const ACE_Atomic_Op &c); + ACE_Atomic_Op &operator= (unsigned short rhs); +}; +#endif + +#if !defined (ACE_LACKS_GCC_ATOMIC_BUILTINS_1) +template<> +class ACE_Export ACE_Atomic_Op +: public ACE_Atomic_Op_GCC +{ +public: + ACE_Atomic_Op (void); + ACE_Atomic_Op (bool c); + ACE_Atomic_Op (const ACE_Atomic_Op &c); + ACE_Atomic_Op &operator= (bool rhs); +}; +#endif #endif /* ACE_HAS_BUILTIN_ATOMIC_OP */ +ACE_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "ace/Atomic_Op.inl" #endif /* __ACE_INLINE__ */ diff --git a/dep/ACE_wrappers/ace/Atomic_Op.inl b/dep/ACE_wrappers/ace/Atomic_Op.inl index ed6bfbdbc..6dcade6c0 100644 --- a/dep/ACE_wrappers/ace/Atomic_Op.inl +++ b/dep/ACE_wrappers/ace/Atomic_Op.inl @@ -1,17 +1,24 @@ // -*- C++ -*- // -// $Id: Atomic_Op.inl 80826 2008-03-04 14:51:23Z wotte $ - -#if defined (ACE_HAS_BUILTIN_ATOMIC_OP) +// $Id: Atomic_Op.inl 89905 2010-04-16 13:04:47Z johnnyw $ #if defined (ACE_HAS_INTRINSIC_INTERLOCKED) -# include "ace/os_include/os_intrin.h" - -#pragma intrinsic (_InterlockedExchange, _InterlockedExchangeAdd, _InterlockedIncrement, _InterlockedDecrement) +# include "ace/os_include/os_intrin.h" +# pragma intrinsic (_InterlockedExchange, _InterlockedExchangeAdd, _InterlockedIncrement, _InterlockedDecrement) #endif /* ACE_HAS_INTRINSIC_INTERLOCKED */ +#if defined (ACE_HAS_VXATOMICLIB) +# include +#endif + +#if defined (ACE_HAS_SOLARIS_ATOMIC_LIB) +# include +#endif + ACE_BEGIN_VERSIONED_NAMESPACE_DECL +#if defined (ACE_HAS_BUILTIN_ATOMIC_OP) + ACE_INLINE ACE_Atomic_Op::ACE_Atomic_Op (void) : value_ (0) @@ -38,6 +45,10 @@ ACE_Atomic_Op::operator++ (void) return ::_InterlockedIncrement (const_cast (&this->value_)); #elif defined (WIN32) return ::InterlockedIncrement (const_cast (&this->value_)); +#elif defined (ACE_HAS_VXATOMICLIB) + return ::vxAtomicInc (reinterpret_cast (const_cast (&this->value_))) + 1; +#elif defined (ACE_HAS_SOLARIS_ATOMIC_LIB) + return ::atomic_inc_ulong_nv (reinterpret_cast(&this->value_)); #else /* WIN32 */ return (*increment_fn_) (&this->value_); #endif /* WIN32 */ @@ -56,6 +67,10 @@ ACE_Atomic_Op::operator-- (void) return ::_InterlockedDecrement (const_cast (&this->value_)); #elif defined (WIN32) return ::InterlockedDecrement (const_cast (&this->value_)); +#elif defined (ACE_HAS_VXATOMICLIB) + return ::vxAtomicDec (reinterpret_cast (const_cast (&this->value_))) - 1; +#elif defined (ACE_HAS_SOLARIS_ATOMIC_LIB) + return ::atomic_dec_ulong_nv (reinterpret_cast(&this->value_)); #else /* WIN32 */ return (*decrement_fn_) (&this->value_); #endif /* WIN32 */ @@ -76,6 +91,10 @@ ACE_Atomic_Op::operator+= (long rhs) #elif defined (WIN32) && defined (ACE_HAS_INTERLOCKED_EXCHANGEADD) return ::InterlockedExchangeAdd (const_cast (&this->value_), rhs) + rhs; +#elif defined (ACE_HAS_VXATOMICLIB) + return ::vxAtomicAdd (reinterpret_cast (const_cast (&this->value_)), rhs) + rhs; +#elif defined (ACE_HAS_SOLARIS_ATOMIC_LIB) + return ::atomic_add_long_nv (reinterpret_cast(&this->value_), rhs); #else /* WIN32 && ACE_HAS_INTERLOCKED_EXCHANGEADD */ return (*exchange_add_fn_) (&this->value_, rhs) + rhs; #endif /* WIN32 && ACE_HAS_INTERLOCKED_EXCHANGEADD */ @@ -90,6 +109,10 @@ ACE_Atomic_Op::operator-= (long rhs) #elif defined (WIN32) && defined (ACE_HAS_INTERLOCKED_EXCHANGEADD) return ::InterlockedExchangeAdd (const_cast (&this->value_), -rhs) - rhs; +#elif defined (ACE_HAS_VXATOMICLIB) + return ::vxAtomicSub (reinterpret_cast (const_cast (&this->value_)), rhs) - rhs; +#elif defined (ACE_HAS_SOLARIS_ATOMIC_LIB) + return ::atomic_add_long_nv (reinterpret_cast(&this->value_), -rhs); #else /* WIN32 && ACE_HAS_INTERLOCKED_EXCHANGEADD */ return (*exchange_add_fn_) (&this->value_, -rhs) - rhs; #endif /* WIN32 && ACE_HAS_INTERLOCKED_EXCHANGEADD */ @@ -138,6 +161,10 @@ ACE_Atomic_Op::operator= (long rhs) ::_InterlockedExchange (const_cast (&this->value_), rhs); #elif defined (WIN32) ::InterlockedExchange (const_cast (&this->value_), rhs); +#elif defined (ACE_HAS_VXATOMICLIB) + ::vxAtomicSet (reinterpret_cast (const_cast (&this->value_)), rhs); +#elif defined (ACE_HAS_SOLARIS_ATOMIC_LIB) + ::atomic_swap_ulong (reinterpret_cast(&this->value_), rhs); #else /* WIN32 */ (*exchange_fn_) (&this->value_, rhs); #endif /* WIN32 */ @@ -152,6 +179,10 @@ ACE_Atomic_Op::operator= ( ::_InterlockedExchange (const_cast (&this->value_), rhs.value_); #elif defined (WIN32) ::InterlockedExchange (const_cast (&this->value_), rhs.value_); +#elif defined (ACE_HAS_VXATOMICLIB) + ::vxAtomicSet (reinterpret_cast (const_cast (&this->value_)), rhs.value_); +#elif defined (ACE_HAS_SOLARIS_ATOMIC_LIB) + ::atomic_swap_ulong (reinterpret_cast(&this->value_), rhs.value_); #else /* WIN32 */ (*exchange_fn_) (&this->value_, rhs.value_); #endif /* WIN32 */ @@ -197,6 +228,10 @@ ACE_Atomic_Op::operator++ (void) return static_cast (::_InterlockedIncrement (const_cast (reinterpret_cast(&this->value_)))); #elif defined (WIN32) return static_cast (::InterlockedIncrement (const_cast (reinterpret_cast(&this->value_)))); +#elif defined (ACE_HAS_VXATOMICLIB) + return static_cast (::vxAtomicInc (reinterpret_cast (const_cast (reinterpret_cast(&this->value_))))) + 1; +#elif defined (ACE_HAS_SOLARIS_ATOMIC_LIB) + return ::atomic_inc_ulong_nv (&this->value_); #else /* WIN32 */ return static_cast ((*increment_fn_) (reinterpret_cast (&this->value_))); #endif /* WIN32 */ @@ -215,6 +250,10 @@ ACE_Atomic_Op::operator-- (void) return static_cast (::_InterlockedDecrement (const_cast (reinterpret_cast(&this->value_)))); #elif defined (WIN32) return static_cast (::InterlockedDecrement (const_cast (reinterpret_cast(&this->value_)))); +#elif defined (ACE_HAS_VXATOMICLIB) + return static_cast (::vxAtomicDec (reinterpret_cast (const_cast (reinterpret_cast(&this->value_))))) - 1; +#elif defined (ACE_HAS_SOLARIS_ATOMIC_LIB) + return ::atomic_dec_ulong_nv (&this->value_); #else /* WIN32 */ return static_cast ((*decrement_fn_) (reinterpret_cast (&this->value_))); #endif /* WIN32 */ @@ -235,6 +274,10 @@ ACE_Atomic_Op::operator+= (unsigned long rhs) #elif defined (WIN32) && defined (ACE_HAS_INTERLOCKED_EXCHANGEADD) return static_cast (::InterlockedExchangeAdd (const_cast (reinterpret_cast (&this->value_)), rhs)) + rhs; +#elif defined (ACE_HAS_VXATOMICLIB) + return static_cast (::vxAtomicAdd (reinterpret_cast (const_cast (reinterpret_cast(&this->value_))), rhs)) + rhs; +#elif defined (ACE_HAS_SOLARIS_ATOMIC_LIB) + return ::atomic_add_long_nv (&this->value_, rhs); #else /* WIN32 && ACE_HAS_INTERLOCKED_EXCHANGEADD */ return static_cast ((*exchange_add_fn_) (reinterpret_cast (&this->value_), rhs)) + rhs; #endif /* WIN32 && ACE_HAS_INTERLOCKED_EXCHANGEADD */ @@ -249,6 +292,10 @@ ACE_Atomic_Op::operator-= (unsigned long rhs) #elif defined (WIN32) && defined (ACE_HAS_INTERLOCKED_EXCHANGEADD) return static_cast (::InterlockedExchangeAdd (const_cast (reinterpret_cast(&this->value_)), -static_cast(rhs))) - rhs; +#elif defined (ACE_HAS_VXATOMICLIB) + return static_cast (::vxAtomicSub (reinterpret_cast (const_cast (reinterpret_cast(&this->value_))), rhs)) - rhs; +#elif defined (ACE_HAS_SOLARIS_ATOMIC_LIB) + return ::atomic_add_long_nv (&this->value_, -rhs); #else /* WIN32 && ACE_HAS_INTERLOCKED_EXCHANGEADD */ long l_rhs = static_cast (rhs); return static_cast ((*exchange_add_fn_) (reinterpret_cast (&this->value_), -l_rhs)) - rhs; @@ -298,6 +345,10 @@ ACE_Atomic_Op::operator= (unsigned long rhs) ::_InterlockedExchange (const_cast (reinterpret_cast (&this->value_)), rhs); #elif defined (WIN32) ::InterlockedExchange (const_cast (reinterpret_cast (&this->value_)), rhs); +#elif defined (ACE_HAS_VXATOMICLIB) + ::vxAtomicSet (reinterpret_cast (const_cast (reinterpret_cast (&this->value_))), rhs); +#elif defined (ACE_HAS_SOLARIS_ATOMIC_LIB) + ::atomic_swap_ulong (&this->value_, rhs); #else /* WIN32 */ (*exchange_fn_) (reinterpret_cast (&this->value_), rhs); #endif /* WIN32 */ @@ -312,6 +363,10 @@ ACE_Atomic_Op::operator= ( ::_InterlockedExchange (const_cast (reinterpret_cast (&this->value_)), rhs.value_); #elif defined (WIN32) ::InterlockedExchange (const_cast (reinterpret_cast (&this->value_)), rhs.value_); +#elif defined (ACE_HAS_VXATOMICLIB) + ::vxAtomicSet (reinterpret_cast (const_cast (reinterpret_cast (&this->value_))), rhs.value_); +#elif defined (ACE_HAS_SOLARIS_ATOMIC_LIB) + ::atomic_swap_ulong (&this->value_, rhs.value_); #else /* WIN32 */ (*exchange_fn_) (reinterpret_cast (&this->value_), rhs.value_); #endif /* WIN32 */ @@ -330,6 +385,198 @@ ACE_Atomic_Op::value_i (void) return this->value_; } +#endif /* ACE_HAS_BUILTIN_ATOMIC_OP */ + +#if defined (ACE_HAS_GCC_ATOMIC_BUILTINS) && (ACE_HAS_GCC_ATOMIC_BUILTINS == 1) + +ACE_INLINE +ACE_Atomic_Op::ACE_Atomic_Op (void) : + ACE_Atomic_Op_GCC () +{ +} + +ACE_INLINE +ACE_Atomic_Op::ACE_Atomic_Op (int c) : + ACE_Atomic_Op_GCC(c) +{ +} + +ACE_INLINE +ACE_Atomic_Op::ACE_Atomic_Op (const ACE_Atomic_Op &c) : + ACE_Atomic_Op_GCC(c) +{ +} + +ACE_INLINE +ACE_Atomic_Op& +ACE_Atomic_Op::operator= (int rhs) +{ + ACE_Atomic_Op_GCC::operator= (rhs); + return *this; +} + + +ACE_INLINE +ACE_Atomic_Op::ACE_Atomic_Op (void) : + ACE_Atomic_Op_GCC() +{ +} + +ACE_INLINE +ACE_Atomic_Op::ACE_Atomic_Op (const ACE_Atomic_Op &c) : + ACE_Atomic_Op_GCC(c) +{ +} + +ACE_INLINE +ACE_Atomic_Op::ACE_Atomic_Op (unsigned int c) : + ACE_Atomic_Op_GCC(c) +{ +} + +ACE_INLINE +ACE_Atomic_Op& +ACE_Atomic_Op::operator= (unsigned int rhs) +{ + ACE_Atomic_Op_GCC::operator= (rhs); + return *this; +} + +ACE_INLINE +ACE_Atomic_Op::ACE_Atomic_Op (void) : + ACE_Atomic_Op_GCC() +{ +} + +ACE_INLINE +ACE_Atomic_Op::ACE_Atomic_Op (long c) : + ACE_Atomic_Op_GCC(c) +{ +} + +ACE_INLINE +ACE_Atomic_Op::ACE_Atomic_Op (const ACE_Atomic_Op &c) : + ACE_Atomic_Op_GCC(c) +{ +} + +ACE_INLINE +ACE_Atomic_Op& +ACE_Atomic_Op::operator= (long rhs) +{ + ACE_Atomic_Op_GCC::operator= (rhs); + return *this; +} + +ACE_INLINE +ACE_Atomic_Op::ACE_Atomic_Op (void) : + ACE_Atomic_Op_GCC () +{ +} + +ACE_INLINE +ACE_Atomic_Op::ACE_Atomic_Op (unsigned long c) : + ACE_Atomic_Op_GCC(c) +{ +} + +ACE_INLINE +ACE_Atomic_Op::ACE_Atomic_Op (const ACE_Atomic_Op &c) : + ACE_Atomic_Op_GCC(c) +{ +} + +ACE_INLINE +ACE_Atomic_Op& +ACE_Atomic_Op::operator= (unsigned long rhs) +{ + ACE_Atomic_Op_GCC::operator= (rhs); + return *this; +} + +#if !defined (ACE_LACKS_GCC_ATOMIC_BUILTINS_2) +ACE_INLINE +ACE_Atomic_Op::ACE_Atomic_Op (void) : + ACE_Atomic_Op_GCC() +{ +} + +ACE_INLINE +ACE_Atomic_Op::ACE_Atomic_Op (short c) : + ACE_Atomic_Op_GCC(c) +{ +} + +ACE_INLINE +ACE_Atomic_Op::ACE_Atomic_Op (const ACE_Atomic_Op &c) : + ACE_Atomic_Op_GCC(c) +{ +} + +ACE_INLINE +ACE_Atomic_Op& +ACE_Atomic_Op::operator= (short rhs) +{ + ACE_Atomic_Op_GCC::operator= (rhs); + return *this; +} + +ACE_INLINE +ACE_Atomic_Op::ACE_Atomic_Op (void) : + ACE_Atomic_Op_GCC () +{ +} + +ACE_INLINE +ACE_Atomic_Op::ACE_Atomic_Op (unsigned short c) : + ACE_Atomic_Op_GCC(c) +{ +} + +ACE_INLINE +ACE_Atomic_Op::ACE_Atomic_Op (const ACE_Atomic_Op &c) : + ACE_Atomic_Op_GCC(c) +{ +} + +ACE_INLINE +ACE_Atomic_Op& +ACE_Atomic_Op::operator= (unsigned short rhs) +{ + ACE_Atomic_Op_GCC::operator= (rhs); + return *this; +} +#endif + +#if !defined (ACE_LACKS_GCC_ATOMIC_BUILTINS_1) +ACE_INLINE +ACE_Atomic_Op::ACE_Atomic_Op (void) : + ACE_Atomic_Op_GCC () +{ +} + +ACE_INLINE +ACE_Atomic_Op::ACE_Atomic_Op (bool c) : + ACE_Atomic_Op_GCC(c) +{ +} + +ACE_INLINE +ACE_Atomic_Op::ACE_Atomic_Op (const ACE_Atomic_Op &c) : + ACE_Atomic_Op_GCC(c) +{ +} + +ACE_INLINE +ACE_Atomic_Op& +ACE_Atomic_Op::operator= (bool rhs) +{ + ACE_Atomic_Op_GCC::operator= (rhs); + return *this; +} +#endif + +#endif /* ACE_HAS_GCC_ATOMIC_BUILTINS==1 */ + ACE_END_VERSIONED_NAMESPACE_DECL -#endif /* ACE_HAS_BUILTIN_ATOMIC_OP */ diff --git a/dep/ACE_wrappers/ace/Atomic_Op_GCC_T.cpp b/dep/ACE_wrappers/ace/Atomic_Op_GCC_T.cpp new file mode 100644 index 000000000..6b1eb60a2 --- /dev/null +++ b/dep/ACE_wrappers/ace/Atomic_Op_GCC_T.cpp @@ -0,0 +1,25 @@ +// $Id: Atomic_Op_GCC_T.cpp 91286 2010-08-05 09:04:31Z johnnyw $ + +#include "ace/OS_NS_unistd.h" + +#if defined (ACE_HAS_GCC_ATOMIC_BUILTINS) && (ACE_HAS_GCC_ATOMIC_BUILTINS == 1) + +#if !defined (__ACE_INLINE__) +#include "ace/Atomic_Op_GCC_T.inl" +#endif /* __ACE_INLINE__ */ + +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + +template +void +ACE_Atomic_Op_GCC::dump (void) const +{ +#if defined (ACE_HAS_DUMP) + ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); +#endif /* ACE_HAS_DUMP */ +} + +ACE_END_VERSIONED_NAMESPACE_DECL + +#endif /* ACE_HAS_GCC_ATOMIC_BUILTINS */ diff --git a/dep/ACE_wrappers/ace/Atomic_Op_GCC_T.h b/dep/ACE_wrappers/ace/Atomic_Op_GCC_T.h new file mode 100644 index 000000000..92bc771dd --- /dev/null +++ b/dep/ACE_wrappers/ace/Atomic_Op_GCC_T.h @@ -0,0 +1,136 @@ +// -*- C++ -*- + +//============================================================================= +/** + * @file Atomic_Op_GCC_T.h + * + * $Id: Atomic_Op_GCC_T.h 89339 2010-03-05 12:20:47Z johnnyw $ + * + * @author Johnny Willemsen +class ACE_Export ACE_Atomic_Op_GCC +{ +public: + /// Atomically pre-increment @c value_. + T operator++ (void); + + /// Atomically post-increment @c value_. + T operator++ (int); + + /// Atomically increment @c value_ by rhs. + T operator+= (T rhs); + + /// Atomically pre-decrement @c value_. + T operator-- (void); + + /// Atomically post-decrement @c value_. + T operator-- (int); + + /// Atomically decrement @c value_ by rhs. + T operator-= (T rhs); + + /// Atomically compare @c value_ with rhs. + bool operator== (T rhs) const; + + /// Atomically compare @c value_ with rhs. + bool operator!= (T rhs) const; + + /// Atomically check if @c value_ greater than or equal to rhs. + bool operator>= (T rhs) const; + + /// Atomically check if @c value_ greater than rhs. + bool operator> (T rhs) const; + + /// Atomically check if @c value_ less than or equal to rhs. + bool operator<= (T rhs) const; + + /// Atomically check if @c value_ less than rhs. + bool operator< (T rhs) const; + + /// Explicitly return @c value_. + T value (void) const; + + /// Dump the state of an object. + void dump (void) const; + + /// Explicitly return @c value_ (by reference). + volatile T &value_i (void); + + // ACE_ALLOC_HOOK_DECLARE; + // Declare the dynamic allocation hooks. + +protected: + /// Atomically assign rhs to @c value_. + ACE_Atomic_Op_GCC &operator= (T rhs); + + /// Atomically assign to @c value_. + ACE_Atomic_Op_GCC &operator= (const ACE_Atomic_Op_GCC &rhs); + + /// Initialize @c value_ to 0. + ACE_Atomic_Op_GCC (void); + + /// Initialize @c value_ to c. + ACE_Atomic_Op_GCC (T c); + + /// Manage copying... + ACE_Atomic_Op_GCC (const ACE_Atomic_Op_GCC &c); + +private: + + // This function cannot be supported by this template specialization. + // If you need access to an underlying lock, use the ACE_Atomic_Op_Ex + // template instead. + ACE_Thread_Mutex &mutex (void); + +private: + + /// Current object decorated by the atomic op. + volatile T value_; +}; + +ACE_END_VERSIONED_NAMESPACE_DECL + +#if defined (__ACE_INLINE__) +#include "ace/Atomic_Op_GCC_T.inl" +#endif /* __ACE_INLINE__ */ + +#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) +#include "ace/Atomic_Op_GCC_T.cpp" +#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ + +#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) +#pragma implementation ("Atomic_Op_GCC_T.cpp") +#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ + + +#endif /* ACE_HAS_GCC_ATOMIC_BUILTINS */ + +#include /**/ "ace/post.h" +#endif /*ACE_ATOMIC_OP_GCC_T_H*/ diff --git a/dep/ACE_wrappers/ace/Atomic_Op_GCC_T.inl b/dep/ACE_wrappers/ace/Atomic_Op_GCC_T.inl new file mode 100644 index 000000000..c6fe02702 --- /dev/null +++ b/dep/ACE_wrappers/ace/Atomic_Op_GCC_T.inl @@ -0,0 +1,148 @@ +// -*- C++ -*- +// +// $Id: Atomic_Op_GCC_T.inl 89391 2010-03-08 13:53:30Z johnnyw $ + +#if defined (ACE_HAS_GCC_ATOMIC_BUILTINS) && (ACE_HAS_GCC_ATOMIC_BUILTINS == 1) + +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + +template +ACE_INLINE +ACE_Atomic_Op_GCC::ACE_Atomic_Op_GCC (void) + : value_ (0) +{ +} + +template +ACE_INLINE +ACE_Atomic_Op_GCC::ACE_Atomic_Op_GCC (T c) + : value_ (c) +{ +} + +template +ACE_INLINE +ACE_Atomic_Op_GCC::ACE_Atomic_Op_GCC ( + const ACE_Atomic_Op_GCC &rhs) + : value_ (rhs.value_) +{ +} + +template +ACE_INLINE T +ACE_Atomic_Op_GCC::operator++ (void) +{ + return __sync_add_and_fetch (&this->value_, 1); +} + +template +ACE_INLINE T +ACE_Atomic_Op_GCC::operator++ (int) +{ + return __sync_fetch_and_add (&this->value_, 1); +} + +template +ACE_INLINE T +ACE_Atomic_Op_GCC::operator-- (void) +{ + return __sync_sub_and_fetch (&this->value_, 1); +} + +template +ACE_INLINE T +ACE_Atomic_Op_GCC::operator-- (int) +{ + return __sync_fetch_and_sub (&this->value_, 1); +} + +template +ACE_INLINE T +ACE_Atomic_Op_GCC::operator+= (T rhs) +{ + return __sync_add_and_fetch (&this->value_, rhs); +} + +template +ACE_INLINE T +ACE_Atomic_Op_GCC::operator-= (T rhs) +{ + return __sync_sub_and_fetch (&this->value_, rhs); +} + +template +ACE_INLINE bool +ACE_Atomic_Op_GCC::operator== (T rhs) const +{ + return (this->value_ == rhs); +} + +template +ACE_INLINE bool +ACE_Atomic_Op_GCC::operator!= (T rhs) const +{ + return (this->value_ != rhs); +} + +template +ACE_INLINE bool +ACE_Atomic_Op_GCC::operator>= (T rhs) const +{ + return (this->value_ >= rhs); +} + +template +ACE_INLINE bool +ACE_Atomic_Op_GCC::operator> (T rhs) const +{ + return (this->value_ > rhs); +} + +template +ACE_INLINE bool +ACE_Atomic_Op_GCC::operator<= (T rhs) const +{ + return (this->value_ <= rhs); +} + +template +ACE_INLINE bool +ACE_Atomic_Op_GCC::operator< (T rhs) const +{ + return (this->value_ < rhs); +} + +template +ACE_INLINE ACE_Atomic_Op_GCC & +ACE_Atomic_Op_GCC::operator= (T rhs) +{ + (void) __sync_lock_test_and_set (&this->value_, rhs); + return *this; +} + +template +ACE_INLINE ACE_Atomic_Op_GCC & +ACE_Atomic_Op_GCC::operator= ( + const ACE_Atomic_Op_GCC &rhs) +{ + (void) __sync_lock_test_and_set (&this->value_, rhs.value_); + return *this; +} + +template +ACE_INLINE T +ACE_Atomic_Op_GCC::value (void) const +{ + return this->value_; +} + +template +ACE_INLINE volatile T & +ACE_Atomic_Op_GCC::value_i (void) +{ + return this->value_; +} + +ACE_END_VERSIONED_NAMESPACE_DECL + +#endif /* ACE_HAS_GCC_ATOMIC_BUILTINS */ diff --git a/dep/ACE_wrappers/ace/Atomic_Op_T.cpp b/dep/ACE_wrappers/ace/Atomic_Op_T.cpp index 7f14370c6..3c463d489 100644 --- a/dep/ACE_wrappers/ace/Atomic_Op_T.cpp +++ b/dep/ACE_wrappers/ace/Atomic_Op_T.cpp @@ -1,3 +1,5 @@ +// $Id: Atomic_Op_T.cpp 91287 2010-08-05 10:30:49Z johnnyw $ + #ifndef ACE_ATOMIC_OP_T_CPP #define ACE_ATOMIC_OP_T_CPP @@ -20,8 +22,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_Atomic_Op_Ex) ACE_ALLOC_HOOK_DEFINE(ACE_Atomic_Op) -ACE_RCSID(ace, Atomic_Op_T, "$Id: Atomic_Op_T.cpp 80826 2008-03-04 14:51:23Z wotte $") - // ************************************************* template ACE_LOCK & ACE_Atomic_Op_Ex::mutex (void) @@ -38,7 +38,7 @@ ACE_Atomic_Op_Ex::dump (void) const // ACE_TRACE ("ACE_Atomic_Op_Ex::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); this->mutex_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP, this)); #endif /* ACE_HAS_DUMP */ } diff --git a/dep/ACE_wrappers/ace/Auto_Event.cpp b/dep/ACE_wrappers/ace/Auto_Event.cpp index 51efcf760..331edb4bf 100644 --- a/dep/ACE_wrappers/ace/Auto_Event.cpp +++ b/dep/ACE_wrappers/ace/Auto_Event.cpp @@ -1,4 +1,4 @@ -// $Id: Auto_Event.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Auto_Event.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $ #include "ace/Auto_Event.h" @@ -6,10 +6,6 @@ #include "ace/Auto_Event.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (ace, - Auto_Event, - "$Id: Auto_Event.cpp 80826 2008-03-04 14:51:23Z wotte $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_Auto_Event::ACE_Auto_Event (int initial_state, diff --git a/dep/ACE_wrappers/ace/Auto_IncDec_T.h b/dep/ACE_wrappers/ace/Auto_IncDec_T.h index 01677101d..8fcdb0bcd 100644 --- a/dep/ACE_wrappers/ace/Auto_IncDec_T.h +++ b/dep/ACE_wrappers/ace/Auto_IncDec_T.h @@ -4,7 +4,7 @@ /** * @file Auto_IncDec_T.h * - * $Id: Auto_IncDec_T.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Auto_IncDec_T.h 84675 2009-03-02 11:44:35Z johnnyw $ * * @author Edan Ayal */ @@ -60,8 +60,8 @@ private: // = Prevent assignment and initialization. ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Auto_IncDec &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Auto_IncDec (const - ACE_Auto_IncDec &)) + ACE_UNIMPLEMENTED_FUNC (ACE_Auto_IncDec (const + ACE_Auto_IncDec &)) }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/Auto_Ptr.cpp b/dep/ACE_wrappers/ace/Auto_Ptr.cpp index 791bd482a..81f458d34 100644 --- a/dep/ACE_wrappers/ace/Auto_Ptr.cpp +++ b/dep/ACE_wrappers/ace/Auto_Ptr.cpp @@ -1,4 +1,4 @@ -// $Id: Auto_Ptr.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Auto_Ptr.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #ifndef ACE_AUTO_PTR_CPP #define ACE_AUTO_PTR_CPP @@ -9,7 +9,7 @@ #include "ace/Auto_Ptr.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ace, Auto_Ptr, "$Id: Auto_Ptr.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/Barrier.cpp b/dep/ACE_wrappers/ace/Barrier.cpp index f3f4454b7..c4b0cceec 100644 --- a/dep/ACE_wrappers/ace/Barrier.cpp +++ b/dep/ACE_wrappers/ace/Barrier.cpp @@ -1,4 +1,4 @@ -// $Id: Barrier.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Barrier.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/Barrier.h" @@ -15,10 +15,6 @@ # include "ace/Log_Msg.h" #endif /* ACE_HAS_DUMP */ -ACE_RCSID (ace, - Barrier, - "$Id: Barrier.cpp 80826 2008-03-04 14:51:23Z wotte $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_Sub_Barrier) @@ -31,8 +27,7 @@ ACE_Sub_Barrier::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); this->barrier_finished_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("running_threads_ = %d"), this->running_threads_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("running_threads_ = %d\n"), this->running_threads_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/dep/ACE_wrappers/ace/Base_Thread_Adapter.cpp b/dep/ACE_wrappers/ace/Base_Thread_Adapter.cpp index 94386ee1d..fd2629f16 100644 --- a/dep/ACE_wrappers/ace/Base_Thread_Adapter.cpp +++ b/dep/ACE_wrappers/ace/Base_Thread_Adapter.cpp @@ -1,11 +1,7 @@ -// $Id: Base_Thread_Adapter.cpp 81239 2008-04-04 22:28:48Z iliyan $ +// $Id: Base_Thread_Adapter.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/Base_Thread_Adapter.h" -ACE_RCSID (ace, - Base_Thread_Adapter, - "$Id: Base_Thread_Adapter.cpp 81239 2008-04-04 22:28:48Z iliyan $") - #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/Base_Thread_Adapter.inl" #endif /* ACE_HAS_INLINED_OSCALLS */ diff --git a/dep/ACE_wrappers/ace/Based_Pointer_Repository.h b/dep/ACE_wrappers/ace/Based_Pointer_Repository.h index f674a8de7..d549ce153 100644 --- a/dep/ACE_wrappers/ace/Based_Pointer_Repository.h +++ b/dep/ACE_wrappers/ace/Based_Pointer_Repository.h @@ -4,7 +4,7 @@ /** * @file Based_Pointer_Repository.h * - * $Id: Based_Pointer_Repository.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Based_Pointer_Repository.h 84837 2009-03-16 13:01:15Z johnnyw $ * * @author Dietrich Quehl * @author Douglas C. Schmidt @@ -71,6 +71,9 @@ private: /// order to avoid circular #include dependencies. ACE_Based_Pointer_Repository_Rep *rep_; +private: + ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Based_Pointer_Repository &)) + ACE_UNIMPLEMENTED_FUNC (ACE_Based_Pointer_Repository (const ACE_Based_Pointer_Repository &)) }; // ---------------------------------- diff --git a/dep/ACE_wrappers/ace/Basic_Stats.cpp b/dep/ACE_wrappers/ace/Basic_Stats.cpp index fe678333d..ae663abe2 100644 --- a/dep/ACE_wrappers/ace/Basic_Stats.cpp +++ b/dep/ACE_wrappers/ace/Basic_Stats.cpp @@ -1,4 +1,4 @@ -// $Id: Basic_Stats.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Basic_Stats.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/Basic_Stats.h" #include "ace/Log_Msg.h" @@ -7,10 +7,6 @@ #include "ace/Basic_Stats.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ace, - Basic_Stats, - "$Id: Basic_Stats.cpp 80826 2008-03-04 14:51:23Z wotte $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL void diff --git a/dep/ACE_wrappers/ace/Basic_Types.cpp b/dep/ACE_wrappers/ace/Basic_Types.cpp index 42ae83c0b..6c161098f 100644 --- a/dep/ACE_wrappers/ace/Basic_Types.cpp +++ b/dep/ACE_wrappers/ace/Basic_Types.cpp @@ -1,3 +1,5 @@ +// $Id: Basic_Types.cpp 91366 2010-08-16 12:42:35Z mhengstmengel $ + #include "ace/Basic_Types.h" #if !defined (__ACE_INLINE__) @@ -5,11 +7,6 @@ #endif /* ! __ACE_INLINE__ */ -ACE_RCSID (ace, - Basic_Types, - "$Id: Basic_Types.cpp 80826 2008-03-04 14:51:23Z wotte $") - - #if defined (ACE_LACKS_LONGLONG_T) && !defined (ACE_LACKS_UNSIGNEDLONGLONG_T) # include "ace/Log_Msg.h" # include "ace/OS_NS_stdio.h" diff --git a/dep/ACE_wrappers/ace/Basic_Types.h b/dep/ACE_wrappers/ace/Basic_Types.h index 8e46abf30..bc467fafb 100644 --- a/dep/ACE_wrappers/ace/Basic_Types.h +++ b/dep/ACE_wrappers/ace/Basic_Types.h @@ -4,7 +4,7 @@ /** * @file Basic_Types.h * - * $Id: Basic_Types.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Basic_Types.h 91161 2010-07-21 18:25:12Z schmidt $ * * @author David L. Levine * @@ -349,13 +349,6 @@ typedef unsigned char ACE_Byte; # define ACE_SIZEOF_VOID_P ACE_SIZEOF_LONG # endif /* ACE_SIZEOF_VOID_P */ -// Type for doing arithmetic on pointers ... as elsewhere, we assume -// that unsigned versions of a type are the same size as the signed -// version of the same type. -# if defined (ACE_HAS_WINCE) && (_WIN32_WCE < 400) -typedef unsigned long ptrdiff_t; // evc3, PocketPC don't defined ptrdiff_t -# endif - ACE_END_VERSIONED_NAMESPACE_DECL // Byte-order (endian-ness) determination. @@ -391,10 +384,13 @@ ACE_END_VERSIONED_NAMESPACE_DECL # endif /* __BYTE_ORDER */ # else /* ! BYTE_ORDER && ! __BYTE_ORDER */ // We weren't explicitly told, so we have to figure it out . . . + // Note that Itanium hardware (IA64) can run in either byte order. It's + // selected by the OS when loading; Windows runs little, HP-UX runs big. # if defined (i386) || defined (__i386__) || defined (_M_IX86) || \ defined (vax) || defined (__alpha) || defined (__LITTLE_ENDIAN__) || \ - defined (ARM) || defined (_M_IA64) || defined (__ia64__) || \ - defined (_M_AMD64) || defined (__amd64) + defined (ARM) || defined (_M_IA64) || defined (_M_AMD64) || \ + defined (__amd64) || \ + ((defined (__ia64__) || defined (__ia64)) && !defined (__hpux)) // We know these are little endian. # define ACE_LITTLE_ENDIAN 0x0123 # define ACE_BYTE_ORDER ACE_LITTLE_ENDIAN @@ -704,94 +700,166 @@ ACE_END_VERSIONED_NAMESPACE_DECL # define ACE_INT64_LITERAL(n) n ## ll # endif /* ! ACE_WIN32 && ! ACE_LACKS_LONGLONG_T */ +#if !defined (ACE_INT8_FORMAT_SPECIFIER_ASCII) +# if defined (PRId8) +# define ACE_INT8_FORMAT_SPECIFIER_ASCII "%" PRId8 +# else +# define ACE_INT8_FORMAT_SPECIFIER_ASCII "%d" +# endif /* defined (PRId8) */ +#endif /* ACE_INT8_FORMAT_SPECIFIER_ASCII */ + #if !defined (ACE_INT8_FORMAT_SPECIFIER) # if defined (PRId8) # define ACE_INT8_FORMAT_SPECIFIER ACE_TEXT ("%") ACE_TEXT (PRId8) # else -# define ACE_INT8_FORMAT_SPECIFIER ACE_TEXT ("%d") +# define ACE_INT8_FORMAT_SPECIFIER ACE_TEXT (ACE_INT8_FORMAT_SPECIFIER_ASCII) # endif /* defined (PRId8) */ #endif /* ACE_INT8_FORMAT_SPECIFIER */ +#if !defined (ACE_UINT8_FORMAT_SPECIFIER_ASCII) +# if defined (PRIu8) +# define ACE_UINT8_FORMAT_SPECIFIER_ASCII "%" PRIu8 +# else +# define ACE_UINT8_FORMAT_SPECIFIER_ASCII "%u" +# endif /* defined (PRIu8) */ +#endif /* ACE_UINT8_FORMAT_SPECIFIER */ + #if !defined (ACE_UINT8_FORMAT_SPECIFIER) # if defined (PRIu8) # define ACE_UINT8_FORMAT_SPECIFIER ACE_TEXT ("%") ACE_TEXT (PRIu8) # else -# define ACE_UINT8_FORMAT_SPECIFIER ACE_TEXT ("%u") +# define ACE_UINT8_FORMAT_SPECIFIER ACE_TEXT (ACE_UINT8_FORMAT_SPECIFIER_ASCII) # endif /* defined (PRIu8) */ #endif /* ACE_UINT8_FORMAT_SPECIFIER */ +#if !defined (ACE_INT16_FORMAT_SPECIFIER_ASCII) +# if defined (PRId16) +# define ACE_INT16_FORMAT_SPECIFIER_ASCII "%" PRId16 +# else +# define ACE_INT16_FORMAT_SPECIFIER_ASCII "%d" +# endif /* defined (PRId16) */ +#endif /* ACE_INT16_FORMAT_SPECIFIER */ + #if !defined (ACE_INT16_FORMAT_SPECIFIER) # if defined (PRId16) # define ACE_INT16_FORMAT_SPECIFIER ACE_TEXT ("%") ACE_TEXT (PRId16) # else -# define ACE_INT16_FORMAT_SPECIFIER ACE_TEXT ("%d") +# define ACE_INT16_FORMAT_SPECIFIER ACE_TEXT (ACE_INT16_FORMAT_SPECIFIER_ASCII) # endif /* defined (PRId16) */ #endif /* ACE_INT16_FORMAT_SPECIFIER */ +#if !defined (ACE_UINT16_FORMAT_SPECIFIER_ASCII) +# if defined (PRIu16) +# define ACE_UINT16_FORMAT_SPECIFIER_ASCII "%" PRIu16 +# else +# define ACE_UINT16_FORMAT_SPECIFIER_ASCII "%u" +# endif /* defined (PRIu16) */ +#endif /* ACE_UINT16_FORMAT_SPECIFIER */ + #if !defined (ACE_UINT16_FORMAT_SPECIFIER) # if defined (PRIu16) # define ACE_UINT16_FORMAT_SPECIFIER ACE_TEXT ("%") ACE_TEXT (PRIu16) # else -# define ACE_UINT16_FORMAT_SPECIFIER ACE_TEXT ("%u") +# define ACE_UINT16_FORMAT_SPECIFIER ACE_TEXT (ACE_UINT16_FORMAT_SPECIFIER_ASCII) # endif /* defined (PRIu16) */ #endif /* ACE_UINT16_FORMAT_SPECIFIER */ +#if !defined (ACE_INT32_FORMAT_SPECIFIER_ASCII) +# if defined (PRId32) +# define ACE_INT32_FORMAT_SPECIFIER_ASCII "%" PRId32 +# elif ACE_SIZEOF_INT == 4 +# define ACE_INT32_FORMAT_SPECIFIER_ASCII "%d" +# else +# define ACE_INT32_FORMAT_SPECIFIER_ASCII "%ld" +# endif /* defined (PRId32) */ +#endif /* ACE_INT32_FORMAT_SPECIFIER */ + #if !defined (ACE_INT32_FORMAT_SPECIFIER) # if defined (PRId32) # define ACE_INT32_FORMAT_SPECIFIER ACE_TEXT ("%") ACE_TEXT (PRId32) -# elif ACE_SIZEOF_INT == 4 -# define ACE_INT32_FORMAT_SPECIFIER ACE_TEXT ("%d") # else -# define ACE_INT32_FORMAT_SPECIFIER ACE_TEXT ("%ld") +# define ACE_INT32_FORMAT_SPECIFIER ACE_TEXT (ACE_INT32_FORMAT_SPECIFIER_ASCII) # endif /* defined (PRId32) */ #endif /* ACE_INT32_FORMAT_SPECIFIER */ +#if !defined (ACE_UINT32_FORMAT_SPECIFIER_ASCII) +# if defined (PRIu32) +# define ACE_UINT32_FORMAT_SPECIFIER_ASCII "%" PRIu32 +# elif ACE_SIZEOF_INT == 4 +# define ACE_UINT32_FORMAT_SPECIFIER_ASCII "%u" +# else +# define ACE_UINT32_FORMAT_SPECIFIER_ASCII "%lu" +# endif /* defined (PRIu32) */ +#endif /* ACE_UINT32_FORMAT_SPECIFIER */ + #if !defined (ACE_UINT32_FORMAT_SPECIFIER) # if defined (PRIu32) # define ACE_UINT32_FORMAT_SPECIFIER ACE_TEXT ("%") ACE_TEXT (PRIu32) -# elif ACE_SIZEOF_INT == 4 -# define ACE_UINT32_FORMAT_SPECIFIER ACE_TEXT ("%u") # else -# define ACE_UINT32_FORMAT_SPECIFIER ACE_TEXT ("%lu") +# define ACE_UINT32_FORMAT_SPECIFIER ACE_TEXT (ACE_UINT32_FORMAT_SPECIFIER_ASCII) # endif /* defined (PRIu32) */ #endif /* ACE_UINT32_FORMAT_SPECIFIER */ +#if !defined (ACE_INT64_FORMAT_SPECIFIER_ASCII) +# if defined (PRId64) +# define ACE_INT64_FORMAT_SPECIFIER_ASCII "%" PRId64 +# elif ACE_SIZEOF_LONG == 8 +# define ACE_INT64_FORMAT_SPECIFIER_ASCII "%ld" +# else +# define ACE_INT64_FORMAT_SPECIFIER_ASCII "%lld" +# endif /* defined (PRId64) */ +#endif /* ACE_INT64_FORMAT_SPECIFIER */ + #if !defined (ACE_INT64_FORMAT_SPECIFIER) # if defined (PRId64) # define ACE_INT64_FORMAT_SPECIFIER ACE_TEXT ("%") ACE_TEXT (PRId64) -# elif ACE_SIZEOF_LONG == 8 -# define ACE_INT64_FORMAT_SPECIFIER ACE_TEXT ("%ld") # else -# define ACE_INT64_FORMAT_SPECIFIER ACE_TEXT ("%lld") +# define ACE_INT64_FORMAT_SPECIFIER ACE_TEXT (ACE_INT64_FORMAT_SPECIFIER_ASCII) # endif /* defined (PRId64) */ #endif /* ACE_INT64_FORMAT_SPECIFIER */ +#if !defined (ACE_UINT64_FORMAT_SPECIFIER_ASCII) +# if defined (PRIu64) +# define ACE_UINT64_FORMAT_SPECIFIER_ASCII "%" PRIu64 +# elif ACE_SIZEOF_LONG == 8 +# define ACE_UINT64_FORMAT_SPECIFIER_ASCII "%lu" +# else +# define ACE_UINT64_FORMAT_SPECIFIER_ASCII "%llu" +# endif /* defined (PRIu64) */ +#endif /* ACE_UINT64_FORMAT_SPECIFIER_ASCII */ + #if !defined (ACE_UINT64_FORMAT_SPECIFIER) # if defined (PRIu64) # define ACE_UINT64_FORMAT_SPECIFIER ACE_TEXT ("%") ACE_TEXT (PRIu64) -# elif ACE_SIZEOF_LONG == 8 -# define ACE_UINT64_FORMAT_SPECIFIER ACE_TEXT ("%lu") # else -# define ACE_UINT64_FORMAT_SPECIFIER ACE_TEXT ("%llu") +# define ACE_UINT64_FORMAT_SPECIFIER ACE_TEXT (ACE_UINT64_FORMAT_SPECIFIER_ASCII) # endif /* defined (PRIu64) */ #endif /* ACE_UINT64_FORMAT_SPECIFIER */ -#if !defined (ACE_SSIZE_T_FORMAT_SPECIFIER) +#if !defined (ACE_SSIZE_T_FORMAT_SPECIFIER_ASCII) # if defined (ACE_WIN64) -# define ACE_SSIZE_T_FORMAT_SPECIFIER ACE_TEXT ("%I64d") +# define ACE_SSIZE_T_FORMAT_SPECIFIER_ASCII "%I64d" # else -# define ACE_SSIZE_T_FORMAT_SPECIFIER ACE_TEXT ("%d") +# define ACE_SSIZE_T_FORMAT_SPECIFIER_ASCII "%d" # endif /* ACE_WIN64 */ #endif /* ACE_SSIZE_T_FORMAT_SPECIFIER */ -#if !defined (ACE_SIZE_T_FORMAT_SPECIFIER) +#if !defined (ACE_SSIZE_T_FORMAT_SPECIFIER) +#define ACE_SSIZE_T_FORMAT_SPECIFIER ACE_TEXT (ACE_SSIZE_T_FORMAT_SPECIFIER_ASCII) +#endif /* ACE_SSIZE_T_FORMAT_SPECIFIER */ + +#if !defined (ACE_SIZE_T_FORMAT_SPECIFIER_ASCII) # if defined (ACE_WIN64) -# define ACE_SIZE_T_FORMAT_SPECIFIER ACE_TEXT ("%I64u") +# define ACE_SIZE_T_FORMAT_SPECIFIER_ASCII "%I64u" # else -# define ACE_SIZE_T_FORMAT_SPECIFIER ACE_TEXT ("%u") +# define ACE_SIZE_T_FORMAT_SPECIFIER_ASCII "%u" # endif /* ACE_WIN64 */ #endif /* ACE_SIZE_T_FORMAT_SPECIFIER */ +#if !defined (ACE_SIZE_T_FORMAT_SPECIFIER) +#define ACE_SIZE_T_FORMAT_SPECIFIER ACE_TEXT (ACE_SIZE_T_FORMAT_SPECIFIER_ASCII) +#endif /* ACE_SIZE_T_FORMAT_SPECIFIER */ + // Cast from UINT64 to a double requires an intermediate cast to INT64 // on some platforms. # if defined (ACE_LACKS_LONGLONG_T) @@ -833,13 +901,17 @@ ACE_END_VERSIONED_NAMESPACE_DECL # if LDBL_MAX_EXP == 128 # define ACE_SIZEOF_LONG_DOUBLE 4 # elif LDBL_MAX_EXP == 1024 -# define ACE_SIZEOF_LONG_DOUBLE 8 +# if defined (__powerpc64__) +# define ACE_SIZEOF_LONG_DOUBLE 16 +# else +# define ACE_SIZEOF_LONG_DOUBLE 8 +# endif # elif LDBL_MAX_EXP == 16384 # if defined (LDBL_DIG) && LDBL_DIG == 18 # if defined (__ia64) || defined (__x86_64) # define ACE_SIZEOF_LONG_DOUBLE 16 -# else /* ! __ia64 */ -# define ACE_SIZEOF_LONG_DOUBLE 12 +# else /* ! __ia64 || __x86_64 */ +# define ACE_SIZEOF_LONG_DOUBLE 12 # endif /* __ia64 */ # else /* ! LDBL_DIG || LDBL_DIG != 18 */ # define ACE_SIZEOF_LONG_DOUBLE 16 diff --git a/dep/ACE_wrappers/ace/Bound_Ptr.h b/dep/ACE_wrappers/ace/Bound_Ptr.h index ec7384e0d..5176ff951 100644 --- a/dep/ACE_wrappers/ace/Bound_Ptr.h +++ b/dep/ACE_wrappers/ace/Bound_Ptr.h @@ -4,7 +4,7 @@ /** * @file Bound_Ptr.h * - * $Id: Bound_Ptr.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Bound_Ptr.h 82723 2008-09-16 09:35:44Z johnnyw $ * * @author Christopher Kohlhoff * @author Boris Kolpackov @@ -223,7 +223,7 @@ public: /// Allows us to check for NULL on all ACE_Strong_Bound_Ptr /// objects. - int null (void) const; + bool null (void) const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -359,7 +359,7 @@ public: long remove_ref (void); /// Allows us to check for NULL on all ACE_Weak_Bound_Ptr objects. - int null (void) const; + bool null (void) const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; diff --git a/dep/ACE_wrappers/ace/Bound_Ptr.inl b/dep/ACE_wrappers/ace/Bound_Ptr.inl index 540a5516e..399a7bc9b 100644 --- a/dep/ACE_wrappers/ace/Bound_Ptr.inl +++ b/dep/ACE_wrappers/ace/Bound_Ptr.inl @@ -1,5 +1,5 @@ /* -*- C++ -*- */ -// $Id: Bound_Ptr.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Bound_Ptr.inl 82723 2008-09-16 09:35:44Z johnnyw $ // Bound_Ptr.i @@ -288,7 +288,7 @@ ACE_Strong_Bound_Ptr::get (void) const return this->ptr_; } -template inline int +template inline bool ACE_Strong_Bound_Ptr::null (void) const { return this->ptr_ == 0; @@ -453,13 +453,13 @@ ACE_Weak_Bound_Ptr::unsafe_get (void) const return this->ptr_; } -template inline int +template inline bool ACE_Weak_Bound_Ptr::null (void) const { // A weak pointer must behave as though it is automatically set to null // if the underlying object has been deleted. if (COUNTER::object_was_deleted (this->counter_)) - return 1; + return true; return this->ptr_ == 0; } diff --git a/dep/ACE_wrappers/ace/CDR_Base.cpp b/dep/ACE_wrappers/ace/CDR_Base.cpp index dab8978fd..ea1214fa9 100644 --- a/dep/ACE_wrappers/ace/CDR_Base.cpp +++ b/dep/ACE_wrappers/ace/CDR_Base.cpp @@ -1,3 +1,5 @@ +// $Id: CDR_Base.cpp 91287 2010-08-05 10:30:49Z johnnyw $ + #include "ace/CDR_Base.h" #if !defined (__ACE_INLINE__) @@ -8,10 +10,6 @@ #include "ace/OS_Memory.h" #include "ace/OS_NS_string.h" -ACE_RCSID (ace, - CDR_Base, - "$Id: CDR_Base.cpp 80826 2008-03-04 14:51:23Z wotte $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL #if defined (NONNATIVE_LONGDOUBLE) @@ -549,20 +547,22 @@ ACE_CDR::total_length (const ACE_Message_Block* begin, return l; } -void +int ACE_CDR::consolidate (ACE_Message_Block *dst, const ACE_Message_Block *src) { if (src == 0) - return; + return 0; - size_t newsize = + size_t const newsize = ACE_CDR::first_size (ACE_CDR::total_length (src, 0) + ACE_CDR::MAX_ALIGNMENT); - dst->size (newsize); + + if (dst->size (newsize) == -1) + return -1; #if !defined (ACE_CDR_IGNORE_ALIGNMENT) - // We must copy the contents of into the new buffer, but + // We must copy the contents of src into the new buffer, but // respecting the alignment. ptrdiff_t srcalign = ptrdiff_t(src->rd_ptr ()) % ACE_CDR::MAX_ALIGNMENT; @@ -586,6 +586,7 @@ ACE_CDR::consolidate (ACE_Message_Block *dst, else dst->wr_ptr (i->length ()); } + return 0; } #if defined (NONNATIVE_LONGLONG) diff --git a/dep/ACE_wrappers/ace/CDR_Base.h b/dep/ACE_wrappers/ace/CDR_Base.h index 9c5851b22..12b4a4953 100644 --- a/dep/ACE_wrappers/ace/CDR_Base.h +++ b/dep/ACE_wrappers/ace/CDR_Base.h @@ -4,7 +4,7 @@ /** * @file CDR_Base.h * - * $Id: CDR_Base.h 82088 2008-06-19 16:22:16Z shuston $ + * $Id: CDR_Base.h 88488 2010-01-12 14:20:13Z olli $ * * ACE Common Data Representation (CDR) basic types. * @@ -124,7 +124,7 @@ public: /// Use whichever byte order is native to this machine. BYTE_ORDER_NATIVE = ACE_CDR_BYTE_ORDER }; - + /** * Do byte swapping for each basic IDL type size. There exist only * routines to put byte, halfword (2 bytes), word (4 bytes), @@ -177,10 +177,14 @@ public: */ static int grow (ACE_Message_Block *mb, size_t minsize); - /// Copy a message block chain into a single message block, - /// preserving the alignment of the first message block of the - /// original stream, not the following message blocks. - static void consolidate (ACE_Message_Block *dst, + /** + * Copy a message block chain into a single message block, + * preserving the alignment of the first message block of the + * original stream, not the following message blocks. + * @retval -1 Failure + * @retval 0 Success. + */ + static int consolidate (ACE_Message_Block *dst, const ACE_Message_Block *src); static size_t total_length (const ACE_Message_Block *begin, @@ -216,7 +220,6 @@ public: // complain about no ANSI C++ long long. typedef longlong_t LongLong; # else - // LynxOS 2.5.0 and Linux don't have u_longlong_t. typedef long long LongLong; # endif /* sun */ # else /* no native 64 bit integer type */ diff --git a/dep/ACE_wrappers/ace/CDR_Size.cpp b/dep/ACE_wrappers/ace/CDR_Size.cpp index 969709270..68fa9d5e9 100644 --- a/dep/ACE_wrappers/ace/CDR_Size.cpp +++ b/dep/ACE_wrappers/ace/CDR_Size.cpp @@ -1,3 +1,5 @@ +// $Id: CDR_Size.cpp 91287 2010-08-05 10:30:49Z johnnyw $ + #include "ace/CDR_Size.h" #include "ace/SString.h" #include "ace/OS_Memory.h" @@ -7,10 +9,6 @@ # include "ace/CDR_Size.inl" #endif /* ! __ACE_INLINE__ */ -ACE_RCSID (ace, - CDR_Size, - "$Id: CDR_Size.cpp 82559 2008-08-07 20:23:07Z parsons $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_CDR::Boolean diff --git a/dep/ACE_wrappers/ace/CDR_Stream.cpp b/dep/ACE_wrappers/ace/CDR_Stream.cpp index 80b405467..cc58132ca 100644 --- a/dep/ACE_wrappers/ace/CDR_Stream.cpp +++ b/dep/ACE_wrappers/ace/CDR_Stream.cpp @@ -1,3 +1,5 @@ +// $Id: CDR_Stream.cpp 91373 2010-08-17 07:35:27Z mhengstmengel $ + #include "ace/CDR_Stream.h" #include "ace/SString.h" #include "ace/Auto_Ptr.h" @@ -7,10 +9,6 @@ # include "ace/CDR_Stream.inl" #endif /* ! __ACE_INLINE__ */ -ACE_RCSID (ace, - CDR_Stream, - "$Id: CDR_Stream.cpp 82559 2008-08-07 20:23:07Z parsons $") - // **************************************************************** ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -379,7 +377,7 @@ ACE_OutputCDR::write_wstring (ACE_CDR::ULong len, this->write_ulong ( ACE_Utils::truncate_cast ( ACE_OutputCDR::wchar_maxbytes_ * len)); - + if (good_ulong) { return this->write_wchar_array (x, len); @@ -533,7 +531,7 @@ ACE_OutputCDR::write_8 (const ACE_CDR::ULongLong *x) if (this->adjust (ACE_CDR::LONGLONG_SIZE, buf) == 0) { -#if defined (__arm__) +#if defined (__arm__) && !defined (ACE_HAS_IPHONE) // Convert to Intel format (12345678 => 56781234) const char *orig = reinterpret_cast (x); char *target = buf; @@ -703,7 +701,6 @@ ACE_OutputCDR::write_boolean_array (const ACE_CDR::Boolean* x, return this->good_bit (); } - char * ACE_OutputCDR::write_long_placeholder (void) { @@ -715,7 +712,6 @@ ACE_OutputCDR::write_long_placeholder (void) return buf; } - char * ACE_OutputCDR::write_short_placeholder (void) { @@ -727,7 +723,6 @@ ACE_OutputCDR::write_short_placeholder (void) return buf; } - ACE_CDR::Boolean ACE_OutputCDR::replace (ACE_CDR::Long x, char* loc) { @@ -1371,7 +1366,7 @@ ACE_InputCDR::read_wstring (ACE_CDR::WChar*& x) } ACE_CDR::ULong len = 0; - + if (!this->read_ulong (len)) { return false; @@ -1615,7 +1610,7 @@ ACE_InputCDR::read_8 (ACE_CDR::ULongLong *x) if (this->adjust (ACE_CDR::LONGLONG_SIZE, buf) == 0) { #if !defined (ACE_DISABLE_SWAP_ON_READ) -# if defined (__arm__) +# if defined (__arm__) && !defined (ACE_HAS_IPHONE) if (!this->do_byte_swap_) { // Convert from Intel format (12345678 => 56781234) @@ -1897,8 +1892,7 @@ ACE_InputCDR::clone_from (ACE_InputCDR &cdr) ACE_CDR::mb_align (&this->start_); - ACE_Data_Block *db = - this->start_.data_block (); + ACE_Data_Block *db = this->start_.data_block (); // If the size of the data that needs to be copied are higher than // what is available, then do a reallocation. @@ -1906,8 +1900,7 @@ ACE_InputCDR::clone_from (ACE_InputCDR &cdr) { // @@NOTE: We need to probably add another method to the message // block interface to simplify this - db = - cdr.start_.data_block ()->clone_nocopy (); + db = cdr.start_.data_block ()->clone_nocopy (); if (db == 0 || db->size ((wr_bytes) + ACE_CDR::MAX_ALIGNMENT) == -1) diff --git a/dep/ACE_wrappers/ace/CDR_Stream.h b/dep/ACE_wrappers/ace/CDR_Stream.h index a9c789f41..0a200dc56 100644 --- a/dep/ACE_wrappers/ace/CDR_Stream.h +++ b/dep/ACE_wrappers/ace/CDR_Stream.h @@ -4,7 +4,7 @@ /** * @file CDR_Stream.h * - * $Id: CDR_Stream.h 82350 2008-07-22 07:36:47Z johnnyw $ + * $Id: CDR_Stream.h 84527 2009-02-19 14:01:42Z johnnyw $ * * ACE Common Data Representation (CDR) marshaling and demarshaling * classes. @@ -120,8 +120,8 @@ public: ACE_CDR::Octet minor_version = ACE_CDR_GIOP_MINOR_VERSION); /// Build a CDR stream with an initial buffer, it will *not* remove - /// , since it did not allocated it. It's important to be careful - /// with the alignment of . + /// @a data, since it did not allocated it. It's important to be careful + /// with the alignment of @a data. /** * Create an output stream from an arbitrary buffer, care must be * exercised with alignment, because this contructor will align if @@ -254,8 +254,8 @@ public: const ACE_CDR::WChar *x); //@} - /// @note the portion written starts at and ends - /// at . + /// @note the portion written starts at @a x and ends + /// at @a x + @a length. /// The length is *NOT* stored into the CDR stream. //@{ @name Array write operations ACE_CDR::Boolean write_boolean_array (const ACE_CDR::Boolean *x, @@ -663,7 +663,7 @@ public: ACE_Lock* lock = 0); /// Create an input stream from an ACE_Data_Block. The - /// indicates whether the can be deleted by the CDR stream + /// indicates whether the @a data can be deleted by the CDR stream /// or not ACE_InputCDR (ACE_Data_Block *data, ACE_Message_Block::Message_Flags flag = 0, @@ -919,7 +919,7 @@ public: */ void exchange_data_blocks (ACE_InputCDR &cdr); - /// Copy the data portion from the @c cdr to this cdr and return the + /// Copy the data portion from the @a cdr to this cdr and return the /// data content (ie. the ACE_Data_Block) from this CDR to the /// caller. /** diff --git a/dep/ACE_wrappers/ace/CDR_Stream.inl b/dep/ACE_wrappers/ace/CDR_Stream.inl index 9fef2d8fa..2be60c154 100644 --- a/dep/ACE_wrappers/ace/CDR_Stream.inl +++ b/dep/ACE_wrappers/ace/CDR_Stream.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: CDR_Stream.inl 82350 2008-07-22 07:36:47Z johnnyw $ +// $Id: CDR_Stream.inl 84206 2009-01-21 02:49:26Z schmidt $ #include "ace/OS_NS_string.h" #include "ace/OS_Memory.h" @@ -572,7 +572,6 @@ ACE_OutputCDR::current_alignment (size_t current_alignment) this->current_alignment_ = current_alignment; #else ACE_UNUSED_ARG (current_alignment); - return 0; #endif /* ACE_LACKS_CDR_ALIGNMENT */ } diff --git a/dep/ACE_wrappers/ace/CORBA_macros.h b/dep/ACE_wrappers/ace/CORBA_macros.h index beab26b7f..ef8050bd1 100644 --- a/dep/ACE_wrappers/ace/CORBA_macros.h +++ b/dep/ACE_wrappers/ace/CORBA_macros.h @@ -4,7 +4,7 @@ /** * @file CORBA_macros.h * - * $Id: CORBA_macros.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: CORBA_macros.h 91285 2010-08-05 08:29:30Z johnnyw $ * * Writing code that is portable between platforms with or without * native C++ exceptions is hard. The following macros offer some @@ -30,10 +30,6 @@ # pragma once # endif /* ACE_LACKS_PRAGMA_ONCE */ -#define ACE_ENV_POLLUTE_NAMES - -#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 @@ -450,126 +446,6 @@ ACE_Write_Guard< MUTEX > OBJ (LOCK); \ if (OBJ.locked () == 0) throw EXCEPTION; -#if !defined (ACE_LACKS_DEPRECATED_MACROS) - -//@{ -/** - * @name Native C++ exceptions portability macros. - * - * The following macros are used to write code portable between platforms - * with and without native C++ exception support. Their main goal is to - * hide the presence of the ACE_ENV_TYPE argument, but they collaborate - * with the ACE_TRY_* macros to emulate the try/catch blocks. - */ - -/// Define a macro to emit code only when ACE_ENV_TYPE is used -#if !defined (ACE_USES_NATIVE_EXCEPTIONS) || defined (ACE_ENV_BKWD_COMPAT) -# define ACE_ENV_EMIT_CODE(X) X -#else -# define ACE_ENV_EMIT_CODE(X) -#endif /* ACE_USES_NATIVE_EXCEPTIONS && ! ACE_ENV_BKWD_COMPAT */ - -/// Another macro to emit code only when ACE_ENV_TYPE is used -#if !defined (ACE_USES_NATIVE_EXCEPTIONS) || defined (ACE_ENV_BKWD_COMPAT) -# define ACE_ENV_EMIT_CODE2(X,Y) X,Y -#else -# define ACE_ENV_EMIT_CODE2(X,Y) -#endif /* ACE_USES_NATIVE_EXCEPTIONS && ! ACE_ENV_BKWD_COMPAT */ - -/// Helper macro -#define ACE_ENV_EMIT_DUMMY - -/// Declare a ACE_ENV_TYPE argument as the last argument of a -/// function -/** - * Normally this macro is used as follows: - * - * void my_funct (int x, int y ACE_ENV_ARG_DECL); - * - * Its purpose is to provide developers (and users) with a mechanism to - * write code that is portable to platforms with and without native C++ - * exceptions. - */ -#define ACE_ENV_ARG_DECL \ - ACE_ENV_EMIT_CODE2(ACE_ENV_EMIT_DUMMY, \ - ACE_ENV_TYPE &ACE_TRY_ENV) - -/// Declare a ACE_ENV_TYPE argument with the default value obtained from -/// the ORB/application. -/** - * It is similar to ACE_ENV_ARG_DECL. The name of the default environment - * getter method needs to be changed when switching ORBs or when used with - * another application. - */ -#define ACE_ENV_ARG_DECL_WITH_DEFAULTS \ - ACE_ENV_EMIT_CODE2(ACE_ENV_EMIT_DUMMY, \ - ACE_ENV_TYPE &ACE_TRY_ENV = \ - ACE_DEFAULT_GET_ENV_METHOD ()) - -/// Declare a ACE_ENV_TYPE argument that is not used by the -/// function definition. -/** - * Similar to ACE_ENV_ARG_DECL, but the formal parameter name is dropped to - * avoid warnings about unused parameters - */ -#define ACE_ENV_ARG_DECL_NOT_USED \ - ACE_ENV_EMIT_CODE2(ACE_ENV_EMIT_DUMMY, \ - ACE_ENV_TYPE &) - -/// Declare a ACE_ENV_TYPE argument for methods that do not take any other -/// parameters -#define ACE_ENV_SINGLE_ARG_DECL \ - ACE_ENV_EMIT_CODE(ACE_ENV_TYPE &ACE_TRY_ENV) - -/// Declare a ACE_ENV_TYPE argument with a default value for methods that -/// do not take any other parameters. The name of the default environment -/// getter method needs to be changed when switching ORBs or when used in -/// another application. -#define ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \ - ACE_ENV_EMIT_CODE(ACE_ENV_TYPE &ACE_TRY_ENV = \ - ACE_DEFAULT_GET_ENV_METHOD ()) - -/// Declare a ACE_ENV_TYPE argument for methods which don't use it. -#define ACE_ENV_SINGLE_ARG_DECL_NOT_USED \ - ACE_ENV_EMIT_CODE(ACE_ENV_TYPE &) - -/// Use the ACE_ENV_TYPE argument in a nested call -#define ACE_ENV_ARG_PARAMETER \ - ACE_ENV_EMIT_CODE2(ACE_ENV_EMIT_DUMMY, \ - ACE_TRY_ENV) - -/// Use the ACE_ENV_TYPE argument in a nested call, assuming that the -/// called function takes only the ACE_TRY_ENV argument. -#define ACE_ENV_SINGLE_ARG_PARAMETER \ - ACE_ENV_EMIT_CODE(ACE_TRY_ENV) - -/// Eliminate unused argument warnings about ACE_TRY_ENV -#define ACE_ENV_ARG_NOT_USED \ - ACE_ENV_EMIT_CODE(ACE_UNUSED_ARG(ACE_TRY_ENV)) -//@} - -#if !defined (ACE_USES_NATIVE_EXCEPTIONS) -// This thing can be moved above when we drop ACE_ENV_BKWD_COMPAT. -# define ACE_ENV_RAISE(ex) ACE_TRY_ENV.exception (ex) -#else -# define ACE_ENV_RAISE(ex) (ex)->_raise () -#endif /* ACE_USES_NATIVE_EXCEPTIONS */ - -// ============================================================ - -// Print out a TAO exception. This is not CORBA compliant. -# define ACE_PRINT_TAO_EXCEPTION(EX,INFO) \ - EX._tao_print_exception (INFO) - -// Print out a CORBA exception. There is not portable way to -// dump a CORBA exception. If you are using other ORB implementation, -// redefine the macro to get what you want. -# if !defined ACE_PRINT_EXCEPTION -# define ACE_PRINT_EXCEPTION(EX,INFO) ACE_PRINT_TAO_EXCEPTION(EX,INFO) -# endif /* ACE_PRINT_EXCEPTION */ - -#endif /* !ACE_LACKS_DEPRECATED_MACROS */ - #include /**/ "ace/post.h" #endif /* ACE_CORBA_MACROS_H */ diff --git a/dep/ACE_wrappers/ace/Cached_Connect_Strategy_T.cpp b/dep/ACE_wrappers/ace/Cached_Connect_Strategy_T.cpp index 1f9ad0abd..077c6d6a9 100644 --- a/dep/ACE_wrappers/ace/Cached_Connect_Strategy_T.cpp +++ b/dep/ACE_wrappers/ace/Cached_Connect_Strategy_T.cpp @@ -1,4 +1,4 @@ -//$Id: Cached_Connect_Strategy_T.cpp 80826 2008-03-04 14:51:23Z wotte $ +//$Id: Cached_Connect_Strategy_T.cpp 82771 2008-09-17 18:47:48Z johnnyw $ #ifndef ACE_CACHED_CONNECT_STRATEGY_T_CPP #define ACE_CACHED_CONNECT_STRATEGY_T_CPP @@ -51,7 +51,7 @@ ACE_Cached_Connect_Strategy_Ex::check_hint_i const ACE_PEER_CONNECTOR_ADDR &remote_addr, ACE_Time_Value *timeout, const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, + bool reuse_addr, int flags, int perms, ACE_Hash_Map_Entry, ACE_Pair > *&entry, @@ -141,7 +141,7 @@ ACE_Cached_Connect_Strategy_Ex::find_or_create_svc_handler_i const ACE_PEER_CONNECTOR_ADDR &remote_addr, ACE_Time_Value *timeout, const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, + bool reuse_addr, int flags, int perms, ACE_Hash_Map_Entry, ACE_Pair > *&entry, @@ -256,7 +256,7 @@ ACE_Cached_Connect_Strategy_Ex::cached_connect (SVC_HANDLER *&sh, const ACE_PEER_CONNECTOR_ADDR &remote_addr, ACE_Time_Value *timeout, const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, + bool reuse_addr, int flags, int perms) { @@ -319,7 +319,7 @@ ACE_Cached_Connect_Strategy_Ex::connect_svc_handler_i const ACE_PEER_CONNECTOR_ADDR &remote_addr, ACE_Time_Value *timeout, const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, + bool reuse_addr, int flags, int perms, int& found) @@ -587,7 +587,7 @@ ACE_Bounded_Cached_Connect_Strategy::find_or_create_svc_handler_i const ACE_PEER_CONNECTOR_ADDR &remote_addr, ACE_Time_Value *timeout, const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, + bool reuse_addr, int flags, int perms, ACE_Hash_Map_Entry, diff --git a/dep/ACE_wrappers/ace/Cached_Connect_Strategy_T.h b/dep/ACE_wrappers/ace/Cached_Connect_Strategy_T.h index 15517ddc3..e95218f60 100644 --- a/dep/ACE_wrappers/ace/Cached_Connect_Strategy_T.h +++ b/dep/ACE_wrappers/ace/Cached_Connect_Strategy_T.h @@ -4,7 +4,7 @@ /** * @file Cached_Connect_Strategy_T.h * - * $Id: Cached_Connect_Strategy_T.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Cached_Connect_Strategy_T.h 91077 2010-07-13 14:33:08Z johnnyw $ * * @author Kirthika Parameswaran */ @@ -116,12 +116,12 @@ protected: /// Add to cache (non-locking version). virtual int cache_i (const void *recycling_act); - /// Get/Set (non-locking version). + /// Get/Set recycle_state (non-locking version). virtual int recycle_state_i (const void *recycling_act, ACE_Recyclable_State new_state); virtual ACE_Recyclable_State recycle_state_i (const void *recycling_act) const; - /// Cleanup hint and reset <*act_holder> to zero if . + /// Cleanup hint and reset @c *act_holder to zero if @a act_holder != 0. virtual int cleanup_hint_i (const void *recycling_act, void **act_holder); @@ -130,7 +130,7 @@ protected: const ACE_PEER_CONNECTOR_ADDR &remote_addr, ACE_Time_Value *timeout, const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, + bool reuse_addr, int flags, int perms, ACE_Hash_Map_Entry, ACE_Pair > *&entry, @@ -140,7 +140,7 @@ protected: const ACE_PEER_CONNECTOR_ADDR &remote_addr, ACE_Time_Value *timeout, const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, + bool reuse_addr, int flags, int perms, ACE_Hash_Map_Entry, ACE_Pair > *&entry, @@ -150,7 +150,7 @@ protected: const ACE_PEER_CONNECTOR_ADDR &remote_addr, ACE_Time_Value *timeout, const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, + bool reuse_addr, int flags, int perms, int &found); @@ -168,7 +168,7 @@ protected: const ACE_PEER_CONNECTOR_ADDR &remote_addr, ACE_Time_Value *timeout, const ACE_PEER_CONNECTOR_ADDR &local_addr, - int reuse_addr, + bool reuse_addr, int flags, int perms); @@ -184,19 +184,20 @@ protected: /** * @class ACE_Bounded_Cached_Connect_Strategy * - * @brief A connection strategy which caches connections to peers - * (represented by SVC_HANDLER instances), thereby allowing - * subsequent re-use of unused, but available, connections. - * This strategy should be used when the cache is bounded by - * maximum size. + * @brief + * A connection strategy which caches connections to peers + * (represented by SVC_HANDLER instances), thereby allowing + * subsequent re-use of unused, but available, connections. + * This strategy should be used when the cache is bounded by + * maximum size. * - * is intended to be used as a - * plug-in connection strategy for ACE_Strategy_Connector. - * It's added value is re-use of established connections and - * tweaking the role of the cache as per the caching strategy. - * Thanks to Edan Ayal for contributing this - * class and Susan Liebeskind for - * brainstorming about it. + * Bounded_Cached_Connect_Strategy is intended to be used as a + * plug-in connection strategy for ACE_Strategy_Connector. + * It's added value is re-use of established connections and + * tweaking the role of the cache as per the caching strategy. + * Thanks to Edan Ayal for contributing this + * class and Susan Liebeskind for + * brainstorming about it. */ template , @@ -244,7 +245,7 @@ protected: protected: - /// max items in the cache, used as a bound for the creation of svc_handlers. + /// Max items in the cache, used as a bound for the creation of svc_handlers. size_t max_size_; }; diff --git a/dep/ACE_wrappers/ace/Capabilities.cpp b/dep/ACE_wrappers/ace/Capabilities.cpp index 5d46e7547..7533f15f0 100644 --- a/dep/ACE_wrappers/ace/Capabilities.cpp +++ b/dep/ACE_wrappers/ace/Capabilities.cpp @@ -1,3 +1,5 @@ +// $Id: Capabilities.cpp 91287 2010-08-05 10:30:49Z johnnyw $ + #include "ace/Capabilities.h" #include "ace/OS_NS_ctype.h" #include "ace/OS_Memory.h" @@ -9,11 +11,6 @@ #include "ace/OS_NS_stdio.h" -ACE_RCSID (ace, - Capabilities, - "$Id: Capabilities.cpp 80826 2008-03-04 14:51:23Z wotte $") - - #define ACE_ESC ((ACE_TCHAR)0x1b) ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/Capabilities.h b/dep/ACE_wrappers/ace/Capabilities.h index e893d987c..f4c8b5cc6 100644 --- a/dep/ACE_wrappers/ace/Capabilities.h +++ b/dep/ACE_wrappers/ace/Capabilities.h @@ -4,7 +4,7 @@ /** * @file Capabilities.h * - * $Id: Capabilities.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Capabilities.h 91077 2010-07-13 14:33:08Z johnnyw $ * * @author Arturo Montes */ @@ -124,16 +124,17 @@ protected: /** * @class ACE_Capabilities * - * @brief This class implement the ACE Capabilities. + * @brief + * This class implement the ACE Capabilities. * * This is a container class for ACE Capabilities * values. Currently exist three different capability values: - * (integer), (bool) and - * (String). An ACE_Capabilities is a - * unordered set of pair = (, *). Where + * ACE_IntCapEntry (integer), ACE_BoolCapEntry (bool) and + * ACE_StringCapEntry (String). An ACE_Capabilities is a + * unordered set of pair = (String, ACE_CapEntry *). Where * the first component is the name of capability and the second * component is a pointer to the capability value container. A - * is a container for ACE_Capabilities, the + * FILE is a container for ACE_Capabilities, the * ACE_Capabilities has a name in the file, as a termcap file. */ class ACE_Export ACE_Capabilities @@ -188,7 +189,6 @@ private: /// This is the set of ACE_CapEntry. CAPABILITIES_MAP caps_; - }; #if defined (ACE_IS_SPLITTING) diff --git a/dep/ACE_wrappers/ace/Cleanup.cpp b/dep/ACE_wrappers/ace/Cleanup.cpp index 752ffb40b..1d5fe99f0 100644 --- a/dep/ACE_wrappers/ace/Cleanup.cpp +++ b/dep/ACE_wrappers/ace/Cleanup.cpp @@ -1,16 +1,14 @@ -// $Id: Cleanup.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Cleanup.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $ #include "ace/Cleanup.h" -ACE_RCSID (ace, - Cleanup, - "$Id: Cleanup.cpp 80826 2008-03-04 14:51:23Z wotte $") - #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/Cleanup.inl" #endif /* ACE_HAS_INLINED_OSCALLS */ #include "ace/OS_Memory.h" +#include "ace/OS_NS_string.h" +#include "ace/os_include/os_typeinfo.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -20,7 +18,6 @@ ACE_Cleanup::cleanup (void *) delete this; } - ACE_Cleanup::~ACE_Cleanup (void) { } @@ -35,15 +32,33 @@ ACE_CLEANUP_DESTROYER_NAME (ACE_Cleanup *object, void *param) /*****************************************************************************/ -ACE_Cleanup_Info::ACE_Cleanup_Info (void) +ACE_Cleanup_Info_Node::ACE_Cleanup_Info_Node (void) : object_ (0), cleanup_hook_ (0), - param_ (0) + param_ (0), + name_ (0) { } +ACE_Cleanup_Info_Node::ACE_Cleanup_Info_Node (void *object, + ACE_CLEANUP_FUNC cleanup_hook, + void *param, + const char *name) + : object_ (object), + cleanup_hook_ (cleanup_hook), + param_ (param), + name_ (name ? ACE_OS::strdup (name) : 0) +{ +} + +ACE_Cleanup_Info_Node::~ACE_Cleanup_Info_Node (void) +{ + if (this->name_) + ACE_OS::free ((void *) name_); +} + bool -ACE_Cleanup_Info::operator== (const ACE_Cleanup_Info &o) const +ACE_Cleanup_Info_Node::operator== (const ACE_Cleanup_Info_Node &o) const { return o.object_ == this->object_ && o.cleanup_hook_ == this->cleanup_hook_ @@ -51,141 +66,111 @@ ACE_Cleanup_Info::operator== (const ACE_Cleanup_Info &o) const } bool -ACE_Cleanup_Info::operator!= (const ACE_Cleanup_Info &o) const +ACE_Cleanup_Info_Node::operator!= (const ACE_Cleanup_Info_Node &o) const { return !(*this == o); } -/*****************************************************************************/ - -/** - * @class ACE_Cleanup_Info_Node - * - * @brief For maintaining a list of ACE_Cleanup_Info items. - * - * For internal use by ACE_Object_Manager. - */ -class ACE_Cleanup_Info_Node -{ -public: - ACE_Cleanup_Info_Node (void); - ACE_Cleanup_Info_Node (const ACE_Cleanup_Info &new_info, - ACE_Cleanup_Info_Node *next); - ~ACE_Cleanup_Info_Node (void); - ACE_Cleanup_Info_Node *insert (const ACE_Cleanup_Info &); -private: - ACE_Cleanup_Info cleanup_info_; - ACE_Cleanup_Info_Node *next_; - - friend class ACE_OS_Exit_Info; -}; - -ACE_Cleanup_Info_Node::ACE_Cleanup_Info_Node (void) - : cleanup_info_ (), - next_ (0) -{ -} - -ACE_Cleanup_Info_Node::ACE_Cleanup_Info_Node (const ACE_Cleanup_Info &new_info, - ACE_Cleanup_Info_Node *next) - : cleanup_info_ (new_info), - next_ (next) -{ -} - -ACE_Cleanup_Info_Node::~ACE_Cleanup_Info_Node (void) -{ - delete next_; -} - -ACE_Cleanup_Info_Node * -ACE_Cleanup_Info_Node::insert (const ACE_Cleanup_Info &new_info) -{ - ACE_Cleanup_Info_Node *new_node = 0; - - ACE_NEW_RETURN (new_node, - ACE_Cleanup_Info_Node (new_info, this), - 0); - - return new_node; -} /*****************************************************************************/ ACE_OS_Exit_Info::ACE_OS_Exit_Info (void) { - ACE_NEW (registered_objects_, ACE_Cleanup_Info_Node); } ACE_OS_Exit_Info::~ACE_OS_Exit_Info (void) { - delete registered_objects_; - registered_objects_ = 0; } int ACE_OS_Exit_Info::at_exit_i (void *object, ACE_CLEANUP_FUNC cleanup_hook, - void *param) + void *param, + const char* name) { - ACE_Cleanup_Info new_info; - new_info.object_ = object; - new_info.cleanup_hook_ = cleanup_hook; - new_info.param_ = param; - // Return -1 and sets errno if unable to allocate storage. Enqueue // at the head and dequeue from the head to get LIFO ordering. - ACE_Cleanup_Info_Node *new_node = 0; - if ((new_node = registered_objects_->insert (new_info)) == 0) - return -1; - else - { - registered_objects_ = new_node; - return 0; - } -} + ACE_NEW_RETURN (new_node, + ACE_Cleanup_Info_Node (object, cleanup_hook, param, name), + -1); -int -ACE_OS_Exit_Info::find (void *object) -{ - // Check for already in queue, and return 1 if so. - for (ACE_Cleanup_Info_Node *iter = registered_objects_; - iter && iter->next_ != 0; - iter = iter->next_) - { - if (iter->cleanup_info_.object_ == object) - { - // The object has already been registered. - return 1; - } - } + registered_objects_.push_front (new_node); return 0; } +bool +ACE_OS_Exit_Info::find (void *object) +{ + for (ACE_Cleanup_Info_Node *iter = registered_objects_.head (); + iter != 0; + iter = iter->next ()) + { + if (iter->object () == object) + { + // The object has already been registered. + return true; + } + } + + return false; +} + +bool +ACE_OS_Exit_Info::remove (void *object) +{ + ACE_Cleanup_Info_Node *node = 0; + for (ACE_Cleanup_Info_Node *iter = registered_objects_.head (); + iter != 0; + iter = iter->next ()) + { + if (iter->object () == object) + { + node = iter; + break; + } + } + + if (node) + { + registered_objects_.remove (node); + delete node; + return true; + } + + return false; +} + + void ACE_OS_Exit_Info::call_hooks (void) { // Call all registered cleanup hooks, in reverse order of // registration. - for (ACE_Cleanup_Info_Node *iter = registered_objects_; - iter && iter->next_ != 0; - iter = iter->next_) + for (ACE_Cleanup_Info_Node *iter = registered_objects_.pop_front (); + iter != 0; + iter = registered_objects_.pop_front ()) { - ACE_Cleanup_Info &info = iter->cleanup_info_; - if (info.cleanup_hook_ == reinterpret_cast ( + if (iter->cleanup_hook () == reinterpret_cast ( ACE_CLEANUP_DESTROYER_NAME)) - // The object is an ACE_Cleanup. - ACE_CLEANUP_DESTROYER_NAME ( - reinterpret_cast (info.object_), - info.param_); - else if (info.object_ == &ace_exit_hook_marker) - // The hook is an ACE_EXIT_HOOK. - (* reinterpret_cast (info.cleanup_hook_)) (); + { + // The object is an ACE_Cleanup. + ACE_CLEANUP_DESTROYER_NAME ( + reinterpret_cast (iter->object ()), + iter->param ()); + } + else if (iter->object () == &ace_exit_hook_marker) + { + // The hook is an ACE_EXIT_HOOK. + (* reinterpret_cast (iter->cleanup_hook ())) (); + } else - (*info.cleanup_hook_) (info.object_, info.param_); + { + (*iter->cleanup_hook ()) (iter->object (), iter->param ()); + } + delete iter; } } diff --git a/dep/ACE_wrappers/ace/Cleanup.h b/dep/ACE_wrappers/ace/Cleanup.h index 8ea036058..bd750724f 100644 --- a/dep/ACE_wrappers/ace/Cleanup.h +++ b/dep/ACE_wrappers/ace/Cleanup.h @@ -4,7 +4,7 @@ /** * @file Cleanup.h * - * $Id: Cleanup.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Cleanup.h 84163 2009-01-15 07:57:27Z johnnyw $ * * @author Douglas C. Schmidt * @author Jesper S. M|ller @@ -27,6 +27,9 @@ #include /**/ "ace/ACE_export.h" +# include "ace/Intrusive_List.h" +# include "ace/Intrusive_List_Node.h" + #if (defined (ACE_HAS_VERSIONED_NAMESPACE) && ACE_HAS_VERSIONED_NAMESPACE == 1) # include "ace/Global_Macros.h" # define ACE_CLEANUP_DESTROYER_NAME ACE_PREPROC_CONCATENATE(ACE_VERSIONED_NAMESPACE_NAME, _ace_cleanup_destroyer) @@ -54,27 +57,39 @@ public: virtual void cleanup (void *param = 0); }; -// Adapter for cleanup, used by ACE_Object_Manager. +/// Adapter for cleanup, used by ACE_Object_Manager. extern "C" ACE_Export void ACE_CLEANUP_DESTROYER_NAME (ACE_Cleanup *, void *param = 0); /** - * @class ACE_Cleanup_Info + * @class ACE_Cleanup_Info_Node * - * @brief Hold cleanup information for thread/process + * @brief For maintaining a list of ACE_Cleanup_Info items. + * + * For internal use by ACE_Object_Manager. */ -class ACE_Export ACE_Cleanup_Info +class ACE_Cleanup_Info_Node : public ACE_Intrusive_List_Node { public: - /// Default constructor. - ACE_Cleanup_Info (void); + ACE_Cleanup_Info_Node (void); + ACE_Cleanup_Info_Node (void *object, + ACE_CLEANUP_FUNC cleanup_hook, + void *param, + const char *name); + ~ACE_Cleanup_Info_Node (void); /// Equality operator. - bool operator== (const ACE_Cleanup_Info &o) const; + bool operator== (const ACE_Cleanup_Info_Node &o) const; /// Inequality operator. - bool operator!= (const ACE_Cleanup_Info &o) const; + bool operator!= (const ACE_Cleanup_Info_Node &o) const; + void* object(void); + + ACE_CLEANUP_FUNC cleanup_hook (void); + + void *param (void); +private: /// Point to object that gets passed into the . void *object_; @@ -83,15 +98,20 @@ public: /// Parameter passed to the . void *param_; + + /// Name of the cleanup object + const char *name_; }; -class ACE_Cleanup_Info_Node; +typedef ACE_Intrusive_List ACE_Cleanup_Info_Node_List; /** * @class ACE_OS_Exit_Info * * @brief Hold Object Manager cleanup (exit) information. * + * @internal + * * For internal use by the ACE library, only. */ class ACE_Export ACE_OS_Exit_Info @@ -104,11 +124,15 @@ public: ~ACE_OS_Exit_Info (void); /// Use to register a cleanup hook. - int at_exit_i (void *object, ACE_CLEANUP_FUNC cleanup_hook, void *param); + int at_exit_i (void *object, ACE_CLEANUP_FUNC cleanup_hook, void *param, const char* name = 0); - /// Look for a registered cleanup hook object. Returns 1 if already - /// registered, 0 if not. - int find (void *object); + /// Look for a registered cleanup hook object. Returns true if already + /// registered, false if not. + bool find (void *object); + + /// Remove a registered cleanup hook object. Returns true if removed + /// false if not. + bool remove (void *object); /// Call all registered cleanup hooks, in reverse order of /// registration. @@ -116,13 +140,12 @@ public: private: /** - * Keeps track of all registered objects. The last node is only - * used to terminate the list (it doesn't contain a valid - * ACE_Cleanup_Info). + * Keeps track of all registered objects. */ - ACE_Cleanup_Info_Node *registered_objects_; + ACE_Cleanup_Info_Node_List registered_objects_; }; + ACE_END_VERSIONED_NAMESPACE_DECL # if defined (ACE_HAS_INLINED_OSCALLS) diff --git a/dep/ACE_wrappers/ace/Cleanup.inl b/dep/ACE_wrappers/ace/Cleanup.inl index 9c36d6b1f..196a9f478 100644 --- a/dep/ACE_wrappers/ace/Cleanup.inl +++ b/dep/ACE_wrappers/ace/Cleanup.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: Cleanup.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Cleanup.inl 83956 2008-12-03 07:57:38Z johnnyw $ ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -9,4 +9,22 @@ ACE_Cleanup::ACE_Cleanup (void) { } +ACE_INLINE void* +ACE_Cleanup_Info_Node::object(void) +{ + return this->object_; +} + +ACE_INLINE ACE_CLEANUP_FUNC +ACE_Cleanup_Info_Node::cleanup_hook (void) +{ + return this->cleanup_hook_; +} + +ACE_INLINE void * +ACE_Cleanup_Info_Node::param (void) +{ + return this->param_; +} + ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/Codecs.cpp b/dep/ACE_wrappers/ace/Codecs.cpp index 71491fe1c..d205ab826 100644 --- a/dep/ACE_wrappers/ace/Codecs.cpp +++ b/dep/ACE_wrappers/ace/Codecs.cpp @@ -1,12 +1,10 @@ +// $Id: Codecs.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $ + #include "ace/Codecs.h" #include "ace/Log_Msg.h" #include "ace/OS_Memory.h" #include "ace/OS_NS_ctype.h" -ACE_RCSID (ace, - Codecs, - "$Id: Codecs.cpp 80826 2008-03-04 14:51:23Z wotte $") - namespace { // Just in case ... diff --git a/dep/ACE_wrappers/ace/Codeset_IBM1047.cpp b/dep/ACE_wrappers/ace/Codeset_IBM1047.cpp index 91582cf4e..3f5bad0b7 100644 --- a/dep/ACE_wrappers/ace/Codeset_IBM1047.cpp +++ b/dep/ACE_wrappers/ace/Codeset_IBM1047.cpp @@ -3,7 +3,7 @@ /** * @file Codeset_IBM1047.cpp * - * $Id: Codeset_IBM1047.cpp 81661 2008-05-09 12:05:34Z johnnyw $ + * $Id: Codeset_IBM1047.cpp 91286 2010-08-05 09:04:31Z johnnyw $ * * Defines the arrays required to convert between ISO8859 (aka * Latin/1) and IBM1047 (aka EBCDIC). @@ -18,10 +18,6 @@ #if defined (ACE_HAS_EBCDIC) -ACE_RCSID (ace, - Codeset_IBM1047, - "$Id: Codeset_IBM1047.cpp 81661 2008-05-09 12:05:34Z johnnyw $") - #include "ace/OS_Memory.h" #include "ace/OS_NS_string.h" diff --git a/dep/ACE_wrappers/ace/Codeset_Registry.cpp b/dep/ACE_wrappers/ace/Codeset_Registry.cpp index c23ef3723..6c132a880 100644 --- a/dep/ACE_wrappers/ace/Codeset_Registry.cpp +++ b/dep/ACE_wrappers/ace/Codeset_Registry.cpp @@ -2,7 +2,7 @@ /** * @file Codeset_Registry.cpp * - * $Id: Codeset_Registry.cpp 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Codeset_Registry.cpp 91286 2010-08-05 09:04:31Z johnnyw $ * * emulated codset regstry functions * @@ -15,16 +15,12 @@ #include "ace/OS_Memory.h" #include "ace/OS_NS_string.h" -// $Id: Codeset_Registry.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Codeset_Registry.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #if !defined (__ACE_INLINE__) #include "ace/Codeset_Registry.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (ace, - Codeset_Registry, - "$Id: Codeset_Registry.cpp 80826 2008-03-04 14:51:23Z wotte $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL int diff --git a/dep/ACE_wrappers/ace/Condition_Recursive_Thread_Mutex.cpp b/dep/ACE_wrappers/ace/Condition_Recursive_Thread_Mutex.cpp index 2a12b132f..1f357589f 100644 --- a/dep/ACE_wrappers/ace/Condition_Recursive_Thread_Mutex.cpp +++ b/dep/ACE_wrappers/ace/Condition_Recursive_Thread_Mutex.cpp @@ -3,7 +3,7 @@ /** * @file Condition_Recursive_Thread_Mutex.cpp * - * $Id: Condition_Recursive_Thread_Mutex.cpp 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Condition_Recursive_Thread_Mutex.cpp 89127 2010-02-22 19:58:18Z schmidt $ * * Originally in Synch.cpp * @@ -63,7 +63,7 @@ ACE_Condition::wait (ACE_Recursive_Thread_Mutex &mut const ACE_Time_Value *abstime) { ACE_recursive_mutex_state mutex_state_holder; - ACE_recursive_thread_mutex_t &recursive_mutex = mutex.mutex (); + ACE_recursive_thread_mutex_t &recursive_mutex = mutex.lock (); if (ACE_OS::recursive_mutex_cond_unlock (&recursive_mutex, mutex_state_holder) == -1) @@ -78,7 +78,7 @@ ACE_Condition::wait (ACE_Recursive_Thread_Mutex &mut // returned with the lock held, but waiters primed and waiting to be // released. At cond_wait below, the mutex will be released. // On return, it will be reacquired. - const int result = abstime == 0 + int const result = abstime == 0 ? ACE_OS::cond_wait (&this->cond_, &mutex.get_nesting_mutex ()) : ACE_OS::cond_timedwait (&this->cond_, diff --git a/dep/ACE_wrappers/ace/Condition_Recursive_Thread_Mutex.h b/dep/ACE_wrappers/ace/Condition_Recursive_Thread_Mutex.h index f3c4b5257..ac3177da8 100644 --- a/dep/ACE_wrappers/ace/Condition_Recursive_Thread_Mutex.h +++ b/dep/ACE_wrappers/ace/Condition_Recursive_Thread_Mutex.h @@ -4,7 +4,7 @@ /** * @file Condition_Recursive_Thread_Mutex.h * - * $Id: Condition_Recursive_Thread_Mutex.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Condition_Recursive_Thread_Mutex.h 86731 2009-09-17 12:23:48Z johnnyw $ * * Moved from Synch.h. * @@ -32,8 +32,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL template class ACE_Condition; /** - * @class ACE_Condition - * * @brief ACE_Condition template specialization written using * @a ACE_Recursive_Thread_Mutex. This allows threads to block until * shared data changes state using recursive mutexes. @@ -57,7 +55,7 @@ public: /** * Block on condition, or until absolute time-of-day has passed. If - * abstime == 0 use "blocking" semantics. Else, if + * abstime == 0 use "blocking" semantics. Else, if @a abstime * != 0 and the call times out before the condition is signaled * returns -1 and sets errno to ETIME. */ diff --git a/dep/ACE_wrappers/ace/Condition_T.cpp b/dep/ACE_wrappers/ace/Condition_T.cpp index a2ebff153..ae75d9ff3 100644 --- a/dep/ACE_wrappers/ace/Condition_T.cpp +++ b/dep/ACE_wrappers/ace/Condition_T.cpp @@ -1,4 +1,4 @@ -// $Id: Condition_T.cpp 81283 2008-04-09 01:28:18Z schmidt $ +// $Id: Condition_T.cpp 89127 2010-02-22 19:58:18Z schmidt $ #ifndef ACE_CONDITION_T_CPP #define ACE_CONDITION_T_CPP @@ -87,7 +87,7 @@ ACE_Condition::wait (void) { // ACE_TRACE ("ACE_Condition::wait"); return ACE_OS::cond_wait (&this->cond_, - &this->mutex_.lock_); + &this->mutex_.lock ()); } template int @@ -96,12 +96,17 @@ ACE_Condition::wait (MUTEX &mutex, { // ACE_TRACE ("ACE_Condition::wait"); if (abstime == 0) + { return ACE_OS::cond_wait (&this->cond_, - &mutex.lock_); + &mutex.lock ()); + } else - return ACE_OS::cond_timedwait (&this->cond_, - &mutex.lock_, - (ACE_Time_Value *) abstime); + { + ACE_Time_Value tv = *abstime; + return ACE_OS::cond_timedwait (&this->cond_, + &mutex.lock (), + &tv); + } } // Peform an "alertable" timed wait. If the argument ABSTIME == 0 diff --git a/dep/ACE_wrappers/ace/Condition_Thread_Mutex.cpp b/dep/ACE_wrappers/ace/Condition_Thread_Mutex.cpp index c9f2620e4..88e99702d 100644 --- a/dep/ACE_wrappers/ace/Condition_Thread_Mutex.cpp +++ b/dep/ACE_wrappers/ace/Condition_Thread_Mutex.cpp @@ -2,7 +2,7 @@ /** * @file Condition_Thread_Mutex.cpp * - * $Id: Condition_Thread_Mutex.cpp 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Condition_Thread_Mutex.cpp 91286 2010-08-05 09:04:31Z johnnyw $ * * Originally in Synch.cpp * @@ -19,7 +19,7 @@ #include "ace/Log_Msg.h" -ACE_RCSID(ace, Condition_Thread_Mutex, "$Id: Condition_Thread_Mutex.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/Configuration.cpp b/dep/ACE_wrappers/ace/Configuration.cpp index 734482f0e..1914f2dc6 100644 --- a/dep/ACE_wrappers/ace/Configuration.cpp +++ b/dep/ACE_wrappers/ace/Configuration.cpp @@ -1,9 +1,10 @@ -// $Id: Configuration.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Configuration.cpp 86348 2009-08-04 14:45:29Z shuston $ #include "ace/Configuration.h" #include "ace/Auto_Ptr.h" #include "ace/SString.h" #include "ace/OS_NS_string.h" #include "ace/OS_NS_strings.h" +#include "ace/Tokenizer_T.h" // Can remove this when import_config and export_config are removed from // ACE_Configuration. They're deprecated at ACE 5.2. @@ -518,11 +519,7 @@ ACE_Configuration_Win32Registry::open_section (const ACE_Configuration_Section_K KEY_ALL_ACCESS, 0, &result_key, -#if defined (__MINGW32__) (PDWORD) 0 -#else - 0 -#endif /* __MINGW32__ */ )) != ERROR_SUCCESS) { errno = errnum; @@ -540,7 +537,7 @@ ACE_Configuration_Win32Registry::open_section (const ACE_Configuration_Section_K int ACE_Configuration_Win32Registry::remove_section (const ACE_Configuration_Section_Key& key, const ACE_TCHAR* sub_section, - int recursive) + bool recursive) { if (validate_name (sub_section)) return -1; @@ -574,13 +571,12 @@ ACE_Configuration_Win32Registry::remove_section (const ACE_Configuration_Section 0, 0) == ERROR_SUCCESS) { - remove_section (section, name_buffer, 1); + remove_section (section, name_buffer, true); buffer_size = ACE_DEFAULT_BUFSIZE; } } - int errnum; - errnum = ACE_TEXT_RegDeleteKey (base_key, sub_section); + int const errnum = ACE_TEXT_RegDeleteKey (base_key, sub_section); if (errnum != ERROR_SUCCESS) { errno = errnum; @@ -1049,11 +1045,7 @@ ACE_Configuration_Win32Registry::resolve_key (HKEY hKey, KEY_ALL_ACCESS, 0, &subkey, -#if defined (__MINGW32__) (PDWORD) 0 -#else - 0 -#endif /* __MINGW32__ */ )) !=ERROR_SUCCESS) { errno = errnum; @@ -1267,6 +1259,12 @@ ACE_Configuration_Heap::~ACE_Configuration_Heap (void) int ACE_Configuration_Heap::open (size_t default_map_size) { + if (this->allocator_ != 0) + { + errno = EBUSY; + return -1; + } + default_map_size_ = default_map_size; // Create the allocator with the appropriate options. // The name used for the lock is the same as one used @@ -1283,6 +1281,12 @@ ACE_Configuration_Heap::open (const ACE_TCHAR* file_name, void* base_address, size_t default_map_size) { + if (this->allocator_ != 0) + { + errno = EBUSY; + return -1; + } + default_map_size_ = default_map_size; // Make sure that the file name is of the legal length. @@ -1595,7 +1599,7 @@ ACE_Configuration_Heap::open_simple_section (const ACE_Configuration_Section_Key int ACE_Configuration_Heap::remove_section (const ACE_Configuration_Section_Key& key, const ACE_TCHAR* sub_section, - int recursive) + bool recursive) { ACE_ASSERT (this->allocator_); if (validate_name (sub_section)) @@ -1617,7 +1621,7 @@ ACE_Configuration_Heap::remove_section (const ACE_Configuration_Section_Key& key section += sub_section; ACE_Configuration_ExtId SectionExtId (section.fast_rep ()); - SECTION_HASH::ENTRY* section_entry; + SECTION_HASH::ENTRY* section_entry = 0; SECTION_HASH* hashmap = index_; if (hashmap->find (SectionExtId, section_entry)) return -1; @@ -1632,7 +1636,7 @@ ACE_Configuration_Heap::remove_section (const ACE_Configuration_Section_Key& key ACE_TString name; while (!enumerate_sections (section, index, name)) { - if (remove_section (section, name.fast_rep (), 1)) + if (remove_section (section, name.fast_rep (), true)) return -1; ++index; @@ -1801,7 +1805,7 @@ ACE_Configuration_Heap::set_string_value (const ACE_Configuration_Section_Key& k return -1; // Get the entry for this item (if it exists) - VALUE_HASH::ENTRY* entry; + VALUE_HASH::ENTRY* entry = 0; ACE_Configuration_ExtId item_name (t_name); if (section_int.value_hash_map_->VALUE_HASH::find (item_name, entry) == 0) { @@ -1860,7 +1864,7 @@ ACE_Configuration_Heap::set_integer_value (const ACE_Configuration_Section_Key& return -1; // section does not exist // Get the entry for this item (if it exists) - VALUE_HASH::ENTRY* entry; + VALUE_HASH::ENTRY* entry = 0; ACE_Configuration_ExtId item_name (t_name); if (section_int.value_hash_map_->VALUE_HASH::find (item_name, entry) == 0) { @@ -1910,7 +1914,7 @@ ACE_Configuration_Heap::set_binary_value (const ACE_Configuration_Section_Key& k return -1; // section does not exist // Get the entry for this item (if it exists) - VALUE_HASH::ENTRY* entry; + VALUE_HASH::ENTRY* entry = 0; ACE_Configuration_ExtId item_name (t_name); if (section_int.value_hash_map_->VALUE_HASH::find (item_name, entry) == 0) { @@ -2100,7 +2104,7 @@ ACE_Configuration_Heap::find_value (const ACE_Configuration_Section_Key& key, // Find it ACE_Configuration_ExtId ValueExtId (t_name); - VALUE_HASH::ENTRY* value_entry; + VALUE_HASH::ENTRY* value_entry = 0; if (((VALUE_HASH *) IntId.value_hash_map_)->find (ValueExtId, value_entry)) return -1; // value does not exist @@ -2130,7 +2134,7 @@ ACE_Configuration_Heap::remove_value (const ACE_Configuration_Section_Key& key, // Find it ACE_Configuration_ExtId ValueExtId (t_name); - VALUE_HASH::ENTRY* value_entry; + VALUE_HASH::ENTRY* value_entry = 0; if (((VALUE_HASH *) IntId.value_hash_map_)->find (ValueExtId, value_entry)) return -1; diff --git a/dep/ACE_wrappers/ace/Configuration.h b/dep/ACE_wrappers/ace/Configuration.h index a0098c8ec..354361901 100644 --- a/dep/ACE_wrappers/ace/Configuration.h +++ b/dep/ACE_wrappers/ace/Configuration.h @@ -4,7 +4,7 @@ /** * @file Configuration.h * - * $Id: Configuration.h 82294 2008-07-12 13:03:37Z johnnyw $ + * $Id: Configuration.h 86348 2009-08-04 14:45:29Z shuston $ * * @author Chris Hafey * @@ -177,7 +177,7 @@ public: /** * @param key Section key to remove the named section from. * @param sub_section Name of the section to remove. - * @param recursive If non zero, any subkeys below @a sub_section are + * @param recursive If true, any subkeys below @a sub_section are * removed as well. * * @retval 0 for success. @@ -185,7 +185,7 @@ public: */ virtual int remove_section (const ACE_Configuration_Section_Key &key, const ACE_TCHAR *sub_section, - int recursive) = 0; + bool recursive) = 0; /** * Enumerates through the values in a section. @@ -483,7 +483,7 @@ public: virtual int remove_section (const ACE_Configuration_Section_Key& key, const ACE_TCHAR* sub_section, - int recursive); + bool recursive); virtual int enumerate_values (const ACE_Configuration_Section_Key& key, int index, @@ -598,7 +598,7 @@ public: /// allocator name_ was created in void free (ACE_Allocator *alloc); - /// function is required in order for this class to be usable by + /// hash function is required in order for this class to be usable by /// ACE_Hash_Map_Manager. u_long hash (void) const; @@ -791,12 +791,37 @@ public: /// Destructor virtual ~ACE_Configuration_Heap (void); - /// Opens a configuration based on a file name + /** + * Opens a configuration that allocates its memory from a memory-mapped file. + * This makes it possible to persist a configuration to permanent storage. + * This is not the same as exporting the configuration to a file; the + * memory-mapped file is not likely to be very readable by humans. + * + * @param file_name Name of the file to map into memory. + * + * @param base_address Address to map the base of @a file_name to. + * + * @param default_map_size Starting size for the internal hash tables that + * contain configuration information. + * + * @retval 0 for success. + * @retval -1 for error, with errno set to indicate the cause. If open() + * is called multiple times, errno will be @c EBUSY. + */ int open (const ACE_TCHAR* file_name, void* base_address = ACE_DEFAULT_BASE_ADDR, size_t default_map_size = ACE_DEFAULT_CONFIG_SECTION_SIZE); - /// Opens a heap based configuration + /** + * Opens a configuration that allocates memory from the heap. + * + * @param default_map_size Starting size for the internal hash tables that + * contain configuration information. + * + * @retval 0 for success. + * @retval -1 for error, with errno set to indicate the cause. If open() + * is called multiple times, errno will be @c EBUSY. + */ int open (size_t default_map_size = ACE_DEFAULT_CONFIG_SECTION_SIZE); virtual int open_section (const ACE_Configuration_Section_Key& base, @@ -805,7 +830,7 @@ public: virtual int remove_section (const ACE_Configuration_Section_Key& key, const ACE_TCHAR* sub_section, - int recursive); + bool recursive); virtual int enumerate_values (const ACE_Configuration_Section_Key& key, int index, diff --git a/dep/ACE_wrappers/ace/Configuration_Import_Export.cpp b/dep/ACE_wrappers/ace/Configuration_Import_Export.cpp index dbfc306c8..f4d1ec235 100644 --- a/dep/ACE_wrappers/ace/Configuration_Import_Export.cpp +++ b/dep/ACE_wrappers/ace/Configuration_Import_Export.cpp @@ -1,4 +1,4 @@ -// $Id: Configuration_Import_Export.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Configuration_Import_Export.cpp 84565 2009-02-23 08:20:39Z johnnyw $ #include "ace/Configuration_Import_Export.h" #include "ace/OS_Errno.h" @@ -254,7 +254,7 @@ ACE_Registry_ImpExp::export_section (const ACE_Configuration_Section_Key& sectio ACE_TString header = ACE_TEXT ("["); header += path; header += ACE_TEXT ("]"); - header += ACE_TEXT (" \n"); + header += ACE_TEXT ("\n"); if (ACE_OS::fputs (header.fast_rep (), out) < 0) return -1; // Write out each value diff --git a/dep/ACE_wrappers/ace/Connection_Recycling_Strategy.cpp b/dep/ACE_wrappers/ace/Connection_Recycling_Strategy.cpp index 78b088843..cab307de8 100644 --- a/dep/ACE_wrappers/ace/Connection_Recycling_Strategy.cpp +++ b/dep/ACE_wrappers/ace/Connection_Recycling_Strategy.cpp @@ -1,9 +1,7 @@ +// $Id: Connection_Recycling_Strategy.cpp 91287 2010-08-05 10:30:49Z johnnyw $ + #include "ace/Connection_Recycling_Strategy.h" - -ACE_RCSID(ace, Connection_Recycling_Strategy, "$Id: Connection_Recycling_Strategy.cpp 80826 2008-03-04 14:51:23Z wotte $") - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_Connection_Recycling_Strategy::~ACE_Connection_Recycling_Strategy (void) diff --git a/dep/ACE_wrappers/ace/Connector.cpp b/dep/ACE_wrappers/ace/Connector.cpp index 3e68abc09..3a1edfc88 100644 --- a/dep/ACE_wrappers/ace/Connector.cpp +++ b/dep/ACE_wrappers/ace/Connector.cpp @@ -1,4 +1,4 @@ -// $Id: Connector.cpp 81991 2008-06-16 19:05:40Z elliott_c $ +// $Id: Connector.cpp 91527 2010-08-27 15:03:31Z shuston $ #ifndef ACE_CONNECTOR_CPP #define ACE_CONNECTOR_CPP @@ -24,12 +24,33 @@ ACE_NonBlocking_Connect_Handler::ACE_NonBlocking_Connect_Handler long id) : connector_ (connector) , svc_handler_ (sh) + , cleanup_svc_handler_ (0) , timer_id_ (id) { ACE_TRACE ("ACE_NonBlocking_Connect_Handler::ACE_NonBlocking_Connect_Handler"); this->reference_counting_policy ().value (ACE_Event_Handler::Reference_Counting_Policy::ENABLED); + + if (this->svc_handler_ != 0 && + this->svc_handler_->reference_counting_policy ().value () == + ACE_Event_Handler::Reference_Counting_Policy::ENABLED) + { + // If SVC_HANDLER is reference counted then NBCH holds a reference + // in cleanup_svc_handle_ which is both a pointer to SVC_HANDLER + // and a flag that triggers remove_reference in NBCH destructor. + this->cleanup_svc_handler_ = sh; + this->cleanup_svc_handler_->add_reference (); + } +} + +template +ACE_NonBlocking_Connect_Handler::~ACE_NonBlocking_Connect_Handler (void) +{ + if (this->cleanup_svc_handler_) + { + this->cleanup_svc_handler_->remove_reference (); + } } template SVC_HANDLER * @@ -100,9 +121,9 @@ ACE_NonBlocking_Connect_Handler::close (SVC_HANDLER *&sh) return false; // Remove from Reactor. - if (this->reactor ()->remove_handler ( + if (-1 == this->reactor ()->remove_handler ( h, - ACE_Event_Handler::ALL_EVENTS_MASK) == -1) + ACE_Event_Handler::ALL_EVENTS_MASK | ACE_Event_Handler::DONT_CALL)) return false; } @@ -119,7 +140,7 @@ ACE_NonBlocking_Connect_Handler::handle_timeout ACE_TRACE ("ACE_NonBlocking_Connect_Handler::handle_timeout"); SVC_HANDLER *svc_handler = 0; - int retval = this->close (svc_handler) ? 0 : -1; + int const retval = this->close (svc_handler) ? 0 : -1; // Forward to the SVC_HANDLER the that was passed in as a // magic cookie during ACE_Connector::connect(). This gives the @@ -145,11 +166,27 @@ ACE_NonBlocking_Connect_Handler::handle_input (ACE_HANDLE) // Close Svc_Handler. if (svc_handler != 0) - svc_handler->close (NORMAL_CLOSE_OPERATION); + { + svc_handler->close (NORMAL_CLOSE_OPERATION); + } return retval; } +template int +ACE_NonBlocking_Connect_Handler::handle_close (ACE_HANDLE handle, + ACE_Reactor_Mask m) +{ + // epoll on Linux will, at least sometimes, return EPOLLERR when a connect + // fails, triggering a total removal from the reactor. This is different from + // select()-based systems which select the fd for read on a connect failure. + // So just call handle_input() to rejoin common handling for a failed + // connect. + if (m == ACE_Event_Handler::ALL_EVENTS_MASK) + return this->handle_input (handle); + return -1; +} + template int ACE_NonBlocking_Connect_Handler::handle_output (ACE_HANDLE handle) { @@ -162,7 +199,9 @@ ACE_NonBlocking_Connect_Handler::handle_output (ACE_HANDLE handle) int const retval = this->close (svc_handler) ? 0 : -1; if (svc_handler != 0) - connector.initialize_svc_handler (handle, svc_handler); + { + connector.initialize_svc_handler (handle, svc_handler); + } return retval; } @@ -593,7 +632,7 @@ ACE_Connector::initialize_svc_handler { // Try to find out if the reactor uses event associations for the // handles it waits on. If so we need to reset it. - int reset_new_handle = + bool reset_new_handle = this->reactor ()->uses_event_associations (); if (reset_new_handle) diff --git a/dep/ACE_wrappers/ace/Connector.h b/dep/ACE_wrappers/ace/Connector.h index b13fc56c1..320867852 100644 --- a/dep/ACE_wrappers/ace/Connector.h +++ b/dep/ACE_wrappers/ace/Connector.h @@ -4,7 +4,7 @@ /** * @file Connector.h * - * $Id: Connector.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Connector.h 91527 2010-08-27 15:03:31Z shuston $ * * @author Douglas C. Schmidt */ @@ -67,6 +67,9 @@ public: SVC_HANDLER *, long timer_id); + /// Destructor. + ~ACE_NonBlocking_Connect_Handler (void); + /// Close up and return underlying SVC_HANDLER through @c sh. /** * If the return value is true the close was performed succesfully, @@ -99,6 +102,9 @@ public: /// Called by ACE_Reactor when asynchronous connections fail. virtual int handle_input (ACE_HANDLE); + /// Called by ACE_Dev_Poll_Reactor when asynchronous connections fail. + virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask); + /// Called by ACE_Reactor when asynchronous connections succeed. virtual int handle_output (ACE_HANDLE); @@ -127,6 +133,9 @@ private: /// Associated SVC_HANDLER. SVC_HANDLER *svc_handler_; + /// Same as svc_handler_ if svc_handler_ is reference counted. + SVC_HANDLER *cleanup_svc_handler_; + /// Associated timer id. long timer_id_; }; @@ -190,7 +199,7 @@ public: * 1). @a flags and @a perms can be used to pass any flags that are * needed to perform specific operations such as opening a file * within connect with certain permissions. If the connection fails - * the hook on the will be called + * the hook on the @a svc_handler will be called * automatically to prevent resource leaks. */ virtual int connect (SVC_HANDLER *&svc_handler, @@ -209,7 +218,7 @@ public: * context of the internal cache its use is thread-safe. But the * actual svc_handler for the current connection is returned in the * second parameter @a svc_handler. If the connection fails the - * hook on the will be called automatically to + * hook on the @a svc_handler will be called automatically to * prevent resource leaks. */ virtual int connect (SVC_HANDLER *&svc_handler_hint, @@ -418,7 +427,7 @@ public: SUPER; /** - * Initialize a connector. @a flags indicates how 's + * Initialize a connector. @a flags indicates how SVC_HANDLER's * should be initialized prior to being activated. Right now, the * only flag that is processed is ACE_NONBLOCK, which enabled * non-blocking I/O on the SVC_HANDLER when it is opened. @@ -529,21 +538,21 @@ protected: /// Creation strategy for an Connector. CREATION_STRATEGY *creation_strategy_; - /// true if Connector created the creation strategy and thus should + /// True if Connector created the creation strategy and thus should /// delete it, else false. bool delete_creation_strategy_; /// Connect strategy for a Connector. CONNECT_STRATEGY *connect_strategy_; - /// true if Connector created the connect strategy and thus should + /// True if Connector created the connect strategy and thus should /// delete it, else false. bool delete_connect_strategy_; - /// Concurrency strategy for an . + /// Concurrency strategy for a Connector. CONCURRENCY_STRATEGY *concurrency_strategy_; - /// true if Connector created the concurrency strategy and thus should + /// True if Connector created the concurrency strategy and thus should /// delete it, else false. bool delete_concurrency_strategy_; }; diff --git a/dep/ACE_wrappers/ace/Containers.cpp b/dep/ACE_wrappers/ace/Containers.cpp index 244a9ad4b..5a8ef29f9 100644 --- a/dep/ACE_wrappers/ace/Containers.cpp +++ b/dep/ACE_wrappers/ace/Containers.cpp @@ -1,11 +1,7 @@ -// $Id: Containers.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Containers.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/Containers.h" -ACE_RCSID (ace, - Containers, - "$Id: Containers.cpp 80826 2008-03-04 14:51:23Z wotte $") - #if !defined (__ACE_INLINE__) #include "ace/Containers.inl" #endif /* __ACE_INLINE__ */ diff --git a/dep/ACE_wrappers/ace/Containers_T.h b/dep/ACE_wrappers/ace/Containers_T.h index 7245b51b6..3f5463fe3 100644 --- a/dep/ACE_wrappers/ace/Containers_T.h +++ b/dep/ACE_wrappers/ace/Containers_T.h @@ -4,7 +4,7 @@ /** * @file Containers_T.h * - * $Id: Containers_T.h 82588 2008-08-11 13:37:41Z johnnyw $ + * $Id: Containers_T.h 88975 2010-02-12 19:19:38Z johnnyw $ * * @author Douglas C. Schmidt */ @@ -1993,13 +1993,8 @@ class ACE_Array : public ACE_Array_Base public: // Define a "trait" typedef T TYPE; - typedef ACE_Array_Iterator ITERATOR; - - // = Exceptions. - - // = Initialization and termination methods. - + /// Dynamically create an uninitialized array. /** * Initialize an empty array of the specified size using the provided diff --git a/dep/ACE_wrappers/ace/Copy_Disabled.cpp b/dep/ACE_wrappers/ace/Copy_Disabled.cpp index 687831119..f3fdfb71b 100644 --- a/dep/ACE_wrappers/ace/Copy_Disabled.cpp +++ b/dep/ACE_wrappers/ace/Copy_Disabled.cpp @@ -1,19 +1,13 @@ /** * @file Copy_Disabled.cpp * - * $Id: Copy_Disabled.cpp 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Copy_Disabled.cpp 91286 2010-08-05 09:04:31Z johnnyw $ * * @author Carlos O'Ryan */ #include "ace/Copy_Disabled.h" - -ACE_RCSID (ace, - Copy_Disabled, - "$Id: Copy_Disabled.cpp 80826 2008-03-04 14:51:23Z wotte $") - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_Copy_Disabled::ACE_Copy_Disabled (void) diff --git a/dep/ACE_wrappers/ace/Countdown_Time.cpp b/dep/ACE_wrappers/ace/Countdown_Time.cpp index dbb2ca55a..c964ab113 100644 --- a/dep/ACE_wrappers/ace/Countdown_Time.cpp +++ b/dep/ACE_wrappers/ace/Countdown_Time.cpp @@ -1,9 +1,11 @@ +// $Id: Countdown_Time.cpp 91287 2010-08-05 10:30:49Z johnnyw $ + #include "ace/Countdown_Time.h" #include "ace/OS_NS_sys_time.h" -ACE_RCSID (ace, - Countdown_Time, - "$Id: Countdown_Time.cpp 80826 2008-03-04 14:51:23Z wotte $") +#if !defined (__ACE_INLINE__) +#include "ace/Countdown_Time.inl" +#endif /* __ACE_INLINE__ */ ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -29,20 +31,16 @@ ACE_Countdown_Time::start (void) } } -bool -ACE_Countdown_Time::stopped (void) const -{ - return stopped_; -} - void ACE_Countdown_Time::stop (void) { - if (this->max_wait_time_ != 0 && this->stopped_ == false) + if (this->max_wait_time_ != 0 && !this->stopped_) { - ACE_Time_Value elapsed_time = ACE_OS::gettimeofday () - this->start_time_; + ACE_Time_Value const elapsed_time = + ACE_OS::gettimeofday () - this->start_time_; - if (*this->max_wait_time_ > elapsed_time) + if (elapsed_time >= ACE_Time_Value::zero && + *this->max_wait_time_ > elapsed_time) { *this->max_wait_time_ -= elapsed_time; } @@ -56,11 +54,4 @@ ACE_Countdown_Time::stop (void) } } -void -ACE_Countdown_Time::update (void) -{ - this->stop (); - this->start (); -} - ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/Countdown_Time.h b/dep/ACE_wrappers/ace/Countdown_Time.h index c12cfb108..b9c9a467f 100644 --- a/dep/ACE_wrappers/ace/Countdown_Time.h +++ b/dep/ACE_wrappers/ace/Countdown_Time.h @@ -4,7 +4,7 @@ /** * @file Countdown_Time.h * - * $Id: Countdown_Time.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Countdown_Time.h 85365 2009-05-18 08:27:42Z johnnyw $ * * @author Douglas C. Schmidt */ @@ -22,6 +22,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Time_Value.h" +#include "ace/Copy_Disabled.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -34,7 +35,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * time the stop() method is called the @c max_wait_time is * updated. */ -class ACE_Export ACE_Countdown_Time +class ACE_Export ACE_Countdown_Time : private ACE_Copy_Disabled { public: /// Cache the @a max_wait_time and call @c start(). @@ -67,14 +68,14 @@ private: /// Keeps track of whether we've already been stopped. bool stopped_; - - // Prevent copying - ACE_Countdown_Time (const ACE_Countdown_Time &); - ACE_Countdown_Time &operator= (const ACE_Countdown_Time &); }; ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" +#if defined (__ACE_INLINE__) +#include "ace/Countdown_Time.inl" +#endif /* __ACE_INLINE__ */ + #endif /* ACE_COUNTDOWN_TIME_H */ diff --git a/dep/ACE_wrappers/ace/Countdown_Time.inl b/dep/ACE_wrappers/ace/Countdown_Time.inl new file mode 100644 index 000000000..4a9eb8e0e --- /dev/null +++ b/dep/ACE_wrappers/ace/Countdown_Time.inl @@ -0,0 +1,20 @@ +// -*- C++ -*- +// +// $Id: Countdown_Time.inl 85368 2009-05-18 10:23:19Z johnnyw $ + +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + +ACE_INLINE bool +ACE_Countdown_Time::stopped (void) const +{ + return stopped_; +} + +ACE_INLINE void +ACE_Countdown_Time::update (void) +{ + this->stop (); + this->start (); +} + +ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/DEV.cpp b/dep/ACE_wrappers/ace/DEV.cpp index 42178a68e..c95bb7f90 100644 --- a/dep/ACE_wrappers/ace/DEV.cpp +++ b/dep/ACE_wrappers/ace/DEV.cpp @@ -1,4 +1,4 @@ -// $Id: DEV.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: DEV.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/DEV.h" @@ -8,7 +8,7 @@ #include "ace/DEV.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ace, DEV, "$Id: DEV.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/DEV_Addr.cpp b/dep/ACE_wrappers/ace/DEV_Addr.cpp index 64bbb5087..90bfe0a57 100644 --- a/dep/ACE_wrappers/ace/DEV_Addr.cpp +++ b/dep/ACE_wrappers/ace/DEV_Addr.cpp @@ -1,4 +1,4 @@ -// $Id: DEV_Addr.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: DEV_Addr.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $ #include "ace/DEV_Addr.h" #if !defined (__ACE_INLINE__) @@ -8,10 +8,6 @@ #include "ace/Log_Msg.h" #include "ace/OS_NS_string.h" -ACE_RCSID (ace, - DEV_Addr, - "$Id: DEV_Addr.cpp 80826 2008-03-04 14:51:23Z wotte $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_DEV_Addr) diff --git a/dep/ACE_wrappers/ace/DEV_Connector.cpp b/dep/ACE_wrappers/ace/DEV_Connector.cpp index bdc2530ac..6251dc670 100644 --- a/dep/ACE_wrappers/ace/DEV_Connector.cpp +++ b/dep/ACE_wrappers/ace/DEV_Connector.cpp @@ -1,4 +1,4 @@ -// $Id: DEV_Connector.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: DEV_Connector.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/DEV_Connector.h" @@ -8,12 +8,6 @@ #include "ace/DEV_Connector.inl" #endif /* __ACE_INLINE__ */ - -ACE_RCSID (ace, - DEV_Connector, - "$Id: DEV_Connector.cpp 80826 2008-03-04 14:51:23Z wotte $") - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_DEV_Connector) diff --git a/dep/ACE_wrappers/ace/DEV_Connector.h b/dep/ACE_wrappers/ace/DEV_Connector.h index 32a7223f4..2f71f6088 100644 --- a/dep/ACE_wrappers/ace/DEV_Connector.h +++ b/dep/ACE_wrappers/ace/DEV_Connector.h @@ -4,7 +4,7 @@ /** * @file DEV_Connector.h * - * $Id: DEV_Connector.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: DEV_Connector.h 82723 2008-09-16 09:35:44Z johnnyw $ * * @author Gerhard Lenzer and Douglas C. Schmidt */ @@ -87,7 +87,7 @@ public: int perms = 0); /// Resets any event associations on this handle - int reset_new_handle (ACE_HANDLE handle); + bool reset_new_handle (ACE_HANDLE handle); /// Dump the state of an object. void dump (void) const; diff --git a/dep/ACE_wrappers/ace/DEV_Connector.inl b/dep/ACE_wrappers/ace/DEV_Connector.inl index 924a42547..a57a38b71 100644 --- a/dep/ACE_wrappers/ace/DEV_Connector.inl +++ b/dep/ACE_wrappers/ace/DEV_Connector.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: DEV_Connector.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: DEV_Connector.inl 82723 2008-09-16 09:35:44Z johnnyw $ ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -23,12 +23,11 @@ ACE_DEV_Connector::ACE_DEV_Connector (ACE_DEV_IO &new_io, remote_sap.get_path_name (), ACE_TEXT ("ACE_DEV_IO"))); } -ACE_INLINE int -ACE_DEV_Connector::reset_new_handle (ACE_HANDLE handle) +ACE_INLINE bool +ACE_DEV_Connector::reset_new_handle (ACE_HANDLE) { - ACE_UNUSED_ARG (handle); // Nothing to do here since the handle is not a socket - return 0; + return false; } ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/DEV_IO.cpp b/dep/ACE_wrappers/ace/DEV_IO.cpp index b9a8e1f46..a16aca006 100644 --- a/dep/ACE_wrappers/ace/DEV_IO.cpp +++ b/dep/ACE_wrappers/ace/DEV_IO.cpp @@ -1,4 +1,4 @@ -// $Id: DEV_IO.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: DEV_IO.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/DEV_IO.h" #include "ace/Log_Msg.h" @@ -7,7 +7,7 @@ #include "ace/DEV_IO.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ace, DEV_IO, "$Id: DEV_IO.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/DLL.cpp b/dep/ACE_wrappers/ace/DLL.cpp index cad251100..1f9604678 100644 --- a/dep/ACE_wrappers/ace/DLL.cpp +++ b/dep/ACE_wrappers/ace/DLL.cpp @@ -1,4 +1,4 @@ -// $Id: DLL.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: DLL.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/DLL.h" @@ -11,7 +11,7 @@ #include -ACE_RCSID(ace, DLL, "$Id: DLL.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/DLL.h b/dep/ACE_wrappers/ace/DLL.h index fa748e8d9..20d333db8 100644 --- a/dep/ACE_wrappers/ace/DLL.h +++ b/dep/ACE_wrappers/ace/DLL.h @@ -4,7 +4,7 @@ /** * @file DLL.h * - * $Id: DLL.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: DLL.h 91064 2010-07-12 10:11:24Z johnnyw $ * * @author Kirthika Parameswaran */ @@ -151,12 +151,12 @@ public: * Return the handle to the caller. If @a become_owner is non-0 then * caller assumes ownership of the handle and the ACE_DLL object * won't call close() when it goes out of scope, even if - * is set. + * @c close_handle_on_destruction is set. */ ACE_SHLIB_HANDLE get_handle (int become_owner = 0) const; /// Set the handle for the DLL object. By default, the close() - //operation on / the object will be invoked before it is destroyed. + /// operation on / the object will be invoked before it is destroyed. int set_handle (ACE_SHLIB_HANDLE handle, bool close_handle_on_destruction = true); diff --git a/dep/ACE_wrappers/ace/DLL_Manager.cpp b/dep/ACE_wrappers/ace/DLL_Manager.cpp index 90049a042..23e6f8552 100644 --- a/dep/ACE_wrappers/ace/DLL_Manager.cpp +++ b/dep/ACE_wrappers/ace/DLL_Manager.cpp @@ -1,4 +1,4 @@ -// $Id: DLL_Manager.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: DLL_Manager.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/DLL_Manager.h" @@ -14,13 +14,7 @@ #include "ace/OS_NS_dlfcn.h" #include "ace/OS_NS_string.h" -ACE_RCSID (ace, - DLL_Manager, - "DLL_Manager.cpp,v 4.23 2003/11/05 23:30:46 shuston Exp") - -/******************************************************************/ - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_BEGIN_VERSIONED_NAMESPACE_DECL sig_atomic_t ACE_DLL_Handle::open_called_ = 0; @@ -61,7 +55,7 @@ ACE_DLL_Handle::open (const ACE_TCHAR *dll_name, { if (ACE::debug ()) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) DLL_Handle::open: error, ") + ACE_TEXT ("ACE (%P|%t) DLL_Handle::open: error, ") ACE_TEXT ("tried to reopen %s with name %s\n"), this->dll_name_, dll_name)); @@ -151,9 +145,9 @@ ACE_DLL_Handle::open (const ACE_TCHAR *dll_name, ACE_ERROR ((LM_ERROR, ACE_TEXT ("ACE (%P|%t) DLL_Handle::open ") ACE_TEXT ("(\'%s\') failed, errno=") - ACE_TEXT ("%d: %s\n"), + ACE_TEXT ("%d: <%s>\n"), name->c_str (), - errno, + ACE_ERRNO_GET, this->error ()->c_str ())); #if defined (AIX) @@ -177,9 +171,9 @@ ACE_DLL_Handle::open (const ACE_TCHAR *dll_name, ACE_TEXT ("(\"%s\", 0x%x) -> %s: %s\n"), aix_pathname, open_mode, - ACE_TEXT ((this->handle_ != ACE_SHLIB_INVALID_HANDLE) - ? "succeeded" - : "failed"), + (this->handle_ != ACE_SHLIB_INVALID_HANDLE + ? ACE_TEXT ("succeeded") + : ACE_TEXT ("failed")), this->error()->c_str())); } @@ -370,7 +364,7 @@ ACE_DLL_Handle::get_handle (int become_owner) if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("ACE (%P|%t) ACE_DLL_Handle::get_handle: ") + ACE_TEXT ("ACE (%P|%t) DLL_Handle::get_handle: ") ACE_TEXT ("post call: handle %s, refcount %d\n"), this->handle_ == ACE_SHLIB_INVALID_HANDLE ? ACE_TEXT ("invalid") : ACE_TEXT ("valid"), @@ -437,7 +431,7 @@ ACE_DLL_Handle::get_dll_names (const ACE_TCHAR *dll_name, try_names.size (0); if ((try_names.max_size () - try_names.size ()) < 5) try_names.max_size (try_names.max_size () + 5); -#if defined (ACE_WIN32) && defined (ACE_LD_DECORATOR_STR) && !defined (ACE_DISABLE_DEBUG_DLL_CHECK) +#if defined (ACE_LD_DECORATOR_STR) && !defined (ACE_DISABLE_DEBUG_DLL_CHECK) ACE_TString decorator (ACE_LD_DECORATOR_STR); #endif ACE_TString suffix (ACE_DLL_SUFFIX); @@ -446,7 +440,7 @@ ACE_DLL_Handle::get_dll_names (const ACE_TCHAR *dll_name, for (size_t i = 0; i < 5 && try_names.size () < try_names.max_size (); ++i) { ACE_TString try_this; - size_t j = try_names.size (); + size_t const j = try_names.size (); switch (i) { case 0: // Name + decorator + suffix @@ -455,7 +449,7 @@ ACE_DLL_Handle::get_dll_names (const ACE_TCHAR *dll_name, case 3: // Prefix + name + suffix if ( base_suffix.length () > 0 -#if !(defined(ACE_WIN32) && defined (ACE_LD_DECORATOR_STR) && !defined (ACE_DISABLE_DEBUG_DLL_CHECK)) +#if !(defined (ACE_LD_DECORATOR_STR) && !defined (ACE_DISABLE_DEBUG_DLL_CHECK)) || (i == 1 || i == 3) // No decorator desired; skip #endif ) @@ -468,7 +462,7 @@ ACE_DLL_Handle::get_dll_names (const ACE_TCHAR *dll_name, try_this += base_suffix; else { -#if defined (ACE_WIN32) && defined (ACE_LD_DECORATOR_STR) && !defined (ACE_DISABLE_DEBUG_DLL_CHECK) +#if defined (ACE_LD_DECORATOR_STR) && !defined (ACE_DISABLE_DEBUG_DLL_CHECK) try_this += decorator; #endif try_this += suffix; @@ -537,7 +531,7 @@ ACE_DLL_Manager::ACE_DLL_Manager (int size) if (this->open (size) != 0 && ACE::debug ()) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ACE_DLL_Manager ctor failed to allocate ") + ACE_TEXT ("ACE (%P|%t) DLL_Manager ctor failed to allocate ") ACE_TEXT ("handle_vector_.\n"))); } @@ -547,7 +541,7 @@ ACE_DLL_Manager::~ACE_DLL_Manager (void) if (this->close () != 0 && ACE::debug ()) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ACE_DLL_Manager dtor failed to close ") + ACE_TEXT ("ACE (%P|%t) DLL_Manager dtor failed to close ") ACE_TEXT ("properly.\n"))); } @@ -583,7 +577,7 @@ ACE_DLL_Manager::open_dll (const ACE_TCHAR *dll_name, // Error while opening dll. Free temp handle if (ACE::debug ()) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ACE_DLL_Manager::open_dll: Could not ") + ACE_TEXT ("ACE (%P|%t) DLL_Manager::open_dll: Could not ") ACE_TEXT ("open dll %s.\n"), dll_name)); @@ -766,7 +760,7 @@ ACE_DLL_Manager::unload_dll (ACE_DLL_Handle *dll_handle, int force_unload) { if (ACE::debug ()) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ACE_DLL_Manager::unload error.\n"))); + ACE_TEXT ("ACE (%P|%t) DLL_Manager::unload error.\n"))); return -1; } @@ -775,7 +769,7 @@ ACE_DLL_Manager::unload_dll (ACE_DLL_Handle *dll_handle, int force_unload) { if (ACE::debug ()) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ACE_DLL_Manager::unload_dll called with ") + ACE_TEXT ("ACE (%P|%t) DLL_Manager::unload_dll called with ") ACE_TEXT ("null pointer.\n"))); return -1; diff --git a/dep/ACE_wrappers/ace/DLL_Manager.h b/dep/ACE_wrappers/ace/DLL_Manager.h index 63b9ee04a..716e32995 100644 --- a/dep/ACE_wrappers/ace/DLL_Manager.h +++ b/dep/ACE_wrappers/ace/DLL_Manager.h @@ -4,7 +4,7 @@ /** * @file DLL_Manager.h * - * $Id: DLL_Manager.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: DLL_Manager.h 91064 2010-07-12 10:11:24Z johnnyw $ * * @author Don Hinton */ @@ -45,7 +45,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * on some platforms. It is refcounted and managed by * ACE_DLL_Manager, so there will only be a single instance of this * class for each dll loaded, no matter how many instances of ACE_DLL - * an application has open. Operations , , and + * an application has open. Operations open(), close(), and symbol() * have been implemented to help opening/closing and extracting symbol * information from a DLL, respectively. * @@ -69,11 +69,11 @@ public: /** * This method opens and dynamically links @a dll_name. The default - * mode is , which loads identifier symbols but not the + * mode is @c RTLD_LAZY, which loads identifier symbols but not the * symbols for functions, which are loaded dynamically on-demand. - * Other supported modes include: , which performs all + * Other supported modes include: @c RTLD_NOW, which performs all * necessary relocations when @a dll_name is first loaded and - * , which makes symbols available for relocation + * @c RTLD_GLOBAL, which makes symbols available for relocation * processing of any other DLLs. Returns -1 on failure and 0 on * success. */ @@ -110,20 +110,20 @@ private: /// to the caller. auto_ptr error (void); - // Builds array of DLL names to try to dlopen, based on platform - // and configured DLL prefixes/suffixes. - // Returns the array of names to try in try_names. + /// Builds array of DLL names to try to dlopen, based on platform + /// and configured DLL prefixes/suffixes. + /// Returns the array of names to try in try_names. void get_dll_names (const ACE_TCHAR *dll_name, ACE_Array &try_names); - // Disallow copying and assignment since we don't handle them. + /// Disallow copying and assignment since we don't handle them. ACE_DLL_Handle (const ACE_DLL_Handle &); void operator= (const ACE_DLL_Handle &); private: - // Keep track of how many ACE_DLL objects have a reference to this - // dll. + /// Keep track of how many ACE_DLL objects have a reference to this + /// dll. sig_atomic_t refcount_; /// Name of the shared library. @@ -218,16 +218,16 @@ protected: /// Destructor. ~ACE_DLL_Manager (void); - // Allocate handle_vector_. + /// Allocate handle_vector_. int open (int size); - // Close all open dlls and deallocate memory. + /// Close all open dlls and deallocate memory. int close (void); - // Find dll in handle_vector_. + /// Find dll in handle_vector_. ACE_DLL_Handle *find_dll (const ACE_TCHAR *dll_name) const; - // Applies strategy for unloading dll. + /// Applies strategy for unloading dll. int unload_dll (ACE_DLL_Handle *dll_handle, int force_unload = 0); private: @@ -235,7 +235,7 @@ private: /// Close the singleton instance. static void close_singleton (void); - // Disallow copying and assignment since we don't handle these. + /// Disallow copying and assignment since we don't handle these. ACE_DLL_Manager (const ACE_DLL_Manager &); void operator= (const ACE_DLL_Manager &); diff --git a/dep/ACE_wrappers/ace/Date_Time.cpp b/dep/ACE_wrappers/ace/Date_Time.cpp index eff0f273f..2cc6b69f3 100644 --- a/dep/ACE_wrappers/ace/Date_Time.cpp +++ b/dep/ACE_wrappers/ace/Date_Time.cpp @@ -1,5 +1,5 @@ // Date_Time.cpp -// $Id: Date_Time.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Date_Time.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/Date_Time.h" @@ -7,4 +7,4 @@ #include "ace/Date_Time.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ace, Date_Time, "$Id: Date_Time.cpp 80826 2008-03-04 14:51:23Z wotte $") + diff --git a/dep/ACE_wrappers/ace/Default_Constants.h b/dep/ACE_wrappers/ace/Default_Constants.h index 13e99e917..1c0743b52 100644 --- a/dep/ACE_wrappers/ace/Default_Constants.h +++ b/dep/ACE_wrappers/ace/Default_Constants.h @@ -4,7 +4,7 @@ /** * @file Default_Constants.h * - * $Id: Default_Constants.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Default_Constants.h 87487 2009-11-12 07:54:39Z johnnyw $ * * @author Douglas C. Schmidt * @author Jesper S. M|ller @@ -18,7 +18,7 @@ #define ACE_DEFAULT_CONSTANTS_H #include /**/ "ace/pre.h" -// Included just keep compilers that see #pragma dierctive first +// Included just keep compilers that see #pragma directive first // happy. #include /**/ "ace/config-all.h" @@ -26,6 +26,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +// For _POSIX_TIMER_MAX +#include "ace/os_include/os_limits.h" + // Define the default constants for ACE. Many of these are used for // the ACE tests and applications. You can change these values by // defining the macros in your config.h file. @@ -62,6 +65,10 @@ #define ACE_DEFAULT_SERVICE_REPOSITORY_SIZE 1024 #endif /* ACE_DEFAULT_SERVICE_REPOSITORY_SIZE */ +#if !defined (ACE_DEFAULT_SERVICE_GESTALT_SIZE) +#define ACE_DEFAULT_SERVICE_GESTALT_SIZE 1024 +#endif /* ACE_DEFAULT_SERVICE_GESTALT_SIZE */ + #if !defined (ACE_REACTOR_NOTIFICATION_ARRAY_SIZE) #define ACE_REACTOR_NOTIFICATION_ARRAY_SIZE 1024 #endif /* ACE_REACTOR_NOTIFICATION_ARRAY_SIZE */ @@ -196,7 +203,7 @@ # define ACE_DEFAULT_TIME_SERVER_STR "ACE_TS_TIME" # endif /* ACE_DEFAULT_TIME_SERVER_STR */ -// Used by the FIFO tests and the Client_Logging_Handler netsvc. +// Used by the FIFO tests # if !defined (ACE_DEFAULT_RENDEZVOUS) # if defined (ACE_HAS_STREAM_PIPES) # define ACE_DEFAULT_RENDEZVOUS ACE_TEXT("/tmp/fifo.ace") @@ -210,13 +217,20 @@ # define ACE_DEFAULT_SYSLOG_FACILITY LOG_USER # endif /* ACE_DEFAULT_SYSLOG_FACILITY */ -# if !defined (ACE_DEFAULT_LOGGER_KEY) +# if !defined (ACE_HAS_STREAM_LOG_MSG_IPC) +# if defined (ACE_HAS_STREAM_PIPES) +# define ACE_HAS_STREAM_LOG_MSG_IPC 1 +# else +# define ACE_HAS_STREAM_LOG_MSG_IPC 0 +# endif /* ACE_HAS_STREAM_PIPES */ +# endif /* !ACE_HAS_STREAM_LOG_MSG_IPC */ -# if defined (ACE_HAS_STREAM_PIPES) -# define ACE_DEFAULT_LOGGER_KEY ACE_TEXT ("/tmp/server_daemon") -# else -# define ACE_DEFAULT_LOGGER_KEY ACE_TEXT ("localhost:20012") -# endif /* ACE_HAS_STREAM_PIPES */ +# if !defined (ACE_DEFAULT_LOGGER_KEY) +# if (ACE_HAS_STREAM_LOG_MSG_IPC == 1) +# define ACE_DEFAULT_LOGGER_KEY ACE_TEXT ("/tmp/server_daemon") +# else +# define ACE_DEFAULT_LOGGER_KEY ACE_TEXT ("localhost:20012") +# endif /* ACE_HAS_STREAM_LOG_MSG_IPC==1 */ # endif /* ACE_DEFAULT_LOGGER_KEY */ // The way to specify the local host for loopback IP. This is usually @@ -299,6 +313,10 @@ # define ACE_DEFAULT_MAP_SIZE 1024 # endif /* ACE_DEFAULT_MAP_SIZE */ +# if defined (ACE_DEFAULT_MAP_SIZE) && (ACE_DEFAULT_MAP_SIZE == 0) +# error ACE_DEFAULT_MAP_SIZE should not be zero +# endif /* ACE_DEFAULT_MAP_SIZE */ + // Defaults for ACE Timer Wheel # if !defined (ACE_DEFAULT_TIMER_WHEEL_SIZE) # define ACE_DEFAULT_TIMER_WHEEL_SIZE 1024 @@ -450,9 +468,13 @@ // Default number of ACE_Event_Handlers supported by // ACE_Timer_Heap. -# if !defined (ACE_DEFAULT_TIMERS) -# define ACE_DEFAULT_TIMERS _POSIX_TIMER_MAX -# endif /* ACE_DEFAULT_TIMERS */ +#if !defined (ACE_DEFAULT_TIMERS) && defined (_POSIX_TIMER_MAX) +# define ACE_DEFAULT_TIMERS _POSIX_TIMER_MAX +#endif /* ACE_DEFAULT_TIMERS */ + +#if !defined (ACE_DEFAULT_TIMERS) || (defined (ACE_DEFAULT_TIMERS) && (ACE_DEFAULT_TIMERS == 0)) +#error ACE_DEFAULT_TIMERS should be defined and not be zero +#endif /* ACE_DEFAULT_TIMERS */ #if defined (ACE_WIN32) # define ACE_PLATFORM_A "Win32" @@ -482,11 +504,9 @@ # define ACE_LD_SEARCH_PATH ACE_TEXT ("PATH") # define ACE_LD_SEARCH_PATH_SEPARATOR_STR ACE_TEXT (";") # define ACE_DLL_SUFFIX ACE_TEXT (".dll") -# if defined (__MINGW32__) -# define ACE_DLL_PREFIX ACE_TEXT ("lib") -# else /* __MINGW32__ */ +# if !defined (ACE_DLL_PREFIX) # define ACE_DLL_PREFIX ACE_TEXT ("") -# endif /* __MINGW32__ */ +# endif /* !ACE_DLL_PREFIX */ #else /* !ACE_WIN32 */ # if !defined (ACE_LD_SEARCH_PATH) # define ACE_LD_SEARCH_PATH ACE_TEXT ("LD_LIBRARY_PATH") @@ -559,6 +579,18 @@ #define ACE_DEFAULT_LOCALNAME ACE_TEXT (ACE_DEFAULT_LOCALNAME_A) #define ACE_DEFAULT_GLOBALNAME ACE_TEXT (ACE_DEFAULT_GLOBALNAME_A) +#if !defined (ACE_DEFAULT_OPEN_PERMS) +# define ACE_DEFAULT_OPEN_PERMS ACE_DEFAULT_FILE_PERMS +#endif /* ACE_DEFAULT_OPEN_PERMS */ + +#if !defined (ACE_DEFAULT_RW_PROCESS_MUTEX_PERMS) +# if defined (ACE_WIN32) +# define ACE_DEFAULT_RW_PROCESS_MUTEX_PERMS ACE_DEFAULT_OPEN_PERMS +# else +# define ACE_DEFAULT_RW_PROCESS_MUTEX_PERMS (S_IRUSR | S_IWUSR) +# endif /* ACE_WIN32 */ +#endif /* ACE_DEFAULT_RW_PROCESS_MUTEX_PERMS */ + # if defined (ACE_WIN32) // The "null" device on Win32. # define ACE_DEV_NULL "nul" diff --git a/dep/ACE_wrappers/ace/Dev_Poll_Reactor.cpp b/dep/ACE_wrappers/ace/Dev_Poll_Reactor.cpp index 60a71d299..8698cbd5c 100644 --- a/dep/ACE_wrappers/ace/Dev_Poll_Reactor.cpp +++ b/dep/ACE_wrappers/ace/Dev_Poll_Reactor.cpp @@ -1,23 +1,17 @@ -// $Id: Dev_Poll_Reactor.cpp 81315 2008-04-10 07:14:15Z johnnyw $ +// $Id: Dev_Poll_Reactor.cpp 91535 2010-08-27 18:16:14Z shuston $ #include "ace/OS_NS_errno.h" #include "ace/Dev_Poll_Reactor.h" #include "ace/Signal.h" #include "ace/Sig_Handler.h" -ACE_RCSID (ace, - Dev_Poll_Reactor, - "$Id: Dev_Poll_Reactor.cpp 81315 2008-04-10 07:14:15Z johnnyw $") - #if defined (ACE_HAS_EVENT_POLL) || defined (ACE_HAS_DEV_POLL) # include "ace/OS_NS_unistd.h" # include "ace/OS_NS_fcntl.h" # include "ace/OS_NS_stropts.h" -# if defined (ACE_HAS_EVENT_POLL) && defined (linux) -# include /**/ -# elif defined (ACE_HAS_DEV_POLL) +# if defined (ACE_HAS_DEV_POLL) # if defined (linux) # include /**/ # elif defined (HPUX_VERS) && HPUX_VERS < 1123 @@ -136,27 +130,25 @@ ACE_Dev_Poll_Reactor_Notify::notify (ACE_Event_Handler *eh, ACE_UNUSED_ARG (timeout); ACE_Dev_Poll_Handler_Guard eh_guard (eh); - int notification_required = - notification_queue_.push_new_notification (buffer); - - if (notification_required == -1) + // When using the queue, always try to write to the notify pipe. If it + // fills up, ignore it safely because the already-written bytes will + // eventually cause the notify handler to be dispatched. + if (-1 == this->notification_queue_.push_new_notification (buffer)) return -1; // Also decrement eh's reference count // The notification has been queued, so it will be delivered at some // point (and may have been already); release the refcnt guard. eh_guard.release (); - if (notification_required == 0) - return 0; - // Now pop the pipe to force the callback for dispatching when ready. If // the send fails due to a full pipe, don't fail - assume the already-sent // pipe bytes will cause the entire notification queue to be processed. + // Note that we don't need a timeout since the pipe is already in + // nonblocking mode and all we want is one attempt. ssize_t n = ACE::send (this->notification_pipe_.write_handle (), (char *) &buffer, - 1, // Only need one byte to pop the pipe - &ACE_Time_Value::zero); - if (n == -1 && (errno != ETIME && errno != EAGAIN)) + 1); // Only need one byte to pop the pipe + if (n == -1 && (errno != EAGAIN)) return -1; return 0; @@ -210,46 +202,48 @@ ACE_Dev_Poll_Reactor_Notify::read_notify_pipe (ACE_HANDLE handle, // expensive than simply checking for an EWOULDBLOCK. size_t to_read; char *read_p; - bool have_one = false; #if defined (ACE_HAS_REACTOR_NOTIFICATION_QUEUE) - // For the queued case, we'll try to read one byte (since that's what - // the notify () tried to put in) but we don't need it - notifications can - // be queued even if the pipe fills, so there may be more notifications - // queued than there are bytes in the pipe. - char b; - read_p = &b; - to_read = 1; + // The idea in the queued case is to be sure we never end up with a notify + // queued but no byte in the pipe. If that happens, the notify won't be + // dispatched. So always try to empty the pipe, read the queue, then put + // a byte in if needed. The notify() method is enqueueing then writing the + // pipe, so be sure to do it in the reverse order here to avoid a race + // between removing the last notification from the queue and the notify + // side writing its byte. + char b[1024]; + read_p = b; + to_read = sizeof(b); + (void)ACE::recv (handle, read_p, to_read); - // Before reading the byte, pop a message from the queue and queue a - // new message unless the queue is now empty. The protocol is to - // keep a byte in the pipe as long as the queue is not empty. bool more_messages_queued = false; ACE_Notification_Buffer next; - - int result = notification_queue_.pop_next_notification (buffer, + int result = 1; + while (result == 1) + { + result = notification_queue_.pop_next_notification (buffer, more_messages_queued, next); - if (result == 0) - { - // remove the notification byte from the pipe, avoiding notification loop - ACE::recv (handle, read_p, to_read); - return 0; + if (result <= 0) // Nothing dequeued or error + return result; + + // If it's just a wake-up, toss it and see if there's anything else. + if (buffer.eh_ != 0) + break; } - if (result == -1) - return -1; - + // If there are more messages, ensure there's a byte in the pipe + // in case the notification limit stops dequeuing notifies before + // emptying the queue. if (more_messages_queued) (void) ACE::send (this->notification_pipe_.write_handle (), (char *)&next, - 1 /* one byte is enough */, - &ACE_Time_Value::zero); + 1); /* one byte is enough */ + return 1; #else to_read = sizeof buffer; read_p = (char *)&buffer; -#endif /* ACE_HAS_REACTOR_NOTIFICATION_QUEUE */ ssize_t n = ACE::recv (handle, read_p, to_read); @@ -275,54 +269,16 @@ ACE_Dev_Poll_Reactor_Notify::read_notify_pipe (ACE_HANDLE handle, if (n <= 0 && (errno != EWOULDBLOCK && errno != EAGAIN)) return -1; - return have_one ? 1 : 0; + return 0; +#endif /* ACE_HAS_REACTOR_NOTIFICATION_QUEUE */ } int -ACE_Dev_Poll_Reactor_Notify::handle_input (ACE_HANDLE handle) +ACE_Dev_Poll_Reactor_Notify::handle_input (ACE_HANDLE /*handle*/) { ACE_TRACE ("ACE_Dev_Poll_Reactor_Notify::handle_input"); - - // @@ We may end up dispatching this event handler twice: once when - // performing the speculative read on the notification pipe - // handle, and once more when dispatching the IO events. - - // Precondition: this->select_reactor_.token_.current_owner () == - // ACE_Thread::self (); - - int number_dispatched = 0; - int result = 0; - ACE_Notification_Buffer buffer; - - while ((result = this->read_notify_pipe (handle, buffer)) > 0) - { - // Dispatch the buffer - // NOTE: We count only if we made any dispatches ie. upcalls. - if (this->dispatch_notify (buffer) > 0) - ++number_dispatched; - - // Bail out if we've reached the . Note that - // by default is -1, so we'll loop until all - // the available notifications have been dispatched. - if (number_dispatched == this->max_notify_iterations_) - break; - } - - if (result == -1) - { - // Reassign number_dispatched to -1 if things have gone - // seriously wrong. - number_dispatched = -1; - } - - // Enqueue ourselves into the list of waiting threads. When we - // reacquire the token we'll be off and running again with ownership - // of the token. The postcondition of this call is that - // == . - //this->select_reactor_->renew (); - - return number_dispatched; + ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("SHOULD NOT BE HERE.\n")), -1); } ACE_HANDLE @@ -438,57 +394,64 @@ ACE_Dev_Poll_Reactor_Notify::dump (void) const #endif /* ACE_HAS_DUMP */ } -// ----------------------------------------------------------------- - -ACE_Dev_Poll_Reactor_Handler_Repository:: -ACE_Dev_Poll_Reactor_Handler_Repository (void) - : max_size_ (0), - handlers_ (0) +int +ACE_Dev_Poll_Reactor_Notify::dequeue_one (ACE_Notification_Buffer &nb) { - ACE_TRACE ("ACE_Dev_Poll_Reactor_Handler_Repository::ACE_Dev_Poll_Reactor_Handler_Repository"); + nb.eh_ = 0; + nb.mask_ = 0; + return this->read_notify_pipe (this->notify_handle (), nb); } -int -ACE_Dev_Poll_Reactor_Handler_Repository::invalid_handle ( + +// ----------------------------------------------------------------- + +ACE_Dev_Poll_Reactor::Handler_Repository::Handler_Repository (void) + : size_ (0), + max_size_ (0), + handlers_ (0) +{ + ACE_TRACE ("ACE_Dev_Poll_Reactor::Handler_Repository::Handler_Repository"); +} + +bool +ACE_Dev_Poll_Reactor::Handler_Repository::invalid_handle ( ACE_HANDLE handle) const { - ACE_TRACE ("ACE_Dev_Poll_Reactor_Handler_Repository::invalid_handle"); + ACE_TRACE ("ACE_Dev_Poll_Reactor::Handler_Repository::invalid_handle"); if (handle < 0 || handle >= this->max_size_) { errno = EINVAL; - return 1; + return true; } else - return 0; + return false; } -int -ACE_Dev_Poll_Reactor_Handler_Repository::handle_in_range ( +bool +ACE_Dev_Poll_Reactor::Handler_Repository::handle_in_range ( ACE_HANDLE handle) const { - ACE_TRACE ("ACE_Dev_Poll_Reactor_Handler_Repository::handle_in_range"); + ACE_TRACE ("ACE_Dev_Poll_Reactor::Handler_Repository::handle_in_range"); if (handle >= 0 && handle < this->max_size_) - return 1; + return true; else { errno = EINVAL; - return 0; + return false; } } int -ACE_Dev_Poll_Reactor_Handler_Repository::open (size_t size) +ACE_Dev_Poll_Reactor::Handler_Repository::open (size_t size) { - ACE_TRACE ("ACE_Dev_Poll_Reactor_Handler_Repository::open"); + ACE_TRACE ("ACE_Dev_Poll_Reactor::Handler_Repository::open"); this->max_size_ = size; // Try to allocate the memory. - ACE_NEW_RETURN (this->handlers_, - ACE_Dev_Poll_Event_Tuple[size], - -1); + ACE_NEW_RETURN (this->handlers_, Event_Tuple[size], -1); // Try to increase the number of handles if is greater than // the current limit. @@ -496,23 +459,35 @@ ACE_Dev_Poll_Reactor_Handler_Repository::open (size_t size) } int -ACE_Dev_Poll_Reactor_Handler_Repository::unbind_all (void) +ACE_Dev_Poll_Reactor::Handler_Repository::unbind_all (void) { - ACE_TRACE ("ACE_Dev_Poll_Reactor_Handler_Repository::unbind_all"); + ACE_TRACE ("ACE_Dev_Poll_Reactor::Handler_Repository::unbind_all"); - // Unbind all of the event handlers. + // Unbind all of the event handlers; similar to remove_handler() on all. for (int handle = 0; handle < this->max_size_; ++handle) - this->unbind (handle); + { + Event_Tuple *entry = this->find (handle); + if (entry == 0) + continue; + + // Check for ref counting now - handle_close () may delete eh. + bool const requires_reference_counting = + entry->event_handler->reference_counting_policy ().value () == + ACE_Event_Handler::Reference_Counting_Policy::ENABLED; + + (void) entry->event_handler->handle_close (handle, entry->mask); + this->unbind (handle, requires_reference_counting); + } return 0; } int -ACE_Dev_Poll_Reactor_Handler_Repository::close (void) +ACE_Dev_Poll_Reactor::Handler_Repository::close (void) { - ACE_TRACE ("ACE_Dev_Poll_Reactor_Handler_Repository::close"); + ACE_TRACE ("ACE_Dev_Poll_Reactor::Handler_Repository::close"); if (this->handlers_ != 0) { @@ -525,37 +500,37 @@ ACE_Dev_Poll_Reactor_Handler_Repository::close (void) return 0; } -ACE_Event_Handler * -ACE_Dev_Poll_Reactor_Handler_Repository::find (ACE_HANDLE handle, - size_t *index_p) +ACE_Dev_Poll_Reactor::Event_Tuple * +ACE_Dev_Poll_Reactor::Handler_Repository::find (ACE_HANDLE handle) { - ACE_TRACE ("ACE_Dev_Poll_Reactor_Handler_Repository::find"); + ACE_TRACE ("ACE_Dev_Poll_Reactor::Handler_Repository::find"); - ACE_Event_Handler *eh = 0; + Event_Tuple *tuple = 0; // Only bother to search for the if it's in range. - if (this->handle_in_range (handle)) + if (!this->handle_in_range (handle)) { - eh = this->handlers_[handle].event_handler; - if (eh != 0) - { - if (index_p != 0) - *index_p = handle; - } - else - errno = ENOENT; + errno = ERANGE; + return 0; } - return eh; + tuple = &(this->handlers_[handle]); + if (tuple->event_handler == 0) + { + errno = ENOENT; + tuple = 0; + } + + return tuple; } int -ACE_Dev_Poll_Reactor_Handler_Repository::bind ( +ACE_Dev_Poll_Reactor::Handler_Repository::bind ( ACE_HANDLE handle, ACE_Event_Handler *event_handler, ACE_Reactor_Mask mask) { - ACE_TRACE ("ACE_Dev_Poll_Reactor_Handler_Repository::bind"); + ACE_TRACE ("ACE_Dev_Poll_Reactor::Handler_Repository::bind"); if (event_handler == 0) return -1; @@ -569,25 +544,29 @@ ACE_Dev_Poll_Reactor_Handler_Repository::bind ( this->handlers_[handle].event_handler = event_handler; this->handlers_[handle].mask = mask; event_handler->add_reference (); + ++this->size_; return 0; } int -ACE_Dev_Poll_Reactor_Handler_Repository::unbind (ACE_HANDLE handle, - bool decr_refcnt) +ACE_Dev_Poll_Reactor::Handler_Repository::unbind (ACE_HANDLE handle, + bool decr_refcnt) { - ACE_TRACE ("ACE_Dev_Poll_Reactor_Handler_Repository::unbind"); + ACE_TRACE ("ACE_Dev_Poll_Reactor::Handler_Repository::unbind"); - if (this->find (handle) == 0) + Event_Tuple *entry = this->find (handle); + if (entry == 0) return -1; if (decr_refcnt) - this->handlers_[handle].event_handler->remove_reference (); - this->handlers_[handle].event_handler = 0; - this->handlers_[handle].mask = ACE_Event_Handler::NULL_MASK; - this->handlers_[handle].suspended = 0; + entry->event_handler->remove_reference (); + entry->event_handler = 0; + entry->mask = ACE_Event_Handler::NULL_MASK; + entry->suspended = false; + entry->controlled = false; + --this->size_; return 0; } @@ -601,17 +580,15 @@ ACE_Dev_Poll_Reactor::ACE_Dev_Poll_Reactor (ACE_Sig_Handler *sh, int s_queue) : initialized_ (false) , poll_fd_ (ACE_INVALID_HANDLE) - , size_ (0) // , ready_set_ () #if defined (ACE_HAS_EVENT_POLL) - , events_ (0) - , start_pevents_ (0) - , end_pevents_ (0) -#else + , epoll_wait_in_progress_ (false) +#endif /* ACE_HAS_EVENT_POLL */ +#if defined (ACE_HAS_DEV_POLL) , dp_fds_ (0) , start_pfds_ (0) , end_pfds_ (0) -#endif /* ACE_HAS_EVENT_POLL */ +#endif /* ACE_HAS_DEV_POLL */ , deactivated_ (0) , token_ (*this, s_queue) , lock_adapter_ (token_) @@ -640,7 +617,7 @@ ACE_Dev_Poll_Reactor::ACE_Dev_Poll_Reactor (ACE_Sig_Handler *sh, } ACE_Dev_Poll_Reactor::ACE_Dev_Poll_Reactor (size_t size, - int rs, + bool rs, ACE_Sig_Handler *sh, ACE_Timer_Queue *tq, int disable_notify_pipe, @@ -649,17 +626,12 @@ ACE_Dev_Poll_Reactor::ACE_Dev_Poll_Reactor (size_t size, int s_queue) : initialized_ (false) , poll_fd_ (ACE_INVALID_HANDLE) - , size_ (0) // , ready_set_ () -#if defined (ACE_HAS_EVENT_POLL) - , events_ (0) - , start_pevents_ (0) - , end_pevents_ (0) -#else +#if defined (ACE_HAS_DEV_POLL) , dp_fds_ (0) , start_pfds_ (0) , end_pfds_ (0) -#endif /* ACE_HAS_EVENT_POLL */ +#endif /* ACE_HAS_DEV_POLL */ , deactivated_ (0) , token_ (*this, s_queue) , lock_adapter_ (token_) @@ -693,7 +665,7 @@ ACE_Dev_Poll_Reactor::~ACE_Dev_Poll_Reactor (void) int ACE_Dev_Poll_Reactor::open (size_t size, - int restart, + bool restart, ACE_Sig_Handler *sh, ACE_Timer_Queue *tq, int disable_notify_pipe, @@ -707,6 +679,11 @@ ACE_Dev_Poll_Reactor::open (size_t size, if (this->initialized_) return -1; +#ifdef ACE_HAS_EVENT_POLL + ACE_OS::memset (&this->event_, 0, sizeof (this->event_)); + this->event_.data.fd = ACE_INVALID_HANDLE; +#endif /* ACE_HAS_EVENT_POLL */ + this->restart_ = restart; this->signal_handler_ = sh; this->timer_queue_ = tq; @@ -755,10 +732,7 @@ ACE_Dev_Poll_Reactor::open (size_t size, #if defined (ACE_HAS_EVENT_POLL) - // Allocating event table: - ACE_NEW_RETURN (this->events_, epoll_event[size], -1); - - // Initializing epoll: + // Initialize epoll: this->poll_fd_ = ::epoll_create (size); if (this->poll_fd_ == -1) result = -1; @@ -793,14 +767,12 @@ ACE_Dev_Poll_Reactor::open (size_t size, ACE_Event_Handler::READ_MASK) == -1)) result = -1; - this->size_ = size; - if (result != -1) // We're all set to go. this->initialized_ = true; else // This will close down all the allocated resources properly. - (void) this->close (); + (void) this->close (); return result; } @@ -859,13 +831,15 @@ ACE_Dev_Poll_Reactor::close (void) #if defined (ACE_HAS_EVENT_POLL) - delete [] this->events_; - this->events_ = 0; + ACE_OS::memset (&this->event_, 0, sizeof (this->event_)); + this->event_.data.fd = ACE_INVALID_HANDLE; #else delete [] this->dp_fds_; this->dp_fds_ = 0; + this->start_pfds_ = 0; + this->end_pfds_ = 0; #endif /* ACE_HAS_EVENT_POLL */ @@ -876,7 +850,7 @@ ACE_Dev_Poll_Reactor::close (void) this->delete_signal_handler_ = false; } - (void) this->handler_rep_.close (); + (void) this->handler_rep_.close (); if (this->delete_timer_queue_) { @@ -897,14 +871,6 @@ ACE_Dev_Poll_Reactor::close (void) this->poll_fd_ = ACE_INVALID_HANDLE; -#if defined (ACE_HAS_EVENT_POLL) - this->start_pevents_ = 0; - this->end_pevents_ = 0; -#else - this->start_pfds_ = 0; - this->end_pfds_ = 0; -#endif /* ACE_HAS_EVENT_POLL */ - this->initialized_ = false; return result; @@ -944,7 +910,7 @@ ACE_Dev_Poll_Reactor::work_pending_i (ACE_Time_Value * max_wait_time) return 0; #if defined (ACE_HAS_EVENT_POLL) - if (this->start_pevents_ != this->end_pevents_) + if (this->event_.data.fd != ACE_INVALID_HANDLE) #else if (this->start_pfds_ != this->end_pfds_) #endif /* ACE_HAS_EVENT_POLL */ @@ -957,35 +923,51 @@ ACE_Dev_Poll_Reactor::work_pending_i (ACE_Time_Value * max_wait_time) // Check if we have timers to fire. int const timers_pending = - ((this_timeout != 0 && max_wait_time == 0) + ((this_timeout != 0 && max_wait_time == 0) || (this_timeout != 0 && max_wait_time != 0 && *this_timeout != *max_wait_time) ? 1 : 0); long const timeout = - (this_timeout == 0 + (this_timeout == 0 ? -1 /* Infinity */ : static_cast (this_timeout->msec ())); #if defined (ACE_HAS_EVENT_POLL) - // Wait for events. - int const nfds = ::epoll_wait (this->poll_fd_, - this->events_, - this->size_, - static_cast (timeout)); + // See if there are handlers that have to be resumed before waiting. + { + ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, grd, this->to_be_resumed_lock_, -1); + this->epoll_wait_in_progress_ = true; + for (Resume_Map::iterator i = this->to_be_resumed_.begin (); + i != this->to_be_resumed_.end (); + ++i) + { + // Make sure that 1) the handle is still registered, + // 2) the registered handler is the one we're waiting to resume. + Event_Tuple *info = this->handler_rep_.find (i->first); + if (info != 0 && info->event_handler == i->second) + { + this->resume_handler_i (i->first); + } + } + this->to_be_resumed_.clear (); + } - if (nfds > 0) - { - this->start_pevents_ = this->events_; - this->end_pevents_ = this->start_pevents_ + nfds; - } + // Wait for an event. + int const nfds = ::epoll_wait (this->poll_fd_, + &this->event_, + 1, + static_cast (timeout)); + // Count on this being an atomic update; at worst, we may get an + // extraneous notify() from dispatch_io_event. + this->epoll_wait_in_progress_ = false; #else struct dvpoll dvp; dvp.dp_fds = this->dp_fds_; - dvp.dp_nfds = this->size_; + dvp.dp_nfds = this->handler_rep_.size (); dvp.dp_timeout = timeout; // Milliseconds // Poll for events @@ -1040,18 +1022,17 @@ ACE_Dev_Poll_Reactor::handle_events_i (ACE_Time_Value *max_wait_time, ACE_TRACE ("ACE_Dev_Poll_Reactor::handle_events_i"); int result = 0; - // int active_handle_count = 0; // Poll for events // - // If the underlying ioctl () call was interrupted via the interrupt + // If the underlying event wait call was interrupted via the interrupt // signal (i.e. returned -1 with errno == EINTR) then the loop will // be restarted if so desired. do { result = this->work_pending_i (max_wait_time); - if (result == -1) - ACE_ERROR ((LM_ERROR, "%t: %p\n", "work_pending_i")); + if (result == -1 && (this->restart_ == 0 || errno != EINTR)) + ACE_ERROR ((LM_ERROR, ACE_TEXT("%t: %p\n"), ACE_TEXT("work_pending_i"))); } while (result == -1 && this->restart_ != 0 && errno == EINTR); @@ -1097,10 +1078,7 @@ ACE_Dev_Poll_Reactor::dispatch (Token_Guard &guard) if ((result = this->dispatch_timer_handler (guard)) != 0) return result; - // Check to see if there are no more I/O handles left to - // dispatch AFTER we've handled the timers. - - // Finally, dispatch the I/O handlers. + // If no timer dispatched, check for an I/O event. result = this->dispatch_io_event (guard); return result; @@ -1173,6 +1151,8 @@ int ACE_Dev_Poll_Reactor::dispatch_io_event (Token_Guard &guard) { + // Dispatch a ready event. + // Define bits to check for while dispatching. #if defined (ACE_HAS_EVENT_POLL) const __uint32_t out_event = EPOLLOUT; @@ -1186,6 +1166,17 @@ ACE_Dev_Poll_Reactor::dispatch_io_event (Token_Guard &guard) const short err_event = 0; // No known bits for this #endif /* ACE_HAS_EVENT_POLL */ +#if defined (ACE_HAS_EVENT_POLL) + // epoll_wait() pulls one event which is stored in event_. If the handle + // is invalid, there's no event there. Else process it. In any event, we + // have the event, so clear event_ for the next thread. + const ACE_HANDLE handle = this->event_.data.fd; + __uint32_t revents = this->event_.events; + this->event_.data.fd = ACE_INVALID_HANDLE; + this->event_.events = 0; + if (handle != ACE_INVALID_HANDLE) + +#else // Since the underlying event demultiplexing mechansim (`/dev/poll' // or '/dev/epoll') is stateful, and since only one result buffer is // used, all pending events (i.e. those retrieved from a previous @@ -1193,8 +1184,6 @@ ACE_Dev_Poll_Reactor::dispatch_io_event (Token_Guard &guard) // polled. As such, the Dev_Poll_Reactor keeps track of the // progress of events that have been dispatched. - // Dispatch the events. - // // Select the first available handle with event (s) pending. Check for // event type in defined order of dispatch: output, exception, input. // When an event is located, clear its bit in the dispatch set. If there @@ -1203,21 +1192,27 @@ ACE_Dev_Poll_Reactor::dispatch_io_event (Token_Guard &guard) // // Notice that pfds only contains file descriptors that have // received events. -#if defined (ACE_HAS_EVENT_POLL) - struct epoll_event *& pfds = this->start_pevents_; - if (pfds < this->end_pevents_) -#else struct pollfd *& pfds = this->start_pfds_; + const ACE_HANDLE handle = pfds->fd; + short &revents = pfds->revents; if (pfds < this->end_pfds_) #endif /* ACE_HAS_EVENT_POLL */ + { -#if defined (ACE_HAS_EVENT_POLL) - const ACE_HANDLE handle = pfds->data.fd; - __uint32_t &revents = pfds->events; -#else - const ACE_HANDLE handle = pfds->fd; - short &revents = pfds->revents; + /* When using sys_epoll, we can attach arbitrary user + data to the descriptor, so it can be delivered when + activity is detected. Perhaps we should store event + handler together with descriptor, instead of looking + it up in a repository ? Could it boost performance ? + */ + Event_Tuple *info = this->handler_rep_.find (handle); + if (info == 0) // No registered handler any longer + { +#ifdef ACE_HAS_EVENT_POLL + this->event_.data.fd = ACE_INVALID_HANDLE; // Dump the event #endif /* ACE_HAS_EVENT_POLL */ + return 0; + } // Figure out what to do first in order to make it easier to manage // the bit twiddling and possible pfds increment before releasing @@ -1225,96 +1220,152 @@ ACE_Dev_Poll_Reactor::dispatch_io_event (Token_Guard &guard) // Note that if there's an error (such as the handle was closed // without being removed from the event set) the EPOLLHUP and/or // EPOLLERR bits will be set in revents. - bool disp_out = false; - bool disp_exc = false; - bool disp_in = false; + ACE_Reactor_Mask disp_mask = 0; + ACE_Event_Handler *eh = info->event_handler; + int (ACE_Event_Handler::*callback)(ACE_HANDLE) = 0; if (ACE_BIT_ENABLED (revents, out_event)) { - disp_out = true; + disp_mask = ACE_Event_Handler::WRITE_MASK; + callback = &ACE_Event_Handler::handle_output; ACE_CLR_BITS (revents, out_event); } else if (ACE_BIT_ENABLED (revents, exc_event)) { - disp_exc = true; + disp_mask = ACE_Event_Handler::EXCEPT_MASK; + callback = &ACE_Event_Handler::handle_exception; ACE_CLR_BITS (revents, exc_event); } else if (ACE_BIT_ENABLED (revents, in_event)) { - disp_in = true; + disp_mask = ACE_Event_Handler::READ_MASK; + callback = &ACE_Event_Handler::handle_input; ACE_CLR_BITS (revents, in_event); } else if (ACE_BIT_ENABLED (revents, err_event)) { - this->remove_handler_i (handle, ACE_Event_Handler::ALL_EVENTS_MASK); + this->remove_handler_i (handle, + ACE_Event_Handler::ALL_EVENTS_MASK, + info->event_handler); +#ifdef ACE_HAS_DEV_POLL ++pfds; +#endif /* ACE_HAS_DEV_POLL */ return 1; } else { - ACE_ERROR ((LM_ERROR, ACE_TEXT (" (%t) dispatch_io h %d unknown events 0x%x\n"), handle, revents)); - // ACE_ASSERT (0); + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("(%t) dispatch_io h %d unknown events 0x%x\n"), + handle, revents)); } +#ifdef ACE_HAS_DEV_POLL // Increment the pointer to the next element before we // release the token. Otherwise event handlers end up being // dispatched multiple times for the same poll. if (revents == 0) ++pfds; +#else + // With epoll, events are registered with oneshot, so the handle is + // effectively suspended; future calls to epoll_wait() will select + // the next event, so they're not managed here. + // The hitch to this is that the notify handler is always registered + // WITHOUT oneshot and is never suspended/resumed. This avoids endless + // notify loops caused by the notify handler requiring a resumption + // which requires the token, which requires a notify, etc. described + // in Bugzilla 3714. So, never suspend the notify handler. - /* When using sys_epoll, we can attach arbitrary user - data to the descriptor, so it can be delivered when - activity is detected. Perhaps we should store event - handler together with descriptor, instead of looking - it up in a repository ? Could it boost performance ? - */ - ACE_Event_Handler *eh = this->handler_rep_.find (handle); - - if (eh) + bool reactor_resumes_eh = false; + if (eh != this->notify_handler_) { - // Modify the reference count in an exception-safe way. - // Note that eh could be the notify handler. It's not strictly - // necessary to manage its refcount, but since we don't enable - // the counting policy, it won't do much. Management of the - // notified handlers themselves is done in the notify handler. - ACE_Dev_Poll_Handler_Guard eh_guard (eh); + info->suspended = true; - // Release the reactor token before upcall. + reactor_resumes_eh = + eh->resume_handler () == + ACE_Event_Handler::ACE_REACTOR_RESUMES_HANDLER; + } +#endif /* ACE_HAS_DEV_POLL */ + + int status = 0; // gets callback status, below. + + // Dispatch notifies directly. The notify dispatcher locates a + // notification then releases the token prior to dispatching it. + // NOTE: If notify_handler_->dispatch_one() returns a fail condition + // it has not releases the guard. Else, it has. + if (eh == this->notify_handler_) + { + ACE_Notification_Buffer b; + status = + dynamic_cast(notify_handler_)->dequeue_one (b); + if (status == -1) + return status; guard.release_token (); + return notify_handler_->dispatch_notify (b); + } - // Dispatch the detected event - if (disp_out) - { - const int status = - this->upcall (eh, &ACE_Event_Handler::handle_output, handle); + { + // Modify the reference count in an exception-safe way. + // Note that eh could be the notify handler. It's not strictly + // necessary to manage its refcount, but since we don't enable + // the counting policy, it won't do much. Management of the + // notified handlers themselves is done in the notify handler. + ACE_Dev_Poll_Handler_Guard eh_guard (eh); - if (status < 0) - // Note that the token is reacquired in remove_handler (). - this->remove_handler (handle, ACE_Event_Handler::WRITE_MASK); - return 1; - } + // Release the reactor token before upcall. + guard.release_token (); - if (disp_exc) - { - const int status = - this->upcall (eh, &ACE_Event_Handler::handle_exception, handle); + // Dispatch the detected event; will do the repeated upcalls + // if callback returns > 0, unless it's the notify handler (which + // returns the number of notfies dispatched, not an indication of + // re-callback requested). If anything other than the notify, come + // back with either 0 or < 0. + status = this->upcall (eh, callback, handle); - if (status < 0) - // Note that the token is reacquired in remove_handler (). - this->remove_handler (handle, ACE_Event_Handler::EXCEPT_MASK); - return 1; - } + // If the callback returned 0, epoll-based needs to resume the + // suspended handler but dev/poll doesn't. + // The epoll case is optimized to not acquire the token in order + // to resume the handler; the handler is added to a list of those + // that need to be resumed and is handled by the next leader + // that does an epoll_wait(). + // In both epoll and dev/poll cases, if the callback returns <0, + // the token needs to be acquired and the handler checked and + // removed if it hasn't already been. + if (status == 0) + { +#ifdef ACE_HAS_EVENT_POLL + // epoll-based effectively suspends handlers around the upcall. + // If the handler must be resumed, add it to the list. + if (reactor_resumes_eh) + { + ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, + grd, + this->to_be_resumed_lock_, + -1); + bool map_was_empty = this->to_be_resumed_.empty(); + this->to_be_resumed_.insert + (Resume_Map::value_type (handle, eh)); + if (this->epoll_wait_in_progress_ && map_was_empty) + this->notify(); + } +#endif /* ACE_HAS_EVENT_POLL */ + return 1; + } - if (disp_in) - { - const int status = - this->upcall (eh, &ACE_Event_Handler::handle_input, handle); + // All state in the handler repository may have changed during the + // upcall while other threads had the token. Thus, reacquire the + // token and evaluate what's needed. If the upcalled handler is still + // the handler of record for handle, continue with checking whether + // or not to remove or resume the handler. + guard.acquire (); + info = this->handler_rep_.find (handle); + if (info != 0 && info->event_handler == eh) + { + if (status < 0) + this->remove_handler_i (handle, disp_mask); + } + } + // Scope close handles eh ref count decrement, if needed. - if (status < 0) - // Note that the token is reacquired in remove_handler (). - this->remove_handler (handle, ACE_Event_Handler::READ_MASK); - return 1; - } - } // The reactor token is reacquired upon leaving this scope. + return 1; } return 0; @@ -1406,19 +1457,27 @@ ACE_Dev_Poll_Reactor::register_handler_i (ACE_HANDLE handle, #if defined (ACE_HAS_EVENT_POLL) + Event_Tuple *info = this->handler_rep_.find (handle); + struct epoll_event epev; ACE_OS::memset (&epev, 0, sizeof (epev)); static const int op = EPOLL_CTL_ADD; - epev.events = this->reactor_mask_to_poll_event (mask); epev.data.fd = handle; + epev.events = this->reactor_mask_to_poll_event (mask); + // All but the notify handler get registered with oneshot to facilitate + // auto suspend before the upcall. See dispatch_io_event for more + // information. + if (event_handler != this->notify_handler_) + epev.events |= EPOLLONESHOT; if (::epoll_ctl (this->poll_fd_, op, handle, &epev) == -1) { - ACE_ERROR ((LM_ERROR, "%p\n", "epoll_ctl")); - (void) this->handler_rep_.unbind (handle); + ACE_ERROR ((LM_ERROR, ACE_TEXT("%p\n"), ACE_TEXT("epoll_ctl"))); + (void) this->handler_rep_.unbind (handle); return -1; } + info->controlled = true; #endif /* ACE_HAS_EVENT_POLL */ } @@ -1428,10 +1487,11 @@ ACE_Dev_Poll_Reactor::register_handler_i (ACE_HANDLE handle, // again, possibly for different event. Add new mask to the // current one. if (this->mask_ops_i (handle, mask, ACE_Reactor::ADD_MASK) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "mask_ops_i"), -1); + ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT("%p\n"), ACE_TEXT("mask_ops_i")), + -1); } -#ifndef ACE_HAS_EVENT_POLL +#ifdef ACE_HAS_DEV_POLL struct pollfd pfd; @@ -1442,10 +1502,10 @@ ACE_Dev_Poll_Reactor::register_handler_i (ACE_HANDLE handle, // Add file descriptor to the "interest set." if (ACE_OS::write (this->poll_fd_, &pfd, sizeof (pfd)) != sizeof (pfd)) { - (void) this->handler_rep_.unbind (handle); + (void) this->handler_rep_.unbind (handle); return -1; } -#endif /*ACE_HAS_EVENT_POLL*/ +#endif /*ACE_HAS_DEV_POLL*/ // Note the fact that we've changed the state of the wait_set_, // which is used by the dispatching loop to determine whether it can @@ -1559,15 +1619,24 @@ ACE_Dev_Poll_Reactor::remove_handler (ACE_HANDLE handle, int ACE_Dev_Poll_Reactor::remove_handler_i (ACE_HANDLE handle, - ACE_Reactor_Mask mask) + ACE_Reactor_Mask mask, + ACE_Event_Handler *eh) { ACE_TRACE ("ACE_Dev_Poll_Reactor::remove_handler_i"); - ACE_Event_Handler *eh = this->handler_rep_.find (handle); - - if (eh == 0 || - this->mask_ops_i (handle, mask, ACE_Reactor::CLR_MASK) == -1) + // If registered event handler not the same as eh, don't mess with + // the mask, but do the proper callback and refcount when needed. + bool handle_reg_changed = true; + Event_Tuple *info = this->handler_rep_.find (handle); + if (info == 0 && eh == 0) // Nothing to work with return -1; + if (info != 0 && (eh == 0 || info->event_handler == eh)) + { + if (this->mask_ops_i (handle, mask, ACE_Reactor::CLR_MASK) == -1) + return -1; + handle_reg_changed = false; + eh = info->event_handler; + } // Check for ref counting now - handle_close () may delete eh. bool const requires_reference_counting = @@ -1575,19 +1644,13 @@ ACE_Dev_Poll_Reactor::remove_handler_i (ACE_HANDLE handle, ACE_Event_Handler::Reference_Counting_Policy::ENABLED; if (ACE_BIT_DISABLED (mask, ACE_Event_Handler::DONT_CALL)) - (void) eh->handle_close (handle, mask); + (void) eh->handle_close (handle, mask); // If there are no longer any outstanding events on the given handle // then remove it from the handler repository. - if (this->handler_rep_.mask (handle) == ACE_Event_Handler::NULL_MASK) + if (!handle_reg_changed && info->mask == ACE_Event_Handler::NULL_MASK) this->handler_rep_.unbind (handle, requires_reference_counting); - // Note the fact that we've changed the state of the wait_set, - // i.e. the "interest set," which is used by the dispatching loop to - // determine whether it can keep going or if it needs to reconsult - // /dev/poll or /dev/epoll. - // this->state_changed_ = 1; - return 0; } @@ -1704,13 +1767,14 @@ ACE_Dev_Poll_Reactor::suspend_handlers (void) ACE_MT (ACE_GUARD_RETURN (ACE_Dev_Poll_Reactor_Token, mon, this->token_, -1)); - size_t const len = this->handler_rep_.size (); + size_t const len = this->handler_rep_.max_size (); for (size_t i = 0; i < len; ++i) - if (this->handler_rep_.suspended (i) == 0 - && this->suspend_handler_i (i) != 0) - return -1; - + { + Event_Tuple *info = this->handler_rep_.find (i); + if (info != 0 && !info->suspended && this->suspend_handler_i (i) != 0) + return -1; + } return 0; } @@ -1719,10 +1783,11 @@ ACE_Dev_Poll_Reactor::suspend_handler_i (ACE_HANDLE handle) { ACE_TRACE ("ACE_Dev_Poll_Reactor::suspend_handler_i"); - if (this->handler_rep_.find (handle) == 0) + Event_Tuple *info = this->handler_rep_.find (handle); + if (info == 0) return -1; - if (this->handler_rep_.suspended (handle)) + if (info->suspended) return 0; // Already suspended. @@ Should this be an error? // Remove the handle from the "interest set." @@ -1742,7 +1807,7 @@ ACE_Dev_Poll_Reactor::suspend_handler_i (ACE_HANDLE handle) if (::epoll_ctl (this->poll_fd_, op, handle, &epev) == -1) return -1; - + info->controlled = false; #else struct pollfd pfd[1]; @@ -1756,7 +1821,7 @@ ACE_Dev_Poll_Reactor::suspend_handler_i (ACE_HANDLE handle) #endif /* ACE_HAS_EVENT_POLL */ - this->handler_rep_.suspend (handle); + info->suspended = true; return 0; } @@ -1813,12 +1878,14 @@ ACE_Dev_Poll_Reactor::resume_handlers (void) ACE_MT (ACE_GUARD_RETURN (ACE_Dev_Poll_Reactor_Token, mon, this->token_, -1)); - size_t const len = this->handler_rep_.size (); + size_t const len = this->handler_rep_.max_size (); for (size_t i = 0; i < len; ++i) - if (this->handler_rep_.suspended (i) - && this->resume_handler_i (i) != 0) - return -1; + { + Event_Tuple *info = this->handler_rep_.find (i); + if (info != 0 && info->suspended && this->resume_handler_i (i) != 0) + return -1; + } return 0; } @@ -1828,14 +1895,19 @@ ACE_Dev_Poll_Reactor::resume_handler_i (ACE_HANDLE handle) { ACE_TRACE ("ACE_Dev_Poll_Reactor::resume_handler_i"); - if (this->handler_rep_.find (handle) == 0 - && this->handler_rep_.suspended (handle) == 0) + Event_Tuple *info = this->handler_rep_.find (handle); + if (info == 0) return -1; - ACE_Reactor_Mask mask = this->handler_rep_.mask (handle); + if (!info->suspended) + return 0; + ACE_Reactor_Mask mask = info->mask; if (mask == ACE_Event_Handler::NULL_MASK) - return -1; + { + info->suspended = false; + return 0; + } // Place the handle back in to the "interest set." // @@ -1845,13 +1917,15 @@ ACE_Dev_Poll_Reactor::resume_handler_i (ACE_HANDLE handle) struct epoll_event epev; ACE_OS::memset (&epev, 0, sizeof (epev)); - static const int op = EPOLL_CTL_ADD; - - epev.events = this->reactor_mask_to_poll_event (mask); + int op = EPOLL_CTL_ADD; + if (info->controlled) + op = EPOLL_CTL_MOD; + epev.events = this->reactor_mask_to_poll_event (mask) | EPOLLONESHOT; epev.data.fd = handle; if (::epoll_ctl (this->poll_fd_, op, handle, &epev) == -1) return -1; + info->controlled = true; #else @@ -1866,7 +1940,7 @@ ACE_Dev_Poll_Reactor::resume_handler_i (ACE_HANDLE handle) #endif /* ACE_HAS_EVENT_POLL */ - this->handler_rep_.resume (handle); + info->suspended = false; return 0; } @@ -1879,12 +1953,12 @@ ACE_Dev_Poll_Reactor::resumable_handler (void) return 0; } -int +bool ACE_Dev_Poll_Reactor::uses_event_associations (void) { // Since the Dev_Poll_Reactor does not do any event associations, - // this method always return zero. - return 0; + // this method always return false. + return false; } long @@ -2042,10 +2116,16 @@ ACE_Dev_Poll_Reactor::find_handler (ACE_HANDLE handle) { ACE_MT (ACE_READ_GUARD_RETURN (ACE_Dev_Poll_Reactor_Token, mon, this->token_, 0)); - ACE_Event_Handler *event_handler = this->handler_rep_.find (handle); - if (event_handler) - event_handler->add_reference (); - return event_handler; + Event_Tuple *info = this->handler_rep_.find (handle); + if (info) + { + info->event_handler->add_reference (); + return info->event_handler; + } + else + { + return 0; + } } int @@ -2057,15 +2137,15 @@ ACE_Dev_Poll_Reactor::handler (ACE_HANDLE handle, ACE_MT (ACE_READ_GUARD_RETURN (ACE_Dev_Poll_Reactor_Token, mon, this->token_, -1)); - ACE_Event_Handler *h = this->handler_rep_.find (handle); + Event_Tuple *info = this->handler_rep_.find (handle); - if (h != 0 - && ACE_BIT_CMP_MASK (this->handler_rep_.mask (handle), + if (info != 0 + && ACE_BIT_CMP_MASK (info->mask, mask, // Compare all bits in the mask mask)) { if (event_handler != 0) - *event_handler = h; + *event_handler = info->event_handler; return 0; } @@ -2102,7 +2182,7 @@ ACE_Dev_Poll_Reactor::initialized (void) size_t ACE_Dev_Poll_Reactor::size (void) const { - return this->size_; + return this->handler_rep_.size (); } ACE_Lock & @@ -2148,24 +2228,24 @@ ACE_Dev_Poll_Reactor::owner (ACE_thread_t * /* owner */) return 0; } -int +bool ACE_Dev_Poll_Reactor::restart (void) { ACE_TRACE ("ACE_Dev_Poll_Reactor::restart"); - ACE_MT (ACE_GUARD_RETURN (ACE_Dev_Poll_Reactor_Token, mon, this->token_, -1)); + ACE_MT (ACE_GUARD_RETURN (ACE_Dev_Poll_Reactor_Token, mon, this->token_, false)); return this->restart_; } -int -ACE_Dev_Poll_Reactor::restart (int r) +bool +ACE_Dev_Poll_Reactor::restart (bool r) { ACE_TRACE ("ACE_Dev_Poll_Reactor::restart"); - ACE_MT (ACE_GUARD_RETURN (ACE_Dev_Poll_Reactor_Token, mon, this->token_, -1)); + ACE_MT (ACE_GUARD_RETURN (ACE_Dev_Poll_Reactor_Token, mon, this->token_, false)); - int current_value = this->restart_; + bool current_value = this->restart_; this->restart_ = r; return current_value; } @@ -2215,13 +2295,14 @@ ACE_Dev_Poll_Reactor::mask_ops_i (ACE_HANDLE handle, { ACE_TRACE ("ACE_Dev_Poll_Reactor::mask_ops_i"); - if (this->handler_rep_.handle_in_range (handle) == 0) + Event_Tuple *info = this->handler_rep_.find (handle); + if (info == 0) return -1; // Block out all signals until method returns. ACE_Sig_Guard sb; - ACE_Reactor_Mask const old_mask = this->handler_rep_.mask (handle); + ACE_Reactor_Mask const old_mask = info->mask; ACE_Reactor_Mask new_mask = old_mask; // Perform GET, CLR, SET, and ADD operations on the interest/wait @@ -2260,12 +2341,15 @@ ACE_Dev_Poll_Reactor::mask_ops_i (ACE_HANDLE handle, } /// Reset the mask for the given handle. - this->handler_rep_.mask (handle, new_mask); + info->mask = new_mask; - if (this->handler_rep_.suspended (handle) == 0) + // Only attempt to alter events for the handle from the + // "interest set" if it hasn't been suspended. If it has been + // suspended, the revised mask will take affect when the + // handle is resumed. The exception is if all the mask bits are + // cleared, we can un-control the fd now. + if (!info->suspended || (info->controlled && new_mask == 0)) { - // Only attempt to alter events for the handle from the - // "interest set" if it hasn't been suspended. short const events = this->reactor_mask_to_poll_event (new_mask); @@ -2301,7 +2385,7 @@ ACE_Dev_Poll_Reactor::mask_ops_i (ACE_HANDLE handle, else { op = EPOLL_CTL_MOD; - epev.events = events; + epev.events = events | EPOLLONESHOT; } epev.data.fd = handle; @@ -2316,7 +2400,7 @@ ACE_Dev_Poll_Reactor::mask_ops_i (ACE_HANDLE handle, ::epoll_ctl (this->poll_fd_, EPOLL_CTL_ADD, handle, &epev) == -1) return -1; } - + info->controlled = (op != EPOLL_CTL_DEL); #else pollfd pfd[1]; @@ -2373,7 +2457,7 @@ ACE_Dev_Poll_Reactor::dump (void) const ACE_TEXT ("initialized_ = %d"), this->initialized_)); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("poll_fd_ = %d"), this->poll_fd_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("size_ = %u"), this->size_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("size_ = %u"), this->handler_rep_.size ())); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("deactivated_ = %d"), this->deactivated_)); @@ -2465,7 +2549,7 @@ ACE_Dev_Poll_Reactor::Token_Guard::acquire_quietly (ACE_Time_Value *max_wait) return 0; else { - ACE_ERROR ((LM_ERROR, "%t: %p\n", "token acquire_read")); + ACE_ERROR ((LM_ERROR, ACE_TEXT("%t: %p\n"), ACE_TEXT("token acquire_read"))); return -1; } } diff --git a/dep/ACE_wrappers/ace/Dev_Poll_Reactor.h b/dep/ACE_wrappers/ace/Dev_Poll_Reactor.h index 38d9c013a..00ae4c218 100644 --- a/dep/ACE_wrappers/ace/Dev_Poll_Reactor.h +++ b/dep/ACE_wrappers/ace/Dev_Poll_Reactor.h @@ -4,7 +4,7 @@ /** * @file Dev_Poll_Reactor.h * - * $Id: Dev_Poll_Reactor.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Dev_Poll_Reactor.h 91462 2010-08-25 20:29:17Z shuston $ * * @c /dev/poll (or Linux @c sys_epoll) based Reactor implementation. * @@ -43,7 +43,8 @@ #if defined (ACE_HAS_DEV_POLL) struct pollfd; #elif defined (ACE_HAS_EVENT_POLL) -struct epoll_event; +# include "ace/Array_Map.h" +# include /**/ #endif ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -52,87 +53,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Sig_Handler; class ACE_Dev_Poll_Reactor; -/** - * @class ACE_Dev_Poll_Event_Tuple - * - * @brief Class that associates specific event mask with a given event - * handler. - * - * This class merely provides a means to associate an event mask - * with an event handler. Such an association is needed since it is - * not possible to retrieve the event mask from the "interest set" - * stored in the `/dev/poll' or `/dev/epoll' driver. Without this - * external association, it would not be possible keep track of the - * event mask for a given event handler when suspending it or resuming - * it. - * - * @note An ACE_Handle_Set is not used since the number of handles may - * exceed its capacity (ACE_DEFAULT_SELECT_REACTOR_SIZE). - */ -class ACE_Dev_Poll_Event_Tuple -{ -public: - - /// Constructor. - ACE_Dev_Poll_Event_Tuple (void); - -public: - - /// The event handler. - ACE_Event_Handler *event_handler; - - /// The event mask for the above event handler. - ACE_Reactor_Mask mask; - - /// Flag that states whether or not the event handler is suspended. - char suspended; -}; - -// --------------------------------------------------------------------- - -#if 0 -/** - * @class ACE_Dev_Poll_Ready_Set - * - * @brief Class that contains the list of "ready" file descriptors. - * - * This class points to an array of pollfd structures corresponding to - * "ready" file descriptors, such as those corresponding to event - * handlers that request an additional callback after being initially - * dispatched (i.e. return a value greater than zero). - * @par - * The idea is to store the "ready" set in an existing area of memory - * that already contains pollfd instances. Doing so is safe since the - * "ready" set is dispatched before polling for additional events, - * thus avoiding being potentially overwritten during the event poll. - * @par - * When the "ready" set is dispatched, all that needs to be done is to - * iterate over the contents of the array. There is no need to "walk" - * the array in search of ready file descriptors since the array by - * design only contains ready file descriptors. As such, this - * implementation of a ready set is much more efficient in the - * presence of a large number of file descriptors in terms of both - * time and space than the one used in the Select_Reactor, for - * example. - */ -class ACE_Dev_Poll_Ready_Set -{ -public: - - /// Constructor. - ACE_Dev_Poll_Ready_Set (void); - -public: - - /// The array containing the pollfd structures corresponding to the - /// "ready" file descriptors. - struct pollfd *pfds; - - /// The number of "ready" file descriptors in the above array. - int nfds; - -}; -#endif /* 0 */ // --------------------------------------------------------------------- @@ -240,6 +160,14 @@ public: /// Dump the state of an object. virtual void dump (void) const; + /// Method called by ACE_Dev_Poll_Reactor to obtain one notification. + /// THIS METHOD MUST BE CALLED WITH THE REACTOR TOKEN HELD! + /// + /// @return -1 on error, else 0 and @arg nb has the notify to + /// dispatch. Note that the contained event handler may be + /// 0 if there were only wake-ups (no handlers to dispatch). + int dequeue_one (ACE_Notification_Buffer &nb); + protected: /** @@ -279,124 +207,6 @@ protected: */ ACE_Notification_Queue notification_queue_; #endif /* ACE_HAS_REACTOR_NOTIFICATION_QUEUE */ - -}; - -// --------------------------------------------------------------------- - -/** - * @class ACE_Dev_Poll_Reactor_Handler_Repository - * - * @internal - - * @brief Used to map ACE_HANDLEs onto the appropriate - * ACE_Event_Handler *. - * - * - * This class is simply a container that maps a handle to its - * corresponding event handler. It is not meant for use outside of - * the Dev_Poll_Reactor. - */ -class ACE_Dev_Poll_Reactor_Handler_Repository -{ -public: - - /// Constructor. - ACE_Dev_Poll_Reactor_Handler_Repository (void); - - /// Initialize a repository of the appropriate @a size. - int open (size_t size); - - /// Close down the repository. - int close (void); - - /** - * @name Repository Manipulation Operations - * - * Methods used to search and modify the handler repository. - */ - //@{ - - /** - * Return the @c ACE_Event_Handler associated with @c ACE_HANDLE. If - * @a index_p is non-zero, then return the index location of the - * handle, if found. - */ - ACE_Event_Handler *find (ACE_HANDLE handle, size_t *index_p = 0); - - /// Set the event mask for event handler associated with the given - /// handle. - void mask (ACE_HANDLE handle, ACE_Reactor_Mask mask); - - /// Retrieve the event mask for the event handler associated with - /// the given handle. - ACE_Reactor_Mask mask (ACE_HANDLE handle); - - /// Mark the event handler associated with the given handle as - /// "suspended." - void suspend (ACE_HANDLE handle); - - /// Mark the event handler associated with the given handle as - /// "resumed." - void resume (ACE_HANDLE handle); - - /// Is the event handler for the given handle suspended? - int suspended (ACE_HANDLE handle) const; - - /// Bind the ACE_Event_Handler to the @c ACE_HANDLE with the - /// appropriate ACE_Reactor_Mask settings. - int bind (ACE_HANDLE handle, - ACE_Event_Handler *handler, - ACE_Reactor_Mask mask); - - /// Remove the binding for @c ACE_HANDLE; optionally decrement the associated - /// handler's reference count. - int unbind (ACE_HANDLE handle, bool decr_refcnt = true); - - /// Remove all the (@c ACE_HANDLE, @c ACE_Event_Handler) tuples. - int unbind_all (void); - - /** - * @name Sanity Checking - * - * Methods used to prevent "out-of-range" errors when indexing the - * underlying handler array. - */ - //@{ - - // Check the @a handle to make sure it's a valid @c ACE_HANDLE that - // within the range of legal handles (i.e., greater than or equal to - // zero and less than @c max_size_). - int invalid_handle (ACE_HANDLE handle) const; - - // Check the handle to make sure it's a valid @c ACE_HANDLE that is - // within the range of currently registered handles (i.e., greater - // than or equal to zero and less than @c max_handlep1_). - int handle_in_range (ACE_HANDLE handle) const; - - //@} - - /// Returns the current table size. - size_t size (void) const; - - /// Dump the state of an object. - void dump (void) const; - - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - -private: - - /// Maximum number of handles. - int max_size_; - - /// The underlying array of event handlers. - /** - * The array of event handlers is directly indexed directly using - * an @c ACE_HANDLE value. This is Unix-specific. - */ - ACE_Dev_Poll_Event_Tuple *handlers_; - }; // --------------------------------------------------------------------- @@ -444,6 +254,155 @@ typedef ACE_Reactor_Token_T ACE_Dev_Poll_Reactor_Token; class ACE_Export ACE_Dev_Poll_Reactor : public ACE_Reactor_Impl { + + /** + * @struct Event_Tuple + * + * @brief Struct that collects event registration information for a handle. + * + * @internal Internal use only + * + * This struct merely provides a means to associate an event mask + * with an event handler. Such an association is needed since it is + * not possible to retrieve the event mask from the "interest set" + * stored in the `/dev/poll' or `/dev/epoll' driver. Without this + * external association, it would not be possible keep track of the + * event mask for a given event handler when suspending it or resuming + * it. + * + * @note An ACE_Handle_Set is not used since the number of handles may + * exceed its capacity (ACE_DEFAULT_SELECT_REACTOR_SIZE). + */ + struct Event_Tuple + { + /// Constructor to set up defaults. + Event_Tuple (ACE_Event_Handler *eh = 0, + ACE_Reactor_Mask m = ACE_Event_Handler::NULL_MASK, + bool is_suspended = false, + bool is_controlled = false); + + /// The event handler. + ACE_Event_Handler *event_handler; + + /// The event mask for the above event handler. + ACE_Reactor_Mask mask; + + /// Flag that states whether or not the event handler is suspended. + bool suspended; + + /// Flag to say whether or not this handle is registered with epoll. + bool controlled; + }; + + + // --------------------------------------------------------------------- + + /** + * @class Handler_Repository + * + * @internal + * + * @brief Used to map ACE_HANDLEs onto the appropriate Event_Tuple. + * + * This class is simply a container that maps a handle to its + * corresponding event tuple. It is not meant for use outside of + * the Dev_Poll_Reactor. + * + * @note Calls to any method in this class, and any modification to a + * Event_Tuple returned from this class's methods, must be made + * while holding the reactor token. + */ + class Handler_Repository + { + public: + + /// Constructor. + Handler_Repository (void); + + /// Initialize a repository that can map handles up to the value @a size. + /// Since the event tuples are accessed directly using the handle as + /// an index, @a size sets the maximum handle value, minus 1. + int open (size_t size); + + /// Close down the repository. + int close (void); + + /** + * @name Repository Manipulation Operations + * + * Methods used to search and modify the handler repository. + */ + //@{ + + /// Return a pointer to the Event_Tuple associated with @a handle. + /// If there is none associated, returns 0 and sets errno. + Event_Tuple *find (ACE_HANDLE handle); + + + /// Bind the ACE_Event_Handler to the @c ACE_HANDLE with the + /// appropriate ACE_Reactor_Mask settings. + int bind (ACE_HANDLE handle, + ACE_Event_Handler *handler, + ACE_Reactor_Mask mask); + + /// Remove the binding for @a handle; optionally decrement the associated + /// handler's reference count. + int unbind (ACE_HANDLE handle, bool decr_refcnt = true); + + /// Remove all the registered tuples. + int unbind_all (void); + + //@} + + /** + * @name Sanity Checking + * + * Methods used to prevent "out-of-range" errors when indexing the + * underlying handler array. + */ + //@{ + + // Check the @a handle to make sure it's a valid @c ACE_HANDLE that + // within the range of legal handles (i.e., greater than or equal to + // zero and less than @c max_size_). + bool invalid_handle (ACE_HANDLE handle) const; + + // Check the handle to make sure it's a valid @c ACE_HANDLE that is + // within the range of currently registered handles (i.e., greater + // than or equal to zero and less than @c max_handlep1_). + bool handle_in_range (ACE_HANDLE handle) const; + + //@} + + /// Returns the current table size. + size_t size (void) const; + + /// Returns the current table size. + size_t max_size (void) const; + + /// Dump the state of an object. + void dump (void) const; + + /// Declare the dynamic allocation hooks. + ACE_ALLOC_HOOK_DECLARE; + + private: + + /// Current number of handles. + int size_; + + /// Maximum number of handles. + int max_size_; + + /// The underlying array of event handlers. + /** + * The array of event handlers is directly indexed directly using + * an @c ACE_HANDLE value. This is Unix-specific. + */ + Event_Tuple *handlers_; + + }; + public: /// Initialize @c ACE_Dev_Poll_Reactor with the default size. @@ -471,7 +430,7 @@ public: * access violations. */ ACE_Dev_Poll_Reactor (size_t size, - int restart = 0, + bool restart = false, ACE_Sig_Handler * = 0, ACE_Timer_Queue * = 0, int disable_notify_pipe = 0, @@ -484,7 +443,7 @@ public: /// Initialization. virtual int open (size_t size, - int restart = 0, + bool restart = false, ACE_Sig_Handler * = 0, ACE_Timer_Queue * = 0, int disable_notify_pipe = 0, @@ -622,8 +581,8 @@ public: ACE_Event_Handler **old_sh = 0, ACE_Sig_Action *old_disp = 0); - /// Registers to handle a set of signals using the - /// . + /// Registers @a new_sh to handle a set of signals @a sigset using the + /// @a new_disp. virtual int register_handler (const ACE_Sig_Set &sigset, ACE_Event_Handler *new_sh, ACE_Sig_Action *new_disp = 0); @@ -647,7 +606,7 @@ public: ACE_Reactor_Mask mask); /** - * Removes all handles in . If @a mask == + * Removes all handles in @a handle_set. If @a mask == * ACE_Event_Handler::DONT_CALL then the method of * the associated s is not invoked. */ @@ -665,7 +624,7 @@ public: ACE_Sig_Action *old_disp = 0, int sigkey = -1); - /// Calls for every signal in . + /// Calls for every signal in @a sigset. virtual int remove_handler (const ACE_Sig_Set &sigset); // = Suspend and resume Handlers. @@ -701,9 +660,9 @@ public: /// the application. virtual int resumable_handler (void); - /// Return 1 if we any event associations were made by the reactor - /// for the handles that it waits on, 0 otherwise. - virtual int uses_event_associations (void); + /// Return true if we any event associations were made by the reactor + /// for the handles that it waits on, false otherwise. + virtual bool uses_event_associations (void); // = Timer management. @@ -793,7 +752,7 @@ public: /** * Set the maximum number of times that ACE_Reactor_Impl will - * iterate and dispatch the that are passed in + * iterate and dispatch the ACE_Event_Handlers that are passed in * via the notify queue before breaking out of its * loop. By default, this is set to * -1, which means "iterate until the queue is empty." Setting this @@ -805,7 +764,7 @@ public: /** * Get the maximum number of times that the ACE_Reactor_Impl will - * iterate and dispatch the that are passed in + * iterate and dispatch the ACE_Event_Handlers that are passed in * via the notify queue before breaking out of its * loop. */ @@ -875,7 +834,7 @@ public: virtual int owner (ACE_thread_t *owner); /// Get the existing restart value. - virtual int restart (void); + virtual bool restart (void); /// Set a new value for restart and return the original value. /** @@ -885,7 +844,7 @@ public: * * @return Returns the previous "restart" value. */ - virtual int restart (int r); + virtual bool restart (bool r); /// Set position of the owner thread. /** @@ -1008,8 +967,12 @@ protected: ACE_Reactor_Mask mask); /// Remove the event handler associated with the given handle and - /// event mask from the "interest set." - int remove_handler_i (ACE_HANDLE handle, ACE_Reactor_Mask mask); + /// event mask from the "interest set." If @a eh is supplied, only + /// do the remove if @eh matches the event handler that's registered + /// for @a handle. + int remove_handler_i (ACE_HANDLE handle, + ACE_Reactor_Mask mask, + ACE_Event_Handler *eh = 0); /// Temporarily remove the given handle from the "interest set." int suspend_handler_i (ACE_HANDLE handle); @@ -1044,29 +1007,25 @@ protected: */ ACE_HANDLE poll_fd_; - /// The maximum number of file descriptors over which demultiplexing - /// will occur. - size_t size_; - - /// Track HANDLES we are interested in for various events that must - /// be dispatched *without* polling. - /// ACE_Dev_Poll_Ready_Set ready_set_; - #if defined (ACE_HAS_EVENT_POLL) - /// Table of event structures to be filled by epoll_wait: - struct epoll_event *events_; - - /// Pointer to the next epoll_event array element that contains the next - /// event to be dispatched. - struct epoll_event *start_pevents_; - - /// The last element in the event array plus one. - /** - * The loop that dispatches IO events stops when this->start_pevents_ == - * this->end_pevents_. - */ - struct epoll_event *end_pevents_; + /// Event structure to be filled by epoll_wait. epoll_wait() only gets + /// one event at a time and we rely on it's internals for fairness. + /// If this struct's fd is ACE_INVALID_HANDLE, the rest is indeterminate. + /// If the fd is good, the event is one that's been retrieved by + /// epoll_wait() but not yet processed. + struct epoll_event event_; + /// Event handlers that are suspended/resumed around upcalls are not + /// immediately resumed; they're added to this list for resumption at + /// the next epoll_wait() call. This avoids always needing to acquire the + /// token just to resume a handler. Of course, if there are no other + /// handlers in the to-be-resumed list and an epoll_wait is already in + /// progress, the reactor needs to be notified to force another run around + /// the epoll_wait() call. + typedef ACE_Array_Map Resume_Map; + Resume_Map to_be_resumed_; + volatile bool epoll_wait_in_progress_; + ACE_SYNCH_MUTEX to_be_resumed_lock_; #else /// The pollfd array that `/dev/poll' will feed its results to. struct pollfd *dp_fds_; @@ -1095,7 +1054,7 @@ protected: ACE_Lock_Adapter lock_adapter_; /// The repository that contains all registered event handlers. - ACE_Dev_Poll_Reactor_Handler_Repository handler_rep_; + Handler_Repository handler_rep_; /// Defined as a pointer to allow overriding by derived classes... ACE_Timer_Queue *timer_queue_; @@ -1132,7 +1091,7 @@ protected: /// Restart the handle_events event loop method automatically when /// polling function in use (ioctl() in this case) is interrupted /// via an EINTR signal. - int restart_; + bool restart_; protected: diff --git a/dep/ACE_wrappers/ace/Dev_Poll_Reactor.inl b/dep/ACE_wrappers/ace/Dev_Poll_Reactor.inl index 96e71f2de..0e72b305c 100644 --- a/dep/ACE_wrappers/ace/Dev_Poll_Reactor.inl +++ b/dep/ACE_wrappers/ace/Dev_Poll_Reactor.inl @@ -1,95 +1,36 @@ // -*- C++ -*- -// -// $Id: Dev_Poll_Reactor.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Dev_Poll_Reactor.inl 91066 2010-07-12 11:05:04Z johnnyw $ #include "ace/Log_Msg.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -ACE_Dev_Poll_Event_Tuple::ACE_Dev_Poll_Event_Tuple (void) - : event_handler (0), - mask (ACE_Event_Handler::NULL_MASK), - suspended (0) +ACE_Dev_Poll_Reactor::Event_Tuple::Event_Tuple (ACE_Event_Handler *eh, + ACE_Reactor_Mask m, + bool is_suspended, + bool is_controlled) + : event_handler (eh), + mask (m), + suspended (is_suspended), + controlled (is_controlled) { } // --------------------------------------------------------------------- -#if 0 -ACE_INLINE -ACE_Dev_Poll_Ready_Set::ACE_Dev_Poll_Ready_Set (void) - : pfds (0), - nfds (0) +ACE_INLINE size_t +ACE_Dev_Poll_Reactor::Handler_Repository::size (void) const { -} -#endif /* 0 */ + ACE_TRACE ("ACE_Dev_Poll_Reactor::Handler_Repository::size"); -// --------------------------------------------------------------------- - -ACE_INLINE void -ACE_Dev_Poll_Reactor_Handler_Repository::mask (ACE_HANDLE handle, - ACE_Reactor_Mask mask) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor_Handler_Repository::mask"); - - // Only bother to search for the handle if it's in range. - if (this->handle_in_range (handle)) - this->handlers_[handle].mask = mask; -} - -ACE_INLINE ACE_Reactor_Mask -ACE_Dev_Poll_Reactor_Handler_Repository::mask (ACE_HANDLE handle) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor_Handler_Repository::mask"); - - ACE_Reactor_Mask mask = ACE_Event_Handler::NULL_MASK; - - // Only bother to search for the handle if it's in range. - if (this->handle_in_range (handle)) - mask = this->handlers_[handle].mask; - - if (mask == ACE_Event_Handler::NULL_MASK) - errno = ENOENT; - - return mask; -} - -ACE_INLINE void -ACE_Dev_Poll_Reactor_Handler_Repository::suspend (ACE_HANDLE handle) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor_Handler_Repository::suspend"); - - // Only bother to search for the handle if it's in range. - if (this->handle_in_range (handle)) - this->handlers_[handle].suspended = 1; -} - -ACE_INLINE void -ACE_Dev_Poll_Reactor_Handler_Repository::resume (ACE_HANDLE handle) -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor_Handler_Repository::resume"); - - // Only bother to search for the handle if it's in range. - if (this->handle_in_range (handle)) - this->handlers_[handle].suspended = 0; -} - -ACE_INLINE int -ACE_Dev_Poll_Reactor_Handler_Repository::suspended (ACE_HANDLE handle) const -{ - ACE_TRACE ("ACE_Dev_Poll_Reactor_Handler_Repository::suspended"); - - if (this->handle_in_range (handle)) - return this->handlers_[handle].suspended; - - return -1; + return this->size_; } ACE_INLINE size_t -ACE_Dev_Poll_Reactor_Handler_Repository::size (void) const +ACE_Dev_Poll_Reactor::Handler_Repository::max_size (void) const { - ACE_TRACE ("ACE_Dev_Poll_Reactor_Handler_Repository::size"); + ACE_TRACE ("ACE_Dev_Poll_Reactor::Handler_Repository::max_size"); return this->max_size_; } @@ -112,33 +53,6 @@ ACE_Dev_Poll_Handler_Guard::ACE_Dev_Poll_Handler_Guard if (do_incr && this->refcounted_) eh->add_reference (); - - /** - * The below comments were here when I replaced the old refcount - * scheme was replaced. They may still need addressing. -Steve Huston - */ - - /** - * @todo Suspend the handler so that other threads will not cause - * an event that is already in an upcall from being dispatched - * again. - * - * @note The naive approach would be to simply call - * suspend_handler_i() on the reactor. However, that would - * cause a system call (write()) to occur. Obviously this - * can potentially have an adverse affect on performance. - * Ideally, the handler would only be marked as "suspended" in - * the handler repository. If an event arrives for a - * suspended handler that event can be "queued" in a - * "handle readiness queue." "Queued" is quoted since a real - * queue need not be used since duplicate events can be - * coalesced, thus avoiding unbounded queue growth. Event - * coalescing is already done by Linux's event poll driver - * (/dev/epoll) so Solaris' poll driver (/dev/poll) is the - * main concern here. The largest the queue can be is the - * same size as the number of handlers stored in the handler - * repository. - */ } ACE_INLINE @@ -146,15 +60,6 @@ ACE_Dev_Poll_Handler_Guard::~ACE_Dev_Poll_Handler_Guard (void) { if (this->refcounted_ && this->eh_ != 0) this->eh_->remove_reference (); - - /** - * The below comments were here when I replaced the old refcount - * scheme was replaced. They may still need addressing. -Steve Huston - */ - /** - * @todo Resume the handler so that other threads will be allowed to - * dispatch the handler. - */ } ACE_INLINE void @@ -172,14 +77,15 @@ ACE_Dev_Poll_Reactor::upcall (ACE_Event_Handler *event_handler, { // If the handler returns positive value (requesting a reactor // callback) just call back as many times as the handler requests - // it. Other threads are off handling other things. + // it. The handler is suspended internally and other threads are off + // handling other things. int status = 0; do { status = (event_handler->*callback) (handle); } - while (status > 0); + while (status > 0 && event_handler != this->notify_handler_); return status; } diff --git a/dep/ACE_wrappers/ace/Dirent.h b/dep/ACE_wrappers/ace/Dirent.h index 2dd5d0a19..7735fb1f2 100644 --- a/dep/ACE_wrappers/ace/Dirent.h +++ b/dep/ACE_wrappers/ace/Dirent.h @@ -4,7 +4,7 @@ /** * @file Dirent.h * - * $Id: Dirent.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Dirent.h 91064 2010-07-12 10:11:24Z johnnyw $ * * Define a portable C++ interface to ACE_OS_Dirent directory-entry * manipulation. @@ -39,17 +39,17 @@ public: /// Default constructor. ACE_Dirent (void); - /// Constructor calls + /// Constructor calls @c opendir() explicit ACE_Dirent (const ACE_TCHAR *dirname); /// Opens the directory named by filename and associates a directory /// stream with it. int open (const ACE_TCHAR *filename); - /// Destructor calls . + /// Destructor calls @c closedir(). ~ACE_Dirent (void); - /// Closes the directory stream and frees the structure. + /// Closes the directory stream and frees the ACE_DIR structure. void close (void); // = Iterator methods. @@ -59,21 +59,21 @@ public: * refers, and positions the directory stream at the next entry, * except on read-only filesystems. It returns a NULL pointer upon * reaching the end of the directory stream, or upon detecting an - * invalid location in the directory. shall not return + * invalid location in the directory. @c read() shall not return * directory entries containing empty names. It is unspecified * whether entries are returned for dot or dot-dot. The pointer - * returned by points to data that may be overwritten by - * another call to on the same directory stream. This - * data shall not be overwritten by another call to on a - * different directory stream. may buffer several - * directory entries per actual read operation; marks for + * returned by @c read() points to data that may be overwritten by + * another call to @c read() on the same directory stream. This + * data shall not be overwritten by another call to @c read() on a + * different directory stream. @c read() may buffer several + * directory entries per actual read operation; @c read() marks for * update the st_atime field of the directory each time the * directory is actually read. */ ACE_DIRENT *read (void); /** - * Has the equivalent functionality as except that an + * Has the equivalent functionality as @c read() except that an * @a entry and @a result buffer must be supplied by the caller to * store the result. */ @@ -86,15 +86,15 @@ public: long tell (void); /** - * Sets the position of the next operation on the + * Sets the position of the next @c read() operation on the * directory stream. The new position reverts to the position - * associated with the directory stream at the time the + * associated with the directory stream at the time the @c tell() * operation that provides loc was performed. Values returned by - * are good only for the lifetime of the pointer from + * @c tell() are good only for the lifetime of the ACE_DIR pointer from * which they are derived. If the directory is closed and then - * reopened, the value may be invalidated due to + * reopened, the @c telldir() value may be invalidated due to * undetected directory compaction. It is safe to use a previous - * value immediately after a call to and before + * @c telldir() value immediately after a call to @c opendir() and before * any calls to readdir. */ void seek (long loc); @@ -103,7 +103,7 @@ public: * Resets the position of the directory stream to the beginning of * the directory. It also causes the directory stream to refer to * the current state of the corresponding directory, as a call to - * would. + * @c opendir() would. */ void rewind (void); diff --git a/dep/ACE_wrappers/ace/Dirent_Selector.cpp b/dep/ACE_wrappers/ace/Dirent_Selector.cpp index 8fcb5775b..c1f480061 100644 --- a/dep/ACE_wrappers/ace/Dirent_Selector.cpp +++ b/dep/ACE_wrappers/ace/Dirent_Selector.cpp @@ -1,4 +1,4 @@ -// $Id: Dirent_Selector.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Dirent_Selector.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/Dirent_Selector.h" @@ -9,10 +9,6 @@ #include "ace/OS_NS_dirent.h" #include "ace/OS_NS_stdlib.h" -ACE_RCSID (ace, - Dirent_Selector, - "$Id: Dirent_Selector.cpp 80826 2008-03-04 14:51:23Z wotte $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL // Construction/Destruction diff --git a/dep/ACE_wrappers/ace/Dump.cpp b/dep/ACE_wrappers/ace/Dump.cpp index 6e5c2d0c3..09ae92600 100644 --- a/dep/ACE_wrappers/ace/Dump.cpp +++ b/dep/ACE_wrappers/ace/Dump.cpp @@ -1,4 +1,4 @@ -// $Id: Dump.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Dump.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/Dump.h" #include "ace/Guard_T.h" @@ -6,7 +6,7 @@ #include "ace/Object_Manager.h" #include "ace/Log_Msg.h" -ACE_RCSID(ace, Dump, "$Id: Dump.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/Dump_T.h b/dep/ACE_wrappers/ace/Dump_T.h index 92b57addc..4186cabf9 100644 --- a/dep/ACE_wrappers/ace/Dump_T.h +++ b/dep/ACE_wrappers/ace/Dump_T.h @@ -4,7 +4,7 @@ /** * @file Dump_T.h * - * $Id: Dump_T.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Dump_T.h 91064 2010-07-12 10:11:24Z johnnyw $ * * @author Doug Schmidt */ @@ -26,7 +26,8 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class ACE_Dumpable_Adapter * - * @brief This class inherits the interface of the abstract ACE_Dumpable + * @brief + * This class inherits the interface of the abstract ACE_Dumpable * class and is instantiated with the implementation of the * concrete component class . * diff --git a/dep/ACE_wrappers/ace/Dynamic.cpp b/dep/ACE_wrappers/ace/Dynamic.cpp index 4eaedad0c..40c1eeec5 100644 --- a/dep/ACE_wrappers/ace/Dynamic.cpp +++ b/dep/ACE_wrappers/ace/Dynamic.cpp @@ -1,4 +1,4 @@ -// $Id: Dynamic.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Dynamic.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/Dynamic.h" #include "ace/Singleton.h" @@ -10,7 +10,7 @@ #include "ace/Dynamic.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ace, Dynamic, "$Id: Dynamic.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/Dynamic_Message_Strategy.cpp b/dep/ACE_wrappers/ace/Dynamic_Message_Strategy.cpp index 9211f3313..b661ca1a7 100644 --- a/dep/ACE_wrappers/ace/Dynamic_Message_Strategy.cpp +++ b/dep/ACE_wrappers/ace/Dynamic_Message_Strategy.cpp @@ -1,3 +1,5 @@ +// $Id: Dynamic_Message_Strategy.cpp 91287 2010-08-05 10:30:49Z johnnyw $ + #include "ace/Dynamic_Message_Strategy.h" #if !defined (__ACE_INLINE__) @@ -9,10 +11,6 @@ #include "ace/Malloc_Base.h" #include "ace/OS_NS_string.h" -ACE_RCSID (ace, - Dynamic_Message_Strategy, - "$Id: Dynamic_Message_Strategy.cpp 80826 2008-03-04 14:51:23Z wotte $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL // ctor @@ -149,7 +147,7 @@ ACE_Deadline_Message_Strategy::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Dynamic_Message_Strategy base class: \n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Dynamic_Message_Strategy base class:\n"))); this->ACE_Dynamic_Message_Strategy::dump (); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nderived class: ACE_Deadline_Message_Strategy\n"))); @@ -192,7 +190,7 @@ ACE_Laxity_Message_Strategy::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Dynamic_Message_Strategy base class: \n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Dynamic_Message_Strategy base class:\n"))); this->ACE_Dynamic_Message_Strategy::dump (); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nderived class: ACE_Laxity_Message_Strategy\n"))); diff --git a/dep/ACE_wrappers/ace/Dynamic_Service_Base.cpp b/dep/ACE_wrappers/ace/Dynamic_Service_Base.cpp index 91eec162c..904c89f36 100644 --- a/dep/ACE_wrappers/ace/Dynamic_Service_Base.cpp +++ b/dep/ACE_wrappers/ace/Dynamic_Service_Base.cpp @@ -1,3 +1,5 @@ +// $Id: Dynamic_Service_Base.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $ + #include "ace/Dynamic_Service_Base.h" #include "ace/ACE.h" #include "ace/Service_Config.h" @@ -6,11 +8,7 @@ #include "ace/Log_Msg.h" -ACE_RCSID (ace, - Dynamic_Service_Base, - "$Id: Dynamic_Service_Base.cpp 80826 2008-03-04 14:51:23Z wotte $") - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_BEGIN_VERSIONED_NAMESPACE_DECL void @@ -82,17 +80,22 @@ ACE_Dynamic_Service_Base::instance (const ACE_Service_Gestalt* repo, { ACE_Guard log_guard (*ACE_Log_Msg::instance ()); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("ACE (%P|%t) DSB::instance, repo=%@, name=%s") - ACE_TEXT (" type=%@ => %@"), - repo->repo_, name, type, obj)); - if (repo->repo_ != repo_found->repo_) - ACE_DEBUG ((LM_DEBUG, + { + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("ACE (%P|%t) DSB::instance, repo=%@, name=%s") + ACE_TEXT (" type=%@ => %@") ACE_TEXT (" [in repo=%@]\n"), + repo->repo_, name, type, obj, repo_found->repo_)); + } else - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); + { + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("ACE (%P|%t) DSB::instance, repo=%@, name=%s") + ACE_TEXT (" type=%@ => %@\n"), + repo->repo_, name, type, obj)); + } } return obj; diff --git a/dep/ACE_wrappers/ace/Dynamic_Service_Base.h b/dep/ACE_wrappers/ace/Dynamic_Service_Base.h index 095e883a8..31fdadaa1 100644 --- a/dep/ACE_wrappers/ace/Dynamic_Service_Base.h +++ b/dep/ACE_wrappers/ace/Dynamic_Service_Base.h @@ -4,7 +4,7 @@ /** * @file Dynamic_Service_Base.h * - * $Id: Dynamic_Service_Base.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Dynamic_Service_Base.h 89454 2010-03-11 09:35:25Z johnnyw $ * * @author Prashant Jain * @author Douglas C. Schmidt @@ -37,7 +37,6 @@ class ACE_Service_Type; */ class ACE_Export ACE_Dynamic_Service_Base { - public: /// Dump the current static of the object void dump (void) const; diff --git a/dep/ACE_wrappers/ace/Dynamic_Service_Dependency.cpp b/dep/ACE_wrappers/ace/Dynamic_Service_Dependency.cpp index df7cd0f5d..32b1a275f 100644 --- a/dep/ACE_wrappers/ace/Dynamic_Service_Dependency.cpp +++ b/dep/ACE_wrappers/ace/Dynamic_Service_Dependency.cpp @@ -1,16 +1,12 @@ +// $Id: Dynamic_Service_Dependency.cpp 91287 2010-08-05 10:30:49Z johnnyw $ + #include "ace/ACE.h" #include "ace/DLL_Manager.h" #include "ace/Dynamic_Service_Dependency.h" #include "ace/Service_Config.h" #include "ace/Log_Msg.h" -ACE_RCSID (ace, - Dynamic_Service_Dependency, - "$Id: Dynamic_Service_Dependency.cpp 80826 2008-03-04 14:51:23Z wotte $") - - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL - +ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_Dynamic_Service_Dependency::ACE_Dynamic_Service_Dependency (const ACE_TCHAR *principal) { diff --git a/dep/ACE_wrappers/ace/Event.cpp b/dep/ACE_wrappers/ace/Event.cpp index ea5f86d99..40eef30b0 100644 --- a/dep/ACE_wrappers/ace/Event.cpp +++ b/dep/ACE_wrappers/ace/Event.cpp @@ -1,4 +1,4 @@ -// $Id: Event.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Event.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/Event.h" @@ -8,7 +8,7 @@ #include "ace/Log_Msg.h" -ACE_RCSID(ace, Event, "$Id: Event.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/Event_Handler.cpp b/dep/ACE_wrappers/ace/Event_Handler.cpp index 9e0a10e6a..fdeacd6d7 100644 --- a/dep/ACE_wrappers/ace/Event_Handler.cpp +++ b/dep/ACE_wrappers/ace/Event_Handler.cpp @@ -1,5 +1,5 @@ // Event_Handler.cpp -// $Id: Event_Handler.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Event_Handler.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/Event_Handler.h" #include "ace/OS_Errno.h" @@ -14,7 +14,7 @@ #include -ACE_RCSID(ace, Event_Handler, "$Id: Event_Handler.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -244,8 +244,6 @@ ACE_Event_Handler::reference_counting_policy (void) return this->reference_counting_policy_; } -//#if !defined (ACE_HAS_WINCE) - ACE_THR_FUNC_RETURN ACE_Event_Handler::read_adapter (void *args) { @@ -299,8 +297,6 @@ ACE_Event_Handler::remove_stdin_handler (ACE_Reactor *reactor, #endif /* ACE_WIN32 */ } -//#endif /* ACE_HAS_WINCE */ - // --------------------------------------------------------------------- ACE_Event_Handler_var::ACE_Event_Handler_var (void) @@ -381,6 +377,8 @@ ACE_Event_Handler_var::reset (ACE_Event_Handler *p) // --------------------------------------------------------------------- ACE_Notification_Buffer::ACE_Notification_Buffer (void) + : eh_ (0), + mask_ (ACE_Event_Handler::NULL_MASK) { ACE_TRACE ("ACE_Notification_Buffer::ACE_Notification_Buffer"); } diff --git a/dep/ACE_wrappers/ace/Event_Handler.h b/dep/ACE_wrappers/ace/Event_Handler.h index 28a762892..417f78578 100644 --- a/dep/ACE_wrappers/ace/Event_Handler.h +++ b/dep/ACE_wrappers/ace/Event_Handler.h @@ -4,7 +4,7 @@ /** * @file Event_Handler.h * - * $Id: Event_Handler.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Event_Handler.h 91066 2010-07-12 11:05:04Z johnnyw $ * * @author Douglas C. Schmidt */ @@ -38,7 +38,8 @@ typedef unsigned long ACE_Reactor_Mask; /** * @class ACE_Event_Handler * - * @brief Provides an abstract interface for handling various types of + * @brief + * Provides an abstract interface for handling various types of * I/O, timer, and signal events. * * Subclasses read/write input/output on an I/O descriptor, @@ -94,9 +95,9 @@ public: // = Get/set priority - // Priorities run from MIN_PRIORITY (which is the "lowest priority") - // to MAX_PRIORITY (which is the "highest priority"). /// Get the priority of the Event_Handler. + /// @note Priorities run from MIN_PRIORITY (which is the "lowest priority") + /// to MAX_PRIORITY (which is the "highest priority"). virtual int priority (void) const; /// Set the priority of the Event_Handler. @@ -114,7 +115,7 @@ public: /** * Called when timer expires. @a current_time represents the current - * time that the was selected for timeout + * time that the Event_Handler was selected for timeout * dispatching and @a act is the asynchronous completion token that * was passed in when was invoked. */ @@ -153,9 +154,8 @@ public: * return a value more than zero and decide to resume the handler * themseleves. * - * @note This method is only useful for the ACE_TP_Reactor. Sad - * that we have to have this method in a class that is supposed to - * be used across different components in ACE. + * @note This method has an affect only when used with the + * ACE_Dev_Poll_Reactor (and then, only on Linux) or the ACE_TP_Reactor. */ virtual int resume_handler (void); @@ -178,8 +178,8 @@ public: * non-sockets (such as ACE_STDIN). This is commonly used in * situations where the Reactor is used to demultiplex read events * on ACE_STDIN on UNIX. Note that @a event_handler must be a - * subclass of ACE_Event_Handler. If the method of - * this event handler returns we default to + * subclass of ACE_Event_Handler. If the get_handle() method of + * this event handler returns ACE_INVALID_HANDLE we default to * reading from ACE_STDIN. */ static ACE_THR_FUNC_RETURN read_adapter (void *event_handler); @@ -194,7 +194,7 @@ public: ACE_Thread_Manager *thr_mgr, int flags = THR_DETACHED); - /// Performs the inverse of the method. + /// Performs the inverse of the register_stdin_handler() method. static int remove_stdin_handler (ACE_Reactor *reactor, ACE_Thread_Manager *thr_mgr); @@ -239,7 +239,8 @@ public: /** * @class Reference_Counting_Policy * - * @brief This policy dictates the reference counting requirements + * @brief + * This policy dictates the reference counting requirements * for the handler. * * This policy allows applications to configure whether it wants the diff --git a/dep/ACE_wrappers/ace/Event_Handler_T.h b/dep/ACE_wrappers/ace/Event_Handler_T.h index 7f81b3474..d86ac3332 100644 --- a/dep/ACE_wrappers/ace/Event_Handler_T.h +++ b/dep/ACE_wrappers/ace/Event_Handler_T.h @@ -4,7 +4,7 @@ /** * @file Event_Handler_T.h * - * $Id: Event_Handler_T.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Event_Handler_T.h 83891 2008-11-28 11:01:50Z johnnyw $ * * @author Douglas C. Schmidt */ @@ -37,7 +37,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * inheritance hierarchy but also would like to integrate with * the ACE_Reactor. Rather than adopt a "mixin" approach, it is * often cleaner to define a template as a subclass of - * ACE_Event_Handler and paramterize it with an operation + * ACE_Event_Handler and parameterize it with an operation * dispatcher type. * When constructing an instantiation of the ACE_Event_Handler_T * object, a set of pointers to member functions must be diff --git a/dep/ACE_wrappers/ace/Exception_Macros.h b/dep/ACE_wrappers/ace/Exception_Macros.h deleted file mode 100644 index bb74b1a21..000000000 --- a/dep/ACE_wrappers/ace/Exception_Macros.h +++ /dev/null @@ -1,55 +0,0 @@ -// -*- C++ -*- - -// ============================================================================ -/** - * @file Exception_Macros.h - * - * $Id: Exception_Macros.h 80826 2008-03-04 14:51:23Z wotte $ - * - * Writing code that is portable between platforms with or without - * native C++ exceptions is hard. The following macros offer some - * help on this task. - * - * @author Nanbor Wang - * @author Aniruddha Gokhale - * @author Carlos O'Ryan - * @author Krishnakumar B , et al. - */ -// ============================================================================ - -// Macros for handling exceptions. - -#ifndef ACE_EXCEPTION_MACROS_H -#define ACE_EXCEPTION_MACROS_H - -#include /**/ "ace/pre.h" - -#include /**/ "ace/config-all.h" - -# if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -# endif /* ACE_LACKS_PRAGMA_ONCE */ - -// By default, if the compiler supports native exception handling, assume -// CORBA also support native exception handling. But it can be disabled by -// defining ACE_CORBA_HAS_EXCEPTIONS=0. If the compiler does not support -// exceptions handling, make sure native exception handling is disabled. -#if defined (ACE_HAS_EXCEPTIONS) -# if defined (ACE_CORBA_HAS_EXCEPTIONS) -# if (ACE_CORBA_HAS_EXCEPTIONS == 0) -# undef ACE_USES_NATIVE_EXCEPTIONS -# else /* ACE_CORBA_HAS_EXCEPTIONS != 0 */ -# define ACE_USES_NATIVE_EXCEPTIONS -# endif /* ACE_CORBA_HAS_EXCEPTIONS == 0 */ -# else -# define ACE_USES_NATIVE_EXCEPTIONS -# define ACE_CORBA_HAS_EXCEPTIONS -# endif /* ACE_CORBA_HAS_EXCEPTIONS */ -#else /* ! ACE_HAS_EXCEPTIONS */ -# undef ACE_CORBA_HAS_EXCEPTIONS -# undef ACE_USES_NATIVE_EXCEPTIONS -#endif /* ACE_HAS_EXCEPTIONS */ - -#include /**/ "ace/post.h" - -#endif /* ACE_EXCEPTION_MACROS_H */ diff --git a/dep/ACE_wrappers/ace/FIFO.cpp b/dep/ACE_wrappers/ace/FIFO.cpp index e3970015c..b564a26c6 100644 --- a/dep/ACE_wrappers/ace/FIFO.cpp +++ b/dep/ACE_wrappers/ace/FIFO.cpp @@ -1,4 +1,4 @@ -// $Id: FIFO.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: FIFO.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/FIFO.h" @@ -12,7 +12,7 @@ #include "ace/OS_NS_sys_stat.h" #include "ace/OS_NS_fcntl.h" -ACE_RCSID(ace, FIFO, "$Id: FIFO.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/FIFO.h b/dep/ACE_wrappers/ace/FIFO.h index 2d590563a..f4836368d 100644 --- a/dep/ACE_wrappers/ace/FIFO.h +++ b/dep/ACE_wrappers/ace/FIFO.h @@ -4,7 +4,7 @@ /** * @file FIFO.h * - * $Id: FIFO.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: FIFO.h 91574 2010-08-30 16:52:24Z shuston $ * * @author Doug Schmidt */ @@ -32,15 +32,24 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * @brief Abstract base class for UNIX FIFOs * * UNIX FIFOs are also known Named Pipes, which are totally - * unrelated to Win32 Named Pipes. If you want to use a local - * IPC mechanism that will be portable to both UNIX and Win32, - * take a look at the classes. + * unrelated to Windows Named Pipes. If you want to use a local + * IPC mechanism that will be portable to both UNIX and Windows, + * take a look at the ACE_Pipe or ACE_SPIPE_Stream classes. */ class ACE_Export ACE_FIFO : public ACE_IPC_SAP { public: - /// Open up the named pipe on the in accordance with the - /// flags. + /** + * Open up the named pipe (FIFO) on the @a rendezvous point in accordance + * with the @a flags. + * + * If @a flags contains @c O_CREAT open() will attempt to call mkfifo() + * to create the FIFO before opening it. In this case, this method + * will not fail simply because the fifo already exists. + * + * @retval 0 for success + * @retval -1 for error; errno contains the error code. + */ int open (const ACE_TCHAR *rendezvous, int flags, mode_t perms, LPSECURITY_ATTRIBUTES sa = 0); @@ -61,14 +70,19 @@ public: ACE_ALLOC_HOOK_DECLARE; protected: - // = Make these protected to ensure that the class is "abstract." + /** + * Protected constructors ensure this class cannot be used directly. + * User code must use ACE_FIFO_Send and/or ACE_FIFO_Recv. + */ + //@{ /// Default constructor. ACE_FIFO (void); - /// Open up the named pipe on the in accordance with the + /// Open up the named pipe on the @a rendezvous in accordance with the /// flags. ACE_FIFO (const ACE_TCHAR *rendezvous, int flags, mode_t perms, LPSECURITY_ATTRIBUTES sa = 0); + //@} private: /// Rendezvous point in the file system. diff --git a/dep/ACE_wrappers/ace/FIFO_Recv.cpp b/dep/ACE_wrappers/ace/FIFO_Recv.cpp index 254e30f21..37700ddaf 100644 --- a/dep/ACE_wrappers/ace/FIFO_Recv.cpp +++ b/dep/ACE_wrappers/ace/FIFO_Recv.cpp @@ -1,4 +1,4 @@ -// $Id: FIFO_Recv.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: FIFO_Recv.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/FIFO_Recv.h" #include "ace/Log_Msg.h" @@ -8,7 +8,7 @@ #include "ace/FIFO_Recv.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ace, FIFO_Recv, "$Id: FIFO_Recv.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/FIFO_Recv.h b/dep/ACE_wrappers/ace/FIFO_Recv.h index c19d102c8..2b6b2f25c 100644 --- a/dep/ACE_wrappers/ace/FIFO_Recv.h +++ b/dep/ACE_wrappers/ace/FIFO_Recv.h @@ -4,7 +4,7 @@ /** * @file FIFO_Recv.h * - * $Id: FIFO_Recv.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: FIFO_Recv.h 91574 2010-08-30 16:52:24Z shuston $ * * @author Doug Schmidt */ @@ -36,7 +36,17 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Export ACE_FIFO_Recv : public ACE_FIFO { public: - // = Initialization methods. + /// @name Initialization methods. + /// + /// Note that @c ACE_NONBLOCK will be added to any @a flags value passed. + /// This causes the open to succeed even if no writer has yet opened the + /// fifo. There is no way to disable this behavior. + /// + /// @arg persistent Means "open fifo for writing, as well as + /// reading." This ensures that the fifo never gets EOF, even if there + /// aren't any writers at the moment! + //@{ + /// Default constructor. ACE_FIFO_Recv (void); @@ -53,8 +63,9 @@ public: mode_t perms = ACE_DEFAULT_FILE_PERMS, int persistent = 1, LPSECURITY_ATTRIBUTES sa = 0); + //@} - /// Close down the named pipe. + /// Close down the fifo. int close (void); /// Recv @a buf of up to @a len bytes. diff --git a/dep/ACE_wrappers/ace/FIFO_Recv_Msg.cpp b/dep/ACE_wrappers/ace/FIFO_Recv_Msg.cpp index f389d03d2..b8580ae31 100644 --- a/dep/ACE_wrappers/ace/FIFO_Recv_Msg.cpp +++ b/dep/ACE_wrappers/ace/FIFO_Recv_Msg.cpp @@ -1,4 +1,4 @@ -// $Id: FIFO_Recv_Msg.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: FIFO_Recv_Msg.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/FIFO_Recv_Msg.h" @@ -8,7 +8,7 @@ #include "ace/FIFO_Recv_Msg.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ace, FIFO_Recv_Msg, "$Id: FIFO_Recv_Msg.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/FIFO_Recv_Msg.h b/dep/ACE_wrappers/ace/FIFO_Recv_Msg.h index 80b7bdda9..6b691e97f 100644 --- a/dep/ACE_wrappers/ace/FIFO_Recv_Msg.h +++ b/dep/ACE_wrappers/ace/FIFO_Recv_Msg.h @@ -4,7 +4,7 @@ /** * @file FIFO_Recv_Msg.h * - * $Id: FIFO_Recv_Msg.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: FIFO_Recv_Msg.h 84480 2009-02-16 18:58:16Z johnnyw $ * * @author Doug Schmidt */ @@ -109,12 +109,12 @@ public: ssize_t recv (void *buf, size_t len); #if defined (ACE_HAS_STREAM_PIPES) - /// Recv and message via Stream pipes. + /// Recv @a data and @a cntl message via Stream pipes. ssize_t recv (ACE_Str_Buf *data, ACE_Str_Buf *cntl, int *flags); - /// Recv and message via Stream pipes in "band" mode. + /// Recv @a data and @a cntl message via Stream pipes in "band" mode. ssize_t recv (int *band, ACE_Str_Buf *data, ACE_Str_Buf *cntl, diff --git a/dep/ACE_wrappers/ace/FIFO_Send.cpp b/dep/ACE_wrappers/ace/FIFO_Send.cpp index 720e63c54..93df476ae 100644 --- a/dep/ACE_wrappers/ace/FIFO_Send.cpp +++ b/dep/ACE_wrappers/ace/FIFO_Send.cpp @@ -1,4 +1,4 @@ -// $Id: FIFO_Send.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: FIFO_Send.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/FIFO_Send.h" #include "ace/Log_Msg.h" @@ -7,7 +7,7 @@ #include "ace/FIFO_Send.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ace, FIFO_Send, "$Id: FIFO_Send.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/FIFO_Send.h b/dep/ACE_wrappers/ace/FIFO_Send.h index cc0fc282f..c6bf60023 100644 --- a/dep/ACE_wrappers/ace/FIFO_Send.h +++ b/dep/ACE_wrappers/ace/FIFO_Send.h @@ -4,7 +4,7 @@ /** * @file FIFO_Send.h * - * $Id: FIFO_Send.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: FIFO_Send.h 91574 2010-08-30 16:52:24Z shuston $ * * @author Doug Schmidt */ @@ -35,7 +35,12 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Export ACE_FIFO_Send : public ACE_FIFO { public: - // = Initialization methods. + /// @name Initialization methods. + /// + /// Note that @c O_WRONLY will be added to any @a flags value passed. + /// Default behavior is to block until a receiver also opens the fifo. + /// To use non-blocking behavior include ACE_NONBLOCK in @a flags. + //@{ /// Default constructor. ACE_FIFO_Send (void); @@ -50,6 +55,7 @@ public: int flags = O_WRONLY, mode_t perms = ACE_DEFAULT_FILE_PERMS, LPSECURITY_ATTRIBUTES sa = 0); + //@} /// Send @a buf of up to @a len bytes. ssize_t send (const void *buf, size_t len); diff --git a/dep/ACE_wrappers/ace/FIFO_Send_Msg.cpp b/dep/ACE_wrappers/ace/FIFO_Send_Msg.cpp index b3bbae00a..a54295c27 100644 --- a/dep/ACE_wrappers/ace/FIFO_Send_Msg.cpp +++ b/dep/ACE_wrappers/ace/FIFO_Send_Msg.cpp @@ -1,4 +1,4 @@ -// $Id: FIFO_Send_Msg.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: FIFO_Send_Msg.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/FIFO_Send_Msg.h" @@ -9,7 +9,7 @@ #include "ace/FIFO_Send_Msg.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ace, FIFO_Send_Msg, "$Id: FIFO_Send_Msg.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/FIFO_Send_Msg.h b/dep/ACE_wrappers/ace/FIFO_Send_Msg.h index 504d89721..434ae1081 100644 --- a/dep/ACE_wrappers/ace/FIFO_Send_Msg.h +++ b/dep/ACE_wrappers/ace/FIFO_Send_Msg.h @@ -4,7 +4,7 @@ /** * @file FIFO_Send_Msg.h * - * $Id: FIFO_Send_Msg.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: FIFO_Send_Msg.h 84480 2009-02-16 18:58:16Z johnnyw $ * * @author Doug Schmidt */ @@ -62,12 +62,12 @@ public: ssize_t send (const void *buf, size_t len); #if defined (ACE_HAS_STREAM_PIPES) - /// Send and message via Stream pipes. + /// Send @a data and @a cntl message via Stream pipes. ssize_t send (const ACE_Str_Buf *data, const ACE_Str_Buf *cntl = 0, int flags = 0); - /// Send and message via Stream pipes in "band" mode. + /// Send @a data and @a cntl message via Stream pipes in "band" mode. ssize_t send (int band, const ACE_Str_Buf *data, const ACE_Str_Buf *cntl = 0, diff --git a/dep/ACE_wrappers/ace/FILE.cpp b/dep/ACE_wrappers/ace/FILE.cpp index 8fe88d1b0..49ff2c1ca 100644 --- a/dep/ACE_wrappers/ace/FILE.cpp +++ b/dep/ACE_wrappers/ace/FILE.cpp @@ -1,4 +1,4 @@ -// $Id: FILE.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: FILE.cpp 91286 2010-08-05 09:04:31Z johnnyw $ /* Defines the member functions for the base class of the ACE_IO_SAP ACE_FILE abstraction. */ @@ -12,7 +12,7 @@ #include "ace/FILE.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ace, FILE, "$Id: FILE.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/FILE_Addr.cpp b/dep/ACE_wrappers/ace/FILE_Addr.cpp index 6d8fbeb77..a20e2a974 100644 --- a/dep/ACE_wrappers/ace/FILE_Addr.cpp +++ b/dep/ACE_wrappers/ace/FILE_Addr.cpp @@ -1,4 +1,4 @@ -// $Id: FILE_Addr.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: FILE_Addr.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/FILE_Addr.h" #include "ace/Lib_Find.h" @@ -11,7 +11,7 @@ #include "ace/FILE_Addr.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ace, FILE_Addr, "$Id: FILE_Addr.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/FILE_Connector.cpp b/dep/ACE_wrappers/ace/FILE_Connector.cpp index b59b1e891..c27a5cec6 100644 --- a/dep/ACE_wrappers/ace/FILE_Connector.cpp +++ b/dep/ACE_wrappers/ace/FILE_Connector.cpp @@ -1,4 +1,4 @@ -// $Id: FILE_Connector.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: FILE_Connector.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/FILE_Connector.h" #include "ace/Handle_Ops.h" @@ -8,7 +8,7 @@ #include "ace/FILE_Connector.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ace, FILE_Connector, "$Id: FILE_Connector.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/FILE_Connector.h b/dep/ACE_wrappers/ace/FILE_Connector.h index c6d396373..624ab3d6a 100644 --- a/dep/ACE_wrappers/ace/FILE_Connector.h +++ b/dep/ACE_wrappers/ace/FILE_Connector.h @@ -4,7 +4,7 @@ /** * @file FILE_Connector.h * - * $Id: FILE_Connector.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: FILE_Connector.h 82723 2008-09-16 09:35:44Z johnnyw $ * * @author Doug Schmidt */ @@ -90,7 +90,7 @@ public: int perms = ACE_DEFAULT_FILE_PERMS); /// Resets any event associations on this handle - int reset_new_handle (ACE_HANDLE handle); + bool reset_new_handle (ACE_HANDLE handle); /// Dump the state of an object. void dump (void) const; diff --git a/dep/ACE_wrappers/ace/FILE_Connector.inl b/dep/ACE_wrappers/ace/FILE_Connector.inl index deab94e00..953f661fb 100644 --- a/dep/ACE_wrappers/ace/FILE_Connector.inl +++ b/dep/ACE_wrappers/ace/FILE_Connector.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: FILE_Connector.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: FILE_Connector.inl 82723 2008-09-16 09:35:44Z johnnyw $ // Creates a Local ACE_FILE. @@ -25,12 +25,11 @@ ACE_FILE_Connector::ACE_FILE_Connector (ACE_FILE_IO &new_io, ACE_TEXT ("ACE_FILE_IO"))); } -ACE_INLINE int -ACE_FILE_Connector::reset_new_handle (ACE_HANDLE handle) +ACE_INLINE bool +ACE_FILE_Connector::reset_new_handle (ACE_HANDLE) { - ACE_UNUSED_ARG (handle); // Nothing to do here since the handle is not a socket - return 0; + return false; } ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/FILE_IO.cpp b/dep/ACE_wrappers/ace/FILE_IO.cpp index d6bf084df..37c412c24 100644 --- a/dep/ACE_wrappers/ace/FILE_IO.cpp +++ b/dep/ACE_wrappers/ace/FILE_IO.cpp @@ -1,4 +1,4 @@ -// $Id: FILE_IO.cpp 82559 2008-08-07 20:23:07Z parsons $ +// $Id: FILE_IO.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/FILE_IO.h" @@ -11,7 +11,7 @@ #include "ace/FILE_IO.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ace, FILE_IO, "$Id: FILE_IO.cpp 82559 2008-08-07 20:23:07Z parsons $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/File_Lock.cpp b/dep/ACE_wrappers/ace/File_Lock.cpp index eeba6f614..b67e8d50e 100644 --- a/dep/ACE_wrappers/ace/File_Lock.cpp +++ b/dep/ACE_wrappers/ace/File_Lock.cpp @@ -1,4 +1,4 @@ -// $Id: File_Lock.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: File_Lock.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/File_Lock.h" #include "ace/Log_Msg.h" @@ -7,7 +7,7 @@ #include "ace/File_Lock.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ace, File_Lock, "$Id: File_Lock.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -26,8 +26,8 @@ ACE_File_Lock::dump (void) const } ACE_File_Lock::ACE_File_Lock (ACE_HANDLE h, - int unlink_in_destructor) - : removed_ (0), + bool unlink_in_destructor) + : removed_ (false), unlink_in_destructor_ (unlink_in_destructor) { // ACE_TRACE ("ACE_File_Lock::ACE_File_Lock"); @@ -41,7 +41,7 @@ ACE_File_Lock::ACE_File_Lock (ACE_HANDLE h, ACE_File_Lock::ACE_File_Lock (const ACE_TCHAR *name, int flags, mode_t perms, - int unlink_in_destructor) + bool unlink_in_destructor) : unlink_in_destructor_ (unlink_in_destructor) { // ACE_TRACE ("ACE_File_Lock::ACE_File_Lock"); @@ -59,7 +59,7 @@ ACE_File_Lock::open (const ACE_TCHAR *name, mode_t perms) { // ACE_TRACE ("ACE_File_Lock::open"); - this->removed_ = 0; + this->removed_ = false; return ACE_OS::flock_init (&this->lock_, flags, name, perms); } diff --git a/dep/ACE_wrappers/ace/File_Lock.h b/dep/ACE_wrappers/ace/File_Lock.h index 12f8ed64f..4cd58fcd1 100644 --- a/dep/ACE_wrappers/ace/File_Lock.h +++ b/dep/ACE_wrappers/ace/File_Lock.h @@ -4,7 +4,7 @@ /** * @file File_Lock.h * - * $Id: File_Lock.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: File_Lock.h 91064 2010-07-12 10:11:24Z johnnyw $ * * @author Douglas C. Schmidt */ @@ -44,15 +44,15 @@ public: * zero value for . */ ACE_File_Lock (ACE_HANDLE handle = ACE_INVALID_HANDLE, - int unlink_in_destructor = 1); + bool unlink_in_destructor = true); /// Open the @a filename with @a flags and @a mode and set the result /// to . If you don't want the file unlinked in the - /// destructor pass a zero value for . + /// destructor pass a false value for @a unlink_in_destructor. ACE_File_Lock (const ACE_TCHAR *filename, int flags, mode_t mode = 0, - int unlink_in_destructor = 1); + bool unlink_in_destructor = true); /// Open the @a filename with @a flags and @a mode and set the result to /// . @@ -64,12 +64,12 @@ public: ~ACE_File_Lock (void); /// Remove a File lock by releasing it and closing down the - /// . If is non-0 then we unlink the file. - int remove (int unlink_file = 1); + /// . If @a unlink_file is true then we unlink the file. + int remove (bool unlink_file = true); /** * Note, for interface uniformity with other synchronization - * wrappers we include the method. This is implemented as + * wrappers we include the acquire() method. This is implemented as * a write-lock to be on the safe-side... */ int acquire (short whence = 0, ACE_OFF_T start = 0, ACE_OFF_T len = 1); @@ -125,10 +125,10 @@ public: /** * Set underlying ACE_HANDLE. Note that this method assumes - * ownership of the and will close it down in . If - * you want the to stay open when is called make - * sure to call on the before closing it. You are - * responsible for the closing the existing before + * ownership of the @a handle and will close it down in . If + * you want the @a handle to stay open when is called make + * sure to call on the @a handle before closing it. You are + * responsible for the closing the existing @a handle before * overwriting it. */ void set_handle (ACE_HANDLE); @@ -148,11 +148,11 @@ protected: /// destructor. This flag isn't protected by a lock, so make sure /// that you don't have multiple threads simultaneously calling /// on the same object, which is a bad idea anyway... - int removed_; + bool removed_; /// Keeps track of whether to unlink the underlying file in the /// destructor. - int unlink_in_destructor_; + bool const unlink_in_destructor_; private: // = Prevent assignment and initialization. diff --git a/dep/ACE_wrappers/ace/File_Lock.inl b/dep/ACE_wrappers/ace/File_Lock.inl index 20b000392..cf0cefed1 100644 --- a/dep/ACE_wrappers/ace/File_Lock.inl +++ b/dep/ACE_wrappers/ace/File_Lock.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: File_Lock.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: File_Lock.inl 87213 2009-10-23 13:11:34Z johnnyw $ ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -63,15 +63,15 @@ ACE_File_Lock::release (short whence, ACE_OFF_T start, ACE_OFF_T len) } ACE_INLINE int -ACE_File_Lock::remove (int unlink_file) +ACE_File_Lock::remove (bool unlink_file) { // ACE_TRACE ("ACE_File_Lock::remove"); int result = 0; - if (this->removed_ == 0) + if (!this->removed_) { - this->removed_ = 1; + this->removed_ = true; result = ACE_OS::flock_destroy (&this->lock_, unlink_file); } @@ -90,7 +90,7 @@ ACE_File_Lock::set_handle (ACE_HANDLE h) { // ACE_TRACE ("ACE_File_Lock::set_handle"); this->lock_.handle_ = h; - this->removed_ = 0; + this->removed_ = false; } ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/Filecache.cpp b/dep/ACE_wrappers/ace/Filecache.cpp index 3a7e3da0a..7a9615bb5 100644 --- a/dep/ACE_wrappers/ace/Filecache.cpp +++ b/dep/ACE_wrappers/ace/Filecache.cpp @@ -1,4 +1,4 @@ -// $Id: Filecache.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Filecache.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $ #include "ace/Filecache.h" #include "ace/Object_Manager.h" @@ -11,10 +11,6 @@ #include "ace/OS_NS_fcntl.h" #include "ace/Truncate.h" -ACE_RCSID (ace, - Filecache, - "$Id: Filecache.cpp 80826 2008-03-04 14:51:23Z wotte $") - #if defined (ACE_WIN32) // Specifies no sharing flags. #define R_MASK ACE_DEFAULT_OPEN_PERMS @@ -738,15 +734,7 @@ ACE_Filecache_Object::update (void) const if (ACE_OS::stat (this->filename_, &statbuf) == -1) result = 1; else - // non-portable code may follow -#if defined (ACE_HAS_WINCE) - // Yup, non-portable... there's probably a way to safely implement - // difftime() on WinCE, but for now, this will have to do. It flags - // every file as having changed since cached. - result = 1; -#else result = ACE_OS::difftime (this->stat_.st_mtime, statbuf.st_mtime) < 0; -#endif /* ACE_HAS_WINCE */ return result; } diff --git a/dep/ACE_wrappers/ace/Filecache.h b/dep/ACE_wrappers/ace/Filecache.h index 60b8a90f6..9165a70fc 100644 --- a/dep/ACE_wrappers/ace/Filecache.h +++ b/dep/ACE_wrappers/ace/Filecache.h @@ -4,7 +4,7 @@ /** * @file Filecache.h * - * $Id: Filecache.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Filecache.h 91066 2010-07-12 11:05:04Z johnnyw $ * * @author James Hu */ @@ -41,7 +41,8 @@ class ACE_Filecache_Object; /** * @class ACE_Filecache_Handle * - * @brief Abstraction over a real file. This is meant to be the entry + * @brief + * Abstraction over a real file. This is meant to be the entry * point into the Cached Virtual Filesystem. * * This is a cached filesystem implementation based loosely on the @@ -143,7 +144,7 @@ private: /// A reference to the low level instance. ACE_Filecache_Object *file_; - /// A 'd version of the one from . + /// A dup'd version of the one from file_. ACE_HANDLE handle_; int mapit_; @@ -157,7 +158,8 @@ typedef ACE_Hash_Map_Entry ACE_Fileca /** * @class ACE_Filecache * - * @brief A hash table holding the information about entry point into + * @brief + * A hash table holding the information about entry point into * the Cached Virtual Filesystem. On insertion, the reference * count is incremented. On destruction, reference count is * decremented. @@ -231,7 +233,8 @@ private: /** * @class ACE_Filecache_Object * - * @brief Abstraction over a real file. This is what the Virtual + * @brief + * Abstraction over a real file. This is what the Virtual * Filesystem contains. This class is not intended for general * consumption. Please consult a physician before attempting to * use this class. diff --git a/dep/ACE_wrappers/ace/Flag_Manip.cpp b/dep/ACE_wrappers/ace/Flag_Manip.cpp index f9ac4083f..6a4975798 100644 --- a/dep/ACE_wrappers/ace/Flag_Manip.cpp +++ b/dep/ACE_wrappers/ace/Flag_Manip.cpp @@ -1,4 +1,4 @@ -// $Id: Flag_Manip.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Flag_Manip.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $ #include "ace/Flag_Manip.h" @@ -15,10 +15,6 @@ # include "ace/os_include/os_termios.h" #endif /* CYGWIN32 */ -ACE_RCSID (ace, - Flag_Manip, - "$Id: Flag_Manip.cpp 80826 2008-03-04 14:51:23Z wotte $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL // Flags are file status flags to turn on. diff --git a/dep/ACE_wrappers/ace/Framework_Component.cpp b/dep/ACE_wrappers/ace/Framework_Component.cpp index 48d304359..dae19a13d 100644 --- a/dep/ACE_wrappers/ace/Framework_Component.cpp +++ b/dep/ACE_wrappers/ace/Framework_Component.cpp @@ -1,5 +1,5 @@ // Framework_Component.cpp -// $Id: Framework_Component.cpp 82238 2008-07-02 12:05:46Z sma $ +// $Id: Framework_Component.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/Framework_Component.h" @@ -13,7 +13,7 @@ #include "ace/Recursive_Thread_Mutex.h" #include "ace/OS_NS_string.h" -ACE_RCSID(ace, Framework_Component, "$Id: Framework_Component.cpp 82238 2008-07-02 12:05:46Z sma $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -144,7 +144,7 @@ ACE_Framework_Repository::register_component (ACE_Framework_Component *fc) if (i < this->total_size_) { this->component_vector_[i] = fc; - this->current_size_++; + ++this->current_size_; return 0; } diff --git a/dep/ACE_wrappers/ace/Free_List.h b/dep/ACE_wrappers/ace/Free_List.h index 3d429dcaf..7f2ce593c 100644 --- a/dep/ACE_wrappers/ace/Free_List.h +++ b/dep/ACE_wrappers/ace/Free_List.h @@ -4,7 +4,7 @@ /** * @file Free_List.h * - * $Id: Free_List.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Free_List.h 84619 2009-02-26 12:26:16Z johnnyw $ * * @author Darrell Brunsch (brunsch@cs.wustl.edu) */ @@ -73,8 +73,8 @@ public: /** * Constructor takes a @a mode (i.e., ACE_FREE_LIST_WITH_POOL or * ACE_PURE_FREE_LIST), a count of the number of nodes to - * , a low and high water mark ( and ) that - * indicate when to allocate more nodes, an increment value () + * @a prealloc, a low and high water mark (@a lwm and @a hwm) that + * indicate when to allocate more nodes, an increment value (@a inc) * that indicates how many nodes to allocate when the list must * grow. */ diff --git a/dep/ACE_wrappers/ace/Functor.cpp b/dep/ACE_wrappers/ace/Functor.cpp index 429aaac9f..4f12670e8 100644 --- a/dep/ACE_wrappers/ace/Functor.cpp +++ b/dep/ACE_wrappers/ace/Functor.cpp @@ -3,7 +3,7 @@ /** * @file Functor.cpp * - * $Id: Functor.cpp 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Functor.cpp 91286 2010-08-05 09:04:31Z johnnyw $ * * Non-inlinable method definitions for non-templatized classes * and template specializations implementing the GOF Command Pattern, @@ -32,7 +32,7 @@ #include "ace/Functor.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ace, Functor, "$Id: Functor.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/Functor.h b/dep/ACE_wrappers/ace/Functor.h index 8504cf076..ec1d28506 100644 --- a/dep/ACE_wrappers/ace/Functor.h +++ b/dep/ACE_wrappers/ace/Functor.h @@ -4,7 +4,7 @@ /** * @file Functor.h * - * $Id: Functor.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Functor.h 86698 2009-09-13 15:58:17Z johnnyw $ * * Non-templatized classes and class template specializations for * implementing function objects that are used in various places @@ -89,8 +89,6 @@ template class ACE_Equal_To; template class ACE_Less_Than; /** - * @class ACE_Hash - * * @brief Function object for hashing a char */ template<> @@ -102,8 +100,6 @@ public: }; /** - * @class ACE_Hash - * * @brief Function object for hashing a signed char */ template<> @@ -115,8 +111,6 @@ public: }; /** - * @class ACE_Hash - * * @brief Function object for hashing an unsigned char */ template<> @@ -131,8 +125,6 @@ public: // @@ ADD HASHES FOR ACE TYPES /** - * @class ACE_Hash - * * @brief Function object for hashing a 16-bit signed number */ template<> @@ -144,8 +136,6 @@ public: }; /** - * @class ACE_Hash - * * @brief Function object for hashing a 16-bit unsigned number */ template<> @@ -157,8 +147,6 @@ public: }; /** - * @class ACE_Hash - * * @brief Function object for hashing a 32-bit signed number */ template<> @@ -170,8 +158,6 @@ public: }; /** - * @class ACE_Hash - * * @brief Function object for hashing a 32-bit unsigned number */ template<> @@ -183,8 +169,6 @@ public: }; /** - * @class ACE_Hash - * * @brief Function object for hashing a 64-bit unsigned number */ template<> @@ -199,8 +183,6 @@ public: #endif /** - * @class ACE_Hash - * * @brief Function object for hashing a short number */ template<> @@ -212,8 +194,6 @@ public: }; /** - * @class ACE_Hash - * * @brief Function object for hashing an unsigned short number */ template<> @@ -225,8 +205,6 @@ public: }; /** - * @class ACE_Hash - * * @brief Function object for hashing an int number */ template<> @@ -238,8 +216,6 @@ public: }; /** - * @class ACE_Hash - * * @brief Function object for hashing an unsigned int number */ template<> @@ -251,8 +227,6 @@ public: }; /** - * @class ACE_Hash - * * @brief Function object for hashing a long number */ template<> @@ -264,8 +238,6 @@ public: }; /** - * @class ACE_Hash - * * @brief Function object for hashing an unsigned long number */ template<> @@ -278,8 +250,6 @@ public: #if !defined (ACE_LACKS_LONGLONG_T) && (ACE_SIZEOF_LONG < 8) /** - * @class ACE_Hash - * * @brief Function object for hashing a signed 64-bit number */ template<> @@ -295,8 +265,6 @@ public: // emulation for it in ACE_U_LongLong. #if (ACE_SIZEOF_LONG < 8) /** - * @class ACE_Hash - * * @brief Function object for hashing an unsigned 64-bit number */ template<> @@ -309,8 +277,6 @@ public: #endif /* ACE_SIZEOF_LONG < 8 */ /** - * @class ACE_Hash - * * @brief Function object for hashing a const string */ template<> @@ -322,8 +288,6 @@ public: }; /** - * @class ACE_Hash - * * @brief Function object for hashing a string */ template<> @@ -335,8 +299,6 @@ public: }; /** - * @class ACE_Hash - * * @brief Function object for hashing a void * */ template<> @@ -347,8 +309,6 @@ public: }; /** - * @class ACE_Equal_To - * * @brief Function object for determining whether two const strings are equal. */ template<> @@ -361,8 +321,6 @@ public: }; /** - * @class ACE_Equal_To - * * @brief Function object for determining whether two non-const * strings are equal. */ @@ -376,8 +334,6 @@ public: }; /** - * @class ACE_Equal_To - * * @brief Function object for determining whether two unsigned * 16 bit ints are equal. */ @@ -391,8 +347,6 @@ public: }; /** - * @class ACE_Equal_To - * * @brief Function object for determining whether two * 16 bit ints are equal. */ @@ -406,8 +360,6 @@ public: }; /** - * @class ACE_Equal_To - * * @brief Function object for determining whether two unsigned * 32 bit ints are equal. */ @@ -421,8 +373,6 @@ public: }; /** - * @class ACE_Equal_To - * * @brief Function object for determining whether two * 32 bit ints are equal. */ @@ -436,8 +386,6 @@ public: }; /** - * @class ACE_Equal_To - * * @brief Function object for determining whether two unsigned * 64 bit ints are equal. */ @@ -451,8 +399,6 @@ public: }; /** - * @class ACE_Less_Than - * * @brief Function object for determining whether the first const string * is less than the second const string. */ @@ -466,8 +412,6 @@ public: }; /** - * @class ACE_Less_Than - * * @brief Function object for determining whether the first string * is less than the second string. */ @@ -484,8 +428,6 @@ public: # if ! defined (ACE_LACKS_NATIVE_WCHAR_T) /** - * @class ACE_Hash - * * @brief Function object for hashing a wchar_t */ template<> @@ -497,8 +439,6 @@ public: }; # endif /* ACE_LACKS_NATIVE_WCHAR_T */ /** - * @class ACE_Hash - * * @brief Function object for hashing a const string */ template<> @@ -510,8 +450,6 @@ public: }; /** - * @class ACE_Hash - * * @brief Function object for hashing a string */ template<> @@ -523,8 +461,6 @@ public: }; /** - * @class ACE_Equal_To - * * @brief Function object for determining whether two const strings are equal. */ template<> @@ -537,8 +473,6 @@ public: }; /** - * @class ACE_Equal_To - * * @brief Function object for determining whether two non-const * strings are equal. */ @@ -552,8 +486,6 @@ public: }; /** - * @class ACE_Less_Than - * * @brief Function object for determining whether the first const string * is less than the second const string. */ @@ -567,8 +499,6 @@ public: }; /** - * @class ACE_Less_Than - * * @brief Function object for determining whether the first string * is less than the second string. */ diff --git a/dep/ACE_wrappers/ace/Functor_String.cpp b/dep/ACE_wrappers/ace/Functor_String.cpp index c113f5cdf..055e83a06 100644 --- a/dep/ACE_wrappers/ace/Functor_String.cpp +++ b/dep/ACE_wrappers/ace/Functor_String.cpp @@ -1,7 +1,9 @@ +// $Id: Functor_String.cpp 91287 2010-08-05 10:30:49Z johnnyw $ + #include "ace/Functor_String.h" #if !defined (__ACE_INLINE__) #include "ace/Functor_String.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ace, Functor, "$Id: Functor_String.cpp 80826 2008-03-04 14:51:23Z wotte $") + diff --git a/dep/ACE_wrappers/ace/Functor_String.h b/dep/ACE_wrappers/ace/Functor_String.h index 6070fcf1b..2adf561a6 100644 --- a/dep/ACE_wrappers/ace/Functor_String.h +++ b/dep/ACE_wrappers/ace/Functor_String.h @@ -4,7 +4,7 @@ /** * @file Functor_String.h * - * $Id: Functor_String.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Functor_String.h 86698 2009-09-13 15:58:17Z johnnyw $ * * Class template specializations for ACE_*String types implementing * function objects that are used in various places in ATC. They @@ -40,8 +40,6 @@ template class ACE_Equal_To; template class ACE_Less_Than; /** - * @class ACE_Equal_To - * * @brief Function object for determining whether two ACE_CStrings are * equal. */ @@ -55,8 +53,6 @@ public: /** - * @class ACE_Hash - * * @brief Function object for hashing a ACE_CString */ template<> @@ -69,8 +65,6 @@ public: /** - * @class ACE_Less_Than - * * @brief Function object for determining whether the first const string * is less than the second const string. */ @@ -87,9 +81,7 @@ public: #if defined (ACE_USES_WCHAR) /** - * @class ACE_Equal_To - * - * @brief Function object for determining whether two ACE_CStrings are + * @brief Function object for determining whether two ACE_WStrings are * equal. */ template<> @@ -102,8 +94,6 @@ public: /** - * @class ACE_Hash - * * @brief Function object for hashing a ACE_WString */ template<> @@ -115,10 +105,8 @@ public: }; /** - * @class ACE_Less_Than - * - * @brief Function object for determining whether the first const string - * is less than the second const string. + * @brief Function object for determining whether the first const wstring + * is less than the second const wstring. */ template<> class ACE_Export ACE_Less_Than diff --git a/dep/ACE_wrappers/ace/Functor_T.h b/dep/ACE_wrappers/ace/Functor_T.h index f055c3c88..ff087d201 100644 --- a/dep/ACE_wrappers/ace/Functor_T.h +++ b/dep/ACE_wrappers/ace/Functor_T.h @@ -4,7 +4,7 @@ /** * @file Functor_T.h * - * $Id: Functor_T.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Functor_T.h 91396 2010-08-19 12:37:24Z johnnyw $ * * Templatized classes for implementing function objects that are * used in various places in ACE. There are currently two major @@ -47,7 +47,8 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class ACE_Command_Callback * - * @brief Defines a class template that allows us to invoke a GOF + * @brief + * Defines a class template that allows us to invoke a GOF * command style callback to an object without knowing anything * about the object except its type. * @@ -60,14 +61,14 @@ template class ACE_Command_Callback : public ACE_Command_Base { public: - /// Constructor: sets the of the Command to recvr, and the - /// of the Command to . + /// Constructor: sets the @c receiver_ of the Command to @a recvr, and the + /// @c action_ of the Command to @a action. ACE_Command_Callback (RECEIVER &recvr, ACTION action); /// Virtual destructor. virtual ~ACE_Command_Callback (void); - /// Invokes the method from the object . + /// Invokes the method @c action_ from the object @c receiver_. virtual int execute (void *arg = 0); private: @@ -98,7 +99,8 @@ public: /** * @class ACE_Pointer_Hash * - * @brief Function object for hashing pointers + * @brief + * Function object for hashing pointers */ template class ACE_Pointer_Hash @@ -111,7 +113,8 @@ public: /** * @class ACE_Equal_To * - * @brief Function object for comparing two objects of + * @brief + * Function object for comparing two objects of * the given type for equality. */ template @@ -126,7 +129,8 @@ public: /** * @class ACE_Less_Than * - * @brief Function object for determining whether the first object of + * @brief + * Function object for determining whether the first object of * the given type is less than the second object of the same * type. */ diff --git a/dep/ACE_wrappers/ace/Future.cpp b/dep/ACE_wrappers/ace/Future.cpp index e3693bd29..e38ec06d6 100644 --- a/dep/ACE_wrappers/ace/Future.cpp +++ b/dep/ACE_wrappers/ace/Future.cpp @@ -1,4 +1,4 @@ - // $Id: Future.cpp 80826 2008-03-04 14:51:23Z wotte $ + // $Id: Future.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #ifndef ACE_FUTURE_CPP #define ACE_FUTURE_CPP @@ -9,8 +9,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -ACE_RCSID (ace, Future, "$Id: Future.cpp 80826 2008-03-04 14:51:23Z wotte $") - #if defined (ACE_HAS_THREADS) # include "ace/Guard_T.h" @@ -54,7 +52,7 @@ ACE_Future_Rep::dump (void) const ACE_DEBUG ((LM_DEBUG, "ref_count_ = %d\n", (int) this->ref_count_)); - ACE_DEBUG ((LM_INFO,"value_: \n")); + ACE_DEBUG ((LM_INFO,"value_:\n")); if (this->value_) ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" (NON-NULL)\n"))); else @@ -62,9 +60,9 @@ ACE_Future_Rep::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" (NULL)\n"))); //FUZZ: enable check_for_NULL - ACE_DEBUG ((LM_INFO,"value_ready_: \n")); + ACE_DEBUG ((LM_INFO,"value_ready_:\n")); this->value_ready_.dump (); - ACE_DEBUG ((LM_INFO,"value_ready_mutex_: \n")); + ACE_DEBUG ((LM_INFO,"value_ready_mutex_:\n")); this->value_ready_mutex_.dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ @@ -328,8 +326,7 @@ template int ACE_Future::cancel (const T &r) { this->cancel (); - return this->future_rep_->set (r, - *this); + return this->future_rep_->set (r, *this); } template int @@ -346,8 +343,7 @@ template int ACE_Future::set (const T &r) { // Give the pointer to the result to the ACE_Future_Rep. - return this->future_rep_->set (r, - *this); + return this->future_rep_->set (r, *this); } template int diff --git a/dep/ACE_wrappers/ace/Future_Set.cpp b/dep/ACE_wrappers/ace/Future_Set.cpp index fceca83dd..a40b0700d 100644 --- a/dep/ACE_wrappers/ace/Future_Set.cpp +++ b/dep/ACE_wrappers/ace/Future_Set.cpp @@ -1,4 +1,4 @@ -// $Id: Future_Set.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Future_Set.cpp 88128 2009-12-14 02:17:22Z schmidt $ #ifndef ACE_FUTURE_SET_CPP #define ACE_FUTURE_SET_CPP @@ -71,7 +71,7 @@ ACE_Future_Set::insert (ACE_Future &future) // If a new map entry was created, then attach to the future, // otherwise we were already attached to the future or some error // occurred so just delete the future holder. - if ( result == 0 ) + if (result == 0) // Attach ourself to the ACE_Futures list of observer future.attach (this); else diff --git a/dep/ACE_wrappers/ace/Future_Set.h b/dep/ACE_wrappers/ace/Future_Set.h index a954d2997..3d07f4f73 100644 --- a/dep/ACE_wrappers/ace/Future_Set.h +++ b/dep/ACE_wrappers/ace/Future_Set.h @@ -4,7 +4,7 @@ /** * @file Future_Set.h * - * $Id: Future_Set.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Future_Set.h 88128 2009-12-14 02:17:22Z schmidt $ * * @author John Tucker */ @@ -31,14 +31,14 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class ACE_Future_Set * - * @brief This class implements a mechanism which allows the values of + * @brief This class implements a mechanism that allows the values of * a collection of ACE_Future objects to be accessed by reader threads * as they become available. The caller(s) provide the ACE_Future_Set * (i.e. the observer...) with the collection of ACE_Future objects - * (i.e. the subjects...) that are to be observed using the - * the ACE_Future_Set::insert() method. The caller(s) may then iterate - * over the collection in the order in which they become readable using - * the ACE_Future_Set::next_readable() method. + * (i.e. the subjects...) that are to be observed using the the + * ACE_Future_Set::insert() method. The caller(s) may then iterate + * over the collection in the order in which they become readable + * using the ACE_Future_Set::next_readable() method. */ template class ACE_Future_Set : public ACE_Future_Observer diff --git a/dep/ACE_wrappers/ace/GNUmakefile b/dep/ACE_wrappers/ace/GNUmakefile deleted file mode 100644 index 138ff5e47..000000000 --- a/dep/ACE_wrappers/ace/GNUmakefile +++ /dev/null @@ -1,83 +0,0 @@ -# -*- makefile -*- -#---------------------------------------------------------------------------- -# GNU ACE Workspace -# -# $Id: GNUACEWorkspaceCreator.pm 80826 2008-03-04 14:51:23Z wotte $ -# -# This file was generated by MPC. Any changes made directly to -# this file will be lost the next time it is generated. -# -# MPC Command: -# /export/anduriltmp/bczar/DOC_ROOT/stage-10168/ACE_wrappers/bin/mwc.pl -type gnuace -exclude "TAO/TAO_*.mwc,TAO/CIAO/CIAO_*.mwc" -recurse -hierarchy -relative ACE_ROOT=/export/anduriltmp/bczar/DOC_ROOT/stage-10168/ACE_wrappers -relative TAO_ROOT=/export/anduriltmp/bczar/DOC_ROOT/stage-10168/ACE_wrappers/TAO -relative CIAO_ROOT=/export/anduriltmp/bczar/DOC_ROOT/stage-10168/ACE_wrappers/TAO/CIAO -# -#---------------------------------------------------------------------------- - -MAKEFILE = GNUmakefile - -ifeq ($(findstring k,$(MAKEFLAGS)),k) - KEEP_GOING = - -endif - -include $(ACE_ROOT)/include/makeinclude/macros.GNU - -all: ACE ACE_FlReactor ACE_Qt3Reactor ACE_TkReactor ACE_XtReactor ACE_ETCL ACE_ETCL_Parser Monitor_Control-target SSL-target - -REMAINING_TARGETS := $(subst all, , $(TARGETS_NESTED:.nested=)) $(CUSTOM_TARGETS) - -$(REMAINING_TARGETS): - @$(MAKE) -f GNUmakefile.ACE $(@) - @$(MAKE) -f GNUmakefile.ACE_FlReactor $(@) - @$(MAKE) -f GNUmakefile.ACE_Qt3Reactor $(@) - @$(MAKE) -f GNUmakefile.ACE_TkReactor $(@) - @$(MAKE) -f GNUmakefile.ACE_XtReactor $(@) - @cd ETCL && $(MAKE) -f GNUmakefile.ACE_ETCL $(@) - @cd ETCL && $(MAKE) -f GNUmakefile.ACE_ETCL_Parser $(@) - @cd Monitor_Control && $(MAKE) -f GNUmakefile.Monitor_Control $(@) - @cd SSL && $(MAKE) -f GNUmakefile.SSL $(@) - -.PHONY: ACE -ACE: - @$(MAKE) -f GNUmakefile.ACE all - -.PHONY: ACE_FlReactor -ACE_FlReactor: ACE - @$(MAKE) -f GNUmakefile.ACE_FlReactor all - -.PHONY: ACE_Qt3Reactor -ACE_Qt3Reactor: ACE - @$(MAKE) -f GNUmakefile.ACE_Qt3Reactor all - -.PHONY: ACE_TkReactor -ACE_TkReactor: ACE - @$(MAKE) -f GNUmakefile.ACE_TkReactor all - -.PHONY: ACE_XtReactor -ACE_XtReactor: ACE - @$(MAKE) -f GNUmakefile.ACE_XtReactor all - -.PHONY: ACE_ETCL -ACE_ETCL: ACE - @cd ETCL && $(MAKE) -f GNUmakefile.ACE_ETCL all - -.PHONY: ACE_ETCL_Parser -ACE_ETCL_Parser: ACE ACE_ETCL - @cd ETCL && $(MAKE) -f GNUmakefile.ACE_ETCL_Parser all - -.PHONY: Monitor_Control-target -Monitor_Control-target: ACE ACE_ETCL ACE_ETCL_Parser - @cd Monitor_Control && $(MAKE) -f GNUmakefile.Monitor_Control all - -.PHONY: SSL-target -SSL-target: ACE - @cd SSL && $(MAKE) -f GNUmakefile.SSL all - -project_name_list: - @echo ACE_ETCL - @echo ACE_ETCL_Parser - @echo ACE - @echo ACE_FlReactor - @echo ACE_Qt3Reactor - @echo ACE_TkReactor - @echo ACE_XtReactor - @echo Monitor_Control-target - @echo SSL-target diff --git a/dep/ACE_wrappers/ace/GNUmakefile.ACE b/dep/ACE_wrappers/ace/GNUmakefile.ACE deleted file mode 100644 index b559137be..000000000 --- a/dep/ACE_wrappers/ace/GNUmakefile.ACE +++ /dev/null @@ -1,485 +0,0 @@ -# -*- Makefile -*- -#---------------------------------------------------------------------------- -# GNU Makefile -# -# @file GNUmakefile.ACE -# -# $Id: gnu.mpd 82648 2008-08-21 06:55:54Z johnnyw $ -# -# This file was automatically generated by MPC. Any changes made directly to -# this file will be lost the next time it is generated. -# -#---------------------------------------------------------------------------- -MAKEFILE = GNUmakefile.ACE -DEPENDENCY_FILE = .depend.ACE - -## LIB may be set to empty later on in this file -LIB_UNCHECKED = libACE.a -LIB = $(LIB_UNCHECKED) -LIB_NAME = libACE - -## SHLIB may be set to empty later on in this file -SHLIB_UNCHECKED = libACE.$(SOEXT) -SHLIB = $(SHLIB_UNCHECKED) - -FILES = \ - Local_Name_Space.cpp \ - Name_Proxy.cpp \ - Name_Request_Reply.cpp \ - Name_Space.cpp \ - Naming_Context.cpp \ - Registry_Name_Space.cpp \ - Remote_Name_Space.cpp \ - NT_Service.cpp \ - Codecs.cpp \ - Local_Tokens.cpp \ - Remote_Tokens.cpp \ - Token_Collection.cpp \ - Token_Invariants.cpp \ - Token_Manager.cpp \ - Token_Request_Reply.cpp \ - DLL.cpp \ - Dynamic_Service_Base.cpp \ - Dynamic_Service_Dependency.cpp \ - Parse_Node.cpp \ - Service_Config.cpp \ - Service_Gestalt.cpp \ - Service_Manager.cpp \ - Service_Object.cpp \ - Service_Repository.cpp \ - Service_Types.cpp \ - Shared_Object.cpp \ - Svc_Conf_Lexer.cpp \ - Svc_Conf_y.cpp \ - Encoding_Converter.cpp \ - Encoding_Converter_Factory.cpp \ - UTF8_Encoding_Converter.cpp \ - UTF16_Encoding_Converter.cpp \ - UTF32_Encoding_Converter.cpp \ - XML_Svc_Conf.cpp \ - UUID.cpp \ - Filecache.cpp \ - ACE.cpp \ - ACE_crc_ccitt.cpp \ - ACE_crc32.cpp \ - ace_wchar.cpp \ - Activation_Queue.cpp \ - Active_Map_Manager.cpp \ - Addr.cpp \ - Argv_Type_Converter.cpp \ - Assert.cpp \ - Asynch_IO.cpp \ - Asynch_IO_Impl.cpp \ - Asynch_Pseudo_Task.cpp \ - ATM_Acceptor.cpp \ - ATM_Addr.cpp \ - ATM_Connector.cpp \ - ATM_Params.cpp \ - ATM_QoS.cpp \ - ATM_Stream.cpp \ - Atomic_Op.cpp \ - Atomic_Op_Sparc.c \ - Auto_Event.cpp \ - Barrier.cpp \ - Base_Thread_Adapter.cpp \ - Based_Pointer_Repository.cpp \ - Basic_Stats.cpp \ - Basic_Types.cpp \ - Capabilities.cpp \ - CDR_Base.cpp \ - CDR_Stream.cpp \ - CDR_Size.cpp \ - Cleanup.cpp \ - Codeset_IBM1047.cpp \ - Codeset_Registry.cpp \ - Codeset_Registry_db.cpp \ - Condition_Recursive_Thread_Mutex.cpp \ - Condition_Thread_Mutex.cpp \ - Configuration.cpp \ - Configuration_Import_Export.cpp \ - Connection_Recycling_Strategy.cpp \ - Containers.cpp \ - Copy_Disabled.cpp \ - Countdown_Time.cpp \ - Date_Time.cpp \ - DEV.cpp \ - DEV_Addr.cpp \ - DEV_Connector.cpp \ - DEV_IO.cpp \ - DLL_Manager.cpp \ - Dev_Poll_Reactor.cpp \ - Dirent.cpp \ - Dirent_Selector.cpp \ - Dump.cpp \ - Dynamic.cpp \ - Dynamic_Message_Strategy.cpp \ - Event.cpp \ - Event_Handler.cpp \ - FIFO.cpp \ - FIFO_Recv.cpp \ - FIFO_Recv_Msg.cpp \ - FIFO_Send.cpp \ - FIFO_Send_Msg.cpp \ - FILE.cpp \ - FILE_Addr.cpp \ - FILE_Connector.cpp \ - FILE_IO.cpp \ - File_Lock.cpp \ - Flag_Manip.cpp \ - Framework_Component.cpp \ - Functor.cpp \ - Functor_String.cpp \ - Get_Opt.cpp \ - gethrtime.cpp \ - Handle_Ops.cpp \ - Handle_Set.cpp \ - Hashable.cpp \ - High_Res_Timer.cpp \ - ICMP_Socket.cpp \ - INET_Addr.cpp \ - Init_ACE.cpp \ - IO_SAP.cpp \ - IO_Cntl_Msg.cpp \ - IOStream.cpp \ - IPC_SAP.cpp \ - Lib_Find.cpp \ - Local_Memory_Pool.cpp \ - Lock.cpp \ - Log_Msg.cpp \ - Log_Msg_Backend.cpp \ - Log_Msg_Callback.cpp \ - Log_Msg_IPC.cpp \ - Log_Msg_NT_Event_Log.cpp \ - Log_Msg_UNIX_Syslog.cpp \ - Log_Record.cpp \ - Logging_Strategy.cpp \ - LSOCK.cpp \ - LSOCK_Acceptor.cpp \ - LSOCK_CODgram.cpp \ - LSOCK_Connector.cpp \ - LSOCK_Dgram.cpp \ - LSOCK_Stream.cpp \ - Malloc.cpp \ - Malloc_Allocator.cpp \ - Manual_Event.cpp \ - MEM_Acceptor.cpp \ - MEM_Addr.cpp \ - MEM_Connector.cpp \ - MEM_IO.cpp \ - Mem_Map.cpp \ - MEM_SAP.cpp \ - MEM_Stream.cpp \ - Message_Block.cpp \ - Message_Queue.cpp \ - Message_Queue_NT.cpp \ - Message_Queue_Vx.cpp \ - Method_Request.cpp \ - MMAP_Memory_Pool.cpp \ - Msg_WFMO_Reactor.cpp \ - Monitor_Admin.cpp \ - Monitor_Admin_Manager.cpp \ - Monitor_Base.cpp \ - Monitor_Point_Registry.cpp \ - Monitor_Size.cpp \ - Monitor_Control_Types.cpp \ - Monitor_Control_Action.cpp \ - Multihomed_INET_Addr.cpp \ - Mutex.cpp \ - Netlink_Addr.cpp \ - Notification_Strategy.cpp \ - Notification_Queue.cpp \ - Obchunk.cpp \ - Object_Manager.cpp \ - Object_Manager_Base.cpp \ - OS_Errno.cpp \ - OS_Log_Msg_Attributes.cpp \ - OS_main.cpp \ - OS_NS_arpa_inet.cpp \ - OS_NS_ctype.cpp \ - OS_NS_dirent.cpp \ - OS_NS_dlfcn.cpp \ - OS_NS_errno.cpp \ - OS_NS_fcntl.cpp \ - OS_NS_math.cpp \ - OS_NS_netdb.cpp \ - OS_NS_poll.cpp \ - OS_NS_pwd.cpp \ - OS_NS_regex.cpp \ - OS_NS_signal.cpp \ - OS_NS_stdio.cpp \ - OS_NS_stdlib.cpp \ - OS_NS_string.cpp \ - OS_NS_strings.cpp \ - OS_NS_stropts.cpp \ - OS_NS_sys_mman.cpp \ - OS_NS_sys_msg.cpp \ - OS_NS_sys_resource.cpp \ - OS_NS_sys_select.cpp \ - OS_NS_sys_sendfile.cpp \ - OS_NS_sys_shm.cpp \ - OS_NS_sys_socket.cpp \ - OS_NS_sys_stat.cpp \ - OS_NS_sys_time.cpp \ - OS_NS_sys_uio.cpp \ - OS_NS_sys_utsname.cpp \ - OS_NS_sys_wait.cpp \ - OS_NS_Thread.cpp \ - OS_NS_time.cpp \ - OS_NS_unistd.cpp \ - OS_NS_wchar.cpp \ - OS_QoS.cpp \ - OS_Thread_Adapter.cpp \ - OS_TLI.cpp \ - Pagefile_Memory_Pool.cpp \ - PI_Malloc.cpp \ - Ping_Socket.cpp \ - Pipe.cpp \ - POSIX_Asynch_IO.cpp \ - POSIX_CB_Proactor.cpp \ - POSIX_Proactor.cpp \ - Priority_Reactor.cpp \ - Proactor.cpp \ - Proactor_Impl.cpp \ - Process.cpp \ - Process_Manager.cpp \ - Process_Mutex.cpp \ - Process_Semaphore.cpp \ - Profile_Timer.cpp \ - Reactor.cpp \ - Reactor_Impl.cpp \ - Reactor_Notification_Strategy.cpp \ - Reactor_Timer_Interface.cpp \ - Read_Buffer.cpp \ - Recursive_Thread_Mutex.cpp \ - Recyclable.cpp \ - Registry.cpp \ - Rtems_init.c \ - RW_Mutex.cpp \ - RW_Process_Mutex.cpp \ - RW_Thread_Mutex.cpp \ - Sample_History.cpp \ - Sbrk_Memory_Pool.cpp \ - Sched_Params.cpp \ - Select_Reactor_Base.cpp \ - Semaphore.cpp \ - Shared_Memory.cpp \ - Shared_Memory_MM.cpp \ - Shared_Memory_Pool.cpp \ - Shared_Memory_SV.cpp \ - Sig_Adapter.cpp \ - Sig_Handler.cpp \ - Signal.cpp \ - SOCK.cpp \ - SOCK_Acceptor.cpp \ - SOCK_CODgram.cpp \ - Sock_Connect.cpp \ - SOCK_Connector.cpp \ - SOCK_Dgram.cpp \ - SOCK_Dgram_Bcast.cpp \ - SOCK_Dgram_Mcast.cpp \ - SOCK_IO.cpp \ - SOCK_Netlink.cpp \ - SOCK_SEQPACK_Acceptor.cpp \ - SOCK_SEQPACK_Association.cpp \ - SOCK_SEQPACK_Connector.cpp \ - SOCK_Stream.cpp \ - SPIPE.cpp \ - SPIPE_Acceptor.cpp \ - SPIPE_Addr.cpp \ - SPIPE_Connector.cpp \ - SPIPE_Stream.cpp \ - SString.cpp \ - Stack_Trace.cpp \ - Stats.cpp \ - String_Base_Const.cpp \ - SUN_Proactor.cpp \ - SV_Message.cpp \ - SV_Message_Queue.cpp \ - SV_Semaphore_Complex.cpp \ - SV_Semaphore_Simple.cpp \ - SV_Shared_Memory.cpp \ - Synch_Options.cpp \ - System_Time.cpp \ - Task.cpp \ - Thread.cpp \ - Thread_Adapter.cpp \ - Thread_Control.cpp \ - Thread_Exit.cpp \ - Thread_Hook.cpp \ - Thread_Manager.cpp \ - Thread_Mutex.cpp \ - Thread_Semaphore.cpp \ - Throughput_Stats.cpp \ - Time_Value.cpp \ - Timeprobe.cpp \ - TLI.cpp \ - TLI_Acceptor.cpp \ - TLI_Connector.cpp \ - TLI_Stream.cpp \ - Token.cpp \ - TP_Reactor.cpp \ - Trace.cpp \ - TSS_Adapter.cpp \ - TTY_IO.cpp \ - UNIX_Addr.cpp \ - UPIPE_Acceptor.cpp \ - UPIPE_Connector.cpp \ - UPIPE_Stream.cpp \ - WFMO_Reactor.cpp \ - WIN32_Asynch_IO.cpp \ - WIN32_Proactor.cpp \ - XTI_ATM_Mcast.cpp - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- -ACE_SHLIBS = - -PRJ_TYPE = library - -INSLIB ?= ../lib -ifeq ($(INSLIB),.) - ifeq ($(PWD),) - PWD=$(shell pwd) - endif - INSLIB = $(PWD) -endif -OUTPUT_DIRECTORY = $(INSLIB) - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU - -ifneq (,$(RC)) -RESOURCES += \ - ace.rc - -RCFLAGS = \ - --include-dir=.. -endif - -# To build multiple targets in the same directory on AIX, it works -# best to have a template directory per project. -# The compiler/linker isn't too smart about instantiating templates... -ifdef TEMPINCDIR -TEMPINCDIR := $(TEMPINCDIR)/ACE -all: $(TEMPINCDIR) -endif - -ifneq ($(OUTPUT_DIRECTORY),) -all: $(OUTPUT_DIRECTORY) -$(OUTPUT_DIRECTORY): - -@$(MKDIR) "$(OUTPUT_DIRECTORY)" -endif - -LIBCHECK = 1 -ifneq ($(ace_for_tao),1) -ifneq ($(LIBCHECK), 1) - LIB = - SHLIB = - all: lib_warning -endif -else - LIB = - SHLIB = - all: avoid_warning -endif - -ifneq ($(ace_for_tao),1) -else - LIB = - SHLIB = - all: avoid_warning -endif -LSRC = $(FILES) - -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU -ifeq ($(VXWORKSLINK),1) -include $(TGT_DIR)/h/make/rules.$(PRJ_TYPE) -endif - -ifeq ($(VXWORKSLINK),1) -LDLIBPATH = -L. -L../lib -else -LDFLAGS += -L. -L../lib -endif -CPPFLAGS += -I.. -ifeq ($(shared_libs),1) - ifneq ($(SHLIB),) - CPPFLAGS += -DACE_BUILD_DLL - endif -endif -ifeq ($(static_libs),1) - CPPFLAGS += -DACE_AS_STATIC_LIBS -endif - -#---------------------------------------------------------------------------- -# Local targets -#---------------------------------------------------------------------------- -Svc_Conf_y.cpp: Svc_Conf.y -ifeq ($(notdir $(YACC)), bison) - $(YACC) -l -d Svc_Conf.y - sed -e 's/fprintf/ACE_OS::fprintf/g' \ - -e 's/\t/ /g' \ - -e 's/yy/ace_yy/g' \ - -e 's/->ace_yyerrno/->yyerrno/g' \ - -e 's/->ace_yylineno/->yylineno/g' \ - -e 's/ NULL/ 0/g' \ - -e 's/ace_yyerror[ ]*([ ]*"/ace_yyerror (ACE_SVC_CONF_PARAM->yyerrno, ACE_SVC_CONF_PARAM->yylineno, "/g' \ - -e 's/ace_yyerror[ ]*([ ]*ace_yymsg/ace_yyerror (ACE_SVC_CONF_PARAM->yyerrno, ACE_SVC_CONF_PARAM->yylineno, ace_yymsg/g' \ - -e 's/ace_yyerror[ ]*([ ]*YY_/ace_yyerror (ACE_SVC_CONF_PARAM->yyerrno, ACE_SVC_CONF_PARAM->yylineno, YY_/g' \ - -e 's@#include @@' \ - -e 's/Svc_Conf\.tab\.c/Svc_Conf_y.cpp/g' $@ - $(RM) -f Svc_Conf.tab.c Svc_Conf_y.cpp.orig -else - @echo 'ERROR: You must use bison 1.35 or higher to process this file' - @/bin/false -endif - -Svc_Conf_Token_Table.h: Svc_Conf.y Svc_Conf_y.cpp -ifeq ($(notdir $(YACC)), bison) - mv Svc_Conf.tab.h Svc_Conf_Token_Table.h -else - @echo 'ERROR: You must use bison 1.35 or higher to process this file' - @/bin/false -endif - -lib_warning: - @echo ACE will not be built due to the following missing library: - @echo $(LIBCHECK) - -avoid_warning: - @echo ACE will not be built due to one of the following enabled make macros: - @echo ace_for_tao - -## Some OS's have /bin/test others only have /usr/bin/test -ifeq ($(wildcard /bin/test), /bin/test) - TEST_EXE = /bin/test -else -ifeq ($(wildcard /usr/bin/test), /usr/bin/test) - TEST_EXE = /usr/bin/test -endif -endif - -ifneq ($(GENERATED_DIRTY),) -.PRECIOUS: $(GENERATED_DIRTY) -## If the generated files are anything but source files, we need to -## ensure that those files are generated before we attempt to build anything -## else. -ifeq ($(OBJS_DEPEND_ON_GENERATED),1) -$(VDIR)$(ACE_PCH_FILE) $(addprefix $(VDIR), $(OBJS)): $(GENERATED_DIRTY) -$(VSHDIR)$(ACE_PCH_FILE) $(VSHOBJS): $(GENERATED_DIRTY) -endif -endif - - -realclean: clean -ifneq ($(GENERATED_DIRTY),) - -$(RM) -r $(GENERATED_DIRTY) -endif - -__prebuild__: - @-: - diff --git a/dep/ACE_wrappers/ace/GNUmakefile.ACE_FlReactor b/dep/ACE_wrappers/ace/GNUmakefile.ACE_FlReactor deleted file mode 100644 index 2a9d9908c..000000000 --- a/dep/ACE_wrappers/ace/GNUmakefile.ACE_FlReactor +++ /dev/null @@ -1,189 +0,0 @@ -# -*- Makefile -*- -#---------------------------------------------------------------------------- -# GNU Makefile -# -# @file GNUmakefile.ACE_FlReactor -# -# $Id: gnu.mpd 82648 2008-08-21 06:55:54Z johnnyw $ -# -# This file was automatically generated by MPC. Any changes made directly to -# this file will be lost the next time it is generated. -# -#---------------------------------------------------------------------------- -MAKEFILE = GNUmakefile.ACE_FlReactor -DEPENDENCY_FILE = .depend.ACE_FlReactor - -## LIB may be set to empty later on in this file -LIB_UNCHECKED = libACE_FlReactor.a -LIB = $(LIB_UNCHECKED) -LIB_NAME = libACE_FlReactor - -## SHLIB may be set to empty later on in this file -SHLIB_UNCHECKED = libACE_FlReactor.$(SOEXT) -SHLIB = $(SHLIB_UNCHECKED) - -FILES = \ - FlReactor/FlReactor.cpp - -VPATH = .:FlReactor - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- -ACE_SHLIBS = -lACE - -PRJ_TYPE = library - -INSLIB ?= ../lib -ifeq ($(INSLIB),.) - ifeq ($(PWD),) - PWD=$(shell pwd) - endif - INSLIB = $(PWD) -endif -OUTPUT_DIRECTORY = $(INSLIB) - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU - -# To build multiple targets in the same directory on AIX, it works -# best to have a template directory per project. -# The compiler/linker isn't too smart about instantiating templates... -ifdef TEMPINCDIR -TEMPINCDIR := $(TEMPINCDIR)/ACE_FlReactor -all: $(TEMPINCDIR) -endif - -ifneq ($(OUTPUT_DIRECTORY),) -all: $(OUTPUT_DIRECTORY) -$(OUTPUT_DIRECTORY): - -@$(MKDIR) "$(OUTPUT_DIRECTORY)" -endif - -# turn off libcheck if doing a dry run -ifeq ($(findstring n, $(MAKEFLAGS)),n) - LIBCHECK = 1 -else - # turn off libcheck if keep going was passed too - ifeq ($(findstring k, $(MAKEFLAGS)),k) - LIBCHECK = 1 - else - LIBCHECK ?= $(filter-out $(foreach lib,ACE,$(findstring $(lib),$(foreach libpath,. ../lib /usr/lib /usr/lib64 $(INSLIB),$(wildcard $(libpath)/lib$(lib).* $(libpath)/$(lib).lib)))),ACE) - ifeq ($(LIBCHECK),) - LIBCHECK = 1 - endif - endif -endif -ifeq ($(x11),1) -ifeq ($(gl),1) -ifeq ($(fl),1) -ifneq ($(LIBCHECK), 1) - LIB = - SHLIB = - all: lib_warning -endif -else - LIB = - SHLIB = - all: require_warning -endif -else - LIB = - SHLIB = - all: require_warning -endif -else - LIB = - SHLIB = - all: require_warning -endif - -ifeq ($(x11),1) -ifeq ($(gl),1) -ifeq ($(fl),1) -else - LIB = - SHLIB = - all: require_warning -endif -else - LIB = - SHLIB = - all: require_warning -endif -else - LIB = - SHLIB = - all: require_warning -endif -LSRC = $(FILES) - -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU -ifeq ($(VXWORKSLINK),1) -include $(TGT_DIR)/h/make/rules.$(PRJ_TYPE) -endif - -ifeq ($(VXWORKSLINK),1) -LDLIBPATH = -L. -L../lib -else -LDFLAGS += -L. -L../lib -endif -CPPFLAGS += -I.. -ifeq ($(shared_libs),1) - ifneq ($(SHLIB),) - CPPFLAGS += -DACE_FLREACTOR_BUILD_DLL - endif -endif -ifeq ($(static_libs),1) - CPPFLAGS += -DACE_AS_STATIC_LIBS -endif - -#---------------------------------------------------------------------------- -# Local targets -#---------------------------------------------------------------------------- -CPPFLAGS += $(PLATFORM_FL_CPPFLAGS) -CPPFLAGS += $(PLATFORM_GL_CPPFLAGS) $(PLATFORM_X11_CPPFLAGS) -LIBS += $(PLATFORM_FL_LIBS) $(PLATFORM_GL_LIBS) $(PLATFORM_X11_LIBS) -LDFLAGS += $(PLATFORM_FL_LDFLAGS) $(PLATFORM_GL_LDFLAGS) -LDFLAGS += $(PLATFORM_GL_LDFLAGS) - -lib_warning: - @echo ACE_FlReactor will not be built due to the following missing library: - @echo $(LIBCHECK) - -require_warning: - @echo ACE_FlReactor will not be built due to one of the following disabled make macros: - @echo x11 gl fl - -## Some OS's have /bin/test others only have /usr/bin/test -ifeq ($(wildcard /bin/test), /bin/test) - TEST_EXE = /bin/test -else -ifeq ($(wildcard /usr/bin/test), /usr/bin/test) - TEST_EXE = /usr/bin/test -endif -endif - -ifneq ($(GENERATED_DIRTY),) -.PRECIOUS: $(GENERATED_DIRTY) -## If the generated files are anything but source files, we need to -## ensure that those files are generated before we attempt to build anything -## else. -ifeq ($(OBJS_DEPEND_ON_GENERATED),1) -$(VDIR)$(ACE_PCH_FILE) $(addprefix $(VDIR), $(OBJS)): $(GENERATED_DIRTY) -$(VSHDIR)$(ACE_PCH_FILE) $(VSHOBJS): $(GENERATED_DIRTY) -endif -endif - - -realclean: clean -ifneq ($(GENERATED_DIRTY),) - -$(RM) -r $(GENERATED_DIRTY) -endif - -__prebuild__: - @-: - diff --git a/dep/ACE_wrappers/ace/GNUmakefile.ACE_Qt3Reactor b/dep/ACE_wrappers/ace/GNUmakefile.ACE_Qt3Reactor deleted file mode 100644 index ea7f38d17..000000000 --- a/dep/ACE_wrappers/ace/GNUmakefile.ACE_Qt3Reactor +++ /dev/null @@ -1,169 +0,0 @@ -# -*- Makefile -*- -#---------------------------------------------------------------------------- -# GNU Makefile -# -# @file GNUmakefile.ACE_Qt3Reactor -# -# $Id: gnu.mpd 82648 2008-08-21 06:55:54Z johnnyw $ -# -# This file was automatically generated by MPC. Any changes made directly to -# this file will be lost the next time it is generated. -# -#---------------------------------------------------------------------------- -MAKEFILE = GNUmakefile.ACE_Qt3Reactor -DEPENDENCY_FILE = .depend.ACE_Qt3Reactor - -## LIB may be set to empty later on in this file -LIB_UNCHECKED = libACE_QtReactor.a -LIB = $(LIB_UNCHECKED) -LIB_NAME = libACE_QtReactor - -## SHLIB may be set to empty later on in this file -SHLIB_UNCHECKED = libACE_QtReactor.$(SOEXT) -SHLIB = $(SHLIB_UNCHECKED) - -FILES = \ - QtReactor/QtReactor_moc.cpp \ - QtReactor/QtReactor.cpp - -VPATH = .:QtReactor - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- -ACE_SHLIBS = -lACE -lqt-mt$(QT_VERSION) - -PRJ_TYPE = library - -INSLIB ?= ../lib -ifeq ($(INSLIB),.) - ifeq ($(PWD),) - PWD=$(shell pwd) - endif - INSLIB = $(PWD) -endif -OUTPUT_DIRECTORY = $(INSLIB) - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU - -# To build multiple targets in the same directory on AIX, it works -# best to have a template directory per project. -# The compiler/linker isn't too smart about instantiating templates... -ifdef TEMPINCDIR -TEMPINCDIR := $(TEMPINCDIR)/ACE_Qt3Reactor -all: $(TEMPINCDIR) -endif - -ifneq ($(OUTPUT_DIRECTORY),) -all: $(OUTPUT_DIRECTORY) -$(OUTPUT_DIRECTORY): - -@$(MKDIR) "$(OUTPUT_DIRECTORY)" -endif - -# turn off libcheck if doing a dry run -ifeq ($(findstring n, $(MAKEFLAGS)),n) - LIBCHECK = 1 -else - # turn off libcheck if keep going was passed too - ifeq ($(findstring k, $(MAKEFLAGS)),k) - LIBCHECK = 1 - else - LIBCHECK ?= $(filter-out $(foreach lib,ACE,$(findstring $(lib),$(foreach libpath,. ../lib $(QTDIR)/lib /usr/lib /usr/lib64 $(INSLIB),$(wildcard $(libpath)/lib$(lib).* $(libpath)/$(lib).lib)))),ACE) - ifeq ($(LIBCHECK),) - LIBCHECK = 1 - endif - endif -endif -ifeq ($(qt),1) -ifneq ($(LIBCHECK), 1) - LIB = - SHLIB = - all: lib_warning -endif -else - LIB = - SHLIB = - all: require_warning -endif - -ifeq ($(qt),1) -else - LIB = - SHLIB = - all: require_warning -endif -LSRC = $(FILES) - -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU -ifeq ($(VXWORKSLINK),1) -include $(TGT_DIR)/h/make/rules.$(PRJ_TYPE) -endif - -ifeq ($(VXWORKSLINK),1) -LDLIBPATH = -L. -L../lib -L$(QTDIR)/lib -else -LDFLAGS += -L. -L../lib -L$(QTDIR)/lib -endif -CPPFLAGS += -I.. -I$(QTDIR)/include -CPPFLAGS += -DQT_THREAD_SUPPORT -ifeq ($(shared_libs),1) - ifneq ($(SHLIB),) - CPPFLAGS += -DACE_QTREACTOR_BUILD_DLL - endif -endif -ifeq ($(static_libs),1) - CPPFLAGS += -DACE_AS_STATIC_LIBS -endif - -#---------------------------------------------------------------------------- -# Local targets -#---------------------------------------------------------------------------- -CPPFLAGS += $(PLATFORM_QT_CPPFLAGS) -LIBS += $(PLATFORM_QT_LIBS) -LDFLAGS += $(PLATFORM_QT_LDFLAGS) - -lib_warning: - @echo ACE_Qt3Reactor will not be built due to the following missing library: - @echo $(LIBCHECK) - -require_warning: - @echo ACE_Qt3Reactor will not be built due to one of the following disabled make macros: - @echo qt - -## Some OS's have /bin/test others only have /usr/bin/test -ifeq ($(wildcard /bin/test), /bin/test) - TEST_EXE = /bin/test -else -ifeq ($(wildcard /usr/bin/test), /usr/bin/test) - TEST_EXE = /usr/bin/test -endif -endif - -GENERATED_DIRTY += QtReactor/QtReactor_moc.cpp -QtReactor/QtReactor_moc.cpp: QtReactor/QtReactor.h - $(QTDIR)/bin/moc QtReactor/QtReactor.h -o $@ - -ifneq ($(GENERATED_DIRTY),) -.PRECIOUS: $(GENERATED_DIRTY) -## If the generated files are anything but source files, we need to -## ensure that those files are generated before we attempt to build anything -## else. -ifeq ($(OBJS_DEPEND_ON_GENERATED),1) -$(VDIR)$(ACE_PCH_FILE) $(addprefix $(VDIR), $(OBJS)): $(GENERATED_DIRTY) -$(VSHDIR)$(ACE_PCH_FILE) $(VSHOBJS): $(GENERATED_DIRTY) -endif -endif - - -realclean: clean -ifneq ($(GENERATED_DIRTY),) - -$(RM) -r $(GENERATED_DIRTY) -endif - -__prebuild__: - @-: - diff --git a/dep/ACE_wrappers/ace/GNUmakefile.ACE_TkReactor b/dep/ACE_wrappers/ace/GNUmakefile.ACE_TkReactor deleted file mode 100644 index efd388ced..000000000 --- a/dep/ACE_wrappers/ace/GNUmakefile.ACE_TkReactor +++ /dev/null @@ -1,163 +0,0 @@ -# -*- Makefile -*- -#---------------------------------------------------------------------------- -# GNU Makefile -# -# @file GNUmakefile.ACE_TkReactor -# -# $Id: gnu.mpd 82648 2008-08-21 06:55:54Z johnnyw $ -# -# This file was automatically generated by MPC. Any changes made directly to -# this file will be lost the next time it is generated. -# -#---------------------------------------------------------------------------- -MAKEFILE = GNUmakefile.ACE_TkReactor -DEPENDENCY_FILE = .depend.ACE_TkReactor - -## LIB may be set to empty later on in this file -LIB_UNCHECKED = libACE_TkReactor.a -LIB = $(LIB_UNCHECKED) -LIB_NAME = libACE_TkReactor - -## SHLIB may be set to empty later on in this file -SHLIB_UNCHECKED = libACE_TkReactor.$(SOEXT) -SHLIB = $(SHLIB_UNCHECKED) - -FILES = \ - TkReactor/TkReactor.cpp - -VPATH = .:TkReactor - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- -ACE_SHLIBS = -lACE - -PRJ_TYPE = library - -INSLIB ?= ../lib -ifeq ($(INSLIB),.) - ifeq ($(PWD),) - PWD=$(shell pwd) - endif - INSLIB = $(PWD) -endif -OUTPUT_DIRECTORY = $(INSLIB) - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU - -# To build multiple targets in the same directory on AIX, it works -# best to have a template directory per project. -# The compiler/linker isn't too smart about instantiating templates... -ifdef TEMPINCDIR -TEMPINCDIR := $(TEMPINCDIR)/ACE_TkReactor -all: $(TEMPINCDIR) -endif - -ifneq ($(OUTPUT_DIRECTORY),) -all: $(OUTPUT_DIRECTORY) -$(OUTPUT_DIRECTORY): - -@$(MKDIR) "$(OUTPUT_DIRECTORY)" -endif - -# turn off libcheck if doing a dry run -ifeq ($(findstring n, $(MAKEFLAGS)),n) - LIBCHECK = 1 -else - # turn off libcheck if keep going was passed too - ifeq ($(findstring k, $(MAKEFLAGS)),k) - LIBCHECK = 1 - else - LIBCHECK ?= $(filter-out $(foreach lib,ACE,$(findstring $(lib),$(foreach libpath,. ../lib /usr/lib /usr/lib64 $(INSLIB),$(wildcard $(libpath)/lib$(lib).* $(libpath)/$(lib).lib)))),ACE) - ifeq ($(LIBCHECK),) - LIBCHECK = 1 - endif - endif -endif -ifeq ($(tk),1) -ifneq ($(LIBCHECK), 1) - LIB = - SHLIB = - all: lib_warning -endif -else - LIB = - SHLIB = - all: require_warning -endif - -ifeq ($(tk),1) -else - LIB = - SHLIB = - all: require_warning -endif -LSRC = $(FILES) - -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU -ifeq ($(VXWORKSLINK),1) -include $(TGT_DIR)/h/make/rules.$(PRJ_TYPE) -endif - -ifeq ($(VXWORKSLINK),1) -LDLIBPATH = -L. -L../lib -else -LDFLAGS += -L. -L../lib -endif -CPPFLAGS += -I.. -ifeq ($(shared_libs),1) - ifneq ($(SHLIB),) - CPPFLAGS += -DACE_TKREACTOR_BUILD_DLL - endif -endif -ifeq ($(static_libs),1) - CPPFLAGS += -DACE_AS_STATIC_LIBS -endif - -#---------------------------------------------------------------------------- -# Local targets -#---------------------------------------------------------------------------- -CPPFLAGS += $(PLATFORM_TCL_CPPFLAGS) $(PLATFORM_TK_CPPFLAGS) -LIBS += $(PLATFORM_TCL_LIBS) $(PLATFORM_TK_LIBS) -LDFLAGS += $(PLATFORM_TCL_LDFLAGS) $(PLATFORM_TK_LDFLAGS) - -lib_warning: - @echo ACE_TkReactor will not be built due to the following missing library: - @echo $(LIBCHECK) - -require_warning: - @echo ACE_TkReactor will not be built due to one of the following disabled make macros: - @echo tk - -## Some OS's have /bin/test others only have /usr/bin/test -ifeq ($(wildcard /bin/test), /bin/test) - TEST_EXE = /bin/test -else -ifeq ($(wildcard /usr/bin/test), /usr/bin/test) - TEST_EXE = /usr/bin/test -endif -endif - -ifneq ($(GENERATED_DIRTY),) -.PRECIOUS: $(GENERATED_DIRTY) -## If the generated files are anything but source files, we need to -## ensure that those files are generated before we attempt to build anything -## else. -ifeq ($(OBJS_DEPEND_ON_GENERATED),1) -$(VDIR)$(ACE_PCH_FILE) $(addprefix $(VDIR), $(OBJS)): $(GENERATED_DIRTY) -$(VSHDIR)$(ACE_PCH_FILE) $(VSHOBJS): $(GENERATED_DIRTY) -endif -endif - - -realclean: clean -ifneq ($(GENERATED_DIRTY),) - -$(RM) -r $(GENERATED_DIRTY) -endif - -__prebuild__: - @-: - diff --git a/dep/ACE_wrappers/ace/GNUmakefile.ACE_XtReactor b/dep/ACE_wrappers/ace/GNUmakefile.ACE_XtReactor deleted file mode 100644 index 823e7f439..000000000 --- a/dep/ACE_wrappers/ace/GNUmakefile.ACE_XtReactor +++ /dev/null @@ -1,175 +0,0 @@ -# -*- Makefile -*- -#---------------------------------------------------------------------------- -# GNU Makefile -# -# @file GNUmakefile.ACE_XtReactor -# -# $Id: gnu.mpd 82648 2008-08-21 06:55:54Z johnnyw $ -# -# This file was automatically generated by MPC. Any changes made directly to -# this file will be lost the next time it is generated. -# -#---------------------------------------------------------------------------- -MAKEFILE = GNUmakefile.ACE_XtReactor -DEPENDENCY_FILE = .depend.ACE_XtReactor - -## LIB may be set to empty later on in this file -LIB_UNCHECKED = libACE_XtReactor.a -LIB = $(LIB_UNCHECKED) -LIB_NAME = libACE_XtReactor - -## SHLIB may be set to empty later on in this file -SHLIB_UNCHECKED = libACE_XtReactor.$(SOEXT) -SHLIB = $(SHLIB_UNCHECKED) - -FILES = \ - XtReactor/XtReactor.cpp - -VPATH = .:XtReactor - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- -ACE_SHLIBS = -lACE - -PRJ_TYPE = library - -INSLIB ?= ../lib -ifeq ($(INSLIB),.) - ifeq ($(PWD),) - PWD=$(shell pwd) - endif - INSLIB = $(PWD) -endif -OUTPUT_DIRECTORY = $(INSLIB) - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU - -# To build multiple targets in the same directory on AIX, it works -# best to have a template directory per project. -# The compiler/linker isn't too smart about instantiating templates... -ifdef TEMPINCDIR -TEMPINCDIR := $(TEMPINCDIR)/ACE_XtReactor -all: $(TEMPINCDIR) -endif - -ifneq ($(OUTPUT_DIRECTORY),) -all: $(OUTPUT_DIRECTORY) -$(OUTPUT_DIRECTORY): - -@$(MKDIR) "$(OUTPUT_DIRECTORY)" -endif - -# turn off libcheck if doing a dry run -ifeq ($(findstring n, $(MAKEFLAGS)),n) - LIBCHECK = 1 -else - # turn off libcheck if keep going was passed too - ifeq ($(findstring k, $(MAKEFLAGS)),k) - LIBCHECK = 1 - else - LIBCHECK ?= $(filter-out $(foreach lib,ACE,$(findstring $(lib),$(foreach libpath,. ../lib /usr/lib /usr/lib64 $(INSLIB),$(wildcard $(libpath)/lib$(lib).* $(libpath)/$(lib).lib)))),ACE) - ifeq ($(LIBCHECK),) - LIBCHECK = 1 - endif - endif -endif -ifeq ($(x11),1) -ifeq ($(xt),1) -ifneq ($(LIBCHECK), 1) - LIB = - SHLIB = - all: lib_warning -endif -else - LIB = - SHLIB = - all: require_warning -endif -else - LIB = - SHLIB = - all: require_warning -endif - -ifeq ($(x11),1) -ifeq ($(xt),1) -else - LIB = - SHLIB = - all: require_warning -endif -else - LIB = - SHLIB = - all: require_warning -endif -LSRC = $(FILES) - -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU -ifeq ($(VXWORKSLINK),1) -include $(TGT_DIR)/h/make/rules.$(PRJ_TYPE) -endif - -ifeq ($(VXWORKSLINK),1) -LDLIBPATH = -L. -L../lib -else -LDFLAGS += -L. -L../lib -endif -CPPFLAGS += -I.. -ifeq ($(shared_libs),1) - ifneq ($(SHLIB),) - CPPFLAGS += -DACE_XTREACTOR_BUILD_DLL - endif -endif -ifeq ($(static_libs),1) - CPPFLAGS += -DACE_AS_STATIC_LIBS -endif - -#---------------------------------------------------------------------------- -# Local targets -#---------------------------------------------------------------------------- -CPPFLAGS += $(PLATFORM_XT_CPPFLAGS) $(PLATFORM_X11_CPPFLAGS) -LIBS += $(PLATFORM_XT_LIBS) $(PLATFORM_X11_LIBS) -LDFLAGS += $(PLATFORM_XT_LDFLAGS) $(PLATFORM_X11_LDFLAGS) - -lib_warning: - @echo ACE_XtReactor will not be built due to the following missing library: - @echo $(LIBCHECK) - -require_warning: - @echo ACE_XtReactor will not be built due to one of the following disabled make macros: - @echo x11 xt - -## Some OS's have /bin/test others only have /usr/bin/test -ifeq ($(wildcard /bin/test), /bin/test) - TEST_EXE = /bin/test -else -ifeq ($(wildcard /usr/bin/test), /usr/bin/test) - TEST_EXE = /usr/bin/test -endif -endif - -ifneq ($(GENERATED_DIRTY),) -.PRECIOUS: $(GENERATED_DIRTY) -## If the generated files are anything but source files, we need to -## ensure that those files are generated before we attempt to build anything -## else. -ifeq ($(OBJS_DEPEND_ON_GENERATED),1) -$(VDIR)$(ACE_PCH_FILE) $(addprefix $(VDIR), $(OBJS)): $(GENERATED_DIRTY) -$(VSHDIR)$(ACE_PCH_FILE) $(VSHOBJS): $(GENERATED_DIRTY) -endif -endif - - -realclean: clean -ifneq ($(GENERATED_DIRTY),) - -$(RM) -r $(GENERATED_DIRTY) -endif - -__prebuild__: - @-: - diff --git a/dep/ACE_wrappers/ace/Get_Opt.cpp b/dep/ACE_wrappers/ace/Get_Opt.cpp index 915ff8a87..5953abe18 100644 --- a/dep/ACE_wrappers/ace/Get_Opt.cpp +++ b/dep/ACE_wrappers/ace/Get_Opt.cpp @@ -1,4 +1,4 @@ -// $Id: Get_Opt.cpp 81840 2008-06-05 13:46:45Z sma $ +// $Id: Get_Opt.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/Get_Opt.h" @@ -14,10 +14,6 @@ #include "ace/OS_NS_ctype.h" #include "ace/OS_NS_stdlib.h" -ACE_RCSID (ace, - Get_Opt, - "$Id: Get_Opt.cpp 81840 2008-06-05 13:46:45Z sma $") - /* * Copyright (c) 1987, 1993, 1994 * The Regents of the University of California. All rights reserved. diff --git a/dep/ACE_wrappers/ace/Get_Opt.h b/dep/ACE_wrappers/ace/Get_Opt.h index 3b4a420d9..1c30096ea 100644 --- a/dep/ACE_wrappers/ace/Get_Opt.h +++ b/dep/ACE_wrappers/ace/Get_Opt.h @@ -4,7 +4,7 @@ /** * @file Get_Opt.h * - * $Id: Get_Opt.h 81840 2008-06-05 13:46:45Z sma $ + * $Id: Get_Opt.h 86367 2009-08-05 09:41:11Z johnnyw $ * * @author Douglas C. Schmidt * @author Don Hinton (added long option support) @@ -182,14 +182,14 @@ public: private: void ACE_Get_Opt_Init (const ACE_TCHAR *optstring); public: - ACE_INLINE ACE_Get_Opt (int argc, + ACE_Get_Opt (int argc, ACE_TCHAR **argv, const ACE_TCHAR *optstring = ACE_TEXT (""), int skip_args = 1, int report_errors = 0, int ordering = PERMUTE_ARGS, int long_only = 0); - ACE_INLINE ACE_Get_Opt (int argc, + ACE_Get_Opt (int argc, ACE_TCHAR **argv, const char *optstring, int skip_args = 1, diff --git a/dep/ACE_wrappers/ace/Global_Macros.h b/dep/ACE_wrappers/ace/Global_Macros.h index d1bf6420b..9e3190270 100644 --- a/dep/ACE_wrappers/ace/Global_Macros.h +++ b/dep/ACE_wrappers/ace/Global_Macros.h @@ -4,7 +4,7 @@ /** * @file Global_Macros.h * - * $Id: Global_Macros.h 82442 2008-07-28 13:11:29Z johnnyw $ + * $Id: Global_Macros.h 91459 2010-08-25 09:51:01Z mcorino $ * * @author Douglas C. Schmidt * @author Jesper S. M|ller @@ -104,68 +104,20 @@ ACE_END_VERSIONED_NAMESPACE_DECL # define ACE_UNIMPLEMENTED_FUNC(f) f; # endif /* ACE_NEEDS_FUNC_DEFINITIONS */ -#if !defined (ACE_LACKS_DEPRECATED_MACROS) - // Easy way to designate that a class is used as a pseudo-namespace. - // Insures that g++ "friendship" anamolies are properly handled. - # define ACE_CLASS_IS_NAMESPACE(CLASSNAME) \ - private: \ - CLASSNAME (void); \ - CLASSNAME (const CLASSNAME&); \ - friend class ace_dewarn_gplusplus -#endif /* ACE_LACKS_DEPRECATED_MACROS */ - -// ---------------------------------------------------------------- - -//FUZZ: disable check_for_exception_sepc -#if !defined (ACE_LACKS_DEPRECATED_MACROS) - #if defined (ACE_HAS_NO_THROW_SPEC) - # define ACE_THROW_SPEC(X) - #else - # if defined (ACE_HAS_EXCEPTIONS) - # if defined (ACE_WIN32) && defined (_MSC_VER) && \ - (_MSC_VER >= 1400) && (_MSC_VER <= 1500) - # define ACE_THROW_SPEC(X) throw(...) - # else - # define ACE_THROW_SPEC(X) throw X - # endif /* ACE_WIN32 && VC8 */ - # else /* ! ACE_HAS_EXCEPTIONS */ - # define ACE_THROW_SPEC(X) - # endif /* ! ACE_HAS_EXCEPTIONS */ - #endif /*ACE_HAS_NO_THROW_SPEC*/ -#endif /* ACE_LACKS_DEPRECATED_MACROS */ -//FUZZ: enable check_for_exception_sepc - -// ---------------------------------------------------------------- - -#if !defined (ACE_LACKS_DEPRECATED_MACROS) - /** - * This macro is deprecated - */ - #define ACE_NESTED_CLASS(TYPE, NAME) TYPE::NAME -#endif /* ACE_LACKS_DEPRECATED_MACROS */ - -#if !defined (ACE_LACKS_DEPRECATED_MACROS) - /** - * @name CORBA namespace macros. - * - * CORBA namespace macros. - * - * @deprecated These macros were formerly used by TAO but are now - * deprecated, and only remain to retain some backward - * compatibility. They will be removed in a future ACE - * release. - */ - //@{ - #define ACE_CORBA_1(NAME) CORBA::NAME - #define ACE_CORBA_2(TYPE, NAME) CORBA::TYPE::NAME - #define ACE_CORBA_3(TYPE, NAME) CORBA::TYPE::NAME - //@} -#endif /* ACE_LACKS_DEPRECATED_MACROS */ - // ---------------------------------------------------------------- // Convenient macro for testing for deadlock, as well as for detecting // when mutexes fail. +/* WARNING: + * Use of ACE_GUARD() is rarely correct. ACE_GUARD() causes the current + * function to return if the lock is not acquired. Since merely returning + * (no value) almost certainly fails to handle the acquisition failure + * and almost certainly fails to communicate the failure to the caller + * for the caller to handle, ACE_GUARD() is almost always the wrong + * thing to do. The same goes for ACE_WRITE_GUARD() and ACE_READ_GUARD() . + * ACE_GUARD_REACTION() is better because it lets you specify error + * handling code. + */ #define ACE_GUARD_ACTION(MUTEX, OBJ, LOCK, ACTION, REACTION) \ ACE_Guard< MUTEX > OBJ (LOCK); \ if (OBJ.locked () != 0) { ACTION; } \ @@ -191,6 +143,37 @@ ACE_END_VERSIONED_NAMESPACE_DECL // ---------------------------------------------------------------- +#if defined(ACE_UNEXPECTED_RETURNS) + +/* Using ACE_UNEXPECTED_RETURNS is ill-advised because, in many cases, + * it fails to inform callers of the error condition. + * It exists mainly to provide back-compatibility with old, dangerous, + * incorrect behavior. + * Code that previously used ACE_GUARD() or ACE_GUARD_RETURN() to return + * upon failure to acquire a lock can now use: + * ACE_GUARD_REACTION(..., ACE_UNEXPECTED(...)) + * The behavior of this depends on whether or not ACE_UNEXPECTED_RETURNS + * is defined. If so, it just returns upon failure (as in the original), + * which is usually dangerous because it usually fails to handle the + * error. If not, it calls std::unexpected(), which does whatever the + * std::unexpected handler does (which is to abort, by default). + */ +# define ACE_UNEXPECTED(RETVAL) \ + do { \ + return RETVAL; \ + } while (0) + +#else + +# define ACE_UNEXPECTED(RETVAL) \ + do { \ + std::unexpected(); \ + } while (0) + +#endif + +// ---------------------------------------------------------------- + # define ACE_DES_NOFREE(POINTER,CLASS) \ do { \ if (POINTER) \ diff --git a/dep/ACE_wrappers/ace/Guard_T.cpp b/dep/ACE_wrappers/ace/Guard_T.cpp index a21fc2e2f..2090ddda2 100644 --- a/dep/ACE_wrappers/ace/Guard_T.cpp +++ b/dep/ACE_wrappers/ace/Guard_T.cpp @@ -1,4 +1,4 @@ -// $Id: Guard_T.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Guard_T.cpp 85141 2009-04-22 08:48:30Z johnnyw $ #ifndef ACE_GUARD_T_CPP #define ACE_GUARD_T_CPP @@ -32,7 +32,7 @@ ACE_Guard::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("mutex_ = %x\n"), this->lock_)); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("owner_ = %d\n"), this->owner_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP, this)); #endif /* ACE_HAS_DUMP */ } diff --git a/dep/ACE_wrappers/ace/Guard_T.h b/dep/ACE_wrappers/ace/Guard_T.h index 46d555505..844ed8288 100644 --- a/dep/ACE_wrappers/ace/Guard_T.h +++ b/dep/ACE_wrappers/ace/Guard_T.h @@ -4,7 +4,7 @@ /** * @file Guard_T.h * - * $Id: Guard_T.h 82508 2008-08-05 13:52:48Z johnnyw $ + * $Id: Guard_T.h 91459 2010-08-25 09:51:01Z mcorino $ * * Moved from Synch.h. * @@ -31,12 +31,35 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * @class ACE_Guard * * @brief This data structure is meant to be used within a method or - * function... It performs automatic aquisition and release of - * a parameterized synchronization object . + * function... It performs automatic acquisition and release of + * a parameterized synchronization object ACE_LOCK. * - * The class given as an actual parameter must provide at + * The class given as an actual parameter must provide, at * the very least the , , , and * methods. + * + * WARNING: A successfully constructed ACE_Guard does NOT mean that the + * lock was acquired! It is the caller's responsibility, after + * constructing an ACE_Guard, to check whether the lock was successfully + * acquired. Code like this is dangerous: + * { + * ACE_Guard g(lock); + * ... perform critical operation requiring lock to be held ... + * } + * Instead, one must do something like this: + * { + * ACE_Guard g(lock); + * if (! g.locked()) + * { + * ... handle error ... + * } + * else + * { + * ... perform critical operation requiring lock to be held ... + * } + * } + * The ACE_GUARD_RETURN() and ACE_GUARD_REACTION() macros are designed to + * to help with this. */ template class ACE_Guard @@ -52,8 +75,8 @@ public: ACE_Guard (ACE_LOCK &l, bool block); /// Initialise the guard without implicitly acquiring the lock. The - /// parameter indicates whether the guard should release - /// the lock implicitly on destruction. The parameter is + /// @a become_owner parameter indicates whether the guard should release + /// the lock implicitly on destruction. The @a block parameter is /// ignored and is used here to disambiguate with the preceding /// constructor. ACE_Guard (ACE_LOCK &l, bool block, int become_owner); @@ -77,9 +100,9 @@ public: void disown (void); // = Utility methods. - /// 1 if locked, 0 if couldn't acquire the lock + /// true if locked, false if couldn't acquire the lock /// (errno will contain the reason for this). - int locked (void) const; + bool locked (void) const; /// Explicitly remove the lock. int remove (void); @@ -114,6 +137,8 @@ private: * acquires/releases a write lock automatically (naturally, the * it is instantiated with must support the appropriate * API). + * + * WARNING: See important "WARNING" in comments at top of ACE_Guard. */ template class ACE_Write_Guard : public ACE_Guard @@ -158,6 +183,8 @@ public: * acquires/releases a read lock automatically (naturally, the * it is instantiated with must support the appropriate * API). + * + * WARNING: See important "WARNING" in comments at top of ACE_Guard. */ template class ACE_Read_Guard : public ACE_Guard diff --git a/dep/ACE_wrappers/ace/Guard_T.inl b/dep/ACE_wrappers/ace/Guard_T.inl index 5fb22b3ba..3e7d5b61f 100644 --- a/dep/ACE_wrappers/ace/Guard_T.inl +++ b/dep/ACE_wrappers/ace/Guard_T.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: Guard_T.inl 82508 2008-08-05 13:52:48Z johnnyw $ +// $Id: Guard_T.inl 82723 2008-09-16 09:35:44Z johnnyw $ #include "ace/RW_Thread_Mutex.h" @@ -65,7 +65,7 @@ ACE_Guard::~ACE_Guard (void) this->release (); } -template ACE_INLINE int +template ACE_INLINE bool ACE_Guard::locked (void) const { return this->owner_ != -1; diff --git a/dep/ACE_wrappers/ace/Handle_Gobbler.inl b/dep/ACE_wrappers/ace/Handle_Gobbler.inl index 4b81218e6..6a053d88b 100644 --- a/dep/ACE_wrappers/ace/Handle_Gobbler.inl +++ b/dep/ACE_wrappers/ace/Handle_Gobbler.inl @@ -1,11 +1,12 @@ // -*- C++ -*- // -// $Id: Handle_Gobbler.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Handle_Gobbler.inl 90388 2010-06-02 15:27:59Z vzykov $ // Since this is only included in Handle_Gobbler.h, these should be // inline, not ACE_INLINE. // FUZZ: disable check_for_inline +#include "ace/ACE.h" #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_fcntl.h" @@ -65,7 +66,7 @@ ACE_Handle_Gobbler::consume_handles (size_t n_handles_to_keep_available) break; } } - if (handle >= FD_SETSIZE) + if (handle >= static_cast(FD_SETSIZE)) break; this->handle_set_.set_bit (handle); } diff --git a/dep/ACE_wrappers/ace/Handle_Ops.cpp b/dep/ACE_wrappers/ace/Handle_Ops.cpp index 0ec856cf1..651e0e699 100644 --- a/dep/ACE_wrappers/ace/Handle_Ops.cpp +++ b/dep/ACE_wrappers/ace/Handle_Ops.cpp @@ -1,4 +1,4 @@ -// $Id: Handle_Ops.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Handle_Ops.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $ #include "ace/Handle_Ops.h" @@ -6,10 +6,6 @@ #include "ace/OS_NS_fcntl.h" #include "ace/Time_Value.h" -ACE_RCSID (ace, - Handle_Ops, - "$Id: Handle_Ops.cpp 80826 2008-03-04 14:51:23Z wotte $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/Handle_Set.cpp b/dep/ACE_wrappers/ace/Handle_Set.cpp index 8eb5186cc..ba64fb344 100644 --- a/dep/ACE_wrappers/ace/Handle_Set.cpp +++ b/dep/ACE_wrappers/ace/Handle_Set.cpp @@ -1,5 +1,5 @@ // Handle_Set.cpp -// $Id: Handle_Set.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Handle_Set.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/Handle_Set.h" @@ -9,7 +9,7 @@ #include "ace/OS_NS_string.h" -ACE_RCSID(ace, Handle_Set, "$Id: Handle_Set.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -24,11 +24,6 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Handle_Set) # define ACE_MSB_MASK (~((fd_mask) 1 << (NFDBITS - 1))) #endif /* ! ACE_WIN32 */ -#if defined (__BORLANDC__) && !defined (ACE_WIN32) -// The Borland C++ compiler on Linux also doesn't have fds_bits, but has __fds_bits. -#define fds_bits __fds_bits -#endif - #if defined (linux) && __GLIBC__ > 1 && __GLIBC_MINOR__ >= 1 && !defined (_XOPEN_SOURCE) // XPG4.2 requires the fds_bits member name, so it is not enabled by // default on Linux/glibc-2.1.x systems. Instead use "__fds_bits." diff --git a/dep/ACE_wrappers/ace/Handle_Set.h b/dep/ACE_wrappers/ace/Handle_Set.h index a29672221..11188f9fc 100644 --- a/dep/ACE_wrappers/ace/Handle_Set.h +++ b/dep/ACE_wrappers/ace/Handle_Set.h @@ -4,7 +4,7 @@ /** * @file Handle_Set.h * - * $Id: Handle_Set.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Handle_Set.h 82723 2008-09-16 09:35:44Z johnnyw $ * * @author Douglas C. Schmidt */ @@ -23,10 +23,6 @@ #include "ace/os_include/sys/os_select.h" #include "ace/os_include/os_limits.h" -#if defined (__QNX__) - typedef long fd_mask; -#endif /* __QNX__ */ - // Default size of the ACE Reactor. #if defined (FD_SETSIZE) int const ACE_FD_SETSIZE = FD_SETSIZE; diff --git a/dep/ACE_wrappers/ace/Hash_Map_Manager_T.cpp b/dep/ACE_wrappers/ace/Hash_Map_Manager_T.cpp index 6e55236f9..457d7d903 100644 --- a/dep/ACE_wrappers/ace/Hash_Map_Manager_T.cpp +++ b/dep/ACE_wrappers/ace/Hash_Map_Manager_T.cpp @@ -3,7 +3,7 @@ /** * @file Hash_Map_Manager_T.cpp * - * $Id: Hash_Map_Manager_T.cpp 81735 2008-05-19 19:14:10Z johnnyw $ + * $Id: Hash_Map_Manager_T.cpp 84477 2009-02-16 13:30:38Z johnnyw $ * * @author Douglas C. Schmidt */ @@ -58,12 +58,24 @@ ACE_Hash_Map_Entry::key () return ext_id_; } +template const EXT_ID & +ACE_Hash_Map_Entry::key () const +{ + return ext_id_; +} + template INT_ID & ACE_Hash_Map_Entry::item () { return int_id_; } +template const INT_ID & +ACE_Hash_Map_Entry::item () const +{ + return int_id_; +} + template void ACE_Hash_Map_Entry::dump (void) const { @@ -80,8 +92,8 @@ ACE_Hash_Map_Manager_Ex::dump { #if defined (ACE_HAS_DUMP) ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("total_size_ = %d"), this->total_size_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncur_size_ = %d"), this->cur_size_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("total_size_ = %d\n"), this->total_size_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("cur_size_ = %d\n"), this->cur_size_)); this->table_allocator_->dump (); this->entry_allocator_->dump (); this->lock_.dump (); @@ -227,7 +239,7 @@ ACE_Hash_Map_Manager_Ex::bind_ &this->table_[loc]); this->table_[loc].next_ = entry; entry->next_->prev_ = entry; - this->cur_size_++; + ++this->cur_size_; return 0; } else @@ -254,7 +266,7 @@ ACE_Hash_Map_Manager_Ex::trybi &this->table_[loc]); this->table_[loc].next_ = entry; entry->next_->prev_ = entry; - this->cur_size_++; + ++this->cur_size_; return 0; } else diff --git a/dep/ACE_wrappers/ace/Hash_Map_Manager_T.h b/dep/ACE_wrappers/ace/Hash_Map_Manager_T.h index 7585b1961..de2fde623 100644 --- a/dep/ACE_wrappers/ace/Hash_Map_Manager_T.h +++ b/dep/ACE_wrappers/ace/Hash_Map_Manager_T.h @@ -4,7 +4,7 @@ /** * @file Hash_Map_Manager_T.h * - * $Id: Hash_Map_Manager_T.h 81735 2008-05-19 19:14:10Z johnnyw $ + * $Id: Hash_Map_Manager_T.h 84477 2009-02-16 13:30:38Z johnnyw $ * * @author Douglas C. Schmidt */ @@ -53,9 +53,15 @@ public: /// Key accessor. EXT_ID& key (void); + /// Read-only key accessor. + const EXT_ID& key (void) const; + /// Item accessor. INT_ID& item (void); + /// Read-only item accessor. + const INT_ID& item (void) const; + /// Key used to look up an entry. /// @deprecated Use key() EXT_ID ext_id_; @@ -553,9 +559,6 @@ protected: /// Accessor of the underlying table ACE_Hash_Map_Entry *table (void); - /// Accessor of the current size attribute - size_t cur_size (void) const; - private: /** * Array of ACE_Hash_Map_Entry *s, each of which points to an diff --git a/dep/ACE_wrappers/ace/Hash_Map_Manager_T.inl b/dep/ACE_wrappers/ace/Hash_Map_Manager_T.inl index 3b9cea3d3..9525b13a6 100644 --- a/dep/ACE_wrappers/ace/Hash_Map_Manager_T.inl +++ b/dep/ACE_wrappers/ace/Hash_Map_Manager_T.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: Hash_Map_Manager_T.inl 81082 2008-03-25 09:09:11Z johnnyw $ +// $Id: Hash_Map_Manager_T.inl 84477 2009-02-16 13:30:38Z johnnyw $ #include "ace/Guard_T.h" @@ -436,13 +436,6 @@ ACE_Hash_Map_Manager_Ex::table return this->table_; } -template ACE_INLINE -size_t -ACE_Hash_Map_Manager_Ex::cur_size (void) const -{ - return this->cur_size_; -} - template 0.0) + { + scale_factor = (ACE_UINT32) (mhertz + 0.5); + break; + } } else if (::sscanf (buf, "bogomips : %lf\n", &bmips) == 1 || ::sscanf (buf, "BogoMIPS : %lf\n", &bmips) == 1) @@ -193,7 +196,7 @@ ACE_High_Res_Timer::global_scale_factor (void) #if (defined (ACE_WIN32) || defined (ACE_HAS_POWERPC_TIMER) || \ defined (ACE_HAS_PENTIUM) || defined (ACE_HAS_ALPHA_TIMER)) && \ !defined (ACE_HAS_HI_RES_TIMER) && \ - ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || \ + (defined (ACE_WIN32) || \ defined (ghs) || defined (__GNUG__) || \ defined (__INTEL_COMPILER)) // Check if the global scale factor needs to be set, and do if so. @@ -234,7 +237,7 @@ ACE_High_Res_Timer::global_scale_factor (void) # endif /* ! ACE_WIN32 && ! (linux && __alpha__) */ # if !defined (ACE_WIN32) - if (ACE_High_Res_Timer::global_scale_factor_ == 1u) + if (ACE_High_Res_Timer::global_scale_factor_ <= 1u) // Failed to retrieve CPU speed from system, so calculate it. ACE_High_Res_Timer::calibrate (); # endif // (ACE_WIN32) @@ -273,14 +276,11 @@ ACE_High_Res_Timer::calibrate (const ACE_UINT32 usec, i < iterations; ++i) { - const ACE_Time_Value actual_start = - ACE_OS::gettimeofday (); - const ACE_hrtime_t start = - ACE_OS::gethrtime (); + ACE_Time_Value const actual_start = ACE_OS::gettimeofday (); + ACE_hrtime_t const start = ACE_OS::gethrtime (); ACE_OS::sleep (sleep_time); - const ACE_hrtime_t stop = - ACE_OS::gethrtime (); - const ACE_Time_Value actual_delta = + ACE_hrtime_t const stop = ACE_OS::gethrtime (); + ACE_Time_Value const actual_delta = ACE_OS::gettimeofday () - actual_start; // Store the sample. @@ -422,7 +422,6 @@ ACE_High_Res_Timer::elapsed_time_incr (ACE_hrtime_t &nanoseconds) const nanoseconds = nanoseconds >> 10; } -#if !defined (ACE_HAS_WINCE) void ACE_High_Res_Timer::print_ave (const ACE_TCHAR *str, const int count, @@ -478,9 +477,9 @@ ACE_High_Res_Timer::print_total (const ACE_TCHAR *str, // Separate to seconds and nanoseconds. u_long total_secs = - (u_long) (total_nanoseconds / (ACE_UINT32) ACE_ONE_SECOND_IN_NSECS); + static_cast (total_nanoseconds / (ACE_UINT32) ACE_ONE_SECOND_IN_NSECS); ACE_UINT32 extra_nsecs = - (ACE_UINT32) (total_nanoseconds % (ACE_UINT32) ACE_ONE_SECOND_IN_NSECS); + static_cast (total_nanoseconds % (ACE_UINT32) ACE_ONE_SECOND_IN_NSECS); ACE_TCHAR buf[100]; if (count > 1) @@ -507,12 +506,10 @@ ACE_High_Res_Timer::print_total (const ACE_TCHAR *str, buf, ACE_OS::strlen (buf)); } -#endif /* !ACE_HAS_WINCE */ int ACE_High_Res_Timer::get_env_global_scale_factor (const ACE_TCHAR *env) { -#if !defined (ACE_HAS_WINCE) if (env != 0) { const char *env_value = ACE_OS::getenv (ACE_TEXT_ALWAYS_CHAR (env)); @@ -526,9 +523,7 @@ ACE_High_Res_Timer::get_env_global_scale_factor (const ACE_TCHAR *env) } } } -#else - ACE_UNUSED_ARG (env); -#endif /* !ACE_HAS_WINCE */ + return -1; } diff --git a/dep/ACE_wrappers/ace/High_Res_Timer.h b/dep/ACE_wrappers/ace/High_Res_Timer.h index 482205f13..3716597e5 100644 --- a/dep/ACE_wrappers/ace/High_Res_Timer.h +++ b/dep/ACE_wrappers/ace/High_Res_Timer.h @@ -4,7 +4,7 @@ /** * @file High_Res_Timer.h * - * $Id: High_Res_Timer.h 81286 2008-04-09 07:27:30Z johnnyw $ + * $Id: High_Res_Timer.h 89483 2010-03-15 09:48:01Z johnnyw $ * * @author Douglas C. Schmidt */ @@ -204,12 +204,8 @@ public: /// to start_incr and stop_incr. void elapsed_time_incr (ACE_hrtime_t &nanoseconds) const; -#if !defined (ACE_HAS_WINCE) - // @@ WINCE These two functions are currently not supported on Windows CE. - // However, we should probably use the handle and ACE_Log_Msg to - // print out the result. /// Print total time. - /// @note only use if incremental timings had been used! + /// @note only use @c print_total if incremental timings had been used! void print_total (const ACE_TCHAR *message, const int iterations = 1, ACE_HANDLE handle = ACE_STDOUT) const; @@ -218,7 +214,6 @@ public: void print_ave (const ACE_TCHAR *message, const int iterations = 1, ACE_HANDLE handle = ACE_STDOUT) const; -#endif /* !ACE_HAS_WINCE */ /// Dump the state of an object. void dump (void) const; diff --git a/dep/ACE_wrappers/ace/High_Res_Timer.inl b/dep/ACE_wrappers/ace/High_Res_Timer.inl index 85df18abe..06241dc0d 100644 --- a/dep/ACE_wrappers/ace/High_Res_Timer.inl +++ b/dep/ACE_wrappers/ace/High_Res_Timer.inl @@ -1,6 +1,6 @@ // -*- C++ -*- */ // -// $Id: High_Res_Timer.inl 81138 2008-03-28 09:18:15Z johnnyw $ +// $Id: High_Res_Timer.inl 89483 2010-03-15 09:48:01Z johnnyw $ #include "ace/Global_Macros.h" @@ -82,7 +82,7 @@ ACE_High_Res_Timer::gettime (const ACE_OS::ACE_HRTimer_Op op) // If there isn't a high-res timer, use gettimeofday (); if (ACE_High_Res_Timer::global_scale_factor_status_ == -1) { - ACE_Time_Value tv = ACE_OS::gettimeofday (); + ACE_Time_Value const tv = ACE_OS::gettimeofday (); // Return the time in microseconds because the global_scale_factor_ // is 1. return tv.sec () * ACE_ONE_SECOND_IN_USECS + tv.usec (); diff --git a/dep/ACE_wrappers/ace/ICMP_Socket.cpp b/dep/ACE_wrappers/ace/ICMP_Socket.cpp index 6178858f9..5247dc4b8 100644 --- a/dep/ACE_wrappers/ace/ICMP_Socket.cpp +++ b/dep/ACE_wrappers/ace/ICMP_Socket.cpp @@ -1,4 +1,4 @@ -// $Id: ICMP_Socket.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: ICMP_Socket.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/ICMP_Socket.h" @@ -9,12 +9,6 @@ #include "ace/OS_NS_netdb.h" #include "ace/OS_NS_sys_socket.h" - -ACE_RCSID (ace, - ICMP_Socket, - "$Id: ICMP_Socket.cpp 80826 2008-03-04 14:51:23Z wotte $") - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE (ACE_ICMP_Socket) diff --git a/dep/ACE_wrappers/ace/INET_Addr.cpp b/dep/ACE_wrappers/ace/INET_Addr.cpp index 2b03349bc..63ececb6e 100644 --- a/dep/ACE_wrappers/ace/INET_Addr.cpp +++ b/dep/ACE_wrappers/ace/INET_Addr.cpp @@ -1,4 +1,4 @@ -// $Id: INET_Addr.cpp 82434 2008-07-28 11:40:36Z johnnyw $ +// $Id: INET_Addr.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $ // Defines the Internet domain address family address format. @@ -18,10 +18,6 @@ #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_sys_socket.h" -ACE_RCSID (ace, - INET_Addr, - "$Id: INET_Addr.cpp 82434 2008-07-28 11:40:36Z johnnyw $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_INET_Addr) @@ -36,7 +32,7 @@ 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]; + char hoststr[MAXHOSTNAMELEN+1]; bool result = false; if (ipaddr_format == 0) @@ -489,7 +485,7 @@ ACE_INET_Addr::set (const char port_name[], int address_family = PF_UNSPEC; # if defined (ACE_HAS_IPV6) - if (ACE_OS::strcmp (ACE_TEXT_CHAR_TO_TCHAR(protocol), ACE_TEXT ("tcp6")) == 0) + if (ACE_OS::strcmp (protocol, "tcp6") == 0) address_family = AF_INET6; # endif /* ACE_HAS_IPV6 */ @@ -702,18 +698,12 @@ ACE_INET_Addr::ACE_INET_Addr (const char port_name[], : ACE_Addr (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), + ACE_HTONL (inet_address), protocol) == -1) ACE_ERROR ((LM_ERROR, ACE_TEXT ("ACE_INET_Addr::ACE_INET_Addr"))); -#else - ACE_UNUSED_ARG (port_name); - ACE_UNUSED_ARG (inet_address); - ACE_UNUSED_ARG (protocol); -#endif } #if defined (ACE_HAS_WCHAR) @@ -723,18 +713,12 @@ ACE_INET_Addr::ACE_INET_Addr (const wchar_t port_name[], : ACE_Addr (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), + ACE_HTONL (inet_address), protocol) == -1) ACE_ERROR ((LM_ERROR, ACE_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 */ diff --git a/dep/ACE_wrappers/ace/INET_Addr.h b/dep/ACE_wrappers/ace/INET_Addr.h index 2902ebb46..ba8978c25 100644 --- a/dep/ACE_wrappers/ace/INET_Addr.h +++ b/dep/ACE_wrappers/ace/INET_Addr.h @@ -4,7 +4,7 @@ /** * @file INET_Addr.h * - * $Id: INET_Addr.h 81799 2008-05-28 18:13:58Z jtc $ + * $Id: INET_Addr.h 91064 2010-07-12 10:11:24Z johnnyw $ * * @author Douglas C. Schmidt */ @@ -64,23 +64,23 @@ public: /** * Creates an ACE_INET_Addr from a @a port_number and an Internet - * . This method assumes that @a port_number and + * @a ip_addr. This method assumes that @a port_number and @a ip_addr * are in host byte order. If you have addressing information in * network byte order, @see set(). */ explicit ACE_INET_Addr (u_short port_number, ACE_UINT32 ip_addr = INADDR_ANY); - /// Uses to create an ACE_INET_Addr from a - /// , the remote @a host_name, and the @a protocol. + /// Uses getservbyname() to create an ACE_INET_Addr from a + /// @a port_name, the remote @a host_name, and the @a protocol. ACE_INET_Addr (const char port_name[], const char host_name[], const char protocol[] = "tcp"); /** - * Uses to create an ACE_INET_Addr from a - * , an Internet , and the @a protocol. This - * method assumes that is in host byte order. + * Uses getservbyname() to create an ACE_INET_Addr from a + * @a port_name, an Internet @a ip_addr, and the @a protocol. This + * method assumes that @a ip_addr is in host byte order. */ ACE_INET_Addr (const char port_name[], ACE_UINT32 ip_addr, @@ -149,8 +149,8 @@ public: /** * Uses to initialize an ACE_INET_Addr from a - * , an , and the @a protocol. This assumes that - * is already in network byte order. + * , an @a ip_addr, and the @a protocol. This assumes that + * @a ip_addr is already in network byte order. */ int set (const char port_name[], ACE_UINT32 ip_addr, @@ -198,11 +198,11 @@ public: /** * Transform the current ACE_INET_Addr address into string format. - * If is non-0 this produces "ip-number:port-number" - * (e.g., "128.252.166.57:1234"), whereas if is 0 + * If @a ipaddr_format is ttrue this produces "ip-number:port-number" + * (e.g., "128.252.166.57:1234"), whereas if @a ipaddr_format is false * this produces "ip-name:port-number" (e.g., * "tango.cs.wustl.edu:1234"). Returns -1 if the @a size of the - * is too small, else 0. + * @a buffer is too small, else 0. */ virtual int addr_to_string (ACE_TCHAR buffer[], size_t size, @@ -237,12 +237,12 @@ public: /** * Sets the address without affecting the port number. If - * @a encode is enabled then is converted into network + * @a encode is enabled then @a ip_addr is converted into network * byte order, otherwise it is assumed to be in network byte order * already and are passed straight through. The size of the address * is specified in the @a len parameter. - * If is non-zero, IPv6 support has been compiled in, and - * is an IPv4 address, then this address is set to the IPv4-mapped + * If @a map is non-zero, IPv6 support has been compiled in, and + * @a ip_addr is an IPv4 address, then this address is set to the IPv4-mapped * IPv6 address of it. */ int set_address (const char *ip_addr, @@ -263,9 +263,9 @@ public: /** * Return the character representation of the name of the host, - * storing it in the (which is assumed to be - * bytes long). This version is reentrant. If - * is greater than 0 then will be + * storing it in the @a hostname (which is assumed to be + * @a hostnamelen bytes long). This version is reentrant. If + * @a hostnamelen is greater than 0 then @a hostname will be * NUL-terminated even if -1 is returned. */ int get_host_name (char hostname[], diff --git a/dep/ACE_wrappers/ace/INET_Addr.inl b/dep/ACE_wrappers/ace/INET_Addr.inl index 4cd9d404b..be3d8e642 100644 --- a/dep/ACE_wrappers/ace/INET_Addr.inl +++ b/dep/ACE_wrappers/ace/INET_Addr.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: INET_Addr.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: INET_Addr.inl 88218 2009-12-17 12:32:14Z mcorino $ #include "ace/OS_NS_string.h" @@ -88,15 +88,13 @@ ACE_INLINE u_short ACE_INET_Addr::get_port_number (void) const { ACE_TRACE ("ACE_INET_Addr::get_port_number"); -#if defined (ACE_LACKS_NTOHS) - ACE_NOTSUP_RETURN (0); -#elif defined (ACE_HAS_IPV6) +#if defined (ACE_HAS_IPV6) if (this->get_type () == PF_INET) - return ntohs (this->inet_addr_.in4_.sin_port); + return ACE_NTOHS (this->inet_addr_.in4_.sin_port); else - return ntohs (this->inet_addr_.in6_.sin6_port); + return ACE_NTOHS (this->inet_addr_.in6_.sin6_port); #else - return ntohs (this->inet_addr_.in4_.sin_port); + return ACE_NTOHS (this->inet_addr_.in4_.sin_port); #endif /* ACE_HAS_IPV6 */ } @@ -218,8 +216,8 @@ ACE_INET_Addr::is_multicast (void) const 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 + (*static_cast ( + static_cast (&this->inet_addr_.in4_.sin_addr.s_addr)) & 0xf0) == 0xe0; } #if defined (ACE_HAS_IPV6) diff --git a/dep/ACE_wrappers/ace/IOStream.cpp b/dep/ACE_wrappers/ace/IOStream.cpp index 7ace37ee8..99065091a 100644 --- a/dep/ACE_wrappers/ace/IOStream.cpp +++ b/dep/ACE_wrappers/ace/IOStream.cpp @@ -1,11 +1,11 @@ -// $Id: IOStream.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: IOStream.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #ifndef ACE_IOSTREAM_CPP #define ACE_IOSTREAM_CPP #include "ace/IOStream.h" -ACE_RCSID(ace, IOStream, "$Id: IOStream.cpp 80826 2008-03-04 14:51:23Z wotte $") + #if !defined (ACE_LACKS_ACE_IOSTREAM) diff --git a/dep/ACE_wrappers/ace/IO_Cntl_Msg.cpp b/dep/ACE_wrappers/ace/IO_Cntl_Msg.cpp index c730f9710..44fcc75b2 100644 --- a/dep/ACE_wrappers/ace/IO_Cntl_Msg.cpp +++ b/dep/ACE_wrappers/ace/IO_Cntl_Msg.cpp @@ -1,4 +1,4 @@ -// $Id: IO_Cntl_Msg.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: IO_Cntl_Msg.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/IO_Cntl_Msg.h" @@ -6,7 +6,7 @@ #include "ace/IO_Cntl_Msg.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ace, IO_Cntl_Msg, "$Id: IO_Cntl_Msg.cpp 80826 2008-03-04 14:51:23Z wotte $") + #if 0 // This is not meant to be used, it's just a place holder... diff --git a/dep/ACE_wrappers/ace/IO_SAP.cpp b/dep/ACE_wrappers/ace/IO_SAP.cpp index 37200bfea..139eb50b3 100644 --- a/dep/ACE_wrappers/ace/IO_SAP.cpp +++ b/dep/ACE_wrappers/ace/IO_SAP.cpp @@ -1,4 +1,4 @@ -// $Id: IO_SAP.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: IO_SAP.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/IO_SAP.h" @@ -12,7 +12,7 @@ #include "ace/IO_SAP.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ace, IO_SAP, "$Id: IO_SAP.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/IPC_SAP.cpp b/dep/ACE_wrappers/ace/IPC_SAP.cpp index bc3e9f7af..bdd0f8a3c 100644 --- a/dep/ACE_wrappers/ace/IPC_SAP.cpp +++ b/dep/ACE_wrappers/ace/IPC_SAP.cpp @@ -1,4 +1,4 @@ -// $Id: IPC_SAP.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: IPC_SAP.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/IPC_SAP.h" @@ -12,7 +12,7 @@ #include "ace/IPC_SAP.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ace, IPC_SAP, "$Id: IPC_SAP.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/Init_ACE.cpp b/dep/ACE_wrappers/ace/Init_ACE.cpp index f0c953f82..f3ea96866 100644 --- a/dep/ACE_wrappers/ace/Init_ACE.cpp +++ b/dep/ACE_wrappers/ace/Init_ACE.cpp @@ -1,12 +1,8 @@ +// $Id: Init_ACE.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $ #include "ace/Init_ACE.h" #include "ace/Object_Manager.h" -ACE_RCSID (ace, - Init_ACE, - "$Id: Init_ACE.cpp 80826 2008-03-04 14:51:23Z wotte $") - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL unsigned int ACE::init_fini_count_ = 0; diff --git a/dep/ACE_wrappers/ace/Init_ACE.h b/dep/ACE_wrappers/ace/Init_ACE.h index 2492f6930..2bbaafc3e 100644 --- a/dep/ACE_wrappers/ace/Init_ACE.h +++ b/dep/ACE_wrappers/ace/Init_ACE.h @@ -4,10 +4,13 @@ /** * @file Init_ACE.h * - * $Id: Init_ACE.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Init_ACE.h 88794 2010-02-01 19:15:36Z schmidt $ * - * Initialize ACE library services. Can be called only once per - * program invocation. + * Initialize and finalize the ACE library services. You can + * generally execute the @a ACE::init() and @a ACE::fini() sequence + * multiple times, but be aware that nothing that ACE controls (e.g., + * singletons, thread-specific services, loaded services, etc.) will + * survive the @a ACE::fini(). */ //============================================================================= @@ -28,17 +31,22 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE { /** - * This class implements the functions for the initialization and - * shutting down ACE. These functions are called only once per ACE - * invokation. - * @return Returns 0 on success, -1 on failure, and 1 if it had already been - * called. + * This method initializes the ACE library services and initializes + * ACE's internal resources. Applications should not instantiate + * ACE classes or call methods on objects of these classes until @a + * ACE::init() returns successfully. + + * @return Returns 0 on success, -1 on failure, and 1 if it had + * already been called. */ extern ACE_Export int init (void); /** - * Shut down ACE library services. Can be called only once per - * program invocation. + * Finalize the ACE library services and releases ACE's internal + * resources. In general, do not instantiate ACE classes or call + * methods on objects of these classes after @a ACE::fini() has been + * called. + * * @return Returns 0 on success, -1 on failure, and 1 if it had already been * called. */ diff --git a/dep/ACE_wrappers/ace/Intrusive_List.cpp b/dep/ACE_wrappers/ace/Intrusive_List.cpp index bdb17837d..90ed82de2 100644 --- a/dep/ACE_wrappers/ace/Intrusive_List.cpp +++ b/dep/ACE_wrappers/ace/Intrusive_List.cpp @@ -1,4 +1,4 @@ -// $Id: Intrusive_List.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Intrusive_List.cpp 84273 2009-01-30 12:55:25Z johnnyw $ #ifndef ACE_INTRUSIVE_LIST_CPP #define ACE_INTRUSIVE_LIST_CPP @@ -36,13 +36,14 @@ ACE_Intrusive_List::push_back (T *node) this->head_ = node; node->next (0); node->prev (0); - return; } - - this->tail_->next (node); - node->prev (this->tail_); - node->next (0); - this->tail_ = node; + else + { + this->tail_->next (node); + node->prev (this->tail_); + node->next (0); + this->tail_ = node; + } } template void @@ -54,22 +55,24 @@ ACE_Intrusive_List::push_front (T *node) this->head_ = node; node->next (0); node->prev (0); - return; } - - this->head_->prev (node); - node->next (this->head_); - node->prev (0); - this->head_ = node; + else + { + this->head_->prev (node); + node->next (this->head_); + node->prev (0); + this->head_ = node; + } } template T * ACE_Intrusive_List::pop_front (void) { T *node = this->head_; - if (node == 0) - return 0; - this->unsafe_remove (node); + if (node != 0) + { + this->unsafe_remove (node); + } return node; } @@ -77,9 +80,10 @@ template T * ACE_Intrusive_List::pop_back (void) { T *node = this->tail_; - if (node == 0) - return 0; - this->unsafe_remove (node); + if (node != 0) + { + this->unsafe_remove (node); + } return node; } diff --git a/dep/ACE_wrappers/ace/Intrusive_List.h b/dep/ACE_wrappers/ace/Intrusive_List.h index 146d11b35..d93ec95ed 100644 --- a/dep/ACE_wrappers/ace/Intrusive_List.h +++ b/dep/ACE_wrappers/ace/Intrusive_List.h @@ -4,7 +4,7 @@ /** * @file Intrusive_List.h * - * $Id: Intrusive_List.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Intrusive_List.h 83968 2008-12-04 08:11:41Z johnnyw $ * * @author Carlos O'Ryan */ @@ -14,7 +14,7 @@ #define ACE_INTRUSIVE_LIST_H #include /**/ "ace/pre.h" -#include /**/ "ace/config-all.h" +#include /**/ "ace/config-lite.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -68,12 +68,12 @@ public: // = Check boundary conditions. - /// Returns 1 if the container is empty, otherwise returns 0. - int is_empty (void) const; + /// Returns true if the container is empty, otherwise returns false. + bool is_empty (void) const; - /// Returns 1 if the container is empty, otherwise returns 0. + /// Returns true if the container is empty, otherwise returns false. /// @deprecated Use is_empty() instead. - int empty (void) const; + bool empty (void) const; /// Insert an element at the beginning of the list void push_front (T *node); diff --git a/dep/ACE_wrappers/ace/Intrusive_List.inl b/dep/ACE_wrappers/ace/Intrusive_List.inl index aac330696..028a1aef3 100644 --- a/dep/ACE_wrappers/ace/Intrusive_List.inl +++ b/dep/ACE_wrappers/ace/Intrusive_List.inl @@ -1,18 +1,18 @@ // -*- C++ -*- // -// $Id: Intrusive_List.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Intrusive_List.inl 83952 2008-12-02 20:01:24Z johnnyw $ #include ACE_BEGIN_VERSIONED_NAMESPACE_DECL -template ACE_INLINE int +template ACE_INLINE bool ACE_Intrusive_List::is_empty (void) const { return this->head_ == 0; } -template ACE_INLINE int +template ACE_INLINE bool ACE_Intrusive_List::empty (void) const { return this->is_empty (); diff --git a/dep/ACE_wrappers/ace/Intrusive_List_Node.h b/dep/ACE_wrappers/ace/Intrusive_List_Node.h index 32780b8f3..dcfbd89e7 100644 --- a/dep/ACE_wrappers/ace/Intrusive_List_Node.h +++ b/dep/ACE_wrappers/ace/Intrusive_List_Node.h @@ -4,7 +4,7 @@ /** * @file Intrusive_List_Node.h * - * $Id: Intrusive_List_Node.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Intrusive_List_Node.h 83968 2008-12-04 08:11:41Z johnnyw $ * * @author Carlos O'Ryan */ @@ -14,7 +14,7 @@ #define ACE_INTRUSIVE_LIST_NODE_H #include /**/ "ace/pre.h" -#include /**/ "ace/config-all.h" +#include /**/ "ace/config-lite.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -37,7 +37,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * confused using such templates, the class is provided as a helper * for our lucky users that only need portability to modern C++ * compilers. - * */ template class ACE_Intrusive_List_Node diff --git a/dep/ACE_wrappers/ace/LOCK_SOCK_Acceptor.cpp b/dep/ACE_wrappers/ace/LOCK_SOCK_Acceptor.cpp index bea8c9015..2140454bc 100644 --- a/dep/ACE_wrappers/ace/LOCK_SOCK_Acceptor.cpp +++ b/dep/ACE_wrappers/ace/LOCK_SOCK_Acceptor.cpp @@ -1,4 +1,4 @@ -// $Id: LOCK_SOCK_Acceptor.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: LOCK_SOCK_Acceptor.cpp 82723 2008-09-16 09:35:44Z johnnyw $ #ifndef ACE_LOCK_SOCK_ACCEPTOR_CPP #define ACE_LOCK_SOCK_ACCEPTOR_CPP @@ -12,8 +12,8 @@ template int ACE_LOCK_SOCK_Acceptor::accept (ACE_SOCK_Stream &stream, ACE_Addr *remote_address, ACE_Time_Value *timeout, - int restart, - int reset_new_handle) const + bool restart, + bool reset_new_handle) const { ACE_GUARD_RETURN (ACE_LOCK, ace_mon, (ACE_LOCK &) this->lock_, -1); diff --git a/dep/ACE_wrappers/ace/LOCK_SOCK_Acceptor.h b/dep/ACE_wrappers/ace/LOCK_SOCK_Acceptor.h index 6fa5eb008..6eff834eb 100644 --- a/dep/ACE_wrappers/ace/LOCK_SOCK_Acceptor.h +++ b/dep/ACE_wrappers/ace/LOCK_SOCK_Acceptor.h @@ -4,7 +4,7 @@ /** * @file LOCK_SOCK_Acceptor.h * - * $Id: LOCK_SOCK_Acceptor.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: LOCK_SOCK_Acceptor.h 82723 2008-09-16 09:35:44Z johnnyw $ * * @author James Hu and Irfan Pyarali */ @@ -42,8 +42,8 @@ public: int accept (ACE_SOCK_Stream &new_stream, ACE_Addr *remote_addr = 0, ACE_Time_Value *timeout = 0, - int restart = 1, - int reset_new_handle = 0) const; + bool restart = true, + bool reset_new_handle = false) const; /// Return a reference to the lock. ACE_LOCK &lock (void); diff --git a/dep/ACE_wrappers/ace/LSOCK.cpp b/dep/ACE_wrappers/ace/LSOCK.cpp index 2db68b5ed..71af23195 100644 --- a/dep/ACE_wrappers/ace/LSOCK.cpp +++ b/dep/ACE_wrappers/ace/LSOCK.cpp @@ -1,8 +1,8 @@ -// $Id: LSOCK.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: LSOCK.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/LSOCK.h" -ACE_RCSID(ace, LSOCK, "$Id: LSOCK.cpp 80826 2008-03-04 14:51:23Z wotte $") + #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) @@ -59,7 +59,8 @@ ACE_LSOCK::send_handle (const ACE_HANDLE handle) const cmsgptr->cmsg_len = sizeof cmsgbuf; send_msg.msg_control = cmsgbuf; send_msg.msg_controllen = sizeof cmsgbuf; - *(ACE_HANDLE *) CMSG_DATA (cmsgptr) = handle; + ACE_HANDLE *ph = (ACE_HANDLE *) CMSG_DATA (cmsgptr); + *ph = handle; send_msg.msg_flags = 0; #else send_msg.msg_accrights = (char *) &handle; @@ -143,7 +144,9 @@ ACE_LSOCK::recv_handle (ACE_HANDLE &handle, char *pbuf, ssize_t *len) const { #if defined (ACE_HAS_4_4BSD_SENDMSG_RECVMSG) // Close down the socket that was returned by the MSG_PEEK. - ACE_OS::closesocket (*(ACE_HANDLE *) CMSG_DATA ((cmsghdr *) cmsgbuf)); + cmsghdr *cmsgptr = (cmsghdr *) cmsgbuf; + ACE_HANDLE * ph = (ACE_HANDLE *) CMSG_DATA (cmsgptr); + ACE_OS::closesocket (*ph); recv_msg.msg_control = cmsgbuf; recv_msg.msg_controllen = sizeof cmsgbuf; #else @@ -158,7 +161,8 @@ ACE_LSOCK::recv_handle (ACE_HANDLE &handle, char *pbuf, ssize_t *len) const { #if defined (ACE_HAS_4_4BSD_SENDMSG_RECVMSG) cmsghdr *cmsgptr = (cmsghdr *) cmsgbuf; - handle = *(ACE_HANDLE *) CMSG_DATA (cmsgptr); + ACE_HANDLE * ph = (ACE_HANDLE *) CMSG_DATA (cmsgptr); + handle = *ph; #endif /* ACE_HAS_4_4BSD_SENDMSG_RECVMSG */ return 1; } diff --git a/dep/ACE_wrappers/ace/LSOCK_Acceptor.cpp b/dep/ACE_wrappers/ace/LSOCK_Acceptor.cpp index 0259697ea..10c5acf55 100644 --- a/dep/ACE_wrappers/ace/LSOCK_Acceptor.cpp +++ b/dep/ACE_wrappers/ace/LSOCK_Acceptor.cpp @@ -1,4 +1,4 @@ -// $Id: LSOCK_Acceptor.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: LSOCK_Acceptor.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/LSOCK_Acceptor.h" @@ -8,7 +8,7 @@ #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_sys_socket.h" -ACE_RCSID(ace, LSOCK_Acceptor, "$Id: LSOCK_Acceptor.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -84,8 +84,8 @@ int ACE_LSOCK_Acceptor::accept (ACE_LSOCK_Stream &new_stream, ACE_Addr *remote_addr, ACE_Time_Value *timeout, - int restart, - int reset_new_handle) const + bool restart, + bool reset_new_handle) const { ACE_TRACE ("ACE_LSOCK_Acceptor::accept"); diff --git a/dep/ACE_wrappers/ace/LSOCK_Acceptor.h b/dep/ACE_wrappers/ace/LSOCK_Acceptor.h index f5a4067ca..b10c55c5d 100644 --- a/dep/ACE_wrappers/ace/LSOCK_Acceptor.h +++ b/dep/ACE_wrappers/ace/LSOCK_Acceptor.h @@ -4,7 +4,7 @@ /** * @file LSOCK_Acceptor.h * - * $Id: LSOCK_Acceptor.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: LSOCK_Acceptor.h 82723 2008-09-16 09:35:44Z johnnyw $ * * @author Doug Schmidt */ @@ -63,8 +63,8 @@ public: int accept (ACE_LSOCK_Stream &new_ipc_sap, ACE_Addr * = 0, ACE_Time_Value *timeout = 0, - int restart = 1, - int reset_new_handle = 0) const; + bool restart = true, + bool reset_new_handle = false) const; /// Close down the ACE_LSOCK and remove the rendezvous point from the /// file system. diff --git a/dep/ACE_wrappers/ace/LSOCK_CODgram.cpp b/dep/ACE_wrappers/ace/LSOCK_CODgram.cpp index e1e2c0b01..8c6e967ba 100644 --- a/dep/ACE_wrappers/ace/LSOCK_CODgram.cpp +++ b/dep/ACE_wrappers/ace/LSOCK_CODgram.cpp @@ -1,11 +1,11 @@ -// $Id: LSOCK_CODgram.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: LSOCK_CODgram.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/LSOCK_CODgram.h" #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) #include "ace/Log_Msg.h" -ACE_RCSID(ace, LSOCK_CODgram, "$Id: LSOCK_CODgram.cpp 80826 2008-03-04 14:51:23Z wotte $") + #if !defined (__ACE_INLINE__) #include "ace/LSOCK_CODgram.inl" diff --git a/dep/ACE_wrappers/ace/LSOCK_CODgram.h b/dep/ACE_wrappers/ace/LSOCK_CODgram.h index 87062051d..c2858a8ed 100644 --- a/dep/ACE_wrappers/ace/LSOCK_CODgram.h +++ b/dep/ACE_wrappers/ace/LSOCK_CODgram.h @@ -4,7 +4,7 @@ /** * @file LSOCK_CODgram.h * - * $Id: LSOCK_CODgram.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: LSOCK_CODgram.h 84419 2009-02-11 22:28:11Z shuston $ * * @author Douglas C. Schmidt */ @@ -32,27 +32,58 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class ACE_LSOCK_CODgram * - * @brief Defines the member functions for the connected + * @brief Defines a fully specified (sometimes called "connected") UNIX-domain * datagram abstraction. + * + * ACE_LSOCK_CODgram provides a way to use a UNIX-domain datagram socket in + * a situation where the local and peer addresses are fully known in advance. + * The "connection-oriented" part of "CODgram" is a misnomer. There is no + * connection used on this type of socket. It merely specifies that both + * endpoint addresses are known in advance of use. Furthermore, this class + * is more suited for use cases where a local endpoint wishes to communicate + * with a single, known peer and may or may not have a specified local address. + * + * If your use case requires receiving datagrams from multiple peers without + * previously known addresses, consider using ACE_LSOCK_Dgram instead. */ class ACE_Export ACE_LSOCK_CODgram : public ACE_SOCK_CODgram, public ACE_LSOCK { public: - // = Initialization methods. - /// Default constructor. + /// Default constructor; requires a call to open() prior to communication. ACE_LSOCK_CODgram (void); - /// Initiate a connected-datagram. + /** + * @name Initialization methods + */ + //@{ + /** + * Initialize a fully-specified datagram socket. + * + * @param remote_sap Remote/peer address. This should be an ACE_UNIX_Addr + * object. It specifies where all sent datagrams will + * be sent to. + * @param local_sap Local address. The local address to receive datagrams + * at. If not specified, an unused address is selected. + * If specified, should be an ACE_UNIX_Addr object. + * + * @sa ACE_UNIX_Addr + */ ACE_LSOCK_CODgram (const ACE_Addr &remote_sap, const ACE_Addr &local_sap = ACE_Addr::sap_any, int protocol_family = PF_UNIX, int protocol = 0); - /// Initiate a connected-datagram. + /** + * Initialize a fully-specified datagram socket. + * + * @retval 0 if no error. + * @retval -1 on error; check errno for an error reason. + */ int open (const ACE_Addr &remote_sap, const ACE_Addr &local_sap = ACE_Addr::sap_any, int protocol_family = PF_UNIX, int protocol = 0); + //@} /// Get underlying handle. ACE_HANDLE get_handle (void) const; diff --git a/dep/ACE_wrappers/ace/LSOCK_Connector.cpp b/dep/ACE_wrappers/ace/LSOCK_Connector.cpp index c1e21b9d5..66e1d8851 100644 --- a/dep/ACE_wrappers/ace/LSOCK_Connector.cpp +++ b/dep/ACE_wrappers/ace/LSOCK_Connector.cpp @@ -1,11 +1,11 @@ -// $Id: LSOCK_Connector.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: LSOCK_Connector.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/LSOCK_Connector.h" #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) #include "ace/Log_Msg.h" -ACE_RCSID(ace, LSOCK_Connector, "$Id: LSOCK_Connector.cpp 80826 2008-03-04 14:51:23Z wotte $") + #if !defined (__ACE_INLINE__) #include "ace/LSOCK_Connector.inl" diff --git a/dep/ACE_wrappers/ace/LSOCK_Dgram.cpp b/dep/ACE_wrappers/ace/LSOCK_Dgram.cpp index 60e630f0b..d681915f8 100644 --- a/dep/ACE_wrappers/ace/LSOCK_Dgram.cpp +++ b/dep/ACE_wrappers/ace/LSOCK_Dgram.cpp @@ -1,11 +1,11 @@ -// $Id: LSOCK_Dgram.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: LSOCK_Dgram.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/LSOCK_Dgram.h" #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) #include "ace/Log_Msg.h" -ACE_RCSID(ace, LSOCK_Dgram, "$Id: LSOCK_Dgram.cpp 80826 2008-03-04 14:51:23Z wotte $") + #if !defined (__ACE_INLINE__) #include "ace/LSOCK_Dgram.inl" diff --git a/dep/ACE_wrappers/ace/LSOCK_Stream.cpp b/dep/ACE_wrappers/ace/LSOCK_Stream.cpp index f8eae9124..34475132d 100644 --- a/dep/ACE_wrappers/ace/LSOCK_Stream.cpp +++ b/dep/ACE_wrappers/ace/LSOCK_Stream.cpp @@ -1,4 +1,4 @@ -// $Id: LSOCK_Stream.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: LSOCK_Stream.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/LSOCK_Stream.h" #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) @@ -6,7 +6,7 @@ #include "ace/Log_Msg.h" #include "ace/OS_NS_sys_socket.h" -ACE_RCSID(ace, LSOCK_Stream, "$Id: LSOCK_Stream.cpp 80826 2008-03-04 14:51:23Z wotte $") + #if !defined (__ACE_INLINE__) #include "ace/LSOCK_Stream.inl" diff --git a/dep/ACE_wrappers/ace/Lib_Find.cpp b/dep/ACE_wrappers/ace/Lib_Find.cpp index 913e94e94..c5a0610f0 100644 --- a/dep/ACE_wrappers/ace/Lib_Find.cpp +++ b/dep/ACE_wrappers/ace/Lib_Find.cpp @@ -1,4 +1,4 @@ -// $Id: Lib_Find.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Lib_Find.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/Lib_Find.h" #include "ace/Log_Msg.h" @@ -26,29 +26,30 @@ extern "C" int LIB$FIND_IMAGE_SYMBOL(...); +/** + * @internal + * + * Implements a class to register symbols and addresses for use with DLL + * symbol retrieval. + * + * OpenVMS restricts symbol length to 31 characters encoding any symbols + * longer than that. In these cases dlsym() only works with the encoded + * names. + * This creates serious problems for the service configurator framework + * where the factory method names often exceed 31 chars and where loading + * is based on retrieval of method pointers using the *full* name. + * For OpenVMS we therefor added this singleton class and the + * ACE_Dynamic_Svc_Registrar class which registers full names and function + * pointers with this singleton at the time the static ACE_Dynamic_Svc_Registrar + * object is created in a (service) DLL. + * By forcing the DLL to load using a common symbol ("NULL") we trigger static + * object creation *before* the full names are referenced. + * Symbol references will be resolved as follows on OpenVMS: + * - first try directly from DLL using the RTL dlsym() function and if that fails; + * - try to find symbol in singleton registry. + */ class ACE_LD_Symbol_Registry { - // @internal - // = TITLE - // Implements a class to register symbols and addresses for use with DLL - // symbol retrieval. - // - // = DESCRIPTION - // OpenVMS restricts symbol length to 31 characters encoding any symbols - // longer than that. In these cases dlsym() only works with the encoded - // names. - // This creates serious problems for the service configurator framework - // where the factory method names often exceed 31 chars and where loading - // is based on retrieval of method pointers using the *full* name. - // For OpenVMS we therefor added this singleton class and the - // ACE_Dynamic_Svc_Registrar class which registers full names and function - // pointers with this singleton at the time the static ACE_Dynamic_Svc_Registrar - // object is created in a (service) DLL. - // By forcing the DLL to load using a common symbol ("NULL") we trigger static - // object creation *before* the full names are referenced. - // Symbol references will be resolved as follows on OpenVMS: - // - first try directly from DLL using the RTL dlsym() function and if that fails; - // - try to find symbol in singleton registry. public: typedef ACE_RB_Tree * #endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ #endif -ACE_RCSID(ace, Lib_Find, "$Id: Lib_Find.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -202,12 +203,12 @@ ACE::ldfind (const ACE_TCHAR* filename, ACE_TCHAR tempcopy[MAXPATHLEN + 1]; ACE_TCHAR searchpathname[MAXPATHLEN + 1]; -#if defined (ACE_WIN32) && defined (ACE_LD_DECORATOR_STR) && !defined (ACE_DISABLE_DEBUG_DLL_CHECK) +#if defined (ACE_LD_DECORATOR_STR) && !defined (ACE_DISABLE_DEBUG_DLL_CHECK) ACE_TCHAR decorator[] = ACE_LD_DECORATOR_STR; ACE_TCHAR searchfilename[MAXPATHLEN + sizeof(decorator) / sizeof (ACE_TCHAR)]; #else ACE_TCHAR searchfilename[MAXPATHLEN + 1]; -#endif /* ACE_WIN32 && ACE_LD_DECORATOR_STR && !ACE_DISABLE_DEBUG_DLL_CHECK */ +#endif /* ACE_LD_DECORATOR_STR && !ACE_DISABLE_DEBUG_DLL_CHECK */ // Create a copy of filename to work with. if (ACE_OS::strlen (filename) + 1 @@ -284,18 +285,17 @@ ACE::ldfind (const ACE_TCHAR* filename, return -1; } -#if defined (ACE_WIN32) && defined (ACE_LD_DECORATOR_STR) && !defined (ACE_DISABLE_DEBUG_DLL_CHECK) - size_t len_searchfilename = ACE_OS::strlen (searchfilename); - if (! has_suffix) - ACE_OS::strcpy (searchfilename + len_searchfilename, - decorator); +#if defined (ACE_LD_DECORATOR_STR) && !defined (ACE_DISABLE_DEBUG_DLL_CHECK) + size_t const len_searchfilename = ACE_OS::strlen (searchfilename); + if (!has_suffix) + ACE_OS::strcpy (searchfilename + len_searchfilename, decorator); for (int tag = 1; tag >= 0; tag --) { if (tag == 0) searchfilename [len_searchfilename] = 0; -#endif /* ACE_WIN32 && ACE_LD_DECORATOR_STR && !ACE_DISABLE_DEBUG_DLL_CHECK */ +#endif /* ACE_LD_DECORATOR_STR && !ACE_DISABLE_DEBUG_DLL_CHECK */ // Use absolute pathname if there is one. if (ACE_OS::strlen (searchpathname) > 0) { @@ -375,9 +375,9 @@ ACE::ldfind (const ACE_TCHAR* filename, else if (pathlen > 0) return 0; #else - ACE_TCHAR *ld_path; + ACE_TCHAR *ld_path = 0; # if defined ACE_DEFAULT_LD_SEARCH_PATH - ld_path = ACE_DEFAULT_LD_SEARCH_PATH; + ld_path = const_cast (ACE_DEFAULT_LD_SEARCH_PATH); # else # if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR) ld_path = ACE_OS::getenv (ACE_LD_SEARCH_PATH); @@ -498,17 +498,16 @@ ACE::ldfind (const ACE_TCHAR* filename, ACE_OS::free (ld_path_temp); #endif /* ACE_HAS_WINCE */ ACE_OS::free ((void *) ld_path); -#if defined (ACE_HAS_WINCE) && defined (ACE_LD_DECORATOR_STR) && \ - !defined (ACE_DISABLE_DEBUG_DLL_CHECK) +#if defined (ACE_LD_DECORATOR_STR) && !defined (ACE_DISABLE_DEBUG_DLL_CHECK) if (result == 0 || tag == 0) -#endif /* ACE_HAS_WINCE && ACE_LD_DECORATOR_STR && !ACE_DISABLE_DEBUG_DLL_CHECK */ +#endif /* ACE_LD_DECORATOR_STR && !ACE_DISABLE_DEBUG_DLL_CHECK */ return result; } #endif /* ACE_WIN32 && !ACE_HAS_WINCE */ } -#if defined (ACE_WIN32) && defined (ACE_LD_DECORATOR_STR) && !defined (ACE_DISABLE_DEBUG_DLL_CHECK) +#if defined (ACE_LD_DECORATOR_STR) && !defined (ACE_DISABLE_DEBUG_DLL_CHECK) } -#endif /* ACE_WIN32 && ACE_LD_DECORATOR_STR && !ACE_DISABLE_DEBUG_DLL_CHECK */ +#endif /* ACE_LD_DECORATOR_STR && !ACE_DISABLE_DEBUG_DLL_CHECK */ errno = ENOENT; return -1; @@ -594,8 +593,8 @@ ACE::get_temp_dir (ACE_TCHAR *buffer, size_t buffer_len) buffer); // Make sure to return -1 if there is an error - if (result == 0 && ::GetLastError () != ERROR_SUCCESS - || result > static_cast (buffer_len)) + if ((result == 0 && ::GetLastError () != ERROR_SUCCESS) + || (result > static_cast (buffer_len))) result = -1; #else /* ACE_WIN32 */ diff --git a/dep/ACE_wrappers/ace/Local_Memory_Pool.cpp b/dep/ACE_wrappers/ace/Local_Memory_Pool.cpp index 559b6656f..abebb2546 100644 --- a/dep/ACE_wrappers/ace/Local_Memory_Pool.cpp +++ b/dep/ACE_wrappers/ace/Local_Memory_Pool.cpp @@ -1,4 +1,4 @@ -// $Id: Local_Memory_Pool.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Local_Memory_Pool.cpp 91286 2010-08-05 09:04:31Z johnnyw $ // Local_Memory_Pool.cpp #include "ace/Local_Memory_Pool.h" @@ -6,7 +6,7 @@ #include "ace/OS_Memory.h" #include "ace/Log_Msg.h" -ACE_RCSID(ace, Local_Memory_Pool, "$Id: Local_Memory_Pool.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/Local_Name_Space.cpp b/dep/ACE_wrappers/ace/Local_Name_Space.cpp index b3e13d7d9..36b9a8055 100644 --- a/dep/ACE_wrappers/ace/Local_Name_Space.cpp +++ b/dep/ACE_wrappers/ace/Local_Name_Space.cpp @@ -1,3 +1,5 @@ +// $Id: Local_Name_Space.cpp 91287 2010-08-05 10:30:49Z johnnyw $ + #include "ace/Local_Name_Space.h" #include "ace/ACE.h" #include "ace/RW_Process_Mutex.h" @@ -5,10 +7,6 @@ #include "ace/OS_NS_string.h" #include "ace/Truncate.h" -ACE_RCSID (ace, - Local_Name_Space, - "$Id: Local_Name_Space.cpp 80826 2008-03-04 14:51:23Z wotte $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_NS_String::~ACE_NS_String (void) diff --git a/dep/ACE_wrappers/ace/Local_Name_Space_T.cpp b/dep/ACE_wrappers/ace/Local_Name_Space_T.cpp index 9acfd1df7..ee545e5df 100644 --- a/dep/ACE_wrappers/ace/Local_Name_Space_T.cpp +++ b/dep/ACE_wrappers/ace/Local_Name_Space_T.cpp @@ -1,4 +1,4 @@ -// $Id: Local_Name_Space_T.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Local_Name_Space_T.cpp 83170 2008-10-13 07:21:38Z johnnyw $ #ifndef ACE_LOCAL_NAME_SPACE_T_CPP #define ACE_LOCAL_NAME_SPACE_T_CPP @@ -813,8 +813,8 @@ ACE_Local_Name_Space::dump_i (void) const const char *type = map_entry->int_id_.type (); #endif /* ! ACE_NLOGGING */ - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("key=%s\nvalue=%s\ntype=%s\n"), - ACE_TEXT_CHAR_TO_TCHAR (key), ACE_TEXT_CHAR_TO_TCHAR (value), ACE_TEXT_CHAR_TO_TCHAR (type))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("key=%C\nvalue=%C\ntype=%C\n"), + key, value, type)); // We need to delete key and value since char_rep allocates // memory for them delete [] key; diff --git a/dep/ACE_wrappers/ace/Local_Tokens.cpp b/dep/ACE_wrappers/ace/Local_Tokens.cpp index b41c8c31d..5901bb188 100644 --- a/dep/ACE_wrappers/ace/Local_Tokens.cpp +++ b/dep/ACE_wrappers/ace/Local_Tokens.cpp @@ -1,4 +1,4 @@ -// $Id: Local_Tokens.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Local_Tokens.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $ #include "ace/Local_Tokens.h" @@ -13,10 +13,6 @@ #endif /* __ACE_INLINE__ */ -ACE_RCSID (ace, - Local_Tokens, - "$Id: Local_Tokens.cpp 80826 2008-03-04 14:51:23Z wotte $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL void diff --git a/dep/ACE_wrappers/ace/Local_Tokens.h b/dep/ACE_wrappers/ace/Local_Tokens.h index 373e84671..603d55626 100644 --- a/dep/ACE_wrappers/ace/Local_Tokens.h +++ b/dep/ACE_wrappers/ace/Local_Tokens.h @@ -4,7 +4,7 @@ /** * @file Local_Tokens.h * - * $Id: Local_Tokens.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Local_Tokens.h 84477 2009-02-16 13:30:38Z johnnyw $ * * @author Karl-Heinz Dorn * @author Douglas C. Schmidt @@ -223,7 +223,7 @@ public: /// Allows us to pass args to the construction of the TSS object. virtual ACE_TPQ_Entry *make_TSS_TYPE (void) const; - /// Operator overloading and inheritence don't mix. + /// Operator overloading and inheritance don't mix. operator ACE_TPQ_Entry *(void); /// Dump the state of the class. @@ -270,7 +270,7 @@ public: /// Destructor. ~ACE_TPQ_Iterator (void); - /// Pass back the . + /// Pass back the @a next_item. int next (ACE_TPQ_Entry *&next_item); /// Returns 1 when all items have been seen, else 0. diff --git a/dep/ACE_wrappers/ace/Lock.cpp b/dep/ACE_wrappers/ace/Lock.cpp index eae8c3bd8..800cea220 100644 --- a/dep/ACE_wrappers/ace/Lock.cpp +++ b/dep/ACE_wrappers/ace/Lock.cpp @@ -1,4 +1,4 @@ -// $Id: Lock.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Lock.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/Lock.h" @@ -6,7 +6,7 @@ #include "ace/Lock.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ace, Lock, "$Id: Lock.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/Lock_Adapter_T.h b/dep/ACE_wrappers/ace/Lock_Adapter_T.h index 4c09f7d3a..2fe38302e 100644 --- a/dep/ACE_wrappers/ace/Lock_Adapter_T.h +++ b/dep/ACE_wrappers/ace/Lock_Adapter_T.h @@ -4,7 +4,7 @@ /** * @file Lock_Adapter_T.h * - * $Id: Lock_Adapter_T.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Lock_Adapter_T.h 84481 2009-02-17 10:58:31Z johnnyw $ * * Moved from Synch.h. * @@ -43,7 +43,7 @@ public: // = Initialization/Finalization methods. - /// Constructor. All locking requests will be forwarded to . + /// Constructor. All locking requests will be forwarded to @a lock. ACE_Lock_Adapter (ACE_LOCKING_MECHANISM &lock); /// Constructor. Since no lock is provided by the user, one will be diff --git a/dep/ACE_wrappers/ace/Log_Msg.cpp b/dep/ACE_wrappers/ace/Log_Msg.cpp index 10d5b422d..3640b23ad 100644 --- a/dep/ACE_wrappers/ace/Log_Msg.cpp +++ b/dep/ACE_wrappers/ace/Log_Msg.cpp @@ -1,4 +1,4 @@ -// $Id: Log_Msg.cpp 82581 2008-08-11 08:58:24Z johnnyw $ +// $Id: Log_Msg.cpp 91446 2010-08-24 14:16:37Z mhengstmengel $ // We need this to get the status of ACE_NTRACE... #include "ace/config-all.h" @@ -17,6 +17,7 @@ #include "ace/OS_NS_sys_time.h" #include "ace/OS_NS_wchar.h" #include "ace/OS_NS_signal.h" +#include "ace/os_include/os_typeinfo.h" #if !defined (ACE_MT_SAFE) || (ACE_MT_SAFE != 0) # include "ace/Object_Manager_Base.h" @@ -44,20 +45,12 @@ #include "ace/Log_Msg.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ace, Log_Msg, "$Id: Log_Msg.cpp 82581 2008-08-11 08:58:24Z johnnyw $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_Log_Msg) -// only used here... dhinton -#if defined (ACE_HAS_SYS_SIGLIST) -# if !defined (_sys_siglist) -# define _sys_siglist sys_siglist -# endif /* !defined (sys_siglist) */ -//extern char **_sys_siglist; -#endif /* ACE_HAS_SYS_SIGLIST */ - #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) bool ACE_Log_Msg::key_created_ = 0; # if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || \ @@ -137,7 +130,7 @@ public: #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) //FUZZ: disable check_for_lack_ACE_OS - static void close (void); + static void close (void) ACE_GCC_DESTRUCTOR_ATTRIBUTE; //FUZZ: enable check_for_lack_ACE_OS static ACE_Recursive_Thread_Mutex *get_lock (void); @@ -263,7 +256,7 @@ ACE_TSS_CLEANUP_NAME (void *ptr) if (log_msg->thr_desc()!=0) log_msg->thr_desc()->log_msg_cleanup(log_msg); else - delete (ACE_Log_Msg *) ptr; + delete log_msg; } # endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE || ACE_HAS_TSS_EMULATION */ #endif /* ! ACE_MT_SAFE */ @@ -398,7 +391,9 @@ ACE_Log_Msg::instance (void) { ACE_NEW_RETURN (log_msg_cleanup, ACE_Msg_Log_Cleanup, 0); // Register the instance for destruction at program termination. - ACE_Object_Manager::at_exit (log_msg_cleanup); + ACE_Object_Manager::at_exit (log_msg_cleanup, + 0, + typeid (*log_msg_cleanup).name ()); } return &log_msg_cleanup->object (); @@ -650,11 +645,11 @@ ACE_Log_Msg::ACE_Log_Msg (void) msg_ (0), restart_ (1), // Restart by default... ostream_ (0), + ostream_refcount_ (0), msg_callback_ (0), trace_depth_ (0), trace_active_ (false), tracing_enabled_ (true), // On by default? - delete_ostream_(false), thr_desc_ (0), priority_mask_ (default_priority_mask_), timestamp_ (0) @@ -743,24 +738,30 @@ ACE_Log_Msg::~ACE_Log_Msg (void) } } - // - // do we need to close and clean up? - // - if (this->delete_ostream_) -#if defined (ACE_LACKS_IOSTREAM_TOTALLY) - { - ACE_OS::fclose (this->ostream_); - } -#else - { - delete ostream_; - ostream_ = 0; - } -#endif + this->cleanup_ostream (); delete[] this->msg_; } +void +ACE_Log_Msg::cleanup_ostream () +{ + if (this->ostream_refcount_) + { + if (--*this->ostream_refcount_ == 0) + { + delete this->ostream_refcount_; +#if defined (ACE_LACKS_IOSTREAM_TOTALLY) + ACE_OS::fclose (this->ostream_); +#else + delete this->ostream_; + this->ostream_ = 0; +#endif + } + this->ostream_refcount_ = 0; + } +} + // Open the sender-side of the message queue. int @@ -913,7 +914,8 @@ ACE_Log_Msg::open (const ACE_TCHAR *prog_name, * '@': print a void* pointer (in hexadecimal) * 'r': call the function pointed to by the corresponding argument * 'R': print return status - * 'S': format the appropriate _sys_siglist entry corresponding to var-argument. + * 'S': print out the appropriate signal message corresponding + * to var-argument, e.g., as done by strsignal() * 's': format a character string * 'T': print timestamp in hour:minute:sec:usec format. * 'D': print timestamp in month/day/year hour:minute:sec:usec format. @@ -1016,7 +1018,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, // bp is pointer to where to put next part of logged message. // bspace is the number of characters remaining in msg_. ACE_TCHAR *bp = const_cast (this->msg ()); - size_t bspace = ACE_Log_Record::MAXLOGMSGLEN; // Leave room for Nul term. + size_t bspace = ACE_MAXLOGMSGLEN; // Leave room for Nul term. if (this->msg_off_ <= ACE_Log_Record::MAXLOGMSGLEN) bspace -= static_cast (this->msg_off_); @@ -1163,7 +1165,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, case 'A': // ACE_timer_t { ACE_OS::strcpy (fp, ACE_TEXT ("f")); - double value = va_arg (argp, double); + double const value = va_arg (argp, double); if (can_check) this_len = ACE_OS::snprintf (bp, bspace, format, value); else @@ -1262,16 +1264,20 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, #if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR) ACE_OS::strcpy (fp, ACE_TEXT ("ls: %ls")); + wchar_t *str = va_arg (argp, wchar_t *); #else ACE_OS::strcpy (fp, ACE_TEXT ("s: %s")); + ACE_TCHAR *str = va_arg (argp, ACE_TCHAR *); #endif if (can_check) this_len = ACE_OS::snprintf - (bp, bspace, format, va_arg (argp, ACE_TCHAR *), + (bp, bspace, format, + str ? str : ACE_TEXT ("(null)"), ACE_TEXT_CHAR_TO_TCHAR (msg)); else this_len = ACE_OS::sprintf - (bp, format, va_arg (argp, ACE_TCHAR *), + (bp, format, + str ? str : ACE_TEXT ("(null)"), ACE_TEXT_CHAR_TO_TCHAR (msg)); #if defined (ACE_WIN32) } @@ -1302,6 +1308,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, // it into a string. If this doesn't work it // returns "unknown error" which is fine for // our purposes. + ACE_TCHAR *str = va_arg (argp, ACE_TCHAR *); if (lpMsgBuf == 0) { const ACE_TCHAR *message = @@ -1310,12 +1317,12 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, if (can_check) this_len = ACE_OS::snprintf (bp, bspace, format, - va_arg (argp, const ACE_TCHAR *), + str ? str : ACE_TEXT ("(null)"), message); else this_len = ACE_OS::sprintf (bp, format, - va_arg (argp, const ACE_TCHAR *), + str ? str : ACE_TEXT ("(null)"), message); } else @@ -1324,12 +1331,12 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, if (can_check) this_len = ACE_OS::snprintf (bp, bspace, format, - va_arg (argp, ACE_TCHAR *), + str ? str : ACE_TEXT ("(null)"), lpMsgBuf); else this_len = ACE_OS::sprintf (bp, format, - va_arg (argp, ACE_TCHAR *), + str ? str : ACE_TEXT ("(null)"), lpMsgBuf); // Free the buffer. ::LocalFree (lpMsgBuf); @@ -1341,27 +1348,133 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, } case 'M': // Print the name of the priority of the message. -#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR) - ACE_OS::strcpy (fp, ACE_TEXT ("ls")); + + // Look at the format precision specifier. .1 is interpreted + // as a single character printout, otherwise we print the name of + // the priority. + + // So, did we find a .1 specifier? Do we need to override it? + if (format[1] == ACE_TEXT('.') && + format[2] == ACE_TEXT('1')) + { + // Yup. + // Print a single character signifying the severity of the message + fp = format; + fp++; + +# if defined (ACE_USES_WCHAR) + +# if defined (ACE_WIN32) // Windows uses 'c' for a wide character + ACE_OS::strcpy (fp, ACE_TEXT ("c")); +# else // Other platforms behave differently +# if defined (HPUX) // HP-Unix compatible + ACE_OS::strcpy (fp, ACE_TEXT ("C")); +# else // Other + ACE_OS::strcpy (fp, ACE_TEXT ("lc")); +# endif /* HPUX */ +# endif + +# else /* ACE_USES_WCHAR */ + + // Non-unicode builds simply use a standard character format specifier + ACE_OS::strcpy (fp, ACE_TEXT ("c")); + +# endif /* ACE_USES_WCHAR */ + + // Below is an optimized (binary search based) + // version of the following simple piece of code: + // + // log_priority == LM_SHUTDOWN ? 'S' : // Shutdown + // log_priority == LM_TRACE ? 'T' : // Trace + // log_priority == LM_DEBUG ? 'D' : // Debug + // log_priority == LM_INFO ? 'I' : // Info + // log_priority == LM_NOTICE ? 'N' : // Notice + // log_priority == LM_WARNING ? 'W' : // Warning + // log_priority == LM_STARTUP ? 'U' : // Startup + // log_priority == LM_ERROR ? 'E' : // Error + // log_priority == LM_CRITICAL ? 'C' : // Critical + // log_priority == LM_ALERT ? 'A' : // Alert + // log_priority == LM_EMERGENCY ? '!' : // Emergency + // '?' // Unknown + + if (can_check) + { + this_len = ACE_OS::snprintf + (bp, bspace, format, +#if !defined (ACE_USES_WCHAR) || defined (ACE_WIN32) + (int) #else - ACE_OS::strcpy (fp, ACE_TEXT ("s")); + (wint_t) #endif - if (can_check) - this_len = ACE_OS::snprintf - (bp, bspace, format, - ACE_Log_Record::priority_name (log_priority)); + (log_priority <= LM_WARNING) ? + (log_priority <= LM_DEBUG) ? + (log_priority <= LM_TRACE) ? + (log_priority == LM_SHUTDOWN) ? + ACE_TEXT('S') : ACE_TEXT('T') : ACE_TEXT('D') : + (log_priority <= LM_NOTICE) ? + (log_priority == LM_INFO) ? + ACE_TEXT('I') : ACE_TEXT('N') : ACE_TEXT('W') : + (log_priority <= LM_CRITICAL) ? + (log_priority <= LM_ERROR) ? + (log_priority == LM_STARTUP) ? + ACE_TEXT('U') : ACE_TEXT('E') : ACE_TEXT('C') : + (log_priority <= LM_EMERGENCY) ? + (log_priority == LM_ALERT) ? + ACE_TEXT('A') : ACE_TEXT('!') : ACE_TEXT('?')); + } + else + { + this_len = ACE_OS::sprintf + (bp, format, +#if !defined (ACE_USES_WCHAR) || defined (ACE_WIN32) + (int) +#else + (wint_t) +#endif + (log_priority <= LM_WARNING) ? + (log_priority <= LM_DEBUG) ? + (log_priority <= LM_TRACE) ? + (log_priority == LM_SHUTDOWN) ? + ACE_TEXT('S') : ACE_TEXT('T') : ACE_TEXT('D') : + (log_priority <= LM_NOTICE) ? + (log_priority == LM_INFO) ? + ACE_TEXT('I') : ACE_TEXT('N') : ACE_TEXT('W') : + (log_priority <= LM_CRITICAL) ? + (log_priority <= LM_ERROR) ? + (log_priority == LM_STARTUP) ? + ACE_TEXT('U') : ACE_TEXT('E') : ACE_TEXT('C') : + (log_priority <= LM_EMERGENCY) ? + (log_priority == LM_ALERT) ? + ACE_TEXT('A') : ACE_TEXT('!') : ACE_TEXT('?')); + } + + ACE_UPDATE_COUNT (bspace, this_len); + } else - this_len = ACE_OS::sprintf - (bp, format, - ACE_Log_Record::priority_name (log_priority)); - ACE_UPDATE_COUNT (bspace, this_len); + { + // Nope, print out standard priority_name() string + +#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR) + ACE_OS::strcpy (fp, ACE_TEXT ("ls")); +#else + ACE_OS::strcpy (fp, ACE_TEXT ("s")); +#endif + if (can_check) + this_len = ACE_OS::snprintf + (bp, bspace, format, + ACE_Log_Record::priority_name (log_priority)); + else + this_len = ACE_OS::sprintf + (bp, format, + ACE_Log_Record::priority_name (log_priority)); + ACE_UPDATE_COUNT (bspace, this_len); + } break; case 'm': // Format the string assocated with the errno value. { errno = 0; - char *msg = 0; - msg = ACE_OS::strerror (ACE::map_errno (this->errnum ())); + char *msg = ACE_OS::strerror (ACE::map_errno (this->errnum ())); // Windows can try to translate the errnum using // system calls if strerror() doesn't get anything useful. #if defined (ACE_WIN32) @@ -1520,36 +1633,14 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, case 'S': // format the string for with this signal number. { - int sig = va_arg (argp, int); -#if defined (ACE_HAS_SYS_SIGLIST) - if (sig >= 0 && sig < ACE_NSIG) - { - ACE_OS::strcpy (fp, ACE_TEXT ("s")); - if (can_check) - this_len = ACE_OS::snprintf - (bp, bspace, format, _sys_siglist[sig]); - else - this_len = ACE_OS::sprintf - (bp, format, _sys_siglist[sig]); - } - else - { - if (can_check) - this_len = ACE_OS::snprintf - (bp, bspace, - ACE_TEXT(" %d"), sig); - else - this_len = ACE_OS::sprintf - (bp, ACE_TEXT (" %d"), sig); - } -#else + const int sig = va_arg (argp, int); + ACE_OS::strcpy (fp, ACE_TEXT ("s")); if (can_check) this_len = ACE_OS::snprintf - (bp, bspace, ACE_TEXT ("signal %d"), sig); + (bp, bspace, format, ACE_OS::strsignal(sig)); else this_len = ACE_OS::sprintf - (bp, ACE_TEXT ("signal %d"), sig); -#endif /* ACE_HAS_SYS_SIGLIST */ + (bp, format, ACE_OS::strsignal(sig)); ACE_UPDATE_COUNT (bspace, this_len); break; } @@ -1558,8 +1649,19 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, // Weekday Month day year hour:minute:sec.usec { ACE_TCHAR day_and_time[35]; - ACE::timestamp (day_and_time, - sizeof day_and_time / sizeof (ACE_TCHAR)); + // Did we find the flag indicating a time value argument + if (format[1] == ACE_TEXT('#')) + { + ACE_Time_Value* time_value = va_arg (argp, ACE_Time_Value*); + ACE::timestamp (*time_value, + day_and_time, + sizeof day_and_time / sizeof (ACE_TCHAR)); + } + else + { + ACE::timestamp (day_and_time, + sizeof day_and_time / sizeof (ACE_TCHAR)); + } #if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR) ACE_OS::strcpy (fp, ACE_TEXT ("ls")); #else @@ -1583,14 +1685,33 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, #else ACE_OS::strcpy (fp, ACE_TEXT ("s")); #endif - if (can_check) - this_len = ACE_OS::snprintf - (bp, bspace, format, - ACE::timestamp (day_and_time, sizeof day_and_time / sizeof (ACE_TCHAR))); + // Did we find the flag indicating a time value argument + if (format[1] == ACE_TEXT('#')) + { + ACE_Time_Value* time_value = va_arg (argp, ACE_Time_Value*); + if (can_check) + this_len = ACE_OS::snprintf + (bp, bspace, format, + ACE::timestamp (*time_value, + day_and_time, + sizeof day_and_time / sizeof (ACE_TCHAR))); + else + this_len = ACE_OS::sprintf + (bp, format, ACE::timestamp (*time_value, + day_and_time, + sizeof day_and_time / sizeof (ACE_TCHAR))); + } else - this_len = ACE_OS::sprintf - (bp, format, ACE::timestamp (day_and_time, - sizeof day_and_time / sizeof (ACE_TCHAR))); + { + if (can_check) + this_len = ACE_OS::snprintf + (bp, bspace, format, + ACE::timestamp (day_and_time, sizeof day_and_time / sizeof (ACE_TCHAR))); + else + this_len = ACE_OS::sprintf + (bp, format, ACE::timestamp (day_and_time, + sizeof day_and_time / sizeof (ACE_TCHAR))); + } ACE_UPDATE_COUNT (bspace, this_len); break; } @@ -2190,7 +2311,6 @@ ACE_Log_Msg::log (ACE_Log_Record &log_record, ACE_Log_Msg_Manager::custom_backend_->log (log_record); } - // This must come last, after the other two print operations // (see the method for details). if (ACE_BIT_ENABLED (ACE_Log_Msg::flags_, @@ -2226,7 +2346,7 @@ ACE_Log_Msg::log_hexdump (ACE_Log_Priority log_priority, return 0; ACE_TCHAR* buf = 0; - const size_t buf_sz = + size_t const buf_sz = ACE_Log_Record::MAXLOGMSGLEN - ACE_Log_Record::VERBOSE_LEN - 58; ACE_NEW_RETURN (buf, ACE_TCHAR[buf_sz], -1); @@ -2245,7 +2365,11 @@ ACE_Log_Msg::log_hexdump (ACE_Log_Priority log_priority, if (text) sz = ACE_OS::sprintf (msg_buf, +#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR) + ACE_TEXT ("%ls - "), +#else ACE_TEXT ("%s - "), +#endif text); sz += ACE_OS::sprintf (msg_buf + sz, @@ -2273,20 +2397,20 @@ ACE_Log_Msg::log_hexdump (ACE_Log_Priority log_priority, } void -ACE_Log_Msg::set (const char *filename, +ACE_Log_Msg::set (const char *file, int line, - int status, - int err, - int rs, + int op_status, + int errnum, + bool restart, ACE_OSTREAM_TYPE *os, ACE_Log_Msg_Callback *c) { ACE_TRACE ("ACE_Log_Msg::set"); - this->file (filename); + this->file (file); this->linenum (line); - this->op_status (status); - this->errnum (err); - this->restart (rs); + this->op_status (op_status); + this->errnum (errnum); + this->restart (restart); this->msg_ostream (os); this->msg_callback (c); } @@ -2412,18 +2536,32 @@ void ACE_Log_Msg::msg_ostream (ACE_OSTREAM_TYPE *m, bool delete_ostream) { if (this->ostream_ == m) - return; - - if (this->delete_ostream_) { -#if defined (ACE_LACKS_IOSTREAM_TOTALLY) - ACE_OS::fclose (this->ostream_); -#else - delete this->ostream_; -#endif + // Same stream, allow user to change the delete_ostream "flag" + if (delete_ostream && !this->ostream_refcount_) + { + ACE_NEW (this->ostream_refcount_, Atomic_ULong (1)); + } + else if (!delete_ostream && this->ostream_refcount_) + { + if (--*this->ostream_refcount_ == 0) + { + delete this->ostream_refcount_; + } + this->ostream_refcount_ = 0; + } + // The other two cases are no-ops, the user has requested the same + // state that's already present. + return; + } + + this->cleanup_ostream (); + + if (delete_ostream) + { + ACE_NEW (this->ostream_refcount_, Atomic_ULong (1)); } - this->delete_ostream_ = delete_ostream; this->ostream_ = m; } @@ -2477,6 +2615,15 @@ ACE_Log_Msg::init_hook (ACE_OS_Log_Msg_Attributes &attributes { ACE_Log_Msg *inherit_log = ACE_LOG_MSG; attributes.ostream_ = inherit_log->msg_ostream (); + if (attributes.ostream_ && inherit_log->ostream_refcount_) + { + ++*inherit_log->ostream_refcount_; + attributes.ostream_refcount_ = inherit_log->ostream_refcount_; + } + else + { + attributes.ostream_refcount_ = 0; + } attributes.priority_mask_ = inherit_log->priority_mask (); attributes.tracing_enabled_ = inherit_log->tracing_enabled (); attributes.restart_ = inherit_log->restart (); @@ -2501,7 +2648,10 @@ ACE_Log_Msg::inherit_hook (ACE_OS_Thread_Descriptor *thr_desc, if (attributes.ostream_) { - new_log->msg_ostream (attributes.ostream_); + new_log->ostream_ = attributes.ostream_; + new_log->ostream_refcount_ = + static_cast (attributes.ostream_refcount_); + new_log->priority_mask (attributes.priority_mask_); if (attributes.tracing_enabled_) diff --git a/dep/ACE_wrappers/ace/Log_Msg.h b/dep/ACE_wrappers/ace/Log_Msg.h index 69904a4db..ee75432ff 100644 --- a/dep/ACE_wrappers/ace/Log_Msg.h +++ b/dep/ACE_wrappers/ace/Log_Msg.h @@ -4,7 +4,7 @@ /** * @file Log_Msg.h * - * $Id: Log_Msg.h 82511 2008-08-05 16:52:44Z shuston $ + * $Id: Log_Msg.h 91446 2010-08-24 14:16:37Z mhengstmengel $ * * @author Douglas C. Schmidt */ @@ -24,24 +24,40 @@ #include "ace/Default_Constants.h" #include "ace/Log_Priority.h" #include "ace/os_include/os_limits.h" +#include "ace/Atomic_Op.h" +#include "ace/Synch_Traits.h" // The ACE_ASSERT macro used to be defined here, include ace/Assert.h // for backwards compatibility. #include "ace/Assert.h" #if defined (ACE_NLOGGING) -#define ACE_HEX_DUMP(X) do {} while (0) -#define ACE_RETURN(Y) do { return (Y); } while (0) -#define ACE_ERROR_RETURN(X, Y) return (Y) -#define ACE_ERROR_BREAK(X) { break; } -#define ACE_ERROR(X) do {} while (0) -#define ACE_DEBUG(X) do {} while (0) -#define ACE_ERROR_INIT(VALUE, FLAGS) +#if !defined (ACE_HEX_DUMP) +# define ACE_HEX_DUMP(X) do {} while (0) +#endif +#if !defined (ACE_RETURN) +# define ACE_RETURN(Y) do { return (Y); } while (0) +#endif +#if !defined (ACE_ERROR_RETURN) +# define ACE_ERROR_RETURN(X, Y) return (Y) +#endif +#if !defined (ACE_ERROR_BREAK) +# define ACE_ERROR_BREAK(X) { break; } +#endif +#if !defined (ACE_ERROR) +# define ACE_ERROR(X) do {} while (0) +#endif +#if !defined (ACE_DEBUG) +# define ACE_DEBUG(X) do {} while (0) +#endif +#if !defined (ACE_ERROR_INIT) +# define ACE_ERROR_INIT(VALUE, FLAGS) +#endif #else #if !defined (ACE_HEX_DUMP) #define ACE_HEX_DUMP(X) \ do { \ - int __ace_error = ACE_Log_Msg::last_error_adapter (); \ + int const __ace_error = ACE_Log_Msg::last_error_adapter (); \ ACE_Log_Msg *ace___ = ACE_Log_Msg::instance (); \ ace___->conditional_set (__FILE__, __LINE__, 0, __ace_error); \ ace___->log_hexdump X; \ @@ -50,7 +66,7 @@ #if !defined (ACE_RETURN) #define ACE_RETURN(Y) \ do { \ - int __ace_error = ACE_Log_Msg::last_error_adapter (); \ + int const __ace_error = ACE_Log_Msg::last_error_adapter (); \ ACE_Log_Msg *ace___ = ACE_Log_Msg::instance (); \ ace___->set (__FILE__, __LINE__, Y, __ace_error, ace___->restart (), \ ace___->msg_ostream (), ace___->msg_callback ()); \ @@ -60,7 +76,7 @@ #if !defined (ACE_ERROR_RETURN) #define ACE_ERROR_RETURN(X, Y) \ do { \ - int __ace_error = ACE_Log_Msg::last_error_adapter (); \ + int const __ace_error = ACE_Log_Msg::last_error_adapter (); \ ACE_Log_Msg *ace___ = ACE_Log_Msg::instance (); \ ace___->conditional_set (__FILE__, __LINE__, Y, __ace_error); \ ace___->log X; \ @@ -70,7 +86,7 @@ #if !defined (ACE_ERROR) #define ACE_ERROR(X) \ do { \ - int __ace_error = ACE_Log_Msg::last_error_adapter (); \ + int const __ace_error = ACE_Log_Msg::last_error_adapter (); \ ACE_Log_Msg *ace___ = ACE_Log_Msg::instance (); \ ace___->conditional_set (__FILE__, __LINE__, -1, __ace_error); \ ace___->log X; \ @@ -79,7 +95,7 @@ #if !defined (ACE_DEBUG) #define ACE_DEBUG(X) \ do { \ - int __ace_error = ACE_Log_Msg::last_error_adapter (); \ + int const __ace_error = ACE_Log_Msg::last_error_adapter (); \ ACE_Log_Msg *ace___ = ACE_Log_Msg::instance (); \ ace___->conditional_set (__FILE__, __LINE__, 0, __ace_error); \ ace___->log X; \ @@ -89,7 +105,8 @@ #define ACE_ERROR_INIT(VALUE, FLAGS) \ do { \ ACE_Log_Msg *ace___ = ACE_Log_Msg::instance (); \ - ace___->set_flags (FLAGS); ace___->op_status (VALUE); \ + ace___->set_flags (FLAGS); \ + ace___->op_status (VALUE); \ } while (0) #endif #if !defined (ACE_ERROR_BREAK) @@ -315,11 +332,11 @@ public: /// Set the field that indicates whether interrupted calls should be /// restarted. - void restart (int); + void restart (bool r); /// Get the field that indicates whether interrupted calls should be /// restarted. - int restart (void) const; + bool restart (void) const; // = Notice that the following two function is equivalent to // "void msg_ostream (HANDLE)" and "HANDLE msg_ostream (void)" @@ -469,7 +486,7 @@ public: int line, int op_status = -1, int errnum = 0, - int restart = 1, + bool restart = true, ACE_OSTREAM_TYPE *os = 0, ACE_Log_Msg_Callback *c = 0); @@ -509,11 +526,16 @@ public: * - '@': print a void* pointer (in hexadecimal) * - 'r': call the function pointed to by the corresponding argument * - 'R': print return status - * - 'S': print out the appropriate _sys_siglist entry corresponding - * to var-argument. + * - 'S': print out the appropriate signal message corresponding + * to var-argument, e.g., as done by strsignal() * - 's': prints a ACE_TCHAR* character string (also see C and W) - * - 'T': print timestamp in hour:minute:sec:usec format. + * - 'T': print timestamp in hour:minute:sec:usec format (plain option, + * i.e. without any flags, prints system supplied timestamp; + * with '#' flag added expects ACE_Time_Value* in argument list) * - 'D': print timestamp as Weekday Month day year hour:minute:sec.usec + * (plain option, i.e. without any flags, prints system supplied + * timestamp; with '#' flag added expects ACE_Time_Value* in + * argument list) * - 't': print thread id (1 if single-threaded) * - 'u': print as unsigned int * - 'w': prints a wide character @@ -583,6 +605,8 @@ public: ACE_ALLOC_HOOK_DECLARE; private: + void cleanup_ostream (); + /// Status of operation (-1 means failure, >= 0 means success). int status_; @@ -602,11 +626,20 @@ private: /// Indicates whether we should restart system calls that are /// interrupted. - int restart_; + bool restart_; /// The ostream where logging messages can be written. ACE_OSTREAM_TYPE *ostream_; + /// This pointer is 0 if we are not reference counting (the user has not + /// passed "true" for the delete_ostream argument to msg_ostream). + /// If we are reference counting, this points to a shared count that will + /// be deleted when it reaches zero. Since we want optional but shared + /// ownership neither std::auto_ptr nor ACE_Strong_Bound_Ptr have the right + /// semantics. *Bound_Ptr also doesn't take advantage of Atomic_Op. + typedef ACE_Atomic_Op Atomic_ULong; + Atomic_ULong *ostream_refcount_; + /// The callback object. ACE_Log_Msg_Callback *msg_callback_; @@ -619,9 +652,6 @@ private: /// Are we allowing tracing in this thread? bool tracing_enabled_; - /// Are we deleting this ostream? - bool delete_ostream_; - /** * If we're running in the context of an ACE_Thread_Manager this * will point to the thread descriptor adapter which holds the diff --git a/dep/ACE_wrappers/ace/Log_Msg.inl b/dep/ACE_wrappers/ace/Log_Msg.inl index 2af6a376b..bb5290331 100644 --- a/dep/ACE_wrappers/ace/Log_Msg.inl +++ b/dep/ACE_wrappers/ace/Log_Msg.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: Log_Msg.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Log_Msg.inl 82723 2008-09-16 09:35:44Z johnnyw $ #include "ace/OS_NS_string.h" #include "ace/OS_NS_unistd.h" @@ -41,13 +41,13 @@ ACE_Log_Msg::op_status (void) const ACE_INLINE void -ACE_Log_Msg::restart (int r) +ACE_Log_Msg::restart (bool r) { this->restart_ = r; } ACE_INLINE -int +bool ACE_Log_Msg::restart (void) const { return this->restart_; diff --git a/dep/ACE_wrappers/ace/Log_Msg_Backend.cpp b/dep/ACE_wrappers/ace/Log_Msg_Backend.cpp index 1d739471f..3ab6a3d70 100644 --- a/dep/ACE_wrappers/ace/Log_Msg_Backend.cpp +++ b/dep/ACE_wrappers/ace/Log_Msg_Backend.cpp @@ -1,8 +1,8 @@ -// $Id: Log_Msg_Backend.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Log_Msg_Backend.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/Log_Msg_Backend.h" -ACE_RCSID(ace, Log_Msg_Backend, "$Id: Log_Msg_Backend.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/Log_Msg_Callback.cpp b/dep/ACE_wrappers/ace/Log_Msg_Callback.cpp index b38113d24..62ae542cf 100644 --- a/dep/ACE_wrappers/ace/Log_Msg_Callback.cpp +++ b/dep/ACE_wrappers/ace/Log_Msg_Callback.cpp @@ -1,8 +1,8 @@ -// $Id: Log_Msg_Callback.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Log_Msg_Callback.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/Log_Msg_Callback.h" -ACE_RCSID(ace, Log_Msg_Callback, "$Id: Log_Msg_Callback.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/Log_Msg_Callback.h b/dep/ACE_wrappers/ace/Log_Msg_Callback.h index f743987b4..a67407459 100644 --- a/dep/ACE_wrappers/ace/Log_Msg_Callback.h +++ b/dep/ACE_wrappers/ace/Log_Msg_Callback.h @@ -4,7 +4,7 @@ /** * @file Log_Msg_Callback.h * - * $Id: Log_Msg_Callback.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Log_Msg_Callback.h 91064 2010-07-12 10:11:24Z johnnyw $ * * @author Douglas C. Schmidt */ @@ -35,7 +35,7 @@ class ACE_Log_Record; * Log_Msg class and make sure that they turn on the * ACE_Log_Msg::MSG_CALLBACK flag. * - * Your routine is called with an instance of + * Your log() routine is called with an instance of * ACE_Log_Record. From this class, you can get the log * message, the verbose log message, message type, message * priority, and so on. @@ -43,9 +43,9 @@ class ACE_Log_Record; * Remember that there is one Log_Msg object per thread. * Therefore, you may need to register your callback object with * many ACE_Log_Msg objects (and have the correct - * synchronization in the method) or have a separate + * synchronization in the log() method) or have a separate * callback object per Log_Msg object. Moreover, - * are not inherited when a new thread + * ACE_Log_Msg_Callbacks are not inherited when a new thread * is spawned because it might have been allocated off of the * stack of the original thread, in which case all hell would * break loose... Therefore, you'll need to reset these in each diff --git a/dep/ACE_wrappers/ace/Log_Msg_IPC.cpp b/dep/ACE_wrappers/ace/Log_Msg_IPC.cpp index b6319517a..4df1db722 100644 --- a/dep/ACE_wrappers/ace/Log_Msg_IPC.cpp +++ b/dep/ACE_wrappers/ace/Log_Msg_IPC.cpp @@ -1,11 +1,11 @@ -// $Id: Log_Msg_IPC.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Log_Msg_IPC.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/Log_Msg_IPC.h" #include "ace/Log_Record.h" #include "ace/CDR_Stream.h" #include "ace/Truncate.h" -ACE_RCSID(ace, Log_Msg_IPC, "$Id: Log_Msg_IPC.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -64,21 +64,24 @@ ACE_Log_Msg_IPC::log (ACE_Log_Record &log_record) // Insert contents of into payload stream. ACE_OutputCDR payload (max_payload_size); - payload << log_record; + if (!(payload << log_record)) + return -1; // Get the number of bytes used by the CDR stream. If it becomes desireable // to support payloads more than 4GB, this field will need to be changed // to a 64-bit value. - ACE_CDR::ULong length = + ACE_CDR::ULong const length = ACE_Utils::truncate_cast (payload.total_length ()); // Send a header so the receiver can determine the byte order and // size of the incoming CDR stream. ACE_OutputCDR header (ACE_CDR::MAX_ALIGNMENT + 8); - header << ACE_OutputCDR::from_boolean (ACE_CDR_BYTE_ORDER); + if (!(header << ACE_OutputCDR::from_boolean (ACE_CDR_BYTE_ORDER))) + return -1; // Store the size of the payload that follows - header << ACE_CDR::ULong (length); + if (!(header << ACE_CDR::ULong (length))) + return -1; // Use an iovec to send both buffer and payload simultaneously. iovec iov[2]; @@ -87,7 +90,7 @@ ACE_Log_Msg_IPC::log (ACE_Log_Record &log_record) iov[1].iov_base = payload.begin ()->rd_ptr (); iov[1].iov_len = length; -#if defined (ACE_HAS_STREAM_PIPES) +#if (ACE_HAS_STREAM_LOG_MSG_IPC == 1) // Use the API if supported to ensure correct message // queueing according to priority. @@ -105,7 +108,7 @@ ACE_Log_Msg_IPC::log (ACE_Log_Record &log_record) // We're running over sockets, so send header and payload // efficiently using "gather-write". return this->message_queue_.sendv_n (iov, 2); -#endif /* ACE_HAS_STREAM_PIPES */ +#endif /* ACE_HAS_STREAM_LOG_MSG_IPC */ } ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/Log_Msg_IPC.h b/dep/ACE_wrappers/ace/Log_Msg_IPC.h index c06b5f62f..958eae276 100644 --- a/dep/ACE_wrappers/ace/Log_Msg_IPC.h +++ b/dep/ACE_wrappers/ace/Log_Msg_IPC.h @@ -4,7 +4,7 @@ /** * @file Log_Msg_IPC.h * - * $Id: Log_Msg_IPC.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Log_Msg_IPC.h 84536 2009-02-20 09:28:48Z johnnyw $ * * @author Carlos O'Ryan */ @@ -20,10 +20,12 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Default_Constants.h" + // IPC conduit between sender and client daemon. This should be // included in the ACE_Log_Msg class, but due to "order of include" // problems it can't be... -#if defined (ACE_HAS_STREAM_PIPES) +#if (ACE_HAS_STREAM_LOG_MSG_IPC == 1) # include "ace/SPIPE_Connector.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL typedef ACE_SPIPE_Stream ACE_LOG_MSG_IPC_STREAM; diff --git a/dep/ACE_wrappers/ace/Log_Msg_NT_Event_Log.cpp b/dep/ACE_wrappers/ace/Log_Msg_NT_Event_Log.cpp index 5cfed4b25..2e7ff49fa 100644 --- a/dep/ACE_wrappers/ace/Log_Msg_NT_Event_Log.cpp +++ b/dep/ACE_wrappers/ace/Log_Msg_NT_Event_Log.cpp @@ -1,4 +1,4 @@ -// $Id: Log_Msg_NT_Event_Log.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Log_Msg_NT_Event_Log.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/config-all.h" @@ -10,7 +10,7 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" -ACE_RCSID(ace, Log_Msg_NT_Event_Log, "$Id: Log_Msg_NT_Event_Log.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -106,11 +106,16 @@ ACE_Log_Msg_NT_Event_Log::log (ACE_Log_Record &log_record) // 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]; + const ACE_TCHAR *src_msg_data = log_record.msg_data (); + ACE_TCHAR msg_data [(ACE_Log_Record::MAXLOGMSGLEN * 2) + 1]; + size_t maxlen = ACE_Log_Record::MAXLOGMSGLEN; + if (ACE_Log_Record::MAXLOGMSGLEN > log_record.msg_data_len ()) + maxlen = log_record.msg_data_len (); + + size_t end = 0; for (size_t i = 0, j = 0; - i < log_record.msg_data_len (); + i < maxlen; ++i) { if (src_msg_data[i] == '\n') @@ -120,7 +125,10 @@ ACE_Log_Msg_NT_Event_Log::log (ACE_Log_Record &log_record) } else msg_data[j++] = src_msg_data[i]; + + end = j; } + msg_data[end] = '\0'; // Map the ACE log record type to an event log type. WORD event_type; diff --git a/dep/ACE_wrappers/ace/Log_Msg_UNIX_Syslog.h b/dep/ACE_wrappers/ace/Log_Msg_UNIX_Syslog.h index 3c762e8da..56d75029e 100644 --- a/dep/ACE_wrappers/ace/Log_Msg_UNIX_Syslog.h +++ b/dep/ACE_wrappers/ace/Log_Msg_UNIX_Syslog.h @@ -4,7 +4,7 @@ /** * @file Log_Msg_UNIX_Syslog.h * - * $Id: Log_Msg_UNIX_Syslog.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Log_Msg_UNIX_Syslog.h 90388 2010-06-02 15:27:59Z vzykov $ * * @author Jerry D. De Master */ @@ -23,6 +23,7 @@ #if !defined (ACE_LACKS_UNIX_SYSLOG) #include "ace/Log_Msg_Backend.h" +#include "ace/Basic_Types.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/Log_Record.cpp b/dep/ACE_wrappers/ace/Log_Record.cpp index f3ea5d659..2d9bd6322 100644 --- a/dep/ACE_wrappers/ace/Log_Record.cpp +++ b/dep/ACE_wrappers/ace/Log_Record.cpp @@ -1,4 +1,4 @@ -// $Id: Log_Record.cpp 81826 2008-06-02 15:29:53Z schmidt $ +// $Id: Log_Record.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/Log_Record.h" @@ -21,7 +21,7 @@ #include "ace/OS_Memory.h" -ACE_RCSID(ace, Log_Record, "$Id: Log_Record.cpp 81826 2008-06-02 15:29:53Z schmidt $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/Log_Record.h b/dep/ACE_wrappers/ace/Log_Record.h index 9e9e2a92d..aaf2a21ed 100644 --- a/dep/ACE_wrappers/ace/Log_Record.h +++ b/dep/ACE_wrappers/ace/Log_Record.h @@ -4,7 +4,7 @@ /** * @file Log_Record.h * - * $Id: Log_Record.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Log_Record.h 91064 2010-07-12 10:11:24Z johnnyw $ * * @author Douglas C. Schmidt */ @@ -56,7 +56,7 @@ public: // = Initialization /** - * Create a and set its priority, time stamp, and + * Create a Log_Record and set its priority, time stamp, and * process id. */ ACE_Log_Record (void); @@ -72,7 +72,7 @@ public: /// Write the contents of the logging record to the appropriate - /// iff the corresponding type is enabled. + /// FILE if the corresponding type is enabled. int print (const ACE_TCHAR host_name[], u_long verbose_flag, #if !defined (ACE_HAS_WINCE) @@ -83,7 +83,7 @@ public: #if !defined (ACE_LACKS_IOSTREAM_TOTALLY) /// Write the contents of the logging record to the appropriate - /// iff the corresponding type is enabled. + /// @a stream if the corresponding type is enabled. int print (const ACE_TCHAR host_name[], u_long verbose_flag, ACE_OSTREAM_TYPE &stream); @@ -95,68 +95,73 @@ public: /** * Returns a character array with the string form of the - * parameter. This is used for the verbose + * ACE_Log_Priority parameter. This is used for the verbose * printing format. */ static const ACE_TCHAR *priority_name (ACE_Log_Priority p); - // IMPORTANT: @a name must be a statically allocated const ACE_TCHAR* - static void priority_name (ACE_Log_Priority p, - const ACE_TCHAR *name); + /// IMPORTANT: @a name must be a statically allocated const ACE_TCHAR* + static void priority_name (ACE_Log_Priority p, const ACE_TCHAR *name); // = Marshall/demarshall - /// Encode the for transmission on the network. - /// @deprecated The encode() and decode() metods are deprecated; please use - /// the CDR insertion and extraction operators to properly encode and decode - /// ACE_Log_Record objects. + /** + * Encode the @c Log_Record for transmission on the network. + * @deprecated + * The encode() and decode() metods are deprecated; please use + * the CDR insertion and extraction operators to properly encode and decode + * ACE_Log_Record objects. + */ void encode (void); - /// Decode the received from the network. - /// @deprecated The encode() and decode() metods are deprecated; please use - /// the CDR insertion and extraction operators to properly encode and decode - /// ACE_Log_Record objects. + /** + * Decode the @c Log_Record received from the network. + * @deprecated + * The encode() and decode() metods are deprecated; please use + * the CDR insertion and extraction operators to properly encode and decode + * ACE_Log_Record objects. + */ void decode (void); // = Set/get methods - /// Get the type of the . + /// Get the type of the Log_Record. ACE_UINT32 type (void) const; - /// Set the type of the . + /// Set the type of the Log_Record. void type (ACE_UINT32); /** - * Get the priority of the . This is computed + * Get the priority of the Log_Record . This is computed * as the base 2 logarithm of (which must be a power of 2, - * as defined by the enums in ). + * as defined by the enums in ACE_Log_Priority). */ u_long priority (void) const; - /// Set the priority of the (which must be a - /// power of 2, as defined by the enums in ). + /// Set the priority of the Log_Record (which must be a + /// power of 2, as defined by the enums in ACE_Log_Priority). void priority (u_long num); - /// Get the total length of the , which includes the + /// Get the total length of the Log_Record, which includes the /// size of the various data member fields. long length (void) const; - /// Set the total length of the , which needs to account for + /// Set the total length of the Log_Record, which needs to account for /// the size of the various data member fields. void length (long); - /// Get the time stamp of the . + /// Get the time stamp of the Log_Record. ACE_Time_Value time_stamp (void) const; - /// Set the time stamp of the . + /// Set the time stamp of the Log_Record. void time_stamp (const ACE_Time_Value &ts); - /// Get the process id of the . + /// Get the process id of the Log_Record. long pid (void) const; - /// Set the process id of the . + /// Set the process id of the Log_Record. void pid (long); - /// Get the message data of the . + /// Get the message data of the Log_Record. const ACE_TCHAR *msg_data (void) const; /// Set the message data of the record. If @a data is longer than the @@ -164,7 +169,7 @@ public: /// fit. If such a reallocation faisl, this method returns -1, else 0. int msg_data (const ACE_TCHAR *data); - /// Get the size of the message data of the , including + /// Get the size of the message data of the Log_Record, including /// a byte for the NUL. size_t msg_data_len (void) const; @@ -198,7 +203,9 @@ private: /// Logging record data ACE_TCHAR *msg_data_; // Heap-allocated text message area - size_t msg_data_size_; // Allocated size of msg_data_ in ACE_TCHARs + + /// Allocated size of msg_data_ in ACE_TCHARs + size_t msg_data_size_; /// disallow copying... ACE_Log_Record (const ACE_Log_Record& rhs); diff --git a/dep/ACE_wrappers/ace/Log_Record.inl b/dep/ACE_wrappers/ace/Log_Record.inl index 4fe84ecab..50cfa70df 100644 --- a/dep/ACE_wrappers/ace/Log_Record.inl +++ b/dep/ACE_wrappers/ace/Log_Record.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: Log_Record.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Log_Record.inl 84183 2009-01-19 08:50:16Z johnnyw $ #include "ace/Global_Macros.h" #include "ace/os_include/arpa/os_inet.h" @@ -20,17 +20,15 @@ ACE_INLINE void ACE_Log_Record::encode (void) { ACE_TRACE ("ACE_Log_Record::encode"); -#if !defined (ACE_LACKS_HTONL) - this->length_ = htonl (this->length_); - this->type_ = htonl (this->type_); + this->length_ = ACE_HTONL (this->length_); + this->type_ = ACE_HTONL (this->type_); // Make sure we don't enclose the sec() and usec() fields until // they've been normalized. // secs_ is commented out because it can be 64 bits. This method is // deprecated; use the CDR operations instead. - // this->secs_ = htonl (this->secs_); - this->usecs_ = htonl (this->usecs_); - this->pid_ = htonl (this->pid_); -#endif /* ACE_LACKS_HTONL */ + // this->secs_ = ACE_HTONL (this->secs_); + this->usecs_ = ACE_HTONL (this->usecs_); + this->pid_ = ACE_HTONL (this->pid_); } ACE_INLINE void diff --git a/dep/ACE_wrappers/ace/Logging_Strategy.cpp b/dep/ACE_wrappers/ace/Logging_Strategy.cpp index 05d913bc9..67b62465c 100644 --- a/dep/ACE_wrappers/ace/Logging_Strategy.cpp +++ b/dep/ACE_wrappers/ace/Logging_Strategy.cpp @@ -1,8 +1,9 @@ -// $Id: Logging_Strategy.cpp 81696 2008-05-14 18:15:31Z johnnyw $ +// $Id: Logging_Strategy.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $ #include "ace/Logging_Strategy.h" #include "ace/Service_Config.h" #include "ace/ACE.h" +#include "ace/ACE_export.h" #include "ace/Get_Opt.h" // FUZZ: disable check_for_streams_include @@ -15,10 +16,6 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID (ace, - Logging_Strategy, - "$Id: Logging_Strategy.cpp 81696 2008-05-14 18:15:31Z johnnyw $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL // Parse the string containing (thread) priorities and set them @@ -386,11 +383,6 @@ ACE_Logging_Strategy::init (int argc, ACE_TCHAR *argv[]) if (this->reactor () == 0) // Use singleton. this->reactor (ACE_Reactor::instance ()); - - this->reactor ()->schedule_timer - (this, 0, - ACE_Time_Value (this->interval_), - ACE_Time_Value (this->interval_)); } } // Now set the flags for Log_Msg @@ -551,6 +543,43 @@ ACE_Logging_Strategy::handle_timeout (const ACE_Time_Value &, return 0; } +int +ACE_Logging_Strategy::handle_close (ACE_HANDLE, + ACE_Reactor_Mask) +{ + // This will reset reactor member and cancel timer events. + this->reactor (0); + return 0; +} + +void +ACE_Logging_Strategy::reactor (ACE_Reactor *r) +{ + if (this->reactor () != r) + { + if (this->reactor () && this->interval_ > 0 && this->max_size_ > 0) + { + this->reactor ()->cancel_timer (this); + } + + ACE_Service_Object::reactor (r); + + if (this->reactor ()) + { + this->reactor ()->schedule_timer + (this, 0, + ACE_Time_Value (this->interval_), + ACE_Time_Value (this->interval_)); + } + } +} + +ACE_Reactor * +ACE_Logging_Strategy::reactor (void) const +{ + return ACE_Service_Object::reactor (); +} + void ACE_Logging_Strategy::log_msg (ACE_Log_Msg *log_msg) { @@ -563,4 +592,19 @@ ACE_END_VERSIONED_NAMESPACE_DECL // svc.conf file to dynamically initialize the state of the // Logging_Strategy. +ACE_STATIC_SVC_DEFINE (ACE_Logging_Strategy, + ACE_TEXT ("Logging_Strategy"), + ACE_Service_Type::SERVICE_OBJECT, + &ACE_SVC_NAME (ACE_Logging_Strategy), + ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, + 0) + ACE_FACTORY_DEFINE (ACE, ACE_Logging_Strategy) + +// _get_dll_unload_policy() prevents ACE from being unloaded and having its +// framework components run down if/when the Logging Strategy is unloaded. +extern "C" ACE_Export int +_get_dll_unload_policy() +{ + return ACE_DLL_UNLOAD_POLICY_LAZY; +} diff --git a/dep/ACE_wrappers/ace/Logging_Strategy.h b/dep/ACE_wrappers/ace/Logging_Strategy.h index bac0d9566..7792c1061 100644 --- a/dep/ACE_wrappers/ace/Logging_Strategy.h +++ b/dep/ACE_wrappers/ace/Logging_Strategy.h @@ -4,7 +4,7 @@ /** * @file Logging_Strategy.h * - * $Id: Logging_Strategy.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Logging_Strategy.h 91064 2010-07-12 10:11:24Z johnnyw $ * * @author Prashant Jain * @author Orlando Ribeiro @@ -30,7 +30,8 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class ACE_Logging_Strategy * - * @brief This class provides a way to dynamically configure the ACE logging + * @brief + * This class provides a way to dynamically configure the ACE logging * mechanism at run time as well as enable the mechanisms for limiting * log file size and log file backup/rotation capability. * @@ -93,12 +94,28 @@ public: /** * Timeout handler which tests logfile size. If the current logfile - * size exceeds , the current logfile is closed, saved to + * size exceeds @c max_size_, the current logfile is closed, saved to * logfile.old, and a new logfile is reopened. */ virtual int handle_timeout (const ACE_Time_Value& tv, const void* arg); + /** + * This function helps to cancel timer events for this logging strategy + * in reactor during shutdown. + */ + virtual int handle_close (ACE_HANDLE, + ACE_Reactor_Mask); + + /** + * Reactor accessors. If reactor changes then we need remove this + * event handler from previous reactor and scheduler for timer events + * in a new one. + */ + virtual void reactor (ACE_Reactor *r); + + virtual ACE_Reactor * reactor (void) const; + /** * Parse arguments provided in svc.conf file. * @arg '-f' Pass in the flags (such as OSTREAM, STDERR, LOGGER, VERBOSE, @@ -110,7 +127,7 @@ public: * @arg '-n' Set the program name for the %n format specifier. * @arg '-N' The maximum number of logfiles that we want created. * @arg '-o' Specifies that we want the no standard logfiles ordering - * (fastest processing in ). Default is not to + * (fastest processing in handle_timeout()). Default is not to * order logfiles. * @arg '-p' Pass in the process-wide priorities to either enable (e.g., * DEBUG, INFO, WARNING, NOTICE, ERROR, CRITICAL, ALERT, @@ -136,10 +153,10 @@ protected: void priorities (ACE_TCHAR *priority_string, ACE_Log_Msg::MASK_TYPE mask); - /// Current thread's priority mask set by + /// Current thread's priority mask set by @c priorities u_long thread_priority_mask_; - /// Process-wide priority mask set by + /// Process-wide priority mask set by @c priorities u_long process_priority_mask_; /// Flags we keep track of. @@ -154,16 +171,16 @@ protected: /// Program name to be used for %n format specifier. ACE_TCHAR *program_name_; - /// If non-0 then wipeout the logfile, otherwise append to it. - /// Default value is 0. + /// If true then wipeout the logfile, otherwise append to it. + /// Default value is false. bool wipeout_logfile_; - /// If non-0 we have a maximum number of log files we can write. - /// Default value is 0, i.e., no maximum number. + /// If true we have a maximum number of log files we can write. + /// Default value is false, i.e., no maximum number. bool fixed_number_; - /// If non-0 we order the files as we rotate them. Default value - /// is 0, i.e., we do not rotate files by default. + /// If true we order the files as we rotate them. Default value + /// is false, i.e., we do not rotate files by default. bool order_files_; /// This tells us in what file we last wrote. It will be increased @@ -171,7 +188,7 @@ protected: int count_; /// Tells us what is the maximum log file to write. We will write - /// + 1 files (includes the current log file). + /// @c max_file_number_ + 1 files (includes the current log file). /// Default value is 1, i.e., 2 files by default. int max_file_number_; @@ -181,7 +198,7 @@ protected: u_long interval_; /// Maximum logfile size (in KB). Default value is - /// . + /// ACE_DEFAULT_MAX_LOGFILE_SIZE. u_long max_size_; /// ACE_Log_Msg instance to work with @@ -190,6 +207,8 @@ protected: ACE_END_VERSIONED_NAMESPACE_DECL +ACE_STATIC_SVC_DECLARE_EXPORT(ACE, ACE_Logging_Strategy) + ACE_FACTORY_DECLARE (ACE, ACE_Logging_Strategy) #endif /* ACE_LOGGING_STRATEGY_H */ diff --git a/dep/ACE_wrappers/ace/MEM_Acceptor.cpp b/dep/ACE_wrappers/ace/MEM_Acceptor.cpp index 920c3ca9c..66c1c8996 100644 --- a/dep/ACE_wrappers/ace/MEM_Acceptor.cpp +++ b/dep/ACE_wrappers/ace/MEM_Acceptor.cpp @@ -1,4 +1,4 @@ -// $Id: MEM_Acceptor.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: MEM_Acceptor.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/MEM_Acceptor.h" @@ -13,7 +13,7 @@ #include "ace/MEM_Acceptor.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ace, MEM_Acceptor, "$Id: MEM_Acceptor.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -82,8 +82,8 @@ int ACE_MEM_Acceptor::accept (ACE_MEM_Stream &new_stream, ACE_MEM_Addr *remote_sap, ACE_Time_Value *timeout, - int restart, - int reset_new_handle) + bool restart, + bool reset_new_handle) { ACE_TRACE ("ACE_MEM_Acceptor::accept"); @@ -192,7 +192,8 @@ ACE_MEM_Acceptor::accept (ACE_MEM_Stream &new_stream, if (ACE::recv (new_handle, &client_signaling, sizeof (ACE_INT16)) == -1) ACE_ERROR_RETURN ((LM_DEBUG, - ACE_TEXT ("ACE_MEM_Acceptor::%p error receiving strategy\n"), ACE_TEXT ("accept")), + ACE_TEXT ("ACE_MEM_Acceptor::%p error receiving strategy\n"), + ACE_TEXT ("accept")), -1); // Ensure minimum buffer size @@ -225,7 +226,7 @@ ACE_MEM_Acceptor::accept (ACE_MEM_Stream &new_stream, int ACE_MEM_Acceptor::shared_accept_finish (ACE_MEM_Stream new_stream, int in_blocking_mode, - int reset_new_handle) const + bool reset_new_handle) const { ACE_TRACE ("ACE_MEM_Acceptor::shared_accept_finish ()"); diff --git a/dep/ACE_wrappers/ace/MEM_Acceptor.h b/dep/ACE_wrappers/ace/MEM_Acceptor.h index 58582c4d0..bc0b02d17 100644 --- a/dep/ACE_wrappers/ace/MEM_Acceptor.h +++ b/dep/ACE_wrappers/ace/MEM_Acceptor.h @@ -4,7 +4,7 @@ /** * @file MEM_Acceptor.h * - * $Id: MEM_Acceptor.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: MEM_Acceptor.h 84834 2009-03-16 12:28:51Z johnnyw $ * * @author Nanbor Wang */ @@ -58,7 +58,7 @@ public: /// Default constructor. ACE_MEM_Acceptor (void); - /// destructor. + /// Destructor. ~ACE_MEM_Acceptor (void); /// Initiate a passive mode socket. @@ -83,14 +83,14 @@ public: int accept (ACE_MEM_Stream &new_ipc_sap, ACE_MEM_Addr *remote_addr = 0, ACE_Time_Value *timeout = 0, - int restart = 1, - int reset_new_handle = 0); + bool restart = true, + bool reset_new_handle = false); /// Perform operations that must occur after is /// called. int shared_accept_finish (ACE_MEM_Stream new_stream, int in_blocking_mode, - int reset_new_handle) const; + bool reset_new_handle) const; /** * Accessor/mutator of mmap filename prefix. By default, the @@ -155,16 +155,16 @@ protected: int accept (ACE_SOCK_Stream &new_stream, ACE_Addr *remote_addr = 0, ACE_Time_Value *timeout = 0, - int restart = 1, - int reset_new_handle = 0) const; + bool restart = true, + bool reset_new_handle = false) const; #if !defined (ACE_HAS_WINCE) int accept (ACE_SOCK_Stream &new_stream, ACE_Accept_QoS_Params qos_params, ACE_Addr *remote_addr = 0, ACE_Time_Value *timeout = 0, - int restart = 1, - int reset_new_handle = 0) const; + bool restart = true, + bool reset_new_handle = false) const; #endif // ACE_HAS_WINCE private: diff --git a/dep/ACE_wrappers/ace/MEM_Acceptor.inl b/dep/ACE_wrappers/ace/MEM_Acceptor.inl index 9bcc211e2..270d0ed3c 100644 --- a/dep/ACE_wrappers/ace/MEM_Acceptor.inl +++ b/dep/ACE_wrappers/ace/MEM_Acceptor.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: MEM_Acceptor.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: MEM_Acceptor.inl 82723 2008-09-16 09:35:44Z johnnyw $ ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -23,8 +23,8 @@ ACE_INLINE int ACE_MEM_Acceptor::accept (ACE_SOCK_Stream &new_stream, ACE_Addr *remote_addr, ACE_Time_Value *timeout, - int restart, - int reset_new_handle) const + bool restart, + bool reset_new_handle) const { return this->ACE_SOCK_Acceptor::accept (new_stream, remote_addr, timeout, restart, reset_new_handle); @@ -36,8 +36,8 @@ ACE_MEM_Acceptor::accept (ACE_SOCK_Stream &new_stream, ACE_Accept_QoS_Params qos_params, ACE_Addr *remote_addr, ACE_Time_Value *timeout, - int restart, - int reset_new_handle) const + bool restart, + bool reset_new_handle) const { return this->ACE_SOCK_Acceptor::accept (new_stream, qos_params, remote_addr, timeout, restart, reset_new_handle); diff --git a/dep/ACE_wrappers/ace/MEM_Addr.cpp b/dep/ACE_wrappers/ace/MEM_Addr.cpp index 1f6c457ff..062f59eef 100644 --- a/dep/ACE_wrappers/ace/MEM_Addr.cpp +++ b/dep/ACE_wrappers/ace/MEM_Addr.cpp @@ -1,4 +1,4 @@ -// $Id: MEM_Addr.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: MEM_Addr.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $ // Defines the Internet domain address family address format. @@ -15,10 +15,6 @@ #include "ace/OS_NS_unistd.h" #include "ace/os_include/os_netdb.h" -ACE_RCSID (ace, - MEM_Addr, - "$Id: MEM_Addr.cpp 80826 2008-03-04 14:51:23Z wotte $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_MEM_Addr) diff --git a/dep/ACE_wrappers/ace/MEM_Connector.cpp b/dep/ACE_wrappers/ace/MEM_Connector.cpp index 33c15be3c..4b0b272da 100644 --- a/dep/ACE_wrappers/ace/MEM_Connector.cpp +++ b/dep/ACE_wrappers/ace/MEM_Connector.cpp @@ -1,9 +1,9 @@ // MEM_Connector.cpp -// $Id: MEM_Connector.cpp 81517 2008-04-29 07:23:47Z johnnyw $ +// $Id: MEM_Connector.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/MEM_Connector.h" -ACE_RCSID(ace, MEM_Connector, "$Id: MEM_Connector.cpp 81517 2008-04-29 07:23:47Z johnnyw $") + #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1) @@ -71,11 +71,11 @@ ACE_MEM_Connector::connect (ACE_MEM_Stream &new_stream, if (!this->address_.same_host (remote_sap)) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) MEM_Connector can't connect ") - ACE_TEXT ("to %s:%d which is not a local endpoint ") - ACE_TEXT ("(local address is %s:%d)\n"), - ACE_TEXT_CHAR_TO_TCHAR (remote_sap.get_host_name ()), + ACE_TEXT ("to %C:%d which is not a local endpoint ") + ACE_TEXT ("(local address is %C:%d)\n"), + remote_sap.get_host_name (), remote_sap.get_port_number (), - ACE_TEXT_CHAR_TO_TCHAR (this->address_.get_host_name ()), + this->address_.get_host_name (), this->address_.get_port_number ()), -1); else diff --git a/dep/ACE_wrappers/ace/MEM_Connector.h b/dep/ACE_wrappers/ace/MEM_Connector.h index 49b15e7df..b9f46f2d8 100644 --- a/dep/ACE_wrappers/ace/MEM_Connector.h +++ b/dep/ACE_wrappers/ace/MEM_Connector.h @@ -4,7 +4,7 @@ /** * @file MEM_Connector.h * - * $Id: MEM_Connector.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: MEM_Connector.h 84816 2009-03-13 08:16:32Z johnnyw $ * * @author Nanbor Wang */ @@ -67,7 +67,7 @@ public: * amount of time passes before the connection is made, * this method returns -1 and errno == ETIME. Note * the difference between this case and when a blocking - * connect is attmpted that TCP times out - in the latter + * connect is attempted that TCP times out - in the latter * case, errno will be ETIMEDOUT. * @param local_sap (optional) The local address to bind to. If it's * the default value of @c ACE_Addr::sap_any then the @@ -112,7 +112,7 @@ public: * amount of time passes before the connection is made, * this method returns -1 and errno == ETIME. Note * the difference between this case and when a blocking - * connect is attmpted that TCP times out - in the latter + * connect is attempted that TCP times out - in the latter * case, errno will be ETIMEDOUT. * @param local_sap (optional) The local address to bind to. If it's * the default value of @c ACE_Addr::sap_any then the diff --git a/dep/ACE_wrappers/ace/MEM_IO.cpp b/dep/ACE_wrappers/ace/MEM_IO.cpp index ff919b7e0..4b373488e 100644 --- a/dep/ACE_wrappers/ace/MEM_IO.cpp +++ b/dep/ACE_wrappers/ace/MEM_IO.cpp @@ -1,5 +1,5 @@ // MEM_IO.cpp -// $Id: MEM_IO.cpp 82559 2008-08-07 20:23:07Z parsons $ +// $Id: MEM_IO.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/MEM_IO.h" #include "ace/Handle_Set.h" @@ -10,7 +10,7 @@ #include "ace/MEM_IO.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ace, MEM_IO, "$Id: MEM_IO.cpp 82559 2008-08-07 20:23:07Z parsons $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -54,7 +54,7 @@ ACE_Reactive_MEM_IO::recv_buf (ACE_MEM_SAP_Node *&buf, buf = 0; return 0; } - else if (retv != sizeof (ACE_OFF_T)) + else if (retv != static_cast (sizeof (ACE_OFF_T))) { // Nothing available or we are really screwed. buf = 0; @@ -75,26 +75,26 @@ ACE_Reactive_MEM_IO::send_buf (ACE_MEM_SAP_Node *buf, { return -1; } - + // The offset. ACE_OFF_T offset = ACE_Utils::truncate_cast ( reinterpret_cast (buf) - static_cast (this->shm_malloc_->base_addr ())); - + // Send the offset value over the socket. if (ACE::send (this->handle_, (const char *) &offset, sizeof (offset), flags, - timeout) != sizeof (offset)) + timeout) != static_cast (sizeof (offset))) { // unsucessful send, release the memory in the shared-memory. this->release_buffer (buf); return -1; } - + return ACE_Utils::truncate_cast (buf->size ()); } @@ -280,12 +280,12 @@ ACE_MT_MEM_IO::recv_buf (ACE_MEM_SAP_Node *&buf, ACE_GUARD_RETURN (ACE_SYNCH_PROCESS_MUTEX, ace_mon, *this->recv_channel_.lock_, -1); buf = this->recv_channel_.queue_.read (); - + if (buf != 0) { return ACE_Utils::truncate_cast (buf->size ()); } - + return -1; } } @@ -403,9 +403,9 @@ ACE_MEM_IO::send (const ACE_Message_Block *message_block, reinterpret_cast ( this->deliver_strategy_->acquire_buffer ( ACE_Utils::truncate_cast (len))); - + size_t n = 0; - + while (message_block != 0) { ACE_OS::memcpy (static_cast (buf->data ()) + n, @@ -429,7 +429,7 @@ ACE_MEM_IO::send (const ACE_Message_Block *message_block, 0, timeout); } - + return 0; } diff --git a/dep/ACE_wrappers/ace/MEM_SAP.cpp b/dep/ACE_wrappers/ace/MEM_SAP.cpp index 6f18b7abe..f6209d4f4 100644 --- a/dep/ACE_wrappers/ace/MEM_SAP.cpp +++ b/dep/ACE_wrappers/ace/MEM_SAP.cpp @@ -1,4 +1,4 @@ -// $Id: MEM_SAP.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: MEM_SAP.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/MEM_SAP.h" @@ -8,7 +8,7 @@ #include "ace/MEM_SAP.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ace, MEM_SAP, "$Id: MEM_SAP.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/MEM_Stream.cpp b/dep/ACE_wrappers/ace/MEM_Stream.cpp index afcbd4f98..32647ddf1 100644 --- a/dep/ACE_wrappers/ace/MEM_Stream.cpp +++ b/dep/ACE_wrappers/ace/MEM_Stream.cpp @@ -1,4 +1,4 @@ -// $Id: MEM_Stream.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: MEM_Stream.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/MEM_Stream.h" @@ -8,7 +8,7 @@ #include "ace/MEM_Stream.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ace, MEM_Stream, "$Id: MEM_Stream.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/MMAP_Memory_Pool.cpp b/dep/ACE_wrappers/ace/MMAP_Memory_Pool.cpp index 61f02a654..82556a832 100644 --- a/dep/ACE_wrappers/ace/MMAP_Memory_Pool.cpp +++ b/dep/ACE_wrappers/ace/MMAP_Memory_Pool.cpp @@ -1,4 +1,4 @@ -// $Id: MMAP_Memory_Pool.cpp 82513 2008-08-05 18:52:53Z parsons $ +// $Id: MMAP_Memory_Pool.cpp 91286 2010-08-05 09:04:31Z johnnyw $ // MMAP_Memory_Pool.cpp #include "ace/MMAP_Memory_Pool.h" @@ -18,10 +18,6 @@ #include "ace/MMAP_Memory_Pool.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ace, - MMAP_Memory_Pool, - "$Id: MMAP_Memory_Pool.cpp 82513 2008-08-05 18:52:53Z parsons $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_MMAP_Memory_Pool) @@ -44,7 +40,7 @@ ACE_MMAP_Memory_Pool::release (int destroy) #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */ if (destroy) - this->mmap_.remove (); + this->mmap_.remove (); else this->mmap_.close (); return 0; @@ -69,9 +65,8 @@ ACE_MMAP_Memory_Pool::sync (int flags) return this->mmap_.sync (len, flags); } -// Sync bytes of the memory region to the backing store starting -// at . - +/// Sync @a len bytes of the memory region to the backing store starting +/// at . int ACE_MMAP_Memory_Pool::sync (void *addr, size_t len, int flags) { @@ -198,7 +193,7 @@ ACE_MMAP_Memory_Pool::ACE_MMAP_Memory_Pool ( { if (this->signal_handler_.register_handler (SIGSEGV, this) == -1) ACE_ERROR ((LM_ERROR, - "%p\n", this->backing_store_name_)); + ACE_TEXT("%p\n"), this->backing_store_name_)); } #endif /* ACE_WIN32 */ } @@ -311,12 +306,12 @@ ACE_MMAP_Memory_Pool::map_file (size_t map_size) { #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1) this->base_addr_ = this->mmap_.addr (); - + if (obase_addr && this->base_addr_ != obase_addr) { ACE_BASED_POINTER_REPOSITORY::instance ()->unbind (obase_addr); } - + ACE_BASED_POINTER_REPOSITORY::instance ()->bind (this->base_addr_, map_size); #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */ diff --git a/dep/ACE_wrappers/ace/Makefile.am b/dep/ACE_wrappers/ace/Makefile.am index 5910646ee..c3fb7e2c7 100644 --- a/dep/ACE_wrappers/ace/Makefile.am +++ b/dep/ACE_wrappers/ace/Makefile.am @@ -1,20 +1,30 @@ ## Process this file with automake to create Makefile.in ## -## $Id: Makefile.am 82580 2008-08-11 07:37:22Z johnnyw $ +## $Id: Makefile.am 91577 2010-08-30 19:13:22Z johnnyw $ ## ## 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 -## Hand edited by Derex < derex101@gmail.com > + +includedir = @includedir@/ace +pkgconfigdir = @libdir@/pkgconfig ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) +SUBDIRS = CLEANFILES = +lib_LTLIBRARIES = +pkgconfig_DATA = +nobase_include_HEADERS = -lib_LTLIBRARIES = libACE.la +## Makefile.ACE.am + +if !BUILD_ACE_FOR_TAO + +lib_LTLIBRARIES += libACE.la libACE_la_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -198,6 +208,7 @@ libACE_la_SOURCES = \ OS_NS_time.cpp \ OS_NS_unistd.cpp \ OS_NS_wchar.cpp \ + OS_NS_wctype.cpp \ OS_QoS.cpp \ OS_TLI.cpp \ OS_Thread_Adapter.cpp \ @@ -332,6 +343,1113 @@ libACE_la_SOURCES = \ libACE_la_LDFLAGS = \ -release @ACE_VERSION_NAME@ +nobase_include_HEADERS += \ + ACE.h \ + ACE.inl \ + ACE_export.h \ + ARGV.cpp \ + ARGV.h \ + ARGV.inl \ + ATM_Acceptor.h \ + ATM_Acceptor.inl \ + ATM_Addr.h \ + ATM_Addr.inl \ + ATM_Connector.h \ + ATM_Connector.inl \ + ATM_Params.h \ + ATM_Params.inl \ + ATM_QoS.h \ + ATM_QoS.inl \ + ATM_Stream.h \ + ATM_Stream.inl \ + Acceptor.cpp \ + Acceptor.h \ + Activation_Queue.h \ + Activation_Queue.inl \ + Active_Map_Manager.h \ + Active_Map_Manager.inl \ + Active_Map_Manager_T.cpp \ + Active_Map_Manager_T.h \ + Active_Map_Manager_T.inl \ + Addr.h \ + Addr.inl \ + Arg_Shifter.cpp \ + Arg_Shifter.h \ + Argv_Type_Converter.h \ + Argv_Type_Converter.inl \ + Array.h \ + Array_Base.cpp \ + Array_Base.h \ + Array_Base.inl \ + Array_Map.cpp \ + Array_Map.h \ + Array_Map.inl \ + Assert.h \ + Asynch_Acceptor.cpp \ + Asynch_Acceptor.h \ + Asynch_Connector.cpp \ + Asynch_Connector.h \ + Asynch_IO.h \ + Asynch_IO_Impl.h \ + Asynch_IO_Impl.inl \ + Asynch_Pseudo_Task.h \ + Atomic_Op.h \ + Atomic_Op.inl \ + Atomic_Op_Sparc.h \ + Atomic_Op_T.cpp \ + Atomic_Op_GCC_T.h \ + Atomic_Op_GCC_T.cpp \ + Atomic_Op_GCC_T.inl \ + Atomic_Op_T.h \ + Atomic_Op_T.inl \ + Auto_Event.h \ + Auto_Event.inl \ + Auto_Functor.cpp \ + Auto_Functor.h \ + Auto_Functor.inl \ + Auto_IncDec_T.cpp \ + Auto_IncDec_T.h \ + Auto_IncDec_T.inl \ + Auto_Ptr.cpp \ + Auto_Ptr.h \ + Auto_Ptr.inl \ + Barrier.h \ + Barrier.inl \ + Base_Thread_Adapter.h \ + Base_Thread_Adapter.inl \ + Based_Pointer_Repository.h \ + Based_Pointer_T.cpp \ + Based_Pointer_T.h \ + Based_Pointer_T.inl \ + Basic_Stats.h \ + Basic_Stats.inl \ + Basic_Types.h \ + Basic_Types.inl \ + Bound_Ptr.h \ + Bound_Ptr.inl \ + CDR_Base.h \ + CDR_Base.inl \ + CDR_Size.h \ + CDR_Size.inl \ + CDR_Stream.h \ + CDR_Stream.inl \ + CORBA_macros.h \ + Cache_Map_Manager_T.cpp \ + Cache_Map_Manager_T.h \ + Cache_Map_Manager_T.inl \ + Cached_Connect_Strategy_T.cpp \ + Cached_Connect_Strategy_T.h \ + Caching_Strategies_T.cpp \ + Caching_Strategies_T.h \ + Caching_Strategies_T.inl \ + Caching_Utility_T.cpp \ + Caching_Utility_T.h \ + Capabilities.h \ + Capabilities.inl \ + Cleanup.h \ + Cleanup.inl \ + Cleanup_Strategies_T.cpp \ + Cleanup_Strategies_T.h \ + Codecs.h \ + Codeset_IBM1047.h \ + Codeset_Registry.h \ + Codeset_Registry.inl \ + Condition_Recursive_Thread_Mutex.h \ + Condition_T.cpp \ + Condition_T.h \ + Condition_T.inl \ + Condition_Thread_Mutex.h \ + Condition_Thread_Mutex.inl \ + Configuration.h \ + Configuration.inl \ + Configuration_Import_Export.h \ + Connection_Recycling_Strategy.h \ + Connector.cpp \ + Connector.h \ + Containers.h \ + Containers.inl \ + Containers_T.cpp \ + Containers_T.h \ + Containers_T.inl \ + Copy_Disabled.h \ + Countdown_Time.h \ + Countdown_Time.inl \ + DEV.h \ + DEV.inl \ + DEV_Addr.h \ + DEV_Addr.inl \ + DEV_Connector.h \ + DEV_Connector.inl \ + DEV_IO.h \ + DEV_IO.inl \ + DLL.h \ + DLL_Manager.h \ + Date_Time.h \ + Date_Time.inl \ + Default_Constants.h \ + Dev_Poll_Reactor.h \ + Dev_Poll_Reactor.inl \ + Dirent.h \ + Dirent.inl \ + Dirent_Selector.h \ + Dirent_Selector.inl \ + Dump.h \ + Dump_T.cpp \ + Dump_T.h \ + Dynamic.h \ + Dynamic.inl \ + Dynamic_Message_Strategy.h \ + Dynamic_Message_Strategy.inl \ + Dynamic_Service.cpp \ + Dynamic_Service.h \ + Dynamic_Service.inl \ + Dynamic_Service_Base.h \ + Dynamic_Service_Dependency.h \ + Encoding_Converter.h \ + Encoding_Converter_Factory.h \ + Env_Value_T.cpp \ + Env_Value_T.h \ + Env_Value_T.inl \ + Event.h \ + Event.inl \ + Event_Handler.h \ + Event_Handler.inl \ + Event_Handler_T.cpp \ + Event_Handler_T.h \ + Event_Handler_T.inl \ + FIFO.h \ + FIFO.inl \ + FIFO_Recv.h \ + FIFO_Recv.inl \ + FIFO_Recv_Msg.h \ + FIFO_Recv_Msg.inl \ + FIFO_Send.h \ + FIFO_Send.inl \ + FIFO_Send_Msg.h \ + FIFO_Send_Msg.inl \ + FILE.h \ + FILE.inl \ + FILE_Addr.h \ + FILE_Addr.inl \ + FILE_Connector.h \ + FILE_Connector.inl \ + FILE_IO.h \ + FILE_IO.inl \ + File_Lock.h \ + File_Lock.inl \ + Filecache.h \ + Flag_Manip.h \ + Flag_Manip.inl \ + Framework_Component.h \ + Framework_Component.inl \ + Framework_Component_T.cpp \ + Framework_Component_T.h \ + Free_List.cpp \ + Free_List.h \ + Functor.h \ + Functor.inl \ + Functor_String.h \ + Functor_String.inl \ + Functor_T.cpp \ + Functor_T.h \ + Functor_T.inl \ + Future.cpp \ + Future.h \ + Future_Set.cpp \ + Future_Set.h \ + Get_Opt.h \ + Get_Opt.inl \ + Global_Macros.h \ + Guard_T.cpp \ + Guard_T.h \ + Guard_T.inl \ + Handle_Gobbler.h \ + Handle_Gobbler.inl \ + Handle_Ops.h \ + Handle_Set.h \ + Handle_Set.inl \ + Hash_Cache_Map_Manager_T.cpp \ + Hash_Cache_Map_Manager_T.h \ + Hash_Cache_Map_Manager_T.inl \ + Hash_Map_Manager.h \ + Hash_Map_Manager_T.cpp \ + Hash_Map_Manager_T.h \ + Hash_Map_Manager_T.inl \ + 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 \ + High_Res_Timer.inl \ + ICMP_Socket.h \ + INET_Addr.h \ + INET_Addr.inl \ + IOStream.h \ + IOStream_T.cpp \ + IOStream_T.h \ + IOStream_T.inl \ + IO_Cntl_Msg.h \ + IO_Cntl_Msg.inl \ + IO_SAP.h \ + IO_SAP.inl \ + IPC_SAP.h \ + IPC_SAP.inl \ + If_Then_Else.h \ + Init_ACE.h \ + Intrusive_Auto_Ptr.cpp \ + Intrusive_Auto_Ptr.h \ + Intrusive_Auto_Ptr.inl \ + Intrusive_List.cpp \ + Intrusive_List.h \ + Intrusive_List.inl \ + Intrusive_List_Node.cpp \ + Intrusive_List_Node.h \ + Intrusive_List_Node.inl \ + LOCK_SOCK_Acceptor.cpp \ + LOCK_SOCK_Acceptor.h \ + LSOCK.h \ + LSOCK.inl \ + LSOCK_Acceptor.h \ + LSOCK_CODgram.h \ + LSOCK_CODgram.inl \ + LSOCK_Connector.h \ + LSOCK_Connector.inl \ + LSOCK_Dgram.h \ + LSOCK_Dgram.inl \ + LSOCK_Stream.h \ + LSOCK_Stream.inl \ + Lib_Find.h \ + Local_Memory_Pool.h \ + Local_Name_Space.h \ + Local_Name_Space_T.cpp \ + Local_Name_Space_T.h \ + Local_Tokens.h \ + Local_Tokens.inl \ + Lock.h \ + Lock.inl \ + Lock_Adapter_T.cpp \ + Lock_Adapter_T.h \ + Lock_Adapter_T.inl \ + Log_Msg.h \ + Log_Msg.inl \ + Log_Msg_Backend.h \ + Log_Msg_Callback.h \ + Log_Msg_IPC.h \ + Log_Msg_NT_Event_Log.h \ + Log_Msg_UNIX_Syslog.h \ + Log_Priority.h \ + Log_Record.h \ + Log_Record.inl \ + Logging_Strategy.h \ + MEM_Acceptor.h \ + MEM_Acceptor.inl \ + MEM_Addr.h \ + MEM_Addr.inl \ + MEM_Connector.h \ + MEM_Connector.inl \ + MEM_IO.h \ + MEM_IO.inl \ + MEM_SAP.h \ + MEM_SAP.inl \ + MEM_Stream.h \ + MEM_Stream.inl \ + MMAP_Memory_Pool.h \ + MMAP_Memory_Pool.inl \ + Malloc.h \ + Malloc.inl \ + Malloc_Allocator.h \ + Malloc_Allocator.inl \ + Malloc_Base.h \ + Malloc_T.cpp \ + Malloc_T.h \ + Malloc_T.inl \ + Managed_Object.cpp \ + Managed_Object.h \ + Managed_Object.inl \ + Manual_Event.h \ + Manual_Event.inl \ + Map_Manager.cpp \ + Map_Manager.h \ + Map_Manager.inl \ + Map_T.cpp \ + Map_T.h \ + Map_T.inl \ + Mem_Map.h \ + Mem_Map.inl \ + Memory_Pool.h \ + Message_Block.h \ + Message_Block.inl \ + Message_Block_T.cpp \ + Message_Block_T.h \ + Message_Block_T.inl \ + Message_Queue.h \ + Message_Queue.inl \ + Message_Queue_NT.h \ + Message_Queue_NT.inl \ + Message_Queue_T.cpp \ + Message_Queue_T.h \ + Message_Queue_Vx.h \ + Message_Queue_Vx.inl \ + Method_Object.h \ + Method_Request.h \ + Min_Max.h \ + Module.cpp \ + Module.h \ + Module.inl \ + Monitor_Admin.h \ + Monitor_Admin_Manager.h \ + Monitor_Base.h \ + Monitor_Base.inl \ + Monitor_Control_Action.h \ + Monitor_Control_Types.h \ + Monitor_Point_Registry.h \ + Monitor_Size.h \ + Msg_WFMO_Reactor.h \ + Msg_WFMO_Reactor.inl \ + Multihomed_INET_Addr.h \ + Multihomed_INET_Addr.inl \ + Mutex.h \ + Mutex.inl \ + NT_Service.h \ + NT_Service.inl \ + Name_Proxy.h \ + Name_Request_Reply.h \ + Name_Space.h \ + Naming_Context.h \ + Naming_Context.inl \ + Netlink_Addr.h \ + Netlink_Addr.inl \ + Node.cpp \ + Node.h \ + Notification_Queue.h \ + Notification_Queue.inl \ + Notification_Strategy.h \ + Notification_Strategy.inl \ + Null_Barrier.h \ + Null_Condition.h \ + Null_Mutex.h \ + Null_Semaphore.h \ + Numeric_Limits.h \ + Obstack.h \ + OS.h \ + OS.inl \ + OS_Dirent.h \ + OS_Errno.h \ + OS_Errno.inl \ + OS_Log_Msg_Attributes.h \ + OS_Log_Msg_Attributes.inl \ + OS_Memory.h \ + OS_NS_Thread.h \ + OS_NS_Thread.inl \ + OS_NS_arpa_inet.h \ + OS_NS_arpa_inet.inl \ + OS_NS_ctype.h \ + OS_NS_ctype.inl \ + OS_NS_dirent.h \ + OS_NS_dirent.inl \ + OS_NS_dlfcn.h \ + OS_NS_dlfcn.inl \ + OS_NS_errno.h \ + OS_NS_errno.inl \ + OS_NS_fcntl.h \ + OS_NS_fcntl.inl \ + OS_NS_macros.h \ + OS_NS_math.h \ + OS_NS_math.inl \ + OS_NS_netdb.h \ + OS_NS_netdb.inl \ + OS_NS_poll.h \ + OS_NS_poll.inl \ + OS_NS_pwd.h \ + OS_NS_pwd.inl \ + OS_NS_regex.h \ + OS_NS_regex.inl \ + OS_NS_signal.h \ + OS_NS_signal.inl \ + OS_NS_stdio.h \ + OS_NS_stdio.inl \ + OS_NS_stdlib.h \ + OS_NS_stdlib.inl \ + OS_NS_string.h \ + OS_NS_string.inl \ + OS_NS_strings.h \ + OS_NS_strings.inl \ + OS_NS_stropts.h \ + OS_NS_stropts.inl \ + OS_NS_sys_mman.h \ + OS_NS_sys_mman.inl \ + OS_NS_sys_msg.h \ + OS_NS_sys_msg.inl \ + OS_NS_sys_resource.h \ + OS_NS_sys_resource.inl \ + OS_NS_sys_select.h \ + OS_NS_sys_select.inl \ + OS_NS_sys_sendfile.h \ + OS_NS_sys_sendfile.inl \ + OS_NS_sys_shm.h \ + OS_NS_sys_shm.inl \ + OS_NS_sys_socket.h \ + OS_NS_sys_socket.inl \ + OS_NS_sys_stat.h \ + OS_NS_sys_stat.inl \ + OS_NS_sys_time.h \ + OS_NS_sys_time.inl \ + OS_NS_sys_uio.h \ + OS_NS_sys_uio.inl \ + OS_NS_sys_utsname.h \ + OS_NS_sys_wait.h \ + OS_NS_sys_wait.inl \ + OS_NS_time.h \ + OS_NS_time.inl \ + OS_NS_unistd.h \ + OS_NS_unistd.inl \ + OS_NS_wchar.h \ + OS_NS_wctype.h \ + OS_NS_wctype.inl \ + OS_NS_wchar.inl \ + OS_QoS.h \ + OS_String.h \ + OS_TLI.h \ + OS_TLI.inl \ + OS_Thread_Adapter.h \ + OS_main.h \ + Obchunk.h \ + Obchunk.inl \ + Object_Manager.h \ + Object_Manager.inl \ + Object_Manager_Base.h \ + Obstack_T.cpp \ + Obstack_T.h \ + Obstack_T.inl \ + PI_Malloc.h \ + PI_Malloc.inl \ + POSIX_Asynch_IO.h \ + POSIX_CB_Proactor.h \ + POSIX_Proactor.h \ + POSIX_Proactor.inl \ + Pagefile_Memory_Pool.h \ + Pagefile_Memory_Pool.inl \ + Pair.h \ + Pair_T.cpp \ + Pair_T.h \ + Pair_T.inl \ + Parse_Node.h \ + Ping_Socket.h \ + Ping_Socket.inl \ + Pipe.h \ + Pipe.inl \ + Priority_Reactor.h \ + Proactor.h \ + Proactor.inl \ + Proactor_Impl.h \ + Process.h \ + Process.inl \ + Process_Manager.h \ + Process_Manager.inl \ + Process_Mutex.h \ + Process_Mutex.inl \ + Process_Semaphore.h \ + Process_Semaphore.inl \ + Profile_Timer.h \ + Profile_Timer.inl \ + RB_Tree.cpp \ + RB_Tree.h \ + RB_Tree.inl \ + RW_Mutex.h \ + RW_Mutex.inl \ + RW_Process_Mutex.h \ + RW_Process_Mutex.inl \ + RW_Thread_Mutex.h \ + RW_Thread_Mutex.inl \ + Reactor.h \ + Reactor.inl \ + Reactor_Impl.h \ + Reactor_Notification_Strategy.h \ + Reactor_Notification_Strategy.inl \ + Reactor_Timer_Interface.h \ + Reactor_Token_T.cpp \ + Reactor_Token_T.h \ + Read_Buffer.h \ + Read_Buffer.inl \ + Recursive_Thread_Mutex.h \ + Recursive_Thread_Mutex.inl \ + Recyclable.h \ + Recyclable.inl \ + Refcountable.h \ + Refcountable_T.cpp \ + Refcountable_T.h \ + Refcountable_T.inl \ + Refcounted_Auto_Ptr.cpp \ + Refcounted_Auto_Ptr.h \ + Refcounted_Auto_Ptr.inl \ + Registry.h \ + Registry_Name_Space.h \ + Remote_Name_Space.h \ + Remote_Tokens.h \ + Remote_Tokens.inl \ + Reverse_Lock_T.cpp \ + Reverse_Lock_T.h \ + Reverse_Lock_T.inl \ + SOCK.h \ + SOCK.inl \ + SOCK_Acceptor.h \ + SOCK_Acceptor.inl \ + SOCK_CODgram.h \ + SOCK_CODgram.inl \ + SOCK_Connector.h \ + SOCK_Connector.inl \ + SOCK_Dgram.h \ + SOCK_Dgram.inl \ + SOCK_Dgram_Bcast.h \ + SOCK_Dgram_Bcast.inl \ + SOCK_Dgram_Mcast.h \ + SOCK_Dgram_Mcast.inl \ + SOCK_IO.h \ + SOCK_IO.inl \ + SOCK_Netlink.h \ + SOCK_Netlink.inl \ + SOCK_SEQPACK_Acceptor.h \ + SOCK_SEQPACK_Acceptor.inl \ + SOCK_SEQPACK_Association.h \ + SOCK_SEQPACK_Association.inl \ + SOCK_SEQPACK_Connector.h \ + SOCK_SEQPACK_Connector.inl \ + SOCK_Stream.h \ + SOCK_Stream.inl \ + SPIPE.h \ + SPIPE.inl \ + SPIPE_Acceptor.h \ + SPIPE_Addr.h \ + SPIPE_Addr.inl \ + SPIPE_Connector.h \ + SPIPE_Connector.inl \ + SPIPE_Stream.h \ + SPIPE_Stream.inl \ + SString.h \ + SString.inl \ + SStringfwd.h \ + Stack_Trace.h \ + SUN_Proactor.h \ + SV_Message.h \ + SV_Message.inl \ + SV_Message_Queue.h \ + SV_Message_Queue.inl \ + SV_Semaphore_Complex.h \ + SV_Semaphore_Complex.inl \ + SV_Semaphore_Simple.h \ + SV_Semaphore_Simple.inl \ + SV_Shared_Memory.h \ + SV_Shared_Memory.inl \ + Sample_History.h \ + Sample_History.inl \ + Sbrk_Memory_Pool.h \ + Sched_Params.h \ + Sched_Params.inl \ + Select_Reactor.h \ + Select_Reactor_Base.h \ + Select_Reactor_Base.inl \ + Select_Reactor_T.cpp \ + Select_Reactor_T.h \ + Select_Reactor_T.inl \ + Semaphore.h \ + Semaphore.inl \ + Service_Config.h \ + Service_Config.inl \ + Service_Gestalt.h \ + Service_Gestalt.inl \ + Service_Manager.h \ + Service_Object.h \ + Service_Object.inl \ + Service_Repository.h \ + Service_Repository.inl \ + Service_Types.h \ + Service_Types.inl \ + Shared_Memory.h \ + Shared_Memory_MM.h \ + Shared_Memory_MM.inl \ + Shared_Memory_Pool.h \ + Shared_Memory_SV.h \ + Shared_Memory_SV.inl \ + Shared_Object.h \ + Shared_Object.inl \ + Sig_Adapter.h \ + Sig_Handler.h \ + Sig_Handler.inl \ + Signal.h \ + Signal.inl \ + Singleton.cpp \ + Singleton.h \ + Singleton.inl \ + Sock_Connect.h \ + Static_Object_Lock.h \ + Stats.h \ + Stats.inl \ + Strategies.h \ + Strategies_T.cpp \ + Strategies_T.h \ + Strategies_T.inl \ + Stream.cpp \ + Stream.h \ + Stream.inl \ + Stream_Modules.cpp \ + Stream_Modules.h \ + String_Base.cpp \ + String_Base.h \ + String_Base.inl \ + String_Base_Const.h \ + Svc_Conf.h \ + Svc_Conf_Lexer.h \ + Svc_Conf_Tokens.h \ + Svc_Conf_Token_Table.h \ + Svc_Handler.cpp \ + Svc_Handler.h \ + Synch.h \ + Synch_Options.h \ + Synch_T.cpp \ + Synch_T.h \ + Synch_Traits.h \ + System_Time.h \ + TLI.h \ + TLI.inl \ + TLI_Acceptor.h \ + TLI_Connector.h \ + TLI_Connector.inl \ + TLI_Stream.h \ + TLI_Stream.inl \ + TP_Reactor.h \ + TP_Reactor.inl \ + TSS_Adapter.h \ + TSS_T.cpp \ + TSS_T.h \ + TSS_T.inl \ + TTY_IO.h \ + Task.h \ + Task.inl \ + Task_Ex_T.cpp \ + Task_Ex_T.h \ + Task_Ex_T.inl \ + Task_T.cpp \ + Task_T.h \ + Task_T.inl \ + Test_and_Set.cpp \ + Test_and_Set.h \ + Thread.h \ + Thread.inl \ + Thread_Adapter.h \ + Thread_Adapter.inl \ + Thread_Control.h \ + Thread_Control.inl \ + Thread_Exit.h \ + Thread_Hook.h \ + Thread_Manager.h \ + Thread_Manager.inl \ + Thread_Mutex.h \ + Thread_Mutex.inl \ + Thread_Semaphore.h \ + Thread_Semaphore.inl \ + Throughput_Stats.h \ + Time_Value.h \ + Time_Value.inl \ + Timeprobe.h \ + Timeprobe.inl \ + Timeprobe_T.cpp \ + Timeprobe_T.h \ + Timer_Hash_T.cpp \ + Timer_Hash_T.h \ + Timer_Heap_T.cpp \ + Timer_Heap_T.h \ + Timer_List_T.cpp \ + Timer_List_T.h \ + Timer_Queue_Adapters.cpp \ + Timer_Queue_Adapters.h \ + Timer_Queue_Adapters.inl \ + Timer_Queue_T.cpp \ + Timer_Queue_T.h \ + Timer_Queue_T.inl \ + Timer_Wheel_T.cpp \ + Timer_Wheel_T.h \ + Tokenizer_T.cpp \ + Tokenizer_T.h \ + Timer_Hash.h \ + Timer_Heap.h \ + Timer_List.h \ + Timer_Queue.h \ + Timer_Queuefwd.h \ + Timer_Wheel.h \ + Token.h \ + Token.inl \ + Token_Collection.h \ + Token_Collection.inl \ + Token_Invariants.h \ + Token_Manager.h \ + Token_Manager.inl \ + Token_Request_Reply.h \ + Token_Request_Reply.inl \ + Trace.h \ + Truncate.h \ + Typed_SV_Message.cpp \ + Typed_SV_Message.h \ + Typed_SV_Message.inl \ + Typed_SV_Message_Queue.cpp \ + Typed_SV_Message_Queue.h \ + Typed_SV_Message_Queue.inl \ + UNIX_Addr.h \ + UNIX_Addr.inl \ + UPIPE_Acceptor.h \ + UPIPE_Acceptor.inl \ + UPIPE_Addr.h \ + UPIPE_Connector.h \ + UPIPE_Connector.inl \ + UPIPE_Stream.h \ + UPIPE_Stream.inl \ + UTF16_Encoding_Converter.h \ + UTF16_Encoding_Converter.inl \ + UTF32_Encoding_Converter.h \ + UTF8_Encoding_Converter.h \ + UUID.h \ + UUID.inl \ + Unbounded_Queue.cpp \ + Unbounded_Queue.h \ + Unbounded_Queue.inl \ + Unbounded_Set.cpp \ + Unbounded_Set.h \ + Unbounded_Set.inl \ + Unbounded_Set_Ex.cpp \ + Unbounded_Set_Ex.h \ + Unbounded_Set_Ex.inl \ + Value_Ptr.h \ + Vector_T.cpp \ + Vector_T.h \ + Vector_T.inl \ + Version.h \ + Versioned_Namespace.h \ + WFMO_Reactor.h \ + WFMO_Reactor.inl \ + WIN32_Asynch_IO.h \ + WIN32_Proactor.h \ + XML_Svc_Conf.h \ + XTI_ATM_Mcast.h \ + XTI_ATM_Mcast.inl \ + ace_wchar.h \ + ace_wchar.inl \ + checked_iterator.h \ + config-WinCE.h \ + config-all.h \ + config-lite.h \ + config-macros.h \ + config-minimal.h \ + config-win32-borland.h \ + config-win32-common.h \ + config-win32-ghs.h \ + config-win32-msvc-7.h \ + config-win32-msvc-8.h \ + config-win32-msvc.h \ + config-win32.h \ + config.h \ + iosfwd.h \ + os_include/arpa/os_inet.h \ + os_include/net/os_if.h \ + os_include/netinet/os_in.h \ + os_include/netinet/os_tcp.h \ + os_include/os_aio.h \ + os_include/os_assert.h \ + os_include/os_byteswap.h \ + os_include/os_complex.h \ + os_include/os_cpio.h \ + os_include/os_ctype.h \ + os_include/os_dirent.h \ + os_include/os_dlfcn.h \ + os_include/os_errno.h \ + os_include/os_fcntl.h \ + os_include/os_fenv.h \ + os_include/os_float.h \ + os_include/os_fmtmsg.h \ + os_include/os_fnmatch.h \ + os_include/os_ftw.h \ + os_include/os_glob.h \ + os_include/os_grp.h \ + os_include/os_iconv.h \ + os_include/os_intrin.h \ + os_include/os_inttypes.h \ + os_include/os_iso646.h \ + os_include/os_kstat.h \ + os_include/os_langinfo.h \ + os_include/os_libgen.h \ + os_include/os_limits.h \ + os_include/os_local.h \ + os_include/os_math.h \ + os_include/os_monetary.h \ + os_include/os_mqueue.h \ + os_include/os_ndbm.h \ + os_include/os_netdb.h \ + os_include/os_nl_types.h \ + os_include/os_pdh.h \ + os_include/os_pdhmsg.h \ + os_include/os_poll.h \ + os_include/os_pthread.h \ + os_include/os_pwd.h \ + os_include/os_regex.h \ + os_include/os_sched.h \ + os_include/os_search.h \ + os_include/os_semaphore.h \ + os_include/os_setjmp.h \ + os_include/os_signal.h \ + os_include/os_spawn.h \ + os_include/os_stdarg.h \ + os_include/os_stdbool.h \ + os_include/os_stddef.h \ + os_include/os_stdint.h \ + os_include/os_stdio.h \ + os_include/os_stdlib.h \ + os_include/os_string.h \ + os_include/os_strings.h \ + os_include/os_stropts.h \ + os_include/os_syslog.h \ + os_include/os_tar.h \ + os_include/os_termios.h \ + os_include/os_tgmath.h \ + os_include/os_time.h \ + os_include/os_trace.h \ + os_include/os_typeinfo.h \ + os_include/os_ucontext.h \ + os_include/os_ulimit.h \ + os_include/os_unistd.h \ + os_include/os_utime.h \ + os_include/os_utmpx.h \ + os_include/os_wchar.h \ + os_include/os_wctype.h \ + os_include/os_wordexp.h \ + os_include/sys/os_ipc.h \ + os_include/sys/os_loadavg.h \ + os_include/sys/os_mman.h \ + os_include/sys/os_msg.h \ + os_include/sys/os_pstat.h \ + os_include/sys/os_resource.h \ + os_include/sys/os_select.h \ + os_include/sys/os_sem.h \ + os_include/sys/os_shm.h \ + os_include/sys/os_socket.h \ + os_include/sys/os_stat.h \ + os_include/sys/os_statvfs.h \ + os_include/sys/os_sysctl.h \ + os_include/sys/os_sysinfo.h \ + os_include/sys/os_time.h \ + os_include/sys/os_timeb.h \ + os_include/sys/os_times.h \ + os_include/sys/os_types.h \ + os_include/sys/os_uio.h \ + os_include/sys/os_un.h \ + os_include/sys/os_utsname.h \ + os_include/sys/os_wait.h \ + post.h \ + pre.h \ + streams.h \ + svc_export.h + +pkgconfig_DATA += \ + ACE.pc + +CLEANFILES += \ + ACE.pc + +ACE.pc: ${top_builddir}/config.status ${srcdir}/ACE.pc.in + ${top_builddir}/config.status --file $@:${srcdir}/ACE.pc.in + +endif !BUILD_ACE_FOR_TAO + +EXTRA_DIST = \ + ACE.pc.in \ + ace.rc + + +## Makefile.ACE_FlReactor.am + +if BUILD_FL +if BUILD_GL +if BUILD_X11 + +lib_LTLIBRARIES += libACE_FlReactor.la + +libACE_FlReactor_la_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + $(ACE_FLTK_CPPFLAGS) \ + -DACE_FLREACTOR_BUILD_DLL + +libACE_FlReactor_la_SOURCES = \ + FlReactor/FlReactor.cpp + +libACE_FlReactor_la_LDFLAGS = \ + -release @ACE_VERSION_NAME@ $(ACE_FLTK_LDFLAGS) + +libACE_FlReactor_la_LIBADD = \ + libACE.la \ + $(ACE_FLTK_LIBS) + +nobase_include_HEADERS += \ + FlReactor/ACE_FlReactor_export.h \ + FlReactor/FlReactor.h + +pkgconfig_DATA += \ + ACE_FlReactor.pc + +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 + +endif BUILD_X11 +endif BUILD_GL +endif BUILD_FL + +EXTRA_DIST += \ + FlReactor/ACE_FlReactor.pc.in + + +## Makefile.ACE_QtReactor.am + +if BUILD_QT + +BUILT_SOURCES = \ + QtReactor/QtReactor_moc.cpp + +CLEANFILES += \ + QtReactor/QtReactor_moc.cpp + +QtReactor/QtReactor_moc.cpp: $(srcdir)/QtReactor/QtReactor.h + $(QTDIR)/bin/moc $(srcdir)/QtReactor/QtReactor.h -o QtReactor/QtReactor_moc.cpp + +lib_LTLIBRARIES += libACE_QtReactor.la + +libACE_QtReactor_la_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + $(ACE_QT_CPPFLAGS) \ + -DACE_QTREACTOR_BUILD_DLL + +libACE_QtReactor_la_SOURCES = \ + QtReactor/QtReactor.cpp \ + QtReactor/QtReactor_moc.cpp + +libACE_QtReactor_la_LDFLAGS = \ + -release @ACE_VERSION_NAME@ $(ACE_QT_LDFLAGS) + +libACE_QtReactor_la_LIBADD = \ + libACE.la \ + $(ACE_QT_LIBS) + +nobase_include_HEADERS += \ + QtReactor/ACE_QtReactor_export.h \ + QtReactor/QtReactor.h + +pkgconfig_DATA += \ + ACE_QtReactor.pc + +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 + +endif BUILD_QT + +EXTRA_DIST += \ + QtReactor/ACE_QtReactor.pc.in + + +## Makefile.ACE_TkReactor.am + +if BUILD_TK + +lib_LTLIBRARIES += libACE_TkReactor.la + +libACE_TkReactor_la_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + $(ACE_TK_CPPFLAGS) \ + $(ACE_TCL_CPPFLAGS) \ + -DACE_TKREACTOR_BUILD_DLL + +libACE_TkReactor_la_SOURCES = \ + TkReactor/TkReactor.cpp + +libACE_TkReactor_la_LDFLAGS = \ + -release @ACE_VERSION_NAME@ $(ACE_TK_LDFLAGS) $(ACE_TCL_LDFLAGS) + +libACE_TkReactor_la_LIBADD = \ + libACE.la \ + $(ACE_TK_LIBS) \ + $(ACE_TCL_LIBS) + +nobase_include_HEADERS += \ + TkReactor/ACE_TkReactor_export.h \ + TkReactor/TkReactor.h + +pkgconfig_DATA += \ + ACE_TkReactor.pc + +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 + +endif BUILD_TK + +EXTRA_DIST += \ + TkReactor/ACE_TkReactor.pc.in + + +## Makefile.ACE_XtReactor.am + +if BUILD_X11 +if BUILD_XT + +lib_LTLIBRARIES += libACE_XtReactor.la + +libACE_XtReactor_la_CPPFLAGS = \ + -I$(ACE_ROOT) \ + -I$(ACE_BUILDDIR) \ + $(ACE_X11_CPPFLAGS) \ + $(ACE_XT_CPPFLAGS) \ + -DACE_XTREACTOR_BUILD_DLL + +libACE_XtReactor_la_SOURCES = \ + XtReactor/XtReactor.cpp + +libACE_XtReactor_la_LDFLAGS = \ + -release @ACE_VERSION_NAME@ $(ACE_X11_LDFLAGS) $(ACE_XT_LDFLAGS) + +libACE_XtReactor_la_LIBADD = \ + libACE.la \ + $(ACE_XT_LIBS) \ + $(ACE_X11_LIBS) + +nobase_include_HEADERS += \ + XtReactor/ACE_XtReactor_export.h \ + XtReactor/XtReactor.h + +pkgconfig_DATA += \ + ACE_XtReactor.pc + +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 + +endif BUILD_XT +endif BUILD_X11 + +EXTRA_DIST += \ + XtReactor/ACE_XtReactor.pc.in + + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/dep/ACE_wrappers/ace/Malloc.cpp b/dep/ACE_wrappers/ace/Malloc.cpp index c175e5448..c332dde80 100644 --- a/dep/ACE_wrappers/ace/Malloc.cpp +++ b/dep/ACE_wrappers/ace/Malloc.cpp @@ -1,4 +1,4 @@ -// $Id: Malloc.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Malloc.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $ #include "ace/Malloc.h" @@ -11,11 +11,6 @@ #include "ace/OS_NS_string.h" -ACE_RCSID (ace, - Malloc, - "$Id: Malloc.cpp 80826 2008-03-04 14:51:23Z wotte $") - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL // Process-wide ACE_Allocator. @@ -145,10 +140,9 @@ ACE_Control_Block::ACE_Name_Node::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("pointer = %@"), (const char *) this->pointer_)); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nnext_ = %@"), (ACE_Name_Node *) this->next_)); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("\nname_ = (%@, %s)"), + ACE_TEXT ("\nname_ = (%@, %C)\n"), (const char *) this->name_, (const char *) this->name_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/dep/ACE_wrappers/ace/Malloc_Allocator.cpp b/dep/ACE_wrappers/ace/Malloc_Allocator.cpp index 4da0e5f8f..53a81d0d3 100644 --- a/dep/ACE_wrappers/ace/Malloc_Allocator.cpp +++ b/dep/ACE_wrappers/ace/Malloc_Allocator.cpp @@ -1,4 +1,4 @@ -// $Id: Malloc_Allocator.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Malloc_Allocator.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/Malloc_Allocator.h" #include "ace/Object_Manager.h" @@ -12,8 +12,6 @@ #include "ace/Log_Msg.h" // for ACE_ASSERT #include "ace/OS_NS_string.h" -ACE_RCSID (ace, Malloc_Allocator, "$Id: Malloc_Allocator.cpp 80826 2008-03-04 14:51:23Z wotte $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_Allocator * diff --git a/dep/ACE_wrappers/ace/Malloc_Base.h b/dep/ACE_wrappers/ace/Malloc_Base.h index 6a13d020a..d800c7fe5 100644 --- a/dep/ACE_wrappers/ace/Malloc_Base.h +++ b/dep/ACE_wrappers/ace/Malloc_Base.h @@ -4,7 +4,7 @@ /** * @file Malloc_Base.h * - * $Id: Malloc_Base.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Malloc_Base.h 91058 2010-07-12 08:20:09Z johnnyw $ * * @author Doug Schmidt and Irfan Pyarali */ @@ -73,7 +73,7 @@ public: size_type elem_size, char initial_value = '\0') = 0; - /// Free (must have been allocated by ). + /// Free @a ptr (must have been allocated by ACE_Allocator::malloc()). virtual void free (void *ptr) = 0; /// Remove any resources associated with this memory manager. diff --git a/dep/ACE_wrappers/ace/Malloc_T.cpp b/dep/ACE_wrappers/ace/Malloc_T.cpp index 1becd8492..5a2a1852b 100644 --- a/dep/ACE_wrappers/ace/Malloc_T.cpp +++ b/dep/ACE_wrappers/ace/Malloc_T.cpp @@ -1,4 +1,4 @@ -// $Id: Malloc_T.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Malloc_T.cpp 84282 2009-01-30 15:04:29Z msmit $ #ifndef ACE_MALLOC_T_CPP #define ACE_MALLOC_T_CPP @@ -1055,8 +1055,7 @@ ACE_Malloc_LIFO_Iterator_T::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); this->curr_->dump (); this->guard_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("name_ = %s"), this->name_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("name_ = %C\n"), this->name_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -1150,8 +1149,7 @@ ACE_Malloc_FIFO_Iterator_T::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); this->curr_->dump (); this->guard_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("name_ = %s"), this->name_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("name_ = %s\n"), this->name_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/dep/ACE_wrappers/ace/Manual_Event.cpp b/dep/ACE_wrappers/ace/Manual_Event.cpp index 0b3caead8..5fb4a84c9 100644 --- a/dep/ACE_wrappers/ace/Manual_Event.cpp +++ b/dep/ACE_wrappers/ace/Manual_Event.cpp @@ -1,4 +1,4 @@ -// $Id: Manual_Event.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Manual_Event.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/Manual_Event.h" @@ -7,7 +7,7 @@ #endif /* __ACE_INLINE__ */ -ACE_RCSID(ace, Manual_Event, "$Id: Manual_Event.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/Manual_Event.h b/dep/ACE_wrappers/ace/Manual_Event.h index 4686e35d3..5242ef17c 100644 --- a/dep/ACE_wrappers/ace/Manual_Event.h +++ b/dep/ACE_wrappers/ace/Manual_Event.h @@ -4,7 +4,7 @@ /** * @file Manual_Event.h * - * $Id: Manual_Event.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Manual_Event.h 91066 2010-07-12 11:05:04Z johnnyw $ * * Moved from Synch.h. * @@ -39,14 +39,14 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Export ACE_Manual_Event : public ACE_Event { public: - /// constructor which will create manual event + /// Constructor which will create manual event ACE_Manual_Event (int initial_state = 0, int type = USYNC_THREAD, const char *name = 0, void *arg = 0); #if defined (ACE_HAS_WCHAR) - /// constructor which will create manual event (wchar_t version) + /// Constructor which will create manual event (wchar_t version) ACE_Manual_Event (int initial_state, int type, const wchar_t *name, diff --git a/dep/ACE_wrappers/ace/Map_Manager.h b/dep/ACE_wrappers/ace/Map_Manager.h index 4e361216f..23fd343c2 100644 --- a/dep/ACE_wrappers/ace/Map_Manager.h +++ b/dep/ACE_wrappers/ace/Map_Manager.h @@ -4,7 +4,7 @@ /** * @file Map_Manager.h * - * $Id: Map_Manager.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Map_Manager.h 91066 2010-07-12 11:05:04Z johnnyw $ * * @author Douglas C. Schmidt */ @@ -111,10 +111,11 @@ class ACE_Map_Reverse_Iterator; /** * @class ACE_Map_Manager * - * @brief Define a map abstraction that associates s with - * s. + * @brief + * Define a map abstraction that associates EXT_IDs with + * INT_IDs. * - * The must support . This constraint can + * The EXT_ID must support @c operator==. This constraint can * be alleviated via template specialization, as shown in the * $ACE_ROOT/tests/Conn_Test.cpp test. * This class uses an ACE_Allocator to allocate memory. The @@ -122,7 +123,7 @@ class ACE_Map_Reverse_Iterator; * ACE_Allocator with a persistable memory pool. * This implementation of a map uses an array, which is searched * linearly. For more efficient searching you should use the - * . + * ACE_Hash_Map_Manager. */ template class ACE_Map_Manager @@ -195,7 +196,7 @@ public: /** * Reassociate @a ext_id with @a int_id. If @a ext_id is not in the - * map then behaves just like . Otherwise, store the old + * map then behaves just like bind(). Otherwise, store the old * values of @a int_id into the "out" parameter and rebind the new * parameters. * @retval 0 If a new entry is bound successfully. @@ -261,12 +262,12 @@ public: size_t total_size (void) const; /** - * Returns a reference to the underlying . This makes it + * Returns a reference to the underlying ACE_LOCK. This makes it * possible to acquire the lock explicitly, which can be useful in * some cases if you instantiate the ACE_Atomic_Op with an * ACE_Recursive_Mutex or ACE_Process_Mutex, or if you need to * guard the state of an iterator. - * @note The right name would be , but HP/C++ will choke on that! + * @note The right name would be lock, but HP/C++ will choke on that! */ ACE_LOCK &mutex (void); diff --git a/dep/ACE_wrappers/ace/Map_T.h b/dep/ACE_wrappers/ace/Map_T.h index 08947e0e0..0b400e20b 100644 --- a/dep/ACE_wrappers/ace/Map_T.h +++ b/dep/ACE_wrappers/ace/Map_T.h @@ -4,7 +4,7 @@ /** * @file Map_T.h * - * $Id: Map_T.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Map_T.h 84316 2009-02-03 19:46:05Z johnnyw $ * * @author Irfan Pyarali */ @@ -1145,11 +1145,11 @@ public: /// Close down and release dynamically allocated resources. virtual ~ACE_Hash_Map_Manager_Ex_Adapter (void); - /// Initialize a with size @a length. + /// Initialize a Map with size @a length. virtual int open (size_t length = ACE_DEFAULT_MAP_SIZE, ACE_Allocator *alloc = 0); - /// Close down a and release dynamically allocated resources. + /// Close down a Map and release dynamically allocated resources. virtual int close (void); /** @@ -1204,7 +1204,7 @@ public: virtual int bind_create_key (const VALUE &value); /// Recovers the original key potentially modified by the map during - /// . + /// bind_modify_key(). virtual int recover_key (const KEY &modified_key, KEY &original_key); diff --git a/dep/ACE_wrappers/ace/Mem_Map.cpp b/dep/ACE_wrappers/ace/Mem_Map.cpp index 15b20ec20..baf9ce361 100644 --- a/dep/ACE_wrappers/ace/Mem_Map.cpp +++ b/dep/ACE_wrappers/ace/Mem_Map.cpp @@ -1,4 +1,4 @@ -// $Id: Mem_Map.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Mem_Map.cpp 91286 2010-08-05 09:04:31Z johnnyw $ // Defines the member functions for the memory mapping facility. @@ -13,7 +13,7 @@ #include "ace/Log_Msg.h" #include "ace/Truncate.h" -ACE_RCSID(ace, Mem_Map, "Mem_Map.cpp,v 4.39 2003/11/01 11:15:13 dhinton Exp") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/Mem_Map.h b/dep/ACE_wrappers/ace/Mem_Map.h index 14410cbf3..bda59bd18 100644 --- a/dep/ACE_wrappers/ace/Mem_Map.h +++ b/dep/ACE_wrappers/ace/Mem_Map.h @@ -4,7 +4,7 @@ /** * @file Mem_Map.h * - * $Id: Mem_Map.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Mem_Map.h 91066 2010-07-12 11:05:04Z johnnyw $ * * @author Douglas C. Schmidt */ @@ -22,6 +22,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Global_Macros.h" +#include "ace/Copy_Disabled.h" #include "ace/os_include/sys/os_mman.h" #include "ace/os_include/os_limits.h" #include "ace/os_include/os_fcntl.h" @@ -37,7 +38,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * This class works with both the mmap(2) UNIX system and the * Win32 family of memory mapping system calls. */ -class ACE_Export ACE_Mem_Map +class ACE_Export ACE_Mem_Map : private ACE_Copy_Disabled { public: // = Initialization and termination methods. @@ -128,38 +129,38 @@ public: /// file. size_t size (void) const; - /// Unmap the region starting at . + /// Unmap the region starting at base_addr_. int unmap (ssize_t len = -1); - /// Unmap the region starting at . + /// Unmap the region starting at addr_. int unmap (void *addr, ssize_t len); /** * Sync @a len bytes of the memory region to the backing store - * starting at . If @a len == -1 then sync the whole + * starting at base_addr_. If @a len == -1 then sync the whole * region. */ int sync (size_t len, int flags = MS_SYNC); /** * Sync the whole memory region to the backing store - * starting at . + * starting at base_addr_. */ int sync (int flags = MS_SYNC); /// Sync @a len bytes of the memory region to the backing store - /// starting at . + /// starting at addr_. int sync (void *addr, size_t len, int flags = MS_SYNC); /** * Change the protection of the pages of the mapped region to @a prot - * starting at up to @a len bytes. + * starting at base_addr_ up to @a len bytes. */ int protect (size_t len, int prot = PROT_RDWR); /** * Change the protection of all the pages of the mapped region to @a prot - * starting at . + * starting at base_addr_. */ int protect (int prot = PROT_RDWR); @@ -197,10 +198,6 @@ private: ACE_OFF_T offset = 0, LPSECURITY_ATTRIBUTES sa = 0); - // = Disallow copying and assignment. - ACE_Mem_Map (const ACE_Mem_Map &); - void operator = (const ACE_Mem_Map &); - private: /// Base address of the memory-mapped file. diff --git a/dep/ACE_wrappers/ace/Message_Block.cpp b/dep/ACE_wrappers/ace/Message_Block.cpp index 9a1fd1adf..0265fa11f 100644 --- a/dep/ACE_wrappers/ace/Message_Block.cpp +++ b/dep/ACE_wrappers/ace/Message_Block.cpp @@ -1,3 +1,4 @@ +// $Id: Message_Block.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $ #include "ace/Message_Block.h" #if !defined (__ACE_INLINE__) @@ -12,10 +13,6 @@ //#define ACE_ENABLE_TIMEPROBES #include "ace/Timeprobe.h" -ACE_RCSID (ace, - Message_Block, - "$Id: Message_Block.cpp 80826 2008-03-04 14:51:23Z wotte $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE (ACE_Message_Block) @@ -154,7 +151,7 @@ ACE_Data_Block::dump (void) const ACE_TEXT ("cur_size_ = %u\n") ACE_TEXT ("max_size_ = %u\n") ACE_TEXT ("flags_ = %u\n") - ACE_TEXT ("base_ = %u\n") + ACE_TEXT ("base_ = %@\n") ACE_TEXT ("locking_strategy_ = %u\n") ACE_TEXT ("reference_count_ = %u\n") ACE_TEXT ("---------------------------\n"), @@ -179,11 +176,11 @@ ACE_Message_Block::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("-----( Message Block )-----\n") ACE_TEXT ("priority_ = %d\n") - ACE_TEXT ("next_ = %u\n") - ACE_TEXT ("prev_ = %u\n") - ACE_TEXT ("cont_ = %u\n") - ACE_TEXT ("rd_ptr_ = %u\n") - ACE_TEXT ("wr_ptr_ = %u\n") + ACE_TEXT ("next_ = %@\n") + ACE_TEXT ("prev_ = %@\n") + ACE_TEXT ("cont_ = %@\n") + ACE_TEXT ("rd_ptr_ = %@\n") + ACE_TEXT ("wr_ptr_ = %@\n") ACE_TEXT ("---------------------------\n"), this->priority_, this->next_, @@ -815,8 +812,10 @@ ACE_Data_Block::release_no_delete (ACE_Lock *lock) } // This is the case when no lock was passed in else - // Lock to be used is our lock - lock_to_be_used = this->locking_strategy_; + { + // Lock to be used is our lock + lock_to_be_used = this->locking_strategy_; + } // If there's a locking strategy then we need to acquire the lock // before decrementing the count. @@ -827,7 +826,9 @@ ACE_Data_Block::release_no_delete (ACE_Lock *lock) result = this->release_i (); } else - result = this->release_i (); + { + result = this->release_i (); + } return result; } @@ -878,7 +879,7 @@ ACE_Message_Block::release (void) // One guard for all ACE_GUARD_RETURN (ACE_Lock, ace_mon, *lock, 0); - // Call non-guarded release with + // Call non-guarded release with @a lock destroy_dblock = this->release_i (lock); } // This is the case when we have a valid data block but no lock @@ -980,6 +981,7 @@ ACE_Message_Block::~ACE_Message_Block (void) this->prev_ = 0; this->next_ = 0; + this->cont_ = 0; } ACE_Data_Block * diff --git a/dep/ACE_wrappers/ace/Message_Block.h b/dep/ACE_wrappers/ace/Message_Block.h index 4f3a3d972..0e8c4bfd6 100644 --- a/dep/ACE_wrappers/ace/Message_Block.h +++ b/dep/ACE_wrappers/ace/Message_Block.h @@ -4,7 +4,7 @@ /** * @file Message_Block.h * - * $Id: Message_Block.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Message_Block.h 91066 2010-07-12 11:05:04Z johnnyw $ * * @author Douglas C. Schmidt */ @@ -138,7 +138,7 @@ public: * responsibility to take care of the memory allocated for the * data_block */ - ACE_Message_Block (ACE_Data_Block *, + ACE_Message_Block (ACE_Data_Block *data_block, Message_Flags flags = 0, ACE_Allocator *message_block_allocator = 0); @@ -214,14 +214,14 @@ public: /** * Create an initialized message of type @a type containing @a size * bytes. The @a cont argument initializes the continuation field in - * the . If @a data == 0 then we create and own the + * the Message_Block. If @a data == 0 then we create and own the * @a data, using @a allocator_strategy to get the data if it's non-0. If * @a data != 0 we assume that we have ownership of the @a data till * this object ceases to exist (and don't delete it during * destruction). If @a locking_strategy is non-0 then this is used * to protect regions of code that access shared state (e.g., * reference counting) from race conditions. Note that the @a size - * of the will be @a size, but the @a length will be 0 + * of the Message_Block will be @a size, but the @a length will be 0 * until is set. The @a data_block_allocator is use to * allocate the data blocks while the @a allocator_strategy is used * to allocate the buffers contained by those. @@ -241,8 +241,8 @@ public: /** * Delete all the resources held in the message. * - * Note that is designed to release the continuation - * chain; the destructor is not. See for details. + * @note Note that release() is designed to release the continuation + * chain; the destructor is not. See release() for details. */ virtual ~ACE_Message_Block (void); @@ -393,7 +393,7 @@ public: */ int copy (const char *buf); - /// Normalizes data in the top-level to align with the base, + /// Normalizes data in the top-level Message_Block to align with the base, /// i.e., it "shifts" the data pointed to by down to the and /// then readjusts to point to and to point /// to + the length of the moved data. Returns -1 and does @@ -405,7 +405,7 @@ public: void reset (void); /// Access all the allocators in the message block. - /// @@todo: Not sure whether we would need finer control while + /// @todo Not sure whether we would need finer control while /// trying to access allocators ie. a method for every allocator. /** * This method returns the allocators only from the first message @@ -486,40 +486,40 @@ public: /// Set the length of the message void length (size_t n); - /// Get the length of the s, including chained - /// s. + /// Get the length of the Message_Blocks, including chained + /// Message_Blocks. size_t total_length (void) const; - /// Get the total number of bytes in all s, including - /// chained s. + /// Get the total number of bytes in all Message_Blocks, including + /// chained Message_Blocks. size_t total_size (void) const; /// Get the total number of bytes and total length in all - /// s, including chained s. + /// Message_Blocks, including chained Message_Blocks. void total_size_and_length (size_t &mb_size, size_t &mb_length) const; - /// Get the number of bytes in the top-level (i.e., - /// does not consider the bytes in chained s). + /// Get the number of bytes in the top-level Message_Block (i.e., + /// does not consider the bytes in chained Message_Blocks). size_t size (void) const; /** - * Set the number of bytes in the top-level , - * reallocating space if necessary. However, the and - * remain at the original offsets into the buffer, even if + * Set the number of bytes in the top-level Message_Block, + * reallocating space if necessary. However, the @c rd_ptr_ and + * @c wr_ptr_ remain at the original offsets into the buffer, even if * it is reallocated. Returns 0 if successful, else -1. */ int size (size_t length); - /// Get the number of allocated bytes in all , including - /// chained s. + /// Get the number of allocated bytes in all Message_Block, including + /// chained Message_Blocks. size_t total_capacity (void) const; - /// Get the number of allocated bytes in the top-level . + /// Get the number of allocated bytes in the top-level Message_Block. size_t capacity (void) const; /// Get the number of bytes available after the in the - /// top-level . + /// top-level Message_Block. size_t space (void) const; //@} @@ -552,14 +552,14 @@ public: /// Set the continuation field. void cont (ACE_Message_Block *); - // = Pointer to the directly ahead in the ACE_Message_Queue. + // = Pointer to the Message_Block directly ahead in the ACE_Message_Queue. /// Get link to next message. ACE_Message_Block *next (void) const; /// Set link to next message. void next (ACE_Message_Block *); - // = Pointer to the directly behind in the ACE_Message_Queue. + // = Pointer to the Message_Block directly behind in the ACE_Message_Queue. /// Get link to prev message. ACE_Message_Block *prev (void) const; @@ -802,7 +802,7 @@ protected: /** * Decrease the reference count, but don't delete the object. * Returns 0 if the object should be removed. - * If is equal to the locking strategy then we assume that + * If @a lock is equal to the locking strategy then we assume that * the lock is beign held by the current thread; this is used to * release all the data blocks in a chain while holding a single * lock. diff --git a/dep/ACE_wrappers/ace/Message_Block.inl b/dep/ACE_wrappers/ace/Message_Block.inl index bf756e4dd..a4c00563c 100644 --- a/dep/ACE_wrappers/ace/Message_Block.inl +++ b/dep/ACE_wrappers/ace/Message_Block.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: Message_Block.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Message_Block.inl 84527 2009-02-19 14:01:42Z johnnyw $ ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -397,7 +397,7 @@ ACE_Message_Block::replace_data_block (ACE_Data_Block *db) if (db != 0) { // Set the read and write pointers in the to point - // to the buffer in the . + // to the buffer in the ACE_Data_Block. this->rd_ptr (this->data_block ()->base ()); this->wr_ptr (this->data_block ()->base ()); } diff --git a/dep/ACE_wrappers/ace/Message_Queue.cpp b/dep/ACE_wrappers/ace/Message_Queue.cpp index fefd67e67..ff781d097 100644 --- a/dep/ACE_wrappers/ace/Message_Queue.cpp +++ b/dep/ACE_wrappers/ace/Message_Queue.cpp @@ -1,4 +1,4 @@ -// $Id: Message_Queue.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Message_Queue.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/Message_Queue.h" #include "ace/Log_Msg.h" @@ -7,10 +7,6 @@ #include "ace/Message_Queue.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (ace, - Message_Queue, - "$Id: Message_Queue.cpp 80826 2008-03-04 14:51:23Z wotte $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_Message_Queue_Base::~ACE_Message_Queue_Base (void) diff --git a/dep/ACE_wrappers/ace/Message_Queue.h b/dep/ACE_wrappers/ace/Message_Queue.h index 15018a634..348cccfaf 100644 --- a/dep/ACE_wrappers/ace/Message_Queue.h +++ b/dep/ACE_wrappers/ace/Message_Queue.h @@ -4,7 +4,7 @@ /** * @file Message_Queue.h * - * $Id: Message_Queue.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Message_Queue.h 88560 2010-01-15 05:02:05Z schmidt $ * * @author Douglas C. Schmidt */ @@ -21,10 +21,6 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/IO_Cntl_Msg.h" -#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) -# include "ace/Synch_Traits.h" /* Needed in ACE_Message_Queue_NT */ -# include "ace/Thread_Mutex.h" /* Needed in ACE_Message_Queue_NT */ -#endif ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/Message_Queue_NT.cpp b/dep/ACE_wrappers/ace/Message_Queue_NT.cpp index 706eeb862..085282e20 100644 --- a/dep/ACE_wrappers/ace/Message_Queue_NT.cpp +++ b/dep/ACE_wrappers/ace/Message_Queue_NT.cpp @@ -1,5 +1,6 @@ -// $Id: Message_Queue_NT.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Message_Queue_NT.cpp 91286 2010-08-05 09:04:31Z johnnyw $ +#include "ace/Message_Queue.h" #include "ace/Message_Queue_NT.h" #include "ace/Log_Msg.h" @@ -7,11 +8,6 @@ #include "ace/Message_Queue_NT.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (ace, - Message_Queue_NT, - "$Id: Message_Queue_NT.cpp 80826 2008-03-04 14:51:23Z wotte $") - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) diff --git a/dep/ACE_wrappers/ace/Message_Queue_NT.h b/dep/ACE_wrappers/ace/Message_Queue_NT.h index cde4028ed..e959e57cf 100644 --- a/dep/ACE_wrappers/ace/Message_Queue_NT.h +++ b/dep/ACE_wrappers/ace/Message_Queue_NT.h @@ -4,7 +4,7 @@ /** * @file Message_Queue_NT.h * - * $Id: Message_Queue_NT.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Message_Queue_NT.h 82723 2008-09-16 09:35:44Z johnnyw $ * * @author Douglas C. Schmidt */ @@ -69,7 +69,7 @@ public: // = Enqueue and dequeue methods. /** - * Enqueue an at the end of the queue. + * Enqueue an ACE_Message_Block * at the end of the queue. * Returns -1 on failure, else the number of items still on the * queue. */ @@ -79,7 +79,7 @@ public: ACE_Time_Value *timeout = 0); /** - * Dequeue and return the at the head of the + * Dequeue and return the ACE_Message_Block * at the head of the * queue. Returns -1 on failure, else the number of items still on * the queue. */ diff --git a/dep/ACE_wrappers/ace/Message_Queue_T.cpp b/dep/ACE_wrappers/ace/Message_Queue_T.cpp index 38413ba7e..a33bac23e 100644 --- a/dep/ACE_wrappers/ace/Message_Queue_T.cpp +++ b/dep/ACE_wrappers/ace/Message_Queue_T.cpp @@ -1,4 +1,4 @@ -// $Id: Message_Queue_T.cpp 82574 2008-08-08 19:35:06Z parsons $ +// $Id: Message_Queue_T.cpp 91016 2010-07-06 11:29:50Z johnnyw $ #ifndef ACE_MESSAGE_QUEUE_T_CPP #define ACE_MESSAGE_QUEUE_T_CPP @@ -9,6 +9,10 @@ #include "ace/Log_Msg.h" #include "ace/OS_NS_sys_time.h" +#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) +#include "ace/Message_Queue_NT.h" +#endif /* ACE_HAS_WIN32_OVERLAPPED_IO */ + #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ @@ -56,13 +60,13 @@ ACE_Message_Queue_Ex::message_length (size_t ne } template -ACE_Message_Queue_Ex::ACE_Message_Queue_Ex (size_t hwm, - size_t lwm, +ACE_Message_Queue_Ex::ACE_Message_Queue_Ex (size_t high_water_mark, + size_t low_water_mark, ACE_Notification_Strategy *ns) { ACE_TRACE ("ACE_Message_Queue_Ex::ACE_Message_Queue_Ex"); - if (this->queue_.open (hwm, lwm, ns) == -1) + if (this->queue_.open (high_water_mark, low_water_mark, ns) == -1) ACE_ERROR ((LM_ERROR, ACE_TEXT ("ACE_Message_Queue_Ex"))); } @@ -981,9 +985,9 @@ ACE_Message_Queue::dump (void) const this->cur_count_, this->head_, this->tail_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("not_full_cond: \n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("not_full_cond:\n"))); not_full_cond_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("not_empty_cond: \n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("not_empty_cond:\n"))); not_empty_cond_.dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ @@ -1028,12 +1032,12 @@ ACE_Message_Queue::ACE_Message_Queue (size_t hwm, char pid_buf[sizeof (int) + 1]; ACE_OS::sprintf (pid_buf, "%d", ACE_OS::getpid ()); pid_buf[sizeof (int)] = '\0'; - + const int addr_nibbles = 2 * sizeof (ptrdiff_t); char addr_buf[addr_nibbles + 1]; ACE_OS::sprintf (addr_buf, "%p", this); addr_buf[addr_nibbles] = '\0'; - + ACE_CString name_str ("Message_Queue_"); name_str += pid_buf; name_str += '_'; @@ -1138,6 +1142,7 @@ ACE_Message_Queue::deactivate_i (int pulse) else this->state_ = ACE_Message_Queue_Base::DEACTIVATED; } + return previous_state; } @@ -1168,12 +1173,12 @@ ACE_Message_Queue::close (void) ACE_TRACE ("ACE_Message_Queue::close"); ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, -1); - int const result = this->deactivate_i (); + // There's no need to check the return value of deactivate_i() since + // it never fails! + this->deactivate_i (); // Free up the remaining messages on the queue. - this->flush_i (); - - return result; + return this->flush_i (); } template int @@ -1764,6 +1769,7 @@ ACE_Message_Queue::enqueue_head (ACE_Message_Block *new_item, { ACE_TRACE ("ACE_Message_Queue::enqueue_head"); int queue_count = 0; + ACE_Notification_Strategy *notifier = 0; { ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, -1); @@ -1777,12 +1783,17 @@ ACE_Message_Queue::enqueue_head (ACE_Message_Block *new_item, return -1; queue_count = this->enqueue_head_i (new_item); - if (queue_count == -1) return -1; - this->notify (); +#if defined (ACE_HAS_MONITOR_POINTS) && (ACE_HAS_MONITOR_POINTS == 1) + this->monitor_->receive (this->cur_length_); +#endif + notifier = this->notification_strategy_; } + + if (0 != notifier) + notifier->notify(); return queue_count; } @@ -1796,6 +1807,7 @@ ACE_Message_Queue::enqueue_prio (ACE_Message_Block *new_item, { ACE_TRACE ("ACE_Message_Queue::enqueue_prio"); int queue_count = 0; + ACE_Notification_Strategy *notifier = 0; { ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, -1); @@ -1813,8 +1825,13 @@ ACE_Message_Queue::enqueue_prio (ACE_Message_Block *new_item, if (queue_count == -1) return -1; - this->notify (); +#if defined (ACE_HAS_MONITOR_POINTS) && (ACE_HAS_MONITOR_POINTS == 1) + this->monitor_->receive (this->cur_length_); +#endif + notifier = this->notification_strategy_; } + if (0 != notifier) + notifier->notify (); return queue_count; } @@ -1828,6 +1845,7 @@ ACE_Message_Queue::enqueue_deadline (ACE_Message_Block *new_item, { ACE_TRACE ("ACE_Message_Queue::enqueue_deadline"); int queue_count = 0; + ACE_Notification_Strategy *notifier = 0; { ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, -1); @@ -1845,8 +1863,13 @@ ACE_Message_Queue::enqueue_deadline (ACE_Message_Block *new_item, if (queue_count == -1) return -1; - this->notify (); +#if defined (ACE_HAS_MONITOR_POINTS) && (ACE_HAS_MONITOR_POINTS == 1) + this->monitor_->receive (this->cur_length_); +#endif + notifier = this->notification_strategy_; } + if (0 != notifier) + notifier->notify (); return queue_count; } @@ -1867,6 +1890,7 @@ ACE_Message_Queue::enqueue_tail (ACE_Message_Block *new_item, { ACE_TRACE ("ACE_Message_Queue::enqueue_tail"); int queue_count = 0; + ACE_Notification_Strategy *notifier = 0; { ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, -1); @@ -1884,8 +1908,13 @@ ACE_Message_Queue::enqueue_tail (ACE_Message_Block *new_item, if (queue_count == -1) return -1; - this->notify (); +#if defined (ACE_HAS_MONITOR_POINTS) && (ACE_HAS_MONITOR_POINTS == 1) + this->monitor_->receive (this->cur_length_); +#endif + notifier = this->notification_strategy_; } + if (0 != notifier) + notifier->notify (); return queue_count; } @@ -1986,10 +2015,6 @@ ACE_Message_Queue::notify (void) { ACE_TRACE ("ACE_Message_Queue::notify"); -#if defined (ACE_HAS_MONITOR_POINTS) && (ACE_HAS_MONITOR_POINTS == 1) - this->monitor_->receive (this->cur_length_); -#endif - // By default, don't do anything. if (this->notification_strategy_ == 0) return 0; @@ -2212,7 +2237,7 @@ ACE_Dynamic_Message_Queue::dump (void) const ACE_TRACE ("ACE_Dynamic_Message_Queue::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Message_Queue (base class): \n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Message_Queue (base class):\n"))); this->ACE_Message_Queue::dump (); ACE_DEBUG ((LM_DEBUG, @@ -2229,7 +2254,7 @@ ACE_Dynamic_Message_Queue::dump (void) const this->beyond_late_head_, this->beyond_late_tail_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("message_strategy_ : \n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("message_strategy_ :\n"))); message_strategy_.dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); @@ -2255,7 +2280,7 @@ ACE_Dynamic_Message_Queue::enqueue_i (ACE_Message_Block *new_item // Refresh priority status boundaries in the queue. result = this->refresh_queue (current_time); - + if (result < 0) { return result; @@ -2928,6 +2953,7 @@ ACE_Message_Queue_Factory::create_laxity_message_queue (size_t hw // . #if defined (ACE_VXWORKS) + // factory method for a wrapped VxWorks message queue template ACE_Message_Queue_Vx * @@ -2942,7 +2968,7 @@ ACE_Message_Queue_Factory::create_Vx_message_queue (size_t max_me 0); return tmp; } - // factory method for a wrapped VxWorks message queue +#endif /* defined (ACE_VXWORKS) */ #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) @@ -2953,13 +2979,12 @@ ACE_Message_Queue_Factory::create_NT_message_queue (size_t max_th ACE_Message_Queue_NT *tmp = 0; ACE_NEW_RETURN (tmp, - ACE_Message_Queue_NT (max_threads); + ACE_Message_Queue_NT (max_threads), 0); return tmp; } #endif /* ACE_HAS_WIN32_OVERLAPPED_IO */ -#endif /* defined (ACE_VXWORKS) */ ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/Message_Queue_Vx.cpp b/dep/ACE_wrappers/ace/Message_Queue_Vx.cpp index 9aa465d36..4357859f7 100644 --- a/dep/ACE_wrappers/ace/Message_Queue_Vx.cpp +++ b/dep/ACE_wrappers/ace/Message_Queue_Vx.cpp @@ -1,4 +1,4 @@ -// $Id: Message_Queue_Vx.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Message_Queue_Vx.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/Message_Queue_Vx.h" #include "ace/Log_Msg.h" @@ -7,11 +7,6 @@ #include "ace/Message_Queue_Vx.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (ace, - Message_Queue_Vx, - "$Id: Message_Queue_Vx.cpp 80826 2008-03-04 14:51:23Z wotte $") - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL #if defined (ACE_VXWORKS) diff --git a/dep/ACE_wrappers/ace/Message_Queue_Vx.h b/dep/ACE_wrappers/ace/Message_Queue_Vx.h index b93330ac0..5dd65c124 100644 --- a/dep/ACE_wrappers/ace/Message_Queue_Vx.h +++ b/dep/ACE_wrappers/ace/Message_Queue_Vx.h @@ -4,7 +4,7 @@ /** * @file Message_Queue_Vx.h * - * $Id: Message_Queue_Vx.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Message_Queue_Vx.h 85579 2009-06-08 18:46:54Z mitza $ * * @author Douglas C. Schmidt */ @@ -58,11 +58,11 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * * . * * . * * The ability to change low and high water marks after creation. - * * chains. The continuation field of ACE_Message_Block + * * Message_Block chains. The continuation field of ACE_Message_Block * * is ignored; only the first block of a fragment chain is * * recognized. */ -class ACE_Message_Queue_Vx : public ACE_Message_Queue +class ACE_Export ACE_Message_Queue_Vx: public ACE_Message_Queue { public: // = Initialization and termination methods. diff --git a/dep/ACE_wrappers/ace/Method_Request.cpp b/dep/ACE_wrappers/ace/Method_Request.cpp index 972087c5d..f9927f777 100644 --- a/dep/ACE_wrappers/ace/Method_Request.cpp +++ b/dep/ACE_wrappers/ace/Method_Request.cpp @@ -1,9 +1,6 @@ +// $Id: Method_Request.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $ #include "ace/Method_Request.h" -ACE_RCSID (ace, - Method_Request, - "$Id: Method_Request.cpp 80826 2008-03-04 14:51:23Z wotte $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_Method_Request::ACE_Method_Request (unsigned long prio) diff --git a/dep/ACE_wrappers/ace/Metrics_Cache_T.inl b/dep/ACE_wrappers/ace/Metrics_Cache_T.inl index e3cc3b8cc..790aa3db0 100644 --- a/dep/ACE_wrappers/ace/Metrics_Cache_T.inl +++ b/dep/ACE_wrappers/ace/Metrics_Cache_T.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: Metrics_Cache_T.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Metrics_Cache_T.inl 83735 2008-11-14 09:41:52Z johnnyw $ #ifndef ACE_METRICS_CACHE_T_INL #define ACE_METRICS_CACHE_T_INL @@ -27,7 +27,7 @@ ACE_Metrics_Cache::report_enqueue_start (u_long i) this->interval_initialized_ = 1; ACE_hrtime_t hrtime_now = ACE_OS::gethrtime (); ACE_High_Res_Timer::hrtime_to_tv (this->interval_start_, - hrtime_now); + hrtime_now); this->interval_end_.set (this->interval_start_.sec(), this->interval_start_.usec()); } diff --git a/dep/ACE_wrappers/ace/Module.cpp b/dep/ACE_wrappers/ace/Module.cpp index bffbd5933..286270a9b 100644 --- a/dep/ACE_wrappers/ace/Module.cpp +++ b/dep/ACE_wrappers/ace/Module.cpp @@ -1,4 +1,4 @@ -// $Id: Module.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Module.cpp 84068 2008-12-24 18:32:05Z shuston $ #ifndef ACE_MODULE_CPP #define ACE_MODULE_CPP @@ -83,14 +83,14 @@ ACE_Module::link (ACE_Module *m) } template int -ACE_Module::open (const ACE_TCHAR *mod_name, +ACE_Module::open (const ACE_TCHAR *module_name, ACE_Task *writer_q, ACE_Task *reader_q, void *arg, int flags /* = M_DELETE */) { ACE_TRACE ("ACE_Module::open"); - this->name (mod_name); + this->name (module_name); this->arg_ = arg; // We may already have readers and/or writers. @@ -178,7 +178,7 @@ ACE_Module::~ACE_Module (void) } template -ACE_Module::ACE_Module (const ACE_TCHAR *mod_name, +ACE_Module::ACE_Module (const ACE_TCHAR *module_name, ACE_Task *writer_q, ACE_Task *reader_q, void *args, @@ -190,7 +190,7 @@ ACE_Module::ACE_Module (const ACE_TCHAR *mod_name, this->q_pair_[0] = 0; this->q_pair_[1] = 0; - if (this->open (mod_name, writer_q, reader_q, args, flags) == -1) + if (this->open (module_name, writer_q, reader_q, args, flags) == -1) ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Module"))); diff --git a/dep/ACE_wrappers/ace/Module.h b/dep/ACE_wrappers/ace/Module.h index 29690a5f3..4ae5c285d 100644 --- a/dep/ACE_wrappers/ace/Module.h +++ b/dep/ACE_wrappers/ace/Module.h @@ -4,7 +4,7 @@ /** * @file Module.h * - * $Id: Module.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Module.h 85417 2009-05-22 08:31:42Z johnnyw $ * * @author Douglas C. Schmidt */ @@ -94,8 +94,8 @@ public: int flags = M_DELETE); /** - * Initialize the module with as its identity - * and and as its tasks. Previously register + * Initialize the module with @a module_name as its identity + * and @a reader> and @a writer as its tasks. Previously register * reader or writers or closed down and deleted according to the * value of flags_. Should not be called from within * . @@ -174,7 +174,7 @@ public: private: /// Implements the close operation for either the reader or the - /// writer task (depending on ). + /// writer task (depending on @a which). int close_i (int which, int flags); /// Pair of Tasks that form the "read-side" and "write-side" of the diff --git a/dep/ACE_wrappers/ace/Monitor_Admin.h b/dep/ACE_wrappers/ace/Monitor_Admin.h index 1b383fbe4..739722f34 100644 --- a/dep/ACE_wrappers/ace/Monitor_Admin.h +++ b/dep/ACE_wrappers/ace/Monitor_Admin.h @@ -4,7 +4,7 @@ /** * @file Monitor_Admin.h * - * $Id: Monitor_Admin.h 81753 2008-05-21 19:02:47Z parsons $ + * $Id: Monitor_Admin.h 85297 2009-05-07 01:40:41Z parsons $ * * @author Jeff Parsons */ @@ -50,10 +50,10 @@ namespace ACE */ class Monitor_Point_Auto_Updater : public ACE_Event_Handler { - public: - /// Override of ACE base class method. - virtual int handle_timeout (const ACE_Time_Value& interval, - const void* monitor_point); + public: + /// Override of ACE base class method. + virtual int handle_timeout (const ACE_Time_Value& interval, + const void* monitor_point); }; /** diff --git a/dep/ACE_wrappers/ace/Monitor_Control_Types.cpp b/dep/ACE_wrappers/ace/Monitor_Control_Types.cpp index 782227c56..f60d9117c 100644 --- a/dep/ACE_wrappers/ace/Monitor_Control_Types.cpp +++ b/dep/ACE_wrappers/ace/Monitor_Control_Types.cpp @@ -1,4 +1,4 @@ -// $Id: Monitor_Control_Types.cpp 82328 2008-07-15 17:20:17Z parsons $ +// $Id: Monitor_Control_Types.cpp 84834 2009-03-16 12:28:51Z johnnyw $ #include "ace/Monitor_Control_Types.h" @@ -53,17 +53,20 @@ namespace ACE Monitor_Control_Types::Constraint& Monitor_Control_Types::Constraint::operator= (const Constraint& rhs) { - if (this->control_action != 0) + if (this != &rhs) { - this->control_action->remove_ref (); - } + if (this->control_action != 0) + { + this->control_action->remove_ref (); + } - this->expr = rhs.expr; - this->control_action = rhs.control_action; + this->expr = rhs.expr; + this->control_action = rhs.control_action; - if (this->control_action != 0) - { - this->control_action->add_ref (); + if (this->control_action != 0) + { + this->control_action->add_ref (); + } } return *this; diff --git a/dep/ACE_wrappers/ace/Monitor_Control_Types.h b/dep/ACE_wrappers/ace/Monitor_Control_Types.h index c42618854..5e92e524f 100644 --- a/dep/ACE_wrappers/ace/Monitor_Control_Types.h +++ b/dep/ACE_wrappers/ace/Monitor_Control_Types.h @@ -4,7 +4,7 @@ /** * @file Monitor_Control_Types.h * - * $Id: Monitor_Control_Types.h 82332 2008-07-16 01:00:55Z johnnyw $ + * $Id: Monitor_Control_Types.h 83306 2008-10-17 12:19:53Z johnnyw $ * * @author Jeff Parsons */ @@ -88,13 +88,6 @@ namespace ACE Control_Action* control_action; }; -#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x570) - // Borland C++ Builder 6 and earlier don't handle the second template - // argument correctly. We have to pass it explicitly - typedef ACE_Vector DataList; - typedef ACE_Vector NameList; - typedef ACE_Array_Map > ConstraintList; -#else /** * @brief Used by the admin class as a container for the data from * a group of monitor points. @@ -110,7 +103,6 @@ namespace ACE * @brief Holder for a monitor point's constraints. */ typedef ACE_Array_Map ConstraintList; -#endif }; } } diff --git a/dep/ACE_wrappers/ace/Msg_WFMO_Reactor.cpp b/dep/ACE_wrappers/ace/Msg_WFMO_Reactor.cpp index e06b69816..dafda96f3 100644 --- a/dep/ACE_wrappers/ace/Msg_WFMO_Reactor.cpp +++ b/dep/ACE_wrappers/ace/Msg_WFMO_Reactor.cpp @@ -1,8 +1,8 @@ -// $Id: Msg_WFMO_Reactor.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Msg_WFMO_Reactor.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/Msg_WFMO_Reactor.h" -ACE_RCSID(ace, Msg_WFMO_Reactor, "$Id: Msg_WFMO_Reactor.cpp 80826 2008-03-04 14:51:23Z wotte $") + #if defined (ACE_WIN32) && !defined (ACE_LACKS_MSG_WFMO) diff --git a/dep/ACE_wrappers/ace/Multihomed_INET_Addr.cpp b/dep/ACE_wrappers/ace/Multihomed_INET_Addr.cpp index 04ba3a0ce..b8b769652 100644 --- a/dep/ACE_wrappers/ace/Multihomed_INET_Addr.cpp +++ b/dep/ACE_wrappers/ace/Multihomed_INET_Addr.cpp @@ -1,4 +1,4 @@ -// $Id: Multihomed_INET_Addr.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Multihomed_INET_Addr.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $ // Extends ACE_INET_Addr with support for multi-homed addresses. @@ -9,10 +9,6 @@ # include "ace/Multihomed_INET_Addr.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (ace, - Multihomed_INET_Addr, - "$Id: Multihomed_INET_Addr.cpp 80826 2008-03-04 14:51:23Z wotte $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_Multihomed_INET_Addr) @@ -54,8 +50,8 @@ ACE_Multihomed_INET_Addr::ACE_Multihomed_INET_Addr(u_short port_number, address_family); if (ret) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Invalid INET addr (%s:%u) will be ignored\n"), - ACE_TEXT_CHAR_TO_TCHAR (secondary_host_names[i]), port_number)); + ACE_TEXT ("Invalid INET addr (%C:%u) will be ignored\n"), + secondary_host_names[i], port_number)); this->secondaries_.size(this->secondaries_.size() - 1); } else diff --git a/dep/ACE_wrappers/ace/Multihomed_INET_Addr.h b/dep/ACE_wrappers/ace/Multihomed_INET_Addr.h index b05ccf958..976ee813e 100644 --- a/dep/ACE_wrappers/ace/Multihomed_INET_Addr.h +++ b/dep/ACE_wrappers/ace/Multihomed_INET_Addr.h @@ -4,7 +4,7 @@ /** * @file Multihomed_INET_Addr.h * - * $Id: Multihomed_INET_Addr.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Multihomed_INET_Addr.h 84325 2009-02-04 22:46:30Z shuston $ * * @author Edward R. Mulholland */ @@ -61,11 +61,11 @@ public: * AF_INET6. To specify IPv4, use AF_INET. */ ACE_Multihomed_INET_Addr(u_short port_number, - const char primary_host_name[], - int encode = 1, - int address_family = AF_UNSPEC, - const char *(secondary_host_names[]) = 0, - size_t size = 0); + const char primary_host_name[], + int encode = 1, + int address_family = AF_UNSPEC, + const char *(secondary_host_names[]) = 0, + size_t size = 0); /** * Constructs an ACE_Multihomed_INET_Addr from a @a port_number, @@ -91,6 +91,7 @@ public: int address_family = AF_UNSPEC, const wchar_t *(secondary_host_names[]) = 0, size_t size = 0); + int set (u_short port_number, const wchar_t primary_host_name[], int encode = 1, diff --git a/dep/ACE_wrappers/ace/Mutex.cpp b/dep/ACE_wrappers/ace/Mutex.cpp index 8adcb6f9c..5106f0272 100644 --- a/dep/ACE_wrappers/ace/Mutex.cpp +++ b/dep/ACE_wrappers/ace/Mutex.cpp @@ -1,4 +1,4 @@ -// $Id: Mutex.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Mutex.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/Mutex.h" @@ -10,11 +10,6 @@ #include "ace/OS_NS_string.h" #include "ace/os_include/sys/os_mman.h" - -ACE_RCSID (ace, - Mutex, - "$Id: Mutex.cpp 80826 2008-03-04 14:51:23Z wotte $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_Mutex) @@ -22,6 +17,7 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Mutex) void ACE_Mutex::dump (void) const { +#if defined (ACE_HAS_DUMP) // ACE_TRACE ("ACE_Mutex::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); @@ -31,6 +27,7 @@ ACE_Mutex::dump (void) const #endif /* ACE_HAS_PTHREADS || ACE_HAS_STHREADS */ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); +#endif /* ACE_HAS_DUMP */ } ACE_Mutex::ACE_Mutex (int type, const ACE_TCHAR *name, diff --git a/dep/ACE_wrappers/ace/Name_Proxy.cpp b/dep/ACE_wrappers/ace/Name_Proxy.cpp index 5755e971e..b96bb0219 100644 --- a/dep/ACE_wrappers/ace/Name_Proxy.cpp +++ b/dep/ACE_wrappers/ace/Name_Proxy.cpp @@ -1,10 +1,10 @@ -// $Id: Name_Proxy.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Name_Proxy.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/Name_Proxy.h" #include "ace/Log_Msg.h" #include "ace/os_include/arpa/os_inet.h" -ACE_RCSID(ace, Name_Proxy, "$Id: Name_Proxy.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/Name_Request_Reply.cpp b/dep/ACE_wrappers/ace/Name_Request_Reply.cpp index 18329ab9d..2d57818f9 100644 --- a/dep/ACE_wrappers/ace/Name_Request_Reply.cpp +++ b/dep/ACE_wrappers/ace/Name_Request_Reply.cpp @@ -1,3 +1,5 @@ +// $Id: Name_Request_Reply.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $ + #include "ace/Name_Request_Reply.h" #include "ace/Basic_Types.h" #include "ace/CDR_Base.h" @@ -7,10 +9,6 @@ #include "ace/OS_NS_string.h" #include "ace/os_include/arpa/os_inet.h" -ACE_RCSID (ace, - Name_Request_Reply, - "$Id: Name_Request_Reply.cpp 80826 2008-03-04 14:51:23Z wotte $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL // Default "do nothing" constructor. diff --git a/dep/ACE_wrappers/ace/Name_Request_Reply.h b/dep/ACE_wrappers/ace/Name_Request_Reply.h index 30f1386dc..e8509f10b 100644 --- a/dep/ACE_wrappers/ace/Name_Request_Reply.h +++ b/dep/ACE_wrappers/ace/Name_Request_Reply.h @@ -4,7 +4,7 @@ /** * @file Name_Request_Reply.h * - * $Id: Name_Request_Reply.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Name_Request_Reply.h 84316 2009-02-03 19:46:05Z johnnyw $ * * Define the format used to exchange messages between the * ACE_Name Server and its clients. @@ -205,7 +205,7 @@ public: /// Default constructor. ACE_Name_Reply (void); - /// Create a message. + /// Create a ACE_Name_Reply message. ACE_Name_Reply (ACE_UINT32 type, ACE_UINT32 err); // Type of reply. /// Initialize length_ in order to ensure correct byte ordering diff --git a/dep/ACE_wrappers/ace/Name_Space.cpp b/dep/ACE_wrappers/ace/Name_Space.cpp index 806abd7d1..7e8f01dec 100644 --- a/dep/ACE_wrappers/ace/Name_Space.cpp +++ b/dep/ACE_wrappers/ace/Name_Space.cpp @@ -1,11 +1,11 @@ // Name_Space.cpp -// $Id: Name_Space.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Name_Space.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/Name_Space.h" #include "ace/OS_NS_string.h" #include "ace/OS_NS_stdlib.h" -ACE_RCSID(ace, Name_Space, "$Id: Name_Space.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -42,7 +42,7 @@ ACE_Name_Binding::ACE_Name_Binding (const ACE_Name_Binding &s) ACE_TRACE ("ACE_Name_Binding::ACE_Name_Binding"); } -void +const ACE_Name_Binding& ACE_Name_Binding::operator = (const ACE_Name_Binding &s) { ACE_TRACE ("ACE_Name_Binding::operator ="); @@ -54,6 +54,8 @@ ACE_Name_Binding::operator = (const ACE_Name_Binding &s) this->value_ = s.value_; this->type_ = ACE_OS::strdup (s.type_); } + + return *this; } bool diff --git a/dep/ACE_wrappers/ace/Name_Space.h b/dep/ACE_wrappers/ace/Name_Space.h index 966c8f46b..93b57bd9c 100644 --- a/dep/ACE_wrappers/ace/Name_Space.h +++ b/dep/ACE_wrappers/ace/Name_Space.h @@ -4,7 +4,7 @@ /** * @file Name_Space.h * - * $Id: Name_Space.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Name_Space.h 84834 2009-03-16 12:28:51Z johnnyw $ * * @author Prashant Jain */ @@ -49,7 +49,7 @@ public: ACE_Name_Binding (const ACE_Name_Binding &); /// Assignment operator. - void operator= (const ACE_Name_Binding &); + const ACE_Name_Binding& operator= (const ACE_Name_Binding &); /// Destructor. ~ACE_Name_Binding (void); diff --git a/dep/ACE_wrappers/ace/Naming_Context.cpp b/dep/ACE_wrappers/ace/Naming_Context.cpp index 0b1f7fefe..4bf312e8a 100644 --- a/dep/ACE_wrappers/ace/Naming_Context.cpp +++ b/dep/ACE_wrappers/ace/Naming_Context.cpp @@ -1,4 +1,4 @@ -// $Id: Naming_Context.cpp 81286 2008-04-09 07:27:30Z johnnyw $ +// $Id: Naming_Context.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/Get_Opt.h" #include "ace/Naming_Context.h" @@ -14,7 +14,7 @@ # include "ace/Trace.h" #endif /* ACE_HAS_TRACE */ -ACE_RCSID(ace, Naming_Context, "$Id: Naming_Context.cpp 81286 2008-04-09 07:27:30Z johnnyw $") + #if !defined (__ACE_INLINE__) #include "ace/Naming_Context.inl" @@ -415,8 +415,8 @@ ACE_Naming_Context::fini (void) } ACE_Name_Options::ACE_Name_Options (void) - : debugging_ (0), - verbosity_ (0), + : debugging_ (false), + verbosity_ (false), use_registry_ (false), nameserver_port_ (ACE_DEFAULT_SERVER_PORT), nameserver_host_ (ACE_OS::strdup (ACE_DEFAULT_SERVER_HOST)), @@ -580,7 +580,7 @@ ACE_Name_Options::parse_args (int argc, ACE_TCHAR *argv[]) } break; case 'd': - this->debugging_ = 1; + this->debugging_ = true; break; case 'r': this->use_registry_ = true; @@ -613,7 +613,7 @@ ACE_Name_Options::parse_args (int argc, ACE_TCHAR *argv[]) #endif /* ACE_HAS_TRACE */ break; case 'v': - this->verbosity_ = 1; + this->verbosity_ = true; break; default: ACE_OS::fprintf (stderr, "%s\n" @@ -624,8 +624,8 @@ ACE_Name_Options::parse_args (int argc, ACE_TCHAR *argv[]) "\t[-p nameserver port]\n" "\t[-s database name]\n" "\t[-b base address]\n" - "\t[-v] (verbose) \n" - "\t[-r] (use Win32 Registry) \n", + "\t[-v] (verbose)\n" + "\t[-r] (use Win32 Registry)\n", argv[0]); /* NOTREACHED */ break; diff --git a/dep/ACE_wrappers/ace/Naming_Context.h b/dep/ACE_wrappers/ace/Naming_Context.h index db8ca9173..ffc0252ed 100644 --- a/dep/ACE_wrappers/ace/Naming_Context.h +++ b/dep/ACE_wrappers/ace/Naming_Context.h @@ -4,7 +4,7 @@ /** * @file Naming_Context.h * - * $Id: Naming_Context.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Naming_Context.h 84160 2009-01-14 14:13:58Z johnnyw $ * * @author Gerhard Lenzer * @author Douglas C. Schmidt @@ -337,17 +337,17 @@ public: void use_registry (bool x); /// Return debug status - int debug (void); + bool debug (void); /// Return verbose status - int verbose (void); + bool verbose (void); private: /// Extra debugging info - int debugging_; + bool debugging_; /// Extra verbose messages - int verbosity_; + bool verbosity_; /// Use Win32 Registry bool use_registry_; diff --git a/dep/ACE_wrappers/ace/Naming_Context.inl b/dep/ACE_wrappers/ace/Naming_Context.inl index 917ddce37..034442b93 100644 --- a/dep/ACE_wrappers/ace/Naming_Context.inl +++ b/dep/ACE_wrappers/ace/Naming_Context.inl @@ -1,4 +1,4 @@ -// $Id: Naming_Context.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Naming_Context.inl 84160 2009-01-14 14:13:58Z johnnyw $ ACE_INLINE bool ACE_Name_Options::use_registry (void) const @@ -14,7 +14,7 @@ ACE_Name_Options::use_registry (bool x) this->use_registry_ = x; } -ACE_INLINE int +ACE_INLINE bool ACE_Name_Options::verbose (void) { ACE_TRACE ("ACE_Name_Options::verbose"); @@ -35,7 +35,7 @@ ACE_Name_Options::namespace_dir (void) return this->namespace_dir_; } -ACE_INLINE int +ACE_INLINE bool ACE_Name_Options::debug (void) { ACE_TRACE ("ACE_Name_Options::debug"); diff --git a/dep/ACE_wrappers/ace/Notification_Queue.cpp b/dep/ACE_wrappers/ace/Notification_Queue.cpp index 09d9934a2..881909052 100644 --- a/dep/ACE_wrappers/ace/Notification_Queue.cpp +++ b/dep/ACE_wrappers/ace/Notification_Queue.cpp @@ -1,4 +1,4 @@ -// $Id: Notification_Queue.cpp 81315 2008-04-10 07:14:15Z johnnyw $ +// $Id: Notification_Queue.cpp 85236 2009-05-01 11:43:56Z johnnyw $ #include "ace/Notification_Queue.h" @@ -26,8 +26,7 @@ ACE_Notification_Queue:: } int -ACE_Notification_Queue:: -open() +ACE_Notification_Queue::open() { ACE_TRACE ("ACE_Notification_Queue::open"); @@ -40,8 +39,7 @@ open() } void -ACE_Notification_Queue:: -reset() +ACE_Notification_Queue::reset() { ACE_TRACE ("ACE_Notification_Queue::reset"); @@ -75,8 +73,8 @@ reset() Buffer_List().swap(free_queue_); } -int ACE_Notification_Queue:: -allocate_more_buffers() +int +ACE_Notification_Queue::allocate_more_buffers() { ACE_TRACE ("ACE_Notification_Queue::allocate_more_buffers"); @@ -101,9 +99,9 @@ allocate_more_buffers() } int -ACE_Notification_Queue:: -purge_pending_notifications(ACE_Event_Handler * eh, - ACE_Reactor_Mask mask) +ACE_Notification_Queue::purge_pending_notifications( + ACE_Event_Handler * eh, + ACE_Reactor_Mask mask) { ACE_TRACE ("ACE_Notification_Queue::purge_pending_notifications"); @@ -155,8 +153,8 @@ purge_pending_notifications(ACE_Event_Handler * eh, return number_purged; } -int ACE_Notification_Queue:: -push_new_notification( +int +ACE_Notification_Queue::push_new_notification( ACE_Notification_Buffer const & buffer) { ACE_TRACE ("ACE_Notification_Queue::push_new_notification"); @@ -210,8 +208,7 @@ ACE_Notification_Queue::pop_next_notification( return 0; } - ACE_Notification_Queue_Node * node = - notify_queue_.pop_front(); + ACE_Notification_Queue_Node * node = notify_queue_.pop_front(); current = node->get(); free_queue_.push_front(node); diff --git a/dep/ACE_wrappers/ace/Notification_Strategy.cpp b/dep/ACE_wrappers/ace/Notification_Strategy.cpp index 1e022e079..e37f85ece 100644 --- a/dep/ACE_wrappers/ace/Notification_Strategy.cpp +++ b/dep/ACE_wrappers/ace/Notification_Strategy.cpp @@ -1,11 +1,11 @@ +// $Id: Notification_Strategy.cpp 91287 2010-08-05 10:30:49Z johnnyw $ + #include "ace/Notification_Strategy.h" #if !defined (__ACE_INLINE__) #include "ace/Notification_Strategy.inl" #endif /* __ACE_INLINE __ */ -ACE_RCSID(ace, Strategies, "$Id: Notification_Strategy.cpp 80826 2008-03-04 14:51:23Z wotte $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_Notification_Strategy::ACE_Notification_Strategy (ACE_Event_Handler *eh, diff --git a/dep/ACE_wrappers/ace/Null_Mutex.h b/dep/ACE_wrappers/ace/Null_Mutex.h index 5c8f6f6da..85aefb0e5 100644 --- a/dep/ACE_wrappers/ace/Null_Mutex.h +++ b/dep/ACE_wrappers/ace/Null_Mutex.h @@ -4,7 +4,7 @@ /** * @file Null_Mutex.h * - * $Id: Null_Mutex.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Null_Mutex.h 86731 2009-09-17 12:23:48Z johnnyw $ * * Moved from Synch.h. * @@ -124,8 +124,6 @@ template class ACE_Guard; /** - * @class ACE_Guard - * * @brief Template specialization of ACE_Guard for the * ACE_Null_Mutex. * @@ -164,8 +162,8 @@ template class ACE_Write_Guard; /** - * @class ACE_Write_Guard - * + * @brief Template specialization of ACE_Write_Guard for the + * ACE_Null_Mutex. */ template<> class ACE_Export ACE_Write_Guard @@ -188,8 +186,8 @@ template class ACE_Read_Guard; /** - * @class ACE_Read_Guard - * + * @brief Template specialization of ACE_Read)Guard for the + * ACE_Null_Mutex. */ template<> class ACE_Export ACE_Read_Guard @@ -211,8 +209,8 @@ public: template class ACE_Malloc_Lock_Adapter_T; /** - * @class ACE_Malloc_Lock_Adapter_T - * + * @brief Template specialization of ACE_Malloc_Lock_Adapter_T for the + * ACE_Null_Mutex. */ template<> class ACE_Export ACE_Malloc_Lock_Adapter_T diff --git a/dep/ACE_wrappers/ace/Numeric_Limits.h b/dep/ACE_wrappers/ace/Numeric_Limits.h index 356c81e71..0a1d5f2e8 100644 --- a/dep/ACE_wrappers/ace/Numeric_Limits.h +++ b/dep/ACE_wrappers/ace/Numeric_Limits.h @@ -4,7 +4,7 @@ /** * @file Numeric_Limits.h * - * $Id: Numeric_Limits.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Numeric_Limits.h 85057 2009-04-08 10:59:58Z msmit $ * * Traits containing basic integer limits. Useful for template-based * code on platforms that lack @c std::numeric_limits<>. @@ -37,7 +37,7 @@ # include "ace/Basic_Types.h" #else -# ifdef __MINGW32__ +# if defined __MINGW32__ // Windows defines min/max macros that interfere with the // numeric_limits::min/max() traits. Undefine those macros before // including . diff --git a/dep/ACE_wrappers/ace/OS.cpp b/dep/ACE_wrappers/ace/OS.cpp index 0fd57bdd5..e748cfff2 100644 --- a/dep/ACE_wrappers/ace/OS.cpp +++ b/dep/ACE_wrappers/ace/OS.cpp @@ -1,4 +1,4 @@ -// $Id: OS.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: OS.cpp 91286 2010-08-05 09:04:31Z johnnyw $ // FUZZ: disable check_for_OS_h_include #include "ace/OS.h" @@ -13,7 +13,7 @@ # include "ace/OS.inl" #endif /* ACE_HAS_INLINED_OSCALLS */ -ACE_RCSID(ace, OS, "$Id: OS.cpp 80826 2008-03-04 14:51:23Z wotte $") + // include new cpps #include "ace/Cleanup.cpp" diff --git a/dep/ACE_wrappers/ace/OS.inl b/dep/ACE_wrappers/ace/OS.inl index 593b582d8..852542b5a 100644 --- a/dep/ACE_wrappers/ace/OS.inl +++ b/dep/ACE_wrappers/ace/OS.inl @@ -1,5 +1,5 @@ // -*- C++ -*- -// $Id: OS.inl 81697 2008-05-14 18:33:11Z johnnyw $ +// $Id: OS.inl 87244 2009-10-27 20:15:48Z olli $ #if !defined (ACE_HAS_INLINED_OSCALLS) # undef ACE_INLINE @@ -41,18 +41,6 @@ using std::strftime; #if !defined (ACE_WIN32) -// Matthew Stevens 7-10-95 Fix GNU GCC 2.7 for memchr() problem. -# if defined (ACE_HAS_GNU_CSTRING_H) -// Define this file to keep /usr/include/memory.h from being included. -# include /**/ -# else -# if defined (ACE_LACKS_MEMORY_H) -# include "ace/os_include/os_string.h" -# else -# include /**/ -# endif /* ACE_LACKS_MEMORY_H */ -# endif /* ACE_HAS_GNU_CSTRING_H */ - // The following are #defines and #includes that must be visible for // ACE to compile it's OS wrapper class implementation correctly. We // put them inside of here to reduce compiler overhead if we're not @@ -90,4 +78,3 @@ using std::strftime; #endif // **************************************************************** - diff --git a/dep/ACE_wrappers/ace/OS_Errno.cpp b/dep/ACE_wrappers/ace/OS_Errno.cpp index 15bdbcf27..7c2866c22 100644 --- a/dep/ACE_wrappers/ace/OS_Errno.cpp +++ b/dep/ACE_wrappers/ace/OS_Errno.cpp @@ -1,9 +1,9 @@ // -*- C++ -*- -// $Id: OS_Errno.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: OS_Errno.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/OS_Errno.h" -ACE_RCSID(ace, OS_Errno, "$Id: OS_Errno.cpp 80826 2008-03-04 14:51:23Z wotte $") + // Inlining this class on debug builds with gcc on Solaris can cause // deadlocks during static initialization. On non debug builds it diff --git a/dep/ACE_wrappers/ace/OS_Errno.h b/dep/ACE_wrappers/ace/OS_Errno.h index ce6500b07..bda24ad0a 100644 --- a/dep/ACE_wrappers/ace/OS_Errno.h +++ b/dep/ACE_wrappers/ace/OS_Errno.h @@ -4,7 +4,7 @@ /** * @file OS_Errno.h * - * $Id: OS_Errno.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: OS_Errno.h 83891 2008-11-28 11:01:50Z johnnyw $ * * @author (Originally in OS.h)Doug Schmidt */ @@ -46,20 +46,19 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Export ACE_Errno_Guard { public: - /// Stash the value of into and initialize the - /// to the address of . + /// Stash the value of @a error into @c error_ and initialize the + /// @c errno_ptr_ to the address of @a errno_ref. ACE_Errno_Guard (ACE_ERRNO_TYPE &errno_ref, int error); - /// Stash the value of @c errno into and initialize the - /// to the address of . + /// Initialize the @c errno_ptr_ to the address of @a errno_ref. ACE_Errno_Guard (ACE_ERRNO_TYPE &errno_ref); /// Reset the value of @c errno to . ~ACE_Errno_Guard (void); #if defined (ACE_HAS_WINCE_BROKEN_ERRNO) - /// Assign to . + /// Assign @a errno_ref to . int operator= (const ACE_ERRNO_TYPE &errno_ref); #endif /* ACE_HAS_WINCE_BROKEN_ERRNO */ diff --git a/dep/ACE_wrappers/ace/OS_Log_Msg_Attributes.cpp b/dep/ACE_wrappers/ace/OS_Log_Msg_Attributes.cpp index ead887680..bbf0cb048 100644 --- a/dep/ACE_wrappers/ace/OS_Log_Msg_Attributes.cpp +++ b/dep/ACE_wrappers/ace/OS_Log_Msg_Attributes.cpp @@ -1,4 +1,4 @@ -// $Id: OS_Log_Msg_Attributes.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: OS_Log_Msg_Attributes.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/OS_Log_Msg_Attributes.h" @@ -6,4 +6,4 @@ # include "ace/OS_Log_Msg_Attributes.inl" #endif /* ACE_HAS_INLINED_OSCALLS */ -ACE_RCSID(ace, OS_Log_Msg_Attributes, "$Id: OS_Log_Msg_Attributes.cpp 80826 2008-03-04 14:51:23Z wotte $") + diff --git a/dep/ACE_wrappers/ace/OS_Log_Msg_Attributes.h b/dep/ACE_wrappers/ace/OS_Log_Msg_Attributes.h index f87619957..65c11ab61 100644 --- a/dep/ACE_wrappers/ace/OS_Log_Msg_Attributes.h +++ b/dep/ACE_wrappers/ace/OS_Log_Msg_Attributes.h @@ -4,7 +4,7 @@ /** * @file OS_Log_Msg_Attributes.h * - * $Id: OS_Log_Msg_Attributes.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: OS_Log_Msg_Attributes.h 91066 2010-07-12 11:05:04Z johnnyw $ * * @author Carlos O'Ryan */ @@ -23,6 +23,7 @@ #include /**/ "ace/ACE_export.h" #include "ace/os_include/os_stdio.h" #include "ace/iosfwd.h" +#include "ace/Copy_Disabled.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -39,7 +40,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * The contents of the class must be made available to the OS layer, * because they are part of the thread descriptor. */ -class ACE_Export ACE_OS_Log_Msg_Attributes +class ACE_Export ACE_OS_Log_Msg_Attributes : private ACE_Copy_Disabled { public: /// Constructor @@ -50,6 +51,7 @@ protected: /// Ostream where the new TSS Log_Msg will use. ACE_OSTREAM_TYPE *ostream_; + void *ostream_refcount_; /// Priority_mask to be used in new TSS Log_Msg. unsigned long priority_mask_; @@ -59,21 +61,16 @@ protected: /// Indicates whether we should restart system calls that are /// interrupted. - int restart_; + bool restart_; /// Depth of the nesting for printing traces. int trace_depth_; -# if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) +#if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) /// Structured exception handling Callbacks, only used under Win32 ACE_SEH_EXCEPT_HANDLER seh_except_selector_; ACE_SEH_EXCEPT_HANDLER seh_except_handler_; -# endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ - -private: - // Prevent copying - ACE_OS_Log_Msg_Attributes (const ACE_OS_Log_Msg_Attributes &); - ACE_OS_Log_Msg_Attributes &operator= (const ACE_OS_Log_Msg_Attributes &); +#endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/OS_Log_Msg_Attributes.inl b/dep/ACE_wrappers/ace/OS_Log_Msg_Attributes.inl index 82619a031..df575b497 100644 --- a/dep/ACE_wrappers/ace/OS_Log_Msg_Attributes.inl +++ b/dep/ACE_wrappers/ace/OS_Log_Msg_Attributes.inl @@ -1,11 +1,21 @@ // -*- C++ -*- // -// $Id: OS_Log_Msg_Attributes.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: OS_Log_Msg_Attributes.inl 84184 2009-01-19 10:18:31Z johnnyw $ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -ACE_OS_Log_Msg_Attributes::ACE_OS_Log_Msg_Attributes (void) +ACE_OS_Log_Msg_Attributes::ACE_OS_Log_Msg_Attributes (void) : + ostream_ (0), + ostream_refcount_ (0), + priority_mask_ (0), + tracing_enabled_ (0), + restart_ (true), + trace_depth_ (0) +# if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) + , seh_except_selector_ (0), + seh_except_handler_ (0) +# endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ { } diff --git a/dep/ACE_wrappers/ace/OS_Memory.h b/dep/ACE_wrappers/ace/OS_Memory.h index ef5746b7c..7a5d94afb 100644 --- a/dep/ACE_wrappers/ace/OS_Memory.h +++ b/dep/ACE_wrappers/ace/OS_Memory.h @@ -4,7 +4,7 @@ /** * @file OS_Memory.h * - * $Id: OS_Memory.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: OS_Memory.h 86400 2009-08-06 13:52:28Z schmidt $ * * @author Doug Schmidt * @author Jesper S. M|ller @@ -231,9 +231,15 @@ ACE_END_VERSIONED_NAMESPACE_DECL if (POINTER == 0) { errno = ENOMEM; } \ } while (0) -# define ACE_throw_bad_alloc \ - void* gcc_will_complain_if_literal_0_is_returned = 0; \ - return gcc_will_complain_if_literal_0_is_returned +# if !defined (ACE_bad_alloc) + class ACE_bad_alloc_class {}; +# define ACE_bad_alloc ACE_bad_alloc_class +# endif +# if defined (ACE_HAS_MFC) && (ACE_HAS_MFC == 1) +# define ACE_throw_bad_alloc AfxThrowMemoryException () +# else +# define ACE_throw_bad_alloc return 0 +# endif #endif /* ACE_NEW_THROWS_EXCEPTIONS */ @@ -260,7 +266,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * * ~(alignment - 1) = 1...110...0 = T2 * - * Notice that there is a multiple of in the range + * Notice that there is a multiple of @a alignment in the range * [, + T1], also notice that if * * X = ( + T1 ) & T2 @@ -270,7 +276,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * <= X <= + T1 * * because the & operator only changes the last bits, and since X is a - * multiple of (its last bits are zero) we have found the + * multiple of @a alignment (its last bits are zero) we have found the * multiple we wanted. */ /// Return the next integer aligned to a required boundary diff --git a/dep/ACE_wrappers/ace/OS_NS_Thread.cpp b/dep/ACE_wrappers/ace/OS_NS_Thread.cpp index e5c37092a..48a661e36 100644 --- a/dep/ACE_wrappers/ace/OS_NS_Thread.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_Thread.cpp @@ -1,8 +1,6 @@ -#include "ace/OS_NS_Thread.h" +// $Id: OS_NS_Thread.cpp 91523 2010-08-27 14:18:02Z johnnyw $ -ACE_RCSID (ace, - OS_NS_Thread, - "$Id: OS_NS_Thread.cpp 81345 2008-04-13 07:28:11Z johnnyw $") +#include "ace/OS_NS_Thread.h" #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_NS_Thread.inl" @@ -33,9 +31,9 @@ ACE_MUTEX_LOCK_CLEANUP_ADAPTER_NAME (void *args) #if !defined(ACE_WIN32) && defined (__IBMCPP__) && (__IBMCPP__ >= 400) # define ACE_BEGINTHREADEX(STACK, STACKSIZE, ENTRY_POINT, ARGS, FLAGS, THR_ID) \ (*THR_ID = ::_beginthreadex ((void(_Optlink*)(void*))ENTRY_POINT, STACK, STACKSIZE, ARGS), *THR_ID) -#elif defined (ACE_HAS_WINCE) && defined (UNDER_CE) && (UNDER_CE >= 211) +#elif defined (ACE_HAS_WINCE) # define ACE_BEGINTHREADEX(STACK, STACKSIZE, ENTRY_POINT, ARGS, FLAGS, THR_ID) \ - CreateThread (0, STACKSIZE, (unsigned long (__stdcall *) (void *)) ENTRY_POINT, ARGS, (FLAGS) & CREATE_SUSPENDED, (unsigned long *) THR_ID) + CreateThread (0, STACKSIZE, (unsigned long (__stdcall *) (void *)) ENTRY_POINT, ARGS, (FLAGS) & (CREATE_SUSPENDED | STACK_SIZE_PARAM_IS_A_RESERVATION), (unsigned long *) THR_ID) #elif defined(ACE_HAS_WTHREADS) // Green Hills compiler gets confused when __stdcall is imbedded in // parameter list, so we define the type ACE_WIN32THRFUNC_T and use it @@ -117,17 +115,15 @@ ACE_OS_thread_key_t ACE_TSS_Emulation::native_tss_key_; # if defined (ACE_HAS_THR_C_FUNC) extern "C" void -ACE_TSS_Emulation_cleanup (void *ptr) +ACE_TSS_Emulation_cleanup (void *) { - ACE_UNUSED_ARG (ptr); // Really this must be used for ACE_TSS_Emulation code to make the TSS // cleanup } # else void -ACE_TSS_Emulation_cleanup (void *ptr) +ACE_TSS_Emulation_cleanup (void *) { - ACE_UNUSED_ARG (ptr); // Really this must be used for ACE_TSS_Emulation code to make the TSS // cleanup } @@ -711,7 +707,7 @@ TSS_Cleanup_Instance::~TSS_Cleanup_Instance (void) // scope the guard { - ACE_Guard guard (*mutex_); + ACE_GUARD (ACE_Thread_Mutex, guard, *mutex_); if (ptr_ != 0) { if (ACE_BIT_ENABLED (flags_, FLAG_DELETING)) @@ -1142,25 +1138,6 @@ ACE_OS::cleanup_tss (const u_int main_thread) /*****************************************************************************/ #if defined (ACE_LACKS_COND_T) -// NOTE: The ACE_OS::cond_* functions for some non-Unix platforms are -// defined here either because they're too big to be inlined, or -// to avoid use before definition if they were inline. - -// @@ The following functions could be inlined if i could figure where -// to put it among the #ifdefs! -int -ACE_OS::condattr_init (ACE_condattr_t &attributes, int type) -{ - attributes.type = type; - return 0; -} - -int -ACE_OS::condattr_destroy (ACE_condattr_t &) -{ - return 0; -} - int ACE_OS::cond_broadcast (ACE_cond_t *cv) { @@ -1170,8 +1147,12 @@ ACE_OS::cond_broadcast (ACE_cond_t *cv) // This is needed to ensure that and are // consistent relative to each other. - ACE_OS::thread_mutex_lock (&cv->waiters_lock_); - int have_waiters = 0; + if (ACE_OS::thread_mutex_lock (&cv->waiters_lock_) != 0) + { + return -1; + } + + bool have_waiters = false; if (cv->waiters_ > 0) { @@ -1180,9 +1161,15 @@ ACE_OS::cond_broadcast (ACE_cond_t *cv) // cond_wait() method know how to optimize itself. Be sure to // set this with the held. cv->was_broadcast_ = 1; - have_waiters = 1; + have_waiters = true; } - ACE_OS::thread_mutex_unlock (&cv->waiters_lock_); + + if (ACE_OS::thread_mutex_unlock (&cv->waiters_lock_) != 0) + { + // This is really bad, we have the lock but can't release it anymore + return -1; + } + int result = 0; if (have_waiters) { @@ -1218,8 +1205,14 @@ ACE_OS::cond_destroy (ACE_cond_t *cv) # elif defined (ACE_VXWORKS) ACE_OS::sema_destroy (&cv->waiters_done_); # endif /* ACE_VXWORKS */ - ACE_OS::thread_mutex_destroy (&cv->waiters_lock_); - return ACE_OS::sema_destroy (&cv->sema_); + int result = 0; + if (ACE_OS::thread_mutex_destroy (&cv->waiters_lock_) != 0) + result = -1; + + if (ACE_OS::sema_destroy (&cv->sema_) != 0) + result = -1; + + return result; # else ACE_UNUSED_ARG (cv); ACE_NOTSUP_RETURN (-1); @@ -1317,11 +1310,13 @@ ACE_OS::cond_signal (ACE_cond_t *cv) // lost wakeup bug... This is needed to ensure that the // value is not in an inconsistent internal state while being // updated by another thread. - ACE_OS::thread_mutex_lock (&cv->waiters_lock_); - int have_waiters = cv->waiters_ > 0; - ACE_OS::thread_mutex_unlock (&cv->waiters_lock_); + if (ACE_OS::thread_mutex_lock (&cv->waiters_lock_) != 0) + return -1; + bool const have_waiters = cv->waiters_ > 0; + if (ACE_OS::thread_mutex_unlock (&cv->waiters_lock_) != 0) + return -1; - if (have_waiters != 0) + if (have_waiters) return ACE_OS::sema_post (&cv->sema_); else return 0; // No-op @@ -1338,19 +1333,27 @@ ACE_OS::cond_wait (ACE_cond_t *cv, ACE_OS_TRACE ("ACE_OS::cond_wait"); # if defined (ACE_HAS_THREADS) // Prevent race conditions on the count. - ACE_OS::thread_mutex_lock (&cv->waiters_lock_); + if (ACE_OS::thread_mutex_lock (&cv->waiters_lock_) != 0) + return -1; + ++cv->waiters_; - ACE_OS::thread_mutex_unlock (&cv->waiters_lock_); + + if (ACE_OS::thread_mutex_unlock (&cv->waiters_lock_) != 0) + return -1; int result = 0; # if defined (ACE_HAS_SIGNAL_OBJECT_AND_WAIT) if (external_mutex->type_ == USYNC_PROCESS) - // This call will automatically release the mutex and wait on the semaphore. - ACE_WIN32CALL (ACE_ADAPT_RETVAL (::SignalObjectAndWait (external_mutex->proc_mutex_, - cv->sema_, INFINITE, FALSE), - result), - int, -1, result); + { + // This call will automatically release the mutex and wait on the semaphore. + ACE_WIN32CALL (ACE_ADAPT_RETVAL (::SignalObjectAndWait (external_mutex->proc_mutex_, + cv->sema_, INFINITE, FALSE), + result), + int, -1, result); + if (result == -1) + return result; + } else # endif /* ACE_HAS_SIGNAL_OBJECT_AND_WAIT */ { @@ -1367,16 +1370,18 @@ ACE_OS::cond_wait (ACE_cond_t *cv, } // Reacquire lock to avoid race conditions on the count. - ACE_OS::thread_mutex_lock (&cv->waiters_lock_); + if (ACE_OS::thread_mutex_lock (&cv->waiters_lock_) != 0) + return -1; // We're ready to return, so there's one less waiter. --cv->waiters_; - int last_waiter = cv->was_broadcast_ && cv->waiters_ == 0; + bool const last_waiter = cv->was_broadcast_ && cv->waiters_ == 0; // Release the lock so that other collaborating threads can make // progress. - ACE_OS::thread_mutex_unlock (&cv->waiters_lock_); + if (ACE_OS::thread_mutex_unlock (&cv->waiters_lock_) != 0) + return -1; if (result == -1) // Bad things happened, so let's just return below. @@ -1398,7 +1403,8 @@ ACE_OS::cond_wait (ACE_cond_t *cv, // We must always regain the , even when // errors occur because that's the guarantee that we give to // our callers. - ACE_OS::mutex_lock (external_mutex); + if (ACE_OS::mutex_lock (external_mutex) != 0) + return -1; return result; /* NOTREACHED */ @@ -1438,17 +1444,19 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv, # if defined (ACE_HAS_WTHREADS) || defined (ACE_VXWORKS) // Prevent race conditions on the count. - ACE_OS::thread_mutex_lock (&cv->waiters_lock_); - cv->waiters_++; - ACE_OS::thread_mutex_unlock (&cv->waiters_lock_); + if (ACE_OS::thread_mutex_lock (&cv->waiters_lock_) != 0) + return -1; + + ++cv->waiters_; + + if (ACE_OS::thread_mutex_unlock (&cv->waiters_lock_) != 0) + return -1; int result = 0; ACE_Errno_Guard error (errno, 0); - int msec_timeout; + int msec_timeout = 0; - if (timeout->sec () == 0 && timeout->usec () == 0) - msec_timeout = 0; // Do a "poll." - else + if (timeout != 0 && *timeout != ACE_Time_Value::zero) { // Note that we must convert between absolute time (which is // passed as a parameter) and relative time (which is what @@ -1457,9 +1465,7 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv, // Watchout for situations where a context switch has caused the // current time to be > the timeout. - if (relative_time < ACE_Time_Value::zero) - msec_timeout = 0; - else + if (relative_time > ACE_Time_Value::zero) msec_timeout = relative_time.msec (); } @@ -1501,12 +1507,15 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv, } // Reacquire lock to avoid race conditions. - ACE_OS::thread_mutex_lock (&cv->waiters_lock_); - cv->waiters_--; + if (ACE_OS::thread_mutex_lock (&cv->waiters_lock_) != 0) + return -1; + + --cv->waiters_; - int last_waiter = cv->was_broadcast_ && cv->waiters_ == 0; + bool const last_waiter = cv->was_broadcast_ && cv->waiters_ == 0; - ACE_OS::thread_mutex_unlock (&cv->waiters_lock_); + if (ACE_OS::thread_mutex_unlock (&cv->waiters_lock_) != 0) + return -1; # if defined (ACE_WIN32) if (result != WAIT_OBJECT_0) @@ -1554,10 +1563,13 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv, result), int, -1, result); else - // We must always regain the , even when - // errors occur because that's the guarantee that we give to - // our callers. - ACE_OS::mutex_lock (external_mutex); + { + // We must always regain the , even when + // errors occur because that's the guarantee that we give to + // our callers. + if (ACE_OS::mutex_lock (external_mutex) != 0) + return -1; + } return result; /* NOTREACHED */ @@ -1567,16 +1579,20 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv, // if" statement since the caller may have timed out and hence the // result would have been -1 above. if (last_waiter) - // Release the signaler/broadcaster if we're the last waiter. + { + // Release the signaler/broadcaster if we're the last waiter. # if defined (ACE_WIN32) - ACE_OS::event_signal (&cv->waiters_done_); + if (ACE_OS::event_signal (&cv->waiters_done_) != 0) # else - ACE_OS::sema_post (&cv->waiters_done_); + if (ACE_OS::sema_post (&cv->waiters_done_) != 0) # endif /* ACE_WIN32 */ + return -1; + } // We must always regain the , even when errors // occur because that's the guarantee that we give to our callers. - ACE_OS::mutex_lock (external_mutex); + if (ACE_OS::mutex_lock (external_mutex) != 0) + return -1; return result; # endif /* ACE_HAS_WTHREADS || ACE_HAS_VXWORKS */ @@ -1587,8 +1603,22 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv, ACE_NOTSUP_RETURN (-1); # endif /* ACE_HAS_THREADS */ } +#else +int +ACE_OS::cond_init (ACE_cond_t *cv, short type, const char *name, void *arg) +{ + ACE_condattr_t attributes; + if (ACE_OS::condattr_init (attributes, type) == 0 + && ACE_OS::cond_init (cv, attributes, name, arg) == 0) + { + (void) ACE_OS::condattr_destroy (attributes); + return 0; + } + return -1; +} +#endif /* ACE_LACKS_COND_T */ -# if defined (ACE_HAS_WTHREADS) +#if defined (ACE_WIN32) && defined (ACE_HAS_WTHREADS) int ACE_OS::cond_timedwait (ACE_cond_t *cv, ACE_thread_mutex_t *external_mutex, @@ -1600,18 +1630,35 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv, if (timeout == 0) return ACE_OS::cond_wait (cv, external_mutex); +# if defined (ACE_HAS_WTHREADS_CONDITION_VARIABLE) + int msec_timeout = 0; + int result = 0; + + ACE_Time_Value relative_time (*timeout - ACE_OS::gettimeofday ()); + // Watchout for situations where a context switch has caused the + // current time to be > the timeout. + if (relative_time > ACE_Time_Value::zero) + msec_timeout = relative_time.msec (); + + ACE_OSCALL (ACE_ADAPT_RETVAL (::SleepConditionVariableCS (cv, external_mutex, msec_timeout), + result), + int, -1, result); + return result; +#else // Prevent race conditions on the count. - ACE_OS::thread_mutex_lock (&cv->waiters_lock_); - cv->waiters_++; - ACE_OS::thread_mutex_unlock (&cv->waiters_lock_); + if (ACE_OS::thread_mutex_lock (&cv->waiters_lock_) != 0) + return -1; + + ++cv->waiters_; + + if (ACE_OS::thread_mutex_unlock (&cv->waiters_lock_) != 0) + return -1; int result = 0; int error = 0; - int msec_timeout; + int msec_timeout = 0; - if (timeout->sec () == 0 && timeout->usec () == 0) - msec_timeout = 0; // Do a "poll." - else + if (timeout != 0 && *timeout != ACE_Time_Value::zero) { // Note that we must convert between absolute time (which is // passed as a parameter) and relative time (which is what @@ -1620,9 +1667,7 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv, // Watchout for situations where a context switch has caused the // current time to be > the timeout. - if (relative_time < ACE_Time_Value::zero) - msec_timeout = 0; - else + if (relative_time > ACE_Time_Value::zero) msec_timeout = relative_time.msec (); } @@ -1646,13 +1691,15 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv, # endif /* ACE_USES_WINCE_SEMA_SIMULATION */ // Reacquire lock to avoid race conditions. - ACE_OS::thread_mutex_lock (&cv->waiters_lock_); + if (ACE_OS::thread_mutex_lock (&cv->waiters_lock_) != 0) + return -1; - cv->waiters_--; + --cv->waiters_; - int last_waiter = cv->was_broadcast_ && cv->waiters_ == 0; + bool const last_waiter = cv->was_broadcast_ && cv->waiters_ == 0; - ACE_OS::thread_mutex_unlock (&cv->waiters_lock_); + if (ACE_OS::thread_mutex_unlock (&cv->waiters_lock_) != 0) + return -1; if (result != WAIT_OBJECT_0) { @@ -1669,14 +1716,26 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv, } if (last_waiter) - // Release the signaler/broadcaster if we're the last waiter. - ACE_OS::event_signal (&cv->waiters_done_); - + { + // Release the signaler/broadcaster if we're the last waiter. + if (ACE_OS::event_signal (&cv->waiters_done_) != 0) + return -1; + } + // We must always regain the , even when errors // occur because that's the guarantee that we give to our callers. - ACE_OS::thread_mutex_lock (external_mutex); - errno = error; + if (ACE_OS::thread_mutex_lock (external_mutex) != 0) + result = -1; + + if (error != 0) + { + /* This assignment must only be done if error != 0, + * since writing 0 to errno violates the POSIX specification. + */ + errno = error; + } return result; +# endif # else ACE_NOTSUP_RETURN (-1); # endif /* ACE_HAS_THREADS */ @@ -1688,9 +1747,17 @@ ACE_OS::cond_wait (ACE_cond_t *cv, { ACE_OS_TRACE ("ACE_OS::cond_wait"); # if defined (ACE_HAS_THREADS) - ACE_OS::thread_mutex_lock (&cv->waiters_lock_); - cv->waiters_++; - ACE_OS::thread_mutex_unlock (&cv->waiters_lock_); +# if defined (ACE_HAS_WTHREADS_CONDITION_VARIABLE) + int result; + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::SleepConditionVariableCS (cv, external_mutex, INFINITE), result), + int, -1); +#else + if (ACE_OS::thread_mutex_lock (&cv->waiters_lock_) != 0) + return -1; + ++cv->waiters_; + + if (ACE_OS::thread_mutex_unlock (&cv->waiters_lock_) != 0) + return -1; int result = 0; int error = 0; @@ -1716,13 +1783,15 @@ ACE_OS::cond_wait (ACE_cond_t *cv, # endif /* ACE_USES_WINCE_SEMA_SIMULATION */ // Reacquire lock to avoid race conditions. - ACE_OS::thread_mutex_lock (&cv->waiters_lock_); + if (ACE_OS::thread_mutex_lock (&cv->waiters_lock_) != 0) + return -1; cv->waiters_--; - int last_waiter = cv->was_broadcast_ && cv->waiters_ == 0; + bool const last_waiter = cv->was_broadcast_ && cv->waiters_ == 0; - ACE_OS::thread_mutex_unlock (&cv->waiters_lock_); + if (ACE_OS::thread_mutex_unlock (&cv->waiters_lock_) != 0) + return -1; if (result != WAIT_OBJECT_0) { @@ -1737,35 +1806,32 @@ ACE_OS::cond_wait (ACE_cond_t *cv, } } else if (last_waiter) - // Release the signaler/broadcaster if we're the last waiter. - ACE_OS::event_signal (&cv->waiters_done_); + { + // Release the signaler/broadcaster if we're the last waiter. + if (ACE_OS::event_signal (&cv->waiters_done_) != 0) + return -1; + } // We must always regain the , even when errors // occur because that's the guarantee that we give to our callers. - ACE_OS::thread_mutex_lock (external_mutex); + if (ACE_OS::thread_mutex_lock (external_mutex) != 0) + result = -1; // Reset errno in case mutex_lock() also fails... - errno = error; + if (error != 0) + { + /* This assignment must only be done if error != 0, + * since writing 0 to errno violates the POSIX specification. + */ + errno = error; + } return result; +#endif # else ACE_NOTSUP_RETURN (-1); # endif /* ACE_HAS_THREADS */ } # endif /* ACE_HAS_WTHREADS */ -#else -int -ACE_OS::cond_init (ACE_cond_t *cv, short type, const char *name, void *arg) -{ - ACE_condattr_t attributes; - if (ACE_OS::condattr_init (attributes, type) == 0 - && ACE_OS::cond_init (cv, attributes, name, arg) == 0) - { - (void) ACE_OS::condattr_destroy (attributes); - return 0; - } - return -1; -} -#endif /* ACE_LACKS_COND_T */ /*****************************************************************************/ // CONDITIONS END @@ -1789,7 +1855,7 @@ ACE_OS::mutex_init (ACE_mutex_t *m, ACE_UNUSED_ARG (name); ACE_UNUSED_ARG (sa); -# if defined (ACE_VXWORKS) && (ACE_VXWORKS >= 0x600) && (ACE_VXWORKS <= 0x620) +# if defined (ACE_PTHREAD_MUTEXATTR_T_INITIALIZE) /* Tests show that VxWorks 6.x pthread lib does not only * require zeroing of mutex/condition objects to function correctly * but also of the attribute objects. @@ -1839,7 +1905,7 @@ ACE_OS::mutex_init (ACE_mutex_t *m, if (result == 0) { -# if defined (ACE_VXWORKS)&& (ACE_VXWORKS >= 0x600) && (ACE_VXWORKS <= 0x620) +# if defined (ACE_PTHREAD_MUTEX_T_INITIALIZE) /* VxWorks 6.x API reference states: * If the memory for the mutex variable object has been allocated * dynamically, it is a good policy to always zero out the @@ -1897,7 +1963,7 @@ ACE_OS::mutex_init (ACE_mutex_t *m, ACE_FAIL_RETURN (-1); else { - // Make sure to set errno to ERROR_ALREADY_EXISTS if necessary. + // Make sure to set errno to ERROR_ALREADY_EXISTS if necessary. ACE_OS::set_errno_to_last_error (); return 0; } @@ -1990,7 +2056,11 @@ ACE_OS::mutex_init (ACE_mutex_t *m, if (m->proc_mutex_ == 0) ACE_FAIL_RETURN (-1); else - return 0; + { + // Make sure to set errno to ERROR_ALREADY_EXISTS if necessary. + ACE_OS::set_errno_to_last_error (); + return 0; + } case USYNC_THREAD: return ACE_OS::thread_mutex_init (&m->thr_mutex_, lock_type, @@ -2395,7 +2465,8 @@ ACE_OS::event_destroy (ACE_event_t *event) && errno == EBUSY) { event->eventdata_->is_signaled_ = 1; - ACE_OS::cond_broadcast (&event->eventdata_->condition_); + if (ACE_OS::cond_broadcast (&event->eventdata_->condition_) != 0) + return -1; ACE_OS::thr_yield (); } # else @@ -2454,7 +2525,8 @@ ACE_OS::event_destroy (ACE_event_t *event) && errno == EBUSY) { event->eventdata_->is_signaled_ = 1; - ACE_OS::cond_broadcast (&event->eventdata_->condition_); + if (ACE_OS::cond_broadcast (&event->eventdata_->condition_) != 0) + return -1; ACE_OS::thr_yield (); } # else @@ -2503,7 +2575,11 @@ ACE_OS::event_init (ACE_event_t *event, if (*event == 0) ACE_FAIL_RETURN (-1); else - return 0; + { + // Make sure to set errno to ERROR_ALREADY_EXISTS if necessary. + ACE_OS::set_errno_to_last_error (); + return 0; + } #elif defined (ACE_HAS_THREADS) ACE_UNUSED_ARG (sa); event->eventdata_ = 0; @@ -2809,9 +2885,11 @@ ACE_OS::event_pulse (ACE_event_t *event) (!defined (ACE_LACKS_MUTEXATTR_PSHARED) || !defined (ACE_LACKS_CONDATTR_PSHARED))) || \ (!defined (ACE_USES_FIFO_SEM) && \ (!defined (ACE_HAS_POSIX_SEM) || !defined (ACE_HAS_POSIX_SEM_TIMEOUT) || defined (ACE_LACKS_NAMED_POSIX_SEM))) - ACE_OS::mutex_unlock (&event->eventdata_->lock_); + if (ACE_OS::mutex_unlock (&event->eventdata_->lock_) != 0) + return -1; # else - ACE_OS::sema_post (&event->lock_); + if (ACE_OS::sema_post (&event->lock_) != 0) + return -1; # endif if (result == -1) // Reset errno in case mutex_unlock() also fails... @@ -2853,9 +2931,11 @@ ACE_OS::event_reset (ACE_event_t *event) (!defined (ACE_LACKS_MUTEXATTR_PSHARED) || !defined (ACE_LACKS_CONDATTR_PSHARED))) || \ (!defined (ACE_USES_FIFO_SEM) && \ (!defined (ACE_HAS_POSIX_SEM) || !defined (ACE_HAS_POSIX_SEM_TIMEOUT) || defined (ACE_LACKS_NAMED_POSIX_SEM))) - ACE_OS::mutex_unlock (&event->eventdata_->lock_); + if (ACE_OS::mutex_unlock (&event->eventdata_->lock_) != 0) + return -1; # else - ACE_OS::sema_post (&event->lock_); + if (ACE_OS::sema_post (&event->lock_) != 0) + return -1; # endif } else @@ -2937,9 +3017,11 @@ ACE_OS::event_signal (ACE_event_t *event) (!defined (ACE_LACKS_MUTEXATTR_PSHARED) || !defined (ACE_LACKS_CONDATTR_PSHARED))) || \ (!defined (ACE_USES_FIFO_SEM) && \ (!defined (ACE_HAS_POSIX_SEM) || !defined (ACE_HAS_POSIX_SEM_TIMEOUT) || defined (ACE_LACKS_NAMED_POSIX_SEM))) - ACE_OS::mutex_unlock (&event->eventdata_->lock_); + if (ACE_OS::mutex_unlock (&event->eventdata_->lock_) != 0) + return -1; # else - ACE_OS::sema_post (&event->lock_); + if (ACE_OS::sema_post (&event->lock_) != 0) + return -1; # endif if (result == -1) @@ -2968,7 +3050,7 @@ ACE_OS::event_timedwait (ACE_event_t *event, #if defined (ACE_WIN32) DWORD result; - if (timeout->sec () == 0 && timeout->usec () == 0) + if (*timeout == ACE_Time_Value::zero) // Do a "poll". result = ::WaitForSingleObject (*event, 0); else @@ -2979,7 +3061,7 @@ ACE_OS::event_timedwait (ACE_event_t *event, // WaitForSingleObjects() expects). // parameter is given in absolute or relative value // depending on parameter . - int msec_timeout; + int msec_timeout = 0; if (use_absolute_time) { // Time is given in absolute time, we should use @@ -2989,9 +3071,7 @@ ACE_OS::event_timedwait (ACE_event_t *event, // Watchout for situations where a context switch has caused // the current time to be > the timeout. Thanks to Norbert // Rapp for pointing this. - if (relative_time < ACE_Time_Value::zero) - msec_timeout = 0; - else + if (relative_time > ACE_Time_Value::zero) msec_timeout = relative_time.msec (); } else @@ -3137,9 +3217,11 @@ ACE_OS::event_timedwait (ACE_event_t *event, (!defined (ACE_LACKS_MUTEXATTR_PSHARED) || !defined (ACE_LACKS_CONDATTR_PSHARED))) || \ (!defined (ACE_USES_FIFO_SEM) && \ (!defined (ACE_HAS_POSIX_SEM) || !defined (ACE_HAS_POSIX_SEM_TIMEOUT) || defined (ACE_LACKS_NAMED_POSIX_SEM))) - ACE_OS::mutex_unlock (&event->eventdata_->lock_); + if (ACE_OS::mutex_unlock (&event->eventdata_->lock_) != 0) + return -1; # else - ACE_OS::sema_post (&event->lock_); + if (ACE_OS::sema_post (&event->lock_) != 0) + return -1; # endif if (result == -1) @@ -3279,9 +3361,11 @@ ACE_OS::event_wait (ACE_event_t *event) (!defined (ACE_LACKS_MUTEXATTR_PSHARED) || !defined (ACE_LACKS_CONDATTR_PSHARED))) || \ (!defined (ACE_USES_FIFO_SEM) && \ (!defined (ACE_HAS_POSIX_SEM) || !defined (ACE_HAS_POSIX_SEM_TIMEOUT) || defined (ACE_LACKS_NAMED_POSIX_SEM))) - ACE_OS::mutex_unlock (&event->eventdata_->lock_); + if (ACE_OS::mutex_unlock (&event->eventdata_->lock_) != 0) + return -1; # else - ACE_OS::sema_post (&event->lock_); + if (ACE_OS::sema_post (&event->lock_) != 0) + return -1; # endif if (result == -1) @@ -3422,7 +3506,7 @@ ACE_OS::rwlock_init (ACE_rwlock_t *rw, rw->ref_count_ = 0; rw->num_waiting_writers_ = 0; rw->num_waiting_readers_ = 0; - rw->important_writer_ = 0; + rw->important_writer_ = false; result = 0; } ACE_OS::condattr_destroy (attributes); @@ -3432,10 +3516,14 @@ ACE_OS::rwlock_init (ACE_rwlock_t *rw, { // Save/restore errno. ACE_Errno_Guard error (errno); - ACE_OS::mutex_destroy (&rw->lock_); - ACE_OS::cond_destroy (&rw->waiting_readers_); - ACE_OS::cond_destroy (&rw->waiting_writers_); - ACE_OS::cond_destroy (&rw->waiting_important_writer_); + + /* We're about to return -1 anyway, so + * no need to check return values of these clean-up calls: + */ + (void)ACE_OS::mutex_destroy (&rw->lock_); + (void)ACE_OS::cond_destroy (&rw->waiting_readers_); + (void)ACE_OS::cond_destroy (&rw->waiting_writers_); + (void)ACE_OS::cond_destroy (&rw->waiting_important_writer_); } return result; # else @@ -3826,7 +3914,7 @@ ACE_OS::thr_create (ACE_THR_FUNC func, # if defined (ACE_HAS_PTHREADS) int result; -# if defined (ACE_VXWORKS) && (ACE_VXWORKS >= 0x600) && (ACE_VXWORKS <= 0x620) +# if defined (ACE_PTHREAD_ATTR_T_INITIALIZE) /* Tests show that VxWorks 6.x pthread lib does not only * require zeroing of mutex/condition objects to function correctly * but also of the attribute objects. @@ -4318,10 +4406,15 @@ ACE_OS::thr_create (ACE_THR_FUNC func, // Set the priority of the new thread and then let it // continue, but only if the user didn't start it suspended // in the first place! - ACE_OS::thr_setprio (*thr_handle, priority); + if (ACE_OS::thr_setprio (*thr_handle, priority) != 0) + { + return -1; + } if (start_suspended == 0) - ACE_OS::thr_continue (*thr_handle); + { + ACE_OS::thr_continue (*thr_handle); + } } } # if 0 @@ -4624,6 +4717,14 @@ ACE_OS::thr_get_affinity (ACE_hthread_t thr_id, return -1; } return 0; +#elif defined (ACE_HAS_TASKCPUAFFINITYSET) + ACE_UNUSED_ARG (cpu_set_size); + int result = 0; + if (ACE_ADAPT_RETVAL (::taskCpuAffinitySet (thr_id, *cpu_mask), result) == -1) + { + return -1; + } + return 0; #else ACE_UNUSED_ARG (thr_id); ACE_UNUSED_ARG (cpu_set_size); @@ -4666,6 +4767,13 @@ ACE_OS::thr_set_affinity (ACE_hthread_t thr_id, return -1; } return 0; +#elif defined (ACE_HAS_TASKCPUAFFINITYSET) + int result = 0; + if (ACE_ADAPT_RETVAL (::taskCpuAffinitySet (thr_id, *cpu_mask), result) == -1) + { + return -1; + } + return 0; #else ACE_UNUSED_ARG (thr_id); ACE_UNUSED_ARG (cpu_set_size); @@ -5121,59 +5229,62 @@ add_to_argv (int& argc, char** argv, int max_args, char* string) size_t previous = 0; size_t length = ACE_OS::strlen (string); - // We use <= to make sure that we get the last argument - for (size_t i = 0; i <= length; i++) + if (length > 0) { - // Is it a double quote that hasn't been escaped? - if (string[i] == '\"' && (i == 0 || string[i - 1] != '\\')) + // We use <= to make sure that we get the last argument + for (size_t i = 0; i <= length; i++) { - indouble ^= 1; - if (indouble) + // Is it a double quote that hasn't been escaped? + if (string[i] == '\"' && (i == 0 || string[i - 1] != '\\')) { - // We have just entered a double quoted string, so - // save the starting position of the contents. - previous = i + 1; + indouble ^= 1; + if (indouble) + { + // We have just entered a double quoted string, so + // save the starting position of the contents. + previous = i + 1; + } + else + { + // We have just left a double quoted string, so + // zero out the ending double quote. + string[i] = '\0'; + } } - else + else if (string[i] == '\\') // Escape the next character + { + // The next character is automatically skipped because + // of the memmove(). + ACE_OS::memmove (string + i, string + i + 1, length); + --length; + } + else if (!indouble && + (ACE_OS::ace_isspace (string[i]) || string[i] == '\0')) { - // We have just left a double quoted string, so - // zero out the ending double quote. string[i] = '\0'; - } - } - else if (string[i] == '\\') // Escape the next character - { - // The next character is automatically - // skipped because of the strcpy - ACE_OS::strcpy (string + i, string + i + 1); - length--; - } - else if (!indouble && - (ACE_OS::ace_isspace (string[i]) || string[i] == '\0')) - { - string[i] = '\0'; - if (argc < max_args) - { - argv[argc] = string + previous; - argc++; - } - else - { - ACE_OS::fprintf (stderr, "spae(): number of arguments " - "limited to %d\n", max_args); - } + if (argc < max_args) + { + argv[argc] = string + previous; + ++argc; + } + else + { + ACE_OS::fprintf (stderr, "spae(): number of arguments " + "limited to %d\n", max_args); + } - // Skip over whitespace in between arguments - for(++i; i < length && ACE_OS::ace_isspace (string[i]); ++i) - { + // Skip over whitespace in between arguments + for(++i; i < length && ACE_OS::ace_isspace (string[i]); ++i) + { + } + + // Save the starting point for the next time around + previous = i; + + // Make sure we don't skip over a character due + // to the above loop to skip over whitespace + --i; } - - // Save the starting point for the next time around - previous = i; - - // Make sure we don't skip over a character due - // to the above loop to skip over whitespace - i--; } } } @@ -5299,9 +5410,10 @@ vx_execae (FUNCPTR entry, char* arg, int prio, int opt, int stacksz, ...) int argc = 1; // Peel off arguments to run_main () and put into argv. - if (arg) - add_to_argv(argc, argv, ACE_MAX_ARGS, arg); + { + add_to_argv(argc, argv, ACE_MAX_ARGS, arg); + } // fill unused argv slots with 0 to get rid of leftovers // from previous invocations @@ -5330,4 +5442,18 @@ vx_execae (FUNCPTR entry, char* arg, int prio, int opt, int stacksz, ...) // successful return ret > 0 ? _vx_call_rc : 255; } + +#if defined(ACE_AS_STATIC_LIBS) && defined (ACE_VXWORKS_DEBUGGING_HELPER) +/** Wind River workbench allows the user to spawn a kernel task as a + "Debug Configuration". Use this function as the entrypoint so that + the arguments are translated into the form that ace_main() requires. + */ +int ace_wb_exec (int arg0, int arg1, int arg2, int arg3, int arg4, + int arg5, int arg6, int arg7, int arg8, int arg9) +{ + return spaef ((FUNCPTR) ace_main, arg0, arg1, arg2, arg3, arg4, + arg5, arg6, arg7, arg8, arg9); +} +#endif /* ACE_AS_STATIC_LIBS && ... */ + #endif /* ACE_VXWORKS && !__RTP__ */ diff --git a/dep/ACE_wrappers/ace/OS_NS_Thread.h b/dep/ACE_wrappers/ace/OS_NS_Thread.h index 36fe609b5..1c3ddc4fd 100644 --- a/dep/ACE_wrappers/ace/OS_NS_Thread.h +++ b/dep/ACE_wrappers/ace/OS_NS_Thread.h @@ -4,7 +4,7 @@ /** * @file OS_NS_Thread.h * - * $Id: OS_NS_Thread.h 81014 2008-03-19 11:41:31Z johnnyw $ + * $Id: OS_NS_Thread.h 91536 2010-08-27 18:36:54Z johnnyw $ * * @author Douglas C. Schmidt * @author Jesper S. M|ller @@ -304,6 +304,9 @@ ACE_END_VERSIONED_NAMESPACE_DECL # define THR_DAEMON 0 /* ignore in most places */ # define THR_JOINABLE 0 /* ignore in most places */ # define THR_SUSPENDED CREATE_SUSPENDED +# if !defined (STACK_SIZE_PARAM_IS_A_RESERVATION) +# define STACK_SIZE_PARAM_IS_A_RESERVATION 0x00010000 +# endif /* STACK_SIZE_PARAM_IS_A_RESERVATION */ # define THR_USE_AFX 0x01000000 # define THR_SCHED_FIFO 0 # define THR_SCHED_RR 0 @@ -314,7 +317,11 @@ ACE_END_VERSIONED_NAMESPACE_DECL # define THR_SCOPE_SYSTEM 0 # endif /* ACE_HAS_PTHREADS / STHREADS / VXWORKS / WTHREADS **********/ -# if defined (ACE_LACKS_COND_T) +# if defined (ACE_HAS_WTHREADS_CONDITION_VARIABLE) + +typedef CONDITION_VARIABLE ACE_cond_t; + +# elif defined (ACE_LACKS_COND_T) ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -366,6 +373,14 @@ public: size_t was_broadcast_; }; +ACE_END_VERSIONED_NAMESPACE_DECL + +# endif /* ACE_LACKS_COND_T */ + +# if defined (ACE_HAS_WTHREADS_CONDITION_VARIABLE) || defined (ACE_LACKS_COND_T) + +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + struct ACE_Export ACE_condattr_t { int type; @@ -378,7 +393,7 @@ struct ACE_Export ACE_mutexattr_t ACE_END_VERSIONED_NAMESPACE_DECL -# endif /* ACE_LACKS_COND_T */ +# endif /* ACE_HAS_WTHREADS_CONDITION_VARIABLE || ACE_LACKS_COND_T */ # if defined (ACE_LACKS_RWLOCK_T) && !defined (ACE_HAS_PTHREADS_UNIX98_EXT) @@ -418,7 +433,7 @@ public: int ref_count_; /// Indicate that a reader is trying to upgrade - int important_writer_; + bool important_writer_; /// Condition for the upgrading reader ACE_cond_t waiting_important_writer_; @@ -512,7 +527,8 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class ACE_recursive_thread_mutex_t * - * @brief Implement a thin C++ wrapper that allows nested acquisition + * @brief + * Implement a thin C++ wrapper that allows nested acquisition * and release of a mutex that occurs in the same thread. * * This implementation is based on an algorithm sketched by Dave @@ -536,8 +552,8 @@ public: ACE_thread_t owner_id_; }; -// Since recursive mutex is emulated, the state saving needs to be handled -// in ACE as well. These members save those from ACE_recursive_thread_mutex_t. +/// Since recursive mutex is emulated, the state saving needs to be handled +/// in ACE as well. These members save those from ACE_recursive_thread_mutex_t. struct ACE_recursive_mutex_state { int nesting_level_; @@ -664,9 +680,10 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class ACE_Thread_ID * - * @brief Defines a platform-independent thread ID class. Note that - * this class should be defined within the scope of a thread, rather - * than at global scope! + * @brief + * Defines a platform-independent thread ID class. Note that + * this class should be defined within the scope of a thread, rather + * than at global scope! */ class ACE_Export ACE_Thread_ID { @@ -680,7 +697,10 @@ public: ACE_Thread_ID (void); /// Copy constructor. - ACE_Thread_ID (const ACE_Thread_ID &rhs); + ACE_Thread_ID (const ACE_Thread_ID &id); + + /// Assignment operator + ACE_Thread_ID& operator= (const ACE_Thread_ID&id); /// Get the thread id. ACE_thread_t id (void) const; @@ -1072,19 +1092,11 @@ namespace ACE_OS { void cleanup_tss (const u_int main_thread); //@{ @name A set of wrappers for condition variables. -#if defined (ACE_LACKS_COND_T) - extern ACE_Export -#else ACE_NAMESPACE_INLINE_FUNCTION -#endif /* ACE_LACKS_COND_T */ int condattr_init (ACE_condattr_t &attributes, int type = ACE_DEFAULT_SYNCH_TYPE); -#if defined (ACE_LACKS_COND_T) - extern ACE_Export -#else ACE_NAMESPACE_INLINE_FUNCTION -#endif /* ACE_LACKS_COND_T */ int condattr_destroy (ACE_condattr_t &attributes); #if defined (ACE_LACKS_COND_T) @@ -1153,7 +1165,7 @@ namespace ACE_OS { #endif /* ACE_LACKS_COND_T */ int cond_timedwait (ACE_cond_t *cv, ACE_mutex_t *m, - ACE_Time_Value *); + ACE_Time_Value *timeout); #if defined (ACE_LACKS_COND_T) extern ACE_Export @@ -1164,20 +1176,12 @@ namespace ACE_OS { ACE_mutex_t *m); # if defined (ACE_WIN32) && defined (ACE_HAS_WTHREADS) -# if defined (ACE_LACKS_COND_T) extern ACE_Export -# else - ACE_NAMESPACE_INLINE_FUNCTION -# endif /* ACE_LACKS_COND_T */ int cond_timedwait (ACE_cond_t *cv, ACE_thread_mutex_t *m, - ACE_Time_Value *); + ACE_Time_Value *timeout); -# if defined (ACE_LACKS_COND_T) extern ACE_Export -# else - ACE_NAMESPACE_INLINE_FUNCTION -# endif /* ACE_LACKS_COND_T */ int cond_wait (ACE_cond_t *cv, ACE_thread_mutex_t *m); # endif /* ACE_WIN32 && ACE_HAS_WTHREADS */ @@ -1318,7 +1322,7 @@ namespace ACE_OS { //@} - /// Low-level interface to (2). + /// Low-level interface to @c priocntl(2). /** * Can't call the following priocntl, because that's a macro on * Solaris. @@ -1475,7 +1479,7 @@ namespace ACE_OS { size_t nsops); //@} - /// Friendly interface to (2). + /// Friendly interface to @c priocntl(2). extern ACE_Export int set_scheduling_params (const ACE_Sched_Params &, ACE_id_t id = ACE_SELF); @@ -1552,8 +1556,7 @@ namespace ACE_OS { const char** thr_name = 0); ACE_NAMESPACE_INLINE_FUNCTION - int thr_equal (ACE_thread_t t1, - ACE_thread_t t2); + int thr_equal (ACE_thread_t t1, ACE_thread_t t2); extern ACE_Export void thr_exit (ACE_THR_FUNC_RETURN status = 0); @@ -1573,21 +1576,18 @@ namespace ACE_OS { # if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) ACE_NAMESPACE_INLINE_FUNCTION /// for internal use only. Applications should call thr_getspecific - int thr_getspecific_native (ACE_OS_thread_key_t key, - void **data); + int thr_getspecific_native (ACE_OS_thread_key_t key, void **data); # endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE */ ACE_NAMESPACE_INLINE_FUNCTION - int thr_getspecific (ACE_thread_key_t key, - void **data); + int thr_getspecific (ACE_thread_key_t key, void **data); #if defined (ACE_HAS_VXTHREADS) extern ACE_Export #else ACE_NAMESPACE_INLINE_FUNCTION #endif /* ACE_HAS_VXTHREADS */ - int thr_join (ACE_hthread_t waiter_id, - ACE_THR_FUNC_RETURN *status); + int thr_join (ACE_hthread_t waiter_id, ACE_THR_FUNC_RETURN *status); #if defined (ACE_HAS_VXTHREADS) extern ACE_Export @@ -1605,7 +1605,7 @@ namespace ACE_OS { * defined, this is the thread-id. For linux-threads, when * ACE_HAS_SCHED_SETAFFINITY defined, it expects a process-id. Since for * linux-threads a thread is seen as a process, it does the job. - * @param cpu_set_size The size of the cpu_mask + * @param cpu_set_size The size of the cpu_mask, in bytes. * @param cpu_mask Is a bitmask of CPUs to bind to, e.g value 1 binds the * thread to the "CPU 0", etc */ @@ -1622,7 +1622,7 @@ namespace ACE_OS { * defined, this is the thread-id. For linux-threads, when * ACE_HAS_SCHED_SETAFFINITY defined, it expects a process-id. Since for * linux-threads a thread is seen as a process, it does the job. - * @param cpu_set_size The size of the cpu_mask + * @param cpu_set_size The size of the cpu_mask, in bytes. * @param cpu_mask Is a bitmask of CPUs to bind to, e.g value 1 binds the * thread to the "CPU 0", etc */ @@ -1682,8 +1682,7 @@ namespace ACE_OS { int thr_keyfree (ACE_thread_key_t key); ACE_NAMESPACE_INLINE_FUNCTION - int thr_kill (ACE_thread_t thr_id, - int signum); + int thr_kill (ACE_thread_t thr_id, int signum); ACE_NAMESPACE_INLINE_FUNCTION size_t thr_min_stack (void); @@ -1698,20 +1697,16 @@ namespace ACE_OS { const char* thr_name (void); ACE_NAMESPACE_INLINE_FUNCTION - int thr_setcancelstate (int new_state, - int *old_state); + int thr_setcancelstate (int new_state, int *old_state); ACE_NAMESPACE_INLINE_FUNCTION - int thr_setcanceltype (int new_type, - int *old_type); + int thr_setcanceltype (int new_type, int *old_type); ACE_NAMESPACE_INLINE_FUNCTION int thr_setconcurrency (int hint); ACE_NAMESPACE_INLINE_FUNCTION - int thr_setprio (ACE_hthread_t ht_id, - int priority, - int policy = -1); + int thr_setprio (ACE_hthread_t ht_id, int priority, int policy = -1); extern ACE_Export int thr_setprio (const ACE_Sched_Priority prio); @@ -1719,18 +1714,14 @@ namespace ACE_OS { # if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) /// @internal Applications should call thr_setspecific extern ACE_Export - int thr_setspecific_native (ACE_OS_thread_key_t key, - void *data); + int thr_setspecific_native (ACE_OS_thread_key_t key, void *data); # endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE */ extern ACE_Export - int thr_setspecific (ACE_thread_key_t key, - void *data); + int thr_setspecific (ACE_thread_key_t key, void *data); ACE_NAMESPACE_INLINE_FUNCTION - int thr_sigsetmask (int how, - const sigset_t *nsm, - sigset_t *osm); + int thr_sigsetmask (int how, const sigset_t *nsm, sigset_t *osm); ACE_NAMESPACE_INLINE_FUNCTION int thr_suspend (ACE_hthread_t target_thread); diff --git a/dep/ACE_wrappers/ace/OS_NS_Thread.inl b/dep/ACE_wrappers/ace/OS_NS_Thread.inl index 14a32196e..ebc05aa26 100644 --- a/dep/ACE_wrappers/ace/OS_NS_Thread.inl +++ b/dep/ACE_wrappers/ace/OS_NS_Thread.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: OS_NS_Thread.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: OS_NS_Thread.inl 91544 2010-08-28 09:44:50Z johnnyw $ #include "ace/OS_NS_macros.h" // for timespec_t, perhaps move it to os_time.h @@ -121,24 +121,15 @@ ACE_OS::thr_equal (ACE_thread_t t1, ACE_thread_t t2) #endif /* ACE_HAS_PTHREADS */ } -#if !defined (ACE_LACKS_COND_T) -// NOTE: The ACE_OS::cond_* functions for Unix platforms are defined -// here because the ACE_OS::sema_* functions below need them. -// However, ACE_WIN32 and VXWORKS define the ACE_OS::cond_* functions -// using the ACE_OS::sema_* functions. So, they are defined in OS.cpp. - ACE_INLINE int ACE_OS::condattr_destroy (ACE_condattr_t &attributes) { #if defined (ACE_HAS_THREADS) # if defined (ACE_HAS_PTHREADS) - pthread_condattr_destroy (&attributes); - -# elif defined (ACE_HAS_STHREADS) +# else attributes.type = 0; - -# endif /* ACE_HAS_PTHREADS vs. ACE_HAS_STHREADS */ +# endif /* ACE_HAS_PTHREADS */ return 0; # else ACE_UNUSED_ARG (attributes); @@ -147,15 +138,14 @@ ACE_OS::condattr_destroy (ACE_condattr_t &attributes) } ACE_INLINE int -ACE_OS::condattr_init (ACE_condattr_t &attributes, - int type) +ACE_OS::condattr_init (ACE_condattr_t &attributes, int type) { ACE_UNUSED_ARG (type); # if defined (ACE_HAS_THREADS) # if defined (ACE_HAS_PTHREADS) int result = -1; -# if defined (ACE_VXWORKS) && (ACE_VXWORKS >= 0x600) && (ACE_VXWORKS <= 0x620) +# if defined (ACE_PTHREAD_CONDATTR_T_INITIALIZE) /* Tests show that VxWorks 6.x pthread lib does not only * require zeroing of mutex/condition objects to function correctly * but also of the attribute objects. @@ -174,17 +164,10 @@ ACE_OS::condattr_init (ACE_condattr_t &attributes, result = -1; // ACE_ADAPT_RETVAL used it for intermediate status return result; -# elif defined (ACE_HAS_STHREADS) - attributes.type = type; - - return 0; - # else - ACE_UNUSED_ARG (attributes); - ACE_UNUSED_ARG (type); - ACE_NOTSUP_RETURN (-1); - -# endif /* ACE_HAS_PTHREADS vs. ACE_HAS_STHREADS */ + attributes.type = type; + return 0; +# endif /* ACE_HAS_PTHREADS */ # else ACE_UNUSED_ARG (attributes); @@ -193,6 +176,12 @@ ACE_OS::condattr_init (ACE_condattr_t &attributes, # endif /* ACE_HAS_THREADS */ } +#if !defined (ACE_LACKS_COND_T) +// NOTE: The ACE_OS::cond_* functions for Unix platforms are defined +// here because the ACE_OS::sema_* functions below need them. +// However, ACE_WIN32 and VXWORKS define the ACE_OS::cond_* functions +// using the ACE_OS::sema_* functions. So, they are defined in OS_NS_Tread.cpp. + ACE_INLINE int ACE_OS::cond_broadcast (ACE_cond_t *cv) { @@ -208,6 +197,9 @@ ACE_OS::cond_broadcast (ACE_cond_t *cv) ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::cond_broadcast (cv), result), int, -1); +# elif defined (ACE_HAS_WTHREADS) && defined (ACE_HAS_WTHREADS_CONDITION_VARIABLE) + ::WakeAllConditionVariable (cv); + return 0; # endif /* ACE_HAS_STHREADS */ # else ACE_UNUSED_ARG (cv); @@ -226,6 +218,9 @@ ACE_OS::cond_destroy (ACE_cond_t *cv) # elif defined (ACE_HAS_STHREADS) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::cond_destroy (cv), result), int, -1); +# elif defined (ACE_HAS_WTHREADS) && defined (ACE_HAS_WTHREADS_CONDITION_VARIABLE) + // Windows doesn't have a destroy + return 0; # endif /* ACE_HAS_STHREADS */ # else ACE_UNUSED_ARG (cv); @@ -246,7 +241,7 @@ ACE_OS::cond_init (ACE_cond_t *cv, # if defined (ACE_HAS_PTHREADS) int result = -1; -# if defined (ACE_VXWORKS) && (ACE_VXWORKS >= 0x600) && (ACE_VXWORKS <= 0x620) +# if defined (ACE_PTHREAD_COND_T_INITIALIZE) /* VxWorks 6.x API reference states: * If the memory for the condition variable object has been allocated * dynamically, it is a good policy to always zero out the @@ -269,6 +264,9 @@ ACE_OS::cond_init (ACE_cond_t *cv, arg), result), int, -1); +# elif defined (ACE_HAS_WTHREADS) && defined (ACE_HAS_WTHREADS_CONDITION_VARIABLE) + ::InitializeConditionVariable (cv); + return 0; # endif /* ACE_HAS_PTHREADS vs. ACE_HAS_STHREADS */ # else ACE_UNUSED_ARG (cv); @@ -310,6 +308,9 @@ ACE_OS::cond_signal (ACE_cond_t *cv) # elif defined (ACE_HAS_STHREADS) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::cond_signal (cv), result), int, -1); +# elif defined (ACE_HAS_WTHREADS) && defined (ACE_HAS_WTHREADS_CONDITION_VARIABLE) + ::WakeConditionVariable (cv); + return 0; # endif /* ACE_HAS_STHREADS */ # else ACE_UNUSED_ARG (cv); @@ -331,6 +332,10 @@ ACE_OS::cond_wait (ACE_cond_t *cv, int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::cond_wait (cv, external_mutex), result), int, -1); +# elif defined (ACE_HAS_WTHREADS) && defined (ACE_HAS_WTHREADS_CONDITION_VARIABLE) + int result; + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::SleepConditionVariableCS (cv, &external_mutex->thr_mutex_, INFINITE), result), + int, -1); # endif /* ACE_HAS_PTHREADS */ # else ACE_UNUSED_ARG (cv); @@ -346,7 +351,7 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv, { ACE_OS_TRACE ("ACE_OS::cond_timedwait"); # if defined (ACE_HAS_THREADS) - int result; + int result = 0; timespec_t ts; if (timeout != 0) @@ -374,6 +379,22 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv, (timestruc_t*)&ts), result), int, -1, result); +# elif defined (ACE_HAS_WTHREADS) && defined (ACE_HAS_WTHREADS_CONDITION_VARIABLE) + int msec_timeout = 0; + if (timeout != 0) + { + ACE_Time_Value relative_time (*timeout - ACE_OS::gettimeofday ()); + // Watchout for situations where a context switch has caused the + // current time to be > the timeout. + if (relative_time > ACE_Time_Value::zero) + msec_timeout = relative_time.msec (); + } + + ACE_OSCALL (ACE_ADAPT_RETVAL (::SleepConditionVariableCS (cv, &external_mutex->thr_mutex_, msec_timeout), + result), + int, -1, result); + + return result; # endif /* ACE_HAS_STHREADS */ if (timeout != 0) timeout->set (ts); // Update the time value before returning. @@ -418,6 +439,8 @@ ACE_OS::event_init (ACE_event_t *event, if (*event == 0) ACE_FAIL_RETURN (-1); + // Make sure to set errno to ERROR_ALREADY_EXISTS if necessary. + ACE_OS::set_errno_to_last_error (); return 0; #else /* ACE_WIN32 */ return ACE_OS::event_init (event, @@ -467,30 +490,11 @@ ACE_OS::recursive_mutex_cond_unlock (ACE_recursive_thread_mutex_t *m, // need to release the lock one fewer times than this thread has acquired // it. Remember how many times, and reacquire it that many more times when // the condition is signaled. - // - // For WinCE, the situation is a bit trickier. CE doesn't have - // RecursionCount, and LockCount has changed semantics over time. - // In CE 3 (and maybe 4?) LockCount is not an indicator of recursion; - // instead, see when it's unlocked by watching the OwnerThread, which will - // change to something other than the current thread when it's been - // unlocked "enough" times. Note that checking for 0 (unlocked) is not - // sufficient. Another thread may acquire the lock between our unlock and - // checking the OwnerThread. So grab our thread ID value first, then - // compare to it in the loop condition. NOTE - the problem with this - // scheme is that we really want to unlock the mutex one _less_ times than - // required to release it for another thread to acquire. With CE 5 we - // can do this by watching LockCount alone. I _think_ it can be done by - // watching LockCount on CE 4 as well (though its meaning is different), - // but I'm leary of changing this code since a user reported success - // with it. - // + // We're using undocumented fields in the CRITICAL_SECTION structure // and they've been known to change across Windows variants and versions./ // So be careful if you need to change these - there may be other // Windows variants that depend on existing values and limits. -# if defined (ACE_HAS_WINCE) && (UNDER_CE < 500) - ACE_thread_t me = ACE_OS::thr_self (); -# endif /* ACE_HAS_WINCE && CE 4 or earlier */ state.relock_count_ = 0; while ( @@ -498,13 +502,8 @@ ACE_OS::recursive_mutex_cond_unlock (ACE_recursive_thread_mutex_t *m, m->LockCount > 0 && m->RecursionCount > 1 # else // WinCE doesn't have RecursionCount and the LockCount semantic - // has changed between versions; pre-Mobile 5 the LockCount - // was 0-indexed, and Mobile 5 has it 1-indexed. -# if (UNDER_CE < 500) - m->LockCount > 0 && m->OwnerThread == (HANDLE)me -# else + // Mobile 5 has it 1-indexed. m->LockCount > 1 -# endif /* UNDER_CE < 500 */ # endif /* ACE_HAS_WINCE */ ) { @@ -1090,7 +1089,7 @@ ACE_OS::rw_trywrlock_upgrade (ACE_rwlock_t *rw) while (rw->ref_count_ > 1) // wait until only I am left { rw->num_waiting_writers_++; // prohibit any more readers - rw->important_writer_ = 1; + rw->important_writer_ = true; if (ACE_OS::cond_wait (&rw->waiting_important_writer_, &rw->lock_) == -1) { @@ -1098,7 +1097,7 @@ ACE_OS::rw_trywrlock_upgrade (ACE_rwlock_t *rw) // we know that we have the lock again, we have this guarantee, // but something went wrong } - rw->important_writer_ = 0; + rw->important_writer_ = false; rw->num_waiting_writers_--; } if (result == 0) @@ -1363,8 +1362,8 @@ ACE_OS::sema_destroy (ACE_sema_t *s) ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::CloseHandle (*s), ace_result_), int, -1); # else /* ACE_USES_WINCE_SEMA_SIMULATION */ // Free up underlying objects of the simulated semaphore. - int r1 = ACE_OS::thread_mutex_destroy (&s->lock_); - int r2 = ACE_OS::event_destroy (&s->count_nonzero_); + int const r1 = ACE_OS::thread_mutex_destroy (&s->lock_); + int const r2 = ACE_OS::event_destroy (&s->count_nonzero_); return r1 != 0 || r2 != 0 ? -1 : 0; # endif /* ACE_USES_WINCE_SEMA_SIMULATION */ # elif defined (ACE_VXWORKS) @@ -1572,15 +1571,15 @@ ACE_OS::sema_init (ACE_sema_t *s, if ((s->fd_[0] = ACE_OS::open (name, O_RDONLY | O_NONBLOCK)) == ACE_INVALID_HANDLE || (s->fd_[1] = ACE_OS::open (name, O_WRONLY | O_NONBLOCK)) == ACE_INVALID_HANDLE) - return (-1); + return -1; /* turn off nonblocking for fd_[0] */ if ((flags = ACE_OS::fcntl (s->fd_[0], F_GETFL, 0)) < 0) - return (-1); + return -1; flags &= ~O_NONBLOCK; if (ACE_OS::fcntl (s->fd_[0], F_SETFL, flags) < 0) - return (-1); + return -1; //if (s->name_ && count) if (creator && count) @@ -1588,7 +1587,7 @@ ACE_OS::sema_init (ACE_sema_t *s, char c = 1; for (u_int i=0; ifd_[1], &c, sizeof (char)) != 1) - return (-1); + return -1; } // In the case of process scope semaphores we can already unlink the FIFO now that @@ -1602,7 +1601,7 @@ ACE_OS::sema_init (ACE_sema_t *s, ACE_OS::unlink (name); } - return (0); + return 0; #elif defined (ACE_HAS_THREADS) # if defined (ACE_HAS_STHREADS) ACE_UNUSED_ARG (name); @@ -1642,17 +1641,21 @@ ACE_OS::sema_init (ACE_sema_t *s, // its maximum value initialized to . SECURITY_ATTRIBUTES sa_buffer; SECURITY_DESCRIPTOR sd_buffer; - *s = ::CreateSemaphoreA + *s = ACE_TEXT_CreateSemaphore (ACE_OS::default_win32_security_attributes_r (sa, &sa_buffer, &sd_buffer), count, max, - name); + ACE_TEXT_CHAR_TO_TCHAR (name)); if (*s == 0) ACE_FAIL_RETURN (-1); /* NOTREACHED */ else - return 0; + { + // Make sure to set errno to ERROR_ALREADY_EXISTS if necessary. + ACE_OS::set_errno_to_last_error (); + return 0; + } # else /* ACE_USES_WINCE_SEMA_SIMULATION */ int result = -1; @@ -1736,7 +1739,11 @@ ACE_OS::sema_init (ACE_sema_t *s, ACE_FAIL_RETURN (-1); /* NOTREACHED */ else - return 0; + { + // Make sure to set errno to ERROR_ALREADY_EXISTS if necessary. + ACE_OS::set_errno_to_last_error (); + return 0; + } # else /* ACE_USES_WINCE_SEMA_SIMULATION */ int result = -1; @@ -1800,8 +1807,8 @@ ACE_OS::sema_post (ACE_sema_t *s) # elif defined (ACE_USES_FIFO_SEM) char c = 1; if (ACE_OS::write (s->fd_[1], &c, sizeof (char)) == sizeof (char)) - return (0); - return (-1); + return 0; + return -1; # elif defined (ACE_HAS_THREADS) # if defined (ACE_HAS_STHREADS) int result; @@ -1890,10 +1897,10 @@ ACE_OS::sema_trywait (ACE_sema_t *s) /* turn on nonblocking for s->fd_[0] */ if ((flags = ACE_OS::fcntl (s->fd_[0], F_GETFL, 0)) < 0) - return (-1); + return -1; flags |= O_NONBLOCK; if (ACE_OS::fcntl (s->fd_[0], F_SETFL, flags) < 0) - return (-1); + return -1; // read sets errno to EAGAIN if no input rc = ACE_OS::read (s->fd_[0], &c, sizeof (char)); @@ -2010,8 +2017,8 @@ ACE_OS::sema_wait (ACE_sema_t *s) # elif defined (ACE_USES_FIFO_SEM) char c; if (ACE_OS::read (s->fd_[0], &c, sizeof (char)) == 1) - return (0); - return (-1); + return 0; + return -1; # elif defined (ACE_HAS_THREADS) # if defined (ACE_HAS_STHREADS) int result; @@ -2193,13 +2200,13 @@ ACE_OS::sema_wait (ACE_sema_t *s, ACE_Time_Value &tv) { if (rc == 0) errno = ETIME; - return (-1); + return -1; } } // try to read the signal *but* do *not* block if (rc == 1 && ACE_OS::sema_trywait (s) == 0) - return (0); + return 0; // we were woken for input but someone beat us to it // so we wait again if there is still time @@ -2209,7 +2216,7 @@ ACE_OS::sema_wait (ACE_sema_t *s, ACE_Time_Value &tv) // make sure errno is set right errno = ETIME; - return (-1); + return -1; # elif defined (ACE_HAS_THREADS) # if defined (ACE_HAS_STHREADS) ACE_UNUSED_ARG (s); @@ -2259,7 +2266,7 @@ ACE_OS::sema_wait (ACE_sema_t *s, ACE_Time_Value &tv) # if !defined (ACE_USES_WINCE_SEMA_SIMULATION) int msec_timeout; - if (tv.sec () == 0 && tv.usec () == 0) + if (tv == ACE_Time_Value::zero) msec_timeout = 0; // Do a "poll." else { @@ -2455,15 +2462,13 @@ ACE_OS::sigtimedwait (const sigset_t *sset, ACE_OS_TRACE ("ACE_OS::sigtimedwait"); #if defined (ACE_HAS_SIGTIMEDWAIT) timespec_t ts; - timespec_t *tsp; + timespec_t *tsp = 0; if (timeout != 0) { ts = *timeout; // Calls ACE_Time_Value::operator timespec_t(). tsp = &ts; } - else - tsp = 0; ACE_OSCALL_RETURN (::sigtimedwait (sset, info, tsp), int, -1); @@ -2495,20 +2500,15 @@ ACE_OS::sigwait (sigset_t *sset, int *sig) return *sig; #endif /* _POSIX_C_SOURCE - 0 >= 199506L || _POSIX_PTHREAD_SEMANTICS */ # elif defined (ACE_HAS_PTHREADS) - // LynxOS and Digital UNIX have their own hoops to jump through. -# if defined (__Lynx__) - // Second arg is a void **, which we don't need (the selected - // signal number is returned). - *sig = ::sigwait (sset, 0); - return *sig; -# elif defined (DIGITAL_UNIX) && defined (__DECCXX_VER) + // Digital UNIX has own hoops to jump through. +# if defined (DIGITAL_UNIX) && defined (__DECCXX_VER) // DEC cxx (but not g++) needs this direct call to its internal // sigwait (). This allows us to #undef sigwait, so that we can // have ACE_OS::sigwait. cxx gets confused by ACE_OS::sigwait // if sigwait is _not_ #undef'ed. errno = ::_Psigwait (sset, sig); return errno == 0 ? *sig : -1; -# else /* ! __Lynx __ && ! (DIGITAL_UNIX && __DECCXX_VER) */ +# else /* !(DIGITAL_UNIX && __DECCXX_VER) */ # if defined (CYGWIN32) // Cygwin has sigwait definition, but it is not implemented ACE_UNUSED_ARG (sset); @@ -2520,7 +2520,7 @@ ACE_OS::sigwait (sigset_t *sset, int *sig) errno = ::sigwait (sset, sig); return errno == 0 ? *sig : -1; # endif /* CYGWIN32 */ -# endif /* ! __Lynx__ && ! (DIGITAL_UNIX && __DECCXX_VER) */ +# endif /* !(DIGITAL_UNIX && __DECCXX_VER) */ # elif defined (ACE_HAS_WTHREADS) ACE_UNUSED_ARG (sset); ACE_NOTSUP_RETURN (-1); @@ -2674,10 +2674,14 @@ ACE_OS::thr_getprio (ACE_hthread_t ht_id, int &priority, int &policy) # elif defined (ACE_HAS_STHREADS) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_getprio (ht_id, &priority), result), int, -1); -# elif defined (ACE_HAS_WTHREADS) && !defined (ACE_HAS_WINCE) +# elif defined (ACE_HAS_WTHREADS) ACE_Errno_Guard error (errno); +# if defined (ACE_HAS_WINCE) && !defined (ACE_LACKS_CE_THREAD_PRIORITY) + priority = ::CeGetThreadPriority (ht_id); +# else priority = ::GetThreadPriority (ht_id); +# endif /* defined (ACE_HAS_WINCE) && !defined (ACE_LACKS_CE_THREAD_PRIORITY) */ # if defined (ACE_HAS_PHARLAP) # if defined (ACE_PHARLAP_LABVIEW_RT) @@ -2686,7 +2690,7 @@ ACE_OS::thr_getprio (ACE_hthread_t ht_id, int &priority, int &policy) DWORD timeslice = ::EtsGetTimeSlice (); policy = timeslice == 0 ? ACE_SCHED_OTHER : ACE_SCHED_FIFO; # endif /* ACE_PHARLAP_LABVIEW_RT */ -# else +# elif !defined (ACE_HAS_WINCE) DWORD priority_class = ::GetPriorityClass (::GetCurrentProcess ()); if (priority_class == 0 && (error = ::GetLastError ()) != NO_ERROR) ACE_FAIL_RETURN (-1); @@ -3104,9 +3108,17 @@ ACE_OS::thr_setprio (ACE_hthread_t ht_id, int priority, int policy) result), int, -1); # elif defined (ACE_HAS_WTHREADS) + +# if defined (ACE_HAS_WINCE) && !defined (ACE_LACKS_CE_THREAD_PRIORITY) + ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::CeSetThreadPriority (ht_id, priority), + ace_result_), + int, -1); +# else ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::SetThreadPriority (ht_id, priority), ace_result_), int, -1); +# endif /* defined (ACE_HAS_WINCE) && !defined (ACE_LACKS_CE_THREAD_PRIORITY) */ + # elif defined (ACE_HAS_VXTHREADS) ACE_OSCALL_RETURN (::taskPrioritySet (ht_id, priority), int, -1); # else @@ -3587,6 +3599,18 @@ ACE_Thread_ID::ACE_Thread_ID (const ACE_Thread_ID &id) { } +ACE_INLINE +ACE_Thread_ID& +ACE_Thread_ID::operator= (const ACE_Thread_ID &id) +{ + if (this != &id) + { + this->thread_id_ = id.thread_id_; + this->thread_handle_ = id.thread_handle_; + } + return *this; +} + ACE_INLINE ACE_Thread_ID::ACE_Thread_ID (void) : thread_id_ (ACE_OS::thr_self ()) diff --git a/dep/ACE_wrappers/ace/OS_NS_arpa_inet.cpp b/dep/ACE_wrappers/ace/OS_NS_arpa_inet.cpp index 93a896520..ffb9e0d9e 100644 --- a/dep/ACE_wrappers/ace/OS_NS_arpa_inet.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_arpa_inet.cpp @@ -1,9 +1,9 @@ // -*- C++ -*- -// $Id: OS_NS_arpa_inet.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: OS_NS_arpa_inet.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/OS_NS_arpa_inet.h" -ACE_RCSID(ace, OS_NS_arpa_inet, "$Id: OS_NS_arpa_inet.cpp 80826 2008-03-04 14:51:23Z wotte $") + #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_NS_arpa_inet.inl" @@ -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 <= 0x660) +#elif defined (ACE_VXWORKS) && (ACE_VXWORKS <= 0x680) // 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/dep/ACE_wrappers/ace/OS_NS_arpa_inet.inl b/dep/ACE_wrappers/ace/OS_NS_arpa_inet.inl index 71db747c9..22083608e 100644 --- a/dep/ACE_wrappers/ace/OS_NS_arpa_inet.inl +++ b/dep/ACE_wrappers/ace/OS_NS_arpa_inet.inl @@ -1,5 +1,5 @@ // -*- C++ -*- -// $Id: OS_NS_arpa_inet.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: OS_NS_arpa_inet.inl 84249 2009-01-28 09:09:41Z johnnyw $ #include "ace/OS_NS_string.h" #include "ace/OS_NS_errno.h" @@ -14,11 +14,11 @@ ACE_OS::inet_addr (const char *name) #if defined (ACE_LACKS_INET_ADDR) ACE_UNUSED_ARG (name); ACE_NOTSUP_RETURN (0); -#elif defined (ACE_HAS_NONCONST_GETBY) +#elif defined (ACE_HAS_NONCONST_INET_ADDR) return ::inet_addr (const_cast (name)); #else return ::inet_addr (name); -#endif /* ACE_HAS_NONCONST_GETBY */ +#endif /* ACE_HAS_NONCONST_INET_ADDR */ } ACE_INLINE char * diff --git a/dep/ACE_wrappers/ace/OS_NS_ctype.cpp b/dep/ACE_wrappers/ace/OS_NS_ctype.cpp index d92456060..5b98b6279 100644 --- a/dep/ACE_wrappers/ace/OS_NS_ctype.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_ctype.cpp @@ -1,9 +1,9 @@ // -*- C++ -*- -// $Id: OS_NS_ctype.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: OS_NS_ctype.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/OS_NS_ctype.h" -ACE_RCSID(ace, OS_NS_ctype, "$Id: OS_NS_ctype.cpp 80826 2008-03-04 14:51:23Z wotte $") + #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_NS_ctype.inl" diff --git a/dep/ACE_wrappers/ace/OS_NS_ctype.h b/dep/ACE_wrappers/ace/OS_NS_ctype.h index fc15e1303..f87a0c6cc 100644 --- a/dep/ACE_wrappers/ace/OS_NS_ctype.h +++ b/dep/ACE_wrappers/ace/OS_NS_ctype.h @@ -4,7 +4,7 @@ /** * @file OS_NS_ctype.h * - * $Id: OS_NS_ctype.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: OS_NS_ctype.h 83891 2008-11-28 11:01:50Z johnnyw $ * * @author Douglas C. Schmidt * @author Jesper S. M|ller @@ -32,6 +32,11 @@ #endif #define ACE_EXPORT_MACRO ACE_Export +#include "ace/os_include/os_ctype.h" +#if defined ACE_HAS_WCHAR +# include "ace/os_include/os_wctype.h" +#endif /* ACE_HAS_WCHAR */ + ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { @@ -56,6 +61,14 @@ namespace ACE_OS { ACE_NAMESPACE_INLINE_FUNCTION int ace_isalpha (ACE_TCHAR c); + /// Returns true if the character is a control character. + ACE_NAMESPACE_INLINE_FUNCTION + int ace_isblank (ACE_TCHAR c); + + /// Returns true if the character is a control character. + ACE_NAMESPACE_INLINE_FUNCTION + int ace_isascii (ACE_TCHAR c); + /// Returns true if the character is a control character. ACE_NAMESPACE_INLINE_FUNCTION int ace_iscntrl (ACE_TCHAR c); @@ -112,6 +125,9 @@ namespace ACE_OS { wint_t ace_towupper (wint_t c); #endif /* ACE_HAS_WCHAR && !ACE_LACKS_TOWUPPER */ + /// Tests @a c for the property specified by the @a desc argument + ACE_NAMESPACE_INLINE_FUNCTION + int ace_isctype (int c, ctype_t desc); //@} } /* namespace ACE_OS */ diff --git a/dep/ACE_wrappers/ace/OS_NS_ctype.inl b/dep/ACE_wrappers/ace/OS_NS_ctype.inl index 8ca1f1a29..4d736488b 100644 --- a/dep/ACE_wrappers/ace/OS_NS_ctype.inl +++ b/dep/ACE_wrappers/ace/OS_NS_ctype.inl @@ -1,11 +1,14 @@ // -*- C++ -*- // -// $Id: OS_NS_ctype.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: OS_NS_ctype.inl 85785 2009-06-24 18:20:42Z mitza $ -#include "ace/os_include/os_ctype.h" -#if defined ACE_HAS_WCHAR -# include "ace/os_include/os_wctype.h" -#endif /* ACE_HAS_WCHAR */ +#if defined (ACE_LACKS_ISCTYPE) +#include "ace/OS_NS_errno.h" +#endif + +#if defined (ACE_USES_WCHAR) && defined (ACE_LACKS_ISWBLANK) && !defined (ACE_LACKS_ISWCTYPE) +#include "ace/OS_NS_wctype.h" +#endif ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -13,18 +16,59 @@ ACE_INLINE int ACE_OS::ace_isalnum (ACE_TCHAR c) { #if defined (ACE_USES_WCHAR) -# if defined (_MSC_VER) && (_MSC_VER >= 1300) +# if defined (_MSC_VER) // For MSVC 7.x, we need to prevent "illegal" character getting into // isalnum, otherwise, it will crash the program. - return c > 0 && c < 256 && iswalnum (c); + return c > 0 && c < 0xFF && iswalnum (c); # else return iswalnum (c); -# endif /* _MSC_VER && _MSC_VER >= 1300 */ +# endif /* _MSC_VER */ #else /* ACE_USES_WCHAR */ return isalnum ((unsigned char) c); #endif /* ACE_USES_WCHAR */ } +ACE_INLINE int +ACE_OS::ace_isascii (ACE_TCHAR c) +{ +#if defined (ACE_USES_WCHAR) +# if defined (ACE_LACKS_ISWASCII) + if (c < 256) + return isascii (static_cast (c)); + else + return c; +# else + return iswascii (c); +# endif +#else /* ACE_USES_WCHAR */ +# if defined (ACE_LACKS_ISASCII) + return (static_cast(c) <= 0x7F); +#else + return isascii ((unsigned char) c); +#endif /* ACE_LACKS_ISASCII */ +#endif /* ACE_USES_WCHAR */ +} + +ACE_INLINE int +ACE_OS::ace_isblank (ACE_TCHAR c) +{ +#if defined (ACE_USES_WCHAR) +# if defined (ACE_LACKS_ISWBLANK) +# if !defined (ACE_LACKS_ISWCTYPE) + return ace_iswctype (c, _BLANK); +# else + return (c == 0x9) || (c == 0x20); +# endif /* !ACE_LACKS_ISWCTYPE */ +# else + return iswblank (c); +# endif /* ACE_LACKS_ISWBLANK */ +#elif defined (ACE_LACKS_ISBLANK) + return (c == 0x9) || (c == 0x20); +#else /* ACE_USES_WCHAR */ + return isblank ((unsigned char) c); +#endif /* ACE_USES_WCHAR */ +} + ACE_INLINE int ACE_OS::ace_isalpha (ACE_TCHAR c) { @@ -79,6 +123,16 @@ ACE_INLINE int ACE_OS::ace_isprint (ACE_TCHAR c) { #if defined (ACE_USES_WCHAR) +# if defined (ACE_LACKS_CORRECT_ISWPRINT_TAB) + /* The MS CRT has the bug that for tab (\t) iswprint returns true instead of + * false. This has been reported to Microsoft: + * https://connect.microsoft.com/VisualStudio/feedback ID# 381915 + */ + if (c == 0x9) + { + return 0; + } +# endif return iswprint (c); #else /* ACE_USES_WCHAR */ return isprint ((unsigned char) c); @@ -160,4 +214,18 @@ ACE_OS::ace_towupper (wint_t c) } #endif /* ACE_HAS_WCHAR && !ACE_LACKS_TOWUPPER */ +ACE_INLINE int +ACE_OS::ace_isctype(int c, ctype_t desc) +{ +#if defined (ACE_ISCTYPE_EQUIVALENT) + return ACE_ISCTYPE_EQUIVALENT (c, desc); +#elif !defined (ACE_LACKS_ISCTYPE) + return isctype (c, desc); +#else + ACE_UNUSED_ARG (c); + ACE_UNUSED_ARG (desc); + ACE_NOTSUP_RETURN (-1); +#endif +} + ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/OS_NS_dirent.cpp b/dep/ACE_wrappers/ace/OS_NS_dirent.cpp index 73fea0f13..67ffabe4f 100644 --- a/dep/ACE_wrappers/ace/OS_NS_dirent.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_dirent.cpp @@ -1,8 +1,8 @@ -// $Id: OS_NS_dirent.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: OS_NS_dirent.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/OS_NS_dirent.h" -ACE_RCSID(ace, OS_NS_dirent, "$Id: OS_NS_dirent.cpp 80826 2008-03-04 14:51:23Z wotte $") + #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_NS_dirent.inl" @@ -21,9 +21,11 @@ ACE_OS::closedir_emulation (ACE_DIR *d) { #if defined (ACE_WIN32) if (d->current_handle_ != INVALID_HANDLE_VALUE) - ::FindClose (d->current_handle_); + { + ::FindClose (d->current_handle_); + d->current_handle_ = INVALID_HANDLE_VALUE; + } - d->current_handle_ = INVALID_HANDLE_VALUE; d->started_reading_ = 0; if (d->dirent_ != 0) { @@ -41,11 +43,11 @@ ACE_DIR * ACE_OS::opendir_emulation (const ACE_TCHAR *filename) { #if defined (ACE_WIN32) -# if defined (ACE_HAS_WINCE) && !defined (INVALID_FILE_ATTRIBUTES) +# if !defined (INVALID_FILE_ATTRIBUTES) # define INVALID_FILE_ATTRIBUTES 0xFFFFFFFF # endif - ACE_DIR *dir; + ACE_DIR *dir = 0; ACE_TCHAR extra[3] = {0,0,0}; // Check if filename is a directory. @@ -72,7 +74,7 @@ ACE_OS::opendir_emulation (const ACE_TCHAR *filename) Phil Mesnier */ - size_t lastchar = ACE_OS::strlen (filename); + size_t const lastchar = ACE_OS::strlen (filename); if (lastchar > 0) { if (filename[lastchar-1] != '*') @@ -122,8 +124,7 @@ ACE_OS::readdir_emulation (ACE_DIR *d) } else { - int retval = ACE_TEXT_FindNextFile (d->current_handle_, - &d->fdata_); + int const retval = ACE_TEXT_FindNextFile (d->current_handle_, &d->fdata_); if (retval == 0) { // Make sure to close the handle explicitly to avoid a leak! @@ -175,7 +176,6 @@ ACE_OS::scandir_emulation (const ACE_TCHAR *dirname, ACE_DIRENT **vector = 0; ACE_DIRENT *dp = 0; int arena_size = 0; - int nfiles = 0; int fail = 0; diff --git a/dep/ACE_wrappers/ace/OS_NS_dirent.h b/dep/ACE_wrappers/ace/OS_NS_dirent.h index 82042f522..caf72b16e 100644 --- a/dep/ACE_wrappers/ace/OS_NS_dirent.h +++ b/dep/ACE_wrappers/ace/OS_NS_dirent.h @@ -4,7 +4,7 @@ /** * @file OS_NS_dirent.h * - * $Id: OS_NS_dirent.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: OS_NS_dirent.h 85435 2009-05-25 18:52:50Z coryan $ * * @author Douglas C. Schmidt * @author Jesper S. M|ller diff --git a/dep/ACE_wrappers/ace/OS_NS_dlfcn.cpp b/dep/ACE_wrappers/ace/OS_NS_dlfcn.cpp index 24218ff43..5ac764f25 100644 --- a/dep/ACE_wrappers/ace/OS_NS_dlfcn.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_dlfcn.cpp @@ -1,8 +1,8 @@ -// $Id: OS_NS_dlfcn.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: OS_NS_dlfcn.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/OS_NS_dlfcn.h" -ACE_RCSID(ace, OS_NS_dlfcn, "$Id: OS_NS_dlfcn.cpp 80826 2008-03-04 14:51:23Z wotte $") + #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_NS_dlfcn.inl" diff --git a/dep/ACE_wrappers/ace/OS_NS_dlfcn.inl b/dep/ACE_wrappers/ace/OS_NS_dlfcn.inl index 9b75ac3ad..14960008d 100644 --- a/dep/ACE_wrappers/ace/OS_NS_dlfcn.inl +++ b/dep/ACE_wrappers/ace/OS_NS_dlfcn.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: OS_NS_dlfcn.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: OS_NS_dlfcn.inl 85341 2009-05-14 11:07:37Z johnnyw $ #include "ace/OS_NS_macros.h" #include "ace/OS_NS_errno.h" @@ -78,7 +78,7 @@ ACE_OS::dlerror (void) { ACE_OS_TRACE ("ACE_OS::dlerror"); # if defined (ACE_HAS_SVR4_DYNAMIC_LINKING) - const char *err; + const char *err = 0; # if defined(_M_UNIX) ACE_OSCALL (::_dlerror (), const char *, 0, err); # else /* _M_UNIX */ diff --git a/dep/ACE_wrappers/ace/OS_NS_errno.cpp b/dep/ACE_wrappers/ace/OS_NS_errno.cpp index ada256d1c..9284e2c42 100644 --- a/dep/ACE_wrappers/ace/OS_NS_errno.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_errno.cpp @@ -1,9 +1,9 @@ // -*- C++ -*- -// $Id: OS_NS_errno.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: OS_NS_errno.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/OS_NS_errno.h" -ACE_RCSID(ace, OS_NS_errno, "$Id: OS_NS_errno.cpp 80826 2008-03-04 14:51:23Z wotte $") + #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_NS_errno.inl" diff --git a/dep/ACE_wrappers/ace/OS_NS_errno.h b/dep/ACE_wrappers/ace/OS_NS_errno.h index 1bf0d216a..22e3d006d 100644 --- a/dep/ACE_wrappers/ace/OS_NS_errno.h +++ b/dep/ACE_wrappers/ace/OS_NS_errno.h @@ -4,7 +4,7 @@ /** * @file OS_NS_errno.h * - * $Id: OS_NS_errno.h 81286 2008-04-09 07:27:30Z johnnyw $ + * $Id: OS_NS_errno.h 85321 2009-05-12 08:31:31Z johnnyw $ * * @author Douglas C. Schmidt * @author Jesper S. M|ller @@ -58,7 +58,7 @@ namespace ACE_OS { * Some versions of CE don't support @c errno and some versions' * implementations are busted. So we implement our own. * Our implementation takes up one Tls key, however, it does not - * allocate memory fromt the heap so there's no problem with cleanin + * allocate memory from the heap so there's no problem with cleaning * up the errno when a thread exit. */ class ACE_Export ACE_CE_Errno @@ -82,8 +82,10 @@ private: #if defined (ACE_HAS_WINCE_BROKEN_ERRNO) # define ACE_ERRNO_TYPE ACE_CE_Errno +# define ACE_ERRNO_GET ACE_CE_Errno::instance ()->operator int() #else # define ACE_ERRNO_TYPE int +# define ACE_ERRNO_GET errno #endif /* ACE_HAS_WINCE_BROKEN_ERRNO */ ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/OS_NS_fcntl.cpp b/dep/ACE_wrappers/ace/OS_NS_fcntl.cpp index aa90f7930..b266e5282 100644 --- a/dep/ACE_wrappers/ace/OS_NS_fcntl.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_fcntl.cpp @@ -1,8 +1,8 @@ -// $Id: OS_NS_fcntl.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: OS_NS_fcntl.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/OS_NS_fcntl.h" -ACE_RCSID(ace, OS_NS_fcntl, "$Id: OS_NS_fcntl.cpp 80826 2008-03-04 14:51:23Z wotte $") + #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_NS_fcntl.inl" diff --git a/dep/ACE_wrappers/ace/OS_NS_fcntl.h b/dep/ACE_wrappers/ace/OS_NS_fcntl.h index 539ac306f..0fe86a5f1 100644 --- a/dep/ACE_wrappers/ace/OS_NS_fcntl.h +++ b/dep/ACE_wrappers/ace/OS_NS_fcntl.h @@ -4,7 +4,7 @@ /** * @file OS_NS_fcntl.h * - * $Id: OS_NS_fcntl.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: OS_NS_fcntl.h 87487 2009-11-12 07:54:39Z johnnyw $ * * @author Douglas C. Schmidt * @author Jesper S. M|ller @@ -44,10 +44,6 @@ namespace ACE_OS { int cmd, long arg = 0); -#if !defined (ACE_DEFAULT_OPEN_PERMS) -# define ACE_DEFAULT_OPEN_PERMS ACE_DEFAULT_FILE_PERMS -#endif /* ACE_DEFAULT_OPEN_PERMS */ - /// The O_APPEND flag is only partly supported on Win32. If you specify /// O_APPEND, then the file pointer will be positioned at the end of /// the file initially during open, but it is not re-positioned at diff --git a/dep/ACE_wrappers/ace/OS_NS_math.cpp b/dep/ACE_wrappers/ace/OS_NS_math.cpp index ae9554c06..f6c61712c 100644 --- a/dep/ACE_wrappers/ace/OS_NS_math.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_math.cpp @@ -1,8 +1,8 @@ -// $Id: OS_NS_math.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: OS_NS_math.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/OS_NS_math.h" -ACE_RCSID(ace, OS_NS_math, "$Id: OS_NS_math.cpp 80826 2008-03-04 14:51:23Z wotte $") + #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_NS_math.inl" diff --git a/dep/ACE_wrappers/ace/OS_NS_math.h b/dep/ACE_wrappers/ace/OS_NS_math.h index 9d001d01b..9ba3b6632 100644 --- a/dep/ACE_wrappers/ace/OS_NS_math.h +++ b/dep/ACE_wrappers/ace/OS_NS_math.h @@ -4,7 +4,7 @@ /** * @file OS_NS_math.h * - * $Id: OS_NS_math.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: OS_NS_math.h 89470 2010-03-12 12:12:12Z olli $ * * @author Douglas C. Schmidt * @author Jesper S. M|ller @@ -88,12 +88,18 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { /// This method computes the largest integral value not greater than x. - ACE_NAMESPACE_INLINE_FUNCTION - double floor (double x); + template + T floor (T x) + { + return ACE_STD_NAMESPACE::floor (x); + } /// This method computes the smallest integral value not less than x. - ACE_NAMESPACE_INLINE_FUNCTION - double ceil (double x); + template + T ceil (T x) + { + return ACE_STD_NAMESPACE::ceil (x); + } /// This method computes the base-2 logarithm of x. ACE_NAMESPACE_INLINE_FUNCTION diff --git a/dep/ACE_wrappers/ace/OS_NS_math.inl b/dep/ACE_wrappers/ace/OS_NS_math.inl index edfeb4186..e66dc496e 100644 --- a/dep/ACE_wrappers/ace/OS_NS_math.inl +++ b/dep/ACE_wrappers/ace/OS_NS_math.inl @@ -1,35 +1,11 @@ // -*- C++ -*- // -// $Id: OS_NS_math.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: OS_NS_math.inl 89470 2010-03-12 12:12:12Z olli $ ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { - ACE_INLINE double - floor (double x) - { - // This method computes the largest integral value not greater than x. - if(x > 0) - return static_cast (x); - else if (static_cast (x) == x) - return x; - else - return static_cast(x) - 1; - } - - ACE_INLINE double - ceil (double x) - { - // This method computes the smallest integral value not less than x. - if (x < 0) - return static_cast (x); - else if (static_cast (x) == x) - return x; - else - return static_cast (x) + 1; - } - ACE_INLINE double log2 (double x) { diff --git a/dep/ACE_wrappers/ace/OS_NS_netdb.cpp b/dep/ACE_wrappers/ace/OS_NS_netdb.cpp index 8cee46be2..b615df138 100644 --- a/dep/ACE_wrappers/ace/OS_NS_netdb.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_netdb.cpp @@ -1,9 +1,9 @@ // -*- C++ -*- -// $Id: OS_NS_netdb.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: OS_NS_netdb.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/OS_NS_netdb.h" -ACE_RCSID(ace, OS_NS_netdb, "$Id: OS_NS_netdb.cpp 80826 2008-03-04 14:51:23Z wotte $") + #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_NS_netdb.inl" @@ -276,7 +276,7 @@ ACE_OS::getmacaddress (struct macaddr_node_t *node) # else # if defined (ACE_HAS_PHARLAP_RT) DEVHANDLE ip_dev = (DEVHANDLE)0; - EK_TCPIPCFG *devp; + EK_TCPIPCFG *devp = 0; size_t i; ACE_TCHAR dev_name[16]; @@ -385,6 +385,60 @@ ACE_OS::getmacaddress (struct macaddr_node_t *node) return 0; +#elif defined (ACE_HAS_IPHONE) || defined (ACE_HAS_MAC_OSX) + + const long BUFFERSIZE = 4000; + char buffer[BUFFERSIZE]; + + struct ifconf ifc; + struct ifreq* ifr = 0; + + ACE_HANDLE handle = + ACE_OS::socket (AF_INET, SOCK_DGRAM, 0); + + if (handle == ACE_INVALID_HANDLE) + { + return -1; + } + + ifc.ifc_len = BUFFERSIZE; + ifc.ifc_buf = buffer; + + if (ACE_OS::ioctl (handle, SIOCGIFCONF, &ifc) < 0) + { + ACE_OS::close (handle); + return -1; + } + + for(char* ptr=buffer; ptr < buffer + ifc.ifc_len; ) + { + ifr = (struct ifreq *) ptr; + + if (ifr->ifr_addr.sa_family == AF_LINK) + { + if(ACE_OS::strcmp (ifr->ifr_name, "en0") == 0) + { + struct sockaddr_dl* sdl = + (struct sockaddr_dl *) &ifr->ifr_addr; + + ACE_OS::memcpy (node->node, + LLADDR(sdl), + 6); + } + } + + ptr += sizeof(ifr->ifr_name); + + if(sizeof(ifr->ifr_addr) > ifr->ifr_addr.sa_len) + ptr += sizeof(ifr->ifr_addr); + else + ptr += ifr->ifr_addr.sa_len; + } + + ACE_OS::close (handle); + + return 0; + #else ACE_UNUSED_ARG (node); ACE_NOTSUP_RETURN (-1); diff --git a/dep/ACE_wrappers/ace/OS_NS_netdb.inl b/dep/ACE_wrappers/ace/OS_NS_netdb.inl index 58ebc0c1f..55292ecc8 100644 --- a/dep/ACE_wrappers/ace/OS_NS_netdb.inl +++ b/dep/ACE_wrappers/ace/OS_NS_netdb.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: OS_NS_netdb.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: OS_NS_netdb.inl 86295 2009-07-30 10:41:49Z shuston $ #include "ace/OS_NS_macros.h" #include "ace/OS_NS_string.h" @@ -125,7 +125,7 @@ ACE_OS::gethostbyaddr_r (const char *addr, *h_errnop = h_errno; return (struct hostent *) 0; } -# elif defined (__GLIBC__) || defined (__FreeBSD__) +# elif defined (__GLIBC__) // GNU C library has a different signature ACE_OS::memset (buffer, 0, sizeof (ACE_HOSTENT_DATA)); @@ -318,7 +318,7 @@ ACE_OS::gethostbyname_r (const char *name, *h_errnop = h_errno; return (struct hostent *) 0; } -# elif defined (__GLIBC__) || defined (__FreeBSD__) +# elif defined (__GLIBC__) // GNU C library has a different signature ACE_OS::memset (buffer, 0, sizeof (ACE_HOSTENT_DATA)); @@ -410,12 +410,16 @@ ACE_OS::gethostbyname_r (const char *name, # else ACE_UNUSED_ARG (result); ACE_UNUSED_ARG (buffer); - ACE_UNUSED_ARG (h_errnop); - //FUZZ: disable check_for_lack_ACE_OS - ACE_SOCKCALL_RETURN (::gethostbyname (name), - struct hostent *, - 0); + // FUZZ: disable check_for_lack_ACE_OS + struct hostent *result2 = 0; + ACE_SOCKCALL (::gethostbyname (name), + struct hostent *, + 0, + result2); + if (result2 == 0 && h_errnop) + *h_errnop = errno; + return result2; //FUZZ: enable check_for_lack_ACE_OS # endif /* defined (ACE_HAS_REENTRANT_FUNCTIONS) && !defined (UNIXWARE) */ } @@ -528,7 +532,7 @@ ACE_OS::getprotobyname_r (const char *name, else return 0; //FUZZ: enable check_for_lack_ACE_OS -# elif defined (__GLIBC__) || defined (__FreeBSD__) +# elif defined (__GLIBC__) // GNU C library has a different signature //FUZZ: disable check_for_lack_ACE_OS if (::getprotobyname_r (name, @@ -609,7 +613,7 @@ ACE_OS::getprotobynumber_r (int proto, //FUZZ: enable check_for_lack_ACE_OS else return 0; -# elif defined (__GLIBC__) || defined (__FreeBSD__) +# elif defined (__GLIBC__) // GNU C library has a different signature //FUZZ: disable check_for_lack_ACE_OS if (::getprotobynumber_r (proto, @@ -695,7 +699,7 @@ ACE_OS::getservbyname_r (const char *svc, //FUZZ: enable check_for_lack_ACE_OS else return (struct servent *) 0; -# elif defined (__GLIBC__) || defined (__FreeBSD__) +# elif defined (__GLIBC__) // GNU C library has a different signature ACE_OS::memset (buf, 0, sizeof (ACE_SERVENT_DATA)); diff --git a/dep/ACE_wrappers/ace/OS_NS_poll.cpp b/dep/ACE_wrappers/ace/OS_NS_poll.cpp index 0c8523d89..b25f006dc 100644 --- a/dep/ACE_wrappers/ace/OS_NS_poll.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_poll.cpp @@ -1,8 +1,8 @@ -// $Id: OS_NS_poll.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: OS_NS_poll.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/OS_NS_poll.h" -ACE_RCSID(ace, OS_NS_poll, "$Id: OS_NS_poll.cpp 80826 2008-03-04 14:51:23Z wotte $") + #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_NS_poll.inl" diff --git a/dep/ACE_wrappers/ace/OS_NS_pwd.cpp b/dep/ACE_wrappers/ace/OS_NS_pwd.cpp index 7a3e5c59b..1bed2d2b6 100644 --- a/dep/ACE_wrappers/ace/OS_NS_pwd.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_pwd.cpp @@ -1,8 +1,8 @@ -// $Id: OS_NS_pwd.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: OS_NS_pwd.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/OS_NS_pwd.h" -ACE_RCSID(ace, OS_NS_pwd, "$Id: OS_NS_pwd.cpp 80826 2008-03-04 14:51:23Z wotte $") + #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_NS_pwd.inl" diff --git a/dep/ACE_wrappers/ace/OS_NS_pwd.h b/dep/ACE_wrappers/ace/OS_NS_pwd.h index 3291d6012..f32c247d2 100644 --- a/dep/ACE_wrappers/ace/OS_NS_pwd.h +++ b/dep/ACE_wrappers/ace/OS_NS_pwd.h @@ -4,7 +4,7 @@ /** * @file OS_NS_pwd.h * - * $Id: OS_NS_pwd.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: OS_NS_pwd.h 87270 2009-10-29 21:47:47Z olli $ * * @author Douglas C. Schmidt * @author Jesper S. M|ller @@ -33,10 +33,6 @@ #endif #define ACE_EXPORT_MACRO ACE_Export -# if defined (ACE_HAS_BROKEN_R_ROUTINES) -# undef getpwnam_r -# endif /* ACE_HAS_BROKEN_R_ROUTINES */ - struct passwd; ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/OS_NS_regex.cpp b/dep/ACE_wrappers/ace/OS_NS_regex.cpp index 62533a2f4..f57e6787d 100644 --- a/dep/ACE_wrappers/ace/OS_NS_regex.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_regex.cpp @@ -1,8 +1,8 @@ -// $Id: OS_NS_regex.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: OS_NS_regex.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/OS_NS_regex.h" -ACE_RCSID(ace, OS_NS_regex, "$Id: OS_NS_regex.cpp 80826 2008-03-04 14:51:23Z wotte $") + #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_NS_regex.inl" diff --git a/dep/ACE_wrappers/ace/OS_NS_signal.cpp b/dep/ACE_wrappers/ace/OS_NS_signal.cpp index bb1c41305..98f2152f0 100644 --- a/dep/ACE_wrappers/ace/OS_NS_signal.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_signal.cpp @@ -1,8 +1,8 @@ -// $Id: OS_NS_signal.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: OS_NS_signal.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/OS_NS_signal.h" -ACE_RCSID(ace, OS_NS_signal, "$Id: OS_NS_signal.cpp 80826 2008-03-04 14:51:23Z wotte $") + #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_NS_signal.inl" diff --git a/dep/ACE_wrappers/ace/OS_NS_signal.h b/dep/ACE_wrappers/ace/OS_NS_signal.h index 57b9e3dd1..8dc02c10a 100644 --- a/dep/ACE_wrappers/ace/OS_NS_signal.h +++ b/dep/ACE_wrappers/ace/OS_NS_signal.h @@ -4,7 +4,7 @@ /** * @file OS_NS_signal.h * - * $Id: OS_NS_signal.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: OS_NS_signal.h 87097 2009-10-14 14:42:24Z olli $ * * @author Douglas C. Schmidt * @author Jesper S. M|ller @@ -33,6 +33,84 @@ #endif #define ACE_EXPORT_MACRO ACE_Export +#if defined (__Lynx__) +// LynxOS defines pthread_sigmask() in pthread.h +# include "ace/os_include/os_pthread.h" +#endif /* __Lynx__ */ + +/* + * We inline and undef some functions that may be implemented + * as macros on some platforms. This way macro definitions will + * be usable later as there is no way to save the macro definition + * using the pre-processor. + * + */ + +#if !defined (ACE_LACKS_SIGSET) +inline int ace_sigemptyset_helper (sigset_t *s) +{ +# if defined (sigemptyset) + return sigemptyset (s); +# undef sigemptyset +# else + return ACE_STD_NAMESPACE::sigemptyset (s); +# endif /* defined (sigemptyset) */ +} + +inline int ace_sigfillset_helper (sigset_t *s) +{ +# if defined (sigfillset) + return sigfillset (s); +# undef sigfillset +# else + return ACE_STD_NAMESPACE::sigfillset (s); +# endif /* defined (sigfillset) */ +} + +inline int ace_sigaddset_helper (sigset_t *s, int signum) +{ +# if defined (sigaddset) + return sigaddset (s, signum); +# undef sigaddset +# else + return ACE_STD_NAMESPACE::sigaddset (s, signum); +# endif /* defined (sigaddset) */ +} + +inline int ace_sigdelset_helper (sigset_t *s, int signum) +{ +# if defined (sigdelset) + return sigdelset (s, signum); +# undef sigdelset +# else + return ACE_STD_NAMESPACE::sigdelset (s, signum); +# endif /* defined (sigdelset) */ +} + +inline int ace_sigismember_helper (sigset_t *s, int signum) +{ +# if defined (sigismember) + return sigismember (s, signum); +# undef sigismember +# else + return ACE_STD_NAMESPACE::sigismember (s, signum); +# endif /* defined (sigismember) */ +} +#endif /* !defined (ACE_LACKS_SIGSET) */ + +#if defined (ACE_HAS_SIGSUSPEND) +inline int ace_sigsuspend_helper (const sigset_t *s) +{ +# if defined (sigsuspend) + return sigsuspend (s); +# undef sigsuspend +# else + return ACE_STD_NAMESPACE::sigsuspend (s); +# endif /* defined (sigsuspen) */ +} +#endif /* ACE_HAS_SIGSUSPEND */ + + # if !defined (SIG_BLOCK) # define SIG_BLOCK 1 # endif /* SIG_BLOCK */ @@ -133,8 +211,10 @@ namespace ACE_OS { sigset_t *osp); ACE_NAMESPACE_INLINE_FUNCTION - int sigsuspend (const sigset_t *set); + int sigsuspend (const sigset_t *s); + ACE_NAMESPACE_INLINE_FUNCTION + int raise (const int signum); //@} } /* namespace ACE_OS */ diff --git a/dep/ACE_wrappers/ace/OS_NS_signal.inl b/dep/ACE_wrappers/ace/OS_NS_signal.inl index 6d03f4301..d6f6494e1 100644 --- a/dep/ACE_wrappers/ace/OS_NS_signal.inl +++ b/dep/ACE_wrappers/ace/OS_NS_signal.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: OS_NS_signal.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: OS_NS_signal.inl 87480 2009-11-11 11:38:15Z olli $ #include "ace/OS_NS_macros.h" #include "ace/OS_NS_errno.h" @@ -78,7 +78,7 @@ ACE_INLINE int sigaddset (sigset_t *s, int signum) { ACE_OS_TRACE ("ACE_OS::sigaddset"); -#if defined (ACE_LACKS_SIGSET) || defined (ACE_LACKS_SIGSET_DEFINITIONS) +#if defined (ACE_LACKS_SIGSET) if (s == 0) { errno = EFAULT; @@ -92,14 +92,14 @@ sigaddset (sigset_t *s, int signum) *s |= (1 << (signum - 1)) ; return 0 ; #else - ACE_OSCALL_RETURN (::sigaddset (s, signum), int, -1); -#endif /* ACE_LACKS_SIGSET || ACE_LACKS_SIGSET_DEFINITIONS */ + return ace_sigaddset_helper (s, signum); +#endif /* ACE_LACKS_SIGSET */ } ACE_INLINE int sigdelset (sigset_t *s, int signum) { -#if defined (ACE_LACKS_SIGSET) || defined (ACE_LACKS_SIGSET_DEFINITIONS) +#if defined (ACE_LACKS_SIGSET) if (s == 0) { errno = EFAULT; @@ -113,14 +113,14 @@ sigdelset (sigset_t *s, int signum) *s &= ~(1 << (signum - 1)) ; return 0; #else - ACE_OSCALL_RETURN (::sigdelset (s, signum), int, -1); -#endif /* ACE_LACKS_SIGSET || ACE_LACKS_SIGSET_DEFINITIONS */ + return ace_sigdelset_helper (s, signum); +#endif /* ACE_LACKS_SIGSET */ } ACE_INLINE int sigemptyset (sigset_t *s) { -#if defined (ACE_LACKS_SIGSET) || defined (ACE_LACKS_SIGSET_DEFINITIONS) +#if defined (ACE_LACKS_SIGSET) if (s == 0) { errno = EFAULT; @@ -129,14 +129,14 @@ sigemptyset (sigset_t *s) *s = 0 ; return 0; #else - ACE_OSCALL_RETURN (::sigemptyset (s), int, -1); -#endif /* ACE_LACKS_SIGSET || ACE_LACKS_SIGSET_DEFINITIONS */ + return ace_sigemptyset_helper (s); +#endif /* ACE_LACKS_SIGSET */ } ACE_INLINE int sigfillset (sigset_t *s) { -#if defined (ACE_LACKS_SIGSET) || defined (ACE_LACKS_SIGSET_DEFINITIONS) +#if defined (ACE_LACKS_SIGSET) if (s == 0) { errno = EFAULT; @@ -145,14 +145,14 @@ sigfillset (sigset_t *s) *s = ~(sigset_t) 0; return 0 ; #else - ACE_OSCALL_RETURN (::sigfillset (s), int, -1); -#endif /* ACE_LACKS_SIGSET || ACE_LACKS_SIGSET_DEFINITIONS */ + return ace_sigfillset_helper (s); +#endif /* ACE_LACKS_SIGSET */ } ACE_INLINE int sigismember (sigset_t *s, int signum) { -#if defined (ACE_LACKS_SIGSET) || defined (ACE_LACKS_SIGSET_DEFINITIONS) +#if defined (ACE_LACKS_SIGSET) if (s == 0) { errno = EFAULT; @@ -172,8 +172,8 @@ sigismember (sigset_t *s, int signum) return -1; // Invalid signum, return error } # endif /* ACE_HAS_SIGISMEMBER_BUG */ - ACE_OSCALL_RETURN (::sigismember (s, signum), int, -1); -#endif /* ACE_LACKS_SIGSET || ACE_LACKS_SIGSET_DEFINITIONS */ + return ace_sigismember_helper (s, signum); +#endif /* ACE_LACKS_SIGSET */ } ACE_INLINE ACE_SignalHandler @@ -183,11 +183,11 @@ signal (int signum, ACE_SignalHandler func) return 0; else # if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) || !defined (ACE_LACKS_UNIX_SIGNALS) -# if !defined (ACE_HAS_TANDEM_SIGNALS) && !defined (ACE_HAS_LYNXOS_SIGNALS) +# if !defined (ACE_HAS_TANDEM_SIGNALS) && !defined (ACE_HAS_LYNXOS4_SIGNALS) return ::signal (signum, func); # else return (ACE_SignalHandler) ::signal (signum, (void (*)(int)) func); -# endif /* !ACE_HAS_TANDEM_SIGNALS */ +# endif /* !ACE_HAS_TANDEM_SIGNALS && !ACE_HAS_LYNXOS4_SIGNALS */ #else // @@ WINCE: Don't know how to implement signal on WinCE (yet.) ACE_UNUSED_ARG (signum); @@ -199,34 +199,45 @@ signal (int signum, ACE_SignalHandler func) ACE_INLINE int sigprocmask (int how, const sigset_t *nsp, sigset_t *osp) { -#if defined (ACE_LACKS_SIGSET) || defined (ACE_LACKS_SIGSET_DEFINITIONS) +#if defined (ACE_LACKS_SIGSET) ACE_UNUSED_ARG (how); ACE_UNUSED_ARG (nsp); ACE_UNUSED_ARG (osp); ACE_NOTSUP_RETURN (-1); #else ACE_OSCALL_RETURN (::sigprocmask (how, nsp, osp), int, -1); -#endif /* ACE_LACKS_SIGSET || ACE_LACKS_SIGSET_DEFINITIONS */ +#endif /* ACE_LACKS_SIGSET */ } ACE_INLINE int -sigsuspend (const sigset_t *sigset) +sigsuspend (const sigset_t *s) { #if defined (ACE_HAS_SIGSUSPEND) - sigset_t s; + sigset_t sigset; - if (sigset == 0) + if (s == 0) { - sigset = &s; - ACE_OS::sigemptyset (&s); + ACE_OS::sigemptyset (&sigset); + s = &sigset; } - ACE_OSCALL_RETURN (::sigsuspend (sigset), int, -1); + return ace_sigsuspend_helper (s); #else - ACE_UNUSED_ARG (sigset); + ACE_UNUSED_ARG (s); ACE_NOTSUP_RETURN (-1); #endif /* ACE_HAS_SIGSUSPEND */ } +ACE_INLINE int +raise (const int signum) +{ +#if defined (ACE_LACKS_RAISE) + ACE_UNUSED_ARG (signum); + ACE_NOTSUP_RETURN (-1); +#else + ACE_OSCALL_RETURN (::raise (signum), int, -1); +#endif /* ACE_LACKS_RAISE */ +} + } /* end namespace ACE_OS */ ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/OS_NS_stdio.cpp b/dep/ACE_wrappers/ace/OS_NS_stdio.cpp index 42bedf0ac..7ecebf1e3 100644 --- a/dep/ACE_wrappers/ace/OS_NS_stdio.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_stdio.cpp @@ -1,13 +1,8 @@ -// $Id: OS_NS_stdio.cpp 82586 2008-08-11 12:46:00Z johnnyw $ +// $Id: OS_NS_stdio.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_Thread.h" -ACE_RCSID (ace, - OS_NS_stdio, - "$Id: OS_NS_stdio.cpp 82586 2008-08-11 12:46:00Z johnnyw $") - - #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_NS_stdio.inl" #endif /* ACE_HAS_INLINED_OSCALLS */ @@ -74,42 +69,6 @@ ACE_OS::ace_flock_t::dump (void) const /*****************************************************************************/ -#if defined (ACE_USES_WCHAR) -void ACE_OS::checkUnicodeFormat (FILE* fp) -{ - if (fp != 0) - { - // Due to the ACE_TCHAR definition, all default input files, such as - // svc.conf, have to be in Unicode format (small endian) on WinCE - // because ACE has all 'char' converted into ACE_TCHAR. - // However, for TAO, ASCII files, such as IOR file, can still be read - // and be written without any error since given buffers are all in 'char' - // type instead of ACE_TCHAR. Therefore, it is user's reponsibility to - // select correct buffer type. - - // At this point, check if the file is Unicode or not. - ACE_UINT16 first_two_bytes; - size_t numRead = - ACE_OS::fread(&first_two_bytes, sizeof (first_two_bytes), 1, fp); - - if (numRead == 1) - { - if ((first_two_bytes != 0xFFFE) && // not a small endian Unicode file - (first_two_bytes != 0xFEFF)) // not a big endian Unicode file - { - // set file pointer back to the beginning -#if defined (ACE_WIN32) - ACE_OS::fseek(fp, 0, FILE_BEGIN); -#else - ACE_OS::fseek(fp, 0, SEEK_SET); -#endif /* ACE_WIN32 */ - } - } - // if it is a Unicode file, file pointer will be right next to the first - // two-bytes - } -} -#endif // ACE_USES_WCHAR #if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) namespace @@ -165,6 +124,11 @@ ACE_OS::fopen (const char *filename, const ACE_TCHAR *mode) { ACE_OS_TRACE ("ACE_OS::fopen"); +#if defined (ACE_LACKS_FOPEN) + ACE_UNUSED_ARG (filename); + ACE_UNUSED_ARG (mode); + ACE_NOTSUP_RETURN (0); +#else int hmode = _O_TEXT; // Let the chips fall where they may if the user passes in a NULL @@ -197,9 +161,6 @@ ACE_OS::fopen (const char *filename, # endif /* defined(ACE_HAS_NONCONST_FDOPEN) && !defined (ACE_USES_WCHAR)) */ if (fp != 0) { -# if defined (ACE_USES_WCHAR) - checkUnicodeFormat(fp); -# endif // ACE_USES_WCHAR return fp; } ::_close (fd); @@ -208,6 +169,7 @@ ACE_OS::fopen (const char *filename, ACE_OS::close (handle); } return 0; +#endif } #if defined (ACE_HAS_WCHAR) @@ -230,6 +192,11 @@ ACE_OS::fopen (const wchar_t *filename, const ACE_TCHAR *mode) { ACE_OS_TRACE ("ACE_OS::fopen"); +#if defined (ACE_LACKS_FOPEN) + ACE_UNUSED_ARG (filename); + ACE_UNUSED_ARG (mode); + ACE_NOTSUP_RETURN (0); +#else int hmode = _O_TEXT; for (const ACE_TCHAR *mode_ptr = mode; *mode_ptr != 0; mode_ptr++) @@ -255,9 +222,6 @@ ACE_OS::fopen (const wchar_t *filename, # endif /* defined(ACE_HAS_NONCONST_FDOPEN) && !defined (ACE_USES_WCHAR)) */ if (fp != 0) { -# if defined (ACE_USES_WCHAR) - checkUnicodeFormat(fp); -# endif // ACE_USES_WCHAR return fp; } ::_close (fd); @@ -266,6 +230,7 @@ ACE_OS::fopen (const wchar_t *filename, ACE_OS::close (handle); } return 0; +#endif } #endif /* ACE_HAS_WCHAR */ @@ -278,10 +243,9 @@ int ACE_OS::fprintf (FILE *fp, const char *format, ...) { // ACE_OS_TRACE ("ACE_OS::fprintf"); - int result = 0; va_list ap; va_start (ap, format); - result = ACE_OS::vfprintf (fp, format, ap); + int const result = ACE_OS::vfprintf (fp, format, ap); va_end (ap); return result; } @@ -291,10 +255,9 @@ int ACE_OS::fprintf (FILE *fp, const wchar_t *format, ...) { // ACE_OS_TRACE ("ACE_OS::fprintf"); - int result = 0; va_list ap; va_start (ap, format); - result = ACE_OS::vfprintf (fp, format, ap); + int const result = ACE_OS::vfprintf (fp, format, ap); va_end (ap); return result; } @@ -304,10 +267,9 @@ int ACE_OS::asprintf (char **bufp, const char *format, ...) { // ACE_OS_TRACE ("ACE_OS::asprintf"); - int result; va_list ap; va_start (ap, format); - result = ACE_OS::vasprintf (bufp, format, ap); + int const result = ACE_OS::vasprintf (bufp, format, ap); va_end (ap); return result; } @@ -317,10 +279,9 @@ int ACE_OS::asprintf (wchar_t **bufp, const wchar_t *format, ...) { // ACE_OS_TRACE ("ACE_OS::asprintf"); - int result; va_list ap; va_start (ap, format); - result = ACE_OS::vasprintf (bufp, format, ap); + int const result = ACE_OS::vasprintf (bufp, format, ap); va_end (ap); return result; } @@ -330,10 +291,9 @@ int ACE_OS::printf (const char *format, ...) { // ACE_OS_TRACE ("ACE_OS::printf"); - int result; va_list ap; va_start (ap, format); - result = ACE_OS::vprintf (format, ap); + int const result = ACE_OS::vprintf (format, ap); va_end (ap); return result; } @@ -343,10 +303,9 @@ int ACE_OS::printf (const wchar_t *format, ...) { // ACE_OS_TRACE ("ACE_OS::printf"); - int result; va_list ap; va_start (ap, format); - result = ACE_OS::vprintf (format, ap); + int const result = ACE_OS::vprintf (format, ap); va_end (ap); return result; } @@ -358,7 +317,7 @@ ACE_OS::snprintf (char *buf, size_t maxlen, const char *format, ...) // ACE_OS_TRACE ("ACE_OS::snprintf"); va_list ap; va_start (ap, format); - int result = ACE_OS::vsnprintf (buf, maxlen, format, ap); + int const result = ACE_OS::vsnprintf (buf, maxlen, format, ap); va_end (ap); return result; } @@ -370,7 +329,7 @@ ACE_OS::snprintf (wchar_t *buf, size_t maxlen, const wchar_t *format, ...) // ACE_OS_TRACE ("ACE_OS::snprintf"); va_list ap; va_start (ap, format); - int result = ACE_OS::vsnprintf (buf, maxlen, format, ap); + int const result = ACE_OS::vsnprintf (buf, maxlen, format, ap); va_end (ap); return result; } @@ -382,7 +341,7 @@ ACE_OS::sprintf (char *buf, const char *format, ...) // ACE_OS_TRACE ("ACE_OS::sprintf"); va_list ap; va_start (ap, format); - int result = ACE_OS::vsprintf (buf, format, ap); + int const result = ACE_OS::vsprintf (buf, format, ap); va_end (ap); return result; } @@ -394,7 +353,7 @@ ACE_OS::sprintf (wchar_t *buf, const wchar_t *format, ...) // ACE_OS_TRACE ("ACE_OS::sprintf"); va_list ap; va_start (ap, format); - int result = ACE_OS::vsprintf (buf, format, ap); + int const result = ACE_OS::vsprintf (buf, format, ap); va_end (ap); return result; } @@ -406,7 +365,7 @@ ACE_OS::vasprintf_emulation(char **bufp, const char *format, va_list argptr) { va_list ap; va_copy (ap, argptr); - int size = ACE_OS::vsnprintf(0, 0, format, ap); + int size = ACE_OS::vsnprintf (0, 0, format, ap); va_end (ap); if (size != -1) diff --git a/dep/ACE_wrappers/ace/OS_NS_stdio.h b/dep/ACE_wrappers/ace/OS_NS_stdio.h index e818a94d3..e70a4aa97 100644 --- a/dep/ACE_wrappers/ace/OS_NS_stdio.h +++ b/dep/ACE_wrappers/ace/OS_NS_stdio.h @@ -4,7 +4,7 @@ /** * @file OS_NS_stdio.h * - * $Id: OS_NS_stdio.h 81840 2008-06-05 13:46:45Z sma $ + * $Id: OS_NS_stdio.h 87143 2009-10-17 10:29:01Z olli $ * * @author Douglas C. Schmidt * @author Jesper S. M|ller @@ -34,6 +34,10 @@ # include "ace/os_include/os_unistd.h" #endif /* CYGWIN32 || ACE_OPENVMS */ +#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) +# include "io.h" +#endif + #if defined (ACE_EXPORT_MACRO) # undef ACE_EXPORT_MACRO #endif @@ -108,7 +112,18 @@ inline int ace_ungetc_helper (int ch, FILE *fp) #endif /* defined (ungetc) */ } - +#if !defined ACE_FILENO_EQUIVALENT +inline ACE_HANDLE ace_fileno_helper (FILE *fp) +{ +# if defined (fileno) + return (ACE_HANDLE)fileno (fp); +# undef fileno +# else + return (ACE_HANDLE)ACE_STD_NAMESPACE::fileno (fp); +# endif /* defined (fileno) */ +} +#endif /* !ACE_FILENO_EQUIVALENT */ + #if !defined (ACE_LACKS_CUSERID) && !defined(ACE_HAS_ALT_CUSERID) \ && !defined(ACE_WIN32) && !defined (ACE_VXWORKS) /// Helper for the ACE_OS::cuserid() function @@ -219,10 +234,6 @@ namespace ACE_OS { ACE_NAMESPACE_INLINE_FUNCTION int fclose (FILE *fp); -# if defined (fdopen) -# undef fdopen -# endif /* fdopen */ - ACE_NAMESPACE_INLINE_FUNCTION FILE *fdopen (ACE_HANDLE handle, const ACE_TCHAR *mode); @@ -298,6 +309,10 @@ namespace ACE_OS { //@} + + ACE_NAMESPACE_INLINE_FUNCTION + ACE_HANDLE fileno (FILE *stream); + #if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) extern ACE_Export #else @@ -516,7 +531,7 @@ namespace ACE_OS { #if !defined (ACE_HAS_VASPRINTF) extern ACE_Export - int vasprintf_emulation (char **bufp, const char *format, va_list argptr); + int vasprintf_emulation (char **bufp, const char *format, va_list argptr); #endif /* !ACE_HAS_VASPRINTF */ #if defined (ACE_HAS_WCHAR) diff --git a/dep/ACE_wrappers/ace/OS_NS_stdio.inl b/dep/ACE_wrappers/ace/OS_NS_stdio.inl index 2c6894e46..64ffc18b9 100644 --- a/dep/ACE_wrappers/ace/OS_NS_stdio.inl +++ b/dep/ACE_wrappers/ace/OS_NS_stdio.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: OS_NS_stdio.inl 82444 2008-07-28 13:33:07Z johnnyw $ +// $Id: OS_NS_stdio.inl 87232 2009-10-26 13:25:55Z johnnyw $ #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_stdlib.h" @@ -135,11 +135,11 @@ ACE_OS::flock_unlock (ACE_OS::ace_flock_t *lock, DWORD low_len = ACE_LOW_PART (len); DWORD high_len = ACE_HIGH_PART (len); ACE_WIN32CALL_RETURN ( - ACE_ADAPT_RETVAL (::UnlockFile (lock->handle_, - lock->overlapped_.Offset, - lock->overlapped_.OffsetHigh, - low_len, - high_len), + ACE_ADAPT_RETVAL (::UnlockFileEx (lock->handle_, + 0, + low_len, + high_len, + &lock->overlapped_), ace_result_), int, -1); #else lock->lock_.l_whence = whence; @@ -365,12 +365,12 @@ ACE_OS::cuserid (char *user, size_t maxlen) ::remCurIdGet (user, 0); return user; } -#elif defined (__QNXNTO__) || defined (ACE_HAS_PHARLAP) || defined (ACE_HAS_WINCE) +#elif defined (ACE_HAS_PHARLAP) || defined (ACE_HAS_WINCE) ACE_UNUSED_ARG (user); ACE_UNUSED_ARG (maxlen); ACE_NOTSUP_RETURN (0); #elif defined (ACE_WIN32) - BOOL result = GetUserNameA (user, (u_long *) &maxlen); + BOOL const result = GetUserNameA (user, (u_long *) &maxlen); if (result == FALSE) ACE_FAIL_RETURN (0); else @@ -461,7 +461,7 @@ ACE_OS::cuserid (wchar_t *user, size_t maxlen) ACE_UNUSED_ARG (maxlen); ACE_NOTSUP_RETURN (0); # elif defined (ACE_WIN32) - BOOL result = GetUserNameW (user, (u_long *) &maxlen); + BOOL const result = GetUserNameW (user, (u_long *) &maxlen); if (result == FALSE) ACE_FAIL_RETURN (0); else @@ -498,9 +498,15 @@ ACE_OS::fdopen (ACE_HANDLE handle, const ACE_TCHAR *mode) { ACE_OS_TRACE ("ACE_OS::fdopen"); #if defined (ACE_HAS_WINCE) +# if defined (ACE_HAS_NONCONST_WFDOPEN) + ACE_OSCALL_RETURN (::_wfdopen ((int)handle, const_cast (ACE_TEXT_ALWAYS_WCHAR (mode))), + FILE*, + 0); +# else ACE_OSCALL_RETURN (::_wfdopen (handle, ACE_TEXT_ALWAYS_WCHAR (mode)), FILE*, 0); +# endif #elif defined (ACE_WIN32) // kernel file handle -> FILE* conversion... // Options: _O_APPEND, _O_RDONLY and _O_TEXT are lost @@ -511,15 +517,11 @@ ACE_OS::fdopen (ACE_HANDLE handle, const ACE_TCHAR *mode) if (crt_handle != -1) { -# if defined(ACE_HAS_NONCONST_FDOPEN) && !defined (ACE_USES_WCHAR) - file = ::_fdopen (crt_handle, const_cast (mode)); -# elif defined (ACE_HAS_NONCONST_FDOPEN) && defined (ACE_USES_WCHAR) - file = ::_wfdopen (crt_handle, const_cast (mode)); -# elif defined (ACE_USES_WCHAR) +# if defined (ACE_USES_WCHAR) file = ::_wfdopen (crt_handle, mode); # else file = ::_fdopen (crt_handle, mode); -# endif /* ACE_HAS_NONCONST_FDOPEN */ +# endif /* ACE_USES_WCHAR */ if (!file) { @@ -542,14 +544,6 @@ ACE_INLINE int ACE_OS::fflush (FILE *fp) { ACE_OS_TRACE ("ACE_OS::fflush"); -#if defined (ACE_VXWORKS) - if (fp == 0) - { - // Do not allow fflush(0) on VxWorks - return 0; - } -#endif /* ACE_VXWORKS */ - ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fflush (fp), int, -1); } @@ -587,14 +581,23 @@ ACE_OS::fgets (wchar_t *buf, int size, FILE *fp) } #endif /* ACE_HAS_WCHAR && !ACE_LACKS_FGETWS */ +ACE_INLINE ACE_HANDLE +ACE_OS::fileno (FILE *stream) +{ +#if defined ACE_FILENO_EQUIVALENT + return (ACE_HANDLE)ACE_FILENO_EQUIVALENT (stream); +#else + return ace_fileno_helper (stream); +#endif +} + #if !(defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) // Win32 PC implementation of fopen () is in OS_NS_stdio.cpp. ACE_INLINE FILE * ACE_OS::fopen (const char *filename, const char *mode) { ACE_OS_TRACE ("ACE_OS::fopen"); - ACE_OSCALL_RETURN - (::fopen (filename, mode), FILE *, 0); + ACE_OSCALL_RETURN (::fopen (filename, mode), FILE *, 0); } #if defined (ACE_HAS_WCHAR) @@ -604,17 +607,16 @@ ACE_OS::fopen (const char *filename, const wchar_t *mode) { ACE_OS_TRACE ("ACE_OS::fopen"); ACE_Wide_To_Ascii n_mode (mode); - ACE_OSCALL_RETURN - (::fopen (filename, n_mode.char_rep ()), FILE *, 0); + ACE_OSCALL_RETURN (::fopen (filename, n_mode.char_rep ()), FILE *, 0); } + // Win32 PC implementation of fopen () is in OS_NS_stdio.cpp. ACE_INLINE FILE * ACE_OS::fopen (const wchar_t *filename, const wchar_t *mode) { ACE_OS_TRACE ("ACE_OS::fopen"); #if defined (ACE_HAS_WINCE) - ACE_OSCALL_RETURN - (::_wfopen (filename, mode), FILE *, 0); + ACE_OSCALL_RETURN (::_wfopen (filename, mode), FILE *, 0); #else // Non-Windows doesn't use wchar_t file systems. ACE_Wide_To_Ascii n_filename (filename); @@ -690,7 +692,7 @@ ACE_INLINE FILE * ACE_OS::freopen (const ACE_TCHAR *filename, const ACE_TCHAR *mode, FILE* stream) { ACE_OS_TRACE ("ACE_OS::freopen"); -#if defined (ACE_WIN32) && (defined(ACE_USES_WCHAR) || defined(ACE_HAS_WINCE)) +#if defined (ACE_WIN32) && defined(ACE_USES_WCHAR) ACE_OSCALL_RETURN (::_wfreopen (ACE_TEXT_ALWAYS_WCHAR (filename), ACE_TEXT_ALWAYS_WCHAR (mode), stream), @@ -774,7 +776,7 @@ ACE_OS::perror (const wchar_t *s) #else ACE_Wide_To_Ascii n_s (s); ::perror (n_s.char_rep ()); -#endif /* ACE_HAS_WINCE */ +#endif /* ACE_LACKS_PERROR */ } #endif /* ACE_HAS_WCHAR */ @@ -813,8 +815,8 @@ ACE_OS::rename (const char *old_name, # elif defined (ACE_HAS_WINCE) // Win CE is always wide-char. ACE_UNUSED_ARG (flags); - if (0 != MoveFile (ACE_TEXT_CHAR_TO_TCHAR (old_name), - ACE_TEXT_CHAR_TO_TCHAR (new_name))) + if (0 == ::MoveFile (ACE_TEXT_CHAR_TO_TCHAR (old_name), + ACE_TEXT_CHAR_TO_TCHAR (new_name))) ACE_FAIL_RETURN (-1); return 0; # elif defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_MOVEFILEEX) @@ -846,7 +848,7 @@ ACE_OS::rename (const wchar_t *old_name, ACE_NOTSUP_RETURN (-1); # elif defined (ACE_HAS_WINCE) ACE_UNUSED_ARG (flags); - if (MoveFileW (old_name, new_name) != 0) + if (::MoveFileW (old_name, new_name) == 0) ACE_FAIL_RETURN (-1); return 0; # elif defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_MOVEFILEEX) @@ -879,7 +881,7 @@ ACE_OS::rewind (FILE *fp) #else // This isn't perfect since it doesn't reset EOF, but it's probably // the closest we can get on WINCE. - (void) fseek (fp, 0L, SEEK_SET); + (void) ::fseek (fp, 0L, SEEK_SET); #endif /* ACE_HAS_WINCE */ } @@ -912,7 +914,7 @@ ACE_OS::tempnam (const wchar_t *dir, const wchar_t *pfx) ACE_OSCALL_RETURN (::_wtempnam (const_cast (dir), const_cast (pfx)), wchar_t *, 0); # else ACE_OSCALL_RETURN (::_wtempnam (dir, pfx), wchar_t *, 0); -# endif /* __BORLANDC__ */ +# endif /* ACE_HAS_NONCONST_TEMPNAM */ #else /* ACE_LACKS_TEMPNAM */ // No native wide-char support; convert to narrow and call the char* variant. char *ndir = ACE_Wide_To_Ascii (dir).char_rep (); @@ -1011,8 +1013,10 @@ ACE_OS::vsprintf (wchar_t *buffer, const wchar_t *format, va_list argptr) # if (defined _XOPEN_SOURCE && (_XOPEN_SOURCE - 0) >= 500) || \ (defined (sun) && !(defined(_XOPEN_SOURCE) && (_XOPEN_VERSION-0==4))) || \ defined (ACE_HAS_DINKUM_STL) || defined (__DMC__) || \ - defined (ACE_HAS_VSWPRINTF) || defined (ACE_WIN32_VC9) || \ - (defined (ACE_WIN32_VC8) && !defined (ACE_HAS_WINCE) && \ + defined (ACE_HAS_VSWPRINTF) || \ + (defined (ACE_WIN32_VC10) && !defined (ACE_HAS_WINCE)) || \ + (defined (ACE_WIN32_VC9) && !defined (ACE_HAS_WINCE)) || \ + (defined (ACE_WIN32_VC8) && !defined (ACE_HAS_WINCE) && \ _MSC_FULL_VER > 140050000) // The XPG4/UNIX98/C99 signature of the wide-char sprintf has a @@ -1054,11 +1058,11 @@ ACE_OS::vsnprintf (char *buffer, size_t maxlen, const char *format, va_list ap) result = ::_vsnprintf (buffer, maxlen, format, ap); // Win32 doesn't regard a full buffer with no 0-terminate as an overrun. - if (result == static_cast (maxlen)) + if (result == static_cast (maxlen) && maxlen > 0) buffer[maxlen-1] = '\0'; // Win32 doesn't 0-terminate the string if it overruns maxlen. - if (result == -1) + if (result == -1 && maxlen > 0) buffer[maxlen-1] = '\0'; # endif // In out-of-range conditions, C99 defines vsnprintf() to return the number @@ -1102,25 +1106,23 @@ ACE_OS::vsnprintf (wchar_t *buffer, size_t maxlen, const wchar_t *format, va_lis result = ::_vsnwprintf (buffer, maxlen, format, ap); // Win32 doesn't regard a full buffer with no 0-terminate as an overrun. - if (result == static_cast (maxlen)) + if (result == static_cast (maxlen) && maxlen > 0) buffer[maxlen-1] = '\0'; // Win32 doesn't 0-terminate the string if it overruns maxlen. - if (result == -1) + if (result == -1 && maxlen > 0) buffer[maxlen-1] = '\0'; # else result = vswprintf (buffer, maxlen, format, ap); #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. + // 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 (maxlen + 1); - } + result = static_cast (maxlen + 1); return result; diff --git a/dep/ACE_wrappers/ace/OS_NS_stdlib.cpp b/dep/ACE_wrappers/ace/OS_NS_stdlib.cpp index 737be33ec..92430d0c8 100644 --- a/dep/ACE_wrappers/ace/OS_NS_stdlib.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_stdlib.cpp @@ -1,11 +1,7 @@ -// $Id: OS_NS_stdlib.cpp 81804 2008-05-29 16:12:07Z vzykov $ +// $Id: OS_NS_stdlib.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/OS_NS_stdlib.h" -ACE_RCSID (ace, - OS_NS_stdlib, - "$Id: OS_NS_stdlib.cpp 81804 2008-05-29 16:12:07Z vzykov $") - #include "ace/Default_Constants.h" #if !defined (ACE_HAS_INLINED_OSCALLS) @@ -61,17 +57,11 @@ ACE_OS::exit (int status) (*exit_hook_) (); #endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER && !ACE_HAS_WINCE && !ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER */ -#if !defined (ACE_HAS_WINCE) -# if defined (ACE_WIN32) +#if defined (ACE_WIN32) ::ExitProcess ((UINT) status); -# else - ::exit (status); -# endif /* ACE_WIN32 */ #else - // @@ This is not exactly the same as ExitProcess. But this is the - // closest one I can get. - ::TerminateProcess (::GetCurrentProcess (), status); -#endif /* ACE_HAS_WINCE */ + ::exit (status); +#endif /* ACE_WIN32 */ } void @@ -92,7 +82,7 @@ ACE_OS::free (void *ptr) ACE_TCHAR * ACE_OS::getenvstrings (void) { -#if defined (ACE_LACKS_ENV) +#if defined (ACE_LACKS_GETENVSTRINGS) ACE_NOTSUP_RETURN (0); #elif defined (ACE_WIN32) # if defined (ACE_USES_WCHAR) @@ -116,7 +106,7 @@ 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) +#elif defined (ACE_LACKS_STRENVDUP) ACE_UNUSED_ARG (str); ACE_NOTSUP_RETURN (0); #else @@ -343,7 +333,7 @@ ACE_OS::realloc (void *ptr, size_t nbytes) return ACE_REALLOC_FUNC (ACE_MALLOC_T (ptr), nbytes); } -#if defined (ACE_LACKS_REALPATH) && !defined (ACE_HAS_WINCE) +#if defined (ACE_LACKS_REALPATH) char * ACE_OS::realpath (const char *file_name, char *resolved_name) @@ -514,7 +504,7 @@ ACE_OS::realpath (const char *file_name, return rpath; } -#endif /* ACE_LACKS_REALPATH && !ACE_HAS_WINCE */ +#endif /* ACE_LACKS_REALPATH */ #if defined (ACE_LACKS_STRTOL) long @@ -596,6 +586,74 @@ ACE_OS::strtol_emulation (const char *nptr, char **endptr, int base) } #endif /* ACE_LACKS_STRTOL */ +#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSTOL) +long +ACE_OS::wcstol_emulation (const wchar_t *nptr, + wchar_t **endptr, + int base) +{ + register const wchar_t *s = nptr; + register unsigned long acc; + register int c; + register unsigned long cutoff; + register int neg = 0, any, cutlim; + + /* + * Skip white space and pick up leading +/- sign if any. + * If base is 0, allow 0x for hex and 0 for octal, else + * assume decimal; if base is already 16, allow 0x. + */ + do { + c = *s++; + } while (ACE_OS::ace_isspace(c)); + if (c == L'-') { + neg = 1; + c = *s++; + } else if (c == L'+') + c = *s++; + if ((base == 0 || base == 16) && + c == '0' && (*s == L'x' || *s == L'X')) { + c = s[1]; + s += 2; + base = 16; + } + if (base == 0) + base = c == L'0' ? 8 : 10; + + /* + * See strtol for comments as to the logic used. + */ + cutoff = neg ? -(unsigned long)LONG_MIN : LONG_MAX; + cutlim = cutoff % (unsigned long)base; + cutoff /= (unsigned long)base; + for (acc = 0, any = 0;; c = *s++) { + if (ACE_OS::ace_isdigit(c)) + c -= L'0'; + else if (ACE_OS::ace_isalpha(c)) + c -= ACE_OS::ace_isupper(c) ? L'A' - 10 : L'a' - 10; + else + break; + if (c >= base) + break; + if (any < 0 || acc > cutoff || acc == cutoff && c > cutlim) + any = -1; + else { + any = 1; + acc *= base; + acc += c; + } + } + if (any < 0) { + acc = neg ? LONG_MIN : LONG_MAX; + errno = ERANGE; + } else if (neg) + acc = -acc; + if (endptr != 0) + *endptr = any ? (wchar_t *)s - 1 : (wchar_t *)nptr; + return (acc); +} +#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSTOL */ + #if defined (ACE_LACKS_STRTOUL) unsigned long ACE_OS::strtoul_emulation (const char *nptr, @@ -665,6 +723,213 @@ ACE_OS::strtoul_emulation (const char *nptr, } #endif /* ACE_LACKS_STRTOUL */ + +#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSTOUL) +unsigned long +ACE_OS::wcstoul_emulation (const wchar_t *nptr, + wchar_t **endptr, + int base) +{ + register const wchar_t *s = nptr; + register unsigned long acc; + register int c; + register unsigned long cutoff; + register int neg = 0, any, cutlim; + + /* + * See strtol for comments as to the logic used. + */ + do + c = *s++; + while (ACE_OS::ace_isspace(c)); + if (c == L'-') + { + neg = 1; + c = *s++; + } + else if (c == L'+') + c = *s++; + if ((base == 0 || base == 16) && + c == L'0' && (*s == L'x' || *s == L'X')) + { + c = s[1]; + s += 2; + base = 16; + } + if (base == 0) + base = c == L'0' ? 8 : 10; + cutoff = (unsigned long) ULONG_MAX / (unsigned long) base; + cutlim = (unsigned long) ULONG_MAX % (unsigned long) base; + + for (acc = 0, any = 0;; c = *s++) + { + if (ACE_OS::ace_isdigit(c)) + c -= L'0'; + else if (ACE_OS::ace_isalpha(c)) + c -= ACE_OS::ace_isupper(c) ? L'A' - 10 : L'a' - 10; + else + break; + if (c >= base) + break; + if (any < 0 || acc > cutoff || acc == cutoff && c > cutlim) + any = -1; + else + { + any = 1; + acc *= base; + acc += c; + } + } + if (any < 0) + { + acc = ULONG_MAX; + errno = ERANGE; + } + else if (neg) + acc = -acc; + if (endptr != 0) + *endptr = any ? (wchar_t *) s - 1 : (wchar_t *) nptr; + return (acc); +} +#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSTOUL */ + +#if defined (ACE_LACKS_STRTOLL) +ACE_INT64 +ACE_OS::strtoll_emulation (const char *nptr, + char **endptr, + register int base) +{ + register const char *s = nptr; + register ACE_UINT64 acc; + register int c; + register ACE_UINT64 cutoff; + register int neg = 0, any, cutlim; + + /* + * Skip white space and pick up leading +/- sign if any. + * If base is 0, allow 0x for hex and 0 for octal, else + * assume decimal; if base is already 16, allow 0x. + */ + do { + c = *s++; + } while (ACE_OS::ace_isspace(c)); + if (c == '-') { + neg = 1; + c = *s++; + } else if (c == '+') + c = *s++; + if ((base == 0 || base == 16) && + c == '0' && (*s == 'x' || *s == 'X')) { + c = s[1]; + s += 2; + base = 16; + } + if (base == 0) + base = c == '0' ? 8 : 10; + + /* + * See strtol for comments as to the logic used. + */ + cutoff = neg ? -(ACE_UINT64)ACE_INT64_MIN : ACE_INT64_MAX; + cutlim = cutoff % (ACE_UINT64)base; + cutoff /= (ACE_UINT64)base; + for (acc = 0, any = 0;; c = *s++) { + if (ACE_OS::ace_isdigit(c)) + c -= '0'; + else if (ACE_OS::ace_isalpha(c)) + c -= ACE_OS::ace_isupper(c) ? 'A' - 10 : 'a' - 10; + else + break; + if (c >= base) + break; + if (any < 0 || acc > cutoff || acc == cutoff && c > cutlim) + any = -1; + else { + any = 1; + acc *= base; + acc += c; + } + } + if (any < 0) { + acc = neg ? ACE_INT64_MIN : ACE_INT64_MAX; + errno = ERANGE; + } else if (neg) + acc = -acc; + if (endptr != 0) + *endptr = any ? (char *)s - 1 : (char *)nptr; + return (acc); +} +#endif /* ACE_LACKS_STRTOLL */ + +#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSTOLL) +ACE_INT64 +ACE_OS::wcstoll_emulation (const wchar_t *nptr, + wchar_t **endptr, + int base) +{ + register const wchar_t *s = nptr; + register ACE_UINT64 acc; + register int c; + register ACE_UINT64 cutoff; + register int neg = 0, any, cutlim; + + /* + * Skip white space and pick up leading +/- sign if any. + * If base is 0, allow 0x for hex and 0 for octal, else + * assume decimal; if base is already 16, allow 0x. + */ + do { + c = *s++; + } while (ACE_OS::ace_isspace(c)); + if (c == L'-') { + neg = 1; + c = *s++; + } else if (c == L'+') + c = *s++; + if ((base == 0 || base == 16) && + c == L'0' && (*s == L'x' || *s == L'X')) { + c = s[1]; + s += 2; + base = 16; + } + if (base == 0) + base = c == L'0' ? 8 : 10; + + /* + * See strtol for comments as to the logic used. + */ + cutoff = neg ? -(ACE_UINT64)ACE_INT64_MIN : ACE_INT64_MAX; + cutlim = cutoff % (ACE_UINT64)base; + cutoff /= (ACE_UINT64)base; + for (acc = 0, any = 0;; c = *s++) { + if (ACE_OS::ace_isdigit(c)) + c -= L'0'; + else if (ACE_OS::ace_isalpha(c)) + c -= ACE_OS::ace_isupper(c) ? L'A' - 10 : L'a' - 10; + else + break; + if (c >= base) + break; + if (any < 0 || acc > cutoff || acc == cutoff && c > cutlim) + any = -1; + else { + any = 1; + acc *= base; + acc += c; + } + } + if (any < 0) { + acc = neg ? ACE_INT64_MIN : ACE_INT64_MAX; + errno = ERANGE; + } else if (neg) + acc = -acc; + if (endptr != 0) + *endptr = any ? (wchar_t *)s - 1 : (wchar_t *)nptr; + return (acc); +} +#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSTOLL */ + + #if defined (ACE_LACKS_STRTOULL) ACE_UINT64 ACE_OS::strtoull_emulation (const char *nptr, @@ -735,6 +1000,76 @@ ACE_OS::strtoull_emulation (const char *nptr, } #endif /* ACE_LACKS_STRTOULL */ +#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSTOULL) +ACE_UINT64 +ACE_OS::wcstoull_emulation (const wchar_t *nptr, + wchar_t **endptr, + int base) +{ + register const wchar_t *s = nptr; + register ACE_UINT64 acc; + register int c; + register ACE_UINT64 cutoff; + register int neg = 0, any, cutlim; + + /* + * See strtol for comments as to the logic used. + */ + do + c = *s++; + while (ACE_OS::ace_isspace(c)); + if (c == L'-') + { + neg = 1; + c = *s++; + } + else if (c == L'+') + c = *s++; + if ((base == 0 || base == 16) && + c == L'0' && (*s == L'x' || *s == L'X')) + { + c = s[1]; + s += 2; + base = 16; + } + if (base == 0) + base = c == L'0' ? 8 : 10; + + cutoff = (ACE_UINT64) ACE_UINT64_MAX / (ACE_UINT64) base; + cutlim = (ACE_UINT64) ACE_UINT64_MAX % (ACE_UINT64) base; + + for (acc = 0, any = 0;; c = *s++) + { + if (ACE_OS::ace_isdigit(c)) + c -= L'0'; + else if (ACE_OS::ace_isalpha(c)) + c -= ACE_OS::ace_isupper(c) ? L'A' - 10 : L'a' - 10; + else + break; + if (c >= base) + break; + if (any < 0 || acc > cutoff || acc == cutoff && c > cutlim) + any = -1; + else + { + any = 1; + acc *= base; + acc += c; + } + } + if (any < 0) + { + acc = ACE_UINT64_MAX; + errno = ERANGE; + } + else if (neg) + acc = -acc; + if (endptr != 0) + *endptr = any ? (wchar_t *) s - 1 : (wchar_t *) nptr; + return (acc); +} +#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSTOULL */ + #if defined (ACE_LACKS_MKSTEMP) ACE_HANDLE ACE_OS::mkstemp_emulation (ACE_TCHAR * s) diff --git a/dep/ACE_wrappers/ace/OS_NS_stdlib.h b/dep/ACE_wrappers/ace/OS_NS_stdlib.h index dcc5f7ae4..28e11a96b 100644 --- a/dep/ACE_wrappers/ace/OS_NS_stdlib.h +++ b/dep/ACE_wrappers/ace/OS_NS_stdlib.h @@ -4,7 +4,7 @@ /** * @file OS_NS_stdlib.h * - * $Id: OS_NS_stdlib.h 81804 2008-05-29 16:12:07Z vzykov $ + * $Id: OS_NS_stdlib.h 88493 2010-01-12 19:17:42Z olli $ * * @author Douglas C. Schmidt * @author Jesper S. M|ller @@ -35,10 +35,6 @@ #endif #define ACE_EXPORT_MACRO ACE_Export -# if defined (ACE_HAS_BROKEN_R_ROUTINES) -# undef rand_r -# endif /* ACE_HAS_BROKEN_R_ROUTINES */ - // We need this for MVS... as well as Linux, etc... // On Windows, we explicitly set this up as __cdecl so it's correct even // if building with another calling convention, such as __stdcall. @@ -52,6 +48,42 @@ extern "C" { } #endif /* ACE_WIN32 && _MSC_VER */ +// FreeBSD has atop macro (not related to ACE_OS::atop) +#if defined (atop) +# undef atop +#endif + +/* + * We inline and undef some functions that may be implemented + * as macros on some platforms. This way macro definitions will + * be usable later as there is no way to save the macro definition + * using the pre-processor. + */ + +#if !defined (ACE_LACKS_STRTOLL) && !defined (ACE_STRTOLL_EQUIVALENT) +inline ACE_INT64 ace_strtoll_helper (const char *s, char **ptr, int base) +{ +# if defined (strtoll) + return strtoll (s, ptr, base); +# undef strtoll +# else + return ACE_STD_NAMESPACE::strtoll (s, ptr, base); +# endif /* strtoll */ +} +#endif /* !ACE_LACKS_STRTOLL && !ACE_STRTOLL_EQUIVALENT */ + +#if !defined (ACE_LACKS_STRTOULL) && !defined (ACE_STRTOULL_EQUIVALENT) +inline ACE_INT64 ace_strtoull_helper (const char *s, char **ptr, int base) +{ +# if defined (strtoull) + return strtoull (s, ptr, base); +# undef strtoull +# else + return ACE_STD_NAMESPACE::strtoull (s, ptr, base); +# endif /* strtoull */ +} +#endif /* !ACE_LACKS_STRTOULL && !ACE_STRTOULL_EQUIVALENT */ + ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { @@ -62,34 +94,72 @@ namespace ACE_OS { * */ //@{ - - ACE_NAMESPACE_INLINE_FUNCTION void _exit (int status = 0); ACE_NAMESPACE_INLINE_FUNCTION void abort (void); + /** + * Register an at exit hook. The @a name can be used to analyze shutdown + * problems + */ ACE_NAMESPACE_INLINE_FUNCTION - int atexit (ACE_EXIT_HOOK func); + int atexit (ACE_EXIT_HOOK func, const char* name = 0); + /* + * Convert string to integer + */ ACE_NAMESPACE_INLINE_FUNCTION int atoi (const char *s); # if defined (ACE_HAS_WCHAR) + /* + * Convert string to integer + */ ACE_NAMESPACE_INLINE_FUNCTION int atoi (const wchar_t *s); # endif /* ACE_HAS_WCHAR */ - // atop not in spec -# if defined (atop) -# undef atop -# endif /* atop */ + /* + * Convert string to long + */ + ACE_NAMESPACE_INLINE_FUNCTION + long atol (const char *s); + /* + * Convert string to long + */ +# if defined (ACE_HAS_WCHAR) + ACE_NAMESPACE_INLINE_FUNCTION + long atol (const wchar_t *s); +# endif /* ACE_HAS_WCHAR */ + + /* + * Convert string to double + */ + ACE_NAMESPACE_INLINE_FUNCTION + double atof (const char *s); + + /* + * Convert string to double + */ +# if defined (ACE_HAS_WCHAR) + ACE_NAMESPACE_INLINE_FUNCTION + double atof (const wchar_t *s); +# endif /* ACE_HAS_WCHAR */ + + // atop not in spec + /* + * Convert string to pointer + */ ACE_NAMESPACE_INLINE_FUNCTION void *atop (const char *s); # if defined (ACE_HAS_WCHAR) + /* + * Convert string to pointer + */ ACE_NAMESPACE_INLINE_FUNCTION void *atop (const wchar_t *s); # endif /* ACE_HAS_WCHAR */ @@ -172,7 +242,7 @@ namespace ACE_OS { #else extern ACE_Export ACE_TCHAR *mktemp (ACE_TCHAR *s); -#endif /* !ACE_LACKS_MSTEMP */ +#endif /* !ACE_LACKS_MKTEMP */ ACE_NAMESPACE_INLINE_FUNCTION int putenv (const char *string); @@ -192,6 +262,12 @@ namespace ACE_OS { size_t width, ACE_COMPARE_FUNC); + ACE_NAMESPACE_INLINE_FUNCTION + int setenv(const char *envname, const char *envval, int overwrite); + + ACE_NAMESPACE_INLINE_FUNCTION + int unsetenv(const char *name); + ACE_NAMESPACE_INLINE_FUNCTION int rand (void); @@ -201,7 +277,6 @@ namespace ACE_OS { extern ACE_Export void *realloc (void *, size_t); -#if !defined (ACE_HAS_WINCE) # if !defined (ACE_LACKS_REALPATH) ACE_NAMESPACE_INLINE_FUNCTION # else @@ -213,7 +288,6 @@ namespace ACE_OS { ACE_NAMESPACE_INLINE_FUNCTION wchar_t *realpath (const wchar_t *file_name, wchar_t *resolved_name); # endif /* ACE_HAS_WCHAR */ -#endif /* ACE_HAS_WINCE */ // exit_hook and set_exit_hook not in spec /// Function that is called by , if non-null. @@ -246,27 +320,27 @@ namespace ACE_OS { ACE_NAMESPACE_INLINE_FUNCTION long strtol (const char *s, char **ptr, int base); -#if defined (ACE_HAS_WCHAR) && !defined (ACE_LACKS_WCSTOL) - /// Converts a string to a long value (wchar_t version). - ACE_NAMESPACE_INLINE_FUNCTION - long strtol (const wchar_t *s, wchar_t **ptr, int base); -#endif /* ACE_HAS_WCHAR && !ACE_LACKS_WCSTOL */ - #if defined (ACE_LACKS_STRTOL) extern ACE_Export long strtol_emulation (const char *nptr, char **endptr, int base); #endif /* ACE_LACKS_STRTOL */ +#if defined (ACE_HAS_WCHAR) + /// Converts a string to a long value (wchar_t version). + ACE_NAMESPACE_INLINE_FUNCTION + long strtol (const wchar_t *s, wchar_t **ptr, int base); + +#if defined (ACE_LACKS_WCSTOL) + extern ACE_Export + long wcstol_emulation (const wchar_t *nptr, wchar_t **endptr, int base); +#endif /* ACE_LACKS_WCSTOL */ + +#endif /* ACE_HAS_WCHAR */ + /// Converts a string to an unsigned long value (char version). ACE_NAMESPACE_INLINE_FUNCTION unsigned long strtoul (const char *s, char **ptr, int base); -#if defined (ACE_HAS_WCHAR) && !defined (ACE_LACKS_WCSTOUL) - /// Converts a string to an unsigned long value (wchar_t version). - ACE_NAMESPACE_INLINE_FUNCTION - unsigned long strtoul (const wchar_t *s, wchar_t **ptr, int base); -#endif /* ACE_HAS_WCHAR && !ACE_LACKS_WCSTOUL */ - #if defined (ACE_LACKS_STRTOUL) extern ACE_Export unsigned long strtoul_emulation (const char *nptr, @@ -274,16 +348,49 @@ namespace ACE_OS { int base); #endif /* ACE_LACKS_STRTOUL */ - /// Converts a string to a 64 bit int value (char version). +#if defined (ACE_HAS_WCHAR) + /// Converts a string to an unsigned long value (wchar_t version). + ACE_NAMESPACE_INLINE_FUNCTION + unsigned long strtoul (const wchar_t *s, wchar_t **ptr, int base); + +#if defined (ACE_LACKS_WCSTOUL) + extern ACE_Export + unsigned long wcstoul_emulation (const wchar_t *nptr, + wchar_t **endptr, + int base); +#endif /* ACE_LACKS_WCSTOUL */ + +#endif /* ACE_HAS_WCHAR */ + + /// Converts a string to a signed 64 bit int value (char version). + ACE_NAMESPACE_INLINE_FUNCTION + ACE_INT64 strtoll (const char *s, char **ptr, int base); + +#if defined (ACE_LACKS_STRTOLL) + extern ACE_Export + ACE_INT64 strtoll_emulation (const char *nptr, + char **endptr, + int base); +#endif /* ACE_LACKS_STRTOLL */ + +#if defined (ACE_HAS_WCHAR) + /// Converts a string to a signed 64 bit int value (wchar_t version). + ACE_NAMESPACE_INLINE_FUNCTION + ACE_INT64 strtoll (const wchar_t *s, wchar_t **ptr, int base); + +#if defined (ACE_LACKS_WCSTOLL) + extern ACE_Export + ACE_INT64 wcstoll_emulation (const wchar_t *nptr, + wchar_t **endptr, + int base); +#endif /* ACE_LACKS_WCSTOLL */ + +#endif /* ACE_HAS_WCHAR */ + + /// Converts a string to a unsigned 64 bit int value (char version). ACE_NAMESPACE_INLINE_FUNCTION ACE_UINT64 strtoull (const char *s, char **ptr, int base); -#if defined (ACE_HAS_WCHAR) && !defined (ACE_LACKS_WCSTOULL) - /// Converts a string to a 64 bit int value (wchar_t version). - ACE_NAMESPACE_INLINE_FUNCTION - ACE_UINT64 strtoull (const wchar_t *s, wchar_t **ptr, int base); -#endif /* ACE_HAS_WCHAR && !ACE_LACKS_WCSTOUL */ - #if defined (ACE_LACKS_STRTOULL) extern ACE_Export ACE_UINT64 strtoull_emulation (const char *nptr, @@ -291,6 +398,20 @@ namespace ACE_OS { int base); #endif /* ACE_LACKS_STRTOULL */ +#if defined (ACE_HAS_WCHAR) + /// Converts a string to a unsigned 64 bit int value (wchar_t version). + ACE_NAMESPACE_INLINE_FUNCTION + ACE_UINT64 strtoull (const wchar_t *s, wchar_t **ptr, int base); + +#if defined (ACE_LACKS_WCSTOULL) + extern ACE_Export + ACE_UINT64 wcstoull_emulation (const wchar_t *nptr, + wchar_t **endptr, + int base); +#endif /* ACE_LACKS_WCSTOULL */ + +#endif /* ACE_HAS_WCHAR */ + ACE_NAMESPACE_INLINE_FUNCTION int system (const ACE_TCHAR *s); diff --git a/dep/ACE_wrappers/ace/OS_NS_stdlib.inl b/dep/ACE_wrappers/ace/OS_NS_stdlib.inl index e32929a35..323149fb2 100644 --- a/dep/ACE_wrappers/ace/OS_NS_stdlib.inl +++ b/dep/ACE_wrappers/ace/OS_NS_stdlib.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: OS_NS_stdlib.inl 82643 2008-08-19 14:02:12Z johnnyw $ +// $Id: OS_NS_stdlib.inl 87347 2009-11-05 12:00:29Z olli $ #include "ace/config-all.h" /* Need ACE_TRACE */ #include "ace/Object_Manager_Base.h" @@ -44,9 +44,9 @@ ACE_OS::abort (void) } ACE_INLINE int -ACE_OS::atexit (ACE_EXIT_HOOK func) +ACE_OS::atexit (ACE_EXIT_HOOK func, const char* name) { - return ACE_OS_Object_Manager::instance ()->at_exit (func); + return ACE_OS_Object_Manager::instance ()->at_exit (func, name); } ACE_INLINE int @@ -59,7 +59,7 @@ ACE_OS::atoi (const char *s) ACE_INLINE int ACE_OS::atoi (const wchar_t *s) { -#if defined (ACE_WIN32) +#if defined (ACE_WIN32) && defined (ACE_HAS_WTOI) ACE_OSCALL_RETURN (::_wtoi (s), int, -1); #else /* ACE_WIN32 */ return ACE_OS::atoi (ACE_Wide_To_Ascii (s).char_rep ()); @@ -67,9 +67,43 @@ ACE_OS::atoi (const wchar_t *s) } #endif /* ACE_HAS_WCHAR */ -#if defined (atop) -# undef atop -#endif /* atop */ +ACE_INLINE long +ACE_OS::atol (const char *s) +{ + ACE_OSCALL_RETURN (::atol (s), long, -1); +} + +#if defined (ACE_HAS_WCHAR) +ACE_INLINE long +ACE_OS::atol (const wchar_t *s) +{ +#if defined (ACE_WIN32) && defined (ACE_HAS_WTOL) + ACE_OSCALL_RETURN (::_wtol (s), long, -1); +#else /* ACE_WIN32 */ + return ACE_OS::atol (ACE_Wide_To_Ascii (s).char_rep ()); +#endif /* ACE_WIN32 */ +} +#endif /* ACE_HAS_WCHAR */ + +ACE_INLINE double +ACE_OS::atof (const char *s) +{ + ACE_OSCALL_RETURN (::atof (s), double, -1); +} + +#if defined (ACE_HAS_WCHAR) +ACE_INLINE double +ACE_OS::atof (const wchar_t *s) +{ +#if !defined (ACE_HAS_WTOF) + return ACE_OS::atof (ACE_Wide_To_Ascii (s).char_rep ()); +#elif defined (ACE_WTOF_EQUIVALENT) + ACE_OSCALL_RETURN (ACE_WTOF_EQUIVALENT (s), double, -1); +#else /* ACE_HAS__WTOF */ + ACE_OSCALL_RETURN (::wtof (s), double, -1); +#endif /* ACE_HAS_WTOF */ +} +#endif /* ACE_HAS_WCHAR */ ACE_INLINE void * ACE_OS::atop (const char *s) @@ -133,24 +167,24 @@ ACE_INLINE char * ACE_OS::getenv (const char *symbol) { ACE_OS_TRACE ("ACE_OS::getenv"); -#if defined (ACE_LACKS_ENV) +#if defined (ACE_LACKS_GETENV) ACE_UNUSED_ARG (symbol); ACE_NOTSUP_RETURN (0); -#else /* ACE_LACKS_ENV */ +#else /* ACE_LACKS_GETENV */ ACE_OSCALL_RETURN (::getenv (symbol), char *, 0); -#endif /* ACE_LACKS_ENV */ +#endif /* ACE_LACKS_GETENV */ } #if defined (ACE_HAS_WCHAR) && defined (ACE_WIN32) ACE_INLINE wchar_t * ACE_OS::getenv (const wchar_t *symbol) { -#if defined (ACE_LACKS_ENV) +#if defined (ACE_LACKS_GETENV) ACE_UNUSED_ARG (symbol); ACE_NOTSUP_RETURN (0); #else ACE_OSCALL_RETURN (::_wgetenv (symbol), wchar_t *, 0); -#endif /* ACE_LACKS_ENV */ +#endif /* ACE_LACKS_GETENV */ } #endif /* ACE_HAS_WCHAR && ACE_WIN32 */ @@ -267,21 +301,11 @@ ACE_OS::mktemp (wchar_t *s) #endif /* !ACE_LACKS_MKTEMP */ -#if defined (INTEGRITY) -extern "C" { - int putenv (char *string); -} -#endif - ACE_INLINE int ACE_OS::putenv (const char *string) { ACE_OS_TRACE ("ACE_OS::putenv"); -#if defined (ACE_HAS_WINCE) - // WinCE don't have the concept of environment variables. - ACE_UNUSED_ARG (string); - ACE_NOTSUP_RETURN (-1); -#elif defined (ACE_LACKS_PUTENV) && defined (ACE_HAS_SETENV) +#if defined (ACE_LACKS_PUTENV) && defined (ACE_HAS_SETENV) int result = 0; char *sp = ACE_OS::strchr (const_cast (string), '='); if (sp) @@ -290,7 +314,7 @@ ACE_OS::putenv (const char *string) if (stmp) { stmp[sp - string] = '\0'; - ACE_OSCALL (::setenv (stmp, sp+sizeof (char), 1), int, -1, result); + result = ACE_OS::setenv (stmp, sp+sizeof (char), 1); ACE_OS::free (stmp); } else @@ -300,15 +324,46 @@ ACE_OS::putenv (const char *string) } } else - ACE_OSCALL (::setenv (string, "", 1), int, -1, result); + { + result = ACE_OS::setenv (string, "", 1); + } return result; -#elif defined (ACE_LACKS_ENV) || defined (ACE_LACKS_PUTENV) +#elif defined (ACE_LACKS_PUTENV) ACE_UNUSED_ARG (string); ACE_NOTSUP_RETURN (0); #else /* ! ACE_HAS_WINCE */ ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::putenv (const_cast (string)), int, -1); -#endif /* ACE_HAS_WINCE */ +#endif /* ACE_LACKS_PUTENV && ACE_HAS_SETENV */ +} + +ACE_INLINE int +ACE_OS::setenv(const char *envname, const char *envval, int overwrite) +{ +#if defined (ACE_LACKS_SETENV) + ACE_UNUSED_ARG (envname); + ACE_UNUSED_ARG (envval); + ACE_UNUSED_ARG (overwrite); + ACE_NOTSUP_RETURN (-1); +#else + ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::setenv (envname, envval, overwrite), int, -1); +#endif +} + +ACE_INLINE int +ACE_OS::unsetenv(const char *name) +{ +#if defined (ACE_LACKS_UNSETENV) + ACE_UNUSED_ARG (name); + ACE_NOTSUP_RETURN (-1); +#else +# if defined (ACE_HAS_VOID_UNSETENV) + ::unsetenv (name); + return 0; +#else + ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::unsetenv (name), int, -1); +# endif /* ACE_HAS_VOID_UNSETENV */ +#endif /* ACE_LACKS_UNSETENV */ } #if defined (ACE_HAS_WCHAR) && defined (ACE_WIN32) @@ -316,13 +371,12 @@ ACE_INLINE int ACE_OS::putenv (const wchar_t *string) { ACE_OS_TRACE ("ACE_OS::putenv"); -#if defined (ACE_HAS_WINCE) - // WinCE doesn't have the concept of environment variables. +#if defined (ACE_LACKS_PUTENV) ACE_UNUSED_ARG (string); ACE_NOTSUP_RETURN (-1); #else ACE_OSCALL_RETURN (::_wputenv (string), int, -1); -#endif /* ACE_HAS_WINCE */ +#endif /* ACE_LACKS_PUTENV */ } #endif /* ACE_HAS_WCHAR && ACE_WIN32 */ @@ -390,7 +444,6 @@ ACE_OS::rand_r (ACE_RANDR_TYPE& seed) #endif /* !ACE_WIN32 */ -#if !defined (ACE_HAS_WINCE) # if !defined (ACE_LACKS_REALPATH) ACE_INLINE char * ACE_OS::realpath (const char *file_name, @@ -402,7 +455,6 @@ ACE_OS::realpath (const char *file_name, return ::realpath (file_name, resolved_name); # endif /* ! ACE_WIN32 */ } -# endif /* !ACE_LACKS_REALPATH */ # if defined (ACE_HAS_WCHAR) ACE_INLINE wchar_t * @@ -467,13 +519,17 @@ ACE_OS::strtol (const char *s, char **ptr, int base) #endif /* ACE_LACKS_STRTOL */ } -#if defined (ACE_HAS_WCHAR) && !defined (ACE_LACKS_WCSTOL) +#if defined (ACE_HAS_WCHAR) ACE_INLINE long ACE_OS::strtol (const wchar_t *s, wchar_t **ptr, int base) { +#if defined (ACE_LACKS_WCSTOL) + return ACE_OS::wcstol_emulation (s, ptr, base); +#else return ACE_WCHAR_STD_NAMESPACE::wcstol (s, ptr, base); +#endif /* ACE_LACKS_WCSTOL */ } -#endif /* ACE_HAS_WCHAR && !ACE_LACKS_WCSTOL */ +#endif /* ACE_HAS_WCHAR */ ACE_INLINE unsigned long ACE_OS::strtoul (const char *s, char **ptr, int base) @@ -485,13 +541,43 @@ ACE_OS::strtoul (const char *s, char **ptr, int base) #endif /* ACE_LACKS_STRTOUL */ } -#if defined (ACE_HAS_WCHAR) && !defined (ACE_LACKS_WCSTOUL) +#if defined (ACE_HAS_WCHAR) ACE_INLINE unsigned long ACE_OS::strtoul (const wchar_t *s, wchar_t **ptr, int base) { +#if defined (ACE_LACKS_WCSTOUL) + return ACE_OS::wcstoul_emulation (s, ptr, base); +#else return ACE_WCHAR_STD_NAMESPACE::wcstoul (s, ptr, base); +#endif /* ACE_LACKS_WCSTOUL */ } -#endif /* ACE_HAS_WCHAR && !ACE_LACKS_WCSTOUL */ +#endif /* ACE_HAS_WCHAR */ + +ACE_INLINE ACE_INT64 +ACE_OS::strtoll (const char *s, char **ptr, int base) +{ +#if defined (ACE_LACKS_STRTOLL) + return ACE_OS::strtoll_emulation (s, ptr, base); +#elif defined (ACE_STRTOLL_EQUIVALENT) + return ACE_STRTOLL_EQUIVALENT (s, ptr, base); +#else + return ace_strtoll_helper (s, ptr, base); +#endif /* ACE_LACKS_STRTOLL */ +} + +#if defined (ACE_HAS_WCHAR) +ACE_INLINE ACE_INT64 +ACE_OS::strtoll (const wchar_t *s, wchar_t **ptr, int base) +{ +#if defined (ACE_LACKS_WCSTOLL) + return ACE_OS::wcstoll_emulation (s, ptr, base); +#elif defined (ACE_WCSTOLL_EQUIVALENT) + return ACE_WCSTOLL_EQUIVALENT (s, ptr, base); +#else + return ACE_WCHAR_STD_NAMESPACE::wcstoll (s, ptr, base); +#endif /* ACE_LACKS_WCSTOLL */ +} +#endif /* ACE_HAS_WCHAR */ ACE_INLINE ACE_UINT64 ACE_OS::strtoull (const char *s, char **ptr, int base) @@ -501,21 +587,23 @@ ACE_OS::strtoull (const char *s, char **ptr, int base) #elif defined (ACE_STRTOULL_EQUIVALENT) return ACE_STRTOULL_EQUIVALENT (s, ptr, base); #else - return ::strtoull (s, ptr, base); + return ace_strtoull_helper (s, ptr, base); #endif /* ACE_LACKS_STRTOULL */ } -#if defined (ACE_HAS_WCHAR) && !defined (ACE_LACKS_WCSTOULL) +#if defined (ACE_HAS_WCHAR) ACE_INLINE ACE_UINT64 ACE_OS::strtoull (const wchar_t *s, wchar_t **ptr, int base) { -#if defined (ACE_WCSTOOULL_EQUIVALENT) - return ACE_WCSTOOULL_EQUIVALENT (s, ptr, base); +#if defined (ACE_LACKS_WCSTOULL) + return ACE_OS::wcstoull_emulation (s, ptr, base); +#elif defined (ACE_WCSTOULL_EQUIVALENT) + return ACE_WCSTOULL_EQUIVALENT (s, ptr, base); #else return ACE_WCHAR_STD_NAMESPACE::wcstoull (s, ptr, base); -#endif /* ACE_WIN32 */ +#endif /* ACE_LACKS_WCSTOULL */ } -#endif /* ACE_HAS_WCHAR && !ACE_LACKS_WCSTOULL */ +#endif /* ACE_HAS_WCHAR */ ACE_INLINE int ACE_OS::system (const ACE_TCHAR *s) diff --git a/dep/ACE_wrappers/ace/OS_NS_string.cpp b/dep/ACE_wrappers/ace/OS_NS_string.cpp index cd5da7ee5..93e112d60 100644 --- a/dep/ACE_wrappers/ace/OS_NS_string.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_string.cpp @@ -1,25 +1,14 @@ -// $Id: OS_NS_string.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: OS_NS_string.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $ -#include "ace/OS_NS_string.h" -#include "ace/OS_NS_stdlib.h" #include "ace/ACE.h" - -ACE_RCSID (ace, - OS_NS_string, - "$Id: OS_NS_string.cpp 80826 2008-03-04 14:51:23Z wotte $") +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_stdlib.h" #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_NS_string.inl" #endif /* ACE_HAS_INLINED_OSCALLS */ -#if defined (ACE_HAS_WCHAR) -# include "ace/OS_NS_stdlib.h" -#endif /* ACE_HAS_WCHAR */ - -#if !defined (ACE_LACKS_STRERROR) -# include "ace/OS_NS_stdio.h" -#endif /* ACE_LACKS_STRERROR */ - ACE_BEGIN_VERSIONED_NAMESPACE_DECL #if defined (ACE_LACKS_MEMCHR) @@ -125,6 +114,9 @@ ACE_OS::strerror (int errnum) errmsg = ret_errortext; ACE_SECURECRTCALL (strerror_s (ret_errortext, sizeof(ret_errortext), errnum), char *, 0, errmsg); + if (errnum < 0 || errnum >= _sys_nerr) + g = EINVAL; + return errmsg; #elif defined (ACE_WIN32) if (errnum < 0 || errnum >= _sys_nerr) @@ -147,12 +139,48 @@ ACE_OS::strerror (int errnum) * Just returns "Unknown Error" all the time. */ char * -ACE_OS::strerror_emulation (int errnum) +ACE_OS::strerror_emulation (int) { - return "Unknown Error"; + return const_cast ("Unknown Error"); } #endif /* ACE_LACKS_STRERROR */ + +char * +ACE_OS::strsignal (int signum) +{ + static char signal_text[128]; +#if defined (ACE_HAS_STRSIGNAL) + char *ret_val = 0; + +# if defined (ACE_NEEDS_STRSIGNAL_RANGE_CHECK) + if (signum < 0 || signum >= ACE_NSIG) + ret_val = 0; + else +# endif /* (ACE_NEEDS_STRSIGNAL_RANGE_CHECK */ + ret_val = ACE_STD_NAMESPACE::strsignal (signum); + + if (ret_val <= reinterpret_cast (0)) + { + ACE_OS::sprintf (signal_text, "Unknown signal: %d", signum); + ret_val = signal_text; + } + return ret_val; +#else + if (signum < 0 || signum >= ACE_NSIG) + { + ACE_OS::sprintf (signal_text, "Unknown signal: %d", signum); + return signal_text; + } +# if defined (ACE_SYS_SIGLIST) + return ACE_SYS_SIGLIST[signum]; +# else + ACE_OS::sprintf (signal_text, "Signal: %d", signum); + return signal_text; +# endif /* ACE_SYS_SIGLIST */ +#endif /* ACE_HAS_STRSIGNAL */ +} + const char * ACE_OS::strnchr (const char *s, int c, size_t len) { @@ -167,8 +195,12 @@ const ACE_WCHAR_T * ACE_OS::strnchr (const ACE_WCHAR_T *s, ACE_WCHAR_T c, size_t len) { for (size_t i = 0; i < len; ++i) - if (s[i] == c) - return s + i; + { + if (s[i] == c) + { + return s + i; + } + } return 0; } @@ -189,8 +221,10 @@ ACE_OS::strnstr (const char *s1, const char *s2, size_t len2) for (size_t i = 0; i <= len; i++) { if (ACE_OS::memcmp (s1 + i, s2, len2) == 0) - // Found a match! Return the index. - return s1 + i; + { + // Found a match! Return the index. + return s1 + i; + } } return 0; @@ -200,20 +234,22 @@ const ACE_WCHAR_T * ACE_OS::strnstr (const ACE_WCHAR_T *s1, const ACE_WCHAR_T *s2, size_t len2) { // Substring length - const size_t len1 = ACE_OS::strlen (s1); + size_t const len1 = ACE_OS::strlen (s1); // Check if the substring is longer than the string being searched. if (len2 > len1) return 0; // Go upto - const size_t len = len1 - len2; + size_t const len = len1 - len2; for (size_t i = 0; i <= len; i++) { if (ACE_OS::memcmp (s1 + i, s2, len2 * sizeof (ACE_WCHAR_T)) == 0) - // Found a match! Return the index. - return s1 + i; + { + // Found a match! Return the index. + return s1 + i; + } } return 0; @@ -293,7 +329,9 @@ ACE_OS::strsncpy (char *dst, const char *src, size_t maxlen) { *rdst = '\0'; if (rsrc != 0) - strncat (rdst, rsrc, --rmaxlen); + { + ACE_OS::strncat (rdst, rsrc, --rmaxlen); + } } else { @@ -313,11 +351,13 @@ ACE_OS::strsncpy (ACE_WCHAR_T *dst, const ACE_WCHAR_T *src, size_t maxlen) if (rmaxlen > 0) { - if (rdst!=rsrc) + if (rdst!= rsrc) { *rdst = ACE_TEXT_WIDE ('\0'); if (rsrc != 0) - strncat (rdst, rsrc, --rmaxlen); + { + ACE_OS::strncat (rdst, rsrc, --rmaxlen); + } } else { @@ -339,11 +379,11 @@ ACE_OS::strtok_r_emulation (char *s, const char *tokens, char **lasts) *lasts = s; if (*s == 0) // We have reached the end return 0; - size_t l_org = ACE_OS::strlen (s); + size_t const l_org = ACE_OS::strlen (s); s = ::strtok (s, tokens); if (s == 0) return 0; - const size_t l_sub = ACE_OS::strlen (s); + size_t const l_sub = ACE_OS::strlen (s); if (s + l_sub < *lasts + l_org) *lasts = s + l_sub + 1; else diff --git a/dep/ACE_wrappers/ace/OS_NS_string.h b/dep/ACE_wrappers/ace/OS_NS_string.h index dd6020a70..2497f2c0c 100644 --- a/dep/ACE_wrappers/ace/OS_NS_string.h +++ b/dep/ACE_wrappers/ace/OS_NS_string.h @@ -4,7 +4,7 @@ /** * @file OS_NS_string.h * - * $Id: OS_NS_string.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: OS_NS_string.h 87481 2009-11-11 11:46:10Z olli $ * * @author Douglas C. Schmidt * @author Jesper S. M|ller @@ -183,11 +183,9 @@ namespace ACE_OS { wchar_t *strecpy (wchar_t *s, const wchar_t *t); #endif /* ACE_HAS_WCHAR */ - /* - ** Returns a system error message. If the supplied errnum is out of range, - ** a string of the form "Unknown error %d" is used to format the string - ** whose pointer is returned and errno is set to EINVAL. - */ + /// Returns a system error message. If the supplied errnum is out of range, + /// a string of the form "Unknown error %d" is used to format the string + /// whose pointer is returned and errno is set to EINVAL. extern ACE_Export char *strerror (int errnum); @@ -197,6 +195,14 @@ namespace ACE_OS { char *strerror_emulation (int errnum); #endif /* ACE_LACKS_STRERROR */ + + /// Returns a string describing the signal number passed in the + /// argument signum. If the supplied signal number is out of range, + /// a string of the form "Unknown signal %d" is used to format the string + /// whose pointer is returned. + extern ACE_Export + char *strsignal (int signum); + /// Finds the length of a string (char version). ACE_NAMESPACE_INLINE_FUNCTION size_t strlen (const char *s); diff --git a/dep/ACE_wrappers/ace/OS_NS_string.inl b/dep/ACE_wrappers/ace/OS_NS_string.inl index 8b9d15f30..cb7b2c295 100644 --- a/dep/ACE_wrappers/ace/OS_NS_string.inl +++ b/dep/ACE_wrappers/ace/OS_NS_string.inl @@ -7,6 +7,12 @@ #include "ace/OS_NS_wchar.h" #include "ace/os_include/os_string.h" +// MaNGOS include begin +#if defined (_MSC_VER) +# pragma warning(disable:4996) +#endif +// MaNGOS include end + ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE const void * diff --git a/dep/ACE_wrappers/ace/OS_NS_strings.cpp b/dep/ACE_wrappers/ace/OS_NS_strings.cpp index 5b5cfcf49..3727ff389 100644 --- a/dep/ACE_wrappers/ace/OS_NS_strings.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_strings.cpp @@ -1,8 +1,8 @@ -// $Id: OS_NS_strings.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: OS_NS_strings.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/OS_NS_strings.h" -ACE_RCSID(ace, OS_NS_strings, "$Id: OS_NS_strings.cpp 80826 2008-03-04 14:51:23Z wotte $") + #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_NS_strings.inl" diff --git a/dep/ACE_wrappers/ace/OS_NS_stropts.cpp b/dep/ACE_wrappers/ace/OS_NS_stropts.cpp index 847340b9a..4a81a1f5b 100644 --- a/dep/ACE_wrappers/ace/OS_NS_stropts.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_stropts.cpp @@ -1,8 +1,8 @@ -// $Id: OS_NS_stropts.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: OS_NS_stropts.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/OS_NS_stropts.h" -ACE_RCSID(ace, OS_NS_stropts, "$Id: OS_NS_stropts.cpp 80826 2008-03-04 14:51:23Z wotte $") + #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_NS_stropts.inl" @@ -47,7 +47,6 @@ ACE_OS::ioctl (ACE_HANDLE socket, # endif /* ACE_HAS_WINSOCK2 */ } -#if !(defined (ACE_HAS_WINCE) && (UNDER_CE < 500)) int ACE_OS::ioctl (ACE_HANDLE socket, unsigned long io_control_code, @@ -190,6 +189,5 @@ ACE_OS::ioctl (ACE_HANDLE socket, ACE_NOTSUP_RETURN (-1); # endif /* ACE_HAS_WINSOCK2 */ } -#endif /* !(defined (ACE_HAS_WINCE) && (UNDER_CE < 500)) */ ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/OS_NS_stropts.h b/dep/ACE_wrappers/ace/OS_NS_stropts.h index 7be61a754..5b96b617c 100644 --- a/dep/ACE_wrappers/ace/OS_NS_stropts.h +++ b/dep/ACE_wrappers/ace/OS_NS_stropts.h @@ -4,7 +4,7 @@ /** * @file OS_NS_stropts.h * - * $Id: OS_NS_stropts.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: OS_NS_stropts.h 85110 2009-04-20 09:18:43Z msmit $ * * @author Douglas C. Schmidt * @author Jesper S. M|ller @@ -108,13 +108,13 @@ namespace ACE_OS { ACE_NAMESPACE_INLINE_FUNCTION int fdetach (const char *file); - /// UNIX-style . + /// UNIX-style @c ioctl ACE_NAMESPACE_INLINE_FUNCTION int ioctl (ACE_HANDLE handle, ACE_IOCTL_TYPE_ARG2 cmd, void * = 0); - /// QoS-enabled . + /// QoS-enabled @c ioctl extern ACE_Export int ioctl (ACE_HANDLE socket, unsigned long io_control_code, @@ -126,8 +126,7 @@ namespace ACE_OS { ACE_OVERLAPPED *overlapped, ACE_OVERLAPPED_COMPLETION_FUNC func); -#if !(defined (ACE_HAS_WINCE) && (UNDER_CE < 500)) - /// QoS-enabled when the I/O control code is either + /// QoS-enabled @c ioctl when the I/O control code is either /// SIO_SET_QOS or SIO_GET_QOS. extern ACE_Export int ioctl (ACE_HANDLE socket, @@ -138,7 +137,6 @@ namespace ACE_OS { unsigned long buffer = 0, ACE_OVERLAPPED *overlapped = 0, ACE_OVERLAPPED_COMPLETION_FUNC func = 0); -#endif /* !(defined (ACE_HAS_WINCE) && (UNDER_CE < 500)) */ ACE_NAMESPACE_INLINE_FUNCTION int isastream (ACE_HANDLE handle); diff --git a/dep/ACE_wrappers/ace/OS_NS_sys_mman.cpp b/dep/ACE_wrappers/ace/OS_NS_sys_mman.cpp index d0b02a9e0..340511eb0 100644 --- a/dep/ACE_wrappers/ace/OS_NS_sys_mman.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_sys_mman.cpp @@ -1,8 +1,8 @@ -// $Id: OS_NS_sys_mman.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: OS_NS_sys_mman.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/OS_NS_sys_mman.h" -ACE_RCSID(ace, OS_NS_sys_mman, "$Id: OS_NS_sys_mman.cpp 80826 2008-03-04 14:51:23Z wotte $") + #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_NS_sys_mman.inl" diff --git a/dep/ACE_wrappers/ace/OS_NS_sys_mman.inl b/dep/ACE_wrappers/ace/OS_NS_sys_mman.inl index de5935fb9..fb8a9a0b6 100644 --- a/dep/ACE_wrappers/ace/OS_NS_sys_mman.inl +++ b/dep/ACE_wrappers/ace/OS_NS_sys_mman.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: OS_NS_sys_mman.inl 82171 2008-06-25 13:32:01Z jtc $ +// $Id: OS_NS_sys_mman.inl 85429 2009-05-25 09:53:48Z johnnyw $ #include "ace/OS_NS_fcntl.h" #include "ace/OS_NS_unistd.h" @@ -75,10 +75,14 @@ ACE_OS::mmap (void *addr, if (ACE_BIT_ENABLED (flags, MAP_PRIVATE)) { -# if !defined(ACE_HAS_WINCE) +# if defined(ACE_HAS_WINCE) + // PAGE_WRITECOPY is not avaible on CE, but this should be the same + // as PAGE_READONLY according to MSDN + nt_flags = FILE_MAP_ALL_ACCESS; +# else prot = PAGE_WRITECOPY; -# endif // ACE_HAS_WINCE nt_flags = FILE_MAP_COPY; +# endif // ACE_HAS_WINCE } else if (ACE_BIT_ENABLED (flags, MAP_SHARED)) { @@ -93,7 +97,7 @@ ACE_OS::mmap (void *addr, { SECURITY_ATTRIBUTES sa_buffer; SECURITY_DESCRIPTOR sd_buffer; - const LPSECURITY_ATTRIBUTES attr = + LPSECURITY_ATTRIBUTES const attr = ACE_OS::default_win32_security_attributes_r (sa, &sa_buffer, &sd_buffer); @@ -102,7 +106,7 @@ ACE_OS::mmap (void *addr, attr, prot, 0, - 0, + (file_handle == ACE_INVALID_HANDLE) ? len : 0, file_mapping_name); } @@ -116,20 +120,20 @@ ACE_OS::mmap (void *addr, DWORD low_off = ACE_LOW_PART (off); DWORD high_off = ACE_HIGH_PART (off); -# if !defined (ACE_HAS_WINCE) +# if defined (ACE_HAS_WINCE) + void *addr_mapping = ::MapViewOfFile (*file_mapping, + nt_flags, + high_off, + low_off, + len); +# else void *addr_mapping = ::MapViewOfFileEx (*file_mapping, nt_flags, high_off, low_off, len, addr); -# else - void *addr_mapping = ::MapViewOfFile (*file_mapping, - nt_flags, - high_off, - low_off, - len); -# endif /* ! ACE_HAS_WINCE */ +# endif /* ACE_HAS_WINCE */ // Only close this down if we used the temporary. if (file_mapping == &local_handle) @@ -239,7 +243,7 @@ ACE_OS::shm_open (const ACE_TCHAR *filename, ACE_OS_TRACE ("ACE_OS::shm_open"); #if defined (ACE_HAS_SHM_OPEN) ACE_UNUSED_ARG (sa); -#if defined (ACE_VXWORKS) && (ACE_VXWORKS <= 0x650) +#if defined (ACE_VXWORKS) && (ACE_VXWORKS <= 0x670) // With VxWorks the file should just start with / and no other // slashes, so replace all other / by _ ACE_TCHAR buf [MAXPATHLEN + 1]; @@ -271,7 +275,7 @@ ACE_OS::shm_unlink (const ACE_TCHAR *path) { ACE_OS_TRACE ("ACE_OS::shm_unlink"); #if defined (ACE_HAS_SHM_OPEN) -#if defined (ACE_VXWORKS) && (ACE_VXWORKS <= 0x650) +#if defined (ACE_VXWORKS) && (ACE_VXWORKS <= 0x670) // With VxWorks the file should just start with / and no other // slashes, so replace all other / by _ ACE_TCHAR buf [MAXPATHLEN + 1]; diff --git a/dep/ACE_wrappers/ace/OS_NS_sys_msg.cpp b/dep/ACE_wrappers/ace/OS_NS_sys_msg.cpp index 3e2b177b7..d59e47e7c 100644 --- a/dep/ACE_wrappers/ace/OS_NS_sys_msg.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_sys_msg.cpp @@ -1,8 +1,8 @@ -// $Id: OS_NS_sys_msg.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: OS_NS_sys_msg.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/OS_NS_sys_msg.h" -ACE_RCSID(ace, OS_NS_sys_msg, "$Id: OS_NS_sys_msg.cpp 80826 2008-03-04 14:51:23Z wotte $") + #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_NS_sys_msg.inl" diff --git a/dep/ACE_wrappers/ace/OS_NS_sys_resource.cpp b/dep/ACE_wrappers/ace/OS_NS_sys_resource.cpp index 58d29f604..fae8b0542 100644 --- a/dep/ACE_wrappers/ace/OS_NS_sys_resource.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_sys_resource.cpp @@ -1,8 +1,8 @@ -// $Id: OS_NS_sys_resource.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: OS_NS_sys_resource.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/OS_NS_sys_resource.h" -ACE_RCSID(ace, OS_NS_sys_resource, "$Id: OS_NS_sys_resource.cpp 80826 2008-03-04 14:51:23Z wotte $") + #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_NS_sys_resource.inl" diff --git a/dep/ACE_wrappers/ace/OS_NS_sys_select.cpp b/dep/ACE_wrappers/ace/OS_NS_sys_select.cpp index 9c6588ad4..6ea47ea28 100644 --- a/dep/ACE_wrappers/ace/OS_NS_sys_select.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_sys_select.cpp @@ -1,8 +1,8 @@ -// $Id: OS_NS_sys_select.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: OS_NS_sys_select.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/OS_NS_sys_select.h" -ACE_RCSID(ace, OS_NS_sys_select, "$Id: OS_NS_sys_select.cpp 80826 2008-03-04 14:51:23Z wotte $") + #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_NS_sys_select.inl" diff --git a/dep/ACE_wrappers/ace/OS_NS_sys_sendfile.cpp b/dep/ACE_wrappers/ace/OS_NS_sys_sendfile.cpp index 8f48c7a20..3bb74becc 100644 --- a/dep/ACE_wrappers/ace/OS_NS_sys_sendfile.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_sys_sendfile.cpp @@ -1,4 +1,4 @@ -// $Id: OS_NS_sys_sendfile.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: OS_NS_sys_sendfile.cpp 84216 2009-01-22 18:34:40Z johnnyw $ #include "ace/OS_NS_sys_sendfile.h" #include "ace/OS_NS_sys_mman.h" @@ -15,7 +15,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -#ifndef ACE_HAS_SENDFILE +#if defined ACE_HAS_SENDFILE && ACE_HAS_SENDFILE == 0 ssize_t ACE_OS::sendfile_emulation (ACE_HANDLE out_fd, ACE_HANDLE in_fd, @@ -48,6 +48,6 @@ ACE_OS::sendfile_emulation (ACE_HANDLE out_fd, return r; } -#endif /* !ACE_HAS_SENDFILE */ +#endif /* ACE_HAS_SENDFILE==0 */ ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/OS_NS_sys_sendfile.h b/dep/ACE_wrappers/ace/OS_NS_sys_sendfile.h index 621444f3c..b39f2a1ec 100644 --- a/dep/ACE_wrappers/ace/OS_NS_sys_sendfile.h +++ b/dep/ACE_wrappers/ace/OS_NS_sys_sendfile.h @@ -4,7 +4,7 @@ /** * @file OS_NS_sys_sendfile.h * - * $Id: OS_NS_sys_sendfile.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: OS_NS_sys_sendfile.h 84216 2009-01-22 18:34:40Z johnnyw $ * * @author Ossama Othman */ @@ -22,6 +22,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Basic_Types.h" /* For ssize_t and off_t. */ +#include "ace/config-all.h" #if defined (ACE_EXPORT_MACRO) # undef ACE_EXPORT_MACRO @@ -40,13 +41,13 @@ namespace ACE_OS off_t * offset, size_t count); -#ifndef ACE_HAS_SENDFILE +#if defined ACE_HAS_SENDFILE && ACE_HAS_SENDFILE == 0 extern ACE_Export ssize_t sendfile_emulation (ACE_HANDLE out_fd, ACE_HANDLE in_fd, off_t * offset, size_t count); -#endif /* !ACE_HAS_SENDFILE */ +#endif /* ACE_HAS_SENDFILE==0 */ } diff --git a/dep/ACE_wrappers/ace/OS_NS_sys_sendfile.inl b/dep/ACE_wrappers/ace/OS_NS_sys_sendfile.inl index 72270e8f3..9ea878c43 100644 --- a/dep/ACE_wrappers/ace/OS_NS_sys_sendfile.inl +++ b/dep/ACE_wrappers/ace/OS_NS_sys_sendfile.inl @@ -1,10 +1,10 @@ // -*- C++ -*- // -// $Id: OS_NS_sys_sendfile.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: OS_NS_sys_sendfile.inl 84216 2009-01-22 18:34:40Z johnnyw $ -#ifdef ACE_HAS_SENDFILE +#if defined ACE_HAS_SENDFILE && ACE_HAS_SENDFILE == 1 # include -#endif /* ACE_HAS_SENDFILE */ +#endif /* ACE_HAS_SENDFILE==1 */ ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -14,11 +14,11 @@ ACE_OS::sendfile (ACE_HANDLE out_fd, off_t * offset, size_t count) { -#ifdef ACE_HAS_SENDFILE +#if defined ACE_HAS_SENDFILE && ACE_HAS_SENDFILE == 1 return ::sendfile (out_fd, in_fd, offset, count); #else return ACE_OS::sendfile_emulation (out_fd, in_fd, offset, count); -#endif /* ACE_HAS_SENDFILE */ +#endif /* ACE_HAS_SENDFILE==1 */ } ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/OS_NS_sys_shm.cpp b/dep/ACE_wrappers/ace/OS_NS_sys_shm.cpp index 4c2353935..3ceebcb68 100644 --- a/dep/ACE_wrappers/ace/OS_NS_sys_shm.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_sys_shm.cpp @@ -1,8 +1,8 @@ -// $Id: OS_NS_sys_shm.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: OS_NS_sys_shm.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/OS_NS_sys_shm.h" -ACE_RCSID(ace, OS_NS_sys_shm, "$Id: OS_NS_sys_shm.cpp 80826 2008-03-04 14:51:23Z wotte $") + #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_NS_sys_shm.inl" diff --git a/dep/ACE_wrappers/ace/OS_NS_sys_socket.cpp b/dep/ACE_wrappers/ace/OS_NS_sys_socket.cpp index 36fc8a946..3ce26a824 100644 --- a/dep/ACE_wrappers/ace/OS_NS_sys_socket.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_sys_socket.cpp @@ -1,8 +1,8 @@ -// $Id: OS_NS_sys_socket.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: OS_NS_sys_socket.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/OS_NS_sys_socket.h" -ACE_RCSID(ace, OS_NS_sys_socket, "$Id: OS_NS_sys_socket.cpp 80826 2008-03-04 14:51:23Z wotte $") + #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_NS_sys_socket.inl" @@ -14,7 +14,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL int ACE_OS::socket_initialized_; #endif /* ACE_WIN32 */ -#if !(defined (ACE_HAS_WINCE) && (UNDER_CE < 500)) ACE_HANDLE ACE_OS::accept (ACE_HANDLE handle, struct sockaddr *addr, @@ -95,7 +94,6 @@ ACE_OS::join_leaf (ACE_HANDLE socket, ACE_NOTSUP_RETURN (ACE_INVALID_HANDLE); # endif /* ACE_HAS_WINSOCK2 */ } -#endif /* !(defined (ACE_HAS_WINCE) && (UNDER_CE < 500)) */ int ACE_OS::socket_init (int version_high, int version_low) diff --git a/dep/ACE_wrappers/ace/OS_NS_sys_socket.h b/dep/ACE_wrappers/ace/OS_NS_sys_socket.h index 3f0fe8799..fc5d8901c 100644 --- a/dep/ACE_wrappers/ace/OS_NS_sys_socket.h +++ b/dep/ACE_wrappers/ace/OS_NS_sys_socket.h @@ -4,7 +4,7 @@ /** * @file OS_NS_sys_socket.h * - * $Id: OS_NS_sys_socket.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: OS_NS_sys_socket.h 85110 2009-04-20 09:18:43Z msmit $ * * @author Douglas C. Schmidt * @author Jesper S. M|ller @@ -74,24 +74,22 @@ namespace ACE_OS # endif /* ACE_WIN32 */ //@{ @name A set of wrappers for sockets. - /// BSD-style (no QoS). + /// BSD-style @c accept (no QoS). ACE_NAMESPACE_INLINE_FUNCTION ACE_HANDLE accept (ACE_HANDLE handle, struct sockaddr *addr, int *addrlen); -#if !(defined (ACE_HAS_WINCE) && (UNDER_CE < 500)) /** - * QoS-enabled , which passes @a qos_params to . If - * the OS platform doesn't support QoS-enabled then the - * @a qos_params are ignored and the BSD-style is called. + * QoS-enabled @c accept, which passes @a qos_params to @c accept. If + * the OS platform doesn't support QoS-enabled @c accept then the + * @a qos_params are ignored and the BSD-style @c accept is called. */ extern ACE_Export ACE_HANDLE accept (ACE_HANDLE handle, struct sockaddr *addr, int *addrlen, const ACE_Accept_QoS_Params &qos_params); -#endif /* !(defined (ACE_HAS_WINCE) && (UNDER_CE < 500)) */ ACE_NAMESPACE_INLINE_FUNCTION int bind (ACE_HANDLE s, @@ -102,24 +100,22 @@ namespace ACE_OS ACE_NAMESPACE_INLINE_FUNCTION int closesocket (ACE_HANDLE s); - /// BSD-style (no QoS). + /// BSD-style @c connect (no QoS). ACE_NAMESPACE_INLINE_FUNCTION int connect (ACE_HANDLE handle, struct sockaddr *addr, int addrlen); -#if !(defined (ACE_HAS_WINCE) && (UNDER_CE < 500)) /** - * QoS-enabled , which passes @a qos_params to . - * If the OS platform doesn't support QoS-enabled then the - * @a qos_params are ignored and the BSD-style is called. + * QoS-enabled @c connect, which passes @a qos_params to @c connect. + * If the OS platform doesn't support QoS-enabled @c connect then the + * @a qos_params are ignored and the BSD-style @c connect is called. */ extern ACE_Export int connect (ACE_HANDLE handle, const sockaddr *addr, int addrlen, const ACE_QoS_Params &qos_params); -#endif /* !(defined (ACE_HAS_WINCE) && (UNDER_CE < 500)) */ /// Retrieve information about available transport protocols /// installed on the local machine. Windows specific... @@ -144,14 +140,12 @@ namespace ACE_OS char *optval, int *optlen); -#if !(defined (ACE_HAS_WINCE) && (UNDER_CE < 500)) /// Joins a leaf node into a QoS-enabled multi-point session. extern ACE_Export ACE_HANDLE join_leaf (ACE_HANDLE socket, const sockaddr *name, int namelen, const ACE_QoS_Params &qos_params); -#endif /* !(defined (ACE_HAS_WINCE) && (UNDER_CE < 500)) */ ACE_NAMESPACE_INLINE_FUNCTION int listen (ACE_HANDLE handle, diff --git a/dep/ACE_wrappers/ace/OS_NS_sys_socket.inl b/dep/ACE_wrappers/ace/OS_NS_sys_socket.inl index db63c418d..925c340ae 100644 --- a/dep/ACE_wrappers/ace/OS_NS_sys_socket.inl +++ b/dep/ACE_wrappers/ace/OS_NS_sys_socket.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: OS_NS_sys_socket.inl 82342 2008-07-17 19:52:57Z shuston $ +// $Id: OS_NS_sys_socket.inl 85632 2009-06-12 19:28:00Z mitza $ #include "ace/OS_NS_errno.h" #include "ace/OS_NS_macros.h" @@ -520,15 +520,12 @@ ACE_OS::recvv (ACE_HANDLE handle, 0, 0); # else - int i, chunklen; - char *chunkp = 0; - // Step through the buffers requested by caller; for each one, cycle // through reads until it's filled or an error occurs. - for (i = 0; i < n && result > 0; ++i) + for (int i = 0; i < n && result > 0; ++i) { - chunkp = buffers[i].iov_base; // Point to part of chunk being read - chunklen = buffers[i].iov_len; // Track how much to read to chunk + char *chunkp = buffers[i].iov_base; // Point to part of chunk being read + int chunklen = buffers[i].iov_len; // Track how much to read to chunk while (chunklen > 0 && result > 0) { result = ::recv ((SOCKET) handle, chunkp, chunklen, 0); @@ -753,7 +750,7 @@ ACE_OS::sendv (ACE_HANDLE handle, // Winsock 2 has WSASend and can do this directly, but Winsock 1 // needs to do the sends one-by-one. -# if (ACE_HAS_WINSOCK2 != 0) +# if (ACE_HAS_WINSOCK2 != 0) && !defined (ACE_DONT_USE_WSASEND) result = ::WSASend ((SOCKET) handle, (WSABUF *) buffers, n, @@ -878,7 +875,7 @@ ACE_OS::setsockopt (ACE_HANDLE handle, -1, result); #if defined (WSAEOPNOTSUPP) - if (result == -1 && errno == WSAEOPNOTSUPP) + if (result == -1 && (errno == WSAEOPNOTSUPP || errno == WSAENOPROTOOPT)) #else if (result == -1) #endif /* WSAEOPNOTSUPP */ diff --git a/dep/ACE_wrappers/ace/OS_NS_sys_stat.cpp b/dep/ACE_wrappers/ace/OS_NS_sys_stat.cpp index 1cba079cf..ad43dd67c 100644 --- a/dep/ACE_wrappers/ace/OS_NS_sys_stat.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_sys_stat.cpp @@ -1,8 +1,8 @@ -// $Id: OS_NS_sys_stat.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: OS_NS_sys_stat.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/OS_NS_sys_stat.h" -ACE_RCSID(ace, OS_NS_sys_stat, "$Id: OS_NS_sys_stat.cpp 80826 2008-03-04 14:51:23Z wotte $") + #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_NS_sys_stat.inl" diff --git a/dep/ACE_wrappers/ace/OS_NS_sys_stat.inl b/dep/ACE_wrappers/ace/OS_NS_sys_stat.inl index a5c515df5..21ab6ed73 100644 --- a/dep/ACE_wrappers/ace/OS_NS_sys_stat.inl +++ b/dep/ACE_wrappers/ace/OS_NS_sys_stat.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: OS_NS_sys_stat.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: OS_NS_sys_stat.inl 84373 2009-02-10 18:21:50Z johnnyw $ #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_fcntl.h" @@ -214,10 +214,11 @@ namespace ACE_OS } else { - stp->st_mode = static_cast(fdata.dwFileAttributes); + stp->st_mode = static_cast(fdata.dwFileAttributes); stp->st_size = fdata.nFileSizeLow; - stp->st_atime = ACE_Time_Value (fdata.ftLastAccessTime); - stp->st_mtime = ACE_Time_Value (fdata.ftLastWriteTime); + stp->st_atime = ACE_Time_Value (fdata.ftLastAccessTime).sec (); + stp->st_mtime = ACE_Time_Value (fdata.ftLastWriteTime).sec (); + stp->st_ctime = ACE_Time_Value (fdata.ftCreationTime).sec (); } return 0; #elif defined (ACE_HAS_X86_STAT_MACROS) @@ -252,14 +253,15 @@ namespace ACE_OS } else { - stp->st_mode = static_cast(fdata.dwFileAttributes); + stp->st_mode = static_cast(fdata.dwFileAttributes); stp->st_size = fdata.nFileSizeLow; - stp->st_atime = ACE_Time_Value (fdata.ftLastAccessTime); - stp->st_mtime = ACE_Time_Value (fdata.ftLastWriteTime); + stp->st_atime = ACE_Time_Value (fdata.ftLastAccessTime).sec (); + stp->st_mtime = ACE_Time_Value (fdata.ftLastWriteTime).sec (); + stp->st_ctime = ACE_Time_Value (fdata.ftCreationTime).sec (); } return 0; #elif defined (__BORLANDC__) \ - || (defined (_MSC_VER) && _MSC_VER >= 1300) \ + || defined (_MSC_VER) \ || defined (__MINGW32__) ACE_OSCALL_RETURN (ACE_WSTAT_FUNC_NAME (file, stp), int, -1); #else /* ACE_HAS_WINCE */ @@ -277,9 +279,10 @@ namespace ACE_OS ACE_UNUSED_ARG (cmask); ACE_NOTSUP_RETURN ((mode_t)-1); # elif defined (ACE_HAS_TR24731_2005_CRT) - mode_t old_mode; - ACE_SECURECRTCALL (_umask_s (cmask, &old_mode), mode_t, -1, old_mode); - return old_mode; + int old_mode; + int new_mode = static_cast (cmask); + ACE_SECURECRTCALL (_umask_s (new_mode, &old_mode), mode_t, -1, old_mode); + return static_cast (old_mode); # elif defined (ACE_WIN32) && !defined (__BORLANDC__) ACE_OSCALL_RETURN (::_umask (cmask), mode_t, -1); # else diff --git a/dep/ACE_wrappers/ace/OS_NS_sys_time.cpp b/dep/ACE_wrappers/ace/OS_NS_sys_time.cpp index e1be67988..d47c4ba1d 100644 --- a/dep/ACE_wrappers/ace/OS_NS_sys_time.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_sys_time.cpp @@ -1,8 +1,8 @@ -// $Id: OS_NS_sys_time.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: OS_NS_sys_time.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/OS_NS_sys_time.h" -ACE_RCSID(ace, OS_NS_sys_time, "$Id: OS_NS_sys_time.cpp 80826 2008-03-04 14:51:23Z wotte $") + #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_NS_sys_time.inl" diff --git a/dep/ACE_wrappers/ace/OS_NS_sys_time.h b/dep/ACE_wrappers/ace/OS_NS_sys_time.h index 3d9aa2dd9..c3df9319d 100644 --- a/dep/ACE_wrappers/ace/OS_NS_sys_time.h +++ b/dep/ACE_wrappers/ace/OS_NS_sys_time.h @@ -4,7 +4,7 @@ /** * @file OS_NS_sys_time.h * - * $Id: OS_NS_sys_time.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: OS_NS_sys_time.h 87823 2009-11-30 12:38:34Z johnnyw $ * * @author Douglas C. Schmidt * @author Jesper S. M|ller @@ -37,22 +37,8 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { -#if defined (ACE_WIN32) && defined (_WIN32_WCE) -// Something is a bit brain-damaged here and I'm not sure what... this code -// compiled before the OS reorg for ACE 5.4. Since then it hasn't - eVC -// complains that the operators that return ACE_Time_Value are C-linkage -// functions that can't return a C++ class. The only way I've found to -// defeat this is to wrap the whole class in extern "C++". -// - Steve Huston, 23-Aug-2004 -extern "C++" { -#endif - ACE_NAMESPACE_INLINE_FUNCTION ACE_Time_Value gettimeofday (void); - -#if defined (ACE_WIN32) && defined (_WIN32_WCE) -} -#endif } /* namespace ACE_OS */ ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/OS_NS_sys_time.inl b/dep/ACE_wrappers/ace/OS_NS_sys_time.inl index 1be2d2f3d..fd747166a 100644 --- a/dep/ACE_wrappers/ace/OS_NS_sys_time.inl +++ b/dep/ACE_wrappers/ace/OS_NS_sys_time.inl @@ -1,44 +1,34 @@ // -*- C++ -*- // -// $Id: OS_NS_sys_time.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: OS_NS_sys_time.inl 89266 2010-02-26 18:30:42Z johnnyw $ #include "ace/os_include/sys/os_time.h" #include "ace/os_include/os_errno.h" -#if defined (ACE_VXWORKS) +#if defined (ACE_VXWORKS) || defined (ACE_HAS_CLOCK_GETTIME_REALTIME) # include "ace/OS_NS_time.h" -#endif /* ACE_VXWORKS */ +#endif /* ACE_VXWORKS || ACE_HAS_CLOCK_REALTIME */ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -#if defined (ACE_WIN32) && defined (_WIN32_WCE) -// Something is a bit brain-damaged here and I'm not sure what... this code -// compiled before the OS reorg for ACE 5.4. Since then it hasn't - eVC -// complains that the operators that return ACE_Time_Value are C-linkage -// functions that can't return a C++ class. The only way I've found to -// defeat this is to wrap the whole class in extern "C++". -// - Steve Huston, 23-Aug-2004 -extern "C++" { -#endif - ACE_INLINE ACE_Time_Value ACE_OS::gettimeofday (void) { // ACE_OS_TRACE ("ACE_OS::gettimeofday"); -#if !defined (ACE_HAS_WINCE)&& !defined (ACE_WIN32) +#if !defined (ACE_WIN32) timeval tv; int result = 0; -#endif // !defined (ACE_HAS_WINCE)&& !defined (ACE_WIN32) +#endif // !defined (ACE_WIN32) -#if (0) +#if defined (ACE_HAS_CLOCK_GETTIME_REALTIME) struct timespec ts; ACE_OSCALL (ACE_OS::clock_gettime (CLOCK_REALTIME, &ts), int, -1, result); tv.tv_sec = ts.tv_sec; tv.tv_usec = ts.tv_nsec / 1000L; // timespec has nsec, but timeval has usec -#elif defined (ACE_HAS_WINCE) +#elif defined (ACE_WIN32) && defined (ACE_LACKS_GETSYSTEMTIMEASFILETIME) SYSTEMTIME tsys; FILETIME tfile; ::GetSystemTime (&tsys); @@ -48,13 +38,6 @@ ACE_OS::gettimeofday (void) FILETIME tfile; ::GetSystemTimeAsFileTime (&tfile); return ACE_Time_Value (tfile); -#if 0 - // From Todd Montgomery... - struct _timeb tb; - ::_ftime (&tb); - tv.tv_sec = tb.time; - tv.tv_usec = 1000 * tb.millitm; -#endif /* 0 */ #elif defined (ACE_HAS_AIX_HI_RES_TIMER) timebasestruct_t tb; @@ -81,16 +64,12 @@ ACE_OS::gettimeofday (void) ACE_OSCALL (::gettimeofday (&tv), int, -1, result); # endif /* ACE_HAS_SVR4_GETTIMEOFDAY */ #endif /* 0 */ -#if !defined (ACE_HAS_WINCE)&& !defined (ACE_WIN32) +#if !defined (ACE_WIN32) if (result == -1) return ACE_Time_Value ((time_t)-1); else return ACE_Time_Value (tv); -#endif // !defined (ACE_HAS_WINCE)&& !defined (ACE_WIN32) +#endif // !defined (ACE_WIN32) } -#if defined (ACE_WIN32) && defined (_WIN32_WCE) -} -#endif - ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/OS_NS_sys_uio.cpp b/dep/ACE_wrappers/ace/OS_NS_sys_uio.cpp index c0d59f62d..1b26f17d2 100644 --- a/dep/ACE_wrappers/ace/OS_NS_sys_uio.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_sys_uio.cpp @@ -1,8 +1,8 @@ -// $Id: OS_NS_sys_uio.cpp 81756 2008-05-22 09:47:33Z johnnyw $ +// $Id: OS_NS_sys_uio.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/OS_NS_sys_uio.h" -ACE_RCSID(ace, OS_NS_sys_uio, "$Id: OS_NS_sys_uio.cpp 81756 2008-05-22 09:47:33Z johnnyw $") + #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_NS_sys_uio.inl" diff --git a/dep/ACE_wrappers/ace/OS_NS_sys_utsname.cpp b/dep/ACE_wrappers/ace/OS_NS_sys_utsname.cpp index 0f64e716a..b6dc6d31c 100644 --- a/dep/ACE_wrappers/ace/OS_NS_sys_utsname.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_sys_utsname.cpp @@ -1,8 +1,8 @@ -// $Id: OS_NS_sys_utsname.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: OS_NS_sys_utsname.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/OS_NS_sys_utsname.h" -ACE_RCSID(ace, OS_NS_sys_utsname, "$Id: OS_NS_sys_utsname.cpp 80826 2008-03-04 14:51:23Z wotte $") + #include "ace/OS_NS_string.h" #include "ace/OS_NS_stdio.h" @@ -58,7 +58,7 @@ ACE_OS::uname (ACE_utsname *name) ) { // Get information from the two structures - const char *os; + const char *os = 0; if (vinfo.dwPlatformId == VER_PLATFORM_WIN32_NT) os = "Windows NT %d.%d"; else @@ -77,7 +77,7 @@ ACE_OS::uname (ACE_utsname *name) // half the space to the processor and half the space to // subtype. The -1 is necessary for because of the space // between processor and subtype in the machine name. - const int bufsize = (sizeof (name->machine) / 2) - 1; + int const bufsize = (sizeof (name->machine) / 2) - 1; char processor[bufsize] = "Unknown"; char subtype[bufsize] = "Unknown"; @@ -101,10 +101,17 @@ ACE_OS::uname (ACE_utsname *name) ACE_OS::strcpy (subtype, "Pentium Pro"); else if (sinfo.wProcessorLevel == 7) // I'm guessing here ACE_OS::strcpy (subtype, "Pentium II"); + else + ACE_OS::sprintf (subtype, "%d", sinfo.wProcessorLevel); break; case PROCESSOR_ARCHITECTURE_MIPS: ACE_OS::strcpy (processor, "MIPS"); - ACE_OS::strcpy (subtype, "R4000"); + if (sinfo.wProcessorLevel == 3) + ACE_OS::strcpy (subtype, "R3000"); + else if (sinfo.wProcessorLevel == 4) + ACE_OS::strcpy (subtype, "R4000"); + else + ACE_OS::sprintf (subtype, "%d", sinfo.wProcessorLevel); break; case PROCESSOR_ARCHITECTURE_ALPHA: ACE_OS::strcpy (processor, "Alpha"); @@ -213,7 +220,7 @@ ACE_OS::uname (ACE_utsname *name) # endif /* ACE_LACKS_HOSTNAME */ #elif defined (ACE_VXWORKS) - size_t maxnamelen = sizeof name->nodename; + size_t const maxnamelen = sizeof name->nodename; ACE_OS::strcpy (name->sysname, "VxWorks"); ACE_OS::strcpy (name->release, kernelVersion()); ACE_OS::strcpy (name->version, sysBspRev ()); diff --git a/dep/ACE_wrappers/ace/OS_NS_sys_wait.cpp b/dep/ACE_wrappers/ace/OS_NS_sys_wait.cpp index 2f83bb28e..148d778e4 100644 --- a/dep/ACE_wrappers/ace/OS_NS_sys_wait.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_sys_wait.cpp @@ -1,8 +1,8 @@ -// $Id: OS_NS_sys_wait.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: OS_NS_sys_wait.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/OS_NS_sys_wait.h" -ACE_RCSID(ace, OS_NS_sys_wait, "$Id: OS_NS_sys_wait.cpp 80826 2008-03-04 14:51:23Z wotte $") + #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_NS_sys_wait.inl" diff --git a/dep/ACE_wrappers/ace/OS_NS_sys_wait.h b/dep/ACE_wrappers/ace/OS_NS_sys_wait.h index c71b3e3a5..8cdf6efa4 100644 --- a/dep/ACE_wrappers/ace/OS_NS_sys_wait.h +++ b/dep/ACE_wrappers/ace/OS_NS_sys_wait.h @@ -4,7 +4,7 @@ /** * @file OS_NS_sys_wait.h * - * $Id: OS_NS_sys_wait.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: OS_NS_sys_wait.h 83735 2008-11-14 09:41:52Z johnnyw $ * * @author Douglas C. Schmidt * @author Jesper S. M|ller @@ -59,7 +59,7 @@ namespace ACE_OS ACE_HANDLE handle = 0); /** - * Calls @c ::waitpid on UNIX/POSIX platforms Does not work on Vxworks 5.5.x. + * Calls @c ::waitpid on UNIX/POSIX platforms Does not work on VxWorks 5.5.x. * On Win32, @a pid is ignored if the @a handle is not equal to 0. * Passing the process @a handle is prefer on Win32 because using * @a pid to wait on the project doesn't always work correctly diff --git a/dep/ACE_wrappers/ace/OS_NS_time.cpp b/dep/ACE_wrappers/ace/OS_NS_time.cpp index b68c657ed..d62542621 100644 --- a/dep/ACE_wrappers/ace/OS_NS_time.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_time.cpp @@ -1,8 +1,8 @@ -// $Id: OS_NS_time.cpp 82693 2008-09-09 11:37:41Z johnnyw $ +// $Id: OS_NS_time.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/OS_NS_time.h" -ACE_RCSID(ace, OS_NS_time, "$Id: OS_NS_time.cpp 82693 2008-09-09 11:37:41Z johnnyw $") + #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_NS_time.inl" @@ -319,6 +319,7 @@ ACE_OS::mktime (struct tm *t) t_sys.wMonth = t->tm_mon + 1; // SYSTEMTIME is 1-indexed, tm is 0-indexed t_sys.wYear = t->tm_year + 1900; // SYSTEMTIME is real; tm is since 1900 t_sys.wDayOfWeek = t->tm_wday; // Ignored in below function call. + t_sys.wMilliseconds = 0; if (SystemTimeToFileTime (&t_sys, &t_file) == 0) return -1; ACE_Time_Value tv (t_file); @@ -354,7 +355,7 @@ ACE_OS::readPPCTimeBase (u_long &most, u_long &least) } #endif /* ACE_HAS_POWERPC_TIMER && ghs */ -#if defined (ACE_LACKS_STRPTIME) && !defined (ACE_REFUSE_STRPTIME_EMULATION) +#if defined (ACE_LACKS_STRPTIME) char * ACE_OS::strptime_emulation (const char *buf, const char *format, struct tm *tm) { @@ -365,8 +366,6 @@ ACE_OS::strptime_emulation (const char *buf, const char *format, struct tm *tm) if (!buf || !format) return 0; - ACE_OS::memset (tm, 0, sizeof (struct tm)); - while (format[fi] != '\0') { if (percent) @@ -632,6 +631,6 @@ ACE_OS::strptime_getnum (const char *buf, else return 0; } -#endif /* ACE_LACKS_STRPTIME && !ACE_REFUSE_STRPTIME_EMULATION */ +#endif /* ACE_LACKS_STRPTIME */ ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/OS_NS_time.h b/dep/ACE_wrappers/ace/OS_NS_time.h index 66304d1e0..dc22f0a0c 100644 --- a/dep/ACE_wrappers/ace/OS_NS_time.h +++ b/dep/ACE_wrappers/ace/OS_NS_time.h @@ -4,7 +4,7 @@ /** * @file OS_NS_time.h * - * $Id: OS_NS_time.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: OS_NS_time.h 87260 2009-10-29 14:00:43Z olli $ * * @author Douglas C. Schmidt * @author Jesper S. M|ller @@ -25,9 +25,10 @@ # pragma once # endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/OS_NS_errno.h" #include "ace/Basic_Types.h" #include "ace/os_include/os_time.h" +#include "ace/OS_NS_errno.h" + #include /**/ "ace/ACE_export.h" #if defined (ACE_EXPORT_MACRO) @@ -35,11 +36,6 @@ #endif #define ACE_EXPORT_MACRO ACE_Export -# if defined (ACE_HAS_BROKEN_R_ROUTINES) -# undef ctime_r -# undef asctime_r -# endif /* ACE_HAS_BROKEN_R_ROUTINES */ - ACE_BEGIN_VERSIONED_NAMESPACE_DECL // Type-safe, and unsigned. @@ -98,6 +94,16 @@ inline long ace_timezone() #if !defined (ACE_LACKS_DIFFTIME) +# if defined (_WIN32_WCE) && (_WIN32_WCE == 0x600) && !defined (_USE_32BIT_TIME_T) \ + && defined (_MSC_VER) + // The WinCE 6.0 SDK ships with a diff_time that uses __time32_t as type + // not time_t. This resolves in compilation warnings because time_t + // can be 64bit. Disable at this momemt the warning for just this method + // else we get two compile warnings on each source file that includes + // this file. +# pragma warning (push) +# pragma warning (disable: 4244) +# endif /// Helper for the ACE_OS::difftime() function /** * We moved the difftime code that used to be in ACE_OS::difftime() @@ -111,6 +117,10 @@ inline double ace_difftime(time_t t1, time_t t0) { return difftime (t1, t0); } +# if defined (_WIN32_WCE) && (_WIN32_WCE == 0x600) && !defined (_USE_32BIT_TIME_T) \ + && defined (_MSC_VER) +# pragma warning (pop) +# endif #endif /* !ACE_LACKS_DIFFTIME */ # if defined (ACE_WIN32) @@ -181,10 +191,6 @@ namespace ACE_OS #endif ACE_TCHAR *ctime_r (const time_t *clock, ACE_TCHAR *buf, int buflen); -# if defined (difftime) -# undef difftime -# endif /* difftime */ - #if !defined (ACE_LACKS_DIFFTIME) ACE_NAMESPACE_INLINE_FUNCTION #else @@ -230,12 +236,16 @@ namespace ACE_OS const char *format, const struct tm *timeptr); + /** + * strptime wrapper. Note that the struct @a tm will always be set to + * zero + */ ACE_NAMESPACE_INLINE_FUNCTION char *strptime (const char *buf, const char *format, struct tm *tm); -# if defined (ACE_LACKS_STRPTIME) && !defined (ACE_REFUSE_STRPTIME_EMULATION) +# if defined (ACE_LACKS_STRPTIME) extern ACE_Export char *strptime_emulation (const char *buf, const char *format, @@ -244,15 +254,11 @@ namespace ACE_OS extern ACE_Export int strptime_getnum (const char *buf, int *num, int *bi, int *fi, int min, int max); -# endif /* ACE_LACKS_STRPTIME && !ACE_REFUSE_STRPTIME_EMULATION */ +# endif /* ACE_LACKS_STRPTIME */ ACE_NAMESPACE_INLINE_FUNCTION time_t time (time_t *tloc = 0); -# if defined (timezone) -# undef timezone -# endif /* timezone */ - ACE_NAMESPACE_INLINE_FUNCTION long timezone (void); diff --git a/dep/ACE_wrappers/ace/OS_NS_time.inl b/dep/ACE_wrappers/ace/OS_NS_time.inl index 661ecb817..ab8da37bb 100644 --- a/dep/ACE_wrappers/ace/OS_NS_time.inl +++ b/dep/ACE_wrappers/ace/OS_NS_time.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: OS_NS_time.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: OS_NS_time.inl 87270 2009-10-29 21:47:47Z olli $ #include "ace/OS_NS_string.h" #include "ace/OS_NS_errno.h" @@ -97,9 +97,7 @@ ACE_INLINE ACE_TCHAR * ACE_OS::ctime (const time_t *t) { ACE_OS_TRACE ("ACE_OS::ctime"); -#if defined (ACE_HAS_BROKEN_CTIME) - ACE_OSCALL_RETURN (::asctime (::localtime (t)), char *, 0); -#elif defined (ACE_HAS_WINCE) +#if defined (ACE_HAS_WINCE) static ACE_TCHAR buf [ctime_buf_size]; return ACE_OS::ctime_r (t, buf, @@ -124,7 +122,7 @@ ACE_OS::ctime (const time_t *t) # else ACE_OSCALL_RETURN (::ctime (t), char *, 0); # endif /* ACE_USES_WCHAR */ -# endif /* ACE_HAS_BROKEN_CTIME */ +# endif /* ACE_HAS_WINCE */ } #if !defined (ACE_HAS_WINCE) /* CE version in OS.cpp */ @@ -196,7 +194,7 @@ ACE_OS::ctime_r (const time_t *t, ACE_TCHAR *buf, int buflen) return 0; } - ACE_TCHAR *result; + ACE_TCHAR *result = 0; # if defined (ACE_USES_WCHAR) ACE_OSCALL (::_wctime (t), wchar_t *, 0, result); # else /* ACE_USES_WCHAR */ @@ -262,7 +260,7 @@ ACE_OS::gethrtime (const ACE_HRTimer_Op op) # endif /* ! ACE_LACKS_LONGLONG_T */ #if defined (__amd64__) || defined (__x86_64__) - // Read the high res tick counter into 32 bit int variables "eax" and + // Read the high res tick counter into 32 bit int variables "eax" and // "edx", and then combine them into 64 bit int "now" ACE_UINT32 eax, edx; asm volatile ("rdtsc" : "=a" (eax), "=d" (edx) : : "memory"); @@ -334,8 +332,9 @@ ACE_OS::gethrtime (const ACE_HRTimer_Op op) ACE_OS::clock_gettime ( #if defined (ACE_HAS_CLOCK_GETTIME_MONOTONIC) CLOCK_MONOTONIC, -#endif /* !ACE_HAS_CLOCK_GETTIME_MONOTONIC */ +#else CLOCK_REALTIME, +#endif /* !ACE_HAS_CLOCK_GETTIME_MONOTONIC */ &ts); // Carefully create the return value to avoid arithmetic overflow @@ -443,17 +442,11 @@ ACE_OS::strftime (char *s, size_t maxsize, const char *format, ACE_INLINE char * ACE_OS::strptime (const char *buf, const char *format, struct tm *tm) { + ACE_OS::memset (tm, 0, sizeof (struct tm)); #if defined (ACE_LACKS_STRPTIME) -# if defined (ACE_REFUSE_STRPTIME_EMULATION) - ACE_UNUSED_ARG (buf); - ACE_UNUSED_ARG (format); - ACE_UNUSED_ARG (tm); - ACE_NOTSUP_RETURN (0); -# else return ACE_OS::strptime_emulation (buf, format, tm); -# endif /* ACE_REFUSE_STRPTIME_EMULATION */ #else - return ::strptime (buf, format, tm); + return ACE_STD_NAMESPACE::strptime (buf, format, tm); #endif /* ACE_LACKS_STRPTIME */ } @@ -461,14 +454,14 @@ ACE_INLINE time_t ACE_OS::time (time_t *tloc) { ACE_OS_TRACE ("ACE_OS::time"); -#if !defined (ACE_HAS_WINCE) - ACE_OSCALL_RETURN (::time (tloc), time_t, (time_t) -1); -#else - time_t retv = ACE_OS::gettimeofday ().sec (); +#if defined (ACE_LACKS_TIME) + time_t const retv = ACE_OS::gettimeofday ().sec (); if (tloc) *tloc = retv; return retv; -#endif /* ACE_HAS_WINCE */ +#else + ACE_OSCALL_RETURN (::time (tloc), time_t, (time_t) -1); +#endif /* ACE_LACKS_TIME */ } // Linux won't compile unless we explicitly use a namespace here. @@ -491,15 +484,13 @@ ACE_OS::timezone (void) ACE_INLINE void ACE_OS::tzset (void) { -#if !defined (ACE_HAS_WINCE) && !defined (ACE_VXWORKS) && !defined(ACE_HAS_RTEMS) && !defined (ACE_HAS_DINKUM_STL) -# if defined (ACE_WIN32) - ::_tzset (); // For Win32. -# else - ::tzset (); // For UNIX platforms. -# endif /* ACE_WIN32 */ -# else +#if defined (ACE_LACKS_TZSET) errno = ENOTSUP; -# endif /* ACE_HAS_WINCE && !VXWORKS && !ACE_HAS_RTEMS && !ACE_HAS_DINKUM_STL */ +#elif defined (ACE_WIN32) + ::_tzset (); // For Win32. +#else + ::tzset (); // For UNIX platforms. +#endif /* ACE_LACKS_TZSET */ } ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/OS_NS_unistd.cpp b/dep/ACE_wrappers/ace/OS_NS_unistd.cpp index dbaa92ef3..66ff09f5c 100644 --- a/dep/ACE_wrappers/ace/OS_NS_unistd.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_unistd.cpp @@ -1,9 +1,7 @@ -// $Id: OS_NS_unistd.cpp 82559 2008-08-07 20:23:07Z parsons $ +// $Id: OS_NS_unistd.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/OS_NS_unistd.h" -ACE_RCSID (ace, OS_NS_unistd, "$Id: OS_NS_unistd.cpp 82559 2008-08-07 20:23:07Z parsons $") - #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_NS_unistd.inl" #endif /* ACE_HAS_INLINED_OSCALLS */ @@ -19,6 +17,11 @@ ACE_RCSID (ace, OS_NS_unistd, "$Id: OS_NS_unistd.cpp 82559 2008-08-07 20:23:07Z #include "ace/os_include/sys/os_pstat.h" #include "ace/os_include/sys/os_sysctl.h" +#if defined ACE_HAS_VXCPULIB +# include "vxCpuLib.h" +# include "cpuset.h" +#endif /* ACE_HAS_VXCPULIB */ + #if defined (ACE_NEEDS_FTRUNCATE) extern "C" int ftruncate (ACE_HANDLE handle, long len) @@ -64,6 +67,10 @@ ACE_OS::argv_to_string (int argc, bool substitute_env_args, bool quote_args) { +#if defined (ACE_LACKS_STRENVDUP) + ACE_UNUSED_ARG (substitute_env_args); +#endif /* ACE_LACKS_STRENVDUP */ + if (argc <= 0 || argv == 0 || argv[0] == 0) return 0; @@ -75,7 +82,7 @@ ACE_OS::argv_to_string (int argc, for (int i = 0; i < argc; ++i) { -#if !defined (ACE_LACKS_ENV) +#if !defined (ACE_LACKS_STRENVDUP) // Account for environment variables. if (substitute_env_args && ACE_OS::strchr (argv[i], ACE_TEXT ('$')) != 0) @@ -98,7 +105,7 @@ ACE_OS::argv_to_string (int argc, return 0; } } -#endif /* ACE_LACKS_ENV */ +#endif /* ACE_LACKS_STRENVDUP */ // If must quote, we only do it if the arg contains spaces, or // is empty. Perhaps a check for other c | ord(c) <= 32 is in // order? @@ -127,7 +134,8 @@ ACE_OS::argv_to_string (int argc, ++quotes; } argv_p[i] = - (ACE_TCHAR *) ACE_OS::malloc (ACE_OS::strlen (temp) * sizeof (ACE_TCHAR) + quotes + 3); + (ACE_TCHAR *) ACE_OS::malloc ((ACE_OS::strlen (temp) + quotes + 3) + * sizeof (ACE_TCHAR)); if (argv_p[i] == 0) { ACE_OS::free (argv_p); @@ -378,10 +386,12 @@ ACE_OS::num_processors (void) SYSTEM_INFO sys_info; ::GetSystemInfo (&sys_info); return sys_info.dwNumberOfProcessors; +#elif defined (ACE_HAS_VXCPULIB) + return vxCpuConfiguredGet(); #elif defined (_SC_NPROCESSORS_CONF) return ::sysconf (_SC_NPROCESSORS_CONF); #elif defined (ACE_HAS_SYSCTL) - int num_processors; + int num_processors = 0; int mib[2] = { CTL_HW, HW_NCPU }; size_t len = sizeof (num_processors); if (::sysctl (mib, 2, &num_processors, &len, 0, 0) != -1) @@ -418,6 +428,20 @@ ACE_OS::num_processors_online (void) mask >>= 1; } return active_processors; +#elif defined (ACE_HAS_VXCPULIB) + long num_cpu = 0; + cpuset_t cpuset; + CPUSET_ZERO (cpuset); + cpuset = vxCpuEnabledGet(); + unsigned int const maxcpu = vxCpuConfiguredGet(); + for (unsigned int i =0; i < maxcpu; i++) + { + if (CPUSET_ISSET (cpuset, i)) + { + ++num_cpu; + } + } + return num_cpu; #elif defined (_SC_NPROCESSORS_ONLN) return ::sysconf (_SC_NPROCESSORS_ONLN); #elif defined (ACE_HAS_SYSCTL) @@ -486,7 +510,10 @@ ACE_OS::pread (ACE_HANDLE handle, if (original_low_position == INVALID_SET_FILE_POINTER && GetLastError () != NO_ERROR) - return -1; + { + ACE_OS::set_errno_to_last_error (); + return -1; + } // Go to the correct position LONG low_offset = ACE_LOW_PART (offset); @@ -497,7 +524,10 @@ ACE_OS::pread (ACE_HANDLE handle, FILE_BEGIN); if (altered_position == INVALID_SET_FILE_POINTER && GetLastError () != NO_ERROR) - return -1; + { + ACE_OS::set_errno_to_last_error (); + return -1; + } DWORD bytes_read; @@ -550,7 +580,10 @@ ACE_OS::pread (ACE_HANDLE handle, &original_high_position, FILE_BEGIN) == INVALID_SET_FILE_POINTER && GetLastError () != NO_ERROR) - return -1; + { + ACE_OS::set_errno_to_last_error (); + return -1; + } return (ssize_t) bytes_read; @@ -605,27 +638,30 @@ ACE_OS::pwrite (ACE_HANDLE handle, ACE_OS_GUARD // Remember the original file pointer position - LARGE_INTEGER orig_position; - orig_position.QuadPart = 0; - orig_position.LowPart = ::SetFilePointer (handle, - 0, - &orig_position.HighPart, - FILE_CURRENT); - if (orig_position.LowPart == INVALID_SET_FILE_POINTER + LONG original_high_position = 0; + DWORD original_low_position = ::SetFilePointer (handle, + 0, + &original_high_position, + FILE_CURRENT); + + if (original_low_position == INVALID_SET_FILE_POINTER && GetLastError () != NO_ERROR) - return -1; + { + ACE_OS::set_errno_to_last_error (); + return -1; + } DWORD bytes_written; - LARGE_INTEGER loffset; - loffset.QuadPart = offset; + LONG low_offset = ACE_LOW_PART (offset); + LONG high_offset = ACE_HIGH_PART (offset); # if defined (ACE_HAS_WIN32_OVERLAPPED_IO) OVERLAPPED overlapped; overlapped.Internal = 0; overlapped.InternalHigh = 0; - overlapped.Offset = loffset.LowPart; - overlapped.OffsetHigh = loffset.HighPart; + overlapped.Offset = low_offset; + overlapped.OffsetHigh = high_offset; overlapped.hEvent = 0; BOOL result = ::WriteFile (handle, @@ -637,35 +673,27 @@ ACE_OS::pwrite (ACE_HANDLE handle, if (result == FALSE) { if (::GetLastError () != ERROR_IO_PENDING) - return -1; - - result = ::GetOverlappedResult (handle, - &overlapped, - &bytes_written, - TRUE); - if (result == FALSE) - return -1; + { + return -1; + } + else + { + result = ::GetOverlappedResult (handle, + &overlapped, + &bytes_written, + TRUE); + if (result == FALSE) + return -1; + } } # else /* ACE_HAS_WIN32_OVERLAPPED_IO */ - // Go to the correct position; if this is a Windows variant without - // overlapped I/O, it probably doesn't have SetFilePointerEx either, - // so manage this with SetFilePointer, changing calls based on the use - // of 64 bit offsets. - DWORD newpos; -# if defined (_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64 - newpos = ::SetFilePointer (handle, - loffset.LowPart, - &loffset.HighPart, - FILE_BEGIN); -# else - newpos = ::SetFilePointer (handle, - loffset.LowPart, - 0, - FILE_BEGIN); -# endif /* 64-bit file offsets */ - if (newpos == 0xFFFFFFFF && ::GetLastError () != NO_ERROR) + if (::SetFilePointer (handle, + low_offset, + &high_offset, + FILE_BEGIN) == INVALID_SET_FILE_POINTER + && ::GetLastError () != NO_ERROR) { ACE_OS::set_errno_to_last_error (); return -1; @@ -683,11 +711,14 @@ ACE_OS::pwrite (ACE_HANDLE handle, // Reset the original file pointer position if (::SetFilePointer (handle, - orig_position.LowPart, - &orig_position.HighPart, + original_low_position, + &original_high_position, FILE_BEGIN) == INVALID_SET_FILE_POINTER && GetLastError () != NO_ERROR) - return -1; + { + ACE_OS::set_errno_to_last_error (); + return -1; + } return (ssize_t) bytes_written; @@ -734,6 +765,10 @@ ACE_OS::string_to_argv (ACE_TCHAR *buf, ACE_TCHAR **&argv, bool substitute_env_args) { +#if defined (ACE_LACKS_STRENVDUP) + ACE_UNUSED_ARG (substitute_env_args); +#endif /* ACE_LACKS_STRENVDUP */ + // Reset the number of arguments argc = 0; @@ -827,7 +862,7 @@ ACE_OS::string_to_argv (ACE_TCHAR *buf, *cp = ACE_TEXT ('\0'); -#if !defined (ACE_LACKS_ENV) +#if !defined (ACE_LACKS_STRENVDUP) // Check for environment variable substitution here. if (substitute_env_args) { argv[i] = ACE_OS::strenvdup (argp); @@ -841,7 +876,7 @@ ACE_OS::string_to_argv (ACE_TCHAR *buf, } } else -#endif /* ACE_LACKS_ENV */ +#endif /* ACE_LACKS_STRENVDUP */ { argv[i] = ACE_OS::strdup (argp); @@ -851,7 +886,7 @@ ACE_OS::string_to_argv (ACE_TCHAR *buf, { delete [] argp; } - + errno = ENOMEM; return -1; } diff --git a/dep/ACE_wrappers/ace/OS_NS_unistd.h b/dep/ACE_wrappers/ace/OS_NS_unistd.h index fce6dc8b1..489dc8e43 100644 --- a/dep/ACE_wrappers/ace/OS_NS_unistd.h +++ b/dep/ACE_wrappers/ace/OS_NS_unistd.h @@ -4,7 +4,7 @@ /** * @file OS_NS_unistd.h * - * $Id: OS_NS_unistd.h 81156 2008-03-30 20:56:47Z iliyan $ + * $Id: OS_NS_unistd.h 91066 2010-07-12 11:05:04Z johnnyw $ * * @author Douglas C. Schmidt * @author Jesper S. M|ller @@ -62,7 +62,7 @@ namespace ACE_OS ACE_NAMESPACE_INLINE_FUNCTION long allocation_granularity (void); - // used by ARGV::argv_to_string() and ACE_OS::fork_exec() + /// used by ARGV::argv_to_string() and ACE_OS::fork_exec() extern ACE_Export int argv_to_string (int argc, ACE_TCHAR **argv, @@ -76,7 +76,6 @@ namespace ACE_OS bool substitute_env_args = true, bool quote_args = false); -#if !defined (ACE_LACKS_CHDIR) ACE_NAMESPACE_INLINE_FUNCTION int chdir (const char *path); @@ -84,7 +83,6 @@ namespace ACE_OS ACE_NAMESPACE_INLINE_FUNCTION int chdir (const wchar_t *path); #endif /* ACE_HAS_WCHAR */ -#endif /* ACE_LACKS_CHDIR */ ACE_NAMESPACE_INLINE_FUNCTION int rmdir (const char *path); @@ -100,6 +98,9 @@ namespace ACE_OS ACE_NAMESPACE_INLINE_FUNCTION ACE_HANDLE dup (ACE_HANDLE handle); + ACE_NAMESPACE_INLINE_FUNCTION + ACE_HANDLE dup (ACE_HANDLE handle, pid_t pid); + ACE_NAMESPACE_INLINE_FUNCTION int dup2 (ACE_HANDLE oldfd, ACE_HANDLE newfd); @@ -141,7 +142,6 @@ namespace ACE_OS extern ACE_Export pid_t fork_exec (ACE_TCHAR *argv[]); - //@} ACE_NAMESPACE_INLINE_FUNCTION @@ -189,12 +189,12 @@ namespace ACE_OS // should call gethostname() ACE_NAMESPACE_INLINE_FUNCTION - int hostname (char *name, + int hostname (char name[], size_t maxnamelen); #if defined (ACE_HAS_WCHAR) ACE_NAMESPACE_INLINE_FUNCTION - int hostname (wchar_t *name, + int hostname (wchar_t name[], size_t maxnamelen); #endif /* ACE_HAS_WCHAR */ @@ -253,11 +253,11 @@ namespace ACE_OS ACE_OVERLAPPED *); /** - * Receive @a len bytes into @a buf from (uses the + * Receive @a len bytes into @a buf from @a handle (uses the * call, which uses the system call on UNIX * and the call on Win32). If errors occur, -1 is * returned. If EOF occurs, 0 is returned. Whatever data has been - * read will be returned to the caller through. + * read will be returned to the caller through @a bytes_transferred. * */ extern ACE_Export @@ -358,7 +358,7 @@ namespace ACE_OS * calls, which is uses the system call on UNIX and the * call on Win32). If errors occur, -1 is returned. If * EOF occurs, 0 is returned. Whatever data has been transmitted - * will be returned to the caller through . + * will be returned to the caller through @a bytes_transferred. */ extern ACE_Export ssize_t write_n (ACE_HANDLE handle, diff --git a/dep/ACE_wrappers/ace/OS_NS_unistd.inl b/dep/ACE_wrappers/ace/OS_NS_unistd.inl index 806a895d8..8de371fdb 100644 --- a/dep/ACE_wrappers/ace/OS_NS_unistd.inl +++ b/dep/ACE_wrappers/ace/OS_NS_unistd.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: OS_NS_unistd.inl 81696 2008-05-14 18:15:31Z johnnyw $ +// $Id: OS_NS_unistd.inl 88515 2010-01-13 08:47:38Z johnnyw $ #include "ace/OS_NS_sys_utsname.h" #include "ace/OS_NS_string.h" @@ -19,16 +19,17 @@ # include "ace/OS_NS_stdio.h" #endif /* ACE_LACKS_ACCESS */ -#if defined (ACE_VXWORKS) || defined (ACE_HAS_WINCE) +#if defined (ACE_HAS_ACCESS_EMULATION) # include "ace/os_include/os_unistd.h" -# if defined (ACE_VXWORKS) && (((ACE_VXWORKS >= 0x620) && (ACE_VXWORKS <= 0x660)) || defined (ACE_HAS_VXWORKS551_MEDUSA)) -# if defined (__RTP__) -# include "ace/os_include/os_strings.h" -# else -# include "ace/os_include/os_string.h" -# endif +#endif /* ACE_HAS_ACCESS_EMULATION */ + +#if defined (ACE_VXWORKS) && (((ACE_VXWORKS >= 0x620) && (ACE_VXWORKS <= 0x680)) || defined (ACE_HAS_VXWORKS551_MEDUSA)) +# if defined (__RTP__) +# include "ace/os_include/os_strings.h" +# else +# include "ace/os_include/os_string.h" # endif -#endif /* VXWORKS || ACE_HAS_WINCE */ +#endif ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -37,7 +38,7 @@ ACE_OS::access (const char *path, int amode) { ACE_OS_TRACE ("ACE_OS::access"); #if defined (ACE_LACKS_ACCESS) -# if defined (ACE_HAS_WINCE) || defined (ACE_VXWORKS) +# if defined (ACE_HAS_ACCESS_EMULATION) // @@ WINCE: There should be a Win32 API that can do this. // Hard coded read access here. ACE_UNUSED_ARG (amode); @@ -48,12 +49,12 @@ ACE_OS::access (const char *path, int amode) ACE_OS::fclose (handle); return 0; } - return (-1); + return -1; # else ACE_UNUSED_ARG (path); ACE_UNUSED_ARG (amode); ACE_NOTSUP_RETURN (-1); -# endif // ACE_HAS_WINCE +# endif /* ACE_HAS_ACCESS_EMULATION */ #elif defined(ACE_WIN32) // Windows doesn't support checking X_OK(6) ACE_OSCALL_RETURN (::access (path, amode & 6), int, -1); @@ -67,11 +68,11 @@ ACE_OS::access (const char *path, int amode) ACE_INLINE int ACE_OS::access (const wchar_t *path, int amode) { -#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) +#if defined (ACE_WIN32) && !defined (ACE_LACKS__WACCESS) ACE_OSCALL_RETURN (::_waccess (path, amode), int, -1); #else /* ACE_WIN32 && !ACE_HAS_WINCE */ return ACE_OS::access (ACE_Wide_To_Ascii (path).char_rep (), amode); -#endif /* ACE_WIN32 && !ACE_HAS_WINCE */ +#endif /* ACE_WIN32 && !ACE_LACKS__WACCESS */ } #endif /* ACE_HAS_WCHAR */ @@ -117,16 +118,15 @@ ACE_OS::allocation_granularity (void) #endif /* ACE_WIN32 */ } -#if !defined (ACE_LACKS_CHDIR) ACE_INLINE int ACE_OS::chdir (const char *path) { ACE_OS_TRACE ("ACE_OS::chdir"); -#if defined (ACE_HAS_NONCONST_CHDIR) - ACE_OSCALL_RETURN (::chdir (const_cast (path)), int, -1); -#elif defined (ACE_HAS_WINCE) +#if defined (ACE_LACKS_CHDIR) ACE_UNUSED_ARG (path); ACE_NOTSUP_RETURN (-1); +#elif defined (ACE_HAS_NONCONST_CHDIR) + ACE_OSCALL_RETURN (::chdir (const_cast (path)), int, -1); #else ACE_OSCALL_RETURN (::chdir (path), int, -1); #endif /* ACE_HAS_NONCONST_CHDIR */ @@ -136,20 +136,22 @@ ACE_OS::chdir (const char *path) ACE_INLINE int ACE_OS::chdir (const wchar_t *path) { -#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) +#if defined (ACE_LACKS_CHDIR) + ACE_UNUSED_ARG (path); + ACE_NOTSUP_RETURN (-1); +#elif defined (ACE_WIN32) ACE_OSCALL_RETURN (::_wchdir (path), int, -1); #else /* ACE_WIN32 */ return ACE_OS::chdir (ACE_Wide_To_Ascii (path).char_rep ()); #endif /* ACE_WIN32 */ } #endif /* ACE_HAS_WCHAR */ -#endif /* ACE_LACKS_CHDIR */ ACE_INLINE int ACE_OS::rmdir (const char *path) { #if defined (ACE_HAS_WINCE) - ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::RemoveDirectory (ACE_TEXT_CHAR_TO_TCHAR (path)), + ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::RemoveDirectory (ACE_TEXT_CHAR_TO_TCHAR(path)), ace_result_), int, -1); #else @@ -193,7 +195,10 @@ ACE_INLINE ACE_HANDLE ACE_OS::dup (ACE_HANDLE handle) { ACE_OS_TRACE ("ACE_OS::dup"); -#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) +#if defined (ACE_LACKS_DUP) + ACE_UNUSED_ARG (handle); + ACE_NOTSUP_RETURN (ACE_INVALID_HANDLE); +#elif defined (ACE_WIN32) ACE_HANDLE new_fd; if (::DuplicateHandle(::GetCurrentProcess (), handle, @@ -206,15 +211,42 @@ ACE_OS::dup (ACE_HANDLE handle) else ACE_FAIL_RETURN (ACE_INVALID_HANDLE); /* NOTREACHED */ -#elif defined (ACE_LACKS_DUP) - ACE_UNUSED_ARG (handle); - ACE_NOTSUP_RETURN (-1); -#elif defined (ACE_HAS_WINCE) - ACE_UNUSED_ARG (handle); - ACE_NOTSUP_RETURN (0); #else ACE_OSCALL_RETURN (::dup (handle), ACE_HANDLE, ACE_INVALID_HANDLE); -#endif /* ACE_WIN32 && !ACE_HAS_WINCE */ +#endif /* ACE_LACKS_DUP */ +} + +ACE_INLINE ACE_HANDLE +ACE_OS::dup(ACE_HANDLE handle, pid_t pid) +{ + ACE_OS_TRACE("ACE_OS::dup"); +#if defined (ACE_LACKS_DUP) + ACE_UNUSED_ARG (handle); + ACE_UNUSED_ARG (pid); + ACE_NOTSUP_RETURN (ACE_INVALID_HANDLE); +#elif defined (ACE_WIN32) + ACE_HANDLE new_fd; + ACE_HANDLE hTargetProcess = ::OpenProcess (PROCESS_DUP_HANDLE, + FALSE, + pid); + if(::DuplicateHandle(::GetCurrentProcess (), + handle, + hTargetProcess, + &new_fd, + 0, + TRUE, + DUPLICATE_SAME_ACCESS)) + { + ::CloseHandle (hTargetProcess); + return new_fd; + } + else + ACE_FAIL_RETURN (ACE_INVALID_HANDLE); + /*NOTREACHED*/ +#else + ACE_UNUSED_ARG (pid); + ACE_OSCALL_RETURN(::dup(handle), ACE_HANDLE, ACE_INVALID_HANDLE); +#endif /*ACE_WIN32 && !ACE_HAS_WINCE*/ } ACE_INLINE int @@ -556,11 +588,10 @@ ACE_OS::hostname (wchar_t name[], size_t maxnamelen) #else /* ACE_WIN32 && !ACE_HAS_WINCE */ // Emulate using the char version char *char_name = 0; - int result = 0; ACE_NEW_RETURN (char_name, char[maxnamelen], -1); - result = ACE_OS::hostname(char_name, maxnamelen); + int result = ACE_OS::hostname(char_name, maxnamelen); ACE_OS::strcpy (name, ACE_Ascii_To_Wide (char_name).wchar_rep ()); delete [] char_name; @@ -591,9 +622,13 @@ ACE_OS::isatty (ACE_HANDLE handle) ACE_UNUSED_ARG (handle); return 0; #else - int fd = ::_open_osfhandle (intptr_t (handle), 0); - int status = ::_isatty (fd); - ::_close (fd); + int const fd = ::_open_osfhandle (intptr_t (handle), 0); + int status = 0; + if (fd != -1) + { + status = ::_isatty (fd); + ::_close (fd); + } return status; #endif /* ACE_LACKS_ISATTY */ } @@ -750,13 +785,11 @@ ACE_OS::readlink (const char *path, char *buf, size_t bufsiz) ACE_UNUSED_ARG (buf); ACE_UNUSED_ARG (bufsiz); ACE_NOTSUP_RETURN (-1); +# elif defined(ACE_HAS_NONCONST_READLINK) + ACE_OSCALL_RETURN ( + ::readlink (const_cast (path), buf, bufsiz), ssize_t, -1); # else -# if !defined(ACE_HAS_NONCONST_READLINK) - ACE_OSCALL_RETURN (::readlink (path, buf, bufsiz), ssize_t, -1); -# else - ACE_OSCALL_RETURN ( - ::readlink (const_cast (path), buf, bufsiz), ssize_t, -1); -# endif + ACE_OSCALL_RETURN (::readlink (path, buf, bufsiz), ssize_t, -1); # endif /* ACE_LACKS_READLINK */ } @@ -1007,7 +1040,7 @@ ACE_INLINE long ACE_OS::sysinfo (int cmd, char *buf, long count) { ACE_OS_TRACE ("ACE_OS::sysinfo"); -#if defined (ACE_HAS_SYSINFO) +#if defined (ACE_HAS_SYSV_SYSINFO) ACE_OSCALL_RETURN (::sysinfo (cmd, buf, count), long, -1); #else ACE_UNUSED_ARG (cmd); @@ -1015,7 +1048,7 @@ ACE_OS::sysinfo (int cmd, char *buf, long count) ACE_UNUSED_ARG (count); ACE_NOTSUP_RETURN (0); -#endif /* ACE_HAS_SYSINFO */ +#endif /* ACE_HAS_SYSV_SYSINFO */ } ACE_INLINE int diff --git a/dep/ACE_wrappers/ace/OS_NS_wchar.cpp b/dep/ACE_wrappers/ace/OS_NS_wchar.cpp index c5217eff6..b0a5075ac 100644 --- a/dep/ACE_wrappers/ace/OS_NS_wchar.cpp +++ b/dep/ACE_wrappers/ace/OS_NS_wchar.cpp @@ -1,8 +1,8 @@ -// $Id: OS_NS_wchar.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: OS_NS_wchar.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/OS_NS_wchar.h" -ACE_RCSID(ace, OS_NS_wchar, "$Id: OS_NS_wchar.cpp 80826 2008-03-04 14:51:23Z wotte $") + #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_NS_wchar.inl" @@ -84,7 +84,7 @@ ACE_OS::wcscmp_emulation (const ACE_WCHAR_T *string1, { while (*string1 == *string2++) if (*string1++ == 0) - return (0); + return 0; return (*string1 - *--string2); } #endif /* !ACE_HAS_WCHAR || ACE_LACKS_WCSCMP */ @@ -157,7 +157,7 @@ ACE_OS::wcsicmp_emulation (const wchar_t *s, const wchar_t *t) size_t ACE_OS::wcslen_emulation (const ACE_WCHAR_T *string) { - const ACE_WCHAR_T *s; + const ACE_WCHAR_T *s = 0; for (s = string; *s; ++s) continue; @@ -178,14 +178,14 @@ ACE_OS::wcsncat_emulation (ACE_WCHAR_T *destination, const ACE_WCHAR_T *s = source; while (*d != 0) - d++; + ++d; do { if ((*d = *s++) == 0) break; - d++; + ++d; } while (--count != 0); *d = 0; @@ -285,7 +285,7 @@ wchar_t * ACE_OS::wcspbrk_emulation (const wchar_t *string, const wchar_t *charset) { - const wchar_t *scanp; + const wchar_t *scanp = 0; int c, sc; while ((c = *string++) != 0) @@ -335,7 +335,7 @@ ACE_OS::wcsspn_emulation (const wchar_t *string, const wchar_t *charset) { const wchar_t *p = string; - const wchar_t *spanp; + const wchar_t *spanp = 0; wchar_t c, sc; // Skip any characters in charset, excluding the terminating \0. diff --git a/dep/ACE_wrappers/ace/OS_NS_wctype.cpp b/dep/ACE_wrappers/ace/OS_NS_wctype.cpp new file mode 100644 index 000000000..d73b4c5fe --- /dev/null +++ b/dep/ACE_wrappers/ace/OS_NS_wctype.cpp @@ -0,0 +1,11 @@ +// -*- C++ -*- +// $Id: OS_NS_wctype.cpp 91286 2010-08-05 09:04:31Z johnnyw $ + +#include "ace/OS_NS_wctype.h" + + + +#if !defined (ACE_HAS_INLINED_OSCALLS) +# include "ace/OS_NS_wctype.inl" +#endif /* ACE_HAS_INLINED_OSCALLS */ + diff --git a/dep/ACE_wrappers/ace/OS_NS_wctype.h b/dep/ACE_wrappers/ace/OS_NS_wctype.h new file mode 100644 index 000000000..47fbfd580 --- /dev/null +++ b/dep/ACE_wrappers/ace/OS_NS_wctype.h @@ -0,0 +1,71 @@ +// -*- C++ -*- + +//============================================================================= +/** + * @file OS_NS_wctype.h + * + * $Id: OS_NS_wctype.h 83891 2008-11-28 11:01:50Z johnnyw $ + * + * @author Johnny Willemsen + */ +//============================================================================= + +#ifndef ACE_OS_NS_WCTYPE_H +# define ACE_OS_NS_WCTYPE_H + +# include /**/ "ace/pre.h" + +# include "ace/config-all.h" + +# if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +# endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include /**/ "ace/ACE_export.h" + +#if defined (ACE_EXPORT_MACRO) +# undef ACE_EXPORT_MACRO +#endif +#define ACE_EXPORT_MACRO ACE_Export + +#include "ace/os_include/os_ctype.h" +#if defined ACE_HAS_WCHAR +# include "ace/os_include/os_wctype.h" +#endif /* ACE_HAS_WCHAR */ + +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + +namespace ACE_OS { + + // these are non-standard names... + + /** @name Functions from + * + * Included are the functions defined in and their + * equivalents. + * + * Since they are often implemented as macros, we don't use the same name + * here. Instead, we change by prepending "ace_". + */ + //@{ +#if defined (ACE_HAS_WCHAR) + /// Tests @a c for the property specified by the @a desc argument + ACE_NAMESPACE_INLINE_FUNCTION + int ace_iswctype(wint_t c, wctype_t desc); +#endif /* ACE_HAS_WCHAR */ + //@} + +} /* namespace ACE_OS */ + +ACE_END_VERSIONED_NAMESPACE_DECL + +# if defined (ACE_HAS_INLINED_OSCALLS) +# if defined (ACE_INLINE) +# undef ACE_INLINE +# endif /* ACE_INLINE */ +# define ACE_INLINE inline +# include "ace/OS_NS_wctype.inl" +# endif /* ACE_HAS_INLINED_OSCALLS */ + +# include /**/ "ace/post.h" +#endif /* ACE_OS_NS_WCTYPE_H */ diff --git a/dep/ACE_wrappers/ace/OS_NS_wctype.inl b/dep/ACE_wrappers/ace/OS_NS_wctype.inl new file mode 100644 index 000000000..7706471b1 --- /dev/null +++ b/dep/ACE_wrappers/ace/OS_NS_wctype.inl @@ -0,0 +1,25 @@ +// -*- C++ -*- +// +// $Id: OS_NS_wctype.inl 83891 2008-11-28 11:01:50Z johnnyw $ + +#if defined (ACE_LACKS_ISWCTYPE) +#include "ace/OS_NS_errno.h" +#endif + +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + +#if defined (ACE_HAS_WCHAR) +ACE_INLINE int +ACE_OS::ace_iswctype(wint_t c, wctype_t desc) +{ +#if !defined (ACE_LACKS_ISWCTYPE) + return iswctype (c, desc); +#else + ACE_UNUSED_ARG (c); + ACE_UNUSED_ARG (desc); + ACE_NOTSUP_RETURN (-1); +#endif +} +#endif /* ACE_HAS_WCHAR */ + +ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/OS_QoS.cpp b/dep/ACE_wrappers/ace/OS_QoS.cpp index e24b32c85..4913dd51f 100644 --- a/dep/ACE_wrappers/ace/OS_QoS.cpp +++ b/dep/ACE_wrappers/ace/OS_QoS.cpp @@ -2,7 +2,7 @@ ///** // * @file OS_QoS.cpp // * -// * $Id: OS_QoS.cpp 80826 2008-03-04 14:51:23Z wotte $ +// * $Id: OS_QoS.cpp 86508 2009-08-14 13:32:40Z johnnyw $ // * // * @brief Contains OS specific data structures for QoS networking. // * @@ -363,7 +363,7 @@ void ACE_QoS::provider_specific (const iovec &ps) { #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) - this->ProviderSpecific = (WSABUF) ((iovec &) ps); + this->ProviderSpecific = (WSABUF) (const_cast (ps)); #else ACE_UNUSED_ARG (ps); #endif /* ACE_HAS_WINSOCK2 */ diff --git a/dep/ACE_wrappers/ace/OS_TLI.cpp b/dep/ACE_wrappers/ace/OS_TLI.cpp index c874388f4..368378121 100644 --- a/dep/ACE_wrappers/ace/OS_TLI.cpp +++ b/dep/ACE_wrappers/ace/OS_TLI.cpp @@ -1,8 +1,8 @@ -// $Id: OS_TLI.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: OS_TLI.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/OS_TLI.h" -ACE_RCSID(ace, OS_TLI, "$Id: OS_TLI.cpp 80826 2008-03-04 14:51:23Z wotte $") + #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_TLI.inl" diff --git a/dep/ACE_wrappers/ace/OS_Thread_Adapter.cpp b/dep/ACE_wrappers/ace/OS_Thread_Adapter.cpp index f65d1acaf..e5bf95b23 100644 --- a/dep/ACE_wrappers/ace/OS_Thread_Adapter.cpp +++ b/dep/ACE_wrappers/ace/OS_Thread_Adapter.cpp @@ -1,11 +1,7 @@ -// $Id: OS_Thread_Adapter.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: OS_Thread_Adapter.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $ #include "ace/OS_Thread_Adapter.h" -ACE_RCSID (ace, - OS_Thread_Adapter, - "$Id: OS_Thread_Adapter.cpp 80826 2008-03-04 14:51:23Z wotte $") - #include "ace/Thread_Hook.h" #include "ace/Object_Manager_Base.h" #include "ace/Global_Macros.h" diff --git a/dep/ACE_wrappers/ace/OS_Thread_Adapter.h b/dep/ACE_wrappers/ace/OS_Thread_Adapter.h index 7b41c5609..4dc3cee09 100644 --- a/dep/ACE_wrappers/ace/OS_Thread_Adapter.h +++ b/dep/ACE_wrappers/ace/OS_Thread_Adapter.h @@ -4,7 +4,7 @@ /** * @file OS_Thread_Adapter.h * - * $Id: OS_Thread_Adapter.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: OS_Thread_Adapter.h 85341 2009-05-14 11:07:37Z johnnyw $ * * @author Carlos O'Ryan */ @@ -63,7 +63,6 @@ protected: /// Ensure that this object is allocated on the heap. ~ACE_OS_Thread_Adapter (void); - }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/OS_main.cpp b/dep/ACE_wrappers/ace/OS_main.cpp index cf9e0bc84..982effa1f 100644 --- a/dep/ACE_wrappers/ace/OS_main.cpp +++ b/dep/ACE_wrappers/ace/OS_main.cpp @@ -1,8 +1,10 @@ -// $Id: OS_main.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: OS_main.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/OS_main.h" -ACE_RCSID(ace, OS_main, "$Id: OS_main.cpp 80826 2008-03-04 14:51:23Z wotte $") + + +#if !defined (ACE_DOESNT_DEFINE_MAIN) #if defined (ACE_HAS_NONSTATIC_OBJECT_MANAGER) && !defined (ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER) @@ -43,7 +45,8 @@ int ace_os_main_i (int argc, char *argv[]) /* user's entry point, e.g., main */ return vx_ace_main_i_ptr ? (*vx_ace_main_i_ptr) (argc, argv) : (-1); /* what the user calls "main" */ } # else /* !ACE_VXWORKS && !__RTP__ */ -int ace_os_main_i (int argc, char *argv[]) /* user's entry point, e.g., main */ +ACE_Export int +ace_os_main_i (int argc, char *argv[]) /* user's entry point, e.g., main */ { ACE_MAIN_OBJECT_MANAGER return ace_main_i (argc, argv); /* what the user calls "main" */ @@ -100,23 +103,47 @@ ACE_END_VERSIONED_NAMESPACE_DECL // CE only gets a command line string; no argv. So we need to convert it // when the main entrypoint expects argc/argv. ACE_ARGV supports this. # include "ace/OS_NS_string.h" +# include "ace/OS_NS_ctype.h" # include "ace/ACE.h" # include "ace/ARGV.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_Main_Base::~ACE_Main_Base () +{ +} + int ACE_Main_Base::run (HINSTANCE, HINSTANCE, LPWSTR lpCmdLine, int) { ACE_TCHAR cmdline[1024]; - ACE_OS::strcpy (cmdline, ACE_TEXT ("program ")); + ACE_TCHAR msg_file [MAXPATHLEN]; + if (ACE_TEXT_GetModuleFileName (0, msg_file, MAXPATHLEN)) + { + bool quote = false; + for (size_t i(0); !quote && msg_file[i]; ++i) + { + if (ACE_OS::ace_isspace (msg_file[i])) quote = true; + } + ACE_TCHAR *cmd_iter = cmdline; + if (quote) + { + *cmd_iter++ = ACE_TEXT ('"'); + } + ACE_OS::strcpy (cmd_iter, msg_file); + ACE_OS::strcat (cmd_iter, quote ? ACE_TEXT ("\" ") : ACE_TEXT (" ")); + } + else + { + ACE_OS::strcpy (cmdline, ACE_TEXT ("program ")); + } ACE_OS::strcat (cmdline, ACE_TEXT_WCHAR_TO_TCHAR (lpCmdLine)); ACE_ARGV ce_argv (cmdline); ACE::init (); ACE_MAIN_OBJECT_MANAGER - int i = this->run_i (ce_argv.argc (), ce_argv.argv ()); + int const i = this->run_i (ce_argv.argc (), ce_argv.argv ()); ACE::fini (); return i; } @@ -124,4 +151,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL # endif /* !ACE_HAS_WINCE */ -# endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER && !ACE_HAS_WINCE && !ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER */ +#endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER && !ACE_HAS_WINCE && !ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER */ + +#endif /* ACE_DOESNT_DEFINE_MAIN */ + diff --git a/dep/ACE_wrappers/ace/OS_main.h b/dep/ACE_wrappers/ace/OS_main.h index 71be8c08e..b916280ea 100644 --- a/dep/ACE_wrappers/ace/OS_main.h +++ b/dep/ACE_wrappers/ace/OS_main.h @@ -4,7 +4,7 @@ /** * @file OS_main.h * - * $Id: OS_main.h 81843 2008-06-05 15:47:55Z schmidt $ + * $Id: OS_main.h 85579 2009-06-08 18:46:54Z mitza $ * * @author Douglas C. Schmidt * @author Jesper S. M|ller @@ -25,6 +25,8 @@ # pragma once # endif /* ACE_LACKS_PRAGMA_ONCE */ +# if !defined (ACE_DOESNT_DEFINE_MAIN) + # if defined (ACE_HAS_RTEMS) extern char* rtems_progname; # endif /* ACE_HAS_RTEMS */ @@ -139,14 +141,14 @@ ace_main_i # define main \ ACE_MAIN (int, char *[]); /* forward decl to gobble up the 'int' if there is one */ \ ACE_BEGIN_VERSIONED_NAMESPACE_DECL \ -int ace_os_main_i (int, char *[]); \ +ACE_Export int ace_os_main_i (int, char *[]); \ ACE_END_VERSIONED_NAMESPACE_DECL \ int \ ACE_MAIN (int argc, char *argv[]) /* user's entry point, e.g., main */ \ { \ return ace_os_main_i (argc, argv); /* what the user calls "main" */ \ } \ -int \ +ACE_Proper_Export_Flag int \ ace_main_i # elif !defined (ACE_HAS_WINCE) @@ -236,6 +238,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Export ACE_Main_Base { public: + virtual ~ACE_Main_Base (void); int run (HINSTANCE, HINSTANCE, LPWSTR, int); virtual int run_i (int, ACE_TCHAR *[]) = 0; }; @@ -300,6 +303,8 @@ int ace_main_i # endif /* ACE_PSOSIM */ # endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER && !ACE_HAS_WINCE && !ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER */ +#endif /* ACE_DOESNT_DEFINE_MAIN */ + # include /**/ "ace/post.h" #endif /* ACE_OS_MAIN_H */ diff --git a/dep/ACE_wrappers/ace/Obchunk.cpp b/dep/ACE_wrappers/ace/Obchunk.cpp index cbe56af7d..50ac21fa0 100644 --- a/dep/ACE_wrappers/ace/Obchunk.cpp +++ b/dep/ACE_wrappers/ace/Obchunk.cpp @@ -1,4 +1,4 @@ -// $Id: Obchunk.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Obchunk.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/Obchunk.h" @@ -6,7 +6,7 @@ #include "ace/Obchunk.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ace, Obchunk, "$Id: Obchunk.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/Object_Manager.cpp b/dep/ACE_wrappers/ace/Object_Manager.cpp index fbe0b5c46..3966fd312 100644 --- a/dep/ACE_wrappers/ace/Object_Manager.cpp +++ b/dep/ACE_wrappers/ace/Object_Manager.cpp @@ -1,4 +1,4 @@ -// $Id: Object_Manager.cpp 81450 2008-04-25 21:24:33Z mitza $ +// $Id: Object_Manager.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/Object_Manager.h" #if !defined (ACE_LACKS_ACE_TOKEN) @@ -30,8 +30,13 @@ #include "ace/Null_Mutex.h" #include "ace/Mutex.h" #include "ace/RW_Thread_Mutex.h" +#if defined (ACE_DISABLE_WIN32_ERROR_WINDOWS) && \ + defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) \ + && (_MSC_VER >= 1400) // VC++ 8.0 and above. + #include "ace/OS_NS_stdlib.h" +#endif // ACE_DISABLE_WIN32_ERROR_WINDOWS && ACE_WIN32 && !ACE_HAS_WINCE && (_MSC_VER >= 1400) + -ACE_RCSID(ace, Object_Manager, "$Id: Object_Manager.cpp 81450 2008-04-25 21:24:33Z mitza $") #if ! defined (ACE_APPLICATION_PREALLOCATED_OBJECT_DEFINITIONS) # define ACE_APPLICATION_PREALLOCATED_OBJECT_DEFINITIONS @@ -51,6 +56,18 @@ ACE_RCSID(ace, Object_Manager, "$Id: Object_Manager.cpp 81450 2008-04-25 21:24:3 ACE_BEGIN_VERSIONED_NAMESPACE_DECL +// Note the following fix was derived from that proposed by Jochen Kalmbach +// http://blog.kalmbachnet.de/?postid=75 +#if defined (ACE_DISABLE_WIN32_ERROR_WINDOWS) && \ + defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && \ + (_MSC_VER >= 1400) && defined (_M_IX86) +LPTOP_LEVEL_EXCEPTION_FILTER WINAPI ACEdisableSetUnhandledExceptionFilter ( + LPTOP_LEVEL_EXCEPTION_FILTER lpTopLevelExceptionFilter) +{ + return 0; +} +#endif // ACE_DISABLE_WIN32_ERROR_WINDOWS && ACE_WIN32 && !ACE_HAS_WINCE && (_MSC_VER >= 1400) && _M_IX86 + // Singleton pointer. ACE_Object_Manager *ACE_Object_Manager::instance_ = 0; @@ -257,6 +274,53 @@ ACE_Object_Manager::init (void) // And this will catch all unhandled exceptions. SetUnhandledExceptionFilter (&ACE_UnhandledExceptionFilter); + +# if (_MSC_VER >= 1400) // VC++ 8.0 and above. + // And this will stop the abort system call from being treated as a crash + _set_abort_behavior( 0, _CALL_REPORTFAULT); + + // Note the following fix was derived from that proposed by Jochen Kalmbach + // http://blog.kalmbachnet.de/?postid=75 + // See also: + // http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=101337 + // + // Starting with VC8 (VS2005), Microsoft changed the behaviour of the CRT in some + // security related and special situations. The are many situations in which our + // ACE_UnhandledExceptionFilter will never be called. This is a major change to + // the previous versions of the CRT and is not very well documented. + // The CRT simply forces the call to the default-debugger without informing the + // registered unhandled exception filter. Jochen's solution is to stop the CRT + // from calling SetUnhandledExceptionFilter() after we have done so above. + // NOTE this only works for intel based windows builds. + +# ifdef _M_IX86 + HMODULE hKernel32 = ACE_TEXT_LoadLibrary (ACE_TEXT ("kernel32.dll")); + if (hKernel32) + { + void *pOrgEntry = + GetProcAddress (hKernel32, "SetUnhandledExceptionFilter"); + if (pOrgEntry) + { + unsigned char newJump[ 100 ]; + DWORD dwOrgEntryAddr = reinterpret_cast (pOrgEntry); + dwOrgEntryAddr += 5; // add 5 for 5 op-codes for jmp far + void *pNewFunc = &ACEdisableSetUnhandledExceptionFilter; + DWORD dwNewEntryAddr = reinterpret_cast (pNewFunc); + DWORD dwRelativeAddr = dwNewEntryAddr - dwOrgEntryAddr; + + newJump[ 0 ] = 0xE9; // JMP absolute + ACE_OS::memcpy (&newJump[ 1 ], &dwRelativeAddr, sizeof (pNewFunc)); + SIZE_T bytesWritten; + WriteProcessMemory ( + GetCurrentProcess (), + pOrgEntry, + newJump, + sizeof (pNewFunc) + 1, + &bytesWritten); + } + } +# endif // _M_IX86 +# endif // (_MSC_VER >= 1400) // VC++ 8.0 and above. #endif /* ACE_DISABLE_WIN32_ERROR_WINDOWS && ACE_WIN32 && !ACE_HAS_WINCE */ @@ -380,7 +444,8 @@ ACE_Object_Manager::instance (void) int ACE_Object_Manager::at_exit_i (void *object, ACE_CLEANUP_FUNC cleanup_hook, - void *param) + void *param, + const char* name) { ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, *instance_->internal_lock_, -1)); @@ -398,7 +463,22 @@ ACE_Object_Manager::at_exit_i (void *object, return -1; } - return exit_info_.at_exit_i (object, cleanup_hook, param); + return exit_info_.at_exit_i (object, cleanup_hook, param, name); +} + +int +ACE_Object_Manager::remove_at_exit_i (void *object) +{ + ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, + *instance_->internal_lock_, -1)); + + if (shutting_down_i ()) + { + errno = EAGAIN; + return -1; + } + + return exit_info_.remove (object); } #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) @@ -467,7 +547,7 @@ ACE_Object_Manager::get_singleton_lock (ACE_Thread_Mutex *&lock) if (lock == 0) { - ACE_Cleanup_Adapter *lock_adapter; + ACE_Cleanup_Adapter *lock_adapter = 0; ACE_NEW_RETURN (lock_adapter, ACE_Cleanup_Adapter, -1); @@ -477,7 +557,9 @@ ACE_Object_Manager::get_singleton_lock (ACE_Thread_Mutex *&lock) // termination. This call will cause us to grab the // ACE_Object_Manager::instance ()->internal_lock_ // again; that's why it is a recursive lock. - ACE_Object_Manager::at_exit (lock_adapter); + ACE_Object_Manager::at_exit (lock_adapter, + 0, + typeid (*lock_adapter).name ()); } } } @@ -515,7 +597,7 @@ ACE_Object_Manager::get_singleton_lock (ACE_Mutex *&lock) if (lock == 0) { - ACE_Cleanup_Adapter *lock_adapter; + ACE_Cleanup_Adapter *lock_adapter = 0; ACE_NEW_RETURN (lock_adapter, ACE_Cleanup_Adapter, -1); @@ -599,7 +681,7 @@ ACE_Object_Manager::get_singleton_lock (ACE_RW_Thread_Mutex *&lock) if (lock == 0) { - ACE_Cleanup_Adapter *lock_adapter; + ACE_Cleanup_Adapter *lock_adapter = 0; ACE_NEW_RETURN (lock_adapter, ACE_Cleanup_Adapter, -1); diff --git a/dep/ACE_wrappers/ace/Object_Manager.h b/dep/ACE_wrappers/ace/Object_Manager.h index 2b603b0a3..5e177ee6b 100644 --- a/dep/ACE_wrappers/ace/Object_Manager.h +++ b/dep/ACE_wrappers/ace/Object_Manager.h @@ -4,7 +4,7 @@ /** * @file Object_Manager.h * - * $Id: Object_Manager.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Object_Manager.h 91066 2010-07-12 11:05:04Z johnnyw $ * * @author David L. Levine * @author Matthias Kerkhoff @@ -237,13 +237,13 @@ public: * Register an ACE_Cleanup object for cleanup at process * termination. The object is deleted via the * . If you need more flexiblity, see the - * method below. For OS's that do not have + * @c other at_exit method below. For OS's that do not have * processes, cleanup takes place at the end of
. Returns 0 * on success. On failure, returns -1 and sets errno to: EAGAIN if * shutting down, ENOMEM if insufficient virtual memory, or EEXIST * if the object (or array) had already been registered. */ - static int at_exit (ACE_Cleanup *object, void *param = 0); + static int at_exit (ACE_Cleanup *object, void *param = 0, const char* name = 0); #if defined (ACE_HAS_TSS_EMULATION) static int init_tss (void); @@ -256,8 +256,8 @@ public: * that is called for the object or array when it to be destroyed. * It may perform any necessary cleanup specific for that object or * its class. "param" is passed as the second parameter to the - * "cleanup_hook" function; the first parameter is the object (or - * array) to be destroyed. "cleanup_hook", for example, may delete + * @a cleanup_hook function; the first parameter is the object (or + * array) to be destroyed. @a cleanup_hook, for example, may delete * the object (or array). For OS's that do not have processes, this * function is the same as . Returns 0 on success. * On failure, returns -1 and sets errno to: EAGAIN if shutting @@ -266,14 +266,18 @@ public: */ static int at_exit (void *object, ACE_CLEANUP_FUNC cleanup_hook, - void *param); + void *param, + const char* name = 0); + + static int remove_at_exit (void *object); #if 0 /* not implemented yet */ - /// Similar to , except that the cleanup_hook is called + /// Similar to at_exit(), except that the cleanup_hook is called /// when the current thread exits instead of when the program terminates. static int at_thread_exit (void *object, ACE_CLEANUP_FUNC cleanup_hook, - void *param); + void *param, + const char* name); #endif /* 0 */ /// Unique identifiers for preallocated objects. Please see @@ -323,7 +327,8 @@ public: }; /** - * @deprecated Accesses a default signal set used, for example, + * @deprecated + * Accesses a default signal set used, for example, * in ACE_Sig_Guard methods. * Deprecated: use ACE_Object_Manager::default_mask () instead. */ @@ -343,7 +348,11 @@ private: /// Register an object or array for deletion at program termination. /// See description of static version above for return values. - int at_exit_i (void *object, ACE_CLEANUP_FUNC cleanup_hook, void *param); + int at_exit_i (void *object, ACE_CLEANUP_FUNC cleanup_hook, void *param, const char* name); + + /// Remove an object for deletion at program termination. + /// See description of static version above for return values. + int remove_at_exit_i (void *object); #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) public: @@ -403,10 +412,10 @@ public: static void *preallocated_array[ACE_PREALLOCATED_ARRAYS]; public: - // Application code should not use these explicitly, so they're - // hidden here. They're public so that the ACE_Object_Manager can - // be constructed/destructed in
with - // ACE_HAS_NONSTATIC_OBJECT_MANAGER. + /// Application code should not use these explicitly, so they're + /// hidden here. They're public so that the ACE_Object_Manager can + /// be constructed/destructed in
with + /// ACE_HAS_NONSTATIC_OBJECT_MANAGER. ACE_Object_Manager (void); ~ACE_Object_Manager (void); @@ -427,7 +436,7 @@ private: #endif /* ACE_MT_SAFE */ #if defined (ACE_HAS_TSS_EMULATION) - // Main thread's thread-specific storage array. + /// Main thread's thread-specific storage array. void *ts_storage_[ACE_TSS_Emulation::ACE_TSS_THREAD_KEYS_MAX]; bool ts_storage_initialized_; #endif /* ACE_HAS_TSS_EMULATION */ @@ -436,7 +445,7 @@ private: friend class ACE_Object_Manager_Manager; #endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER */ - // Disallow copying by not implementing the following . . . + /// Disallow copying by not implementing the following . . . ACE_Object_Manager (const ACE_Object_Manager &); ACE_Object_Manager &operator= (const ACE_Object_Manager &); }; diff --git a/dep/ACE_wrappers/ace/Object_Manager.inl b/dep/ACE_wrappers/ace/Object_Manager.inl index bcc27af91..30dca17ac 100644 --- a/dep/ACE_wrappers/ace/Object_Manager.inl +++ b/dep/ACE_wrappers/ace/Object_Manager.inl @@ -1,30 +1,41 @@ // -*- C++ -*- // -// $Id: Object_Manager.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Object_Manager.inl 84163 2009-01-15 07:57:27Z johnnyw $ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE int ACE_Object_Manager::at_exit (ACE_Cleanup *object, - void *param) + void *param, + const char* name) { return ACE_Object_Manager::instance ()->at_exit_i ( object, (ACE_CLEANUP_FUNC) ACE_CLEANUP_DESTROYER_NAME, - param); + param, + name); } ACE_INLINE int ACE_Object_Manager::at_exit (void *object, ACE_CLEANUP_FUNC cleanup_hook, - void *param) + void *param, + const char* name) { return ACE_Object_Manager::instance ()->at_exit_i ( object, cleanup_hook, - param); + param, + name); +} + +ACE_INLINE +int +ACE_Object_Manager::remove_at_exit (void *object) +{ + return ACE_Object_Manager::instance ()->remove_at_exit_i (object); } ACE_INLINE diff --git a/dep/ACE_wrappers/ace/Object_Manager_Base.cpp b/dep/ACE_wrappers/ace/Object_Manager_Base.cpp index 16b271df1..400c891a2 100644 --- a/dep/ACE_wrappers/ace/Object_Manager_Base.cpp +++ b/dep/ACE_wrappers/ace/Object_Manager_Base.cpp @@ -1,8 +1,8 @@ -// $Id: Object_Manager_Base.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Object_Manager_Base.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/Object_Manager_Base.h" -ACE_RCSID(ace, Object_Manager_Base, "$Id: Object_Manager_Base.cpp 80826 2008-03-04 14:51:23Z wotte $") + #include "ace/OS_Memory.h" #include "ace/OS_NS_Thread.h" @@ -83,8 +83,8 @@ void *ACE_OS_Object_Manager::preallocated_object[ ACE_OS_Object_Manager::ACE_OS_PREALLOCATED_OBJECTS] = { 0 }; ACE_OS_Object_Manager::ACE_OS_Object_Manager (void) - // default_mask_ isn't initialized, because it's defined by . - : thread_hook_ (0) + : default_mask_ (0) + , thread_hook_ (0) , exit_info_ () #if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) , seh_except_selector_ (ACE_SEH_Default_Exception_Selector) @@ -394,11 +394,12 @@ ACE_OS_Object_Manager::fini (void) int ace_exit_hook_marker = 0; int -ACE_OS_Object_Manager::at_exit (ACE_EXIT_HOOK func) +ACE_OS_Object_Manager::at_exit (ACE_EXIT_HOOK func, const char* name) { return exit_info_.at_exit_i (&ace_exit_hook_marker, reinterpret_cast (func), - 0); + 0, + name); } void diff --git a/dep/ACE_wrappers/ace/Object_Manager_Base.h b/dep/ACE_wrappers/ace/Object_Manager_Base.h index 8335253c4..66df51d96 100644 --- a/dep/ACE_wrappers/ace/Object_Manager_Base.h +++ b/dep/ACE_wrappers/ace/Object_Manager_Base.h @@ -4,7 +4,7 @@ /** * @file Object_Manager_Base.h * - * $Id: Object_Manager_Base.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Object_Manager_Base.h 84163 2009-01-15 07:57:27Z johnnyw $ * * @author Douglas C. Schmidt * @author Jesper S. M|ller @@ -104,7 +104,7 @@ protected: /** * Flag indicating whether the ACE_Object_Manager was dynamically - * allocated by ACE. (If is was dynamically allocated by the + * allocated by ACE. (If is was dynamically allocated by the * application, then the application is responsible for destroying * it.) */ @@ -205,7 +205,7 @@ public: static ACE_OS_Object_Manager *instance (void); /// For support. - int at_exit (ACE_EXIT_HOOK func); + int at_exit (ACE_EXIT_HOOK func, const char* name = 0); //private: /// Singleton instance pointer. diff --git a/dep/ACE_wrappers/ace/Obstack_T.cpp b/dep/ACE_wrappers/ace/Obstack_T.cpp index 5c6863fc6..65e07167a 100644 --- a/dep/ACE_wrappers/ace/Obstack_T.cpp +++ b/dep/ACE_wrappers/ace/Obstack_T.cpp @@ -1,4 +1,4 @@ -// $Id: Obstack_T.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Obstack_T.cpp 88793 2010-02-01 17:50:34Z cleeland $ #ifndef ACE_OBSTACK_T_CPP #define ACE_OBSTACK_T_CPP @@ -19,11 +19,11 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_Obstack_T) -template void -ACE_Obstack_T::dump (void) const +template void +ACE_Obstack_T::dump (void) const { #if defined (ACE_HAS_DUMP) - ACE_TRACE ("ACE_Obstack_T::dump"); + ACE_TRACE ("ACE_Obstack_T::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("size_ = %d\n"), this->size_)); @@ -33,13 +33,13 @@ ACE_Obstack_T::dump (void) const #endif /* ACE_HAS_DUMP */ } -template int -ACE_Obstack_T::request (size_t len) +template int +ACE_Obstack_T::request (size_t len) { - ACE_TRACE ("ACE_Obstack_T::request"); + ACE_TRACE ("ACE_Obstack_T::request"); // normalize the length. - len *= sizeof (CHAR); + len *= sizeof (ACE_CHAR_T); // Check to see if there's room for the requested length, including // any part of an existing string, if any. @@ -89,15 +89,15 @@ ACE_Obstack_T::request (size_t len) return 0; } -template CHAR * -ACE_Obstack_T::grow (CHAR c) +template ACE_CHAR_T * +ACE_Obstack_T::grow (ACE_CHAR_T c) { - ACE_TRACE ("ACE_Obstack_T::grow"); + ACE_TRACE ("ACE_Obstack_T::grow"); if (this->request (1) == 0) { - CHAR *retv = reinterpret_cast (this->curr_->cur_); - this->curr_->cur_ += sizeof (CHAR); + ACE_CHAR_T *retv = reinterpret_cast (this->curr_->cur_); + this->curr_->cur_ += sizeof (ACE_CHAR_T); *retv = c; return retv; } @@ -105,10 +105,10 @@ ACE_Obstack_T::grow (CHAR c) return 0; } -template ACE_Obchunk * -ACE_Obstack_T::new_chunk (void) +template ACE_Obchunk * +ACE_Obstack_T::new_chunk (void) { - ACE_TRACE ("ACE_Obstack_T::new_chunk"); + ACE_TRACE ("ACE_Obstack_T::new_chunk"); ACE_Obchunk *temp = 0; @@ -120,15 +120,15 @@ ACE_Obstack_T::new_chunk (void) return temp; } -template -ACE_Obstack_T::ACE_Obstack_T (size_t size, +template +ACE_Obstack_T::ACE_Obstack_T (size_t size, ACE_Allocator *allocator_strategy) : allocator_strategy_ (allocator_strategy), size_ (size), head_ (0), curr_ (0) { - ACE_TRACE ("ACE_Obstack_T::ACE_Obstack"); + ACE_TRACE ("ACE_Obstack_T::ACE_Obstack"); if (this->allocator_strategy_ == 0) ACE_ALLOCATOR (this->allocator_strategy_, @@ -138,10 +138,10 @@ ACE_Obstack_T::ACE_Obstack_T (size_t size, this->curr_ = this->head_; } -template -ACE_Obstack_T::~ACE_Obstack_T (void) +template +ACE_Obstack_T::~ACE_Obstack_T (void) { - ACE_TRACE ("ACE_Obstack_T::~ACE_Obstack_T"); + ACE_TRACE ("ACE_Obstack_T::~ACE_Obstack_T"); ACE_Obchunk *temp = this->head_; @@ -154,23 +154,23 @@ ACE_Obstack_T::~ACE_Obstack_T (void) } } -template CHAR * -ACE_Obstack_T::copy (const CHAR *s, +template ACE_CHAR_T * +ACE_Obstack_T::copy (const ACE_CHAR_T *s, size_t len) { - ACE_TRACE ("ACE_Obstack_T::copy"); + ACE_TRACE ("ACE_Obstack_T::copy"); if (this->request (len) != 0) return 0; - size_t tsize = len * sizeof (CHAR); + size_t tsize = len * sizeof (ACE_CHAR_T); ACE_OS::memcpy (this->curr_->cur_, s, tsize); this->curr_->cur_ += tsize ; return this->freeze (); } -template void -ACE_Obstack_T::unwind (void* obj) +template void +ACE_Obstack_T::unwind (void* obj) { if (obj >= this->curr_->contents_ && obj < this->curr_->end_) this->curr_->block_ = this->curr_->cur_ = reinterpret_cast (obj); @@ -178,8 +178,8 @@ ACE_Obstack_T::unwind (void* obj) this->unwind_i (obj); } -template void -ACE_Obstack_T::unwind_i (void* obj) +template void +ACE_Obstack_T::unwind_i (void* obj) { ACE_Obchunk* curr = this->head_; while (curr != 0 && (curr->contents_ > obj || curr->end_ < obj)) @@ -194,29 +194,29 @@ ACE_Obstack_T::unwind_i (void* obj) ACE_TEXT ("Deletion of non-existent object.\n%a"))); } -template void -ACE_Obstack_T::release (void) +template void +ACE_Obstack_T::release (void) { - ACE_TRACE ("ACE_Obstack_T::release"); + ACE_TRACE ("ACE_Obstack_T::release"); this->curr_ = this->head_; this->curr_->block_ = this->curr_->cur_ = this->curr_->contents_; } -template void -ACE_Obstack_T::grow_fast (CHAR c) +template void +ACE_Obstack_T::grow_fast (ACE_CHAR_T c) { - * (reinterpret_cast (this->curr_->cur_)) = c; - this->curr_->cur_ += sizeof (CHAR); + * (reinterpret_cast (this->curr_->cur_)) = c; + this->curr_->cur_ += sizeof (ACE_CHAR_T); } -template CHAR * -ACE_Obstack_T::freeze (void) +template ACE_CHAR_T * +ACE_Obstack_T::freeze (void) { - CHAR *retv = reinterpret_cast (this->curr_->block_); - * (reinterpret_cast (this->curr_->cur_)) = 0; + ACE_CHAR_T *retv = reinterpret_cast (this->curr_->block_); + * (reinterpret_cast (this->curr_->cur_)) = 0; - this->curr_->cur_ += sizeof (CHAR); + this->curr_->cur_ += sizeof (ACE_CHAR_T); this->curr_->block_ = this->curr_->cur_; return retv; } diff --git a/dep/ACE_wrappers/ace/Obstack_T.h b/dep/ACE_wrappers/ace/Obstack_T.h index c94cbc7cf..d27d43b6e 100644 --- a/dep/ACE_wrappers/ace/Obstack_T.h +++ b/dep/ACE_wrappers/ace/Obstack_T.h @@ -4,7 +4,7 @@ /** * @file Obstack_T.h * - * $Id: Obstack_T.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Obstack_T.h 88793 2010-02-01 17:50:34Z cleeland $ * * @author Doug Schmidt * @author Nanbor Wang @@ -34,12 +34,12 @@ class ACE_Allocator; * The implementation is similar to the GNU obstack utility, * which is used extensively in the GCC compiler. */ -template +template class ACE_Obstack_T { public: // = Initialization and termination methods. - ACE_Obstack_T (size_t size = (4096 * sizeof (CHAR)) - sizeof (ACE_Obchunk), + ACE_Obstack_T (size_t size = (4096 * sizeof (ACE_CHAR_T)) - sizeof (ACE_Obchunk), ACE_Allocator *allocator_strategy = 0); ~ACE_Obstack_T (void); @@ -47,32 +47,32 @@ public: /// a new string. Return -1 if fail, 0 if success. int request (size_t len); - /// Inserting a new CHAR \a c into the current building + /// Inserting a new ACE_CHAR_T \a c into the current building /// block without freezing (null terminating) the block. /// This function will create new chunk by checking the /// boundary of current Obchunk. Return /// the location \a c gets inserted to, or 0 if error. - CHAR *grow (CHAR c); + ACE_CHAR_T *grow (ACE_CHAR_T c); - /// Inserting a new CHAR \a c into the current building + /// Inserting a new ACE_CHAR_T \a c into the current building /// block without freezing (null terminating) the block and without /// checking for out-of-bound error. - void grow_fast (CHAR c); + void grow_fast (ACE_CHAR_T c); /// Freeze the current building block by null terminating it. /// Return the starting address of the current building block, 0 /// if error occurs. - CHAR *freeze (void); + ACE_CHAR_T *freeze (void); /// Copy the data into the current Obchunk and freeze the current /// block. Return the starting address of the current building /// block, 0 if error occurs. @a len specify the string length, /// not the actually data size. - CHAR *copy (const CHAR *data, + ACE_CHAR_T *copy (const ACE_CHAR_T *data, size_t len); /// Return the maximum @a length or @a size of a string that can be put - /// into this Obstack. @a size = @a length * sizeof (CHAR). + /// into this Obstack. @a size = @a length * sizeof (ACE_CHAR_T). /// /// @deprecated No need to use this function as you can put objects of /// arbitrary lengths into the obstack now. diff --git a/dep/ACE_wrappers/ace/Obstack_T.inl b/dep/ACE_wrappers/ace/Obstack_T.inl index b3e8669a3..dc5665cc7 100644 --- a/dep/ACE_wrappers/ace/Obstack_T.inl +++ b/dep/ACE_wrappers/ace/Obstack_T.inl @@ -1,17 +1,17 @@ // -*- C++ -*- // -// $Id: Obstack_T.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Obstack_T.inl 88793 2010-02-01 17:50:34Z cleeland $ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -template ACE_INLINE size_t -ACE_Obstack_T::length () const +template ACE_INLINE size_t +ACE_Obstack_T::length () const { - return this->size_ / sizeof (CHAR); + return this->size_ / sizeof (ACE_CHAR_T); } -template ACE_INLINE size_t -ACE_Obstack_T::size () const +template ACE_INLINE size_t +ACE_Obstack_T::size () const { return this->size_; } diff --git a/dep/ACE_wrappers/ace/PI_Malloc.cpp b/dep/ACE_wrappers/ace/PI_Malloc.cpp index 979ddd6ba..471f4ed90 100644 --- a/dep/ACE_wrappers/ace/PI_Malloc.cpp +++ b/dep/ACE_wrappers/ace/PI_Malloc.cpp @@ -1,12 +1,10 @@ +// $Id: PI_Malloc.cpp 91287 2010-08-05 10:30:49Z johnnyw $ + #ifndef ACE_PI_MALLOC_CPP #define ACE_PI_MALLOC_CPP #include "ace/PI_Malloc.h" -ACE_RCSID (ace, - PI_Malloc, - "$Id: PI_Malloc.cpp 80826 2008-03-04 14:51:23Z wotte $") - #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1) #if !defined (__ACE_INLINE__) diff --git a/dep/ACE_wrappers/ace/POSIX_Asynch_IO.cpp b/dep/ACE_wrappers/ace/POSIX_Asynch_IO.cpp index f585ad665..b28894ac1 100644 --- a/dep/ACE_wrappers/ace/POSIX_Asynch_IO.cpp +++ b/dep/ACE_wrappers/ace/POSIX_Asynch_IO.cpp @@ -1,4 +1,4 @@ -// $Id: POSIX_Asynch_IO.cpp 81535 2008-04-29 20:08:52Z shuston $ +// $Id: POSIX_Asynch_IO.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $ #include "ace/POSIX_Asynch_IO.h" @@ -14,11 +14,6 @@ #include "ace/OS_NS_sys_socket.h" #include "ace/OS_NS_sys_stat.h" -ACE_RCSID (ace, - POSIX_Asynch_IO, - "$Id: POSIX_Asynch_IO.cpp 81535 2008-04-29 20:08:52Z shuston $") - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL size_t @@ -815,7 +810,7 @@ ACE_POSIX_Asynch_Accept::open (const ACE_Handler::Proxy_Ptr &handler_proxy, if (this->flg_open_) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT("%N:%l:ACE_POSIX_Asynch_Accept::open:") - ACE_TEXT("acceptor already open \n")), + ACE_TEXT("acceptor already open\n")), -1); if (-1 == ACE_POSIX_Asynch_Operation::open (handler_proxy, @@ -2075,8 +2070,8 @@ ACE_POSIX_Asynch_Transmit_File::transmit_file (ACE_HANDLE file, if (file_size == -1) ACE_ERROR_RETURN ((LM_ERROR, - "Error:%N:%l:%p\n", - "POSIX_Asynch_Transmit_File:filesize failed"), + ACE_TEXT("Error:%N:%l:%p\n"), + ACE_TEXT("POSIX_Asynch_Transmit_File:filesize failed")), -1); if (bytes_to_write == 0) @@ -2084,8 +2079,8 @@ ACE_POSIX_Asynch_Transmit_File::transmit_file (ACE_HANDLE file, if (offset > (size_t) file_size) ACE_ERROR_RETURN ((LM_ERROR, - "Error:%p\n", - "Asynch_Transmit_File:File size is less than offset"), + ACE_TEXT("Error:%p\n"), + ACE_TEXT("Asynch_Transmit_File:File size is less than offset")), -1); if (offset != 0) diff --git a/dep/ACE_wrappers/ace/POSIX_CB_Proactor.cpp b/dep/ACE_wrappers/ace/POSIX_CB_Proactor.cpp index 4c6a2b95b..def961477 100644 --- a/dep/ACE_wrappers/ace/POSIX_CB_Proactor.cpp +++ b/dep/ACE_wrappers/ace/POSIX_CB_Proactor.cpp @@ -1,4 +1,4 @@ -// $Id: POSIX_CB_Proactor.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: POSIX_CB_Proactor.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $ #include "ace/POSIX_CB_Proactor.h" @@ -9,10 +9,6 @@ #include "ace/Object_Manager.h" #include "ace/OS_NS_sys_time.h" -ACE_RCSID (ace, - POSIX_CB_Proactor, - "$Id: POSIX_CB_Proactor.cpp 80826 2008-03-04 14:51:23Z wotte $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_POSIX_CB_Proactor::ACE_POSIX_CB_Proactor (size_t max_aio_operations) @@ -135,9 +131,9 @@ ACE_POSIX_CB_Proactor::handle_events_i (u_long milli_seconds) if (lerror != ETIME && // timeout lerror != EINTR ) // interrupted system call ACE_ERROR ((LM_ERROR, - "%N:%l:(%P | %t)::%p\n", - "ACE_POSIX_CB_Proactor::handle_events:" - "semaphore acquire failed" + ACE_TEXT("%N:%l:(%P | %t)::%p\n"), + ACE_TEXT("ACE_POSIX_CB_Proactor::handle_events:") + ACE_TEXT("semaphore acquire failed") )); } diff --git a/dep/ACE_wrappers/ace/POSIX_Proactor.cpp b/dep/ACE_wrappers/ace/POSIX_Proactor.cpp index fc14d884b..151aa26ab 100644 --- a/dep/ACE_wrappers/ace/POSIX_Proactor.cpp +++ b/dep/ACE_wrappers/ace/POSIX_Proactor.cpp @@ -1,4 +1,4 @@ -// $Id: POSIX_Proactor.cpp 81697 2008-05-14 18:33:11Z johnnyw $ +// $Id: POSIX_Proactor.cpp 86102 2009-07-18 04:15:48Z wotte $ #include "ace/POSIX_Proactor.h" @@ -685,9 +685,9 @@ ACE_AIOCB_Notify_Pipe_Manager::ACE_AIOCB_Notify_Pipe_Manager (ACE_POSIX_AIOCB_Pr 0) // Proactor == -1) ACE_ERROR ((LM_ERROR, - "%N:%l:%p\n", - "ACE_AIOCB_Notify_Pipe_Manager::ACE_AIOCB_Notify_Pipe_Manager:" - "Open on Read Stream failed")); + ACE_TEXT("%N:%l:%p\n"), + ACE_TEXT("ACE_AIOCB_Notify_Pipe_Manager::ACE_AIOCB_Notify_Pipe_Manager:") + ACE_TEXT("Open on Read Stream failed"))); // Issue an asynch_read on the read_stream of the notify pipe. if (this->read_stream_.read (this->message_block_, @@ -696,9 +696,9 @@ ACE_AIOCB_Notify_Pipe_Manager::ACE_AIOCB_Notify_Pipe_Manager (ACE_POSIX_AIOCB_Pr 0) // Priority == -1) ACE_ERROR ((LM_ERROR, - "%N:%l:%p\n", - "ACE_AIOCB_Notify_Pipe_Manager::ACE_AIOCB_Notify_Pipe_Manager:" - "Read from pipe failed")); + ACE_TEXT("%N:%l:%p\n"), + ACE_TEXT("ACE_AIOCB_Notify_Pipe_Manager::ACE_AIOCB_Notify_Pipe_Manager:") + ACE_TEXT("Read from pipe failed"))); } ACE_AIOCB_Notify_Pipe_Manager::~ACE_AIOCB_Notify_Pipe_Manager (void) @@ -1126,8 +1126,8 @@ ACE_POSIX_Asynch_Result * ACE_POSIX_AIOCB_Proactor::getq_result (void) // don't waste time if queue is empty - it is normal // or check queue size before dequeue_head // ACE_ERROR_RETURN ((LM_ERROR, -// "%N:%l:(%P | %t):%p\n", -// "ACE_POSIX_AIOCB_Proactor::getq_result failed"), +// ACE_TEXT("%N:%l:(%P | %t):%p\n"), +// ACE_TEXT("ACE_POSIX_AIOCB_Proactor::getq_result failed")), // 0); return result; @@ -1239,11 +1239,14 @@ ACE_POSIX_AIOCB_Proactor::get_result_status (ACE_POSIX_Asynch_Result *asynch_res transfer_count = 0; // Get the error status of the aio_ operation. - error_status = aio_error (asynch_result); + // The following aio_ptr anathema is required to work around a bug in an over-aggressive + // optimizer in GCC 4.1.2. + aiocb *aio_ptr (asynch_result); + error_status = aio_error (aio_ptr); if (error_status == EINPROGRESS) return 0; // not completed - ssize_t op_return = aio_return (asynch_result); + ssize_t op_return = aio_return (aio_ptr); if (op_return > 0) transfer_count = static_cast (op_return); // else transfer_count is already 0, error_status reports the error. @@ -1425,16 +1428,18 @@ ACE_POSIX_AIOCB_Proactor::start_aio_i (ACE_POSIX_Asynch_Result *result) const ACE_TCHAR *ptype = 0; // Start IO - + // The following aio_ptr anathema is required to work around a bug in + // the optimizer for GCC 4.1.2 + aiocb * aio_ptr (result); switch (result->aio_lio_opcode ) { case LIO_READ : ptype = ACE_TEXT ("read "); - ret_val = aio_read (result); + ret_val = aio_read (aio_ptr); break; case LIO_WRITE : ptype = ACE_TEXT ("write"); - ret_val = aio_write (result); + ret_val = aio_write (aio_ptr); break; default: ptype = ACE_TEXT ("?????"); @@ -1656,8 +1661,8 @@ ACE_POSIX_SIG_Proactor::ACE_POSIX_SIG_Proactor (const sigset_t signal_set, // Empty the signal set first. if (sigemptyset (&this->RT_completion_signals_) == -1) ACE_ERROR ((LM_ERROR, - "Error:(%P | %t):%p\n", - "sigemptyset failed")); + ACE_TEXT("Error:(%P | %t):%p\n"), + ACE_TEXT("sigemptyset failed"))); // For each signal number present in the , add it to // the signal set we use, and also set up its process signal action @@ -1669,9 +1674,9 @@ ACE_POSIX_SIG_Proactor::ACE_POSIX_SIG_Proactor (const sigset_t signal_set, si); if (member == -1) ACE_ERROR ((LM_ERROR, - "%N:%l:(%P | %t)::%p\n", - "ACE_POSIX_SIG_Proactor::ACE_POSIX_SIG_Proactor:" - "sigismember failed")); + ACE_TEXT("%N:%l:(%P | %t)::%p\n"), + ACE_TEXT("ACE_POSIX_SIG_Proactor::ACE_POSIX_SIG_Proactor:") + ACE_TEXT("sigismember failed"))); else if (member == 1) { sigaddset (&this->RT_completion_signals_, si); @@ -1724,8 +1729,8 @@ ACE_POSIX_SIG_Proactor::notify_completion (int sig_num) pid_t const pid = ACE_OS::getpid (); if (pid == (pid_t) -1) ACE_ERROR_RETURN ((LM_ERROR, - "Error:%N:%l(%P | %t):%p", - " failed"), + ACE_TEXT("Error:%N:%l(%P | %t):%p"), + ACE_TEXT(" failed")), -1); // Set the signal information. @@ -1742,8 +1747,8 @@ ACE_POSIX_SIG_Proactor::notify_completion (int sig_num) if (errno != EAGAIN) ACE_ERROR_RETURN ((LM_ERROR, - "Error:%N:%l:(%P | %t):%p\n", - " failed"), + ACE_TEXT("Error:%N:%l:(%P | %t):%p\n"), + ACE_TEXT(" failed")), -1); return -1; } @@ -1834,8 +1839,8 @@ ACE_POSIX_SIG_Proactor::setup_signal_handler (int signal_number) const 0); if (sigaction_return == -1) ACE_ERROR_RETURN ((LM_ERROR, - "Error:%p\n", - "Proactor couldnt do sigaction for the RT SIGNAL"), + ACE_TEXT("Error:%p\n"), + ACE_TEXT("Proactor couldnt do sigaction for the RT SIGNAL")), -1); #else ACE_UNUSED_ARG(signal_number); diff --git a/dep/ACE_wrappers/ace/Pagefile_Memory_Pool.cpp b/dep/ACE_wrappers/ace/Pagefile_Memory_Pool.cpp index 476a33f4f..fb012ef5d 100644 --- a/dep/ACE_wrappers/ace/Pagefile_Memory_Pool.cpp +++ b/dep/ACE_wrappers/ace/Pagefile_Memory_Pool.cpp @@ -1,4 +1,4 @@ -// $Id: Pagefile_Memory_Pool.cpp 82559 2008-08-07 20:23:07Z parsons $ +// $Id: Pagefile_Memory_Pool.cpp 91286 2010-08-05 09:04:31Z johnnyw $ // Pagefile_Memory_Pool.cpp #include "ace/Pagefile_Memory_Pool.h" @@ -21,7 +21,7 @@ #include "ace/Based_Pointer_Repository.h" #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */ -ACE_RCSID(ace, Pagefile_Memory_Pool, "$Id: Pagefile_Memory_Pool.cpp 82559 2008-08-07 20:23:07Z parsons $") + #if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP) #if !defined (ACE_HAS_WINCE) @@ -95,6 +95,10 @@ ACE_Pagefile_Memory_Pool::ACE_Pagefile_Memory_Pool (const ACE_TCHAR *backing_sto ACE_TEXT ("_")); } +ACE_Pagefile_Memory_Pool::~ACE_Pagefile_Memory_Pool (void) +{ +} + void * ACE_Pagefile_Memory_Pool::acquire (size_t nbytes, size_t &rounded_bytes) diff --git a/dep/ACE_wrappers/ace/Pagefile_Memory_Pool.h b/dep/ACE_wrappers/ace/Pagefile_Memory_Pool.h index 002ae823d..28fdfe59a 100644 --- a/dep/ACE_wrappers/ace/Pagefile_Memory_Pool.h +++ b/dep/ACE_wrappers/ace/Pagefile_Memory_Pool.h @@ -4,7 +4,7 @@ /** * @file Pagefile_Memory_Pool.h * - * $Id: Pagefile_Memory_Pool.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Pagefile_Memory_Pool.h 85318 2009-05-11 18:17:14Z johnnyw $ * * @author Dougls C. Schmidt * @author Prashant Jain @@ -67,6 +67,9 @@ public: ACE_Pagefile_Memory_Pool (const ACE_TCHAR *backing_store_name = 0, const OPTIONS *options = 0); + /// Destructor + virtual ~ACE_Pagefile_Memory_Pool (void); + /// Ask system for initial chunk of shared memory. void *init_acquire (size_t nbytes, size_t &rounded_bytes, diff --git a/dep/ACE_wrappers/ace/Parse_Node.cpp b/dep/ACE_wrappers/ace/Parse_Node.cpp index 80e980fca..0b225ba81 100644 --- a/dep/ACE_wrappers/ace/Parse_Node.cpp +++ b/dep/ACE_wrappers/ace/Parse_Node.cpp @@ -1,3 +1,4 @@ +// $Id: Parse_Node.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $ #include "ace/Parse_Node.h" #if (ACE_USES_CLASSIC_SVC_CONF == 1) @@ -11,19 +12,16 @@ #include "ace/OS_NS_string.h" #include "ace/ARGV.h" -ACE_RCSID (ace, - Parse_Node, - "$Id: Parse_Node.cpp 81245 2008-04-05 13:37:47Z johnnyw $") +#include - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE (ACE_Stream_Node) // Provide the class hierarchy that defines the parse tree of Service // Nodes. - void +void ACE_Stream_Node::dump (void) const { #if defined (ACE_HAS_DUMP) @@ -46,10 +44,21 @@ ACE_Stream_Node::apply (ACE_Service_Gestalt *config, int &yyerrno) ACE_Stream_Type *st = dynamic_cast (const_cast (sst->type ())); - for (const ACE_Static_Node *module = dynamic_cast (this->mods_); + // The modules were linked as popped off the yacc stack, so they're in + // reverse order from the way they should be pushed onto the stream. + // So traverse mods_ and and reverse the list, then iterate over it to push + // the modules in the stream in the correct order. + std::list mod_list; + const ACE_Static_Node *module; + for (module = dynamic_cast (this->mods_); module != 0; module = dynamic_cast (module->link())) + mod_list.push_front (module); + + std::list::const_iterator iter; + for (iter = mod_list.begin (); iter != mod_list.end (); ++iter) { + module = *iter; ACE_ARGV args (module->parameters ()); const ACE_Service_Type *mst = module->record (config); @@ -58,10 +67,14 @@ ACE_Stream_Node::apply (ACE_Service_Gestalt *config, int &yyerrno) if (yyerrno != 0) { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("dynamic initialization failed for Module %s\n"), - module->name ())); + if (ACE::debug ()) + { + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("dynamic initialization failed for Module %s\n"), + module->name ())); + } ++yyerrno; + continue; // Don't try anything else with this one } ACE_Module_Type const * const mt1 = @@ -71,9 +84,12 @@ ACE_Stream_Node::apply (ACE_Service_Gestalt *config, int &yyerrno) if (st->push (mt) == -1) { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("dynamic initialization failed for Stream %s\n"), - this->node_->name ())); + if (ACE::debug ()) + { + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("dynamic initialization failed for Stream %s\n"), + this->node_->name ())); + } ++yyerrno; } @@ -465,11 +481,14 @@ ACE_Location_Node::open_dll (int & yyerrno) ++yyerrno; #ifndef ACE_NLOGGING - ACE_TCHAR *errmsg = this->dll_.error (); - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ACE (%P|%t) LN::open_dll - Failed to open %s: %s\n"), - this->pathname (), - errmsg ? errmsg : ACE_TEXT ("no error reported"))); + if (ACE::debug ()) + { + ACE_TCHAR *errmsg = this->dll_.error (); + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("ACE (%P|%t) LN::open_dll - Failed to open %s: %s\n"), + this->pathname (), + errmsg ? errmsg : ACE_TEXT ("no error reported"))); + } #endif /* ACE_NLOGGING */ return -1; @@ -521,12 +540,15 @@ ACE_Object_Node::symbol (ACE_Service_Gestalt *, ++yyerrno; #ifndef ACE_NLOGGING - ACE_TCHAR *errmsg = this->dll_.error (); - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ACE (%P|%t) DLL::symbol -") - ACE_TEXT (" Failed for object %s: %s\n"), - object_name, - errmsg ? errmsg : ACE_TEXT ("no error reported"))); + if (ACE::debug ()) + { + ACE_TCHAR *errmsg = this->dll_.error (); + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("ACE (%P|%t) DLL::symbol -") + ACE_TEXT (" Failed for object %s: %s\n"), + object_name, + errmsg ? errmsg : ACE_TEXT ("no error reported"))); + } #endif /* ACE_NLOGGING */ return 0; @@ -647,12 +669,15 @@ ACE_Function_Node::symbol (ACE_Service_Gestalt *, ++yyerrno; #ifndef ACE_NLOGGING - ACE_TCHAR * const errmsg = this->dll_.error (); - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("DLL::symbol failed for function %s: ") - ACE_TEXT ("%s\n"), - function_name, - errmsg ? errmsg : ACE_TEXT ("no error reported"))); + if (ACE::debug ()) + { + ACE_TCHAR * const errmsg = this->dll_.error (); + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("DLL::symbol failed for function %s: ") + ACE_TEXT ("%s\n"), + function_name, + errmsg ? errmsg : ACE_TEXT ("no error reported"))); + } #endif /* ACE_NLOGGING */ return 0; @@ -673,10 +698,13 @@ ACE_Function_Node::symbol (ACE_Service_Gestalt *, if (this->symbol_ == 0) { ++yyerrno; - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - this->function_name_), - 0); + if (ACE::debug ()) + { + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("%p\n"), + this->function_name_)); + } + return 0; } } return this->symbol_; @@ -766,11 +794,14 @@ ACE_Static_Function_Node::symbol (ACE_Service_Gestalt *config, if (config->find_static_svc_descriptor (this->function_name_, &ssd) == -1) { ++yyerrno; - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%P|%t) No static service ") - ACE_TEXT ("registered for function %s\n"), - this->function_name_), - 0); + if (ACE::debug ()) + { + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("(%P|%t) No static service ") + ACE_TEXT ("registered for function %s\n"), + this->function_name_)); + } + return 0; } if (ssd->alloc_ == 0) @@ -781,11 +812,14 @@ ACE_Static_Function_Node::symbol (ACE_Service_Gestalt *config, { ++yyerrno; - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%P|%t) No static service factory ") - ACE_TEXT ("function registered for function %s\n"), - this->function_name_), - 0); + if (ACE::debug ()) + { + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("(%P|%t) No static service factory ") + ACE_TEXT ("function registered for function %s\n"), + this->function_name_)); + } + return 0; } } @@ -795,10 +829,13 @@ ACE_Static_Function_Node::symbol (ACE_Service_Gestalt *config, if (this->symbol_ == 0) { ++yyerrno; - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - this->function_name_), - 0); + if (ACE::debug ()) + { + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("%p\n"), + this->function_name_)); + } + return 0; } return this->symbol_; @@ -834,7 +871,7 @@ ACE_Service_Type_Factory::make_service_type (ACE_Service_Gestalt *cfg) const { ACE_TRACE ("ACE_Service_Type_Factory::make_service_type"); - u_int flags = ACE_Service_Type::DELETE_THIS + u_int const flags = ACE_Service_Type::DELETE_THIS | (this->location_->dispose () == 0 ? 0 : ACE_Service_Type::DELETE_OBJ); int yyerrno = 0; @@ -864,10 +901,13 @@ ACE_Service_Type_Factory::make_service_type (ACE_Service_Gestalt *cfg) const } #ifndef ACE_NLOGGING - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ACE (%P|%t) Unable to create ") - ACE_TEXT ("service object for %s\n"), - this->name ())); + if (ACE::debug ()) + { + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("ACE (%P|%t) Unable to create ") + ACE_TEXT ("service object for %s\n"), + this->name ())); + } #endif ++yyerrno; return 0; diff --git a/dep/ACE_wrappers/ace/Ping_Socket.cpp b/dep/ACE_wrappers/ace/Ping_Socket.cpp index 70601c78a..1ebb7d164 100644 --- a/dep/ACE_wrappers/ace/Ping_Socket.cpp +++ b/dep/ACE_wrappers/ace/Ping_Socket.cpp @@ -1,4 +1,4 @@ -// $Id: Ping_Socket.cpp 81737 2008-05-20 09:46:39Z johnnyw $ +// $Id: Ping_Socket.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $ #include "ace/Ping_Socket.h" @@ -9,16 +9,12 @@ #include "ace/OS_NS_string.h" #include "ace/OS_NS_sys_time.h" #include "ace/OS_NS_sys_socket.h" +# include "ace/OS_NS_unistd.h" #if !defined (__ACE_INLINE__) # include "ace/Ping_Socket.inl" #endif /* !__ACE_INLINE__ */ - -ACE_RCSID (ace, - Ping_Socket, - "$Id: Ping_Socket.cpp 81737 2008-05-20 09:46:39Z johnnyw $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE (ACE_Ping_Socket) @@ -248,14 +244,15 @@ ACE_Ping_Socket::process_incoming_dgram (char * ptr, ssize_t len) ACE_TEXT ("(%P|%t) ACE_Ping_Socket::process_incoming_dgram") ACE_TEXT (" - ICMP_ECHOREPLY received.\n"))); - if (icmp->icmp_id != getpid ()) + if (icmp->icmp_id != (ACE_OS::getpid () & 0xFFFF)) { ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) ACE_Ping_Socket::") ACE_TEXT ("process_incoming_dgram ") - ACE_TEXT ("- The ICMP header received is a reply") - ACE_TEXT (" to request of another process.")), + ACE_TEXT ("- The ICMP header received is a reply to request ") + ACE_TEXT ("of another process (%d; expected %d).\n"), + icmp->icmp_id, ACE_OS::getpid()), -1); } if (icmplen < 16) @@ -329,7 +326,7 @@ ACE_Ping_Socket::send_echo_check (ACE_INET_Addr &remote_addr, _icmp = (struct icmp *) this->icmp_send_buff_; _icmp->icmp_type = ICMP_ECHO; _icmp->icmp_code = 0; - _icmp->icmp_id = getpid (); + _icmp->icmp_id = ACE_OS::getpid () & 0xFFFF; _icmp->icmp_seq = sequence_number_++; #if defined (ACE_WIN32) diff --git a/dep/ACE_wrappers/ace/Pipe.cpp b/dep/ACE_wrappers/ace/Pipe.cpp index a05b92596..8286302a6 100644 --- a/dep/ACE_wrappers/ace/Pipe.cpp +++ b/dep/ACE_wrappers/ace/Pipe.cpp @@ -1,4 +1,4 @@ -// $Id: Pipe.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Pipe.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/Pipe.h" #include "ace/SOCK_Acceptor.h" @@ -18,7 +18,7 @@ #include "ace/Pipe.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ace, Pipe, "$Id: Pipe.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -29,8 +29,7 @@ ACE_Pipe::dump (void) const ACE_TRACE ("ACE_Pipe::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("handles_[0] = %d"), this->handles_[0])); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nhandles_[1] = %d"), this->handles_[1])); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nhandles_[1] = %d\n"), this->handles_[1])); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -40,7 +39,7 @@ ACE_Pipe::open (int buffer_size) { ACE_TRACE ("ACE_Pipe::open"); -#if defined (ACE_LACKS_SOCKETPAIR) || defined (__Lynx__) +#if defined (ACE_LACKS_SOCKETPAIR) ACE_INET_Addr my_addr; ACE_SOCK_Acceptor acceptor; ACE_SOCK_Connector connector; @@ -97,9 +96,10 @@ ACE_Pipe::open (int buffer_size) } # endif /* ! ACE_LACKS_TCP_NODELAY */ -# if defined (ACE_LACKS_SOCKET_BUFSIZ) +# if defined (ACE_LACKS_SO_RCVBUF) && defined (ACE_LACKS_SO_SNDBUF) ACE_UNUSED_ARG (buffer_size); -# else /* ! ACE_LACKS_SOCKET_BUFSIZ */ +# endif +# if !defined (ACE_LACKS_SO_RCVBUF) if (reader.set_option (SOL_SOCKET, SO_RCVBUF, reinterpret_cast (&buffer_size), @@ -109,16 +109,18 @@ ACE_Pipe::open (int buffer_size) this->close (); return -1; } - else if (writer.set_option (SOL_SOCKET, - SO_SNDBUF, - reinterpret_cast (&buffer_size), - sizeof (buffer_size)) == -1 +# endif /* !ACE_LACKS_SO_RCVBUF */ +# if !defined (ACE_LACKS_SO_SNDBUF) + if (writer.set_option (SOL_SOCKET, + SO_SNDBUF, + reinterpret_cast (&buffer_size), + sizeof (buffer_size)) == -1 && errno != ENOTSUP) { this->close (); return -1; } -# endif /* ! ACE_LACKS_SOCKET_BUFSIZ */ +# endif /* !ACE_LACKS_SO_SNDBUF */ #elif defined (ACE_HAS_STREAM_PIPES) || defined (__QNX__) ACE_UNUSED_ARG (buffer_size); @@ -156,9 +158,10 @@ ACE_Pipe::open (int buffer_size) ACE_TEXT ("%p\n"), ACE_TEXT ("socketpair")), -1); -# if defined (ACE_LACKS_SOCKET_BUFSIZ) +# if defined (ACE_LACKS_SO_SNDBUF) && defined (ACE_LACKS_SO_RCVBUF) ACE_UNUSED_ARG (buffer_size); -# else /* ! ACE_LACKS_SOCKET_BUFSIZ */ +# endif +# if !defined (ACE_LACKS_SO_RCVBUF) if (ACE_OS::setsockopt (this->handles_[0], SOL_SOCKET, SO_RCVBUF, @@ -169,6 +172,8 @@ ACE_Pipe::open (int buffer_size) this->close (); return -1; } +# endif +# if !defined (ACE_LACKS_SO_SNDBUF) if (ACE_OS::setsockopt (this->handles_[1], SOL_SOCKET, SO_SNDBUF, @@ -179,7 +184,7 @@ ACE_Pipe::open (int buffer_size) this->close (); return -1; } -# endif /* ! ACE_LACKS_SOCKET_BUFSIZ */ +# endif /* ! ACE_LACKS_SO_SNDBUF */ # if defined (ACE_OPENVMS) && !defined (ACE_LACKS_TCP_NODELAY) int one = 1; // OpenVMS implements socketpair(AF_UNIX...) by returning AF_INET sockets. diff --git a/dep/ACE_wrappers/ace/Pipe.h b/dep/ACE_wrappers/ace/Pipe.h index 1034b4e11..b831769da 100644 --- a/dep/ACE_wrappers/ace/Pipe.h +++ b/dep/ACE_wrappers/ace/Pipe.h @@ -4,7 +4,7 @@ /** * @file Pipe.h * - * $Id: Pipe.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Pipe.h 87240 2009-10-27 15:54:10Z schmidt $ * * @author Douglas C. Schmidt */ @@ -122,7 +122,7 @@ public: * This is an interface to ::readv, that doesn't use the struct * iovec explicitly. The ... can be passed as an arbitrary number * of (char *ptr, int len) tuples. However, the count N is the - * *total* number of trailing arguments, *not* a couple of the + * *total* number of trailing arguments, *not* a count of the * number of tuple pairs! */ ssize_t recv (size_t n, ...) const; diff --git a/dep/ACE_wrappers/ace/Priority_Reactor.cpp b/dep/ACE_wrappers/ace/Priority_Reactor.cpp index 9b46b6413..445f5d912 100644 --- a/dep/ACE_wrappers/ace/Priority_Reactor.cpp +++ b/dep/ACE_wrappers/ace/Priority_Reactor.cpp @@ -1,9 +1,9 @@ -// $Id: Priority_Reactor.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Priority_Reactor.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/Priority_Reactor.h" #include "ace/Malloc_T.h" -ACE_RCSID(ace, Priority_Reactor, "$Id: Priority_Reactor.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -51,10 +51,10 @@ ACE_Priority_Reactor::ACE_Priority_Reactor (ACE_Sig_Handler *sh, } ACE_Priority_Reactor::ACE_Priority_Reactor (size_t size, - int rs, + bool restart, ACE_Sig_Handler *sh, ACE_Timer_Queue *tq) - : ACE_Select_Reactor (size, rs, sh, tq), + : ACE_Select_Reactor (size, restart, sh, tq), bucket_ (0), tuple_allocator_ (0) { @@ -84,7 +84,7 @@ ACE_Priority_Reactor::build_bucket (ACE_Handle_Set &dispatch_mask, (handle = handle_iter ()) != ACE_INVALID_HANDLE; ) { - ACE_Event_Handler *event_handler = + ACE_Event_Handler *event_handler = this->handler_rep_.find (handle); if (event_handler == 0) return -1; diff --git a/dep/ACE_wrappers/ace/Priority_Reactor.h b/dep/ACE_wrappers/ace/Priority_Reactor.h index bb4150925..2f29c4c07 100644 --- a/dep/ACE_wrappers/ace/Priority_Reactor.h +++ b/dep/ACE_wrappers/ace/Priority_Reactor.h @@ -4,7 +4,7 @@ /** * @file Priority_Reactor.h * - * $Id: Priority_Reactor.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Priority_Reactor.h 82723 2008-09-16 09:35:44Z johnnyw $ * * @author Carlos O'Ryan */ @@ -45,7 +45,7 @@ public: /// Initialize ACE_Priority_Reactor with size @a size. ACE_Priority_Reactor (size_t size, - int restart = 0, + bool restart = false, ACE_Sig_Handler * = 0, ACE_Timer_Queue * = 0); @@ -75,7 +75,7 @@ private: void init_bucket (void); /// Build the bucket from the given dispatch_mask. Return -1 on - /// failure, 0 otherwise. + /// failure, 0 otherwise. int build_bucket (ACE_Handle_Set& dispatch_mask, int &min_priority, int &max_priority); diff --git a/dep/ACE_wrappers/ace/Proactor.cpp b/dep/ACE_wrappers/ace/Proactor.cpp index f7771aec1..983b8eabb 100644 --- a/dep/ACE_wrappers/ace/Proactor.cpp +++ b/dep/ACE_wrappers/ace/Proactor.cpp @@ -1,4 +1,4 @@ -// $Id: Proactor.cpp 81535 2008-04-29 20:08:52Z shuston $ +// $Id: Proactor.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $ #include "ace/config-lite.h" #include "ace/Proactor.h" @@ -17,11 +17,6 @@ #endif /* !ACE_HAS_WINCE && !ACE_LACKS_ACE_SVCCONF */ -ACE_RCSID (ace, - Proactor, - "$Id: Proactor.cpp 81535 2008-04-29 20:08:52Z shuston $") - - #include "ace/Task_T.h" #include "ace/Log_Msg.h" #include "ace/Framework_Component.h" diff --git a/dep/ACE_wrappers/ace/Proactor_Impl.cpp b/dep/ACE_wrappers/ace/Proactor_Impl.cpp index 3375540d9..4b7772c04 100644 --- a/dep/ACE_wrappers/ace/Proactor_Impl.cpp +++ b/dep/ACE_wrappers/ace/Proactor_Impl.cpp @@ -1,11 +1,7 @@ -// $Id: Proactor_Impl.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Proactor_Impl.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $ #include "ace/Proactor_Impl.h" -ACE_RCSID (ace, - Proactor_Impl, - "$Id: Proactor_Impl.cpp 80826 2008-03-04 14:51:23Z wotte $") - #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS) // This only works on standard Win32 platforms and on Unix platforms supporting // aio calls. diff --git a/dep/ACE_wrappers/ace/Process.cpp b/dep/ACE_wrappers/ace/Process.cpp index 1871e3044..ce397b4c0 100644 --- a/dep/ACE_wrappers/ace/Process.cpp +++ b/dep/ACE_wrappers/ace/Process.cpp @@ -1,4 +1,4 @@ -// $Id: Process.cpp 82499 2008-08-04 20:01:17Z shuston $ +// $Id: Process.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/Process.h" @@ -17,17 +17,19 @@ #include "ace/OS_NS_errno.h" #include "ace/OS_NS_string.h" #include "ace/OS_NS_unistd.h" +#include "ace/OS_NS_fcntl.h" #include "ace/OS_Memory.h" #include "ace/Countdown_Time.h" #include "ace/Truncate.h" #include "ace/Vector_T.h" +#include "ace/Tokenizer_T.h" #if defined (ACE_VXWORKS) && (ACE_VXWORKS > 0x600) && defined (__RTP__) # include # include #endif -ACE_RCSID (ace, Process, "$Id: Process.cpp 82499 2008-08-04 20:01:17Z shuston $") + // This function acts as a signal handler for SIGCHLD. We don't really want // to do anything with the signal - it's just needed to interrupt a sleep. @@ -137,13 +139,12 @@ ACE_Process::spawn (ACE_Process_Options &options) // like other OS environment. Therefore, it is user's whole responsibility to call // 'ACE_Process_Options::process_name(const ACE_TCHAR *name)' to set the proper // process name (the execution file name with path if needed). - BOOL fork_result = ACE_TEXT_CreateProcess (options.process_name(), options.command_line_buf(), options.get_process_attributes(), // must be NULL in CE options.get_thread_attributes(), // must be NULL in CE - options.handle_inheritence(), // must be false in CE + options.handle_inheritance(), // must be false in CE options.creation_flags(), // must be NULL in CE options.env_buf(), // environment variables, must be NULL in CE options.working_directory(), // must be NULL in CE @@ -175,7 +176,7 @@ ACE_Process::spawn (ACE_Process_Options &options) options.command_line_buf (), options.get_process_attributes (), options.get_thread_attributes (), - options.handle_inheritence (), + options.handle_inheritance (), flags, env_buf, // environment variables options.working_directory (), @@ -454,6 +455,16 @@ ACE_Process::spawn (ACE_Process_Options &options) ACE_OS::close (options.get_stdin ()); ACE_OS::close (options.get_stdout ()); ACE_OS::close (options.get_stderr ()); + if (!options.handle_inheritance ()) + { + // Set close-on-exec for all FDs except standard handles + for (int i = ACE::max_handles () - 1; i >= 0; i--) + { + if (i == ACE_STDIN || i == ACE_STDOUT || i == ACE_STDERR) + continue; + ACE_OS::fcntl (i, F_SETFD, FD_CLOEXEC); + } + } // If we must, set the working directory for the child // process. @@ -783,9 +794,9 @@ ACE_Process::convert_env_buffer (const char* env) const #endif ACE_Process_Options::ACE_Process_Options (bool inherit_environment, - int command_line_buf_len, - int env_buf_len, - int max_env_args) + size_t command_line_buf_len, + size_t env_buf_len, + size_t max_env_args) : #if !defined (ACE_HAS_WINCE) inherit_environment_ (inherit_environment), @@ -795,7 +806,6 @@ ACE_Process_Options::ACE_Process_Options (bool inherit_environment, #if !defined (ACE_HAS_WINCE) #if defined (ACE_WIN32) environment_inherited_ (0), - handle_inheritence_ (TRUE), process_attributes_ (0), thread_attributes_ (0), #else /* ACE_WIN32 */ @@ -807,6 +817,7 @@ ACE_Process_Options::ACE_Process_Options (bool inherit_environment, rgid_ ((uid_t) -1), egid_ ((uid_t) -1), #endif /* ACE_WIN32 */ + handle_inheritance_ (true), set_handles_called_ (0), environment_buf_index_ (0), environment_argv_index_ (0), @@ -815,7 +826,7 @@ ACE_Process_Options::ACE_Process_Options (bool inherit_environment, max_environment_args_ (max_env_args), max_environ_argv_index_ (max_env_args - 1), #endif /* !ACE_HAS_WINCE */ - command_line_argv_calculated_ (0), + command_line_argv_calculated_ (false), command_line_buf_ (0), command_line_copy_ (0), command_line_buf_len_ (command_line_buf_len), @@ -825,6 +836,13 @@ ACE_Process_Options::ACE_Process_Options (bool inherit_environment, ACE_NEW (command_line_buf_, ACE_TCHAR[command_line_buf_len]); command_line_buf_[0] = '\0'; + process_name_[0] = '\0'; + +#if defined (ACE_HAS_WINCE) + ACE_UNUSED_ARG(inherit_environment); + ACE_UNUSED_ARG(env_buf_len); + ACE_UNUSED_ARG(max_env_args); +#endif #if !defined (ACE_HAS_WINCE) working_directory_[0] = '\0'; @@ -834,7 +852,6 @@ ACE_Process_Options::ACE_Process_Options (bool inherit_environment, ACE_TCHAR *[max_env_args]); environment_buf_[0] = '\0'; environment_argv_[0] = 0; - process_name_[0] = '\0'; #if defined (ACE_WIN32) ACE_OS::memset ((void *) &this->startup_info_, 0, @@ -915,24 +932,6 @@ ACE_Process_Options::env_argv (void) #endif /* ACE_WIN32 */ -void -ACE_Process_Options::enable_unicode_environment (void) -{ - this->use_unicode_environment_ = true; -} - -void -ACE_Process_Options::disable_unicode_environment (void) -{ - this->use_unicode_environment_ = false; -} - -bool -ACE_Process_Options::use_unicode_environment (void) const -{ - return this->use_unicode_environment_; -} - int ACE_Process_Options::setenv (ACE_TCHAR *envp[]) { @@ -1004,8 +1003,11 @@ ACE_Process_Options::setenv (const ACE_TCHAR *variable_name, va_start (argp, format); // Add the rest of the varargs. - size_t tmp_buflen = DEFAULT_COMMAND_LINE_BUF_LEN > buflen - ? static_cast (DEFAULT_COMMAND_LINE_BUF_LEN) : buflen; + size_t tmp_buflen = buflen; + if (DEFAULT_COMMAND_LINE_BUF_LEN > buflen) + { + tmp_buflen = DEFAULT_COMMAND_LINE_BUF_LEN; + } int retval = 0; ACE_TCHAR *stack_buf = 0; @@ -1181,22 +1183,37 @@ ACE_Process_Options::~ACE_Process_Options (void) int ACE_Process_Options::command_line (const ACE_TCHAR *const argv[]) { - // @@ Factor out the code between this int i = 0; if (argv[i]) { ACE_OS::strcat (command_line_buf_, argv[i]); + while (argv[++i]) { - ACE_OS::strcat (command_line_buf_, - ACE_TEXT (" ")); - ACE_OS::strcat (command_line_buf_, - argv[i]); + // Check to see if the next argument will overflow the + // command_line buffer. + size_t const cur_len = + ACE_OS::strlen (command_line_buf_) + + ACE_OS::strlen (argv[i]) + + 2; + + if (cur_len > command_line_buf_len_) + { + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("ACE_Process:command_line: ") + ACE_TEXT ("command line is ") + ACE_TEXT ("longer than %d\n"), + command_line_buf_len_), + 1); + } + + ACE_OS::strcat (command_line_buf_, ACE_TEXT (" ")); + ACE_OS::strcat (command_line_buf_, argv[i]); } } - command_line_argv_calculated_ = 0; + command_line_argv_calculated_ = false; return 0; // Success. } @@ -1226,7 +1243,7 @@ ACE_Process_Options::command_line (const ACE_TCHAR *format, ...) // Useless macro. va_end (argp); - command_line_argv_calculated_ = 0; + command_line_argv_calculated_ = false; return 0; } @@ -1238,7 +1255,7 @@ ACE_Process_Options::command_line (const ACE_TCHAR *format, ...) int ACE_Process_Options::command_line (const ACE_ANTI_TCHAR *format, ...) { - ACE_ANTI_TCHAR *anti_clb; + ACE_ANTI_TCHAR *anti_clb = 0; ACE_NEW_RETURN (anti_clb, ACE_ANTI_TCHAR[this->command_line_buf_len_], -1); @@ -1260,7 +1277,7 @@ ACE_Process_Options::command_line (const ACE_ANTI_TCHAR *format, ...) delete [] anti_clb; - command_line_argv_calculated_ = 0; + command_line_argv_calculated_ = false; return 0; } #endif /* ACE_HAS_WCHAR && !ACE_HAS_WINCE */ @@ -1281,9 +1298,9 @@ ACE_Process_Options::env_buf (void) ACE_TCHAR * const * ACE_Process_Options::command_line_argv (void) { - if (command_line_argv_calculated_ == 0) + if (!command_line_argv_calculated_) { - command_line_argv_calculated_ = 1; + command_line_argv_calculated_ = true; // We need to free up any previous allocated memory first. ACE::strdelete (command_line_copy_); diff --git a/dep/ACE_wrappers/ace/Process.h b/dep/ACE_wrappers/ace/Process.h index 4454d9cc6..cdba43cb8 100644 --- a/dep/ACE_wrappers/ace/Process.h +++ b/dep/ACE_wrappers/ace/Process.h @@ -4,7 +4,7 @@ /** * @file Process.h * - * $Id: Process.h 82233 2008-07-01 22:49:26Z shuston $ + * $Id: Process.h 91571 2010-08-30 15:35:12Z shuston $ * * @author Tim Harrison */ @@ -82,9 +82,9 @@ public: * max strlen for command-line arguments. */ ACE_Process_Options (bool inherit_environment = true, - int command_line_buf_len = DEFAULT_COMMAND_LINE_BUF_LEN, - int env_buf_len = ENVIRONMENT_BUFFER, - int max_env_args = MAX_ENVIRONMENT_ARGS); + size_t command_line_buf_len = DEFAULT_COMMAND_LINE_BUF_LEN, + size_t env_buf_len = ENVIRONMENT_BUFFER, + size_t max_env_args = MAX_ENVIRONMENT_ARGS); /// Destructor. ~ACE_Process_Options (void); @@ -94,8 +94,19 @@ public: /** * Set the standard handles of the new process to the respective * handles. If you want to affect a subset of the handles, make - * sure to set the others to ACE_INVALID_HANDLE. Returns 0 on - * success, -1 on failure. + * sure to set the others to ACE_INVALID_HANDLE. + * + * @note Any handle passed as ACE_INVALID_HANDLE will be changed to + * a duplicate of the current associated handle. For example, passing + * ACE_INVALID_HANDLE for @a std_in will cause ACE_STDIN to be + * duplicated and set in this object. + * + * @note Windows: The implementation of set_handles() uses DuplicateHandle + * on Windows. DuplicateHandle cannot be used to pass a socket handle + * on Windows. Socket handles require an alternate mechanism to pass; + * see http://msdn.microsoft.com/en-us/library/ms741565(v=VS.85).aspx + * + * @return 0 on success, -1 on failure. */ int set_handles (ACE_HANDLE std_in, ACE_HANDLE std_out = ACE_INVALID_HANDLE, @@ -113,7 +124,7 @@ public: * Set a single environment variable, @a variable_name. Since * different platforms separate each environment variable * differently, you must call this method once for each variable. - * can be any printf format string. So options->setenv + * @a format can be any printf format string. So options->setenv * ("FOO","one + two = %s", "three") will result in "FOO=one + two = * three". */ @@ -220,9 +231,9 @@ public: /// ACE_Process_Manager to manage groups of processes. pid_t setgroup (pid_t pgrp); - /// Allows disabling of handle inheritence, default is TRUE. - int handle_inheritence (void); - void handle_inheritence (int); + /// Allows disabling of handle inheritance, default is TRUE. + int handle_inheritance (void); + void handle_inheritance (int); /// Cause the specified handle to be passed to a child process /// when it runs a new program image. @@ -351,9 +362,6 @@ protected: ACE_TEXT_STARTUPINFO startup_info_; - /// Default TRUE. - BOOL handle_inheritence_; - /// Pointer to security_buf1_. LPSECURITY_ATTRIBUTES process_attributes_; @@ -379,6 +387,9 @@ protected: uid_t egid_; #endif /* ACE_WIN32 */ + /// Default true. + bool handle_inheritance_; + #if !defined (ACE_HAS_WINCE) /// Is 1 if stdhandles was called. int set_handles_called_; @@ -388,7 +399,7 @@ protected: size_t environment_buf_index_; /// Pointer to environment_argv_. - int environment_argv_index_; + size_t environment_argv_index_; /// Pointer to buffer of the environment settings. ACE_TCHAR *environment_buf_; @@ -400,17 +411,17 @@ protected: ACE_TCHAR **environment_argv_; /// Maximum number of environment variables. Configurable - int max_environment_args_; + size_t max_environment_args_; /// Maximum index of environment_argv_ buffer - int max_environ_argv_index_; + size_t max_environ_argv_index_; /// The current working directory. ACE_TCHAR working_directory_[MAXPATHLEN + 1]; #endif /* !ACE_HAS_WINCE */ /// Ensures command_line_argv is only calculated once. - int command_line_argv_calculated_; + bool command_line_argv_calculated_; /// Pointer to buffer of command-line arguments. E.g., "-f foo -b bar". ACE_TCHAR *command_line_buf_; @@ -420,7 +431,7 @@ protected: ACE_TCHAR *command_line_copy_; /// Max length of command_line_buf_ - int command_line_buf_len_; + size_t command_line_buf_len_; /// Argv-style command-line arguments. ACE_TCHAR *command_line_argv_[MAX_COMMAND_LINE_OPTIONS]; @@ -439,7 +450,7 @@ protected: ACE_TCHAR process_name_[MAXPATHLEN + 1]; /// Indicate if a Unicode environment should be used - bool use_unicode_environment_; + bool use_unicode_environment_; }; //class ACE_Process_Manager; @@ -495,14 +506,14 @@ public: */ virtual void child (pid_t parent); - /// Called by a that is removing this Process from + /// Called by a Process_Manager that is removing this Process from /// its table of managed Processes. Default is to do nothing. virtual void unmanage (void); /** - * Wait for the process we've created to exit. If != 0, it + * Wait for the process we've created to exit. If @a status != 0, it * points to an integer where the function store the exit status of - * child process to. If == then return 0 + * child process to. If @a wait_options == @c WNOHANG then return 0 * and don't block if the child process hasn't exited yet. A return * value of -1 represents the operation failed, otherwise, * the child process id is returned. @@ -514,7 +525,7 @@ public: * Timed wait for the process we've created to exit. A return value * of -1 indicates that the something failed; 0 indicates that a * timeout occurred. Otherwise, the child's process id is returned. - * If != 0, it points to an integer where the function + * If @a status != 0, it points to an integer where the function * stores the child's exit status. * * @note On UNIX platforms this function uses , i.e., it @@ -531,7 +542,7 @@ public: int kill (int signum = SIGINT); /** - * Terminate the process abruptly using . + * Terminate the process abruptly using ACE::terminate_process(). * This call doesn't give the process a chance to cleanup, so use it * with caution... */ @@ -591,6 +602,7 @@ protected: /// Set of handles that were passed to the child process. ACE_Handle_Set handles_passed_; + /// Handle duplicates made for the child process. ACE_Handle_Set dup_handles_; @@ -602,7 +614,6 @@ private: #endif }; - /** * @class ACE_Managed_Process * diff --git a/dep/ACE_wrappers/ace/Process.inl b/dep/ACE_wrappers/ace/Process.inl index 9723ebc8c..8b68efc0c 100644 --- a/dep/ACE_wrappers/ace/Process.inl +++ b/dep/ACE_wrappers/ace/Process.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: Process.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Process.inl 83405 2008-10-23 06:30:06Z johnnyw $ #include "ace/ACE.h" #include "ace/OS_NS_sys_wait.h" @@ -10,6 +10,24 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_INLINE void +ACE_Process_Options::enable_unicode_environment (void) +{ + this->use_unicode_environment_ = true; +} + +ACE_INLINE void +ACE_Process_Options::disable_unicode_environment (void) +{ + this->use_unicode_environment_ = false; +} + +ACE_INLINE bool +ACE_Process_Options::use_unicode_environment (void) const +{ + return this->use_unicode_environment_; +} + #if defined (ACE_WIN32) ACE_INLINE PROCESS_INFORMATION @@ -129,24 +147,15 @@ ACE_Process_Options::setgroup (pid_t pgrp) } ACE_INLINE int -ACE_Process_Options::handle_inheritence (void) +ACE_Process_Options::handle_inheritance (void) { -#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) - return handle_inheritence_; -#else - ACE_NOTSUP_RETURN (0); // This is a benign error. -#endif /* ACE_WIN32 && ! ACE_HAS_WINCE */ + return handle_inheritance_; } ACE_INLINE void -ACE_Process_Options::handle_inheritence (int hi) +ACE_Process_Options::handle_inheritance (int hi) { -#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) - handle_inheritence_ = hi; -#else - ACE_UNUSED_ARG (hi); - ACE_NOTSUP; -#endif /* !ACE_HAS_WINCE */ + handle_inheritance_ = hi; } ACE_INLINE int diff --git a/dep/ACE_wrappers/ace/Process_Manager.cpp b/dep/ACE_wrappers/ace/Process_Manager.cpp index 5aae463df..572e7457a 100644 --- a/dep/ACE_wrappers/ace/Process_Manager.cpp +++ b/dep/ACE_wrappers/ace/Process_Manager.cpp @@ -1,4 +1,4 @@ -// $Id: Process_Manager.cpp 82559 2008-08-07 20:23:07Z parsons $ +// $Id: Process_Manager.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $ // Process_Manager.cpp #include "ace/Process_Manager.h" @@ -19,12 +19,9 @@ #include "ace/OS_NS_signal.h" #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_sys_time.h" +#include "ace/os_include/os_typeinfo.h" #include "ace/Truncate.h" -ACE_RCSID (ace, - Process_Manager, - "$Id: Process_Manager.cpp 82559 2008-08-07 20:23:07Z parsons $") - #if defined (ACE_HAS_SIG_C_FUNC) extern "C" void ACE_Process_Manager_cleanup (void *instance, void *arg) @@ -131,11 +128,13 @@ ACE_Process_Manager::instance (void) #if defined ACE_HAS_SIG_C_FUNC ACE_Object_Manager::at_exit (ACE_Process_Manager::instance_, ACE_Process_Manager_cleanup, - 0); + 0, + typeid (*ACE_Process_Manager::instance_).name ()); #else ACE_Object_Manager::at_exit (ACE_Process_Manager::instance_, ACE_Process_Manager::cleanup, - 0); + 0, + typeid (*ACE_Process_Manager::instance_).name ()); #endif /* ACE_HAS_SIG_C_FUNC */ } @@ -162,11 +161,13 @@ ACE_Process_Manager::instance (ACE_Process_Manager *tm) #if defined ACE_HAS_SIG_C_FUNC ACE_Object_Manager::at_exit (ACE_Process_Manager::instance_, ACE_Process_Manager_cleanup, - 0); + 0, + typeid (*ACE_Process_Manager::instance_).name ()); #else ACE_Object_Manager::at_exit (ACE_Process_Manager::instance_, ACE_Process_Manager::cleanup, - 0); + 0, + typeid (*ACE_Process_Manager::instance_).name ()); #endif /* ACE_HAS_SIG_C_FUNC */ ACE_Process_Manager::instance_ = tm; @@ -256,11 +257,12 @@ ACE_Process_Manager::ACE_Process_Manager (size_t size, { ACE_TRACE ("ACE_Process_Manager::ACE_Process_Manager"); - if (this->open (size, - r) == -1) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_Process_Manager"))); + if (this->open (size, r) == -1) + { + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Process_Manager"))); + } } // Close up and release all resources. @@ -427,7 +429,7 @@ ACE_Process_Manager::spawn (ACE_Process_Options &options, ACE_Managed_Process, ACE_INVALID_PID); - pid_t const pid = spawn (process, options, event_handler); + pid_t const pid = this->spawn (process, options, event_handler); if (pid == ACE_INVALID_PID || pid == 0) delete process; @@ -686,7 +688,7 @@ ACE_Process_Manager::find_proc (pid_t pid) { ACE_TRACE ("ACE_Process_Manager::find_proc"); - for (size_t i = 0; i < this->current_count_; ++i) + for (size_t i = 0; i < this->current_count_; ++i) { if (pid == this->process_table_[i].process_->getpid ()) { @@ -841,7 +843,7 @@ ACE_Process_Manager::wait (pid_t pid, // WAIT_OBJECT_0 is a pointless comparison because // WAIT_OBJECT_0 is zero and DWORD is unsigned long, so this // test is skipped for Green Hills. Same for mingw. -# if defined (ghs) || defined (__MINGW32__) || (defined (_MSC_VER) && _MSC_VER >= 1300) +# if defined (ghs) || defined (__MINGW32__) || defined (_MSC_VER) ACE_ASSERT (result < WAIT_OBJECT_0 + this->current_count_); # else ACE_ASSERT (result >= WAIT_OBJECT_0 diff --git a/dep/ACE_wrappers/ace/Process_Manager.h b/dep/ACE_wrappers/ace/Process_Manager.h index e2a569480..26515476c 100644 --- a/dep/ACE_wrappers/ace/Process_Manager.h +++ b/dep/ACE_wrappers/ace/Process_Manager.h @@ -4,7 +4,7 @@ /** * @file Process_Manager.h * - * $Id: Process_Manager.h 81014 2008-03-19 11:41:31Z johnnyw $ + * $Id: Process_Manager.h 84619 2009-02-26 12:26:16Z johnnyw $ * * @author Douglas C. Schmidt */ @@ -337,9 +337,9 @@ public: //@} protected: - // = These methods allow a to be an . + // = These methods allow a to be an Event_Handler. - // As an , the automagically + // As an Event_Handler, the automagically // detects child Processes exiting and calls notify_proc_handler() // and remove(). This means that you don't have to (shouldn't!) // call the wait(...) methods yourself. diff --git a/dep/ACE_wrappers/ace/Process_Mutex.cpp b/dep/ACE_wrappers/ace/Process_Mutex.cpp index 95d6529d9..28d414d05 100644 --- a/dep/ACE_wrappers/ace/Process_Mutex.cpp +++ b/dep/ACE_wrappers/ace/Process_Mutex.cpp @@ -1,4 +1,4 @@ -// $Id: Process_Mutex.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Process_Mutex.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/Process_Mutex.h" #include "ace/Log_Msg.h" @@ -11,7 +11,7 @@ #include "ace/Process_Mutex.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ace, Process_Mutex, "$Id: Process_Mutex.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/Process_Mutex.h b/dep/ACE_wrappers/ace/Process_Mutex.h index b2b7b2698..476676e6c 100644 --- a/dep/ACE_wrappers/ace/Process_Mutex.h +++ b/dep/ACE_wrappers/ace/Process_Mutex.h @@ -4,7 +4,7 @@ /** * @file Process_Mutex.h * - * $Id: Process_Mutex.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Process_Mutex.h 87179 2009-10-20 16:27:01Z shuston $ * * A wrapper for mutexes that can be used across processes on the * same host machine, as well as within a process, of course. @@ -46,36 +46,48 @@ class ACE_Time_Value; * @class ACE_Process_Mutex * * @brief A wrapper for mutexes that can be used across processes on - * the same host machine, as well as within a process, of - * course. + * the same host machine, as well as within a process, of course. * * @attention The mechanism upon which @c ACE_Process_Mutex is based * can be configured at build time to be either @c ACE_SV_Semaphore_Complex - * (on platforms that support it) or @c ACE_Mutex. On platforms that - * require interprocess mutexes be allocated from shared memory (Pthreads - * and UI Threads are examples), @c ACE_SV_Semaphore_Complex provides a - * more reliable mechanism for implementing inter-process mutex than - * @c ACE_Mutex. However, at least on some platforms, - * @c ACE_SV_Semaphore_Complex is limited to a small number of - * objects by the underlying System V IPC kernel parameters. If you - * want to force use of @c ACE_Mutex as the underlying mechanism, set - * @c ACE_USES_MUTEX_FOR_PROCESS_MUTEX in your @c config.h file. - * Also, if you require the ability to do a timed @c acquire(), you must - * set @c ACE_USES_MUTEX_FOR_PROCESS_MUTEX, as timed acquire does not - * work with System V semaphores. - * @attention Currently there is also the operational difference between - * pthreads and semaphores based @c. For semaphore base @c the semaphore - * is destroyed after the last instance of @c in OS. In contrary, pthread based - * @c is destroyed when the owner, namely the process which created the - * first instance of @c destroys the mutex. For protable applications it is better - * to always ensure that the owner of the mutex destroys it after the - * other processes. + * (on platforms that support it) or @c ACE_Mutex. On platforms that offer + * System V IPC (the @c ACE_HAS_SYSV_IPC config macro is defined) + * @c ACE_SV_Semaphore_Complex is the default because it is more convenient + * and easy to use. @c ACE_Mutex is the default on all other platforms. + * On platforms where ACE_SV_Semaphore_Complex is used by default, the + * mechanism can be changed to ACE_Mutex when ACE is built by adding + * @code + * #define ACE_USES_MUTEX_FOR_PROCESS_MUTEX + * @endcode + * to your @c config.h file. + * @par + * Consider these tradeoffs when evaluating whether or not to change + * the default: + * - Some platforms (e.g., Pthreads and UI Threads) require interprocess + * mutexes to be allocated from shared memory. On these platforms, using + * ACE_Mutex as the underlying mechanism requires that ACE_Process_Mutex + * objects be allocated in shared memory. Using ACE_SV_Semaphore_Complex + * avoids this restriction. + * - System V IPC kernel parameters have a low default limit on some + * platforms. This would restrict the number of ACE_Process_Mutex objects + * that can be in use simultaneously when using ACE_SV_Semaphore_Complex. + * - If you require the ability to do a timed @c acquire(), you must + * use ACE_Mutex as the underlying mechanism because timed acquire does not + * work with System V semaphores. + * - When using ACE_Mutex on a Pthreads-based platform, an ACE_Process_Mutex + * object is deleted when the process which created the object destroys + * it, regardless of whether or not there are other processes still + * accessing the ACE_Process_Mutex. Using ACE_SV_Semaphore_Complex avoids + * this problem; the semaphore is destroyed when the last use of the + * object ends. For portable applications it is better to always ensure + * that the owner of the mutex destroys it after all other processes have + * stopped using it. */ class ACE_Export ACE_Process_Mutex { public: /** - * Create a Process_Mutex, passing in the optional @c name. + * Create an ACE_Process_Mutex. * * @param name optional, null-terminated string containing the name of * the object. Multiple users of the same @c ACE_Process_Mutex must use @@ -93,8 +105,7 @@ public: #if defined (ACE_HAS_WCHAR) /** - * Create a Process_Mutex, passing in the optional @c name. (@c wchar_t - * version) + * Create an ACE_Process_Mutex (@c wchar_t version) * * @param name optional, null-terminated string containing the name of * the object. Multiple users of the same @c ACE_Process_Mutex must use @@ -111,6 +122,12 @@ public: mode_t mode = ACE_DEFAULT_FILE_PERMS); #endif /* ACE_HAS_WCHAR */ + /** + * Destructor. + * + * @note The destructor will not release an acquired mutex except + * on Windows. + */ ~ACE_Process_Mutex (void); /** diff --git a/dep/ACE_wrappers/ace/Process_Semaphore.cpp b/dep/ACE_wrappers/ace/Process_Semaphore.cpp index 9c84b955e..6b94f0efa 100644 --- a/dep/ACE_wrappers/ace/Process_Semaphore.cpp +++ b/dep/ACE_wrappers/ace/Process_Semaphore.cpp @@ -1,4 +1,4 @@ -// $Id: Process_Semaphore.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Process_Semaphore.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/Process_Semaphore.h" #include "ace/Log_Msg.h" @@ -10,7 +10,7 @@ #include "ace/ACE.h" -ACE_RCSID(ace, Process_Semaphore, "$Id: Process_Semaphore.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/Process_Semaphore.h b/dep/ACE_wrappers/ace/Process_Semaphore.h index d2f347973..ea614bf69 100644 --- a/dep/ACE_wrappers/ace/Process_Semaphore.h +++ b/dep/ACE_wrappers/ace/Process_Semaphore.h @@ -4,7 +4,7 @@ /** * @file Process_Semaphore.h * - * $Id: Process_Semaphore.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Process_Semaphore.h 86731 2009-09-17 12:23:48Z johnnyw $ * * Wrapper for Dijkstra style general semaphores that work * across processes. @@ -135,8 +135,6 @@ protected: template class ACE_Malloc_Lock_Adapter_T; /** - * @class ACE_Malloc_Lock_Adapter_T - * * @brief Template specialization of ACE_Malloc_Lock_Adapter_T for * ACE_Process_Semaphore. * diff --git a/dep/ACE_wrappers/ace/Profile_Timer.cpp b/dep/ACE_wrappers/ace/Profile_Timer.cpp index 081afa18c..767638a54 100644 --- a/dep/ACE_wrappers/ace/Profile_Timer.cpp +++ b/dep/ACE_wrappers/ace/Profile_Timer.cpp @@ -1,4 +1,4 @@ -// $Id: Profile_Timer.cpp 82208 2008-06-26 20:44:51Z jtc $ +// $Id: Profile_Timer.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/Profile_Timer.h" @@ -14,7 +14,7 @@ #include "ace/OS_NS_unistd.h" #endif -ACE_RCSID(ace, Profile_Timer, "$Id: Profile_Timer.cpp 82208 2008-06-26 20:44:51Z jtc $") + #if (defined (ACE_HAS_PRUSAGE_T) || defined (ACE_HAS_GETRUSAGE)) && !defined (ACE_WIN32) diff --git a/dep/ACE_wrappers/ace/README b/dep/ACE_wrappers/ace/README index fee75004a..aeec9f1eb 100644 --- a/dep/ACE_wrappers/ace/README +++ b/dep/ACE_wrappers/ace/README @@ -1,4 +1,4 @@ -// $Id: README 82276 2008-07-09 17:35:49Z jtc $ +// $Id: README 91581 2010-08-31 13:18:11Z shuston $ ACE Portability Macros ---------------------- @@ -208,10 +208,6 @@ ACE_HAS_STDARG_THR_DEST Platform has void (*)(...) prototype for pthread_key_create() destructor (e.g., LynxOS). -ACE_HAS_STL_MAP_CONFLICT Used when users want to - compile ACE with STL and STL - map class conflicts with - map struct. ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS Platform/compiler supports Win32 structural exceptions ACE_HAS_READ_TIMEDWAIT @@ -249,10 +245,6 @@ ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR ACE_HAS_BROKEN_ACCEPT_ADDR Platform can't correctly deal with a NULL addr to accept() (e.g, VxWorks). -ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS Compiler can't handle const char * - as rvalue in conditional operator. -ACE_HAS_BROKEN_CTIME Compiler/platform uses macro - for ctime (e.g., MVS) ACE_HAS_BROKEN_DGRAM_SENDV Platform sendv() does not work properly with datagrams, i.e. it fails when the iovec @@ -313,13 +305,6 @@ ACE_HAS_EBCDIC Compile in the ACE code set classes that support EBCDIC. ACE_HAS_EXCEPTIONS Compiler supports C++ exception handling -ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS Compiler does not call - unexpected exception handler - if exception not listed in - exception specification is - thrown. In particular, the - exception specification is not - respected. ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT When a base-class is a specialization of a class template then this class template must be @@ -339,9 +324,6 @@ ACE_HAS_GETRUSAGE_PROTOTYPE Platform has a getrusage () prototype in sys/resource.h that differs from the one in ace/OS.i. -ACE_HAS_GNU_CSTRING_H Denotes that GNU has cstring.h - as standard which redefines - memchr() ACE_HAS_GPERF The GPERF utility is compiled for this platform ACE_HAS_GETIFADDRS This platform has ifaddrs.h and @@ -384,8 +366,6 @@ ACE_HAS_THR_MINSTACK Platform calls thr_minstack() (e.g., Tandem). ACE_HAS_LIMITED_RUSAGE_T The rusage_t structure has only two fields. -ACE_HAS_LIMITED_SELECT The select is unable to deal with - large file descriptors. ACE_HAS_LINUX_NPTL Linux platform (with kernel >= 2.6.x) with GLibc including new NPTL (Native POSIX Thread Library). @@ -562,9 +542,6 @@ ACE_HAS_SIGINFO_T Platform supports SVR4 ACE_HAS_SIGSUSPEND Platform supports sigsuspend() ACE_HAS_SIGISMEMBER_BUG Platform has bug with sigismember() (HP/UX 11). -ACE_HAS_SIG_MACROS Platform/compiler has macros - for sig{empty,fill,add,del}set - (e.g., SCO and FreeBSD) ACE_HAS_SIGNAL_OBJECT_AND_WAIT Platform supports the Win32 SignalObjectAndWait() function (WinNT 4.0 and beyond). @@ -614,7 +591,6 @@ ACE_HAS_WCSDUP_EMULATION Use ACE's wcsdup() emulation (even ACE_HAS_STRNLEN Platform supports strnlen(3). ACE_HAS_STREAMS Platform supports STREAMS ACE_HAS_STREAM_PIPES Platform supports STREAM pipes -ACE_HAS_STRERROR Compiler/platform supports strerror () ACE_HAS_STRICT Use the STRICT compilation mode on Win32. ACE_HAS_STRING_CLASS Platform/Compiler supports a String class (e.g., GNU or @@ -640,21 +616,17 @@ ACE_HAS_SYSCALL_GETRUSAGE HP/UX has an undefined syscall for GETRUSAGE... ACE_HAS_SYSENT_H Platform provides header -ACE_HAS_SYSINFO Platform supports system +ACE_HAS_SYSV_SYSINFO Platform supports system configuration information ACE_HAS_SYSV_IPC Platform supports System V IPC (most versions of UNIX, but not Win32) -ACE_HAS_SYS_ERRLIST Platform/compiler supports - _sys_errlist symbol ACE_HAS_SYS_FILIO_H Platform provides header ACE_HAS_SYS_LOADAVG_H Compiler/platform contains the file. ACE_HAS_SYS_PSTAT_H Compiler/platform contains the file. -ACE_HAS_SYS_SIGLIST Compiler/platform supports - _sys_siglist array ACE_HAS_SYS_SOCKIO_H Compiler/platform provides the sockio.h file ACE_HAS_SYS_SYSCALL_H Compiler/platform contains the @@ -869,17 +841,6 @@ ACE_LACKS_OPENDIR Platform lacks opendir and the opendir emulation must be used ACE_LACKS_READDIR Platform lacks readdir and the readdir emulation must be used -ACE_LACKS_CMSG_DATA_MACRO Platform has - ACE_HAS_4_4BSD_SENDMSG_RECVMSG but does - not define CMSG_DATA (cmsg) macro. -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.) ACE_LACKS_COND_TIMEDWAIT_RESET pthread_cond_timedwait does *not* reset the time argument when the lock is acquired. @@ -1009,7 +970,6 @@ ACE_LACKS_PUTENV_PROTOTYPE Platform/compiler lacks the LynxOS) ACE_LACKS_PWD_REENTRANT_FUNCTIONS Platform lacks getpwnam_r() methods (e.g., SGI 6.2). -ACE_LACKS_SID Platform lacks setsid() ACE_LACKS_QSORT Compiler/platform lacks the standard C library qsort() function @@ -1062,7 +1022,6 @@ ACE_LACKS_SIGSET Platform lacks signal sets (e.g., Chorus and Win32) ACE_LACKS_STRPTIME Platform/compiler lacks the strptime() function. -ACE_LACKS_STRCHR Platform/compiler lacks strchr() ACE_LACKS_WCSCHR Platform/compiler lacks wcschr() ACE_LACKS_STRDUP Platform/compiler lacks strdup() ACE_LACKS_WCSDUP Platform/compiler lacks wcsdup() @@ -1566,25 +1525,6 @@ ACE_HAS_STREAM_PIPES: No sysV.4 streams. -ACE_HAS_STRERROR: ------------------ - - Used in: - ace/OS.h - - Notes: - if not defined, does a: - #define strerror(err) sys_errlist[err] - - Solaris: - /usr/include/string.h - - HPUX: - set it. - in /usr/include/sys/errno.h and string.h - extern char *strerror (int); - - ACE_HAS_SVR4_DYNAMIC_LINKING: ----------------------------- @@ -1715,27 +1655,6 @@ ACE_HAS_SYS_FILIO_H: use #ifdef HP-UX to modify sysincludes.h -ACE_HAS_SYS_SIGLIST: --------------------- - - Used in: - ace/OS.h - libsrc/Log_Msg/Log_Msg.C - - Notes: - if not defined, does a: - extern const char **_sys_siglist; - - Solaris: - This is an array holding signal descriptions. - - HPUX: - don't set. - Some additional work is required. In libsrc/Log_Msg/Log_Msg.C, - sys_siglist is used regardless of ACE_HAS_SYS_SIGLIST. - have to add #ifdefs to remove them. - - ACE_HAS_TEMPLATE_TYPEDEFS: -------------------------- diff --git a/dep/ACE_wrappers/ace/RW_Mutex.cpp b/dep/ACE_wrappers/ace/RW_Mutex.cpp index b8734bb62..a7459f045 100644 --- a/dep/ACE_wrappers/ace/RW_Mutex.cpp +++ b/dep/ACE_wrappers/ace/RW_Mutex.cpp @@ -1,7 +1,7 @@ /** * @file RW_Mutex.cpp * - * $Id: RW_Mutex.cpp 80826 2008-03-04 14:51:23Z wotte $ + * $Id: RW_Mutex.cpp 91286 2010-08-05 09:04:31Z johnnyw $ * * Originally in Synch.cpp * @@ -18,7 +18,7 @@ #include "ace/Log_Msg.h" -ACE_RCSID(ace, RW_Mutex, "$Id: RW_Mutex.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -35,7 +35,7 @@ ACE_RW_Mutex::dump (void) const } ACE_RW_Mutex::ACE_RW_Mutex (int type, const ACE_TCHAR *name, void *arg) - : removed_ (0) + : removed_ (false) { // ACE_TRACE ("ACE_RW_Mutex::ACE_RW_Mutex"); if (ACE_OS::rwlock_init (&this->lock_, type, name, arg) != 0) diff --git a/dep/ACE_wrappers/ace/RW_Mutex.h b/dep/ACE_wrappers/ace/RW_Mutex.h index e5719ad10..aaaabdc0b 100644 --- a/dep/ACE_wrappers/ace/RW_Mutex.h +++ b/dep/ACE_wrappers/ace/RW_Mutex.h @@ -4,7 +4,7 @@ /** * @file RW_Mutex.h * - * $Id: RW_Mutex.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: RW_Mutex.h 83934 2008-12-01 13:47:06Z johnnyw $ * * Moved from Synch.h. * @@ -120,7 +120,7 @@ protected: /// destructor. This flag isn't protected by a lock, so make sure /// that you don't have multiple threads simultaneously calling /// on the same object, which is a bad idea anyway... - int removed_; + bool removed_; private: // = Prevent assignment and initialization. diff --git a/dep/ACE_wrappers/ace/RW_Mutex.inl b/dep/ACE_wrappers/ace/RW_Mutex.inl index b26dc986c..3ff9826c5 100644 --- a/dep/ACE_wrappers/ace/RW_Mutex.inl +++ b/dep/ACE_wrappers/ace/RW_Mutex.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: RW_Mutex.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: RW_Mutex.inl 83934 2008-12-01 13:47:06Z johnnyw $ ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -16,9 +16,9 @@ ACE_RW_Mutex::remove (void) { // ACE_TRACE ("ACE_RW_Mutex::remove"); int result = 0; - if (this->removed_ == 0) + if (!this->removed_) { - this->removed_ = 1; + this->removed_ = true; result = ACE_OS::rwlock_destroy (&this->lock_); } return result; diff --git a/dep/ACE_wrappers/ace/RW_Process_Mutex.cpp b/dep/ACE_wrappers/ace/RW_Process_Mutex.cpp index a39de3e34..74cf98145 100644 --- a/dep/ACE_wrappers/ace/RW_Process_Mutex.cpp +++ b/dep/ACE_wrappers/ace/RW_Process_Mutex.cpp @@ -1,10 +1,10 @@ -// $Id: RW_Process_Mutex.cpp 81509 2008-04-28 22:00:49Z shuston $ +// $Id: RW_Process_Mutex.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/RW_Process_Mutex.h" #include "ace/Log_Msg.h" #include "ace/ACE.h" -ACE_RCSID(ace, RW_Process_Mutex, "$Id: RW_Process_Mutex.cpp 81509 2008-04-28 22:00:49Z shuston $") + #if !defined (__ACE_INLINE__) #include "ace/RW_Process_Mutex.inl" diff --git a/dep/ACE_wrappers/ace/RW_Process_Mutex.h b/dep/ACE_wrappers/ace/RW_Process_Mutex.h index bd9ff309e..3953c2b4d 100644 --- a/dep/ACE_wrappers/ace/RW_Process_Mutex.h +++ b/dep/ACE_wrappers/ace/RW_Process_Mutex.h @@ -4,7 +4,7 @@ /** * @file RW_Process_Mutex.h * - * $Id: RW_Process_Mutex.h 81509 2008-04-28 22:00:49Z shuston $ + * $Id: RW_Process_Mutex.h 87487 2009-11-12 07:54:39Z johnnyw $ * * @author Douglas C. Schmidt */ @@ -22,7 +22,6 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Default_Constants.h" -#include "ace/OS_NS_fcntl.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -44,17 +43,11 @@ class ACE_Export ACE_RW_Process_Mutex public: /// Create a cross-process readers/writer mutex, passing in the optional /// @a name, @a flags and @a mode \sa ACE_File_Lock. - /// If not specified, a name is generated and flags and mode are set - /// to default platform values. -#if defined (ACE_WIN32) + /// If not specified, a name is generated and flags and mode are set + /// to default platform values. ACE_RW_Process_Mutex (const ACE_TCHAR *name = 0, int flags = O_CREAT|O_RDWR, - mode_t mode = ACE_DEFAULT_OPEN_PERMS); -#else - ACE_RW_Process_Mutex (const ACE_TCHAR *name = 0, - int flags = O_CREAT|O_RDWR, - mode_t mode = S_IRUSR | S_IWUSR ); -#endif /* ACE_WIN32 */ + mode_t mode = ACE_DEFAULT_RW_PROCESS_MUTEX_PERMS); ~ACE_RW_Process_Mutex (void); diff --git a/dep/ACE_wrappers/ace/RW_Thread_Mutex.cpp b/dep/ACE_wrappers/ace/RW_Thread_Mutex.cpp index 281f2d481..7fce758d9 100644 --- a/dep/ACE_wrappers/ace/RW_Thread_Mutex.cpp +++ b/dep/ACE_wrappers/ace/RW_Thread_Mutex.cpp @@ -1,7 +1,7 @@ /** * @file RW_Thread_Mutex.cpp * - * $Id: RW_Thread_Mutex.cpp 80826 2008-03-04 14:51:23Z wotte $ + * $Id: RW_Thread_Mutex.cpp 91286 2010-08-05 09:04:31Z johnnyw $ * * Originally in Synch.cpp * @@ -18,7 +18,7 @@ #include "ace/Guard_T.h" -ACE_RCSID(ace, RW_Thread_Mutex, "$Id: RW_Thread_Mutex.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/Reactor.cpp b/dep/ACE_wrappers/ace/Reactor.cpp index fa44b18c1..20a76e2d2 100644 --- a/dep/ACE_wrappers/ace/Reactor.cpp +++ b/dep/ACE_wrappers/ace/Reactor.cpp @@ -1,4 +1,4 @@ -// $Id: Reactor.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Reactor.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $ #include "ace/Reactor.h" @@ -51,10 +51,6 @@ #include "ace/Reactor.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (ace, - Reactor, - "$Id: Reactor.cpp 80826 2008-03-04 14:51:23Z wotte $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_Reactor) @@ -477,7 +473,9 @@ ACE_Reactor::notify (ACE_Event_Handler *event_handler, // First, try to remember this reactor in the event handler, in case // the event handler goes away before the notification is delivered. if (event_handler != 0 && event_handler->reactor () == 0) - event_handler->reactor (this); + { + event_handler->reactor (this); + } return this->implementation ()->notify (event_handler, mask, tv); } diff --git a/dep/ACE_wrappers/ace/Reactor.h b/dep/ACE_wrappers/ace/Reactor.h index f3d2a37ae..6f0fdf350 100644 --- a/dep/ACE_wrappers/ace/Reactor.h +++ b/dep/ACE_wrappers/ace/Reactor.h @@ -4,7 +4,7 @@ /** * @file Reactor.h * - * $Id: Reactor.h 82117 2008-06-22 17:05:12Z schmidt $ + * $Id: Reactor.h 88832 2010-02-04 09:57:42Z johnnyw $ * * @author Irfan Pyarali * @author Douglas C. Schmidt @@ -233,13 +233,13 @@ public: /** * Initialize the ACE_Reactor to manage . - * If is non-0 then the ACE_Reactor's + * If @a restart is false then the ACE_Reactor's * method will be restarted automatically when occurs. If - * or are non-0 they are used as the + * @a signal_handler or @a timer_queue are non-0 they are used as the * signal handler and timer queue, respectively. */ int open (size_t max_number_of_handles, - int restart = 0, + bool restart = false, ACE_Sig_Handler *signal_handler = 0, ACE_Timer_Queue *timer_queue = 0); @@ -281,8 +281,8 @@ public: * that were dispatched, 0 if the @a max_wait_time elapsed without * dispatching any handlers, or -1 if an error occurs. * - * The only difference between and - * is that in the alertable case, the eventloop will + * The only difference between alertable_handle_events() and + * handle_events() is that in the alertable case, the eventloop will * return when the system queues an I/O completion routine or an * Asynchronous Procedure Call. */ @@ -294,8 +294,8 @@ public: * @a max_wait_time value is a reference and can therefore never be * NULL. * - * The only difference between and - * is that in the alertable case, the eventloop will + * The only difference between alertable_handle_events() and + * handle_events() is that in the alertable case, the eventloop will * return when the system queues an I/O completion routine or an * Asynchronous Procedure Call. */ @@ -380,7 +380,7 @@ public: * Shorthand for calling * register_handler(ACE_HANDLE,ACE_Event_Handler*,ACE_Reactor_Mask), * multiple times for the same @a event_handler and @a masks but - * different . + * different @a handles. */ int register_handler (const ACE_Handle_Set &handles, ACE_Event_Handler *event_handler, @@ -524,7 +524,7 @@ public: * Resume @a handles. * * Shorthand for calling resume_handler(ACE_HANDLE) with multiple - * . + * @a handles. */ int resume_handler (const ACE_Handle_Set &handles); @@ -656,7 +656,7 @@ public: int cancel_wakeup (ACE_Event_Handler *event_handler, ACE_Reactor_Mask masks_to_be_cleared); - /// Clear @a masks_to_be_cleared from the 's entry. + /// Clear @a masks_to_be_cleared from the @a handle's entry. /// Note that this call does not cause the Reactor to re-examine /// its set of handlers - the new masks will be noticed the next /// time the Reactor waits for activity. If there is no other @@ -703,7 +703,7 @@ public: * Set the maximum number of times that ACE_Reactor will * iterate and dispatch the ACE_Event_Handlers that are passed in * via the notify queue before breaking out of its - * loop. By default, this is set to + * ACE_Message_Queue::dequeue() loop. By default, this is set to * -1, which means "iterate until the queue is empty." Setting this * to a value like "1 or 2" will increase "fairness" (and thus * prevent starvation) at the expense of slightly higher dispatching @@ -715,7 +715,7 @@ public: * Get the maximum number of times that the ACE_Reactor will * iterate and dispatch the ACE_Event_Handler's that are passed in * via the notify queue before breaking out of its - * loop. + * ACE_Message_Queue::dequeue() loop. */ int max_notify_iterations (void); @@ -793,10 +793,10 @@ public: int requeue_position (void); /// Get the existing restart value. - int restart (void); + bool restart (void); /// Set a new value for restart and return the original value. - int restart (int r); + bool restart (bool r); // = Low-level wait_set mask manipulation methods. @@ -819,7 +819,7 @@ public: ACE_Reactor_Mask mask, int ops); - /// GET/SET/ADD/CLR the ready "bit" bound with the and @a mask. + /// GET/SET/ADD/CLR the ready "bit" bound with the @a handle and @a mask. int ready_ops (ACE_HANDLE handle, ACE_Reactor_Mask mask, int ops); @@ -835,9 +835,9 @@ public: */ int current_info (ACE_HANDLE handle, size_t &msg_size); - /// Return 1 if we any event associations were made by the reactor - /// for the handles that it waits on, 0 otherwise. - int uses_event_associations (void); + /// Return true if we any event associations were made by the reactor + /// for the handles that it waits on, false otherwise. + bool uses_event_associations (void); /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; diff --git a/dep/ACE_wrappers/ace/Reactor.inl b/dep/ACE_wrappers/ace/Reactor.inl index f3f5b1799..36a89dbf6 100644 --- a/dep/ACE_wrappers/ace/Reactor.inl +++ b/dep/ACE_wrappers/ace/Reactor.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: Reactor.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Reactor.inl 82723 2008-09-16 09:35:44Z johnnyw $ #include "ace/Reactor_Impl.h" @@ -143,7 +143,7 @@ ACE_Reactor::current_info (ACE_HANDLE handle, size_t &size) ACE_INLINE int ACE_Reactor::open (size_t size, - int restart, + bool restart, ACE_Sig_Handler *signal_handler, ACE_Timer_Queue *timer_queue) { @@ -410,14 +410,14 @@ ACE_Reactor::owner (ACE_thread_t *owner) return this->implementation ()->owner (owner); } -ACE_INLINE int +ACE_INLINE bool ACE_Reactor::restart (void) { return this->implementation ()->restart (); } -ACE_INLINE int -ACE_Reactor::restart (int r) +ACE_INLINE bool +ACE_Reactor::restart (bool r) { return this->implementation ()->restart (r); } @@ -479,7 +479,7 @@ ACE_Reactor::size (void) const return this->implementation ()->size (); } -ACE_INLINE int +ACE_INLINE bool ACE_Reactor::uses_event_associations (void) { return this->implementation ()->uses_event_associations (); diff --git a/dep/ACE_wrappers/ace/Reactor_Impl.cpp b/dep/ACE_wrappers/ace/Reactor_Impl.cpp index dceba3276..7503e257f 100644 --- a/dep/ACE_wrappers/ace/Reactor_Impl.cpp +++ b/dep/ACE_wrappers/ace/Reactor_Impl.cpp @@ -1,11 +1,7 @@ -// $Id: Reactor_Impl.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Reactor_Impl.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/Reactor_Impl.h" -ACE_RCSID (ace, - Reactor_Impl, - "$Id: Reactor_Impl.cpp 80826 2008-03-04 14:51:23Z wotte $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_Reactor_Impl::~ACE_Reactor_Impl (void) diff --git a/dep/ACE_wrappers/ace/Reactor_Impl.h b/dep/ACE_wrappers/ace/Reactor_Impl.h index a4b4de6de..863c0b4ee 100644 --- a/dep/ACE_wrappers/ace/Reactor_Impl.h +++ b/dep/ACE_wrappers/ace/Reactor_Impl.h @@ -4,7 +4,7 @@ /** * @file Reactor_Impl.h * - * $Id: Reactor_Impl.h 81082 2008-03-25 09:09:11Z johnnyw $ + * $Id: Reactor_Impl.h 84316 2009-02-03 19:46:05Z johnnyw $ * * @author Irfan Pyarali */ @@ -91,7 +91,7 @@ public: ACE_Notification_Buffer &buffer) = 0; /** * Set the maximum number of times that the method - * will iterate and dispatch the that are + * will iterate and dispatch the ACE_Event_Handlers that are * passed in via the notify queue before breaking out of the event * loop. By default, this is set to -1, which means "iterate until * the queue is empty." Setting this to a value like "1 or 2" will @@ -102,7 +102,7 @@ public: /** * Get the maximum number of times that the method - * will iterate and dispatch the that are + * will iterate and dispatch the ACE_Event_Handlers that are * passed in via the notify queue before breaking out of its event * loop. */ @@ -133,7 +133,7 @@ public: /// Initialization. virtual int open (size_t size, - int restart = 0, + bool restart = false, ACE_Sig_Handler * = 0, ACE_Timer_Queue * = 0, int disable_notify_pipe = 0, @@ -263,15 +263,15 @@ public: ACE_Event_Handler *event_handler, ACE_Reactor_Mask mask) = 0; - /// Register @a event_handler with all the in the . + /// Register @a event_handler with all the @a handles in the . virtual int register_handler (const ACE_Handle_Set &handles, ACE_Event_Handler *event_handler, ACE_Reactor_Mask mask) = 0; /** - * Register to handle the signal @a signum using the - * . Returns the that was previously registered - * (if any), along with the of the signal handler. + * 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. */ virtual int register_handler (int signum, ACE_Event_Handler *new_sh, @@ -279,8 +279,8 @@ public: ACE_Event_Handler **old_sh = 0, ACE_Sig_Action *old_disp = 0) = 0; - /// Registers to handle a set of signals using the - /// . + /// Registers @a new_sh to handle a set of signals @a sigset using the + /// @a new_disp. virtual int register_handler (const ACE_Sig_Set &sigset, ACE_Event_Handler *new_sh, ACE_Sig_Action *new_disp = 0) = 0; @@ -295,7 +295,7 @@ public: ACE_Reactor_Mask mask) = 0; /** - * Removes . If @a mask == ACE_Event_Handler::DONT_CALL + * Removes @a handle. If @a mask == ACE_Event_Handler::DONT_CALL * then the method of the associated * is not invoked. */ @@ -303,7 +303,7 @@ public: ACE_Reactor_Mask mask) = 0; /** - * Removes all handles in . If @a mask == + * Removes all handles in @a handle_set. If @a mask == * ACE_Event_Handler::DONT_CALL then the method of * the associated s is not invoked. */ @@ -321,7 +321,7 @@ public: ACE_Sig_Action *old_disp = 0, int sigkey = -1) = 0; - /// Calls for every signal in . + /// Calls for every signal in @a sigset. virtual int remove_handler (const ACE_Sig_Set &sigset) = 0; // = Suspend and resume Handlers. @@ -330,10 +330,10 @@ public: /// to get the handle. virtual int suspend_handler (ACE_Event_Handler *event_handler) = 0; - /// Suspend temporarily. + /// Suspend @a handle temporarily. virtual int suspend_handler (ACE_HANDLE handle) = 0; - /// Suspend all in handle set temporarily. + /// Suspend all @a handles in handle set temporarily. virtual int suspend_handler (const ACE_Handle_Set &handles) = 0; /// Suspend all temporarily. @@ -343,10 +343,10 @@ public: /// get the handle. virtual int resume_handler (ACE_Event_Handler *event_handler) = 0; - /// Resume . + /// Resume @a handle. virtual int resume_handler (ACE_HANDLE handle) = 0; - /// Resume all in handle set. + /// Resume all @a handles in handle set. virtual int resume_handler (const ACE_Handle_Set &handles) = 0; /// Resume all . @@ -357,9 +357,9 @@ public: /// the application virtual int resumable_handler (void) = 0; - /// Return 1 if we any event associations were made by the reactor - /// for the handles that it waits on, 0 otherwise. - virtual int uses_event_associations (void) = 0; + /// Return true if we any event associations were made by the reactor + /// for the handles that it waits on, false otherwise. + virtual bool uses_event_associations (void) = 0; // If we need to reset handles returned from accept/connect. @@ -422,16 +422,16 @@ public: virtual int schedule_wakeup (ACE_Event_Handler *event_handler, ACE_Reactor_Mask masks_to_be_added) = 0; - /// Add @a masks_to_be_added to the 's entry. - /// associated with must already have been registered. + /// Add @a masks_to_be_added to the @a handle's entry. + /// associated with @a handle must already have been registered. virtual int schedule_wakeup (ACE_HANDLE handle, ACE_Reactor_Mask masks_to_be_added) = 0; - /// Clear @a masks_to_be_cleared from the 's entry. + /// Clear @a masks_to_be_cleared from the @a event_handler's entry. virtual int cancel_wakeup (ACE_Event_Handler *event_handler, ACE_Reactor_Mask masks_to_be_cleared) = 0; - /// Clear @a masks_to_be_cleared from the 's entry. + /// Clear @a masks_to_be_cleared from the @a handle's entry. virtual int cancel_wakeup (ACE_HANDLE handle, ACE_Reactor_Mask masks_to_be_cleared) = 0; @@ -449,7 +449,7 @@ public: /** * Set the maximum number of times that ACE_Reactor_Impl will - * iterate and dispatch the that are passed in + * iterate and dispatch the ACE_Event_Handlers that are passed in * via the notify queue before breaking out of its * loop. By default, this is set to * -1, which means "iterate until the queue is empty." Setting this @@ -461,7 +461,7 @@ public: /** * Get the maximum number of times that the ACE_Reactor_Impl will - * iterate and dispatch the that are passed in + * iterate and dispatch the ACE_Event_Handlers that are passed in * via the notify queue before breaking out of its * loop. */ @@ -476,13 +476,13 @@ public: ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK) = 0; /** - * Return the Event_Handler associated with . Return 0 if - * is not registered. + * Return the Event_Handler associated with @a handle. Return 0 if + * @a handle is not registered. */ virtual ACE_Event_Handler *find_handler (ACE_HANDLE handle) = 0; /** - * Check to see if is associated with a valid Event_Handler + * Check to see if @a handle is associated with a valid Event_Handler * bound to @a mask. Return the @a event_handler associated with this * handler if @a event_handler != 0. */ @@ -512,17 +512,17 @@ public: /// Wake up all threads in waiting in the event loop virtual void wakeup_all_threads (void) = 0; - /// Transfers ownership of Reactor_Impl to the . + /// Transfers ownership of Reactor_Impl to the @a new_owner. virtual int owner (ACE_thread_t new_owner, ACE_thread_t *old_owner = 0) = 0; /// Return the ID of the "owner" thread. virtual int owner (ACE_thread_t *owner) = 0; /// Get the existing restart value. - virtual int restart (void) = 0; + virtual bool restart (void) = 0; /// Set a new value for restart and return the original value. - virtual int restart (int r) = 0; + virtual bool restart (bool r) = 0; /// Set position of the owner thread. virtual void requeue_position (int) = 0; @@ -538,7 +538,7 @@ public: ACE_Reactor_Mask mask, int ops) = 0; - /// GET/SET/ADD/CLR the dispatch MASK "bit" bound with the + /// GET/SET/ADD/CLR the dispatch MASK "bit" bound with the @a handle /// and @a mask. virtual int mask_ops (ACE_HANDLE handle, ACE_Reactor_Mask mask, @@ -551,7 +551,7 @@ public: ACE_Reactor_Mask mask, int ops) = 0; - /// GET/SET/ADD/CLR the ready "bit" bound with the and @a mask. + /// GET/SET/ADD/CLR the ready "bit" bound with the @a handle and @a mask. virtual int ready_ops (ACE_HANDLE handle, ACE_Reactor_Mask, int ops) = 0; diff --git a/dep/ACE_wrappers/ace/Reactor_Notification_Strategy.cpp b/dep/ACE_wrappers/ace/Reactor_Notification_Strategy.cpp index ca09498ec..fdad27b65 100644 --- a/dep/ACE_wrappers/ace/Reactor_Notification_Strategy.cpp +++ b/dep/ACE_wrappers/ace/Reactor_Notification_Strategy.cpp @@ -1,3 +1,5 @@ +// $Id: Reactor_Notification_Strategy.cpp 91287 2010-08-05 10:30:49Z johnnyw $ + #include "ace/Reactor_Notification_Strategy.h" #include "ace/Reactor.h" @@ -5,8 +7,6 @@ #include "ace/Reactor_Notification_Strategy.inl" #endif /* __ACE_INLINE __ */ -ACE_RCSID(ace, Reactor_Notification_Strategy, "$Id: Reactor_Notification_Strategy.cpp 80826 2008-03-04 14:51:23Z wotte $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_Reactor_Notification_Strategy::ACE_Reactor_Notification_Strategy ( diff --git a/dep/ACE_wrappers/ace/Reactor_Timer_Interface.cpp b/dep/ACE_wrappers/ace/Reactor_Timer_Interface.cpp index e2c644bd7..8bd7be7e3 100644 --- a/dep/ACE_wrappers/ace/Reactor_Timer_Interface.cpp +++ b/dep/ACE_wrappers/ace/Reactor_Timer_Interface.cpp @@ -1,12 +1,7 @@ -// $Id: Reactor_Timer_Interface.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Reactor_Timer_Interface.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/Reactor_Timer_Interface.h" -ACE_RCSID (ace, - Reactor_Timer_Interface, - "$Id: Reactor_Timer_Interface.cpp 80826 2008-03-04 14:51:23Z wotte $") - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_Reactor_Timer_Interface::~ACE_Reactor_Timer_Interface() diff --git a/dep/ACE_wrappers/ace/Reactor_Token_T.cpp b/dep/ACE_wrappers/ace/Reactor_Token_T.cpp index 5520c85c7..2c8b64528 100644 --- a/dep/ACE_wrappers/ace/Reactor_Token_T.cpp +++ b/dep/ACE_wrappers/ace/Reactor_Token_T.cpp @@ -1,4 +1,4 @@ -// $Id: Reactor_Token_T.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Reactor_Token_T.cpp 82917 2008-10-03 19:10:56Z dai_y $ #include "ace/Log_Msg.h" #include "ace/Reactor_Token_T.h" @@ -61,10 +61,20 @@ template void ACE_Reactor_Token_T::sleep_hook (void) { ACE_TRACE ("ACE_Reactor_Token_T::sleep_hook"); - if (this->reactor_->notify () == -1) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("sleep_hook failed"))); + ACE_Time_Value ping = ACE_Time_Value::zero; + if (this->reactor_->notify (0, ACE_Event_Handler::EXCEPT_MASK, &ping) == -1) + { + if (errno == ETIME) + { + errno = 0; + } + else + { + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("%p\n"), + ACE_TEXT ("sleep_hook failed"))); + } + } } ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/Read_Buffer.cpp b/dep/ACE_wrappers/ace/Read_Buffer.cpp index dc246a466..5ad8fcf1c 100644 --- a/dep/ACE_wrappers/ace/Read_Buffer.cpp +++ b/dep/ACE_wrappers/ace/Read_Buffer.cpp @@ -1,4 +1,4 @@ -// $Id: Read_Buffer.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Read_Buffer.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/Read_Buffer.h" @@ -13,7 +13,7 @@ #include "ace/Service_Config.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID(ace, Read_Buffer, "$Id: Read_Buffer.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/Recursive_Thread_Mutex.cpp b/dep/ACE_wrappers/ace/Recursive_Thread_Mutex.cpp index c62302e2f..c32c20010 100644 --- a/dep/ACE_wrappers/ace/Recursive_Thread_Mutex.cpp +++ b/dep/ACE_wrappers/ace/Recursive_Thread_Mutex.cpp @@ -1,7 +1,7 @@ /** * @file Recursive_Thread_Mutex.cpp * - * $Id: Recursive_Thread_Mutex.cpp 82253 2008-07-04 20:18:14Z shuston $ + * $Id: Recursive_Thread_Mutex.cpp 91286 2010-08-05 09:04:31Z johnnyw $ * * Originally in Synch.cpp * @@ -18,7 +18,7 @@ #include "ace/Log_Msg.h" -ACE_RCSID(ace, Recursive_Thread_Mutex, "$Id: Recursive_Thread_Mutex.cpp 82253 2008-07-04 20:18:14Z shuston $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -82,7 +82,7 @@ int ACE_Recursive_Thread_Mutex::get_nesting_level (void) { // ACE_TRACE ("ACE_Recursive_Thread_Mutex::get_nesting_level"); -#if defined (ACE_HAS_WINCE) || defined (ACE_HAS_VXTHREADS) || defined (ACE_HAS_PHARLAP) +#if defined (ACE_HAS_VXTHREADS) || defined (ACE_HAS_PHARLAP) || defined (ACE_HAS_WINCE) ACE_NOTSUP_RETURN (-1); #elif defined (ACE_HAS_RECURSIVE_MUTEXES) # if defined (ACE_WIN32) diff --git a/dep/ACE_wrappers/ace/Recursive_Thread_Mutex.h b/dep/ACE_wrappers/ace/Recursive_Thread_Mutex.h index 2dce01607..93a25a7bd 100644 --- a/dep/ACE_wrappers/ace/Recursive_Thread_Mutex.h +++ b/dep/ACE_wrappers/ace/Recursive_Thread_Mutex.h @@ -4,7 +4,7 @@ /** * @file Recursive_Thread_Mutex.h * - * $Id: Recursive_Thread_Mutex.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Recursive_Thread_Mutex.h 91066 2010-07-12 11:05:04Z johnnyw $ * * Moved from Synch.h. * @@ -90,14 +90,14 @@ public: /** * Acquire mutex ownership. This calls and is only - * here to make the interface consistent + * here to make the ACE_Recusive_Thread_Mutex interface consistent * with the other synchronization APIs. */ int acquire_read (void); /** * Acquire mutex ownership. This calls and is only - * here to make the interface consistent + * here to make the ACE_Recusive_Thread_Mutex interface consistent * with the other synchronization APIs. */ int acquire_write (void); @@ -105,7 +105,7 @@ public: /** * Conditionally acquire mutex (i.e., won't block). This calls * and is only here to make the - * interface consistent with the other + * ACE_Recusive_Thread_Mutex interface consistent with the other * synchronization APIs. Returns -1 on failure. If we "failed" * because someone else already had the lock, @c errno is set to * @c EBUSY. @@ -115,7 +115,7 @@ public: /** * Conditionally acquire mutex (i.e., won't block). This calls * and is only here to make the - * interface consistent with the other + * ACE_Recusive_Thread_Mutex interface consistent with the other * synchronization APIs. Returns -1 on failure. If we "failed" * because someone else already had the lock, @c errno is set to * @c EBUSY. @@ -151,6 +151,9 @@ public: int get_nesting_level (void); /// Returns a reference to the recursive mutex; + ACE_recursive_thread_mutex_t &lock (void); + + /// @deprecated Returns a reference to the recursive mutex; ACE_recursive_thread_mutex_t &mutex (void); /// Returns a reference to the recursive mutex's internal mutex; diff --git a/dep/ACE_wrappers/ace/Recursive_Thread_Mutex.inl b/dep/ACE_wrappers/ace/Recursive_Thread_Mutex.inl index fe282097e..57e8a8a66 100644 --- a/dep/ACE_wrappers/ace/Recursive_Thread_Mutex.inl +++ b/dep/ACE_wrappers/ace/Recursive_Thread_Mutex.inl @@ -1,11 +1,11 @@ // -*- C++ -*- // -// $Id: Recursive_Thread_Mutex.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Recursive_Thread_Mutex.inl 89121 2010-02-22 14:48:31Z schmidt $ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE ACE_recursive_thread_mutex_t & -ACE_Recursive_Thread_Mutex::mutex (void) +ACE_Recursive_Thread_Mutex::lock (void) { return lock_; } diff --git a/dep/ACE_wrappers/ace/Recyclable.cpp b/dep/ACE_wrappers/ace/Recyclable.cpp index d68ffd4d7..9af11bb85 100644 --- a/dep/ACE_wrappers/ace/Recyclable.cpp +++ b/dep/ACE_wrappers/ace/Recyclable.cpp @@ -1,4 +1,4 @@ -//$Id: Recyclable.cpp 80826 2008-03-04 14:51:23Z wotte $ +//$Id: Recyclable.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/Recyclable.h" @@ -6,7 +6,7 @@ #include "ace/Recyclable.inl" #endif /* __ACE_INLINE __ */ -ACE_RCSID(ace, Recyclable, "$Id: Recyclable.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/Recyclable.h b/dep/ACE_wrappers/ace/Recyclable.h index ab6844dd1..36c75586d 100644 --- a/dep/ACE_wrappers/ace/Recyclable.h +++ b/dep/ACE_wrappers/ace/Recyclable.h @@ -4,7 +4,7 @@ /** * @file Recyclable.h * - * $Id: Recyclable.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Recyclable.h 82723 2008-09-16 09:35:44Z johnnyw $ * * @author Doug Schmidt */ @@ -63,8 +63,6 @@ protected: /// Constructor. ACE_Recyclable (ACE_Recyclable_State initial_state); -protected: - /// Our state. ACE_Recyclable_State recycle_state_; }; diff --git a/dep/ACE_wrappers/ace/Refcountable_T.cpp b/dep/ACE_wrappers/ace/Refcountable_T.cpp index 80c28ea50..755c61150 100644 --- a/dep/ACE_wrappers/ace/Refcountable_T.cpp +++ b/dep/ACE_wrappers/ace/Refcountable_T.cpp @@ -1,14 +1,10 @@ -// $Id: Refcountable_T.cpp 81407 2008-04-24 05:59:30Z johnnyw $ +// $Id: Refcountable_T.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $ #ifndef ACE_REFCOUNTABLE_T_CPP #define ACE_REFCOUNTABLE_T_CPP #include "ace/Refcountable_T.h" -ACE_RCSID (ace, - Refcountable_T, - "$Id: Refcountable_T.cpp 81407 2008-04-24 05:59:30Z johnnyw $") - #if !defined (__ACE_INLINE__) #include "ace/Refcountable_T.inl" #endif /* __ACE_INLINE__ */ diff --git a/dep/ACE_wrappers/ace/Registry.cpp b/dep/ACE_wrappers/ace/Registry.cpp index 9ae334511..a62a5632b 100644 --- a/dep/ACE_wrappers/ace/Registry.cpp +++ b/dep/ACE_wrappers/ace/Registry.cpp @@ -1,11 +1,7 @@ -// $Id: Registry.cpp 82435 2008-07-28 11:53:42Z johnnyw $ +// $Id: Registry.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/Registry.h" -ACE_RCSID (ace, - Registry, - "$Id: Registry.cpp 82435 2008-07-28 11:53:42Z johnnyw $") - #if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_REGISTRY) # include "ace/os_include/os_netdb.h" @@ -842,11 +838,14 @@ ACE_Registry::Binding_Iterator::Iteration_State::iterator (Binding_Iterator *ite } -ACE_Registry::Binding_Iterator::Iteration_State::Iteration_State () +ACE_Registry::Binding_Iterator::Iteration_State::Iteration_State (void) : index_ (0) { } +ACE_Registry::Binding_Iterator::Iteration_State::~Iteration_State (void) +{ +} // Next entry int @@ -1075,6 +1074,9 @@ ACE_Predefined_Naming_Contexts::connect (ACE_Registry::Naming_Context &naming_co const ACE_TCHAR *machine_name) { #if defined (ACE_HAS_WINCE) + ACE_UNUSED_ARG(naming_context); + ACE_UNUSED_ARG(predefined); + ACE_UNUSED_ARG(machine_name); return -1; #else long result = -1; @@ -1088,6 +1090,7 @@ ACE_Predefined_Naming_Contexts::connect (ACE_Registry::Naming_Context &naming_co predefined, &naming_context.key_); if (predefined == HKEY_CURRENT_USER || predefined == HKEY_CLASSES_ROOT) + { // Make sure that for these types, the machine is local if (machine_name == 0 || ACE_Predefined_Naming_Contexts::is_local_host (machine_name)) @@ -1097,6 +1100,7 @@ ACE_Predefined_Naming_Contexts::connect (ACE_Registry::Naming_Context &naming_co } else result = -1; + } ACE_REGISTRY_CALL_RETURN (result); #endif // ACE_HAS_WINCE diff --git a/dep/ACE_wrappers/ace/Registry.h b/dep/ACE_wrappers/ace/Registry.h index b5d3b5449..8b7f6a1ed 100644 --- a/dep/ACE_wrappers/ace/Registry.h +++ b/dep/ACE_wrappers/ace/Registry.h @@ -4,7 +4,7 @@ /** * @file Registry.h * - * $Id: Registry.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Registry.h 85110 2009-04-20 09:18:43Z msmit $ * * @author Irfan Pyarali (irfan@cs.wustl.edu) */ @@ -460,7 +460,10 @@ public: { public: /// Constructor - Iteration_State (); + Iteration_State (void); + + /// Destructor + virtual ~Iteration_State (void); /// Set the iterator reference. void iterator (Binding_Iterator *iterator); diff --git a/dep/ACE_wrappers/ace/Registry_Name_Space.cpp b/dep/ACE_wrappers/ace/Registry_Name_Space.cpp index 3a4234119..594e8032f 100644 --- a/dep/ACE_wrappers/ace/Registry_Name_Space.cpp +++ b/dep/ACE_wrappers/ace/Registry_Name_Space.cpp @@ -1,8 +1,8 @@ -// $Id: Registry_Name_Space.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Registry_Name_Space.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/Registry_Name_Space.h" -ACE_RCSID(ace, Registry_Name_Space, "$Id: Registry_Name_Space.cpp 80826 2008-03-04 14:51:23Z wotte $") + #if (defined (ACE_WIN32) && defined (ACE_USES_WCHAR)) // This only works on Win32 platforms when ACE_USES_WCHAR is turned on @@ -254,7 +254,10 @@ ACE_Registry_Name_Space::list_name_entries (ACE_BINDING_SET &set, value, type); if (result != 0) - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Registry::Naming_Context::resolve")), result); + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Registry::Naming_Context::resolve")), + result); // Complete binding ACE_Name_Binding binding (key, value, type); diff --git a/dep/ACE_wrappers/ace/Remote_Name_Space.cpp b/dep/ACE_wrappers/ace/Remote_Name_Space.cpp index afbfd360f..fd99feb84 100644 --- a/dep/ACE_wrappers/ace/Remote_Name_Space.cpp +++ b/dep/ACE_wrappers/ace/Remote_Name_Space.cpp @@ -1,13 +1,10 @@ +// $Id: Remote_Name_Space.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $ #include "ace/Remote_Name_Space.h" #include "ace/Auto_Ptr.h" #include "ace/Log_Msg.h" #include "ace/SString.h" #include "ace/OS_NS_string.h" -ACE_RCSID (ace, - Remote_Name_Space, - "$Id: Remote_Name_Space.cpp 80826 2008-03-04 14:51:23Z wotte $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL int diff --git a/dep/ACE_wrappers/ace/Remote_Tokens.cpp b/dep/ACE_wrappers/ace/Remote_Tokens.cpp index 30c7a556f..07d3b6816 100644 --- a/dep/ACE_wrappers/ace/Remote_Tokens.cpp +++ b/dep/ACE_wrappers/ace/Remote_Tokens.cpp @@ -1,4 +1,4 @@ -// $Id: Remote_Tokens.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Remote_Tokens.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/Remote_Tokens.h" @@ -10,12 +10,6 @@ #include "ace/Remote_Tokens.inl" #endif /* __ACE_INLINE__ */ - -ACE_RCSID (ace, - Remote_Tokens, - "$Id: Remote_Tokens.cpp 80826 2008-03-04 14:51:23Z wotte $") - - #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) #define ACE_TSS_CONNECTION_MUTEX ACE_Thread_Mutex #else @@ -157,12 +151,16 @@ ACE_Remote_Token_Proxy::request_reply (ACE_Token_Request &request, ACE_SOCK_Stream *peer = ACE_Token_Connections::instance ()->get_connection (); if (peer == 0) - ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p\n", "BIG PROBLEMS with get_connection"), -1); + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT("(%P|%t) %p\n"), + ACE_TEXT("BIG PROBLEMS with get_connection")), -1); // Transmit request via a blocking send. if (peer->send_n (buffer, length) != length) - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("send_n failed")), -1); + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("%p\n"), + ACE_TEXT ("send_n failed")), -1); else { ACE_Token_Reply reply; diff --git a/dep/ACE_wrappers/ace/Reverse_Lock_T.h b/dep/ACE_wrappers/ace/Reverse_Lock_T.h index 12428d856..48b6bbed0 100644 --- a/dep/ACE_wrappers/ace/Reverse_Lock_T.h +++ b/dep/ACE_wrappers/ace/Reverse_Lock_T.h @@ -4,7 +4,7 @@ /** * @file Reverse_Lock_T.h * - * $Id: Reverse_Lock_T.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Reverse_Lock_T.h 84481 2009-02-17 10:58:31Z johnnyw $ * * Moved from Synch.h. * @@ -77,7 +77,7 @@ public: // = Initialization/Finalization methods. - /// Constructor. All locking requests will be forwarded to . + /// Constructor. All locking requests will be forwarded to @a lock. ACE_Reverse_Lock (ACE_LOCKING_MECHANISM &lock, ACE_Acquire_Method::METHOD_TYPE acquire_method = ACE_Acquire_Method::ACE_REGULAR); diff --git a/dep/ACE_wrappers/ace/SOCK.cpp b/dep/ACE_wrappers/ace/SOCK.cpp index b5b38ced0..fadc85042 100644 --- a/dep/ACE_wrappers/ace/SOCK.cpp +++ b/dep/ACE_wrappers/ace/SOCK.cpp @@ -1,4 +1,4 @@ -// $Id: SOCK.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: SOCK.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/SOCK.h" #include "ace/Log_Msg.h" @@ -7,7 +7,7 @@ #include "ace/SOCK.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ace, SOCK, "$Id: SOCK.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/SOCK.h b/dep/ACE_wrappers/ace/SOCK.h index d2f3df97d..d37e68b29 100644 --- a/dep/ACE_wrappers/ace/SOCK.h +++ b/dep/ACE_wrappers/ace/SOCK.h @@ -4,7 +4,7 @@ /** * @file SOCK.h * - * $Id: SOCK.h 81014 2008-03-19 11:41:31Z johnnyw $ + * $Id: SOCK.h 84834 2009-03-16 12:28:51Z johnnyw $ * * @author Douglas C. Schmidt */ @@ -125,7 +125,6 @@ protected: * pointer/reference. */ ~ACE_SOCK (void); - }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/SOCK_Acceptor.cpp b/dep/ACE_wrappers/ace/SOCK_Acceptor.cpp index f8ced09b7..d6aa2bd5f 100644 --- a/dep/ACE_wrappers/ace/SOCK_Acceptor.cpp +++ b/dep/ACE_wrappers/ace/SOCK_Acceptor.cpp @@ -1,4 +1,4 @@ -// $Id: SOCK_Acceptor.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: SOCK_Acceptor.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/SOCK_Acceptor.h" @@ -16,7 +16,7 @@ #include "ace/OS_QoS.h" #endif // ACE_HAS_WINCE -ACE_RCSID(ace, SOCK_Acceptor, "$Id: SOCK_Acceptor.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -33,7 +33,7 @@ ACE_SOCK_Acceptor::ACE_SOCK_Acceptor (void) int ACE_SOCK_Acceptor::shared_accept_start (ACE_Time_Value *timeout, - int restart, + bool restart, int &in_blocking_mode) const { ACE_TRACE ("ACE_SOCK_Acceptor::shared_accept_start"); @@ -66,7 +66,7 @@ ACE_SOCK_Acceptor::shared_accept_start (ACE_Time_Value *timeout, int ACE_SOCK_Acceptor::shared_accept_finish (ACE_SOCK_Stream new_stream, int in_blocking_mode, - int reset_new_handle) const + bool reset_new_handle) const { ACE_TRACE ("ACE_SOCK_Acceptor::shared_accept_finish ()"); @@ -105,8 +105,8 @@ int ACE_SOCK_Acceptor::accept (ACE_SOCK_Stream &new_stream, ACE_Addr *remote_addr, ACE_Time_Value *timeout, - int restart, - int reset_new_handle) const + bool restart, + bool reset_new_handle) const { ACE_TRACE ("ACE_SOCK_Acceptor::accept"); @@ -135,7 +135,7 @@ ACE_SOCK_Acceptor::accept (ACE_SOCK_Stream &new_stream, addr, len_ptr)); while (new_stream.get_handle () == ACE_INVALID_HANDLE - && restart != 0 + && restart && errno == EINTR && timeout == 0); @@ -161,8 +161,8 @@ ACE_SOCK_Acceptor::accept (ACE_SOCK_Stream &new_stream, ACE_Accept_QoS_Params qos_params, ACE_Addr *remote_addr, ACE_Time_Value *timeout, - int restart, - int reset_new_handle) const + bool restart, + bool reset_new_handle) const { ACE_TRACE ("ACE_SOCK_Acceptor::accept"); @@ -192,7 +192,7 @@ ACE_SOCK_Acceptor::accept (ACE_SOCK_Stream &new_stream, len_ptr, qos_params)); while (new_stream.get_handle () == ACE_INVALID_HANDLE - && restart != 0 + && restart && errno == EINTR && timeout == 0); diff --git a/dep/ACE_wrappers/ace/SOCK_Acceptor.h b/dep/ACE_wrappers/ace/SOCK_Acceptor.h index 3d63ba733..79d3adefe 100644 --- a/dep/ACE_wrappers/ace/SOCK_Acceptor.h +++ b/dep/ACE_wrappers/ace/SOCK_Acceptor.h @@ -4,7 +4,7 @@ /** * @file SOCK_Acceptor.h * - * $Id: SOCK_Acceptor.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: SOCK_Acceptor.h 82723 2008-09-16 09:35:44Z johnnyw $ * * @author Douglas C. Schmidt */ @@ -99,8 +99,8 @@ public: // = Passive connection methods. /** * Accept a new ACE_SOCK_Stream connection. A @a timeout of 0 - * means block forever, a @a timeout of {0, 0} means poll. - * == 1 means "restart if interrupted," i.e., if errno == EINTR. + * means block forever, a @a timeout of {0, 0} means poll. @a restart + * == true means "restart if interrupted," i.e., if errno == EINTR. * Note that @a new_stream inherits the "blocking mode" of @c this * ACE_SOCK_Acceptor, i.e., if @c this acceptor factory is in * non-blocking mode, the @a new_stream will be in non-blocking mode @@ -109,14 +109,14 @@ public: int accept (ACE_SOCK_Stream &new_stream, ACE_Addr *remote_addr = 0, ACE_Time_Value *timeout = 0, - int restart = 1, - int reset_new_handle = 0) const; + bool restart = true, + bool reset_new_handle = false) const; #if !defined (ACE_HAS_WINCE) /** * Accept a new ACE_SOCK_Stream connection using the QoS * information in @a qos_params. A @a timeout of 0 means block - * forever, a @a timeout of {0, 0} means poll. @a restart == 1 means + * forever, a @a timeout of {0, 0} means poll. @a restart == true means * "restart if interrupted," i.e., if errno == EINTR. Note that * @a new_stream inherits the "blocking mode" of @c this * ACE_SOCK_Acceptor, i.e., if @c this acceptor factory is in @@ -127,8 +127,8 @@ public: ACE_Accept_QoS_Params qos_params, ACE_Addr *remote_addr = 0, ACE_Time_Value *timeout = 0, - int restart = 1, - int reset_new_handle = 0) const; + bool restart = true, + bool reset_new_handle = false) const; #endif // ACE_HAS_WINCE // = Meta-type info @@ -145,14 +145,14 @@ protected: /// Perform operations that must occur before is /// called. int shared_accept_start (ACE_Time_Value *timeout, - int restart, + bool restart, int &in_blocking_mode) const; /// Perform operations that must occur after is /// called. int shared_accept_finish (ACE_SOCK_Stream new_stream, int in_blocking_mode, - int reset_new_handle) const; + bool reset_new_handle) const; /** * This method factors out the common code and is called by diff --git a/dep/ACE_wrappers/ace/SOCK_CODgram.cpp b/dep/ACE_wrappers/ace/SOCK_CODgram.cpp index 7babdad8e..9d9873acf 100644 --- a/dep/ACE_wrappers/ace/SOCK_CODgram.cpp +++ b/dep/ACE_wrappers/ace/SOCK_CODgram.cpp @@ -1,4 +1,4 @@ -// $Id: SOCK_CODgram.cpp 82540 2008-08-06 13:02:53Z johnnyw $ +// $Id: SOCK_CODgram.cpp 91287 2010-08-05 10:30:49Z johnnyw $ #include "ace/SOCK_CODgram.h" #include "ace/Log_Msg.h" @@ -8,8 +8,6 @@ #include "ace/SOCK_CODgram.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ace, SOCK_CODgram, "$Id: SOCK_CODgram.cpp 82540 2008-08-06 13:02:53Z johnnyw $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_CODgram) diff --git a/dep/ACE_wrappers/ace/SOCK_Connector.cpp b/dep/ACE_wrappers/ace/SOCK_Connector.cpp index f45e36d6c..838033792 100644 --- a/dep/ACE_wrappers/ace/SOCK_Connector.cpp +++ b/dep/ACE_wrappers/ace/SOCK_Connector.cpp @@ -1,4 +1,4 @@ -// $Id: SOCK_Connector.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: SOCK_Connector.cpp 91287 2010-08-05 10:30:49Z johnnyw $ #include "ace/SOCK_Connector.h" #include "ace/INET_Addr.h" @@ -15,8 +15,6 @@ #include "ace/SOCK_Connector.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ace, SOCK_Connector, "$Id: SOCK_Connector.cpp 80826 2008-03-04 14:51:23Z wotte $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_Connector) @@ -97,8 +95,7 @@ ACE_SOCK_Connector::shared_connect_start (ACE_SOCK_Stream &new_stream, } // Enable non-blocking, if required. - if (timeout != 0 - && new_stream.enable (ACE_NONBLOCK) == -1) + if (timeout != 0 && new_stream.enable (ACE_NONBLOCK) == -1) return -1; else return 0; @@ -119,8 +116,7 @@ ACE_SOCK_Connector::shared_connect_finish (ACE_SOCK_Stream &new_stream, if (error == EINPROGRESS || error == EWOULDBLOCK) { // This expression checks if we were polling. - if (timeout->sec () == 0 - && timeout->usec () == 0) + if (*timeout == ACE_Time_Value::zero) { #if defined(ACE_WIN32) // In order to detect when the socket that has been @@ -164,10 +160,18 @@ ACE_SOCK_Connector::shared_connect_finish (ACE_SOCK_Stream &new_stream, // EISCONN is treated specially since this routine may be used to // check if we are already connected. if (result != -1 || error == EISCONN) - // Start out with non-blocking disabled on the . - new_stream.disable (ACE_NONBLOCK); + { + // Start out with non-blocking disabled on the new_stream. + result = new_stream.disable (ACE_NONBLOCK); + if (result == -1) + { + new_stream.close (); + } + } else if (!(error == EWOULDBLOCK || error == ETIMEDOUT)) - new_stream.close (); + { + new_stream.close (); + } return result; } diff --git a/dep/ACE_wrappers/ace/SOCK_Connector.h b/dep/ACE_wrappers/ace/SOCK_Connector.h index e22ff2cee..98ec8862f 100644 --- a/dep/ACE_wrappers/ace/SOCK_Connector.h +++ b/dep/ACE_wrappers/ace/SOCK_Connector.h @@ -4,7 +4,7 @@ /** * @file SOCK_Connector.h * - * $Id: SOCK_Connector.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: SOCK_Connector.h 84816 2009-03-13 08:16:32Z johnnyw $ * * @author Doug Schmidt */ @@ -71,7 +71,7 @@ public: * amount of time passes before the connection is made, * this method returns -1 and errno == ETIME. Note * the difference between this case and when a blocking - * connect is attmpted that TCP times out - in the latter + * connect is attempted that TCP times out - in the latter * case, errno will be ETIMEDOUT. * @param local_sap (optional) The local address to bind to. If it's * the default value of @c ACE_Addr::sap_any then the @@ -121,7 +121,7 @@ public: * amount of time passes before the connection is made, * this method returns -1 and errno == ETIME. Note * the difference between this case and when a blocking - * connect is attmpted that TCP times out - in the latter + * connect is attempted that TCP times out - in the latter * case, errno will be ETIMEDOUT. * @param local_sap (optional) The local address to bind to. If it's * the default value of @c ACE_Addr::sap_any then the @@ -168,7 +168,7 @@ public: * amount of time passes before the connection is made, * this method returns -1 and errno == ETIME. Note * the difference between this case and when a blocking - * connect is attmpted that TCP times out - in the latter + * connect is attempted that TCP times out - in the latter * case, errno will be ETIMEDOUT. * @param local_sap (optional) The local address to bind to. If it's * the default value of @c ACE_Addr::sap_any then the @@ -222,7 +222,7 @@ public: * amount of time passes before the connection is made, * this method returns -1 and errno == ETIME. Note * the difference between this case and when a blocking - * connect is attmpted that TCP times out - in the latter + * connect is attempted that TCP times out - in the latter * case, errno will be ETIMEDOUT. * @param local_sap (optional) The local address to bind to. If it's * the default value of @c ACE_Addr::sap_any then the @@ -270,7 +270,7 @@ public: const ACE_Time_Value *timeout = 0); /// Resets any event associations on this handle - int reset_new_handle (ACE_HANDLE handle); + bool reset_new_handle (ACE_HANDLE handle); // = Meta-type info typedef ACE_INET_Addr PEER_ADDR; diff --git a/dep/ACE_wrappers/ace/SOCK_Connector.inl b/dep/ACE_wrappers/ace/SOCK_Connector.inl index ec99a5f38..a805ba0b1 100644 --- a/dep/ACE_wrappers/ace/SOCK_Connector.inl +++ b/dep/ACE_wrappers/ace/SOCK_Connector.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: SOCK_Connector.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: SOCK_Connector.inl 82723 2008-09-16 09:35:44Z johnnyw $ ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -21,7 +21,7 @@ ACE_SOCK_Connector::ACE_SOCK_Connector (void) ACE_TRACE ("ACE_SOCK_Connector::ACE_SOCK_Connector"); } -ACE_INLINE int +ACE_INLINE bool ACE_SOCK_Connector::reset_new_handle (ACE_HANDLE handle) { #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) @@ -31,7 +31,7 @@ ACE_SOCK_Connector::reset_new_handle (ACE_HANDLE handle) 0); #else /* !defined ACE_HAS_WINSOCK2 */ ACE_UNUSED_ARG (handle); - return 0; + return false; #endif /* ACE_WIN32 */ } diff --git a/dep/ACE_wrappers/ace/SOCK_Dgram.cpp b/dep/ACE_wrappers/ace/SOCK_Dgram.cpp index 12961a44f..7431475ed 100644 --- a/dep/ACE_wrappers/ace/SOCK_Dgram.cpp +++ b/dep/ACE_wrappers/ace/SOCK_Dgram.cpp @@ -1,3 +1,5 @@ +// $Id: SOCK_Dgram.cpp 91604 2010-09-02 14:51:58Z vzykov $ + #include "ace/SOCK_Dgram.h" #include "ace/Handle_Set.h" @@ -16,13 +18,9 @@ #endif /* __ACE_INLINE__ */ #if defined (ACE_HAS_IPV6) && defined (ACE_WIN32) -#include /**/ +#include /**/ #endif -ACE_RCSID (ace, - SOCK_Dgram, - "$Id: SOCK_Dgram.cpp 82559 2008-08-07 20:23:07Z parsons $") - // This is a workaround for platforms with non-standard // definitions of the ip_mreq structure #if ! defined (IMR_MULTIADDR) @@ -60,13 +58,12 @@ ACE_SOCK_Dgram::recv (iovec *io_vec, // Check the status of the current socket to make sure there's data // to recv (or time out). - int select_width; # if defined (ACE_WIN32) // This arg is ignored on Windows and causes pointer truncation // warnings on 64-bit compiles. - select_width = 0; + int select_width = 0; # else - select_width = int (this->get_handle ()) + 1; + int select_width = int (this->get_handle ()) + 1; # endif /* ACE_WIN32 */ switch (ACE_OS::select (select_width, handle_set, @@ -459,13 +456,12 @@ ACE_SOCK_Dgram::recv (void *buf, handle_set.set_bit (this->get_handle ()); // Check the status of the current socket. - int select_width; #if defined (ACE_WIN32) // This arg is ignored on Windows and causes pointer truncation // warnings on 64-bit compiles. - select_width = 0; + int select_width = 0; #else - select_width = int (this->get_handle ()) + 1; + int select_width = int (this->get_handle ()) + 1; #endif /* ACE_WIN32 */ switch (ACE_OS::select (select_width, handle_set, @@ -498,13 +494,12 @@ ACE_SOCK_Dgram::send (const void *buf, handle_set.set_bit (this->get_handle ()); // Check the status of the current socket. - int select_width; #if defined (ACE_WIN32) // This arg is ignored on Windows and causes pointer truncation // warnings on 64-bit compiles. - select_width = 0; + int select_width = 0; #else - select_width = int (this->get_handle ()) + 1; + int select_width = int (this->get_handle ()) + 1; #endif /* ACE_WIN32 */ switch (ACE_OS::select (select_width, 0, diff --git a/dep/ACE_wrappers/ace/SOCK_Dgram_Bcast.cpp b/dep/ACE_wrappers/ace/SOCK_Dgram_Bcast.cpp index 7dbe796ee..eac72a74a 100644 --- a/dep/ACE_wrappers/ace/SOCK_Dgram_Bcast.cpp +++ b/dep/ACE_wrappers/ace/SOCK_Dgram_Bcast.cpp @@ -1,4 +1,4 @@ -// $Id: SOCK_Dgram_Bcast.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: SOCK_Dgram_Bcast.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/SOCK_Dgram_Bcast.h" @@ -13,7 +13,7 @@ #include "ace/SOCK_Dgram_Bcast.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ace, SOCK_Dgram_Bcast, "$Id: SOCK_Dgram_Bcast.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -117,8 +117,8 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name) SO_BROADCAST, (char *) &one, sizeof one) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", - "ACE_SOCK_Dgram_Bcast::mk_broadcast: setsockopt failed"), + ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT("%p\n"), + ACE_TEXT("ACE_SOCK_Dgram_Bcast::mk_broadcast: setsockopt failed")), -1); #if !defined (ACE_WIN32) && !defined(__INTERIX) @@ -135,8 +135,8 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name) if (ACE_OS::ioctl (s, SIOCGIFCONF, (char *) &ifc) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", - "ACE_SOCK_Dgram_Bcast::mk_broadcast: ioctl (get interface configuration)"), + ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT("%p\n"), + ACE_TEXT("ACE_SOCK_Dgram_Bcast::mk_broadcast: ioctl (get interface configuration)")), ACE_INVALID_HANDLE); struct ifreq *ifr = ifc.ifc_req; @@ -213,8 +213,8 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name) if (ifr->ifr_addr.sa_family != 0 || ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - "warning %p: sa_family: %d\n", - "ACE_SOCK_Dgram_Bcast::mk_broadcast: Not AF_INET", + ACE_TEXT("warning %p: sa_family: %d\n"), + ACE_TEXT("ACE_SOCK_Dgram_Bcast::mk_broadcast: Not AF_INET"), ifr->ifr_addr.sa_family)); continue; } @@ -226,17 +226,17 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name) SIOCGIFFLAGS, (char *) &flags) == -1) { - ACE_ERROR ((LM_ERROR, "%p [%s]\n", - "ACE_SOCK_Dgram_Bcast::mk_broadcast: ioctl (get interface flags)", - flags.ifr_name)); + ACE_ERROR ((LM_ERROR, ACE_TEXT("%p [%s]\n"), + ACE_TEXT("ACE_SOCK_Dgram_Bcast::mk_broadcast: ioctl (get interface flags)"), + flags.ifr_name)); continue; } if (ACE_BIT_ENABLED (flags.ifr_flags, IFF_UP) == 0) { - ACE_ERROR ((LM_ERROR, "%p [%s]\n", - "ACE_SOCK_Dgram_Bcast::mk_broadcast: Network interface is not up", + ACE_ERROR ((LM_ERROR, ACE_TEXT("%p [%s]\n"), + ACE_TEXT("ACE_SOCK_Dgram_Bcast::mk_broadcast: Network interface is not up"), flags.ifr_name)); continue; } @@ -251,8 +251,8 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name) if (ACE_OS::ioctl (s, SIOCGIFBRDADDR, (char *) &if_req) == -1) - ACE_ERROR ((LM_ERROR, "%p [%s]\n", - "ACE_SOCK_Dgram_Bcast::mk_broadcast: ioctl (get broadaddr)", + ACE_ERROR ((LM_ERROR, ACE_TEXT("%p [%s]\n"), + ACE_TEXT("ACE_SOCK_Dgram_Bcast::mk_broadcast: ioctl (get broadaddr)"), flags.ifr_name)); else { @@ -268,8 +268,8 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name) else { if (host_name != 0) - ACE_ERROR ((LM_ERROR, "%p [%s]\n", - "ACE_SOCK_Dgram_Bcast::mk_broadcast: Broadcast is not enable for this interface.", + ACE_ERROR ((LM_ERROR, ACE_TEXT("%p [%s]\n"), + ACE_TEXT("ACE_SOCK_Dgram_Bcast::mk_broadcast: Broadcast is not enable for this interface."), flags.ifr_name)); } } diff --git a/dep/ACE_wrappers/ace/SOCK_Dgram_Mcast.cpp b/dep/ACE_wrappers/ace/SOCK_Dgram_Mcast.cpp index 52961235b..5f31771b0 100644 --- a/dep/ACE_wrappers/ace/SOCK_Dgram_Mcast.cpp +++ b/dep/ACE_wrappers/ace/SOCK_Dgram_Mcast.cpp @@ -1,4 +1,4 @@ -// $Id: SOCK_Dgram_Mcast.cpp 82390 2008-07-23 08:13:52Z johnnyw $ +// $Id: SOCK_Dgram_Mcast.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/SOCK_Dgram_Mcast.h" @@ -13,17 +13,13 @@ #endif #if defined (ACE_HAS_IPV6) && defined (ACE_WIN32) -#include /**/ +#include /**/ #endif #if !defined (__ACE_INLINE__) #include "ace/SOCK_Dgram_Mcast.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (ace, - SOCK_Dgram_Mcast, - "$Id: SOCK_Dgram_Mcast.cpp 82390 2008-07-23 08:13:52Z johnnyw $") - #include "ace/Log_Msg.h" // This is a workaround for platforms with non-standard diff --git a/dep/ACE_wrappers/ace/SOCK_Dgram_Mcast.h b/dep/ACE_wrappers/ace/SOCK_Dgram_Mcast.h index a84de430f..a59b41bc4 100644 --- a/dep/ACE_wrappers/ace/SOCK_Dgram_Mcast.h +++ b/dep/ACE_wrappers/ace/SOCK_Dgram_Mcast.h @@ -4,7 +4,7 @@ /** * @file SOCK_Dgram_Mcast.h * - * $Id: SOCK_Dgram_Mcast.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: SOCK_Dgram_Mcast.h 83891 2008-11-28 11:01:50Z johnnyw $ * * @author Irfan Pyrali * @author Tim Harrison @@ -201,7 +201,7 @@ public: /** * This method is optional; if not explicitly invoked, it is invoked by * the first , using the subscribed address/port# and network - * interface paramters. + * interface parameters. * The parameter defines the default send address/port# and * also the port# and, if the OPT_BINDADDR_YES option is used, * the multicast address that is bound to this socket. diff --git a/dep/ACE_wrappers/ace/SOCK_IO.cpp b/dep/ACE_wrappers/ace/SOCK_IO.cpp index b22016e46..db08d4059 100644 --- a/dep/ACE_wrappers/ace/SOCK_IO.cpp +++ b/dep/ACE_wrappers/ace/SOCK_IO.cpp @@ -1,4 +1,4 @@ -// $Id: SOCK_IO.cpp 82294 2008-07-12 13:03:37Z johnnyw $ +// $Id: SOCK_IO.cpp 91604 2010-09-02 14:51:58Z vzykov $ #include "ace/SOCK_IO.h" @@ -12,7 +12,7 @@ #include "ace/SOCK_IO.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ace, SOCK_IO, "$Id: SOCK_IO.cpp 82294 2008-07-12 13:03:37Z johnnyw $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -44,13 +44,12 @@ ACE_SOCK_IO::recvv (iovec *io_vec, io_vec->iov_base = 0; // Check the status of the current socket. - int select_width; # if defined (ACE_WIN32) // This arg is ignored on Windows and causes pointer truncation // warnings on 64-bit compiles. - select_width = 0; + int select_width = 0; # else - select_width = int (this->get_handle ()) + 1; + int select_width = int (this->get_handle ()) + 1; # endif /* ACE_WIN32 */ switch (ACE_OS::select (select_width, handle_set, diff --git a/dep/ACE_wrappers/ace/SOCK_SEQPACK_Acceptor.cpp b/dep/ACE_wrappers/ace/SOCK_SEQPACK_Acceptor.cpp index ab0590564..2a39527c3 100644 --- a/dep/ACE_wrappers/ace/SOCK_SEQPACK_Acceptor.cpp +++ b/dep/ACE_wrappers/ace/SOCK_SEQPACK_Acceptor.cpp @@ -1,4 +1,4 @@ -// $Id: SOCK_SEQPACK_Acceptor.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: SOCK_SEQPACK_Acceptor.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/SOCK_SEQPACK_Acceptor.h" @@ -13,7 +13,7 @@ #include "ace/SOCK_SEQPACK_Acceptor.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ace, SOCK_SEQPACK_Acceptor, "SOCK_SEQPACK_Acceptor.cpp,v 4.30 2002/03/08 23:18:09 spark Exp") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -30,7 +30,7 @@ ACE_SOCK_SEQPACK_Acceptor::ACE_SOCK_SEQPACK_Acceptor (void) int ACE_SOCK_SEQPACK_Acceptor::shared_accept_start (ACE_Time_Value *timeout, - int restart, + bool restart, int &in_blocking_mode) const { ACE_TRACE ("ACE_SOCK_SEQPACK_Acceptor::shared_accept_start"); @@ -63,7 +63,7 @@ ACE_SOCK_SEQPACK_Acceptor::shared_accept_start (ACE_Time_Value *timeout, int ACE_SOCK_SEQPACK_Acceptor::shared_accept_finish (ACE_SOCK_SEQPACK_Association new_association, int in_blocking_mode, - int reset_new_handle) const + bool reset_new_handle) const { ACE_TRACE ("ACE_SOCK_SEQPACK_Acceptor::shared_accept_finish ()"); @@ -102,8 +102,8 @@ int ACE_SOCK_SEQPACK_Acceptor::accept (ACE_SOCK_SEQPACK_Association &new_association, ACE_Addr *remote_addr, ACE_Time_Value *timeout, - int restart, - int reset_new_handle) const + bool restart, + bool reset_new_handle) const { ACE_TRACE ("ACE_SOCK_SEQPACK_Acceptor::accept"); diff --git a/dep/ACE_wrappers/ace/SOCK_SEQPACK_Acceptor.h b/dep/ACE_wrappers/ace/SOCK_SEQPACK_Acceptor.h index 117a61bdd..d5c701081 100644 --- a/dep/ACE_wrappers/ace/SOCK_SEQPACK_Acceptor.h +++ b/dep/ACE_wrappers/ace/SOCK_SEQPACK_Acceptor.h @@ -4,7 +4,7 @@ /** * @file SOCK_SEQPACK_Acceptor.h * - * $Id: SOCK_SEQPACK_Acceptor.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: SOCK_SEQPACK_Acceptor.h 84325 2009-02-04 22:46:30Z shuston $ * @author Patrick J. Lardieri * @author Gaurav Naik, Lockheed Martin ATL * @author based on SOCK_STREAM_Acceptor @@ -56,30 +56,29 @@ public: * @c SO_REUSEADDR to reuse this address. */ ACE_SOCK_SEQPACK_Acceptor (const ACE_Addr &local_sap, - int reuse_addr = 0, - int protocol_family = PF_UNSPEC, - int backlog = ACE_DEFAULT_BACKLOG, - int protocol = 132); + int reuse_addr = 0, + int protocol_family = PF_UNSPEC, + int backlog = ACE_DEFAULT_BACKLOG, + int protocol = 132); /// Multihomed version of same ACE_SOCK_SEQPACK_Acceptor (const ACE_Multihomed_INET_Addr &local_sap, - int reuse_addr = 0, - int protocol_family = PF_UNSPEC, - int backlog = ACE_DEFAULT_BACKLOG, - int protocol = 132); + int reuse_addr = 0, + int protocol_family = PF_UNSPEC, + int backlog = ACE_DEFAULT_BACKLOG, + int protocol = 132); /// Initialize a passive-mode QoS-enabled acceptor socket. Returns 0 /// on success and -1 on failure. ACE_SOCK_SEQPACK_Acceptor (const ACE_Addr &local_sap, - ACE_Protocol_Info *protocolinfo, - ACE_SOCK_GROUP g, - u_long flags, - int reuse_addr, - int protocol_family = PF_UNSPEC, - int backlog = ACE_DEFAULT_BACKLOG, - int protocol = 132); - + ACE_Protocol_Info *protocolinfo, + ACE_SOCK_GROUP g, + u_long flags, + int reuse_addr, + int protocol_family = PF_UNSPEC, + int backlog = ACE_DEFAULT_BACKLOG, + int protocol = 132); /** * Initialize a passive-mode BSD-style acceptor socket (no QoS). @@ -133,8 +132,8 @@ public: int accept (ACE_SOCK_SEQPACK_Association &new_association, ACE_Addr *remote_addr = 0, ACE_Time_Value *timeout = 0, - int restart = 1, - int reset_new_handle = 0) const; + bool restart = true, + bool reset_new_handle = false) const; // = Meta-type info typedef ACE_Multihomed_INET_Addr PEER_ADDR; @@ -150,14 +149,14 @@ protected: /// Perform operations that must occur before is /// called. int shared_accept_start (ACE_Time_Value *timeout, - int restart, + bool restart, int &in_blocking_mode) const; /// Perform operations that must occur after is /// called. int shared_accept_finish (ACE_SOCK_SEQPACK_Association new_association, int in_blocking_mode, - int reset_new_handle) const; + bool reset_new_handle) const; /** * This method factors out the common code and is called by diff --git a/dep/ACE_wrappers/ace/SOCK_SEQPACK_Association.cpp b/dep/ACE_wrappers/ace/SOCK_SEQPACK_Association.cpp index 4e9afb470..8df2b125b 100644 --- a/dep/ACE_wrappers/ace/SOCK_SEQPACK_Association.cpp +++ b/dep/ACE_wrappers/ace/SOCK_SEQPACK_Association.cpp @@ -1,4 +1,4 @@ -// $Id: SOCK_SEQPACK_Association.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: SOCK_SEQPACK_Association.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/SOCK_SEQPACK_Association.h" @@ -11,7 +11,7 @@ #include "ace/SOCK_SEQPACK_Association.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ace, SOCK_SEQPACK_Association, "$Id: SOCK_SEQPACK_Association.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -96,7 +96,11 @@ ACE_SOCK_SEQPACK_Association::get_local_addrs (ACE_INET_Addr *addrs, size_t &siz int err = 0; size_t len = 0; +#ifndef ACE_HAS_VOID_PTR_SCTP_GETLADDRS err = sctp_getladdrs(this->get_handle(), 0, &laddrs); +#else + err = sctp_getladdrs(this->get_handle(), 0, reinterpret_cast(&laddrs)); +#endif /* ACE_HAS_VOID_PTR_SCTP_GETPADDRS */ if (err > 0) { len = err; @@ -230,7 +234,12 @@ ACE_SOCK_SEQPACK_Association::get_remote_addrs (ACE_INET_Addr *addrs, size_t &si int err = 0; size_t len = 0; +#ifndef ACE_HAS_VOID_PTR_SCTP_GETPADDRS err = sctp_getpaddrs(this->get_handle(), 0, &paddrs); +#else + err = sctp_getpaddrs(this->get_handle(), 0, reinterpret_cast(&paddrs)); +#endif /* ACE_HAS_VOID_PTR_SCTP_GETPADDRS */ + if (err > 0) { len = err; diff --git a/dep/ACE_wrappers/ace/SOCK_SEQPACK_Connector.cpp b/dep/ACE_wrappers/ace/SOCK_SEQPACK_Connector.cpp index f515f3ade..25b2bfe41 100644 --- a/dep/ACE_wrappers/ace/SOCK_SEQPACK_Connector.cpp +++ b/dep/ACE_wrappers/ace/SOCK_SEQPACK_Connector.cpp @@ -1,4 +1,4 @@ -// $Id: SOCK_SEQPACK_Connector.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: SOCK_SEQPACK_Connector.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/SOCK_SEQPACK_Connector.h" @@ -18,7 +18,7 @@ #include "ace/SOCK_SEQPACK_Connector.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ace, SOCK_SEQPACK_Connector, "SOCK_SEQPACK_Connector.cpp,v 4.35 2002/03/08 23:18:09 spark Exp") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -243,8 +243,7 @@ ACE_SOCK_SEQPACK_Connector::shared_connect_finish (ACE_SOCK_SEQPACK_Association if (error == EINPROGRESS || error == EWOULDBLOCK) { // This expression checks if we were polling. - if (timeout->sec () == 0 - && timeout->usec () == 0) + if (*timeout == ACE_Time_Value::zero) error = EWOULDBLOCK; // Wait synchronously using timeout. else if (this->complete (new_association, diff --git a/dep/ACE_wrappers/ace/SOCK_SEQPACK_Connector.h b/dep/ACE_wrappers/ace/SOCK_SEQPACK_Connector.h index 2e0d57aff..67bc75776 100644 --- a/dep/ACE_wrappers/ace/SOCK_SEQPACK_Connector.h +++ b/dep/ACE_wrappers/ace/SOCK_SEQPACK_Connector.h @@ -4,7 +4,7 @@ /** * @file SOCK_SEQPACK_Connector.h * - * $Id: SOCK_SEQPACK_Connector.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: SOCK_SEQPACK_Connector.h 84816 2009-03-13 08:16:32Z johnnyw $ * * @author Patrick J. Lardieri * @author Gaurav Naik, Lockheed Martin ATL @@ -79,7 +79,7 @@ public: * amount of time passes before the connection is made, * this method returns -1 and errno == ETIME. Note * the difference between this case and when a blocking - * connect is attmpted that TCP times out - in the latter + * connect is attempted that TCP times out - in the latter * case, errno will be ETIMEDOUT. * @param local_sap (optional) The local address to bind to. If it's * the default value of @c ACE_Addr::sap_any then the @@ -129,7 +129,7 @@ public: * amount of time passes before the connection is made, * this method returns -1 and errno == ETIME. Note * the difference between this case and when a blocking - * connect is attmpted that TCP times out - in the latter + * connect is attempted that TCP times out - in the latter * case, errno will be ETIMEDOUT. * @param local_sap (optional) The set of local addresses for SCTP to * bind to. @@ -178,7 +178,7 @@ public: * amount of time passes before the connection is made, * this method returns -1 and errno == ETIME. Note * the difference between this case and when a blocking - * connect is attmpted that TCP times out - in the latter + * connect is attempted that TCP times out - in the latter * case, errno will be ETIMEDOUT. * @param local_sap (optional) The local address to bind to. If it's * the default value of @c ACE_Addr::sap_any then the @@ -228,7 +228,7 @@ public: * amount of time passes before the connection is made, * this method returns -1 and errno == ETIME. Note * the difference between this case and when a blocking - * connect is attmpted that TCP times out - in the latter + * connect is attempted that TCP times out - in the latter * case, errno will be ETIMEDOUT. * @param local_sap (optional) The set of local addresses for SCTP to * bind to. @@ -275,7 +275,7 @@ public: const ACE_Time_Value *timeout = 0); /// Resets any event associations on this handle - int reset_new_handle (ACE_HANDLE handle); + bool reset_new_handle (ACE_HANDLE handle); // = Meta-type info typedef ACE_Multihomed_INET_Addr PEER_ADDR; diff --git a/dep/ACE_wrappers/ace/SOCK_SEQPACK_Connector.inl b/dep/ACE_wrappers/ace/SOCK_SEQPACK_Connector.inl index d11a69d31..332b6ce30 100644 --- a/dep/ACE_wrappers/ace/SOCK_SEQPACK_Connector.inl +++ b/dep/ACE_wrappers/ace/SOCK_SEQPACK_Connector.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: SOCK_SEQPACK_Connector.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: SOCK_SEQPACK_Connector.inl 82723 2008-09-16 09:35:44Z johnnyw $ ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -21,7 +21,7 @@ ACE_SOCK_SEQPACK_Connector::ACE_SOCK_SEQPACK_Connector (void) ACE_TRACE ("ACE_SOCK_SEQPACK_Connector::ACE_SOCK_SEQPACK_Connector"); } -ACE_INLINE int +ACE_INLINE bool ACE_SOCK_SEQPACK_Connector::reset_new_handle (ACE_HANDLE handle) { #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) @@ -31,7 +31,7 @@ ACE_SOCK_SEQPACK_Connector::reset_new_handle (ACE_HANDLE handle) 0); #else /* !defined ACE_HAS_WINSOCK2 */ ACE_UNUSED_ARG (handle); - return 0; + return false; #endif /* ACE_WIN32 */ } diff --git a/dep/ACE_wrappers/ace/SOCK_Stream.cpp b/dep/ACE_wrappers/ace/SOCK_Stream.cpp index 36f0b8761..54148be89 100644 --- a/dep/ACE_wrappers/ace/SOCK_Stream.cpp +++ b/dep/ACE_wrappers/ace/SOCK_Stream.cpp @@ -1,4 +1,4 @@ -// $Id: SOCK_Stream.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: SOCK_Stream.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/SOCK_Stream.h" @@ -6,7 +6,7 @@ #include "ace/SOCK_Stream.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ace, SOCK_Stream, "$Id: SOCK_Stream.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/SPIPE.cpp b/dep/ACE_wrappers/ace/SPIPE.cpp index cddd44e90..00f2224a8 100644 --- a/dep/ACE_wrappers/ace/SPIPE.cpp +++ b/dep/ACE_wrappers/ace/SPIPE.cpp @@ -1,4 +1,4 @@ -// $Id: SPIPE.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: SPIPE.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/SPIPE.h" @@ -8,7 +8,7 @@ #include "ace/SPIPE.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ace, SPIPE, "$Id: SPIPE.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/SPIPE_Acceptor.cpp b/dep/ACE_wrappers/ace/SPIPE_Acceptor.cpp index 3c653c406..6325e9259 100644 --- a/dep/ACE_wrappers/ace/SPIPE_Acceptor.cpp +++ b/dep/ACE_wrappers/ace/SPIPE_Acceptor.cpp @@ -1,4 +1,4 @@ -// $Id: SPIPE_Acceptor.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: SPIPE_Acceptor.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/SPIPE_Acceptor.h" #include "ace/Log_Msg.h" @@ -9,7 +9,7 @@ # include "ace/OS_NS_unistd.h" #endif // ACE_HAS_STREAM_PIPES -ACE_RCSID(ace, SPIPE_Acceptor, "$Id: SPIPE_Acceptor.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -248,8 +248,8 @@ int ACE_SPIPE_Acceptor::accept (ACE_SPIPE_Stream &new_io, ACE_SPIPE_Addr *remote_addr, ACE_Time_Value *timeout, - int restart, - int reset_new_handle) + bool restart, + bool reset_new_handle) { ACE_TRACE ("ACE_SPIPE_Acceptor::accept"); ACE_UNUSED_ARG (reset_new_handle); diff --git a/dep/ACE_wrappers/ace/SPIPE_Acceptor.h b/dep/ACE_wrappers/ace/SPIPE_Acceptor.h index acd7ebada..84529c765 100644 --- a/dep/ACE_wrappers/ace/SPIPE_Acceptor.h +++ b/dep/ACE_wrappers/ace/SPIPE_Acceptor.h @@ -4,7 +4,7 @@ /** * @file SPIPE_Acceptor.h * - * $Id: SPIPE_Acceptor.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: SPIPE_Acceptor.h 82723 2008-09-16 09:35:44Z johnnyw $ * * @author Douglas C. Schmidt * @author Prashant Jain @@ -121,8 +121,8 @@ public: int accept (ACE_SPIPE_Stream &ipc_sap_spipe, ACE_SPIPE_Addr *remote_addr = 0, ACE_Time_Value *timeout = 0, - int restart = 1, - int reset_new_handle = 0); + bool restart = true, + bool reset_new_handle = false); // = Meta-type info typedef ACE_SPIPE_Addr PEER_ADDR; diff --git a/dep/ACE_wrappers/ace/SPIPE_Addr.cpp b/dep/ACE_wrappers/ace/SPIPE_Addr.cpp index e81da6d96..256b5473c 100644 --- a/dep/ACE_wrappers/ace/SPIPE_Addr.cpp +++ b/dep/ACE_wrappers/ace/SPIPE_Addr.cpp @@ -1,4 +1,4 @@ -// $Id: SPIPE_Addr.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: SPIPE_Addr.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/SPIPE_Addr.h" #include "ace/OS_NS_string.h" @@ -9,7 +9,7 @@ #include "ace/SPIPE_Addr.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ace, SPIPE_Addr, "$Id: SPIPE_Addr.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/SPIPE_Connector.cpp b/dep/ACE_wrappers/ace/SPIPE_Connector.cpp index c11bb7d9b..269a2a19b 100644 --- a/dep/ACE_wrappers/ace/SPIPE_Connector.cpp +++ b/dep/ACE_wrappers/ace/SPIPE_Connector.cpp @@ -1,4 +1,4 @@ -// $Id: SPIPE_Connector.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: SPIPE_Connector.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/SPIPE_Connector.h" #include "ace/Log_Msg.h" @@ -10,7 +10,7 @@ #include "ace/SPIPE_Connector.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ace, SPIPE_Connector, "$Id: SPIPE_Connector.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/SPIPE_Connector.h b/dep/ACE_wrappers/ace/SPIPE_Connector.h index 419414adc..89b9199d5 100644 --- a/dep/ACE_wrappers/ace/SPIPE_Connector.h +++ b/dep/ACE_wrappers/ace/SPIPE_Connector.h @@ -4,7 +4,7 @@ /** * @file SPIPE_Connector.h * - * $Id: SPIPE_Connector.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: SPIPE_Connector.h 82723 2008-09-16 09:35:44Z johnnyw $ * * @author Doug Schmidt * @author Prashant Jain @@ -95,7 +95,7 @@ public: int pipe_mode = PIPE_READMODE_MESSAGE | PIPE_WAIT); /// Resets any event associations on this handle - int reset_new_handle (ACE_HANDLE handle); + bool reset_new_handle (ACE_HANDLE handle); // = Meta-type info typedef ACE_SPIPE_Addr PEER_ADDR; diff --git a/dep/ACE_wrappers/ace/SPIPE_Connector.inl b/dep/ACE_wrappers/ace/SPIPE_Connector.inl index f61dd72d5..46fdcbd42 100644 --- a/dep/ACE_wrappers/ace/SPIPE_Connector.inl +++ b/dep/ACE_wrappers/ace/SPIPE_Connector.inl @@ -1,15 +1,14 @@ // -*- C++ -*- // -// $Id: SPIPE_Connector.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: SPIPE_Connector.inl 82723 2008-09-16 09:35:44Z johnnyw $ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -ACE_INLINE int -ACE_SPIPE_Connector::reset_new_handle (ACE_HANDLE handle) +ACE_INLINE bool +ACE_SPIPE_Connector::reset_new_handle (ACE_HANDLE) { - ACE_UNUSED_ARG (handle); // Nothing to do here since the handle is not a socket - return 0; + return false; } ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/SPIPE_Stream.cpp b/dep/ACE_wrappers/ace/SPIPE_Stream.cpp index 74a2ab350..67bc34e4b 100644 --- a/dep/ACE_wrappers/ace/SPIPE_Stream.cpp +++ b/dep/ACE_wrappers/ace/SPIPE_Stream.cpp @@ -1,4 +1,4 @@ -// $Id: SPIPE_Stream.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: SPIPE_Stream.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/SPIPE_Stream.h" #include "ace/OS_Memory.h" @@ -7,7 +7,7 @@ #include "ace/SPIPE_Stream.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ace, SPIPE_Stream, "$Id: SPIPE_Stream.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/SPIPE_Stream.h b/dep/ACE_wrappers/ace/SPIPE_Stream.h index 582ca07eb..573573161 100644 --- a/dep/ACE_wrappers/ace/SPIPE_Stream.h +++ b/dep/ACE_wrappers/ace/SPIPE_Stream.h @@ -4,7 +4,7 @@ /** * @file SPIPE_Stream.h * - * $Id: SPIPE_Stream.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: SPIPE_Stream.h 84480 2009-02-16 18:58:16Z johnnyw $ * * @author Douglas C. Schmidt */ @@ -84,12 +84,12 @@ public: /// Recv bytes via STREAM pipes using "band" mode. ssize_t recv (void *buf, size_t len) const; - /// Send and via STREAM pipes. + /// Send @a cntl and @a data via STREAM pipes. ssize_t send (const ACE_Str_Buf *cntl, const ACE_Str_Buf *data, int flags = 0) const; - /// Recv and via STREAM pipes. + /// Recv @a cntl and @a data via STREAM pipes. ssize_t recv (ACE_Str_Buf *cntl, ACE_Str_Buf *data, int *flags) const; @@ -144,7 +144,7 @@ public: ssize_t sendv_n (const iovec iov[], int len) const; - /// Receive an of size @a len to the stream. + /// Receive an of size @a len from the stream. ssize_t recvv_n (iovec iov[], int len) const; diff --git a/dep/ACE_wrappers/ace/SPIPE_Stream.inl b/dep/ACE_wrappers/ace/SPIPE_Stream.inl index e52600d48..d490f88f1 100644 --- a/dep/ACE_wrappers/ace/SPIPE_Stream.inl +++ b/dep/ACE_wrappers/ace/SPIPE_Stream.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: SPIPE_Stream.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: SPIPE_Stream.inl 88707 2010-01-25 18:49:25Z johnnyw $ #include "ace/OS_NS_sys_uio.h" #include "ace/OS_NS_errno.h" @@ -111,7 +111,7 @@ ACE_SPIPE_Stream::send_handle (ACE_HANDLE handle) const DWORD procID; WSAPROTOCOL_INFO protInfo; ssize_t res = this->recv(&procID, sizeof(procID)); - if (res != sizeof(procID)) + if (res != static_cast (sizeof(procID))) { if(res != -1) errno = ENXIO; @@ -123,7 +123,7 @@ ACE_SPIPE_Stream::send_handle (ACE_HANDLE handle) const return -1; } res = this->send(&protInfo, sizeof(protInfo)); - if (res != sizeof(protInfo)) + if (res != static_cast (sizeof(protInfo))) { if(res != -1) errno = ENXIO; @@ -131,7 +131,7 @@ ACE_SPIPE_Stream::send_handle (ACE_HANDLE handle) const } // This is just for synchronization, we will ignore the data res = this->recv(&procID, sizeof(procID)); - if (res != sizeof(procID)) + if (res != static_cast (sizeof(procID))) { if(res != -1) errno = ENXIO; @@ -165,14 +165,14 @@ ACE_SPIPE_Stream::recv_handle (ACE_HANDLE &handle) const pid_t procID = ACE_OS::getpid(); WSAPROTOCOL_INFO protInfo; ssize_t res = this->send(&procID, sizeof(procID)); - if (res != sizeof(procID)) + if (res != static_cast (sizeof(procID))) { if(res != -1) errno = ENXIO; return -1; } res = this->recv(&protInfo, sizeof(protInfo)); - if (res != sizeof(protInfo)) + if (res != static_cast (sizeof(protInfo))) { if(res != -1) errno = ENXIO; @@ -187,7 +187,7 @@ ACE_SPIPE_Stream::recv_handle (ACE_HANDLE &handle) const // Since it does not matter what the data is, just send something to // synchronize the end of the exchange res = this->send(&procID, sizeof(procID)); - if (res != sizeof(procID)) + if (res != static_cast (sizeof(procID))) { if(res != -1) errno = ENXIO; diff --git a/dep/ACE_wrappers/ace/SString.cpp b/dep/ACE_wrappers/ace/SString.cpp index 6985c076f..5a087e3e0 100644 --- a/dep/ACE_wrappers/ace/SString.cpp +++ b/dep/ACE_wrappers/ace/SString.cpp @@ -1,10 +1,7 @@ -// $Id: SString.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: SString.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $ #include "ace/Malloc_T.h" #include "ace/OS_Memory.h" -#if !defined (ACE_HAS_WINCE) -//# include "ace/Service_Config.h" -#endif /* !ACE_HAS_WINCE */ #include "ace/SString.h" #include "ace/Auto_Ptr.h" #include "ace/OS_NS_string.h" @@ -20,11 +17,6 @@ #endif /* __ACE_INLINE__ */ -ACE_RCSID (ace, - SString, - "SString.cpp,v 4.61 2001/03/04 00:55:30 brunsch Exp") - - // ************************************************************ ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -336,212 +328,6 @@ ACE_SString::substring (size_type offset, // ************************************************************ -ACE_Tokenizer::ACE_Tokenizer (ACE_TCHAR *buffer) - : buffer_ (buffer), - index_ (0), - preserves_index_ (0), - delimiter_index_ (0) -{ -} - -int -ACE_Tokenizer::delimiter (ACE_TCHAR d) -{ - if (delimiter_index_ == MAX_DELIMITERS) - return -1; - - delimiters_[delimiter_index_].delimiter_ = d; - delimiters_[delimiter_index_].replace_ = 0; - delimiter_index_++; - return 0; -} - -int -ACE_Tokenizer::delimiter_replace (ACE_TCHAR d, - ACE_TCHAR replacement) -{ - // Make it possible to replace delimiters on-the-fly, e.g., parse - // string until certain token count and then copy rest of the - // original string. - for (int i = 0; i < delimiter_index_; i++) - if (delimiters_[i].delimiter_ == d) - { - delimiters_[i].replacement_ = replacement; - delimiters_[i].replace_ = 1; - return 0; - } - - if (delimiter_index_ >= MAX_DELIMITERS) - return -1; - - delimiters_[delimiter_index_].delimiter_ = d; - delimiters_[delimiter_index_].replacement_ = replacement; - delimiters_[delimiter_index_].replace_ = 1; - delimiter_index_++; - return 0; -} - -int -ACE_Tokenizer::preserve_designators (ACE_TCHAR start, - ACE_TCHAR stop, - int strip) -{ - if (preserves_index_ == MAX_PRESERVES) - return -1; - - preserves_[preserves_index_].start_ = start; - preserves_[preserves_index_].stop_ = stop; - preserves_[preserves_index_].strip_ = strip; - preserves_index_++; - return 0; -} - -int -ACE_Tokenizer::is_delimiter (ACE_TCHAR d, - int &replace, - ACE_TCHAR &r) -{ - replace = 0; - - for (int x = 0; x < delimiter_index_; x++) - if (delimiters_[x].delimiter_ == d) - { - if (delimiters_[x].replace_) - { - r = delimiters_[x].replacement_; - replace = 1; - } - return 1; - } - - return 0; -} - -int -ACE_Tokenizer::is_preserve_designator (ACE_TCHAR start, - ACE_TCHAR &stop, - int &strip) -{ - for (int x = 0; x < preserves_index_; x++) - if (preserves_[x].start_ == start) - { - stop = preserves_[x].stop_; - strip = preserves_[x].strip_; - return 1; - } - - return 0; -} - -ACE_TCHAR * -ACE_Tokenizer::next (void) -{ - // Check if the previous pass was the last one in the buffer. - if (index_ == -1) - { - index_ = 0; - return 0; - } - - ACE_TCHAR replacement = 0; - int replace; - ACE_TCHAR *next_token; - - // Skip all leading delimiters. - for (;;) - { - // Check for end of string. - if (buffer_[index_] == '\0') - { - // If we hit EOS at the start, return 0. - index_ = 0; - return 0; - } - - if (this->is_delimiter (buffer_[index_], - replace, - replacement)) - index_++; - else - break; - } - - // When we reach this point, buffer_[index_] is a non-delimiter and - // not EOS - the start of our next_token. - next_token = buffer_ + index_; - - // A preserved region is it's own token. - ACE_TCHAR stop; - int strip; - if (this->is_preserve_designator (buffer_[index_], - stop, - strip)) - { - while (++index_) - { - if (buffer_[index_] == '\0') - { - index_ = -1; - goto EXIT_LABEL; - } - - if (buffer_[index_] == stop) - break; - } - - if (strip) - { - // Skip start preserve designator. - next_token += 1; - // Zap the stop preserve designator. - buffer_[index_] = '\0'; - // Increment to the next token. - index_++; - } - - goto EXIT_LABEL; - } - - // Step through finding the next delimiter or EOS. - for (;;) - { - // Advance pointer. - index_++; - - // Check for delimiter. - if (this->is_delimiter (buffer_[index_], - replace, - replacement)) - { - // Replace the delimiter. - if (replace != 0) - buffer_[index_] = replacement; - - // Move the pointer up and return. - index_++; - goto EXIT_LABEL; - } - - // A preserve designator signifies the end of this token. - if (this->is_preserve_designator (buffer_[index_], - stop, - strip)) - goto EXIT_LABEL; - - // Check for end of string. - if (buffer_[index_] == '\0') - { - index_ = -1; - goto EXIT_LABEL; - } - } - -EXIT_LABEL: - return next_token; -} - -// ************************************************************* - #if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) template char ACE_String_Base::NULL_String_; template ACE_WSTRING_TYPE ACE_String_Base::NULL_String_; diff --git a/dep/ACE_wrappers/ace/SString.h b/dep/ACE_wrappers/ace/SString.h index fea86ba17..e7ff8ea78 100644 --- a/dep/ACE_wrappers/ace/SString.h +++ b/dep/ACE_wrappers/ace/SString.h @@ -4,7 +4,7 @@ /** * @file SString.h * - * $Id: SString.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: SString.h 91058 2010-07-12 08:20:09Z johnnyw $ * * @author Douglas C. Schmidt (schmidt@cs.wustl.edu) */ @@ -39,6 +39,12 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL #if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT template class ACE_Export ACE_String_Base; template class ACE_Export ACE_String_Base; + +template class ACE_Export ACE_String_Base_Iterator; +template class ACE_Export ACE_String_Base_Iterator; + +template class ACE_Export ACE_String_Base_Const_Iterator; +template class ACE_Export ACE_String_Base_Const_Iterator; #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */ /** @@ -139,7 +145,7 @@ public: /// Constructor that copies @a s into dynamically allocated memory. ACE_SString (const char *s, ACE_Allocator *alloc = 0); - /// Constructor that copies @a len chars of @s into dynamically + /// Constructor that copies @a len chars of @a s into dynamically /// allocated memory (will NUL terminate the result). ACE_SString (const char *s, size_type len, ACE_Allocator *alloc = 0); @@ -189,14 +195,14 @@ public: /// Get the underlying pointer. const char *fast_rep (void) const; - /// Same as STL String's and . + /// Same as STL String's c_str() and fast_rep(). const char *c_str (void) const; /// Comparison operator that will match substrings. Returns the /// slot of the first location that matches, else @c npos. size_type strstr (const ACE_SString &s) const; - /// Find starting at pos. Returns the slot of the first + /// Find @a str starting at pos. Returns the slot of the first /// location that matches (will be >= pos), else npos. size_type find (const ACE_SString &str, size_type pos = 0) const; @@ -204,11 +210,11 @@ public: /// location that matches (will be >= pos), else npos. size_type find (const char *s, size_type pos = 0) const; - /// Find starting at pos. Returns the slot of the first + /// Find @a c starting at pos. Returns the slot of the first /// location that matches (will be >= pos), else npos. size_type find (char c, size_type pos = 0) const; - /// Find starting at pos (counting from the end). Returns the + /// Find @a c starting at pos (counting from the end). Returns the /// slot of the first location that matches, else npos. size_type rfind (char c, size_type pos = npos) const; @@ -224,7 +230,7 @@ public: /// Inequality comparison operator. bool operator != (const ACE_SString &s) const; - /// Performs a -style comparison. + /// Performs a strcmp()-style comparison. int compare (const ACE_SString &s) const; /// Dump the state of an object. @@ -237,7 +243,7 @@ private: /// Pointer to a memory allocator. ACE_Allocator *allocator_; - /// Length of the ACE_SString (not counting the trailing '\0'). + /// Length of the ACE_SString (not counting the trailing '\\0'). size_type len_; /// Pointer to data. @@ -256,208 +262,6 @@ typedef ACE_WString ACE_TString; typedef ACE_CString ACE_TString; #endif /* ACE_USES_WCHAR */ - -// ************************************************************ - -/** - * @class ACE_Tokenizer - * - * @brief Tokenizer - * - * Tokenizes a buffer. Allows application to set delimiters and - * preserve designators. Does not allow special characters, yet - * (e.g., printf ("\"like a quoted string\"")). - */ -class ACE_Export ACE_Tokenizer -{ -public: - /** - * \a buffer will be parsed. Notice that ACE_Tokenizer will modify - * \a buffer if you use delimiter_replace or - * preserve_designators to do character substitution. - * @note You should NOT pass a constant string or string literal - * to this constructor, since ACE_Tokenizer will try to modify - * the string. - * \sa preserve_designators - * \sa preserve_designators - */ - ACE_Tokenizer (ACE_TCHAR *buffer); - - /** - * \a d is a delimiter. - * \return Returns 0 on success, -1 if there is no memory left. - * - * Example: - * \verbatim - char buf[30]; - ACE_OS::strcpy(buf, "William/Joseph/Hagins"); - - ACE_Tokenizer tok (buf); - tok.delimiter ('/'); - for (char *p = tok.next (); p; p = tok.next ()) - cout << p << endl; - \endverbatim - * - * This will print out: - * \verbatim - William/Joseph/Hagins - Joseph/Hagins - Hagins \endverbatim - */ - int delimiter (ACE_TCHAR d); - - /** - * \a d is a delimiter and, when found, will be replaced by - * \a replacement. - * \return 0 on success, -1 if there is no memory left. - * - * Example: - * \verbatim - char buf[30]; - ACE_OS::strcpy(buf, "William/Joseph/Hagins"); - - ACE_Tokenizer tok (buf); - tok.delimiter_replace ('/', 0); - for (char *p = tok.next (); p; p = tok.next ()) - cout << p << endl; - \endverbatim - * - * This will print out: - * \verbatim - William - Joseph - Hagins \endverbatim - */ - int delimiter_replace (ACE_TCHAR d, ACE_TCHAR replacement); - - /** - * Extract string between a pair of designator characters. - * For instance, quotes, or '(' and ')'. - * \a start specifies the begin designator. - * \a stop specifies the end designator. - * \a strip If \a strip == 1, then the preserve - * designators will be stripped from the tokens returned by next. - * \return 0 on success, -1 if there is no memory left. - * - * Example with strip = 0: - * \verbatim - char buf[30]; - ACE_OS::strcpy(buf, "William(Joseph)Hagins"); - - ACE_Tokenizer tok (buf); - tok.preserve_designators ('(', ')', 0); - for (char *p = tok.next (); p; p = tok.next ()) - cout << p << endl; - \endverbatim - * - * This will print out: - * \verbatim - William(Joseph)Hagins - (Joseph)Hagins - )Hagins \endverbatim - * - * Example with strip = 1: - * \verbatim - char buf[30]; - ACE_OS::strcpy(buf, "William(Joseph)Hagins"); - - ACE_Tokenizer tok (buf); - tok.preserve_designators ('(', ')', 1); - for (char *p = tok.next (); p; p = tok.next ()) - cout << p << endl; - \endverbatim - * - * This will print out: - * \verbatim - William - Joseph - Hagins \endverbatim - */ - int preserve_designators (ACE_TCHAR start, ACE_TCHAR stop, int strip=1); - - /// Returns the next token. - ACE_TCHAR *next (void); - - enum { - MAX_DELIMITERS=16, - MAX_PRESERVES=16 - }; - -protected: - /// Returns 1 if is a delimiter, 0 otherwise. If should be - /// replaced with @a r, is set to 1, otherwise 0. - int is_delimiter (ACE_TCHAR d, int &replace, ACE_TCHAR &r); - - /** - * If is a start preserve designator, returns 1 and sets - * to the stop designator. Returns 0 if is not a - * preserve designator. - */ - int is_preserve_designator (ACE_TCHAR start, ACE_TCHAR &stop, int &strip); - - ACE_TCHAR *buffer_; - int index_; - - /** - * @class Preserve_Entry - * - * @brief Preserve Entry - * - * Defines a set of characters that designate an area that - * should not be parsed, but should be treated as a complete - * token. For instance, in: (this is a preserve region), start - * would be a left paren -(- and stop would be a right paren - * -)-. The strip determines whether the designators should be - * removed from the token. - */ - class Preserve_Entry - { - public: - /** - * E.g., "(". - * E.g., ")". - * Whether the designators should be removed from the token. - */ - ACE_TCHAR start_; - ACE_TCHAR stop_; - int strip_; - }; - - /// The application can specify MAX_PRESERVES preserve designators. - Preserve_Entry preserves_[MAX_PRESERVES]; - - /// Pointer to the next free spot in preserves_. - int preserves_index_; - - /** - * @class Delimiter_Entry - * - * @brief Delimiter Entry - * - * Describes a delimiter for the tokenizer. - */ - class Delimiter_Entry - { - public: - /** - * Most commonly a space ' '. - * What occurrences of delimiter_ should be replaced with. - * Whether replacement_ should be used. This should be replaced - * with a technique that sets replacement_ = delimiter by - * default. I'll do that next iteration. - */ - ACE_TCHAR delimiter_; - ACE_TCHAR replacement_; - int replace_; - }; - - /// The tokenizer allows MAX_DELIMITERS number of delimiters. - Delimiter_Entry delimiters_[MAX_DELIMITERS]; - - /// Pointer to the next free space in delimiters_. - int delimiter_index_; -}; - // **************************************************************** /** diff --git a/dep/ACE_wrappers/ace/SStringfwd.h b/dep/ACE_wrappers/ace/SStringfwd.h index c8c868a43..50f30f69c 100644 --- a/dep/ACE_wrappers/ace/SStringfwd.h +++ b/dep/ACE_wrappers/ace/SStringfwd.h @@ -4,7 +4,7 @@ /** * @file SStringfwd.h * - * $Id: SStringfwd.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: SStringfwd.h 88793 2010-02-01 17:50:34Z cleeland $ * * Forward declarations and typedefs of ACE string types. * @@ -33,7 +33,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -template class ACE_String_Base; // Forward declaration. +template class ACE_String_Base; // Forward declaration. typedef ACE_WCHAR_T ACE_WSTRING_TYPE; diff --git a/dep/ACE_wrappers/ace/SUN_Proactor.cpp b/dep/ACE_wrappers/ace/SUN_Proactor.cpp index a7c125ad3..ae7184494 100644 --- a/dep/ACE_wrappers/ace/SUN_Proactor.cpp +++ b/dep/ACE_wrappers/ace/SUN_Proactor.cpp @@ -1,4 +1,4 @@ -// $Id: SUN_Proactor.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: SUN_Proactor.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/SUN_Proactor.h" @@ -8,12 +8,6 @@ #include "ace/Log_Msg.h" #include "ace/Object_Manager.h" - -ACE_RCSID (ace, - POSIX_CB_Proactor, - "$Id: SUN_Proactor.cpp 80826 2008-03-04 14:51:23Z wotte $") - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_SUN_Proactor::ACE_SUN_Proactor (size_t max_aio_operations) @@ -112,8 +106,8 @@ ACE_SUN_Proactor::handle_events_i (ACE_Time_Value *delta) default: // EFAULT ACE_ERROR_RETURN ((LM_ERROR, - "%N:%l:(%P | %t)::%p \nNumAIO=%d\n", - "ACE_SUN_Proactor::handle_events: aiowait failed", + ACE_TEXT("%N:%l:(%P | %t)::%p \nNumAIO=%d\n"), + ACE_TEXT("ACE_SUN_Proactor::handle_events: aiowait failed"), num_started_aio_), -1); } @@ -202,9 +196,9 @@ ACE_SUN_Proactor::find_completed_aio (aio_result_t *result, transfer_count) == 0) { // should never be ACE_ERROR ((LM_ERROR, - "%N:%l:(%P | %t)::%p\n", - "ACE_SUN_Proactor::find_completed_aio:" - "should never be !!!\n")); + ACE_TEXT("%N:%l:(%P | %t)::%p\n"), + ACE_TEXT("ACE_SUN_Proactor::find_completed_aio:") + ACE_TEXT("should never be !!!\n"))); return 0; } diff --git a/dep/ACE_wrappers/ace/SV_Message.cpp b/dep/ACE_wrappers/ace/SV_Message.cpp index 5334cca6f..4757c03d6 100644 --- a/dep/ACE_wrappers/ace/SV_Message.cpp +++ b/dep/ACE_wrappers/ace/SV_Message.cpp @@ -1,5 +1,5 @@ // SV_Message.cpp -// $Id: SV_Message.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: SV_Message.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/SV_Message.h" @@ -7,7 +7,7 @@ #include "ace/SV_Message.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ace, SV_Message, "$Id: SV_Message.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/SV_Message_Queue.cpp b/dep/ACE_wrappers/ace/SV_Message_Queue.cpp index a1c9d8879..82cd14cc6 100644 --- a/dep/ACE_wrappers/ace/SV_Message_Queue.cpp +++ b/dep/ACE_wrappers/ace/SV_Message_Queue.cpp @@ -1,4 +1,4 @@ -// $Id: SV_Message_Queue.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: SV_Message_Queue.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/SV_Message_Queue.h" #include "ace/Log_Msg.h" @@ -7,7 +7,7 @@ #include "ace/SV_Message_Queue.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ace, SV_Message_Queue, "$Id: SV_Message_Queue.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/SV_Semaphore_Complex.cpp b/dep/ACE_wrappers/ace/SV_Semaphore_Complex.cpp index c88c9dde4..c2f4f94d4 100644 --- a/dep/ACE_wrappers/ace/SV_Semaphore_Complex.cpp +++ b/dep/ACE_wrappers/ace/SV_Semaphore_Complex.cpp @@ -1,5 +1,4 @@ -// SV_Semaphore_Complex.cpp -// $Id: SV_Semaphore_Complex.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: SV_Semaphore_Complex.cpp 91321 2010-08-09 06:38:18Z johnnyw $ #include "ace/SV_Semaphore_Complex.h" #include "ace/Log_Msg.h" @@ -9,8 +8,6 @@ #include "ace/SV_Semaphore_Complex.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ace, SV_Semaphore_Complex, "$Id: SV_Semaphore_Complex.cpp 80826 2008-03-04 14:51:23Z wotte $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_SV_Semaphore_Complex) diff --git a/dep/ACE_wrappers/ace/SV_Semaphore_Simple.cpp b/dep/ACE_wrappers/ace/SV_Semaphore_Simple.cpp index 97395055b..643cbce3c 100644 --- a/dep/ACE_wrappers/ace/SV_Semaphore_Simple.cpp +++ b/dep/ACE_wrappers/ace/SV_Semaphore_Simple.cpp @@ -1,3 +1,5 @@ +// $Id: SV_Semaphore_Simple.cpp 91287 2010-08-05 10:30:49Z johnnyw $ + #include "ace/SV_Semaphore_Simple.h" #include "ace/Log_Msg.h" #include "ace/ACE.h" @@ -7,10 +9,6 @@ #include "ace/SV_Semaphore_Simple.inl" #endif /* !__ACE_INLINE__ */ -ACE_RCSID (ace, - SV_Semaphore_Simple, - "$Id: SV_Semaphore_Simple.cpp 82559 2008-08-07 20:23:07Z parsons $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE (ACE_SV_Semaphore_Simple) @@ -138,15 +136,15 @@ ACE_SV_Semaphore_Simple::name_2_key (const char *name) // Basically "hash" the values in the . This won't // necessarily guarantee uniqueness of all keys. // But (IMHO) CRC32 is good enough for most purposes (Carlos) -#if defined (ACE_WIN64) || defined (ACE_WIN32) +#if defined (ACE_WIN32) && defined (_MSC_VER) // The cast below is legit... # pragma warning(push) # pragma warning(disable : 4312) -#endif /* ACE_WIN64 */ +#endif /* defined (ACE_WIN32) && defined (_MSC_VER) */ return (key_t) ACE::crc32 (name); -#if defined (ACE_WIN64) || defined (ACE_WIN32) +#if defined (ACE_WIN32) && defined (_MSC_VER) # pragma warning(pop) -#endif /* ACE_WIN64 */ +#endif /* defined (ACE_WIN32) && defined (_MSC_VER) */ } // Open or create a ACE_SV_Semaphore. We return 1 if all is OK, else diff --git a/dep/ACE_wrappers/ace/SV_Semaphore_Simple.h b/dep/ACE_wrappers/ace/SV_Semaphore_Simple.h index 5d3695615..4bf2121aa 100644 --- a/dep/ACE_wrappers/ace/SV_Semaphore_Simple.h +++ b/dep/ACE_wrappers/ace/SV_Semaphore_Simple.h @@ -4,7 +4,7 @@ /** * @file SV_Semaphore_Simple.h * - * $Id: SV_Semaphore_Simple.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: SV_Semaphore_Simple.h 86494 2009-08-13 19:09:03Z johnnyw $ * * @author Douglas C. Schmidt */ @@ -29,7 +29,7 @@ #if defined (ACE_WIN32) // Default semaphore key and mutex name # if !defined (ACE_DEFAULT_SEM_KEY) -# define ACE_DEFAULT_SEM_KEY "ACE_SEM_KEY" +# define ACE_DEFAULT_SEM_KEY const_cast ("ACE_SEM_KEY") # endif /* ACE_DEFAULT_SEM_KEY */ #else /* !defined (ACE_WIN32) */ // Default semaphore key diff --git a/dep/ACE_wrappers/ace/SV_Shared_Memory.cpp b/dep/ACE_wrappers/ace/SV_Shared_Memory.cpp index 9db097ca2..406204746 100644 --- a/dep/ACE_wrappers/ace/SV_Shared_Memory.cpp +++ b/dep/ACE_wrappers/ace/SV_Shared_Memory.cpp @@ -1,4 +1,4 @@ -// $Id: SV_Shared_Memory.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: SV_Shared_Memory.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/SV_Shared_Memory.h" #include "ace/Log_Msg.h" @@ -7,7 +7,7 @@ #include "ace/SV_Shared_Memory.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ace, SV_Shared_Memory, "$Id: SV_Shared_Memory.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/Sample_History.cpp b/dep/ACE_wrappers/ace/Sample_History.cpp index 913bbd5f8..78a755870 100644 --- a/dep/ACE_wrappers/ace/Sample_History.cpp +++ b/dep/ACE_wrappers/ace/Sample_History.cpp @@ -1,4 +1,4 @@ -// $Id: Sample_History.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Sample_History.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/Sample_History.h" @@ -10,7 +10,7 @@ #include "ace/Log_Msg.h" #include "ace/OS_Memory.h" -ACE_RCSID(ace, Sample_History, "$Id: Sample_History.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -46,7 +46,7 @@ ACE_Sample_History::dump_samples (const ACE_TCHAR *msg, #ifndef ACE_NLOGGING for (size_t i = 0; i != this->sample_count_; ++i) { - const ACE_UINT64 val = this->samples_[i] / scale_factor; + ACE_UINT64 const val = this->samples_[i] / scale_factor; ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%s: ") ACE_SIZE_T_FORMAT_SPECIFIER diff --git a/dep/ACE_wrappers/ace/Sbrk_Memory_Pool.cpp b/dep/ACE_wrappers/ace/Sbrk_Memory_Pool.cpp index c8c5d3f5a..bee21bdd2 100644 --- a/dep/ACE_wrappers/ace/Sbrk_Memory_Pool.cpp +++ b/dep/ACE_wrappers/ace/Sbrk_Memory_Pool.cpp @@ -1,10 +1,10 @@ -// $Id: Sbrk_Memory_Pool.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Sbrk_Memory_Pool.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/OS_NS_unistd.h" #include "ace/Sbrk_Memory_Pool.h" #include "ace/Log_Msg.h" -ACE_RCSID(ace, Sbrk_Memory_Pool, "$Id: Sbrk_Memory_Pool.cpp 80826 2008-03-04 14:51:23Z wotte $") + #if !defined (ACE_LACKS_SBRK) diff --git a/dep/ACE_wrappers/ace/Sched_Params.cpp b/dep/ACE_wrappers/ace/Sched_Params.cpp index 6584d88db..5002f52a7 100644 --- a/dep/ACE_wrappers/ace/Sched_Params.cpp +++ b/dep/ACE_wrappers/ace/Sched_Params.cpp @@ -3,7 +3,7 @@ /** * @file Sched_Params.cpp * - * $Id: Sched_Params.cpp 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Sched_Params.cpp 91286 2010-08-05 09:04:31Z johnnyw $ * * @author David Levine */ @@ -21,7 +21,7 @@ # include /**/ #endif /* ACE_HAS_PRIOCNTL && ACE_HAS_THREADS */ -ACE_RCSID(ace, Sched_Params, "$Id: Sched_Params.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -115,10 +115,14 @@ ACE_Sched_Params::priority_min (const Policy policy, } } -#elif defined (ACE_HAS_WTHREADS) +#elif defined (ACE_HAS_WTHREADS) && !defined (ACE_HAS_WINCE) ACE_UNUSED_ARG (policy); ACE_UNUSED_ARG (scope); return THREAD_PRIORITY_IDLE; +#elif defined (ACE_HAS_WTHREADS) && defined (ACE_HAS_WINCE) + ACE_UNUSED_ARG (policy); + ACE_UNUSED_ARG (scope); + return 255; #elif defined (ACE_VXWORKS) ACE_UNUSED_ARG (policy); ACE_UNUSED_ARG (scope); @@ -219,10 +223,14 @@ ACE_Sched_Params::priority_max (const Policy policy, } } -#elif defined (ACE_HAS_WTHREADS) +#elif defined (ACE_HAS_WTHREADS) && !defined (ACE_HAS_WINCE) ACE_UNUSED_ARG (policy); ACE_UNUSED_ARG (scope); return THREAD_PRIORITY_TIME_CRITICAL; +#elif defined (ACE_HAS_WTHREADS) && defined (ACE_HAS_WINCE) + ACE_UNUSED_ARG (policy); + ACE_UNUSED_ARG (scope); + return 0; #elif defined (ACE_VXWORKS) ACE_UNUSED_ARG (policy); ACE_UNUSED_ARG (scope); @@ -243,7 +251,7 @@ ACE_Sched_Params::next_priority (const Policy policy, const int priority, const int scope) { -#if defined (ACE_HAS_WTHREADS) +#if defined (ACE_HAS_WTHREADS) && !defined (ACE_HAS_WINCE) ACE_UNUSED_ARG (policy); ACE_UNUSED_ARG (scope); switch (priority) @@ -271,10 +279,9 @@ ACE_Sched_Params::next_priority (const Policy policy, // including STHREADS, and PTHREADS int const max = priority_max (policy, scope); return priority < max ? priority + 1 : max; -#elif defined (ACE_VXWORKS) - return priority > priority_max (policy, scope) - ? priority - 1 - : priority_max (policy, scope); +#elif defined (ACE_VXWORKS) || defined (ACE_HAS_WINCE) + int const max = priority_max (policy, scope); + return priority > max ? priority - 1 : max; #else ACE_UNUSED_ARG (policy); ACE_UNUSED_ARG (scope); @@ -288,7 +295,7 @@ ACE_Sched_Params::previous_priority (const Policy policy, const int priority, const int scope) { -#if defined (ACE_HAS_WTHREADS) +#if defined (ACE_HAS_WTHREADS) && !defined (ACE_HAS_WINCE) ACE_UNUSED_ARG (policy); ACE_UNUSED_ARG (scope); switch (priority) @@ -315,12 +322,10 @@ ACE_Sched_Params::previous_priority (const Policy policy, defined (ACE_HAS_PTHREAD_SCHEDPARAM)) // including STHREADS and PTHREADS int const min = priority_min (policy, scope); - return priority > min ? priority - 1 : min; -#elif defined (ACE_VXWORKS) - return priority < priority_min (policy, scope) - ? priority + 1 - : priority_min (policy, scope); +#elif defined (ACE_VXWORKS) || defined (ACE_HAS_WINCE) + int const min = priority_min (policy, scope); + return priority < min ? priority + 1 : min; #else ACE_UNUSED_ARG (policy); ACE_UNUSED_ARG (scope); diff --git a/dep/ACE_wrappers/ace/Select_Reactor.h b/dep/ACE_wrappers/ace/Select_Reactor.h index fdfd78eb6..d72bf69b3 100644 --- a/dep/ACE_wrappers/ace/Select_Reactor.h +++ b/dep/ACE_wrappers/ace/Select_Reactor.h @@ -4,7 +4,7 @@ /** * @file Select_Reactor.h * - * $Id: Select_Reactor.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Select_Reactor.h 91432 2010-08-23 15:06:31Z mitza $ * * @author Douglas C. Schmidt */ @@ -26,6 +26,10 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL //@@ TAO_REACTOR_SPL_COMMENT_HOOK_START typedef ACE_Reactor_Token_T ACE_Select_Reactor_Token; +#if defined (_MSC_VER) && (_MSC_VER >= 1600) +template class ACE_Export ACE_Select_Reactor_T; +#endif /* _MSC_VER */ + typedef ACE_Select_Reactor_T ACE_Select_Reactor; //@@ TAO_REACTOR_SPL_COMMENT_HOOK_END diff --git a/dep/ACE_wrappers/ace/Select_Reactor_Base.cpp b/dep/ACE_wrappers/ace/Select_Reactor_Base.cpp index 380e9a64b..2165d6e16 100644 --- a/dep/ACE_wrappers/ace/Select_Reactor_Base.cpp +++ b/dep/ACE_wrappers/ace/Select_Reactor_Base.cpp @@ -1,4 +1,4 @@ -// $Id: Select_Reactor_Base.cpp 81153 2008-03-29 08:17:58Z johnnyw $ +// $Id: Select_Reactor_Base.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $ #include "ace/Select_Reactor_Base.h" #include "ace/Reactor.h" @@ -18,11 +18,6 @@ # include #endif /* !ACE_WIN32 */ -ACE_RCSID (ace, - Select_Reactor_Base, - "$Id: Select_Reactor_Base.cpp 81153 2008-03-29 08:17:58Z johnnyw $") - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL template @@ -83,7 +78,7 @@ ACE_Select_Reactor_Handler_Repository::handle_in_range (ACE_HANDLE handle) } int -ACE_Select_Reactor_Handler_Repository::open (size_t size) +ACE_Select_Reactor_Handler_Repository::open (size_type size) { ACE_TRACE ("ACE_Select_Reactor_Handler_Repository::open"); @@ -691,7 +686,9 @@ ACE_Select_Reactor_Notify::notify (ACE_Event_Handler *event_handler, ACE_Event_Handler_var safe_handler (event_handler); if (event_handler) - event_handler->add_reference (); + { + event_handler->add_reference (); + } ACE_Notification_Buffer buffer (event_handler, mask); @@ -718,7 +715,9 @@ ACE_Select_Reactor_Notify::notify (ACE_Event_Handler *event_handler, sizeof buffer, timeout); if (n == -1) - return -1; + { + return -1; + } // No failures. safe_handler.release (); @@ -800,14 +799,9 @@ ACE_Select_Reactor_Notify::dispatch_notify (ACE_Notification_Buffer &buffer) more_messages_queued, next); - if (result == 0) + if (result == 0 || result == -1) { - return 0; - } - - if (result == -1) - { - return -1; + return result; } if(more_messages_queued) @@ -874,6 +868,25 @@ ACE_Select_Reactor_Notify::read_notify_pipe (ACE_HANDLE handle, { ACE_TRACE ("ACE_Select_Reactor_Notify::read_notify_pipe"); + // This is kind of a weird, fragile beast. We first read with a + // regular read. The read side of this socket is non-blocking, so + // the read may end up being short. + // + // If the read is short, then we do a recv_n to insure that we block + // and read the rest of the buffer. + // + // Now, you might be tempted to say, "why don't we just replace the + // first recv with a recv_n?" I was, too. But that doesn't work + // because of how the calling code in handle_input() works. In + // handle_input, the event will only be dispatched if the return + // value from read_notify_pipe() is > 0. That means that we can't + // return zero from this func unless it's an EOF condition. + // + // Thus, the return value semantics for this are: + // -1: nothing read, fatal, unrecoverable error + // 0: nothing read at all + // 1: complete buffer read + ssize_t const n = ACE::recv (handle, (char *) &buffer, sizeof buffer); if (n > 0) @@ -887,9 +900,9 @@ ACE_Select_Reactor_Notify::read_notify_pipe (ACE_HANDLE handle, // doesn't work we're in big trouble since the input stream // won't be aligned correctly. I'm not sure quite what to // do at this point. It's probably best just to return -1. - if (ACE::recv (handle, - ((char *) &buffer) + n, - remainder) != remainder) + if (ACE::recv_n (handle, + ((char *) &buffer) + n, + remainder) != remainder) return -1; } @@ -916,6 +929,9 @@ ACE_Select_Reactor_Notify::handle_input (ACE_HANDLE handle) int result = 0; ACE_Notification_Buffer buffer; + // If there is only one buffer in the pipe, this will loop and call + // read_notify_pipe() twice. The first time will read the buffer, and + // the second will read the fact that the pipe is empty. while ((result = this->read_notify_pipe (handle, buffer)) > 0) { // Dispatch the buffer diff --git a/dep/ACE_wrappers/ace/Select_Reactor_Base.h b/dep/ACE_wrappers/ace/Select_Reactor_Base.h index 085cdb13d..790279162 100644 --- a/dep/ACE_wrappers/ace/Select_Reactor_Base.h +++ b/dep/ACE_wrappers/ace/Select_Reactor_Base.h @@ -4,7 +4,7 @@ /** * @file Select_Reactor_Base.h * - * $Id: Select_Reactor_Base.h 82393 2008-07-23 10:52:34Z johnnyw $ + * $Id: Select_Reactor_Base.h 87252 2009-10-28 20:03:48Z cleeland $ * * @author Douglas C. Schmidt */ @@ -180,6 +180,11 @@ public: /// Read one of the notify call on the @a handle into the /// @a buffer. This could be because of a thread trying to unblock /// the Reactor_Impl + /// + /// Return value semantics for this are: + /// -1: nothing read, fatal, unrecoverable error + /// 0: nothing read at all + /// 1: complete buffer read virtual int read_notify_pipe (ACE_HANDLE handle, ACE_Notification_Buffer &buffer); @@ -502,7 +507,7 @@ protected: /// appropriate point specified by . virtual void renew (void) = 0; - /// Check to see if the associated with @a handle is + /// Check to see if the Event_Handler associated with @a handle is /// suspended. Returns 0 if not, 1 if so. virtual int is_suspended_i (ACE_HANDLE handle) = 0; @@ -554,7 +559,7 @@ protected: /// Restart the event-loop method automatically when /// /. Pass over both the *and* the + * , , or . */ -#if defined (ACE_WIN32) && defined (_WIN32_WCE) -// Something is a bit brain-damaged here and I'm not sure what... this code -// compiled before the OS reorg for ACE 5.4. Since then it hasn't - eVC -// complains that the operators that return ACE_Time_Value are C-linkage -// functions that can't return a C++ class. The only way I've found to -// defeat this is to wrap the whole class in extern "C++". -// - Steve Huston, 23-Aug-2004 -extern "C++" { -#endif - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - class ACE_Export ACE_Time_Value { public: @@ -132,6 +126,17 @@ public: */ unsigned long msec (void) const; + /// Converts from ACE_Time_Value format into milliseconds format. + /** + * @return Sum of second field (in milliseconds) and microsecond field + * (in milliseconds). + * + * @note The semantics of this method differs from the sec() and + * usec() methods. There is no analogous "millisecond" + * component in an ACE_Time_Value. + */ + ACE_UINT64 get_msec () const; + /// Converts from ACE_Time_Value format into milliseconds format. /** * @return Sum of second field (in milliseconds) and microsecond field @@ -140,6 +145,8 @@ public: * @note The semantics of this method differs from the sec() and * usec() methods. There is no analogous "millisecond" * component in an ACE_Time_Value. + * + * @deprecated Use get_msec() instead. */ void msec (ACE_UINT64 &ms) const; @@ -151,9 +158,19 @@ public: * @note The semantics of this method differs from the sec() and * usec() methods. There is no analogous "millisecond" * component in an ACE_Time_Value. + * + * @deprecated Use get_msec() instead. */ void msec (ACE_UINT64 &ms) /* const */; + /// Converts from milli-seconds format into ACE_Time_Value format. + /** + * @note The semantics of this method differs from the sec() and + * usec() methods. There is no analogous "millisecond" + * component in an ACE_Time_Value. + */ + void set_msec (const ACE_UINT64 &ms); + /// Converts from milli-seconds format into ACE_Time_Value format. /** * @note The semantics of this method differs from the sec() and @@ -333,7 +350,7 @@ public: private: /// Put the timevalue into a canonical form. - void normalize (void); + void normalize (bool saturate = false); /// Store the values as a timeval. #if defined (ACE_HAS_TIME_T_LONG_MISMATCH) @@ -355,16 +372,16 @@ private: #endif /* ACE_HAS_TIME_T_LONG_MISMATCH */ }; +#ifdef ACE_HAS_CPP98_IOSTREAMS +extern ACE_Export ostream &operator<<( ostream &o, const ACE_Time_Value &v ); +#endif + ACE_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) #include "ace/Time_Value.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_WIN32) && defined (_WIN32_WCE) -} -#endif - #if defined (__MINGW32__) ACE_BEGIN_VERSIONED_NAMESPACE_DECL // The MingW linker has problems with the exported statics diff --git a/dep/ACE_wrappers/ace/Time_Value.inl b/dep/ACE_wrappers/ace/Time_Value.inl index 274333893..8f7bf23d8 100644 --- a/dep/ACE_wrappers/ace/Time_Value.inl +++ b/dep/ACE_wrappers/ace/Time_Value.inl @@ -1,23 +1,12 @@ // -*- C++ -*- // -// $Id: Time_Value.inl 82610 2008-08-12 19:46:36Z parsons $ +// $Id: Time_Value.inl 90689 2010-06-18 11:14:47Z shuston $ #include "ace/Truncate.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL -#if defined (ACE_WIN32) && defined (_WIN32_WCE) -// Something is a bit brain-damaged here and I'm not sure what... this code -// compiled before the OS reorg for ACE 5.4. Since then it hasn't - eVC -// complains that the operators that return ACE_Time_Value are C-linkage -// functions that can't return a C++ class. The only way I've found to -// defeat this is to wrap the whole class in extern "C++". -// - Steve Huston, 23-Aug-2004 -extern "C++" { -#endif - -// Returns the value of the object as a timeval. - +/// Returns the value of the object as a timeval. ACE_INLINE ACE_Time_Value::operator timeval () const { @@ -69,7 +58,19 @@ ACE_INLINE void ACE_Time_Value::set (time_t sec, suseconds_t usec) { // ACE_OS_TRACE ("ACE_Time_Value::set"); +# if defined (_WIN32_WCE) && (_WIN32_WCE == 0x600) && !defined (_USE_32BIT_TIME_T) && defined (_MSC_VER) + // The WinCE 6.0 SDK ships with a timeval tv_sec member that uses long as type + // not time_t. This resolves in compilation warnings because time_t + // can be 64bit. Disable at this momemt the warning for just this method + // else we get a compile warnings each time this inline file is included + // this file. +# pragma warning (push) +# pragma warning (disable: 4244) +# endif this->tv_.tv_sec = sec; +# if defined (_WIN32_WCE) && (_WIN32_WCE == 0x600) && !defined (_USE_32BIT_TIME_T) && defined (_MSC_VER) +# pragma warning (pop) +# endif this->tv_.tv_usec = usec; #if __GNUC__ if (__builtin_constant_p(sec) && @@ -90,10 +91,9 @@ ACE_Time_Value::set (double d) this->normalize (); } -// Initializes a timespec_t. Note that this approach loses precision -// since it converts the nano-seconds into micro-seconds. But then -// again, do any real systems have nano-second timer precision?! - +/// Initializes a timespec_t. Note that this approach loses precision +/// since it converts the nano-seconds into micro-seconds. But then +/// again, do any real systems have nano-second timer precision?! ACE_INLINE void ACE_Time_Value::set (const timespec_t &tv) { @@ -118,8 +118,7 @@ ACE_Time_Value::ACE_Time_Value (time_t sec, suseconds_t usec) this->set (sec, usec); } -// Returns number of seconds. - +/// Returns number of seconds. ACE_INLINE time_t ACE_Time_Value::sec (void) const { @@ -127,8 +126,7 @@ ACE_Time_Value::sec (void) const return this->tv_.tv_sec; } -// Sets the number of seconds. - +/// Sets the number of seconds. ACE_INLINE void ACE_Time_Value::sec (time_t sec) { @@ -136,8 +134,7 @@ ACE_Time_Value::sec (time_t sec) this->tv_.tv_sec = ACE_Utils::truncate_cast (sec); } -// Converts from Time_Value format into milli-seconds format. - +/// Converts from Time_Value format into milli-seconds format. ACE_INLINE unsigned long ACE_Time_Value::msec (void) const { @@ -150,13 +147,21 @@ ACE_Time_Value::msec (void) const return ACE_Utils::truncate_cast (secs); } +ACE_INLINE ACE_UINT64 +ACE_Time_Value::get_msec () const +{ + // ACE_OS_TRACE ("ACE_Time_Value::get_msec"); + ACE_UINT64 ms = ACE_Utils::truncate_cast (this->tv_.tv_sec); + ms *= 1000; + ms += (this->tv_.tv_usec / 1000); + return ms; +} + ACE_INLINE void ACE_Time_Value::msec (ACE_UINT64 &ms) const { // ACE_OS_TRACE ("ACE_Time_Value::msec"); - ms = ACE_Utils::truncate_cast (this->tv_.tv_sec); - ms *= 1000; - ms += (this->tv_.tv_usec / 1000); + ms = this->get_msec (); } ACE_INLINE void @@ -167,8 +172,18 @@ ACE_Time_Value::msec (ACE_UINT64 &ms) /*const*/ tv->msec (ms); } -// Converts from milli-seconds format into Time_Value format. +ACE_INLINE void +ACE_Time_Value::set_msec (const ACE_UINT64 &ms) +{ + // ACE_OS_TRACE ("ACE_Time_Value::set_msec"); + // Convert millisecond units to seconds; + ACE_UINT64 secs = ms / 1000; + this->tv_.tv_sec = static_cast (secs); + // Convert remainder to microseconds; + this->tv_.tv_usec = static_cast((ms - (secs * 1000)) * 1000); +} +/// Converts from milli-seconds format into Time_Value format. ACE_INLINE void ACE_Time_Value::msec (long milliseconds) { @@ -180,16 +195,14 @@ ACE_Time_Value::msec (long milliseconds) this->tv_.tv_usec = (milliseconds - (secs * 1000)) * 1000; } -// Converts from milli-seconds format into Time_Value format. - +/// Converts from milli-seconds format into Time_Value format. ACE_INLINE void ACE_Time_Value::msec (int milliseconds) { ACE_Time_Value::msec (static_cast (milliseconds)); } -// Returns number of micro-seconds. - +/// Returns number of micro-seconds. ACE_INLINE suseconds_t ACE_Time_Value::usec (void) const { @@ -197,8 +210,7 @@ ACE_Time_Value::usec (void) const return this->tv_.tv_usec; } -// Sets the number of micro-seconds. - +/// Sets the number of micro-seconds. ACE_INLINE void ACE_Time_Value::usec (suseconds_t usec) { @@ -218,7 +230,7 @@ ACE_Time_Value::to_usec (ACE_UINT64 & usec) const usec = ACE_U_LongLong (this->tv_.tv_sec); #else usec = static_cast (this->tv_.tv_sec); -#endif /* ACE_LACKS_LONG_LONG_T */ +#endif /* ACE_LACKS_LONGLONG_T */ usec *= 1000000; usec += this->tv_.tv_usec; } @@ -235,8 +247,7 @@ operator * (const ACE_Time_Value &tv, double d) return ACE_Time_Value (tv) *= d; } -// True if tv1 > tv2. - +/// True if tv1 > tv2. ACE_INLINE bool operator > (const ACE_Time_Value &tv1, const ACE_Time_Value &tv2) @@ -251,8 +262,7 @@ operator > (const ACE_Time_Value &tv1, return 0; } -// True if tv1 >= tv2. - +/// True if tv1 >= tv2. ACE_INLINE bool operator >= (const ACE_Time_Value &tv1, const ACE_Time_Value &tv2) @@ -267,8 +277,7 @@ operator >= (const ACE_Time_Value &tv1, return 0; } -// Returns the value of the object as a timespec_t. - +/// Returns the value of the object as a timespec_t. ACE_INLINE ACE_Time_Value::operator timespec_t () const { @@ -280,8 +289,7 @@ ACE_Time_Value::operator timespec_t () const return tv; } -// Initializes the ACE_Time_Value object from a timespec_t. - +/// Initializes the ACE_Time_Value object from a timespec_t. ACE_INLINE ACE_Time_Value::ACE_Time_Value (const timespec_t &tv) // : tv_ () @@ -290,8 +298,7 @@ ACE_Time_Value::ACE_Time_Value (const timespec_t &tv) this->set (tv); } -// True if tv1 < tv2. - +/// True if tv1 < tv2. ACE_INLINE bool operator < (const ACE_Time_Value &tv1, const ACE_Time_Value &tv2) @@ -300,8 +307,7 @@ operator < (const ACE_Time_Value &tv1, return tv2 > tv1; } -// True if tv1 >= tv2. - +/// True if tv1 >= tv2. ACE_INLINE bool operator <= (const ACE_Time_Value &tv1, const ACE_Time_Value &tv2) @@ -310,8 +316,7 @@ operator <= (const ACE_Time_Value &tv1, return tv2 >= tv1; } -// True if tv1 == tv2. - +/// True if tv1 == tv2. ACE_INLINE bool operator == (const ACE_Time_Value &tv1, const ACE_Time_Value &tv2) @@ -321,8 +326,7 @@ operator == (const ACE_Time_Value &tv1, && tv1.usec () == tv2.usec (); } -// True if tv1 != tv2. - +/// True if tv1 != tv2. ACE_INLINE bool operator != (const ACE_Time_Value &tv1, const ACE_Time_Value &tv2) @@ -331,8 +335,7 @@ operator != (const ACE_Time_Value &tv1, return !(tv1 == tv2); } -// Add TV to this. - +/// Add TV to this. ACE_INLINE ACE_Time_Value & ACE_Time_Value::operator+= (const ACE_Time_Value &tv) { @@ -369,8 +372,7 @@ ACE_Time_Value::operator= (time_t tv) return *this; } -// Subtract TV to this. - +/// Subtract TV to this. ACE_INLINE ACE_Time_Value & ACE_Time_Value::operator-= (const ACE_Time_Value &tv) { @@ -389,8 +391,7 @@ ACE_Time_Value::operator-= (time_t tv) return *this; } -// Adds two ACE_Time_Value objects together, returns the sum. - +/// Adds two ACE_Time_Value objects together, returns the sum. ACE_INLINE ACE_Time_Value operator + (const ACE_Time_Value &tv1, const ACE_Time_Value &tv2) @@ -402,8 +403,7 @@ operator + (const ACE_Time_Value &tv1, return sum; } -// Subtracts two ACE_Time_Value objects, returns the difference. - +/// Subtracts two ACE_Time_Value objects, returns the difference. ACE_INLINE ACE_Time_Value operator - (const ACE_Time_Value &tv1, const ACE_Time_Value &tv2) @@ -415,8 +415,4 @@ operator - (const ACE_Time_Value &tv1, return delta; } -#if defined (ACE_WIN32) && defined (_WIN32_WCE) -} -#endif - ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/Timeprobe.cpp b/dep/ACE_wrappers/ace/Timeprobe.cpp index 1fe8459ed..69a2d0080 100644 --- a/dep/ACE_wrappers/ace/Timeprobe.cpp +++ b/dep/ACE_wrappers/ace/Timeprobe.cpp @@ -1,8 +1,8 @@ -// $Id: Timeprobe.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Timeprobe.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/config-all.h" -ACE_RCSID(ace, Timeprobe, "$Id: Timeprobe.cpp 80826 2008-03-04 14:51:23Z wotte $") + #if defined (ACE_COMPILE_TIMEPROBES) diff --git a/dep/ACE_wrappers/ace/Timer_Hash_T.cpp b/dep/ACE_wrappers/ace/Timer_Hash_T.cpp index 057668063..6b603d218 100644 --- a/dep/ACE_wrappers/ace/Timer_Hash_T.cpp +++ b/dep/ACE_wrappers/ace/Timer_Hash_T.cpp @@ -1,4 +1,4 @@ -// $Id: Timer_Hash_T.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Timer_Hash_T.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $ #ifndef ACE_TIMER_HASH_T_CPP #define ACE_TIMER_HASH_T_CPP @@ -13,10 +13,6 @@ #include "ace/Guard_T.h" #include "ace/Log_Msg.h" -ACE_RCSID(ace, - Timer_Hash_T, - "$Id: Timer_Hash_T.cpp 80826 2008-03-04 14:51:23Z wotte $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL template @@ -823,10 +819,7 @@ ACE_Timer_Hash_T::expire (const ACE_Time_Value { // Make sure that we skip past values that have already // "expired". - do - expired->set_timer_value (expired->get_timer_value () - + expired->get_interval ()); - while (expired->get_timer_value () <= cur_time); + this->recompute_next_abs_interval_time (expired, cur_time); // Since this is an interval timer, we need to // reschedule it. diff --git a/dep/ACE_wrappers/ace/Timer_Heap_T.cpp b/dep/ACE_wrappers/ace/Timer_Heap_T.cpp index 03893dac9..75ec9ef70 100644 --- a/dep/ACE_wrappers/ace/Timer_Heap_T.cpp +++ b/dep/ACE_wrappers/ace/Timer_Heap_T.cpp @@ -1,4 +1,4 @@ -// $Id: Timer_Heap_T.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Timer_Heap_T.cpp 84962 2009-03-24 15:16:25Z johnnyw $ #ifndef ACE_TIMER_HEAP_T_CPP #define ACE_TIMER_HEAP_T_CPP @@ -349,7 +349,7 @@ ACE_Timer_Heap_T::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmin_free_ = %d"), this->timer_ids_min_free_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nheap_ = \n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nheap_ =\n"))); for (size_t i = 0; i < this->cur_size_; ++i) { @@ -359,7 +359,7 @@ ACE_Timer_Heap_T::dump (void) const this->heap_[i]->dump (); } - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntimer_ids_ = \n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntimer_ids_ =\n"))); for (size_t j = 0; j < this->max_size_; ++j) ACE_DEBUG ((LM_DEBUG, @@ -688,7 +688,7 @@ ACE_Timer_Heap_T::schedule_i ( if ((this->cur_size_ + this->cur_limbo_) < this->max_size_) { // Obtain the next unique sequence number. - long timer_id = this->timer_id (); + long const timer_id = this->timer_id (); // Obtain the memory to the new node. ACE_Timer_Node_T *temp = 0; diff --git a/dep/ACE_wrappers/ace/Timer_Heap_T.h b/dep/ACE_wrappers/ace/Timer_Heap_T.h index ac21a487f..d6a6221ae 100644 --- a/dep/ACE_wrappers/ace/Timer_Heap_T.h +++ b/dep/ACE_wrappers/ace/Timer_Heap_T.h @@ -4,7 +4,7 @@ /** * @file Timer_Heap_T.h * - * $Id: Timer_Heap_T.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Timer_Heap_T.h 84619 2009-02-26 12:26:16Z johnnyw $ * * @author Douglas C. Schmidt */ @@ -143,7 +143,7 @@ public: /** * Cancel all timers associated with @a type. If @a dont_call_handle_close - * is 0then the will be invoked. Returns number of timers + * is 0 then the will be invoked. Returns number of timers * cancelled. */ virtual int cancel (const TYPE &type, diff --git a/dep/ACE_wrappers/ace/Timer_List_T.cpp b/dep/ACE_wrappers/ace/Timer_List_T.cpp index c3b837bb2..3e4ba78f5 100644 --- a/dep/ACE_wrappers/ace/Timer_List_T.cpp +++ b/dep/ACE_wrappers/ace/Timer_List_T.cpp @@ -1,4 +1,4 @@ -// $Id: Timer_List_T.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Timer_List_T.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #ifndef ACE_TIMER_LIST_T_C #define ACE_TIMER_LIST_T_C @@ -11,7 +11,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -ACE_RCSID(ace, Timer_List_T, "$Id: Timer_List_T.cpp 80826 2008-03-04 14:51:23Z wotte $") + // Default Constructor diff --git a/dep/ACE_wrappers/ace/Timer_Queue_Adapters.cpp b/dep/ACE_wrappers/ace/Timer_Queue_Adapters.cpp index f6519ae9e..54e8f8ade 100644 --- a/dep/ACE_wrappers/ace/Timer_Queue_Adapters.cpp +++ b/dep/ACE_wrappers/ace/Timer_Queue_Adapters.cpp @@ -1,4 +1,4 @@ -// $Id: Timer_Queue_Adapters.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Timer_Queue_Adapters.cpp 89482 2010-03-15 07:58:50Z johnnyw $ #ifndef ACE_TIMER_QUEUE_ADAPTERS_CPP #define ACE_TIMER_QUEUE_ADAPTERS_CPP @@ -23,14 +23,14 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -template TQ & -ACE_Async_Timer_Queue_Adapter::timer_queue (void) +template TQ & +ACE_Async_Timer_Queue_Adapter::timer_queue (void) { return this->timer_queue_; } -template int -ACE_Async_Timer_Queue_Adapter::cancel (long timer_id, +template int +ACE_Async_Timer_Queue_Adapter::cancel (long timer_id, const void **act) { // Block designated signals. @@ -40,8 +40,8 @@ ACE_Async_Timer_Queue_Adapter::cancel (long timer_id, return this->timer_queue_.cancel (timer_id, act); } -template int -ACE_Async_Timer_Queue_Adapter::expire (void) +template int +ACE_Async_Timer_Queue_Adapter::expire (void) { // Block designated signals. ACE_Sig_Guard sg (&this->mask_); @@ -50,8 +50,8 @@ ACE_Async_Timer_Queue_Adapter::expire (void) return this->timer_queue_.expire (); } -template int -ACE_Async_Timer_Queue_Adapter::schedule_ualarm (void) +template int +ACE_Async_Timer_Queue_Adapter::schedule_ualarm (void) { ACE_Time_Value tv = this->timer_queue_.earliest_time () - this->timer_queue_.gettimeofday (); @@ -68,8 +68,8 @@ ACE_Async_Timer_Queue_Adapter::schedule_ualarm (void) return 0; } -template long -ACE_Async_Timer_Queue_Adapter::schedule (ACE_Event_Handler *eh, +template long +ACE_Async_Timer_Queue_Adapter::schedule (TYPE eh, const void *act, const ACE_Time_Value &future_time, const ACE_Time_Value &interval) @@ -96,8 +96,8 @@ ACE_Async_Timer_Queue_Adapter::schedule (ACE_Event_Handler *eh, return tid; } -template -ACE_Async_Timer_Queue_Adapter::ACE_Async_Timer_Queue_Adapter (ACE_Sig_Set *mask) +template +ACE_Async_Timer_Queue_Adapter::ACE_Async_Timer_Queue_Adapter (ACE_Sig_Set *mask) // If == 0, block *all* signals when the SIGARLM handler is // running, else just block those in the mask. : mask_ (mask) @@ -120,8 +120,8 @@ ACE_Async_Timer_Queue_Adapter::ACE_Async_Timer_Queue_Adapter (ACE_Sig_Set *m // list. It gets invoked asynchronously when the SIGALRM signal // occurs. -template int -ACE_Async_Timer_Queue_Adapter::handle_signal (int signum, +template int +ACE_Async_Timer_Queue_Adapter::handle_signal (int signum, siginfo_t *, ucontext_t *) { @@ -154,8 +154,8 @@ ACE_Async_Timer_Queue_Adapter::handle_signal (int signum, } } -template -ACE_Thread_Timer_Queue_Adapter::ACE_Thread_Timer_Queue_Adapter (ACE_Thread_Manager *tm, +template +ACE_Thread_Timer_Queue_Adapter::ACE_Thread_Timer_Queue_Adapter (ACE_Thread_Manager *tm, TQ* timer_queue) : ACE_Task_Base (tm), timer_queue_(timer_queue), @@ -172,8 +172,8 @@ ACE_Thread_Timer_Queue_Adapter::ACE_Thread_Timer_Queue_Adapter (ACE_Thread_M } } -template -ACE_Thread_Timer_Queue_Adapter::~ACE_Thread_Timer_Queue_Adapter (void) +template +ACE_Thread_Timer_Queue_Adapter::~ACE_Thread_Timer_Queue_Adapter (void) { if (this->delete_timer_queue_) { @@ -183,15 +183,15 @@ ACE_Thread_Timer_Queue_Adapter::~ACE_Thread_Timer_Queue_Adapter (void) } } -template ACE_SYNCH_RECURSIVE_MUTEX & -ACE_Thread_Timer_Queue_Adapter::mutex (void) +template ACE_SYNCH_RECURSIVE_MUTEX & +ACE_Thread_Timer_Queue_Adapter::mutex (void) { return this->mutex_; } -template long -ACE_Thread_Timer_Queue_Adapter::schedule - (ACE_Event_Handler* handler, +template long +ACE_Thread_Timer_Queue_Adapter::schedule + (TYPE handler, const void *act, const ACE_Time_Value &future_time, const ACE_Time_Value &interval) @@ -203,8 +203,8 @@ ACE_Thread_Timer_Queue_Adapter::schedule return result; } -template int -ACE_Thread_Timer_Queue_Adapter::cancel (long timer_id, +template int +ACE_Thread_Timer_Queue_Adapter::cancel (long timer_id, const void **act) { ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mutex_, -1); @@ -214,8 +214,8 @@ ACE_Thread_Timer_Queue_Adapter::cancel (long timer_id, return result; } -template void -ACE_Thread_Timer_Queue_Adapter::deactivate (void) +template void +ACE_Thread_Timer_Queue_Adapter::deactivate (void) { ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mutex_); @@ -223,8 +223,8 @@ ACE_Thread_Timer_Queue_Adapter::deactivate (void) this->condition_.signal (); } -template int -ACE_Thread_Timer_Queue_Adapter::svc (void) +template int +ACE_Thread_Timer_Queue_Adapter::svc (void) { ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mutex_, -1); @@ -290,8 +290,8 @@ ACE_Thread_Timer_Queue_Adapter::svc (void) return 0; } -template int -ACE_Thread_Timer_Queue_Adapter::activate (long flags, +template int +ACE_Thread_Timer_Queue_Adapter::activate (long flags, int , int , long priority, @@ -320,14 +320,14 @@ ACE_Thread_Timer_Queue_Adapter::activate (long flags, // or cancelling timers on platforms where the timer queue mutex is not // recursive. -template int -ACE_Thread_Timer_Queue_Adapter::enqueue_command (ACE_Command_Base *cmd, +template int +ACE_Thread_Timer_Queue_Adapter::enqueue_command (ACE_Command_Base *cmd, COMMAND_ENQUEUE_POSITION pos) { // Serialize access to the command queue. ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, this->command_mutex_, -1); - if (pos == ACE_Thread_Timer_Queue_Adapter::TAIL) + if (pos == ACE_Thread_Timer_Queue_Adapter::TAIL) return command_queue_.enqueue_tail (cmd); else return command_queue_.enqueue_head (cmd); @@ -336,8 +336,8 @@ ACE_Thread_Timer_Queue_Adapter::enqueue_command (ACE_Command_Base *cmd, // Dispatches all command objects enqueued in the most recent event // handler context. -template int -ACE_Thread_Timer_Queue_Adapter::dispatch_commands (void) +template int +ACE_Thread_Timer_Queue_Adapter::dispatch_commands (void) { // Serialize access to the command queue. ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, this->command_mutex_, -1); diff --git a/dep/ACE_wrappers/ace/Timer_Queue_Adapters.h b/dep/ACE_wrappers/ace/Timer_Queue_Adapters.h index e6ef944ea..d55617171 100644 --- a/dep/ACE_wrappers/ace/Timer_Queue_Adapters.h +++ b/dep/ACE_wrappers/ace/Timer_Queue_Adapters.h @@ -4,7 +4,7 @@ /** * @file Timer_Queue_Adapters.h * - * $Id: Timer_Queue_Adapters.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Timer_Queue_Adapters.h 89482 2010-03-15 07:58:50Z johnnyw $ * * @author Douglas C. Schmidt and * Carlos O'Ryan @@ -49,7 +49,7 @@ class ACE_Sig_Set; * * @todo This adapter does not automatically reschedule repeating timers. */ -template +template class ACE_Async_Timer_Queue_Adapter : public ACE_Event_Handler { public: @@ -70,7 +70,7 @@ public: * calling expire(). Note that interval timers are not implemented * yet. */ - long schedule (ACE_Event_Handler *type, + long schedule (TYPE type, const void *act, const ACE_Time_Value &future_time, const ACE_Time_Value &interval = ACE_Time_Value::zero); @@ -119,7 +119,7 @@ private: * use. * */ -template +template class ACE_Thread_Timer_Queue_Adapter : public ACE_Task_Base { public: @@ -145,7 +145,7 @@ public: /// Schedule the timer according to the semantics of the ; wakes /// up the dispatching thread. - long schedule (ACE_Event_Handler *handler, + long schedule (TYPE handler, const void *act, const ACE_Time_Value &future_time, const ACE_Time_Value &interval = ACE_Time_Value::zero); diff --git a/dep/ACE_wrappers/ace/Timer_Queue_Adapters.inl b/dep/ACE_wrappers/ace/Timer_Queue_Adapters.inl index 77011eacf..d73ef0242 100644 --- a/dep/ACE_wrappers/ace/Timer_Queue_Adapters.inl +++ b/dep/ACE_wrappers/ace/Timer_Queue_Adapters.inl @@ -1,17 +1,17 @@ // -*- C++ -*- // -// $Id: Timer_Queue_Adapters.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Timer_Queue_Adapters.inl 89482 2010-03-15 07:58:50Z johnnyw $ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -template ACE_INLINE TQ * -ACE_Thread_Timer_Queue_Adapter::timer_queue (void) const +template ACE_INLINE TQ * +ACE_Thread_Timer_Queue_Adapter::timer_queue (void) const { return this->timer_queue_; } -template ACE_INLINE int -ACE_Thread_Timer_Queue_Adapter::timer_queue (TQ *tq) +template ACE_INLINE int +ACE_Thread_Timer_Queue_Adapter::timer_queue (TQ *tq) { if (this->delete_timer_queue_) delete this->timer_queue_; @@ -20,8 +20,8 @@ ACE_Thread_Timer_Queue_Adapter::timer_queue (TQ *tq) return 0; } -template ACE_INLINE ACE_thread_t -ACE_Thread_Timer_Queue_Adapter::thr_id (void) const +template ACE_INLINE ACE_thread_t +ACE_Thread_Timer_Queue_Adapter::thr_id (void) const { return this->thr_id_; } diff --git a/dep/ACE_wrappers/ace/Timer_Queue_T.cpp b/dep/ACE_wrappers/ace/Timer_Queue_T.cpp index 58fbf9ad3..258e68edd 100644 --- a/dep/ACE_wrappers/ace/Timer_Queue_T.cpp +++ b/dep/ACE_wrappers/ace/Timer_Queue_T.cpp @@ -1,4 +1,4 @@ -// $Id: Timer_Queue_T.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Timer_Queue_T.cpp 89254 2010-02-25 22:10:39Z cleeland $ #ifndef ACE_TIMER_QUEUE_T_CPP #define ACE_TIMER_QUEUE_T_CPP @@ -166,7 +166,7 @@ ACE_Timer_Queue_T::dump (void) const template ACE_Timer_Queue_T::ACE_Timer_Queue_T (FUNCTOR *upcall_functor, - ACE_Free_List > *freelist) + ACE_Free_List > *freelist) : gettimeofday_ (ACE_OS::gettimeofday), delete_upcall_functor_ (upcall_functor == 0), delete_free_list_ (freelist == 0), @@ -283,6 +283,66 @@ ACE_Timer_Queue_T::expire (const ACE_Time_Value &cur_ti return number_of_timers_expired; } +template void +ACE_Timer_Queue_T::recompute_next_abs_interval_time + (ACE_Timer_Node_T *expired, + const ACE_Time_Value &cur_time) +{ + if ( expired->get_timer_value () <= cur_time ) + { + /* + * Somehow the current time is past when this time was + * supposed to expire (e.g., timer took too long, + * somebody changed system time, etc.). There used to + * be a simple loop here that skipped ahead one timer + * interval at a time, but that was horribly inefficient + * (an O(n) algorithm) when the timer duration was small + * relative to the amount of time skipped. + * + * So, we replace the loop with a simple computation, + * which also happens to be O(1). All times get + * normalized in the computation to microseconds. + * + * For reference, the loop looked like this: + * + * do + * expired->set_timer_value (expired->get_timer_value () + + * expired->get_interval ()); + * while (expired->get_timer_value () <= cur_time); + * + */ + + // Compute the duration of the timer's interval + ACE_UINT64 interval_usec; + expired->get_interval ().to_usec (interval_usec); + + // Compute the span between the current time and when + // the timer would have expired in the past (and + // normalize to microseconds). + ACE_Time_Value old_diff = cur_time - expired->get_timer_value (); + ACE_UINT64 old_diff_usec; + old_diff.to_usec (old_diff_usec); + + // Compute the delta time in the future when the timer + // should fire as if it had advanced incrementally. The + // modulo arithmetic accomodates the likely case that + // the current time doesn't fall precisely on a timer + // firing interval. + ACE_UINT64 new_timer_usec = + interval_usec - (old_diff_usec % interval_usec); + + // Compute the absolute time in the future when this + // interval timer should expire. + ACE_Time_Value new_timer_value + (cur_time.sec () + + static_cast(new_timer_usec / ACE_ONE_SECOND_IN_USECS), + cur_time.usec () + + static_cast(new_timer_usec % ACE_ONE_SECOND_IN_USECS)); + + expired->set_timer_value (new_timer_value); + } +} + template int ACE_Timer_Queue_T::dispatch_info_i (const ACE_Time_Value &cur_time, ACE_Timer_Node_Dispatch_Info_T &info) @@ -306,10 +366,7 @@ ACE_Timer_Queue_T::dispatch_info_i (const ACE_Time_Valu { // Make sure that we skip past values that have already // "expired". - do - expired->set_timer_value (expired->get_timer_value () + - expired->get_interval ()); - while (expired->get_timer_value () <= cur_time); + this->recompute_next_abs_interval_time (expired, cur_time); // Since this is an interval timer, we need to reschedule // it. diff --git a/dep/ACE_wrappers/ace/Timer_Queue_T.h b/dep/ACE_wrappers/ace/Timer_Queue_T.h index 591109c17..5e316e1e0 100644 --- a/dep/ACE_wrappers/ace/Timer_Queue_T.h +++ b/dep/ACE_wrappers/ace/Timer_Queue_T.h @@ -4,7 +4,7 @@ /** * @file Timer_Queue_T.h * - * $Id: Timer_Queue_T.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Timer_Queue_T.h 89254 2010-02-25 22:10:39Z cleeland $ * * @author Doug Schmidt * @author Irfan Pyarali and @@ -431,6 +431,10 @@ protected: virtual int dispatch_info_i (const ACE_Time_Value ¤t_time, ACE_Timer_Node_Dispatch_Info_T &info); + /// Recompute when the next time is that this interval timer should fire. + void recompute_next_abs_interval_time (ACE_Timer_Node_T* expired, + const ACE_Time_Value &cur_time); + /// Synchronization variable for ACE_Timer_Queue. /// @note The right name would be lock_, but HP/C++ will choke on that! ACE_LOCK mutex_; diff --git a/dep/ACE_wrappers/ace/Timer_Wheel_T.cpp b/dep/ACE_wrappers/ace/Timer_Wheel_T.cpp index f62ca7523..529cc456d 100644 --- a/dep/ACE_wrappers/ace/Timer_Wheel_T.cpp +++ b/dep/ACE_wrappers/ace/Timer_Wheel_T.cpp @@ -1,4 +1,4 @@ -// $Id: Timer_Wheel_T.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Timer_Wheel_T.cpp 89254 2010-02-25 22:10:39Z cleeland $ #ifndef ACE_TIMER_WHEEL_T_CPP #define ACE_TIMER_WHEEL_T_CPP @@ -148,7 +148,7 @@ ACE_Timer_Wheel_T::open_i this->free_list_->resize (prealloc + this->spoke_count_); - this->wheel_time_.msec (1 << (this->res_bits_ + this->spoke_bits_)); + this->wheel_time_.msec (1 << (this->res_bits_)); ACE_NEW (this->spokes_, ACE_Timer_Node_T* [this->spoke_count_]); @@ -699,7 +699,7 @@ ACE_Timer_Wheel_T::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nresolution_ = %d"), 1 << this->res_bits_)); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("\nwheel_ = \n"))); + ACE_TEXT ("\nwheel_ =\n"))); for (u_int i = 0; i < this->spoke_count_; ++i) { @@ -834,10 +834,7 @@ ACE_Timer_Wheel_T::expire (const ACE_Time_Value& cur_ti { // Make sure that we skip past values that have already // "expired". - do - n->set_timer_value (n->get_timer_value () + - n->get_interval ()); - while (n->get_timer_value () <= cur_time); + this->recompute_next_abs_interval_time (n, cur_time); this->reschedule (n); } diff --git a/dep/ACE_wrappers/ace/Timer_Wheel_T.h b/dep/ACE_wrappers/ace/Timer_Wheel_T.h index 44fffed13..266099f2e 100644 --- a/dep/ACE_wrappers/ace/Timer_Wheel_T.h +++ b/dep/ACE_wrappers/ace/Timer_Wheel_T.h @@ -4,7 +4,7 @@ /** * @file Timer_Wheel_T.h * - * $Id: Timer_Wheel_T.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Timer_Wheel_T.h 84619 2009-02-26 12:26:16Z johnnyw $ * * @author Darrell Brunsch */ @@ -126,8 +126,8 @@ public: virtual int reset_interval (long timer_id, const ACE_Time_Value& interval); - /// Cancel all timer associated with @a type. If is 0 - /// then the will be invoked. Returns number of timers + /// Cancel all timer associated with @a type. If @a dont_call_handle_close is + /// 0 then the will be invoked. Returns number of timers /// cancelled. virtual int cancel (const TYPE& type, int dont_call_handle_close = 1); diff --git a/dep/ACE_wrappers/ace/Token.cpp b/dep/ACE_wrappers/ace/Token.cpp index ca2aea12f..c63370fa5 100644 --- a/dep/ACE_wrappers/ace/Token.cpp +++ b/dep/ACE_wrappers/ace/Token.cpp @@ -1,4 +1,4 @@ -// $Id: Token.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Token.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/Token.h" @@ -6,7 +6,7 @@ # include "ace/Token.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ace, Token, "$Id: Token.cpp 80826 2008-03-04 14:51:23Z wotte $") + #if defined (ACE_HAS_THREADS) @@ -216,7 +216,7 @@ ACE_Token::shared_acquire (void (*sleep_hook_func)(void *), } // Do a quick check for "polling" behavior. - if (timeout != 0 && timeout->sec () == 0 && timeout->usec () == 0) + if (timeout != 0 && *timeout == ACE_Time_Value::zero) { errno = ETIME; return -1; diff --git a/dep/ACE_wrappers/ace/Token.h b/dep/ACE_wrappers/ace/Token.h index f46726aa6..7857c44df 100644 --- a/dep/ACE_wrappers/ace/Token.h +++ b/dep/ACE_wrappers/ace/Token.h @@ -4,7 +4,7 @@ /** * @file Token.h * - * $Id: Token.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Token.h 85367 2009-05-18 10:11:54Z johnnyw $ * * @author Original author * @author Karl-Heinz Dorn (kdorn@erlh.siemens.de) @@ -29,10 +29,10 @@ #include "ace/Thread_Mutex.h" -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || defined (ACE_HAS_VXTHREADS) +#if (defined (ACE_WIN32) && !defined (ACE_USES_WINCE_SEMA_SIMULATION)) || defined (ACE_HAS_VXTHREADS) // If platforms support semaphores with timed wait, then we use semaphores instead of c.v. # define ACE_TOKEN_USES_SEMAPHORE -#endif /* (ACE_WIN32 && !ACE_HAS_WINCE) || VXWORKS */ +#endif /* ACE_WIN32 || ACE_HAS_VXTHREADS */ #if defined (ACE_TOKEN_USES_SEMAPHORE) # include "ace/Semaphore.h" diff --git a/dep/ACE_wrappers/ace/Token_Collection.cpp b/dep/ACE_wrappers/ace/Token_Collection.cpp index 23a5813c9..4e124b892 100644 --- a/dep/ACE_wrappers/ace/Token_Collection.cpp +++ b/dep/ACE_wrappers/ace/Token_Collection.cpp @@ -1,3 +1,4 @@ +// $Id: Token_Collection.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $ #include "ace/Token_Collection.h" #if defined (ACE_HAS_TOKENS_LIBRARY) @@ -7,10 +8,6 @@ #endif /* __ACE_INLINE__ */ -ACE_RCSID (ace, - Token_Collection, - "$Id: Token_Collection.cpp 80826 2008-03-04 14:51:23Z wotte $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_Token_Collection::ACE_Token_Collection (bool debug, diff --git a/dep/ACE_wrappers/ace/Token_Invariants.cpp b/dep/ACE_wrappers/ace/Token_Invariants.cpp index 6c5d1bd52..11d29fb1f 100644 --- a/dep/ACE_wrappers/ace/Token_Invariants.cpp +++ b/dep/ACE_wrappers/ace/Token_Invariants.cpp @@ -1,12 +1,11 @@ +// $Id: Token_Invariants.cpp 91287 2010-08-05 10:30:49Z johnnyw $ + #include "ace/Token_Invariants.h" #if defined (ACE_HAS_TOKENS_LIBRARY) #include "ace/Object_Manager.h" - -ACE_RCSID (ace, - Token_Invariants, - "$Id: Token_Invariants.cpp 80826 2008-03-04 14:51:23Z wotte $") +#include "ace/os_include/os_typeinfo.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -31,7 +30,7 @@ ACE_Token_Invariant_Manager::instance (void) ACE_Token_Invariant_Manager, 0); // Register for destruction with ACE_Object_Manager. - ACE_Object_Manager::at_exit (instance_); + ACE_Object_Manager::at_exit (instance_, 0, typeid (instance_).name ()); } } diff --git a/dep/ACE_wrappers/ace/Token_Manager.cpp b/dep/ACE_wrappers/ace/Token_Manager.cpp index 22b6e9f9e..7492b675d 100644 --- a/dep/ACE_wrappers/ace/Token_Manager.cpp +++ b/dep/ACE_wrappers/ace/Token_Manager.cpp @@ -1,17 +1,16 @@ +// $Id: Token_Manager.cpp 91287 2010-08-05 10:30:49Z johnnyw $ + #include "ace/Token_Manager.h" #if defined (ACE_HAS_TOKENS_LIBRARY) #include "ace/Object_Manager.h" +#include "ace/os_include/os_typeinfo.h" #if !defined (__ACE_INLINE__) #include "ace/Token_Manager.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (ace, - Token_Manager, - "$Id: Token_Manager.cpp 80826 2008-03-04 14:51:23Z wotte $") - ACE_BEGIN_VERSIONED_NAMESPACE_DECL // singleton token manager @@ -61,7 +60,7 @@ ACE_Token_Manager::instance (void) ACE_Token_Manager, 0); // Register for destruction with ACE_Object_Manager. - ACE_Object_Manager::at_exit (token_manager_); + ACE_Object_Manager::at_exit (token_manager_, 0, typeid (token_manager_).name ()); } } diff --git a/dep/ACE_wrappers/ace/Token_Request_Reply.cpp b/dep/ACE_wrappers/ace/Token_Request_Reply.cpp index 598afe013..6d842ed2b 100644 --- a/dep/ACE_wrappers/ace/Token_Request_Reply.cpp +++ b/dep/ACE_wrappers/ace/Token_Request_Reply.cpp @@ -1,4 +1,4 @@ -// $Id: Token_Request_Reply.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Token_Request_Reply.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/Token_Request_Reply.h" @@ -8,7 +8,7 @@ #include "ace/Token_Request_Reply.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ace, Token_Request_Reply, "$Id: Token_Request_Reply.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/Tokenizer_T.cpp b/dep/ACE_wrappers/ace/Tokenizer_T.cpp new file mode 100644 index 000000000..00aa2abdc --- /dev/null +++ b/dep/ACE_wrappers/ace/Tokenizer_T.cpp @@ -0,0 +1,242 @@ +// $Id: Tokenizer_T.cpp 88793 2010-02-01 17:50:34Z cleeland $ + +#ifndef ACE_TOKENIZER_T_CPP +#define ACE_TOKENIZER_T_CPP + +#include "ace/ACE.h" +#include "ace/Malloc_Base.h" +#include "ace/String_Base.h" +#include "ace/Auto_Ptr.h" +#include "ace/OS_NS_string.h" + +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + +template +ACE_Tokenizer_T::ACE_Tokenizer_T (ACE_CHAR_T *buffer) + : buffer_ (buffer), + index_ (0), + preserves_index_ (0), + delimiter_index_ (0) +{ +} + +template +int +ACE_Tokenizer_T::delimiter (ACE_CHAR_T d) +{ + if (delimiter_index_ == MAX_DELIMITERS) + return -1; + + delimiters_[delimiter_index_].delimiter_ = d; + delimiters_[delimiter_index_].replace_ = 0; + ++delimiter_index_; + return 0; +} + +template +int +ACE_Tokenizer_T::delimiter_replace (ACE_CHAR_T d, + ACE_CHAR_T replacement) +{ + // Make it possible to replace delimiters on-the-fly, e.g., parse + // string until certain token count and then copy rest of the + // original string. + for (int i = 0; i < delimiter_index_; i++) + if (delimiters_[i].delimiter_ == d) + { + delimiters_[i].replacement_ = replacement; + delimiters_[i].replace_ = 1; + return 0; + } + + if (delimiter_index_ >= MAX_DELIMITERS) + return -1; + + delimiters_[delimiter_index_].delimiter_ = d; + delimiters_[delimiter_index_].replacement_ = replacement; + delimiters_[delimiter_index_].replace_ = 1; + ++delimiter_index_; + return 0; +} + +template +int +ACE_Tokenizer_T::preserve_designators (ACE_CHAR_T start, + ACE_CHAR_T stop, + int strip) +{ + if (preserves_index_ == MAX_PRESERVES) + return -1; + + preserves_[preserves_index_].start_ = start; + preserves_[preserves_index_].stop_ = stop; + preserves_[preserves_index_].strip_ = strip; + ++preserves_index_; + return 0; +} + +template +int +ACE_Tokenizer_T::is_delimiter (ACE_CHAR_T d, + int &replace, + ACE_CHAR_T &r) +{ + replace = 0; + + for (int x = 0; x < delimiter_index_; x++) + if (delimiters_[x].delimiter_ == d) + { + if (delimiters_[x].replace_) + { + r = delimiters_[x].replacement_; + replace = 1; + } + return 1; + } + + return 0; +} + +template +int +ACE_Tokenizer_T::is_preserve_designator (ACE_CHAR_T start, + ACE_CHAR_T &stop, + int &strip) +{ + for (int x = 0; x < preserves_index_; x++) + if (preserves_[x].start_ == start) + { + stop = preserves_[x].stop_; + strip = preserves_[x].strip_; + return 1; + } + + return 0; +} + +template +ACE_CHAR_T * +ACE_Tokenizer_T::next (void) +{ + // Check if the previous pass was the last one in the buffer. + if (index_ == -1) + { + index_ = 0; + return 0; + } + + // Check if a buffer has been passed + if (!buffer_) + { + return 0; + } + + ACE_CHAR_T replacement = 0; + int replace; + ACE_CHAR_T *next_token = 0; + + // Skip all leading delimiters. + for (;;) + { + // Check for end of string. + if (buffer_[index_] == '\0') + { + // If we hit EOS at the start, return 0. + index_ = 0; + return 0; + } + + if (this->is_delimiter (buffer_[index_], + replace, + replacement)) + ++index_; + else + break; + } + + // When we reach this point, buffer_[index_] is a non-delimiter and + // not EOS - the start of our next_token. + next_token = buffer_ + index_; + + // A preserved region is it's own token. + ACE_CHAR_T stop; + int strip; + if (this->is_preserve_designator (buffer_[index_], + stop, + strip)) + { + while (++index_) + { + if (buffer_[index_] == '\0') + { + index_ = -1; + goto EXIT_LABEL; + } + + if (buffer_[index_] == stop) + break; + } + + if (strip) + { + // Skip start preserve designator. + next_token += 1; + // Zap the stop preserve designator. + buffer_[index_] = '\0'; + // Increment to the next token. + ++index_; + } + + goto EXIT_LABEL; + } + + // Step through finding the next delimiter or EOS. + for (;;) + { + // Advance pointer. + ++index_; + + // Check for delimiter. + if (this->is_delimiter (buffer_[index_], + replace, + replacement)) + { + // Replace the delimiter. + if (replace != 0) + buffer_[index_] = replacement; + + // Move the pointer up and return. + ++index_; + goto EXIT_LABEL; + } + + // A preserve designator is NESTED inside this token + // We can't strip such preserve designators, just skip + // over them so that delimiters nested within arn't seen. + if (this->is_preserve_designator (buffer_[index_], + stop, + strip)) + { + ++index_; // Skip starting preserve_designator + while (('\0' != buffer_[index_]) && (stop != buffer_[index_])) + ++index_; // Skip enclosed character + } + + // Check for end of string. + if (buffer_[index_] == '\0') + { + index_ = -1; + goto EXIT_LABEL; + } + } + +EXIT_LABEL: + return next_token; +} + +// ************************************************************* + + +ACE_END_VERSIONED_NAMESPACE_DECL + +#endif /* ACE_TOKENIZER_T_CPP */ diff --git a/dep/ACE_wrappers/ace/Tokenizer_T.h b/dep/ACE_wrappers/ace/Tokenizer_T.h new file mode 100644 index 000000000..b13f5bb5a --- /dev/null +++ b/dep/ACE_wrappers/ace/Tokenizer_T.h @@ -0,0 +1,241 @@ +// -*- C++ -*- + +//============================================================================= +/** + * @file Tokenizer_T.h + * + * $Id: Tokenizer_T.h 88793 2010-02-01 17:50:34Z cleeland $ + * + * @author Douglas C. Schmidt (schmidt@cs.wustl.edu) + * @author Nanbor Wang + */ +//============================================================================= + +#ifndef ACE_TOKENIZER_T_H +#define ACE_TOKENIZER_T_H + +#include /**/ "ace/pre.h" + +#include "ace/Global_Macros.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + +/** + * @class ACE_Tokenizer_T + * + * @brief Tokenizer + * + * Tokenizes a buffer. Allows application to set delimiters and + * preserve designators. Does not allow special characters, yet + * (e.g., printf ("\"like a quoted string\"")). + */ +template +class ACE_Tokenizer_T +{ +public: + /** + * \a buffer will be parsed. Notice that ACE_Tokenizer_T will modify + * \a buffer if you use delimiter_replace or + * preserve_designators to do character substitution. + * @note You should NOT pass a constant string or string literal + * to this constructor, since ACE_Tokenizer_T will try to modify + * the string. + * \sa preserve_designators + * \sa preserve_designators + */ + ACE_Tokenizer_T (ACE_CHAR_T *buffer); + + /** + * \a d is a delimiter. + * \return Returns 0 on success, -1 if there is no memory left. + * + * Example: + * \verbatim + char buf[30]; + ACE_OS::strcpy(buf, "William/Joseph/Hagins"); + + ACE_Tokenizer_T tok (buf); + tok.delimiter ('/'); + for (char *p = tok.next (); p; p = tok.next ()) + cout << p << endl; + \endverbatim + * + * This will print out: + * \verbatim + William/Joseph/Hagins + Joseph/Hagins + Hagins \endverbatim + */ + int delimiter (ACE_CHAR_T d); + + /** + * \a d is a delimiter and, when found, will be replaced by + * \a replacement. + * \return 0 on success, -1 if there is no memory left. + * + * Example: + * \verbatim + char buf[30]; + ACE_OS::strcpy(buf, "William/Joseph/Hagins"); + + ACE_Tokenizer tok (buf); + tok.delimiter_replace ('/', 0); + for (char *p = tok.next (); p; p = tok.next ()) + cout << p << endl; + \endverbatim + * + * This will print out: + * \verbatim + William + Joseph + Hagins \endverbatim + */ + int delimiter_replace (ACE_CHAR_T d, ACE_CHAR_T replacement); + + /** + * Extract string between a pair of designator characters. + * For instance, quotes, or '(' and ')'. + * \a start specifies the begin designator. + * \a stop specifies the end designator. + * \a strip If \a strip == 1, then the preserve + * designators will be stripped from the tokens returned by next. + * \return 0 on success, -1 if there is no memory left. + * + * Example with strip = 0: + * \verbatim + char buf[30]; + ACE_OS::strcpy(buf, "William(Joseph)Hagins"); + + ACE_Tokenizer tok (buf); + tok.preserve_designators ('(', ')', 0); + for (char *p = tok.next (); p; p = tok.next ()) + cout << p << endl; + \endverbatim + * + * This will print out: + * \verbatim + William(Joseph)Hagins + (Joseph)Hagins + )Hagins \endverbatim + * + * Example with strip = 1: + * \verbatim + char buf[30]; + ACE_OS::strcpy(buf, "William(Joseph)Hagins"); + + ACE_Tokenizer tok (buf); + tok.preserve_designators ('(', ')', 1); + for (char *p = tok.next (); p; p = tok.next ()) + cout << p << endl; + \endverbatim + * + * This will print out: + * \verbatim + William + Joseph + Hagins \endverbatim + */ + int preserve_designators (ACE_CHAR_T start, ACE_CHAR_T stop, int strip=1); + + /// Returns the next token. + ACE_CHAR_T *next (void); + + enum { + MAX_DELIMITERS=16, + MAX_PRESERVES=16 + }; + +protected: + /// Returns 1 if @a d is a delimiter, 0 otherwise. If @a d should be + /// replaced with @a r, @a replace is set to 1, otherwise 0. + int is_delimiter (ACE_CHAR_T d, int &replace, ACE_CHAR_T &r); + + /** + * If @a start is a start preserve designator, returns 1 and sets + * @a stop to the stop designator. Returns 0 if @a start is not a + * preserve designator. + */ + int is_preserve_designator (ACE_CHAR_T start, ACE_CHAR_T &stop, int &strip); + + ACE_CHAR_T *buffer_; + int index_; + + /** + * @class Preserve_Entry + * + * @brief Preserve Entry + * + * Defines a set of characters that designate an area that + * should not be parsed, but should be treated as a complete + * token. For instance, in: (this is a preserve region), start + * would be a left paren -(- and stop would be a right paren + * -)-. The strip determines whether the designators should be + * removed from the token. + */ + class Preserve_Entry + { + public: + /** + * E.g., "(". + * E.g., ")". + * Whether the designators should be removed from the token. + */ + ACE_CHAR_T start_; + ACE_CHAR_T stop_; + int strip_; + }; + + /// The application can specify MAX_PRESERVES preserve designators. + Preserve_Entry preserves_[MAX_PRESERVES]; + + /// Pointer to the next free spot in preserves_. + int preserves_index_; + + /** + * @class Delimiter_Entry + * + * @brief Delimiter Entry + * + * Describes a delimiter for the tokenizer. + */ + class Delimiter_Entry + { + public: + /** + * Most commonly a space ' '. + * What occurrences of delimiter_ should be replaced with. + * Whether replacement_ should be used. This should be replaced + * with a technique that sets replacement_ = delimiter by + * default. I'll do that next iteration. + */ + ACE_CHAR_T delimiter_; + ACE_CHAR_T replacement_; + int replace_; + }; + + /// The tokenizer allows MAX_DELIMITERS number of delimiters. + Delimiter_Entry delimiters_[MAX_DELIMITERS]; + + /// Pointer to the next free space in delimiters_. + int delimiter_index_; +}; + +typedef ACE_Tokenizer_T ACE_Tokenizer; + +ACE_END_VERSIONED_NAMESPACE_DECL + +#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) +#include "ace/Tokenizer_T.cpp" +#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ + +#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) +#pragma implementation ("Tokenizer_T.cpp") +#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ + +#include /**/ "ace/post.h" + +#endif /* ACE_TOKENIZER_T_H */ diff --git a/dep/ACE_wrappers/ace/Trace.cpp b/dep/ACE_wrappers/ace/Trace.cpp index 12ccf135e..8acbb6342 100644 --- a/dep/ACE_wrappers/ace/Trace.cpp +++ b/dep/ACE_wrappers/ace/Trace.cpp @@ -1,12 +1,7 @@ -// $Id: Trace.cpp 80826 2008-03-04 14:51:23Z wotte $ - +// $Id: Trace.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/Trace.h" -ACE_RCSID (ace, - Trace, - "$Id: Trace.cpp 80826 2008-03-04 14:51:23Z wotte $") - // Turn off tracing for the duration of this file. #if defined (ACE_NTRACE) #undef ACE_NTRACE @@ -24,7 +19,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL int ACE_Trace::nesting_indent_ = ACE_Trace::DEFAULT_INDENT; // Is tracing enabled? -int ACE_Trace::enable_tracing_ = ACE_Trace::DEFAULT_TRACING; +bool ACE_Trace::enable_tracing_ = ACE_Trace::DEFAULT_TRACING; ACE_ALLOC_HOOK_DEFINE(ACE_Trace) @@ -37,7 +32,7 @@ ACE_Trace::dump (void) const // Determine whether or not tracing is enabled -int +bool ACE_Trace::is_tracing (void) { return ACE_Trace::enable_tracing_; @@ -48,7 +43,7 @@ ACE_Trace::is_tracing (void) void ACE_Trace::start_tracing (void) { - ACE_Trace::enable_tracing_ = 1; + ACE_Trace::enable_tracing_ = true; } // Disable the tracing facility. @@ -56,7 +51,7 @@ ACE_Trace::start_tracing (void) void ACE_Trace::stop_tracing (void) { - ACE_Trace::enable_tracing_ = 0; + ACE_Trace::enable_tracing_ = false; } // Change the nesting indentation level. diff --git a/dep/ACE_wrappers/ace/Trace.h b/dep/ACE_wrappers/ace/Trace.h index f11d634ee..3fbc9ce0b 100644 --- a/dep/ACE_wrappers/ace/Trace.h +++ b/dep/ACE_wrappers/ace/Trace.h @@ -4,7 +4,7 @@ /** * @file Trace.h * - * $Id: Trace.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Trace.h 87823 2009-11-30 12:38:34Z johnnyw $ * * @author Douglas C. Schmidt */ @@ -49,8 +49,8 @@ public: ~ACE_Trace (void); // = Control the tracing level. - /// Determine if tracing is enabled (return == 1) or not (== 0) - static int is_tracing(void); + /// Determine if tracing is enabled or not + static bool is_tracing(void); /// Enable the tracing facility. static void start_tracing (void); @@ -79,7 +79,7 @@ private: static int nesting_indent_; /// Is tracing enabled? - static int enable_tracing_; + static bool enable_tracing_; /// Default values. enum diff --git a/dep/ACE_wrappers/ace/Truncate.h b/dep/ACE_wrappers/ace/Truncate.h index 5b9a0e118..223513a56 100644 --- a/dep/ACE_wrappers/ace/Truncate.h +++ b/dep/ACE_wrappers/ace/Truncate.h @@ -4,7 +4,7 @@ /** * @file Truncate.h * - * $Id: Truncate.h 82623 2008-08-13 14:41:09Z johnnyw $ + * $Id: Truncate.h 83306 2008-10-17 12:19:53Z johnnyw $ * * @author Steve Huston * @author Ossama Othman @@ -27,18 +27,14 @@ #include "ace/If_Then_Else.h" #include "ace/Numeric_Limits.h" -#if defined (ACE_LACKS_LONGLONG_T) \ - || defined (__BORLANDC__) && __BORLANDC__ < 0x590 +#if defined (ACE_LACKS_LONGLONG_T) # include "ace/Basic_Types.h" -#endif /* ACE_LACKS_LONGLONG_T || __BORLANDC__ < 0x590 */ +#endif /* ACE_LACKS_LONGLONG_T */ ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_Utils { - -#if !defined (__BORLANDC__) || __BORLANDC__ >= 0x590 - template struct Sign_Check; // Specialize the unsigned signed cases. @@ -512,540 +508,6 @@ namespace ACE_Utils return truncator() (val); } -#else - - // Borland can't handle the template meta-programming above so - // provide explicit specializations for a few types. More will be - // added if necessary. - - /** - * @deprecated Borland ACE_Utils::Truncator<> specializations should - * be removed. - */ - - template struct Truncator; - - //---------------------------------------------------------- - // sizeof(FROM) > sizeof(TO) - //---------------------------------------------------------- - - template<> - struct Truncator - { - ACE_INT8 operator() (ACE_INT32 val) - { - return - (val > ACE_Numeric_Limits::max () - ? ACE_Numeric_Limits::max () - : static_cast (val)); - } - }; - - template<> - struct Truncator - { - ACE_UINT8 operator() (ACE_UINT32 val) - { - return - (val > static_cast (ACE_Numeric_Limits::max ()) - ? ACE_Numeric_Limits::max () - : static_cast (val)); - } - }; - - template<> - struct Truncator - { - ACE_UINT8 operator() (ACE_INT32 val) - { - return - (val > static_cast (ACE_Numeric_Limits::max ()) - ? ACE_Numeric_Limits::max () - : static_cast (val)); - } - }; - - template<> - struct Truncator - { - ACE_INT8 operator() (ACE_UINT32 val) - { - return - (val > static_cast (ACE_Numeric_Limits::max ()) - ? ACE_Numeric_Limits::max () - : static_cast (val)); - } - }; - -#if defined (ACE_SIZEOF_LONG) && ACE_SIZEOF_LONG < 8 - template<> - struct Truncator - { - signed long operator() (ACE_INT64 val) - { - return - (val > ACE_Numeric_Limits::max () - ? ACE_Numeric_Limits::max () - : static_cast (val)); - } - }; - - template<> - struct Truncator - { - unsigned long operator() (ACE_INT64 val) - { - return - (val > static_cast (ACE_Numeric_Limits::max ()) - ? ACE_Numeric_Limits::max () - : static_cast (val)); - } - }; - - template<> - struct Truncator - { - unsigned long operator() (ACE_UINT64 val) - { - return - (val > static_cast (ACE_Numeric_Limits::max ()) - ? ACE_Numeric_Limits::max () - : static_cast (val)); - } - }; - - template<> - struct Truncator - { - signed long operator() (ACE_UINT64 val) - { - return - (val > static_cast (ACE_Numeric_Limits::max ()) - ? ACE_Numeric_Limits::max () - : static_cast (val)); - } - }; - - template<> - struct Truncator - { - signed long operator() (const ACE_UINT64 val) - { - return - (val > static_cast (ACE_Numeric_Limits::max ()) - ? ACE_Numeric_Limits::max () - : static_cast (val)); - } - }; - -#endif /* ACE_SIZEOF_LONG < 8 */ - -#if defined (ACE_SIZEOF_INT) && ACE_SIZEOF_INT < 8 - template<> - struct Truncator - { - ACE_INT32 operator() (ACE_INT64 val) - { - return - (val > ACE_Numeric_Limits::max () - ? ACE_Numeric_Limits::max () - : static_cast (val)); - } - }; - - template<> - struct Truncator - { - ACE_UINT32 operator() (ACE_INT64 val) - { - return - (val > static_cast (ACE_Numeric_Limits::max ()) - ? ACE_Numeric_Limits::max () - : static_cast (val)); - } - }; - - template<> - struct Truncator - { - ACE_UINT32 operator() (ACE_UINT64 val) - { - return - (val > static_cast (ACE_Numeric_Limits::max ()) - ? ACE_Numeric_Limits::max () - : static_cast (val)); - } - }; - - template<> - struct Truncator - { - signed int operator() (ACE_UINT64 val) - { - return - (val > static_cast (ACE_Numeric_Limits::max ()) - ? ACE_Numeric_Limits::max () - : static_cast (val)); - } - }; - -#endif /* ACE_SIZEOF_INT < 8 */ - - //---------------------------------------------------------- - // sizeof(FROM) == sizeof(TO) - //---------------------------------------------------------- - - template<> - struct Truncator - { - char operator() (unsigned int val) - { - return static_cast (val); - } - }; - - template<> - struct Truncator - { - wchar_t operator() (unsigned int val) - { - return static_cast (val); - } - }; - - template<> - struct Truncator - { - unsigned int operator() (signed int val) - { - return static_cast (val); - } - }; - - template<> - struct Truncator - { - signed int operator() (unsigned int val) - { - return - (val > static_cast (ACE_Numeric_Limits::max ()) - ? ACE_Numeric_Limits::max () - : static_cast (val)); - } - }; - - template<> - struct Truncator - { - signed int operator() (const unsigned int val) - { - return - (val > static_cast (ACE_Numeric_Limits::max ()) - ? ACE_Numeric_Limits::max () - : static_cast (val)); - } - }; - - template<> - struct Truncator - { - unsigned long operator() (signed long val) - { - return static_cast (val); - } - }; - - template<> - struct Truncator - { - signed long operator() (unsigned long val) - { - return - (val > static_cast (ACE_Numeric_Limits::max ()) - ? ACE_Numeric_Limits::max () - : static_cast (val)); - } - }; - -#if defined (ACE_SIZEOF_INT) && defined (ACE_SIZEOF_LONG) \ - && ACE_SIZEOF_INT == ACE_SIZEOF_LONG - - template<> - struct Truncator - { - unsigned long operator() (signed int val) - { - return static_cast (val); - } - }; - - template<> - struct Truncator - { - signed long operator() (signed int val) - { - return static_cast (val); - } - }; - - template<> - struct Truncator - { - signed int operator() (unsigned long val) - { - return - (val > static_cast (ACE_Numeric_Limits::max ()) - ? ACE_Numeric_Limits::max () - : static_cast (val)); - } - }; - - template<> - struct Truncator - { - signed int operator() (signed long val) - { - return static_cast (val); -// This code causes asserts and compiler crashes with BCB6 Static and -// BCB2007 Static -// return -// (val > static_cast (ACE_Numeric_Limits::max ()) -// ? ACE_Numeric_Limits::max () -// : static_cast (val)); - } - }; - - template<> - struct Truncator - { - unsigned int operator() (signed long val) - { - return static_cast (val); - } - }; - - template<> - struct Truncator - { - unsigned int operator() (const signed long val) - { - return static_cast (val); - } - }; - - - template<> - struct Truncator - { - signed long operator() (unsigned int val) - { - return - (val > static_cast (ACE_Numeric_Limits::max ()) - ? ACE_Numeric_Limits::max () - : static_cast (val)); - } - }; - -#endif /* ACE_SIZEOF_INT == ACE_SIZEOF_LONG */ - - template<> - struct Truncator - { - ACE_UINT64 operator() (ACE_INT64 val) - { - return static_cast (val); - } - }; - - template<> - struct Truncator - { - ACE_INT64 operator() (ACE_UINT64 val) - { - return - (val > static_cast (ACE_Numeric_Limits::max ()) - ? ACE_Numeric_Limits::max () - : static_cast (val)); - } - }; - - //---------------------------------------------------------- - // sizeof(FROM) < sizeof(TO) - //---------------------------------------------------------- - - template<> - struct Truncator - { - ACE_INT32 operator() (ACE_INT8 val) - { - return static_cast (val); - } - }; - - template<> - struct Truncator - { - ACE_UINT32 operator() (ACE_UINT8 val) - { - return static_cast (val); - } - }; - - template<> - struct Truncator - { - ACE_INT32 operator() (ACE_UINT8 val) - { - return static_cast (val); - } - }; - - template<> - struct Truncator - { - ACE_UINT32 operator() (ACE_INT8 val) - { - return static_cast (val); - } - }; - -#if defined (ACE_SIZEOF_LONG) && ACE_SIZEOF_LONG < 8 - template<> - struct Truncator - { - ACE_INT64 operator() (signed long val) - { - return static_cast (val); - } - }; - - template<> - struct Truncator - { - ACE_UINT64 operator() (signed long val) - { - return static_cast (val); - } - }; - - template<> - struct Truncator - { - ACE_UINT64 operator() (const signed long val) - { - return - (val > static_cast (ACE_Numeric_Limits::max ()) - ? ACE_Numeric_Limits::max () - : static_cast (val)); - } - }; - - template<> - struct Truncator - { - ACE_UINT64 operator() (unsigned long val) - { - return static_cast (val); - } - }; - - template<> - struct Truncator - { - ACE_INT64 operator() (unsigned long val) - { - return static_cast (val); - } - }; -#endif /* ACE_SIZEOF_LONG < 8 */ - -#if defined (ACE_SIZEOF_INT) && ACE_SIZEOF_INT < 8 - template<> - struct Truncator - { - ACE_INT64 operator() (signed int val) - { - return static_cast (val); - } - }; - - template<> - struct Truncator - { - ACE_UINT64 operator() (signed int val) - { - return static_cast (val); - } - }; - - template<> - struct Truncator - { - ACE_UINT64 operator() (unsigned int val) - { - return static_cast (val); - } - }; - - template<> - struct Truncator - { - ACE_INT64 operator() (unsigned int val) - { - return static_cast (val); - } - }; -#endif /* ACE_SIZEOF_INT < 8 */ - - template<> - struct Truncator - { - unsigned long operator() (size_t val) - { - return - (val > static_cast (ACE_Numeric_Limits::max ()) - ? ACE_Numeric_Limits::max () - : static_cast (val)); - } - }; - - // Partial specialization for the case where the types are the same. - // No truncation is necessary. - template - struct Truncator - { - T operator() (T val) - { - return val; - } - }; - - // Partial specialization for the case where the types are the same, - // but the from type is const. No truncation is necessary. - // - // This is only necessary to workaround a problem with the BCB6 - // compiler. - template - struct Truncator - { - T operator() (T val) - { - return val; - } - }; - - // ------------------------------------- - - template - inline TO truncate_cast (FROM val) - { - typedef Truncator truncator; - - return truncator() (val); - } - -#endif /* !__BORLANDC__ || __BORLANDC__ >= 0x590 */ - } // namespace ACE_Utils ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/UNIX_Addr.cpp b/dep/ACE_wrappers/ace/UNIX_Addr.cpp index 013af8a33..fa889d84e 100644 --- a/dep/ACE_wrappers/ace/UNIX_Addr.cpp +++ b/dep/ACE_wrappers/ace/UNIX_Addr.cpp @@ -1,8 +1,8 @@ -// $Id: UNIX_Addr.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: UNIX_Addr.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/UNIX_Addr.h" -ACE_RCSID(ace, UNIX_Addr, "$Id: UNIX_Addr.cpp 80826 2008-03-04 14:51:23Z wotte $") + #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) diff --git a/dep/ACE_wrappers/ace/UPIPE_Acceptor.cpp b/dep/ACE_wrappers/ace/UPIPE_Acceptor.cpp index 0b8954d5d..3cdf6e2f5 100644 --- a/dep/ACE_wrappers/ace/UPIPE_Acceptor.cpp +++ b/dep/ACE_wrappers/ace/UPIPE_Acceptor.cpp @@ -1,8 +1,8 @@ -// $Id: UPIPE_Acceptor.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: UPIPE_Acceptor.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/UPIPE_Acceptor.h" -ACE_RCSID(ace, UPIPE_Acceptor, "$Id: UPIPE_Acceptor.cpp 80826 2008-03-04 14:51:23Z wotte $") + #if defined (ACE_HAS_THREADS) @@ -72,8 +72,8 @@ int ACE_UPIPE_Acceptor::accept (ACE_UPIPE_Stream &new_stream, ACE_UPIPE_Addr *remote_addr, ACE_Time_Value *timeout, - int restart, - int reset_new_handle) + bool restart, + bool reset_new_handle) { ACE_TRACE ("ACE_UPIPE_Acceptor::accept"); ACE_UNUSED_ARG (reset_new_handle); diff --git a/dep/ACE_wrappers/ace/UPIPE_Acceptor.h b/dep/ACE_wrappers/ace/UPIPE_Acceptor.h index 0fd33226e..e4925a045 100644 --- a/dep/ACE_wrappers/ace/UPIPE_Acceptor.h +++ b/dep/ACE_wrappers/ace/UPIPE_Acceptor.h @@ -4,7 +4,7 @@ /** * @file UPIPE_Acceptor.h * - * $Id: UPIPE_Acceptor.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: UPIPE_Acceptor.h 82723 2008-09-16 09:35:44Z johnnyw $ * * @author Gerhard Lenzer * @author Douglas C. Schmidt @@ -69,8 +69,8 @@ public: int accept (ACE_UPIPE_Stream &server_stream, ACE_UPIPE_Addr *remote_addr = 0, ACE_Time_Value *timeout = 0, - int restart = 1, - int reset_new_handle = 0); + bool restart = true, + bool reset_new_handle = false); /// Dump the state of an object. void dump (void) const; diff --git a/dep/ACE_wrappers/ace/UPIPE_Connector.cpp b/dep/ACE_wrappers/ace/UPIPE_Connector.cpp index 9b9bfcd38..ce03c0fae 100644 --- a/dep/ACE_wrappers/ace/UPIPE_Connector.cpp +++ b/dep/ACE_wrappers/ace/UPIPE_Connector.cpp @@ -1,8 +1,8 @@ -// $Id: UPIPE_Connector.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: UPIPE_Connector.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/UPIPE_Connector.h" -ACE_RCSID(ace, UPIPE_Connector, "$Id: UPIPE_Connector.cpp 80826 2008-03-04 14:51:23Z wotte $") + #if defined (ACE_HAS_THREADS) diff --git a/dep/ACE_wrappers/ace/UPIPE_Connector.h b/dep/ACE_wrappers/ace/UPIPE_Connector.h index ea4fc2ec7..b2ad1787a 100644 --- a/dep/ACE_wrappers/ace/UPIPE_Connector.h +++ b/dep/ACE_wrappers/ace/UPIPE_Connector.h @@ -4,7 +4,7 @@ /** * @file UPIPE_Connector.h * - * $Id: UPIPE_Connector.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: UPIPE_Connector.h 82723 2008-09-16 09:35:44Z johnnyw $ * * @author Gerhard Lenzer and Douglas C. Schmidt */ @@ -89,7 +89,7 @@ public: int perms = 0); /// Resets any event associations on this handle - int reset_new_handle (ACE_HANDLE handle); + bool reset_new_handle (ACE_HANDLE handle); // = Meta-type info typedef ACE_UPIPE_Addr PEER_ADDR; diff --git a/dep/ACE_wrappers/ace/UPIPE_Connector.inl b/dep/ACE_wrappers/ace/UPIPE_Connector.inl index fa43dbea3..07b7502cc 100644 --- a/dep/ACE_wrappers/ace/UPIPE_Connector.inl +++ b/dep/ACE_wrappers/ace/UPIPE_Connector.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: UPIPE_Connector.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: UPIPE_Connector.inl 82723 2008-09-16 09:35:44Z johnnyw $ ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -24,11 +24,11 @@ ACE_UPIPE_Connector::ACE_UPIPE_Connector (ACE_UPIPE_Stream &new_stream, ACE_TEXT ("ACE_UPIPE_Connector"))); } -ACE_INLINE int +ACE_INLINE bool ACE_UPIPE_Connector::reset_new_handle (ACE_HANDLE /* handle */) { // Nothing to do here since the handle is not a socket - return 0; + return false; } ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/UPIPE_Stream.cpp b/dep/ACE_wrappers/ace/UPIPE_Stream.cpp index d07722a48..03c063add 100644 --- a/dep/ACE_wrappers/ace/UPIPE_Stream.cpp +++ b/dep/ACE_wrappers/ace/UPIPE_Stream.cpp @@ -1,8 +1,8 @@ -// $Id: UPIPE_Stream.cpp 82559 2008-08-07 20:23:07Z parsons $ +// $Id: UPIPE_Stream.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/UPIPE_Stream.h" -ACE_RCSID(ace, UPIPE_Stream, "$Id: UPIPE_Stream.cpp 82559 2008-08-07 20:23:07Z parsons $") + #if defined (ACE_HAS_THREADS) @@ -215,7 +215,7 @@ ACE_UPIPE_Stream::recv_n (char *buf, len = this->recv (buf + bytes_read, n - bytes_read, timeout); - + if (len == -1) { return -1; diff --git a/dep/ACE_wrappers/ace/UTF16_Encoding_Converter.cpp b/dep/ACE_wrappers/ace/UTF16_Encoding_Converter.cpp index 0a51cf9fb..da883734c 100644 --- a/dep/ACE_wrappers/ace/UTF16_Encoding_Converter.cpp +++ b/dep/ACE_wrappers/ace/UTF16_Encoding_Converter.cpp @@ -1,4 +1,4 @@ -// $Id: UTF16_Encoding_Converter.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: UTF16_Encoding_Converter.cpp 83735 2008-11-14 09:41:52Z johnnyw $ // ====================================================================== // @@ -305,7 +305,7 @@ ACE_UTF16_Encoding_Converter::encoded (const ACE_Byte* source, static const size_t converted = begin * 4; ACE_Byte target[converted]; - ACE_UTF16_Encoding_Converter* converter; + ACE_UTF16_Encoding_Converter* converter = 0; ACE_NEW_RETURN (converter, ACE_UTF16_Encoding_Converter (false), 0); diff --git a/dep/ACE_wrappers/ace/UUID.cpp b/dep/ACE_wrappers/ace/UUID.cpp index 4ce2bcd0a..8fdf150b0 100644 --- a/dep/ACE_wrappers/ace/UUID.cpp +++ b/dep/ACE_wrappers/ace/UUID.cpp @@ -1,4 +1,4 @@ -//$Id: UUID.cpp 81541 2008-04-30 13:56:12Z shuston $ +//$Id: UUID.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/UUID.h" #include "ace/Guard_T.h" @@ -15,162 +15,115 @@ #include "ace/OS_NS_unistd.h" #include "ace/ACE.h" -ACE_RCSID (ace, - UUID, - "$Id: UUID.cpp 81541 2008-04-30 13:56:12Z shuston $") - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_Utils { - UUID_Node::UUID_Node (void) - { - for (int i = 0; i < UUID_Node::NODE_ID_SIZE; ++i) - node_ID_[i] = 0; - } + // NIL version of the UUID + const UUID UUID::NIL_UUID; - UUID_Node::Node_ID& - UUID_Node::node_ID (void) - { - return node_ID_; - } - - void - UUID_Node::node_ID (Node_ID& node_ID) - { - for (int i = 0; i < UUID_Node::NODE_ID_SIZE; ++i) - node_ID_[i] = node_ID[i]; - } - - UUID UUID::NIL_UUID; - - /// Construct a nil UUID. Such a UUID has every one of it's data - /// elements set to zero. - UUID::UUID (void) - : time_low_ (0), - time_mid_ (0), - time_hi_and_version_ (0), - clock_seq_hi_and_reserved_ (0), - clock_seq_low_ (0), - node_ (0), - node_release_ (true), - as_string_ (0) - { - ACE_NEW (node_, - UUID_Node); - } - - /// Construct a UUID from a string representation of an UUID. UUID::UUID (const ACE_CString& uuid_string) - : time_low_ (0), - time_mid_ (0), - time_hi_and_version_ (0), - clock_seq_hi_and_reserved_ (0), - clock_seq_low_ (0), - node_ (0), - node_release_ (true), - as_string_ (0) { - ACE_NEW (node_, - UUID_Node); - + this->init (); this->from_string_i (uuid_string); } - UUID::UUID (const UUID &right) - : time_low_ (right.time_low_), - time_mid_ (right.time_mid_), - time_hi_and_version_ (right.time_hi_and_version_), - clock_seq_hi_and_reserved_ (right.clock_seq_hi_and_reserved_), - clock_seq_low_ (right.clock_seq_low_), - as_string_ (0) + const UUID & + UUID::operator = (const UUID & rhs) { - ACE_NEW (node_, - UUID_Node (*right.node_)); - } - - UUID::~UUID (void) - { - if (node_release_) - delete node_; - - if (as_string_ != 0) - delete as_string_; - } - - const ACE_CString* - UUID::to_string (void) - { - /// Only compute the string representation once. - if (as_string_ == 0) + if (this != &rhs) { - // 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; - - if ((thr_id_.length () != 0) && (pid_.length () != 0)) + // Reset the string version of the UUID a string version + // exist, and the UUID is not equal to the old UUID. + if (0 != this->as_string_.get ()) { - UUID_STRING_LENGTH += 2; //for '-' - ACE_NEW_RETURN (buf, - char[UUID_STRING_LENGTH + 1], - 0); - - ACE_OS::sprintf (buf, - "%8.8x-%4.4x-%4.4x-%2.2x%2.2x-%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x-%s-%s", - this->time_low_, - this->time_mid_, - this->time_hi_and_version_, - this->clock_seq_hi_and_reserved_, - this->clock_seq_low_, - (this->node_->node_ID ()) [0], - (this->node_->node_ID ()) [1], - (this->node_->node_ID ()) [2], - (this->node_->node_ID ()) [3], - (this->node_->node_ID ()) [4], - (this->node_->node_ID ()) [5], - thr_id_.c_str (), - pid_.c_str () - ); - } - else - { - ACE_NEW_RETURN (buf, - char[UUID_STRING_LENGTH + 1], - 0); - - ACE_OS::sprintf (buf, - "%8.8x-%4.4x-%4.4x-%2.2x%2.2x-%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x", - this->time_low_, - this->time_mid_, - this->time_hi_and_version_, - this->clock_seq_hi_and_reserved_, - this->clock_seq_low_, - (this->node_->node_ID ()) [0], - (this->node_->node_ID ()) [1], - (this->node_->node_ID ()) [2], - (this->node_->node_ID ()) [3], - (this->node_->node_ID ()) [4], - (this->node_->node_ID ()) [5] - ); + if (0 == rhs.as_string_.get () || *this != rhs) + this->as_string_.reset (); } - // 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)); + // Copy the contents of the UUID. + ACE_OS::memcpy (&this->uuid_, &rhs.uuid_, BINARY_SIZE); - // we first free the dynamically allocated 'buf'. - 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; + /// @todo We should create an UUID_Ex class for UUIDs that + /// contain the thread id and process id. + this->thr_id_ = rhs.thr_id_; + this->pid_ = rhs.pid_; } - return as_string_; + return *this; + } + + const ACE_CString * UUID::to_string (void) const + { + // Compute the string representation only once. + if (0 != this->as_string_.get ()) + return this->as_string_.get (); + + // Get a buffer exactly the correct size. Use the nil UUID as a + // gauge. Don't forget the trailing nul. + ACE_Auto_Array_Ptr auto_clean; + size_t UUID_STRING_LENGTH = 36 + thr_id_.length () + pid_.length (); + char *buf = 0; + + if (36 == UUID_STRING_LENGTH) + { + ACE_NEW_RETURN (buf, + char[UUID_STRING_LENGTH + 1], + 0); + + // Let the auto array pointer manage the buffer. + auto_clean.reset (buf); + + ACE_OS::sprintf (buf, + "%8.8x-%4.4x-%4.4x-%2.2x%2.2x-%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x", + this->uuid_.time_low_, + this->uuid_.time_mid_, + this->uuid_.time_hi_and_version_, + this->uuid_.clock_seq_hi_and_reserved_, + this->uuid_.clock_seq_low_, + (this->uuid_.node_.node_ID ()) [0], + (this->uuid_.node_.node_ID ()) [1], + (this->uuid_.node_.node_ID ()) [2], + (this->uuid_.node_.node_ID ()) [3], + (this->uuid_.node_.node_ID ()) [4], + (this->uuid_.node_.node_ID ()) [5]); + } + else + { + UUID_STRING_LENGTH += 2; //for '-' + ACE_NEW_RETURN (buf, + char[UUID_STRING_LENGTH + 1], + 0); + + // Let the auto array pointer manage the buffer. + auto_clean.reset (buf); + + ACE_OS::sprintf (buf, + "%8.8x-%4.4x-%4.4x-%2.2x%2.2x-%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x-%s-%s", + this->uuid_.time_low_, + this->uuid_.time_mid_, + this->uuid_.time_hi_and_version_, + this->uuid_.clock_seq_hi_and_reserved_, + this->uuid_.clock_seq_low_, + (this->uuid_.node_.node_ID ()) [0], + (this->uuid_.node_.node_ID ()) [1], + (this->uuid_.node_.node_ID ()) [2], + (this->uuid_.node_.node_ID ()) [3], + (this->uuid_.node_.node_ID ()) [4], + (this->uuid_.node_.node_ID ()) [5], + thr_id_.c_str (), + pid_.c_str ()); + } + + // Save the string. + ACE_CString * as_string = 0; + + ACE_NEW_RETURN (as_string, + ACE_CString (buf, UUID_STRING_LENGTH), + 0); + + this->as_string_.reset (as_string); + return this->as_string_.get (); } void @@ -187,10 +140,7 @@ namespace ACE_Utils /// Special case for the nil UUID. if (uuid_string == *NIL_UUID.to_string ()) { - bool copy_constructor_not_supported = false; - ACE_ASSERT (copy_constructor_not_supported); - //*this = NIL_UUID; - ACE_UNUSED_ARG (copy_constructor_not_supported); + *this = NIL_UUID; return; } @@ -285,20 +235,18 @@ namespace ACE_Utils } } - this->time_low_ = static_cast (time_low); - this->time_mid_ = static_cast (time_mid); - this->time_hi_and_version_ = static_cast (time_hi_and_version); - this->clock_seq_hi_and_reserved_ = static_cast (clock_seq_hi_and_reserved); - this->clock_seq_low_ = static_cast (clock_seq_low); + this->uuid_.time_low_ = static_cast (time_low); + this->uuid_.time_mid_ = static_cast (time_mid); + this->uuid_.time_hi_and_version_ = static_cast (time_hi_and_version); + this->uuid_.clock_seq_hi_and_reserved_ = static_cast (clock_seq_hi_and_reserved); + this->uuid_.clock_seq_low_ = static_cast (clock_seq_low); - UUID_Node::Node_ID node_id; - for (int i = 0; i < UUID_Node::NODE_ID_SIZE; ++i) - node_id [i] = static_cast (node[i]); - - this->node_->node_ID (node_id); + for (size_t i = 0; i < UUID_Node::NODE_ID_SIZE; ++ i) + this->uuid_.node_.node_ID ()[i] = static_cast (node[i]); // Support varient 10- only - if ((this->clock_seq_hi_and_reserved_ & 0xc0) != 0x80 && (this->clock_seq_hi_and_reserved_ & 0xc0) != 0xc0) + if ((this->uuid_.clock_seq_hi_and_reserved_ & 0xc0) != 0x80 && + (this->uuid_.clock_seq_hi_and_reserved_ & 0xc0) != 0xc0) { ACE_DEBUG ((LM_DEBUG, "ACE_UUID::from_string_i - " @@ -307,7 +255,7 @@ namespace ACE_Utils } /// Support versions 1, 3, and 4 only - ACE_UINT16 V1 = this->time_hi_and_version_; + ACE_UINT16 V1 = this->uuid_.time_hi_and_version_; if ((V1 & 0xF000) != 0x1000 && (V1 & 0xF000) != 0x3000 && @@ -319,7 +267,7 @@ namespace ACE_Utils return; } - if ((this->clock_seq_hi_and_reserved_ & 0xc0) == 0xc0) + if ((this->uuid_.clock_seq_hi_and_reserved_ & 0xc0) == 0xc0) { if (uuid_string.length () == NIL_UUID.to_string ()->length ()) { @@ -336,19 +284,20 @@ namespace ACE_Utils "IllegalArgument (Thread and Process Id format incorrect)\n")); this->thr_id_ = thr_pid_str.substr (0, pos); - this->pid_ = thr_pid_str.substr (pos+1, thr_pid_str.length ()-pos-1); + this->pid_ = thr_pid_str.substr (pos+1, thr_pid_str.length ()-pos-1); } } - UUID_Generator::UUID_Generator () + UUID_Generator::UUID_Generator (void) : time_last_ (0), - destroy_lock_ (true) + destroy_lock_ (true), + is_init_ (false) { - ACE_NEW (lock_, - ACE_SYNCH_MUTEX); + ACE_NEW (lock_, ACE_SYNCH_MUTEX); + this->init (); } - UUID_Generator::~UUID_Generator () + UUID_Generator::~UUID_Generator (void) { if (destroy_lock_) delete lock_; @@ -357,24 +306,19 @@ namespace ACE_Utils void UUID_Generator::init (void) { + if (this->is_init_) + return; + ACE_OS::macaddr_node_t macaddress; - int result = ACE_OS::getmacaddress (&macaddress); + int const result = ACE_OS::getmacaddress (&macaddress); UUID_Node::Node_ID node_id; - if (result != -1) - { -// ACE_DEBUG ((LM_DEBUG, -// "%02X-%02X-%02X-%02X-%02X-%02X\n", -// macaddress.node [0], -// macaddress.node [1], -// macaddress.node [2], -// macaddress.node [3], -// macaddress.node [4], -// macaddress.node [5])); - ACE_OS::memcpy (&node_id, + if (-1 != result) + { + ACE_OS::memcpy (node_id, macaddress.node, - sizeof (node_id)); + UUID_Node::NODE_ID_SIZE); } else { @@ -391,13 +335,18 @@ namespace ACE_Utils { ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, *lock_); uuid_state_.timestamp = time_last_; - uuid_state_.node.node_ID (node_id); + + ACE_OS::memcpy (uuid_state_.node.node_ID (), + node_id, + UUID_Node::NODE_ID_SIZE); } + + this->is_init_ = true; } void - UUID_Generator::generate_UUID (UUID& uuid,ACE_UINT16 version, - u_char variant) + UUID_Generator:: + generate_UUID (UUID& uuid, ACE_UINT16 version, u_char variant) { UUID_Time timestamp; ACE_UINT16 clock_sequence; @@ -420,7 +369,7 @@ namespace ACE_Utils cseqHAV |= variant; uuid.clock_seq_hi_and_reserved (cseqHAV); - uuid.node (& (uuid_state_.node)); + uuid.node (uuid_state_.node); if (variant == 0xc0) { @@ -439,7 +388,7 @@ namespace ACE_Utils UUID* UUID_Generator::generate_UUID (ACE_UINT16 version, u_char variant) { - UUID* uuid; + UUID* uuid = 0; ACE_NEW_RETURN (uuid, UUID, 0); @@ -461,7 +410,7 @@ namespace ACE_Utils // sequence. if (timestamp <= time_last_) { - uuid_state_.clock_sequence = static_cast + uuid_state_.clock_sequence = static_cast ((uuid_state_.clock_sequence + 1) & ACE_UUID_CLOCK_SEQ_MASK); } // If the system time ticked since the last UUID was @@ -525,7 +474,7 @@ namespace ACE_Utils now.to_usec (time); time = time * 10; timestamp = time + timeOffset; -} + } ACE_SYNCH_MUTEX* UUID_Generator::lock (void) @@ -534,8 +483,7 @@ namespace ACE_Utils } void - UUID_Generator::lock (ACE_SYNCH_MUTEX* lock, - bool release_lock) + UUID_Generator::lock (ACE_SYNCH_MUTEX* lock, bool release_lock) { if (this->destroy_lock_) delete this->lock_; @@ -543,12 +491,11 @@ namespace ACE_Utils this->lock_ = lock; this->destroy_lock_ = release_lock; } - } #if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) -template ACE_Singleton * - ACE_Singleton::singleton_; + template ACE_Singleton * + ACE_Singleton ::singleton_; #endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/UUID.h b/dep/ACE_wrappers/ace/UUID.h index 4f3c39d08..ae43c145d 100644 --- a/dep/ACE_wrappers/ace/UUID.h +++ b/dep/ACE_wrappers/ace/UUID.h @@ -4,7 +4,7 @@ /** * @file UUID.h * - * $Id: UUID.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: UUID.h 88604 2010-01-18 18:01:19Z hillj $ * * @author Andrew T. Finnel * @author Yamuna Krishnmaurthy @@ -21,6 +21,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Auto_Ptr.h" #include "ace/SString.h" #include "ace/Singleton.h" #include "ace/Synch_Traits.h" @@ -29,33 +30,41 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_Utils { - /// Class to hold a MAC address + /** + * @class UUID_Node + * + * @brief Holds the MAC-address of the UUID. + */ class ACE_Export UUID_Node { public: - - /// Constructor - UUID_Node (void); - + /// Size of the node in bytes. enum {NODE_ID_SIZE = 6}; + + /// Type definition of the node. typedef u_char Node_ID[NODE_ID_SIZE]; - Node_ID &node_ID (void); - void node_ID (Node_ID&); + /// Get the node id + Node_ID & node_ID (void); - ///// Equality Operations - bool operator == (const UUID_Node& right) const; - bool operator != (const UUID_Node& right) const; + /** + * @overload + */ + const Node_ID & node_ID (void) const; - ///// Relational Operations - //bool operator < (const UUID_Node& right) const; + /// Test for equality. + bool operator == (const UUID_Node & right) const; + + /// Test for inequality. + bool operator != (const UUID_Node & right) const; private: + /// The value of the node id. Node_ID node_ID_; }; /** - * @class ACE_UUID + * @class ACE_UUID * * ACE_UUID represents a Universally Unique IDentifier (UUID) as * described in (the expired) INTERNET-DRAFT specification entitled @@ -75,6 +84,8 @@ namespace ACE_Utils class ACE_Export UUID { public: + /// The size of a binary UUID. + enum { BINARY_SIZE = 16 }; /// Constructor UUID (void); @@ -102,8 +113,10 @@ namespace ACE_Utils u_char clock_seq_low (void) const; void clock_seq_low (u_char); - UUID_Node* node (void) const; - void node (UUID_Node*); + UUID_Node & node (void); + const UUID_Node & node (void) const; + + void node (const UUID_Node & node); ACE_CString* thr_id (void); void thr_id (char*); @@ -112,42 +125,63 @@ namespace ACE_Utils void pid (char*); /// Returns a string representation of the UUID - const ACE_CString* to_string (void); + const ACE_CString* to_string (void) const; /// Set the value using a string void from_string (const ACE_CString& uuid_string); - static UUID NIL_UUID; + /// NIL UUID + static const UUID NIL_UUID; /// Equality Operations - bool operator== (const UUID &right) const; - bool operator!= (const UUID &right) const; + bool operator == (const UUID &right) const; + bool operator != (const UUID &right) const; - /// Relational Operations - //bool operator< (const UUID &right) const; - //bool operator> (const UUID &right) const; - //bool operator<= (const UUID &right) const; - //bool operator>= (const UUID &right) const; + /// Compute a hash value for the UUID. + unsigned long hash (void) const; + + /// Assign an existing UUID to this UUID. + const UUID & operator = (const UUID & rhs); private: + /// Initialize the UUID + void init (void); + + /** + * Helper method to convert from a string UUID. + * + * @param[in] uuid_string String version of UUID. + */ void from_string_i (const ACE_CString& uuid_string); - UUID& operator= (const UUID&); - /// Data Members for Class Attributes - ACE_UINT32 time_low_; - ACE_UINT16 time_mid_; - ACE_UINT16 time_hi_and_version_; - u_char clock_seq_hi_and_reserved_; - u_char clock_seq_low_; - UUID_Node* node_; - bool node_release_; + struct data + { + /// Time low. + ACE_UINT32 time_low_; + + /// Time mid. + ACE_UINT16 time_mid_; + + /// Time high and version. + ACE_UINT16 time_hi_and_version_; + + /// Clock sequence high and reserved space. + u_char clock_seq_hi_and_reserved_; + + /// Clock sequence low. + u_char clock_seq_low_; + + /// MAC-address within the UUID. + UUID_Node node_; + } uuid_; + ACE_CString thr_id_; ACE_CString pid_; /// The string representation of the UUID. This is created and /// updated only on demand. - ACE_CString *as_string_; + mutable ACE_Auto_Ptr as_string_; }; /** @@ -162,9 +196,14 @@ namespace ACE_Utils enum {ACE_UUID_CLOCK_SEQ_MASK = 0x3FFF}; - UUID_Generator(); + /// Default constructor. + UUID_Generator(void); + + /// Destructor. ~UUID_Generator(); + /// Initialize the UUID generator + /// @deprecated This method may go away in some future release. void init (void); /// Format timestamp, clockseq, and nodeID into an UUID of the @@ -185,11 +224,9 @@ namespace ACE_Utils ACE_SYNCH_MUTEX* lock (void); /// Set a new locking strategy and return the old one. - void lock (ACE_SYNCH_MUTEX* lock, - bool release_lock); + void lock (ACE_SYNCH_MUTEX* lock, bool release_lock); private: - /// The system time when that last uuid was generated. UUID_Time time_last_; @@ -209,25 +246,31 @@ namespace ACE_Utils /// Obtain a UUID timestamp and clock sequence. Compensate for the /// fact that the time obtained from getSystem time has a /// resolution less than 100ns. - void get_timestamp_and_clocksequence (UUID_Time& timestamp, + void get_timestamp_and_clocksequence (UUID_Time& timestamp, ACE_UINT16& clockSequence); /// Obtain the system time in UTC as a count of 100 nanosecond intervals /// since 00:00:00.00, 15 October 1582 (the date of Gregorian reform to - /// the Christian calendar). + /// the Christian calendar). void get_systemtime( UUID_Time& timeNow); /// The UUID generator persistent state. UUID_State uuid_state_; ACE_SYNCH_MUTEX* lock_; + bool destroy_lock_; + + /// Initalization state of the generator. + bool is_init_; }; - typedef ACE_Singleton UUID_GENERATOR; - + typedef ACE_Singleton + UUID_GENERATOR; } +ACE_SINGLETON_DECLARE (ACE_Singleton, ACE_Utils::UUID_Generator, ACE_SYNCH_MUTEX) + ACE_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) diff --git a/dep/ACE_wrappers/ace/UUID.inl b/dep/ACE_wrappers/ace/UUID.inl index a60fb6ce1..568adfa00 100644 --- a/dep/ACE_wrappers/ace/UUID.inl +++ b/dep/ACE_wrappers/ace/UUID.inl @@ -1,87 +1,134 @@ // -*- C++ -*- // -//$Id: UUID.inl 80826 2008-03-04 14:51:23Z wotte $ +//$Id: UUID.inl 85331 2009-05-14 00:04:12Z hillj $ ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_Utils { + ACE_INLINE + const UUID_Node::Node_ID & UUID_Node::node_ID (void) const + { + return this->node_ID_; + } + + ACE_INLINE + UUID_Node::Node_ID & UUID_Node::node_ID (void) + { + return this->node_ID_; + } + + ACE_INLINE + UUID::UUID (void) + { + this->init (); + } + + ACE_INLINE + UUID::UUID (const UUID &right) + : thr_id_ (right.thr_id_), + pid_ (right.pid_) + { + ACE_OS::memcpy (&this->uuid_, &right.uuid_, BINARY_SIZE); + } + + ACE_INLINE + UUID::~UUID (void) + { + + } + + ACE_INLINE void + UUID::init (void) + { + ACE_OS::memset (&this->uuid_, 0, BINARY_SIZE); + } + + ACE_INLINE unsigned long + UUID::hash (void) const + { + return ACE::hash_pjw (reinterpret_cast (&this->uuid_), + UUID::BINARY_SIZE); + } - /// Data Members for Class Attributes ACE_INLINE ACE_UINT32 UUID::time_low (void) const { - return this->time_low_; + return this->uuid_.time_low_; } ACE_INLINE void UUID::time_low (ACE_UINT32 timelow) { - this->time_low_ = timelow; + this->uuid_.time_low_ = timelow; } ACE_INLINE ACE_UINT16 UUID::time_mid (void) const { - return this->time_mid_; + return this->uuid_.time_mid_; } ACE_INLINE void UUID::time_mid (ACE_UINT16 time_mid) { - this->time_mid_ = time_mid; + this->uuid_.time_mid_ = time_mid; } ACE_INLINE ACE_UINT16 UUID::time_hi_and_version (void) const { - return this->time_hi_and_version_; + return this->uuid_.time_hi_and_version_; } ACE_INLINE void UUID::time_hi_and_version (ACE_UINT16 time_hi_and_version) { - this->time_hi_and_version_ = time_hi_and_version; + this->uuid_.time_hi_and_version_ = time_hi_and_version; } ACE_INLINE u_char UUID::clock_seq_hi_and_reserved (void) const { - return this->clock_seq_hi_and_reserved_; + return this->uuid_.clock_seq_hi_and_reserved_; } ACE_INLINE void UUID::clock_seq_hi_and_reserved (u_char clock_seq_hi_and_reserved) { - this->clock_seq_hi_and_reserved_ = clock_seq_hi_and_reserved; + this->uuid_.clock_seq_hi_and_reserved_ = clock_seq_hi_and_reserved; } ACE_INLINE u_char UUID::clock_seq_low (void) const { - return this->clock_seq_low_; + return this->uuid_.clock_seq_low_; } ACE_INLINE void UUID::clock_seq_low (u_char clock_seq_low) { - this->clock_seq_low_ = clock_seq_low; + this->uuid_.clock_seq_low_ = clock_seq_low; } - ACE_INLINE UUID_Node* + ACE_INLINE const UUID_Node & UUID::node (void) const { - return this->node_; + return this->uuid_.node_; + } + + ACE_INLINE UUID_Node & + UUID::node (void) + { + return this->uuid_.node_; } ACE_INLINE void - UUID::node (UUID_Node* node) + UUID::node (const UUID_Node & node) { - if (node_release_) - delete node_; - - this->node_ = node; - node_release_ = false; + ACE_OS::memcpy (&this->uuid_.node_, + node.node_ID (), + UUID_Node::NODE_ID_SIZE); } ACE_INLINE ACE_CString* @@ -117,58 +164,15 @@ namespace ACE_Utils ACE_INLINE bool UUID::operator == (const UUID &right) const { - if ((this->time_low_ != right.time_low ()) || - (this->time_mid_ != right.time_mid ()) || - (this->time_hi_and_version_ != right.time_hi_and_version ()) || - (this->clock_seq_hi_and_reserved_ != right.clock_seq_hi_and_reserved ()) || - (this->clock_seq_low_ != right.clock_seq_low ()) || - (*this->node_ != *right.node ())) - return false; - - return true; + return 0 == ACE_OS::memcmp (&this->uuid_, &right.uuid_, BINARY_SIZE); } ACE_INLINE bool UUID::operator != (const UUID &right) const { - return !(*this == right); + return 0 != ACE_OS::memcmp (&this->uuid_, &right.uuid_, BINARY_SIZE); } -// ACE_INLINE bool -//UUID::operator < (const UUID &rt) const -// { -// UUID right (rt); -// if ((timeLow_ < right.timeLow ()) || -// (timeMid_ < right.timeMid ()) || -// (timeHiAndVersion_ < right.timeHiAndVersion ()) || -// (clockSeqHiAndReserved_ < right.clockSeqHiAndReserved ()) || -// (clockSeqLow_ < right.clockSeqLow ()) || -// (node_ < right.node ())) -// { -// return true; -// } -// -// return false; -// } -// -// ACE_INLINE bool -// UUID::operator > (const UUID &right) const -// { -// return right < *this; -// } -// -// ACE_INLINE bool -// UUID::operator <= (const UUID &right) const -// { -// return !(*this > right); -// } -// -// ACE_INLINE bool -// UUID::operator >= (const UUID &right) const -// { -// return !(*this < right); -// } -// ACE_INLINE bool UUID_Node::operator == (const UUID_Node& rt) const { diff --git a/dep/ACE_wrappers/ace/Unbounded_Queue.cpp b/dep/ACE_wrappers/ace/Unbounded_Queue.cpp index aaaddc6a9..2890650fb 100644 --- a/dep/ACE_wrappers/ace/Unbounded_Queue.cpp +++ b/dep/ACE_wrappers/ace/Unbounded_Queue.cpp @@ -1,4 +1,4 @@ -// $Id: Unbounded_Queue.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Unbounded_Queue.cpp 82723 2008-09-16 09:35:44Z johnnyw $ #ifndef ACE_UNBOUNDED_QUEUE_CPP #define ACE_UNBOUNDED_QUEUE_CPP @@ -154,7 +154,6 @@ ACE_Unbounded_Queue::~ACE_Unbounded_Queue (void) this->allocator_->free, ACE_Node, ); - this->head_ = 0; } template int diff --git a/dep/ACE_wrappers/ace/Unbounded_Queue.h b/dep/ACE_wrappers/ace/Unbounded_Queue.h index b6e1c4eea..65be7aaae 100644 --- a/dep/ACE_wrappers/ace/Unbounded_Queue.h +++ b/dep/ACE_wrappers/ace/Unbounded_Queue.h @@ -4,7 +4,7 @@ /** * @file Unbounded_Queue.h * - * $Id: Unbounded_Queue.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Unbounded_Queue.h 84316 2009-02-03 19:46:05Z johnnyw $ * * @author Douglas C. Schmidt */ @@ -185,17 +185,17 @@ public: // = Check boundary conditions. - /// Returns 1 if the container is empty, otherwise returns 0. + /// Returns true if the container is empty, otherwise returns false. /** * Constant time check to see if the queue is empty. */ - int is_empty (void) const; + bool is_empty (void) const; /// Returns 0. /** * The queue cannot be full, so it always returns 0. */ - int is_full (void) const; + bool is_full (void) const; // = Classic queue operations. diff --git a/dep/ACE_wrappers/ace/Unbounded_Queue.inl b/dep/ACE_wrappers/ace/Unbounded_Queue.inl index 0758412b9..81e3ded3e 100644 --- a/dep/ACE_wrappers/ace/Unbounded_Queue.inl +++ b/dep/ACE_wrappers/ace/Unbounded_Queue.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: Unbounded_Queue.inl 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Unbounded_Queue.inl 84316 2009-02-03 19:46:05Z johnnyw $ ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -10,18 +10,18 @@ ACE_Unbounded_Queue::size (void) const return this->cur_size_; } -template ACE_INLINE int +template ACE_INLINE bool ACE_Unbounded_Queue::is_empty (void) const { // ACE_TRACE ("ACE_Unbounded_Queue::is_empty"); return this->head_ == this->head_->next_; } -template ACE_INLINE int +template ACE_INLINE bool ACE_Unbounded_Queue::is_full (void) const { // ACE_TRACE ("ACE_Unbounded_Queue::is_full"); - return 0; // We should implement a "node of last resort for this..." + return false; // We should implement a "node of last resort for this..." } ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/Unbounded_Set_Ex.h b/dep/ACE_wrappers/ace/Unbounded_Set_Ex.h index 262ef6043..3d290a6ac 100644 --- a/dep/ACE_wrappers/ace/Unbounded_Set_Ex.h +++ b/dep/ACE_wrappers/ace/Unbounded_Set_Ex.h @@ -4,7 +4,7 @@ /** * @file Unbounded_Set_Ex.h * - * $Id: Unbounded_Set_Ex.h 81624 2008-05-06 17:14:57Z wotte $ + * $Id: Unbounded_Set_Ex.h 88978 2010-02-13 16:03:31Z hillj $ * * @author Douglas C. Schmidt */ @@ -16,6 +16,7 @@ #include "ace/Node.h" #include "ace/os_include/os_stddef.h" +#include #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -43,12 +44,22 @@ template class ACE_Unbounded_Set_Ex_Iterator { public: + /// Type definition of the container type. + typedef ACE_Unbounded_Set_Ex container_type; + + // = std::iterator_traits typedefs/traits. + typedef std::forward_iterator_tag iterator_category; + typedef typename container_type::value_type value_type; + typedef typename container_type::reference reference; + typedef typename container_type::pointer pointer; + typedef typename container_type::difference_type difference_type; + // = Initialization method. ACE_Unbounded_Set_Ex_Iterator (ACE_Unbounded_Set_Ex &s, bool end = false); // = Iteration methods. - /// Pass back the that hasn't been seen in the Set. + /// Pass back the @a next_item that hasn't been seen in the Set. /// Returns 0 when all items have been seen, else 1. int next (T *&next_item); @@ -102,6 +113,15 @@ template class ACE_Unbounded_Set_Ex_Const_Iterator { public: + typedef ACE_Unbounded_Set_Ex container_type; + + // = std::iterator_traits typedefs/traits. + typedef std::forward_iterator_tag iterator_category; + typedef typename container_type::const_value_type value_type; + typedef typename container_type::const_reference reference; + typedef typename container_type::const_pointer pointer; + typedef typename container_type::difference_type difference_type; + // = Initialization method. ACE_Unbounded_Set_Ex_Const_Iterator (const ACE_Unbounded_Set_Ex &s, bool end = false); @@ -163,7 +183,7 @@ private: * allow duplicates, but it maintains FIFO ordering of insertions. * * This implementation may also be parameterized with a comparator - * functor, which must implement bool operator () (const T&, const T&) const, + * functor, which must implement bool operator () (const T&, const T&) const, * returning true if the given items are equivalent. The default comparator * is sufficient for objects reliably compared with operator==. * @@ -205,7 +225,16 @@ public: typedef ACE_Unbounded_Set_Ex_Const_Iterator const_iterator; typedef C COMP; typedef ACE_Node NODE; - + + // = STL typedefs/traits. + typedef T value_type; + typedef T const const_value_type; + typedef value_type & reference; + typedef const_value_type & const_reference; + typedef value_type * pointer; + typedef const_value_type * const_pointer; + typedef ptrdiff_t difference_type; + // = Initialization and termination methods. /// Constructor. Use user specified allocation strategy /// if specified. @@ -324,7 +353,7 @@ private: /// Allocation strategy of the set. ACE_Allocator *allocator_; - + /// Comparator to be used COMP comp_; }; diff --git a/dep/ACE_wrappers/ace/Vector_T.h b/dep/ACE_wrappers/ace/Vector_T.h index 2df3aa61d..8f9dbdf9c 100644 --- a/dep/ACE_wrappers/ace/Vector_T.h +++ b/dep/ACE_wrappers/ace/Vector_T.h @@ -4,7 +4,7 @@ /** * @file Vector_T.h * - * $Id: Vector_T.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Vector_T.h 91285 2010-08-05 08:29:30Z johnnyw $ * * @author Craig L. Ching * @author Gonzalo Diethelm @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "ace/Array.h" +#include "ace/Containers_T.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -170,14 +170,14 @@ public: // = Compare operators - ///Equality comparison operator. + /// Equality comparison operator. /** * Compare this vector with @arg s for equality. Two vectors are equal * if their sizes are equal and all the elements are equal. */ bool operator== (const ACE_Vector &s) const; - ///Inequality comparison operator. + /// Inequality comparison operator. /** * Compare this vector with @arg s for inequality such that @c *this != * @arg s is always the complement of the boolean return value of @@ -272,7 +272,7 @@ public: // = Iteration methods. - /// Pass back the that hasn't been seen in the vector. + /// Pass back the @a next_item that hasn't been seen in the vector. /// Returns 0 when all items have been seen, else 1. int next (T *&next_item); diff --git a/dep/ACE_wrappers/ace/Version.h b/dep/ACE_wrappers/ace/Version.h index 0c8c9d7db..2b8e277bb 100644 --- a/dep/ACE_wrappers/ace/Version.h +++ b/dep/ACE_wrappers/ace/Version.h @@ -1,9 +1,9 @@ // -*- C++ -*- -// $Id: Version.h 82705 2008-09-15 11:08:20Z sma $ +// $Id: Version.h 91613 2010-09-04 09:31:47Z johnnyw $ // This is file was automatically generated by \$ACE_ROOT/bin/make_release. #define ACE_MAJOR_VERSION 5 -#define ACE_MINOR_VERSION 6 -#define ACE_BETA_VERSION 6 -#define ACE_VERSION "5.6.6" +#define ACE_MINOR_VERSION 8 +#define ACE_BETA_VERSION 2 +#define ACE_VERSION "5.8.2" diff --git a/dep/ACE_wrappers/ace/WFMO_Reactor.cpp b/dep/ACE_wrappers/ace/WFMO_Reactor.cpp index 7195749ad..a86b9798e 100644 --- a/dep/ACE_wrappers/ace/WFMO_Reactor.cpp +++ b/dep/ACE_wrappers/ace/WFMO_Reactor.cpp @@ -1,4 +1,4 @@ -// $Id: WFMO_Reactor.cpp 81138 2008-03-28 09:18:15Z johnnyw $ +// $Id: WFMO_Reactor.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/WFMO_Reactor.h" @@ -14,7 +14,7 @@ #include "ace/WFMO_Reactor.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ace, WFMO_Reactor, "$Id: WFMO_Reactor.cpp 81138 2008-03-28 09:18:15Z johnnyw $") + #include "ace/Auto_Ptr.h" @@ -1137,15 +1137,12 @@ ACE_WFMO_Reactor::current_info (ACE_HANDLE, size_t &) int ACE_WFMO_Reactor::open (size_t size, - int unused, + bool, ACE_Sig_Handler *sh, ACE_Timer_Queue *tq, - int disable_notify_pipe, + int, ACE_Reactor_Notify *notify) { - ACE_UNUSED_ARG (unused); - ACE_UNUSED_ARG (disable_notify_pipe); - // This GUARD is necessary since we are updating shared state. ACE_GUARD_RETURN (ACE_Process_Mutex, ace_mon, this->lock_, -1); @@ -1759,9 +1756,13 @@ ACE_WFMO_Reactor::ok_to_wait (ACE_Time_Value *max_wait_time, // grab the lock and recheck the ok_to_wait_ event. When we can get them // both, or there's an error/timeout, return. #if defined (ACE_HAS_WINCE) - ACE_Time_Value timeout = ACE_OS::gettimeofday (); + ACE_UNUSED_ARG (alertable); + ACE_Time_Value timeout; if (max_wait_time != 0) - timeout += *max_wait_time; + { + timeout = ACE_OS::gettimeofday (); + timeout += *max_wait_time; + } while (1) { int status; @@ -1776,14 +1777,15 @@ ACE_WFMO_Reactor::ok_to_wait (ACE_Time_Value *max_wait_time, if (max_wait_time == 0) status = this->lock_.acquire (); else - status = this->lock_.acquire (timeout); + { + status = this->lock_.acquire (timeout); + } if (status == -1) return -1; // Have the lock_, now re-check the event. If it's not signaled, // another thread changed something so go back and wait again. - ACE_Time_Value poll_it = ACE_OS::gettimeofday (); - if (this->ok_to_wait_.wait (&poll_it) == 0) + if (this->ok_to_wait_.wait (&ACE_Time_Value::zero, 0) == 0) break; this->lock_.release (); } @@ -1902,10 +1904,8 @@ ACE_WFMO_Reactor::expire_timers (void) int ACE_WFMO_Reactor::dispatch (DWORD wait_status) { - int handlers_dispatched = 0; - // Expire timers - handlers_dispatched += this->expire_timers (); + int handlers_dispatched = this->expire_timers (); switch (wait_status) { @@ -1940,7 +1940,7 @@ ACE_WFMO_Reactor::dispatch_handles (DWORD wait_status) DWORD dispatch_slot = 0; // Cache this value, this is the absolute value. - DWORD max_handlep1 = this->handler_rep_.max_handlep1 (); + DWORD const max_handlep1 = this->handler_rep_.max_handlep1 (); // nCount starts off at , this is a transient count of // handles last waited on. @@ -1954,9 +1954,9 @@ ACE_WFMO_Reactor::dispatch_handles (DWORD wait_status) #if ! defined(__BORLANDC__) \ && !defined (ghs) \ && !defined (__MINGW32__) \ - && !(defined (_MSC_VER) && _MSC_VER >= 1300) + && !defined (_MSC_VER) // wait_status is unsigned in Borland, Green Hills, - // mingw32 and MSVC++ >= 7.1. + // mingw32 and MSVC++ // This >= is always true, with a warning. wait_status >= WAIT_OBJECT_0 && #endif @@ -2218,7 +2218,7 @@ ACE_WFMO_Reactor::upcall (ACE_Event_Handler *event_handler, } } - if (ACE_BIT_ENABLED (actual_events, FD_ACCEPT)) + if (ACE_BIT_ENABLED (actual_events, FD_ACCEPT)) { action = event_handler->handle_input (io_handle); if (action <= 0) diff --git a/dep/ACE_wrappers/ace/WFMO_Reactor.h b/dep/ACE_wrappers/ace/WFMO_Reactor.h index 1bbf207ec..fb3a14d28 100644 --- a/dep/ACE_wrappers/ace/WFMO_Reactor.h +++ b/dep/ACE_wrappers/ace/WFMO_Reactor.h @@ -4,7 +4,7 @@ /** * @file WFMO_Reactor.h * - * $Id: WFMO_Reactor.h 81138 2008-03-28 09:18:15Z johnnyw $ + * $Id: WFMO_Reactor.h 84727 2009-03-05 19:22:29Z johnnyw $ * * @author Irfan Pyarali * @author Tim Harrison @@ -337,7 +337,7 @@ public: // = Sanity checking. - // Check the to make sure it's a valid ACE_HANDLE + // Check the @a handle to make sure it's a valid ACE_HANDLE int invalid_handle (ACE_HANDLE handle) const; // = Accessors. @@ -412,22 +412,22 @@ public: ACE_Reactor_Mask to_be_removed_masks); /** - * Return the Event_Handler associated with . Return 0 if - * is not registered. + * Return the Event_Handler associated with @a handle. Return 0 if + * @a handle is not registered. */ ACE_Event_Handler *find_handler (ACE_HANDLE handle); /** - * Check to see if is associated with a valid Event_Handler - * bound to @a mask. Return the associated with this - * @a handler if != 0. + * Check to see if @a handle is associated with a valid Event_Handler + * bound to @a mask. Return the @a event_handler associated with this + * @a handler if @a event_handler != 0. */ int handler (ACE_HANDLE handle, ACE_Reactor_Mask mask, ACE_Event_Handler **event_handler = 0); /** - * Check to see if is associated with a valid + * Check to see if @a handle is associated with a valid * Event_Handler. Return Event_Handler and associated masks. */ ACE_Event_Handler *handler (ACE_HANDLE handle, @@ -510,7 +510,7 @@ public: /** * Special trick to unblock when updates - * occur. All we do is enqueue and @a mask onto the + * occur. All we do is enqueue @a event_handler and @a mask onto the * ACE_Message_Queue and wakeup the by signaling * its handle. The ACE_Time_Value indicates how long * to blocking trying to notify the . If @a timeout == @@ -540,7 +540,7 @@ public: /// Verify whether the buffer has dispatchable info or not. virtual int is_dispatchable (ACE_Notification_Buffer &buffer); - /// Read one of the notify call on the into the + /// Read one of the notify call on the @a handle into the /// . This could be because of a thread trying to unblock /// the virtual int read_notify_pipe (ACE_HANDLE handle, @@ -549,7 +549,7 @@ public: /** * Set the maximum number of times that the * method will iterate and - * dispatch the that are passed in via the + * dispatch the ACE_Event_Handlers that are passed in via the * notify queue before breaking out of its * loop. By default, this is set to * -1, which means "iterate until the queue is empty." Setting this @@ -562,7 +562,7 @@ public: /** * Get the maximum number of times that the * method will iterate and - * dispatch the that are passed in via the + * dispatch the ACE_Event_Handlers that are passed in via the * notify queue before breaking out of its * loop. */ @@ -570,7 +570,7 @@ public: /** * Purge any notifications pending in this reactor for the specified - * ACE_Event_Handler object. If == 0, all notifications for all + * ACE_Event_Handler object. If @a eh == 0, all notifications for all * handlers are removed (but not any notifications posted just to wake up * the reactor itself). Returns the number of notifications purged. * Returns -1 on error. @@ -588,7 +588,7 @@ private: /** * Called when the notification event waited on by * is signaled. This dequeues all pending - * and dispatches them. + * ACE_Event_Handlers and dispatches them. */ virtual int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0); @@ -596,7 +596,7 @@ private: /// thread up (e.g., when the method is called). ACE_Auto_Event wakeup_one_thread_; - /// Message queue that keeps track of pending . + /// Message queue that keeps track of pending ACE_Event_Handlers. /// This queue must be thread-safe because it can be called by /// multiple threads of control. ACE_Message_Queue message_queue_; @@ -604,7 +604,7 @@ private: /** * Keeps track of the maximum number of times that the * method will iterate and - * dispatch the that are passed in via the + * dispatch the ACE_Event_Handlers that are passed in via the * notify queue before breaking out of its * loop. By default, this is set to * -1, which means "iterate until the queue is empty." @@ -697,7 +697,7 @@ public: * used for internal management purposes. */ virtual int open (size_t size = ACE_WFMO_Reactor::DEFAULT_SIZE, - int restart = 0, + bool restart = false, ACE_Sig_Handler * = 0, ACE_Timer_Queue * = 0, int disable_notify_pipe = 0, @@ -788,13 +788,13 @@ public: // = Register and remove Handlers. /** - * Register an ACE_Event_Handler . Since no Event + * Register an ACE_Event_Handler @a event_handler. Since no Event * Mask is passed through this interface, it is assumed that the - * being passed in is an event handle and when the event + * @a handle being passed in is an event handle and when the event * becomes signaled, will call handle_signal on - * . If == the + * @a event_handler. If @a handle == the * will call the method of - * to extract the underlying event handle. + * @a event_handler to extract the underlying event handle. */ virtual int register_handler (ACE_Event_Handler *event_handler, ACE_HANDLE event_handle = ACE_INVALID_HANDLE); @@ -833,16 +833,16 @@ public: virtual int register_handler (ACE_Event_Handler *event_handler, ACE_Reactor_Mask mask); - /// Register with all the in the + /// Register @a event_handler with all the @a handles in the /// . virtual int register_handler (const ACE_Handle_Set &handles, ACE_Event_Handler *event_handler, ACE_Reactor_Mask mask); /** - * Register to handle the signal @a signum using the - * . Returns the that was previously registered - * (if any), along with the of the signal handler. + * 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. */ virtual int register_handler (int signum, ACE_Event_Handler *new_sh, @@ -850,31 +850,31 @@ public: ACE_Event_Handler **old_sh = 0, ACE_Sig_Action *old_disp = 0); - /// Registers to handle a set of signals using the - /// . + /// Registers @a new_sh to handle a set of signals @a sigset using the + /// @a new_disp. virtual int register_handler (const ACE_Sig_Set &sigset, ACE_Event_Handler *new_sh, ACE_Sig_Action *new_disp = 0); /** - * Removes from the . Note that + * Removes @a event_handler from the . Note that * the will call the method of - * to extract the underlying handle. If @a mask == + * @a event_handler to extract the underlying handle. If @a mask == * ACE_Event_Handler::DONT_CALL then the method of - * the is not invoked. Note that the can + * the @a event_handler is not invoked. Note that the @a handle can * either be the or the */ virtual int remove_handler (ACE_Event_Handler *event_handler, ACE_Reactor_Mask mask); /** - * Removes from the . If @a mask == + * Removes @a handle from the . If @a mask == * ACE_Event_Handler::DONT_CALL then the method of - * the is not invoked. Note that the can + * the is not invoked. Note that the @a handle can * either be the or the * * For the case of I/O entries, this removes the @a mask binding of - * whose handle is from . If + * whose handle is @a handle from . If * there are no more bindings for this then it is * removed from the WFMO_Reactor. For simple event entries, mask is * mostly ignored and the is always removed from @@ -884,7 +884,7 @@ public: ACE_Reactor_Mask mask); /** - * Removes all the @a mask bindings for handles in the + * Removes all the @a mask bindings for handles in the @a handle_set * bind of . If there are no more bindings for any * of these handles then they are removed from WFMO_Reactor. */ @@ -893,7 +893,7 @@ public: /** * Remove the ACE_Event_Handler currently associated with @a signum. - * is ignored in this implementation since there is only + * @a sigkey is ignored in this implementation since there is only * one instance of a signal handler. Install the new disposition * (if given) and return the previous disposition (if desired by the * caller). Returns 0 on success and -1 if @a signum is invalid. @@ -903,32 +903,32 @@ public: ACE_Sig_Action *old_disp = 0, int sigkey = -1); - /// Calls for every signal in . + /// Calls for every signal in @a sigset. virtual int remove_handler (const ACE_Sig_Set &sigset); // = Suspend and resume Handlers. - /// Suspend temporarily. Use + /// Suspend @a event_handler temporarily. Use /// to get the handle. virtual int suspend_handler (ACE_Event_Handler *event_handler); - /// Suspend temporarily. + /// Suspend @a handle temporarily. virtual int suspend_handler (ACE_HANDLE handle); - /// Suspend all in handle set temporarily. + /// Suspend all @a handles in handle set temporarily. virtual int suspend_handler (const ACE_Handle_Set &handles); /// Suspend all temporarily. virtual int suspend_handlers (void); - /// Resume . Use to + /// Resume @a event_handler. Use to /// get the handle. virtual int resume_handler (ACE_Event_Handler *event_handler); - /// Resume . + /// Resume @a handle. virtual int resume_handler (ACE_HANDLE handle); - /// Resume all in handle set. + /// Resume all @a handles in handle set. virtual int resume_handler (const ACE_Handle_Set &handles); /// Resume all . @@ -941,12 +941,12 @@ public: virtual int resumable_handler (void); /** - * Return 1 if we any event associations were made by the reactor - * for the handles that it waits on, 0 otherwise. Since the + * Return true if we any event associations were made by the reactor + * for the handles that it waits on, false otherwise. Since the * WFMO_Reactor does use event associations, this function always - * return 1. + * return true. */ - virtual int uses_event_associations (void); + virtual bool uses_event_associations (void); // Timer management. @@ -983,7 +983,7 @@ public: const ACE_Time_Value &interval); /// Cancel all Event_Handlers that match the address of - /// . Returns number of handler's cancelled. + /// @a event_handler. Returns number of handler's cancelled. virtual int cancel_timer (ACE_Event_Handler *event_handler, int dont_call_handle_close = 1); @@ -1003,8 +1003,8 @@ public: // = High-level Event_Handler scheduling operations /** - * Add @a masks_to_be_added to the 's entry in - * WFMO_Reactor. must already have been registered + * Add @a masks_to_be_added to the @a event_handler's entry in + * WFMO_Reactor. @a event_handler must already have been registered * with WFMO_Reactor. */ virtual int schedule_wakeup (ACE_Event_Handler *event_handler, @@ -1012,7 +1012,7 @@ public: /** * Add @a masks_to_be_added to the @a handle's entry in WFMO_Reactor. - * The Event_Handler associated with must already have been + * The Event_Handler associated with @a handle must already have been * registered with WFMO_Reactor. */ virtual int schedule_wakeup (ACE_HANDLE handle, @@ -1051,7 +1051,7 @@ public: /** * Set the maximum number of times that the * method will iterate and - * dispatch the that are passed in via the + * dispatch the ACE_Event_Handlers that are passed in via the * notify queue before breaking out of its * loop. By default, this is set to * -1, which means "iterate until the queue is empty." Setting this @@ -1064,7 +1064,7 @@ public: /** * Get the maximum number of times that the * method will iterate and - * dispatch the that are passed in via the + * dispatch the ACE_Event_Handlers that are passed in via the * notify queue before breaking out of its * loop. */ @@ -1088,8 +1088,8 @@ public: /** * Check to see if is associated with a valid Event_Handler - * bound to @a mask. Return the associated with this - * @a handler if != 0. + * bound to @a mask. Return the @a event_handler associated with this + * @a handler if @a event_handler != 0. */ virtual int handler (ACE_HANDLE handle, ACE_Reactor_Mask mask, @@ -1119,7 +1119,7 @@ public: virtual void wakeup_all_threads (void); /** - * Transfers ownership of the WFMO_Reactor to the . The + * Transfers ownership of the WFMO_Reactor to the @a new_owner. The * transfer will not complete until all threads are ready (just like * the handle set). */ @@ -1129,10 +1129,10 @@ public: virtual int owner (ACE_thread_t *owner); /// Get the existing restart value. - virtual int restart (void); + virtual bool restart (void); /// Set a new value for restart and return the original value. - virtual int restart (int r); + virtual bool restart (bool r); /// Not implemented virtual void requeue_position (int); @@ -1143,8 +1143,8 @@ public: // = Low-level wait_set mask manipulation methods. /** - * Modify @a masks of the 's entry in WFMO_Reactor - * depending upon . must already have + * Modify @a masks of the @a event_handler's entry in WFMO_Reactor + * depending upon . @a event_handler must already have * been registered with WFMO_Reactor. */ virtual int mask_ops (ACE_Event_Handler *event_handler, @@ -1308,7 +1308,7 @@ protected: /** * A manual event is used so that we can wake everyone up (e.g., - * when are bounded and unbound from the + * when ACE_Event_Handlers are bounded and unbound from the * handler repository). */ ACE_Manual_Event wakeup_all_threads_; diff --git a/dep/ACE_wrappers/ace/WFMO_Reactor.inl b/dep/ACE_wrappers/ace/WFMO_Reactor.inl index a155019d8..6d3e43db6 100644 --- a/dep/ACE_wrappers/ace/WFMO_Reactor.inl +++ b/dep/ACE_wrappers/ace/WFMO_Reactor.inl @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: WFMO_Reactor.inl 81138 2008-03-28 09:18:15Z johnnyw $ +// $Id: WFMO_Reactor.inl 82949 2008-10-06 22:32:10Z shuston $ #include "ace/Handle_Set.h" #include "ace/Reactor.h" @@ -735,7 +735,9 @@ ACE_WFMO_Reactor::suspend_handlers (void) // First suspend all current handles bool changes_required = false; - for (size_t i = 0; + // Skip over the notify and wakeup_all_threads handles. These are registered + // by ACE_WFMO_Reactor::open(), not by users, and should not be suspended. + for (size_t i = 2; i < this->handler_rep_.max_handlep1_ && !error; i++) { @@ -865,12 +867,12 @@ ACE_WFMO_Reactor::resume_handlers (void) return error ? -1 : 0; } -ACE_INLINE int +ACE_INLINE bool ACE_WFMO_Reactor::uses_event_associations (void) { // Since the WFMO_Reactor does use event associations, this function // always return 1. - return 1; + return true; } ACE_INLINE int @@ -1104,16 +1106,16 @@ ACE_WFMO_Reactor::requeue_position (void) ACE_NOTSUP_RETURN (-1); } -ACE_INLINE int +ACE_INLINE bool ACE_WFMO_Reactor::restart (void) { - return 0; + return false; } -ACE_INLINE int -ACE_WFMO_Reactor::restart (int) +ACE_INLINE bool +ACE_WFMO_Reactor::restart (bool) { - return 0; + return false; } ACE_INLINE int diff --git a/dep/ACE_wrappers/ace/WIN32_Asynch_IO.cpp b/dep/ACE_wrappers/ace/WIN32_Asynch_IO.cpp index 6f201accc..75da1ad6f 100644 --- a/dep/ACE_wrappers/ace/WIN32_Asynch_IO.cpp +++ b/dep/ACE_wrappers/ace/WIN32_Asynch_IO.cpp @@ -1,11 +1,7 @@ -// $Id: WIN32_Asynch_IO.cpp 82444 2008-07-28 13:33:07Z johnnyw $ +// $Id: WIN32_Asynch_IO.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $ #include "ace/WIN32_Asynch_IO.h" -ACE_RCSID (ace, - Win32_Asynch_IO, - "$Id: WIN32_Asynch_IO.cpp 82444 2008-07-28 13:33:07Z johnnyw $") - #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) && \ (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 == 1)) @@ -847,11 +843,13 @@ ACE_WIN32_Asynch_Write_Stream::write (ACE_Message_Block &message_block, -1); // Shared write - int return_val = this->shared_write (result); + int const return_val = this->shared_write (result); // Upon errors if (return_val == -1) - delete result; + { + delete result; + } return return_val; } @@ -1024,8 +1022,10 @@ ACE_WIN32_Asynch_Write_Stream::shared_write (ACE_WIN32_Asynch_Write_Stream_Resul result, 0); if (initiate_result == 0) - // Immediate success: the OVERLAPPED will still get queued. - return 0; + { + // Immediate success: the OVERLAPPED will still get queued. + return 0; + } #else initiate_result = ::WriteFile (result->handle (), result->message_block ().rd_ptr (), @@ -2385,7 +2385,7 @@ ACE_WIN32_Asynch_Connect::open (const ACE_Handler::Proxy_Ptr &handler_proxy, if (this->flg_open_) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%N:%l:ACE_WIN32_Asynch_Connect::open:") - ACE_TEXT ("connector already open \n")), + ACE_TEXT ("connector already open\n")), -1); //int result = diff --git a/dep/ACE_wrappers/ace/WIN32_Proactor.cpp b/dep/ACE_wrappers/ace/WIN32_Proactor.cpp index a55983897..3d1d3fcfa 100644 --- a/dep/ACE_wrappers/ace/WIN32_Proactor.cpp +++ b/dep/ACE_wrappers/ace/WIN32_Proactor.cpp @@ -1,6 +1,6 @@ -// $Id: WIN32_Proactor.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: WIN32_Proactor.cpp 91286 2010-08-05 09:04:31Z johnnyw $ -// ACE_RCSID(ace, Proactor, "$Id: WIN32_Proactor.cpp 80826 2008-03-04 14:51:23Z wotte $") +// #include "ace/WIN32_Proactor.h" diff --git a/dep/ACE_wrappers/ace/XTI_ATM_Mcast.cpp b/dep/ACE_wrappers/ace/XTI_ATM_Mcast.cpp index 503e3fea0..e01c55eab 100644 --- a/dep/ACE_wrappers/ace/XTI_ATM_Mcast.cpp +++ b/dep/ACE_wrappers/ace/XTI_ATM_Mcast.cpp @@ -1,8 +1,8 @@ -// $Id: XTI_ATM_Mcast.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: XTI_ATM_Mcast.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/XTI_ATM_Mcast.h" -ACE_RCSID(ace, XTI_ATM_Mcast, "$Id: XTI_ATM_Mcast.cpp 80826 2008-03-04 14:51:23Z wotte $") + #if defined (ACE_HAS_XTI_ATM) diff --git a/dep/ACE_wrappers/ace/ace.mpc b/dep/ACE_wrappers/ace/ace.mpc new file mode 100644 index 000000000..eba67d895 --- /dev/null +++ b/dep/ACE_wrappers/ace/ace.mpc @@ -0,0 +1,516 @@ +// -*- MPC -*- now wouldn't this be cool... +// $Id: ace.mpc 91579 2010-08-31 12:41:37Z johnnyw $ + +project(ACE) : ace_output, acedefaults, install, other, codecs, token, svcconf, uuid, filecache, versioned_namespace, pkgconfig, support_ostream { + avoids = ace_for_tao + sharedname = ACE + dynamicflags += ACE_BUILD_DLL + + Source_Files(ACE_COMPONENTS) { + ACE.cpp + ACE_crc_ccitt.cpp + ACE_crc32.cpp + ace_wchar.cpp + Activation_Queue.cpp + Active_Map_Manager.cpp + Addr.cpp + Argv_Type_Converter.cpp + Assert.cpp + Asynch_IO.cpp + Asynch_IO_Impl.cpp + Asynch_Pseudo_Task.cpp + ATM_Acceptor.cpp + ATM_Addr.cpp + ATM_Connector.cpp + ATM_Params.cpp + ATM_QoS.cpp + ATM_Stream.cpp + Atomic_Op.cpp + Atomic_Op_Sparc.c + Auto_Event.cpp + Barrier.cpp + Base_Thread_Adapter.cpp + Based_Pointer_Repository.cpp + Basic_Stats.cpp + Basic_Types.cpp + Capabilities.cpp + CDR_Base.cpp + CDR_Stream.cpp + CDR_Size.cpp + Cleanup.cpp + Codeset_IBM1047.cpp + Codeset_Registry.cpp + Codeset_Registry_db.cpp + Condition_Recursive_Thread_Mutex.cpp + Condition_Thread_Mutex.cpp + Configuration.cpp + Configuration_Import_Export.cpp + Connection_Recycling_Strategy.cpp + Containers.cpp + Copy_Disabled.cpp + Countdown_Time.cpp + Date_Time.cpp + DEV.cpp + DEV_Addr.cpp + DEV_Connector.cpp + DEV_IO.cpp + DLL_Manager.cpp + Dev_Poll_Reactor.cpp + Dirent.cpp + Dirent_Selector.cpp + Dump.cpp + Dynamic.cpp + Dynamic_Message_Strategy.cpp + Event.cpp + Event_Handler.cpp + FIFO.cpp + FIFO_Recv.cpp + FIFO_Recv_Msg.cpp + FIFO_Send.cpp + FIFO_Send_Msg.cpp + FILE.cpp + FILE_Addr.cpp + FILE_Connector.cpp + FILE_IO.cpp + File_Lock.cpp + Flag_Manip.cpp + Framework_Component.cpp + Functor.cpp + Functor_String.cpp + Get_Opt.cpp + gethrtime.cpp + Handle_Ops.cpp + Handle_Set.cpp + Hashable.cpp + High_Res_Timer.cpp + ICMP_Socket.cpp + INET_Addr.cpp + Init_ACE.cpp + IO_SAP.cpp + IO_Cntl_Msg.cpp + IOStream.cpp + IPC_SAP.cpp + Lib_Find.cpp + Local_Memory_Pool.cpp + Lock.cpp + Log_Msg.cpp + Log_Msg_Backend.cpp + Log_Msg_Callback.cpp + Log_Msg_IPC.cpp + Log_Msg_NT_Event_Log.cpp + Log_Msg_UNIX_Syslog.cpp + Log_Record.cpp + Logging_Strategy.cpp + LSOCK.cpp + LSOCK_Acceptor.cpp + LSOCK_CODgram.cpp + LSOCK_Connector.cpp + LSOCK_Dgram.cpp + LSOCK_Stream.cpp + Malloc.cpp + Malloc_Allocator.cpp + Manual_Event.cpp + MEM_Acceptor.cpp + MEM_Addr.cpp + MEM_Connector.cpp + MEM_IO.cpp + Mem_Map.cpp + MEM_SAP.cpp + MEM_Stream.cpp + Message_Block.cpp + Message_Queue.cpp + Message_Queue_NT.cpp + Message_Queue_Vx.cpp + Method_Request.cpp + MMAP_Memory_Pool.cpp + Msg_WFMO_Reactor.cpp + Monitor_Admin.cpp + Monitor_Admin_Manager.cpp + Monitor_Base.cpp + Monitor_Point_Registry.cpp + Monitor_Size.cpp + Monitor_Control_Types.cpp + Monitor_Control_Action.cpp + Multihomed_INET_Addr.cpp + Mutex.cpp + Netlink_Addr.cpp + Notification_Strategy.cpp + Notification_Queue.cpp + Obchunk.cpp + Object_Manager.cpp + Object_Manager_Base.cpp + OS_Errno.cpp + OS_Log_Msg_Attributes.cpp + OS_main.cpp + OS_NS_arpa_inet.cpp + OS_NS_ctype.cpp + OS_NS_dirent.cpp + OS_NS_dlfcn.cpp + OS_NS_errno.cpp + OS_NS_fcntl.cpp + OS_NS_math.cpp + OS_NS_netdb.cpp + OS_NS_poll.cpp + OS_NS_pwd.cpp + OS_NS_regex.cpp + OS_NS_signal.cpp + OS_NS_stdio.cpp + OS_NS_stdlib.cpp + OS_NS_string.cpp + OS_NS_strings.cpp + OS_NS_stropts.cpp + OS_NS_sys_mman.cpp + OS_NS_sys_msg.cpp + OS_NS_sys_resource.cpp + OS_NS_sys_select.cpp + OS_NS_sys_sendfile.cpp + OS_NS_sys_shm.cpp + OS_NS_sys_socket.cpp + OS_NS_sys_stat.cpp + OS_NS_sys_time.cpp + OS_NS_sys_uio.cpp + OS_NS_sys_utsname.cpp + OS_NS_sys_wait.cpp + OS_NS_Thread.cpp + OS_NS_time.cpp + OS_NS_unistd.cpp + OS_NS_wchar.cpp + OS_NS_wctype.cpp + OS_QoS.cpp + OS_Thread_Adapter.cpp + OS_TLI.cpp + Pagefile_Memory_Pool.cpp + Parse_Node.cpp + PI_Malloc.cpp + Ping_Socket.cpp + Pipe.cpp + POSIX_Asynch_IO.cpp + POSIX_CB_Proactor.cpp + POSIX_Proactor.cpp + Priority_Reactor.cpp + Proactor.cpp + Proactor_Impl.cpp + Process.cpp + Process_Manager.cpp + Process_Mutex.cpp + Process_Semaphore.cpp + Profile_Timer.cpp + Reactor.cpp + Reactor_Impl.cpp + Reactor_Notification_Strategy.cpp + Reactor_Timer_Interface.cpp + Read_Buffer.cpp + Recursive_Thread_Mutex.cpp + Recyclable.cpp + Registry.cpp + Rtems_init.c + RW_Mutex.cpp + RW_Process_Mutex.cpp + RW_Thread_Mutex.cpp + Sample_History.cpp + Sbrk_Memory_Pool.cpp + Sched_Params.cpp + Select_Reactor_Base.cpp + Semaphore.cpp + Shared_Memory.cpp + Shared_Memory_MM.cpp + Shared_Memory_Pool.cpp + Shared_Memory_SV.cpp + Sig_Adapter.cpp + Sig_Handler.cpp + Signal.cpp + SOCK.cpp + SOCK_Acceptor.cpp + SOCK_CODgram.cpp + Sock_Connect.cpp + SOCK_Connector.cpp + SOCK_Dgram.cpp + SOCK_Dgram_Bcast.cpp + SOCK_Dgram_Mcast.cpp + SOCK_IO.cpp + SOCK_Netlink.cpp + SOCK_SEQPACK_Acceptor.cpp + SOCK_SEQPACK_Association.cpp + SOCK_SEQPACK_Connector.cpp + SOCK_Stream.cpp + SPIPE.cpp + SPIPE_Acceptor.cpp + SPIPE_Addr.cpp + SPIPE_Connector.cpp + SPIPE_Stream.cpp + SString.cpp + Stack_Trace.cpp + Stats.cpp + String_Base_Const.cpp + SUN_Proactor.cpp + SV_Message.cpp + SV_Message_Queue.cpp + SV_Semaphore_Complex.cpp + SV_Semaphore_Simple.cpp + SV_Shared_Memory.cpp + Synch_Options.cpp + System_Time.cpp + Task.cpp + Thread.cpp + Thread_Adapter.cpp + Thread_Control.cpp + Thread_Exit.cpp + Thread_Hook.cpp + Thread_Manager.cpp + Thread_Mutex.cpp + Thread_Semaphore.cpp + Throughput_Stats.cpp + Time_Value.cpp + Timeprobe.cpp + TLI.cpp + TLI_Acceptor.cpp + TLI_Connector.cpp + TLI_Stream.cpp + Token.cpp + TP_Reactor.cpp + Trace.cpp + TSS_Adapter.cpp + TTY_IO.cpp + UNIX_Addr.cpp + UPIPE_Acceptor.cpp + UPIPE_Connector.cpp + UPIPE_Stream.cpp + WFMO_Reactor.cpp + WIN32_Asynch_IO.cpp + WIN32_Proactor.cpp + XTI_ATM_Mcast.cpp + } + + Template_Files { + Acceptor.cpp + Active_Map_Manager_T.cpp + ARGV.cpp + Arg_Shifter.cpp + Array_Base.cpp + Array_Map.cpp + Asynch_Acceptor.cpp + Asynch_Connector.cpp + Atomic_Op_T.cpp + Atomic_Op_GCC_T.cpp + Auto_Functor.cpp + Auto_IncDec_T.cpp + Auto_Ptr.cpp + Based_Pointer_T.cpp + Cache_Map_Manager_T.cpp + Cached_Connect_Strategy_T.cpp + Caching_Strategies_T.cpp + Caching_Utility_T.cpp + Cleanup_Strategies_T.cpp + Condition_T.cpp + Connector.cpp + Containers_T.cpp + Dump_T.cpp + Dynamic_Service.cpp + Env_Value_T.cpp + Event_Handler_T.cpp + Framework_Component_T.cpp + Free_List.cpp + Functor_T.cpp + Future.cpp + Future_Set.cpp + Guard_T.cpp + Hash_Cache_Map_Manager_T.cpp + Hash_Map_Manager_T.cpp + Hash_Multi_Map_Manager_T.cpp + Hash_Map_With_Allocator_T.cpp + IOStream_T.cpp + Intrusive_Auto_Ptr.cpp + Intrusive_List.cpp + Intrusive_List_Node.cpp + LOCK_SOCK_Acceptor.cpp + Local_Name_Space_T.cpp + Lock_Adapter_T.cpp + Malloc_T.cpp + Managed_Object.cpp + Map_Manager.cpp + Map_T.cpp + Message_Block_T.cpp + Message_Queue_T.cpp + Metrics_Cache_T.cpp + Module.cpp + Node.cpp + Obstack_T.cpp + Pair_T.cpp + RB_Tree.cpp + Reactor_Token_T.cpp + Refcountable_T.cpp + Refcounted_Auto_Ptr.cpp + Reverse_Lock_T.cpp + Select_Reactor_T.cpp + Singleton.cpp + Strategies_T.cpp + Stream.cpp + Stream_Modules.cpp + String_Base.cpp + Svc_Handler.cpp + Synch_T.cpp + Refcountable_T.cpp + TSS_T.cpp + Task_Ex_T.cpp + Task_T.cpp + Test_and_Set.cpp + Timeprobe_T.cpp + Timer_Hash_T.cpp + Timer_Heap_T.cpp + Timer_List_T.cpp + Timer_Queue_Adapters.cpp + Timer_Queue_T.cpp + Timer_Wheel_T.cpp + Tokenizer_T.cpp + Typed_SV_Message.cpp + Typed_SV_Message_Queue.cpp + Unbounded_Queue.cpp + Unbounded_Set.cpp + Unbounded_Set_Ex.cpp + Vector_T.cpp + } + + Inline_Files { + Bound_Ptr.inl + Condition_T.inl + Guard_T.inl + Handle_Gobbler.inl + Intrusive_Auto_Ptr.inl + Lock_Adapter_T.inl + Metrics_Cache_T.inl + Refcounted_Auto_Ptr.inl + Reverse_Lock_T.inl + TSS_T.inl + ace_wchar.inl + OS.inl + } + + Header_Files { + // Set recurse so that everything from os_include is pulled in + recurse = 1 + + ACE_export.h + Array.h + Bound_Ptr.h + CE_Screen_Output.h + Codeset_Symbols.h + CORBA_macros.h + Codeset_Symbols.h + Condition_T.h + Default_Constants.h + Global_Macros.h + Guard_T.h + Hash_Map_Manager.h + Handle_Gobbler.h + If_Then_Else.h + IO_Cntl_Msg.h + Intrusive_Auto_Ptr.h + Lock_Adapter_T.h + Log_Priority.h + Malloc_Base.h + Map.h + Method_Object.h + Metrics_Cache.h + Metrics_Cache_T.h + Memory_Pool.h + Min_Max.h + Netlink_Addr.h + Null_Barrier.h + Null_Condition.h + Null_Mutex.h + Null_Semaphore.h + Numeric_Limits.h + OS.h + OS_Dirent.h + OS_Memory.h + OS_NS_macros.h + OS_String.h + OS_Thread_Adapter.h + Object_Manager_Base.h + Obstack.h + Pair.h + Proactor_Impl.h + Reactor_Impl.h + Reactor_Timer_Interface.h + Refcountable.h + Refcounted_Auto_Ptr.h + Reverse_Lock_T.h + Select_Reactor.h + Service_Templates.h + SOCK_Netlink.h + SStringfwd.h + Stack_Trace.h + Static_Object_Lock.h + Strategies.h + String_Base_Const.h + Svc_Conf.h + Svc_Conf_Param.h + Svc_Conf_Tokens.h + Svc_Conf_Token_Table.h + Synch.h + Synch_Traits.h + TSS_T.h + Timer_Hash.h + Timer_Heap.h + Timer_List.h + Timer_Queue.h + Timer_Queuefwd.h + Timer_Wheel.h + Truncate.h + UPIPE_Addr.h + Value_Ptr.h + Version.h + Versioned_Namespace.h + ace_wchar.h + checked_iterator.h + config-*.h + config.h + iosfwd.h + os_include + post.h + pre.h + streams.h + svc_export.h + } + + Documentation_Files { + README + ../VERSION + } + + Pkgconfig_Files { + ACE.pc.in + } + + InstallData_Files { + gendir = bin + ../bin/MakeProjectCreator + ../bin/DependencyGenerator + ../bin/mwc.pl + ../bin/mpc.pl + ../bin/add_rel_link.sh + ../bin/depgen.pl + } + InstallData_Files { + gendir = include + ../include/makeinclude + } + InstallData_Files { + gendir = . + ../README + ../VERSION + ../PROBLEM-REPORT-FORM + ../NEWS + ../COPYING + ../AUTHORS + ../THANKS + ../docs + } + + verbatim(gnuace, postinstall) { +" perl -i -pe's!\\$$[{(]ACE_ROOT[})]!$(INSTALL_PREFIX)/include!g unless /^\\s*include / || /^INS/' $(INSTALL_PREFIX)/share/ace/include/makeinclude/wrapper_macros.GNU" +" perl -i -pe'BEGIN {$$lib = qq($(INSTALL_PREFIX)/$(INSTALL_LIB)); $$lp = qq(-value_project libpaths+=$$lib\\n); $$cl = qq(command_line =)}' -e'if ($$. == 1 && /^$$cl (.*)/ && $$1 !~ /$$lib\\b/) {chomp; print qq($$_ $$lp); $$_ = qq()}' -e'elsif ($$. == 1 && !/^$$cl/) {print qq($$cl $$lp)}' $(INSTALL_PREFIX)/share/ace/bin/MakeProjectCreator/config/MPC.cfg" +" perl -i -ne'print unless /^\\s*ARCH\\s*[+?:]?=/' $(INSTALL_PREFIX)/share/ace/include/makeinclude/platform_macros.GNU" +" echo export ACE_ROOT=$(INSTALL_PREFIX)/share/ace> $(INSTALL_PREFIX)/share/ace/ace-devel.sh" + } +} diff --git a/dep/ACE_wrappers/ace/ace.mwc b/dep/ACE_wrappers/ace/ace.mwc new file mode 100644 index 000000000..5c18480f4 --- /dev/null +++ b/dep/ACE_wrappers/ace/ace.mwc @@ -0,0 +1,18 @@ +// -*- MPC -*- +// +// $Id: ace.mwc 82426 2008-07-26 06:35:20Z johnnyw $ + +workspace { + ace.mpc + ace_for_tao.mpc + ace_flreactor.mpc + ace_foxreactor.mpc + ace_qt3reactor.mpc + ace_qt4reactor.mpc + ace_tkreactor.mpc + ace_xtreactor.mpc + ETCL + Monitor_Control + QoS + SSL +} diff --git a/dep/ACE_wrappers/ace/ace_flreactor.mpc b/dep/ACE_wrappers/ace/ace_flreactor.mpc new file mode 100644 index 000000000..49d4c165f --- /dev/null +++ b/dep/ACE_wrappers/ace/ace_flreactor.mpc @@ -0,0 +1,32 @@ +// -*- MPC -*- now wouldn't this be cool... +// $Id: ace_flreactor.mpc 90826 2010-06-24 09:07:33Z johnnyw $ + +project(ACE_FlReactor) : acedefaults, install, acelib, ace_output, ace_fl{ + + sharedname = ACE_FlReactor + dynamicflags += ACE_FLREACTOR_BUILD_DLL + + Source_Files { + FlReactor + } + + Header_Files { + FlReactor + } + + Inline_Files { + FlReactor + } + + Template_Files { + FlReactor + } + + Resource_Files { + FlReactor + } + + Pkgconfig_Files { + FlReactor/ACE_FlReactor.pc.in + } +} diff --git a/dep/ACE_wrappers/ace/ace_for_tao.mpc b/dep/ACE_wrappers/ace/ace_for_tao.mpc new file mode 100644 index 000000000..043c97428 --- /dev/null +++ b/dep/ACE_wrappers/ace/ace_for_tao.mpc @@ -0,0 +1,390 @@ +// -*- MPC -*- +// +// $Id: ace_for_tao.mpc 90826 2010-06-24 09:07:33Z johnnyw $ + +// The ACE_FOR_TAO subset is designed primarily for use with the +// TAO CosNotification service. It is not intended to be used +// for some of other TAO features and services, such as the TAO +// Strategies library, the CosNaming service, etc. +// +// Avoid adding source files simply to get some ACE/TAO-based code to +// link. This ACE_FOR_TAO subset library must remain as small as +// possible. + +project(ACE_FOR_TAO) : acedefaults, install, svcconf, uuid, versioned_namespace, pkgconfig, ace_output { + macros += ACE_LACKS_ACE_TOKEN + requires = ace_for_tao ace_svcconf + sharedname = ACE_FOR_TAO + dynamicflags += ACE_BUILD_DLL + + Source_Files(ACE_COMPONENTS) { + ACE.cpp + Active_Map_Manager.cpp + Addr.cpp + Argv_Type_Converter.cpp + Assert.cpp + Atomic_Op.cpp + Auto_Event.cpp + Barrier.cpp // Required by orbsvcs/tests/Notify/lib + Base_Thread_Adapter.cpp + Based_Pointer_Repository.cpp + Basic_Stats.cpp // Required by ace/Stats + Basic_Types.cpp + Capabilities.cpp // Required by TAO/orbsvcs/examples/ImR/Advanced + CDR_Base.cpp + CDR_Stream.cpp + CDR_Size.cpp + Cleanup.cpp + Codeset_IBM1047.cpp + Codeset_Registry.cpp + Codeset_Registry_db.cpp + Condition_Recursive_Thread_Mutex.cpp + Condition_Thread_Mutex.cpp + Countdown_Time.cpp + Copy_Disabled.cpp + DLL_Manager.cpp + Dirent.cpp // Required by TAO_IDL + Dirent_Selector.cpp + Dump.cpp + Dynamic.cpp + Dynamic_Message_Strategy.cpp + Event.cpp + Event_Handler.cpp + FILE.cpp + FILE_Addr.cpp + Flag_Manip.cpp + Framework_Component.cpp + Functor.cpp + Functor_String.cpp + Get_Opt.cpp + Handle_Ops.cpp + Handle_Set.cpp + Hashable.cpp + High_Res_Timer.cpp // Required by orbsvcs/tests/Notify/lib + INET_Addr.cpp + Init_ACE.cpp + IO_SAP.cpp + IO_Cntl_Msg.cpp + IOStream.cpp + IPC_SAP.cpp + Lib_Find.cpp + Local_Memory_Pool.cpp + Lock.cpp + Log_Msg.cpp + Log_Msg_Backend.cpp + Log_Msg_Callback.cpp + Log_Msg_IPC.cpp + Log_Msg_NT_Event_Log.cpp + Log_Msg_UNIX_Syslog.cpp + Log_Record.cpp + Logging_Strategy.cpp + Malloc.cpp + Malloc_Allocator.cpp + Manual_Event.cpp + Mem_Map.cpp + Message_Block.cpp + Message_Queue.cpp + Message_Queue_NT.cpp + MMAP_Memory_Pool.cpp + Monitor_Admin.cpp + Monitor_Admin_Manager.cpp + Monitor_Base.cpp + Monitor_Point_Registry.cpp + Monitor_Size.cpp + Monitor_Control_Types.cpp + Monitor_Control_Action.cpp + Mutex.cpp + Notification_Strategy.cpp + Notification_Queue.cpp + Obchunk.cpp + Object_Manager.cpp + Object_Manager_Base.cpp + OS_Errno.cpp + OS_Log_Msg_Attributes.cpp + OS_main.cpp + OS_NS_arpa_inet.cpp + OS_NS_ctype.cpp + OS_NS_dirent.cpp + OS_NS_dlfcn.cpp + OS_NS_errno.cpp + OS_NS_fcntl.cpp + OS_NS_math.cpp + OS_NS_netdb.cpp + OS_NS_poll.cpp + OS_NS_pwd.cpp + OS_NS_regex.cpp + OS_NS_signal.cpp + OS_NS_stdio.cpp + OS_NS_stdlib.cpp + OS_NS_string.cpp + OS_NS_strings.cpp + OS_NS_stropts.cpp + OS_NS_sys_mman.cpp + OS_NS_sys_msg.cpp + OS_NS_sys_resource.cpp + OS_NS_sys_select.cpp + OS_NS_sys_sendfile.cpp + OS_NS_sys_shm.cpp + OS_NS_sys_socket.cpp + OS_NS_sys_stat.cpp + OS_NS_sys_time.cpp + OS_NS_sys_uio.cpp + OS_NS_sys_utsname.cpp + OS_NS_sys_wait.cpp + OS_NS_Thread.cpp + OS_NS_time.cpp + OS_NS_unistd.cpp + OS_NS_wchar.cpp + OS_NS_wctype.cpp + OS_QoS.cpp + OS_Thread_Adapter.cpp + OS_TLI.cpp + Parse_Node.cpp + Pipe.cpp + Process.cpp + Process_Manager.cpp + Reactor.cpp + Reactor_Impl.cpp + Reactor_Notification_Strategy.cpp + Reactor_Timer_Interface.cpp + Read_Buffer.cpp + Recursive_Thread_Mutex.cpp + Rtems_init.c + RW_Mutex.cpp + RW_Thread_Mutex.cpp + Sched_Params.cpp + Select_Reactor_Base.cpp + Signal.cpp + Sig_Handler.cpp + Sig_Adapter.cpp + SOCK.cpp + SOCK_Acceptor.cpp + Sock_Connect.cpp + SOCK_Connector.cpp + SOCK_Dgram.cpp + SOCK_Dgram_Mcast.cpp + SOCK_IO.cpp + SOCK_Stream.cpp + SPIPE.cpp + SPIPE_Acceptor.cpp + SPIPE_Connector.cpp + SPIPE_Addr.cpp + SPIPE_Stream.cpp + SString.cpp + Stack_Trace.cpp // Required by Log_Msg.cpp + Stats.cpp // Required by orbsvcs/tests/Notify + String_Base_Const.cpp + Synch_Options.cpp + Task.cpp + Thread.cpp + Thread_Adapter.cpp + Thread_Control.cpp + Thread_Exit.cpp + Thread_Hook.cpp + Thread_Manager.cpp + Thread_Mutex.cpp + Throughput_Stats.cpp + Time_Value.cpp + Timeprobe.cpp + Token.cpp + TP_Reactor.cpp + Trace.cpp + TSS_Adapter.cpp + + // Dev_Poll_Reactor isn't available on Windows. + conditional(!prop:windows) { + Dev_Poll_Reactor.cpp + } + + // ACE_Token implementation uses semaphores on Windows and VxWorks. + conditional(prop:windows) { + NT_Service.cpp // Required by ace_for_tao sponsors + Semaphore.cpp + Process_Mutex.cpp + WFMO_Reactor.cpp + } + } + + Template_Files { + Acceptor.cpp + Active_Map_Manager_T.cpp + Array_Base.cpp + Array_Map.cpp + Arg_Shifter.cpp + ARGV.cpp + Atomic_Op_T.cpp + Auto_Functor.cpp + Auto_IncDec_T.cpp + Auto_Ptr.cpp + Based_Pointer_T.cpp + Cache_Map_Manager_T.cpp + Cached_Connect_Strategy_T.cpp + Caching_Strategies_T.cpp + Caching_Utility_T.cpp + Cleanup_Strategies_T.cpp + Condition_T.cpp + Connector.cpp + Containers_T.cpp + Dump_T.cpp + Dynamic_Service.cpp + Env_Value_T.cpp + Event_Handler_T.cpp + Framework_Component_T.cpp + Free_List.cpp + Functor_T.cpp + Guard_T.cpp + Hash_Cache_Map_Manager_T.cpp + Hash_Map_Manager_T.cpp + Hash_Map_With_Allocator_T.cpp + IOStream_T.cpp + Intrusive_List.cpp + Intrusive_List_Node.cpp + Lock_Adapter_T.cpp + Malloc_T.cpp + Managed_Object.cpp + Map_Manager.cpp + Map_T.cpp + Message_Block_T.cpp + Message_Queue_T.cpp + Module.cpp + Node.cpp + Obstack_T.cpp + Pair_T.cpp + RB_Tree.cpp + Reactor_Token_T.cpp + Refcountable_T.cpp + Refcounted_Auto_Ptr.cpp + Reverse_Lock_T.cpp + Select_Reactor_T.cpp + Singleton.cpp + Strategies_T.cpp + Stream.cpp + Stream_Modules.cpp + String_Base.cpp + Svc_Handler.cpp + Synch_T.cpp + TSS_T.cpp + Task_Ex_T.cpp + Task_T.cpp + Timeprobe_T.cpp + Timer_Hash_T.cpp + Timer_Heap_T.cpp + Timer_List_T.cpp + Timer_Queue_Adapters.cpp + Timer_Queue_T.cpp + Timer_Wheel_T.cpp + Tokenizer_T.cpp + Typed_SV_Message.cpp + Typed_SV_Message_Queue.cpp + Unbounded_Queue.cpp + Unbounded_Set.cpp + Vector_T.cpp + } + + Inline_Files { + Bound_Ptr.inl + Condition_T.inl + Guard_T.inl + Handle_Gobbler.inl + Lock_Adapter_T.inl + OS.inl + OS_Memory.inl + OS_String.inl + Refcounted_Auto_Ptr.inl + Reverse_Lock_T.inl + TSS_T.inl + ace_wchar.inl + MMAP_Memory_Pool.inl + Mem_Map.inl + } + + Header_Files { + ACE_export.h + Array.h + Based_Pointer_Repository.h + Bound_Ptr.h + CORBA_macros.h + Condition_T.h + Default_Constants.h + Exception_Macros.h + Global_Macros.h + Guard_T.h + Handle_Gobbler.h + If_Then_Else.h + IO_Cntl_Msg.h + Lock_Adapter_T.h + Log_Priority.h + Malloc_Base.h + MMAP_Memory_Pool.h + Memory_Pool.h + Mem_Map.h + Min_Max.h + Null_Barrier.h + Null_Condition.h + Null_Mutex.h + Null_Semaphore.h + Numeric_Limits.h + OS.h + OS_Dirent.h + OS_Memory.h + OS_NS_macros.h + OS_String.h + OS_Thread_Adapter.h + Object_Manager_Base.h + Process.h + Process_Manager.h + Pair.h + Reactor_Impl.h + Reactor_Timer_Interface.h + Refcounted_Auto_Ptr.h + Reverse_Lock_T.h + Select_Reactor.h + SStringfwd.h + Static_Object_Lock.h + Strategies.h + String_Base_Const.h + Svc_Conf.h + Svc_Conf_Tokens.h + Synch.h + Synch_Traits.h + TSS_T.h + Timer_Queuefwd.h + Truncate.h + Value_Ptr.h + Version.h + ace_wchar.h + checked_iterator.h + config-WinCE.h + config-all.h + config-borland-common.h + config-lite.h + config-minimal.h + config-win32-borland.h + config-win32-common.h + config-win32-ghs.h + config-win32-msvc-6.h + config-win32-msvc-7.h + config-win32-msvc.h + config-win32.h + config.h + iosfwd.h + os_include + os_include/arpa + os_include/net + os_include/netinet + os_include/sys + post.h + pre.h + streams.h + svc_export.h + } + + Documentation_Files { + README + ../VERSION + } + + Pkgconfig_Files { + ACE_FOR_TAO.pc.in + } +} diff --git a/dep/ACE_wrappers/ace/ace_foxreactor.mpc b/dep/ACE_wrappers/ace/ace_foxreactor.mpc new file mode 100644 index 000000000..3c3596d19 --- /dev/null +++ b/dep/ACE_wrappers/ace/ace_foxreactor.mpc @@ -0,0 +1,32 @@ +// -*- MPC -*- now wouldn't this be cool... +// $Id: ace_foxreactor.mpc 90826 2010-06-24 09:07:33Z johnnyw $ + +project(ACE_FoxReactor) : acedefaults, install, acelib, ace_output, ace_fox { + + sharedname = ACE_FoxReactor + dynamicflags += ACE_FOXREACTOR_BUILD_DLL + + Source_Files { + FoxReactor + } + + Header_Files { + FoxReactor + } + + Inline_Files { + FoxReactor + } + + Template_Files { + FoxReactor + } + + Resource_Files { + FoxReactor + } + + Pkgconfig_Files { + FoxReactor/ACE_FoxReactor.pc.in + } +} diff --git a/dep/ACE_wrappers/ace/ace_qt3reactor.mpc b/dep/ACE_wrappers/ace/ace_qt3reactor.mpc new file mode 100644 index 000000000..82653815b --- /dev/null +++ b/dep/ACE_wrappers/ace/ace_qt3reactor.mpc @@ -0,0 +1,43 @@ +// -*- MPC -*- now wouldn't this be cool... +// $Id: ace_qt3reactor.mpc 90826 2010-06-24 09:07:33Z johnnyw $ + +project(ACE_Qt3Reactor_moc) : acedefaults, ace_qt3 { + custom_only = 1 + MOC_Files { + QtReactor/QtReactor.h + } +} + +project(ACE_Qt3Reactor) : acedefaults, install, acelib, ace_output, ace_qt3 { + after += ACE_Qt3Reactor_moc + sharedname = ACE_QtReactor + dynamicflags += ACE_QTREACTOR_BUILD_DLL + + MOC_Files { + } + + Source_Files { + QtReactor/QtReactor_moc.cpp + QtReactor/QtReactor.cpp + } + + Header_Files { + QtReactor + } + + Inline_Files { + QtReactor + } + + Template_Files { + QtReactor + } + + Resource_Files { + QtReactor + } + + Pkgconfig_Files { + QtReactor/ACE_QtReactor.pc.in + } +} diff --git a/dep/ACE_wrappers/ace/ace_qt4reactor.mpc b/dep/ACE_wrappers/ace/ace_qt4reactor.mpc new file mode 100644 index 000000000..9293c374b --- /dev/null +++ b/dep/ACE_wrappers/ace/ace_qt4reactor.mpc @@ -0,0 +1,43 @@ +// -*- MPC -*- now wouldn't this be cool... +// $Id: ace_qt4reactor.mpc 90826 2010-06-24 09:07:33Z johnnyw $ + +project(ACE_Qt4Reactor_moc) : acedefaults, ace_qt4 { + custom_only = 1 + MOC_Files { + QtReactor/QtReactor.h + } +} + +project(ACE_Qt4Reactor) : acedefaults, install, acelib, ace_output, ace_qt4 { + after += ACE_Qt4Reactor_moc + sharedname = ACE_QtReactor + dynamicflags += ACE_QTREACTOR_BUILD_DLL + + MOC_Files { + } + + Source_Files { + QtReactor/QtReactor_moc.cpp + QtReactor/QtReactor.cpp + } + + Header_Files { + QtReactor + } + + Inline_Files { + QtReactor + } + + Template_Files { + QtReactor + } + + Resource_Files { + QtReactor + } + + Pkgconfig_Files { + QtReactor/ACE_QtReactor.pc.in + } +} diff --git a/dep/ACE_wrappers/ace/ace_tkreactor.mpc b/dep/ACE_wrappers/ace/ace_tkreactor.mpc new file mode 100644 index 000000000..88dc6ec98 --- /dev/null +++ b/dep/ACE_wrappers/ace/ace_tkreactor.mpc @@ -0,0 +1,32 @@ +// -*- MPC -*- now wouldn't this be cool... +// $Id: ace_tkreactor.mpc 90826 2010-06-24 09:07:33Z johnnyw $ + +project(ACE_TkReactor) : acedefaults, install, acelib, ace_output, ace_tk { + + sharedname = ACE_TkReactor + dynamicflags += ACE_TKREACTOR_BUILD_DLL + + Source_Files { + TkReactor + } + + Header_Files { + TkReactor + } + + Inline_Files { + TkReactor + } + + Template_Files { + TkReactor + } + + Resource_Files { + TkReactor + } + + Pkgconfig_Files { + TkReactor/ACE_TkReactor.pc.in + } +} diff --git a/dep/ACE_wrappers/ace/ace_wchar.cpp b/dep/ACE_wrappers/ace/ace_wchar.cpp index bec825544..f969c7885 100644 --- a/dep/ACE_wrappers/ace/ace_wchar.cpp +++ b/dep/ACE_wrappers/ace/ace_wchar.cpp @@ -1,11 +1,11 @@ // -*- C++ -*- // -// $Id: ace_wchar.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: ace_wchar.cpp 91286 2010-08-05 09:04:31Z johnnyw $ #include "ace/config-macros.h" #include "ace/ace_wchar.h" -ACE_RCSID(ace, ace_wchar, "$Id: ace_wchar.cpp 80826 2008-03-04 14:51:23Z wotte $") + ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/dep/ACE_wrappers/ace/ace_wchar.h b/dep/ACE_wrappers/ace/ace_wchar.h index f556e0f9c..41f1184d6 100644 --- a/dep/ACE_wrappers/ace/ace_wchar.h +++ b/dep/ACE_wrappers/ace/ace_wchar.h @@ -4,7 +4,7 @@ /** * @file ace_wchar.h * - * $Id: ace_wchar.h 82441 2008-07-28 13:04:13Z johnnyw $ + * $Id: ace_wchar.h 91285 2010-08-05 08:29:30Z johnnyw $ * * @author Darrell Brunsch */ @@ -123,9 +123,6 @@ using std::size_t; typedef wchar_t ACE_TCHAR; typedef char ACE_ANTI_TCHAR; # define ACE_TEXT(STRING) ACE_TEXT_WIDE (STRING) -# if !defined (ACE_LACKS_DEPRECATED_MACROS) -# define ACE_LIB_TEXT(STRING) ACE_TEXT_WIDE (STRING) -# endif # define ACE_TEXT_ALWAYS_CHAR(STRING) ACE_Wide_To_Ascii (STRING).char_rep () # define ACE_TEXT_ALWAYS_WCHAR(STRING) STRING # define ACE_TEXT_CHAR_TO_TCHAR(STRING) ACE_Ascii_To_Wide (STRING).wchar_rep () @@ -135,9 +132,6 @@ typedef char ACE_ANTI_TCHAR; typedef char ACE_TCHAR; typedef wchar_t ACE_ANTI_TCHAR; # define ACE_TEXT(STRING) STRING -# if !defined (ACE_LACKS_DEPRECATED_MACROS) -# define ACE_LIB_TEXT(STRING) STRING -# endif # define ACE_TEXT_ALWAYS_CHAR(STRING) STRING # define ACE_TEXT_ALWAYS_WCHAR(STRING) ACE_Ascii_To_Wide (STRING).wchar_rep () # define ACE_TEXT_CHAR_TO_TCHAR(STRING) STRING diff --git a/dep/ACE_wrappers/ace/ace_xtreactor.mpc b/dep/ACE_wrappers/ace/ace_xtreactor.mpc new file mode 100644 index 000000000..5a82963ea --- /dev/null +++ b/dep/ACE_wrappers/ace/ace_xtreactor.mpc @@ -0,0 +1,32 @@ +// -*- MPC -*- now wouldn't this be cool... +// $Id: ace_xtreactor.mpc 90826 2010-06-24 09:07:33Z johnnyw $ + +project(ACE_XtReactor) : acedefaults, install, acelib, ace_output, ace_xt { + + sharedname = ACE_XtReactor + dynamicflags += ACE_XTREACTOR_BUILD_DLL + + Source_Files { + XtReactor + } + + Header_Files { + XtReactor + } + + Inline_Files { + XtReactor + } + + Template_Files { + XtReactor + } + + Resource_Files { + XtReactor + } + + Pkgconfig_Files { + XtReactor/ACE_XtReactor.pc.in + } +} diff --git a/dep/ACE_wrappers/ace/checked_iterator.h b/dep/ACE_wrappers/ace/checked_iterator.h index 00c207e18..08940e62b 100644 --- a/dep/ACE_wrappers/ace/checked_iterator.h +++ b/dep/ACE_wrappers/ace/checked_iterator.h @@ -23,7 +23,7 @@ * not supported, the pointer passed to the function is returned * instead. * - * $Id: checked_iterator.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: checked_iterator.h 88263 2009-12-20 07:58:09Z johnnyw $ * * @internal The functions and types in this header are meant for * internal use. They may change at any point between @@ -32,12 +32,12 @@ * @author Ossama Othman */ -# if defined (_MSC_VER) && (_MSC_FULL_VER >= 140050000) +# if defined (_MSC_VER) && (_MSC_FULL_VER >= 140050000) && (!defined (_STLPORT_VERSION)) // Checked iterators are currently only supported in MSVC++ 8 or better. # include -# endif /* _MSC_VER >= 1400 */ +# endif /* _MSC_VER >= 1400 && !_STLPORT_VERSION */ -# if defined (_MSC_VER) && (_MSC_FULL_VER >= 140050000 && _MSC_FULL_VER < 160020506) +# if defined (_MSC_VER) && (_MSC_FULL_VER >= 140050000) && (!defined (_STLPORT_VERSION)) template stdext::checked_array_iterator ACE_make_checked_array_iterator (PTR buf, size_t len) @@ -53,6 +53,6 @@ ACE_make_checked_array_iterator (PTR buf, size_t /* len */) // the buffer itself. return buf; } -# endif /* _MSC_VER >= 1400 */ +# endif /* _MSC_VER >= 1400 && !_STLPORT_VERSION */ #endif /* ACE_CHECKED_ITERATOR_H */ diff --git a/dep/ACE_wrappers/ace/config-WinCE.h b/dep/ACE_wrappers/ace/config-WinCE.h index f3b65a44c..930405839 100644 --- a/dep/ACE_wrappers/ace/config-WinCE.h +++ b/dep/ACE_wrappers/ace/config-WinCE.h @@ -1,4 +1,4 @@ -// $Id: config-WinCE.h 81693 2008-05-14 12:35:01Z johnnyw $ +// $Id: config-WinCE.h 89494 2010-03-15 20:11:18Z olli $ // Note: For WinCE build, simply use: #include "ace/config-win32.h" // It is same as config.h for Windows NT/2k so that you can @@ -15,26 +15,13 @@ # error Use config-win32.h in config.h instead of this header #endif // ACE_CONFIG_WIN32_H -#if !defined (UNDER_CE) -# error Define UNDER_CE to version (i.e. 300 = 3.0) -#endif // UNDER_CE +#if !defined (_WIN32_WCE) +# error Define _WIN32_WCE to version (i.e. 500 = 5.0) +#endif // _WIN32_WCE -#if (UNDER_CE < 300) -# error ACE requires Windows CE 3.0 and later. -#endif // UNDER_CE - -#if (UNDER_CE < 400) -// CE 3 doesn't have Winsock 2, but CE 4 does. -# if !defined (ACE_HAS_WINSOCK2) -# define ACE_HAS_WINSOCK2 0 -# endif -# define ACE_LACKS_ASSERT_H -# define ACE_LACKS_SEARCH_H -# define ACE_LACKS_WCHAR_H -# define ACE_LACKS_WCTYPE_H -# define ACE_LACKS_STDDEF_H -# define ACE_LACKS_PTRDIFF_T -#endif /* UNDER_CE < 400 */ +#if (_WIN32_WCE < 500) +# error ACE requires Windows CE 5.0 and later. +#endif // _WIN32_WCE #if !defined (ACE_HAS_WINCE) # define ACE_HAS_WINCE 1 @@ -50,8 +37,10 @@ #endif // We need these libraries to build: -#pragma comment(lib,"corelibc.lib") -#pragma comment(linker, "/nodefaultlib:oldnames.lib") +#if defined (_MSC_VER) +# pragma comment(lib,"corelibc.lib") +# pragma comment(linker, "/nodefaultlib:oldnames.lib") +#endif // Only DLL version is supported on CE. //#if defined (ACE_HAS_DLL) @@ -80,21 +69,40 @@ #define ACE_LACKS_GETPROCESSTIMES #define ACE_LACKS_PDH_H #define ACE_LACKS_PDHMSG_H +#define ACE_LACKS_TIME +#define ACE_LACKS_TZSET +#define ACE_LACKS_RAISE +#define ACE_LACKS_BSEARCH #define ACE_HAS_POSITION_INDEPENDENT_POINTERS 1 #define ACE_LACKS_MSG_WFMO #define ACE_LACKS_UMASK +#define ACE_HAS_TYPES_H +#define ACE_LACKS_DEV_T + +#define ACE_ISCTYPE_EQUIVALENT ::_isctype // WinCE only supports the UNICODE API #if !defined (ACE_USES_WCHAR) # define ACE_USES_WCHAR #endif /* ACE_USES_WCHAR */ -#define ACE_USES_WINCE_SEMA_SIMULATION +#if (_WIN32_WCE < 0x600) +# define ACE_USES_WINCE_SEMA_SIMULATION +# define ACE_LACKS_ERRNO_H +# define ACE_LACKS_DUP +# define ACE_LACKS_GETSYSTEMTIMEASFILETIME +#endif /* (_WIN32_WCE < 0x600) */ + +#define ACE_LACKS_REGNOTIFYCHANGEKEYVALUE #define ACE_HAS_NONSTATIC_OBJECT_MANAGER 1 +#if ! defined(ACE_DEFAULT_THREAD_KEYS) +# define ACE_DEFAULT_THREAD_KEYS TLS_MINIMUM_AVAILABLE +#endif // ! defined(ACE_DEFAULT_THREAD_KEYS) + // FILE stuff isn't always defined in CE #if (_MSC_VER < 1400) && !defined (_FILE_DEFINED) typedef void FILE; @@ -134,23 +142,9 @@ #define _O_TEXT 0x4000 // file mode is text (translated) #define _O_BINARY 0x8000 // file mode is binary (untranslated) -// macro to translate the C 2.0 name used to force binary mode for files -//#define _O_RAW _O_BINARY - -// Open handle inherit bit -//#define _O_NOINHERIT 0x0080 // child process doesn't inherit file - // Temporary file bit - file is deleted when last handle is closed #define _O_TEMPORARY 0x0040 // temporary file bit -// temporary access hint -//#define _O_SHORT_LIVED 0x1000 // temporary storage file, try not to flush - -// sequential/random access hints -//#define _O_SEQUENTIAL 0x0020 // file access is primarily sequential -//#define _O_RANDOM 0x0010 // file access is primarily random - - // Non-ANSI names #define O_RDONLY _O_RDONLY #define O_WRONLY _O_WRONLY @@ -162,46 +156,35 @@ #define O_TEXT _O_TEXT #define O_BINARY _O_BINARY #define O_TEMPORARY _O_TEMPORARY -//#define O_RAW _O_BINARY -//#define O_NOINHERIT _O_NOINHERIT -//#define O_SEQUENTIAL _O_SEQUENTIAL -//#define O_RANDOM _O_RANDOM - // @@ NSIG value. This is definitely not correct. #define NSIG 23 - -// @@ For some reason, WinCE forgot to define this. -// Need to find out what it is. (Used in MapViewOfFile ().) +#if !defined (FILE_MAP_COPY) #define FILE_MAP_COPY 0 +#endif - -#define ACE_LACKS_STRCASECMP // WinCE doesn't support _stricmp -#define ACE_LACKS_GETSERVBYNAME +#define ACE_HAS_INTERLOCKED_EXCHANGEADD #define ACE_LACKS_ACCESS -#define ACE_LACKS_FILELOCKS +#define ACE_LACKS__WACCESS +#define ACE_HAS_ACCESS_EMULATION #define ACE_LACKS_EXEC #define ACE_LACKS_MKTEMP -#define ACE_LACKS_STRRCHR -#define ACE_LACKS_BSEARCH -#define ACE_LACKS_SOCKET_BUFSIZ #define ACE_LACKS_ISATTY #define ACE_LACKS_STRERROR #define ACE_LACKS_SYSTEM -#define ACE_LACKS_SIGACTION #define ACE_LACKS_PIPE -//#define ACE_LACKS_CUSERID -//#define ACE_LACKS_CHDIR -#define ACE_LACKS_ENV -#define ACE_LACKS_HOSTNAME +#define ACE_LACKS_CHDIR +#define ACE_LACKS_GETENV +#define ACE_LACKS_SETENV +#define ACE_LACKS_UNSETENV +#define ACE_LACKS_PUTENV +#define ACE_LACKS_GETENVSTRINGS +#define ACE_LACKS_STRENVDUP #define ACE_LACKS_REALPATH -#define ACE_LACKS_READLINK #define ACE_LACKS_SWAB #define ACE_LACKS_TEMPNAM -#define ACE_LACKS_GETPROTOBYNUMBER -#define ACE_LACKS_GETPROTOBYNAME #if defined (_WIN32_WCE_EMULATION) // @@ For some reason, qsort isn't defined correctly (_stdcall vs _cdecl) @@ -210,28 +193,34 @@ #endif // _WIN32_WCE_EMULATION #if !defined (BUFSIZ) -# define BUFSIZ 1024 +# define BUFSIZ 1024 #endif -typedef void (__cdecl * __sighandler_t)(int); // keep Signal compilation happy -typedef long off_t; - #define ACE_LACKS_MALLOC_H // We do have malloc.h, but don't use it. #define ACE_HAS_WINCE_BROKEN_ERRNO #define ACE_HAS_STRDUP_EMULATION +#if !defined (MAXSYMLINKS) +# define MAXSYMLINKS 0 +#endif + // WinCE can't do fixed addresses for memory-mapped files. #if defined (ACE_DEFAULT_BASE_ADDR) -# undef ACE_DEFAULT_BASE_ADDR +# undef ACE_DEFAULT_BASE_ADDR #endif #define ACE_DEFAULT_BASE_ADDR 0 -#define ACE_HAS_TSS_EMULATION +#if (_WIN32_WCE < 0x600) +# define ACE_HAS_TSS_EMULATION +#endif // WinCE version < 6.0 + +// CE doesn't support FILE_SHARE_DELETE like regular windows +#if !defined (ACE_DEFAULT_FILE_PERMS) +# define ACE_DEFAULT_FILE_PERMS (FILE_SHARE_READ | FILE_SHARE_WRITE) +#endif -// This is still true up thru VC8... -#define ACE_LACKS_ERRNO_H #define ACE_LACKS_SIGNAL_H #define ACE_LACKS_SYS_STAT_H diff --git a/dep/ACE_wrappers/ace/config-aix-5.x.h b/dep/ACE_wrappers/ace/config-aix-5.x.h index 30507a05f..d524e9530 100644 --- a/dep/ACE_wrappers/ace/config-aix-5.x.h +++ b/dep/ACE_wrappers/ace/config-aix-5.x.h @@ -1,4 +1,4 @@ -// $Id: config-aix-5.x.h 80826 2008-03-04 14:51:23Z wotte $ +// $Id: config-aix-5.x.h 87268 2009-10-29 21:06:06Z olli $ // // Config file for AIX 5.1 and higher. @@ -40,61 +40,52 @@ # 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 +#if defined (__IBMCPP__) + // AIX xlC, IBM C/C++ compiler //******************************************************************** // -// Compiler does this with a builtin - it's not in libc. -// Although ACE does have alloca() on this compiler/platform combination, it is -// disabled by default since it can be dangerous. Uncomment the following line -// if you ACE to use it. -//# define ACE_HAS_ALLOCA + // Compiler 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. + // Compiler supports the ssize_t typedef. # define ACE_HAS_SSIZE_T // Keep an eye on this as the compiler and standards converge... # define ACE_LACKS_LINEBUFFERED_STREAMBUF # define ACE_LACKS_PRAGMA_ONCE - // 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 +# define ACE_EXPLICIT_TEMPLATE_DESTRUCTOR_TAKES_ARGS + // When using -qtempinc, we don't need to see template implementation + // source (though we do need a pragma to find the correct source file). + // However, without -qtempinc (either -qnotempinc or -qtemplateregistry) + // we do need to see the source. +# if defined (__TEMPINC__) +# if !defined ACE_TEMPLATES_REQUIRE_PRAGMA +# define ACE_TEMPLATES_REQUIRE_PRAGMA +# endif +# else +# if !defined (ACE_TEMPLATES_REQUIRE_SOURCE) +# define ACE_TEMPLATES_REQUIRE_SOURCE +# endif +# endif /* __TEMPINC__ */ - // These are for Visual Age C++ only -# if defined (__IBMCPP__) && (__IBMCPP__ >= 600) -# define ACE_EXPLICIT_TEMPLATE_DESTRUCTOR_TAKES_ARGS - // When using -qtempinc, we don't need to see template implementation - // source (though we do need a pragma to find the correct source file). - // However, without -qtempinc (either -qnotempinc or -qtemplateregistry) - // we do need to see the source. -# if defined (__TEMPINC__) -# if !defined ACE_TEMPLATES_REQUIRE_PRAGMA -# define ACE_TEMPLATES_REQUIRE_PRAGMA -# endif -# else -# if !defined (ACE_TEMPLATES_REQUIRE_SOURCE) -# define ACE_TEMPLATES_REQUIRE_SOURCE -# endif -# endif /* __TEMPINC__ */ +# undef WIFEXITED +# undef WEXITSTATUS +# define ACE_HAS_STANDARD_CPP_LIBRARY 1 +# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 -# undef WIFEXITED -# undef WEXITSTATUS -# define ACE_HAS_STANDARD_CPP_LIBRARY 1 -# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 - -# if (__IBMCPP__ >= 600) /* Visual Age 6 and XL C/C++ 7 and up */ -# define ACE_HAS_TEMPLATE_TYPEDEFS -# define ACE_HAS_CUSTOM_EXPORT_MACROS -# define ACE_Proper_Export_Flag -# define ACE_Proper_Import_Flag -# define ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) extern template class SINGLETON_TYPE < CLASS, LOCK >; -# endif /* __IBMCPP__ >= 600 */ -# endif /* __IBMCPP__ */ +# define ACE_HAS_TEMPLATE_TYPEDEFS +# define ACE_HAS_CUSTOM_EXPORT_MACROS +# define ACE_Proper_Export_Flag +# define ACE_Proper_Import_Flag + // There's no explicit import/export per-se, but to be sure that declared + // template code is exported, explicitly instantiate the class. +# define ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) template class SINGLETON_TYPE < CLASS, LOCK >; +# define ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) extern template class SINGLETON_TYPE < CLASS, LOCK >; #elif defined (__GNUG__) // config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so @@ -102,8 +93,7 @@ # 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)) @@ -118,7 +108,7 @@ # endif /* _REENTRANT */ # endif /* !ACE_MT_SAFE */ -#else /* ! __xlC__ && ! __GNUG__ */ +#else /* ! __IBMCPP__ && ! __GNUG__ */ # ifdef __cplusplus /* Let it slide for C compilers. */ # error unsupported compiler in ace/config-aix-5.x.h # endif /* __cplusplus */ @@ -142,7 +132,7 @@ #if defined (ACE_DLL_SUFFIX) # undef ACE_DLL_SUFFIX #endif -#define ACE_DLL_SUFFIX ".so" +#define ACE_DLL_SUFFIX ACE_TEXT (".so") #define ACE_DEFAULT_BASE_ADDR ((char *) 0x80000000) @@ -179,6 +169,7 @@ #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT #define ACE_HAS_NONCONST_SELECT_TIMEVAL +#define ACE_HAS_ICMP_SUPPORT 1 #define ACE_HAS_IP_MULTICAST // Lacks perfect filtering, must bind group address. @@ -217,9 +208,6 @@ #define ACE_HAS_STREAMS // #define ACE_HAS_STREAM_PIPES -// Compiler/platform supports strerror (). -#define ACE_HAS_STRERROR - // AIX bzero() #define ACE_HAS_STRINGS @@ -246,6 +234,8 @@ #define ACE_HAS_UTIME +#define ACE_HAS_CTYPE_T + // Platform has XPG4 wide character type and functions. However, the size // of wchar_t changes for 32- vs. 64-bit builds (unsigned short vs. unsigned // int, respectively). @@ -259,7 +249,7 @@ #define ACE_LACKS_NETINET_TCP_H // AIX uses LIBPATH to search for libraries -#define ACE_LD_SEARCH_PATH "LIBPATH" +#define ACE_LD_SEARCH_PATH ACE_TEXT ("LIBPATH") // Defines the page size of the system. #define ACE_PAGE_SIZE 4096 @@ -329,5 +319,8 @@ #define ACE_SCANDIR_SEL_LACKS_CONST #define ACE_HAS_SIGSUSPEND #define ACE_HAS_TIMEZONE /* Call tzset() to set timezone */ +#define ACE_LACKS_ISCTYPE +#define ACE_HAS_STRSIGNAL +#define ACE_NEEDS_STRSIGNAL_RANGE_CHECK #endif /* ACE_CONFIG_AIX_5_X_H */ diff --git a/dep/ACE_wrappers/ace/config-all.h b/dep/ACE_wrappers/ace/config-all.h index 2a57a7ee3..e19caec8e 100644 --- a/dep/ACE_wrappers/ace/config-all.h +++ b/dep/ACE_wrappers/ace/config-all.h @@ -4,7 +4,7 @@ /** * @file config-all.h * - * $Id: config-all.h 81661 2008-05-09 12:05:34Z johnnyw $ + * $Id: config-all.h 84216 2009-01-22 18:34:40Z johnnyw $ * * @author (Originally in OS.h)Doug Schmidt * @author Jesper S. M|ller @@ -76,6 +76,10 @@ # define ACE_HAS_MONITOR_FRAMEWORK 1 #endif +#if !defined (ACE_HAS_SENDFILE) +# define ACE_HAS_SENDFILE 0 +#endif + #if !defined (ACE_HAS_MONITOR_POINTS) # define ACE_HAS_MONITOR_POINTS 0 #endif diff --git a/dep/ACE_wrappers/ace/config-borland-common.h b/dep/ACE_wrappers/ace/config-borland-common.h deleted file mode 100644 index c57ddb07f..000000000 --- a/dep/ACE_wrappers/ace/config-borland-common.h +++ /dev/null @@ -1,66 +0,0 @@ -// -*- C++ -*- -//$Id: config-borland-common.h 82294 2008-07-12 13:03:37Z johnnyw $ - -// The following configuration file contains defines for Borland compilers. - -#ifndef ACE_CONFIG_BORLAND_COMMON_H -#define ACE_CONFIG_BORLAND_COMMON_H -#include /**/ "ace/pre.h" - -#define ACE_HAS_CUSTOM_EXPORT_MACROS -#define ACE_Proper_Export_Flag __declspec (dllexport) -#define ACE_Proper_Import_Flag __declspec (dllimport) -#define ACE_EXPORT_SINGLETON_DECLARATION(T) template class __declspec (dllexport) T -#define ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) template class __declspec (dllexport) SINGLETON_TYPE; -#define ACE_IMPORT_SINGLETON_DECLARATION(T) template class __declspec (dllimport) T -#define ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) template class __declspec (dllimport) SINGLETON_TYPE ; - -// In later versions of C++Builder we will prefer inline functions by -// default. The debug configuration of ACE is built with functions -// out-of-line, so when linking your application against a debug ACE -// build, you can choose to use the out-of-line functions by adding -// ACE_NO_INLINE=1 to your project settings. -# if !defined (__ACE_INLINE__) -# define __ACE_INLINE__ 1 -# endif /* __ACE_INLINE__ */ - -# define ACE_CC_NAME ACE_TEXT ("Borland C++ Builder") -# define ACE_CC_MAJOR_VERSION (__BORLANDC__ / 0x100) -# define ACE_CC_MINOR_VERSION (__BORLANDC__ % 0x100) -# define ACE_CC_BETA_VERSION (0) - -# ifndef ACE_USING_MCPP_PREPROCESSOR -# define ACE_CC_PREPROCESSOR_ARGS "-q -P- -o%s" -# endif - -# define ACE_EXPORT_NESTED_CLASSES 1 -# define ACE_HAS_CPLUSPLUS_HEADERS 1 -# define ACE_HAS_EXCEPTIONS -# define ACE_HAS_GNU_CSTRING_H 1 -# define ACE_HAS_NONCONST_SELECT_TIMEVAL -# define ACE_HAS_SIG_ATOMIC_T -# define ACE_HAS_STANDARD_CPP_LIBRARY 1 -# define ACE_HAS_STDCPP_STL_INCLUDES 1 -# define ACE_HAS_STRERROR -# define ACE_HAS_STRING_CLASS 1 -# define ACE_HAS_TEMPLATE_TYPEDEFS 1 -# define ACE_HAS_USER_MODE_MASKS 1 -# define ACE_LACKS_ACE_IOSTREAM 1 -# define ACE_LACKS_LINEBUFFERED_STREAMBUF 1 -# define ACE_LACKS_STRPTIME 1 -# if (__BORLANDC__ < 0x590) -# define ACE_LACKS_PLACEMENT_OPERATOR_DELETE 1 -# endif -# define ACE_LACKS_PRAGMA_ONCE 1 -# define ACE_HAS_NEW_NOTHROW -# define ACE_TEMPLATES_REQUIRE_SOURCE 1 -# define ACE_SIZEOF_LONG_DOUBLE 10 -# define ACE_UINT64_FORMAT_SPECIFIER ACE_TEXT ("%Lu") -# define ACE_INT64_FORMAT_SPECIFIER ACE_TEXT ("%Ld") -# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 -# define ACE_USES_STD_NAMESPACE_FOR_STDC_LIB 0 -# define ACE_ENDTHREADEX(STATUS) ::_endthreadex ((DWORD) STATUS) -# define ACE_LACKS_SWAB - -#include /**/ "ace/post.h" -#endif /* ACE_CONFIG_BORLAND_COMMON_H */ diff --git a/dep/ACE_wrappers/ace/config-cray.h b/dep/ACE_wrappers/ace/config-cray.h index 28038b15b..1b9448761 100644 --- a/dep/ACE_wrappers/ace/config-cray.h +++ b/dep/ACE_wrappers/ace/config-cray.h @@ -1,5 +1,5 @@ /* -*- C++ -*- */ -// $Id: config-cray.h 81935 2008-06-12 22:01:53Z jtc $ +// $Id: config-cray.h 87169 2009-10-19 20:26:55Z olli $ #ifndef ACE_CONFIG_CRAY_H #define ACE_CONFIG_CRAY_H @@ -81,12 +81,11 @@ #define ACE_HAS_CHARPTR_SOCKOPT #define ACE_HAS_NONCONST_GETBY +#define ACE_HAS_NONCONST_INET_ADDR // has man pages, but links with missing symbols and I can't find lib yet /* #define ACE_HAS_REGEX */ -#define ACE_HAS_SIG_MACROS - #define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES #if _UNICOS > 9 @@ -99,8 +98,6 @@ #define ACE_HAS_MSG -#define ACE_HAS_STRERROR - #define ACE_HAS_GPERF // Special modifications that apply to UNICOS/mk @@ -190,8 +187,6 @@ // Ones to check out at some point -/* #define ACE_HAS_SYS_SIGLIST */ - // C++ Compiler stuff to verify /* #define ACE_NEW_THROWS_EXCEPTIONS */ /* #define ACE_HAS_TEMPLATE_TYPEDEFS */ @@ -203,11 +198,8 @@ /* #define ACE_HAS_TLI */ /* #define ACE_HAS_TIUSER_H */ /* #define ACE_HAS_TLI_PROTOTYPES */ -/* #define ACE_LACKS_T_ERRNO */ /* #define ACE_LACKS_NAMED_POSIX_SEM */ -/* #define ACE_HAS_SYS_ERRLIST */ - #include /**/ "ace/post.h" #endif /* ACE_CONFIG_CRAY_H */ diff --git a/dep/ACE_wrappers/ace/config-cxx-common.h b/dep/ACE_wrappers/ace/config-cxx-common.h index 024c25fd2..e50cf38ec 100644 --- a/dep/ACE_wrappers/ace/config-cxx-common.h +++ b/dep/ACE_wrappers/ace/config-cxx-common.h @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: config-cxx-common.h 81935 2008-06-12 22:01:53Z jtc $ +// $Id: config-cxx-common.h 91285 2010-08-05 08:29:30Z johnnyw $ #ifndef ACE_CXX_COMMON_H #define ACE_CXX_COMMON_H @@ -27,9 +27,7 @@ # if (__DECCXX_VER >= 60090010) // DEC CXX 6.0 supports exceptions, etc., by default. Exceptions // are enabled by platform_osf1_4.x.GNU/wrapper_macros.GNU. -# if defined (ACE_HAS_EXCEPTIONS) -# define ACE_NEW_THROWS_EXCEPTIONS -# endif /* ACE_HAS_EXCEPTIONS */ +# define ACE_NEW_THROWS_EXCEPTIONS # define ACE_HAS_STANDARD_CPP_LIBRARY 1 # define ACE_HAS_TEMPLATE_TYPEDEFS diff --git a/dep/ACE_wrappers/ace/config-cygwin32.h b/dep/ACE_wrappers/ace/config-cygwin32.h index 3dde02798..35c517c3c 100644 --- a/dep/ACE_wrappers/ace/config-cygwin32.h +++ b/dep/ACE_wrappers/ace/config-cygwin32.h @@ -1,5 +1,5 @@ /* -*- C++ -*- */ -// $Id: config-cygwin32.h 81809 2008-05-30 13:40:21Z vzykov $ +// $Id: config-cygwin32.h 87169 2009-10-19 20:26:55Z olli $ // The following configuration file is designed to work for CygWin // platforms using GNU C++. @@ -25,13 +25,15 @@ #endif /* ACE_IOV_MAX */ // Define custom export macros for export/import of symbols from/of dll's -#define ACE_HAS_CUSTOM_EXPORT_MACROS -#define ACE_Proper_Export_Flag __declspec (dllexport) -#define ACE_Proper_Import_Flag __declspec (dllimport) -#define ACE_EXPORT_SINGLETON_DECLARATION(T) template class __declspec (dllexport) T -#define ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) template class __declspec (dllexport) SINGLETON_TYPE; -#define ACE_IMPORT_SINGLETON_DECLARATION(T) extern template class T -#define ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) extern template class SINGLETON_TYPE ; +#if !defined (ACE_HAS_CUSTOM_EXPORT_MACROS) +# define ACE_HAS_CUSTOM_EXPORT_MACROS 1 +# define ACE_Proper_Export_Flag __declspec (dllexport) +# define ACE_Proper_Import_Flag __declspec (dllimport) +# define ACE_EXPORT_SINGLETON_DECLARATION(T) template class __declspec (dllexport) T +# define ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) template class __declspec (dllexport) SINGLETON_TYPE; +# define ACE_IMPORT_SINGLETON_DECLARATION(T) extern template class T +# define ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) extern template class SINGLETON_TYPE ; +#endif #define ACE_HAS_SELECT_H @@ -61,7 +63,6 @@ #define ACE_HAS_VOIDPTR_SOCKOPT 1 #define ACE_HAS_UALARM 1 -#define ACE_HAS_SYS_ERRLIST 1 #define ACE_HAS_STRNLEN 1 #define ACE_HAS_POSIX_GETPWNAM_R 1 #define ACE_HAS_POSIX_NONBLOCK 1 @@ -110,8 +111,7 @@ #define ACE_HAS_VOIDPTR_GETTIMEOFDAY -// Compiler/platform supports strerror (). -#define ACE_HAS_STRERROR +#define ACE_HAS_STRSIGNAL // Compiler supports the ssize_t typedef. #define ACE_HAS_SSIZE_T @@ -145,6 +145,7 @@ #define ACE_LACKS_FPUTWS 1 #define ACE_LACKS_WCSTOULL 1 +#define ACE_LACKS_ISCTYPE #define ACE_HAS_AUTOMATIC_INIT_FINI @@ -195,12 +196,21 @@ # define ACE_LACKS_PTHREAD_YIELD 1 # define ACE_LACKS_PTHREAD_ATTR_SETSTACK +#if CYGWIN_VERSION_API_MINOR < 207 // In the 1.5.9 release of Cygwin the pthread_kill gives an access violation // so for the time being we say Cygwin doesn't support pthread_kill. # define ACE_LACKS_PTHREAD_KILL +#endif #endif /* ACE_MT_SAFE */ +#if CYGWIN_VERSION_API_MINOR >= 207 +// > Cygwin 1.7 +#define ACE_HAS_VWPRINTF +#define ACE_HAS_VFWPRINTF +#define ACE_HAS_VSWPRINTF +#endif + #include /**/ "ace/post.h" #endif /* ACE_CONFIG_CYGWIN32_H */ diff --git a/dep/ACE_wrappers/ace/config-doxygen.h b/dep/ACE_wrappers/ace/config-doxygen.h index 2bc89c982..53fdec777 100644 --- a/dep/ACE_wrappers/ace/config-doxygen.h +++ b/dep/ACE_wrappers/ace/config-doxygen.h @@ -6,7 +6,7 @@ * * @file config-doxygen.h * - * $Id: config-doxygen.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: config-doxygen.h 91285 2010-08-05 08:29:30Z johnnyw $ * * @author Carlos O'Ryan * @author Darrell Brunsch @@ -58,9 +58,6 @@ /// Enable support for the SSL wrappers #define ACE_HAS_SSL 1 -/// Enable exceptions -#define ACE_HAS_EXCEPTIONS - /// Enable timeprobes #define ACE_COMPILE_TIMEPROBES @@ -117,4 +114,12 @@ #define ACE_HAS_IP_MULTICAST +#define ACE_INLINE +#define ACE_BEGIN_VERSIONED_NAMESPACE_DECL +#define ACE_END_VERSIONED_NAMESPACE_DECL +#define TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#define TAO_END_VERSIONED_NAMESPACE_DECL + +#define ACE_HAS_POSITION_INDEPENDENT_POINTERS 1 + #endif /* ACE_CONFIG_DOXYGEN_H */ diff --git a/dep/ACE_wrappers/ace/config-freebsd.h b/dep/ACE_wrappers/ace/config-freebsd.h index 3461bec8d..b83394dde 100644 --- a/dep/ACE_wrappers/ace/config-freebsd.h +++ b/dep/ACE_wrappers/ace/config-freebsd.h @@ -1,5 +1,5 @@ /* -*- C++ -*- */ -// $Id: config-freebsd.h 80826 2008-03-04 14:51:23Z wotte $ +// $Id: config-freebsd.h 87483 2009-11-11 13:50:04Z olli $ // The following configuration file is designed to work for FreeBSD @@ -8,30 +8,30 @@ #include /**/ "ace/pre.h" #if !defined (ACE_MT_SAFE) -# define ACE_MT_SAFE 1 +# define ACE_MT_SAFE 1 #endif #if ACE_MT_SAFE - // Yes, we do have threads. -# define ACE_HAS_THREADS 1 + // Yes, we do have threads. +# define ACE_HAS_THREADS 1 #else - // Set to 0 since that's what config-posix.h checks for. -# define ACE_HAS_THREADS 0 + // Set to 0 since that's what config-posix.h checks for. +# define ACE_HAS_THREADS 0 #endif /* ACE_MT_SAFE */ #include "ace/config-posix.h" -#include // Make sure we source in the OS version. +#include -#if ! defined (__ACE_INLINE__) -#define __ACE_INLINE__ +#if !defined (__ACE_INLINE__) +# define __ACE_INLINE__ #endif /* ! __ACE_INLINE__ */ #if (__FreeBSD_version < 220000) -#if defined (ACE_HAS_THREADS) -#error Threads are not supported. -#endif /* ACE_HAS_THREADS */ +# if defined (ACE_HAS_THREADS) +# error Threads are not supported. +# endif /* ACE_HAS_THREADS */ #endif /* __FreeBSD_version < 220000 */ #if defined (__GNUG__) @@ -45,204 +45,73 @@ // Platform specific directives // gcc defines __FreeBSD__ automatically for us. #ifdef ACE_HAS_THREADS -#if !defined (_THREAD_SAFE) -#define _THREAD_SAFE -#endif /* _THREAD_SAFE */ +# if !defined (_THREAD_SAFE) +# define _THREAD_SAFE +# endif /* _THREAD_SAFE */ #endif -#define ACE_HAS_GPERF - -#if (__FreeBSD_version < 420000) -#define ACE_LACKS_GETPGID -#define ACE_LACKS_SETPGID -#define ACE_LACKS_SETREGID -#define ACE_LACKS_SETREUID -#define ACE_LACKS_PTHREAD_CANCEL -#endif /* __FreeBSD_version < 420000 */ +#define ACE_HAS_3_PARAM_READDIR_R +#define ACE_HAS_3_PARAM_WCSTOK +#define ACE_HAS_4_4BSD_SENDMSG_RECVMSG +#define ACE_HAS_ALLOCA #define ACE_HAS_ALT_CUSERID -#define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS -#define ACE_HAS_SIG_MACROS -// Optimize ACE_Handle_Set for select(). -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT -#define ACE_HAS_NONCONST_SELECT_TIMEVAL +#define ACE_HAS_AUTOMATIC_INIT_FINI #define ACE_HAS_CHARPTR_DL +#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES +#define ACE_HAS_DIRENT +#define ACE_HAS_GETRUSAGE +#define ACE_HAS_GPERF +#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT +#define ACE_HAS_IP_MULTICAST +#define ACE_HAS_MSG +#define ACE_HAS_NONCONST_SELECT_TIMEVAL +#define ACE_HAS_POSIX_NONBLOCK +#define ACE_HAS_POSIX_TIME +#define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS +#define ACE_HAS_RTLD_LAZY_V +#define ACE_HAS_SEMUN +#define ACE_HAS_SIGISMEMBER_BUG +#define ACE_HAS_SIGSUSPEND +#define ACE_HAS_SIGWAIT +#define ACE_HAS_SIG_ATOMIC_T +#define ACE_HAS_SOCKADDR_IN6_SIN6_LEN +#define ACE_HAS_SOCKADDR_IN_SIN_LEN +#define ACE_HAS_SSIZE_T +#define ACE_HAS_STRSIGNAL +#define ACE_HAS_SVR4_DYNAMIC_LINKING +#define ACE_HAS_SVR4_SIGNAL_T +#define ACE_HAS_SYSCTL +#define ACE_HAS_SYSV_IPC +#define ACE_HAS_SYS_FILIO_H +#define ACE_HAS_SYS_SOCKIO_H +#define ACE_HAS_SYS_SYSCALL_H +#define ACE_HAS_TERMIOS +#define ACE_HAS_THREAD_SPECIFIC_STORAGE +#define ACE_HAS_TIMEZONE_GETTIMEOFDAY +#define ACE_HAS_UALARM -#if (__FreeBSD_version < 400000) -#define ACE_LACKS_SIGSET -#define ACE_LACKS_RWLOCK_T -#define ACE_LACKS_READDIR_R -#define ACE_LACKS_SETSCHED -#define ACE_LACKS_PTHREAD_THR_SIGSETMASK -#define ACE_LACKS_UCONTEXT_H -#define ACE_LACKS_RAND_REENTRANT_FUNCTIONS -#endif +#define ACE_LACKS_CONDATTR_PSHARED +#define ACE_LACKS_ISCTYPE +#define ACE_LACKS_ITOW +#define ACE_LACKS_LOG2 +#define ACE_LACKS_MALLOC_H +#define ACE_LACKS_MUTEXATTR_PSHARED +#define ACE_LACKS_SIGINFO_H +#define ACE_LACKS_SI_ADDR +#define ACE_LACKS_STROPTS_H +#define ACE_LACKS_STRRECVFD +#define ACE_LACKS_THREAD_PROCESS_SCOPING +#define ACE_LACKS_TIMESPEC_T +#define ACE_LACKS_WCSDUP +#define ACE_LACKS_WCSICMP +#define ACE_LACKS_WCSNICMP #define ACE_NEEDS_SCHED_H -#if (__FreeBSD_version < 400000) -enum schedparam_policy { - SCHED_RR, - SCHED_IO, - SCHED_FIFO, - SCHED_OTHER -}; -#endif - -// Use of is deprecated. -#define ACE_LACKS_MALLOC_H - - -// This won't be necessary after it is fixed in the system include headers. -extern "C" { char * cuserid (char *s); } - -// Platform supports POSIX timers via struct timespec. -#define ACE_HAS_POSIX_TIME -#define ACE_HAS_UALARM - -// Platform defines struct timespec but not timespec_t -#define ACE_LACKS_TIMESPEC_T - -#if (__FreeBSD_version < 501000) -#define ACE_LACKS_STDINT_H -#endif - -#define ACE_HAS_SYSCTL -#define ACE_LACKS_STRRECVFD - -#define ACE_HAS_SOCKADDR_IN_SIN_LEN -#define ACE_HAS_SOCKADDR_IN6_SIN6_LEN - -// Platform supports System V IPC (most versions of UNIX, but not Win32) -#define ACE_HAS_SYSV_IPC - -// Compiler/platform contains the file. -#define ACE_HAS_SYS_SYSCALL_H - -#if (__FreeBSD_version >= 220000) -#define ACE_HAS_VASPRINTF -#endif - -#if (__FreeBSD_version >= 300000) -#define ACE_HAS_SIGINFO_T -#endif /* __FreeBSD_version >= 300000 */ - -#if (__FreeBSD_version >= 320000) -#define ACE_HAS_REENTRANT_FUNCTIONS -#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS -#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R -#endif /* __FreeBSD_version >= 320000 */ - -#if (__FreeBSD_version >= 440000) -#define ACE_HAS_GETPROGNAME -#define ACE_HAS_SETPROGNAME -#endif - -#if (__FreeBSD_version < 501000) -#define ACE_LACKS_PWD_REENTRANT_FUNCTIONS -#endif - -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES -#define ACE_LACKS_SIGINFO_H -#define ACE_LACKS_LOG2 -#define ACE_LACKS_SI_ADDR - -// Compiler/platform supports SVR4 signal typedef -#define ACE_HAS_SVR4_SIGNAL_T - -// 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 supports SVR4 dynamic linking semantics.. -#define ACE_HAS_SVR4_DYNAMIC_LINKING - -// Compiler/platform correctly calls init()/fini() for shared libraries. -#define ACE_HAS_AUTOMATIC_INIT_FINI - -// Explicit dynamic linking permits "lazy" symbol resolution -#define ACE_HAS_RTLD_LAZY_V - -// platform supports POSIX O_NONBLOCK semantics -#define ACE_HAS_POSIX_NONBLOCK - -// platform supports IP multicast -#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 */ - -// Compiler/platform has -//#define ACE_HAS_ALLOCA_H - -// Compiler/platform has the getrusage() system call. -#define ACE_HAS_GETRUSAGE - -// Compiler/platform defines the sig_atomic_t typedef. -#define ACE_HAS_SIG_ATOMIC_T - -// Compiler/platform supports sys_siglist array. -// *** This refers to (_sys_siglist) instead of (sys_siglist) -// #define ACE_HAS_SYS_SIGLIST - -// Compiler/platform defines a union semun for SysV shared memory. -#define ACE_HAS_SEMUN - -// Compiler supports the ssize_t typedef. -#define ACE_HAS_SSIZE_T - -// Compiler/platform supports strerror (). -#define ACE_HAS_STRERROR - -// Compiler/platform provides the sockio.h file. -#define ACE_HAS_SYS_SOCKIO_H - // Defines the page size of the system. #define ACE_PAGE_SIZE 4096 -// Platform provides header. -#define ACE_HAS_SYS_FILIO_H - -// Platform/compiler supports timezone * as second parameter to gettimeofday(). -#define ACE_HAS_TIMEZONE_GETTIMEOFDAY - -#define ACE_HAS_MSG -#define ACE_HAS_4_4BSD_SENDMSG_RECVMSG - -#if (__FreeBSD_version < 500100) -# define ACE_HAS_NONCONST_MSGSND -#endif - -// Thread specific settings -// Yes, we do have threads. -#ifdef ACE_HAS_THREADS -#if !defined (ACE_MT_SAFE) -# define ACE_MT_SAFE 1 -#endif /* ! ACE_MT_SAFE */ -#endif /* ACE_HAS_THREADS */ - -#define ACE_LACKS_THREAD_PROCESS_SCOPING -#define ACE_LACKS_CONDATTR_PSHARED -#define ACE_LACKS_MUTEXATTR_PSHARED -#define ACE_HAS_THREAD_SPECIFIC_STORAGE -#define ACE_HAS_DIRENT - -#define ACE_HAS_SIGWAIT - -// Platform has POSIX terminal interface. -#define ACE_HAS_TERMIOS - -#if (__FreeBSD_version > 400000) -#define ACE_HAS_UCONTEXT_T -#define ACE_HAS_SOCKLEN_T -#define ACE_HAS_GETIFADDRS -#define ACE_HAS_PTHREADS_UNIX98_EXT -#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 @@ -250,23 +119,81 @@ extern "C" { char * cuserid (char *s); } // By default use Proactor which does not use POSIX Real-time Signals. #ifdef ACE_HAS_AIO_CALLS -# ifndef ACE_POSIX_AIOCB_PROACTOR -# define ACE_POSIX_AIOCB_PROACTOR -# endif /* ACE_POSIX_AIOCB_PROACTOR */ +# ifndef ACE_POSIX_AIOCB_PROACTOR +# define ACE_POSIX_AIOCB_PROACTOR +# endif /* ACE_POSIX_AIOCB_PROACTOR */ #endif /* ACE_HAS_AIO_CALLS */ -#define ACE_LACKS_STROPTS_H +#if !defined ACE_LACKS_PERFECT_MULTICAST_FILTERING +# define ACE_LACKS_PERFECT_MULTICAST_FILTERING 1 +#endif /* ACE_LACKS_PERFECT_MULTICAST_FILTERING */ -// Needed when ACE_HAS_WCHAR is defined. -#define ACE_LACKS_WCSNICMP -#define ACE_LACKS_WCSICMP -#define ACE_LACKS_WCSDUP -#define ACE_LACKS_ITOW -#define ACE_HAS_3_PARAM_WCSTOK -#define ACE_HAS_3_PARAM_READDIR_R +// +// Version specific settings +// + +#if (__FreeBSD_version >= 220000) +# define ACE_HAS_VASPRINTF +#endif + +#if (__FreeBSD_version >= 300000) +# define ACE_HAS_SIGINFO_T +#endif /* __FreeBSD_version >= 300000 */ + +#if (__FreeBSD_version >= 320000) +# define ACE_HAS_REENTRANT_FUNCTIONS +# define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS +# define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R +#endif /* __FreeBSD_version >= 320000 */ + +#if (__FreeBSD_version > 400000) +# define ACE_HAS_UCONTEXT_T +# define ACE_HAS_SOCKLEN_T +# define ACE_HAS_GETIFADDRS +# define ACE_HAS_PTHREADS_UNIX98_EXT +#endif + +#if (__FreeBSD_version < 400000) +# define ACE_LACKS_SIGSET +# define ACE_LACKS_RWLOCK_T +# define ACE_LACKS_READDIR_R +# define ACE_LACKS_SETSCHED +# define ACE_LACKS_PTHREAD_THR_SIGSETMASK +# define ACE_LACKS_UCONTEXT_H +# define ACE_LACKS_RAND_REENTRANT_FUNCTIONS + +enum schedparam_policy { + SCHED_RR, + SCHED_IO, + SCHED_FIFO, + SCHED_OTHER +}; +#endif + +#if (__FreeBSD_version < 420000) +# define ACE_LACKS_GETPGID +# define ACE_LACKS_SETPGID +# define ACE_LACKS_SETREGID +# define ACE_LACKS_SETREUID +# define ACE_LACKS_PTHREAD_CANCEL +#endif /* __FreeBSD_version < 420000 */ + +#if (__FreeBSD_version >= 440000) +# define ACE_HAS_GETPROGNAME +# define ACE_HAS_SETPROGNAME +#endif + +#if (__FreeBSD_version < 500100) +# define ACE_HAS_NONCONST_MSGSND +#endif + +#if (__FreeBSD_version < 501000) +# define ACE_LACKS_STDINT_H +# define ACE_LACKS_PWD_REENTRANT_FUNCTIONS +#endif #if (__FreeBSD_version >= 501000) -# define ACE_HAS_PTHREAD_SETSTACK +# define ACE_HAS_PTHREAD_SETSTACK #endif #if (__FreeBSD_version < 700007) @@ -279,6 +206,10 @@ extern "C" { char * cuserid (char *s); } # define ACE_HAS_LKSCTP #endif +#if (__FreeBSD_version < 700038) +# define ACE_HAS_VOID_UNSETENV +#endif + #include /**/ "ace/post.h" #endif /* ACE_CONFIG_H */ diff --git a/dep/ACE_wrappers/ace/config-g++-common.h b/dep/ACE_wrappers/ace/config-g++-common.h index 8ac8eb974..464f30eab 100644 --- a/dep/ACE_wrappers/ace/config-g++-common.h +++ b/dep/ACE_wrappers/ace/config-g++-common.h @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: config-g++-common.h 82495 2008-08-04 07:23:01Z johnnyw $ +// $Id: config-g++-common.h 91338 2010-08-11 13:47:26Z johnnyw $ // This configuration file is designed to be included by another, // specific configuration file. It provides config information common @@ -29,24 +29,14 @@ #if (__GNUC__ < 3) # define ACE_LACKS_MEMBER_TEMPLATES +# define ACE_LACKS_NUMERIC_LIMITS #endif /* __GNUC__ < 3 */ -// __EXCEPTIONS is defined with -fexceptions, the egcs default. It -// is not defined with -fno-exceptions, the ACE default for g++. -// ACE_HAS_EXCEPTIONS is defined in -// include/makeinclude/wrapper_macros.GNU, so this really isn't -// necessary. Just in case . . . -#if defined (__EXCEPTIONS) && !defined (ACE_HAS_EXCEPTIONS) -# define ACE_HAS_EXCEPTIONS -#endif /* __EXCEPTIONS && ! ACE_HAS_EXCEPTIONS */ - -#if defined (ACE_HAS_EXCEPTIONS) -# define ACE_NEW_THROWS_EXCEPTIONS -# if (__GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) +#define ACE_NEW_THROWS_EXCEPTIONS +#if (__GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) // Versions of g++ prior to 3.3 had a buggy operator // new(nothrow)[](). -# define ACE_HAS_NEW_NOTHROW -# endif /* __GNUC__ >= 3.3 */ -#endif /* ACE_HAS_EXCEPTIONS */ +# define ACE_HAS_NEW_NOTHROW +#endif /* __GNUC__ >= 3.3 */ #if (defined (i386) || defined (__i386__)) && !defined (ACE_SIZEOF_LONG_DOUBLE) # define ACE_SIZEOF_LONG_DOUBLE 12 @@ -65,6 +55,30 @@ # define ACE_HAS_INTEL_ASSEMBLY #endif +#if !defined (ACE_HAS_GCC_CONSTRUCTOR_ATTRIBUTE) +#define ACE_HAS_GCC_CONSTRUCTOR_ATTRIBUTE 1 +#endif + +#if !defined (ACE_HAS_GCC_DESTRUCTOR_ATTRIBUTE) +#define ACE_HAS_GCC_DESTRUCTOR_ATTRIBUTE 1 +#endif + +#if !defined (ACE_HAS_GCC_DEPRECATED_ATTRIBUTE) +#define ACE_HAS_GCC_DEPRECATED_ATTRIBUTE 1 +#endif + +#if (ACE_HAS_GCC_CONSTRUCTOR_ATTRIBUTE == 1) +# define ACE_GCC_CONSTRUCTOR_ATTRIBUTE __attribute__ ((constructor)) +#endif + +#if (ACE_HAS_GCC_DESTRUCTOR_ATTRIBUTE == 1) +# define ACE_GCC_DESTRUCTOR_ATTRIBUTE __attribute__ ((destructor)) +#endif + +#if (ACE_HAS_GCC_DEPRECATED_ATTRIBUTE == 1) +#define ACE_DEPRECATED __attribute__ ((deprecated)) +#endif + // GNU g++ >= 4.x implements "#pragma once". #if (__GNUC__ < 4) && !defined (ACE_LACKS_PRAGMA_ONCE) // We define it with a -D with make depend. @@ -73,7 +87,7 @@ // Take advantage of G++ (>= 4.x) visibility attributes to generate // improved shared library binaries. -#if (__GNUC__ >= 4) && !defined (__MINGW32__) +#if (__GNUC__ >= 4) && !defined (__MINGW32__) && !defined (ACE_HAS_CEGCC) # if defined (ACE_HAS_CUSTOM_EXPORT_MACROS) && ACE_HAS_CUSTOM_EXPORT_MACROS == 0 # undef ACE_HAS_CUSTOM_EXPORT_MACROS @@ -124,6 +138,30 @@ # endif /* ACE_HAS_CUSTOM_EXPORT_MACROS == 0 */ #endif /* __GNU__ >= 4 */ +// GCC >= 4.1 provides __sync_XXXX builtins for use in atomic operations +// although the builtins are provided globally they are not supported on all platforms +#if defined (ACE_HAS_THREADS) +#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 1)) +# if defined (__powerpc__) +// The builtins seem to be provided for all powerpc platforms +# define ACE_HAS_GCC_ATOMIC_BUILTINS 1 +# if ((__GNUC__ == 4) && (__GNUC_MINOR__ == 1) && (__GNUC_PATCHLEVEL__ == 1)) +// PPU GCC 4.1.1 doesn't have builtin atomic ops for size 1/2 +# define ACE_LACKS_GCC_ATOMIC_BUILTINS_2 +# define ACE_LACKS_GCC_ATOMIC_BUILTINS_1 +# endif +# endif +# if defined (__ia64) +// The builtins seem to be provided for the IA64 platforms +# define ACE_HAS_GCC_ATOMIC_BUILTINS 1 +# endif +# if defined (__amd64__) || defined (__x86_64__) +// The builtin's are provided also for 64bit linux +# define ACE_HAS_GCC_ATOMIC_BUILTINS 1 +# endif +#endif +#endif /* ACE_HAS_THREADS */ + #if defined (ACE_HAS_GNU_REPO) // -frepo causes unresolved symbols of basic_string left- and // right-shift operators with ACE_HAS_STRING_CLASS. diff --git a/dep/ACE_wrappers/ace/config-hpux-11.00.h b/dep/ACE_wrappers/ace/config-hpux-11.00.h index 3af693e3e..d2797a32e 100644 --- a/dep/ACE_wrappers/ace/config-hpux-11.00.h +++ b/dep/ACE_wrappers/ace/config-hpux-11.00.h @@ -1,5 +1,5 @@ /* -*- C++ -*- */ -// $Id: config-hpux-11.00.h 81992 2008-06-16 19:09:50Z wotte $ +// $Id: config-hpux-11.00.h 91285 2010-08-05 08:29:30Z johnnyw $ // The following configuration file is designed to work for HP // platforms running HP-UX 11.00 using aC++ or gcc (2.95 and up). @@ -27,12 +27,6 @@ # ifndef ACE_USING_MCPP_PREPROCESSOR # define ACE_CC_PREPROCESSOR_ARGS "-E +W 67" # endif -// Compiler supports C++ exception handling. It's on by default. If the -// +noeh compiler option is used to disable exceptions, the compiler defines -// __HPACC_NOEH. -# if !defined (__HPACC_NOEH) -# define ACE_HAS_EXCEPTIONS 1 -# endif // If the -AA compile option is used, the compiler defines _HP_NAMESPACE_STD. // The -AA option enables the 2.0 standard C++ library. If not used, then @@ -284,17 +278,11 @@ #define ACE_HAS_XPG4_MULTIBYTE_CHAR -/* Platform/compiler supports _sys_errlist symbol */ -#define ACE_HAS_SYS_ERRLIST 1 - #define ACE_HAS_UALARM // Platform supports ucontext_t (which is used in the extended signal API). #define ACE_HAS_UCONTEXT_T -// Compiler/platform supports strerror (). -#define ACE_HAS_STRERROR - // Platform/compiler supports void * as second parameter to gettimeofday(). #define ACE_HAS_VOIDPTR_GETTIMEOFDAY @@ -337,11 +325,18 @@ #define ACE_LACKS_SUSECONDS_T #define ACE_LACKS_SYS_SYSCTL_H -// @@ TODO: It looks like HP-UX provides strtoull and wcstoull -// but some more work is needed to plug them in correctly. +// @@ TODO: It looks like HP-UX provides strtoll, strtoull, wcstoll and +// wcstoull but some more work is needed to plug them in correctly. +#define ACE_LACKS_STRTOLL +#define ACE_LACKS_WCSTOLL #define ACE_LACKS_STRTOULL #define ACE_LACKS_WCSTOULL +#define ACE_LACKS_ISWASCII + +#define ACE_LACKS_SETENV +#define ACE_LACKS_UNSETENV + // Shared library name/path components #if defined (__ia64) # define ACE_DLL_SUFFIX ACE_TEXT (".so") @@ -360,6 +355,7 @@ #define ACE_HAS_3_PARAM_READDIR_R +#define ACE_LACKS_STRUCT_LIFNUM ////////////////////////////////////////////////////////////////////////// // diff --git a/dep/ACE_wrappers/ace/config-icc-common.h b/dep/ACE_wrappers/ace/config-icc-common.h index 1ebd0c52e..13a6c9216 100644 --- a/dep/ACE_wrappers/ace/config-icc-common.h +++ b/dep/ACE_wrappers/ace/config-icc-common.h @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: config-icc-common.h 81935 2008-06-12 22:01:53Z jtc $ +// $Id: config-icc-common.h 91285 2010-08-05 08:29:30Z johnnyw $ #ifndef ACE_LINUX_ICC_COMMON_H #define ACE_LINUX_ICC_COMMON_H @@ -61,18 +61,7 @@ # define ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) __extension__ extern template class SINGLETON_TYPE; #endif /* ACE_HAS_CUSTOM_EXPORT_MACROS == 0 */ -// __EXCEPTIONS is defined with -fexceptions, the egcs default. It -// is not defined with -fno-exceptions, the ACE default for g++. -// ACE_HAS_EXCEPTIONS is defined in -// include/makeinclude/wrapper_macros.GNU, so this really isn't -// necessary. Just in case . . . -# if defined (__EXCEPTIONS) && !defined (ACE_HAS_EXCEPTIONS) -# define ACE_HAS_EXCEPTIONS -# endif /* __EXCEPTIONS && ! ACE_HAS_EXCEPTIONS */ - -# if defined (ACE_HAS_EXCEPTIONS) -# define ACE_NEW_THROWS_EXCEPTIONS -# endif /* ACE_HAS_EXCEPTIONS */ +#define ACE_NEW_THROWS_EXCEPTIONS #if (defined (i386) || defined (__i386__)) && !defined (ACE_SIZEOF_LONG_DOUBLE) # define ACE_SIZEOF_LONG_DOUBLE 12 diff --git a/dep/ACE_wrappers/ace/config-integritySCA.h b/dep/ACE_wrappers/ace/config-integritySCA.h index 62a5d5963..960086eff 100644 --- a/dep/ACE_wrappers/ace/config-integritySCA.h +++ b/dep/ACE_wrappers/ace/config-integritySCA.h @@ -8,7 +8,7 @@ * Integrity RTOS with SCA from Green Hills Software * http://www.ghs.com/products/rtos/integrity.html * - * $Id: config-integritySCA.h 81935 2008-06-12 22:01:53Z jtc $ + * $Id: config-integritySCA.h 91285 2010-08-05 08:29:30Z johnnyw $ */ #define ghs @@ -26,9 +26,6 @@ #define ACE_LACKS_GETEGID #define ACE_LACKS_GETGID -#ifndef ACE_HAS_EXCEPTIONS - #define ACE_HAS_EXCEPTIONS -#endif #define ACE_NEW_THROWS_EXCEPTIONS #define ACE_HAS_STANDARD_CPP_LIBRARY 1 #define ACE_TEMPLATES_REQUIRE_SOURCE 1 @@ -47,8 +44,7 @@ /***** ANSI defines *****/ #define ACE_LACKS_TEMPNAM /* believe it or not, this is ANSI C */ -#define ACE_HAS_STRERROR - +#define ACE_LACKS_PUTENV_PROTOTYPE #define ACE_LACKS_SENDMSG @@ -104,12 +100,9 @@ #define ACE_LACKS_RWLOCK_T #define ACE_LACKS_SEMBUF_T #define ACE_LACKS_UNIX_DOMAIN_SOCKETS -#define ACE_LACKS_USER -#define ACE_LACKS_FILE_FCNTL #define ACE_LACKS_FCNTL #define ACE_LACKS_UMASK #define ACE_LACKS_SEEK -#define ACE_LACKS_SHARED_MEMORY #define ACE_LACKS_MSYNC #define ACE_LACKS_PID_STUFF #define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS diff --git a/dep/ACE_wrappers/ace/config-irix6.x-common.h b/dep/ACE_wrappers/ace/config-irix6.x-common.h index d968fa422..1de756d53 100644 --- a/dep/ACE_wrappers/ace/config-irix6.x-common.h +++ b/dep/ACE_wrappers/ace/config-irix6.x-common.h @@ -1,6 +1,6 @@ /* -*- C++ -*- */ // -// $Id: config-irix6.x-common.h 81697 2008-05-14 18:33:11Z johnnyw $ +// $Id: config-irix6.x-common.h 87167 2009-10-19 19:33:53Z olli $ // // This file contains the common configuration options for both // SGI/MIPSPro C++ and g++ under IRIX 6.X @@ -119,9 +119,6 @@ // Platform supports STREAMS. #define ACE_HAS_STREAMS -// Compiler/platform supports strerror (). -#define ACE_HAS_STRERROR - // Compiler/platform supports struct strbuf. #define ACE_HAS_STRBUF_T @@ -181,7 +178,7 @@ #define ACE_LACKS_LINEBUFFERED_STREAMBUF #define ACE_LACKS_STDINT_H #define ACE_HAS_SYSENT_H -#define ACE_HAS_SYSINFO +#define ACE_HAS_SYSV_SYSINFO #define ACE_HAS_SYS_SYSTEMINFO_H // Platform has support for multi-byte character support compliant diff --git a/dep/ACE_wrappers/ace/config-irix6.x-g++.h b/dep/ACE_wrappers/ace/config-irix6.x-g++.h index 2211e0e7c..94c79119a 100644 --- a/dep/ACE_wrappers/ace/config-irix6.x-g++.h +++ b/dep/ACE_wrappers/ace/config-irix6.x-g++.h @@ -1,5 +1,5 @@ /* -*- C++ -*- */ -// $Id: config-irix6.x-g++.h 80826 2008-03-04 14:51:23Z wotte $ +// $Id: config-irix6.x-g++.h 87268 2009-10-29 21:06:06Z olli $ // The following configuration file is designed to work for the SGI // Indigo2EX running Irix 6.2 platform using the GNU C++ Compiler @@ -8,16 +8,8 @@ #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" #include "ace/config-irix6.x-common.h" -// Denotes that GNU has cstring.h as standard -// which redefines memchr() -#define ACE_HAS_GNU_CSTRING_H - #include /**/ "ace/post.h" #endif /* ACE_CONFIG_H */ diff --git a/dep/ACE_wrappers/ace/config-kfreebsd.h b/dep/ACE_wrappers/ace/config-kfreebsd.h new file mode 100644 index 000000000..34530ab0b --- /dev/null +++ b/dep/ACE_wrappers/ace/config-kfreebsd.h @@ -0,0 +1,628 @@ +// $Id: config-kfreebsd.h 91429 2010-08-23 14:50:15Z johnnyw $ + +#ifndef ACE_CONFIG_KFREEBSD_H +#define ACE_CONFIG_KFREEBSDH +#include "ace/config-g++-common.h" + + +/* Uses ctime_r & asctime_r with only two parameters vs. three. */ +#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R 1 + +/* Define to 1 if platform has 3 parameter readdir_r() */ +#define ACE_HAS_3_PARAM_READDIR_R 1 + +/* Define to 1 if platform has 3 parameter wcstok() */ +#define ACE_HAS_3_PARAM_WCSTOK 1 + +/* Platform has BSD 4.4 sendmsg()/recvmsg() APIs. */ +#define ACE_HAS_4_4BSD_SENDMSG_RECVMSG 1 + +/* Platform supports Asynchronous IO calls */ +#define ACE_HAS_AIO_CALLS 1 + +/* Use ACE's alternate cuserid() implementation since a system cuserid() may + not exist, or it is not desirable to use it. The implementation requires + ACE_LACKS_PWD_FUNCTIONS to be undefined and that the geteuid() system call + exists. */ +#define ACE_HAS_ALT_CUSERID 1 + +/* Compiler/platform correctly calls init()/fini() for shared libraries. */ +#define ACE_HAS_AUTOMATIC_INIT_FINI 1 + +/* Define to 1 if platform has bswap_16(). */ +#define ACE_HAS_BSWAP_16 1 + +/* Define to 1 if platform has bswap_32(). */ +#define ACE_HAS_BSWAP_32 1 + +/* Define to 1 if platform has bswap_64(). */ +#define ACE_HAS_BSWAP_64 1 + +/* Define to 1 if platform has the header file. */ +#define ACE_HAS_BYTESWAP_H 1 + +/* Define to 1 if platform has clock_gettime(). */ +#define ACE_HAS_CLOCK_GETTIME 1 + +/* Define to 1 if platform has clock_settime(). */ +#define ACE_HAS_CLOCK_SETTIME 1 + +/* Prototypes for both signal() and struct sigaction are consistent. */ +#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES 1 + +/* Define to 1 if the system has the type `cpu_set_t'. */ +#define ACE_HAS_CPU_SET_T 1 + +/* Platform supports operations on directories via struct dirent, readdir_r, + etc. */ +#define ACE_HAS_DIRENT 1 + +/* Compiler supports C++ exception handling. */ +#define ACE_HAS_EXCEPTIONS 1 + +/* Define to 1 if platform has getifaddrs(). */ +#define ACE_HAS_GETIFADDRS 1 + +/* Platform supports getpagesize() call (otherwise, ACE_PAGE_SIZE must be + defined, except on Win32). */ +#define ACE_HAS_GETPAGESIZE 1 + +/* Define to 1 if platform has getrusage(). */ +#define ACE_HAS_GETRUSAGE 1 + +/* Define to 1 if platform has the declaration of getrusage(). */ +#define ACE_HAS_GETRUSAGE_PROTOTYPE 1 + +/* Denotes that GNU has cstring.h as standard which redefines memchr() */ +#define ACE_HAS_GNU_CSTRING_H 1 + +/* The GPERF utility is compiled for this platform */ +#define ACE_HAS_GPERF 1 + +/* Optimize ACE_Handle_Set::count_bits for select() operations (common case) + */ +#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT 1 + +/* Defined to 1 if platform supports ICMP over raw sockets */ +#define ACE_HAS_ICMP_SUPPORT 1 + +/* Define to 1 if the system has the type `int16_t'. */ +#define ACE_HAS_INT16_T 1 + +/* Define to 1 if the system has the type `int32_t'. */ +#define ACE_HAS_INT32_T 1 + +/* Define to 1 if the system has the type `int64_t'. */ +#define ACE_HAS_INT64_T 1 + +/* Define to 1 if the system has the type `int8_t'. */ +#define ACE_HAS_INT8_T 1 + +/* Platform supports IPv6 */ +#define ACE_HAS_IPV6 1 + +/* Platform supports IP multicast */ +#define ACE_HAS_IP_MULTICAST 1 + +/* Define to 1 if platform has the declaration of isastream(). */ +#define ACE_HAS_ISASTREAM_PROTOTYPE 1 + +/* Platform supports lseek64(). This should not be defined if ACE_HAS_LLSEEK + is defined. */ +#define ACE_HAS_LSEEK64 1 + +/* Define to 1 if platform has memchr(). */ +#define ACE_HAS_MEMCHR 1 + +/* Define to 1 if unrolled ACE_OS::fast_memcpy() is faster than system + memcpy() */ +#define ACE_HAS_MEMCPY_LOOP_UNROLL 1 + +/* Define to 1 if platform has mkdir(). */ +#define ACE_HAS_MKDIR 1 + +/* Platform supports recvmsg and sendmsg */ +#define ACE_HAS_MSG 1 + +/* Compiler supports timed mutex acquisitions (e.g. + pthread_mutex_timedlock()). */ +#define ACE_HAS_MUTEX_TIMEOUTS 1 + +/* Define to 1 if platform has nanosleep(). */ +#define ACE_HAS_NANOSLEEP 1 + +/* Define to 1 if platform has the header file. */ +#ifdef ACE_HAS_NEW_H +#undef ACE_HAS_NEW_H +#endif + +#ifndef ACE_LACKS_NEW_H +#define ACE_LACKS_NEW_H 1 +#endif + +/* Platform provides new style C++ header */ +#define ACE_HAS_NEW_NO_H 1 + +/* Platform's select() uses non-const timeval* (only found on Linux right now) + */ +#define ACE_HAS_NONCONST_SELECT_TIMEVAL 1 + +/* Platform has swab(char*, char*, ssize_t) variant. */ +#define ACE_HAS_NONCONST_SWAB 1 + +/* Platform contains */ +#define ACE_HAS_POLL 1 + +/* Platform supports "position-independent" features provided by + ACE_Based_Pointer<>. */ +#define ACE_HAS_POSITION_INDEPENDENT_POINTERS 1 + +/* Platform supports POSIX getpwnam_r() function */ +#define ACE_HAS_POSIX_GETPWNAM_R 1 + +/* Platform supports POSIX O_NONBLOCK semantics */ +#define ACE_HAS_POSIX_NONBLOCK 1 + +/* Platform supports POSIX real-time semaphores (e.g., VxWorks and Solaris) */ +#define ACE_HAS_POSIX_SEM 1 + +/* Platform supports the POSIX struct timespec type */ +#define ACE_HAS_POSIX_TIME 1 + +/* Platform supports the /proc file system and defines tid_t in + */ +#define ACE_HAS_PROC_FS 1 + +/* Define to 1 if platform has POSIX threads */ +#define ACE_HAS_PTHREADS 1 + +/* Platform supports POSIX.1c-1995 threads */ +#define ACE_HAS_PTHREADS_STD 1 + +/* Platform has the UNIX98 extensions to Pthreads (rwlocks) */ +#define ACE_HAS_PTHREADS_UNIX98_EXT 1 + +/* Define to 1 if platform has pthread_getconcurrency(). */ +#define ACE_HAS_PTHREAD_GETCONCURRENCY 1 + +/* Define to 1 if platform has pthread_mutexattr_setkind_np(). */ +#define ACE_HAS_PTHREAD_MUTEXATTR_SETKIND_NP 1 + +/* pthread.h declares an enum with PTHREAD_PROCESS_PRIVATE and + PTHREAD_PROCESS_SHARED values */ +#define ACE_HAS_PTHREAD_PROCESS_ENUM 1 + +/* Define to 1 if platform has pthread_setconcurrency(). */ +#define ACE_HAS_PTHREAD_SETCONCURRENCY 1 + +/* Define to 1 if platform has the declaration of pthread_sigmask(). */ +#define ACE_HAS_PTHREAD_SIGMASK_PROTOTYPE 1 + +/* Platform has pread() and pwrite() support. */ +#define ACE_HAS_P_READ_WRITE 1 + +/* Define to 1 to configure Reactor to use a user-space queue for + notifications */ +#define ACE_HAS_REACTOR_NOTIFICATION_QUEUE 1 + +/* Mutexes are inherently recursive (e.g., Win32) */ +/* #undef ACE_HAS_RECURSIVE_MUTEXES */ + +/* Platform will recurse infinitely on thread exits from TSS cleanup routines + (e.g., AIX) */ +#define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS 1 + +/* Platform supports reentrant functions (i.e., all the POSIX *_r functions). + */ +#define ACE_HAS_REENTRANT_FUNCTIONS 1 + +/* Define to 1 if platform has sched_getaffinity(). */ +#define ACE_HAS_SCHED_GETAFFINITY 1 + +/* Define to 1 if platform has sched_setaffinity(). */ +#define ACE_HAS_SCHED_SETAFFINITY 1 + +/* Platform has shm_open() */ +#define ACE_HAS_SHM_OPEN 1 + +/* Platform's sigaction() function takes const sigaction* as 2nd parameter */ +#define ACE_HAS_SIGACTION_CONSTP2 1 + +/* Define to 1 if the system has the type `siginfo_t'. */ +#define ACE_HAS_SIGINFO_T 1 + +/* Define to 1 if platform has sigsuspend(). */ +#define ACE_HAS_SIGSUSPEND 1 + +/* Define to 1 if platform has sigtimedwait(). */ +#define ACE_HAS_SIGTIMEDWAIT 1 + +/* Define to 1 if platform has sigwait(). */ +#define ACE_HAS_SIGWAIT 1 + +/* Define to 1 if the system has the type 'sig_atomic_t'. */ +#define ACE_HAS_SIG_ATOMIC_T 1 + +/* Compiler requires extern "C" functions for signals. */ +#define ACE_HAS_SIG_C_FUNC 1 + +/* Define to 1 if platform has snprintf(). */ +#define ACE_HAS_SNPRINTF 1 + +/* Define to 1 if `sin6_len' is a member of `sockaddr_in6'. */ +#define ACE_HAS_SOCKADDR_IN6_SIN6_LEN 1 + +/* Define to 1 if `sin_len' is a member of `sockaddr_in'. */ +#define ACE_HAS_SOCKADDR_IN_SIN_LEN 1 + +/* Platform requires (struct sockaddr *) for msg_name field of struct msghdr. + */ +#define ACE_HAS_SOCKADDR_MSG_NAME 1 + +/* Define to 1 if the system has the type `socklen_t'. */ +#define ACE_HAS_SOCKLEN_T 1 + +/* Define to 1 if the system has the type `ssize_t'. */ +#define ACE_HAS_SSIZE_T 1 + +/* Platform/compiler supports Standard C++ Library */ +#define ACE_HAS_STANDARD_CPP_LIBRARY 1 + +/* Compiler supports standard C++ template class member specializations */ +#define ACE_HAS_STD_TEMPLATE_CLASS_MEMBER_SPECIALIZATION 1 + +/* Compiler supports standard C++ template specializations (e.g. "template <>" + syntax.) */ +#define ACE_HAS_STD_TEMPLATE_SPECIALIZATION 1 + +/* Compiler/platform supports struct strbuf */ +#define ACE_HAS_STRBUF_T 1 + +/* Platform supports STREAMS */ +#define ACE_HAS_STREAMS 1 + +/* Define to 1 if platform has strerror(). */ +#define ACE_HAS_STRERROR 1 + +/* Platform has (which contains bzero() prototype) */ +#define ACE_HAS_STRINGS 1 + +/* Platform/Compiler supports a String class (e.g., GNU or Win32). */ +#define ACE_HAS_STRING_CLASS 1 + +/* Define to 1 if platform has strnlen(). */ +#define ACE_HAS_STRNLEN 1 + +/* Compiler/platform supports SVR4 dynamic linking semantics */ +#define ACE_HAS_SVR4_DYNAMIC_LINKING 1 + +/* Define to 1 if platform has sysctl(). */ +#define ACE_HAS_SYSCTL 1 + +/* Platform supports System V IPC (most versions of UNIX, but not Win32) */ +#define ACE_HAS_SYSV_IPC 1 + +/* Platform/compiler supports _sys_errlist symbol */ +#define ACE_HAS_SYS_ERRLIST 1 + +/* Define to 1 if platform has the header file. */ +#define ACE_HAS_SYS_FILIO_H 1 + +/* Compiler/platform supports _sys_siglist array */ +#define ACE_HAS_SYS_SIGLIST 1 + +/* Define to 1 if platform has the header file. */ +#define ACE_HAS_SYS_SOCKIO_H 1 + +/* Define to 1 if platform has the header file. */ +#define ACE_HAS_SYS_SYSCALL_H 1 + +/* Define to 1 if system supports POSIX tty API. */ +#define ACE_HAS_TERMIOS 1 + +/* Platform supports threads. */ +#define ACE_HAS_THREADS 1 + +/* Compiler/platform has thread-specific storage */ +#define ACE_HAS_THREAD_SPECIFIC_STORAGE 1 + +/* Define to 1 if platform has global timezone variable */ +#define ACE_HAS_TIMEZONE 1 + +/* Platform/compiler supports timezone * as second parameter to gettimeofday() + and has a prototype. */ +#define ACE_HAS_TIMEZONE_GETTIMEOFDAY 1 + +/* Compiler supports the C++ typename keyword */ +#define ACE_HAS_TYPENAME_KEYWORD 1 + +/* Define to 1 if platform has ualarm(). */ +#define ACE_HAS_UALARM 1 + +/* Define to 1 if the system has the type `ucontext_t'. */ +#define ACE_HAS_UCONTEXT_T 1 + +/* Define to 1 if the system has the type `uint16_t'. */ +#define ACE_HAS_UINT16_T 1 + +/* Define to 1 if the system has the type `uint32_t'. */ +#define ACE_HAS_UINT32_T 1 + +/* Define to 1 if the system has the type `uint64_t'. */ +#define ACE_HAS_UINT64_T 1 + +/* Define to 1 if the system has the type `uint8_t'. */ +#define ACE_HAS_UINT8_T 1 + +/* Define to 1 if platform has vasprintf(). */ +#define ACE_HAS_VASPRINTF 1 + +/* Define to 1 if platform has vfwprintf(). */ +#define ACE_HAS_VFWPRINTF 1 + +/* Platform requires void * for mmap(). */ +#define ACE_HAS_VOIDPTR_MMAP 1 + +/* OS/compiler uses void * arg 4 setsockopt() rather than const char * */ +#define ACE_HAS_VOIDPTR_SOCKOPT 1 + +/* Define to 1 if platform has vswprintf(). */ +#define ACE_HAS_VSWPRINTF 1 + +/* Platform/compiler supports wchar_t */ +#define ACE_HAS_WCHAR 1 + +/* Define to 1 if platform has wcsnlen(). */ +#define ACE_HAS_WCSNLEN 1 + +/* Platform has support for multi-byte character support compliant with the + XPG4 Worldwide Portability Interface wide-character classification. */ +#define ACE_HAS_XPG4_MULTIBYTE_CHAR 1 + +/* Platform has Xt Intrinsics Toolkit */ +#define ACE_HAS_XT 1 + +/* Define to signed 64 bit integer type */ +#define ACE_INT64_TYPE signed long long + +/* Define to the type of arg 2 for `ioctl'. */ +#define ACE_IOCTL_TYPE_ARG2 int + +/* Define to 1 if platform lacks getipnodebyaddr(). */ +#define ACE_LACKS_GETIPNODEBYADDR 1 + +/* Define to 1 if platform lacks getipnodebyname(). */ +#define ACE_LACKS_GETIPNODEBYNAME 1 + +/* iostream header does not declare ipfx (), opfx (), etc. */ +#define ACE_LACKS_IOSTREAM_FX 1 + +/* Define to 1 if platform lacks itow(). */ +#define ACE_LACKS_ITOW 1 + +/* Platform lacks streambuf "linebuffered ()". */ +#define ACE_LACKS_LINEBUFFERED_STREAMBUF 1 + +/* Platform does not have Motif X toolkit available */ +#define ACE_LACKS_MOTIF 1 + +/* Platform defines ACE_HAS_MSG, but lacks msg_accrights{len}. */ +#define ACE_LACKS_MSG_ACCRIGHTS 1 + +/* Platform lacks named POSIX semaphores (e.g., Chorus) */ +#define ACE_LACKS_NAMED_POSIX_SEM 1 + +/* Compiler complains about use of obsolete "pragma once" */ +#define ACE_LACKS_PRAGMA_ONCE 1 + +/* Define to 1 if the system lacks the type 'pri_t'. */ +#define ACE_LACKS_PRI_T 1 + +/* Define to 1 if platform lacks pthread_thr_sigsetmask(). */ +#define ACE_LACKS_PTHREAD_THR_SIGSETMASK 1 + +/* Platform lacks readers/writer locks. */ +#define ACE_LACKS_RWLOCK_T 1 + +/* Define to 1 if platform lacks the header file. */ +#define ACE_LACKS_SIGINFO_H 1 + +/* Define to 1 if platform lacks the header file. */ +#define ACE_LACKS_TERMIO_H 1 + +/* Define to 1 if platform lacks the declarations of recv_timedwait, + send_timedwait, etc. */ +#define ACE_LACKS_TIMEDWAIT_PROTOTYPES 1 + +/* Platform does not define timepec_t as a typedef for struct timespec. */ +#define ACE_LACKS_TIMESPEC_T 1 + +/* */ +#define ACE_LACKS_UNBUFFERED_STREAMBUF 1 + +/* Define to 1 if the system lacks the type `u_long_long_t'. */ +#define ACE_LACKS_U_LONGLONG_T 1 + +/* Define to 1 if platform lacks wcsnicmp(). */ +#define ACE_LACKS_WCSNICMP 1 + +/* Compile using multi-thread libraries */ +#define ACE_MT_SAFE 1 + +/* Size of the native "double" type */ +#define ACE_SIZEOF_DOUBLE 8 + +/* Size of the native "float" type */ +#define ACE_SIZEOF_FLOAT 4 + +/* Size of the native "int" type */ +#define ACE_SIZEOF_INT 4 + +/* Size of the native "long" type */ +#define ACE_SIZEOF_LONG 4 + +/* Size of the native "long double" type */ +#define ACE_SIZEOF_LONG_DOUBLE 12 + +/* Size of the native "long long" type */ +#define ACE_SIZEOF_LONG_LONG 8 + +/* Size of the native "short" type */ +#define ACE_SIZEOF_SHORT 2 + +/* Size of the native "pointer to void" type */ +#define ACE_SIZEOF_VOID_P 4 + +/* Size of the native "wchar_t" type */ +#define ACE_SIZEOF_WCHAR 4 + +/* Define to unsigned 64 bit integer type */ +#define ACE_UINT64_TYPE unsigned long long + +/* Enable IPv6 support on platforms that don't have IPv6 turned on by default + */ +#define ACE_USES_IPV4_IPV6_MIGRATION 1 + +/* Platform has its standard C++ library in the namespace std. */ +#define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 + +/* Define to 1 if you have the header file, and it defines `DIR'. + */ +#define HAVE_DIRENT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FSTREAM 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_IOMANIP 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_IOS 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_IOSTREAM 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_IOSTREAM_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_ISTREAM 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_OSTREAM 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STREAMBUF 1 + +/* Define to 1 if you have the `strftime' function. */ +#define HAVE_STRFTIME 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have that is POSIX.1 compatible. */ +#define HAVE_SYS_WAIT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#define LT_OBJDIR ".libs/" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "ace-bugs@cs.wustl.edu" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "ACE" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "ACE 5.6.3" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "ace" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "5.6.3" + +/* The size of `double', as computed by sizeof. */ +#define SIZEOF_DOUBLE 8 + +/* The size of `float', as computed by sizeof. */ +#define SIZEOF_FLOAT 4 + +/* The size of `int', as computed by sizeof. */ +#define SIZEOF_INT 4 + +/* The size of `long', as computed by sizeof. */ +#define SIZEOF_LONG 4 + +/* The size of `long double', as computed by sizeof. */ +#define SIZEOF_LONG_DOUBLE 12 + +/* The size of `long long', as computed by sizeof. */ +#define SIZEOF_LONG_LONG 8 + +/* The size of `short', as computed by sizeof. */ +#define SIZEOF_SHORT 2 + +/* The size of `signed char', as computed by sizeof. */ +#define SIZEOF_SIGNED_CHAR 1 + +/* The size of `void *', as computed by sizeof. */ +#define SIZEOF_VOID_P 4 + +/* The size of `wchar_t', as computed by sizeof. */ +#define SIZEOF_WCHAR_T 4 + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + + +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most + significant byte first (like Motorola and SPARC, unlike Intel). */ +#if defined AC_APPLE_UNIVERSAL_BUILD +# if defined __BIG_ENDIAN__ +# define WORDS_BIGENDIAN 1 +# endif +#else +# ifndef WORDS_BIGENDIAN +/* # undef WORDS_BIGENDIAN */ +# endif +#endif + + +/* Enable ACE inlining */ +#define __ACE_INLINE__ 1 + + +#endif /* ACE_CONFIG_KFREEBSDH */ + + diff --git a/dep/ACE_wrappers/ace/config-linux-common.h b/dep/ACE_wrappers/ace/config-linux-common.h index bbb10b175..b787a1447 100644 --- a/dep/ACE_wrappers/ace/config-linux-common.h +++ b/dep/ACE_wrappers/ace/config-linux-common.h @@ -1,5 +1,5 @@ /* -*- C++ -*- */ -// $Id: config-linux-common.h 82516 2008-08-05 19:22:59Z shuston $ +// $Id: config-linux-common.h 88663 2010-01-22 10:49:22Z mcorino $ // Do not use this configuration file directly since it's designed to // be included by another, specific configuration file, such as @@ -73,6 +73,7 @@ # if (__GLIBC__ < 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 3) # define ACE_HAS_RUSAGE_WHO_ENUM enum __rusage_who # define ACE_HAS_RLIMIT_RESOURCE_ENUM enum __rlimit_resource +# define ACE_LACKS_ISCTYPE # endif # define ACE_HAS_SOCKLEN_T # define ACE_HAS_4_4BSD_SENDMSG_RECVMSG @@ -174,13 +175,7 @@ #elif defined (__DECCXX) # define ACE_CONFIG_INCLUDE_CXX_COMMON # include "ace/config-cxx-common.h" -#elif defined (__BORLANDC__) -# undef ACE_HAS_LLSEEK -# undef ACE_HAS_LSEEK64 -# undef ACE_LACKS_LLSEEK_PROTOTYPE -# undef ACE_LACKS_LSEEK64_PROTOTYPE -# include "ace/config-borland-common.h" -#elif defined (__SUNCC_PRO) +#elif defined (__SUNCC_PRO) || defined (__SUNPRO_CC) # include "ace/config-suncc-common.h" #elif defined (__PGI) // Portable group compiler @@ -199,7 +194,7 @@ * (TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.{h,c}) that may indirectly * include this */ -#else /* ! __GNUG__ && !__DECCXX && !__INTEL_COMPILER && !__BORLANDC__ && !__PGI */ +#else /* ! __GNUG__ && !__DECCXX && !__INTEL_COMPILER && && !__PGI */ # ifdef __cplusplus /* Let it slide for C compilers. */ # error unsupported compiler in ace/config-linux-common.h # endif /* __cplusplus */ @@ -208,11 +203,13 @@ // Completely common part :-) // Platform/compiler has the sigwait(2) prototype -# define ACE_HAS_SIGWAIT +#define ACE_HAS_SIGWAIT -# define ACE_HAS_SIGSUSPEND +#define ACE_HAS_SIGSUSPEND -# define ACE_HAS_UALARM +#define ACE_HAS_UALARM + +#define ACE_HAS_STRSIGNAL #if __GLIBC__ >= 2 #ifndef ACE_HAS_POSIX_REALTIME_SIGNALS @@ -239,6 +236,7 @@ #define ACE_LACKS_ITOW #define ACE_LACKS_WCSICMP #define ACE_LACKS_WCSNICMP +#define ACE_LACKS_ISWASCII #if __GLIBC__ >= 2 # define ACE_HAS_3_PARAM_WCSTOK @@ -323,8 +321,11 @@ // Platform supplies scandir() #define ACE_HAS_SCANDIR +#if (__GLIBC__ < 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 10) // Although the scandir man page says otherwise, this setting is correct. +// The setting was fixed in 2.10, so do not use the hack after that. #define ACE_SCANDIR_CMP_USES_CONST_VOIDPTR +#endif // A conflict appears when including both and // with recent glibc headers. @@ -341,9 +342,6 @@ #define ACE_HAS_TIMEZONE_GETTIMEOFDAY -// Compiler/platform supports strerror (). -#define ACE_HAS_STRERROR - // Don't define _XOPEN_SOURCE in ACE to make strptime() prototype // visible. ACE shouldn't depend on feature test macros to make // prototypes visible. @@ -378,13 +376,18 @@ #if defined (__ia64) || defined(__alpha) || defined (__x86_64__) // On 64 bit platforms, the "long" type is 64-bits. Override the // default 32-bit platform-specific format specifiers appropriately. -# define ACE_UINT64_FORMAT_SPECIFIER ACE_TEXT ("%lu") -# define ACE_SSIZE_T_FORMAT_SPECIFIER ACE_TEXT ("%ld") -# define ACE_SIZE_T_FORMAT_SPECIFIER ACE_TEXT ("%lu") +# define ACE_UINT64_FORMAT_SPECIFIER_ASCII "%lu" +# define ACE_SSIZE_T_FORMAT_SPECIFIER_ASCII "%ld" +# define ACE_SIZE_T_FORMAT_SPECIFIER_ASCII "%lu" #endif /* __ia64 */ #define ACE_SIZEOF_WCHAR 4 +#if defined (__powerpc__) && !defined (ACE_SIZEOF_LONG_DOUBLE) +// 32bit PowerPC Linux uses 128bit long double +# define ACE_SIZEOF_LONG_DOUBLE 16 +#endif + #define ACE_LACKS_GETIPNODEBYADDR #define ACE_LACKS_GETIPNODEBYNAME @@ -392,15 +395,28 @@ #define ACE_HAS_TERMIOS // Linux implements sendfile(). -#define ACE_HAS_SENDFILE +#define ACE_HAS_SENDFILE 1 #define ACE_HAS_VOIDPTR_MMAP +#define ACE_HAS_ICMP_SUPPORT 1 + +#define ACE_HAS_VASPRINTF + +// According to man pages Linux uses different (compared to UNIX systems) types +// for setting IP_MULTICAST_TTL and IPV6_MULTICAST_LOOP / IP_MULTICAST_LOOP +// in setsockopt/getsockopt. +#define ACE_HAS_IP_MULTICAST_TTL_AS_INT 1 +#define ACE_HAS_IPV6_MULTICAST_LOOP_AS_BOOL 1 +#define ACE_HAS_IP_MULTICAST_LOOP_AS_INT 1 + #if defined (ACE_LACKS_NETWORKING) # include "ace/config-posix-nonetworking.h" #else # define ACE_HAS_NETLINK -# define ACE_HAS_GETIFADDRS +# if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) +# define ACE_HAS_GETIFADDRS +# endif #endif #if !defined (ACE_GETNAME_RETURNS_RANDOM_SIN_ZERO) diff --git a/dep/ACE_wrappers/ace/config-lite.h b/dep/ACE_wrappers/ace/config-lite.h index 0992925a6..1a6937c85 100644 --- a/dep/ACE_wrappers/ace/config-lite.h +++ b/dep/ACE_wrappers/ace/config-lite.h @@ -4,7 +4,7 @@ /** * @file config-lite.h * - * $Id: config-lite.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: config-lite.h 85832 2009-06-28 16:14:59Z johnnyw $ * * @author (Originally in OS.h)Doug Schmidt * @author Jesper S. M|ller @@ -122,13 +122,13 @@ 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 <= 0x590 \ +#if defined (__SUNPRO_CC) && __SUNPRO_CC <= 0x5100 \ && !defined (_STLPORT_VERSION) // If we're not using the stlport4 C++ library (which has standard // iterators), we need to ensure this is included in order to test // the _RWSTD_NO_CLASS_PARTIAL_SPEC feature test macro below. # include -#endif /* __SUNPRO_CC <= 0x580 */ +#endif /* __SUNPRO_CC <= 0x5100 */ #if (defined (_MSC_VER) && (_MSC_VER <= 1310) && defined (_WIN64)) \ || defined (ACE_HAS_BROKEN_STD_REVERSE_ITERATOR) // VC 7.1 and the latest 64-bit platform SDK still don't define a standard @@ -137,7 +137,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL typedef std::reverse_iterator reverse_iterator; \ typedef std::reverse_iterator const_reverse_iterator; -#elif defined (__SUNPRO_CC) && __SUNPRO_CC <= 0x590 \ +#elif defined (__SUNPRO_CC) && __SUNPRO_CC <= 0x5100 \ && defined (_RWSTD_NO_CLASS_PARTIAL_SPEC) # define ACE_DECLARE_STL_REVERSE_ITERATORS \ typedef std::reverse_iterator +#undef __FREEBSDCODE__ + #if ! defined (__ACE_INLINE__) # define __ACE_INLINE__ #endif /* ! __ACE_INLINE__ */ @@ -32,7 +39,8 @@ // # define ACE_HAS_POWERPC_TIMER #endif /* __x86__ || __powerpc__ */ -#define ACE_DEFAULT_BASE_ADDR ((char *) 0) +#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R +#define ACE_HAS_3_PARAM_READDIR_R #define ACE_HAS_4_4BSD_SENDMSG_RECVMSG #define ACE_HAS_ALLOCA #define ACE_HAS_ALLOCA_H @@ -45,41 +53,55 @@ #define ACE_HAS_CLOCK_SETTIME #define ACE_HAS_CPLUSPLUS_HEADERS #define ACE_HAS_DIRENT +#define ACE_HAS_GETIFADDRS #define ACE_HAS_GETPAGESIZE #define ACE_HAS_GETRUSAGE -#define ACE_HAS_GNU_CSTRING_H +#define ACE_HAS_GETRUSAGE_PROTOTYPE #define ACE_HAS_GPERF +#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT #define ACE_HAS_ICMP_SUPPORT 1 #define ACE_HAS_IP_MULTICAST -#define ACE_HAS_LYNXOS_SIGNALS +#define ACE_HAS_MEMCHR +#define ACE_HAS_MKDIR #define ACE_HAS_MSG +#define ACE_HAS_NANOSLEEP +#define ACE_HAS_NEW_NOTHROW #define ACE_HAS_NONCONST_CLOCK_SETTIME #define ACE_HAS_NONCONST_MSGSND #define ACE_HAS_NONCONST_READV #define ACE_HAS_NONCONST_SELECT_TIMEVAL #define ACE_HAS_NONCONST_SETRLIMIT #define ACE_HAS_NONCONST_WRITEV +#define ACE_HAS_POSITION_INDEPENDENT_POINTERS 1 #define ACE_HAS_POSIX_NONBLOCK #define ACE_HAS_POSIX_TIME #define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS #define ACE_HAS_SCANDIR -#define ACE_HAS_SEMUN +#define ACE_HAS_SIGACTION_CONSTP2 #define ACE_HAS_SIGINFO_T +#define ACE_HAS_SIGSUSPEND #define ACE_HAS_SIGTIMEDWAIT #define ACE_HAS_SIGWAIT #define ACE_HAS_SIG_ATOMIC_T +#define ACE_HAS_SIG_C_FUNC +#define ACE_HAS_SOCKADDR_IN6_SIN6_LEN +#define ACE_HAS_SOCKADDR_IN_SIN_LEN +#define ACE_HAS_SOCKADDR_MSG_NAME +#define ACE_HAS_SOCKLEN_T #define ACE_HAS_SSIZE_T -#define ACE_HAS_STRBUF_T #define ACE_HAS_STREAMS -#define ACE_HAS_STRERROR -#define ACE_HAS_SYSV_IPC -#define ACE_HAS_SYS_SIGLIST +#define ACE_HAS_STRINGS +#define ACE_HAS_STRING_CLASS +#define ACE_HAS_SYSCTL +#define ACE_HAS_SYS_FILIO_H #define ACE_HAS_SYS_SOCKIO_H #define ACE_HAS_TERMIOS #define ACE_HAS_TIMEZONE_GETTIMEOFDAY + #define ACE_LACKS_ALPHASORT_PROTOTYPE #define ACE_LACKS_CONST_TIMESPEC_PTR #define ACE_LACKS_GETPGID +#define ACE_LACKS_ISCTYPE #define ACE_LACKS_MADVISE #define ACE_LACKS_MKSTEMP_PROTOTYPE #define ACE_LACKS_MKTEMP_PROTOTYPE @@ -92,13 +114,13 @@ #define ACE_LACKS_SETEUID #define ACE_LACKS_SIGINFO_H #define ACE_LACKS_STRPTIME -#define ACE_LACKS_SUSECONDS_T #define ACE_LACKS_SWAB_PROTOTYPE #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_LACKS_SUSECONDS_T + +#define ACE_DEFAULT_BASE_ADDR ((char *) 0) +#define ACE_EXPLICIT_TEMPLATE_DESTRUCTOR_TAKES_ARGS #define ACE_MALLOC_ALIGN 8 #define ACE_PAGE_SIZE 4096 #define ACE_POSIX_SIG_PROACTOR @@ -110,34 +132,25 @@ #if ACE_MT_SAFE == 1 // Platform supports threads. # define ACE_HAS_PTHREADS +# define ACE_HAS_PTHREADS_STD +# define ACE_HAS_PTHREADS_UNIX98_EXT +# define ACE_HAS_PTHREAD_GETCONCURRENCY +# define ACE_HAS_PTHREAD_SETCONCURRENCY +# define ACE_HAS_PTHREAD_SIGMASK_PROTOTYPE # define ACE_HAS_THREAD_SPECIFIC_STORAGE -# define ACE_LACKS_NULL_PTHREAD_STATUS -# define ACE_LACKS_THREAD_PROCESS_SCOPING # define ACE_LACKS_PTHREAD_ATTR_SETSTACK +# define ACE_LACKS_THREAD_PROCESS_SCOPING # if ACE_LYNXOS_MAJOR == 4 && ACE_LYNXOS_MINOR == 0 # define ACE_LACKS_SETDETACH # define ACE_LACKS_PTHREAD_ATTR_SETSTACKADDR # endif #endif /* ACE_MT_SAFE */ -#if __GNUC__ < 3 -# define ACE_LACKS_NUMERIC_LIMITS -#endif /* __GNUC__ < 3 */ - // 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 */ -// System include files are not in sys/, this gets rid of warning. -#define __NO_INCLUDE_WARN__ - -// "changes signedness" error (OS.i and many other files) -#define ACE_HAS_SOCKLEN_T -// LSOCK.cpp uses a macro from param.h, not included -#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 @@ -145,7 +158,6 @@ # 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) @@ -154,6 +166,31 @@ # define ACE_HAS_MUTEX_TIMEOUTS #endif +#if (ACE_LYNXOS_MAJOR >=5) +// LynxOS 5.0 Additons +# define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES +# define ACE_HAS_NONCONST_INET_ADDR +# define ACE_LACKS_INET_ATON_PROTOTYPE +# define ACE_LACKS_SEMBUF_T +# define ACE_LACKS_STROPTS_H +# define ACE_LACKS_STRRECVFD +# define ACE_LACKS_SYS_SEM_H +# define ACE_SYS_SIGLIST __sys_siglist +#else +// LynxOS 5.0 Removals +# define ACE_HAS_LYNXOS4_SIGNALS +# define ACE_HAS_SEMUN +# define ACE_HAS_STRBUF_T +# define ACE_HAS_SYSV_IPC +# define ACE_LACKS_ISBLANK +# define ACE_LACKS_SETENV +# define ACE_LACKS_UNSETENV +# define ACE_LACKS_USECONDS_T +# define ACE_LACKS_VSNPRINTF +# define ACE_LACKS_WCHAR_H +# define ACE_SYS_SIGLIST sys_siglist +#endif + #if defined (ACE_HAS_SVR4_DYNAMIC_LINKING) # define ACE_HAS_BROKEN_THREAD_KEYFREE #endif /* ACE_HAS_SVR4_DYNAMIC_LINKING */ diff --git a/dep/ACE_wrappers/ace/config-macosx-iphone-hardware.h b/dep/ACE_wrappers/ace/config-macosx-iphone-hardware.h new file mode 100644 index 000000000..6201d8e82 --- /dev/null +++ b/dep/ACE_wrappers/ace/config-macosx-iphone-hardware.h @@ -0,0 +1,15 @@ +// $Id: config-macosx-iphone-hardware.h 88739 2010-01-27 05:35:23Z sowayaa $ +#ifndef ACE_CONFIG_MACOSX_IPHONE_HARDWARE_H +#define ACE_CONFIG_MACOSX_IPHONE_HARDWARE_H + +#define ACE_HAS_IPHONE +#define ACE_SIZEOF_LONG_DOUBLE 8 + +#include "ace/config-macosx-snowleopard.h" + +#ifdef ACE_HAS_SYSV_IPC +#undef ACE_HAS_SYSV_IPC +#endif + +#endif ACE_CONFIG_MACOSX_IPHONE_HARDWARE_H + diff --git a/dep/ACE_wrappers/ace/config-macosx-iphone-simulator.h b/dep/ACE_wrappers/ace/config-macosx-iphone-simulator.h new file mode 100644 index 000000000..024cf8480 --- /dev/null +++ b/dep/ACE_wrappers/ace/config-macosx-iphone-simulator.h @@ -0,0 +1,9 @@ +// $Id: config-macosx-iphone-simulator.h 88653 2010-01-21 23:19:50Z sowayaa $ +#ifndef ACE_CONFIG_MACOSX_IPHONE_SIMULATOR_H +#define ACE_CONFIG_MACOSX_IPHONE_SIMULATOR_H + +#define ACE_HAS_IPHONE +#include "ace/config-macosx-snowleopard.h" + +#endif ACE_CONFIG_MACOSX_IPHONE_SIMULATOR_H + diff --git a/dep/ACE_wrappers/ace/config-macosx-leopard.h b/dep/ACE_wrappers/ace/config-macosx-leopard.h index a56067b97..2af9ba97b 100644 --- a/dep/ACE_wrappers/ace/config-macosx-leopard.h +++ b/dep/ACE_wrappers/ace/config-macosx-leopard.h @@ -1,11 +1,16 @@ /* -*- C++ -*- */ -// $Id: config-macosx-leopard.h 81858 2008-06-07 03:31:22Z dai_y $ +// $Id: config-macosx-leopard.h 91459 2010-08-25 09:51:01Z mcorino $ // This configuration file is designed to work with the MacOS X operating system. #ifndef ACE_CONFIG_MACOSX_LEOPARD_H #define ACE_CONFIG_MACOSX_LEOPARD_H +#define ACE_HAS_MAC_OSX +#define ACE_HAS_NET_IF_DL_H + +#define ACE_HAS_VOID_UNSETENV + #if ! defined (__ACE_INLINE__) #define __ACE_INLINE__ #endif /* ! __ACE_INLINE__ */ @@ -24,13 +29,15 @@ # include "ace/config-g++-common.h" #endif /* __GNUG__ */ +#define ACE_ISCTYPE_EQUIVALENT __isctype + #ifndef ACE_HAS_NONCONST_FD_ISSET #define ACE_HAS_NONCONST_FD_ISSET #endif #define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR -#define ACE_SIZE_T_FORMAT_SPECIFIER ACE_TEXT ("%lu") +#define ACE_SIZE_T_FORMAT_SPECIFIER_ASCII "%lu" #if !defined (__i386__) # if defined (ACE_HAS_PENTIUM) @@ -52,7 +59,7 @@ #define ACE_LACKS_STROPTS_H // Platform provides header. -#define ACE_HAS_EXECINFO_H +#define ACE_HAS_EXECINFO_H // Wcharness.... #define ACE_HAS_WCHAR @@ -83,9 +90,6 @@ //Platform supports sigsuspend() #define ACE_HAS_SIGSUSPEND -//Platform/compiler has macros for sig{empty,fill,add,del}set (e.g., SCO and FreeBSD) -#define ACE_HAS_SIG_MACROS - #define ACE_LACKS_GETPGID #define ACE_LACKS_RWLOCK_T @@ -94,9 +98,6 @@ #define ACE_HAS_NONCONST_SELECT_TIMEVAL -//? -#define ACE_LACKS_SIGSET - #define ACE_NEEDS_SCHED_H // Use of is deprecated. @@ -113,6 +114,7 @@ #define ACE_LACKS_STRRECVFD +#define ACE_HAS_SOCKADDR_IN_SIN_LEN #define ACE_HAS_SOCKADDR_IN6_SIN6_LEN // Platform supports System V IPC (most versions of UNIX, but not Win32) @@ -145,9 +147,6 @@ // Compiler supports the ssize_t typedef. #define ACE_HAS_SSIZE_T -// Compiler/platform supports strerror (). -#define ACE_HAS_STRERROR - // Compiler/platform provides the sockio.h file. #define ACE_HAS_SYS_SOCKIO_H @@ -203,6 +202,11 @@ #define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES #define ACE_LACKS_UNNAMED_SEMAPHORE +#if !defined (__DARWIN_UNIX03) +#define ACE_HAS_VOID_UNSETENV +#endif + + // dlcompat package (not part of base Darwin) is needed for dlopen(). // You may download directly from sourceforge and install or use fink // Fink installer puts libraries in /sw/lib and headers in /sw/include @@ -224,4 +228,4 @@ #error "Compiler must be upgraded, see http://developer.apple.com" #endif /* __APPLE_CC__ */ -#endif /* ACE_CONFIG_MACOSX_TIGER_H */ +#endif /* ACE_CONFIG_MACOSX_LEOPARD_H */ diff --git a/dep/ACE_wrappers/ace/config-macosx-panther.h b/dep/ACE_wrappers/ace/config-macosx-panther.h index 8b4010e79..4b131f986 100644 --- a/dep/ACE_wrappers/ace/config-macosx-panther.h +++ b/dep/ACE_wrappers/ace/config-macosx-panther.h @@ -1,5 +1,5 @@ /* -*- C++ -*- */ -// $Id: config-macosx-panther.h 80826 2008-03-04 14:51:23Z wotte $ +// $Id: config-macosx-panther.h 87167 2009-10-19 19:33:53Z olli $ // This configuration file is designed to work with the MacOS X operating system. @@ -15,7 +15,7 @@ #endif /* __GNUG__ */ #define ACE_LACKS_SUSECONDS_T -#define ACE_SIZE_T_FORMAT_SPECIFIER ACE_TEXT ("%lu") +#define ACE_SIZE_T_FORMAT_SPECIFIER_ASCII "%lu" #if defined (ACE_HAS_PENTIUM) # undef ACE_HAS_PENTIUM @@ -46,9 +46,6 @@ //Platform supports sigsuspend() #define ACE_HAS_SIGSUSPEND -//Platform/compiler has macros for sig{empty,fill,add,del}set (e.g., SCO and FreeBSD) -#define ACE_HAS_SIG_MACROS - //#define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS #define ACE_LACKS_GETPGID #define ACE_LACKS_RWLOCK_T @@ -58,9 +55,6 @@ #define ACE_HAS_NONCONST_SELECT_TIMEVAL -//? -#define ACE_LACKS_SIGSET - #define ACE_NEEDS_SCHED_H // Use of is deprecated. @@ -113,9 +107,6 @@ // Compiler supports the ssize_t typedef. #define ACE_HAS_SSIZE_T -// Compiler/platform supports strerror (). -#define ACE_HAS_STRERROR - // Compiler/platform provides the sockio.h file. #define ACE_HAS_SYS_SOCKIO_H diff --git a/dep/ACE_wrappers/ace/config-macosx-snowleopard.h b/dep/ACE_wrappers/ace/config-macosx-snowleopard.h new file mode 100644 index 000000000..beeb820d6 --- /dev/null +++ b/dep/ACE_wrappers/ace/config-macosx-snowleopard.h @@ -0,0 +1,20 @@ +// $Id: config-macosx-snowleopard.h 91319 2010-08-08 23:32:07Z wotte $ +#ifndef ACE_CONFIG_MACOSX_SNOWLEOPARD_H +#define ACE_CONFIG_MACOSX_SNOWLEOPARD_H + + +#include "ace/config-macosx-leopard.h" + +#ifdef __clang__ +#ifdef ACE_HAS_GCC_ATOMIC_BUILTINS +#undef ACE_HAS_GCC_ATOMIC_BUILTINS +#endif + +#define ACE_ANY_OPS_USE_NAMESPACE + +#endif + +// This header has been deprecated in Snow Leopard. +#define ACE_LACKS_UCONTEXT_H + +#endif // ACE_CONFIG_MACOSX_SNOWLEOPARD_H diff --git a/dep/ACE_wrappers/ace/config-macosx-tiger.h b/dep/ACE_wrappers/ace/config-macosx-tiger.h index f920690ed..f3d1ddcf8 100644 --- a/dep/ACE_wrappers/ace/config-macosx-tiger.h +++ b/dep/ACE_wrappers/ace/config-macosx-tiger.h @@ -1,5 +1,5 @@ /* -*- C++ -*- */ -// $Id: config-macosx-tiger.h 82344 2008-07-19 20:04:18Z johnnyw $ +// $Id: config-macosx-tiger.h 87167 2009-10-19 19:33:53Z olli $ // This configuration file is designed to work with the MacOS X operating system. @@ -26,7 +26,7 @@ #define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR -#define ACE_SIZE_T_FORMAT_SPECIFIER ACE_TEXT ("%lu") +#define ACE_SIZE_T_FORMAT_SPECIFIER_ASCII "%lu" #if !defined (__i386__) # if defined (ACE_HAS_PENTIUM) @@ -76,9 +76,6 @@ //Platform supports sigsuspend() #define ACE_HAS_SIGSUSPEND -//Platform/compiler has macros for sig{empty,fill,add,del}set (e.g., SCO and FreeBSD) -#define ACE_HAS_SIG_MACROS - #define ACE_LACKS_GETPGID #define ACE_LACKS_RWLOCK_T @@ -87,9 +84,6 @@ #define ACE_HAS_NONCONST_SELECT_TIMEVAL -//? -#define ACE_LACKS_SIGSET - #define ACE_NEEDS_SCHED_H // Use of is deprecated. @@ -138,9 +132,6 @@ // Compiler supports the ssize_t typedef. #define ACE_HAS_SSIZE_T -// Compiler/platform supports strerror (). -#define ACE_HAS_STRERROR - // Compiler/platform provides the sockio.h file. #define ACE_HAS_SYS_SOCKIO_H @@ -212,6 +203,9 @@ // gperf seems to need this //#define ACE_HAS_NONSTATIC_OBJECT_MANAGER +#define ACE_LACKS_UNSETENV +#define ACE_LACKS_ISCTYPE + #if defined(__APPLE_CC__) && (__APPLE_CC__ < 1173) #error "Compiler must be upgraded, see http://developer.apple.com" #endif /* __APPLE_CC__ */ diff --git a/dep/ACE_wrappers/ace/config-macosx.h b/dep/ACE_wrappers/ace/config-macosx.h index 904eae5ac..ae2552f14 100644 --- a/dep/ACE_wrappers/ace/config-macosx.h +++ b/dep/ACE_wrappers/ace/config-macosx.h @@ -1,5 +1,5 @@ /* -*- C++ -*- */ -// $Id: config-macosx.h 80826 2008-03-04 14:51:23Z wotte $ +// $Id: config-macosx.h 87167 2009-10-19 19:33:53Z olli $ // This configuration file is designed to work with the MacOS X operating system, version 10.2 (Jaguar). @@ -14,7 +14,7 @@ # include "ace/config-g++-common.h" #endif /* __GNUG__ */ -#define ACE_SIZE_T_FORMAT_SPECIFIER ACE_TEXT ("%lu") +#define ACE_SIZE_T_FORMAT_SPECIFIER_ASCII "%lu" #if defined (ACE_HAS_PENTIUM) # undef ACE_HAS_PENTIUM @@ -47,9 +47,6 @@ //Platform supports sigsuspend() #define ACE_HAS_SIGSUSPEND -//Platform/compiler has macros for sig{empty,fill,add,del}set (e.g., SCO and FreeBSD) -#define ACE_HAS_SIG_MACROS - //#define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS #define ACE_LACKS_GETPGID #define ACE_LACKS_RWLOCK_T @@ -61,9 +58,6 @@ #define ACE_HAS_SYSCTL -//? -#define ACE_LACKS_SIGSET - #define ACE_NEEDS_SCHED_H // Use of is deprecated. @@ -115,9 +109,6 @@ // Compiler supports the ssize_t typedef. #define ACE_HAS_SSIZE_T -// Compiler/platform supports strerror (). -#define ACE_HAS_STRERROR - // Compiler/platform provides the sockio.h file. #define ACE_HAS_SYS_SOCKIO_H diff --git a/dep/ACE_wrappers/ace/config-macros.h b/dep/ACE_wrappers/ace/config-macros.h index ca7f49c31..d36978ab9 100644 --- a/dep/ACE_wrappers/ace/config-macros.h +++ b/dep/ACE_wrappers/ace/config-macros.h @@ -4,7 +4,7 @@ /** * @file config-macros.h * - * $Id: config-macros.h 82495 2008-08-04 07:23:01Z johnnyw $ + * $Id: config-macros.h 91325 2010-08-09 15:14:39Z johnnyw $ * * @author (Originally in OS.h)Doug Schmidt * @author Jesper S. M|ller @@ -21,15 +21,24 @@ #ifndef ACE_CONFIG_MACROS_H #define ACE_CONFIG_MACROS_H +// MaNGOS changes begin #ifdef _WIN32 -#include "ace/config-win32.h" +# include "ace/config-win32.h" #else -#include "ace/config.h" +# include "ace/config.h" #endif //_WIN32 +#ifdef ACE_HAS_NONSTATIC_OBJECT_MANAGER +# undef ACE_HAS_NONSTATIC_OBJECT_MANAGER +#endif +// MaNGOS changes end #include "ace/Version.h" #include "ace/Versioned_Namespace.h" +#if !defined (ACE_HAS_EXCEPTIONS) +#define ACE_HAS_EXCEPTIONS +#endif /* !ACE_HAS_EXCEPTIONS */ + // ACE_HAS_TLI is used to decide whether to try any XTI/TLI functionality // so if it isn't set, set it. Capabilities and differences between // XTI and TLI favor XTI, but when deciding to do anything, as opposed to @@ -58,19 +67,6 @@ # endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */ #endif /* ! ACE_DEFAULT_LOG_STREAM */ -// These two are only for backward compatibility. You should avoid -// using them if not necessary. -#if !defined (ACE_LACKS_DEPRECATED_MACROS) -/** - * @deprecated The ACE_SYNCH_1 macro is deprecated - */ -# define ACE_SYNCH_1 ACE_SYNCH_DECL -/** - * @deprecated The ACE_SYNCH_2 macro is deprecated - */ -# define ACE_SYNCH_2 ACE_SYNCH_USE -#endif - // For Win32 compatibility... # if !defined (ACE_WSOCK_VERSION) # define ACE_WSOCK_VERSION 0, 0 @@ -93,32 +89,6 @@ # define ACE_INITIALIZE_MEMORY_BEFORE_USE # endif /* ACE_HAS_VALGRIND */ -#if !defined (ACE_LACKS_DEPRECATED_MACROS) -/** - * @deprecated The @c ACE_HAS_USING macros are deprecated - */ -# define ACE_USING using -#endif /* !ACE_LACKS_DEPRECATED_MACROS */ - -#if !defined (ACE_LACKS_DEPRECATED_MACROS) -/** - * @deprecated The @c ACE_TYPENAME macros is deprecated. Use standard - * C++ keyword typename instead. - */ -# define ACE_TYPENAME typename -#endif /* !ACE_LACKS_DEPRECATED_MACROS */ - -#if !defined (ACE_LACKS_DEPRECATED_MACROS) -/** - * @deprecated The @c ACE_TEMPLATE_SPECIALIZATION and - * @c ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION macros are - * deprecated. Use standard C++ template specialization - * syntax instead. - */ -# define ACE_TEMPLATE_SPECIALIZATION template<> -# define ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION -#endif /* !ACE_LACKS_DEPRECATED_MACROS */ - // ========================================================================= // Perfect Multicast filting refers to RFC 3376, where a socket is only // delivered dgrams for groups joined even if it didn't bind the group @@ -222,31 +192,6 @@ # define ACE_INLINE #endif /* __ACE_INLINE__ */ -#if !defined (ACE_LACKS_DEPRECATED_MACROS) - // ========================================================================= - // EXPLICIT macro - // ========================================================================= - - /** - * @deprecated explicit is deprecated. ACE requires C++ - * "explicit" keyword support. - */ - # define ACE_EXPLICIT explicit -#endif /* ACE_LACKS_DEPRECATED_MACROS */ - -#if !defined (ACE_LACKS_DEPRECATED_MACROS) - // ========================================================================= - // MUTABLE macro - // ========================================================================= - - /** - * @deprecated ACE_MUTABLE is deprecated. ACE requires C++ "mutable" - * keyword support. - */ - # define ACE_MUTABLE mutable - # define ACE_CONST_WHEN_MUTABLE const -#endif /* ACE_LACKS_DEPRECATED_MACROS */ - // ============================================================================ // EXPORT macros // @@ -309,60 +254,6 @@ # define ACE_sap_any_cast(TYPE) reinterpret_cast (const_cast (ACE_Addr::sap_any)) -#if !defined (ACE_LACKS_DEPRECATED_MACROS) - /** - * @deprecated ACE_{static,reinterpret,dynamic,const}_cast@<@> is - * deprecated. Directly use standard C++ casts instead. - */ - # define ACE_static_cast(TYPE, EXPR) static_cast (EXPR) - # define ACE_static_cast_1_ptr(TYPE, T1, EXPR) static_cast *> (EXPR) - # define ACE_static_cast_2_ptr(TYPE, T1, T2, EXPR) static_cast *> (EXPR) - # define ACE_static_cast_3_ptr(TYPE, T1, T2, T3, EXPR) static_cast *> (EXPR) - # define ACE_static_cast_4_ptr(TYPE, T1, T2, T3, T4, EXPR) static_cast *> (EXPR) - # define ACE_static_cast_5_ptr(TYPE, T1, T2, T3, T4, T5, EXPR) static_cast *> (EXPR) - # define ACE_static_cast_1_ref(TYPE, T1, EXPR) static_cast &> (EXPR) - # define ACE_static_cast_2_ref(TYPE, T1, T2, EXPR) static_cast &> (EXPR) - # define ACE_static_cast_3_ref(TYPE, T1, T2, T3, EXPR) static_cast &> (EXPR) - # define ACE_static_cast_4_ref(TYPE, T1, T2, T3, T4, EXPR) static_cast &> (EXPR) - # define ACE_static_cast_5_ref(TYPE, T1, T2, T3, T4, T5, EXPR) static_cast &> (EXPR) - - # define ACE_const_cast(TYPE, EXPR) const_cast (EXPR) - # define ACE_const_cast_1_ptr(TYPE, T1, EXPR) const_cast *> (EXPR) - # define ACE_const_cast_2_ptr(TYPE, T1, T2, EXPR) const_cast *> (EXPR) - # define ACE_const_cast_3_ptr(TYPE, T1, T2, T3, EXPR) const_cast *> (EXPR) - # define ACE_const_cast_4_ptr(TYPE, T1, T2, T3, T4, EXPR) const_cast *> (EXPR) - # define ACE_const_cast_5_ptr(TYPE, T1, T2, T3, T4, T5, EXPR) const_cast *> (EXPR) - # define ACE_const_cast_1_ref(TYPE, T1, EXPR) const_cast &> (EXPR) - # define ACE_const_cast_2_ref(TYPE, T1, T2, EXPR) const_cast &> (EXPR) - # define ACE_const_cast_3_ref(TYPE, T1, T2, T3, EXPR) const_cast &> (EXPR) - # define ACE_const_cast_4_ref(TYPE, T1, T2, T3, T4, EXPR) const_cast &> (EXPR) - # define ACE_const_cast_5_ref(TYPE, T1, T2, T3, T4, T5, EXPR) const_cast &> (EXPR) - - # define ACE_reinterpret_cast(TYPE, EXPR) reinterpret_cast (EXPR) - # define ACE_reinterpret_cast_1_ptr(TYPE, T1, EXPR) reinterpret_cast *> (EXPR) - # define ACE_reinterpret_cast_2_ptr(TYPE, T1, T2, EXPR) reinterpret_cast *> (EXPR) - # define ACE_reinterpret_cast_3_ptr(TYPE, T1, T2, T3, EXPR) reinterpret_cast *> (EXPR) - # define ACE_reinterpret_cast_4_ptr(TYPE, T1, T2, T3, T4, EXPR) reinterpret_cast *> (EXPR) - # define ACE_reinterpret_cast_5_ptr(TYPE, T1, T2, T3, T4, T5, EXPR) reinterpret_cast *> (EXPR) - # define ACE_reinterpret_cast_1_ref(TYPE, T1, EXPR) reinterpret_cast &> (EXPR) - # define ACE_reinterpret_cast_2_ref(TYPE, T1, T2, EXPR) reinterpret_cast &> (EXPR) - # define ACE_reinterpret_cast_3_ref(TYPE, T1, T2, T3, EXPR) reinterpret_cast &> (EXPR) - # define ACE_reinterpret_cast_4_ref(TYPE, T1, T2, T3, T4, EXPR) reinterpret_cast &> (EXPR) - # define ACE_reinterpret_cast_5_ref(TYPE, T1, T2, T3, T4, T5, EXPR) reinterpret_cast &> (EXPR) - - # define ACE_dynamic_cast(TYPE, EXPR) dynamic_cast (EXPR) - # define ACE_dynamic_cast_1_ptr(TYPE, T1, EXPR) dynamic_cast *> (EXPR) - # define ACE_dynamic_cast_2_ptr(TYPE, T1, T2, EXPR) dynamic_cast *> (EXPR) - # define ACE_dynamic_cast_3_ptr(TYPE, T1, T2, T3, EXPR) dynamic_cast *> (EXPR) - # define ACE_dynamic_cast_4_ptr(TYPE, T1, T2, T3, T4, EXPR) dynamic_cast *> (EXPR) - # define ACE_dynamic_cast_5_ptr(TYPE, T1, T2, T3, T4, T5, EXPR) dynamic_cast *> (EXPR) - # define ACE_dynamic_cast_1_ref(TYPE, T1, EXPR) dynamic_cast &> (EXPR) - # define ACE_dynamic_cast_2_ref(TYPE, T1, T2, EXPR) dynamic_cast &> (EXPR) - # define ACE_dynamic_cast_3_ref(TYPE, T1, T2, T3, EXPR) dynamic_cast &> (EXPR) - # define ACE_dynamic_cast_4_ref(TYPE, T1, T2, T3, T4, EXPR) dynamic_cast &> (EXPR) - # define ACE_dynamic_cast_5_ref(TYPE, T1, T2, T3, T4, T5, EXPR) dynamic_cast &> (EXPR) -#endif /* ACE_LACKS_DEPRECATED_MACROS */ - # if !defined (ACE_CAST_CONST) // Sun CC 4.2, for example, requires const in reinterpret casts of // data members in const member functions. But, other compilers @@ -399,7 +290,7 @@ # endif /* ghs || __GNUC__ || ..... */ #endif /* !ACE_UNUSED_ARG */ -#if defined (_MSC_VER) || defined(__sgi) || defined (ghs) || defined (__DECCXX) || defined(__BORLANDC__) || defined (ACE_RM544) || defined (__USLC__) || defined (__DCC__) || defined (__PGI) || defined (__TANDEM) || (defined (__HP_aCC) && (__HP_aCC >= 60500)) +#if defined (_MSC_VER) || defined(__sgi) || defined (ghs) || defined (__DECCXX) || defined(__BORLANDC__) || defined (ACE_RM544) || defined (__USLC__) || defined (__DCC__) || defined (__PGI) || defined (__TANDEM) || (defined (__HP_aCC) && (__HP_aCC < 40000 || __HP_aCC >= 60500)) # define ACE_NOTREACHED(a) #else /* __sgi || ghs || ..... */ # define ACE_NOTREACHED(a) a @@ -459,7 +350,8 @@ #if defined (ACE_WIN32) # define ACE_WIN32CALL_RETURN(X,TYPE,FAILVALUE) \ do { \ - TYPE ace_result_ = (TYPE) X; \ + TYPE ace_result_; \ + ace_result_ = (TYPE) X; \ if (ace_result_ == FAILVALUE) \ ACE_OS::set_errno_to_last_error (); \ return ace_result_; \ @@ -633,4 +525,22 @@ extern "C" u_long CLS##_Export _get_dll_unload_policy (void) \ #define ACE_PREPROC_CONCATENATE(A,B) ACE_PREPROC_CONCATENATE_IMPL(A,B) // ------------------------------------------------------------------- +/// If MPC is using a lib modifier this define will be set and this then +/// is used by the service configurator framework +#if defined MPC_LIB_MODIFIER && !defined (ACE_LD_DECORATOR_STR) +#define ACE_LD_DECORATOR_STR ACE_TEXT( MPC_LIB_MODIFIER ) +#endif /* MPC_LIB_MODIFIER */ + +#ifndef ACE_GCC_CONSTRUCTOR_ATTRIBUTE +# define ACE_GCC_CONSTRUCTOR_ATTRIBUTE +#endif + +#ifndef ACE_GCC_DESTRUCTOR_ATTRIBUTE +# define ACE_GCC_DESTRUCTOR_ATTRIBUTE +#endif + +#ifndef ACE_DEPRECATED +# define ACE_DEPRECATED +#endif + #endif /* ACE_CONFIG_MACROS_H */ diff --git a/dep/ACE_wrappers/ace/config-mvs.h b/dep/ACE_wrappers/ace/config-mvs.h index c37bac258..3f438a776 100644 --- a/dep/ACE_wrappers/ace/config-mvs.h +++ b/dep/ACE_wrappers/ace/config-mvs.h @@ -1,5 +1,5 @@ /* -*- C++ -*- */ -// $Id: config-mvs.h 81992 2008-06-16 19:09:50Z wotte $ +// $Id: config-mvs.h 88495 2010-01-12 19:23:11Z olli $ // Config file for MVS with OpenEdition @@ -13,7 +13,6 @@ #define NSIG 44 /* missing from Signal.h */ #define MAXHOSTNAMELEN 256 /* missing form netdb.h */ #define howmany __howmany /* MVS uses different names than most others */ -#define fd_mask __fd_mask #define MAXNAMLEN __DIR_NAME_MAX #if defined (log) /* log is a macro in math.h */ # undef log /* conflicts with log function in ACE */ @@ -43,7 +42,6 @@ #define ERRMAX __sys_nerr #define ACE_HAS_3_PARAM_WCSTOK -#define ACE_HAS_BROKEN_CTIME #define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES #define ACE_HAS_CPLUSPLUS_HEADERS #define ACE_HAS_DIRENT @@ -67,7 +65,6 @@ #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_STRBUF_T #define ACE_HAS_STRINGS #define ACE_HAS_SYSV_IPC @@ -85,7 +82,6 @@ #define ACE_LACKS_CONDATTR_PSHARED #define ACE_LACKS_INET_ATON -#define ACE_LACKS_MSGBUF_T #define ACE_LACKS_MUTEXATTR_PSHARED #define ACE_LACKS_IOSTREAM_FX #define ACE_LACKS_LINEBUFFERED_STREAMBUF @@ -102,7 +98,6 @@ #define ACE_LACKS_SEMAPHORE_H #define ACE_LACKS_SIGINFO_H #define ACE_LACKS_STDINT_H -#define ACE_LACKS_SYS_NERR #define ACE_LACKS_SYS_SELECT_H #define ACE_LACKS_SYS_SYSCTL_H #define ACE_LACKS_SYSTIME_H @@ -111,6 +106,7 @@ #define ACE_LACKS_THREAD_PROCESS_SCOPING #define ACE_LACKS_PTHREAD_ATTR_SETSTACKADDR #define ACE_LACKS_TIMESPEC_T +#define ACE_LACKS_FD_MASK #if !defined (ACE_MT_SAFE) # define ACE_MT_SAFE 1 diff --git a/dep/ACE_wrappers/ace/config-netbsd.h b/dep/ACE_wrappers/ace/config-netbsd.h index 551718015..242b3af70 100644 --- a/dep/ACE_wrappers/ace/config-netbsd.h +++ b/dep/ACE_wrappers/ace/config-netbsd.h @@ -1,5 +1,5 @@ /* -*- C++ -*- */ -// $Id: config-netbsd.h 80826 2008-03-04 14:51:23Z wotte $ +// $Id: config-netbsd.h 91285 2010-08-05 08:29:30Z johnnyw $ #ifndef ACE_CONFIG_H #define ACE_CONFIG_H @@ -35,13 +35,11 @@ #define ACE_HAS_CLOCK_GETTIME 1 #define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES 1 #define ACE_HAS_DIRENT 1 -#define ACE_HAS_EXCEPTIONS 1 #define ACE_HAS_GETIFADDRS 1 #define ACE_HAS_GETPAGESIZE 1 #define ACE_HAS_GETPROGNAME 1 #define ACE_HAS_GETRUSAGE 1 #define ACE_HAS_GETRUSAGE_PROTOTYPE 1 -#define ACE_HAS_GNU_CSTRING_H 1 #define ACE_HAS_GPERF 1 #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT 1 #define ACE_HAS_IP_MULTICAST 1 @@ -72,14 +70,12 @@ #define ACE_HAS_SSIZE_T 1 #define ACE_HAS_STANDARD_CPP_LIBRARY 1 #define ACE_HAS_STDEXCEPT_NO_H 1 -#define ACE_HAS_STRERROR 1 #define ACE_HAS_STRINGS 1 #define ACE_HAS_STRING_CLASS 1 #define ACE_HAS_SVR4_DYNAMIC_LINKING 1 #define ACE_HAS_SYSV_IPC 1 -#define ACE_HAS_SYS_ERRLIST 1 #define ACE_HAS_SYS_FILIO_H 1 -#define ACE_HAS_SYS_SIGLIST 1 +#define ACE_HAS_STRSIGNAL #define ACE_HAS_SYS_SOCKIO_H 1 #define ACE_HAS_SYS_SYSCALL_H 1 #define ACE_HAS_SYSCTL @@ -123,6 +119,7 @@ #define ACE_LACKS_WCSICMP 1 #define ACE_LACKS_WCSNICMP 1 #define ACE_SCANDIR_CMP_USES_CONST_VOIDPTR 1 +#define ACE_LACKS_ISCTYPE #if defined(__x86_64__) #define ACE_SIZEOF_DOUBLE 8 @@ -138,8 +135,8 @@ typedef unsigned long ACE_UINT64; typedef signed long ACE_INT64; -#define ACE_SSIZE_T_FORMAT_SPECIFIER ACE_TEXT ("%ld") -#define ACE_SIZE_T_FORMAT_SPECIFIER ACE_TEXT ("%lu") +#define ACE_SSIZE_T_FORMAT_SPECIFIER_ASCII "%ld" +#define ACE_SIZE_T_FORMAT_SPECIFIER_ASCII "%lu" #elif defined(__i386__) diff --git a/dep/ACE_wrappers/ace/config-openbsd.h b/dep/ACE_wrappers/ace/config-openbsd.h index a730c810d..aab03106a 100644 --- a/dep/ACE_wrappers/ace/config-openbsd.h +++ b/dep/ACE_wrappers/ace/config-openbsd.h @@ -1,235 +1,208 @@ /* -*- C++ -*- */ -// $Id: config-openbsd.h 80826 2008-03-04 14:51:23Z wotte $ +// $Id: config-openbsd.h 89494 2010-03-15 20:11:18Z olli $ // The following configuration file is designed to work for OpenBSD // platforms using GNU g++. #ifndef ACE_CONFIG_H -#define ACE_CONFIG_H +# define ACE_CONFIG_H #include /**/ "ace/pre.h" -#if defined (ACE_HAS_THREADS) -#include /**/ -#endif /* ACE_HAS_THREADS */ - -#include "ace/config-posix.h" - -#if ! defined (__ACE_INLINE__) -#define __ACE_INLINE__ -#endif /* ! __ACE_INLINE__ */ - -#define ACE_SIZEOF_LONG_DOUBLE 12 - -#if defined (__GNUG__) -# include "ace/config-g++-common.h" -#endif /* __GNUG__ */ - // Platform specific directives // gcc defines __OpenBSD__ automatically for us. #include #if defined (ACE_HAS_THREADS) -#if !defined (_THREAD_SAFE) -#define _THREAD_SAFE -#endif /* _THREAD_SAFE */ +# include /**/ +#endif /* ACE_HAS_THREADS */ + +#include "ace/config-posix.h" + +#if !defined (__ACE_INLINE__) +# define __ACE_INLINE__ +#endif /* !__ACE_INLINE__ */ + +#if defined (__GNUG__) +# include "ace/config-g++-common.h" +#endif /* __GNUG__ */ + + +#if defined (ACE_HAS_THREADS) + +# if !defined (_THREAD_SAFE) +# define _THREAD_SAFE +# endif /* _THREAD_SAFE */ + +// And they're even POSIX pthreads +# if !defined (ACE_MT_SAFE) +# define ACE_MT_SAFE 1 +# endif /* ! ACE_MT_SAFE */ + // Check if pthreads and native exceptions are being used together. // This causes SEGVs to tbe thrown somewhat randomly for some // reason. According to newsgroup postings, it appears to be an // OpenBSD or gcc bug. -#if defined (ACE_USES_NATIVE_EXCEPTIONS) -#error "OpenBSD pthreads and native exceptions currently do not work. See OpenBSD bug #1750" -#endif /* ACE_USES_NATIVE_EXCEPTIONS */ +# if defined (ACE_USES_NATIVE_EXCEPTIONS) +# error "OpenBSD pthreads and native exceptions currently do not work. See OpenBSD bug #1750" +# endif /* ACE_USES_NATIVE_EXCEPTIONS */ + +#else +// OpenBSD really has readdir_r () in single threaded mode, +// but the #ifdefs in OS.i select one with the wrong parameter +// sets if the ACE_HAS_POSIX_STD isn't defined (which is defined +// when ACE_HAS_THREADS is defined.) +# define ACE_LACKS_READDIR_R #endif /* ACE_HAS_THREADS */ -#define ACE_HAS_GPERF -// Platform specific directives -/* Are the following true? */ +#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R +#define ACE_HAS_3_PARAM_READDIR_R +#define ACE_HAS_3_PARAM_WCSTOK +#define ACE_HAS_4_4BSD_SENDMSG_RECVMSG +#define ACE_HAS_ALLOCA +#define ACE_HAS_ALT_CUSERID +#define ACE_HAS_AUTOMATIC_INIT_FINI +#define ACE_HAS_CHARPTR_DL +#define ACE_HAS_CLOCK_GETTIME +#define ACE_HAS_CLOCK_SETTIME +#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES +#define ACE_HAS_DIRENT +#define ACE_HAS_GETIFADDRS +#define ACE_HAS_GETPAGESIZE +#define ACE_HAS_GETRUSAGE +#define ACE_HAS_GPERF +#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT +#define ACE_HAS_ICMP_SUPPORT 1 +#define ACE_HAS_IPV6 +#define ACE_HAS_IP_MULTICAST +#define ACE_HAS_MEMCHR +#define ACE_HAS_MKDIR +#define ACE_HAS_MSG +#define ACE_HAS_NANOSLEEP +#define ACE_HAS_NEW_NO_H +#define ACE_HAS_NONCONST_MSGSND +#define ACE_HAS_NONCONST_SELECT_TIMEVAL +#define ACE_HAS_NONCONST_SWAB +#define ACE_HAS_POLL +#define ACE_HAS_POSITION_INDEPENDENT_POINTERS 1 +#define ACE_HAS_POSIX_GETPWNAM_R +#define ACE_HAS_POSIX_NONBLOCK +#define ACE_HAS_POSIX_TIME +#define ACE_HAS_PTHREADS_STD +#define ACE_HAS_PTHREADS_UNIX98_EXT +#define ACE_HAS_PTHREAD_ATTR_SETCREATESUSPEND_NP +#define ACE_HAS_PTHREAD_GETCONCURRENCY +#define ACE_HAS_PTHREAD_MUTEXATTR_SETKIND_NP +#define ACE_HAS_PTHREAD_NP_H +#define ACE_HAS_PTHREAD_RESUME_NP +#define ACE_HAS_PTHREAD_SETCONCURRENCY +#define ACE_HAS_PTHREAD_SIGMASK_PROTOTYPE +#define ACE_HAS_PTHREAD_SUSPEND_NP +#define ACE_HAS_P_READ_WRITE +#define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS +#define ACE_HAS_REENTRANT_FUNCTIONS +#define ACE_HAS_RTLD_LAZY_V +#define ACE_HAS_SCANDIR +#define ACE_HAS_SEMUN +#define ACE_HAS_SIGACTION_CONSTP2 +#define ACE_HAS_SIGINFO_T +#define ACE_HAS_SIGSUSPEND +#define ACE_HAS_SIGWAIT +#define ACE_HAS_SIG_ATOMIC_T +#define ACE_HAS_SIG_C_FUNC +#define ACE_HAS_SOCKADDR_IN6_SIN6_LEN +#define ACE_HAS_SOCKADDR_IN_SIN_LEN +#define ACE_HAS_SOCKADDR_MSG_NAME +#define ACE_HAS_SOCKLEN_T +#define ACE_HAS_SSIZE_T +#define ACE_HAS_STRINGS +#define ACE_HAS_STRING_CLASS +#define ACE_HAS_SVR4_DYNAMIC_LINKING +#define ACE_HAS_SVR4_SIGNAL_T +#define ACE_HAS_SYSCTL +#define ACE_HAS_SYSV_IPC +#define ACE_HAS_SYS_FILIO_H +#define ACE_HAS_STRSIGNAL +#define ACE_HAS_SYS_SOCKIO_H +#define ACE_HAS_SYS_SYSCALL_H +#define ACE_HAS_TERMIOS +#define ACE_HAS_THREAD_SPECIFIC_STORAGE +#define ACE_HAS_TIMEZONE_GETTIMEOFDAY +#define ACE_HAS_UALARM +#define ACE_HAS_VASPRINTF +#define ACE_HAS_VOIDPTR_MMAP +#define ACE_HAS_VOIDPTR_SOCKOPT +#define ACE_HAS_VOID_UNSETENV +#define ACE_HAS_WCHAR +#define ACE_HAS_XPG4_MULTIBYTE_CHAR + +#define ACE_LACKS_CONDATTR_PSHARED +#define ACE_LACKS_GETIPNODEBYADDR +#define ACE_LACKS_GETIPNODEBYNAME #define ACE_LACKS_GETPGID +#define ACE_LACKS_IOSTREAM_FX +#define ACE_LACKS_ISCTYPE +#define ACE_LACKS_ITOW +#define ACE_LACKS_LINEBUFFERED_STREAMBUF +#define ACE_LACKS_LOG2 +#define ACE_LACKS_MALLOC_H +#define ACE_LACKS_MSG_ACCRIGHTS +#define ACE_LACKS_MUTEXATTR_PSHARED +#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS +#define ACE_LACKS_PERFECT_MULTICAST_FILTERING +#define ACE_LACKS_PRI_T +#define ACE_LACKS_PTHREAD_THR_SIGSETMASK +#define ACE_LACKS_PWD_REENTRANT_FUNCTIONS +#define ACE_LACKS_RAND_REENTRANT_FUNCTIONS +#define ACE_LACKS_RLIMIT_PROTOTYPE +#define ACE_LACKS_RWLOCK_T #define ACE_LACKS_SETPGID #define ACE_LACKS_SETREGID #define ACE_LACKS_SETREUID +#define ACE_LACKS_SETSCHED +#define ACE_LACKS_SIGINFO_H +#define ACE_LACKS_STDINT_H +#define ACE_LACKS_STROPTS_H +#define ACE_LACKS_STRRECVFD +#define ACE_LACKS_TERMIO_H +#define ACE_LACKS_THREAD_PROCESS_SCOPING +#define ACE_LACKS_TIMEDWAIT_PROTOTYPES +#define ACE_LACKS_TIMESPEC_T +#define ACE_LACKS_UCONTEXT_H +#define ACE_LACKS_UNBUFFERED_STREAMBUF +#define ACE_LACKS_U_LONGLONG_T +#define ACE_LACKS_WCHAR_H +#define ACE_LACKS_WCSCASECMP +#define ACE_LACKS_WCSDUP +#define ACE_LACKS_WCSNCASECMP +#define ACE_LACKS_WCSNICMP -#define ACE_HAS_ALT_CUSERID -#define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS - -#define ACE_LACKS_RWLOCK_T -#define ACE_HAS_SIG_MACROS -#define ACE_HAS_CHARPTR_DL -#define ACE_HAS_DIRENT +#define ACE_EXPLICIT_TEMPLATE_DESTRUCTOR_TAKES_ARGS +#define ACE_PAGE_SIZE 4096 +#define ACE_SCANDIR_CMP_USES_CONST_VOIDPTR +#define ACE_SCANDIR_SEL_LACKS_CONST // OpenBSD 3.6 #if (OpenBSD < 200411) # define ACE_USES_ASM_SYMBOL_IN_DLSYM #endif -#define ACE_LACKS_UCONTEXT_H - // ucontext_t is in OpenBSD 3.5 and later. #if (OpenBSD >= 200405) # define ACE_HAS_UCONTEXT_T #endif /* OpenBSD >= 200405 */ - -// OpenBSD has sigwait defined -#define ACE_HAS_SIGWAIT -#define ACE_HAS_SIGINFO_T - -#define ACE_HAS_REENTRANT_FUNCTIONS -#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS -#define ACE_LACKS_PWD_REENTRANT_FUNCTIONS -#define ACE_LACKS_RAND_REENTRANT_FUNCTIONS -#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R - -#define ACE_HAS_SOCKLEN_T - -#define ACE_HAS_POLL - -// Use of is deprecated. -#define ACE_LACKS_MALLOC_H - -// NetBSD appears to have a sigset_t type. -// #define ACE_LACKS_SIGSET - -// Platform supports POSIX timers via struct timespec. -#define ACE_HAS_POSIX_TIME -#define ACE_HAS_UALARM - -// Platform defines struct timespec but not timespec_t -#define ACE_LACKS_TIMESPEC_T - -#define ACE_LACKS_STDINT_H -#define ACE_LACKS_STROPTS_H -#define ACE_LACKS_WCHAR_H - -#define ACE_LACKS_STRRECVFD - -#define ACE_HAS_SOCKADDR_IN_SIN_LEN -#define ACE_HAS_SOCKADDR_IN6_SIN6_LEN - -// Platform supports System V IPC (most versions of UNIX, but not Win32) -#define ACE_HAS_SYSV_IPC - -// Compiler/platform contains the file. -#define ACE_HAS_SYS_SYSCALL_H - -// OpenBSD supports the getifaddrs interface -#define ACE_HAS_GETIFADDRS - -// Compiler/platform supports SVR4 signal typedef -#define ACE_HAS_SVR4_SIGNAL_T -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES - -// 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 supports SVR4 dynamic linking semantics.. -#define ACE_HAS_SVR4_DYNAMIC_LINKING - -// Compiler/platform correctly calls init()/fini() for shared libraries. -#define ACE_HAS_AUTOMATIC_INIT_FINI - -// Explicit dynamic linking permits "lazy" symbol resolution -#define ACE_HAS_RTLD_LAZY_V - -// platform supports POSIX O_NONBLOCK semantics -#define ACE_HAS_POSIX_NONBLOCK - -// platform supports IP multicast -#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 +# define ACE_LACKS_PERFECT_MULTICAST_FILTERING #endif /* ACE_LACKS_PERFECT_MULTICAST_FILTERING */ -// Compiler/platform has -//#define ACE_HAS_ALLOCA_H - -// Compiler/platform has the getrusage() system call. -#define ACE_HAS_GETRUSAGE - -// Compiler/platform defines the sig_atomic_t typedef. -#define ACE_HAS_SIG_ATOMIC_T - -// Compiler/platform defines a union semun for SysV shared memory. -#define ACE_HAS_SEMUN - -// Compiler supports the ssize_t typedef. -#define ACE_HAS_SSIZE_T - -// Compiler/platform supports strerror (). -#define ACE_HAS_STRERROR - -// Compiler/platform provides the sockio.h file. -#define ACE_HAS_SYS_SOCKIO_H - -// Defines the page size of the system. -#define ACE_PAGE_SIZE 4096 - -// Platform provides header. -#define ACE_HAS_SYS_FILIO_H - -#define ACE_HAS_SYSCTL - -// Platform/compiler supports timezone * as second parameter to gettimeofday(). -#define ACE_HAS_TIMEZONE_GETTIMEOFDAY - // OpenBSD's dlsym call segfaults when passed an invalid handle. -// It seems as if most other OSs detect this and just report an -// error. +// It seems as if most other OSs detect this and just report an error. #define ACE_HAS_DLSYM_SEGFAULT_ON_INVALID_HANDLE -#define ACE_HAS_MSG -#define ACE_HAS_4_4BSD_SENDMSG_RECVMSG -#define ACE_HAS_NONCONST_MSGSND - -#ifdef ACE_HAS_THREADS -// Thread specific settings - -// And they're even POSIX pthreads -#if !defined (ACE_MT_SAFE) -# define ACE_MT_SAFE 1 -#endif /* ! ACE_MT_SAFE */ -#endif /* ACE_HAS_THREADS */ - -#define ACE_HAS_SIGWAIT - -// Optimize ACE_Handle_Set for select(). -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT -#define ACE_HAS_NONCONST_SELECT_TIMEVAL -#define ACE_LACKS_THREAD_PROCESS_SCOPING -#define ACE_LACKS_CONDATTR_PSHARED -#define ACE_LACKS_MUTEXATTR_PSHARED -#define ACE_HAS_THREAD_SPECIFIC_STORAGE -#define ACE_HAS_DIRENT - -#if !defined (ACE_HAS_THREADS) -// OpenBSD really has readdir_r () in single threaded mode, -// but the #ifdefs in OS.i select one with the wrong parameter -// sets if the ACE_HAS_POSIX_STD isn't defined (which is defined -// when ACE_HAS_THREADS is defined.) - -#define ACE_LACKS_READDIR_R - -#endif /* ! ACE_HAD_THREADS */ - -// Platform has POSIX terminal interface. -#define ACE_HAS_TERMIOS - -// OpenBSD 3.2 lacks sched_setscheduler (see /usr/src/lib/libc_r/TODO) -#define ACE_LACKS_SETSCHED - -// OpenBSD supports IPv6 by default, but ACE IPv6 code -// has compile errors. -//#define ACE_HAS_IPV6 - -#define ACE_HAS_3_PARAM_READDIR_R - #include /**/ "ace/post.h" + #endif /* ACE_CONFIG_H */ diff --git a/dep/ACE_wrappers/ace/config-openvms.h b/dep/ACE_wrappers/ace/config-openvms.h index 0b3d3c15f..467f085ec 100644 --- a/dep/ACE_wrappers/ace/config-openvms.h +++ b/dep/ACE_wrappers/ace/config-openvms.h @@ -1,5 +1,5 @@ /* -*- C++ -*- */ -// $Id: config-openvms.h 81935 2008-06-12 22:01:53Z jtc $ +// $Id: config-openvms.h 91285 2010-08-05 08:29:30Z johnnyw $ // The following configuration file is designed to work for OpenVMS 7.3-2 @@ -35,7 +35,6 @@ #include #include #include -#undef clearerr #undef memset #undef memcpy #undef memmove @@ -107,7 +106,6 @@ #define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R 1 #define ACE_HAS_3_PARAM_WCSTOK 1 #define ACE_HAS_SIGSUSPEND 1 -#define ACE_HAS_SIG_MACROS 1 #define ACE_HAS_SIGWAIT 1 #define ACE_HAS_SIGTIMEDWAIT 1 @@ -115,7 +113,6 @@ #define ACE_HAS_SIGISMEMBER_BUG #define ACE_HAS_STRNLEN 1 #define ACE_HAS_STREAMS 1 -#define ACE_HAS_STRERROR 1 #define ACE_HAS_UALARM 1 #define ACE_HAS_VOIDPTR_MMAP 1 #define ACE_HAS_VOIDPTR_SOCKOPT 1 @@ -129,6 +126,7 @@ #define ACE_LACKS_SETSCHED #define ACE_LACKS_SYSCALL 1 #define ACE_LACKS_WCSTOULL 1 +#define ACE_LACKS_WCSTOLL /* (missing) standard data types */ #define ACE_LACKS_CONST_TIMESPEC_PTR 1 @@ -172,7 +170,6 @@ #define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES 1 #define ACE_HAS_CPLUSPLUS_HEADERS 1 -#define ACE_HAS_EXCEPTIONS 1 #define ACE_LACKS_LINEBUFFERED_STREAMBUF 1 #define ACE_HAS_GPERF 1 @@ -191,5 +188,10 @@ #define ACE_LACKS_UNIX_DOMAIN_SOCKETS 1 #define ACE_LACKS_UNIX_SYSLOG 1 #define ACE_LACKS_ALPHASORT 1 +#define ACE_LACKS_ISCTYPE +#define ACE_LACKS_ISBLANK + +#define ACE_LACKS_SETENV +#define ACE_LACKS_UNSETENV #endif diff --git a/dep/ACE_wrappers/ace/config-pharlap.h b/dep/ACE_wrappers/ace/config-pharlap.h index 8a0d2792a..dad0e91a9 100644 --- a/dep/ACE_wrappers/ace/config-pharlap.h +++ b/dep/ACE_wrappers/ace/config-pharlap.h @@ -1,5 +1,5 @@ /* -*- C++ -*- */ -// $Id: config-pharlap.h 81837 2008-06-04 22:48:08Z shuston $ +// $Id: config-pharlap.h 84373 2009-02-10 18:21:50Z johnnyw $ // This configuration file is for use with the PharLap Realtime ETS Kernel. // It has been tested with PharLap TNT Embedded ToolSuite version 9.1. @@ -23,6 +23,7 @@ // Fortunately, PharLap ETS offers much of the Win32 API. But it's still on // Winsock 1.1 #define ACE_HAS_WINSOCK2 0 +#define ACE_HAS_WINSOCK1 1 // The TSS implementation doesn't pass muster on the TSS_Test, but it works // well with ACE's TSS emulation. diff --git a/dep/ACE_wrappers/ace/config-qnx-neutrino.h b/dep/ACE_wrappers/ace/config-qnx-neutrino.h index 745b86491..86525567c 100644 --- a/dep/ACE_wrappers/ace/config-qnx-neutrino.h +++ b/dep/ACE_wrappers/ace/config-qnx-neutrino.h @@ -1,5 +1,5 @@ // -*- C++ -*- -// $Id: config-qnx-neutrino.h 80826 2008-03-04 14:51:23Z wotte $ +// $Id: config-qnx-neutrino.h 87167 2009-10-19 19:33:53Z olli $ // The following configuration file is designed to work for Neutrino // 2.0 (Beta) with GNU C++ and the POSIX (pthread) threads package. @@ -75,10 +75,8 @@ #define ACE_HAS_SIGISMEMBER_BUG #define ACE_HAS_SIGWAIT #define ACE_HAS_SIG_ATOMIC_T -#define ACE_HAS_SIG_MACROS #define ACE_HAS_SOCKADDR_IN_SIN_LEN #define ACE_HAS_SSIZE_T -#define ACE_HAS_STRERROR #define ACE_HAS_STRINGS #define ACE_HAS_SVR4_GETTIMEOFDAY #define ACE_HAS_TERMIOS @@ -106,7 +104,8 @@ #define ACE_LACKS_RWLOCK_T #define ACE_LACKS_SBRK #define ACE_LACKS_SEEKDIR -#define ACE_LACKS_SOCKET_BUFSIZ +#define ACE_LACKS_SO_SNDBUF +#define ACE_LACKS_SO_RCVBUF #define ACE_LACKS_SOCKETPAIR #define ACE_LACKS_STROPTS_H #define ACE_LACKS_STREAM_MODULES diff --git a/dep/ACE_wrappers/ace/config-qnx-rtp-62x.h b/dep/ACE_wrappers/ace/config-qnx-rtp-62x.h index 3574153ba..7fa7514a1 100644 --- a/dep/ACE_wrappers/ace/config-qnx-rtp-62x.h +++ b/dep/ACE_wrappers/ace/config-qnx-rtp-62x.h @@ -1,5 +1,5 @@ // -*- C++ -*- -// $Id: config-qnx-rtp-62x.h 80826 2008-03-04 14:51:23Z wotte $ +// $Id: config-qnx-rtp-62x.h 87167 2009-10-19 19:33:53Z olli $ // The following configuration file is designed to work for QNX RTP 621 // GNU C++ and the POSIX (pthread) threads package. You can get QNX // RTP at http://get.qnx.com @@ -51,11 +51,9 @@ #define ACE_HAS_SIGISMEMBER_BUG #define ACE_HAS_SIGWAIT #define ACE_HAS_SIG_ATOMIC_T -#define ACE_HAS_SIG_MACROS #define ACE_HAS_SOCKADDR_IN_SIN_LEN #define ACE_HAS_SOCKLEN_T #define ACE_HAS_SSIZE_T -#define ACE_HAS_STRERROR #define ACE_HAS_STRINGS #define ACE_HAS_SVR4_DYNAMIC_LINKING #define ACE_HAS_SVR4_GETTIMEOFDAY @@ -86,7 +84,8 @@ #define ACE_LACKS_POLL_H #define ACE_LACKS_PTHREAD_THR_SIGSETMASK #define ACE_LACKS_RWLOCK_T -#define ACE_LACKS_SOCKET_BUFSIZ +#define ACE_LACKS_SO_SNDBUF +#define ACE_LACKS_SO_RCVBUF #define ACE_LACKS_STREAM_MODULES #define ACE_LACKS_STROPTS_H #define ACE_LACKS_STRPTIME @@ -99,6 +98,9 @@ #define ACE_LACKS_T_ERRNO #define ACE_LACKS_U_LONGLONG_T #define ACE_LACKS_ALPHASORT +#define ACE_LACKS_FD_MASK +#define ACE_LACKS_NFDBITS +#define ACE_LACKS_ISCTYPE #define ACE_LACKS_RLIMIT // QNX rlimit syscalls don't work properly with ACE. diff --git a/dep/ACE_wrappers/ace/config-qnx-rtp-common.h b/dep/ACE_wrappers/ace/config-qnx-rtp-common.h index 410d94e4e..79eb2397b 100644 --- a/dep/ACE_wrappers/ace/config-qnx-rtp-common.h +++ b/dep/ACE_wrappers/ace/config-qnx-rtp-common.h @@ -1,5 +1,5 @@ // -*- C++ -*- -// $Id: config-qnx-rtp-common.h 80826 2008-03-04 14:51:23Z wotte $ +// $Id: config-qnx-rtp-common.h 85074 2009-04-10 03:17:24Z mesnier_p $ // several macros common to various qnx neutrino version. #ifndef ACE_CONFIG_QNX_RTP_COMMON_H @@ -42,5 +42,9 @@ #define ACE_SIZEOF_DOUBLE 8 #define ACE_SIZEOF_FLOAT 4 +// At least qnx 6.3.2 uses a void return for unsetenv +// This assumes that older versions do too. +#define ACE_HAS_VOID_UNSETENV + #include /**/ "ace/post.h" #endif /* ACE_CONFIG_QNX_RTP_COMMON_H */ diff --git a/dep/ACE_wrappers/ace/config-qnx-rtp-pre62x.h b/dep/ACE_wrappers/ace/config-qnx-rtp-pre62x.h index 92adf76b1..504d3a3ac 100644 --- a/dep/ACE_wrappers/ace/config-qnx-rtp-pre62x.h +++ b/dep/ACE_wrappers/ace/config-qnx-rtp-pre62x.h @@ -1,5 +1,5 @@ // -*- C++ -*- -// $Id: config-qnx-rtp-pre62x.h 80826 2008-03-04 14:51:23Z wotte $ +// $Id: config-qnx-rtp-pre62x.h 87167 2009-10-19 19:33:53Z olli $ // The following configuration file is designed to work for QNX RTP // GNU C++ and the POSIX (pthread) threads package. You can get QNX // RTP at http://get.qnx.com @@ -48,12 +48,10 @@ #define ACE_HAS_SIGISMEMBER_BUG #define ACE_HAS_SIGWAIT #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_SOCKLEN_T #define ACE_HAS_SSIZE_T -#define ACE_HAS_STRERROR #define ACE_HAS_STRINGS #define ACE_HAS_SVR4_GETTIMEOFDAY #define ACE_HAS_TERMIOS @@ -84,7 +82,8 @@ #define ACE_LACKS_RWLOCK_T #define ACE_LACKS_SBRK #define ACE_LACKS_SEEKDIR -#define ACE_LACKS_SOCKET_BUFSIZ +#define ACE_LACKS_SO_SNDBUF +#define ACE_LACKS_SO_RCVBUF #define ACE_LACKS_SOCKETPAIR // Even if the QNX RTP docs says that socket pair are // available, there is actually no implementation of @@ -105,6 +104,8 @@ #define ACE_LACKS_UCONTEXT_H #define ACE_LACKS_UNIX_DOMAIN_SOCKETS #define ACE_LACKS_U_LONGLONG_T +#define ACE_LACKS_FD_MASK +#define ACE_LACKS_NFDBITS #define ACE_LACKS_RLIMIT // QNX rlimit syscalls don't work properly with ACE. diff --git a/dep/ACE_wrappers/ace/config-rtems.h b/dep/ACE_wrappers/ace/config-rtems.h index e2b458615..d113a1434 100644 --- a/dep/ACE_wrappers/ace/config-rtems.h +++ b/dep/ACE_wrappers/ace/config-rtems.h @@ -1,5 +1,5 @@ /* -*- C -*- */ -// $Id: config-rtems.h 80826 2008-03-04 14:51:23Z wotte $ +// $Id: config-rtems.h 87169 2009-10-19 20:26:55Z olli $ /* The following configuration file is designed to work for RTEMS platforms using GNU C. @@ -59,6 +59,7 @@ #define ACE_LACKS_RAND_REENTRANT_FUNCTIONS #define ACE_LACKS_REALPATH #define ACE_LACKS_TEMPNAM +#define ACE_LACKS_TZSET // Temporarily, enabling this results in compile errors with // rtems 4.6.6. @@ -97,9 +98,7 @@ #define ACE_HAS_SIGINFO_T #define ACE_HAS_SIGSUSPEND #define ACE_HAS_SSIZE_T -#define ACE_HAS_STRERROR #define ACE_HAS_VOIDPTR_GETTIMEOFDAY -#define ACE_HAS_SYS_ERRLIST #define ACE_HAS_SYS_FILIO_H #define ACE_HAS_TIMEZONE_GETTIMEOFDAY #define ACE_LACKS_EXEC diff --git a/dep/ACE_wrappers/ace/config-sco-5.0.0-nothread.h b/dep/ACE_wrappers/ace/config-sco-5.0.0-nothread.h index b83680639..259bd55c2 100644 --- a/dep/ACE_wrappers/ace/config-sco-5.0.0-nothread.h +++ b/dep/ACE_wrappers/ace/config-sco-5.0.0-nothread.h @@ -1,5 +1,5 @@ /* -*- C++ -*- */ -// $Id: config-sco-5.0.0-nothread.h 80826 2008-03-04 14:51:23Z wotte $ +// $Id: config-sco-5.0.0-nothread.h 87268 2009-10-29 21:06:06Z olli $ #ifndef ACE_CONFIG_H #define ACE_CONFIG_H @@ -8,7 +8,5 @@ #include "ace/config-g++-common.h" #include "ace/config-sco-5.0.0.h" -#define ACE_HAS_GNU_CSTRING_H - #include /**/ "ace/post.h" #endif /* ACE_CONFIG_H */ diff --git a/dep/ACE_wrappers/ace/config-sco-5.0.0.h b/dep/ACE_wrappers/ace/config-sco-5.0.0.h index 22849e505..61b68213b 100644 --- a/dep/ACE_wrappers/ace/config-sco-5.0.0.h +++ b/dep/ACE_wrappers/ace/config-sco-5.0.0.h @@ -1,5 +1,5 @@ /* -*- C++ -*- */ -// $Id: config-sco-5.0.0.h 80826 2008-03-04 14:51:23Z wotte $ +// $Id: config-sco-5.0.0.h 87167 2009-10-19 19:33:53Z olli $ #ifndef ACE_CONFIG_SCO_5_0_0_H #define ACE_CONFIG_SCO_5_0_0_H @@ -15,7 +15,6 @@ #endif /* SCO */ #define ACE_HAS_NONCONST_SELECT_TIMEVAL -#define ACE_HAS_SIG_MACROS #define ACE_LACKS_CONST_TIMESPEC_PTR #define ACE_LACKS_SYSCALL #define ACE_LACKS_STRRECVFD @@ -48,9 +47,6 @@ // 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 @@ -66,9 +62,6 @@ // Defines the page size of the system. #define ACE_PAGE_SIZE 4096 -// Compiler/platform supports strerror (). -#define ACE_HAS_STRERROR - #define ACE_HAS_TIMEZONE_GETTIMEOFDAY // Note, this only works if the flag is set above! diff --git a/dep/ACE_wrappers/ace/config-suncc-common.h b/dep/ACE_wrappers/ace/config-suncc-common.h index 3f0bae8a2..b11f2d1e8 100644 --- a/dep/ACE_wrappers/ace/config-suncc-common.h +++ b/dep/ACE_wrappers/ace/config-suncc-common.h @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: config-suncc-common.h 81935 2008-06-12 22:01:53Z jtc $ +// $Id: config-suncc-common.h 91285 2010-08-05 08:29:30Z johnnyw $ #ifndef ACE_SUNCC_COMMON_H #define ACE_SUNCC_COMMON_H @@ -30,18 +30,7 @@ # define ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) __extension__ extern template class SINGLETON_TYPE; #endif /* ACE_HAS_CUSTOM_EXPORT_MACROS == 0 */ -// __EXCEPTIONS is defined with -fexceptions, the egcs default. It -// is not defined with -fno-exceptions, the ACE default for g++. -// ACE_HAS_EXCEPTIONS is defined in -// include/makeinclude/wrapper_macros.GNU, so this really isn't -// necessary. Just in case . . . -# if defined (__EXCEPTIONS) && !defined (ACE_HAS_EXCEPTIONS) -# define ACE_HAS_EXCEPTIONS -# endif /* __EXCEPTIONS && ! ACE_HAS_EXCEPTIONS */ - -# if defined (ACE_HAS_EXCEPTIONS) -# define ACE_NEW_THROWS_EXCEPTIONS -# endif /* ACE_HAS_EXCEPTIONS */ +#define ACE_NEW_THROWS_EXCEPTIONS #if (defined (i386) || defined (__i386__)) && !defined (ACE_SIZEOF_LONG_DOUBLE) # define ACE_SIZEOF_LONG_DOUBLE 12 diff --git a/dep/ACE_wrappers/ace/config-sunos5.10.h b/dep/ACE_wrappers/ace/config-sunos5.10.h index 79ec20a63..df6f095fe 100644 --- a/dep/ACE_wrappers/ace/config-sunos5.10.h +++ b/dep/ACE_wrappers/ace/config-sunos5.10.h @@ -1,5 +1,5 @@ /* -*- C++ -*- */ -// $Id: config-sunos5.10.h 81805 2008-05-30 10:14:59Z vzykov $ +// $Id: config-sunos5.10.h 89905 2010-04-16 13:04:47Z johnnyw $ // The following configuration file is designed to work for SunOS 5.10 // (Solaris 10) platforms using the SunC++ 5.x (Sun Studio 8-10), or g++ @@ -27,25 +27,40 @@ # undef ACE_LACKS_LOG2 #endif +// Solaris 10 offers a useable isblank() unlike previous Solaris versions. +#if defined (ACE_LACKS_ISBLANK) +# undef ACE_LACKS_ISBLANK +#endif + // Solaris 10 delivers pthread_attr_setstack #if defined (ACE_LACKS_PTHREAD_ATTR_SETSTACK) # undef ACE_LACKS_PTHREAD_ATTR_SETSTACK #endif // Solaris 10 introduced printf() modifiers for [s]size_t types. -#if defined (ACE_SSIZE_T_FORMAT_SPECIFIER) -# undef ACE_SSIZE_T_FORMAT_SPECIFIER -# define ACE_SSIZE_T_FORMAT_SPECIFIER ACE_TEXT ("%zd") -#endif /* ACE_SSIZE_T_FORMAT_SPECIFIER */ +#if defined (ACE_SSIZE_T_FORMAT_SPECIFIER_ASCII) +# undef ACE_SSIZE_T_FORMAT_SPECIFIER_ASCII +# define ACE_SSIZE_T_FORMAT_SPECIFIER_ASCII "%zd" +#endif /* ACE_SSIZE_T_FORMAT_SPECIFIER_ASCII */ -#if defined (ACE_SIZE_T_FORMAT_SPECIFIER) -# undef ACE_SIZE_T_FORMAT_SPECIFIER -# define ACE_SIZE_T_FORMAT_SPECIFIER ACE_TEXT ("%zu") -#endif /* ACE_SIZE_T_FORMAT_SPECIFIER */ +#if defined (ACE_SIZE_T_FORMAT_SPECIFIER_ASCII) +# undef ACE_SIZE_T_FORMAT_SPECIFIER_ASCII +# define ACE_SIZE_T_FORMAT_SPECIFIER_ASCII "%zu" +#endif /* ACE_SIZE_T_FORMAT_SPECIFIER_ASCII */ -// Solaris 10 offers wcstoull() +// Solaris 10 offers wcstoll() and wcstoull() +#if defined (ACE_LACKS_WCSTOLL) +# undef ACE_LACKS_WCSTOLL +#endif /* ACE_LACKS_WCSTOLL */ #if defined (ACE_LACKS_WCSTOULL) # undef ACE_LACKS_WCSTOULL #endif /* ACE_LACKS_WCSTOULL */ +#if defined (ACE_HAS_SCTP) && defined (ACE_HAS_LKSCTP) +# define ACE_HAS_VOID_PTR_SCTP_GETLADDRS +# define ACE_HAS_VOID_PTR_SCTP_GETPADDRS +#endif + +#define ACE_HAS_SOLARIS_ATOMIC_LIB + #endif /* ACE_CONFIG_H */ diff --git a/dep/ACE_wrappers/ace/config-sunos5.4-g++.h b/dep/ACE_wrappers/ace/config-sunos5.4-g++.h index f911da8d3..a678389e7 100644 --- a/dep/ACE_wrappers/ace/config-sunos5.4-g++.h +++ b/dep/ACE_wrappers/ace/config-sunos5.4-g++.h @@ -1,5 +1,5 @@ /* -*- C++ -*- */ -// $Id: config-sunos5.4-g++.h 81697 2008-05-14 18:33:11Z johnnyw $ +// $Id: config-sunos5.4-g++.h 87268 2009-10-29 21:06:06Z olli $ // The following configuration file is designed to work for SunOS 5.4 // platforms using the GNU g++ compiler. @@ -17,7 +17,6 @@ #define ACE_HAS_STRING_CLASS #include "ace/config-g++-common.h" -#define ACE_HAS_GNU_CSTRING_H #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT @@ -40,7 +39,7 @@ // Platform supports system configuration information. #define ACE_HAS_SYS_SYSTEMINFO_H -#define ACE_HAS_SYSINFO +#define ACE_HAS_SYSV_SYSINFO // Platform supports the POSIX regular expression library #define ACE_HAS_REGEX @@ -106,9 +105,6 @@ // 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 @@ -127,8 +123,7 @@ // Platform provides header. #define ACE_HAS_SYS_FILIO_H -// Compiler/platform supports sys_siglist array. -#define ACE_HAS_SYS_SIGLIST +#define ACE_HAS_STRSIGNAL /* Turn off the following defines if you want to disable threading. */ // Compile using multi-thread libraries. diff --git a/dep/ACE_wrappers/ace/config-sunos5.4-sunc++-4.x.h b/dep/ACE_wrappers/ace/config-sunos5.4-sunc++-4.x.h index 36a155cdb..e4bc82391 100644 --- a/dep/ACE_wrappers/ace/config-sunos5.4-sunc++-4.x.h +++ b/dep/ACE_wrappers/ace/config-sunos5.4-sunc++-4.x.h @@ -1,5 +1,5 @@ /* -*- C++ -*- */ -// $Id: config-sunos5.4-sunc++-4.x.h 81935 2008-06-12 22:01:53Z jtc $ +// $Id: config-sunos5.4-sunc++-4.x.h 91285 2010-08-05 08:29:30Z johnnyw $ // The following configuration file is designed to work for SunOS 5.4 // platforms using the SunC++ 4.0.x compiler. @@ -31,7 +31,7 @@ // Platform supports system configuration information. #define ACE_HAS_SYS_SYSTEMINFO_H -#define ACE_HAS_SYSINFO +#define ACE_HAS_SYSV_SYSINFO // Platform supports the POSIX regular expression library. #define ACE_HAS_REGEX @@ -100,9 +100,6 @@ // 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 @@ -124,8 +121,7 @@ // Platform provides header. #define ACE_HAS_SYS_FILIO_H -// Compiler/platform supports sys_siglist array. -#define ACE_HAS_SYS_SIGLIST +#define ACE_HAS_STRSIGNAL /* Turn off the following defines if you want to disable threading. */ // Compile using multi-thread libraries. @@ -180,11 +176,9 @@ #define ACE_HAS_GPERF #define ACE_HAS_DIRENT -# if defined (ACE_HAS_EXCEPTIONS) - // If exceptions are enabled and we are using Sun/CC then - // throws an exception instead of returning 0. -# define ACE_NEW_THROWS_EXCEPTIONS -# endif /* ACE_HAS_EXCEPTIONS */ +// If exceptions are enabled and we are using Sun/CC then +// throws an exception instead of returning 0. +#define ACE_NEW_THROWS_EXCEPTIONS #include /**/ "ace/post.h" #endif /* ACE_CONFIG_H */ diff --git a/dep/ACE_wrappers/ace/config-sunos5.5.h b/dep/ACE_wrappers/ace/config-sunos5.5.h index 3608a28ab..f2a287748 100644 --- a/dep/ACE_wrappers/ace/config-sunos5.5.h +++ b/dep/ACE_wrappers/ace/config-sunos5.5.h @@ -1,5 +1,5 @@ /* -*- C++ -*- */ -// $Id: config-sunos5.5.h 81971 2008-06-16 12:15:00Z parsons $ +// $Id: config-sunos5.5.h 91321 2010-08-09 06:38:18Z johnnyw $ // This configuration file is designed to work for SunOS 5.5 platforms // using the following compilers: @@ -24,10 +24,24 @@ // SunOS 5.5 does not provide getloadavg() #define ACE_LACKS_GETLOADAVG +// Some SunOS releases define _POSIX_PTHREAD_SEMANTICS automatically. +// We need to be check if the user has manually defined the macro before +// including . +#if defined (_POSIX_PTHREAD_SEMANTICS) +# define ACE_HAS_POSIX_PTHREAD_SEMANTICS +#endif /* _POSIX_PTHREAD_SEMANTICS */ + // Before we do anything, we should include to // ensure that things are set up properly. #include +// Some SunOS releases define _POSIX_PTHREAD_SEMANTICS automatically. +// We need to undef if the macro is set and not defined by the user. +#if defined (_POSIX_PTHREAD_SEMANTICS) && \ + !defined (ACE_HAS_POSIX_PTHREAD_SEMANTICS) +# undef _POSIX_PTHREAD_SEMANTICS +#endif /* _POSIX_PTHREAD_SEMANTICS && !ACE_HAS_POSIX_PTHREAD_SEMANTICS */ + // Sun has the posix defines so let this file sort out what Sun delivers #include "ace/config-posix.h" @@ -49,12 +63,7 @@ # define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 # define ACE_HAS_THR_C_DEST # endif /* __SUNPRO_CC_COMPAT >= 5 */ -# if defined (ACE_HAS_EXCEPTIONS) -# define ACE_HAS_NEW_NOTHROW -# else - // See /opt/SUNWspro_5.0/SC5.0/include/CC/stdcomp.h: -# define _RWSTD_NO_EXCEPTIONS 1 -# endif /* ! ACE_HAS_EXCEPTIONS */ +# define ACE_HAS_NEW_NOTHROW # elif (__SUNPRO_CC == 0x420) || (__SUNPRO_CC == 0x410) # define ACE_LACKS_PLACEMENT_OPERATOR_DELETE # endif /* __SUNPRO_CC >= 0x500 */ @@ -67,24 +76,9 @@ # define ACE_LACKS_LINEBUFFERED_STREAMBUF # define ACE_LACKS_SIGNED_CHAR - // ACE_HAS_EXCEPTIONS precludes -noex in - // include/makeinclude/platform_macros.GNU. But beware, we have - // seen problems with exception handling on multiprocessor - // UltraSparcs: threaded executables core dump when threads exit. - // This problem does not seem to appear on single-processor UltraSparcs. - // And, it is solved with the application of patch - // 104631-02 "C++ 4.2: Jumbo Patch for C++ 4.2 on Solaris SPARC" - // to Sun C++ 4.2. - // To provide optimum performance, ACE_HAS_EXCEPTIONS is disabled by - // default. It can be enabled by adding "exceptions=1" to the "make" - // invocation. See include/makeinclude/platform_sunos5_sunc++.GNU - // for details. - -# if defined (ACE_HAS_EXCEPTIONS) - // If exceptions are enabled and we are using Sun/CC then - // throws an exception instead of returning 0. -# define ACE_NEW_THROWS_EXCEPTIONS -# endif /* ACE_HAS_EXCEPTIONS */ +// If exceptions are enabled and we are using Sun/CC then +// throws an exception instead of returning 0. +#define ACE_NEW_THROWS_EXCEPTIONS /* If you want to disable threading with Sun CC, remove -mt from your CFLAGS, e.g., using make threads=0. */ @@ -116,10 +110,10 @@ // 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_HAS_HI_RES_TIMER - // Denotes that GNU has cstring.h as standard, to redefine memchr(). -# define ACE_HAS_GNU_CSTRING_H # define ACE_HAS_XPG4_MULTIBYTE_CHAR # if !defined (ACE_MT_SAFE) || ACE_MT_SAFE != 0 @@ -191,7 +185,7 @@ // Platform supports system configuration information. #define ACE_HAS_SYS_SYSTEMINFO_H -#define ACE_HAS_SYSINFO +#define ACE_HAS_SYSV_SYSINFO // Platform supports recvmsg and sendmsg. #define ACE_HAS_MSG @@ -264,9 +258,6 @@ // 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 @@ -282,8 +273,7 @@ // Platform provides header. #define ACE_HAS_SYS_FILIO_H -// Compiler/platform supports sys_siglist array. -#define ACE_HAS_SYS_SIGLIST +#define ACE_HAS_STRSIGNAL // SunOS 5.5.x does not support mkstemp #define ACE_LACKS_MKSTEMP @@ -361,13 +351,14 @@ #define ACE_HAS_GETPAGESIZE 1 -#define ACE_HAS_STL_MAP_CONFLICT - #define ACE_HAS_IDTYPE_T #define ACE_HAS_GPERF #define ACE_HAS_DIRENT +#define ACE_LACKS_ISCTYPE +#define ACE_LACKS_ISBLANK + #if defined (__SUNPRO_CC) # define ACE_CC_NAME ACE_TEXT ("SunPro C++") # define ACE_CC_MAJOR_VERSION (__SUNPRO_CC >> 8) @@ -399,6 +390,7 @@ #define ACE_LACKS_INET_ATON // Solaris doesn't have wcstoull +#define ACE_LACKS_WCSTOLL #define ACE_LACKS_WCSTOULL #if defined (_LARGEFILE_SOURCE) || (_FILE_OFFSET_BITS==64) @@ -413,5 +405,8 @@ // Sum of the iov_len values can't be larger then SSIZE_MAX #define ACE_HAS_SOCK_BUF_SIZE_MAX +#define ACE_LACKS_SETENV +#define ACE_LACKS_UNSETENV + #include /**/ "ace/post.h" #endif /* ACE_CONFIG_H */ diff --git a/dep/ACE_wrappers/ace/config-sunos5.6.h b/dep/ACE_wrappers/ace/config-sunos5.6.h index d100627a2..c89bf1750 100644 --- a/dep/ACE_wrappers/ace/config-sunos5.6.h +++ b/dep/ACE_wrappers/ace/config-sunos5.6.h @@ -1,5 +1,5 @@ /* -*- C++ -*- */ -// $Id: config-sunos5.6.h 81935 2008-06-12 22:01:53Z jtc $ +// $Id: config-sunos5.6.h 91581 2010-08-31 13:18:11Z shuston $ // The following configuration file is designed to work for SunOS 5.6 // platforms using the SunC++ 4.x or g++ compilers. @@ -107,9 +107,6 @@ #define ACE_POSIX_AIOCB_PROACTOR #endif /* ACE_POSIX_AIOCB_PROACTOR */ -// SunOS 5.6 has a buggy select -#define ACE_HAS_LIMITED_SELECT - // SunOS 5.6 introduced shm_open, but need to turn on POSIX.1b or higher // to pick it up. #if defined (_POSIX_C_SOURCE) && (_POSIX_C_SOURCE > 2) diff --git a/dep/ACE_wrappers/ace/config-sunos5.7.h b/dep/ACE_wrappers/ace/config-sunos5.7.h index 60e1d993a..b01b0d477 100644 --- a/dep/ACE_wrappers/ace/config-sunos5.7.h +++ b/dep/ACE_wrappers/ace/config-sunos5.7.h @@ -1,5 +1,5 @@ /* -*- C++ -*- */ -// $Id: config-sunos5.7.h 80826 2008-03-04 14:51:23Z wotte $ +// $Id: config-sunos5.7.h 91581 2010-08-31 13:18:11Z shuston $ // The following configuration file is designed to work for SunOS 5.7 // (Solaris 7) platforms using the SunC++ 4.x, 5.x, or g++ compilers. @@ -54,10 +54,6 @@ #define ACE_HAS_AIO_CALLS #endif /* !ACE_HAS_AIO_CALLS */ -#ifdef ACE_HAS_LIMITED_SELECT -#undef ACE_HAS_LIMITED_SELECT -#endif /* ACE_HAS_LIMITED_SELECT */ - // SunOS 5.7 has socklen_t #define ACE_HAS_SOCKLEN_T diff --git a/dep/ACE_wrappers/ace/config-sunos5.9.h b/dep/ACE_wrappers/ace/config-sunos5.9.h index 0e6aa8d5b..b8d09447e 100644 --- a/dep/ACE_wrappers/ace/config-sunos5.9.h +++ b/dep/ACE_wrappers/ace/config-sunos5.9.h @@ -1,5 +1,5 @@ /* -*- C++ -*- */ -// $Id: config-sunos5.9.h 80826 2008-03-04 14:51:23Z wotte $ +// $Id: config-sunos5.9.h 84213 2009-01-22 15:45:13Z johnnyw $ // The following configuration file is designed to work for SunOS 5.9 // (Solaris 9) platforms using the SunC++ 5.x (Forte 6 and 7), or g++ @@ -12,7 +12,7 @@ // #include the SunOS 5.8 config, then add any SunOS 5.9 updates below. #include "ace/config-sunos5.8.h" -#define ACE_HAS_SENDFILE +#define ACE_HAS_SENDFILE 1 #define ACE_LACKS_THR_CONCURRENCY_FUNCS #endif /* ACE_CONFIG_H */ diff --git a/dep/ACE_wrappers/ace/config-tandem-nsk-mips-v2.h b/dep/ACE_wrappers/ace/config-tandem-nsk-mips-v2.h index 20d555321..8470a51d6 100644 --- a/dep/ACE_wrappers/ace/config-tandem-nsk-mips-v2.h +++ b/dep/ACE_wrappers/ace/config-tandem-nsk-mips-v2.h @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: config-tandem-nsk-mips-v2.h 81935 2008-06-12 22:01:53Z jtc $ +// $Id: config-tandem-nsk-mips-v2.h 91285 2010-08-05 08:29:30Z johnnyw $ #ifndef ACE_CONFIG_NSK_H #define ACE_CONFIG_NSK_H @@ -48,9 +48,6 @@ // note: on nsk TNS/R there is room in // sigset_t for 128 signals but those // above 31 are not valid. -typedef long fd_mask; // should be in select.h but no such file -#define NBBY 8 // must be consistent with value in sys/types.h -#define NFDBITS (sizeof (fd_mask) * NBBY) /* bits per mask */ #define MAXNAMLEN 248 // missing from dirent.h #define ERRMAX 4218 // from errno.h @@ -188,9 +185,6 @@ typedef enum CMA_T_SCHED_POLICY { // to make some ACE modifications.] //#define ACE_HAS_REGEX -// Compiler/platform supports strerror () -#define ACE_HAS_STRERROR - // Platform doesn't have truncate() #define ACE_LACKS_TRUNCATE @@ -218,11 +212,8 @@ typedef enum CMA_T_SCHED_POLICY { // Platform supports System V IPC #define ACE_HAS_SYSV_IPC -// Platform lacks the socketpair() call -// [Needed due to failure of Pipe_Test. even though nsk platform -// has socketpair(), Pipe.cpp tries to set socket buf size but this -// is not allowed for AF_UNIX protocol on nsk.] -#define ACE_LACKS_SOCKET_BUFSIZ +#define ACE_LACKS_SO_SNDBUF +#define ACE_LACKS_SO_RCVBUF // Platform lacks the socketpair() call #define ACE_LACKS_SOCKETPAIR @@ -234,8 +225,8 @@ typedef enum CMA_T_SCHED_POLICY { #define ACE_HRTIME_T_IS_BASIC_TYPE // printf format specifiers for 64 bit integers -# define ACE_UINT64_FORMAT_SPECIFIER ACE_TEXT ("%Ld") -# define ACE_INT64_FORMAT_SPECIFIER ACE_TEXT ("%Ld") +# define ACE_UINT64_FORMAT_SPECIFIER_ASCII "%Ld" +# define ACE_INT64_FORMAT_SPECIFIER_ASCII "%Ld" //========================================================================= // Threads specific parts @@ -285,6 +276,8 @@ typedef enum CMA_T_SCHED_POLICY { #define ACE_HAS_UCONTEXT_T #endif +#define ACE_LACKS_FD_MASK + //========================================================================= // Include file characteristics //========================================================================= @@ -343,9 +336,6 @@ typedef enum CMA_T_SCHED_POLICY { // Compiler specific parts //========================================================================= -// Compiler supports C++ exception handling -#define ACE_HAS_EXCEPTIONS - // Compiler/platform has correctly prototyped header files #define ACE_HAS_CPLUSPLUS_HEADERS diff --git a/dep/ACE_wrappers/ace/config-tandem-nsk-mips-v3.h b/dep/ACE_wrappers/ace/config-tandem-nsk-mips-v3.h index 0e6fd291c..88dc259cf 100644 --- a/dep/ACE_wrappers/ace/config-tandem-nsk-mips-v3.h +++ b/dep/ACE_wrappers/ace/config-tandem-nsk-mips-v3.h @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id: config-tandem-nsk-mips-v3.h 81935 2008-06-12 22:01:53Z jtc $ +// $Id: config-tandem-nsk-mips-v3.h 91285 2010-08-05 08:29:30Z johnnyw $ #ifndef ACE_CONFIG_NSK_H @@ -49,9 +49,6 @@ // note: on nsk TNS/R there is room in // sigset_t for 128 signals but those // above 31 are not valid. -typedef long fd_mask; // should be in select.h but no such file -#define NBBY 8 // must be consistent with value in sys/types.h -#define NFDBITS (sizeof (fd_mask) * NBBY) /* bits per mask */ #define MAXNAMLEN 248 // missing from dirent.h #define ERRMAX 4218 // from errno.h @@ -189,9 +186,6 @@ typedef enum CMA_T_SCHED_POLICY { // to make some ACE modifications.] //#define ACE_HAS_REGEX -// Compiler/platform supports strerror () -#define ACE_HAS_STRERROR - // Platform doesn't have truncate() #define ACE_LACKS_TRUNCATE @@ -219,11 +213,8 @@ typedef enum CMA_T_SCHED_POLICY { // Platform supports System V IPC #define ACE_HAS_SYSV_IPC -// Platform lacks the socketpair() call -// [Needed due to failure of Pipe_Test. even though nsk platform -// has socketpair(), Pipe.cpp tries to set socket buf size but this -// is not allowed for AF_UNIX protocol on nsk.] -#define ACE_LACKS_SOCKET_BUFSIZ +#define ACE_LACKS_SO_SNDBUF +#define ACE_LACKS_SO_RCVBUF // Platform lacks the socketpair() call #define ACE_LACKS_SOCKETPAIR @@ -235,8 +226,8 @@ typedef enum CMA_T_SCHED_POLICY { #define ACE_HRTIME_T_IS_BASIC_TYPE // printf format specifiers for 64 bit integers -# define ACE_UINT64_FORMAT_SPECIFIER ACE_TEXT ("%Ld") -# define ACE_INT64_FORMAT_SPECIFIER ACE_TEXT ("%Ld") +# define ACE_UINT64_FORMAT_SPECIFIER_ASCII "%Ld" +# define ACE_INT64_FORMAT_SPECIFIER_ASCII "%Ld" // Use larger default buffer size for ease of interoperability #define ACE_DEFAULT_CDR_BUFSIZE 4096 @@ -261,6 +252,8 @@ typedef enum CMA_T_SCHED_POLICY { // Platform lacks alphasort() #define ACE_LACKS_ALPHASORT +#define ACE_LACKS_FD_MASK +#define ACE_LACKS_NFDBITS //========================================================================= // Threads specific parts @@ -378,9 +371,6 @@ typedef enum CMA_T_SCHED_POLICY { // Compiler specific parts //========================================================================= -// Compiler supports C++ exception handling -#define ACE_HAS_EXCEPTIONS 1 - // Compiler/platform has correctly prototyped header files #define ACE_HAS_CPLUSPLUS_HEADERS diff --git a/dep/ACE_wrappers/ace/config-tandem.h b/dep/ACE_wrappers/ace/config-tandem.h index 981fdfb2d..145c20abd 100644 --- a/dep/ACE_wrappers/ace/config-tandem.h +++ b/dep/ACE_wrappers/ace/config-tandem.h @@ -1,6 +1,6 @@ /* -*- C++ -*- */ // Testing TANDEM -// $Id: config-tandem.h 81697 2008-05-14 18:33:11Z johnnyw $ +// $Id: config-tandem.h 87167 2009-10-19 19:33:53Z olli $ // The following configuration file is designed to work for Tandems NonStop-UX // 4.2MP platforms using the NCC 3.20 compiler. @@ -41,7 +41,7 @@ //Platform supports system configuration information #define ACE_HAS_SYS_SYSTEMINFO_H -#define ACE_HAS_SYSINFO +#define ACE_HAS_SYSV_SYSINFO //Platform supports the POSIX regular expression library #define ACE_HAS_REGEX @@ -111,9 +111,6 @@ #define ACE_HAS_STREAM_PIPES //Platform supports STREAM pipes -//Compiler/platform supports strerror () -#define ACE_HAS_STRERROR - //Compiler/platform supports struct strbuf #define ACE_HAS_STRBUF_T @@ -172,6 +169,7 @@ //Platform uses non-const char * in calls to gethostbyaddr, gethostbyname, // getservbyname #define ACE_HAS_NONCONST_GETBY +#define ACE_HAS_NONCONST_INET_ADDR // Platform's select() uses non-const timeval* (only found on Linux right now) #define ACE_HAS_NONCONST_SELECT_TIMEVAL // And on Tandem :-) diff --git a/dep/ACE_wrappers/ace/config-tru64.h b/dep/ACE_wrappers/ace/config-tru64.h index f2825b996..45a7aa6bd 100644 --- a/dep/ACE_wrappers/ace/config-tru64.h +++ b/dep/ACE_wrappers/ace/config-tru64.h @@ -1,5 +1,5 @@ /* -*- C++ -*- */ -// $Id: config-tru64.h 81935 2008-06-12 22:01:53Z jtc $ +// $Id: config-tru64.h 87270 2009-10-29 21:47:47Z olli $ // The following configuration file is designed to work for the // Digital UNIX V4.0a and later platforms. It relies on @@ -37,7 +37,6 @@ # include "ace/config-g++-common.h" -# define ACE_HAS_GNU_CSTRING_H # define ACE_HAS_REENTRANT_FUNCTIONS #elif defined (__DECCXX) @@ -60,7 +59,6 @@ #define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R #define ACE_HAS_BROKEN_IF_HEADER -#define ACE_HAS_BROKEN_R_ROUTINES #if (ACE_MT_SAFE != 0) # define ACE_HAS_PTHREADS # define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS @@ -102,7 +100,6 @@ #define ACE_HAS_SSIZE_T #define ACE_HAS_STRBUF_T #define ACE_HAS_STREAMS -#define ACE_HAS_STRERROR #define ACE_HAS_STRPTIME #define ACE_HAS_SVR4_DYNAMIC_LINKING #define ACE_HAS_SVR4_SIGNAL_T diff --git a/dep/ACE_wrappers/ace/config-unixware-7.1.0.h b/dep/ACE_wrappers/ace/config-unixware-7.1.0.h index b75fac4dc..3712ea01e 100644 --- a/dep/ACE_wrappers/ace/config-unixware-7.1.0.h +++ b/dep/ACE_wrappers/ace/config-unixware-7.1.0.h @@ -1,5 +1,5 @@ /* -*- C++ -*- */ -// $Id: config-unixware-7.1.0.h 82267 2008-07-08 16:39:19Z jtc $ +// $Id: config-unixware-7.1.0.h 91285 2010-08-05 08:29:30Z johnnyw $ #ifndef ACE_CONFIG_H #define ACE_CONFIG_H @@ -89,13 +89,6 @@ readdir_r, etc. */ #define ACE_HAS_DIRENT 1 -/* Compiler supports C++ exception handling */ -// MM-Graz if ! defined inserted, to prevent warnings, because it is already -// defined in config-g++common.h -# if !defined (ACE_HAS_EXCEPTIONS) -#define ACE_HAS_EXCEPTIONS 1 -# endif - /* Platform supports getpagesize() call (otherwise, ACE_PAGE_SIZE must be defined, except on Win32) */ #define ACE_HAS_GETPAGESIZE 1 @@ -107,9 +100,6 @@ the one in ace/OS.i. */ #define ACE_HAS_GETRUSAGE_PROTOTYPE 1 -/* Denotes that GNU has cstring.h as standard which redefines memchr() */ -#define ACE_HAS_GNU_CSTRING_H - /* The GPERF utility is compiled for this platform */ #define ACE_HAS_GPERF 1 @@ -229,9 +219,6 @@ /* Platform supports STREAM pipes */ #define ACE_HAS_STREAM_PIPES 1 -/* Compiler/platform supports strerror () */ -#define ACE_HAS_STRERROR 1 - /* Platform/Compiler supports a String class (e.g., GNU or Win32). */ #define ACE_HAS_STRING_CLASS 1 @@ -252,7 +239,7 @@ /* Platform supports system configuration information */ #define ACE_HAS_SYS_SYSTEMINFO_H -#define ACE_HAS_SYSINFO 1 +#define ACE_HAS_SYSV_SYSINFO 1 /* Platform supports System V IPC (most versions of UNIX, but not Win32) */ #define ACE_HAS_SYSV_IPC 1 diff --git a/dep/ACE_wrappers/ace/config-unixware-7.1.0.udk.h b/dep/ACE_wrappers/ace/config-unixware-7.1.0.udk.h index 477130d3d..9dac770a8 100644 --- a/dep/ACE_wrappers/ace/config-unixware-7.1.0.udk.h +++ b/dep/ACE_wrappers/ace/config-unixware-7.1.0.udk.h @@ -2,7 +2,7 @@ #ifndef ACE_CONFIG_UNIXWARE_UDK_H #define ACE_CONFIG_UNIXWARE_UDK_H -// $Id: config-unixware-7.1.0.udk.h 82267 2008-07-08 16:39:19Z jtc $ +// $Id: config-unixware-7.1.0.udk.h 91285 2010-08-05 08:29:30Z johnnyw $ // Configuration for the unixware UDK compiler. derived from the unixware/g++ config // which was itself derived from an autoconfig run. @@ -114,11 +114,6 @@ readdir_r, etc. */ #define ACE_HAS_DIRENT -/* Compiler supports C++ exception handling */ -# if !defined (ACE_HAS_EXCEPTIONS) -#define ACE_HAS_EXCEPTIONS -# endif - /* Platform supports getpagesize() call (otherwise, ACE_PAGE_SIZE must be defined, except on Win32) */ #define ACE_HAS_GETPAGESIZE @@ -269,9 +264,6 @@ /* Platform supports STREAM pipes */ #define ACE_HAS_STREAM_PIPES -/* Compiler/platform supports strerror () */ -#define ACE_HAS_STRERROR - /* Platform/Compiler supports a String class (e.g., GNU or Win32). */ #define ACE_HAS_STRING_CLASS @@ -292,7 +284,7 @@ /* Platform supports system configuration information */ #define ACE_HAS_SYS_SYSTEMINFO_H -#define ACE_HAS_SYSINFO 1 +#define ACE_HAS_SYSV_SYSINFO 1 /* Platform supports System V IPC (most versions of UNIX, but not Win32) */ #define ACE_HAS_SYSV_IPC 1 diff --git a/dep/ACE_wrappers/ace/config-vxworks.h b/dep/ACE_wrappers/ace/config-vxworks.h index bb6ed5796..fd4e04193 100644 --- a/dep/ACE_wrappers/ace/config-vxworks.h +++ b/dep/ACE_wrappers/ace/config-vxworks.h @@ -1,5 +1,5 @@ //* -*- C++ -*- */ -// $Id: config-vxworks.h 81046 2008-03-21 10:11:12Z johnnyw $ +// $Id: config-vxworks.h 87036 2009-10-10 18:21:39Z johnnyw $ // The following configuration file is designed to work for VxWorks // Based on ACE_VXWORKS it will select the correct config file @@ -29,25 +29,27 @@ # define ACE_VXWORKS 0x650 # elif (_WRS_VXWORKS_MINOR == 6) # define ACE_VXWORKS 0x660 +# elif (_WRS_VXWORKS_MINOR == 7) +# define ACE_VXWORKS 0x670 +# elif (_WRS_VXWORKS_MINOR == 8) +# define ACE_VXWORKS 0x680 # endif # endif # endif #endif /* ! ACE_VXWORKS */ -#if (ACE_VXWORKS == 0x551) -# include "ace/config-vxworks5.x.h" -#elif (ACE_VXWORKS == 0x620) -# include "ace/config-vxworks6.2.h" -#elif (ACE_VXWORKS == 0x630) -# include "ace/config-vxworks6.3.h" -#elif (ACE_VXWORKS == 0x640) +#if (ACE_VXWORKS == 0x640) # include "ace/config-vxworks6.4.h" #elif (ACE_VXWORKS == 0x650) # include "ace/config-vxworks6.5.h" #elif (ACE_VXWORKS == 0x660) # include "ace/config-vxworks6.6.h" +#elif (ACE_VXWORKS == 0x670) +# include "ace/config-vxworks6.7.h" +#elif (ACE_VXWORKS == 0x680) +# include "ace/config-vxworks6.8.h" #else -#error Unknown VxWorks version +#error Unknown or unsupported VxWorks version #endif #include /**/ "ace/post.h" diff --git a/dep/ACE_wrappers/ace/config-vxworks5.x.h b/dep/ACE_wrappers/ace/config-vxworks5.x.h deleted file mode 100644 index a13ce4720..000000000 --- a/dep/ACE_wrappers/ace/config-vxworks5.x.h +++ /dev/null @@ -1,345 +0,0 @@ -/* -*- C++ -*- */ -// $Id: config-vxworks5.x.h 81850 2008-06-06 08:39:54Z vzykov $ - -// The following configuration file is designed to work for VxWorks -// 5.5.x platforms using one of these compilers: -// 1) The GNU g++ compiler that is shipped with Tornado 2.2 or newer. -// 2) The Green Hills 1.8.8 and newer 1.8.9 compilers (not tested -// already for a long time) -// 3) The WindRiver Compiler (formerly known as Diab) - -#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 0x551 -#endif /* ! ACE_VXWORKS */ - -#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 - -# if !defined (ACE_MAIN) -# define ACE_MAIN ace_main -# endif /* ! ACE_MAIN */ - -# define ACE_LACKS_LINEBUFFERED_STREAMBUF - -# if (__GNUC__ == 2) -# define ACE_CDR_IMPLEMENT_WITH_NATIVE_DOUBLE 1 -# endif - -# 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 (ghs) - // Processor type, if necessary. Green Hills defines "ppc". -# if defined (ppc) -# define ACE_HAS_POWERPC_TIMER -# define ACE_LACKS_CLEARERR -# endif /* ppc */ - -# define ACE_CONFIG_INCLUDE_GHS_COMMON -# include "ace/config-ghs-common.h" - -# define ACE_LACKS_UNISTD_H -# define ACE_LACKS_IOSTREAM_TOTALLY - -// Short-circuit the include of -// Green Hills has a problem with multiply defined functions -// with different parameters. -# define __INCineth - -#elif defined (__DCPLUSPLUS__) || defined (__DCC__) - // Diab 4.2a or later. -# if !defined (ACE_LACKS_PRAGMA_ONCE) - // We define it with a -D with make depend. -# define ACE_LACKS_PRAGMA_ONCE -# endif /* ! ACE_LACKS_PRAGMA_ONCE */ - - // Diab doesn't support VxWorks' iostream libraries. -# define ACE_LACKS_IOSTREAM_TOTALLY -# define ACE_LACKS_ACE_IOSTREAM - -# define ACE_HAS_STANDARD_CPP_LIBRARY 1 -# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 0 - -# 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_SIZET_PTR_ASCTIME_R_AND_CTIME_R -#define ACE_MKDIR_LACKS_MODE -#define ACE_HAS_NONCONST_GETBY -#define ACE_HAS_NONCONST_STAT -#define ACE_HAS_NONCONST_SWAB -#define ACE_HAS_NONCONST_READV -#define ACE_HAS_NONCONST_CHDIR -#define ACE_HAS_NONCONST_UNLINK -#define ACE_HAS_NONCONST_OPENDIR -#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_CHARPTR_SOCKOPT -#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_IOCTL_INT_3_PARAM -#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_SOCKADDR_IN_SIN_LEN -#define ACE_HAS_SOCKADDR_IN6_SIN6_LEN -#define ACE_HAS_STRDUP_EMULATION -#define ACE_HAS_STRERROR -#define ACE_HAS_THREADS -#define ACE_LACKS_ALPHASORT -#define ACE_LACKS_ACCESS -#define ACE_LACKS_EXEC -#define ACE_LACKS_FCNTL -#define ACE_LACKS_FILELOCKS -#define ACE_LACKS_FORK -#define ACE_LACKS_FSYNC -#define ACE_LACKS_GETHOSTENT -#define ACE_LACKS_GETOPT -#define ACE_LACKS_GETPID -#define ACE_LACKS_GETPPID -#define ACE_LACKS_GETSERVBYNAME -#define ACE_LACKS_KEY_T -#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_MKTEMP -#define ACE_LACKS_MKSTEMP -#define ACE_LACKS_MMAP -#define ACE_LACKS_MPROTECT -#define ACE_LACKS_MSYNC -#define ACE_LACKS_NUMERIC_LIMITS -#define ACE_LACKS_GETPROTOBYNAME -#define ACE_LACKS_GETPROTOBYNUMBER -#define ACE_LACKS_GETHOSTBYADDR -#define ACE_LACKS_GETHOSTBYNAME -#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS -#define ACE_LACKS_SYS_PARAM_H -#define ACE_LACKS_PWD_FUNCTIONS -#define ACE_LACKS_RAND_REENTRANT_FUNCTIONS -#define ACE_LACKS_READDIR_R -#define ACE_LACKS_READLINK -#define ACE_LACKS_REALPATH -#define ACE_LACKS_RLIMIT -#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_SI_ADDR -#define ACE_LACKS_SOCKETPAIR -#define ACE_LACKS_STRCASECMP -#define ACE_LACKS_STRRECVFD -#define ACE_LACKS_SYSCALL -#define ACE_LACKS_SYSCONF -#define ACE_LACKS_SYS_SYSCTL_H -#define ACE_LACKS_SYSV_SHMEM -#define ACE_LACKS_TELLDIR -#define ACE_LACKS_TEMPNAM -#define ACE_LACKS_TIMESPEC_T -#define ACE_LACKS_TRUNCATE -#define ACE_LACKS_UCONTEXT_H -#define ACE_LACKS_UMASK -#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 -#define ACE_LACKS_DUP -#define ACE_LACKS_SUSECONDS_T -#define ACE_LACKS_USECONDS_T -#define ACE_LACKS_INTPTR_T -#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 -#if !defined (ACE_VXWORKS_SPARE) -# define ACE_VXWORKS_SPARE spare4 -#endif /* ! ACE_VXWORKS_SPARE */ - -#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_GETEGID -#define ACE_LACKS_GETGID -#define ACE_LACKS_GETEUID -#define ACE_LACKS_GETUID -#define ACE_LACKS_SETGID -#define ACE_LACKS_GETPGID - -#define ACE_LACKS_PIPE -#define ACE_LACKS_STDINT_H -#define ACE_LACKS_INTTYPES_H -#define ACE_LACKS_UNISTD_H -#define ACE_LACKS_SYS_SELECT_H -#define ACE_LACKS_SYS_TIME_H -#define ACE_LACKS_SYS_RESOURCE_H -#define ACE_LACKS_DLFCN_H -#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_WCHAR_H -#define ACE_LACKS_PWD_H -#define ACE_LACKS_SEARCH_H -#define ACE_LACKS_SYS_SHM_H -#define ACE_LACKS_STRINGS_H -#define ACE_LACKS_TERMIOS_H -#define ACE_LACKS_POLL_H -#define ACE_LACKS_WCTYPE_H - -// Not sure if these should always be defined. -#define ACE_LACKS_SYS_UN_H - -// Some string things -#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_ITOW -#define ACE_LACKS_WCSICMP -#define ACE_LACKS_WCSNICMP -#define ACE_LACKS_WCSTOD -#define ACE_LACKS_WCSTOL -#define ACE_LACKS_WCSTOUL -#define ACE_LACKS_WCSDUP -#define ACE_LACKS_STRTOULL -#define ACE_LACKS_WCSTOULL - -#define ACE_LACKS_SYMLINKS -#define ACE_LACKS_FGETWC -#define ACE_LACKS_FGETWS -#define ACE_LACKS_FPUTWS - -#if defined (ACE_HAS_VXWORKS551_PID) || (ACE_HAS_VXWORKS551_PCD) || (ACE_HAS_VXWORKS551_PNE) -# define ACE_HAS_VXWORKS551_MEDUSA -#endif - -#if defined (ACE_HAS_VXWORKS551_MEDUSA) -# define ACE_HAS_GETIFADDRS -#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_LACKS_CONDATTR_PSHARED -# define ACE_LACKS_MUTEXATTR_PSHARED -# define ACE_HAS_THREAD_SPECIFIC_STORAGE -# define ACE_HAS_POSIX_SEM -// 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_HAS_VXTHREADS -# define ACE_LACKS_PTHREAD_H -# define ACE_LACKS_COND_T -// 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 -// VxWorks does not have the pthread_mutex_timedlock operation, but there is -// an emulation for this when not using the pthread mapping -#define ACE_HAS_MUTEX_TIMEOUTS -#define ACE_HAS_TSS_EMULATION -#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 (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 - -# if defined (TOOL) && (TOOL == gnu) -# if defined (CPU) && (CPU == PPC85XX || CPU == PPC604 || CPU == PPC603) -// These PPC's do lack log2 -# define ACE_LACKS_LOG2 -# endif -# endif - -#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/dep/ACE_wrappers/ace/config-vxworks6.2.h b/dep/ACE_wrappers/ace/config-vxworks6.2.h deleted file mode 100644 index 0d03b44cd..000000000 --- a/dep/ACE_wrappers/ace/config-vxworks6.2.h +++ /dev/null @@ -1,328 +0,0 @@ -/* -*- C++ -*- */ -// $Id: config-vxworks6.2.h 81850 2008-06-06 08:39:54Z vzykov $ - -// The following configuration file is designed to work for VxWorks -// 6.2 platforms using one of these compilers: -// 1) The GNU g++ compiler that is shipped with VxWorks 6.2 - -#ifndef ACE_CONFIG_VXWORKS_6_2_H -#define ACE_CONFIG_VXWORKS_6_2_H -#include /**/ "ace/pre.h" - -#if ! defined (VXWORKS) -# define VXWORKS -#endif /* ! VXWORKS */ - -#if ! defined (ACE_VXWORKS) -# define ACE_VXWORKS 0x620 -#endif /* ! ACE_VXWORKS */ - -#if defined __RTP__ - // Fix wrong typedef in unistd.h (unsigned short) - #define _SUSECONDS_T - typedef long suseconds_t; -#endif -#include - -// Fix for including right typedef for pid_t in VxTypes.h (int) -#include - -#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 defined (__RTP__) && !defined (_HAS_C9X) -// Workaround for the fact that under RTP the log2 method can't be used -// without this define set, see TSR560446 -# if !defined (_C99) -# define _C99 -# endif -# endif - -#elif defined (__DCPLUSPLUS__) || defined (__DCC__) - // Diab 4.2a or later. -# if !defined (ACE_LACKS_PRAGMA_ONCE) - // We define it with a -D with make depend. -# define ACE_LACKS_PRAGMA_ONCE -# endif /* ! ACE_LACKS_PRAGMA_ONCE */ - -# define ACE_HAS_STANDARD_CPP_LIBRARY 1 -# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 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 */ - -#if !defined __RTP__ -# if defined (TOOL) && (TOOL == gnu) -# if defined (CPU) && (CPU == PPC85XX || CPU == PPC604 || CPU == PPC603) -// These PPC's do lack log2 in kernel mode -# define ACE_LACKS_LOG2 -# endif -# endif -#endif - -// OS-specific configuration -#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 -#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_IOCTL_INT_3_PARAM -#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_SIGACTION_CONSTP2 -#define ACE_HAS_SIGINFO_T -#define ACE_HAS_SIGWAIT -#define ACE_HAS_SIG_ATOMIC_T -#define ACE_HAS_SOCKADDR_IN_SIN_LEN -#define ACE_HAS_SOCKADDR_IN6_SIN6_LEN -#define ACE_HAS_STRERROR -#define ACE_HAS_THREADS -#define ACE_HAS_SYSCTL -#define ACE_LACKS_ALPHASORT -#define ACE_LACKS_EXEC -#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_KEY_T -#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_MKTEMP -#define ACE_LACKS_MKSTEMP -#define ACE_LACKS_MMAP -#define ACE_LACKS_MPROTECT -#define ACE_LACKS_MSYNC -#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS -#define ACE_LACKS_SYS_PARAM_H -#define ACE_LACKS_PWD_FUNCTIONS -#define ACE_LACKS_READDIR_R -#define ACE_LACKS_READLINK -#define ACE_LACKS_REALPATH -#define ACE_LACKS_PIPE -#define ACE_LACKS_RLIMIT -#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_SI_ADDR -#define ACE_LACKS_SOCKETPAIR -#define ACE_LACKS_STRRECVFD -#define ACE_LACKS_SYSV_SHMEM -#define ACE_LACKS_TELLDIR -#define ACE_LACKS_TEMPNAM -#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_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 -#if !defined (ACE_VXWORKS_SPARE) -# define ACE_VXWORKS_SPARE spare4 -#endif /* ! ACE_VXWORKS_SPARE */ -#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_LACKS_STRTOULL -#define ACE_LACKS_WCSTOULL - -#define ACE_HAS_CHARPTR_SOCKOPT -#define ACE_LACKS_SYMLINKS - -#if defined __RTP__ - // We are building for RTP mode - #if !defined (ACE_AS_STATIC_LIBS) - # define ACE_HAS_SVR4_DYNAMIC_LINKING - #endif - #define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R - #define ACE_LACKS_REGEX_H - #define ACE_LACKS_PUTENV - #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 - #define ACE_LACKS_INTPTR_T - #define ACE_LACKS_SUSECONDS_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_GETPID - #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 - #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_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 -# define ACE_HAS_VXTHREADS -# 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 -# 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 (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 -// 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 */ - -#if defined (ACE_HAS_IP_MULTICAST) -# define ACE_LACKS_PERFECT_MULTICAST_FILTERING 1 -#endif /* ACE_HAS_IP_MULTICAST */ - -#include /**/ "ace/post.h" -#endif /* ACE_CONFIG_VXWORKS_6_2_H */ diff --git a/dep/ACE_wrappers/ace/config-vxworks6.3.h b/dep/ACE_wrappers/ace/config-vxworks6.3.h deleted file mode 100644 index 1b7cd4100..000000000 --- a/dep/ACE_wrappers/ace/config-vxworks6.3.h +++ /dev/null @@ -1,317 +0,0 @@ -/* -*- C++ -*- */ -// $Id: config-vxworks6.3.h 81850 2008-06-06 08:39:54Z vzykov $ - -// The following configuration file is designed to work for VxWorks -// 6.3 platforms using one of these compilers: -// 1) The GNU g++ compiler that is shipped with VxWorks 6.3 - -#ifndef ACE_CONFIG_VXWORKS_6_3_H -#define ACE_CONFIG_VXWORKS_6_3_H -#include /**/ "ace/pre.h" - -#if ! defined (VXWORKS) -# define VXWORKS -#endif /* ! VXWORKS */ - -#if ! defined (ACE_VXWORKS) -# define ACE_VXWORKS 0x630 -#endif /* ! ACE_VXWORKS */ - -#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 defined (__RTP__) && !defined (_HAS_C9X) -// Workaround for the fact that under RTP the log2 method can't be used -// without this define set, see TSR560446 -# if !defined (_C99) -# define _C99 -# endif -# endif - -#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 */ - -#if !defined __RTP__ -# if defined (TOOL) && (TOOL == gnu) -# if defined (CPU) && (CPU == PPC85XX || CPU == PPC604 || CPU == PPC603) -// These PPC's do lack log2 in kernel mode -# define ACE_LACKS_LOG2 -# endif -# endif -#endif - -// OS-specific configuration -#define ACE_HAS_4_4BSD_SENDMSG_RECVMSG -#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_SIGACTION_CONSTP2 -#define ACE_HAS_SIGINFO_T -#define ACE_HAS_SIGWAIT -#define ACE_HAS_SIG_ATOMIC_T -#define ACE_HAS_SOCKADDR_IN_SIN_LEN -#define ACE_HAS_SOCKADDR_IN6_SIN6_LEN -#define ACE_HAS_STRERROR -#define ACE_HAS_THREADS -#define ACE_HAS_SYSCTL -#define ACE_LACKS_ALPHASORT -#define ACE_LACKS_EXEC -#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_MKTEMP -#define ACE_LACKS_MKSTEMP -#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS -#define ACE_LACKS_SYS_PARAM_H -#define ACE_LACKS_PWD_FUNCTIONS -#define ACE_LACKS_READDIR_R -#define ACE_LACKS_READLINK -#define ACE_LACKS_REALPATH -#define ACE_LACKS_PIPE -#define ACE_LACKS_RLIMIT -#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_SI_ADDR -#define ACE_LACKS_SOCKETPAIR -#define ACE_LACKS_STRRECVFD -#define ACE_LACKS_SYSV_SHMEM -#define ACE_LACKS_TELLDIR -#define ACE_LACKS_TEMPNAM -#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_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_ITOW -#define ACE_LACKS_WCSDUP -#define ACE_LACKS_WCSICMP -#define ACE_LACKS_WCSNICMP -#define ACE_LACKS_STRTOULL -#define ACE_LACKS_WCSTOULL - -#define ACE_HAS_CHARPTR_SOCKOPT -#define ACE_LACKS_SYMLINKS - -#if defined __RTP__ - // We are building for RTP mode - #if !defined (ACE_AS_STATIC_LIBS) - # define ACE_HAS_SVR4_DYNAMIC_LINKING - #endif - #define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R - #define ACE_LACKS_REGEX_H - #define ACE_LACKS_PUTENV - #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 - #if defined (ACE_AS_STATIC_LIBS) - # define ACE_HAS_AIO_CALLS - #endif - #define ACE_LACKS_STRCASECMP - // 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_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_GETPID - #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_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 -# define ACE_HAS_VXTHREADS -# 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 (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 - -// 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 */ - -#if defined (ACE_HAS_IP_MULTICAST) -# define ACE_LACKS_PERFECT_MULTICAST_FILTERING 1 -#endif /* ACE_HAS_IP_MULTICAST */ - -#include /**/ "ace/post.h" -#endif /* ACE_CONFIG_VXWORKS_6_3_H */ diff --git a/dep/ACE_wrappers/ace/config-vxworks6.4.h b/dep/ACE_wrappers/ace/config-vxworks6.4.h index 2d8db5294..d1fad7819 100644 --- a/dep/ACE_wrappers/ace/config-vxworks6.4.h +++ b/dep/ACE_wrappers/ace/config-vxworks6.4.h @@ -1,5 +1,5 @@ //* -*- C++ -*- */ -// $Id: config-vxworks6.4.h 81850 2008-06-06 08:39:54Z vzykov $ +// $Id: config-vxworks6.4.h 89494 2010-03-15 20:11:18Z olli $ // The following configuration file is designed to work for VxWorks // 6.4 platforms using one of these compilers: @@ -72,7 +72,7 @@ #if !defined __RTP__ # if defined (TOOL) && (TOOL == gnu) -# if defined (CPU) && (CPU == PPC85XX || CPU == PPC604 || CPU == PPC603) +# if defined (CPU) && (CPU == PPC85XX || CPU == PPC604 || CPU == PPC603 || CPU == PPC32) // These PPC's do lack log2 in kernel mode # define ACE_LACKS_LOG2 # endif @@ -83,7 +83,10 @@ #define ACE_HAS_4_4BSD_SENDMSG_RECVMSG #define ACE_HAS_3_PARAM_READDIR_R #define ACE_HAS_NONCONST_GETBY +#define ACE_HAS_NONCONST_INET_ADDR #define ACE_HAS_NONCONST_SWAB +#define ACE_USES_INETLIB_H +#define ACE_USES_SELECTLIB_H #define ACE_LACKS_UNIX_SYSLOG #define ACE_DEFAULT_MAX_SOCKET_BUFSIZ 32768 #define ACE_DEFAULT_THREAD_KEYS 16 @@ -96,7 +99,6 @@ #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 @@ -111,7 +113,6 @@ #define ACE_HAS_SIG_ATOMIC_T #define ACE_HAS_SOCKADDR_IN_SIN_LEN #define ACE_HAS_SOCKADDR_IN6_SIN6_LEN -#define ACE_HAS_STRERROR #define ACE_HAS_THREADS #define ACE_HAS_SYSCTL #define ACE_LACKS_ALPHASORT @@ -192,11 +193,14 @@ #define ACE_LACKS_WCSDUP #define ACE_LACKS_WCSICMP #define ACE_LACKS_WCSNICMP +#define ACE_LACKS_STRTOLL +#define ACE_LACKS_WCSTOLL #define ACE_LACKS_STRTOULL #define ACE_LACKS_WCSTOULL #define ACE_HAS_CHARPTR_SOCKOPT #define ACE_LACKS_SYMLINKS +#define ACE_LACKS_ISCTYPE #if defined __RTP__ // We are building for RTP mode @@ -223,8 +227,11 @@ #if !defined (IOV_MAX) || (IOV_MAX == 0) #define ACE_IOV_MAX 16 #endif + #define ACE_LACKS_ISASCII #else // We are building for kernel mode + #define ACE_LACKS_SETENV + #define ACE_LACKS_UNSETENV #define ACE_LACKS_SUSECONDS_T #define ACE_LACKS_INTPTR_T #define ACE_LACKS_INTTYPES_H @@ -273,6 +280,9 @@ #if !defined (ACE_MAIN) # define ACE_MAIN ace_main #endif /* ! ACE_MAIN */ + #define ACE_LACKS_TZSET + #define ACE_LACKS_ISWCTYPE + #define ACE_LACKS_ISBLANK #endif // It is possible to enable pthread support with VxWorks, when the user decides diff --git a/dep/ACE_wrappers/ace/config-vxworks6.6.h b/dep/ACE_wrappers/ace/config-vxworks6.6.h index 98787f39e..eebce4432 100644 --- a/dep/ACE_wrappers/ace/config-vxworks6.6.h +++ b/dep/ACE_wrappers/ace/config-vxworks6.6.h @@ -1,5 +1,5 @@ //* -*- C++ -*- */ -// $Id: config-vxworks6.6.h 80826 2008-03-04 14:51:23Z wotte $ +// $Id: config-vxworks6.6.h 85143 2009-04-22 09:15:08Z johnnyw $ // The following configuration file is designed to work for VxWorks // 6.6 platforms using one of these compilers: @@ -22,8 +22,13 @@ #if !defined (__RTP__) # undef ACE_HAS_IOCTL_INT_3_PARAM +# define ACE_HAS_TASKCPUAFFINITYSET #endif +#define ACE_HAS_VXATOMICLIB +#define ACE_HAS_CPUSET_T +#define ACE_HAS_VXCPULIB + #include /**/ "ace/post.h" #endif /* ACE_CONFIG_VXWORKS_6_6_H */ diff --git a/dep/ACE_wrappers/ace/config-vxworks6.7.h b/dep/ACE_wrappers/ace/config-vxworks6.7.h new file mode 100644 index 000000000..eab429a2e --- /dev/null +++ b/dep/ACE_wrappers/ace/config-vxworks6.7.h @@ -0,0 +1,23 @@ +//* -*- C++ -*- */ +// $Id: config-vxworks6.7.h 84971 2009-03-25 13:03:44Z johnnyw $ + +// The following configuration file is designed to work for VxWorks +// 6.7 platforms using one of these compilers: +// 1) The GNU g++ compiler that is shipped with VxWorks 6.7 +// 2) The Diab compiler that is shipped with VxWorks 6.7 + +#ifndef ACE_CONFIG_VXWORKS_6_7_H +#define ACE_CONFIG_VXWORKS_6_7_H +#include /**/ "ace/pre.h" + +#if !defined (ACE_VXWORKS) +# define ACE_VXWORKS 0x670 +#endif /* ! ACE_VXWORKS */ + +#include "ace/config-vxworks6.6.h" + +#undef ACE_HAS_NONCONST_INET_ADDR + +#include /**/ "ace/post.h" +#endif /* ACE_CONFIG_VXWORKS_6_7_H */ + diff --git a/dep/ACE_wrappers/ace/config-vxworks6.8.h b/dep/ACE_wrappers/ace/config-vxworks6.8.h new file mode 100644 index 000000000..ecad4752d --- /dev/null +++ b/dep/ACE_wrappers/ace/config-vxworks6.8.h @@ -0,0 +1,21 @@ +//* -*- C++ -*- */ +// $Id: config-vxworks6.8.h 87036 2009-10-10 18:21:39Z johnnyw $ + +// The following configuration file is designed to work for VxWorks +// 6.8 platforms using one of these compilers: +// 1) The GNU g++ compiler that is shipped with VxWorks 6.8 +// 2) The Diab compiler that is shipped with VxWorks 6.8 + +#ifndef ACE_CONFIG_VXWORKS_6_8_H +#define ACE_CONFIG_VXWORKS_6_8_H +#include /**/ "ace/pre.h" + +#if !defined (ACE_VXWORKS) +# define ACE_VXWORKS 0x680 +#endif /* ! ACE_VXWORKS */ + +#include "ace/config-vxworks6.7.h" + +#include /**/ "ace/post.h" +#endif /* ACE_CONFIG_VXWORKS_6_8_H */ + diff --git a/dep/ACE_wrappers/ace/config-win32-borland.h b/dep/ACE_wrappers/ace/config-win32-borland.h index 2c05bc074..65dbee6c8 100644 --- a/dep/ACE_wrappers/ace/config-win32-borland.h +++ b/dep/ACE_wrappers/ace/config-win32-borland.h @@ -1,5 +1,5 @@ // -*- C++ -*- -//$Id: config-win32-borland.h 82643 2008-08-19 14:02:12Z johnnyw $ +//$Id: config-win32-borland.h 91285 2010-08-05 08:29:30Z johnnyw $ // The following configuration file contains defines for Borland compilers. @@ -11,7 +11,35 @@ #error Use config-win32.h in config.h instead of this header #endif /* ACE_CONFIG_WIN32_H */ -#include "config-borland-common.h" +#define ACE_HAS_CUSTOM_EXPORT_MACROS +#define ACE_Proper_Export_Flag __declspec (dllexport) +#define ACE_Proper_Import_Flag __declspec (dllimport) +#define ACE_EXPORT_SINGLETON_DECLARATION(T) template class __declspec (dllexport) T +#define ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) template class __declspec (dllexport) SINGLETON_TYPE; +#define ACE_IMPORT_SINGLETON_DECLARATION(T) template class __declspec (dllimport) T +#define ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) template class __declspec (dllimport) SINGLETON_TYPE ; + +// In later versions of C++Builder we will prefer inline functions by +// default. The debug configuration of ACE is built with functions +// out-of-line, so when linking your application against a debug ACE +// build, you can choose to use the out-of-line functions by adding +// ACE_NO_INLINE=1 to your project settings. +# if !defined (__ACE_INLINE__) +# define __ACE_INLINE__ 1 +# endif /* __ACE_INLINE__ */ + +# define ACE_CC_NAME ACE_TEXT ("Embarcadero C++ Builder") +# define ACE_CC_MAJOR_VERSION (__BORLANDC__ / 0x100) +# define ACE_CC_MINOR_VERSION (__BORLANDC__ % 0x100) +# define ACE_CC_BETA_VERSION (0) + +#ifndef ACE_USING_MCPP_PREPROCESSOR +# if (__BORLANDC__ >= 0x620) +# define ACE_CC_PREPROCESSOR_ARGS "-q -Sl -o%s" +# else +# define ACE_CC_PREPROCESSOR_ARGS "-q -P- -o%s" +# endif +#endif // Automatically define WIN32 macro if the compiler tells us it is our // target platform. @@ -30,16 +58,10 @@ # include "ace/config-win32-common.h" -// Borland on win32 has swab -# undef ACE_LACKS_SWAB - # define ACE_WSTRING_HAS_USHORT_SUPPORT 1 # define ACE_HAS_DIRENT -#ifdef ACE_USES_STD_NAMESPACE_FOR_STDC_LIB -#undef ACE_USES_STD_NAMESPACE_FOR_STDC_LIB #define ACE_USES_STD_NAMESPACE_FOR_STDC_LIB 1 -#endif #define ACE_NEEDS_DL_UNDERSCORE @@ -84,6 +106,28 @@ #define ACE_LACKS_STRRECVFD #define ACE_USES_EXPLICIT_STD_NAMESPACE +#define ACE_HAS_TIME_T_LONG_MISMATCH + +#define ACE_EXPORT_NESTED_CLASSES 1 +#define ACE_HAS_CPLUSPLUS_HEADERS 1 +#define ACE_HAS_NONCONST_SELECT_TIMEVAL +#define ACE_HAS_SIG_ATOMIC_T +#define ACE_HAS_STANDARD_CPP_LIBRARY 1 +#define ACE_HAS_STDCPP_STL_INCLUDES 1 +#define ACE_HAS_STRING_CLASS 1 +#define ACE_HAS_TEMPLATE_TYPEDEFS 1 +#define ACE_HAS_USER_MODE_MASKS 1 +#define ACE_LACKS_ACE_IOSTREAM 1 +#define ACE_LACKS_LINEBUFFERED_STREAMBUF 1 +#define ACE_HAS_NEW_NOTHROW +#define ACE_TEMPLATES_REQUIRE_SOURCE 1 +#define ACE_SIZEOF_LONG_DOUBLE 10 +#define ACE_UINT64_FORMAT_SPECIFIER_ASCII "%Lu" +#define ACE_INT64_FORMAT_SPECIFIER_ASCII "%Ld" +#define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 +#define ACE_USES_STD_NAMESPACE_FOR_ABS 1 +#define ACE_ENDTHREADEX(STATUS) ::_endthreadex ((DWORD) STATUS) + #if defined(ACE_MT_SAFE) && (ACE_MT_SAFE != 0) // must have _MT defined to include multithreading // features from win32 headers @@ -95,19 +139,16 @@ # endif /* !_MT && !ACE_HAS_WINCE */ #endif /* ACE_MT_SAFE && ACE_MT_SAFE != 0 */ -#if (__BORLANDC__ < 0x580) -# define ACE_LACKS_INTPTR_T -# define ACE_HAS_NONCONST_SWAB -# define ACE_HAS_NONCONST_FDOPEN +#if (__BORLANDC__ < 0x620) +# define ACE_LACKS_ISBLANK +# define ACE_LACKS_ISWBLANK +# define ACE_LACKS_PRAGMA_ONCE 1 #endif -#if (__BORLANDC__ < 0x610) -# define ACE_HAS_NONCONST_TEMPNAM -# define ACE_LACKS_STRTOULL -# define ACE_LACKS_WCSTOULL -#endif +#define ACE_LACKS_ISWCTYPE +#define ACE_LACKS_ISCTYPE -#if (__BORLANDC__ <= 0x610) +#if (__BORLANDC__ < 0x620) // Older Borland compilers can't handle assembly in inline methods or // templates (E2211). When we build for pentium optimized and we are inlining // then we disable inline assembly @@ -116,9 +157,16 @@ # endif #endif +#if (__BORLANDC__ == 0x621) +// C++ Builder 2010 wcsncat seems broken +# define ACE_LACKS_WCSNCAT +#endif + #define ACE_WCSDUP_EQUIVALENT ::_wcsdup #define ACE_STRCASECMP_EQUIVALENT ::stricmp #define ACE_STRNCASECMP_EQUIVALENT ::strnicmp +#define ACE_WTOF_EQUIVALENT ::_wtof +#define ACE_FILENO_EQUIVALENT(X) (_get_osfhandle (::_fileno (X))) #define ACE_HAS_ITOA 1 #include /**/ "ace/post.h" diff --git a/dep/ACE_wrappers/ace/config-win32-cegcc.h b/dep/ACE_wrappers/ace/config-win32-cegcc.h new file mode 100644 index 000000000..c29290d71 --- /dev/null +++ b/dep/ACE_wrappers/ace/config-win32-cegcc.h @@ -0,0 +1,113 @@ +// -*- C++ -*- +// $Id: config-win32-cegcc.h 87167 2009-10-19 19:33:53Z olli $ + +// +// The following configuration file is designed to work for win32 +// platforms using gcc/g++ with mingw32 (http://www.mingw.org). +// + +#ifndef ACE_CONFIG_WIN32_CEGCC_H +#define ACE_CONFIG_WIN32_CEGCC_H +#include /**/ "ace/pre.h" + +#ifndef ACE_CONFIG_WIN32_H +# error Use config-win32.h in config.h instead of this header +#endif /* ACE_CONFIG_WIN32_H */ + +#define ACE_CC_NAME ACE_TEXT ("g++") +#define ACE_CC_PREPROCESSOR "cpp" +#define ACE_CC_PREPROCESOR_ARGS "" + +// Why all this is not in config-g++-common.h? +#define ACE_CC_MAJOR_VERSION __GNUC__ +#define ACE_CC_MINOR_VERSION __GNUC_MINOR__ +#define ACE_CC_BETA_VERSION (0) + +#if !defined (ACE_HAS_CEGCC) +# error You do not seem to be using cegcc +#endif + +// We trust the user: He must have used -mpentiumpro or -mpentium +// if that is what he wants. +#if defined(pentiumpro) || defined(pentium) +# define ACE_HAS_PENTIUM +#endif + +#include "ace/config-g++-common.h" + +#include /**/ +#include /**/ +#include /**/ <_mingw.h> + +#if (__MINGW32_MAJOR_VERSION > 3) || ((__MINGW32_MAJOR_VERSION == 3) && (__MINGW32_MINOR_VERSION >= 15)) +# undef ACE_LACKS_USECONDS_T +#endif + +#define ACE_HAS_USER_MODE_MASKS + +#define ACE_HAS_SSIZE_T +#undef ACE_LACKS_STRUCT_DIR +#undef ACE_LACKS_OPENDIR +#undef ACE_LACKS_CLOSEDIR +#undef ACE_LACKS_READDIR +#undef ACE_LACKS_TELLDIR +#undef ACE_LACKS_SEEKDIR +#undef ACE_LACKS_REWINDDIR + +#undef ACE_HAS_WTOF + +#define ACE_LACKS_SYS_SHM_H +#define ACE_LACKS_TERMIOS_H +#define ACE_LACKS_NETINET_TCP_H +#define ACE_LACKS_STRRECVFD +#define ACE_LACKS_STRPTIME +#define ACE_LACKS_POLL_H +#define ACE_LACKS_REGEX_H +#define ACE_LACKS_SYS_MSG_H +#define ACE_LACKS_PWD_H +#define ACE_LACKS_SEMAPHORE_H +#define ACE_LACKS_UCONTEXT_H +#define ACE_LACKS_SYS_SELECT_H +#define ACE_LACKS_SYS_RESOURCE_H +#define ACE_LACKS_SYS_WAIT_H +#define ACE_LACKS_DLFCN_H +#define ACE_LACKS_SYS_MMAN_H +#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_NET_IF_H +#define ACE_LACKS_SYS_IPC_H +#define ACE_LACKS_SYS_SEM_H +#define ACE_LACKS_STROPTS_H +#define ACE_LACKS_SYS_IOCTL_H +#define ACE_LACKS_PDH_H +#define ACE_LACKS_PDHMSG_H +#define ACE_HAS_NONCONST_WCSDUP +#define ACE_HAS_WINSOCK2_GQOS +#define ACE_LACKS_CORRECT_ISWPRINT_TAB + +//Changes to compile on CE gcc. +#undef ACE_HAS_TYPES_H +#define ACE_LACKS_ERRNO_H +#undef ACE_LACKS_DEV_T +#define ACE_LACKS_ISCTYPE +#define ACE_HAS_NONCONST_WFDOPEN +#undef ACE_HAS_WTOI +#undef ACE_HAS_WTOL + +#define ACE_INT64_FORMAT_SPECIFIER_ASCII "%I64d" +#define ACE_UINT64_FORMAT_SPECIFIER_ASCII "%I64u" +#define ACE_ENDTHREADEX(STATUS) ExitThread ((DWORD) STATUS) + +#define ACE_Proper_Export_Flag __declspec (dllexport) +#define ACE_Proper_Import_Flag __declspec (dllimport) +#define ACE_EXPORT_SINGLETON_DECLARATION(T) template class __declspec (dllexport) T +#define ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) template class __declspec (dllexport) SINGLETON_TYPE; +#define ACE_IMPORT_SINGLETON_DECLARATION(T) extern template class T +#define ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) extern template class SINGLETON_TYPE ; + +#define ACE_DLL_PREFIX ACE_TEXT ("lib") + +#include /**/ "ace/post.h" +#endif /* ACE_CONFIG_WIN32_CEGCC_H */ diff --git a/dep/ACE_wrappers/ace/config-win32-common.h b/dep/ACE_wrappers/ace/config-win32-common.h index 837f9ce4d..2debc3362 100644 --- a/dep/ACE_wrappers/ace/config-win32-common.h +++ b/dep/ACE_wrappers/ace/config-win32-common.h @@ -1,5 +1,5 @@ /* -*- C++ -*- */ -// $Id: config-win32-common.h 82316 2008-07-15 01:28:39Z johnnyw $ +// $Id: config-win32-common.h 91448 2010-08-24 14:22:13Z johnnyw $ #ifndef ACE_CONFIG_WIN32_COMMON_H @@ -92,6 +92,17 @@ # define ACE_MT_SAFE 1 #endif +// On winCE these classes do not exist. If they are +// introduced in the future, no changes need to be made +#if defined (ABOVE_NORMAL_PRIORITY_CLASS) && \ + defined (BELOW_NORMAL_PRIORITY_CLASS) && \ + defined (HIGH_PRIORITY_CLASS) && \ + defined (IDLE_PRIORITY_CLASS) && \ + defined (NORMAL_PRIORITY_CLASS) && \ + defined (REALTIME_PRIORITY_CLASS) +#define ACE_HAS_WIN32_PRIORITY_CLASS +#endif + // Build ACE services as DLLs. If you write a library and want it to // use ACE_Svc_Export, this will cause those macros to build dlls. If // you want your ACE service to be a static library, comment out this @@ -103,7 +114,10 @@ // #endif // Define the special export macros needed to export symbols outside a dll -#if !defined(__BORLANDC__) +#if !defined(__BORLANDC__) && (!defined (ACE_HAS_CUSTOM_EXPORT_MACROS) || (ACE_HAS_CUSTOM_EXPORT_MACROS == 0)) +#if defined (ACE_HAS_CUSTOM_EXPORT_MACROS) +#undef ACE_HAS_CUSTOM_EXPORT_MACROS +#endif #define ACE_HAS_CUSTOM_EXPORT_MACROS 1 #define ACE_Proper_Export_Flag __declspec (dllexport) #define ACE_Proper_Import_Flag __declspec (dllimport) @@ -148,8 +162,6 @@ // using static object managers. #if !defined (ACE_HAS_NONSTATIC_OBJECT_MANAGER) # define ACE_HAS_NONSTATIC_OBJECT_MANAGER -#elif (ACE_HAS_NONSTATIC_OBJECT_MANAGER == 0) -# undef ACE_HAS_NONSTATIC_OBJECT_MANAGER #endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER */ #define ACE_HAS_GPERF @@ -168,7 +180,7 @@ // below if you need to raise or lower it. #if !defined (FD_SETSIZE) -#define FD_SETSIZE 1024 +#define FD_SETSIZE 4096 #endif /* FD_SETSIZE */ @@ -191,7 +203,15 @@ #if !defined (ACE_HAS_WINCE) // Platform supports pread() and pwrite() -# define ACE_HAS_P_READ_WRITE +# define ACE_HAS_WTOF +#endif /* ! ACE_HAS_WINCE */ + +#define ACE_HAS_P_READ_WRITE + +#if !defined (ACE_HAS_WINCE) +# define ACE_HAS_DIRECT_H +# define ACE_HAS_PROCESS_H +# define ACE_HAS_IO_H #endif /* ! ACE_HAS_WINCE */ #if !defined (__MINGW32__) @@ -265,6 +285,17 @@ #define ACE_LACKS_WAIT #define ACE_LACKS_IOVEC #define ACE_LACKS_LOG2 +#define ACE_LACKS_CADDR_T +#if !defined(__MINGW32__) && !defined (__BORLANDC__) +# define ACE_LACKS_MODE_T +#endif +#if !defined (__BORLANDC__) +# define ACE_LACKS_NLINK_T +# define ACE_LACKS_UID_T +# define ACE_LACKS_GID_T +#endif +#define ACE_LACKS_SETENV +#define ACE_LACKS_UNSETENV #define ACE_HAS_PDH_H #define ACE_HAS_PDHMSG_H @@ -292,45 +323,16 @@ // Win32 has wide-char support. Use of the compiler-defined wchar_t type // is controlled in compiler configs since it's a compiler switch. #define ACE_HAS_WCHAR - -// Compiler/platform correctly calls init()/fini() for shared -// libraries. - applied for DLLs ? -//define ACE_HAS_AUTOMATIC_INIT_FINI - -// Platform supports POSIX O_NONBLOCK semantics. -//define ACE_HAS_POSIX_NONBLOCK - -// Platform contains . -//define ACE_HAS_POLL - -// Platform supports the /proc file system. -//define ACE_HAS_PROC_FS +#define ACE_HAS_WTOI +#define ACE_HAS_WTOL // Platform supports the rusage struct. #define ACE_HAS_GETRUSAGE -// Compiler/platform supports SVR4 signal typedef. -//define ACE_HAS_SVR4_SIGNAL_T - -// Platform provides header. -//define ACE_HAS_SYS_FILIO_H - -// Compiler/platform supports sys_siglist array. -//define ACE_HAS_SYS_SIGLIST - -// 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. // For Win32, this is not really true, but saves a lot of hassle! #define ACE_HAS_TLI_PROTOTYPES -// Platform supports ACE_TLI. -//define ACE_HAS_TLI - // I'm pretty sure NT lacks these #define ACE_LACKS_UNIX_DOMAIN_SOCKETS @@ -338,7 +340,10 @@ #define ACE_LACKS_WRITEV #define ACE_LACKS_READV -#define ACE_LACKS_COND_T +#if !defined (ACE_HAS_WTHREADS_CONDITION_VARIABLE) +# define ACE_LACKS_COND_T +#endif + #define ACE_LACKS_RWLOCK_T #define ACE_LACKS_KEY_T @@ -433,15 +438,20 @@ #if !defined(ACE_HAS_WINSOCK2) # define ACE_HAS_WINSOCK2 1 #endif /* !defined(ACE_HAS_WINSOCK2) */ +// Not use WS1 by default +#if !defined(ACE_HAS_WINSOCK1) +# define ACE_HAS_WINSOCK1 0 +#endif /* !defined(ACE_HAS_WINSOCK1) */ #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) +# define ACE_HAS_ICMP_SUPPORT 1 # if !defined (_WINSOCK2API_) // will also include windows.h, if not present # include /**/ // WinCE 4 doesn't define the Exxx values without the WSA prefix, so do that // here. This is all lifted from the #if 0'd out part of winsock2.h. -# if defined (UNDER_CE) +# if defined (_WIN32_WCE) && (_WIN32_WCE < 0x600) # define EWOULDBLOCK WSAEWOULDBLOCK # define EINPROGRESS WSAEINPROGRESS # define EALREADY WSAEALREADY @@ -479,7 +489,7 @@ # define EDQUOT WSAEDQUOT # define ESTALE WSAESTALE # define EREMOTE WSAEREMOTE -# endif /* UNDER_CE */ +# endif /* (_WIN32_WCE) && (_WIN32_WCE < 0x600) */ # endif /* _WINSOCK2API */ # if defined (ACE_HAS_FORE_ATM_WS2) @@ -512,7 +522,7 @@ // PharLap ETS has its own winsock lib, so don't grab the one // supplied with the OS. -# if defined (_MSC_VER) && !defined (UNDER_CE) && !defined (ACE_HAS_PHARLAP) +# if defined (_MSC_VER) && !defined (_WIN32_WCE) && !defined (ACE_HAS_PHARLAP) # pragma comment(lib, "wsock32.lib") # endif /* _MSC_VER */ @@ -529,8 +539,8 @@ # 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_WINCE) +# define ACE_HAS_INTERLOCKED_EXCHANGEADD #endif #define ACE_HAS_WIN32_TRYLOCK @@ -541,7 +551,7 @@ # 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_WINCE) && !ACE_HAS_PHARLAP */ #if !defined (ACE_SEH_DEFAULT_EXCEPTION_HANDLING_ACTION) # define ACE_SEH_DEFAULT_EXCEPTION_HANDLING_ACTION EXCEPTION_CONTINUE_SEARCH diff --git a/dep/ACE_wrappers/ace/config-win32-dmc.h b/dep/ACE_wrappers/ace/config-win32-dmc.h index 91adf86b8..054e57448 100644 --- a/dep/ACE_wrappers/ace/config-win32-dmc.h +++ b/dep/ACE_wrappers/ace/config-win32-dmc.h @@ -1,5 +1,5 @@ // -*- C++ -*- -// $Id: config-win32-dmc.h 81992 2008-06-16 19:09:50Z wotte $ +// $Id: config-win32-dmc.h 91285 2010-08-05 08:29:30Z johnnyw $ // The following configuration file contains defines for Digital Mars compilers. @@ -48,13 +48,10 @@ # define ACE_EXPORT_NESTED_CLASSES 1 # define ACE_HAS_CPLUSPLUS_HEADERS 1 -//# define ACE_HAS_EXCEPTIONS 1 -# define ACE_HAS_GNU_CSTRING_H 1 # define ACE_HAS_NONCONST_SELECT_TIMEVAL 1 # define ACE_HAS_SIG_ATOMIC_T 1 # define ACE_HAS_STANDARD_CPP_LIBRARY 0 # define ACE_HAS_STDCPP_STL_INCLUDES 1 -# define ACE_HAS_STRERROR 1 # define ACE_HAS_STRING_CLASS 1 # define ACE_HAS_TEMPLATE_TYPEDEFS 1 # define ACE_HAS_USER_MODE_MASKS 1 diff --git a/dep/ACE_wrappers/ace/config-win32-ghs.h b/dep/ACE_wrappers/ace/config-win32-ghs.h index 77cff1d80..8f84b3894 100644 --- a/dep/ACE_wrappers/ace/config-win32-ghs.h +++ b/dep/ACE_wrappers/ace/config-win32-ghs.h @@ -1,5 +1,5 @@ // -*- C++ -*- -// $Id: config-win32-ghs.h 81992 2008-06-16 19:09:50Z wotte $ +// $Id: config-win32-ghs.h 91285 2010-08-05 08:29:30Z johnnyw $ // The following configuration file contains defines for Green Hills compilers. @@ -56,13 +56,10 @@ # define ACE_EXPORT_NESTED_CLASSES 1 # define ACE_HAS_CPLUSPLUS_HEADERS 1 -//# define ACE_HAS_EXCEPTIONS 1 -# define ACE_HAS_GNU_CSTRING_H 1 # define ACE_HAS_NONCONST_SELECT_TIMEVAL 1 # define ACE_HAS_SIG_ATOMIC_T 1 # define ACE_HAS_STANDARD_CPP_LIBRARY 1 # define ACE_HAS_STDCPP_STL_INCLUDES 1 -# define ACE_HAS_STRERROR 1 # define ACE_HAS_STRING_CLASS 1 # define ACE_HAS_TEMPLATE_TYPEDEFS 1 # define ACE_HAS_USER_MODE_MASKS 1 @@ -74,9 +71,8 @@ //# define ACE_NEW_THROWS_EXCEPTIONS 1 # define ACE_SIZEOF_LONG_DOUBLE 10 # define ACE_TEMPLATES_REQUIRE_SOURCE 1 -// Changed ACE_TEXT to ACE_TEXT in the following two lines -# define ACE_UINT64_FORMAT_SPECIFIER ACE_TEXT ("%I64u") -# define ACE_INT64_FORMAT_SPECIFIER ACE_TEXT ("%I64d") +# define ACE_UINT64_FORMAT_SPECIFIER_ASCII "%I64u" +# define ACE_INT64_FORMAT_SPECIFIER_ASCII "%I64d" # define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 // Set the following to zero to placate SString.h ACE_WString CTOR # undef ACE_WSTRING_HAS_USHORT_SUPPORT diff --git a/dep/ACE_wrappers/ace/config-win32-interix.h b/dep/ACE_wrappers/ace/config-win32-interix.h index d613444fa..2fa969599 100644 --- a/dep/ACE_wrappers/ace/config-win32-interix.h +++ b/dep/ACE_wrappers/ace/config-win32-interix.h @@ -1,76 +1,109 @@ // -*- C++ -*- -// $Id: config-win32-interix.h 80826 2008-03-04 14:51:23Z wotte $ +// $Id: config-win32-interix.h 91285 2010-08-05 08:29:30Z johnnyw $ // The following configuration file is designed to work for Interix // platforms using GNU g++ (Interix == Microsoft's Services for Unix) #ifndef ACE_CONFIG_WIN32_INTERIX_H #define ACE_CONFIG_WIN32_INTERIX_H -#include /**/ "ace/pre.h" -#include -# define ACE_LACKS_SENDMSG -# define ACE_LACKS_RECVMSG -# define ACE_LACKS_STDINT_H -# define ACE_LACKS_INTTYPES_H -# define ACE_LACKS_PRAGMA_ONCE -# define ACE_LACKS_RWLOCK_T -# define ACE_LACKS_GETPGID // Don't have getpgid(), have setpgid() though... -# define ACE_LACKS_UCONTEXT_H -# define ACE_HAS_REENTRANT_FUNCTIONS -# define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS // Don't have gethostbyaddr_r and friends. -# define ACE_HAS_DIRENT -# define ACE_HAS_STDCPP_STL_INCLUDES -# define ACE_HAS_STANDARD_CPP_LIBRARY 1 -# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 -# define ACE_HAS_NONCONST_SELECT_TIMEVAL -# define ACE_HAS_SIGWAIT -# define ACE_HAS_SIGINFO_T +#include /**/ "ace/pre.h" #include "ace/config-g++-common.h" -#define ACE_HAS_NEW_NOTHROW // Need to know 'new's failure semantics. +#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R +#define ACE_HAS_3_PARAM_READDIR_R +#define ACE_HAS_4_4BSD_SENDMSG_RECVMSG +#define ACE_HAS_AUTOMATIC_INIT_FINI +#define ACE_HAS_BROKEN_T_ERROR +#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES +#define ACE_HAS_DIRENT +#define ACE_HAS_GETPAGESIZE +#define ACE_HAS_GETRUSAGE +#define ACE_HAS_GETRUSAGE_PROTOTYPE +#define ACE_HAS_GPERF +#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT +#define ACE_HAS_ICMP_SUPPORT 1 +#define ACE_HAS_IP_MULTICAST +#define ACE_HAS_MEMCHR +#define ACE_HAS_MKDIR +#define ACE_HAS_MSG +#define ACE_HAS_NEW_NOTHROW +#define ACE_HAS_NEW_NO_H +#define ACE_HAS_NONCONST_SELECT_TIMEVAL +#define ACE_HAS_POLL +#define ACE_HAS_POSITION_INDEPENDENT_POINTERS 1 +#define ACE_HAS_POSIX_GETPWNAM_R +#define ACE_HAS_POSIX_NONBLOCK +#define ACE_HAS_POSIX_TIME +#define ACE_HAS_PTHREADS_STD +#define ACE_HAS_PTHREADS_UNIX98_EXT +#define ACE_HAS_PTHREAD_GETCONCURRENCY +#define ACE_HAS_PTHREAD_SETCONCURRENCY +#define ACE_HAS_PTHREAD_SIGMASK_PROTOTYPE +#define ACE_HAS_P_READ_WRITE +#define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS +#define ACE_HAS_REENTRANT_FUNCTIONS +#define ACE_HAS_RTLD_LAZY_V +#define ACE_HAS_SEMUN +#define ACE_HAS_SIGINFO_T +#define ACE_HAS_SIGSUSPEND +#define ACE_HAS_SIGWAIT +#define ACE_HAS_SIG_ATOMIC_T +#define ACE_HAS_SIG_C_FUNC +#define ACE_HAS_SOCKADDR_MSG_NAME +#define ACE_HAS_SOCKLEN_T +#define ACE_HAS_SSIZE_T +#define ACE_HAS_STANDARD_CPP_LIBRARY 1 +#define ACE_HAS_STDCPP_STL_INCLUDES +#define ACE_HAS_STREAMS +#define ACE_HAS_STRING_CLASS +#define ACE_HAS_STRSIGNAL +#define ACE_HAS_SVR4_DYNAMIC_LINKING +#define ACE_HAS_SVR4_GETTIMEOFDAY +#define ACE_HAS_SVR4_SIGNAL_T +#define ACE_HAS_SYSV_IPC +#define ACE_HAS_SYS_SYSCALL_H +#define ACE_HAS_TERMIOS +#define ACE_HAS_UALARM +#define ACE_HAS_UCONTEXT_T +#define ACE_HAS_VOIDPTR_GETTIMEOFDAY +#define ACE_HAS_NONSTATIC_OBJECT_MANAGER + +#define ACE_LACKS_GETPGID +#define ACE_LACKS_ISCTYPE +#define ACE_LACKS_LOG2 +#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS +#define ACE_LACKS_NET_IF_H +#define ACE_LACKS_PRAGMA_ONCE +#define ACE_LACKS_SETSCHED +#define ACE_LACKS_STRRECVFD +#define ACE_LACKS_SYS_SYSCTL_H +#define ACE_LACKS_TIMESPEC_T +#define ACE_LACKS_WCSTOK +#define ACE_LACKS_WCSTOLL +#define ACE_LACKS_WCSTOULL + +// These are probably not needed with gcc 4.x +#define ACE_LACKS_UNSETENV +#define ACE_LACKS_STRTOLL +#define ACE_LACKS_STRTOULL +#define ACE_LACKS_SETEGID +#define ACE_LACKS_SETEUID + + +#define ACE_PAGE_SIZE 4096 +#define ACE_SIZEOF_LONG_LONG 8 +#define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 #if defined (ACE_HAS_THREADS) -#define ACE_HAS_THREADS -#define ACE_HAS_PTHREADS -#define _THREAD_SAFE -#define ACE_MTSAFE 1 -#define ACE_MT_SAFE 1 -#define ACE_LACKS_PTHREAD_YIELD -#define ACE_HAS_MUTEX_TIMEOUTS +# define ACE_HAS_MUTEX_TIMEOUTS +# define ACE_HAS_PTHREADS +# define ACE_MT_SAFE 1 #else - error "You need to enable threads for this Interix port." +# error "You need to enable threads for this Interix port." #endif /* ACE_HAS_THREADS */ -// INTERIX has the following, just an issue with porting for the moment -#define ACE_LACKS_ACCESS -// END INTERIX has the following.... - -#define ACE_SIZEOF_LONG_DOUBLE 12 -#define ACE_PAGE_SIZE 4096 - -#define ACE_HAS_SYSV_IPC -#define ACE_HAS_SVR4_SIGNAL_T -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES -#define ACE_HAS_SVR4_DYNAMIC_LINKING -#define ACE_HAS_POSIX_TIME // Supports POSIX timers via struct timespec. -#define ACE_LACKS_TIMESPEC_T // Defines struct timespec but not timespec_t. -#define ACE_LACKS_STRRECVFD -#define ACE_LACKS_SETSCHED -#define ACE_HAS_SOCKADDR_IN_SIN_LEN -#define ACE_HAS_RTLD_LAZY_V -#define ACE_HAS_POSIX_NONBLOCK -#define ACE_HAS_GETRUSAGE -#define ACE_HAS_SIG_ATOMIC_T -#define ACE_HAS_SEMUN -#define ACE_HAS_SSIZE_T -#define ACE_HAS_STRERROR -#define ACE_HAS_SVR4_GETTIMEOFDAY -#define ACE_HAS_UALARM -#define ACE_HAS_TERMIOS -#define ACE_HAS_SIGWAIT - // Turns off the tracing feature. #if !defined (ACE_NTRACE) #define ACE_NTRACE 1 @@ -87,14 +120,7 @@ #define ACE_HAS_THREAD_SPECIFIC_STORAGE // We need thread specific storage even though... #define ACE_HAS_TSS_EMULATION // It would appear to be broken in Interix! + #include /**/ "ace/post.h" + #endif /* ACE_CONFIG_WIN32_INTERIX_H */ - -/* -The following tests do not run. -Dynamic_Priority_Test.log ACE_HAS_TIMED_MESSAGE_BLOCKS -Enum_Interfaces_Test.log -IOStream_Test.log ACE_IOSTREAM not supported on this platform -*/ - - diff --git a/dep/ACE_wrappers/ace/config-win32-mingw.h b/dep/ACE_wrappers/ace/config-win32-mingw.h index f4439865d..0a0ff292f 100644 --- a/dep/ACE_wrappers/ace/config-win32-mingw.h +++ b/dep/ACE_wrappers/ace/config-win32-mingw.h @@ -1,5 +1,5 @@ // -*- C++ -*- -// $Id: config-win32-mingw.h 81693 2008-05-14 12:35:01Z johnnyw $ +// $Id: config-win32-mingw.h 87167 2009-10-19 19:33:53Z olli $ // // The following configuration file is designed to work for win32 @@ -51,15 +51,17 @@ # define ACE_LACKS_DIRENT_H #endif -#undef ACE_LACKS_SIGSET +#if (__MINGW32_MAJOR_VERSION > 3) || ((__MINGW32_MAJOR_VERSION == 3) && (__MINGW32_MINOR_VERSION >= 15)) +# undef ACE_LACKS_USECONDS_T +#endif + +#undef ACE_HAS_WTOF -#define ACE_LACKS_SIGSET_DEFINITIONS #define ACE_LACKS_SYS_SHM_H #define ACE_LACKS_TERMIOS_H #define ACE_LACKS_NETINET_TCP_H #define ACE_LACKS_STRRECVFD #define ACE_LACKS_STRPTIME -#define ACE_HAS_STRERROR #define ACE_LACKS_POLL_H #define ACE_LACKS_REGEX_H #define ACE_LACKS_SYS_MSG_H @@ -84,6 +86,7 @@ #define ACE_LACKS_PDHMSG_H #define ACE_HAS_NONCONST_WCSDUP #define ACE_HAS_WINSOCK2_GQOS +#define ACE_ISCTYPE_EQUIVALENT ::_isctype // We trust the user: He must have used -mpentiumpro or -mpentium // if that is what he wants. @@ -91,10 +94,12 @@ # define ACE_HAS_PENTIUM #endif -#define ACE_INT64_FORMAT_SPECIFIER ACE_TEXT ("%I64d") -#define ACE_UINT64_FORMAT_SPECIFIER ACE_TEXT ("%I64u") +#define ACE_INT64_FORMAT_SPECIFIER_ASCII "%I64d" +#define ACE_UINT64_FORMAT_SPECIFIER_ASCII "%I64u" #define ACE_ENDTHREADEX(STATUS) ::_endthreadex ((DWORD) (STATUS)) +#define ACE_DLL_PREFIX ACE_TEXT ("lib") + #include /**/ "ace/post.h" #endif /* ACE_CONFIG_WIN32_MINGW_H */ diff --git a/dep/ACE_wrappers/ace/config-win32-msvc-10.h b/dep/ACE_wrappers/ace/config-win32-msvc-10.h new file mode 100644 index 000000000..882a33e0a --- /dev/null +++ b/dep/ACE_wrappers/ace/config-win32-msvc-10.h @@ -0,0 +1,149 @@ +/* -*- C++ -*- */ +//============================================================================= +/** + * @file config-win32-msvc-10.h + * + * $Id: config-win32-msvc-10.h 91285 2010-08-05 08:29:30Z johnnyw $ + * + * @brief Microsoft Visual C++ 10.0 configuration file. + * + * This file is the ACE configuration file for Microsoft Visual C++ version 10. + * + * @note Do not include this file directly, include config-win32.h instead. + */ +//============================================================================= + +#ifndef ACE_CONFIG_WIN32_MSVC_10_H +#define ACE_CONFIG_WIN32_MSVC_10_H +#include /**/ "ace/pre.h" + +#ifndef ACE_CONFIG_WIN32_H +#error Use config-win32.h in config.h instead of this header +#endif /* ACE_CONFIG_WIN32_H */ + +#ifndef ACE_WIN32_VC10 +# define ACE_WIN32_VC10 +#endif + +// Visual C++ 9.0 (.NET) deprecated the old iostreams +#if !defined (ACE_HAS_STANDARD_CPP_LIBRARY) +#define ACE_HAS_STANDARD_CPP_LIBRARY 1 +#endif + +#if !defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) +#define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 +#endif + +// Windows' timeval is non-conformant (defined in terms of long instead of +// time_t) and VC9 (on desktop, not CE) changed time_t to a 64-bit value +// even when compiling a 32-bit application. Therefore, ace/Time_Value +// needs to rearrange a few things for this compiler. See Time_Value.h +// for complete details. +#if !defined (ACE_HAS_WINCE) +# define ACE_HAS_TIME_T_LONG_MISMATCH +#endif + +#define ACE_HAS_ITOA +#define ACE_HAS_HEADER_ALLOCATED_CLASS_STATIC_CONST_INT_STOREAGE +#define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR + +#define ACE_ITOA_EQUIVALENT ::_itoa +#define ACE_STRCASECMP_EQUIVALENT ::_stricmp +#define ACE_STRNCASECMP_EQUIVALENT ::_strnicmp +#define ACE_WCSDUP_EQUIVALENT ::_wcsdup +#if defined (ACE_HAS_WINCE) +# define ACE_FILENO_EQUIVALENT ::_fileno +#else +# define ACE_FILENO_EQUIVALENT(X) (_get_osfhandle (::_fileno (X))) +#endif + +// Windows Mobile 6 doesn't do sig_atomic_t, but maybe future versions will. +# if !defined (_WIN32_WCE) || (_WIN32_WCE > 0x601) +# define ACE_HAS_SIG_ATOMIC_T +# endif /* !Win CE 6.0 or less */ + +#define ACE_LACKS_STRPTIME + +// Evaluate this with a WinCE build; maybe things have improved since VC8. +//#if !defined (ACE_HAS_WINCE) +# define ACE_HAS_INTRIN_H +# define ACE_HAS_INTRINSIC_INTERLOCKED +//#endif + +#if !defined (_WIN32_WCE) || (_WIN32_WCE >= 0x501) +# define ACE_HAS_INTRINSIC_BYTESWAP +#endif + +#define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES +#define ACE_LACKS_STRRECVFD +#define ACE_HAS_CPLUSPLUS_HEADERS + +#define ACE_HAS_TEMPLATE_TYPEDEFS +#define ACE_TEMPLATES_REQUIRE_SOURCE + +// Platform provides ACE_TLI function prototypes. +// For Win32, this is not really true, but saves a lot of hassle! +#define ACE_HAS_TLI_PROTOTYPES + +// Platform support linebuffered streaming is broken +#define ACE_LACKS_LINEBUFFERED_STREAMBUF + +#if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && (ACE_HAS_STANDARD_CPP_LIBRARY != 0) + +// Platform has its Standard C++ library in the namespace std +# if !defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) +# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 +# endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */ + +// ace/iostream.h does not work with the standard cpp library (yet). +# if !defined (ACE_USES_OLD_IOSTREAMS) +# define ACE_LACKS_ACE_IOSTREAM +# endif /* ! ACE_USES_OLD_IOSTREAMS */ + +// Starting with MSVC 7.1, std::new throws std::bad_alloc on out-of-memory. +#define ACE_NEW_THROWS_EXCEPTIONS +#define ACE_HAS_NEW_NOTHROW + +#else + +// iostream header lacks ipfx (), isfx (), etc., declarations +# define ACE_LACKS_IOSTREAM_FX + +#endif + +// There are too many instances of this warning to fix it right now. +// Maybe in the future. + +// Disable warning of using Microsoft Extension. +# pragma warning(disable:4231) + +// 'class1' : inherits 'class2::member' via dominance +#pragma warning(disable:4250) + +// CE (at least thru Windows Mobile 5) doesn't have the new, secure CRT. +#if !defined (ACE_HAS_WINCE) && !defined (ACE_HAS_TR24731_2005_CRT) +# define ACE_HAS_TR24731_2005_CRT +#endif + +// On CE w/o MFC config-WinCE.h needs to declare a placement new. This +// triggers a warning that there's no placement delete, which can be ignored. +#if defined (ACE_HAS_WINCE) && !defined (ACE_HAS_MFC) +# pragma warning(disable:4291) +#endif + +// A template can not be exported. Only an instantiation may be exported. +#define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT + +// At least for ACE_UNIMPLEMENTED_FUNC in class templates, this is needed to +// explicitly instantiate a template that has ACE_UNIMPLEMENTED_FUNC. +# define ACE_NEEDS_FUNC_DEFINITIONS + +// Windows Vista and Windows Server 2008 and newer do have native condition +// variables +#if defined (WIN32_WINNT) && (WIN32_WINNT >= 0x0600) +# define ACE_HAS_WTHREADS_CONDITION_VARIABLE +# undef ACE_LACKS_COND_T +#endif + +#include /**/ "ace/post.h" +#endif /* ACE_CONFIG_WIN32_MSVC_10_H */ diff --git a/dep/ACE_wrappers/ace/config-win32-msvc-7.h b/dep/ACE_wrappers/ace/config-win32-msvc-7.h index 535643a8f..016456e96 100644 --- a/dep/ACE_wrappers/ace/config-win32-msvc-7.h +++ b/dep/ACE_wrappers/ace/config-win32-msvc-7.h @@ -3,7 +3,7 @@ /** * @file config-win32-msvc-7.h * - * $Id: config-win32-msvc-7.h 81935 2008-06-12 22:01:53Z jtc $ + * $Id: config-win32-msvc-7.h 91285 2010-08-05 08:29:30Z johnnyw $ * * @brief Microsoft Visual C++ 7.0 configuration file. * @@ -46,11 +46,6 @@ #define ACE_STRNCASECMP_EQUIVALENT ::_strnicmp #define ACE_WCSDUP_EQUIVALENT ::_wcsdup -#if !defined (ACE_HAS_WINCE) && !defined (ACE_HAS_EXCEPTIONS) -#define ACE_HAS_EXCEPTIONS -#endif /* ACE_HAS_WINCE */ - -#define ACE_HAS_STRERROR #define ACE_LACKS_STRPTIME #define ACE_HAS_SIG_ATOMIC_T @@ -112,7 +107,7 @@ #pragma warning(disable:4231) // 'function' : unreferenced local function has been removed -# pragma warning(disable:4505) +#pragma warning(disable:4505) // A template can not be exported. Only an instantiation may be exported. #define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT diff --git a/dep/ACE_wrappers/ace/config-win32-msvc-8.h b/dep/ACE_wrappers/ace/config-win32-msvc-8.h index 73c29e1d4..9f1a7301f 100644 --- a/dep/ACE_wrappers/ace/config-win32-msvc-8.h +++ b/dep/ACE_wrappers/ace/config-win32-msvc-8.h @@ -3,7 +3,7 @@ /** * @file config-win32-msvc-8.h * - * $Id: config-win32-msvc-8.h 81935 2008-06-12 22:01:53Z jtc $ + * $Id: config-win32-msvc-8.h 91285 2010-08-05 08:29:30Z johnnyw $ * * @brief Microsoft Visual C++ 8.0 configuration file. * @@ -53,20 +53,25 @@ #define ACE_STRCASECMP_EQUIVALENT ::_stricmp #define ACE_STRNCASECMP_EQUIVALENT ::_strnicmp #define ACE_WCSDUP_EQUIVALENT ::_wcsdup +#if defined (ACE_HAS_WINCE) +# define ACE_FILENO_EQUIVALENT ::_fileno +#else +# define ACE_FILENO_EQUIVALENT(X) (_get_osfhandle (::_fileno (X))) +#endif -#define ACE_HAS_EXCEPTIONS - -// Windows Mobile 5 doesn't do sig_atomic_t, but maybe future versions will. -# if !defined (_WIN32_WCE) || (_WIN32_WCE > 0x501) +// Windows Mobile 6 doesn't do sig_atomic_t, but maybe future versions will. +// This has been true up thrugh the versions. We don't have any indication +// that this might be supported in the future, but it is an easy enough fix +// to bump the wince revision number when a new version is released. +# if !defined (_WIN32_WCE) || (_WIN32_WCE > 0x601) # define ACE_HAS_SIG_ATOMIC_T -# endif /* !Win CE 5.0 or less */ +# endif /* !Win CE 6.0 or less */ -#define ACE_HAS_STRERROR #define ACE_LACKS_STRPTIME #if !defined (ACE_HAS_WINCE) -# define ACE_HAS_INTRIN_H -# define ACE_HAS_INTRINSIC_INTERLOCKED +# define ACE_HAS_INTRIN_H +# define ACE_HAS_INTRINSIC_INTERLOCKED #endif #if !defined (_WIN32_WCE) || (_WIN32_WCE >= 0x501) @@ -114,7 +119,13 @@ // Maybe in the future. // Disable warning of using Microsoft Extension. -# pragma warning(disable:4231) +#pragma warning(disable:4231) + +// 'class1' : inherits 'class2::member' via dominance +#pragma warning(disable:4250) + +// 'this' : used in base member initializer list +#pragma warning(disable:4355) // CE (at least thru Windows Mobile 5) doesn't have the new, secure CRT. #if !defined (ACE_HAS_WINCE) && !defined (ACE_HAS_TR24731_2005_CRT) diff --git a/dep/ACE_wrappers/ace/config-win32-msvc-9.h b/dep/ACE_wrappers/ace/config-win32-msvc-9.h index 8f148b4c0..f0282fc62 100644 --- a/dep/ACE_wrappers/ace/config-win32-msvc-9.h +++ b/dep/ACE_wrappers/ace/config-win32-msvc-9.h @@ -3,7 +3,7 @@ /** * @file config-win32-msvc-9.h * - * $Id: config-win32-msvc-9.h 81935 2008-06-12 22:01:53Z jtc $ + * $Id: config-win32-msvc-9.h 91285 2010-08-05 08:29:30Z johnnyw $ * * @brief Microsoft Visual C++ 9.0 configuration file. * @@ -51,22 +51,24 @@ #define ACE_STRCASECMP_EQUIVALENT ::_stricmp #define ACE_STRNCASECMP_EQUIVALENT ::_strnicmp #define ACE_WCSDUP_EQUIVALENT ::_wcsdup +#if defined (ACE_HAS_WINCE) +# define ACE_FILENO_EQUIVALENT ::_fileno +#else +# define ACE_FILENO_EQUIVALENT(X) (_get_osfhandle (::_fileno (X))) +#endif -#define ACE_HAS_EXCEPTIONS - -// Windows Mobile 5 doesn't do sig_atomic_t, but maybe future versions will. -# if !defined (_WIN32_WCE) || (_WIN32_WCE > 0x501) +// Windows Mobile 6 doesn't do sig_atomic_t, but maybe future versions will. +# if !defined (_WIN32_WCE) || (_WIN32_WCE > 0x601) # define ACE_HAS_SIG_ATOMIC_T -# endif /* !Win CE 5.0 or less */ +# endif /* !Win CE 6.0 or less */ -#define ACE_HAS_STRERROR #define ACE_LACKS_STRPTIME // Evaluate this with a WinCE build; maybe things have improved since VC8. -//#if !defined (ACE_HAS_WINCE) +#if !defined (ACE_HAS_WINCE) # define ACE_HAS_INTRIN_H # define ACE_HAS_INTRINSIC_INTERLOCKED -//#endif +#endif #if !defined (_WIN32_WCE) || (_WIN32_WCE >= 0x501) # define ACE_HAS_INTRINSIC_BYTESWAP @@ -136,5 +138,12 @@ // explicitly instantiate a template that has ACE_UNIMPLEMENTED_FUNC. # define ACE_NEEDS_FUNC_DEFINITIONS +// Windows Vista and Windows Server 2008 and newer do have native condition +// variables +#if defined (WIN32_WINNT) && (WIN32_WINNT >= 0x0600) +# define ACE_HAS_WTHREADS_CONDITION_VARIABLE +# undef ACE_LACKS_COND_T +#endif + #include /**/ "ace/post.h" #endif /* ACE_CONFIG_WIN32_MSVC_9_H */ diff --git a/dep/ACE_wrappers/ace/config-win32-msvc.h b/dep/ACE_wrappers/ace/config-win32-msvc.h index a7f8898fc..6f62477b9 100644 --- a/dep/ACE_wrappers/ace/config-win32-msvc.h +++ b/dep/ACE_wrappers/ace/config-win32-msvc.h @@ -2,7 +2,7 @@ /** * @file config-win32-msvc.h * - * $Id: config-win32-msvc.h 82643 2008-08-19 14:02:12Z johnnyw $ + * $Id: config-win32-msvc.h 85785 2009-06-24 18:20:42Z mitza $ * * @brief Microsoft Visual C++ configuration file. * @@ -31,12 +31,6 @@ #define ACE_CC_MINOR_VERSION (_MSC_VER % 100) #define ACE_CC_BETA_VERSION (0) -#if !defined (ACE_LD_DECORATOR_STR) -# if defined (_DEBUG) -# define ACE_LD_DECORATOR_STR ACE_TEXT ("d") -# endif /* _DEBUG */ -#endif /* ACE_LD_DECORATOR_STR */ - #if !defined(_NATIVE_WCHAR_T_DEFINED) #define ACE_LACKS_NATIVE_WCHAR_T #endif @@ -48,7 +42,10 @@ # define ACE_ENDTHREADEX(STATUS) ::_endthreadex ((DWORD) STATUS) #endif /* _WIN32_WCE */ -#if (_MSC_VER >= 1500) +//FUZZ: disable check_for_msc_ver +#if (_MSC_VER >= 1600) +# include "ace/config-win32-msvc-10.h" +#elif (_MSC_VER >= 1500) # include "ace/config-win32-msvc-9.h" #elif (_MSC_VER >= 1400) # include "ace/config-win32-msvc-8.h" @@ -57,6 +54,7 @@ #else # error This version of Microsoft Visual C++ is not supported. #endif +//FUZZ: enable check_for_msc_ver // MFC changes the behavior of operator new at all MSVC versions from 6 up // by throwing a static CMemoryException* instead of std::bad_alloc @@ -124,11 +122,19 @@ #define ACE_LACKS_TERMIOS_H #define ACE_LACKS_REGEX_H -#define ACE_INT64_FORMAT_SPECIFIER ACE_TEXT ("%I64d") -#define ACE_UINT64_FORMAT_SPECIFIER ACE_TEXT ("%I64u") +#define ACE_INT64_FORMAT_SPECIFIER_ASCII "%I64d" +#define ACE_UINT64_FORMAT_SPECIFIER_ASCII "%I64u" +#define ACE_STRTOLL_EQUIVALENT ::_strtoi64 +#define ACE_WCSTOLL_EQUIVALENT ::_wcstoi64 #define ACE_STRTOULL_EQUIVALENT ::_strtoui64 -#define ACE_WCSTOOULL_EQUIVALENT ::_wcstoui64 +#define ACE_WCSTOULL_EQUIVALENT ::_wcstoui64 +#define ACE_WTOF_EQUIVALENT ::_wtof + +#define ACE_LACKS_ISBLANK +#define ACE_LACKS_ISWBLANK +#define ACE_LACKS_CORRECT_ISWPRINT_TAB +#define ACE_ISCTYPE_EQUIVALENT ::_isctype // Turn off warnings for /W4 // To resume any of these warning: #pragma warning(default: 4xxx) diff --git a/dep/ACE_wrappers/ace/config-win32.h b/dep/ACE_wrappers/ace/config-win32.h index 76f258eb3..af946518c 100644 --- a/dep/ACE_wrappers/ace/config-win32.h +++ b/dep/ACE_wrappers/ace/config-win32.h @@ -3,7 +3,7 @@ /** * @file config-win32.h * - * $Id: config-win32.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: config-win32.h 85057 2009-04-08 10:59:58Z msmit $ * * @brief Microsoft Windows configuration file. * @@ -19,39 +19,6 @@ #define ACE_CONFIG_WIN32_H #include /**/ "ace/pre.h" -// by derex ,I include the win32 specific header here, -// this violates the idea of this file a bit ;) -#define ACE_HAS_REACTOR_NOTIFICATION_QUEUE - -// Max amount of connections for non-epoll platforms -#ifndef FD_SETSIZE - #define FD_SETSIZE 4096 -#endif - -//disable some deprecate warnings on windows -#ifndef _CRT_NONSTDC_NO_WARNINGS - #define _CRT_NONSTDC_NO_WARNINGS -#endif - -#ifndef _CRT_SECURE_NO_WARNINGS - #define _CRT_SECURE_NO_WARNINGS -#endif - -#ifndef _CRT_SECURE_NO_DEPRECATE - #define _CRT_SECURE_NO_DEPRECATE -#endif - -#ifndef _CRT_NONSTDC_NO_DEPRECATE - #define _CRT_NONSTDC_NO_DEPRECATE -#endif - -#ifndef _WINDOWS - #define _WINDOWS -#endif - -// end custom config stuff - - // NOTE: Please do not add anything besides #include's here. Put other stuff // (definitions, etc.) in the included headers @@ -70,6 +37,8 @@ # include "ace/config-win32-msvc.h" #elif defined (ghs) # include "ace/config-win32-ghs.h" +#elif defined (ACE_HAS_CEGCC) //need to be prior to MINGW32 +# include "ace/config-win32-cegcc.h" #elif defined (__MINGW32__) # include "ace/config-win32-mingw.h" #elif defined (__DMC__) @@ -81,13 +50,6 @@ // gethostbyaddr does not handle IPv6-mapped-IPv4 addresses #define ACE_HAS_BROKEN_GETHOSTBYADDR_V4MAPPED -// TODO remove this at some point when we add ACE::init and ACE::fini -// by derex -#ifdef ACE_HAS_NONSTATIC_OBJECT_MANAGER -#undef ACE_HAS_NONSTATIC_OBJECT_MANAGER -#endif //ACE_HAS_NONSTATIC_OBJECT_MANAGER - - #include /**/ "ace/post.h" #endif /* ACE_CONFIG_WIN32_H */ diff --git a/dep/ACE_wrappers/ace/gethrtime.cpp b/dep/ACE_wrappers/ace/gethrtime.cpp index 69de03153..5c32d16da 100644 --- a/dep/ACE_wrappers/ace/gethrtime.cpp +++ b/dep/ACE_wrappers/ace/gethrtime.cpp @@ -1,4 +1,4 @@ -// $Id: gethrtime.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: gethrtime.cpp 91286 2010-08-05 09:04:31Z johnnyw $ // // Build this file with g++. It can be linked in to a ACE application // that was compiled with GreenHills. It wouldn't be necessary if I @@ -7,7 +7,7 @@ #include "ace/config-all.h" -ACE_RCSID(ace, gethrtime, "$Id: gethrtime.cpp 80826 2008-03-04 14:51:23Z wotte $") + #if defined (ghs) && (defined (i386) || defined(__i386__)) diff --git a/dep/ACE_wrappers/ace/iosfwd.h b/dep/ACE_wrappers/ace/iosfwd.h index b07a9f11b..b9576ebae 100644 --- a/dep/ACE_wrappers/ace/iosfwd.h +++ b/dep/ACE_wrappers/ace/iosfwd.h @@ -4,7 +4,7 @@ /** * @file iosfwd.h * - * $Id: iosfwd.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: iosfwd.h 89098 2010-02-21 21:51:41Z schmidt $ * * @author Irfan Pyarali * @@ -44,6 +44,7 @@ # if !defined (ACE_USES_OLD_IOSTREAMS) # include /**/ +#define ACE_HAS_CPP98_IOSTREAMS 1 # else // @note If these forward declarations don't work (e.g. aren't // portable), we may have to include "ace/streams.h" as a last diff --git a/dep/ACE_wrappers/ace/os_include/arpa/os_inet.h b/dep/ACE_wrappers/ace/os_include/arpa/os_inet.h index 090484d28..b97f7c6e4 100644 --- a/dep/ACE_wrappers/ace/os_include/arpa/os_inet.h +++ b/dep/ACE_wrappers/ace/os_include/arpa/os_inet.h @@ -6,7 +6,7 @@ * * definitions for internet operations * - * $Id: os_inet.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: os_inet.h 85015 2009-04-03 12:27:59Z johnnyw $ * * @author Don Hinton * @author This code was originally in various places including ace/OS.h. @@ -32,9 +32,9 @@ } #endif /* !ACE_LACKS_ARPA_INET_H */ -#if defined (ACE_VXWORKS) +#if defined (ACE_USES_INETLIB_H) # include /**/ -#endif /* ACE_VXWORKS */ +#endif /* ACE_USES_INETLIB_H */ /** * In some environments it is useful to swap the bytes on write, for diff --git a/dep/ACE_wrappers/ace/os_include/net/os_if.h b/dep/ACE_wrappers/ace/os_include/net/os_if.h index 1f59a1772..3dcf5918f 100644 --- a/dep/ACE_wrappers/ace/os_include/net/os_if.h +++ b/dep/ACE_wrappers/ace/os_include/net/os_if.h @@ -6,7 +6,7 @@ * * sockets local interfaces * - * $Id: os_if.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: os_if.h 88719 2010-01-26 12:55:03Z sowayaa $ * * @author Don Hinton * @author This code was originally in various places including ace/OS.h. @@ -25,17 +25,10 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #if !defined (ACE_LACKS_NET_IF_H) - // This part if to avoid STL name conflict with the map structure - // in net/if.h. -# if defined (ACE_HAS_STL_MAP_CONFLICT) -# define map _Resource_Allocation_Map_ -# endif /* ACE_HAS_STL_MAP_CONFLICT */ - extern "C" { # include /**/ - } -# if defined (ACE_HAS_STL_MAP_CONFLICT) -# undef map -# endif /* ACE_HAS_STL_MAP_CONFLICT */ +# if defined (ACE_HAS_NET_IF_DL_H) +# include /**/ +# endif /* ACE_HAS_NET_IF_DL_H */ # if defined (HPUX) && defined (IOR) /* HP-UX 11.11 defines IOR in /usr/include/pa/inline.h and we don't want that definition. See IOP_IORC.h. diff --git a/dep/ACE_wrappers/ace/os_include/netinet/os_in.h b/dep/ACE_wrappers/ace/os_include/netinet/os_in.h index 4a4346ed4..dff894aad 100644 --- a/dep/ACE_wrappers/ace/os_include/netinet/os_in.h +++ b/dep/ACE_wrappers/ace/os_include/netinet/os_in.h @@ -1,3 +1,4 @@ + // -*- C++ -*- //============================================================================= @@ -6,7 +7,7 @@ * * Internet address family * - * $Id: os_in.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: os_in.h 85438 2009-05-26 06:56:46Z johnnyw $ * * @author Don Hinton * @author This code was originally in various places including ace/OS.h. @@ -31,31 +32,24 @@ # include /**/ #endif /* ACE_HAS_WINSOCK2 */ -#if !defined (ACE_LACKS_NETINET_IN_H) -# if defined (ACE_HAS_STL_QUEUE_CONFLICT) -# define queue _Queue_ -# endif /* ACE_HAS_STL_QUEUE_CONFLICT */ - extern "C" { -# include /**/ - } -# if defined (ACE_HAS_STL_QUEUE_CONFLICT) -# undef queue -# endif /* ACE_HAS_STL_QUEUE_CONFLICT */ -#endif /* !ACE_LACKS_NETINET_IN_H */ - // Place all additions (especially function declarations) within extern "C" {} #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ +#if !defined (ACE_LACKS_NETINET_IN_H) +# include /**/ +#endif /* !ACE_LACKS_NETINET_IN_H */ + + # if defined (ACE_HAS_PHARLAP_RT) # define ACE_IPPROTO_TCP SOL_SOCKET # else # define ACE_IPPROTO_TCP IPPROTO_TCP # endif /* ACE_HAS_PHARLAP_RT */ -# if !defined (ACE_HAS_IP_MULTICAST) && defined (ACE_LACKS_IP_ADD_MEMBERSHIP) +# if !defined (ACE_HAS_IP_MULTICAST) && defined (ACE_LACKS_IP_ADD_MEMBERSHIP) // Even if ACE_HAS_IP_MULTICAST is not defined, if IP_ADD_MEMBERSHIP // is defined, assume that the ip_mreq struct is also defined // (presumably in netinet/in.h). diff --git a/dep/ACE_wrappers/ace/os_include/netinet/os_tcp.h b/dep/ACE_wrappers/ace/os_include/netinet/os_tcp.h index 6e6c66757..aca6590bc 100644 --- a/dep/ACE_wrappers/ace/os_include/netinet/os_tcp.h +++ b/dep/ACE_wrappers/ace/os_include/netinet/os_tcp.h @@ -6,7 +6,7 @@ * * definitions for the Internet Transmission Control Protocol (TCP) * - * $Id: os_tcp.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: os_tcp.h 88499 2010-01-12 19:34:34Z olli $ * * @author Don Hinton * @author This code was originally in various places including ace/OS.h. @@ -26,7 +26,7 @@ #if !defined (ACE_LACKS_NETINET_TCP_H) # include /**/ -#endif /* !ACE_LACKS_NETIINET_TCP_H */ +#endif /* !ACE_LACKS_NETINET_TCP_H */ // Place all additions (especially function declarations) within extern "C" {} #ifdef __cplusplus diff --git a/dep/ACE_wrappers/ace/os_include/os_ctype.h b/dep/ACE_wrappers/ace/os_include/os_ctype.h index faa04af65..4b5b65120 100644 --- a/dep/ACE_wrappers/ace/os_include/os_ctype.h +++ b/dep/ACE_wrappers/ace/os_include/os_ctype.h @@ -6,7 +6,7 @@ * * character types * - * $Id: os_ctype.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: os_ctype.h 83520 2008-11-03 08:54:08Z johnnyw $ * * @author Don Hinton * @author This code was originally in various places including ace/OS.h. @@ -36,6 +36,9 @@ extern "C" // @todo move the is* and is* emulation methods in ACE_OS here // and let ACE_OS just call them. +#if !defined (ACE_HAS_CTYPE_T) +typedef int ctype_t; +#endif #ifdef __cplusplus } diff --git a/dep/ACE_wrappers/ace/os_include/os_dirent.h b/dep/ACE_wrappers/ace/os_include/os_dirent.h index 2db95c65a..034bacd00 100644 --- a/dep/ACE_wrappers/ace/os_include/os_dirent.h +++ b/dep/ACE_wrappers/ace/os_include/os_dirent.h @@ -6,7 +6,7 @@ * * format of directory entries * - * $Id: os_dirent.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: os_dirent.h 82985 2008-10-08 18:15:30Z johnnyw $ * * @author Don Hinton * @author This code was originally in various places including ace/OS.h. @@ -64,6 +64,7 @@ struct dirent { }; #define ACE_DIRENT dirent +#define ACE_HAS_TCHAR_DIRENT struct ACE_DIR { /// The name of the directory we are looking into @@ -82,6 +83,7 @@ struct ACE_DIR { int started_reading_; }; #elif defined (ACE_WIN32) && (__BORLANDC__) && defined (ACE_USES_WCHAR) +#define ACE_HAS_TCHAR_DIRENT #define ACE_DIRENT wdirent typedef wDIR ACE_DIR; #else diff --git a/dep/ACE_wrappers/ace/os_include/os_errno.h b/dep/ACE_wrappers/ace/os_include/os_errno.h index 1e297e364..4f5cfe695 100644 --- a/dep/ACE_wrappers/ace/os_include/os_errno.h +++ b/dep/ACE_wrappers/ace/os_include/os_errno.h @@ -6,7 +6,7 @@ * * system error numbers * - * $Id: os_errno.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: os_errno.h 91076 2010-07-13 14:20:35Z johnnyw $ * * @author Don Hinton * @author This code was originally in various places including ace/OS.h. @@ -41,46 +41,237 @@ extern "C" #if defined (ACE_WIN32) // error code mapping for windows -# define ETIME ERROR_SEM_TIMEOUT -# define EWOULDBLOCK WSAEWOULDBLOCK -# define EINPROGRESS WSAEINPROGRESS -# define EALREADY WSAEALREADY -# define ENOTSOCK WSAENOTSOCK -# define EDESTADDRREQ WSAEDESTADDRREQ -# define EMSGSIZE WSAEMSGSIZE -# define EPROTOTYPE WSAEPROTOTYPE -# define ENOPROTOOPT WSAENOPROTOOPT -# define EPROTONOSUPPORT WSAEPROTONOSUPPORT -# define ESOCKTNOSUPPORT WSAESOCKTNOSUPPORT -# define EOPNOTSUPP WSAEOPNOTSUPP -# define EPFNOSUPPORT WSAEPFNOSUPPORT -# define EAFNOSUPPORT WSAEAFNOSUPPORT -# define EADDRINUSE WSAEADDRINUSE -# define EADDRNOTAVAIL WSAEADDRNOTAVAIL -# define ENETDOWN WSAENETDOWN -# define ENETUNREACH WSAENETUNREACH -# define ENETRESET WSAENETRESET -# define ECONNABORTED WSAECONNABORTED -# define ECONNRESET WSAECONNRESET -# define ENOBUFS WSAENOBUFS -# define EISCONN WSAEISCONN -# define ENOTCONN WSAENOTCONN -# define ESHUTDOWN WSAESHUTDOWN -# define ETOOMANYREFS WSAETOOMANYREFS -# define ETIMEDOUT WSAETIMEDOUT -# define ECONNREFUSED WSAECONNREFUSED -# define ELOOP WSAELOOP -# define EHOSTDOWN WSAEHOSTDOWN -# define EHOSTUNREACH WSAEHOSTUNREACH -# define EPROCLIM WSAEPROCLIM -# define EUSERS WSAEUSERS -# define EDQUOT WSAEDQUOT -# define ESTALE WSAESTALE -# define EREMOTE WSAEREMOTE - // Grrr! ENAMETOOLONG and ENOTEMPTY are already defined by the horrible - // 'standard' library. - // #define ENAMETOOLONG WSAENAMETOOLONG -# define EADDRINUSE WSAEADDRINUSE + + // VC++ 10 has these error codes defined in errno.h, + // this will cause different errors in ACE. + // So we undef these error codes if they are wrongly defined +# if defined (EWOULDBLOCK) && (EWOULDBLOCK != WSAEWOULDBLOCK) +# undef EWOULDBLOCK +# endif /* EWOULDBLOCK */ +# if defined (EINPROGRESS) && (EINPROGRESS != WSAEINPROGRESS) +# undef EINPROGRESS +# endif /* EINPROGRESS */ +# if defined (EALREADY) && (EALREADY != WSAEALREADY) +# undef EALREADY +# endif /* EALREADY */ +# if defined (ENOTSOCK) && (ENOTSOCK != WSAENOTSOCK) +# undef ENOTSOCK +# endif /* ENOTSOCK */ +# if defined (EDESTADDRREQ) && (EDESTADDRREQ != WSAEDESTADDRREQ) +# undef EDESTADDRREQ +# endif /* EDESTADDRREQ */ +# if defined (EMSGSIZE) && (EMSGSIZE != WSAEMSGSIZE) +# undef EMSGSIZE +# endif /* EMSGSIZE */ +# if defined (EPROTOTYPE) && (EPROTOTYPE != WSAEPROTOTYPE) +# undef EPROTOTYPE +# endif /* EPROTOTYPE */ +# if defined (ENOPROTOOPT) && (ENOPROTOOPT != WSAENOPROTOOPT) +# undef ENOPROTOOPT +# endif /* ENOPROTOOPT */ +# if defined (EPROTONOSUPPORT) && (EPROTONOSUPPORT != WSAEPROTONOSUPPORT) +# undef EPROTONOSUPPORT +# endif /* EPROTONOSUPPORT */ +# if defined (ESOCKTNOSUPPORT) && (ESOCKTNOSUPPORT != WSAESOCKTNOSUPPORT) +# undef ESOCKTNOSUPPORT +# endif /* ESOCKTNOSUPPORT */ +# if defined (EOPNOTSUPP) && (EOPNOTSUPP != WSAEOPNOTSUPP) +# undef EOPNOTSUPP +# endif /* EOPNOTSUPP */ +# if defined (EPFNOSUPPORT) && (EPFNOSUPPORT != WSAEPFNOSUPPORT) +# undef EPFNOSUPPORT +# endif /* EPFNOSUPPORT */ +# if defined (EAFNOSUPPORT) && (EAFNOSUPPORT != WSAEAFNOSUPPORT) +# undef EAFNOSUPPORT +# endif /* EAFNOSUPPORT */ +# if defined (EADDRINUSE) && (EADDRINUSE != WSAEADDRINUSE) +# undef EADDRINUSE +# endif /* EADDRINUSE */ +# if defined (EADDRNOTAVAIL) && (EADDRNOTAVAIL != WSAEADDRNOTAVAIL) +# undef EADDRNOTAVAIL +# endif /* EADDRNOTAVAIL */ +# if defined (ENETDOWN) && (ENETDOWN != WSAENETDOWN) +# undef ENETDOWN +# endif /* ENETDOWN */ +# if defined (ENETUNREACH) && (ENETUNREACH != WSAENETUNREACH) +# undef ENETUNREACH +# endif /* ENETUNREACH */ +# if defined (ENETRESET) && (ENETRESET != WSAENETRESET) +# undef ENETRESET +# endif /* ENETRESET */ +# if defined (ECONNABORTED) && (ECONNABORTED != WSAECONNABORTED) +# undef ECONNABORTED +# endif /* ECONNABORTED */ +# if defined (ECONNRESET) && (ECONNRESET != WSAECONNRESET) +# undef ECONNRESET +# endif /* ECONNRESET */ +# if defined (ENOBUFS) && (ENOBUFS != WSAENOBUFS) +# undef ENOBUFS +# endif /* ENOBUFS */ +# if defined (EISCONN) && (EISCONN != WSAEISCONN) +# undef EISCONN +# endif /* EISCONN */ +# if defined (ENOTCONN) && (ENOTCONN != WSAENOTCONN) +# undef ENOTCONN +# endif /* ENOTCONN */ +# if defined (ESHUTDOWN) && (ESHUTDOWN != WSAESHUTDOWN) +# undef ESHUTDOWN +# endif /* ESHUTDOWN */ +# if defined (ETOOMANYREFS) && (ETOOMANYREFS != WSAETOOMANYREFS) +# undef ETOOMANYREFS +# endif /* ETOOMANYREFS */ +# if defined (ETIMEDOUT) && (ETIMEDOUT != WSAETIMEDOUT) +# undef ETIMEDOUT +# endif /* ETIMEDOUT */ +# if defined (ECONNREFUSED) && (ECONNREFUSED != WSAECONNREFUSED) +# undef ECONNREFUSED +# endif /* ECONNREFUSED */ +# if defined (ELOOP) && (ELOOP != WSAELOOP) +# undef ELOOP +# endif /* ELOOP */ +//# if defined (ENAMETOOLONG) && (ENAMETOOLONG != WSAENAMETOOLONG) +//# undef ENAMETOOLONG +//# endif /* ENAMETOOLONG */ +# if defined (EHOSTDOWN) && (EHOSTDOWN != WSAEHOSTDOWN) +# undef EHOSTDOWN +# endif /* EHOSTDOWN */ +# if defined (EHOSTUNREACH) && (EHOSTUNREACH != WSAEHOSTUNREACH) +# undef EHOSTUNREACH +# endif /* EHOSTUNREACH */ +//# if defined (ENOTEMPTY) && (ENOTEMPTY != WSAENOTEMPTY) +//# undef ENOTEMPTY +//# endif /* ENOTEMPTY */ +# if defined (EPROCLIM) && (EPROCLIM != WSAEPROCLIM) +# undef EPROCLIM +# endif /* EPROCLIM */ +# if defined (EUSERS) && (EUSERS != WSAEUSERS) +# undef EUSERS +# endif /* EUSERS */ +# if defined (EDQUOT) && (EDQUOT != WSAEDQUOT) +# undef EDQUOT +# endif /* EDQUOT */ +# if defined (ESTALE) && (ESTALE != WSAESTALE) +# undef ESTALE +# endif /* ESTALE */ +# if defined (EREMOTE) && (EREMOTE != WSAEREMOTE) +# undef EREMOTE +# endif /* EREMOTE */ + +# if !defined (ETIME) +# define ETIME ERROR_SEM_TIMEOUT +# endif /* !ETIME */ +# if !defined (EWOULDBLOCK) +# define EWOULDBLOCK WSAEWOULDBLOCK +# endif /* !EWOULDBLOCK */ +# if !defined (EINPROGRESS) +# define EINPROGRESS WSAEINPROGRESS +# endif /* !EINPROGRESS */ +# if !defined (EALREADY) +# define EALREADY WSAEALREADY +# endif /* !EALREADY */ +# if !defined (ENOTSOCK) +# define ENOTSOCK WSAENOTSOCK +# endif /* !ENOTSOCK */ +# if !defined (EDESTADDRREQ) +# define EDESTADDRREQ WSAEDESTADDRREQ +# endif /* !EDESTADDRREQ */ +# if !defined (EMSGSIZE) +# define EMSGSIZE WSAEMSGSIZE +# endif /* !EMSGSIZE */ +# if !defined (EPROTOTYPE) +# define EPROTOTYPE WSAEPROTOTYPE +# endif /* !EPROTOTYPE */ +# if !defined (ENOPROTOOPT) +# define ENOPROTOOPT WSAENOPROTOOPT +# endif /* !ENOPROTOOPT */ +# if !defined (EPROTONOSUPPORT) +# define EPROTONOSUPPORT WSAEPROTONOSUPPORT +# endif /* !EPROTONOSUPPORT */ +# if !defined (ESOCKTNOSUPPORT) +# define ESOCKTNOSUPPORT WSAESOCKTNOSUPPORT +# endif /* !ESOCKTNOSUPPORT */ +# if !defined (EOPNOTSUPP) +# define EOPNOTSUPP WSAEOPNOTSUPP +# endif /* !EOPNOTSUPP */ +# if !defined (EPFNOSUPPORT) +# define EPFNOSUPPORT WSAEPFNOSUPPORT +# endif /* !EPFNOSUPPORT */ +# if !defined (EAFNOSUPPORT) +# define EAFNOSUPPORT WSAEAFNOSUPPORT +# endif /* !EAFNOSUPPORT */ +# if !defined (EADDRINUSE) +# define EADDRINUSE WSAEADDRINUSE +# endif /* !EADDRINUSE */ +# if !defined (EADDRNOTAVAIL) +# define EADDRNOTAVAIL WSAEADDRNOTAVAIL +# endif /* !EADDRNOTAVAIL */ +# if !defined (ENETDOWN) +# define ENETDOWN WSAENETDOWN +# endif /* !ENETDOWN */ +# if !defined (ENETUNREACH) +# define ENETUNREACH WSAENETUNREACH +# endif /* !ENETUNREACH */ +# if !defined (ENETRESET) +# define ENETRESET WSAENETRESET +# endif /* !ENETRESET */ +# if !defined (ECONNABORTED) +# define ECONNABORTED WSAECONNABORTED +# endif /* !ECONNABORTED */ +# if !defined (ECONNRESET) +# define ECONNRESET WSAECONNRESET +# endif /* !ECONNRESET */ +# if !defined (ENOBUFS) +# define ENOBUFS WSAENOBUFS +# endif /* !ENOBUFS */ +# if !defined (EISCONN) +# define EISCONN WSAEISCONN +# endif /* !EISCONN */ +# if !defined (ENOTCONN) +# define ENOTCONN WSAENOTCONN +# endif /* !ENOTCONN */ +# if !defined (ESHUTDOWN) +# define ESHUTDOWN WSAESHUTDOWN +# endif /* !ESHUTDOWN */ +# if !defined (ETOOMANYREFS) +# define ETOOMANYREFS WSAETOOMANYREFS +# endif /* !ETOOMANYREFS */ +# if !defined (ETIMEDOUT) +# define ETIMEDOUT WSAETIMEDOUT +# endif /* !ETIMEDOUT */ +# if !defined (ECONNREFUSED) +# define ECONNREFUSED WSAECONNREFUSED +# endif /* !ECONNREFUSED */ +# if !defined (ELOOP) +# define ELOOP WSAELOOP +# endif /* !ELOOP */ +# if !defined (EHOSTDOWN) +# define EHOSTDOWN WSAEHOSTDOWN +# endif /* !EHOSTDOWN */ +# if !defined (EHOSTUNREACH) +# define EHOSTUNREACH WSAEHOSTUNREACH +# endif /* !EHOSTUNREACH */ +# if !defined (EPROCLIM) +# define EPROCLIM WSAEPROCLIM +# endif /* !EPROCLIM */ +# if !defined (EUSERS) +# define EUSERS WSAEUSERS +# endif /* !EUSERS */ +# if !defined (EDQUOT) +# define EDQUOT WSAEDQUOT +# endif /* !EDQUOT */ +# if !defined (ESTALE) +# define ESTALE WSAESTALE +# endif /* !ESTALE */ +# if !defined (EREMOTE) +# define EREMOTE WSAEREMOTE +# endif /* !EREMOTE */ + + // Grrr! ENAMETOOLONG and ENOTEMPTY are already defined by the horrible + // 'standard' library. + // #define ENAMETOOLONG WSAENAMETOOLONG +# if !defined (EADDRINUSE) +# define EADDRINUSE WSAEADDRINUSE +# endif /* EADDRINUSE*/ // CE needs this... # if !defined (EPERM) @@ -92,9 +283,123 @@ extern "C" void herror (const char *str); #endif /* ACE_HAS_H_ERRNO */ -#if !defined (ACE_WIN32) && defined (ACE_LACKS_T_ERRNO) +#if defined (ACE_LACKS_ERRNO_H) +# if !defined (EPERM) +# define EPERM 1 +# endif /* EPERM */ +# if !defined (ENOENT) +# define ENOENT 2 +# endif /* ENOENT */ +# if !defined (ESRCH) +# define ESRCH 3 +# endif /* ESRCH */ +# if !defined (EINTR) +# define EINTR 4 +# endif /* EINTR */ +# if !defined (EIO) +# define EIO 5 +# endif /* EIO */ +# if !defined (ENXIO) +# define ENXIO 6 +# endif /* ENXIO */ +# if !defined (E2BIG) +# define E2BIG 7 +# endif /* E2BIG */ +# if !defined (ENOEXEC) +# define ENOEXEC 8 +# endif /* ENOEXEC */ +# if !defined (EBADF) +# define EBADF 9 +# endif /* EBADF */ +# if !defined (ECHILD) +# define ECHILD 10 +# endif /* ECHILD */ +# if !defined (EAGAIN) +# define EAGAIN 11 +# endif /* EAGAIN */ +# if !defined (ENOMEM) +# define ENOMEM 12 +# endif /* ENOMEM */ +# if !defined (EACCES) +# define EACCES 13 +# endif /* EACCES */ +# if !defined (EFAULT) +# define EFAULT 14 +# endif /* EFAULT */ +# if !defined (EBUSY) +# define EBUSY 16 +# endif /* EBUSY */ +# if !defined (EEXIST) +# define EEXIST 17 +# endif /* EEXIST */ +# if !defined (EXDEV) +# define EXDEV 18 +# endif /* EXDEV */ +# if !defined (ENODEV) +# define ENODEV 19 +# endif /* ENODEV */ +# if !defined (ENOTDIR) +# define ENOTDIR 20 +# endif /* ENOTDIR */ +# if !defined (EISDIR) +# define EISDIR 21 +# endif /* EISDIR */ +# if !defined (EINVAL) +# define EINVAL 22 +# endif /* EINVAL */ +# if !defined (ENFILE) +# define ENFILE 23 +# endif /* ENFILE */ +# if !defined (EMFILE) +# define EMFILE 24 +# endif /* EMFILE */ +# if !defined (ENOTTY) +# define ENOTTY 25 +# endif /* ENOTTY */ +# if !defined (EFBIG) +# define EFBIG 27 +# endif /* EFBIG */ +# if !defined (ENOSPC) +# define ENOSPC 28 +# endif /* ENOSPC */ +# if !defined (ESPIPE) +# define ESPIPE 29 +# endif /* ESPIPE */ +# if !defined (EROFS) +# define EROFS 30 +# endif /* EROFS */ +# if !defined (EMLINK) +# define EMLINK 31 +# endif /* EMLINK */ +# if !defined (EPIPE) +# define EPIPE 32 +# endif /* EPIPE */ +# if !defined (EDOM) +# define EDOM 33 +# endif /* EDOM */ +# if !defined (ERANGE) +# define ERANGE 34 +# endif /* ERANGE */ +# if !defined (EDEADLK) +# define EDEADLK 36 +# endif /* EDEADLK */ +# if !defined (ENAMETOOLONG) +# define ENAMETOOLONG 38 +# endif /* ENAMETOOLONG */ +# if !defined (ENOLCK) +# define ENOLCK 39 +# endif /* ENOLCK */ +# if !defined (ENOSYS) +# define ENOSYS 40 +# endif /* ENOSYS */ +# if !defined (ENOTEMPTY) +# define ENOTEMPTY 41 +# endif /* ENOTEMPTY */ +#endif /* ACE_LACKS_ERRNO_H */ + +#if defined (ACE_LACKS_T_ERRNO) extern int t_errno; -#endif /* ACE_WIN32 && ACE_LACKS_T_ERRNO */ +#endif /* ACE_LACKS_T_ERRNO */ #if !defined (ENOSYS) # define ENOSYS EFAULT /* Operation not supported or unknown error. */ diff --git a/dep/ACE_wrappers/ace/os_include/os_limits.h b/dep/ACE_wrappers/ace/os_include/os_limits.h index 1b1267721..a128efcc0 100644 --- a/dep/ACE_wrappers/ace/os_include/os_limits.h +++ b/dep/ACE_wrappers/ace/os_include/os_limits.h @@ -6,7 +6,7 @@ * * implementation-defined constants * - * $Id: os_limits.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: os_limits.h 84972 2009-03-25 19:09:06Z johnnyw $ * * @author Don Hinton * @author This code was originally in various places including ace/OS.h. @@ -102,7 +102,7 @@ extern "C" # define ACE_IOV_MAX IOV_MAX #endif /* ACE_IOV_MAX */ -#if defined (ACE_VXWORKS) && ((ACE_VXWORKS >= 0x620) && (ACE_VXWORKS <= 0x660)) && !defined (__RTP__) +#if defined (ACE_VXWORKS) && ((ACE_VXWORKS >= 0x620) && (ACE_VXWORKS <= 0x670)) && !defined (__RTP__) # if defined (PIPE_BUF) && (PIPE_BUF == -1) # undef PIPE_BUF # endif diff --git a/dep/ACE_wrappers/ace/os_include/os_netdb.h b/dep/ACE_wrappers/ace/os_include/os_netdb.h index 286cb2754..798bf9b7a 100644 --- a/dep/ACE_wrappers/ace/os_include/os_netdb.h +++ b/dep/ACE_wrappers/ace/os_include/os_netdb.h @@ -6,7 +6,7 @@ * * definitions for network database operations * - * $Id: os_netdb.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: os_netdb.h 84660 2009-03-01 20:22:37Z olli $ * * @author Don Hinton * @author This code was originally in various places including ace/OS.h. @@ -27,18 +27,6 @@ #include "ace/os_include/netinet/os_in.h" #include "ace/os_include/os_limits.h" -#if !defined (ACE_LACKS_NETDB_H) -# if defined (ACE_HAS_STL_QUEUE_CONFLICT) -# define queue _Queue_ -# endif /* ACE_HAS_STL_QUEUE_CONFLICT */ - extern "C" { -# include /**/ - } -# if defined (ACE_HAS_STL_QUEUE_CONFLICT) -# undef queue -# endif /* ACE_HAS_STL_QUEUE_CONFLICT */ -#endif /* !ACE_LACKS_NETDB_H */ - #if defined (ACE_VXWORKS) && (ACE_VXWORKS < 0x620) # include /**/ #endif /* ACE_VXWORKS */ @@ -49,6 +37,10 @@ extern "C" { #endif /* __cplusplus */ +#if !defined (ACE_LACKS_NETDB_H) +# include /**/ +#endif /* !ACE_LACKS_NETDB_H */ + #if defined (ACE_LACKS_HOSTENT) struct hostent { char *h_name; /* official name of host */ diff --git a/dep/ACE_wrappers/ace/os_include/os_sched.h b/dep/ACE_wrappers/ace/os_include/os_sched.h index a80b454df..f06541b8c 100644 --- a/dep/ACE_wrappers/ace/os_include/os_sched.h +++ b/dep/ACE_wrappers/ace/os_include/os_sched.h @@ -6,7 +6,7 @@ * * execution scheduling (REALTIME) * - * $Id: os_sched.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: os_sched.h 85102 2009-04-17 14:04:36Z johnnyw $ * * @author Don Hinton * @author This code was originally in various places including ace/OS.h. @@ -37,11 +37,15 @@ extern "C" #endif /* __cplusplus */ #if !defined (__cpu_set_t_defined) || !defined (ACE_HAS_CPU_SET_T) +#if defined (ACE_HAS_CPUSET_T) + typedef cpuset_t cpu_set_t; +#else # define ACE_CPU_SETSIZE 1024 typedef struct { ACE_UINT32 bit_array_[ACE_CPU_SETSIZE / (8 * sizeof (ACE_UINT32))]; } cpu_set_t; +#endif #endif /* !ACE_HAS_CPU_SET_T || !__cpu_set_t_defined */ #ifdef __cplusplus diff --git a/dep/ACE_wrappers/ace/os_include/os_signal.h b/dep/ACE_wrappers/ace/os_include/os_signal.h index 957450601..dbda2a67b 100644 --- a/dep/ACE_wrappers/ace/os_include/os_signal.h +++ b/dep/ACE_wrappers/ace/os_include/os_signal.h @@ -6,7 +6,7 @@ * * signals * - * $Id: os_signal.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: os_signal.h 87480 2009-11-11 11:38:15Z olli $ * * @author Don Hinton * @author This code was originally in various places including ace/OS.h. @@ -25,7 +25,6 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/os_include/sys/os_types.h" -#include "ace/os_include/os_pthread.h" #if !defined (ACE_LACKS_SIGNAL_H) extern "C" { @@ -59,25 +58,9 @@ extern "C" { #endif /* __cplusplus */ -#if defined (ACE_LACKS_SIGSET) +#if defined (ACE_LACKS_SIGSET) && !defined (__MINGW32__) typedef u_int sigset_t; -#endif /* ACE_LACKS_SIGSET */ - -#if defined (ACE_HAS_SIG_MACROS) -# undef sigemptyset -# undef sigfillset -# undef sigaddset -# undef sigdelset -# undef sigismember -#endif /* ACE_HAS_SIG_MACROS */ - -// This must come after signal.h is #included. It's to counteract -// the sigemptyset and sigfillset #defines, which only happen -// when __OPTIMIZE__ is #defined (really!) on Linux. -#if defined (linux) && defined (__OPTIMIZE__) -# undef sigemptyset -# undef sigfillset -#endif /* linux && __OPTIMIZE__ */ +#endif /* ACE_LACKS_SIGSET && !sigset_t */ #if !defined (ACE_HAS_SIG_ATOMIC_T) typedef int sig_atomic_t; @@ -135,6 +118,14 @@ extern "C" # define SIGALRM 0 #endif /* SIGALRM */ +#if !defined (SIGABRT) +# define SIGABRT 0 +#endif /* SIGABRT */ + +#if !defined (SIGTERM) +# define SIGTERM 0 +#endif /* SIGTERM */ + #if !defined (SIG_DFL) # define SIG_DFL ((__sighandler_t) 0) #endif /* SIG_DFL */ @@ -164,13 +155,17 @@ extern "C" // All other platforms set NSIG to one greater than the // highest-numbered signal. # define ACE_NSIG NSIG -#endif /* __Lynx__ */ +#endif /* ACE_VXWORKS */ + +#if defined (ACE_HAS_WINCE) + typedef void (__cdecl * __sighandler_t)(int); +#endif #if defined (ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES) - // Prototypes for both signal() and struct sigaction are consistent.. + // Prototypes for both signal() and struct sigaction are consistent.. typedef void (*ACE_SignalHandler)(int); typedef void (*ACE_SignalHandlerV)(int); -#elif defined (ACE_HAS_LYNXOS_SIGNALS) || defined (ACE_HAS_TANDEM_SIGNALS) +#elif defined (ACE_HAS_LYNXOS4_SIGNALS) || defined (ACE_HAS_TANDEM_SIGNALS) typedef void (*ACE_SignalHandler)(...); typedef void (*ACE_SignalHandlerV)(...); #elif defined (ACE_HAS_SVR4_SIGNAL_T) diff --git a/dep/ACE_wrappers/ace/os_include/os_stddef.h b/dep/ACE_wrappers/ace/os_include/os_stddef.h index b842ffe80..55ec50192 100644 --- a/dep/ACE_wrappers/ace/os_include/os_stddef.h +++ b/dep/ACE_wrappers/ace/os_include/os_stddef.h @@ -6,7 +6,7 @@ * * standard type definitions * - * $Id: os_stddef.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: os_stddef.h 89759 2010-04-06 06:07:24Z johnnyw $ * * @author Don Hinton * @author This code was originally in various places including ace/OS.h. @@ -36,28 +36,6 @@ extern "C" { #endif /* __cplusplus */ -//FUZZ: disable check_for_NULL -// NULL pointer constant -#if defined (ACE_LACKS_NULL) -# undef NULL -# if defined(__cplusplus) -# define NULL 0 -# else -# define NULL ((void *)0) -# endif -#endif /* ACE_LACKS_NULL */ -//FUZZ: enable check_for_NULL - -/* - Integer constant expression of type size_t, the value of which is the offset - in bytes to the structure member (member-designator), from the beginning of - its structure (type). -*/ -#if defined (ACE_LACKS_OFFSETOF) -# undef offsetof -# define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER) -#endif /* ACE_LACKS_OFFSETOF */ - // Signed integer type of the result of subtracting two pointers. #if defined (ACE_LACKS_PTRDIFF_T) # if !defined (ACE_PTRDIFF_T_TYPE) @@ -76,7 +54,7 @@ extern "C" */ #if defined (ACE_LACKS_WCHAR_T) # if !defined (ACE_WCHAR_T_TYPE) -# define ACE_WCHAR_T_TYPE long; +# define ACE_WCHAR_T_TYPE long # endif /* !ACE_WCHAR_T_TYPE */ typedef ACE_WCHAR_T_TYPE wchar_t; #endif /* ACE_LACKS_WCHAR_T */ @@ -84,7 +62,7 @@ extern "C" // Unsigned integer type of the result of the sizeof operator. #if defined (ACE_LACKS_SIZE_T) # if !defined (ACE_SIZE_T_TYPE) -# define ACE_SIZE_T_TYPE unsigned int; +# define ACE_SIZE_T_TYPE unsigned int # endif /* !ACE_SIZE_T_TYPE */ typedef ACE_SIZE_T_TYPE size_t; #endif /* ACE_LACKS_SIZE_T */ diff --git a/dep/ACE_wrappers/ace/os_include/os_stdlib.h b/dep/ACE_wrappers/ace/os_include/os_stdlib.h index f30c77d0f..6a675d54e 100644 --- a/dep/ACE_wrappers/ace/os_include/os_stdlib.h +++ b/dep/ACE_wrappers/ace/os_include/os_stdlib.h @@ -6,7 +6,7 @@ * * standard library definitions * - * $Id: os_stdlib.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: os_stdlib.h 83948 2008-12-02 13:55:34Z jtc $ * * @author Don Hinton * @author This code was originally in various places including ace/OS.h. @@ -66,9 +66,17 @@ extern "C" #endif /* ACE_LACKS_MKTEMP_PROTOTYPE */ #if defined (ACE_LACKS_MKSTEMP_PROTOTYPE) - int mkstemp(char *); + int mkstemp (char *); #endif /* ACE_LACKS_MKSTEMP_PROTOTYPE */ +#if defined (ACE_LACKS_STRTOLL_PROTOTYPE) + long long strtoll (const char *, char **, int); +#endif /* ACE_LACKS_STRTOLL_PROTOTYPE */ + +#if defined (ACE_LACKS_STRTOULL_PROTOTYPE) + unsigned long long strtoull (const char *, char **, int); +#endif /* ACE_LACKS_STRTOULL_PROTOTYPE */ + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/dep/ACE_wrappers/ace/os_include/os_string.h b/dep/ACE_wrappers/ace/os_include/os_string.h index 0bd82f75d..0aa2f7de7 100644 --- a/dep/ACE_wrappers/ace/os_include/os_string.h +++ b/dep/ACE_wrappers/ace/os_include/os_string.h @@ -6,7 +6,7 @@ * * string operations * - * $Id: os_string.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: os_string.h 87216 2009-10-23 20:26:16Z olli $ * * @author Don Hinton * @author This code was originally in various places including ace/OS.h. @@ -26,18 +26,10 @@ #include "ace/os_include/os_stddef.h" -// Matthew Stevens 7-10-95 Fix GNU GCC 2.7 for memchr() problem. -#if defined (ACE_HAS_GNU_CSTRING_H) -// Define this file to keep /usr/include/memory.h from being included. -# include /**/ -#else -# if !defined (ACE_LACKS_MEMORY_H) -# include /**/ -# endif /* !ACE_LACKS_MEMORY_H */ -# if !defined (ACE_LACKS_STRING_H) -# include /**/ -# endif /* !ACE_LACKS_STRING_H */ -#endif /* ACE_HAS_GNU_CSTRING_H */ +#if !defined (ACE_LACKS_STRING_H) +# include /**/ +#endif /* !ACE_LACKS_STRING_H */ + // Place all additions (especially function declarations) within extern "C" {} #ifdef __cplusplus @@ -45,16 +37,6 @@ extern "C" { #endif /* __cplusplus */ - // this looks fishy... dhinton -#if !defined (ACE_HAS_STRERROR) -# if defined (ACE_HAS_SYS_ERRLIST) - extern char *sys_errlist[]; -# define strerror(err) sys_errlist[err] -# else -# define strerror(err) "strerror is unsupported" -# endif /* ACE_HAS_SYS_ERRLIST */ -#endif /* !ACE_HAS_STRERROR */ - #if defined (ACE_LACKS_STRTOK_R_PROTOTYPE) && !defined (_POSIX_SOURCE) char *strtok_r (char *s, const char *delim, char **save_ptr); #endif /* ACE_LACKS_STRTOK_R_PROTOTYPE */ @@ -63,11 +45,6 @@ extern "C" size_t strnlen(const char *s, size_t maxlen); #endif /* ACE_LACKS_STRNLEN_PROTOTYPE */ -#if defined (__BORLANDC__) && (__BORLANDC__ < 0x560) -# define _stricmp stricmp -# define _strnicmp strnicmp -#endif /* __BORLANDC__ */ - #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/dep/ACE_wrappers/ace/os_include/os_stropts.h b/dep/ACE_wrappers/ace/os_include/os_stropts.h index 1e69b9a03..e64717a95 100644 --- a/dep/ACE_wrappers/ace/os_include/os_stropts.h +++ b/dep/ACE_wrappers/ace/os_include/os_stropts.h @@ -6,7 +6,7 @@ * * STREAMS interface (STREAMS) * - * $Id: os_stropts.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: os_stropts.h 84660 2009-03-01 20:22:37Z olli $ * * @author Don Hinton * @author This code was originally in various places including ace/OS.h. @@ -27,13 +27,7 @@ #include "ace/os_include/os_unistd.h" #if defined (ACE_HAS_TIMOD_H) -# if defined (ACE_HAS_STL_QUEUE_CONFLICT) -# define queue _Queue_ -# endif /* ACE_HAS_STL_QUEUE_CONFLICT */ # include /**/ -# if defined (ACE_HAS_STL_QUEUE_CONFLICT) -# undef queue -# endif /* ACE_HAS_STL_QUEUE_CONFLICT */ #elif defined (ACE_HAS_OSF_TIMOD_H) # include /**/ #endif /* ACE_HAS_TIMOD_H */ diff --git a/dep/ACE_wrappers/ace/os_include/os_time.h b/dep/ACE_wrappers/ace/os_include/os_time.h index 150f6a712..e10a3b316 100644 --- a/dep/ACE_wrappers/ace/os_include/os_time.h +++ b/dep/ACE_wrappers/ace/os_include/os_time.h @@ -6,7 +6,7 @@ * * time types * - * $Id: os_time.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: os_time.h 87270 2009-10-29 21:47:47Z olli $ * * @author Don Hinton * @author This code was originally in various places including ace/OS.h. @@ -81,10 +81,6 @@ extern "C" { #endif /* __cplusplus */ -#if defined (ACE_HAS_BROKEN_CTIME) -# undef ctime -#endif /* ACE_HAS_BROKEN_CTIME */ - // There are a lot of threads-related macro definitions in the config files. // They came in at different times and from different places and platform // requirements as threads evolved. They are probably not all needed - some diff --git a/dep/ACE_wrappers/ace/os_include/os_typeinfo.h b/dep/ACE_wrappers/ace/os_include/os_typeinfo.h new file mode 100644 index 000000000..3ad1b16ef --- /dev/null +++ b/dep/ACE_wrappers/ace/os_include/os_typeinfo.h @@ -0,0 +1,39 @@ +// -*- C++ -*- + +//============================================================================= +/** + * @file os_typeinfo.h + * + * definitions for the typeinfo file + * + * $Id: os_typeinfo.h 84160 2009-01-14 14:13:58Z johnnyw $ + * + * @author Don Hinton Johnny Willemsen + */ +//============================================================================= + +#ifndef ACE_OS_INCLUDE_OS_TYPEINFO_H +#define ACE_OS_INCLUDE_OS_TYPEINFO_H + +#include /**/ "ace/pre.h" + +#include /**/ "ace/config-all.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +# include /**/ + +// Place all additions (especially function declarations) within extern "C" {} +#ifdef __cplusplus +extern "C" +{ +#endif /* __cplusplus */ + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#include /**/ "ace/post.h" +#endif /* ACE_OS_INCLUDE_OS_TYPEINFO_H */ diff --git a/dep/ACE_wrappers/ace/os_include/os_unistd.h b/dep/ACE_wrappers/ace/os_include/os_unistd.h index a699a22ec..ee685d262 100644 --- a/dep/ACE_wrappers/ace/os_include/os_unistd.h +++ b/dep/ACE_wrappers/ace/os_include/os_unistd.h @@ -6,7 +6,7 @@ * * standard symbolic constants and types * - * $Id: os_unistd.h 81697 2008-05-14 18:33:11Z johnnyw $ + * $Id: os_unistd.h 87125 2009-10-15 17:34:25Z wotte $ * * @author Don Hinton * @author This code was originally in various places including ace/OS.h. @@ -27,14 +27,13 @@ #include "ace/os_include/sys/os_types.h" #include "ace/os_include/os_inttypes.h" -#if defined (__BORLANDC__) -# include "ace/os_include/os_fcntl.h" -#endif /* __BORLANDC */ - -#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) +#if defined (ACE_HAS_PROCESS_H) # include /**/ +#endif /* ACE_HAS_PROCESS_H */ + +#if defined (ACE_HAS_IO_H) # include /**/ -#endif /* ACE_WIN32 && !ACE_HAS_WINCE */ +#endif /* ACE_HAS_IO_H */ #if defined (ACE_HAS_SYS_SYSTEMINFO_H) # include /**/ @@ -64,7 +63,7 @@ extern "C" // The following are #defines and #includes that are specific to // WIN32. # if defined (ACE_HAS_WINCE) -# define ACE_STDIN _fileno (stdin) +# define ACE_STDIN _fileno (stdin) # define ACE_STDOUT _fileno (stdout) # define ACE_STDERR _fileno (stderr) # else @@ -164,12 +163,6 @@ extern "C" #endif /* _LARGEFILE64_SOURCE */ #if defined (__BORLANDC__) -# if (__BORLANDC__ <= 0x540) -# define _getcwd getcwd -# define _chdir chdir -# undef _access -# define _access access -# endif # define _isatty isatty #endif /* __BORLANDC__ */ diff --git a/dep/ACE_wrappers/ace/os_include/os_wchar.h b/dep/ACE_wrappers/ace/os_include/os_wchar.h index 1a542b7b5..37eab2e4e 100644 --- a/dep/ACE_wrappers/ace/os_include/os_wchar.h +++ b/dep/ACE_wrappers/ace/os_include/os_wchar.h @@ -6,7 +6,7 @@ * * wide-character handling * - * $Id: os_wchar.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: os_wchar.h 83948 2008-12-02 13:55:34Z jtc $ * * @author Don Hinton * @author This code was originally in various places including ace/OS.h. @@ -41,6 +41,14 @@ extern "C" { #endif /* __cplusplus */ +#if defined (ACE_LACKS_WCSTOLL_PROTOTYPE) + long long wcstoll (const wchar_t *, wchar_t **, int); +#endif /* ACE_LACKS_WCSTOLL_PROTOTYPE */ + +#if defined (ACE_LACKS_WCSTOULL_PROTOTYPE) + unsigned long long wcstoull (const wchar_t *, wchar_t **, int); +#endif /* ACE_LACKS_WCSTOULL_PROTOTYPE */ + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/dep/ACE_wrappers/ace/os_include/sys/os_select.h b/dep/ACE_wrappers/ace/os_include/sys/os_select.h index 26a3fabd7..59473aff3 100644 --- a/dep/ACE_wrappers/ace/os_include/sys/os_select.h +++ b/dep/ACE_wrappers/ace/os_include/sys/os_select.h @@ -6,7 +6,7 @@ * * select types * - * $Id: os_select.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: os_select.h 85015 2009-04-03 12:27:59Z johnnyw $ * * @author Don Hinton * @author This code was originally in various places including ace/OS.h. @@ -32,9 +32,9 @@ # include /**/ #endif /* !ACE_LACKS_SYS_SELECT_H */ -#if defined (ACE_VXWORKS) && defined (ACE_LACKS_SYS_SELECT_H) +#if defined (ACE_USES_SELECTLIB_H) && defined (ACE_LACKS_SYS_SELECT_H) # include /**/ -#endif /* ACE_VXWORKS */ +#endif /* ACE_USES_SELECTLIB_H && ACE_LACKS_SYS_SELECT_H */ // Place all additions (especially function declarations) within extern "C" {} #ifdef __cplusplus @@ -42,13 +42,15 @@ extern "C" { #endif /* __cplusplus */ +#if defined (ACE_LACKS_FD_MASK) + typedef long fd_mask; +#endif /* __QNX__ */ + #if defined (ACE_WIN32) // This will help until we figure out everything: # define NFDBITS 32 /* only used in unused functions... */ -#elif defined (__QNX__) -# if !defined (NFDBITS) -# define NFDBITS (sizeof(fd_mask) * NBBY) /* bits per mask */ -# endif /* ! NFDBITS */ +#elif defined (ACE_LACKS_NFDBITS) +# define NFDBITS (sizeof(fd_mask) * NBBY) /* bits per mask */ #endif /* ACE_WIN32 */ #ifdef __cplusplus diff --git a/dep/ACE_wrappers/ace/os_include/sys/os_socket.h b/dep/ACE_wrappers/ace/os_include/sys/os_socket.h index f70fee9df..676041747 100644 --- a/dep/ACE_wrappers/ace/os_include/sys/os_socket.h +++ b/dep/ACE_wrappers/ace/os_include/sys/os_socket.h @@ -6,7 +6,7 @@ * * main sockets header * - * $Id: os_socket.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: os_socket.h 85015 2009-04-03 12:27:59Z johnnyw $ * * @author Don Hinton * @author This code was originally in various places including ace/OS.h. @@ -30,9 +30,9 @@ # include /**/ #endif /* !ACE_LACKS_SYS_SOCKET_H */ -#if defined (ACE_VXWORKS) && (ACE_VXWORKS < 0x620) +#if defined (ACE_USES_SOCKLIB_H) # include /**/ -#endif /* ACE_VXWORKS */ +#endif /* ACE_USES_SOCKLIB_H */ // Place all additions (especially function declarations) within extern "C" {} #ifdef __cplusplus diff --git a/dep/ACE_wrappers/ace/os_include/sys/os_stat.h b/dep/ACE_wrappers/ace/os_include/sys/os_stat.h index a6ad4eeaf..19b126500 100644 --- a/dep/ACE_wrappers/ace/os_include/sys/os_stat.h +++ b/dep/ACE_wrappers/ace/os_include/sys/os_stat.h @@ -6,7 +6,7 @@ * * data returned by the stat() function * - * $Id: os_stat.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: os_stat.h 85057 2009-04-08 10:59:58Z msmit $ * * @author Don Hinton * @author This code was originally in various places including ace/OS.h. @@ -26,9 +26,9 @@ #include "ace/os_include/sys/os_types.h" -#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) +#if defined (ACE_HAS_DIRECT_H) # include /**/ -#endif /* ACE_WIN32 && !ACE_HAS_WINCE */ +#endif /* ACE_HAS_DIRECT_H */ #if !defined (ACE_LACKS_SYS_STAT_H) # include /**/ @@ -46,19 +46,44 @@ extern "C" // the following macros are for POSIX conformance. # if !defined (ACE_HAS_USER_MODE_MASKS) -# define S_IRWXU 00700 /* read, write, execute: owner. */ -# define S_IRUSR 00400 /* read permission: owner. */ -# define S_IWUSR 00200 /* write permission: owner. */ -# define S_IXUSR 00100 /* execute permission: owner. */ +# if !defined (S_IRWXU) +# define S_IRWXU 00700 /* read, write, execute: owner. */ +# endif /* !S_IRWXU */ +# if !defined (S_IRUSR) +# define S_IRUSR 00400 /* read permission: owner. */ +# endif /* !S_IRUSR */ +# if !defined (S_IWUSR) +# define S_IWUSR 00200 /* write permission: owner. */ +# endif /* !S_IWUSR */ +# if !defined (S_IXUSR) +# define S_IXUSR 00100 /* execute permission: owner. */ +# endif /* !S_IXUSR */ # endif /* ACE_HAS_USER_MODE_MASKS */ -# define S_IRWXG 00070 /* read, write, execute: group. */ -# define S_IRGRP 00040 /* read permission: group. */ -# define S_IWGRP 00020 /* write permission: group. */ -# define S_IXGRP 00010 /* execute permission: group. */ -# define S_IRWXO 00007 /* read, write, execute: other. */ -# define S_IROTH 00004 /* read permission: other. */ -# define S_IWOTH 00002 /* write permission: other. */ -# define S_IXOTH 00001 /* execute permission: other. */ + +# if !defined (S_IRWXG) +# define S_IRWXG 00070 +# endif /* S_IRWXG */ +# if !defined (S_IRGRP) +# define S_IRGRP 00040 +# endif /* S_IRGRP */ +# if !defined (S_IWGRP) +# define S_IWGRP 00020 +# endif /* S_IWGRP */ +# if !defined (S_IXGRP) +# define S_IXGRP 00010 +# endif /* S_IXGRP */ +# if !defined (S_IRWXO) +# define S_IRWXO 00007 +# endif /* S_IRWXO */ +# if !defined (S_IROTH) +# define S_IROTH 00004 +# endif /* S_IROTH */ +# if !defined (S_IWOTH) +# define S_IWOTH 00002 +# endif /* S_IWOTH */ +# if !defined (S_IXOTH) +# define S_IXOTH 00001 +# endif /* S_IXOTH */ // WinCE's S_IFLNK is defined with the other bits, below. #if !defined (S_IFLNK) && !defined (ACE_HAS_WINCE) @@ -77,7 +102,6 @@ extern "C" #endif /* S_ISLNK */ #if defined (ACE_HAS_WINCE) -# include "ace/Time_Value.h" // Translate the WinCE bits into names expected by our callers. // The dwFileAttributes parameter doesn't have protection info, so @@ -87,6 +111,11 @@ extern "C" # define S_IFREG FILE_ATTRIBUTE_NORMAL # define S_IFLNK 0 +# if !defined (__MINGW32__) + // Since CE does not have _stat by default as NT/2000 does, the 'stat' + // struct defined here will be used. Also note that CE file system + // struct is only for the CE 3.0 or later. + // Refer to the WCHAR.H from Visual C++ and WIBASE.H from eVC 3.0. struct stat { /// always 0 on Windows platforms @@ -96,19 +125,19 @@ extern "C" dev_t st_rdev; /// file attribute - unsigned short st_mode; + mode_t st_mode; /// number of hard links - short st_nlink; + nlink_t st_nlink; /// time of last access - ACE_Time_Value st_atime; + time_t st_atime; /// time of last data modification - ACE_Time_Value st_mtime; + time_t st_mtime; /// time of creation - ACE_Time_Value st_ctime; + time_t st_ctime; /// file size, in bytes ACE_OFF_T st_size; @@ -117,6 +146,7 @@ extern "C" //u_long st_blksize; // optimal blocksize for I/O //u_long st_flags; // user defined flags for file }; + #endif #endif /* ACE_HAS_WINCE */ #ifdef __cplusplus diff --git a/dep/ACE_wrappers/ace/os_include/sys/os_time.h b/dep/ACE_wrappers/ace/os_include/sys/os_time.h index 4c6fdce76..937ceebaa 100644 --- a/dep/ACE_wrappers/ace/os_include/sys/os_time.h +++ b/dep/ACE_wrappers/ace/os_include/sys/os_time.h @@ -6,7 +6,7 @@ * * time types * - * $Id: os_time.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: os_time.h 85365 2009-05-18 08:27:42Z johnnyw $ * * @author Don Hinton * @author This code was originally in various places including ace/OS.h. @@ -41,11 +41,7 @@ extern "C" #endif /* __cplusplus */ #if defined (ACE_HAS_SVR4_GETTIMEOFDAY) -# if !defined (SCO) int gettimeofday (struct timeval *tp, void * = 0); -# else - int gettimeofday (struct timeval *tp); -# endif /* !SCO */ #elif defined (ACE_HAS_OSF1_GETTIMEOFDAY) int gettimeofday (struct timeval *tp, struct timezone * = 0); #elif defined (ACE_HAS_VOIDPTR_GETTIMEOFDAY) diff --git a/dep/ACE_wrappers/ace/os_include/sys/os_timeb.h b/dep/ACE_wrappers/ace/os_include/sys/os_timeb.h index e276ba8bb..cf10566ed 100644 --- a/dep/ACE_wrappers/ace/os_include/sys/os_timeb.h +++ b/dep/ACE_wrappers/ace/os_include/sys/os_timeb.h @@ -6,7 +6,7 @@ * * additional definitions for date and time * - * $Id: os_timeb.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: os_timeb.h 83306 2008-10-17 12:19:53Z johnnyw $ * * @author Don Hinton * @author This code was originally in various places including ace/OS.h. @@ -36,11 +36,6 @@ extern "C" { #endif /* __cplusplus */ -#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x560) -# define _ftime ftime -# define _timeb timeb -#endif /* __BORLANDC__ */ - #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/dep/ACE_wrappers/ace/os_include/sys/os_types.h b/dep/ACE_wrappers/ace/os_include/sys/os_types.h index 794faf86d..963826537 100644 --- a/dep/ACE_wrappers/ace/os_include/sys/os_types.h +++ b/dep/ACE_wrappers/ace/os_include/sys/os_types.h @@ -6,7 +6,7 @@ * * data types * - * $Id: os_types.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: os_types.h 88515 2010-01-13 08:47:38Z johnnyw $ * * @author Don Hinton * @author This code was originally in various places including ace/OS.h. @@ -30,9 +30,9 @@ # include /**/ #endif /* !ACE_LACKS_SYS_TYPES_H */ -#if defined (ACE_HAS_WINCE) +#if defined (ACE_HAS_TYPES_H) # include /**/ -#endif /* ACE_HAS_WINCE */ +#endif /* ACE_HAS_TYPES_H */ # if defined (ACE_USES_STD_NAMESPACE_FOR_STDC_LIB) && \ (ACE_USES_STD_NAMESPACE_FOR_STDC_LIB != 0) @@ -55,22 +55,13 @@ typedef double ACE_timer_t; # endif /* CLOCK_REALTIME */ #endif /* ! ACE_HAS_CLOCK_GETTIME && ! _CLOCKID_T_ */ -#if defined (ACE_HAS_WINCE) - -// CE's add-on for c-style fstat/stat functionalities. This struct is -// by no mean complete compared to what you usually find in UNIX -// platforms. Only members that have direct conversion using Win32's -// BY_HANDLE_FILE_INFORMATION are defined so that users can discover -// non-supported members at compile time. Time values are of type -// ACE_Time_Value for easy comparison. - -// Since CE does not have _stat by default as NT/2000 does, the 'stat' -// struct defined here will be used. Also note that CE file system -// struct is only for the CE 3.0 or later. -// Refer to the WCHAR.H from Visual C++ and WIBASE.H from eVC 3.0. - +#if defined (ACE_LACKS_DEV_T) typedef unsigned int dev_t; -#endif /* ACE_HAS_WINCE */ +#endif /* ACE_LACKS_DEV_T */ + +#if defined (ACE_HAS_WINCE) + typedef long off_t; +#endif #if defined(ACE_WIN32) && defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS==64) typedef __int64 ACE_OFF_T; @@ -80,8 +71,8 @@ typedef double ACE_timer_t; #if defined (ACE_SIZEOF_LONG) && ACE_SIZEOF_LONG == 8 typedef off_t ACE_LOFF_T; -#elif defined (ACE_HAS_RTEMS) || defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__APPLE__) || \ - (defined (ACE_OPENVMS) && defined (_LARGEFILE)) || defined(ACE_MVS) +#elif defined (ACE_HAS_RTEMS) || defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__APPLE__) || defined(ACE_MVS) || defined(__INTERIX) || \ + (defined (ACE_OPENVMS) && defined (_LARGEFILE)) typedef off_t ACE_LOFF_T; #elif defined (__sgi) || defined (AIX) || defined (HPUX) || defined (__QNX__) typedef off64_t ACE_LOFF_T; @@ -89,7 +80,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 <= 0x660)) || \ +#elif (defined (ACE_VXWORKS) && (ACE_VXWORKS <= 0x680)) || \ defined (ACE_LYNXOS_MAJOR) || \ (defined (ACE_OPENVMS) && !defined (_LARGEFILE)) || \ defined (__TANDEM) @@ -98,17 +89,25 @@ typedef double ACE_timer_t; typedef loff_t ACE_LOFF_T; #endif -#if defined (ACE_WIN32) -# if !defined (__BORLANDC__) - typedef DWORD nlink_t; -# if !defined(__MINGW32__) - typedef int mode_t; -# endif /* !__MINGW32__ */ - typedef long uid_t; - typedef long gid_t; -# endif /* __BORLANDC__ */ - typedef char *caddr_t; -#endif /* ACE_WIN32 */ +#if defined (ACE_LACKS_UID_T) +typedef long uid_t; +#endif /* ACE_LACKS_UID_T */ + +#if defined (ACE_LACKS_GID_T) +typedef long gid_t; +#endif /* ACE_LACKS_GID_T */ + +#if defined (ACE_LACKS_CADDR_T) +typedef char *caddr_t; +#endif /* ACE_LACKS_CADDR_T */ + +#if defined (ACE_LACKS_MODE_T) +typedef u_short mode_t; +#endif /* ACE_LACKS_MODE_T */ + +#if defined (ACE_LACKS_NLINK_T) +typedef DWORD nlink_t; +#endif /* ACE_LACKS_NLINK_T */ #if defined (ACE_LACKS_KEY_T) # if defined (ACE_WIN32) diff --git a/dep/ACE_wrappers/ace/os_include/sys/os_un.h b/dep/ACE_wrappers/ace/os_include/sys/os_un.h index 6fe6ec6e1..04a4da0bd 100644 --- a/dep/ACE_wrappers/ace/os_include/sys/os_un.h +++ b/dep/ACE_wrappers/ace/os_include/sys/os_un.h @@ -6,7 +6,7 @@ * * definitions for UNIX domain sockets * - * $Id: os_un.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: os_un.h 85015 2009-04-03 12:27:59Z johnnyw $ * * @author Don Hinton * @author This code was originally in various places including ace/OS.h. @@ -36,12 +36,12 @@ extern "C" { #endif /* __cplusplus */ -#if defined (ACE_VXWORKS) && (ACE_VXWORKS <= 0x600) +#if defined (ACE_LACKS_SOCKADDR_UN) struct sockaddr_un { short sun_family; // AF_UNIX. char sun_path[108]; // path name. }; -#endif /* ACE_VXWORKS */ +#endif /* ACE_LACKS_SOCKADDR_UN */ #ifdef __cplusplus diff --git a/dep/ACE_wrappers/ace/pre.h b/dep/ACE_wrappers/ace/pre.h index b9a543a54..7cc32d8ff 100644 --- a/dep/ACE_wrappers/ace/pre.h +++ b/dep/ACE_wrappers/ace/pre.h @@ -16,7 +16,6 @@ // No header guard #if defined (_MSC_VER) # pragma warning (disable:4103) -# pragma warning (disable:4005) # pragma pack (push, 8) #elif defined (__BORLANDC__) # pragma option push -a8 -b -Ve- -Vx- -w-rvl -w-rch -w-ccc -w-obs -w-aus -w-pia -w-inl -w-sig diff --git a/dep/ACE_wrappers/ace/svc_export.h b/dep/ACE_wrappers/ace/svc_export.h index e84907b6e..18cf3a24c 100644 --- a/dep/ACE_wrappers/ace/svc_export.h +++ b/dep/ACE_wrappers/ace/svc_export.h @@ -1,5 +1,5 @@ // -*- C++ -*- -// $Id: svc_export.h 80826 2008-03-04 14:51:23Z wotte $ +// $Id: svc_export.h 84495 2009-02-17 17:44:31Z johnnyw $ // Definition for Win32 Export directives. // This file was generated by generate_export_file.pl diff --git a/dep/ACE_wrappers/ace/svcconf.mpb b/dep/ACE_wrappers/ace/svcconf.mpb index c2eee25b8..4ac633b80 100644 --- a/dep/ACE_wrappers/ace/svcconf.mpb +++ b/dep/ACE_wrappers/ace/svcconf.mpb @@ -1,5 +1,5 @@ // -*- MPC -*- -// $Id: svcconf.mpb 81335 2008-04-11 01:53:36Z iliyan $ +// $Id: svcconf.mpb 89216 2010-02-25 07:39:30Z johnnyw $ feature(ace_svcconf) { macros -= ACE_LACKS_ACE_SVCCONF @@ -25,34 +25,5 @@ feature(ace_svcconf) { UTF32_Encoding_Converter.cpp XML_Svc_Conf.cpp } - - verbatim(gnuace, local) { - "Svc_Conf_y.cpp: Svc_Conf.y" - "ifeq ($(notdir $(YACC)), bison)" - " $(YACC) -l -d Svc_Conf.y" - " sed -e 's/fprintf/ACE_OS::fprintf/g' \\" // Use ACE's fprintf, not library's - " -e 's/\\t/ /g' \\" // Eliminate tabs (replace with 2 spaces) - " -e 's/yy/ace_yy/g' \\" - " -e 's/->ace_yyerrno/->yyerrno/g' \\" // This reverses the ace_ prefix where it - " -e 's/->ace_yylineno/->yylineno/g' \\" // should not have been added by the substitution, above. - " -e 's/ NULL/ 0/g' \\" - " -e 's/ace_yyerror[ ]*([ ]*\"/ace_yyerror (ACE_SVC_CONF_PARAM->yyerrno, ACE_SVC_CONF_PARAM->yylineno, \"/g' \\" - " -e 's/ace_yyerror[ ]*([ ]*ace_yymsg/ace_yyerror (ACE_SVC_CONF_PARAM->yyerrno, ACE_SVC_CONF_PARAM->yylineno, ace_yymsg/g' \\" - " -e 's/ace_yyerror[ ]*([ ]*YY_/ace_yyerror (ACE_SVC_CONF_PARAM->yyerrno, ACE_SVC_CONF_PARAM->yylineno, YY_/g' \\" - " -e 's@#include @@' \\" - " -e 's/Svc_Conf\\.tab\\.c/Svc_Conf_y.cpp/g' $@" - " $(RM) -f Svc_Conf.tab.c Svc_Conf_y.cpp.orig" - "else" - " @echo 'ERROR: You must use bison 1.35 or higher to process this file'" - " @/bin/false" - "endif" - - "Svc_Conf_Token_Table.h: Svc_Conf.y Svc_Conf_y.cpp" - "ifeq ($(notdir $(YACC)), bison)" - " mv Svc_Conf.tab.h Svc_Conf_Token_Table.h" - "else" - " @echo 'ERROR: You must use bison 1.35 or higher to process this file'" - " @/bin/false" - "endif" - } } + diff --git a/dep/ACE_wrappers/ace/svcconfgen.mpc b/dep/ACE_wrappers/ace/svcconfgen.mpc new file mode 100644 index 000000000..35aecd1e8 --- /dev/null +++ b/dep/ACE_wrappers/ace/svcconfgen.mpc @@ -0,0 +1,35 @@ +// -*- MPC -*- +// $Id: svcconfgen.mpc 89216 2010-02-25 07:39:30Z johnnyw $ + +project(ace_svcconf_gen) { + requires += ace_svcconf_gen + verbatim(gnuace, local) { + "Svc_Conf_y.cpp: Svc_Conf.y" + "ifeq ($(notdir $(YACC)), bison)" + " $(YACC) -l -d Svc_Conf.y" + " sed -e 's/fprintf/ACE_OS::fprintf/g' \\" // Use ACE's fprintf, not library's + " -e 's/\\t/ /g' \\" // Eliminate tabs (replace with 2 spaces) + " -e 's/yy/ace_yy/g' \\" + " -e 's/->ace_yyerrno/->yyerrno/g' \\" // This reverses the ace_ prefix where it + " -e 's/->ace_yylineno/->yylineno/g' \\" // should not have been added by the substitution, above. + " -e 's/ NULL/ 0/g' \\" + " -e 's/ace_yyerror[ ]*([ ]*\"/ace_yyerror (ACE_SVC_CONF_PARAM->yyerrno, ACE_SVC_CONF_PARAM->yylineno, \"/g' \\" + " -e 's/ace_yyerror[ ]*([ ]*ace_yymsg/ace_yyerror (ACE_SVC_CONF_PARAM->yyerrno, ACE_SVC_CONF_PARAM->yylineno, ace_yymsg/g' \\" + " -e 's/ace_yyerror[ ]*([ ]*YY_/ace_yyerror (ACE_SVC_CONF_PARAM->yyerrno, ACE_SVC_CONF_PARAM->yylineno, YY_/g' \\" + " -e 's@#include @@' \\" + " -e 's/Svc_Conf\\.tab\\.c/Svc_Conf_y.cpp/g' $@" + " $(RM) -f Svc_Conf.tab.c Svc_Conf_y.cpp.orig" + "else" + " @echo 'ERROR: You must use bison 1.35 or higher to process this file'" + " @/bin/false" + "endif" + + "Svc_Conf_Token_Table.h: Svc_Conf.y Svc_Conf_y.cpp" + "ifeq ($(notdir $(YACC)), bison)" + " mv Svc_Conf.tab.h Svc_Conf_Token_Table.h" + "else" + " @echo 'ERROR: You must use bison 1.35 or higher to process this file'" + " @/bin/false" + "endif" + } +} diff --git a/dep/ACE_wrappers/configure.ac b/dep/ACE_wrappers/configure.ac index 52051be76..dcf1aa233 100644 --- a/dep/ACE_wrappers/configure.ac +++ b/dep/ACE_wrappers/configure.ac @@ -1,4 +1,4 @@ -dnl $Id: configure.ac 82832 2008-09-25 17:38:39Z jtc $ +dnl $Id: configure.ac 91345 2010-08-12 16:20:20Z shuston $ dnl An autoconf script to automatically configure ACE. dnl Process this file with autoconf to produce a configure script. @@ -14,12 +14,9 @@ dnl particularly with M4, do not modify this macro definition. define([ACE_VERSION], patsubst(esyscmd(grep ACE_VERSION ace/Version.h | sed 's/.*\" *\(.*\)\".*/\1/'), [ ]))dnl remove newline ending every `esyscmd' answer -AC_INIT([ACE], - ACE_VERSION, - [ace-bugs@cs.wustl.edu], - [ace]) +AC_INIT([ACE],[ACE_VERSION],[ace-bugs@cs.wustl.edu],[ace]) -AC_REVISION([$Id: configure.ac 82832 2008-09-25 17:38:39Z jtc $]) +AC_REVISION([$Id: configure.ac 91345 2010-08-12 16:20:20Z shuston $]) AC_COPYRIGHT([ACE(TM), TAO(TM), CIAO(TM), and CoSMIC(TM) (henceforth referred to as "DOC software") are copyrighted by Douglas C. @@ -39,7 +36,7 @@ additional details.]) dnl Require GNU Autoconf 2.58 or better. Previous versions did not dnl correctly support HP-UX. -AC_PREREQ([2.58]) +AC_PREREQ(2.61) dnl Autoconf explicitly forbids patterns containing "_AC_". This causes dnl a problem when using MPC to generate the Automake ".am" files since @@ -63,7 +60,7 @@ dnl Add maintainer mode option to the option list. dnl AM_MAINTAINER_MODE dnl The maintainer of this configure script. -ACE_CONFIGURE_MAINTAINER='ace-users@cs.wustl.edu' +ACE_CONFIGURE_MAINTAINER='ace-users@list.isis.vanderbilt.edu' dnl Until autoconf support in ACE is complete, prevent this script @@ -135,6 +132,9 @@ AC_LANG([C++]) dnl If we are cross compiling disable certain things in the Makefiles. AM_CONDITIONAL([ACE_CROSS_COMPILED], [test X$cross_compiling = Xyes]) +dnl If we are cross compiling disable certain things in the Makefiles. +AM_CONDITIONAL([BUILD_CROSS_COMPILE], [test X$cross_compiling = Xyes]) + dnl Look for the best awk-style program available. AC_PROG_AWK @@ -368,9 +368,6 @@ AC_DISABLE_STATIC dnl Enable Libtool module support AC_LIBTOOL_DLOPEN -dnl Enable support for "clean" DLLs. -AC_LIBTOOL_WIN32_DLL - dnl dnl ###### Relies on the as of yet unreleased Libtool 1.6 distribuion ### dnl @@ -764,7 +761,7 @@ dnl Check if XTI headers define TCP macros that conflict with netinet/tcp.h's # endif /* ACE_HAS_XTI */ # if !defined (ACE_LACKS_NETINET_TCP_H) # include /**/ -# endif /* !ACE_LACKS_NETIINET_TCP_H */ +# endif /* !ACE_LACKS_NETINET_TCP_H */ ]],[[ int a = 0; ]])],[ @@ -1004,12 +1001,6 @@ AC_CHECK_HEADER([new], ACE_CHECK_HAS_HEADERS([new.h]) ]) -dnl ace/OS.i can #include ,not #include -dnl "cstring" is the correct form. -dnl TODO: Double check the above comment. -AC_CHECK_HEADER([cstring], - [AC_DEFINE([ACE_HAS_GNU_CSTRING_H])],) - AC_CHECK_HEADER([memory],,) dnl Check for availablity of "new style" C++ stream headers @@ -1304,6 +1295,11 @@ AC_CHECK_TYPE([sigset_t], [AC_DEFINE([ACE_LACKS_SIGSET], 1, [Define to 1 if the system lacks the type `sigset_t'.])], [#include ]) +AC_CHECK_TYPE([struct lifnum], + [], + [AC_DEFINE([ACE_LACKS_STRUCT_LIFNUM], 1, + [Define to 1 if the system uses int instead of `struct lifnum' for SIOCGIFNUM ioctl.])], + [#include ]) AC_CHECK_TYPE([struct utsname], [], [AC_DEFINE([ACE_LACKS_UTSNAME_T], 1, @@ -1568,48 +1564,6 @@ ACE_CACHE_CHECK([for sys_siglist], ]) ],[AC_DEFINE([ACE_HAS_SYS_SIGLIST])],) -dnl Check for sys_errlist -dnl TODO: Check whether this variable can be defined somewhere else. -ACE_CACHE_CHECK([for sys_errlist], - [ace_cv_lib_posix_sys_errlist],[ - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -#include -#include -#if !defined (_sys_errlist) -# define _sys_errlist sys_errlist -#endif - ]],[[ - void* vp = (void*) &_sys_errlist; - ]])],[ - ace_cv_lib_posix_sys_errlist=yes - ],[ - dnl Check if sys_errlist is a global variable in a library - AC_LINK_IFELSE([AC_LANG_PROGRAM( - [[ -#include -#include - -#if !defined (_sys_errlist) -# define _sys_errlist sys_errlist -#endif - -extern const char * const _sys_errlist[]; - ]], - [[ - void* vp = (void*) &_sys_errlist; - ]])], - [ - ace_cv_lib_posix_sys_errlist=yes - ], - [ - ace_cv_lib_posix_sys_errlist=no - ]) - ]) - ],[AC_DEFINE([ACE_HAS_SYS_ERRLIST])],) - -dnl Save the cache for debugging purposes -AC_CACHE_SAVE - dnl SECTION 9: checks for compiler characteristics @@ -2114,62 +2068,6 @@ ACE_CACHE_CHECK([for new style C++ include file support], AC_DEFINE([ACE_HAS_STRING_CLASS]) ],) -AC_CHECK_HEADER([map], -[ - AC_CHECK_HEADER([net/if.h], - [ - ACE_CACHE_CHECK([if STL map class conflicts with map struct], - [ace_cv_header_stl_map_conflict], - [ - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -#ifndef ACE_LACKS_SYS_TYPES_H -# include -#endif -#include -#include - ]],[[ -#ifdef ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB - std::map ace_map; -#else - map ace_map; -#endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */ - ]])],[ - ace_cv_header_stl_map_conflict=no - ],[ - ace_cv_header_stl_map_conflict=yes - ]) - ],[AC_DEFINE([ACE_HAS_STL_MAP_CONFLICT])],) - ],) -],) - -AC_CHECK_HEADER([queue], -[ - AC_CHECK_HEADER([netinet/in.h], - [ - ACE_CACHE_CHECK([if STL queue class conflicts with queue struct], - [ace_cv_header_stl_queue_conflict], - [ - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -#ifndef ACE_LACKS_SYS_TYPES_H -# include -#endif -#include -#include - ]],[[ -#ifdef ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB - std::queue ace_queue; -#else - queue ace_queue; -#endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */ - ]])],[ - ace_cv_header_stl_queue_conflict=no - ],[ - ace_cv_header_stl_queue_conflict=yes - ]) - ],[AC_DEFINE([ACE_HAS_STL_QUEUE_CONFLICT])],) - ],) -],) - dnl Check whether platform supports the standard C++ library dnl TODO: For now, check whether headers , dnl and exist; is there a better way? @@ -3040,6 +2938,27 @@ if test "$ac_cv_func__InterlockedIncrement" = yes && AC_DEFINE([ACE_HAS_INTRINSIC_INTERLOCKED]) fi +dnl Check for GCC atomic builtin +AC_MSG_CHECKING([for GCC atomic builtin]) +AC_LINK_IFELSE([AC_LANG_PROGRAM( + [[ + ]], + [[ + volatile unsigned long val = 10; + unsigned long retval = __sync_sub_and_fetch(&val, 1); + retval = __sync_add_and_fetch(&val, 1); + retval = __sync_fetch_and_sub(&val, 1); + retval = __sync_fetch_and_add(&val, 1); + ]])], + [ + AC_MSG_RESULT([yes]) + AC_DEFINE([ACE_HAS_GCC_ATOMIC_BUILTINS], 1, + [Define to 1 if compiler has builtin atomic support]) + ], + [ + AC_MSG_RESULT([no]) + ]) + ACE_CHECK_LACKS_FUNCS(access) ACE_CHECK_LACKS_FUNCS(alphasort) @@ -3109,6 +3028,8 @@ ACE_CHECK_HAS_FUNCS(getifaddrs) ACE_CHECK_LACKS_FUNCS(getegid geteuid getgid) +ACE_CHECK_LACKS_FUNCS(setenv unsetenv) + ACE_CHECK_LACKS_FUNCS(getopt) if test $ac_cv_func_getopt = yes; then AC_CHECK_DECL([getopt], @@ -3366,11 +3287,10 @@ if test "$ac_cv_func_strnlen" = yes; then [#include ]) fi +ACE_CHECK_HAS_FUNCS(strsignal) + ACE_CHECK_LACKS_FUNCS(strchr) -# 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) ACE_CHECK_LACKS_FUNCS(strftime) @@ -3385,9 +3305,11 @@ ACE_CHECK_LACKS_FUNCS(strtod) ACE_CHECK_LACKS_FUNCS(strtol) +ACE_FUNC_STRTOLL + ACE_CHECK_LACKS_FUNCS(strtoul) -ACE_CHECK_LACKS_FUNCS(strtoull) +ACE_FUNC_STRTOULL # swab() comes in a number of forms: # swab (const void*, void*, size_t) is POSIX, XPG4, SUS, SUSv2 standard. @@ -3494,6 +3416,7 @@ main () AC_CHECK_FUNC([gethostbyaddr],,) +if test "$cross_compiling" != yes; then case "$host" in *linux*) dnl Linux Event Poll @@ -3546,6 +3469,7 @@ main () []) ;; esac +fi AC_CHECK_FUNC([gethrtime]) if test $ac_cv_func_gethrtime = "yes"; then @@ -3683,8 +3607,9 @@ ACE_CHECK_HAS_FUNCS(vasprintf vaswprintf vfwprintf vswprintf) ACE_CHECK_HAS_FUNCS(wcsnlen) -ACE_CHECK_LACKS_FUNCS(fgetws fputws itow towlower towupper wcscat wcschr wcscmp wcscpy wcscspn wcslen wcsncat wcsncmp wcsncpy wcsnicmp wcspbrk wcsrchr wcsspn wcsstr wcstod wcstok wcstol wcstoul wcstoull) +ACE_CHECK_LACKS_FUNCS(fgetws fputws isblank iswblank isctype iswctype itow towlower towupper wcscat wcschr wcscmp wcscpy wcscspn wcslen wcsncat wcsncmp wcsncpy wcsnicmp wcspbrk wcsrchr wcsspn wcsstr wcstod) +ACE_CHECK_LACKS_FUNCS(wcstok) if test "$ac_cv_func_wcstok" = yes; then dnl The wcstok() function varies with standards. Check which one we have. AC_MSG_CHECKING([for 2- or 3-param wcstok]) @@ -3708,6 +3633,14 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM( ]) fi dnl test "$ac_cv_func_wcstok" = yes +ACE_CHECK_LACKS_FUNCS(wcstol) + +ACE_FUNC_WCSTOLL + +ACE_CHECK_LACKS_FUNCS(wcstoul) + +ACE_FUNC_WCSTOULL + dnl Check for SYSV IPC functions dnl dnl Although Darwin/OS X does not implement any of the SysV IPC API, @@ -3827,7 +3760,7 @@ 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(vsnprintf) ACE_CHECK_LACKS_FUNCS(tempnam truncate) @@ -4646,11 +4579,11 @@ if test "$ace_user_enable_reentrant_funcs" = yes; then #endif ]], [[ - const char * name; + const char * name = 0; struct passwd * pwent; - char * buffer; + char * buffer = 0; int buflen; - struct passwd * result; + struct passwd * result = 0; int status = getpwnam_r (name, pwent, buffer, buflen, &result); ]])], @@ -4659,10 +4592,11 @@ if test "$ace_user_enable_reentrant_funcs" = yes; then AC_DEFINE([ACE_HAS_POSIX_GETPWNAM_R]) fi ], - [ - echo "Nothing to do"; - ]) - ], + [ + dnl Nothing to do! + echo + ]), + ],, [AC_DEFINE([ACE_LACKS_PWD_REENTRANT_FUNCTIONS])]) AC_CHECK_FUNC([ctime_r],,) @@ -6023,85 +5957,6 @@ dnl dnl SECTION 13: checks for system services dnl -dnl Check if platform defines ctime() as a macro -ACE_CACHE_CHECK([for ctime() macro], - [ace_cv_feature_have_ctime_macro], - [ - AC_EGREP_CPP([ACE_CTIME_MACRO], - [ -#include - -#if defined (ctime) - ACE_CTIME_MACRO -#endif - ], - [ - ace_cv_feature_have_ctime_macro=yes - ], - [ - ace_cv_feature_have_ctime_macro=no - ]) - ], [AC_DEFINE([ACE_HAS_BROKEN_CTIME])],) - -dnl Check if platform defines ctime_r, asctime_r, rand_r or getpwnam_r -dnl as macros. -ACE_CACHE_CHECK([for reentrant function macros], - [ace_cv_feature_has_broken_r_routines], - [ - AC_EGREP_CPP([ACE_R_MACROS], - [ -#ifndef _REENTRANT -# define _REENTRANT -#endif - -#include - -#if !defined (ACE_LACKS_PWD_H) -# include -#endif - -#if defined (ctime_r) || \ - defined (asctime_r) || \ - defined (rand_r) || \ - defined (getpwnam_r) - ACE_R_MACROS -#endif - ], - [ - ace_cv_feature_has_broken_r_routines=yes - ], - [ - ace_cv_feature_has_broken_r_routines=no - ]) - ], [AC_DEFINE([ACE_HAS_BROKEN_R_ROUTINES])],) - -dnl Check if platform defines sig{empty,fill,add,del}set as macros -ACE_CACHE_CHECK([for sig{empty fill add del}set macros], - [ace_cv_feature_have_sig_macros], - [ - AC_EGREP_CPP([ACE_SIG_MACROS], - [ -#ifndef ACE_LACKS_SYS_TYPES_H -# include -#endif -#include - -#if defined (sigemptyset) || \ - defined (sigfillset) || \ - defined (sigaddset) || \ - defined (sigdelset) || \ - defined (sigismember) - ACE_SIG_MACROS -#endif - ], - [ - ace_cv_feature_have_sig_macros=yes - ], - [ - ace_cv_feature_have_sig_macros=no - ]) - ], [AC_DEFINE([ACE_HAS_SIG_MACROS])],) - dnl Check for open() mode masks ACE_CACHE_CHECK([for open() mode masks], [ace_cv_feature_have_open_mode_masks],[ @@ -7157,7 +7012,7 @@ elif test "$ace_cv_lib_signal_vi1_2" != yes && test "$ace_cv_lib_struct_sigaction_vv1_handler" != yes && test "$ace_cv_lib_struct_sigaction_vi1a2_handler" != yes && test "$ace_cv_lib_struct_sigaction_va1_handler" = yes; then - AC_DEFINE([ACE_HAS_LYNXOS_SIGNALS]) + AC_DEFINE([ACE_HAS_LYNXOS4_SIGNALS]) AC_DEFINE([ACE_HAS_TANDEM_SIGNALS]) elif test "$ace_cv_lib_signal_vi1_2" = yes && test "$ace_cv_lib_signal_vi1_ret" = yes && @@ -7253,17 +7108,17 @@ ACE_CACHE_CHECK([if generated ACE configuration is usable], dnl there would be no chance that the rest of ACE would compile. ], [ - AC_MSG_ERROR( + AC_MSG_WARN( [ The generated configuration appears to be unusable. Please verify that your system path and environment variables are correct. If they appear to be correct then please send the maintainer of this configure -script $ACE_CONFIGURE_MAINTAINER the *COMPRESSED* 'config.log' file -and the following information: +script $ACE_CONFIGURE_MAINTAINER the *COMPRESSED* 'config.log' file, +the generated ace/config.h file and the following information: ACE 'configure' Script Information ================================== - [RCS] translit([$Id: configure.ac 82832 2008-09-25 17:38:39Z jtc $], [$"]) + [RCS] translit([$Id: configure.ac 91345 2010-08-12 16:20:20Z shuston $], [$"]) ACE Version: ACE_VERSION @@ -7382,27 +7237,6 @@ dnl created first. dnl Makefile dnl ace/Makefile -dnl apps/Makefile -dnl apps/gperf/Makefile -dnl apps/gperf/src/Makefile -dnl man/Makefile -dnl man/man3/Makefile -dnl netsvcs/Makefile -dnl netsvcs/clients/Makefile -dnl netsvcs/clients/Logger/Makefile -dnl netsvcs/clients/Naming/Makefile -dnl netsvcs/clients/Naming/Client/Makefile -dnl netsvcs/clients/Naming/Dump_Restore/Makefile -dnl netsvcs/clients/Tokens/Makefile -dnl netsvcs/clients/Tokens/collection/Makefile -dnl netsvcs/clients/Tokens/deadlock/Makefile -dnl netsvcs/clients/Tokens/invariant/Makefile -dnl netsvcs/clients/Tokens/manual/Makefile -dnl netsvcs/clients/Tokens/mutex/Makefile -dnl netsvcs/clients/Tokens/rw_lock/Makefile -dnl netsvcs/lib/Makefile -dnl netsvcs/servers/Makefile -dnl tests/Makefile AC_CONFIG_FILES([ Makefile diff --git a/dep/ACE_wrappers/m4/.gitignore b/dep/ACE_wrappers/m4/.gitignore deleted file mode 100644 index 23fc95a8b..000000000 --- a/dep/ACE_wrappers/m4/.gitignore +++ /dev/null @@ -1,17 +0,0 @@ -# -# NOTE! Don't add files that are generated in specific -# subdirectories here. Add them in the ".gitignore" file -# in that subdirectory instead. -# -# NOTE! Please use 'git-ls-files -i --exclude-standard' -# command after changing this file, to see if there are -# any tracked files which get ignored after the change. -# -# MaNGOS generated files -# - -libtool.m4 -ltoptions.m4 -ltsugar.m4 -ltversion.m4 -lt~obsolete.m4 diff --git a/dep/ACE_wrappers/m4/ace.m4 b/dep/ACE_wrappers/m4/ace.m4 index f04555763..64b4ee7a0 100644 --- a/dep/ACE_wrappers/m4/ace.m4 +++ b/dep/ACE_wrappers/m4/ace.m4 @@ -1,5 +1,5 @@ dnl ------------------------------------------------------------------------- -dnl $Id: ace.m4 82523 2008-08-06 08:36:01Z johnnyw $ +dnl $Id: ace.m4 88997 2010-02-15 09:38:01Z johnnyw $ dnl dnl ace.m4 dnl @@ -1250,8 +1250,8 @@ AC_DEFUN([ACE_PATH_FL], fi fi if test X"${FLTKCONFIG}" != X; then - ACE_FLTK_CPPFLAGS=`$FLTKCONFIG --use-gl --cxxflags 2>/dev/null` - ACE_FLTK_LIBS=`$FLTKCONFIG --use-gl --ldflags 2>/dev/null` + ACE_FLTK_CPPFLAGS=`$FLTKCONFIG --cxxflags 2>/dev/null` + ACE_FLTK_LIBS=`$FLTKCONFIG --ldflags 2>/dev/null` AC_SUBST(ACE_FLTK_CPPFLAGS) AC_SUBST(ACE_FLTK_LIBS) @@ -1393,6 +1393,7 @@ if test "$no_x" != yes; then AC_SUBST(ACE_XT_LIBS) fi AM_CONDITIONAL([BUILD_ATHENA], true) +AM_CONDITIONAL([BUILD_ATHENA3D], true) AM_CONDITIONAL([BUILD_MOTIF], false) ]) diff --git a/dep/ACE_wrappers/m4/ace_func.m4 b/dep/ACE_wrappers/m4/ace_func.m4 index 14b84973b..bc8cbd116 100644 --- a/dep/ACE_wrappers/m4/ace_func.m4 +++ b/dep/ACE_wrappers/m4/ace_func.m4 @@ -35,8 +35,8 @@ fi ]) # ACE_FUNC_STRNCASECMP -# + Defines ACE_LACKS_STRCASECMP to 1 if platform lacks strcasecmp() -# + Defines ACE_STRCASECMP_EQUIVALENT to identifier name if platform +# + Defines ACE_LACKS_STRNCASECMP to 1 if platform lacks strncasecmp() +# + Defines ACE_STRNCASECMP_EQUIVALENT to identifier name if platform # has a equivalent function that differs in name only. # + Defines ACE_LACKS_STRNCASECMP_PROTOTYPE to 1 if platform lacks # declaration for strncasecmp(). @@ -87,9 +87,65 @@ if test "$ac_cv_func_strdup" = no; then fi ]) +# ACE_FUNC_STRTOLL +# + Defines ACE_LACKS_STRTOLL to 1 if platform lacks strtoll() +# + Defines ACE_STRTOLL_EQUIVALENT to identifier name if platform +# has a equivalent function that differs in name only. +# + Defines ACE_LACKS_STRTOLL_PROTOTYPE to 1 if platform lacks +# declaration for strtoll(). +AC_DEFUN([ACE_FUNC_STRTOLL], +[ACE_CHECK_LACKS_FUNCS(strtoll) +if test $ac_cv_func_strtoll = "no"; then + AC_CHECK_FUNC(__strtoll) + if test $ac_cv_func___strtoll = "yes"; then + AC_DEFINE([ACE_STRTOLL_EQUIVALENT], [::__strtoll], + [Define to function that is equivalent to strtoll()]) + else + AC_CHECK_FUNC(_strtoi64) + if test $ac_cv_func__strtoi64 = "yes"; then + AC_DEFINE([ACE_STRTOLL_EQUIVALENT], [::_strtoi64]) + fi + fi +else + AC_CHECK_DECL([strtoll], + [], + [AC_DEFINE([ACE_LACKS_STRTOLL_PROTOTYPE], 1, + [Define to 1 if platform lacks a declaration for strtoll()])], + [#include ]) +fi +]) + +# ACE_FUNC_STRTOULL +# + Defines ACE_LACKS_STRTOULL to 1 if platform lacks strtoull() +# + Defines ACE_STRTOULL_EQUIVALENT to identifier name if platform +# has a equivalent function that differs in name only. +# + Defines ACE_LACKS_STRTOULL_PROTOTYPE to 1 if platform lacks +# declaration for strtoull(). +#--------------------------------------------------------------------------- +AC_DEFUN([ACE_FUNC_STRTOULL], +[ACE_CHECK_LACKS_FUNCS(strtoull) +if test $ac_cv_func_strtoull = "no"; then + AC_CHECK_FUNC(__strtoull) + if test $ac_cv_func___strtoull = "yes"; then + AC_DEFINE([ACE_STRTOULL_EQUIVALENT], [::__strtoull], + [Define to function that is equivalent to strtoull()]) + else + AC_CHECK_FUNC(_strtoui64) + if test $ac_cv_func__strtoui64 = "yes"; then + AC_DEFINE([ACE_STRTOULL_EQUIVALENT], [::_strtoui64]) + fi + fi +else + AC_CHECK_DECL([strtoull], + [], + [AC_DEFINE([ACE_LACKS_STRTOULL_PROTOTYPE], 1, + [Define to 1 if platform lacks a declaration for strtoull()])], + [#include ]) +fi +]) # ACE_FUNC_WCSCASECMP -# + Defines ACE_LACKS_WCSCASECMP to 1 if platform lacks strcasecmp() +# + Defines ACE_LACKS_WCSCASECMP to 1 if platform lacks wcscasecmp() # + Defines ACE_WCSCASECMP_EQUIVALENT to identifier name if platform # has a equivalent function that differs in name only. #--------------------------------------------------------------------------- @@ -110,7 +166,7 @@ fi ]) # ACE_FUNC_WCSNCASECMP -# + Defines ACE_LACKS_WCSNCASECMP to 1 if platform lacks strcasecmp() +# + Defines ACE_LACKS_WCSNCASECMP to 1 if platform lacks wcsncasecmp() # + Defines ACE_WCSNCASECMP_EQUIVALENT to identifier name if platform # has a equivalent function that differs in name only. #--------------------------------------------------------------------------- @@ -147,11 +203,72 @@ if test "$ac_cv_func_wcsdup" = no; then fi ]) +# ACE_FUNC_WCSTOLL +# + Defines ACE_LACKS_WCSTOLL to 1 if platform lacks wcstoll() +# + Defines ACE_WCSTOLL_EQUIVALENT to identifier name if platform +# has a equivalent function that differs in name only. +# + Defines ACE_LACKS_WCSTOLL_PROTOTYPE to 1 if platform lacks +# declaration for wcstoll(). +AC_DEFUN([ACE_FUNC_WCSTOLL], +[ACE_CHECK_LACKS_FUNCS(wcstoll) +if test $ac_cv_func_wcstoll = "no"; then + AC_CHECK_FUNC(__wcstoll) + if test $ac_cv_func___wcstoll = "yes"; then + AC_DEFINE([ACE_WCSTOLL_EQUIVALENT], [::__wcstoll], + [Define to function that is equivalent to wcstoll()]) + else + AC_CHECK_FUNC(_wcstoi64) + if test $ac_cv_func__wcstoi64 = "yes"; then + AC_DEFINE([ACE_WCSTOLL_EQUIVALENT], [::_wcstoi64], + [Define to function that is equivalent to wcstoll()]) + fi + fi +else + AC_CHECK_DECL([wcstoll], + [], + [AC_DEFINE([ACE_LACKS_WCSTOLL_PROTOTYPE], 1, + [Define to 1 if platform lacks a declaration for wcstoll()])], + [#include +#include ]) +fi +]) + +# ACE_FUNC_WCSTOULL +# + Defines ACE_LACKS_WCSTOULL to 1 if platform lacks wcstoull() +# + Defines ACE_WCSTOULL_EQUIVALENT to identifier name if platform +# has a equivalent function that differs in name only. +# + Defines ACE_LACKS_WCSTOULL_PROTOTYPE to 1 if platform lacks +# declaration for wcstoull(). +AC_DEFUN([ACE_FUNC_WCSTOULL], +[ACE_CHECK_LACKS_FUNCS(wcstoull) +if test $ac_cv_func_wcstoull = "no"; then + AC_CHECK_FUNC(__wcstoull) + if test $ac_cv_func___wcstoull = "yes"; then + AC_DEFINE([ACE_WCSTOULL_EQUIVALENT], [::__wcstoull], + [Define to function that is equivalent to wcstoull()]) + else + AC_CHECK_FUNC(_wcstoui64) + if test $ac_cv_func__wcstoui64 = "yes"; then + AC_DEFINE([ACE_WCSTOULL_EQUIVALENT], [::_wcstoui64], + [Define to function that is equivalent to wcstoull()]) + fi + fi +else + AC_CHECK_DECL([wcstoull], + [], + [AC_DEFINE([ACE_LACKS_WCSTOULL_PROTOTYPE], 1, + [Define to 1 if platform lacks a declaration for wcstoull()])], + [#include +#include ]) +fi +]) # ACE_CHECK_SYSINFO # -# SVR4 and Linux have completely independent implementations of the -# sysinfo() system / library call. +# HP/UX, SVR4/POSIX and Linux have completely independent +# implementations of the # sysinfo() system / library call. +# +# The HP/UX syscall is undocumented. # # The SVR4 signature is: # #include @@ -164,6 +281,8 @@ fi # SVR4 (or at least Solaris) also has a sys/sysinfo.h header, so that # cannot be used to distinguish between the two varients. As far as I # know, Linux does not have a sys/systeminfo.h header, so that can. +# To further avoid false positives, small programs that use the two +# APIs are compiled as part of the feature tests. # # ACE uses the ACE_HAS_SYSV_SYSINFO feature test macro for the first # and ACE_HAS_LINUX_SYSINFO for the second. @@ -173,11 +292,24 @@ ACE_CHECK_HAS_HEADERS(sys/sysinfo.h sys/systeminfo.h) AC_CHECK_FUNC(sysinfo) if test "$ac_cv_func_sysinfo" = yes; then if test "$ac_cv_header_sys_systeminfo_h" = yes; then - AC_DEFINE([ACE_HAS_SYSV_SYSINFO], 1, - [Define to 1 if system has SysV version of sysinfo().]) + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [#include ], + [char buf[256]; + sysinfo (SI_SYSNAME, buf, sizeof(buf)); + return 0;])], + [AC_DEFINE([ACE_HAS_SYSV_SYSINFO], 1, + [Define to 1 if system has SysV version of sysinfo().])]) + elif test "$ac_cv_header_sys_sysinfo_h" = yes; then - AC_DEFINE([ACE_HAS_LINUX_SYSINFO], 1, - [Define to 1 if system has Linux version of sysinfo().]) + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [#include ], + [struct sysinfo s; + sysinfo (&s); + return 0;])], + [AC_DEFINE([ACE_HAS_LINUX_SYSINFO], 1, + [Define to 1 if system has Linux version of sysinfo().])]) fi fi ]) diff --git a/dep/ACE_wrappers/m4/aio.m4 b/dep/ACE_wrappers/m4/aio.m4 index 49fa7d19a..e91c63d3f 100644 --- a/dep/ACE_wrappers/m4/aio.m4 +++ b/dep/ACE_wrappers/m4/aio.m4 @@ -1,5 +1,5 @@ dnl ------------------------------------------------------------------------- -dnl $Id: aio.m4 80826 2008-03-04 14:51:23Z wotte $ +dnl $Id: aio.m4 85317 2009-05-11 15:21:04Z schmidt $ dnl dnl aio.m4 dnl @@ -64,6 +64,7 @@ if test "$ace_has_aio_funcs" = yes; then #include #include #include +#include #include @@ -137,7 +138,6 @@ Test_Aio::init (void) // Init the buffers. this->buffer_write_ = new char [sizeof (message) + 1]; strcpy (this->buffer_write_, message); - // cout << "The buffer : " << this->buffer_write_ << endl; this->buffer_read_ = new char [sizeof (message) + 1]; return 0; @@ -219,8 +219,6 @@ Test_Aio::do_aio (void) list_aiocb [0] = 0; } } -// else -// cout << "AIO in progress" << endl; if (list_aiocb [1] != 0 && aio_error (list_aiocb [1]) != EINPROGRESS) { @@ -237,17 +235,12 @@ Test_Aio::do_aio (void) list_aiocb [1] = 0; } } -// else -// cout << "AIO in progress" << endl; // Is it done? if ((list_aiocb [0] == 0) && (list_aiocb [1] == 0)) done = 1; } - //cout << "Both the AIO operations done." << endl; - //cout << "The buffer is :" << this->buffer_read_ << endl; - return 0; } diff --git a/dep/ACE_wrappers/m4/config_h.m4 b/dep/ACE_wrappers/m4/config_h.m4 index c3307fc3f..a619ee9b8 100644 --- a/dep/ACE_wrappers/m4/config_h.m4 +++ b/dep/ACE_wrappers/m4/config_h.m4 @@ -1,5 +1,5 @@ dnl ------------------------------------------------------------------------- -dnl $Id: config_h.m4 82833 2008-09-25 18:28:53Z jtc $ +dnl $Id: config_h.m4 87480 2009-11-11 11:38:15Z olli $ dnl dnl config_h.m4 dnl @@ -74,7 +74,7 @@ AH_TEMPLATE([ACE_HAS_STDEXCEPT_NO_H],[Platform provides C++ header]) dnl Deprecated! (or soon to be?) AH_TEMPLATE([ACE_HAS_OSF1_GETTIMEOFDAY], [timezone* 2nd parameter & no prototype]) -AH_TEMPLATE([ACE_HAS_LYNXOS_SIGNALS],[]) +AH_TEMPLATE([ACE_HAS_LYNXOS4_SIGNALS],[]) AH_TEMPLATE([ACE_HAS_TANDEM_SIGNALS],[]) AH_TEMPLATE([PTHREAD_STACK_MIN],[]) @@ -237,14 +237,6 @@ AH_TEMPLATE([ACE_HAS_STDARG_THR_DEST], [Platform has void (*)(...) prototype for pthread_key_create() destructor (e.g., LynxOS).]) -AH_TEMPLATE([ACE_HAS_STL_MAP_CONFLICT], -[Used when users want to compile ACE with STL and STL map class -conflicts with map struct.]) - -AH_TEMPLATE([ACE_HAS_STL_QUEUE_CONFLICT], -[Used when users want to compile ACE with STL and STL queue class -conflicts with queue struct.]) - AH_TEMPLATE([ACE_HAS_4_4BSD_SENDMSG_RECVMSG], [Platform has BSD 4.4 sendmsg()/recvmsg() APIs.]) @@ -270,9 +262,6 @@ AH_TEMPLATE([ACE_EXPLICIT_TEMPLATE_DESTRUCTOR_TAKES_ARGS], AH_TEMPLATE([ACE_HAS_BROKEN_MAP_FAILED], [Platform doesn't cast MAP_FAILED to a (void *).]) -AH_TEMPLATE([ACE_HAS_BROKEN_CTIME], -[Compiler/platform uses macro for ctime (e.g., MVS)]) - AH_TEMPLATE([ACE_HAS_BROKEN_DGRAM_SENDV], [Platform sendv() does not work properly with datagrams, i.e. it fails when the iovec size is IOV_MAX.]) @@ -286,9 +275,6 @@ AH_TEMPLATE([ACE_HAS_BROKEN_MMAP_H], AH_TEMPLATE([ACE_HAS_BROKEN_POSIX_TIME], [Platform defines struct timespec in ]) -AH_TEMPLATE([ACE_HAS_BROKEN_R_ROUTINES], -[Platform defines ctime_r, asctime_r, rand_r and getpwnam_r as macros]) - AH_TEMPLATE([ACE_HAS_BROKEN_RANDR], [OS/compiler's header files are inconsistent with libC definition of rand_r().]) @@ -330,9 +316,6 @@ AH_TEMPLATE([ACE_HAS_GETPAGESIZE], [Platform supports getpagesize() call (otherwise, ACE_PAGE_SIZE must be defined, except on Win32).]) -AH_TEMPLATE([ACE_HAS_GNU_CSTRING_H], -[Denotes that GNU has cstring.h as standard which redefines memchr()]) - AH_TEMPLATE([ACE_HAS_INTRINSIC_INTERLOCKED], [Platform supports the intrinsic interlocked optimizations.]) @@ -539,10 +522,6 @@ AH_TEMPLATE([ACE_SHM_OPEN_REQUIRES_ONE_SLASH],[shm_open() requires a leading sla AH_TEMPLATE([ACE_HAS_SIGISMEMBER_BUG], [Platform has bug with sigismember() (HP/UX 11).]) -AH_TEMPLATE([ACE_HAS_SIG_MACROS], -[Platform/compiler has macros for sig{empty,fill,add,del}set (e.g., - SCO and FreeBSD)]) - AH_TEMPLATE([ACE_HAS_SIGNAL_OBJECT_AND_WAIT], [Platform supports the Win32 SignalObjectAndWait() function (WinNT 4.0 and beyond).]) @@ -593,9 +572,6 @@ AH_TEMPLATE([ACE_HAS_SVR4_TLI], AH_TEMPLATE([ACE_HAS_SYSV_IPC], [Platform supports System V IPC (most versions of UNIX, but not Win32)]) -AH_TEMPLATE([ACE_HAS_SYS_ERRLIST], -[Platform/compiler supports _sys_errlist symbol]) - AH_TEMPLATE([ACE_HAS_SYS_SIGLIST], [Compiler/platform supports _sys_siglist array]) diff --git a/dep/ACE_wrappers/m4/platform.m4 b/dep/ACE_wrappers/m4/platform.m4 index f5f1f04b6..2ce3a547f 100644 --- a/dep/ACE_wrappers/m4/platform.m4 +++ b/dep/ACE_wrappers/m4/platform.m4 @@ -1,5 +1,5 @@ dnl ------------------------------------------------------------------------- -dnl $Id: platform.m4 82266 2008-07-08 16:09:00Z jtc $ +dnl $Id: platform.m4 87480 2009-11-11 11:38:15Z olli $ dnl dnl platform.m4 dnl @@ -160,7 +160,7 @@ dnl */ AC_DEFINE([__NO_INCLUDE_WARN__]) AC_DEFINE([ACE_MALLOC_ALIGN], [8]) AC_DEFINE([ACE_MAP_PRIVATE], [ACE_MAP_SHARED]) - AC_DEFINE([ACE_HAS_LYNXOS_SIGNALS]) + AC_DEFINE([ACE_HAS_LYNXOS4_SIGNALS]) AC_DEFINE([ACE_TIMER_SKEW], [(1000 * 10)]) ;; *mvs*) diff --git a/dep/ACE_wrappers/m4/tao.m4 b/dep/ACE_wrappers/m4/tao.m4 new file mode 100644 index 000000000..412a7228f --- /dev/null +++ b/dep/ACE_wrappers/m4/tao.m4 @@ -0,0 +1,88 @@ +dnl ------------------------------------------------------------------------- +dnl $Id: tao.m4 88990 2010-02-15 09:20:27Z johnnyw $ +dnl +dnl tao.m4 +dnl +dnl ACE M4 include file which contains TAO specific M4 macros +dnl for enabling/disabling certain TAO features. +dnl +dnl ------------------------------------------------------------------------- + +dnl Copyright (C) 1998, 1999, 2000, 2002 Ossama Othman +dnl +dnl All Rights Reserved +dnl +dnl This library is free software; you can redistribute it and/or +dnl modify it under the current ACE distribution terms. +dnl +dnl This library is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + + +AC_DEFUN([TAO_ENABLE_MINIMUM_CORBA], +[AC_ARG_ENABLE([minimum-corba], + AS_HELP_STRING([--enable-minimum-corba], + [build TAO with minimum corba support [[[no]]]]), +[ +case "${enableval}" in + yes) + tao_user_enable_minimum_corba=yes + ;; + no) + tao_user_enable_minimum_corba=no + ;; + *) + AC_MSG_ERROR([bad value ${enableval} for --enable-minimum-corba]) + ;; +esac +],[ +tao_user_enable_minimum_corba=no +]) +AM_CONDITIONAL([BUILD_MINIMUM_CORBA], + [test X$tao_user_enable_minimum_corba = Xyes]) +]) + +AC_DEFUN([TAO_ENABLE_EXAMPLES], +[AC_ARG_ENABLE([tao-examples], + AS_HELP_STRING([--enable-tao-examples], + [build TAO examples [[[yes]]]]), +[ +case "${enableval}" in + yes) + tao_build_examples=yes + ;; + no) + tao_build_examples=no + ;; + *) + AC_MSG_ERROR([bad value ${enableval} for --enable-tao-examples]) + ;; +esac +],[ +tao_build_examples=yes +]) +AM_CONDITIONAL([BUILD_EXAMPLES], [test X$tao_build_examples = Xyes]) +]) + +AC_DEFUN([TAO_ENABLE_TESTS], +[AC_ARG_ENABLE([tao-tests], + AS_HELP_STRING([--enable-tao-tests], + [build TAO tests [[[yes]]]]), +[ +case "${enableval}" in + yes) + tao_build_tests=yes + ;; + no) + tao_build_tests=no + ;; + *) + AC_MSG_ERROR([bad value ${enableval} for --enable-tao-tests]) + ;; +esac +],[ +tao_build_tests=yes +]) +AM_CONDITIONAL([BUILD_TESTS], [test X$tao_build_tests = Xyes]) +]) diff --git a/src/shared/Common.h b/src/shared/Common.h index e59e9b714..e525f868e 100644 --- a/src/shared/Common.h +++ b/src/shared/Common.h @@ -98,7 +98,9 @@ #include #if PLATFORM == PLATFORM_WINDOWS -# define FD_SETSIZE 4096 +# if !defined (FD_SETSIZE) +# define FD_SETSIZE 4096 +# endif # include // XP winver - needed to compile with standard leak check in MemoryLeaks.h // uncomment later if needed diff --git a/src/shared/Threading.h b/src/shared/Threading.h index 0684616aa..233c6741c 100644 --- a/src/shared/Threading.h +++ b/src/shared/Threading.h @@ -26,7 +26,6 @@ namespace ACE_Based { - class Runnable { public: @@ -40,7 +39,7 @@ namespace ACE_Based delete this; } private: - ACE_Atomic_Op m_refs; + ACE_Atomic_Op m_refs; }; enum Priority @@ -103,6 +102,5 @@ namespace ACE_Based //use this object to determine current OS thread priority values mapped to enum Priority{} static ThreadPriority m_TpEnum; }; - } #endif diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index c6881240a..7240b0291 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "10642" + #define REVISION_NR "10643" #endif // __REVISION_NR_H__ diff --git a/win/VC100/ACE_vc10.vcxproj b/win/VC100/ACE_vc10.vcxproj index ddcb5a69d..74500a7e0 100644 --- a/win/VC100/ACE_vc10.vcxproj +++ b/win/VC100/ACE_vc10.vcxproj @@ -410,14 +410,15 @@ + - + @@ -434,6 +435,7 @@ + @@ -468,19 +470,19 @@ - + - + @@ -561,12 +563,13 @@ + + - @@ -600,8 +603,8 @@ - + @@ -639,10 +642,10 @@ + - @@ -667,623 +670,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1307,8 +693,8 @@ - + @@ -1353,17 +739,17 @@ - + - + @@ -1371,16 +757,15 @@ - + - @@ -1388,6 +773,7 @@ + @@ -1467,14 +853,15 @@ + + - @@ -1517,9 +904,9 @@ - + @@ -1544,13 +931,13 @@ - - + + @@ -1563,8 +950,8 @@ - + @@ -1592,6 +979,630 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/win/VC80/ACE_vc8.vcproj b/win/VC80/ACE_vc8.vcproj index 8cd57f22c..7207668a3 100644 --- a/win/VC80/ACE_vc8.vcproj +++ b/win/VC80/ACE_vc8.vcproj @@ -3,9 +3,10 @@ ProjectType="Visual C++" Version="8.00" Name="ACE_Wrappers" - ProjectGUID="{AD537C9A-FECA-1BAD-6757-8A6348EA12C8}" + ProjectGUID="{AD537C9A-FECA-1BAD-6757-8A6300006755}" RootNamespace="ACE" Keyword="Win32Proj" + SignManifests="true" > + + @@ -1922,6 +1927,10 @@ RelativePath="..\..\dep\ACE_wrappers\ace\Atomic_Op.h" > + + @@ -2058,10 +2067,6 @@ RelativePath="..\..\dep\ACE_wrappers\ace\config-all.h" > - - @@ -2118,6 +2123,10 @@ RelativePath="..\..\dep\ACE_wrappers\ace\config-irix6.x-sgic++.h" > + + @@ -2134,6 +2143,14 @@ RelativePath="..\..\dep\ACE_wrappers\ace\config-lynxos.h" > + + + + @@ -2142,6 +2159,10 @@ RelativePath="..\..\dep\ACE_wrappers\ace\config-macosx-panther.h" > + + @@ -2290,18 +2311,6 @@ RelativePath="..\..\dep\ACE_wrappers\ace\config-vxworks.h" > - - - - - - @@ -2314,10 +2323,22 @@ RelativePath="..\..\dep\ACE_wrappers\ace\config-vxworks6.6.h" > + + + + + + @@ -2338,6 +2359,10 @@ RelativePath="..\..\dep\ACE_wrappers\ace\config-win32-mingw.h" > + + @@ -2498,10 +2523,6 @@ RelativePath="..\..\dep\ACE_wrappers\ace\Event_Handler_T.h" > - - @@ -3018,6 +3039,30 @@ RelativePath="..\..\dep\ACE_wrappers\ace\OS.h" > + + + + + + + + + + + + @@ -3042,10 +3087,6 @@ RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_ctype.h" > - - @@ -3054,10 +3095,6 @@ RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_dlfcn.h" > - - @@ -3098,18 +3135,6 @@ RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_iconv.h" > - - - - - - @@ -3118,10 +3143,6 @@ RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_inttypes.h" > - - @@ -3142,34 +3163,14 @@ RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_limits.h" > - - - - - - - - - - @@ -3178,10 +3179,6 @@ RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_mqueue.h" > - - @@ -3194,6 +3191,250 @@ RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_nl_types.h" > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3331,237 +3572,25 @@ > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4158,6 +4187,10 @@ RelativePath="..\..\dep\ACE_wrappers\ace\Token_Request_Reply.h" > + + @@ -4277,7 +4310,7 @@ + + @@ -4447,6 +4484,10 @@ RelativePath="..\..\dep\ACE_wrappers\ace\Containers_T.inl" > + + @@ -4955,6 +4996,10 @@ RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_wchar.inl" > + + @@ -5378,109 +5423,59 @@ + Filter=""> + RelativePath="..\..\dep\ACE_wrappers\ace\..\VERSION"> + ExcludedFromBuild="TRUE"> - - - - - - - - - + Name="VCCustomBuildTool"/> + ExcludedFromBuild="TRUE"> + Name="VCCustomBuildTool"/> + + + + ExcludedFromBuild="TRUE"> + Name="VCCustomBuildTool"/> + RelativePath="..\..\dep\ACE_wrappers\ace\README"> + ExcludedFromBuild="TRUE"> - - - - - - - - - + Name="VCCustomBuildTool"/> + ExcludedFromBuild="TRUE"> + Name="VCCustomBuildTool"/> + + + + ExcludedFromBuild="TRUE"> + Name="VCCustomBuildTool"/> diff --git a/win/VC90/ACE_vc9.vcproj b/win/VC90/ACE_vc9.vcproj index 70a9f1429..78f62b01e 100644 --- a/win/VC90/ACE_vc9.vcproj +++ b/win/VC90/ACE_vc9.vcproj @@ -3,10 +3,10 @@ ProjectType="Visual C++" Version="9,00" Name="ACE_Wrappers" - ProjectGUID="{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}" + ProjectGUID="{BD537C9A-FECA-1BAD-6757-8A6300006755}" RootNamespace="ACE" Keyword="Win32Proj" - TargetFrameworkVersion="0" + SignManifests="true" > + + @@ -1905,6 +1909,10 @@ RelativePath="..\..\dep\ACE_wrappers\ace\Atomic_Op.h" > + + @@ -2041,10 +2049,6 @@ RelativePath="..\..\dep\ACE_wrappers\ace\config-all.h" > - - @@ -2101,6 +2105,10 @@ RelativePath="..\..\dep\ACE_wrappers\ace\config-irix6.x-sgic++.h" > + + @@ -2117,6 +2125,14 @@ RelativePath="..\..\dep\ACE_wrappers\ace\config-lynxos.h" > + + + + @@ -2125,6 +2141,10 @@ RelativePath="..\..\dep\ACE_wrappers\ace\config-macosx-panther.h" > + + @@ -2273,18 +2293,6 @@ RelativePath="..\..\dep\ACE_wrappers\ace\config-vxworks.h" > - - - - - - @@ -2297,10 +2305,22 @@ RelativePath="..\..\dep\ACE_wrappers\ace\config-vxworks6.6.h" > + + + + + + @@ -2321,6 +2341,10 @@ RelativePath="..\..\dep\ACE_wrappers\ace\config-win32-mingw.h" > + + @@ -2481,10 +2505,6 @@ RelativePath="..\..\dep\ACE_wrappers\ace\Event_Handler_T.h" > - - @@ -3001,6 +3021,30 @@ RelativePath="..\..\dep\ACE_wrappers\ace\OS.h" > + + + + + + + + + + + + @@ -3025,10 +3069,6 @@ RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_ctype.h" > - - @@ -3037,10 +3077,6 @@ RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_dlfcn.h" > - - @@ -3081,18 +3117,6 @@ RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_iconv.h" > - - - - - - @@ -3101,10 +3125,6 @@ RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_inttypes.h" > - - @@ -3125,34 +3145,14 @@ RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_limits.h" > - - - - - - - - - - @@ -3161,10 +3161,6 @@ RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_mqueue.h" > - - @@ -3177,6 +3173,250 @@ RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_nl_types.h" > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3314,237 +3554,25 @@ > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4141,6 +4169,10 @@ RelativePath="..\..\dep\ACE_wrappers\ace\Token_Request_Reply.h" > + + @@ -4260,7 +4292,7 @@ + + @@ -4430,6 +4466,10 @@ RelativePath="..\..\dep\ACE_wrappers\ace\Containers_T.inl" > + + @@ -4938,6 +4978,10 @@ RelativePath="..\..\dep\ACE_wrappers\ace\OS_NS_wchar.inl" > + + @@ -5361,38 +5405,39 @@ + Filter="" + > - - - + ExcludedFromBuild="TRUE" + > + ExcludedFromBuild="TRUE" + > + + + + ExcludedFromBuild="TRUE" + > @@ -5415,36 +5460,36 @@ - - - + ExcludedFromBuild="TRUE" + > + ExcludedFromBuild="TRUE" + > + + + + ExcludedFromBuild="TRUE" + > diff --git a/win/mangosdVC80.sln b/win/mangosdVC80.sln index e9568a73e..50f2b092a 100644 --- a/win/mangosdVC80.sln +++ b/win/mangosdVC80.sln @@ -10,7 +10,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shared", "VC80\shared.vcpro {B15F131E-328A-4D42-ADC2-9FF4CA6306D8} = {B15F131E-328A-4D42-ADC2-9FF4CA6306D8} {803F488E-4C5A-4866-8D5C-1E6C03C007C2} = {803F488E-4C5A-4866-8D5C-1E6C03C007C2} {8072769E-CF10-48BF-B9E1-12752A5DAC6E} = {8072769E-CF10-48BF-B9E1-12752A5DAC6E} - {AD537C9A-FECA-1BAD-6757-8A6348EA12C8} = {AD537C9A-FECA-1BAD-6757-8A6348EA12C8} + {AD537C9A-FECA-1BAD-6757-8A6300006755} = {AD537C9A-FECA-1BAD-6757-8A6300006755} {BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E} = {BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E} {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} = {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} EndProjectSection @@ -40,7 +40,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3dlite", "VC80\g3dlite.vcp EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genrevision", "VC80\genrevision.vcproj", "{803F488E-4C5A-4866-8D5C-1E6C03C007C2}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE_Wrappers", "VC80\ACE_vc8.vcproj", "{AD537C9A-FECA-1BAD-6757-8A6348EA12C8}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE_Wrappers", "VC80\ACE_vc8.vcproj", "{AD537C9A-FECA-1BAD-6757-8A6300006755}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tbb", "VC80\tbb.vcproj", "{F62787DD-1327-448B-9818-030062BCFAA5}" EndProject @@ -167,18 +167,18 @@ Global {803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Release|Win32.Build.0 = Release|Win32 {803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Release|x64.ActiveCfg = Release|Win32 {803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Release|x64.Build.0 = Release|Win32 - {AD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32 - {AD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32 - {AD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64 - {AD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64 - {AD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug|Win32.ActiveCfg = Debug|Win32 - {AD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug|Win32.Build.0 = Debug|Win32 - {AD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug|x64.ActiveCfg = Debug|x64 - {AD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug|x64.Build.0 = Debug|x64 - {AD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Release|Win32.ActiveCfg = Release|Win32 - {AD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Release|Win32.Build.0 = Release|Win32 - {AD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Release|x64.ActiveCfg = Release|x64 - {AD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Release|x64.Build.0 = Release|x64 + {AD537C9A-FECA-1BAD-6757-8A6300006755}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32 + {AD537C9A-FECA-1BAD-6757-8A6300006755}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32 + {AD537C9A-FECA-1BAD-6757-8A6300006755}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64 + {AD537C9A-FECA-1BAD-6757-8A6300006755}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64 + {AD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|Win32.ActiveCfg = Debug|Win32 + {AD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|Win32.Build.0 = Debug|Win32 + {AD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|x64.ActiveCfg = Debug|x64 + {AD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|x64.Build.0 = Debug|x64 + {AD537C9A-FECA-1BAD-6757-8A6300006755}.Release|Win32.ActiveCfg = Release|Win32 + {AD537C9A-FECA-1BAD-6757-8A6300006755}.Release|Win32.Build.0 = Release|Win32 + {AD537C9A-FECA-1BAD-6757-8A6300006755}.Release|x64.ActiveCfg = Release|x64 + {AD537C9A-FECA-1BAD-6757-8A6300006755}.Release|x64.Build.0 = Release|x64 {F62787DD-1327-448B-9818-030062BCFAA5}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32 {F62787DD-1327-448B-9818-030062BCFAA5}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32 {F62787DD-1327-448B-9818-030062BCFAA5}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64 diff --git a/win/mangosdVC90.sln b/win/mangosdVC90.sln index 73b3a47b5..46d0b4f2b 100644 --- a/win/mangosdVC90.sln +++ b/win/mangosdVC90.sln @@ -10,7 +10,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shared", "VC90\shared.vcpro {BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E} = {BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E} {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} = {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} {803F488E-4C5A-4866-8D5C-1E6C03C007C2} = {803F488E-4C5A-4866-8D5C-1E6C03C007C2} - {BD537C9A-FECA-1BAD-6757-8A6348EA12C8} = {BD537C9A-FECA-1BAD-6757-8A6348EA12C8} + {BD537C9A-FECA-1BAD-6757-8A6300006755} = {BD537C9A-FECA-1BAD-6757-8A6300006755} {8072769E-CF10-48BF-B9E1-12752A5DAC6E} = {8072769E-CF10-48BF-B9E1-12752A5DAC6E} EndProjectSection EndProject @@ -42,7 +42,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3dlite", "VC90\g3dlite.vcp EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genrevision", "VC90\genrevision.vcproj", "{803F488E-4C5A-4866-8D5C-1E6C03C007C2}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE_Wrappers", "VC90\ACE_vc9.vcproj", "{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE_Wrappers", "VC90\ACE_vc9.vcproj", "{BD537C9A-FECA-1BAD-6757-8A6300006755}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tbb", "VC90\tbb.vcproj", "{F62787DD-1327-448B-9818-030062BCFAA5}" EndProject @@ -169,18 +169,18 @@ Global {803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Release|Win32.Build.0 = Release|Win32 {803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Release|x64.ActiveCfg = Release|Win32 {803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Release|x64.Build.0 = Release|Win32 - {BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32 - {BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32 - {BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64 - {BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64 - {BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug|Win32.ActiveCfg = Debug|Win32 - {BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug|Win32.Build.0 = Debug|Win32 - {BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug|x64.ActiveCfg = Debug|x64 - {BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug|x64.Build.0 = Debug|x64 - {BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Release|Win32.ActiveCfg = Release|Win32 - {BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Release|Win32.Build.0 = Release|Win32 - {BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Release|x64.ActiveCfg = Release|x64 - {BD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Release|x64.Build.0 = Release|x64 + {BD537C9A-FECA-1BAD-6757-8A6300006755}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32 + {BD537C9A-FECA-1BAD-6757-8A6300006755}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32 + {BD537C9A-FECA-1BAD-6757-8A6300006755}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64 + {BD537C9A-FECA-1BAD-6757-8A6300006755}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64 + {BD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|Win32.ActiveCfg = Debug|Win32 + {BD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|Win32.Build.0 = Debug|Win32 + {BD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|x64.ActiveCfg = Debug|x64 + {BD537C9A-FECA-1BAD-6757-8A6300006755}.Debug|x64.Build.0 = Debug|x64 + {BD537C9A-FECA-1BAD-6757-8A6300006755}.Release|Win32.ActiveCfg = Release|Win32 + {BD537C9A-FECA-1BAD-6757-8A6300006755}.Release|Win32.Build.0 = Release|Win32 + {BD537C9A-FECA-1BAD-6757-8A6300006755}.Release|x64.ActiveCfg = Release|x64 + {BD537C9A-FECA-1BAD-6757-8A6300006755}.Release|x64.Build.0 = Release|x64 {F62787DD-1327-448B-9818-030062BCFAA5}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32 {F62787DD-1327-448B-9818-030062BCFAA5}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32 {F62787DD-1327-448B-9818-030062BCFAA5}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64