diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2000-02-21 23:18:53 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2000-02-21 23:18:53 +0000 |
| commit | b75744d8bffc8cc52e8201369da3bb81d75fe0c9 (patch) | |
| tree | d8a8fb5b956a97c19bb33c90c6846d0766ebda58 | |
| parent | afd3024e1bea027bc86bd4538ec70e6db5e441f1 (diff) | |
| download | ATCD-b75744d8bffc8cc52e8201369da3bb81d75fe0c9.tar.gz | |
ChangeLogTag:Mon Feb 21 14:35:39 2000 Christopher Kohlhoff <chris@kohlhoff.com>
138 files changed, 507 insertions, 828 deletions
diff --git a/ChangeLog b/ChangeLog index 876ae515924..8cdeb25f7df 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,22 @@ +Mon Feb 21 14:35:39 2000 Christopher Kohlhoff <chris@kohlhoff.com> + + * ace/Makefile.bor: Added new files. + + * tests/*.cpp, tests/test_config.h: Removed macros that had been + used by C++Builder 3. + + * include/makeinclude/compiler.bor: Added support for C++Builder 5 + VCL libs. + + * include/makeinclude/recurse.bor, lots of Makefile.bor files: + Added support for makefile recursion. + +Mon Feb 21 14:35:39 2000 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * include/makeinclude/compiler.bor: Increased the limit of + LIB_LFLAGS from 2048 to 4096. Thanks to Mogens Hansen + <mogens_h@dk-online.dk> for reporting this. + Mon Feb 21 15:43:01 2000 Nanbor Wang <nanbor@cs.wustl.edu> * ace/MEM_SAP.h: diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 876ae515924..8cdeb25f7df 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,22 @@ +Mon Feb 21 14:35:39 2000 Christopher Kohlhoff <chris@kohlhoff.com> + + * ace/Makefile.bor: Added new files. + + * tests/*.cpp, tests/test_config.h: Removed macros that had been + used by C++Builder 3. + + * include/makeinclude/compiler.bor: Added support for C++Builder 5 + VCL libs. + + * include/makeinclude/recurse.bor, lots of Makefile.bor files: + Added support for makefile recursion. + +Mon Feb 21 14:35:39 2000 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * include/makeinclude/compiler.bor: Increased the limit of + LIB_LFLAGS from 2048 to 4096. Thanks to Mogens Hansen + <mogens_h@dk-online.dk> for reporting this. + Mon Feb 21 15:43:01 2000 Nanbor Wang <nanbor@cs.wustl.edu> * ace/MEM_SAP.h: diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 876ae515924..8cdeb25f7df 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,22 @@ +Mon Feb 21 14:35:39 2000 Christopher Kohlhoff <chris@kohlhoff.com> + + * ace/Makefile.bor: Added new files. + + * tests/*.cpp, tests/test_config.h: Removed macros that had been + used by C++Builder 3. + + * include/makeinclude/compiler.bor: Added support for C++Builder 5 + VCL libs. + + * include/makeinclude/recurse.bor, lots of Makefile.bor files: + Added support for makefile recursion. + +Mon Feb 21 14:35:39 2000 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * include/makeinclude/compiler.bor: Increased the limit of + LIB_LFLAGS from 2048 to 4096. Thanks to Mogens Hansen + <mogens_h@dk-online.dk> for reporting this. + Mon Feb 21 15:43:01 2000 Nanbor Wang <nanbor@cs.wustl.edu> * ace/MEM_SAP.h: diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 7bca3654f21..678a29cee08 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,15 @@ +Mon Feb 21 14:35:39 2000 Christopher Kohlhoff <chris@kohlhoff.com> + + * tao/Makefile.bor, TAO/orbsvcs/orbsvcs/Makefile.bor: Added new files. + + * tests/MProfile/test_i.h: Removed extra semicolon. + +Mon Feb 21 16:09:28 2000 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * docs/DIFFERENCES: Clarified that this file doesn't reflect + what's in TAO any more. Thanks to Alex Brown + <abrown@3com-ne.com> for pointing this out. + Mon Feb 21 15:54:31 2000 Jeff Parsons <parsons@cs.wustl.edu> * tests/IDL_Test/union.idl: diff --git a/TAO/Makefile.bor b/TAO/Makefile.bor index c90af1c6f6f..6d170cd475c 100644 --- a/TAO/Makefile.bor +++ b/TAO/Makefile.bor @@ -1,48 +1,33 @@ - # # Makefile for building ACE and TAO # -!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor> +!ifndef BUILDALL + +# By default we build a smaller set of libraries and executables. +DIRS = \ + ..\ace \ + ..\apps\gperf\src \ + tao \ + tao_idl \ + orbsvcs \ + utils -ace_tao: - cd $(ACE_ROOT)\ace - $(MAKE) -f Makefile.bor $(MAKE_FLAGS) - cd $(ACE_ROOT)\TAO\tao - $(MAKE) -f Makefile.bor $(MAKE_FLAGS) - cd $(ACE_ROOT)\TAO\tao_idl - $(MAKE) -f Makefile.bor $(MAKE_FLAGS) - cd $(ACE_ROOT)\apps\gperf\src - $(MAKE) -f Makefile.bor $(MAKE_FLAGS) - cd $(ACE_ROOT)\TAO\orbsvcs\orbsvcs - $(MAKE) -f Makefile.bor $(MAKE_FLAGS) - cd $(ACE_ROOT)\TAO\orbsvcs\Naming_Service - $(MAKE) -f Makefile.bor $(MAKE_FLAGS) - cd $(ACE_ROOT)\TAO\orbsvcs\Trading_Service - $(MAKE) -f Makefile.bor $(MAKE_FLAGS) - cd $(ACE_ROOT)\TAO\orbsvcs\Event_Service - $(MAKE) -f Makefile.bor $(MAKE_FLAGS) - cd $(ACE_ROOT)\TAO\orbsvcs\CosEvent_Service - $(MAKE) -f Makefile.bor $(MAKE_FLAGS) +!else -examples: - cd $(ACE_ROOT)\TAO\examples\simple\echo - $(MAKE) -f Makefile.bor $(MAKE_FLAGS) - cd $(ACE_ROOT)\TAO\examples\simple\chat - $(MAKE) -f Makefile.bor $(MAKE_FLAGS) - cd $(ACE_ROOT)\TAO\examples\simple\bank - $(MAKE) -f Makefile.bor $(MAKE_FLAGS) - cd $(ACE_ROOT)\TAO\examples\simple\grid - $(MAKE) -f Makefile.bor $(MAKE_FLAGS) - cd $(ACE_ROOT)\TAO\examples\simple\time - $(MAKE) -f Makefile.bor $(MAKE_FLAGS) - cd $(ACE_ROOT)\TAO\examples\Callback_Quoter - $(MAKE) -f Makefile.bor $(MAKE_FLAGS) +# When BUILDALL is defined we will make everything that can be built. +DIRS = \ + ..\ace \ + ..\apps \ + ..\netsvcs \ + ..\tests \ + tao \ + TAO_IDL \ + orbsvcs \ + examples \ + tests \ + utils -utils: - cd $(ACE_ROOT)\tao\utils\catior - $(MAKE) -f Makefile.bor $(MAKE_FLAGS) - cd $(ACE_ROOT)\tao\utils\IOR-parser - $(MAKE) -f Makefile.bor $(MAKE_FLAGS) - cd $(ACE_ROOT)\tao\utils\nslist - $(MAKE) -f Makefile.bor $(MAKE_FLAGS) +!endif + +!include <$(ACE_ROOT)\include\makeinclude\recurse.bor> diff --git a/TAO/docs/DIFFERENCES b/TAO/docs/DIFFERENCES index 0a8dd343d4d..79ea6c7619f 100644 --- a/TAO/docs/DIFFERENCES +++ b/TAO/docs/DIFFERENCES @@ -1,5 +1,14 @@ @(#)DIFFERENCES 1.1 95/09/13 +Note -- this documentation was distributed with the original SunSoft +IIOP reference implementation and has very little relevance to what's +in TAO. We include it here only for "historical" reference, i.e., you +should disregard most of what's in this document. + + Doug Schmidt + +---------------------------------------- + [ NOTE that the CORBA 2.0 specifications have now been published, but are not yet sufficiently available that this document can usefully just list any differences between that specification and this software. As a rule, diff --git a/TAO/examples/Callback_Quoter/Makefile.bor b/TAO/examples/Callback_Quoter/Makefile.bor index b8a062276e4..186a5e66a87 100644 --- a/TAO/examples/Callback_Quoter/Makefile.bor +++ b/TAO/examples/Callback_Quoter/Makefile.bor @@ -2,10 +2,10 @@ # Makefile for building the Callback Quoter example # -!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor> - -all: - $(MAKE) -f Callback_Quoter_Notifier.bor $(MAKE_FLAGS) - $(MAKE) -f Callback_Quoter_Consumer.bor $(MAKE_FLAGS) - $(MAKE) -f Callback_Quoter_Supplier.bor $(MAKE_FLAGS) +MAKEFILES = \ + Callback_Quoter_Notifier.bor \ + Callback_Quoter_Consumer.bor \ + Callback_Quoter_Supplier.bor + +!include <$(ACE_ROOT)\include\makeinclude\recurse.bor> diff --git a/TAO/examples/Makefile.bor b/TAO/examples/Makefile.bor new file mode 100644 index 00000000000..31a95260e85 --- /dev/null +++ b/TAO/examples/Makefile.bor @@ -0,0 +1,8 @@ + +# +# Makefile for building the TAO examples +# + +DIRS = Callback_Quoter Simple + +!include <$(ACE_ROOT)\include\makeinclude\recurse.bor> diff --git a/TAO/examples/Simple/Makefile.bor b/TAO/examples/Simple/Makefile.bor new file mode 100644 index 00000000000..98ca252ffcc --- /dev/null +++ b/TAO/examples/Simple/Makefile.bor @@ -0,0 +1,8 @@ + +# +# Makefile for building the simple examples +# + +DIRS = bank chat echo grid time + +!include <$(ACE_ROOT)\include\makeinclude\recurse.bor> diff --git a/TAO/examples/Simple/bank/Makefile.bor b/TAO/examples/Simple/bank/Makefile.bor index c1449bea116..0b78bdea401 100644 --- a/TAO/examples/Simple/bank/Makefile.bor +++ b/TAO/examples/Simple/bank/Makefile.bor @@ -3,9 +3,6 @@ # Makefile for building the Bank example # -!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor> - -all: - $(MAKE) -f Bank_Client.bor $(MAKE_FLAGS) - $(MAKE) -f Bank_Server.bor $(MAKE_FLAGS) +MAKEFILES = Bank_Client.bor Bank_Server.bor +!include <$(ACE_ROOT)\include\makeinclude\recurse.bor> diff --git a/TAO/examples/Simple/chat/Makefile.bor b/TAO/examples/Simple/chat/Makefile.bor index 828f0dc2c93..77d97e80b8c 100644 --- a/TAO/examples/Simple/chat/Makefile.bor +++ b/TAO/examples/Simple/chat/Makefile.bor @@ -2,9 +2,6 @@ # Makefile for building the Chat example # -!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor> - -all: - $(MAKE) -f Chat_Client.bor $(MAKE_FLAGS) - $(MAKE) -f Chat_Server.bor $(MAKE_FLAGS) +MAKEFILES = Chat_Client.bor Chat_Server.bor +!include <$(ACE_ROOT)\include\makeinclude\recurse.bor> diff --git a/TAO/examples/Simple/echo/Makefile.bor b/TAO/examples/Simple/echo/Makefile.bor index f8514256edc..9ebf4665df3 100644 --- a/TAO/examples/Simple/echo/Makefile.bor +++ b/TAO/examples/Simple/echo/Makefile.bor @@ -3,9 +3,7 @@ # Makefile for building the Echo example # -!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor> +MAKEFILES = Echo_Client.bor Echo_Server.bor -all: - $(MAKE) -f Echo_Client.bor $(MAKE_FLAGS) - $(MAKE) -f Echo_Server.bor $(MAKE_FLAGS) +!include <$(ACE_ROOT)\include\makeinclude\recurse.bor> diff --git a/TAO/examples/Simple/grid/Makefile.bor b/TAO/examples/Simple/grid/Makefile.bor index 928d64225bc..f81cf6322ce 100644 --- a/TAO/examples/Simple/grid/Makefile.bor +++ b/TAO/examples/Simple/grid/Makefile.bor @@ -2,9 +2,7 @@ # Makefile for building the Grid example # -!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor> +MAKEFILES = Grid_Client.bor Grid_Server.bor -all: - $(MAKE) -f Grid_Client.bor $(MAKE_FLAGS) - $(MAKE) -f Grid_Server.bor $(MAKE_FLAGS) +!include <$(ACE_ROOT)\include\makeinclude\recurse.bor> diff --git a/TAO/examples/Simple/time/Makefile.bor b/TAO/examples/Simple/time/Makefile.bor index 270f4ed8322..4c591d95001 100644 --- a/TAO/examples/Simple/time/Makefile.bor +++ b/TAO/examples/Simple/time/Makefile.bor @@ -2,9 +2,7 @@ # Makefile for building the Time example # -!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor> +MAKEFILES = Time_Client.bor Time_Server.bor -all: - $(MAKE) -f Time_Client.bor $(FLAGS) - $(MAKE) -f Time_Server.bor $(FLAGS) +!include <$(ACE_ROOT)\include\makeinclude\recurse.bor> diff --git a/TAO/orbsvcs/Makefile.bor b/TAO/orbsvcs/Makefile.bor new file mode 100644 index 00000000000..4eddf84d723 --- /dev/null +++ b/TAO/orbsvcs/Makefile.bor @@ -0,0 +1,13 @@ +# +# Makefile for building orbsvcs +# + +DIRS = \ + orbsvcs \ + CosEvent_Service \ + Event_Service \ + Naming_Service \ + Notify_Service \ + Trading_Service + +!include <$(ACE_ROOT)\include\makeinclude\recurse.bor> diff --git a/TAO/orbsvcs/Naming_Service/Makefile.bor b/TAO/orbsvcs/Naming_Service/Makefile.bor index 852dee03b1b..3b04d0a72d9 100644 --- a/TAO/orbsvcs/Naming_Service/Makefile.bor +++ b/TAO/orbsvcs/Naming_Service/Makefile.bor @@ -2,11 +2,6 @@ # Makefile for building the Naming Service executables # -!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor> +MAKEFILES = Naming_Service.bor -console_only: - $(MAKE) -f Naming_Service.bor $(MAKE_FLAGS) - -all: - $(MAKE) -f Naming_Service.bor $(MAKE_FLAGS) - $(MAKE) -f NT_Naming_Service.bor $(MAKE_FLAGS) +!include <$(ACE_ROOT)\include\makeinclude\recurse.bor> diff --git a/TAO/orbsvcs/Notify_Service/Makefile.bor b/TAO/orbsvcs/Notify_Service/Makefile.bor new file mode 100644 index 00000000000..074b1441a22 --- /dev/null +++ b/TAO/orbsvcs/Notify_Service/Makefile.bor @@ -0,0 +1,15 @@ +# +# Makefile for building the Notification Service executable +# + +NAME = Notify_Service + +OBJFILES = $(OBJDIR)\Notify_Service.obj + +CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(ORBSVCS_CFLAGS) + +LIBFILES = $(ACE_LIB) $(TAO_LIB) $(ORBSVCS_LIB) + +CPPDIR = . + +!include <$(ACE_ROOT)\include\makeinclude\build_core_exe.bor> diff --git a/TAO/orbsvcs/Trading_Service/Makefile.bor b/TAO/orbsvcs/Trading_Service/Makefile.bor index 06735120755..fbe3f674b7e 100644 --- a/TAO/orbsvcs/Trading_Service/Makefile.bor +++ b/TAO/orbsvcs/Trading_Service/Makefile.bor @@ -6,7 +6,7 @@ NAME = Trading_Service OBJFILES = \ $(OBJDIR)\Trading_Service.obj \ - $(OBJDIR)\Trading_Server.obj + $(OBJDIR)\Trading_Server.obj CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(ORBSVCS_CFLAGS) diff --git a/TAO/orbsvcs/orbsvcs/Makefile.bor b/TAO/orbsvcs/orbsvcs/Makefile.bor index d07457e8498..9bdead4ccac 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.bor +++ b/TAO/orbsvcs/orbsvcs/Makefile.bor @@ -35,6 +35,24 @@ OBJFILES = \ $(OBJDIR)\BasicLog_i.obj \ $(OBJDIR)\BasicLogFactory_i.obj \ $(OBJDIR)\BCU.obj \ + $(OBJDIR)\CEC_ConsumerAdmin.obj \ + $(OBJDIR)\CEC_ConsumerControl.obj \ + $(OBJDIR)\CEC_Default_Factory.obj \ + $(OBJDIR)\CEC_Dispatching.obj \ + $(OBJDIR)\CEC_Dispatching_Task.obj \ + $(OBJDIR)\CEC_EventChannel.obj \ + $(OBJDIR)\CEC_Factory.obj \ + $(OBJDIR)\CEC_MT_Dispatching.obj \ + $(OBJDIR)\CEC_ProxyPullConsumer.obj \ + $(OBJDIR)\CEC_ProxyPullSupplier.obj \ + $(OBJDIR)\CEC_ProxyPushConsumer.obj \ + $(OBJDIR)\CEC_ProxyPushSupplier.obj \ + $(OBJDIR)\CEC_Pulling_Strategy.obj \ + $(OBJDIR)\CEC_Reactive_ConsumerControl.obj \ + $(OBJDIR)\CEC_Reactive_Pulling_Strategy.obj \ + $(OBJDIR)\CEC_Reactive_SupplierControl.obj \ + $(OBJDIR)\CEC_SupplierAdmin.obj \ + $(OBJDIR)\CEC_SupplierControl.obj \ $(OBJDIR)\Config_Scheduler.obj \ $(OBJDIR)\Constraint_Interpreter.obj \ $(OBJDIR)\Constraint_l.obj \ @@ -72,8 +90,10 @@ OBJFILES = \ $(OBJDIR)\DsLogAdminC.obj \ $(OBJDIR)\DsLogAdminS.obj \ $(OBJDIR)\DynSched.obj \ + $(OBJDIR)\EC_And_Filter.obj \ $(OBJDIR)\EC_Basic_Factory.obj \ $(OBJDIR)\EC_Basic_Filter_Builder.obj \ + $(OBJDIR)\EC_Bitmask_Filter.obj \ $(OBJDIR)\EC_Busy_Lock.obj \ $(OBJDIR)\EC_Conjunction_Filter.obj \ $(OBJDIR)\EC_ConsumerAdmin.obj \ @@ -88,16 +108,17 @@ OBJFILES = \ $(OBJDIR)\EC_Filter_Builder.obj \ $(OBJDIR)\EC_Gateway.obj \ $(OBJDIR)\EC_Gateway_UDP.obj \ + $(OBJDIR)\EC_Masked_Type_Filter.obj \ $(OBJDIR)\EC_MT_Dispatching.obj \ $(OBJDIR)\EC_Negation_Filter.obj \ $(OBJDIR)\EC_Null_Factory.obj \ $(OBJDIR)\EC_Null_Scheduling.obj \ $(OBJDIR)\EC_ObserverStrategy.obj \ $(OBJDIR)\EC_Per_Supplier_Filter.obj \ + $(OBJDIR)\EC_Prefix_Filter_Builder.obj \ $(OBJDIR)\EC_Priority_Dispatching.obj \ $(OBJDIR)\EC_Priority_Scheduling.obj \ $(OBJDIR)\EC_ProxyConsumer.obj \ - $(OBJDIR)\EC_ProxyPushSupplier_Set.obj \ $(OBJDIR)\EC_ProxySupplier.obj \ $(OBJDIR)\EC_QOS_Info.obj \ $(OBJDIR)\EC_Reactive_ConsumerControl.obj \ diff --git a/TAO/tao/Makefile.bor b/TAO/tao/Makefile.bor index 6c18f2d6e9b..e780772703d 100644 --- a/TAO/tao/Makefile.bor +++ b/TAO/tao/Makefile.bor @@ -10,7 +10,7 @@ OBJFILES = \ $(OBJDIR)\Any.obj \ $(OBJDIR)\append.obj \ $(OBJDIR)\Asynch_Invocation.obj \ - $(OBJDIR)\Buffering_Constraint_Policy.obj \ + $(OBJDIR)\Buffering_Constraint_Policy.obj \ $(OBJDIR)\CDR.obj \ $(OBJDIR)\CDR_Interpreter.obj \ $(OBJDIR)\Client_Priority_Policy.obj \ @@ -45,6 +45,7 @@ OBJFILES = \ $(OBJDIR)\Forwarding_Servant.obj \ $(OBJDIR)\GIOP.obj \ $(OBJDIR)\GIOP_Server_Request.obj \ + $(OBJDIR)\GIOPC.obj \ $(OBJDIR)\IIOP_Acceptor.obj \ $(OBJDIR)\IIOP_Connect.obj \ $(OBJDIR)\IIOP_Connector.obj \ @@ -110,10 +111,16 @@ OBJFILES = \ $(OBJDIR)\Server_Request.obj \ $(OBJDIR)\Server_Strategy_Factory.obj \ $(OBJDIR)\Services.obj \ + $(OBJDIR)\SHMIOP_Acceptor.obj \ + $(OBJDIR)\SHMIOP_Connect.obj \ + $(OBJDIR)\SHMIOP_Connector.obj \ + $(OBJDIR)\SHMIOP_Factory.obj \ + $(OBJDIR)\SHMIOP_Profile.obj \ + $(OBJDIR)\SHMIOP_Transport.obj \ $(OBJDIR)\Single_Reactor.obj \ $(OBJDIR)\skip.obj \ $(OBJDIR)\Stub.obj \ - $(OBJDIR)\Sync_Strategies.obj \ + $(OBJDIR)\Sync_Strategies.obj \ $(OBJDIR)\Tagged_Components.obj \ $(OBJDIR)\TAO.obj \ $(OBJDIR)\TAO_Internal.obj \ diff --git a/TAO/tests/AMI/Makefile.bor b/TAO/tests/AMI/Makefile.bor index 6cdc1d3da90..b891b969552 100644 --- a/TAO/tests/AMI/Makefile.bor +++ b/TAO/tests/AMI/Makefile.bor @@ -2,9 +2,6 @@ # Makefile for building the AMI test executables # -!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor> +MAKEFILES = server.bor client.bor simple_client.bor -all: - $(MAKE) -f server.bor $(MAKE_FLAGS) - $(MAKE) -f client.bor $(MAKE_FLAGS) - $(MAKE) -f simple_client.bor $(MAKE_FLAGS) +!include <$(ACE_ROOT)\include\makeinclude\recurse.bor> diff --git a/TAO/tests/CDR/Makefile.bor b/TAO/tests/CDR/Makefile.bor index 2a3727b57cf..7c8ef190efa 100644 --- a/TAO/tests/CDR/Makefile.bor +++ b/TAO/tests/CDR/Makefile.bor @@ -1,13 +1,7 @@ - # # Makefile for building the CDR tests # -!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor> +MAKEFILES = allocator.bor basic_types.bor growth.bor octet_sequence.bor tc.bor -tests: - $(MAKE) -f allocator.bor $(MAKE_FLAGS) - $(MAKE) -f basic_types.bor $(MAKE_FLAGS) - $(MAKE) -f growth.bor $(MAKE_FLAGS) - $(MAKE) -f octet_sequence.bor $(MAKE_FLAGS) - $(MAKE) -f tc.bor $(MAKE_FLAGS) +!include <$(ACE_ROOT)\include\makeinclude\recurse.bor> diff --git a/TAO/tests/Collocation/Makefile.bor b/TAO/tests/Collocation/Makefile.bor index 851e33b1a20..597234b5974 100644 --- a/TAO/tests/Collocation/Makefile.bor +++ b/TAO/tests/Collocation/Makefile.bor @@ -2,9 +2,6 @@ # Makefile for building the Collocation test executables and libraries # -!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor> +MAKEFILES = Coll_Test_Stubs.bor Diamond.bor Collocation.bor -all: - $(MAKE) -f Coll_Test_Stubs.bor $(MAKE_FLAGS) - $(MAKE) -f Diamond.bor $(MAKE_FLAGS) - $(MAKE) -f Collocation.bor $(MAKE_FLAGS) +!include <$(ACE_ROOT)\include\makeinclude\recurse.bor> diff --git a/TAO/tests/Endpoint_Per_Priority/Makefile.bor b/TAO/tests/Endpoint_Per_Priority/Makefile.bor index 6afe0052c99..5415c5f741a 100644 --- a/TAO/tests/Endpoint_Per_Priority/Makefile.bor +++ b/TAO/tests/Endpoint_Per_Priority/Makefile.bor @@ -2,8 +2,6 @@ # Makefile for building the Endpoint_Per_Priority test executables # -!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor> +MAKEFILES = server.bor client.bor -all: - $(MAKE) -f server.bor $(MAKE_FLAGS) - $(MAKE) -f client.bor $(MAKE_FLAGS) +!include <$(ACE_ROOT)\include\makeinclude\recurse.bor> diff --git a/TAO/tests/Explicit_Event_Loop/Makefile.bor b/TAO/tests/Explicit_Event_Loop/Makefile.bor index 60137283cb9..335981c0081 100644 --- a/TAO/tests/Explicit_Event_Loop/Makefile.bor +++ b/TAO/tests/Explicit_Event_Loop/Makefile.bor @@ -2,8 +2,6 @@ # Makefile for building the Explicit_Event_Loop test executables # -!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor> +MAKEFILES = server.bor client.bor -all: - $(MAKE) -f server.bor $(MAKE_FLAGS) - $(MAKE) -f client.bor $(MAKE_FLAGS) +!include <$(ACE_ROOT)\include\makeinclude\recurse.bor> diff --git a/TAO/tests/Faults/Makefile.bor b/TAO/tests/Faults/Makefile.bor index 57f5f8901cc..a4c8d9a474c 100644 --- a/TAO/tests/Faults/Makefile.bor +++ b/TAO/tests/Faults/Makefile.bor @@ -2,11 +2,6 @@ # Makefile for building the Faults test executables # -!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor> +MAKEFILES = server.bor middle.bor client.bor ping.bor pong.bor -all: - $(MAKE) -f server.bor $(MAKE_FLAGS) - $(MAKE) -f middle.bor $(MAKE_FLAGS) - $(MAKE) -f client.bor $(MAKE_FLAGS) - $(MAKE) -f ping.bor $(MAKE_FLAGS) - $(MAKE) -f pong.bor $(MAKE_FLAGS) +!include <$(ACE_ROOT)\include\makeinclude\recurse.bor> diff --git a/TAO/tests/InterOp-Naming/Makefile.bor b/TAO/tests/InterOp-Naming/Makefile.bor index f0603d3d459..6de3ea09f0a 100644 --- a/TAO/tests/InterOp-Naming/Makefile.bor +++ b/TAO/tests/InterOp-Naming/Makefile.bor @@ -2,8 +2,6 @@ # Makefile for building the InterOp-Naming test executables # -!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor> +MAKEFILES = server.bor client.bor -all: - $(MAKE) -f server.bor $(MAKE_FLAGS) - $(MAKE) -f client.bor $(MAKE_FLAGS) +!include <$(ACE_ROOT)\include\makeinclude\recurse.bor> diff --git a/TAO/tests/Interceptors/Makefile.bor b/TAO/tests/Interceptors/Makefile.bor index 15df3d031cb..1224510c2f9 100644 --- a/TAO/tests/Interceptors/Makefile.bor +++ b/TAO/tests/Interceptors/Makefile.bor @@ -2,8 +2,6 @@ # Makefile for building the Interceptors test executables # -!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor> +MAKEFILES = server.bor client.bor -all: - $(MAKE) -f server.bor $(MAKE_FLAGS) - $(MAKE) -f client.bor $(MAKE_FLAGS) +!include <$(ACE_ROOT)\include\makeinclude\recurse.bor> diff --git a/TAO/tests/MProfile/Makefile.bor b/TAO/tests/MProfile/Makefile.bor index 2e280ea5fff..4a119810aa6 100644 --- a/TAO/tests/MProfile/Makefile.bor +++ b/TAO/tests/MProfile/Makefile.bor @@ -2,8 +2,6 @@ # Makefile for building the MProfile test executables # -!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor> +MAKEFILES = server.bor client.bor -all: - $(MAKE) -f server.bor $(MAKE_FLAGS) - $(MAKE) -f client.bor $(MAKE_FLAGS) +!include <$(ACE_ROOT)\include\makeinclude\recurse.bor> diff --git a/TAO/tests/MProfile/test_i.h b/TAO/tests/MProfile/test_i.h index 48c742508f8..0016ce9b90b 100644 --- a/TAO/tests/MProfile/test_i.h +++ b/TAO/tests/MProfile/test_i.h @@ -9,7 +9,7 @@ // test_i.h // // = AUTHOR -// Carlos O'Ryan +// Carlos O'Ryan <coryan@uci.edu> // // ============================================================================ @@ -35,7 +35,7 @@ public: // ctor // = The Simple_Server methods. - void remote_call (CORBA::Environment &); + void remote_call (CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)); void shutdown (CORBA::Environment&) diff --git a/TAO/tests/Makefile.bor b/TAO/tests/Makefile.bor index ade0ddd46c0..1711fd29015 100644 --- a/TAO/tests/Makefile.bor +++ b/TAO/tests/Makefile.bor @@ -2,30 +2,20 @@ # Makefile for building the TAO tests # -!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor> +DIRS = \ + CDR \ + Collocation \ + Connection_Purging \ + DynAny_Test \ + Endpoint_Per_Priority \ + Explicit_Event_Loop \ + Faults \ + IDL_Test \ + InterOp-Naming \ + Interceptors \ + IORManipulation \ + MProfile \ + Param_Test \ + Timeout -tests: - cd $(ACE_ROOT)\TAO\tests\CDR - $(MAKE) -f Makefile.bor $(MAKE_FLAGS) - cd $(ACE_ROOT)\TAO\tests\Connection_Purging - $(MAKE) -f Makefile.bor $(MAKE_FLAGS) - cd $(ACE_ROOT)\TAO\tests\DynAny_Test - $(MAKE) -f Makefile.bor $(MAKE_FLAGS) - cd $(ACE_ROOT)\TAO\tests\Endpoint_Per_Priority - $(MAKE) -f Makefile.bor $(MAKE_FLAGS) - cd $(ACE_ROOT)\TAO\tests\Explicit_Event_Loop - $(MAKE) -f Makefile.bor $(MAKE_FLAGS) - cd $(ACE_ROOT)\TAO\tests\Faults - $(MAKE) -f Makefile.bor $(MAKE_FLAGS) - cd $(ACE_ROOT)\TAO\tests\IDL_Test - $(MAKE) -f Makefile.bor $(MAKE_FLAGS) - cd $(ACE_ROOT)\TAO\tests\IORManipulation - $(MAKE) -f Makefile.bor $(MAKE_FLAGS) - cd $(ACE_ROOT)\TAO\tests\InterOp-Naming - $(MAKE) -f Makefile.bor $(MAKE_FLAGS) - cd $(ACE_ROOT)\TAO\tests\Interceptors - $(MAKE) -f Makefile.bor $(MAKE_FLAGS) - cd $(ACE_ROOT)\TAO\tests\MProfile - $(MAKE) -f Makefile.bor $(MAKE_FLAGS) - cd $(ACE_ROOT)\TAO\tests\Param_Test - $(MAKE) -f Makefile.bor $(MAKE_FLAGS) +!include <$(ACE_ROOT)\include\makeinclude\recurse.bor> diff --git a/TAO/tests/Param_Test/Makefile.bor b/TAO/tests/Param_Test/Makefile.bor index cce6a0e677e..4693d686fc3 100644 --- a/TAO/tests/Param_Test/Makefile.bor +++ b/TAO/tests/Param_Test/Makefile.bor @@ -2,8 +2,6 @@ # Makefile for building the Param_Test executables # -!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor> +MAKEFILES = server.bor client.bor -all: - $(MAKE) -f server.bor $(MAKE_FLAGS) - $(MAKE) -f client.bor $(MAKE_FLAGS) +!include <$(ACE_ROOT)\include\makeinclude\recurse.bor> diff --git a/TAO/tests/Smart_Proxies/Collocation/Makefile.bor b/TAO/tests/Smart_Proxies/Collocation/Makefile.bor index 851e33b1a20..597234b5974 100644 --- a/TAO/tests/Smart_Proxies/Collocation/Makefile.bor +++ b/TAO/tests/Smart_Proxies/Collocation/Makefile.bor @@ -2,9 +2,6 @@ # Makefile for building the Collocation test executables and libraries # -!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor> +MAKEFILES = Coll_Test_Stubs.bor Diamond.bor Collocation.bor -all: - $(MAKE) -f Coll_Test_Stubs.bor $(MAKE_FLAGS) - $(MAKE) -f Diamond.bor $(MAKE_FLAGS) - $(MAKE) -f Collocation.bor $(MAKE_FLAGS) +!include <$(ACE_ROOT)\include\makeinclude\recurse.bor> diff --git a/TAO/tests/Timeout/Makefile.bor b/TAO/tests/Timeout/Makefile.bor index 353d14dba0e..7e6b7685129 100644 --- a/TAO/tests/Timeout/Makefile.bor +++ b/TAO/tests/Timeout/Makefile.bor @@ -2,8 +2,6 @@ # Makefile for building the Timeout test executables # -!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor> +MAKEFILES = server.bor client.bor -all: - $(MAKE) -f server.bor $(MAKE_FLAGS) - $(MAKE) -f client.bor $(MAKE_FLAGS) +!include <$(ACE_ROOT)\include\makeinclude\recurse.bor> diff --git a/TAO/utils/Makefile.bor b/TAO/utils/Makefile.bor new file mode 100644 index 00000000000..cfa54f10fca --- /dev/null +++ b/TAO/utils/Makefile.bor @@ -0,0 +1,10 @@ +# +# Makefile for building utils +# + +DIRS = \ + catior \ + IOR-parser \ + nslist + +!include <$(ACE_ROOT)\include\makeinclude\recurse.bor> @@ -75,6 +75,7 @@ Carlos Garcia Braschi <cgarcia@caramba.tid.es> Jam Hamidi <jh1@osi.com> Eric Vaughan <evaughan@arinc.com> Karlheinz Dorn <Karlheinz.Dorn@med.siemens.de>, +Gerhard Lenzer <Gerhard.Lenzer@med.siemens.de> Steve Ritter <ritter@titan.com> Chandra Venkatapathy <cvenkat@develop.bsis.com> Matt Stevens <mstevens@kirk.softeng.infonautics.com> @@ -445,7 +446,7 @@ Ian Wright <I.Wright@elsevier.co.uk> David Janello <David.Janello@abnamro.com> Rich Wellner <rw2@wellner.org> Fernando D. Mato Mira <matomira@acm.org> -Jonathan Reis <reis@minniemouse.cemax.com> +Jonathan Reis <reis@stentorsoft.com> Seung-Lee Hoon <tarjan@lgsoft.com> Russell L. Carter <rcarter@pinyon.org> Bill Hall <hts@gte.net> @@ -902,7 +903,7 @@ Alia Atlas <akatlas@bbn.com> David Hall <David.Hall@grc.nasa.gov> Todd Gruhn <tgruhn2@mail.com> John Hickin <hickin@nortelnetworks.com> -Jonathan Reis <reis@stentorsoft.com> +Alex Brown <abrown@3com-ne.com> I would particularly like to thank Paul Stephenson, who worked with me at Ericsson. Paul devised the recursive Makefile scheme that diff --git a/ace/Makefile.bor b/ace/Makefile.bor index ecab3ea6eae..76f4f35879e 100644 --- a/ace/Makefile.bor +++ b/ace/Makefile.bor @@ -14,6 +14,12 @@ OBJFILES = \ $(OBJDIR)\ARGV.obj \ $(OBJDIR)\Asynch_IO.obj \ $(OBJDIR)\Asynch_IO_Impl.obj \ + $(OBJDIR)\ATM_Acceptor.obj \ + $(OBJDIR)\ATM_Addr.obj \ + $(OBJDIR)\ATM_Connector.obj \ + $(OBJDIR)\ATM_Params.obj \ + $(OBJDIR)\ATM_QoS.obj \ + $(OBJDIR)\ATM_Stream.obj \ $(OBJDIR)\Based_Pointer_Repository.obj \ $(OBJDIR)\Basic_Types.obj \ $(OBJDIR)\Capabilities.obj \ @@ -65,7 +71,13 @@ OBJFILES = \ $(OBJDIR)\LSOCK_Stream.obj \ $(OBJDIR)\Malloc.obj \ $(OBJDIR)\Map.obj \ + $(OBJDIR)\MEM_Acceptor.obj \ + $(OBJDIR)\MEM_Addr.obj \ + $(OBJDIR)\MEM_Connector.obj \ + $(OBJDIR)\MEM_IO.obj \ $(OBJDIR)\Mem_Map.obj \ + $(OBJDIR)\MEM_SAP.obj \ + $(OBJDIR)\MEM_Stream.obj \ $(OBJDIR)\Memory_Pool.obj \ $(OBJDIR)\Message_Block.obj \ $(OBJDIR)\Message_Queue.obj \ @@ -88,6 +100,8 @@ OBJFILES = \ $(OBJDIR)\Process.obj \ $(OBJDIR)\Process_Manager.obj \ $(OBJDIR)\Profile_Timer.obj \ + $(OBJDIR)\QoS_Session_Factory.obj \ + $(OBJDIR)\QoS_Session_Impl.obj \ $(OBJDIR)\Reactor.obj \ $(OBJDIR)\Read_Buffer.obj \ $(OBJDIR)\Registry.obj \ diff --git a/apps/Gateway/Makefile.bor b/apps/Gateway/Makefile.bor index bbe0f9444be..60b7e1be137 100644 --- a/apps/Gateway/Makefile.bor +++ b/apps/Gateway/Makefile.bor @@ -1,9 +1,3 @@ +DIRS = Gateway Peer -!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor> - -all: - cd $(ACE_ROOT)\apps\Gateway\Gateway - $(MAKE) -f Makefile.bor $(MAKE_FLAGS) - cd $(ACE_ROOT)\apps\Gateway\Peer - $(MAKE) -f Makefile.bor $(MAKE_FLAGS) - +!include <$(ACE_ROOT)\include\makeinclude\recurse.bor> diff --git a/apps/JAWS/Makefile.bor b/apps/JAWS/Makefile.bor index f517d4b8872..9bdeebefeab 100644 --- a/apps/JAWS/Makefile.bor +++ b/apps/JAWS/Makefile.bor @@ -1,9 +1,3 @@ +DIRS = clients server -!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor> - -all: - cd $(ACE_ROOT)\apps\JAWS\clients - $(MAKE) -f Makefile.bor $(MAKE_FLAGS) - cd $(ACE_ROOT)\apps\JAWS\server - $(MAKE) -f Makefile.bor $(MAKE_FLAGS) - +!include <$(ACE_ROOT)\include\makeinclude\recurse.bor> diff --git a/apps/JAWS/clients/Makefile.bor b/apps/JAWS/clients/Makefile.bor index 2a119e447a0..02206e7ebba 100644 --- a/apps/JAWS/clients/Makefile.bor +++ b/apps/JAWS/clients/Makefile.bor @@ -1,9 +1,3 @@ +DIRS = Blobby Caching -!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor> - -all: - cd $(ACE_ROOT)\apps\JAWS\clients\Blobby - $(MAKE) -f Makefile.bor $(MAKE_FLAGS) - cd $(ACE_ROOT)\apps\JAWS\clients\Caching - $(MAKE) -f Makefile.bor $(MAKE_FLAGS) - +!include <$(ACE_ROOT)\include\makeinclude\recurse.bor> diff --git a/apps/Makefile.bor b/apps/Makefile.bor index bdc3b24ec5a..87f54eca0a0 100644 --- a/apps/Makefile.bor +++ b/apps/Makefile.bor @@ -1,11 +1,3 @@ +DIRS = gperf Gateway JAWS -!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor> - -all: - cd $(ACE_ROOT)\apps\gperf - $(MAKE) -f Makefile.bor $(MAKE_FLAGS) - cd $(ACE_ROOT)\apps\Gateway - $(MAKE) -f Makefile.bor $(MAKE_FLAGS) - cd $(ACE_ROOT)\apps\JAWS - $(MAKE) -f Makefile.bor $(MAKE_FLAGS) - +!include <$(ACE_ROOT)\include\makeinclude\recurse.bor> diff --git a/apps/gperf/Makefile.bor b/apps/gperf/Makefile.bor index 2831e305908..063fce565bf 100644 --- a/apps/gperf/Makefile.bor +++ b/apps/gperf/Makefile.bor @@ -1,7 +1,3 @@ +DIRS = src -!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor> - -all: - cd $(ACE_ROOT)\apps\gperf\src - $(MAKE) -f Makefile.bor $(MAKE_FLAGS) - +!include <$(ACE_ROOT)\include\makeinclude\recurse.bor> diff --git a/include/makeinclude/compiler.bor b/include/makeinclude/compiler.bor index 37721233145..51b2357fecb 100644 --- a/include/makeinclude/compiler.bor +++ b/include/makeinclude/compiler.bor @@ -101,26 +101,35 @@ EXE_STARTUP_OBJ = c0x32.obj LIB_CFLAGS = !ifdef DEBUG -LIB_LFLAGS = /C /P2048 +LIB_LFLAGS = /C /P4096 !else LIB_LFLAGS = /C /P512 !endif # +# VCL lib version number +# + +!if $(BCBVER) == 5 +VCLVER = 50 +!else +VCLVER = 40 +!endif + +# # Libraries to be linked # !ifdef STATIC !ifdef PASCAL -COMMON_LIBS = import32.lib vcl.lib vcl40.lib cp32mt.lib ws2_32.lib +COMMON_LIBS = import32.lib vcl$(VCLVER).lib vcle$(VCLVER).lib cp32mt.lib ws2_32.lib !else COMMON_LIBS = import32.lib cw32mt.lib ws2_32.lib !endif !else !ifdef PASCAL -COMMON_LIBS = import32.lib vcl.lib vcl40.bpi cp32mti.lib ws2_32.lib +COMMON_LIBS = import32.lib vcl$(VCLVER).bpi vcle$(VCLVER).lib cp32mti.lib ws2_32.lib !else COMMON_LIBS = import32.lib cw32mti.lib ws2_32.lib !endif !endif - diff --git a/include/makeinclude/recurse.bor b/include/makeinclude/recurse.bor new file mode 100644 index 00000000000..77c878e6ab7 --- /dev/null +++ b/include/makeinclude/recurse.bor @@ -0,0 +1,73 @@ +# +# Macros for recursive invocations of make +# +# Inputs: +# ~~~~~~~ +# DIRS - list of sub-directories to invoke make in +# MAKEFILES - list of makefiles to be run +# + +!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor> + +!ifdef DIRS + +all: $(DIRS) + +# We use an extra level of make recursion to ensure the current directory is +# automatically restored when the sub-directory is finished. +$(DIRS): + @echo Entering directory $< + @$(MAKE) $(MAKE_FLAGS) -f&&! +all: + @cd $< + $(MAKE) $(MAKE_FLAGS) -fMakefile.bor +! + +# This ugliness is to remove extra spaces from between the items in the list. +DIRS_CLEAN_1 = $(DIRS) $(BLANK_SPACE) +DIRS_CLEAN_2 = $(DIRS_CLEAN_1: =%) +DIRS_CLEAN_3 = $(DIRS_CLEAN_2:%%=%) +DIRS_CLEAN_4 = $(DIRS_CLEAN_3:%%=%) +DIRS_CLEAN = $(DIRS_CLEAN_4:%=.Clean ) + +clean: $(DIRS_CLEAN) + +# We use an extra level of make recursion to ensure the current directory is +# automatically restored when the sub-directory is finished. +$(DIRS_CLEAN): + @echo Cleaning directory $(<:.Clean=) + @$(MAKE) $(MAKE_FLAGS) -f&&! +all: + @cd $(<:.Clean=) + $(MAKE) $(MAKE_FLAGS) -fMakefile.bor clean +! + +!endif + +!ifdef MAKEFILES + +# This ugliness is to remove extra spaces from between the items in the list. +MAKEFILES_ALL_1 = $(MAKEFILES) $(BLANK_SPACE) +MAKEFILES_ALL_2 = $(MAKEFILES_ALL_1: =%) +MAKEFILES_ALL_3 = $(MAKEFILES_ALL_2:%%=%) +MAKEFILES_ALL_4 = $(MAKEFILES_ALL_3:%%=%) +MAKEFILES_ALL = $(MAKEFILES_ALL_4:%=.All ) + +all: $(MAKEFILES_ALL) + +$(MAKEFILES_ALL): + $(MAKE) $(MAKE_FLAGS) -f$(<:.All=) + +# This ugliness is to remove extra spaces from between the items in the list. +MAKEFILES_CLEAN_1 = $(MAKEFILES) $(BLANK_SPACE) +MAKEFILES_CLEAN_2 = $(MAKEFILES_CLEAN_1: =%) +MAKEFILES_CLEAN_3 = $(MAKEFILES_CLEAN_2:%%=%) +MAKEFILES_CLEAN_4 = $(MAKEFILES_CLEAN_3:%%=%) +MAKEFILES_CLEAN = $(MAKEFILES_CLEAN_4:%=.Clean ) + +clean: $(MAKEFILES_CLEAN) + +$(MAKEFILES_CLEAN): + $(MAKE) $(MAKE_FLAGS) -f$(<:.Clean=) clean + +!endif diff --git a/netsvcs/Makefile.bor b/netsvcs/Makefile.bor index 5ac8a257adf..a5babc67742 100644 --- a/netsvcs/Makefile.bor +++ b/netsvcs/Makefile.bor @@ -2,13 +2,6 @@ # Makefile for building the netsvcs # -!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor> - -all: - cd $(ACE_ROOT)\netsvcs\lib - $(MAKE) -f Makefile.bor $(MAKE_FLAGS) - cd $(ACE_ROOT)\netsvcs\clients - $(MAKE) -f Makefile.bor $(MAKE_FLAGS) - cd $(ACE_ROOT)\netsvcs\servers - $(MAKE) -f Makefile.bor $(MAKE_FLAGS) +DIRS = lib clients servers +!include <$(ACE_ROOT)\include\makeinclude\recurse.bor> diff --git a/netsvcs/clients/Makefile.bor b/netsvcs/clients/Makefile.bor index a91e169e1ee..629c17b423a 100644 --- a/netsvcs/clients/Makefile.bor +++ b/netsvcs/clients/Makefile.bor @@ -1,11 +1,3 @@ +DIRS = Logger Naming Tokens -!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor> - -all: - cd $(ACE_ROOT)\netsvcs\clients\Logger - $(MAKE) -f Makefile.bor $(MAKE_FLAGS) - cd $(ACE_ROOT)\netsvcs\clients\Naming - $(MAKE) -f Makefile.bor $(MAKE_FLAGS) - cd $(ACE_ROOT)\netsvcs\clients\Tokens - $(MAKE) -f Makefile.bor $(MAKE_FLAGS) - +!include <$(ACE_ROOT)\include\makeinclude\recurse.bor> diff --git a/netsvcs/clients/Naming/Makefile.bor b/netsvcs/clients/Naming/Makefile.bor index 81c2f78e587..eedc62fae17 100644 --- a/netsvcs/clients/Naming/Makefile.bor +++ b/netsvcs/clients/Naming/Makefile.bor @@ -1,9 +1,3 @@ +DIRS = Client Dump_Restore -!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor> - -all: - cd $(ACE_ROOT)\netsvcs\clients\Naming\Client - $(MAKE) -f Makefile.bor $(MAKE_FLAGS) - cd $(ACE_ROOT)\netsvcs\clients\Naming\Dump_Restore - $(MAKE) -f Makefile.bor $(MAKE_FLAGS) - +!include <$(ACE_ROOT)\include\makeinclude\recurse.bor> diff --git a/netsvcs/clients/Tokens/Makefile.bor b/netsvcs/clients/Tokens/Makefile.bor index 4bdc1900fdb..6c410f583bd 100644 --- a/netsvcs/clients/Tokens/Makefile.bor +++ b/netsvcs/clients/Tokens/Makefile.bor @@ -1,17 +1,3 @@ +DIRS = collection deadlock invariant manual mutex rw_lock -!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor> - -all: - cd $(ACE_ROOT)\netsvcs\clients\Tokens\collection - $(MAKE) -f Makefile.bor $(MAKE_FLAGS) - cd $(ACE_ROOT)\netsvcs\clients\Tokens\deadlock - $(MAKE) -f Makefile.bor $(MAKE_FLAGS) - cd $(ACE_ROOT)\netsvcs\clients\Tokens\invariant - $(MAKE) -f Makefile.bor $(MAKE_FLAGS) - cd $(ACE_ROOT)\netsvcs\clients\Tokens\manual - $(MAKE) -f Makefile.bor $(MAKE_FLAGS) - cd $(ACE_ROOT)\netsvcs\clients\Tokens\mutex - $(MAKE) -f Makefile.bor $(MAKE_FLAGS) - cd $(ACE_ROOT)\netsvcs\clients\Tokens\rw_lock - $(MAKE) -f Makefile.bor $(MAKE_FLAGS) - +!include <$(ACE_ROOT)\include\makeinclude\recurse.bor> diff --git a/tests/ACE_Init_Test.cpp b/tests/ACE_Init_Test.cpp index ddce650bdc7..77a041fd58e 100644 --- a/tests/ACE_Init_Test.cpp +++ b/tests/ACE_Init_Test.cpp @@ -1,20 +1,18 @@ // $Id$ + +// This is a Win32-only test for verifying that the ACE dll +// initializes itself without having a nonstatic object manager +// present by way of a console app's main function. It's a MFC dialog +// app - it pops up a dialog and spawns a thread - the thread will +// wait 2 seconds and programatically dismiss the dialog box. The +// main thread waits for the other one to exit, and that's the test. +// If the ACE DLL doesn't initialize correctly, it will go boom! // -// ACE_Init_Test -// -// This is a Win32-only test for verifying that the ACE dll initializes itself -// without having a nonstatic object manager present by way of a console app's -// main function. It's a MFC dialog app - it pops up a dialog and spawns a -// thread - the thread will wait 2 seconds and programatically dismiss the -// dialog box. The main thread waits for the other one to exit, and that's -// the test. If the ACE DLL doesn't initialize correctly, it will go boom! -// -// This test program was initially generated from MSVC AppWizard, then some -// files were renamed and moved around to fit in with the ACE test directory -// structure. +// This test program was initially generated from MSVC AppWizard, then +// some files were renamed and moved around to fit in with the ACE +// test directory structure. // // ACE_Init_Test.cpp : Defines the class behaviors for the application. -// #include "ace/Thread_Manager.h" #include "ACE_Init_Test_StdAfx.h" @@ -29,7 +27,6 @@ static char THIS_FILE[] = __FILE__; static void * wait_and_kill_dialog (void *pBox); - ///////////////////////////////////////////////////////////////////////////// // CACE_Init_TestApp diff --git a/tests/ARGV_Test.cpp b/tests/ARGV_Test.cpp index a40186f8dd2..c0f77b9968a 100644 --- a/tests/ARGV_Test.cpp +++ b/tests/ARGV_Test.cpp @@ -19,12 +19,8 @@ ACE_RCSID(tests, ARGV_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - -int main(int, char *argv[]) +int +main (int, char *argv[]) { ACE_START_TEST (ASYS_TEXT ("ARGV_Test")); diff --git a/tests/Aio_Platform_Test.cpp b/tests/Aio_Platform_Test.cpp index 5b839234953..e29a6ce61b9 100644 --- a/tests/Aio_Platform_Test.cpp +++ b/tests/Aio_Platform_Test.cpp @@ -1,4 +1,5 @@ // $Id$ + // ============================================================================ // // = FILENAME @@ -12,8 +13,8 @@ // features further. // // = AUTHOR -// Programming for the Real World. Bill O. GallMeister. -// Modified by Alexander Babu Arulanthu <alex@cs.wustl.edu> +// Programming for the Real World. Bill O. GallMeister. Modified +// by Alexander Babu Arulanthu <alex@cs.wustl.edu> // // ===================================================================== @@ -22,11 +23,6 @@ ACE_RCSID(tests, Aio_Platform_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - #if defined (_POSIX_ASYNCHRONOUS_IO) static int do_sysconf (void) { diff --git a/tests/Atomic_Op_Test.cpp b/tests/Atomic_Op_Test.cpp index 847841d2941..cedbd26de63 100644 --- a/tests/Atomic_Op_Test.cpp +++ b/tests/Atomic_Op_Test.cpp @@ -15,7 +15,7 @@ // these operations. // // = AUTHOR -// Irfan Pyarali +// Irfan Pyarali <irfan@cs.wustl.edu> // // ============================================================================ @@ -24,11 +24,6 @@ ACE_RCSID(tests, Atomic_Op_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - #if defined (ACE_HAS_THREADS) int diff --git a/tests/Auto_IncDec_Test.cpp b/tests/Auto_IncDec_Test.cpp index 68497c4e1bd..255b3d5f1f2 100644 --- a/tests/Auto_IncDec_Test.cpp +++ b/tests/Auto_IncDec_Test.cpp @@ -23,11 +23,6 @@ ACE_RCSID(tests, Auto_IncDec_Test, "Auto_IncDec_Test.cpp, by Edan Ayal") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - #if defined (ACE_HAS_THREADS) // Default number of threads. diff --git a/tests/Barrier_Test.cpp b/tests/Barrier_Test.cpp index d18250d1948..a29a6b7ef21 100644 --- a/tests/Barrier_Test.cpp +++ b/tests/Barrier_Test.cpp @@ -13,7 +13,7 @@ // mechanisms work. // // = AUTHOR -// Prashant Jain and Doug Schmidt +// Prashant Jain <pjain@cs.wustl.edu> and Doug Schmidt <schmidt@cs.wustl.edu> // // ============================================================================ @@ -23,11 +23,6 @@ ACE_RCSID(tests, Barrier_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - #if defined (ACE_HAS_THREADS) struct Tester_Args diff --git a/tests/Basic_Types_Test.cpp b/tests/Basic_Types_Test.cpp index 437c9df0bbc..f4be82c3a0a 100644 --- a/tests/Basic_Types_Test.cpp +++ b/tests/Basic_Types_Test.cpp @@ -12,7 +12,7 @@ // Checks the #defines in ace/Basic_Types.h, and a few other basics. // // = AUTHOR -// David L. Levine +// David L. Levine <levine@cs.wustl.edu> // // ============================================================================ @@ -37,12 +37,6 @@ ACE_RCSID(tests, Basic_Types_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - - typedef void* (*a_function_pointer) (void*); static diff --git a/tests/Buffer_Stream_Test.cpp b/tests/Buffer_Stream_Test.cpp index 786025f88a2..7540988d69b 100644 --- a/tests/Buffer_Stream_Test.cpp +++ b/tests/Buffer_Stream_Test.cpp @@ -17,7 +17,7 @@ // components reduces the reliance on global variables. // // = AUTHOR -// Prashant Jain and Doug Schmidt +// Prashant Jain <pjain@cs.wustl.edu> and Doug Schmidt <schmidt@cs.wustl.edu> // // ============================================================================ @@ -29,11 +29,6 @@ ACE_RCSID(tests, Buffer_Stream_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - #if defined (ACE_HAS_THREADS) typedef ACE_Stream<ACE_MT_SYNCH> MT_Stream; diff --git a/tests/CDR_File_Test.cpp b/tests/CDR_File_Test.cpp index deea7e6870f..9a254cefc4e 100644 --- a/tests/CDR_File_Test.cpp +++ b/tests/CDR_File_Test.cpp @@ -15,6 +15,7 @@ // = AUTHORS // Giga Giguashvili <gregoryg@ParadigmGeo.com> and // Douglas C. Schmidt <schmidt@cs.wustl.edu> +// // ============================================================================ #include "ace/CDR_Stream.h" @@ -25,11 +26,6 @@ ACE_RCSID(tests, CDR_File_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - #if !defined (ACE_LACKS_IOSTREAM_TOTALLY) class CDR_Test diff --git a/tests/CDR_Test.cpp b/tests/CDR_Test.cpp index 400b0ad6802..d2624bd307a 100644 --- a/tests/CDR_Test.cpp +++ b/tests/CDR_Test.cpp @@ -25,11 +25,6 @@ ACE_RCSID(tests, CDR_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - static int n = 4096; static int nloops = 100; diff --git a/tests/Cache_Map_Manager_Test.cpp b/tests/Cache_Map_Manager_Test.cpp index 0da3c4fc53a..24fb6bcf298 100644 --- a/tests/Cache_Map_Manager_Test.cpp +++ b/tests/Cache_Map_Manager_Test.cpp @@ -35,11 +35,6 @@ #include "ace/Get_Opt.h" #include "Cache_Map_Manager_Test.h" // Hash_Key class defined in here -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - typedef size_t KEY; typedef size_t VALUE; typedef int ATTR; diff --git a/tests/Cached_Accept_Conn_Test.cpp b/tests/Cached_Accept_Conn_Test.cpp index 87e84f8ffaa..7683f3d53bb 100644 --- a/tests/Cached_Accept_Conn_Test.cpp +++ b/tests/Cached_Accept_Conn_Test.cpp @@ -46,20 +46,14 @@ ACE_RCSID(tests, Cached_Accept_Conn_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - // Note: To keep both sunCC5.0 without debugging symbols and gcc2.7.3 // happy, it was necessary to have the definitions of the methods of // the Accept_Strategy before the instantiations. -// -// HPUX doesnt accept these declaration after their usage. +// HPUX doesn't accept these declaration after their usage. // For some strange reason this must *not* be static since otherwise -// certain versions of SunC++ will not link properly. +// certain versions of SunC++ will not link properly. int connection_accepted = 0; // For some strange reason this must *not* be static since otherwise diff --git a/tests/Cached_Conn_Test.cpp b/tests/Cached_Conn_Test.cpp index b23f98386c4..c1ccafa58f3 100644 --- a/tests/Cached_Conn_Test.cpp +++ b/tests/Cached_Conn_Test.cpp @@ -300,11 +300,6 @@ template class ACE_Guard<ACE_Reverse_Lock<ACE_SYNCH_NULL_MUTEX> >; #endif /* CACHED_CONNECT_TEST */ -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - static int debug = 0; Svc_Handler::Svc_Handler (ACE_Thread_Manager *t) diff --git a/tests/Capabilities_Test.cpp b/tests/Capabilities_Test.cpp index 6ea3f0fe04b..984f1c7be48 100644 --- a/tests/Capabilities_Test.cpp +++ b/tests/Capabilities_Test.cpp @@ -22,11 +22,6 @@ ACE_RCSID(tests, Capabilities_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - static const char config[] = "Capabilities_Test.cfg"; static int diff --git a/tests/Collection_Test.cpp b/tests/Collection_Test.cpp index d30b7cd3d12..3d25d4fd6d8 100644 --- a/tests/Collection_Test.cpp +++ b/tests/Collection_Test.cpp @@ -13,7 +13,7 @@ // iterators. // // = AUTHOR -// Irfan Pyarali +// Irfan Pyarali <irfan@cs.wustl.edu> // // ============================================================================ @@ -21,11 +21,6 @@ ACE_RCSID(tests, Collection_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - #include "ace/Containers.h" typedef int DATA; diff --git a/tests/Conn_Test.cpp b/tests/Conn_Test.cpp index 378306a3ca1..dfc6a05f473 100644 --- a/tests/Conn_Test.cpp +++ b/tests/Conn_Test.cpp @@ -198,11 +198,6 @@ template class ACE_Unbounded_Queue<ACE_Thread_Descriptor*>; #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - // Default number of clients/servers. #if defined (ACE_HAS_PHARLAP) // PharLap is, by default, resource contrained. Test for something that works diff --git a/tests/DLL_Test.cpp b/tests/DLL_Test.cpp index 4efe745132f..defcdd203f7 100644 --- a/tests/DLL_Test.cpp +++ b/tests/DLL_Test.cpp @@ -29,12 +29,6 @@ ACE_RCSID(tests, DLL_Test, "$Id$") #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - // Considering UNIX OS to be default. On Win32 platforms, the symbols // are got form the .exe as one cant have .exe and .dll for the same // .cpp. Also, on Win32 platforms one cant use the .obj to obtain @@ -48,24 +42,26 @@ USELIB("..\ace\aced.lib"); # define OBJ_PREFIX "./" ACE_DLL_PREFIX #endif /*ACE_WIN32*/ - char const * -cdecl_decoration(char const * func_name) +cdecl_decoration (char const *func_name) { -#if defined(__BORLANDC__) +#if defined (__BORLANDC__) static char decorated_func_name[10*1024]; - ACE_OS::sprintf(decorated_func_name, "_%s", func_name); + ACE_OS::sprintf (decorated_func_name, + "_%s", + func_name); return decorated_func_name; #else return func_name; -#endif +#endif /* __BORLANDC__ */ } // This function returns the Hello object pointer. extern "C" ACE_Svc_Export Hello *get_hello (void); -Hello *get_hello (void) +Hello * +get_hello (void) { Hello *hello = 0; @@ -100,11 +96,12 @@ main (int argc, ASYS_TCHAR *argv[]) dll.error ()), -1); - // Just becos the ANSI C++ spec says you can no longer cast a void* to a - // function pointer. Doesnt allow:TC f = (TC) dll.symbol ("get_hello"); - void * foo; + // Just because the ANSI C++ spec says you can no longer cast a + // void* to a function pointer. Doesn't allow: + // TC f = (TC) dll.symbol ("get_hello"); + void *foo; - char const *cdecl_str = cdecl_decoration("get_hello"); + char const *cdecl_str = cdecl_decoration ("get_hello"); foo = dll.symbol (cdecl_str); // Cast the void* to long first. @@ -131,7 +128,6 @@ main (int argc, ASYS_TCHAR *argv[]) return 0; } - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class auto_ptr <Hello>; template class ACE_Auto_Basic_Ptr <Hello>; diff --git a/tests/DLList_Test.cpp b/tests/DLList_Test.cpp index 0df99359267..fd9e6e9c9fb 100644 --- a/tests/DLList_Test.cpp +++ b/tests/DLList_Test.cpp @@ -12,7 +12,7 @@ // This test illustrates the use of <ACE_DLList>. // // = AUTHOR -// James Hu and Douglas C. Schmidt +// James Hu <jxh@cs.wustl.edu> and Douglas C. Schmidt <schmidt@cs.wustl.edu> // // ============================================================================ @@ -37,11 +37,6 @@ template class ACE_Static_Allocator<8192>; #pragma instantiate ACE_Static_Allocator<8192> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - static ACE_Static_Allocator<8192> alloc; static ACE_STRING string_table[] = diff --git a/tests/Dynamic_Priority_Test.cpp b/tests/Dynamic_Priority_Test.cpp index 900f2b39dba..d1b46b7ef87 100644 --- a/tests/Dynamic_Priority_Test.cpp +++ b/tests/Dynamic_Priority_Test.cpp @@ -54,12 +54,6 @@ ACE_RCSID(tests, Dynamic_Priority_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - - enum Test_Type {BEST, WORST, RANDOM}; class ArgStruct diff --git a/tests/Enum_Interfaces_Test.cpp b/tests/Enum_Interfaces_Test.cpp index 76742d3f8b6..071c06c6843 100644 --- a/tests/Enum_Interfaces_Test.cpp +++ b/tests/Enum_Interfaces_Test.cpp @@ -33,11 +33,6 @@ ACE_RCSID(tests, Enum_Interfaces_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - int main (int, ASYS_TCHAR *[]) { diff --git a/tests/Env_Value_Test.cpp b/tests/Env_Value_Test.cpp index 084102236dd..da467ad1ba8 100644 --- a/tests/Env_Value_Test.cpp +++ b/tests/Env_Value_Test.cpp @@ -21,11 +21,6 @@ ACE_RCSID(tests, Env_Value_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - #define TEST_THIS(type, varname, defval, expval) \ do { \ ACE_Env_Value<type> val (varname, (defval)); \ diff --git a/tests/FlReactor_Test.cpp b/tests/FlReactor_Test.cpp index 0c20c5a81b9..b7afb411cb8 100644 --- a/tests/FlReactor_Test.cpp +++ b/tests/FlReactor_Test.cpp @@ -23,11 +23,6 @@ ACE_RCSID(tests, FlReactor_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - #if !defined (ACE_HAS_FL) int main (int, char*[]) diff --git a/tests/Future_Set_Test.cpp b/tests/Future_Set_Test.cpp index 2c9ba7ca212..179e6febfa6 100644 --- a/tests/Future_Set_Test.cpp +++ b/tests/Future_Set_Test.cpp @@ -16,8 +16,9 @@ // are prime. // // = AUTHOR -// Andres Kruse <Andres.Kruse@cern.ch>, Douglas C. Schmidt -// <schmidt@cs.wustl.edu>, and Per Andersson <pera@ipso.se> +// Andres Kruse <Andres.Kruse@cern.ch>, +// Douglas C. Schmidt <schmidt@cs.wustl.edu>, +// and Per Andersson <pera@ipso.se> // // ============================================================================ @@ -34,11 +35,6 @@ ACE_RCSID(tests, Future_Set_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 - USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - #if defined (ACE_HAS_THREADS) typedef ACE_Atomic_Op<ACE_Thread_Mutex, int> ATOMIC_INT; diff --git a/tests/Future_Test.cpp b/tests/Future_Test.cpp index 73502edff87..2c02aa1c8a2 100644 --- a/tests/Future_Test.cpp +++ b/tests/Future_Test.cpp @@ -16,8 +16,9 @@ // are prime. // // = AUTHOR -// Andres Kruse <Andres.Kruse@cern.ch>, Douglas C. Schmidt -// <schmidt@cs.wustl.edu>, and Per Andersson <pera@ipso.se> +// Andres Kruse <Andres.Kruse@cern.ch>, +// Douglas C. Schmidt <schmidt@cs.wustl.edu>, +// and Per Andersson <pera@ipso.se> // // ============================================================================ @@ -33,11 +34,6 @@ ACE_RCSID(tests, Future_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - #if defined (ACE_HAS_THREADS) typedef ACE_Atomic_Op<ACE_Thread_Mutex, int> ATOMIC_INT; diff --git a/tests/Handle_Set_Test.cpp b/tests/Handle_Set_Test.cpp index 151e7083d82..8964aed6d94 100644 --- a/tests/Handle_Set_Test.cpp +++ b/tests/Handle_Set_Test.cpp @@ -25,11 +25,6 @@ ACE_RCSID(tests, Handle_Set_Test, "Handle_Set_Test.cpp,v 4.34 1999/09/19 15:53:54 schmidt Exp") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - static void test_duplicates (size_t count) { diff --git a/tests/Hash_Map_Bucket_Iterator_Test.cpp b/tests/Hash_Map_Bucket_Iterator_Test.cpp index 83bc58b2da5..75f044d0d34 100644 --- a/tests/Hash_Map_Bucket_Iterator_Test.cpp +++ b/tests/Hash_Map_Bucket_Iterator_Test.cpp @@ -12,7 +12,7 @@ // This is a simple test of the <Hash_Map_Bucket_Iterator>. // // = AUTHOR -// Irfan Pyarali +// Irfan Pyarali <irfan@cs.wustl.edu> // // ============================================================================ @@ -24,13 +24,6 @@ ACE_RCSID(tests, Hash_Map_Bucket_Iterator_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - -//////////////////////////////////////////////////////////////////////////////// - static ACE_UINT32 iterations = ACE_MAX_ITERATIONS * 10; static ACE_UINT32 table_size = ACE_MAX_ITERATIONS; diff --git a/tests/Hash_Map_Manager_Test.cpp b/tests/Hash_Map_Manager_Test.cpp index f766a4baeca..32150c2735c 100644 --- a/tests/Hash_Map_Manager_Test.cpp +++ b/tests/Hash_Map_Manager_Test.cpp @@ -57,12 +57,6 @@ template class ACE_Static_Allocator<STRING_TABLE_SIZE>; static ACE_Static_Allocator<STRING_TABLE_SIZE> alloc; -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - - typedef ACE_Hash_Map_Manager_Ex<LPCTSTR, LPCTSTR, ACE_Hash<LPCTSTR>, diff --git a/tests/High_Res_Timer_Test.cpp b/tests/High_Res_Timer_Test.cpp index b20f86304d4..1dd6f9bd555 100644 --- a/tests/High_Res_Timer_Test.cpp +++ b/tests/High_Res_Timer_Test.cpp @@ -1,5 +1,5 @@ // $Id$ -// + // ============================================================================ // // = LIBRARY @@ -12,7 +12,7 @@ // Simple test of ACE_High_Res_Timer. // // = AUTHOR -// David L. Levine +// David L. Levine <levine@cs.wustl.edu> // // ============================================================================ @@ -24,11 +24,6 @@ ACE_RCSID(tests, High_Res_Timer_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - static u_int check (const u_int interval, const u_int measured) @@ -41,17 +36,15 @@ check (const u_int interval, const u_int measured) const u_int percentage_difference = difference * 100 / interval; if (percentage_difference < threshold) - { - return 0; - } + return 0; else - { - ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("The measured time of %u differs from ") - ASYS_TEXT ("the interval of %u by %u percent.\n"), - measured, interval, percentage_difference)); - return 1; - } + ACE_ERROR_RETURN ((LM_ERROR, + ASYS_TEXT ("The measured time of %u differs from ") + ASYS_TEXT ("the interval of %u by %u percent.\n"), + measured, + interval, + percentage_difference), + 1); } static @@ -78,8 +71,9 @@ main (int argc, ASYS_TCHAR *argv[]) { ACE_START_TEST (ASYS_TEXT ("High_Res_Timer_Test")); - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("The ACE_High_Res_Timer scale factor is %u ") - ASYS_TEXT ("1/microsecond\n"), + ACE_DEBUG ((LM_DEBUG, + ASYS_TEXT ("The ACE_High_Res_Timer scale factor is %u ") + ASYS_TEXT ("1/microsecond\n"), ACE_High_Res_Timer::global_scale_factor ())); u_int errors = 0; @@ -105,7 +99,8 @@ main (int argc, ASYS_TCHAR *argv[]) { const ACE_Time_Value interval (0, intervals[i]); const ACE_Time_Value measured = time_interval (interval); - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("interval: %u usec, measured: %u usec%s\n"), + ACE_DEBUG ((LM_DEBUG, + ASYS_TEXT ("interval: %u usec, measured: %u usec%s\n"), interval.sec () * 1000000 + interval.usec (), measured.sec () * 1000000 + measured.usec (), intervals[i] <= TIMER_RESOLUTION ? diff --git a/tests/IOStream_Test.cpp b/tests/IOStream_Test.cpp index b7867aa97dc..c2e33e47972 100644 --- a/tests/IOStream_Test.cpp +++ b/tests/IOStream_Test.cpp @@ -26,11 +26,6 @@ ACE_RCSID (tests, IOStream_Test, "$Id$") -#if defined (__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB ("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined (__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - #if !defined (ACE_LACKS_ACE_IOSTREAM) typedef ACE_IOStream<ACE_SOCK_Stream> ACE_SOCK_IOStream; diff --git a/tests/Lazy_Map_Manager_Test.cpp b/tests/Lazy_Map_Manager_Test.cpp index e22a168fb7e..0ce276c47c4 100644 --- a/tests/Lazy_Map_Manager_Test.cpp +++ b/tests/Lazy_Map_Manager_Test.cpp @@ -15,6 +15,7 @@ // // = AUTHOR // Irfan Pyarali <irfan@cs.wustl.edu>, +// // ============================================================================ #include "test_config.h" @@ -25,11 +26,6 @@ ACE_RCSID(tests, Map_Manager_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - // Simple map manager. typedef ACE_Map_Manager<int, int, ACE_Null_Mutex> MAP; diff --git a/tests/Log_Msg_Test.cpp b/tests/Log_Msg_Test.cpp index 51a3efa172a..82cae74bda8 100644 --- a/tests/Log_Msg_Test.cpp +++ b/tests/Log_Msg_Test.cpp @@ -27,11 +27,6 @@ ACE_RCSID(tests, Log_Msg_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - static void cleanup (void) { diff --git a/tests/MM_Shared_Memory_Test.cpp b/tests/MM_Shared_Memory_Test.cpp index 523459ec6fd..62c9743cfa2 100644 --- a/tests/MM_Shared_Memory_Test.cpp +++ b/tests/MM_Shared_Memory_Test.cpp @@ -28,11 +28,6 @@ ACE_RCSID(tests, MM_Shared_Memory_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - const int SHMSZ = 27; static TCHAR shm_key[] = ACE_TEMP_FILE_NAME ACE_TEXT ("XXXXXX"); diff --git a/tests/MT_Reactor_Timer_Test.cpp b/tests/MT_Reactor_Timer_Test.cpp index 42a6d2a4902..98dcbbd6c94 100644 --- a/tests/MT_Reactor_Timer_Test.cpp +++ b/tests/MT_Reactor_Timer_Test.cpp @@ -24,11 +24,6 @@ ACE_RCSID(tests, MT_Reactor_Timer_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - #if defined (ACE_HAS_THREADS) // This test exercises the setting and cancelling of timers from a diff --git a/tests/MT_SOCK_Test.cpp b/tests/MT_SOCK_Test.cpp index d348bdfa15e..a6dbb1bd34e 100644 --- a/tests/MT_SOCK_Test.cpp +++ b/tests/MT_SOCK_Test.cpp @@ -33,11 +33,6 @@ ACE_RCSID(tests, MT_SOCK_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - static void * client (void *arg) { diff --git a/tests/Malloc_Test.cpp b/tests/Malloc_Test.cpp index f9dc93142c6..e2f51c51547 100644 --- a/tests/Malloc_Test.cpp +++ b/tests/Malloc_Test.cpp @@ -25,11 +25,6 @@ ACE_RCSID(tests, SV_Shared_Memory_Test, "Malloc_Test.cpp,v 4.22 1999/12/13 22:24:42 nanbor Exp") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - #if !defined (__Lynx__) && (!defined (ACE_LACKS_FORK) || defined (ACE_WIN32)) #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1) diff --git a/tests/Map_Manager_Test.cpp b/tests/Map_Manager_Test.cpp index 859184a5022..c4814771c55 100644 --- a/tests/Map_Manager_Test.cpp +++ b/tests/Map_Manager_Test.cpp @@ -17,6 +17,7 @@ // Irfan Pyarali <irfan@cs.wustl.edu>, // Douglas C. Schmidt <schmidt@cs.wustl.edu>, and // Kirthika Parameswaran <kirthika@cs.wustl.edu> +// // ============================================================================ #include "test_config.h" @@ -31,11 +32,6 @@ ACE_RCSID(tests, Map_Manager_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - typedef ACE_Null_Mutex MUTEX; typedef ACE_UINT32 TYPE; typedef ACE_Active_Map_Manager_Key diff --git a/tests/Map_Test.cpp b/tests/Map_Test.cpp index 4dd11067862..ac8c5115bab 100644 --- a/tests/Map_Test.cpp +++ b/tests/Map_Test.cpp @@ -13,7 +13,7 @@ // use the forward and reverse iterators. // // = AUTHOR -// Irfan Pyarali +// Irfan Pyarali <irfan@cs.wustl.edu> // // ============================================================================ @@ -25,13 +25,6 @@ ACE_RCSID(tests, Map_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - -//////////////////////////////////////////////////////////////////////////////// - // Value type. typedef size_t VALUE; diff --git a/tests/Mem_Map_Test.cpp b/tests/Mem_Map_Test.cpp index bfb390d3120..9ec2d2993d4 100644 --- a/tests/Mem_Map_Test.cpp +++ b/tests/Mem_Map_Test.cpp @@ -15,7 +15,7 @@ // original file. // // = AUTHOR -// Prashant Jain +// Prashant Jain <pjain@cs.wustl.edu> // // ============================================================================ @@ -24,11 +24,6 @@ ACE_RCSID(tests, Mem_Map_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - static const int LINE_LENGTH = 10; static const int NUM_LINES = 15; diff --git a/tests/Message_Block_Test.cpp b/tests/Message_Block_Test.cpp index 968e82e3a1e..4092df0c4cb 100644 --- a/tests/Message_Block_Test.cpp +++ b/tests/Message_Block_Test.cpp @@ -10,11 +10,11 @@ // // = DESCRIPTION // This test program is a torture test that illustrates how -// ACE_Message_Block reference counting works in multi-threaded +// <ACE_Message_Block> reference counting works in multi-threaded // code. // // = AUTHOR -// Doug Schmidt and Nanbor Wang +// Doug Schmidt <schmidt@cs.wustl.edu> and Nanbor Wang <nanbor@cs.wustl.edu> // // ============================================================================ @@ -26,11 +26,6 @@ ACE_RCSID(tests, Message_Block_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - // Number of memory allocation strategies used in this test. static const int ACE_ALLOC_STRATEGY_NO = 2; diff --git a/tests/Message_Queue_Notifications_Test.cpp b/tests/Message_Queue_Notifications_Test.cpp index 97aea00ad64..ac28b577e04 100644 --- a/tests/Message_Queue_Notifications_Test.cpp +++ b/tests/Message_Queue_Notifications_Test.cpp @@ -30,7 +30,7 @@ // signaling mechanism works flawlessly. // // = AUTHOR -// Irfan Pyarali and Nanbor Wang. +// Irfan Pyarali <irfan@cs.wustl.edu> and Nanbor Wang <nanbor@cs.wustl.edu> // // ============================================================================ @@ -41,11 +41,6 @@ ACE_RCSID(tests, Message_Queue_Notifications_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - static int iterations = 10; static const size_t worker_threads = 2; diff --git a/tests/Message_Queue_Test.cpp b/tests/Message_Queue_Test.cpp index aca3eba6aa9..ec93d1e38d1 100644 --- a/tests/Message_Queue_Test.cpp +++ b/tests/Message_Queue_Test.cpp @@ -18,7 +18,7 @@ // 3) a test/usage example of ACE_Message_Queue_Vx. // // = AUTHORS -// Irfan Pyarali and David L. Levine +// Irfan Pyarali <irfan@cs.wustl.edu> and David L. Levine <levine@cs.wustl.edu> // // ============================================================================ @@ -30,11 +30,6 @@ ACE_RCSID(tests, Message_Queue_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - const ASYS_TCHAR usage[] = ASYS_TEXT ("usage: Message_Queue_Test <number of messages>\n"); typedef ACE_Message_Queue<ACE_NULL_SYNCH> QUEUE; diff --git a/tests/Naming_Test.cpp b/tests/Naming_Test.cpp index 937a5411cf8..60be9098721 100644 --- a/tests/Naming_Test.cpp +++ b/tests/Naming_Test.cpp @@ -14,7 +14,7 @@ // the local naming context. // // = AUTHOR -// Prashant Jain and Irfan Pyarali +// Prashant Jain <pjain@cs.wustl.edu> and Irfan Pyarali <irfan@cs.wustl.edu> // // ============================================================================ @@ -25,11 +25,6 @@ ACE_RCSID(tests, Naming_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - static char name[BUFSIZ]; static char value[BUFSIZ]; static char type[BUFSIZ]; diff --git a/tests/New_Fail_Test.cpp b/tests/New_Fail_Test.cpp index 7fe49e79948..8138b0bac13 100644 --- a/tests/New_Fail_Test.cpp +++ b/tests/New_Fail_Test.cpp @@ -30,11 +30,6 @@ ACE_RCSID(tests, New_Fail_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - // This test allocates all of the heap memory, forcing 'new' to fail // because of a lack of memory. The ACE_NEW macros should prevent an // exception from being thrown past the ACE_NEW. If this test doesn't diff --git a/tests/Notify_Performance_Test.cpp b/tests/Notify_Performance_Test.cpp index 1f752964c49..cb5462e8638 100644 --- a/tests/Notify_Performance_Test.cpp +++ b/tests/Notify_Performance_Test.cpp @@ -31,11 +31,6 @@ ACE_RCSID(tests, Notify_Performance_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - #if defined (ACE_HAS_THREADS) // Number of client (user) threads diff --git a/tests/Object_Manager_Test.cpp b/tests/Object_Manager_Test.cpp index dc8e543eab4..c10f556ee3d 100644 --- a/tests/Object_Manager_Test.cpp +++ b/tests/Object_Manager_Test.cpp @@ -1,5 +1,5 @@ // $Id$ -// + // ============================================================================ // // = LIBRARY @@ -12,13 +12,15 @@ // Tests the basic functions of the ACE_Object_Manager. // // = AUTHOR -// David L. Levine +// David L. Levine <levine@cs.wustl.edu> // // ============================================================================ #include "test_config.h" #include "ace/Object_Manager.h" +ACE_RCSID(tests, Object_Manager_Test, "$Id$") + static u_int *ip; extern "C" diff --git a/tests/OrdMultiSet_Test.cpp b/tests/OrdMultiSet_Test.cpp index 1b375be84b7..804af5ab9a5 100644 --- a/tests/OrdMultiSet_Test.cpp +++ b/tests/OrdMultiSet_Test.cpp @@ -9,12 +9,13 @@ // OrdMultiSet_Test.cpp // // = DESCRIPTION -// This is a simple test of the ACE_Ordered_MultiSet and -// ACE_Ordered_MultiSet_Iterator class templates, instantiating them with -// type int. No command line arguments are needed to run the test. +// This is a simple test of the <ACE_Ordered_MultiSet> and +// <ACE_Ordered_MultiSet_Iterator> class templates, instantiating +// them with type int. No command line arguments are needed to run +// the test. // // = AUTHOR -// Chris Gill +// Chris Gill <cdgill@cs.wustl.edu> // // ============================================================================ @@ -26,11 +27,6 @@ ACE_RCSID(tests, OrdMultiSet_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - int main (int, ASYS_TCHAR *[]) { diff --git a/tests/Pipe_Test.cpp b/tests/Pipe_Test.cpp index 10885967b3a..f99c547bc93 100644 --- a/tests/Pipe_Test.cpp +++ b/tests/Pipe_Test.cpp @@ -12,7 +12,7 @@ // Tests the construction of multiple pipes in a process. // // = AUTHOR -// Irfan Pyarali +// Irfan Pyarali <irfan@cs.wustl.edu> // // ============================================================================ @@ -23,11 +23,6 @@ ACE_RCSID(tests, Pipe_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - #if !defined (ACE_LACKS_FORK) static int close_pipe = 1; static int child_process = 0; diff --git a/tests/Priority_Buffer_Test.cpp b/tests/Priority_Buffer_Test.cpp index 9617e25ae42..14ef4dee0ac 100644 --- a/tests/Priority_Buffer_Test.cpp +++ b/tests/Priority_Buffer_Test.cpp @@ -26,11 +26,6 @@ ACE_RCSID(tests, Priority_Buffer_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - #if defined (ACE_HAS_THREADS) // Global message count. diff --git a/tests/Priority_Reactor_Test.cpp b/tests/Priority_Reactor_Test.cpp index 08a91bb1f65..5ad543dcebc 100644 --- a/tests/Priority_Reactor_Test.cpp +++ b/tests/Priority_Reactor_Test.cpp @@ -20,7 +20,7 @@ // simple <ACE_Svc_Handler>, <ACE_Connectors> and <ACE_Acceptors>. // // = AUTHOR -// Carlos O'Ryan +// Carlos O'Ryan <coryan@cs.wustl.edu> // // ============================================================================ @@ -38,11 +38,6 @@ ACE_RCSID(tests, Priority_Reactor_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - // The number of children to run, it can be changed using the -c // option. static int opt_nchildren = diff --git a/tests/Priority_Task_Test.cpp b/tests/Priority_Task_Test.cpp index cebda8e419c..e74dbb85a81 100644 --- a/tests/Priority_Task_Test.cpp +++ b/tests/Priority_Task_Test.cpp @@ -24,11 +24,6 @@ ACE_RCSID(tests, Priority_Task_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - static const ASYS_TCHAR *usage = ASYS_TEXT ("usage: %s [-d]\n"); #if defined (ACE_HAS_THREADS) diff --git a/tests/Process_Manager_Test.cpp b/tests/Process_Manager_Test.cpp index 0429ca4f3e1..259ab0f9d0d 100644 --- a/tests/Process_Manager_Test.cpp +++ b/tests/Process_Manager_Test.cpp @@ -31,11 +31,6 @@ ACE_RCSID(tests, Process_Manager_Test, "Process_Manager_Test.cpp,v 4.11 1999/09/02 04:36:30 schmidt Exp") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - #if !defined (ACE_LACKS_FORK) && defined (ACE_HAS_THREADS) static u_int debug_test = 0; diff --git a/tests/Process_Mutex_Test.cpp b/tests/Process_Mutex_Test.cpp index fa60952deb9..b0f4f861f5a 100644 --- a/tests/Process_Mutex_Test.cpp +++ b/tests/Process_Mutex_Test.cpp @@ -23,11 +23,6 @@ ACE_RCSID(tests, Process_Mutex_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - #if !defined (ACE_LACKS_FORK) static int release_mutex = 1; static int child_process = 0; diff --git a/tests/Process_Strategy_Test.cpp b/tests/Process_Strategy_Test.cpp index 1bcc5fd9397..17b9a655fc1 100644 --- a/tests/Process_Strategy_Test.cpp +++ b/tests/Process_Strategy_Test.cpp @@ -83,11 +83,6 @@ template class ACE_Write_Guard<ACE_File_Lock>; #pragma instantiate ACE_Write_Guard<ACE_File_Lock> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - // Define a <Strategy_Acceptor> that's parameterized by the // <Counting_Service>. diff --git a/tests/Purgable_Map_Manager_Test.cpp b/tests/Purgable_Map_Manager_Test.cpp index 6e3a1e1d609..ae59a991e1b 100644 --- a/tests/Purgable_Map_Manager_Test.cpp +++ b/tests/Purgable_Map_Manager_Test.cpp @@ -27,11 +27,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - ACE_RCSID(tests, Purgable_Map_Manager_Test, "$Id$") class Entry_ID @@ -41,33 +36,32 @@ class Entry_ID // //= DESCRIPTION // This class is used as an KEY and VALUE of the map entry. - public: Entry_ID (int val = 0) : val_ (val) - { - } + { + } ~Entry_ID (void) - { - } + { + } // Obtain the value stored. int get_val (void) - { - return this->val_; - } + { + return this->val_; + } // Hashing needed to access an entry in the map. u_long hash (void) const - { - return this->val_; - } + { + return this->val_; + } // Needed since every entry KEY has to be checked on a lookup. - friend int operator== (const Entry_ID &lhs, const Entry_ID &rhs) - { - return (&lhs == &rhs) ? 0 : 1; - } + friend int operator== (const Entry_ID &lhs, const Entry_ID &rhs) + { + return (&lhs == &rhs) ? 0 : 1; + } private: int val_; @@ -83,7 +77,8 @@ void display_map (PURGE_MAP &map) // The Hash_Map entry without the purgable feature. typedef ACE_Hash_Map_Entry<Entry_ID, Entry_ID> *ENTRY; - // The derived class from Hash_Map_Entry which facilitates purging thru its purge_tag member. + // The derived class from Hash_Map_Entry which facilitates purging + // thru its purge_tag member. typedef ACE_Hash_Purgable_Map_Entry<Entry_ID, Entry_ID> *PURGABLE_ENTRY; ACE_DEBUG ((LM_DEBUG, @@ -99,16 +94,17 @@ void display_map (PURGE_MAP &map) { purgable_entry = (PURGABLE_ENTRY) entry; - ACE_DEBUG ((LM_DEBUG, - "%d:%d purge_tag:%d\n", - (purgable_entry->ext_id_).get_val (), - (purgable_entry->int_id_).get_val (), - purgable_entry->get_purge_tag ())); + ACE_DEBUG ((LM_DEBUG, + "%d:%d purge_tag:%d\n", + (purgable_entry->ext_id_).get_val (), + (purgable_entry->int_id_).get_val (), + purgable_entry->get_purge_tag ())); } } -int main (int argc, char *argv[]) +int +main (int argc, char *argv[]) { ACE_UNUSED_ARG (argc); ACE_UNUSED_ARG (argv); diff --git a/tests/RB_Tree_Test.cpp b/tests/RB_Tree_Test.cpp index 0ee92282087..c8158eaf9d0 100644 --- a/tests/RB_Tree_Test.cpp +++ b/tests/RB_Tree_Test.cpp @@ -10,12 +10,12 @@ // // = DESCRIPTION // This is a test to verify and illustrate the use of the -// ACE_RB_Tree ACE_RB_Tree_Iterator, and -// ACE_RB_Tree_Reverse_Iterator classes. Two different key and +// <ACE_RB_Tree ACE_RB_Tree_Iterator> and +// <ACE_RB_Tree_Reverse_Iterator> classes. Two different key and // item types are used in order to demonstrate specialization of -// the ACE_Less_Than comparison function object template: int (for -// which the native < operator is sufficient), and const char * -// (for which < operator semantics must be replaced by strcmp +// the <ACE_Less_Than> comparison function object template: int +// (for which the native < operator is sufficient), and const char +// * (for which < operator semantics must be replaced by strcmp // semantics). An RB tree for each of the four possible type // parameter permutations over int and const char * is constructed // and filled in, and the resulting order is checked via an @@ -32,11 +32,6 @@ ACE_RCSID(tests, RB_Tree_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - // Type definitions for the four distinct parameterizations of the // test. diff --git a/tests/Reactor_Exceptions_Test.cpp b/tests/Reactor_Exceptions_Test.cpp index fa7f3797c4e..0fe412cf772 100644 --- a/tests/Reactor_Exceptions_Test.cpp +++ b/tests/Reactor_Exceptions_Test.cpp @@ -13,7 +13,7 @@ // correctly in the face of C++ exceptions and threads. // // = AUTHOR -// Luca Priorelli <lucapri@mbox.vol.it> and Douglas C. Schmidt +// Luca Priorelli <lucapri@mbox.vol.it> and Douglas C. Schmidt <schmidt@cs.wustl.edu> // // ============================================================================ @@ -25,11 +25,6 @@ ACE_RCSID(tests, Reactor_Exceptions_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - #if defined (ACE_HAS_EXCEPTIONS) #if defined (ACE_WIN32) diff --git a/tests/Reactor_Notify_Test.cpp b/tests/Reactor_Notify_Test.cpp index 1db35ba60bb..29d08bbb5ce 100644 --- a/tests/Reactor_Notify_Test.cpp +++ b/tests/Reactor_Notify_Test.cpp @@ -30,11 +30,6 @@ ACE_RCSID(tests, Reactor_Notify_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - #if defined (ACE_HAS_THREADS) static const int LONG_TIMEOUT = 10; diff --git a/tests/Reactor_Performance_Test.cpp b/tests/Reactor_Performance_Test.cpp index 20db2146afc..54d8b68da78 100644 --- a/tests/Reactor_Performance_Test.cpp +++ b/tests/Reactor_Performance_Test.cpp @@ -9,13 +9,12 @@ // Reactor_Performance_Test.cpp // // = DESCRIPTION -// // This test is used to time the dispatching mechanisms of the -// ACE_Reactors. Both the WFMO_Reactor and Select_Reactor can be -// tested. +// <ACE_Reactor>s. Both the <ACE_WFMO_Reactor> and +// <ACE_Select_Reactor> can be tested. // // = AUTHOR -// Irfan Pyarali +// Irfan Pyarali <irfan@cs.wustl.edu> // // ============================================================================ @@ -34,11 +33,6 @@ ACE_RCSID(tests, Reactor_Performance_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - #if defined (ACE_HAS_THREADS) // Number of client (user) threads diff --git a/tests/Reactor_Timer_Test.cpp b/tests/Reactor_Timer_Test.cpp index 3ddfa466a97..d1fe88674f5 100644 --- a/tests/Reactor_Timer_Test.cpp +++ b/tests/Reactor_Timer_Test.cpp @@ -26,11 +26,6 @@ ACE_RCSID(tests, Reactor_Timer_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - static int done = 0; static int count = 0; static int odd = 0; diff --git a/tests/Reactors_Test.cpp b/tests/Reactors_Test.cpp index 457ab3ae234..4c3ea3a6e1e 100644 --- a/tests/Reactors_Test.cpp +++ b/tests/Reactors_Test.cpp @@ -13,7 +13,9 @@ // <ACE_Reactors> and <ACE_Tasks> in the same process. // // = AUTHOR -// Prashant Jain, Detlef Becker, and Douglas C. Schmidt +// Prashant Jain <pjain@cs.wustl.edu>, +// Detlef Becker <Detlef.Becker@med.siemens.de>, and +// Douglas C. Schmidt <schmidt@cs.wustl.edu> // // ============================================================================ @@ -23,11 +25,6 @@ ACE_RCSID(tests, Reactors_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - #if defined (ACE_HAS_THREADS) ACE_Thread_Manager *thr_mgr; diff --git a/tests/Reader_Writer_Test.cpp b/tests/Reader_Writer_Test.cpp index 65534952a19..018b1eddd13 100644 --- a/tests/Reader_Writer_Test.cpp +++ b/tests/Reader_Writer_Test.cpp @@ -14,7 +14,7 @@ // pthreads. // // = AUTHOR -// Prashant Jain and Doug C. Schmidt +// Prashant Jain <pjain@cs.wustl.edu> and Doug C. Schmidt <schmidt@cs.wustl.edu> // // ============================================================================ @@ -26,11 +26,6 @@ ACE_RCSID(tests, Reader_Writer_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - #if defined (ACE_HAS_THREADS) // Default number of iterations. diff --git a/tests/Recursive_Mutex_Test.cpp b/tests/Recursive_Mutex_Test.cpp index 5897f3a5d65..8bfc818a0e6 100644 --- a/tests/Recursive_Mutex_Test.cpp +++ b/tests/Recursive_Mutex_Test.cpp @@ -14,7 +14,7 @@ // pthreads. // // = AUTHOR -// Prashant Jain and Doug C. Schmidt +// Prashant Jain <pjain@cs.wustl.edu> and Doug C. Schmidt <schmidt@cs.wustl.edu> // // ============================================================================ @@ -25,11 +25,6 @@ ACE_RCSID(tests, Recursive_Mutex_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - #if defined (ACE_HAS_THREADS) // Total number of iterations. diff --git a/tests/Reverse_Lock_Test.cpp b/tests/Reverse_Lock_Test.cpp index 2577447a73a..6fba4738452 100644 --- a/tests/Reverse_Lock_Test.cpp +++ b/tests/Reverse_Lock_Test.cpp @@ -14,7 +14,7 @@ // command line arguments are needed to run the test. // // = AUTHOR -// Irfan Pyarali +// Irfan Pyarali <irfan@cs.wustl.edu> // // ============================================================================ @@ -22,11 +22,6 @@ ACE_RCSID(tests, Reverse_Lock_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - typedef ACE_Reverse_Lock<ACE_SYNCH_MUTEX> REVERSE_MUTEX; int diff --git a/tests/SOCK_Connector_Test.cpp b/tests/SOCK_Connector_Test.cpp index 51672529e9a..0b891511990 100644 --- a/tests/SOCK_Connector_Test.cpp +++ b/tests/SOCK_Connector_Test.cpp @@ -13,7 +13,7 @@ // than on success cases. // // = AUTHOR -// Steve Huston +// Steve Huston <shuston@riverace.com> // // ============================================================================ @@ -25,11 +25,6 @@ ACE_RCSID(tests, SOCK_Connector_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - #if !defined (ACE_LACKS_GETHOSTENT) // Determine if a host exists, is reachable, and is up. // Attempt a blocking connection to it; if it succeeds, diff --git a/tests/SOCK_Send_Recv_Test.cpp b/tests/SOCK_Send_Recv_Test.cpp index 5c8a1fcfd03..1d289038f19 100644 --- a/tests/SOCK_Send_Recv_Test.cpp +++ b/tests/SOCK_Send_Recv_Test.cpp @@ -34,11 +34,6 @@ ACE_RCSID(tests, SOCK_Send_Recv_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - // Change to non-zero if test fails static int Test_Result = 0; diff --git a/tests/SOCK_Test.cpp b/tests/SOCK_Test.cpp index 1b7756dfb38..61629d61a34 100644 --- a/tests/SOCK_Test.cpp +++ b/tests/SOCK_Test.cpp @@ -16,7 +16,7 @@ // exchange data. // // = AUTHOR -// Prashant Jain and Doug Schmidt +// Prashant Jain <pjain@cs.wustl.edu> and Doug Schmidt <schmidt@cs.wustl.edu> // // ============================================================================ @@ -30,11 +30,6 @@ ACE_RCSID(tests, SOCK_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - static void * client (void *arg) { diff --git a/tests/SPIPE_Test.cpp b/tests/SPIPE_Test.cpp index ca977366c58..9e0f08f67cc 100644 --- a/tests/SPIPE_Test.cpp +++ b/tests/SPIPE_Test.cpp @@ -17,7 +17,7 @@ // required as far as command line arguments are concerned. // // = AUTHOR -// Prashant Jain +// Prashant Jain <pjain@cs.wustl.edu> // // ============================================================================ @@ -31,11 +31,6 @@ ACE_RCSID(tests, SPIPE_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - #if defined (ACE_HAS_STREAM_PIPES) || defined (ACE_WIN32) // pipe name to use static const char *PIPE_NAME = "ace_pipe_name"; diff --git a/tests/SString_Test.cpp b/tests/SString_Test.cpp index 31051af0b75..ff406b7b3e4 100644 --- a/tests/SString_Test.cpp +++ b/tests/SString_Test.cpp @@ -1,6 +1,6 @@ -// ============================================================================ // $Id$ +// ============================================================================ // // = LIBRARY // tests @@ -14,7 +14,7 @@ // the test. // // = AUTHOR -// Prashant Jain +// Prashant Jain <pjain@cs.wustl.edu> // // ============================================================================ @@ -23,11 +23,6 @@ ACE_RCSID(tests, SString_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - int main (int, ASYS_TCHAR *[]) { diff --git a/tests/SV_Shared_Memory_Test.cpp b/tests/SV_Shared_Memory_Test.cpp index afb65852a13..91f6d41eab0 100644 --- a/tests/SV_Shared_Memory_Test.cpp +++ b/tests/SV_Shared_Memory_Test.cpp @@ -27,11 +27,6 @@ ACE_RCSID(tests, SV_Shared_Memory_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - #if defined (ACE_HAS_SYSV_IPC) && !defined(ACE_LACKS_SYSV_SHMEM) // The shared memory allocator, which uses up the ACE_DEFAULT_SEM_KEY. diff --git a/tests/Semaphore_Test.cpp b/tests/Semaphore_Test.cpp index ed8e19d9a56..5fcc651ece8 100644 --- a/tests/Semaphore_Test.cpp +++ b/tests/Semaphore_Test.cpp @@ -25,11 +25,6 @@ ACE_RCSID(tests, Semaphore_Test, "$Id$") -#if defined (__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB ("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined (__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - // msec that times are allowed to differ before test fails. #define ACE_ALLOWED_SLACK 100 diff --git a/tests/Service_Config_Test.cpp b/tests/Service_Config_Test.cpp index 969df5f69c0..80f86622ead 100644 --- a/tests/Service_Config_Test.cpp +++ b/tests/Service_Config_Test.cpp @@ -13,7 +13,7 @@ // working correctly. // // = AUTHOR -// David Levine +// David Levine <levine@cs.wustl.edu> // // ============================================================================ @@ -23,11 +23,6 @@ ACE_RCSID(tests, Service_Config_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - static const u_int VARIETIES = 3; static u_int error = 0; diff --git a/tests/Sigset_Ops_Test.cpp b/tests/Sigset_Ops_Test.cpp index 62cad35df60..884e3486e44 100644 --- a/tests/Sigset_Ops_Test.cpp +++ b/tests/Sigset_Ops_Test.cpp @@ -14,7 +14,7 @@ // sigismember(). // // = AUTHOR -// Nanbor Wang +// Nanbor Wang <nanbor@cs.wustl.edu> // // ============================================================================ @@ -23,11 +23,6 @@ ACE_RCSID(tests, Sigset_Ops_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - void siglistset(sigset_t x, int *sigset) { diff --git a/tests/Simple_Message_Block_Test.cpp b/tests/Simple_Message_Block_Test.cpp index 2b35bf12e89..0a02186862e 100644 --- a/tests/Simple_Message_Block_Test.cpp +++ b/tests/Simple_Message_Block_Test.cpp @@ -9,14 +9,13 @@ // Simple_Message_Block_Test.cpp // // = DESCRIPTION -// // This test program is a torture test that illustrates how // ACE_Message_Block reference counting works, how and when locks // are used, how memory is managed, and how continuation chains // of message blocks are made. Ideally used with purify :-) // // = AUTHOR -// Irfan Pyarali (irfan@cs.wustl.edu) +// Irfan Pyarali <irfan@cs.wustl.edu> // // ============================================================================ @@ -26,11 +25,6 @@ ACE_RCSID(tests, Simple_Message_Block_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - int main (int, ASYS_TCHAR *[]) { diff --git a/tests/Svc_Handler_Test.cpp b/tests/Svc_Handler_Test.cpp index b38673605c1..31c1f4a1eda 100644 --- a/tests/Svc_Handler_Test.cpp +++ b/tests/Svc_Handler_Test.cpp @@ -24,11 +24,6 @@ ACE_RCSID(tests, Svc_Handler_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - typedef ACE_Buffered_Svc_Handler <ACE_FILE_STREAM, ACE_NULL_SYNCH> SVC_HANDLER; static void diff --git a/tests/TSS_Test.cpp b/tests/TSS_Test.cpp index 2d044bed8a4..81e783b828d 100644 --- a/tests/TSS_Test.cpp +++ b/tests/TSS_Test.cpp @@ -16,7 +16,7 @@ // in the Errno class. // // = AUTHOR -// Prashant Jain and Doug Schmidt +// Prashant Jain <pjain@cs.wustl.edu> and Doug Schmidt <schmidt@cs.wustl.edu> // // ============================================================================ @@ -28,11 +28,6 @@ ACE_RCSID(tests, TSS_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - static u_int errors = 0; #if defined (ACE_HAS_THREADS) diff --git a/tests/Task_Test.cpp b/tests/Task_Test.cpp index 97fe044c3c8..23e746b2bc9 100644 --- a/tests/Task_Test.cpp +++ b/tests/Task_Test.cpp @@ -25,11 +25,6 @@ ACE_RCSID(tests, Task_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - #if defined (ACE_HAS_THREADS) class My_Thread_Hook : public ACE_Thread_Hook diff --git a/tests/Thread_Manager_Test.cpp b/tests/Thread_Manager_Test.cpp index c6f7b7423cf..ef71f96e00d 100644 --- a/tests/Thread_Manager_Test.cpp +++ b/tests/Thread_Manager_Test.cpp @@ -26,11 +26,6 @@ ACE_RCSID(tests, Thread_Manager_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - #if defined (ACE_HAS_THREADS) // Each thread keeps track of whether it has been signalled by using a diff --git a/tests/Thread_Mutex_Test.cpp b/tests/Thread_Mutex_Test.cpp index e65de696341..b801ccc8250 100644 --- a/tests/Thread_Mutex_Test.cpp +++ b/tests/Thread_Mutex_Test.cpp @@ -14,7 +14,7 @@ // command line arguments are needed to run the test. // // = AUTHOR -// Prashant Jain and Doug Schmidt +// Prashant Jain <pjain@cs.wustl.edu> and Doug Schmidt <schmidt@cs.wustl.edu> // // ============================================================================ @@ -23,11 +23,6 @@ ACE_RCSID(tests, Thread_Mutex_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - #if defined (ACE_HAS_THREADS) static void * test (void *args) diff --git a/tests/Thread_Pool_Reactor_Test.cpp b/tests/Thread_Pool_Reactor_Test.cpp index 66ff5199632..276f0be0021 100644 --- a/tests/Thread_Pool_Reactor_Test.cpp +++ b/tests/Thread_Pool_Reactor_Test.cpp @@ -48,11 +48,6 @@ ACE_RCSID(tests, Atomic_Op_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - #if defined (ACE_HAS_THREADS) #include "tests/Thread_Pool_Reactor_Test.h" diff --git a/tests/Thread_Pool_Test.cpp b/tests/Thread_Pool_Test.cpp index e1097b2fc34..68fa98bab5b 100644 --- a/tests/Thread_Pool_Test.cpp +++ b/tests/Thread_Pool_Test.cpp @@ -29,11 +29,6 @@ ACE_RCSID(tests, Thread_Pool_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - #if defined (ACE_HAS_THREADS) // Number of iterations to run the test. diff --git a/tests/Time_Service_Test.cpp b/tests/Time_Service_Test.cpp index 4b2ae7f4302..d88510e6076 100644 --- a/tests/Time_Service_Test.cpp +++ b/tests/Time_Service_Test.cpp @@ -26,11 +26,6 @@ ACE_RCSID(tests, Time_Service_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - #define APPLICATION \ ACE_TEXT ("..") ACE_DIRECTORY_SEPARATOR_STR \ ACE_TEXT ("netsvcs") ACE_DIRECTORY_SEPARATOR_STR \ diff --git a/tests/Time_Value_Test.cpp b/tests/Time_Value_Test.cpp index ff2e208f009..d5d7007ec93 100644 --- a/tests/Time_Value_Test.cpp +++ b/tests/Time_Value_Test.cpp @@ -15,7 +15,7 @@ // this seems like a reasonable place to test it. // // = AUTHOR -// Prashant Jain and David Levine +// Prashant Jain <pjain@cs.wustl.edu> and David Levine <levine@cs.wustl.edu> // // ============================================================================ @@ -48,11 +48,6 @@ ACE_RCSID(tests, Time_Value_Test, "$Id$") #include "test_config.h" #include "ace/ACE.h" -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - #if defined (sun) && !defined (ACE_LACKS_LONGLONG_T) static u_long diff --git a/tests/Timeprobe_Test.cpp b/tests/Timeprobe_Test.cpp index 4b229d2e54e..9fb2ab7a77d 100644 --- a/tests/Timeprobe_Test.cpp +++ b/tests/Timeprobe_Test.cpp @@ -12,7 +12,7 @@ // This is a simple test of ACE Timeprobes. // // = AUTHOR -// Irfan Pyarali +// Irfan Pyarali <irfan@cs.wustl.edu> // // ============================================================================ @@ -25,11 +25,6 @@ ACE_RCSID(tests, Timeprobe_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - #if defined (ACE_ENABLE_TIMEPROBES) static const char *events_descriptions_0[] = diff --git a/tests/Timer_Queue_Test.cpp b/tests/Timer_Queue_Test.cpp index aff963cec17..dfaa41b605f 100644 --- a/tests/Timer_Queue_Test.cpp +++ b/tests/Timer_Queue_Test.cpp @@ -34,11 +34,6 @@ ACE_RCSID(tests, Timer_Queue_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - template <class T> void randomize_array (T array[], size_t size) { diff --git a/tests/TkReactor_Test.cpp b/tests/TkReactor_Test.cpp index 82ec6f23b51..e4c2576400a 100644 --- a/tests/TkReactor_Test.cpp +++ b/tests/TkReactor_Test.cpp @@ -21,7 +21,7 @@ // No command line arguments are needed to run the test. // // = AUTHOR -// Nagarajan Surendran (naga@cs.wustl.edu) +// Nagarajan Surendran <naga@cs.wustl.edu> // // ============================================================================ @@ -29,11 +29,6 @@ ACE_RCSID(tests, TkReactor_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - #if !defined (ACE_HAS_TK) int main (int, char*[]) diff --git a/tests/Tokens_Test.cpp b/tests/Tokens_Test.cpp index d6678b9a168..528932d7cb0 100644 --- a/tests/Tokens_Test.cpp +++ b/tests/Tokens_Test.cpp @@ -21,7 +21,7 @@ // test remotely. // // = AUTHOR -// Tim Harrison +// Tim Harrison <harrison@cs.wustl.edu> // // ============================================================================ @@ -36,11 +36,6 @@ ACE_RCSID(tests, Tokens_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - #if defined (ACE_HAS_THREADS) typedef ACE_Token_Invariant_Manager TOKEN_INVARIANTS; diff --git a/tests/UPIPE_SAP_Test.cpp b/tests/UPIPE_SAP_Test.cpp index 4401fc202d8..7e2d2397d7e 100644 --- a/tests/UPIPE_SAP_Test.cpp +++ b/tests/UPIPE_SAP_Test.cpp @@ -9,11 +9,13 @@ // UPIPE_SAP_Test.cpp // // = DESCRIPTION -// This is a test that uses ACE_UPIPE_SAP and ACE_Thread for +// This is a test that uses <ACE_UPIPE_SAP> and <ACE_Thread> for // intra-process communication. // // = AUTHOR -// Gerhard Lenzer, Douglas C. Schmidt, and Prashant Jain +// Gerhard Lenzer <Gerhard.Lenzer@med.siemens.de>, +// Douglas C. Schmidt <schmidt@cs.wustl.edu>, and +// Prashant Jain <pjain@cs.wustl.edu> // // ============================================================================ @@ -24,11 +26,6 @@ ACE_RCSID(tests, UPIPE_SAP_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - #if defined (ACE_HAS_THREADS) && (defined (ACE_HAS_STREAM_PIPES) || \ (defined (ACE_WIN32) && \ defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0))) diff --git a/tests/Upgradable_RW_Test.cpp b/tests/Upgradable_RW_Test.cpp index 791b6d89d1b..bc1e4193218 100644 --- a/tests/Upgradable_RW_Test.cpp +++ b/tests/Upgradable_RW_Test.cpp @@ -23,11 +23,6 @@ ACE_RCSID(tests, Upgradable_RW_Test, "$Id$") -#if defined (__BORLANDC__) && __BORLANDC__ >= 0x0530 - USELIB ("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined (__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - #if defined (ACE_HAS_THREADS) // Default number of iterations. diff --git a/tests/XtReactor_Test.cpp b/tests/XtReactor_Test.cpp index dd40820c6a0..6660fe777cf 100644 --- a/tests/XtReactor_Test.cpp +++ b/tests/XtReactor_Test.cpp @@ -29,11 +29,6 @@ ACE_RCSID(tests, XtReactor_Test, "$Id$") -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -USELIB("..\ace\aced.lib"); -//--------------------------------------------------------------------------- -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - #if defined (ACE_HAS_XT) #include <ace/XtReactor.h> diff --git a/tests/test_config.h b/tests/test_config.h index 0d07b378b4a..b8252080091 100644 --- a/tests/test_config.h +++ b/tests/test_config.h @@ -32,11 +32,6 @@ #undef ACE_NLOGGING #endif /* ACE_NLOGGING */ -/* Borland C++ Builder stuff */ -#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 -#include /**/ <condefs.h> -#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ - // This first #undef protects against command-line definitions. #undef ACE_NDEBUG #include "ace/OS.h" |