diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2013-08-07 07:10:20 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2013-08-07 07:10:20 +0000 |
| commit | d884ff87f199ac1b30e214cc1bfae94a7108f1bd (patch) | |
| tree | 25b69c881029169c7ada3a29fe6b6174f6f6070b | |
| parent | f52e99527d0ca115f90561aed98fa5a6eb8f9c46 (diff) | |
| download | ATCD-d884ff87f199ac1b30e214cc1bfae94a7108f1bd.tar.gz | |
Wed Aug 7 07:02:52 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl>
* ACE-INSTALL.html:
* ASNMP/asnmp/address.cpp:
* ASNMP/asnmp/asn1.cpp:
* ASNMP/asnmp/snmp.h:
* ASNMP/asnmp/snmp.cpp:
* ace/Asynch_IO.h:
* ace/Connection_Recycling_Strategy.h:
* ace/Connection_Recycling_Strategy.cpp:
* ace/ETCL/ETCL_Constraint_Visitor.h:
* ace/ETCL/ETCL_Constraint_Visitor.cpp:
* ace/FIFO_Recv_Msg.inl:
* ace/Log_Msg_Callback.h:
* ace/Log_Msg_Callback.cpp:
* ace/Monitor_Control/Auto_Update_Starter.h:
* ace/Monitor_Control/Auto_Update_Starter.cpp:
* ace/Monitor_Control/Monitor_Query.h:
* ace/Monitor_Control/Monitor_Query.cpp:
* ace/OS_NS_Thread.cpp:
* ace/OS_NS_signal.h:
* ace/OS_NS_signal.cpp:
* ace/OS_NS_stdio.cpp:
* ace/Select_Reactor_Base.cpp:
* ace/Sig_Handler.h:
* ace/Sig_Handler.cpp:
* ace/TTY_IO.h:
* ace/TTY_IO.cpp:
* ace/Thread_Hook.h:
* ace/Thread_Hook.cpp:
* ace/config-macros.h:
* ace/config-win32-borland.h:
* ace/config-win32-common.h:
* ace/config-win32.h:
* apps/Gateway/Peer/Peer.cpp:
* bin/MakeProjectCreator/config/bmake.features:
* examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp:
* examples/NT_Service/main.cpp:
* examples/Reactor/TP_Reactor/ReadHandler.cpp:
* examples/Reactor/TP_Reactor/client.cpp:
* examples/Timer_Queue/Custom_Handler.h:
* examples/Timer_Queue/main_thread_custom_handler.cpp:
* performance-tests/Synch-Benchmarks/Base_Test/mutex_test.cpp:
* protocols/ace/INet/AuthenticationBase.h:
* protocols/ace/INet/AuthenticationBase.cpp:
* protocols/ace/INet/ConnectionCache.h:
* protocols/ace/INet/FTP_ClientRequestHandler.cpp:
* protocols/ace/INet/FTP_URL.cpp:
* protocols/ace/INet/HTTP_ClientRequestHandler.h:
* protocols/ace/INet/HTTP_ClientRequestHandler.cpp:
* protocols/ace/INet/HTTP_URL.cpp:
* protocols/ace/INet/HeaderBase.h:
* protocols/examples/RMCast/Send_Msg/Receiver.cpp:
* tests/Bug_2434_Regression_Test.cpp:
* tests/Bug_2772_Regression_Test.cpp:
* tests/Capabilities_Test.cpp:
* tests/DLL_Test.h:
* tests/DLL_Test_Impl.cpp:
* tests/Logging_Strategy_Test.cpp:
* tests/Process_Env_Test.cpp:
* tests/Process_Strategy_Test.cpp:
* tests/Reactor_Timer_Test.cpp:
* tests/SOCK_Send_Recv_Test.cpp:
* tests/test_config.h:
Revived port for Embarcadero C++ Builder XE4 using bcc32
commit b8e06cf020879fa8aa8cf3158601a19ea8bc44d4
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Fri Jun 28 19:38:10 2013 +0200
Layout
* ACE/tests/Bug_2434_Regression_Test.cpp:
* ACE/tests/Bug_2772_Regression_Test.cpp:
commit ee6893a5065cbe56df7e4ab5aae31971ddf0edf3
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Fri Jun 28 19:34:00 2013 +0200
Updated borland instructions
* ACE/ACE-INSTALL.html:
commit 1ac4a32bb448852cf8c1f2fa90d6b14f1fd2d339
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Fri Jun 28 19:28:01 2013 +0200
Fix conversion warnings for bcc32:
* ACE/apps/Gateway/Peer/Peer.cpp:
* ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp:
* ACE/examples/Reactor/TP_Reactor/ReadHandler.cpp:
* ACE/examples/Reactor/TP_Reactor/client.cpp:
commit b873f90c6801dde85f9fc6538a656f8400d4b8b3
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Fri Jun 28 09:02:36 2013 +0200
Fixed typo
* ACE/tests/Reactor_Timer_Test.cpp:
commit 4ffd49852005a058ddd7540e101348f1f58db506
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Thu Jun 27 14:41:32 2013 +0200
Fixed bcc32 signed/unsigned comparison warnings
* ACE/protocols/examples/RMCast/Send_Msg/Receiver.cpp:
* ACE/tests/Capabilities_Test.cpp:
* ACE/tests/Process_Strategy_Test.cpp:
* ACE/tests/Reactor_Timer_Test.cpp:
* ACE/tests/SOCK_Send_Recv_Test.cpp:
commit 604b6c22cc21a64be12bbca4da68ce90f63b4d56
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Thu Jun 27 13:01:30 2013 +0200
Fixed conversion warnings with bcc32
* ACE/ASNMP/asnmp/address.cpp:
* ACE/ASNMP/asnmp/asn1.cpp:
* ACE/ace/FIFO_Recv_Msg.inl:
commit c257a73968b54bcab543cb5f2f436f16a9d63df8
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Thu Jun 27 11:13:25 2013 +0200
Cleanup port
* ACE/ace/config-win32-borland.h:
commit a6dbc3fc51f6d3bb791b024c5e7aed2891a0f749
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Wed Jun 26 19:34:34 2013 +0200
Updated Embarcadero instructions
* ACE/ACE-INSTALL.html:
commit 476cdd82dcb899059e3f8c67858d4d383042e609
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Wed Jun 26 14:25:13 2013 +0200
Fixed bcc32 warning
* ACE/tests/Process_Strategy_Test.cpp:
commit 93e4a41e1954ff23a30d1b613e3d42a64ebcac10
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Wed Jun 26 14:18:51 2013 +0200
Extended size of environment usage to make sure we
are above 32k
* ACE/tests/Process_Env_Test.cpp:
commit 340fbaa2b557c7df56d8ecf8ce623837b4bccb54
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Wed Jun 26 13:58:19 2013 +0200
Added missing export
* ACE/protocols/ace/INet/HeaderBase.h:
Layout
* ACE/tests/Process_Env_Test.cpp:
commit e7bbccf459931996a3c8482f74736b08ab929093
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Wed Jun 26 13:26:39 2013 +0200
Added some casts to suppress bcc32 warnings
* ACE/ace/OS_NS_Thread.cpp:
* ACE/ace/Select_Reactor_Base.cpp:
commit a07353c126b24967c7a72c5fba6369a487f8515b
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Wed Jun 26 13:22:52 2013 +0200
Removed check
* ACE/ace/pre.h:
commit f17435f0745233504a01a52fd1dc76b45397504d
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Wed Jun 26 12:26:20 2013 +0200
Fixed compile errors with bcc32
* ACE/protocols/ace/INet/FTP_ClientRequestHandler.cpp:
* ACE/protocols/ace/INet/FTP_URL.cpp:
* ACE/protocols/ace/INet/HTTP_ClientRequestHandler.cpp:
* ACE/protocols/ace/INet/HTTP_ClientRequestHandler.h:
* ACE/protocols/ace/INet/HTTP_URL.cpp:
commit 305ed854f18ad958d593a94b1b51045ac8f01d5f
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Wed Jun 26 12:11:44 2013 +0200
bcb lacks localtime_r
* ACE/ace/config-win32-borland.h:
commit f7085b98b817695b633ffe2a1898523ff4e5677e
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Wed Jun 26 12:03:56 2013 +0200
Disable warning about static constructors
* ACE/ace/pre.h:
commit 0894d0797d66c9be6ab51ee68612c103f1b7a594
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Wed Jun 26 11:51:11 2013 +0200
Made check more generic
* ACE/tests/Logging_Strategy_Test.cpp:
commit 5b6354cd131be8ab244dfae4c9bcecccf46eaa74
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Wed Jun 26 10:10:44 2013 +0200
Fix for bcc64
* ACE/tests/Logging_Strategy_Test.cpp:
commit 4373010c606d004cc43685b19ad073e957be6518
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Mon Jun 24 12:03:45 2013 +0200
Layout changes
* ACE/tests/test_config.h:
commit f3c9a5cd86bb50ace420b5a72f8e03fe35c6d9b5
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Thu Jun 20 10:52:58 2013 +0200
Added support for ACE_HAS_CONSOLE_TEST_OUTPUT
* ACE/tests/test_config.h:
commit 2eadc63b624e91bf2bc3a68ee7627361e7c4c072
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Wed May 29 11:03:18 2013 +0200
Use 32bit preprocessor with cpp64 build
* ACE/ace/config-win32-borland.h:
commit fd1975d168c7cd7d7f26c6e097d6df4dfc56082d
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue May 28 21:50:34 2013 +0200
Attempt to fix bcc64 error
* ACE/examples/NT_Service/main.cpp:
commit d1988a65bc87098d5c13044bb7b7d7fb8e3c2271
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue May 28 21:32:27 2013 +0200
Attempt to fix time_t problems
* ACE/ace/config-win32-borland.h:
commit f2982ed3371cbe38528105b28532bbd56b60a29e
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue May 28 19:22:06 2013 +0200
Reverted change for other export macros
* ACE/ace/config-win32-borland.h:
commit 811d190e619b89fdf9478034f92dc5af28fcc69f
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue May 28 19:11:54 2013 +0200
Try regular export macros with bcb
* ACE/ace/config-win32-borland.h:
* ACE/ace/config-win32-common.h:
commit 1f8bf7e55140105a36aaf6fb0c689009c05b696e
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue May 28 16:14:48 2013 +0200
Default constructor
* ACE/protocols/ace/INet/AuthenticationBase.cpp:
* ACE/protocols/ace/INet/AuthenticationBase.h:
commit 201d7f17557a32477b8c02c74396ef092a4fc953
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue May 28 15:53:01 2013 +0200
Default constructor
* ACE/ace/Monitor_Control/Monitor_Query.cpp:
* ACE/ace/Monitor_Control/Monitor_Query.h:
* ACE/performance-tests/Synch-Benchmarks/Base_Test/mutex_test.cpp:
commit ba8d2a24dade17fe0bfa69c86127b00bc5ff6000
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue May 28 13:47:43 2013 +0200
Default constructor
* ACE/ace/TTY_IO.cpp:
* ACE/ace/TTY_IO.h:
commit 2d9fb952d66ac6527794f3091115a6b1b2d82b58
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue May 28 13:46:33 2013 +0200
Default constructot
* ACE/ace/Connection_Recycling_Strategy.cpp:
* ACE/ace/Connection_Recycling_Strategy.h:
commit e1629f8efa132812267365371e83f0cc6da52842
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue May 28 13:44:45 2013 +0200
Added default constructor
* ACE/ace/Monitor_Control/Auto_Update_Starter.cpp:
* ACE/ace/Monitor_Control/Auto_Update_Starter.h:
commit eca2f470d4671100c1fedfa1a14fa3dc4ac2dda6
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue May 28 13:37:59 2013 +0200
Let us see what happens if we don't use a prefix
underscore for symbols
* ACE/ace/config-win32-borland.h:
commit a596f6fed12afde29d4847af99c0dde85dcf35ee
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue May 28 12:57:24 2013 +0200
Default constructor
* ACE/performance-tests/Synch-Benchmarks/Base_Test/mutex_test.cpp:
commit 8dfb772c0d63996f2f5c0c9e8a02966cebc9665e
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue May 28 12:55:50 2013 +0200
Add default constructor
* ACE/tests/DLL_Test.h:
* ACE/tests/DLL_Test_Impl.cpp:
commit ab80db0e78d4cdaca365fa2a4b7af2745629da0f
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue May 28 12:53:51 2013 +0200
Default constructor
* ACE/ace/Thread_Hook.cpp:
* ACE/ace/Thread_Hook.h:
commit 2143f2e2b51e0e379eff498b85958434ff6e68fc
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue May 28 12:49:44 2013 +0200
Long double change for 64bit
* ACE/ace/config-win32-borland.h:
commit cd44c9fbf676714211d1016d8def0f0ffead14c1
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue May 28 12:46:56 2013 +0200
Added default constructors
* ACE/ace/Log_Msg_Callback.cpp:
* ACE/ace/Log_Msg_Callback.h:
* ACE/ace/Sig_Handler.cpp:
* ACE/ace/Sig_Handler.h:
commit 19184dcab928edfd22dce7008ab141534b56f2cd
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue May 28 10:44:32 2013 +0200
Added empty constructor to fix bcc64 link errors
* ACE/ace/ETCL/ETCL_Constraint_Visitor.cpp:
* ACE/ace/ETCL/ETCL_Constraint_Visitor.h:
commit 2e55eedf63d1e9a7b82c488f2bd0716a2d88078b
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue May 28 10:43:12 2013 +0200
Added explicit constructor to resolve bcc64 link
problems
* ACE/ASNMP/asnmp/snmp.cpp:
* ACE/ASNMP/asnmp/snmp.h:
commit d1f85d331af335064b4b40d55e469487ce8c36ad
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue May 28 10:40:19 2013 +0200
clang based compiler has a problem with swab, let
us emulate it in ACE for the moment
* ACE/ace/config-win32-borland.h:
* ACE/protocols/ace/INet/ConnectionCache.h:
Doxygen fix
commit cec571985b60322fef6a0c613927d3fab9ae8fdf
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue May 28 09:14:36 2013 +0200
we have nonconst swab
* ACE/ace/config-win32-borland.h:
commit bb9dba4eb5005cb111a6b2cad60c94b8029dd616
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue May 28 09:07:50 2013 +0200
Zap older compiler support, handle different
preprocessor
for clang environment
* ACE/ace/config-win32-borland.h:
commit 7bcf63e19497aad971f0eb75ed6dfa504a8d4419
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue May 28 09:05:46 2013 +0200
Make unimplemented methods private
* ACE/ace/Asynch_IO.h:
commit 83333a374d3cafc4ea296c6bb419dfd2ecf2a580
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue May 28 08:40:52 2013 +0200
Added macro to try to resolve link errors
* ACE/ace/config-win32-borland.h:
commit d342c02695a6f74e95cc61446ed519de42a6815c
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Mon May 27 19:30:41 2013 +0200
Removed array of handles as part of siginfo_t,
triggers
warning with bcc64 and doesn't seem to be used at
all
* ACE/ace/OS_NS_signal.cpp:
* ACE/ace/OS_NS_signal.h:
commit 9e8926669d68a902196a7a4a474c70ad009a05e7
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Mon May 27 18:10:46 2013 +0200
Fix for localtime_r
* ACE/ace/config-win32-borland.h:
commit a59c969d36d8eb4ca6311bafeab4c653bc0475b6
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Mon May 27 16:51:17 2013 +0200
Attempt to fix argument unused warnings
* ACE/ace/config-macros.h:
commit fdf91a5679222a618a8eca419310ea83a4470573
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Mon May 27 12:53:26 2013 +0200
Fixes for bcc32
* ACE/examples/Timer_Queue/Custom_Handler.h:
* ACE/examples/Timer_Queue/main_thread_custom_handler.cpp:
commit 6799802f3d30139f586894debb2d41680bf78085
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Mon May 27 11:32:01 2013 +0200
New file for bmake
* ACE/bin/MakeProjectCreator/config/bmake.features:
Added.
commit c08478508b066069b412391d17f2ee5905f96da0
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Mon May 27 11:17:45 2013 +0200
Fixes for C++BuilderXE4
* ACE/ace/config-win32-borland.h:
commit cb17ce9c8760b274a669ceb9246d0ae3e4229dc0
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Fri Aug 17 13:40:38 2012 +0200
* ACE/ace/OS_NS_stdio.cpp:
Fixed for bcc32
commit 83b5446de5dab9a967da424368170818f7fe78c7
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Fri Jul 27 13:37:55 2012 +0200
* ACE/ace/config-win32-borland.h:
* ACE/ace/config-win32.h:
Added some old files back
64 files changed, 887 insertions, 145 deletions
diff --git a/ACE/ACE-INSTALL.html b/ACE/ACE-INSTALL.html index d1070b665a4..158fece553f 100644 --- a/ACE/ACE-INSTALL.html +++ b/ACE/ACE-INSTALL.html @@ -154,7 +154,7 @@ document</a>.</p><p> <th>Remedy IT</th> <td>Maintains 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/XE, + CodeGear C++ Builder 2007/2009, CodeGear RAD Studio 2007, Embarcadero C++ Builder 2010/XE/XE4, Windows CE, MinGW, Microsoft Visual C++ 7.1/8/9/10, GCC, Cygwin, VxWorks 6.x (kernel and rtp), OpenVMS 8.3 on IA64, BlueCAT Linux, RedHat Linux, Fedora, MacOSX, Solaris, @@ -286,7 +286,7 @@ UNIX with: <ol> <li><a href="#unix_traditional">Traditional ACE/GNU Make Configuration</a></li> </ol> -The <a href="#win32">build process for Windows</a> is different from +The <a href="#win32">build process for Windows</a> is different from the UNIX methods. <h3><a name="unix_traditional">Using the Traditional ACE/GNU Configuration</a></h3> @@ -421,7 +421,7 @@ one will not clean up any old files, and trying to use the environment's <ul> <li><a href="#msvc">Microsoft Visual Studio</a></li> -<li><a href="#codegear">Embarcadero C++Builder</a></li> +<li><a href="#embarcadero">Embarcadero C++Builder</a></li> <li><a href="#mingw">MinGW</a></li> <li><a href="#cygwin">Cygwin</a></li> </ul> @@ -430,8 +430,8 @@ one will not clean up any old files, and trying to use the environment's </p><h3><a name="msvc">Building and Installing ACE on Windows with Microsoft Visual Studio</a></h3> -<p>ACE contains project files for Microsoft Visual Studio .NET 2005 (VC8) -, Visual Studio 2009 (VC9), and Visual Studio 2010 (VC10). +<p>ACE contains project files for +Visual Studio 2009 (VC9), and Visual Studio 2010 (VC10). 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 @@ -626,9 +626,7 @@ card. This is one method: </p></li></a></ol> <hr align="left" width="50%"><p> </p> -<h3><a name="codegear">Building and Installing ACE on Windows with Embarcadero C++</a></h3> - -<b>The Embarcadero C++ port is not maintained anymore due to lack of funding.</b><p> +<h3><a name="embarcadero">Building and Installing ACE on Windows with Embarcadero C++</a></h3> If you are building for a machine without a network card, you may want to check <a href="#win32nonic">here</a> first. <p> @@ -655,12 +653,16 @@ to check <a href="#win32nonic">here</a> first. <p> <br> </li><li>Add ACE_wrappers\lib and ACE_wrappers\bin to the PATH environment variable:<br> <br> - <code>set PATH=C:\ACE_wrappers\lib;C:\ACE_wrappers\bin;%PATH%</code><br> + <code>set PATH=%ACE_ROOT%\lib;%ACE_ROOT%\bin;%PATH%</code><br> + <br> + </li><li>Generate the bmake makefiles using <a href="#MPC">MPC</a>. Use the <code>bmake</code> project type for C++ Builder:<br> + <br> + <code>%ACE_ROOT%\bin\mwc.pl -type bmake</code><br> <br> - </li><li>Generate the bmake makefiles using <a href="#MPC">MPC</a>. Use the <code>bmake</code> project type for C++ Builder. - <br><br> </li><li>Change to the ACE_ROOT\ace directory.<br> <br> + <code>cd %ACE_ROOT%\ace</code><br> + <br> </li><li>Build release DLLs for ACE by going:<br> <br> <code>make -f Makefile.bmak all</code><br> @@ -695,7 +697,7 @@ to check <a href="#win32nonic">here</a> first. <p> Note that when you run <code>make</code> in a sub directory you give <code>make -f Makefile.bmak all</code>. The <code>all</code> is needed to make sure the complete project is build.<p> -The Borland/CodeGear/Embarcadero C++ Builder 4.0/5.0/6.0/2006/2007/2009/2010 port has been done by Jody Hagins, <a href="mailto:chris@kohlhoff.com">Christopher Kohlhoff</a> and <a href="mailto:jwillemsen@remedy.nl">Johnny Willemsen</a>. </p><p> +The C++ Builder port has been done by Jody Hagins, <a href="mailto:chris@kohlhoff.com">Christopher Kohlhoff</a> and <a href="mailto:jwillemsen@remedy.nl">Johnny Willemsen</a>. </p><p> <b>ACE TESTS</b></p><p> @@ -715,7 +717,7 @@ Once you build all the tests, you can run the automated test script using:</p><p </p><blockquote><code>perl run_test.pl</code></blockquote><p> in the <code>tests</code> directory to try all the tests. You need to make sure the ACE bin and lib directory (in this case -<code>ACE_ROOT\bin</code> and <code>ACE_ROOT\lib</code>) +<code>%ACE_ROOT%\bin</code> and <code>%ACE_ROOT%\lib</code>) are on the path before you try to run the tests.</p><p> <p></p><hr align="left" width="50%"><p> @@ -789,16 +791,16 @@ For our build we require the packages before the previous one. <br><br> - <p> + <p> If you want to install ACE (using "make install") and want all the <tt>.pc</tt> files generated, - set the installation prefix in platform_macros.GNU. + set the installation prefix in platform_macros.GNU. </p><blockquote><code></code><pre> INSTALL_PREFIX=/c/ACE </pre></blockquote> - Headers will be installed to $INSTALL_PREFIX/include, documentation and - build system files to $INSTALL_PREFIX/share and libraries to $INSTALL_PREFIX/lib. With INSTALL_PREFIX set, RPATH will be enabled. - To disable RPATH (for example, if $INSTALL_PREFIX/$INSTALL_LIB is already - a system-known location for shared libraries), set the make macro - install_rpath to 0 by adding install_rpath=0 to platform_macros.GNU. + Headers will be installed to $INSTALL_PREFIX/include, documentation and + build system files to $INSTALL_PREFIX/share and libraries to $INSTALL_PREFIX/lib. With INSTALL_PREFIX set, RPATH will be enabled. + To disable RPATH (for example, if $INSTALL_PREFIX/$INSTALL_LIB is already + a system-known location for shared libraries), set the make macro + install_rpath to 0 by adding install_rpath=0 to platform_macros.GNU. <br><br> @@ -823,9 +825,9 @@ For our build we require the packages </li><li> Run make install: - <blockquote><code></code><pre> % make install + <blockquote><code></code><pre> % make install </pre></blockquote> - <p> + <p> This should create <tt>ACE.pc</tt> to use with pkg-config. </p> @@ -1782,9 +1784,9 @@ below.</p> the <code>config.h</code> file has been created, build the <code>ACE_SSL</code> project.</li> </ol> -<h2>CodeGear C++</h2> +<h2>Embarcadero C++</h2> <p>Support for building ACE's ACE_SSL library and TAO's SSLIOP - pluggable protocol with CodeGear C++ does exist. + pluggable protocol with Embarcadero C++ does exist. <ol> <li>Set the <code>SSL_ROOT</code> environment variable to the location of the directory containing the OpenSSL <code>inc32</code> and @@ -1792,7 +1794,7 @@ below.</p> <li>Add <code>ssl=1</code> to your MPC <code>$ACE_ROOT/bin/MakeProjectCreator/config/default.features</code> or <code>$ACE_ROOT/local.features</code> file, and re-run MPC to add - support for building the ACE_SSL library to your CodeGear C++ makefiles. + support for building the ACE_SSL library to your Embarcadero C++ makefiles. <li>Build ACE and TAO. </ol> </p> @@ -2560,7 +2562,7 @@ To save space on a Unix machine, I usually run 'find . -name \*.sln -o -name \*.vcproj -o -name \*.bmak | xargs rm -f' in $ACE_ROOT at first after I untar the distribution. They are meaningless in my environment (Files named '*.sln' and '*.vcproj' are -used for MSVC++ and files named '*.bmak' are for CodeGear C++ +used for MSVC++ and files named '*.bmak' are for Embarcadero C++ Builder.)</p><p> Finally, to save space, may want to run 'make clean' after 'make'. It @@ -2926,18 +2928,18 @@ CIAO. We point out some suggestions below to get bootstrapped quickly. <ul> - <li>You can checkout different subsets from the Subversion repository. - <ul> - <li>To checkout ACE with MPC:<p> - <code>svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/sets-anon/ACE .</code> - </li> - <li>To checkout ACE+TAO with MPC:<p> - <code>svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/sets-anon/ACE+TAO .</code> - </li> - <li>To checkout ACE+TAO+CIAO with MPC:<p> - <code>svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/sets-anon/ACE+TAO+CIAO .</code> - </li> - </ul> + <li>You can checkout different subsets from the Subversion repository. + <ul> + <li>To checkout ACE with MPC:<p> + <code>svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/sets-anon/ACE .</code> + </li> + <li>To checkout ACE+TAO with MPC:<p> + <code>svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/sets-anon/ACE+TAO .</code> + </li> + <li>To checkout ACE+TAO+CIAO with MPC:<p> + <code>svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/sets-anon/ACE+TAO+CIAO .</code> + </li> + </ul> </p></li><li>Please make sure that you have <a href="http://www.perl.org/"> perl</a> installed, preferably perl 5.8 or higher. Users on Win32 based platforms are recommended to use diff --git a/ACE/ASNMP/asnmp/address.cpp b/ACE/ASNMP/asnmp/address.cpp index a635aa6cefa..f3ace6cece0 100644 --- a/ACE/ASNMP/asnmp/address.cpp +++ b/ACE/ASNMP/asnmp/address.cpp @@ -599,7 +599,7 @@ int IpAddress::resolve_to_address(const char *hostname, in_addr& quad_addr) ACE_OS::memset(&lookupResult, 0, sizeof(struct hostent)); int loc_errno = 0; if (ACE_OS::gethostbyname_r( hostname, &lookupResult, buffer, &loc_errno)) { - if (lookupResult.h_length == sizeof(in_addr) && + if (lookupResult.h_length == (int) sizeof(in_addr) && lookupResult.h_addrtype == AF_INET) { ACE_OS::memcpy((void *) &quad_addr, (void *) lookupResult.h_addr_list[0], sizeof(in_addr)); @@ -719,7 +719,7 @@ int Address_Iter::query_dns(const char *hostname) int loc_errno = 0; if (ACE_OS::gethostbyname_r( hostname, &lookupResult_, buffer_, &loc_errno)) { - if (lookupResult_.h_length == sizeof(IPV4LEN) && + if (lookupResult_.h_length == (int) sizeof(IPV4LEN) && lookupResult_.h_addrtype == AF_INET) { return 0; } diff --git a/ACE/ASNMP/asnmp/asn1.cpp b/ACE/ASNMP/asnmp/asn1.cpp index 6ba1d557e62..8352fc4bf07 100644 --- a/ACE/ASNMP/asnmp/asn1.cpp +++ b/ACE/ASNMP/asnmp/asn1.cpp @@ -61,11 +61,11 @@ * of this object (i.e. the start of the next object). * Returns 0 on any error. */ -u_char * asn1::parse_int( u_char *data, - int *datalength, - u_char *type, - long int *intp, - int intsize) +u_char * asn1::parse_int(u_char *data, + int *datalength, + u_char *type, + long int *intp, + int intsize) { ACE_TRACE("asn1::parse_int"); /* @@ -75,7 +75,7 @@ u_char * asn1::parse_int( u_char *data, u_long asn_length; long value = 0; - if (intsize != sizeof (long)){ + if (intsize != (int) sizeof (long)){ ASNERROR("not long"); return 0; } @@ -127,7 +127,7 @@ u_char * asn1::parse_unsigned_int( u_char *data, u_long asn_length; u_long value = 0; - if (intsize != sizeof (long)){ + if (intsize != (int) sizeof (long)){ ASNERROR("not long"); return 0; } @@ -180,7 +180,7 @@ u_char * asn1::build_int( u_char *data, long integer; u_long mask; - if (intsize != sizeof (long)) + if (intsize != (int) sizeof (long)) return 0; integer = *intp; /* @@ -237,7 +237,7 @@ u_char * asn1::build_unsigned_int( u_char *data, u_long mask; int add_null_byte = 0; - if (intsize != sizeof (long)) + if (intsize != (int) sizeof (long)) return 0; integer = *intp; mask = u_long (0xFF) << (8 * (sizeof(u_long) - 1)); @@ -851,7 +851,7 @@ u_char * asn1::parse_unsigned_int64(u_char *data, u_long low = 0, high = 0; int intsize = 4; - if (countersize != sizeof(struct counter64)){ + if (countersize != (int) sizeof(struct counter64)){ ASNERROR("not right size"); return 0; } @@ -911,7 +911,7 @@ u_char * asn1::build_unsigned_int64( u_char *data, int add_null_byte = 0; int intsize; - if (countersize != sizeof (struct counter64)) + if (countersize != (int) sizeof (struct counter64)) return 0; intsize = 8; low = cp->low; diff --git a/ACE/ASNMP/asnmp/snmp.cpp b/ACE/ASNMP/asnmp/snmp.cpp index 046707c0eba..db16dbb36f3 100644 --- a/ACE/ASNMP/asnmp/snmp.cpp +++ b/ACE/ASNMP/asnmp/snmp.cpp @@ -282,3 +282,7 @@ void Snmp::get_host_name(char* name, int len) Snmp_Result::~Snmp_Result() { } + +Snmp_Result::Snmp_Result() +{ +} diff --git a/ACE/ASNMP/asnmp/snmp.h b/ACE/ASNMP/asnmp/snmp.h index 5bae232baa0..85c3a30f779 100644 --- a/ACE/ASNMP/asnmp/snmp.h +++ b/ACE/ASNMP/asnmp/snmp.h @@ -55,6 +55,7 @@ class Snmp; class ASNMP_Export Snmp_Result { public: + Snmp_Result (); virtual ~Snmp_Result(); virtual void result(Snmp *snmp, int result) = 0; }; diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 44ab4d94554..f9447dc97c5 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,469 @@ +Wed Aug 7 07:02:52 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl> + + * ACE-INSTALL.html: + * ASNMP/asnmp/address.cpp: + * ASNMP/asnmp/asn1.cpp: + * ASNMP/asnmp/snmp.h: + * ASNMP/asnmp/snmp.cpp: + * ace/Asynch_IO.h: + * ace/Connection_Recycling_Strategy.h: + * ace/Connection_Recycling_Strategy.cpp: + * ace/ETCL/ETCL_Constraint_Visitor.h: + * ace/ETCL/ETCL_Constraint_Visitor.cpp: + * ace/FIFO_Recv_Msg.inl: + * ace/Log_Msg_Callback.h: + * ace/Log_Msg_Callback.cpp: + * ace/Monitor_Control/Auto_Update_Starter.h: + * ace/Monitor_Control/Auto_Update_Starter.cpp: + * ace/Monitor_Control/Monitor_Query.h: + * ace/Monitor_Control/Monitor_Query.cpp: + * ace/OS_NS_Thread.cpp: + * ace/OS_NS_signal.h: + * ace/OS_NS_signal.cpp: + * ace/OS_NS_stdio.cpp: + * ace/Select_Reactor_Base.cpp: + * ace/Sig_Handler.h: + * ace/Sig_Handler.cpp: + * ace/TTY_IO.h: + * ace/TTY_IO.cpp: + * ace/Thread_Hook.h: + * ace/Thread_Hook.cpp: + * ace/config-macros.h: + * ace/config-win32-borland.h: + * ace/config-win32-common.h: + * ace/config-win32.h: + * apps/Gateway/Peer/Peer.cpp: + * bin/MakeProjectCreator/config/bmake.features: + * examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp: + * examples/NT_Service/main.cpp: + * examples/Reactor/TP_Reactor/ReadHandler.cpp: + * examples/Reactor/TP_Reactor/client.cpp: + * examples/Timer_Queue/Custom_Handler.h: + * examples/Timer_Queue/main_thread_custom_handler.cpp: + * performance-tests/Synch-Benchmarks/Base_Test/mutex_test.cpp: + * protocols/ace/INet/AuthenticationBase.h: + * protocols/ace/INet/AuthenticationBase.cpp: + * protocols/ace/INet/ConnectionCache.h: + * protocols/ace/INet/FTP_ClientRequestHandler.cpp: + * protocols/ace/INet/FTP_URL.cpp: + * protocols/ace/INet/HTTP_ClientRequestHandler.h: + * protocols/ace/INet/HTTP_ClientRequestHandler.cpp: + * protocols/ace/INet/HTTP_URL.cpp: + * protocols/ace/INet/HeaderBase.h: + * protocols/examples/RMCast/Send_Msg/Receiver.cpp: + * tests/Bug_2434_Regression_Test.cpp: + * tests/Bug_2772_Regression_Test.cpp: + * tests/Capabilities_Test.cpp: + * tests/DLL_Test.h: + * tests/DLL_Test_Impl.cpp: + * tests/Logging_Strategy_Test.cpp: + * tests/Process_Env_Test.cpp: + * tests/Process_Strategy_Test.cpp: + * tests/Reactor_Timer_Test.cpp: + * tests/SOCK_Send_Recv_Test.cpp: + * tests/test_config.h: + Revived port for Embarcadero C++ Builder XE4 using bcc32 + + commit b8e06cf020879fa8aa8cf3158601a19ea8bc44d4 + Author: Johnny Willemsen <jwillemsen@remedy.nl> + Date: Fri Jun 28 19:38:10 2013 +0200 + + Layout + * ACE/tests/Bug_2434_Regression_Test.cpp: + * ACE/tests/Bug_2772_Regression_Test.cpp: + + commit ee6893a5065cbe56df7e4ab5aae31971ddf0edf3 + Author: Johnny Willemsen <jwillemsen@remedy.nl> + Date: Fri Jun 28 19:34:00 2013 +0200 + + Updated borland instructions + * ACE/ACE-INSTALL.html: + + commit 1ac4a32bb448852cf8c1f2fa90d6b14f1fd2d339 + Author: Johnny Willemsen <jwillemsen@remedy.nl> + Date: Fri Jun 28 19:28:01 2013 +0200 + + Fix conversion warnings for bcc32: + * ACE/apps/Gateway/Peer/Peer.cpp: + * ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp: + * ACE/examples/Reactor/TP_Reactor/ReadHandler.cpp: + * ACE/examples/Reactor/TP_Reactor/client.cpp: + + commit b873f90c6801dde85f9fc6538a656f8400d4b8b3 + Author: Johnny Willemsen <jwillemsen@remedy.nl> + Date: Fri Jun 28 09:02:36 2013 +0200 + + Fixed typo + * ACE/tests/Reactor_Timer_Test.cpp: + + commit 4ffd49852005a058ddd7540e101348f1f58db506 + Author: Johnny Willemsen <jwillemsen@remedy.nl> + Date: Thu Jun 27 14:41:32 2013 +0200 + + Fixed bcc32 signed/unsigned comparison warnings + * ACE/protocols/examples/RMCast/Send_Msg/Receiver.cpp: + * ACE/tests/Capabilities_Test.cpp: + * ACE/tests/Process_Strategy_Test.cpp: + * ACE/tests/Reactor_Timer_Test.cpp: + * ACE/tests/SOCK_Send_Recv_Test.cpp: + + commit 604b6c22cc21a64be12bbca4da68ce90f63b4d56 + Author: Johnny Willemsen <jwillemsen@remedy.nl> + Date: Thu Jun 27 13:01:30 2013 +0200 + + Fixed conversion warnings with bcc32 + * ACE/ASNMP/asnmp/address.cpp: + * ACE/ASNMP/asnmp/asn1.cpp: + * ACE/ace/FIFO_Recv_Msg.inl: + + commit c257a73968b54bcab543cb5f2f436f16a9d63df8 + Author: Johnny Willemsen <jwillemsen@remedy.nl> + Date: Thu Jun 27 11:13:25 2013 +0200 + + Cleanup port + * ACE/ace/config-win32-borland.h: + + commit a6dbc3fc51f6d3bb791b024c5e7aed2891a0f749 + Author: Johnny Willemsen <jwillemsen@remedy.nl> + Date: Wed Jun 26 19:34:34 2013 +0200 + + Updated Embarcadero instructions + * ACE/ACE-INSTALL.html: + + commit 476cdd82dcb899059e3f8c67858d4d383042e609 + Author: Johnny Willemsen <jwillemsen@remedy.nl> + Date: Wed Jun 26 14:25:13 2013 +0200 + + Fixed bcc32 warning + * ACE/tests/Process_Strategy_Test.cpp: + + commit 93e4a41e1954ff23a30d1b613e3d42a64ebcac10 + Author: Johnny Willemsen <jwillemsen@remedy.nl> + Date: Wed Jun 26 14:18:51 2013 +0200 + + Extended size of environment usage to make sure we + are above 32k + * ACE/tests/Process_Env_Test.cpp: + + commit 340fbaa2b557c7df56d8ecf8ce623837b4bccb54 + Author: Johnny Willemsen <jwillemsen@remedy.nl> + Date: Wed Jun 26 13:58:19 2013 +0200 + + Added missing export + * ACE/protocols/ace/INet/HeaderBase.h: + Layout + * ACE/tests/Process_Env_Test.cpp: + + commit e7bbccf459931996a3c8482f74736b08ab929093 + Author: Johnny Willemsen <jwillemsen@remedy.nl> + Date: Wed Jun 26 13:26:39 2013 +0200 + + Added some casts to suppress bcc32 warnings + * ACE/ace/OS_NS_Thread.cpp: + * ACE/ace/Select_Reactor_Base.cpp: + + commit a07353c126b24967c7a72c5fba6369a487f8515b + Author: Johnny Willemsen <jwillemsen@remedy.nl> + Date: Wed Jun 26 13:22:52 2013 +0200 + + Removed check + * ACE/ace/pre.h: + + commit f17435f0745233504a01a52fd1dc76b45397504d + Author: Johnny Willemsen <jwillemsen@remedy.nl> + Date: Wed Jun 26 12:26:20 2013 +0200 + + Fixed compile errors with bcc32 + * ACE/protocols/ace/INet/FTP_ClientRequestHandler.cpp: + * ACE/protocols/ace/INet/FTP_URL.cpp: + * ACE/protocols/ace/INet/HTTP_ClientRequestHandler.cpp: + * ACE/protocols/ace/INet/HTTP_ClientRequestHandler.h: + * ACE/protocols/ace/INet/HTTP_URL.cpp: + + commit 305ed854f18ad958d593a94b1b51045ac8f01d5f + Author: Johnny Willemsen <jwillemsen@remedy.nl> + Date: Wed Jun 26 12:11:44 2013 +0200 + + bcb lacks localtime_r + * ACE/ace/config-win32-borland.h: + + commit f7085b98b817695b633ffe2a1898523ff4e5677e + Author: Johnny Willemsen <jwillemsen@remedy.nl> + Date: Wed Jun 26 12:03:56 2013 +0200 + + Disable warning about static constructors + * ACE/ace/pre.h: + + commit 0894d0797d66c9be6ab51ee68612c103f1b7a594 + Author: Johnny Willemsen <jwillemsen@remedy.nl> + Date: Wed Jun 26 11:51:11 2013 +0200 + + Made check more generic + * ACE/tests/Logging_Strategy_Test.cpp: + + commit 5b6354cd131be8ab244dfae4c9bcecccf46eaa74 + Author: Johnny Willemsen <jwillemsen@remedy.nl> + Date: Wed Jun 26 10:10:44 2013 +0200 + + Fix for bcc64 + * ACE/tests/Logging_Strategy_Test.cpp: + + commit 4373010c606d004cc43685b19ad073e957be6518 + Author: Johnny Willemsen <jwillemsen@remedy.nl> + Date: Mon Jun 24 12:03:45 2013 +0200 + + Layout changes + * ACE/tests/test_config.h: + + commit f3c9a5cd86bb50ace420b5a72f8e03fe35c6d9b5 + Author: Johnny Willemsen <jwillemsen@remedy.nl> + Date: Thu Jun 20 10:52:58 2013 +0200 + + Added support for ACE_HAS_CONSOLE_TEST_OUTPUT + * ACE/tests/test_config.h: + + commit 2eadc63b624e91bf2bc3a68ee7627361e7c4c072 + Author: Johnny Willemsen <jwillemsen@remedy.nl> + Date: Wed May 29 11:03:18 2013 +0200 + + Use 32bit preprocessor with cpp64 build + * ACE/ace/config-win32-borland.h: + + commit fd1975d168c7cd7d7f26c6e097d6df4dfc56082d + Author: Johnny Willemsen <jwillemsen@remedy.nl> + Date: Tue May 28 21:50:34 2013 +0200 + + Attempt to fix bcc64 error + * ACE/examples/NT_Service/main.cpp: + + commit d1988a65bc87098d5c13044bb7b7d7fb8e3c2271 + Author: Johnny Willemsen <jwillemsen@remedy.nl> + Date: Tue May 28 21:32:27 2013 +0200 + + Attempt to fix time_t problems + * ACE/ace/config-win32-borland.h: + + commit f2982ed3371cbe38528105b28532bbd56b60a29e + Author: Johnny Willemsen <jwillemsen@remedy.nl> + Date: Tue May 28 19:22:06 2013 +0200 + + Reverted change for other export macros + * ACE/ace/config-win32-borland.h: + + commit 811d190e619b89fdf9478034f92dc5af28fcc69f + Author: Johnny Willemsen <jwillemsen@remedy.nl> + Date: Tue May 28 19:11:54 2013 +0200 + + Try regular export macros with bcb + * ACE/ace/config-win32-borland.h: + * ACE/ace/config-win32-common.h: + + commit 1f8bf7e55140105a36aaf6fb0c689009c05b696e + Author: Johnny Willemsen <jwillemsen@remedy.nl> + Date: Tue May 28 16:14:48 2013 +0200 + + Default constructor + * ACE/protocols/ace/INet/AuthenticationBase.cpp: + * ACE/protocols/ace/INet/AuthenticationBase.h: + + commit 201d7f17557a32477b8c02c74396ef092a4fc953 + Author: Johnny Willemsen <jwillemsen@remedy.nl> + Date: Tue May 28 15:53:01 2013 +0200 + + Default constructor + * ACE/ace/Monitor_Control/Monitor_Query.cpp: + * ACE/ace/Monitor_Control/Monitor_Query.h: + * ACE/performance-tests/Synch-Benchmarks/Base_Test/mutex_test.cpp: + + commit ba8d2a24dade17fe0bfa69c86127b00bc5ff6000 + Author: Johnny Willemsen <jwillemsen@remedy.nl> + Date: Tue May 28 13:47:43 2013 +0200 + + Default constructor + * ACE/ace/TTY_IO.cpp: + * ACE/ace/TTY_IO.h: + + commit 2d9fb952d66ac6527794f3091115a6b1b2d82b58 + Author: Johnny Willemsen <jwillemsen@remedy.nl> + Date: Tue May 28 13:46:33 2013 +0200 + + Default constructot + * ACE/ace/Connection_Recycling_Strategy.cpp: + * ACE/ace/Connection_Recycling_Strategy.h: + + commit e1629f8efa132812267365371e83f0cc6da52842 + Author: Johnny Willemsen <jwillemsen@remedy.nl> + Date: Tue May 28 13:44:45 2013 +0200 + + Added default constructor + * ACE/ace/Monitor_Control/Auto_Update_Starter.cpp: + * ACE/ace/Monitor_Control/Auto_Update_Starter.h: + + commit eca2f470d4671100c1fedfa1a14fa3dc4ac2dda6 + Author: Johnny Willemsen <jwillemsen@remedy.nl> + Date: Tue May 28 13:37:59 2013 +0200 + + Let us see what happens if we don't use a prefix + underscore for symbols + * ACE/ace/config-win32-borland.h: + + commit a596f6fed12afde29d4847af99c0dde85dcf35ee + Author: Johnny Willemsen <jwillemsen@remedy.nl> + Date: Tue May 28 12:57:24 2013 +0200 + + Default constructor + * ACE/performance-tests/Synch-Benchmarks/Base_Test/mutex_test.cpp: + + commit 8dfb772c0d63996f2f5c0c9e8a02966cebc9665e + Author: Johnny Willemsen <jwillemsen@remedy.nl> + Date: Tue May 28 12:55:50 2013 +0200 + + Add default constructor + * ACE/tests/DLL_Test.h: + * ACE/tests/DLL_Test_Impl.cpp: + + commit ab80db0e78d4cdaca365fa2a4b7af2745629da0f + Author: Johnny Willemsen <jwillemsen@remedy.nl> + Date: Tue May 28 12:53:51 2013 +0200 + + Default constructor + * ACE/ace/Thread_Hook.cpp: + * ACE/ace/Thread_Hook.h: + + commit 2143f2e2b51e0e379eff498b85958434ff6e68fc + Author: Johnny Willemsen <jwillemsen@remedy.nl> + Date: Tue May 28 12:49:44 2013 +0200 + + Long double change for 64bit + * ACE/ace/config-win32-borland.h: + + commit cd44c9fbf676714211d1016d8def0f0ffead14c1 + Author: Johnny Willemsen <jwillemsen@remedy.nl> + Date: Tue May 28 12:46:56 2013 +0200 + + Added default constructors + * ACE/ace/Log_Msg_Callback.cpp: + * ACE/ace/Log_Msg_Callback.h: + * ACE/ace/Sig_Handler.cpp: + * ACE/ace/Sig_Handler.h: + + commit 19184dcab928edfd22dce7008ab141534b56f2cd + Author: Johnny Willemsen <jwillemsen@remedy.nl> + Date: Tue May 28 10:44:32 2013 +0200 + + Added empty constructor to fix bcc64 link errors + * ACE/ace/ETCL/ETCL_Constraint_Visitor.cpp: + * ACE/ace/ETCL/ETCL_Constraint_Visitor.h: + + commit 2e55eedf63d1e9a7b82c488f2bd0716a2d88078b + Author: Johnny Willemsen <jwillemsen@remedy.nl> + Date: Tue May 28 10:43:12 2013 +0200 + + Added explicit constructor to resolve bcc64 link problems + * ACE/ASNMP/asnmp/snmp.cpp: + * ACE/ASNMP/asnmp/snmp.h: + + commit d1f85d331af335064b4b40d55e469487ce8c36ad + Author: Johnny Willemsen <jwillemsen@remedy.nl> + Date: Tue May 28 10:40:19 2013 +0200 + + clang based compiler has a problem with swab, let + us emulate it in ACE for the moment + * ACE/ace/config-win32-borland.h: + + * ACE/protocols/ace/INet/ConnectionCache.h: + Doxygen fix + + commit cec571985b60322fef6a0c613927d3fab9ae8fdf + Author: Johnny Willemsen <jwillemsen@remedy.nl> + Date: Tue May 28 09:14:36 2013 +0200 + + we have nonconst swab + * ACE/ace/config-win32-borland.h: + + commit bb9dba4eb5005cb111a6b2cad60c94b8029dd616 + Author: Johnny Willemsen <jwillemsen@remedy.nl> + Date: Tue May 28 09:07:50 2013 +0200 + + Zap older compiler support, handle different preprocessor + for clang environment + * ACE/ace/config-win32-borland.h: + + commit 7bcf63e19497aad971f0eb75ed6dfa504a8d4419 + Author: Johnny Willemsen <jwillemsen@remedy.nl> + Date: Tue May 28 09:05:46 2013 +0200 + + Make unimplemented methods private + * ACE/ace/Asynch_IO.h: + + commit 83333a374d3cafc4ea296c6bb419dfd2ecf2a580 + Author: Johnny Willemsen <jwillemsen@remedy.nl> + Date: Tue May 28 08:40:52 2013 +0200 + + Added macro to try to resolve link errors + * ACE/ace/config-win32-borland.h: + + commit d342c02695a6f74e95cc61446ed519de42a6815c + Author: Johnny Willemsen <jwillemsen@remedy.nl> + Date: Mon May 27 19:30:41 2013 +0200 + + Removed array of handles as part of siginfo_t, triggers + warning with bcc64 and doesn't seem to be used at all + * ACE/ace/OS_NS_signal.cpp: + * ACE/ace/OS_NS_signal.h: + + commit 9e8926669d68a902196a7a4a474c70ad009a05e7 + Author: Johnny Willemsen <jwillemsen@remedy.nl> + Date: Mon May 27 18:10:46 2013 +0200 + + Fix for localtime_r + * ACE/ace/config-win32-borland.h: + + commit a59c969d36d8eb4ca6311bafeab4c653bc0475b6 + Author: Johnny Willemsen <jwillemsen@remedy.nl> + Date: Mon May 27 16:51:17 2013 +0200 + + Attempt to fix argument unused warnings + * ACE/ace/config-macros.h: + + commit fdf91a5679222a618a8eca419310ea83a4470573 + Author: Johnny Willemsen <jwillemsen@remedy.nl> + Date: Mon May 27 12:53:26 2013 +0200 + + Fixes for bcc32 + * ACE/examples/Timer_Queue/Custom_Handler.h: + * ACE/examples/Timer_Queue/main_thread_custom_handler.cpp: + + commit 6799802f3d30139f586894debb2d41680bf78085 + Author: Johnny Willemsen <jwillemsen@remedy.nl> + Date: Mon May 27 11:32:01 2013 +0200 + + New file for bmake + * ACE/bin/MakeProjectCreator/config/bmake.features: + Added. + + commit c08478508b066069b412391d17f2ee5905f96da0 + Author: Johnny Willemsen <jwillemsen@remedy.nl> + Date: Mon May 27 11:17:45 2013 +0200 + + Fixes for C++BuilderXE4 + * ACE/ace/config-win32-borland.h: + + commit cb17ce9c8760b274a669ceb9246d0ae3e4229dc0 + Author: Johnny Willemsen <jwillemsen@remedy.nl> + Date: Fri Aug 17 13:40:38 2012 +0200 + + * ACE/ace/OS_NS_stdio.cpp: + Fixed for bcc32 + + commit 83b5446de5dab9a967da424368170818f7fe78c7 + Author: Johnny Willemsen <jwillemsen@remedy.nl> + Date: Fri Jul 27 13:37:55 2012 +0200 + + * ACE/ace/config-win32-borland.h: + * ACE/ace/config-win32.h: + Added some old files back + Sat Aug 3 19:13:41 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl> * examples/OS/Process/process.cpp: diff --git a/ACE/ace/Asynch_IO.h b/ACE/ace/Asynch_IO.h index 054a29a255b..9c9bf1197b1 100644 --- a/ACE/ace/Asynch_IO.h +++ b/ACE/ace/Asynch_IO.h @@ -1697,6 +1697,7 @@ protected: /// Refers to proxy for this handler. ACE_Refcounted_Auto_Ptr<Proxy, ACE_SYNCH_MUTEX> proxy_; +private: ACE_UNIMPLEMENTED_FUNC (ACE_Handler (const ACE_Handler &)) ACE_UNIMPLEMENTED_FUNC (ACE_Handler operator= (const ACE_Handler &)) }; diff --git a/ACE/ace/Connection_Recycling_Strategy.cpp b/ACE/ace/Connection_Recycling_Strategy.cpp index 0705c8a04be..d8be7436b73 100644 --- a/ACE/ace/Connection_Recycling_Strategy.cpp +++ b/ACE/ace/Connection_Recycling_Strategy.cpp @@ -4,6 +4,10 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_Connection_Recycling_Strategy::ACE_Connection_Recycling_Strategy (void) +{ +} + ACE_Connection_Recycling_Strategy::~ACE_Connection_Recycling_Strategy (void) { } diff --git a/ACE/ace/Connection_Recycling_Strategy.h b/ACE/ace/Connection_Recycling_Strategy.h index fa9599f678c..28ba1de281d 100644 --- a/ACE/ace/Connection_Recycling_Strategy.h +++ b/ACE/ace/Connection_Recycling_Strategy.h @@ -29,6 +29,8 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Export ACE_Connection_Recycling_Strategy { public: + ACE_Connection_Recycling_Strategy (void); + /// Virtual Destructor virtual ~ACE_Connection_Recycling_Strategy (void); diff --git a/ACE/ace/ETCL/ETCL_Constraint_Visitor.cpp b/ACE/ace/ETCL/ETCL_Constraint_Visitor.cpp index 73744ecc287..1056d2956fa 100644 --- a/ACE/ace/ETCL/ETCL_Constraint_Visitor.cpp +++ b/ACE/ace/ETCL/ETCL_Constraint_Visitor.cpp @@ -13,6 +13,10 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL +ETCL_Constraint_Visitor::ETCL_Constraint_Visitor (void) +{ +} + ETCL_Constraint_Visitor::~ETCL_Constraint_Visitor (void) { } diff --git a/ACE/ace/ETCL/ETCL_Constraint_Visitor.h b/ACE/ace/ETCL/ETCL_Constraint_Visitor.h index b18a713f08e..6e000af591a 100644 --- a/ACE/ace/ETCL/ETCL_Constraint_Visitor.h +++ b/ACE/ace/ETCL/ETCL_Constraint_Visitor.h @@ -43,6 +43,7 @@ class ETCL_Preference; class ACE_ETCL_Export ETCL_Constraint_Visitor { public: + ETCL_Constraint_Visitor (void); virtual ~ETCL_Constraint_Visitor (void); virtual int visit_literal (ETCL_Literal_Constraint *); diff --git a/ACE/ace/FIFO_Recv_Msg.inl b/ACE/ace/FIFO_Recv_Msg.inl index 4a7ce576e38..f1fc7e3f8f7 100644 --- a/ACE/ace/FIFO_Recv_Msg.inl +++ b/ACE/ace/FIFO_Recv_Msg.inl @@ -32,7 +32,7 @@ ACE_FIFO_Recv_Msg::recv (ACE_Str_Buf &recv_msg) #else /* Do the ol' 2-read trick... */ if (ACE_OS::read (this->get_handle (), (char *) &recv_msg.len, - sizeof recv_msg.len) != sizeof recv_msg.len) + sizeof recv_msg.len) != (ssize_t) sizeof recv_msg.len) { return -1; } diff --git a/ACE/ace/Log_Msg_Callback.cpp b/ACE/ace/Log_Msg_Callback.cpp index 726879c0b7b..17b72c06bb6 100644 --- a/ACE/ace/Log_Msg_Callback.cpp +++ b/ACE/ace/Log_Msg_Callback.cpp @@ -2,12 +2,14 @@ #include "ace/Log_Msg_Callback.h" - - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_Log_Msg_Callback::ACE_Log_Msg_Callback (void) +{ +} + ACE_Log_Msg_Callback::~ACE_Log_Msg_Callback (void) { } + ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Log_Msg_Callback.h b/ACE/ace/Log_Msg_Callback.h index 2a372ed76b8..abb3f814e9c 100644 --- a/ACE/ace/Log_Msg_Callback.h +++ b/ACE/ace/Log_Msg_Callback.h @@ -54,6 +54,9 @@ class ACE_Log_Record; class ACE_Export ACE_Log_Msg_Callback { public: + /// Default constructor + ACE_Log_Msg_Callback (void); + /// No-op virtual destructor. virtual ~ACE_Log_Msg_Callback (void); diff --git a/ACE/ace/Monitor_Control/Auto_Update_Starter.cpp b/ACE/ace/Monitor_Control/Auto_Update_Starter.cpp index 98bbd87374c..7a10425984d 100644 --- a/ACE/ace/Monitor_Control/Auto_Update_Starter.cpp +++ b/ACE/ace/Monitor_Control/Auto_Update_Starter.cpp @@ -14,6 +14,10 @@ namespace ACE { namespace Monitor_Control { + Auto_Update_Starter::Auto_Update_Starter (void) + { + } + int Auto_Update_Starter::svc (void) { diff --git a/ACE/ace/Monitor_Control/Auto_Update_Starter.h b/ACE/ace/Monitor_Control/Auto_Update_Starter.h index 8339a18f02a..7fc829ef576 100644 --- a/ACE/ace/Monitor_Control/Auto_Update_Starter.h +++ b/ACE/ace/Monitor_Control/Auto_Update_Starter.h @@ -45,6 +45,8 @@ namespace ACE class MONITOR_CONTROL_Export Auto_Update_Starter : public ACE_Task_Base { public: + Auto_Update_Starter (void); + int svc (void); }; } diff --git a/ACE/ace/Monitor_Control/Monitor_Query.cpp b/ACE/ace/Monitor_Control/Monitor_Query.cpp index 30c0768c9b9..d7235f67f88 100644 --- a/ACE/ace/Monitor_Control/Monitor_Query.cpp +++ b/ACE/ace/Monitor_Control/Monitor_Query.cpp @@ -16,6 +16,10 @@ namespace ACE { namespace Monitor_Control { + Monitor_Point_Auto_Query::Monitor_Point_Auto_Query () + { + } + int Monitor_Point_Auto_Query::handle_timeout ( const ACE_Time_Value& /* current */, diff --git a/ACE/ace/Monitor_Control/Monitor_Query.h b/ACE/ace/Monitor_Control/Monitor_Query.h index cc6589036dd..3051c008eed 100644 --- a/ACE/ace/Monitor_Control/Monitor_Query.h +++ b/ACE/ace/Monitor_Control/Monitor_Query.h @@ -41,6 +41,9 @@ namespace ACE : public ACE_Event_Handler { public: + /// Default constructor + Monitor_Point_Auto_Query (); + /// Override of ACE base class method. virtual int handle_timeout (const ACE_Time_Value& current, const void* monitor_query); diff --git a/ACE/ace/OS_NS_Thread.cpp b/ACE/ace/OS_NS_Thread.cpp index 6a3d6232358..9fec2eae63a 100644 --- a/ACE/ace/OS_NS_Thread.cpp +++ b/ACE/ace/OS_NS_Thread.cpp @@ -1471,7 +1471,7 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv, return -1; # if defined (ACE_WIN32) - if (result != WAIT_OBJECT_0) + if (result != (int)WAIT_OBJECT_0) { switch (result) { @@ -1654,7 +1654,7 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv, if (ACE_OS::thread_mutex_unlock (&cv->waiters_lock_) != 0) return -1; - if (result != WAIT_OBJECT_0) + if (result != (int)WAIT_OBJECT_0) { switch (result) { @@ -1746,7 +1746,7 @@ ACE_OS::cond_wait (ACE_cond_t *cv, if (ACE_OS::thread_mutex_unlock (&cv->waiters_lock_) != 0) return -1; - if (result != WAIT_OBJECT_0) + if (result != (int)WAIT_OBJECT_0) { switch (result) { diff --git a/ACE/ace/OS_NS_signal.cpp b/ACE/ace/OS_NS_signal.cpp index 8b708e44859..595442068c0 100644 --- a/ACE/ace/OS_NS_signal.cpp +++ b/ACE/ace/OS_NS_signal.cpp @@ -8,17 +8,7 @@ #if !defined (ACE_HAS_SIGINFO_T) siginfo_t::siginfo_t (ACE_HANDLE handle) - : si_handle_ (handle), - si_handles_ (&handle) -{ -} - -siginfo_t::siginfo_t (ACE_HANDLE *handles) - : si_handle_ (handles[0]), - si_handles_ (handles) + : si_handle_ (handle) { } #endif /* ACE_HAS_SIGINFO_T */ - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/OS_NS_signal.h b/ACE/ace/OS_NS_signal.h index e7eeb96fc83..896d6142f30 100644 --- a/ACE/ace/OS_NS_signal.h +++ b/ACE/ace/OS_NS_signal.h @@ -129,13 +129,9 @@ inline int ace_sigsuspend_helper (const sigset_t *s) struct ACE_Export siginfo_t { siginfo_t (ACE_HANDLE handle); - siginfo_t (ACE_HANDLE *handles); // JCEJ 12/23/96 /// Win32 HANDLE that has become signaled. ACE_HANDLE si_handle_; - - /// Array of Win32 HANDLEs all of which have become signaled. - ACE_HANDLE *si_handles_; }; # endif /* ACE_HAS_SIGINFO_T */ diff --git a/ACE/ace/OS_NS_stdio.cpp b/ACE/ace/OS_NS_stdio.cpp index 80bec1ada89..a21e2e62b44 100644 --- a/ACE/ace/OS_NS_stdio.cpp +++ b/ACE/ace/OS_NS_stdio.cpp @@ -37,8 +37,11 @@ extern "C" BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID) ACE_BEGIN_VERSIONED_NAMESPACE_DECL +namespace ACE_OS +{ + void -ACE_OS::ace_flock_t::dump (void) const +ace_flock_t::dump (void) const { #if defined (ACE_HAS_DUMP) ACE_OS_TRACE ("ACE_OS::ace_flock_t::dump"); @@ -67,6 +70,8 @@ ACE_OS::ace_flock_t::dump (void) const #endif /* ACE_HAS_DUMP */ } +} /* namespace ACE_OS */ + /*****************************************************************************/ diff --git a/ACE/ace/Select_Reactor_Base.cpp b/ACE/ace/Select_Reactor_Base.cpp index 72f21215fe1..68d74c16b32 100644 --- a/ACE/ace/Select_Reactor_Base.cpp +++ b/ACE/ace/Select_Reactor_Base.cpp @@ -892,7 +892,7 @@ ACE_Select_Reactor_Notify::read_notify_pipe (ACE_HANDLE handle, if (n > 0) { // Check to see if we've got a short read. - if (n != sizeof buffer) + if ((size_t)n != sizeof buffer) { ssize_t const remainder = sizeof buffer - n; diff --git a/ACE/ace/Sig_Handler.cpp b/ACE/ace/Sig_Handler.cpp index 87b052162fa..bf160f1e6be 100644 --- a/ACE/ace/Sig_Handler.cpp +++ b/ACE/ace/Sig_Handler.cpp @@ -329,6 +329,10 @@ ACE_Sig_Handlers_Set::instance (int signum) ACE_ALLOC_HOOK_DEFINE(ACE_Sig_Handlers) +ACE_Sig_Handlers::ACE_Sig_Handlers (void) +{ +} + void ACE_Sig_Handlers::dump (void) const { diff --git a/ACE/ace/Sig_Handler.h b/ACE/ace/Sig_Handler.h index 3e8732e5579..711936e2934 100644 --- a/ACE/ace/Sig_Handler.h +++ b/ACE/ace/Sig_Handler.h @@ -165,6 +165,9 @@ private: class ACE_Export ACE_Sig_Handlers : public ACE_Sig_Handler { public: + /// Default constructor + ACE_Sig_Handlers (void); + // = Registration and removal methods. /** * Add a new ACE_Event_Handler and a new sigaction associated with diff --git a/ACE/ace/TTY_IO.cpp b/ACE/ace/TTY_IO.cpp index 7aa82ab74a7..5a986f88463 100644 --- a/ACE/ace/TTY_IO.cpp +++ b/ACE/ace/TTY_IO.cpp @@ -26,6 +26,10 @@ namespace ACE_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_TTY_IO::ACE_TTY_IO (void) +{ +} + ACE_TTY_IO::Serial_Params::Serial_Params (void) { baudrate = 9600; diff --git a/ACE/ace/TTY_IO.h b/ACE/ace/TTY_IO.h index d3f165eca23..f0ed759a757 100644 --- a/ACE/ace/TTY_IO.h +++ b/ACE/ace/TTY_IO.h @@ -36,6 +36,8 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Export ACE_TTY_IO : public ACE_DEV_IO { public: + ACE_TTY_IO (void); + enum Control_Mode { SETPARAMS, ///< Set control parameters. diff --git a/ACE/ace/Thread_Hook.cpp b/ACE/ace/Thread_Hook.cpp index 16c156435f1..68ede402b9b 100644 --- a/ACE/ace/Thread_Hook.cpp +++ b/ACE/ace/Thread_Hook.cpp @@ -5,6 +5,10 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_Thread_Hook::ACE_Thread_Hook() +{ +} + ACE_Thread_Hook::~ACE_Thread_Hook () { } diff --git a/ACE/ace/Thread_Hook.h b/ACE/ace/Thread_Hook.h index 54b4419250d..5cf7aa02705 100644 --- a/ACE/ace/Thread_Hook.h +++ b/ACE/ace/Thread_Hook.h @@ -34,6 +34,9 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Export ACE_Thread_Hook { public: + /// Default constructor + ACE_Thread_Hook (void); + /// Destructor. virtual ~ACE_Thread_Hook (void); diff --git a/ACE/ace/config-macros.h b/ACE/ace/config-macros.h index 22b544286ca..432457a980d 100644 --- a/ACE/ace/config-macros.h +++ b/ACE/ace/config-macros.h @@ -223,7 +223,7 @@ // ============================================================================ #if !defined (ACE_UNUSED_ARG) -# if defined (__GNUC__) && ((__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))) +# if defined (__GNUC__) && ((__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))) || (defined (__BORLANDC__) && defined (__clang__)) # define ACE_UNUSED_ARG(a) (void) (a) # elif defined (__GNUC__) || defined (ghs) || defined (__hpux) || defined (__DECCXX) || defined (__rational__) || defined (__USLC__) || defined (ACE_RM544) || defined (__DCC__) || defined (__PGI) || defined (__TANDEM) // Some compilers complain about "statement with no effect" with (a). diff --git a/ACE/ace/config-win32-borland.h b/ACE/ace/config-win32-borland.h new file mode 100644 index 00000000000..4bed71c4fab --- /dev/null +++ b/ACE/ace/config-win32-borland.h @@ -0,0 +1,179 @@ +//-*- C++ -*- +//$Id$ + +// The following configuration file contains defines for Borland compilers. + +#ifndef ACE_CONFIG_WIN32_BORLAND_H +#define ACE_CONFIG_WIN32_BORLAND_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_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<CLASS, LOCK>; +#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 <CLASS, LOCK>; + +// 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) + +#if (__BORLANDC__ >= 0x620) +# define ACE_CC_PREPROCESSOR_ARGS "-q -Sl -o%s" +#endif + +// Automatically define WIN32 macro if the compiler tells us it is our +// target platform. +# if defined (__WIN32__) && !defined (WIN32) +# define WIN32 1 +# endif + +// When building a VCL application, the main VCL header file should be +// included before anything else. You can define ACE_HAS_VCL=1 in your +// project settings to have this file included for you automatically. +# if defined (ACE_HAS_VCL) && (ACE_HAS_VCL != 0) +# include /**/ <vcl.h> +# endif + +#if defined (__clang__) +# define ACE_HAS_BCC64 +#else +# define ACE_HAS_BCC32 +#endif + +#if defined (ACE_HAS_BCC64) +// Use 32bit pre processor because cpp64 doesn't have the same +// options +# define ACE_CC_PREPROCESSOR "CPP32.EXE" +#else +# define ACE_CC_PREPROCESSOR "CPP32.EXE" +#endif + +# include "ace/config-win32-common.h" + +# define ACE_WSTRING_HAS_USHORT_SUPPORT 1 +# define ACE_HAS_DIRENT + +#define ACE_USES_STD_NAMESPACE_FOR_STDC_LIB 1 + +#define ACE_LACKS_TERMIOS_H +#define ACE_LACKS_NETINET_TCP_H +#define ACE_LACKS_REGEX_H +#define ACE_LACKS_SYS_MSG_H +#define ACE_LACKS_PWD_H +#define ACE_LACKS_POLL_H +#define ACE_LACKS_SYS_SHM_H +#define ACE_LACKS_STRINGS_H +#define ACE_LACKS_SEMAPHORE_H +#define ACE_LACKS_INTTYPES_H +#define ACE_LACKS_UCONTEXT_H +#define ACE_LACKS_SYS_SELECT_H +#define ACE_LACKS_SYS_TIME_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_SYS_IOCTL_H +#define ACE_LACKS_STROPTS_H + +#undef ACE_LACKS_STRUCT_DIR +#undef ACE_LACKS_CLOSEDIR +#undef ACE_LACKS_OPENDIR +#undef ACE_LACKS_READDIR +#undef ACE_LACKS_REWINDDIR + +#define ACE_HAS_WOPENDIR +#define ACE_HAS_WCLOSEDIR +#define ACE_HAS_WREADDIR +#define ACE_HAS_WREWINDDIR + +#define ACE_LACKS_STRRECVFD +#define ACE_USES_EXPLICIT_STD_NAMESPACE + +#if defined (ACE_HAS_BCC64) +# define ACE_HAS_TIME_T_LONG_MISMATCH +#endif + +#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_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_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 +# if !defined(__MT__) +// *** DO NOT *** defeat this error message by defining __MT__ yourself. +// You must link with the multi threaded libraries. Add -tWM to your +// compiler options +# error You must link against multi-threaded libraries when using ACE (check your project settings) +# endif /* !__MT__ */ +#endif /* ACE_MT_SAFE && ACE_MT_SAFE != 0 */ + +#if (__BORLANDC__ <= 0x660) +# define ACE_LACKS_ISWCTYPE +# define ACE_LACKS_ISCTYPE +#endif + +#if (__BORLANDC__ >= 0x650) && (__BORLANDC__ <= 0x660) +# define ACE_LACKS_STRTOK_R +#endif + +#if (__BORLANDC__ <= 0x660) +# define ACE_LACKS_LOCALTIME_R +#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 + +#if defined (ACE_HAS_BCC64) +# define ACE_LACKS_SWAB +#endif + +#if defined (ACE_HAS_BCC32) +# define ACE_SIZEOF_LONG_DOUBLE 10 +# define ACE_NEEDS_DL_UNDERSCORE +#endif + +#include /**/ "ace/post.h" +#endif /* ACE_CONFIG_WIN32_BORLAND_H */ + diff --git a/ACE/ace/config-win32-common.h b/ACE/ace/config-win32-common.h index 5846e3e9730..7305cece2e9 100644 --- a/ACE/ace/config-win32-common.h +++ b/ACE/ace/config-win32-common.h @@ -134,7 +134,7 @@ // #endif // Define the special export macros needed to export symbols outside a dll -#if !defined(__BORLANDC__) && (!defined (ACE_HAS_CUSTOM_EXPORT_MACROS) || (ACE_HAS_CUSTOM_EXPORT_MACROS == 0)) +#if !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 diff --git a/ACE/ace/config-win32.h b/ACE/ace/config-win32.h index 1ada8467838..24833d682f0 100644 --- a/ACE/ace/config-win32.h +++ b/ACE/ace/config-win32.h @@ -22,23 +22,31 @@ // NOTE: Please do not add anything besides #include's here. Put other stuff // (definitions, etc.) in the included headers -#include "ace/config-win32-common.h" +// We need to ensure that for Borland vcl.h can be included before +// windows.h. So we will not include config-win32-common.h from here, +// but instead let it be included at the appropriate place in +// config-win32-borland.h. +#if !defined (__BORLANDC__) +# include "ace/config-win32-common.h" +#endif /* !__BORLANDC__ */ // Include the config-win32-* file specific to the compiler -#if defined (_MSC_VER) -# include "ace/config-win32-msvc.h" +#if defined (__BORLANDC__) +# include "ace/config-win32-borland.h" +#elif defined (_MSC_VER) +# include "ace/config-win32-msvc.h" #elif defined (ACE_HAS_CEGCC) //need to be prior to MINGW32 -# include "ace/config-win32-cegcc.h" +# include "ace/config-win32-cegcc.h" #elif defined (__MINGW32__) -# if defined (__MINGW64_VERSION_MAJOR) -# include "ace/config-win32-mingw64.h" -# else -# include "ace/config-win32-mingw.h" -# endif +# if defined (__MINGW64_VERSION_MAJOR) +# include "ace/config-win32-mingw64.h" +# else +# include "ace/config-win32-mingw.h" +# endif #elif defined (__DMC__) -# include "ace/config-win32-dmc.h" +# include "ace/config-win32-dmc.h" #else -# error Compiler is not supported +# error Compiler is not supported #endif #include /**/ "ace/post.h" diff --git a/ACE/apps/Gateway/Peer/Peer.cpp b/ACE/apps/Gateway/Peer/Peer.cpp index 233148682d3..76dbe01e63b 100644 --- a/ACE/apps/Gateway/Peer/Peer.cpp +++ b/ACE/apps/Gateway/Peer/Peer.cpp @@ -491,7 +491,7 @@ Peer_Handler::await_connection_id (void) ssize_t n = this->peer ().recv (&this->connection_id_, sizeof this->connection_id_); - if (n != sizeof this->connection_id_) + if (n != (ssize_t) sizeof this->connection_id_) { if (n == 0) ACE_ERROR_RETURN ((LM_ERROR, diff --git a/ACE/bin/MakeProjectCreator/config/bmake.features b/ACE/bin/MakeProjectCreator/config/bmake.features new file mode 100644 index 00000000000..f7f24def9d1 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/bmake.features @@ -0,0 +1,7 @@ +// bmake.features,v 1.2 2005/08/22 09:35:48 jwillemsen Exp + +ssl=0 +qos=1 +cidl=0 +rwho=0 +sctp=0 diff --git a/ACE/docs/svn/config b/ACE/docs/svn/config index 46ec471d88e..e1a39660b5b 100644 --- a/ACE/docs/svn/config +++ b/ACE/docs/svn/config @@ -152,6 +152,7 @@ enable-auto-props = yes *.conf=svn:eol-style=native;svn:keywords=Author Date Id Revision *.pem=svn:eol-style=native;svn:keywords=Author Date Id Revision *.xme=svn:eol-style=native;svn:keywords=Author Date Id Revision +*.features=svn:eol-style=native;svn:keywords=Author Date Id Revision Change?og*=svn:eol-style=native;svn:keywords=Author Date Id Revision README=svn:eol-style=native;svn:keywords=Author Date Id Revision "Makefile"="svn:eol-style=native;svn:keywords=Author Date Id Revision" diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp index 2c097321acf..e1ab3534edd 100644 --- a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp +++ b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp @@ -90,7 +90,7 @@ twoway_server (void *arg) "(%P|%t) reached end of input, connection closed by client\n")); break; } - else if (r_bytes != sizeof (ACE_INT32)) + else if (r_bytes != (ssize_t) sizeof (ACE_INT32)) { ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", @@ -206,7 +206,7 @@ oneway_server (void *arg) "(%P|%t) reached end of input, connection closed by client\n")); break; } - else if (r_bytes != sizeof (ACE_INT32)) + else if (r_bytes != (ssize_t) sizeof (ACE_INT32)) { ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", diff --git a/ACE/examples/NT_Service/main.cpp b/ACE/examples/NT_Service/main.cpp index 785913e3613..fb3e65cbf39 100644 --- a/ACE/examples/NT_Service/main.cpp +++ b/ACE/examples/NT_Service/main.cpp @@ -141,10 +141,9 @@ Process::parse_args (int argc, ACE_TCHAR* argv[]) // Define a function to handle Ctrl+C to cleanly shut this down. -static BOOL __stdcall -ConsoleHandler (DWORD ctrlType) +static BOOL WINAPI +ConsoleHandler (DWORD /*ctrlType*/) { - ACE_UNUSED_ARG (ctrlType); SERVICE::instance ()->handle_control (SERVICE_CONTROL_STOP); return TRUE; } diff --git a/ACE/examples/Reactor/TP_Reactor/ReadHandler.cpp b/ACE/examples/Reactor/TP_Reactor/ReadHandler.cpp index d2adf529654..c5aa1eb011e 100644 --- a/ACE/examples/Reactor/TP_Reactor/ReadHandler.cpp +++ b/ACE/examples/Reactor/TP_Reactor/ReadHandler.cpp @@ -76,7 +76,7 @@ int ReadHandler::handle_input(ACE_HANDLE) { // Note: only use the sizeof and pointer to int on compatible // platforms (i.e. little-endian/big-endian, data type size) if (mStream.recv_n(&mDataSize, sizeof(mDataSize), - &connTimeout) != sizeof(mDataSize)) { + &connTimeout) != (ssize_t) sizeof(mDataSize)) { ACE_ERROR((LM_ERROR, ACE_TEXT("%N:%l: Failed to receive ") ACE_TEXT ("request. (errno = %i: %m)\n"), ACE_ERRNO_GET)); INVOCATION_RETURN(-1); diff --git a/ACE/examples/Reactor/TP_Reactor/client.cpp b/ACE/examples/Reactor/TP_Reactor/client.cpp index 5c770f2f3bc..68b9918ca3e 100644 --- a/ACE/examples/Reactor/TP_Reactor/client.cpp +++ b/ACE/examples/Reactor/TP_Reactor/client.cpp @@ -86,7 +86,7 @@ int ACE_TMAIN(int argc, ACE_TCHAR **argv) { // send the request to the server (number of MiB in the next call) // Note: only use the sizeof and pointer to int on compatible // platforms (i.e. little-endian/big-endian, data type size) - if (stream.send_n(&size, sizeof(size), &connTimeout) != sizeof(size)) { + if (stream.send_n(&size, sizeof(size), &connTimeout) != (ssize_t) sizeof(size)) { ACE_ERROR((LM_ERROR, ACE_TEXT("%N:%l: Failed to send ") ACE_TEXT ("request. (errno = %i: %m)\n"), ACE_ERRNO_GET)); throw 1; diff --git a/ACE/examples/Timer_Queue/Custom_Handler.h b/ACE/examples/Timer_Queue/Custom_Handler.h index d8d9a951fb8..0d5ead57200 100644 --- a/ACE/examples/Timer_Queue/Custom_Handler.h +++ b/ACE/examples/Timer_Queue/Custom_Handler.h @@ -19,6 +19,7 @@ #define _CUSTOM_HANDLER_H_ #include "ace/Timer_Queue.h" +#include "ace/svc_export.h" /** * @class Custom_Handler @@ -60,7 +61,7 @@ class Custom_Handler /// /// Implements the Upcall interface used by the ACE_Timer_Queue, specifically for the /// IWorkItem interface. -class Custom_Handler_Upcall +class ACE_Svc_Export Custom_Handler_Upcall { public: diff --git a/ACE/examples/Timer_Queue/main_thread_custom_handler.cpp b/ACE/examples/Timer_Queue/main_thread_custom_handler.cpp index cb4221ac394..9f33e5101e1 100644 --- a/ACE/examples/Timer_Queue/main_thread_custom_handler.cpp +++ b/ACE/examples/Timer_Queue/main_thread_custom_handler.cpp @@ -30,7 +30,7 @@ ACE_TMAIN (int, ACE_TCHAR *[]) { // Auto ptr ensures that the driver memory is released // automatically. - THREAD_TIMER_QUEUE_TEST_DRIVER *tqtd; + THREAD_TIMER_QUEUE_TEST_DRIVER *tqtd = 0; ACE_NEW_RETURN (tqtd, Thread_Timer_Queue_Custom_Handler_Test, -1); auto_ptr <THREAD_TIMER_QUEUE_TEST_DRIVER> driver (tqtd); diff --git a/ACE/performance-tests/Synch-Benchmarks/Base_Test/mutex_test.cpp b/ACE/performance-tests/Synch-Benchmarks/Base_Test/mutex_test.cpp index 162f60943f6..f1da0dbed3a 100644 --- a/ACE/performance-tests/Synch-Benchmarks/Base_Test/mutex_test.cpp +++ b/ACE/performance-tests/Synch-Benchmarks/Base_Test/mutex_test.cpp @@ -23,6 +23,9 @@ template<class LOCK> class ACE_Svc_Export Baseline_Lock_Test : public Baseline_Test_Base { public: + Baseline_Lock_Test (); + virtual ~Baseline_Lock_Test (); + virtual int acquire (); virtual int release (); // These two method are used to test try_acquire performance. @@ -36,6 +39,16 @@ private: // }; +template<class LOCK> +Baseline_Lock_Test<LOCK>::Baseline_Lock_Test () +{ +} + +template<class LOCK> +Baseline_Lock_Test<LOCK>::~Baseline_Lock_Test () +{ +} + template<class LOCK> int Baseline_Lock_Test<LOCK>::acquire () { diff --git a/ACE/protocols/ace/INet/AuthenticationBase.cpp b/ACE/protocols/ace/INet/AuthenticationBase.cpp index 735a94cd7bb..c2c0953b4f1 100644 --- a/ACE/protocols/ace/INet/AuthenticationBase.cpp +++ b/ACE/protocols/ace/INet/AuthenticationBase.cpp @@ -12,9 +12,17 @@ namespace ACE { namespace INet { - AuthenticationBase::~AuthenticationBase () {} + AuthenticationBase::~AuthenticationBase () + { + } - AuthenticatorBase::~AuthenticatorBase () {} + AuthenticatorBase::AuthenticatorBase () + { + } + + AuthenticatorBase::~AuthenticatorBase () + { + } } } diff --git a/ACE/protocols/ace/INet/AuthenticationBase.h b/ACE/protocols/ace/INet/AuthenticationBase.h index 45675f4a553..04e216aeb88 100644 --- a/ACE/protocols/ace/INet/AuthenticationBase.h +++ b/ACE/protocols/ace/INet/AuthenticationBase.h @@ -65,6 +65,9 @@ namespace ACE class ACE_INET_Export AuthenticatorBase { public: + /// Default constructor + AuthenticatorBase (); + /// Destructor virtual ~AuthenticatorBase (); diff --git a/ACE/protocols/ace/INet/ConnectionCache.h b/ACE/protocols/ace/INet/ConnectionCache.h index 0776fe295da..05406ff2929 100644 --- a/ACE/protocols/ace/INet/ConnectionCache.h +++ b/ACE/protocols/ace/INet/ConnectionCache.h @@ -237,14 +237,14 @@ namespace ACE const ConnectionCacheValue& cacheval); /// Attempts to claim an existing connection. - /// Returns true and sets <connection> if successful. + /// Returns true and sets @a connection if successful. /// Returns false otherwise. /// Does not wait when no connection available. bool claim_existing_connection(const ConnectionKey& key, connection_type*& connection, ConnectionCacheValue::State& state); - /// Looks up a matching cache entry for <key> and updates + /// Looks up a matching cache entry for @a key and updates /// <cacheval> with the entry state if found. /// Returns true if found, false otherwise. bool find_connection (const ConnectionKey& key, diff --git a/ACE/protocols/ace/INet/FTP_ClientRequestHandler.cpp b/ACE/protocols/ace/INet/FTP_ClientRequestHandler.cpp index 1f9a8775f55..d8132cfbb8d 100644 --- a/ACE/protocols/ace/INet/FTP_ClientRequestHandler.cpp +++ b/ACE/protocols/ace/INet/FTP_ClientRequestHandler.cpp @@ -68,7 +68,7 @@ namespace ACE const ACE_CString& realm, ACE_CString& user, ACE_CString& pw) - : AuthenticationBase (), + : ACE::INet::AuthenticationBase (), realm_ (realm), user_ (user), password_ (pw) diff --git a/ACE/protocols/ace/INet/FTP_URL.cpp b/ACE/protocols/ace/INet/FTP_URL.cpp index b6a8118a2d0..fa2cadbb20e 100644 --- a/ACE/protocols/ace/INet/FTP_URL.cpp +++ b/ACE/protocols/ace/INet/FTP_URL.cpp @@ -24,18 +24,18 @@ namespace ACE } URL::URL () - : URL_INetAuthBase (FTP_PORT) + : ACE::INet::URL_INetAuthBase (FTP_PORT) { } URL::URL (const ACE_CString& url_string) - : URL_INetAuthBase (FTP_PORT) + : ACE::INet::URL_INetAuthBase (FTP_PORT) { this->parse (url_string); } URL::URL (const URL& url) - : URL_INetAuthBase (0) + : ACE::INet::URL_INetAuthBase (0) { *this = url; } diff --git a/ACE/protocols/ace/INet/HTTP_ClientRequestHandler.cpp b/ACE/protocols/ace/INet/HTTP_ClientRequestHandler.cpp index ade87052b37..c2cdda310da 100644 --- a/ACE/protocols/ace/INet/HTTP_ClientRequestHandler.cpp +++ b/ACE/protocols/ace/INet/HTTP_ClientRequestHandler.cpp @@ -154,7 +154,7 @@ namespace ACE ACE::INet::ConnectionKey* ClientRequestHandler::HttpConnectionKey::duplicate () const { - ConnectionKey* k = 0; + ACE::INet::ConnectionKey* k = 0; if (this->proxy_connection_) { ACE_NEW_RETURN (k, diff --git a/ACE/protocols/ace/INet/HTTP_ClientRequestHandler.h b/ACE/protocols/ace/INet/HTTP_ClientRequestHandler.h index 16f5ca10832..1a8a0b61350 100644 --- a/ACE/protocols/ace/INet/HTTP_ClientRequestHandler.h +++ b/ACE/protocols/ace/INet/HTTP_ClientRequestHandler.h @@ -190,7 +190,7 @@ namespace ACE virtual u_long hash () const; - virtual ConnectionKey* duplicate () const; + virtual ACE::INet::ConnectionKey* duplicate () const; bool is_proxy_connection () const; @@ -199,7 +199,7 @@ namespace ACE u_short proxy_target_port () const; protected: - virtual bool equal (const ConnectionKey& key) const; + virtual bool equal (const ACE::INet::ConnectionKey& key) const; private: bool proxy_connection_; diff --git a/ACE/protocols/ace/INet/HTTP_URL.cpp b/ACE/protocols/ace/INet/HTTP_URL.cpp index 01498682691..3527fc15da2 100644 --- a/ACE/protocols/ace/INet/HTTP_URL.cpp +++ b/ACE/protocols/ace/INet/HTTP_URL.cpp @@ -24,26 +24,26 @@ namespace ACE } URL::URL () - : URL_INetAuthBase (HTTP_PORT), + : ACE::INet::URL_INetAuthBase (HTTP_PORT), proxy_port_ (HTTP_PROXY_PORT) { } URL::URL (const ACE_CString& url_string) - : URL_INetAuthBase (HTTP_PORT), + : ACE::INet::URL_INetAuthBase (HTTP_PORT), proxy_port_ (HTTP_PROXY_PORT) { this->parse (url_string); } URL::URL (const URL& url) - : URL_INetAuthBase (0) + : ACE::INet::URL_INetAuthBase (0) { *this = url; } URL::URL (u_short port) - : URL_INetAuthBase (port), + : ACE::INet::URL_INetAuthBase (port), proxy_port_ (HTTP_PROXY_PORT) { } diff --git a/ACE/protocols/ace/INet/HeaderBase.h b/ACE/protocols/ace/INet/HeaderBase.h index 5231ee24294..65d10b07e42 100644 --- a/ACE/protocols/ace/INet/HeaderBase.h +++ b/ACE/protocols/ace/INet/HeaderBase.h @@ -36,7 +36,7 @@ namespace ACE * @brief Name/Value pair holder class. * */ - class NVPair + class ACE_INET_Export NVPair { public: NVPair (); @@ -116,22 +116,22 @@ namespace ACE static const ACE_CString EMPTY; - /// Sets header <name> to <value>. Overwrites existing vaues. + /// Sets header @a name to @a value. Overwrites existing vaues. void set (const ACE_CString& name, const ACE_CString& value); - /// Adds header <name> with <value>. Allows duplicates. + /// Adds header @a name with @a value. Allows duplicates. void add (const ACE_CString& name, const ACE_CString& value); - /// Removes header <name> (first found). + /// Removes header @a name (first found). void remove (const ACE_CString& name); - /// Retrieves value for header <name> into <value> (first found). + /// Retrieves value for header @a name into @a value (first found). bool get (const ACE_CString& name, ACE_CString& value) const; - /// Returns true if a header <name> exists (1 or more), false otherwise. + /// Returns true if a header @a name exists (1 or more), false otherwise. bool has (const ACE_CString& name) const; - /// Retrieves values for all headers <name> into <values>. + /// Retrieves values for all headers @a name into @a values. void get_values (const ACE_CString& name, ACE_Array<ACE_CString>& values) const; protected: diff --git a/ACE/protocols/examples/RMCast/Send_Msg/Receiver.cpp b/ACE/protocols/examples/RMCast/Send_Msg/Receiver.cpp index c6378948fc8..90330b61973 100644 --- a/ACE/protocols/examples/RMCast/Send_Msg/Receiver.cpp +++ b/ACE/protocols/examples/RMCast/Send_Msg/Receiver.cpp @@ -84,7 +84,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[]) continue; } - if (s != sizeof (msg)) + if (s != (ssize_t) sizeof (msg)) { ACE_ERROR ((LM_ERROR, "unexpected message size %d, expected %d\n", s, sizeof (msg))); diff --git a/ACE/tests/Bug_2434_Regression_Test.cpp b/ACE/tests/Bug_2434_Regression_Test.cpp index b4d5a2d1431..bb3d9fca4fc 100644 --- a/ACE/tests/Bug_2434_Regression_Test.cpp +++ b/ACE/tests/Bug_2434_Regression_Test.cpp @@ -12,12 +12,9 @@ */ //============================================================================= - // Note, for this test the config.h file *must* come first! #include "ace/config-all.h" - - #include "test_config.h" #include "ace/ACE.h" #include "ace/Time_Value.h" diff --git a/ACE/tests/Bug_2772_Regression_Test.cpp b/ACE/tests/Bug_2772_Regression_Test.cpp index 6969d3fc277..01b9c7e8e22 100644 --- a/ACE/tests/Bug_2772_Regression_Test.cpp +++ b/ACE/tests/Bug_2772_Regression_Test.cpp @@ -18,8 +18,6 @@ #include "ace/Condition_Recursive_Thread_Mutex.h" #include "ace/Thread.h" - - class ThreadTest { public: diff --git a/ACE/tests/Capabilities_Test.cpp b/ACE/tests/Capabilities_Test.cpp index 41af5b42817..81face57602 100644 --- a/ACE/tests/Capabilities_Test.cpp +++ b/ACE/tests/Capabilities_Test.cpp @@ -86,7 +86,7 @@ run_main (int, ACE_TCHAR *[]) if (ACE_OS::write (fd, file_contents, sizeof(file_contents)) != - sizeof(file_contents)) + (ssize_t) sizeof(file_contents)) { ACE_OS::unlink (config); ACE_OS::close (fd); diff --git a/ACE/tests/DLL_Test.h b/ACE/tests/DLL_Test.h index fb55875eff9..84c2c36e00d 100644 --- a/ACE/tests/DLL_Test.h +++ b/ACE/tests/DLL_Test.h @@ -64,6 +64,7 @@ public: class ACE_Svc_Export Child : public Parent { public: + Child (void); virtual ~Child (void); diff --git a/ACE/tests/DLL_Test_Impl.cpp b/ACE/tests/DLL_Test_Impl.cpp index ba02c9ab320..f9e6ea2db86 100644 --- a/ACE/tests/DLL_Test_Impl.cpp +++ b/ACE/tests/DLL_Test_Impl.cpp @@ -113,6 +113,10 @@ static Static_Constructor_Test the_instance; // -------------------------------------------------------- +Child::Child (void) +{ +} + Child::~Child (void) { } diff --git a/ACE/tests/Logging_Strategy_Test.cpp b/ACE/tests/Logging_Strategy_Test.cpp index 6b3c6a8394d..e566481bd48 100644 --- a/ACE/tests/Logging_Strategy_Test.cpp +++ b/ACE/tests/Logging_Strategy_Test.cpp @@ -65,7 +65,7 @@ ACE_TCHAR const * cdecl_decoration (ACE_TCHAR const *func_name) { -#if defined (__BORLANDC__) +#if defined(ACE_NEEDS_DL_UNDERSCORE) static ACE_TCHAR decorated_func_name[10*1024]; ACE_OS::sprintf (decorated_func_name, ACE_TEXT ("_%s"), @@ -73,7 +73,7 @@ cdecl_decoration (ACE_TCHAR const *func_name) return decorated_func_name; #else return func_name; -#endif /* __BORLANDC__ */ +#endif /* ACE_NEEDS_DL_UNDERSCORE */ } // Global variables. diff --git a/ACE/tests/Process_Env_Test.cpp b/ACE/tests/Process_Env_Test.cpp index 185f7302adf..b24456af1f9 100644 --- a/ACE/tests/Process_Env_Test.cpp +++ b/ACE/tests/Process_Env_Test.cpp @@ -5,15 +5,13 @@ * * $Id$ * - * This program tests the limits of the Windows CreateProcess - * environment buffer. - * + * This program tests the limits of the Windows CreateProcess + * environment buffer. * * @author Chad Elliott <elliott_c@ociweb.com> */ //============================================================================= - #include "test_config.h" #include "ace/Process.h" #include "ace/SString.h" @@ -25,7 +23,7 @@ typedef void (*setenvfn_t) (const ACE_TCHAR *name, const ACE_TCHAR *value, void create_large_env (setenvfn_t setenv, void *ctx) { - static const size_t varsize = 1200; + static const size_t varsize = 1600; for (int i = 0; i < 26; i++) { char name[2] = { 'A', '\0' }; @@ -89,7 +87,7 @@ run_main (int, ACE_TCHAR*[]) test_status = 1; } - //test inheriting a large env block with enable_unicode_environment + // Test inheriting a large env block with enable_unicode_environment ACE_Process_Options opts2 (1, ACE_Process_Options::DEFAULT_COMMAND_LINE_BUF_LEN, 128 * 1024); diff --git a/ACE/tests/Process_Strategy_Test.cpp b/ACE/tests/Process_Strategy_Test.cpp index 2d04924214f..3ebe1271bb6 100644 --- a/ACE/tests/Process_Strategy_Test.cpp +++ b/ACE/tests/Process_Strategy_Test.cpp @@ -74,7 +74,7 @@ typedef ACE_Strategy_Acceptor <Counting_Service, ACE_SOCK_ACCEPTOR> ACCEPTOR; typedef ACE_Singleton<Options, ACE_Null_Mutex> OPTIONS; // counter for connections -static int connections = 0; +static size_t connections = 0; // Use this to show down the process gracefully. static void @@ -226,7 +226,7 @@ Options::parse_args (int argc, ACE_TCHAR *argv[]) // Store the initial value of the count in the file. if (ACE_OS::write (this->file_lock_.get_handle (), (const void *) &count, - sizeof count) != sizeof count) + sizeof count) != (ssize_t) sizeof count) ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n"), ACE_TEXT ("write"))); @@ -304,7 +304,7 @@ Counting_Service::read (void) if (ACE_OS::pread (OPTIONS::instance ()->file_lock ().get_handle (), (void *) &count, sizeof count, - 0) != sizeof count) + 0) != (ssize_t) sizeof count) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n"), ACE_TEXT ("read")), @@ -342,7 +342,7 @@ Counting_Service::inc (void) if (ACE_OS::pread (OPTIONS::instance ()->file_lock ().get_handle (), (void *) &count, sizeof count, - 0) != sizeof count) + 0) != (ssize_t) sizeof count) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n"), ACE_TEXT ("read")), @@ -357,7 +357,7 @@ Counting_Service::inc (void) if (ACE_OS::pwrite (OPTIONS::instance ()->file_lock ().get_handle (), (const void *) &count, sizeof count, - 0) != sizeof count) + 0) != (ssize_t) sizeof count) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n"), ACE_TEXT ("write")), diff --git a/ACE/tests/Reactor_Timer_Test.cpp b/ACE/tests/Reactor_Timer_Test.cpp index 22dfc273b7b..baf0c3fd897 100644 --- a/ACE/tests/Reactor_Timer_Test.cpp +++ b/ACE/tests/Reactor_Timer_Test.cpp @@ -94,7 +94,7 @@ Time_Handler::handle_timeout (const ACE_Time_Value &tv, if (current_count == long (ACE_MAX_TIMERS - 1)) done = 1; - else if (the_count == ACE_MAX_TIMERS - 1) + else if (the_count == long (ACE_MAX_TIMERS - 1)) { done = 1; return -1; diff --git a/ACE/tests/SOCK_Send_Recv_Test.cpp b/ACE/tests/SOCK_Send_Recv_Test.cpp index b3dc1145f60..92d387bf3bc 100644 --- a/ACE/tests/SOCK_Send_Recv_Test.cpp +++ b/ACE/tests/SOCK_Send_Recv_Test.cpp @@ -196,7 +196,6 @@ client (void *arg) // case this tests only needs to be exercised if the socket is // non-blocking, so set that first. - ssize_t sent; char buff[Test3_Send_Size]; if (-1 == cli_stream.enable (ACE_NONBLOCK)) ACE_ERROR ((LM_ERROR, @@ -205,8 +204,8 @@ client (void *arg) for (i = 0; i < Test3_Loops; ++i) { errno = 0; - sent = cli_stream.send_n (buff, sizeof (buff)); - if (sent != sizeof (buff) && errno != 0) + ssize_t sent = cli_stream.send_n (buff, sizeof (buff)); + if (sent != (ssize_t) sizeof (buff) && errno != 0) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Test 3, pass %d, sent %d, %p\n"), diff --git a/ACE/tests/test_config.h b/ACE/tests/test_config.h index e7a99122ee8..c5fb375402b 100644 --- a/ACE/tests/test_config.h +++ b/ACE/tests/test_config.h @@ -61,7 +61,9 @@ # define ACE_DEFAULT_TEST_DIR ACE_TEXT ("") #endif -#define ACE_LOG_FILE_EXT_NAME ACE_TEXT (".log") +#if !defined (ACE_LOG_FILE_EXT_NAME) +# define ACE_LOG_FILE_EXT_NAME ACE_TEXT (".log") +#endif /* ACE_LOG_FILE_EXT_NAME */ #if defined (ACE_HAS_WINCE) || defined (ACE_HAS_PHARLAP) size_t const ACE_MAX_CLIENTS = 4; @@ -78,6 +80,16 @@ size_t const ACE_MAX_ITERATIONS = 10; size_t const ACE_MAX_PROCESSES = 10; size_t const ACE_MAX_THREADS = 4; +#if defined ACE_HAS_CONSOLE_TEST_OUTPUT +#ifndef ACE_START_TEST +# define ACE_START_TEST(NAME) const ACE_TCHAR *program = NAME; ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Starting %s test at %D\n"), NAME)) +#endif /* ACE_START_TEST */ + +#ifndef ACE_END_TEST +# define ACE_END_TEST ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Ending %s test t %D\n"), program)); +#endif /* ACE_END_TEST */ +#endif /* ACE_HAS_CONSOLE_TEST_OUTPUT */ + #ifndef ACE_START_TEST #define ACE_START_TEST(NAME) \ const ACE_TCHAR *program = NAME; \ |