diff options
75 files changed, 895 insertions, 96 deletions
diff --git a/ChangeLog-98b b/ChangeLog-98b index 4003035271c..677dc27e8d3 100644 --- a/ChangeLog-98b +++ b/ChangeLog-98b @@ -1,3 +1,97 @@ +Thu Jul 09 23:27:26 1998 Gonzalo Diethelm <gonzo@tango.cs.wustl.edu> + + * ace/OS.h: + Corrected definitions for ACE_Export under Borland compilers. + + * ace/SString.h: + Got rid of the friend operators. + + * ace/Containers.cpp: + * ace/Message_Queue_T.cpp: + * ace/Stream.cpp: + * ace/Timer_Heap_T.cpp: + * tests/Buffer_Stream_Test.cpp: + * tests/Dynamic_Priority_Test.cpp: + * tests/Future_Test.cpp: + * tests/Naming_Test.cpp: + * tests/Priority_Buffer_Test.cpp: + * tests/Thread_Pool_Test.cpp: + Got rid of a few assignments to zero that cause warnings with + the Borland compiler. + + * ace/ace_bcc.ide: + * tests/tests_bcc.ide: + Now Borland C++ 5.x supports building ACE as a DLL, and the tests + are linked against the Debug DLL. + + * tests/tests.bpg: + * tests/Dynamic_Priority_Test.bpr: + * tests/Timeprobe_Test.bpr: + * tests/Upgradable_RW_Test.bpr: + * tests/XtReactor_Test.bpr: + Added four new tests to the project group. + + * tests/Aio_Platform_Test.bpr: + * tests/Atomic_Op_Test.bpr: + * tests/Barrier_Test.bpr: + * tests/Basic_Types_Test.bpr: + * tests/Buffer_Stream_Test.bpr: + * tests/Conn_Test.bpr: + * tests/Dynamic_Priority_Test.bpr: + * tests/Enum_Interfaces_Test.bpr: + * tests/Env_Value_Test.bpr: + * tests/Future_Test.bpr: + * tests/Handle_Set_Test.bpr: + * tests/Hash_Map_Manager_Test.bpr: + * tests/IOStream_Test.bpr: + * tests/MM_Shared_Memory_Test.bpr: + * tests/MT_Reactor_Timer_Test.bpr: + * tests/MT_SOCK_Test.bpr: + * tests/Map_Manager_Test.bpr: + * tests/Mem_Map_Test.bpr: + * tests/Message_Block_Test.bpr: + * tests/Message_Queue_Test.bpr: + * tests/MsgQueue_Notifications_Test.bpr: + * tests/Naming_Test.bpr: + * tests/Notify_Performance_Test.bpr: + * tests/OrdMultiSet_Test.bpr: + * tests/Pipe_Test.bpr: + * tests/Priority_Buffer_Test.bpr: + * tests/Priority_Reactor_Test.bpr: + * tests/Priority_Task_Test.bpr: + * tests/Process_Mutex_Test.bpr: + * tests/Process_Strategy_Test.bpr: + * tests/Reactor_Exceptions_Test.bpr: + * tests/Reactor_Notify_Test.bpr: + * tests/Reactor_Performance_Test.bpr: + * tests/Reactor_Timer_Test.bpr: + * tests/Reactors_Test.bpr: + * tests/Reader_Writer_Test.bpr: + * tests/Recursive_Mutex_Test.bpr: + * tests/SOCK_Connector_Test.bpr: + * tests/SOCK_Test.bpr: + * tests/SPIPE_Test.bpr: + * tests/SString_Test.bpr: + * tests/SV_Shared_Memory_Test.bpr: + * tests/Semaphore_Test.bpr: + * tests/Service_Config_Test.bpr: + * tests/Sigset_Ops_Test.bpr: + * tests/Simple_Message_Block_Test.bpr: + * tests/TSS_Test.bpr: + * tests/Task_Test.bpr: + * tests/Thread_Manager_Test.bpr: + * tests/Thread_Mutex_Test.bpr: + * tests/Thread_Pool_Test.bpr: + * tests/Time_Service_Test.bpr: + * tests/Time_Value_Test.bpr: + * tests/Timeprobe_Test.bpr: + * tests/Timer_Queue_Test.bpr: + * tests/Tokens_Test.bpr: + * tests/UPIPE_SAP_Test.bpr: + * tests/Upgradable_RW_Test.bpr: + * tests/XtReactor_Test.bpr: + Uniform options for Borland C++ and C++ Builder. + Thu Jul 09 16:23:34 1998 Irfan Pyarali <irfan@cs.wustl.edu> * ace/Registry.h (ACE_Registry): Changed the Registry class so diff --git a/ace/Containers.cpp b/ace/Containers.cpp index 19d566b4f37..43358d8b5cf 100644 --- a/ace/Containers.cpp +++ b/ace/Containers.cpp @@ -228,7 +228,7 @@ ACE_Unbounded_Stack<T>::push (const T &new_item) { // ACE_TRACE ("ACE_Unbounded_Stack<T>::push"); - ACE_Node<T> *temp = 0; + ACE_Node<T> *temp; ACE_NEW_MALLOC_RETURN (temp, (ACE_Node<T>*) this->allocator_->malloc (sizeof (ACE_Node<T>)), diff --git a/ace/Message_Queue_T.cpp b/ace/Message_Queue_T.cpp index a7249b52123..4fc2794ed08 100644 --- a/ace/Message_Queue_T.cpp +++ b/ace/Message_Queue_T.cpp @@ -758,7 +758,7 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::enqueue_i (ACE_Message_Block *new_item { ACE_TRACE ("ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::enqueue_i"); - int result = 0; + int result; // get the current time ACE_Time_Value current_time = ACE_OS::gettimeofday (); @@ -809,7 +809,7 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::dequeue_head (ACE_Message_Block *&firs return -1; } - int result = 0; + int result; // get the current time ACE_Time_Value current_time = ACE_OS::gettimeofday (); @@ -952,8 +952,8 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::remove_stale_messages (const ACE_Time_ // management scheme to be configured in either case. ACE_Message_Block *temp1 = remove_head; ACE_Message_Block *temp2 = remove_head->next (); - ACE_Message_Block *size_temp = 0; - size_t msg_size = 0; + ACE_Message_Block *size_temp; + size_t msg_size; while (temp1) { // Make sure to count *all* the bytes in a composite message!!! @@ -366,20 +366,19 @@ // First, we define how to properly export/import objects. # if defined (ACE_WIN32) // Only Win32 needs special treatment. -# if defined(_MSC_VER) || (defined(__BORLANDC__) && __BORLANDC__ >= 0x0530) -/* Microsoft, Borland C++ Builder: */ +# if defined(_MSC_VER) || defined(__BORLANDC__) +/* Microsoft, Borland: */ # define ACE_Proper_Export_Flag __declspec (dllexport) # define ACE_Proper_Import_Flag __declspec (dllimport) # define ACE_EXPORT_SINGLETON_DECLARATION(T) template class __declspec (dllexport) T # define ACE_IMPORT_SINGLETON_DECLARATION(T) extern template class T -# else /* defined(_MSC_VER) || (defined(__BORLANDC__) && __BORLANDC__ >= 0x0530) */ -/* Non-Microsoft, other versions of Borland: */ +# else /* defined(_MSC_VER) || defined(__BORLANDC__) */ +/* Non-Microsoft, non-Borland: */ # define ACE_Proper_Export_Flag _export # define ACE_Proper_Import_Flag _import -// @@ Don't know how to handle this when using Borland's compilers. # define ACE_EXPORT_SINGLETON_DECLARATION(T) # define ACE_IMPORT_SINGLETON_DECLARATION(T) -# endif /* defined(_MSC_VER) || (defined(__BORLANDC__) && __BORLANDC__ >= 0x0530) */ +# endif /* defined(_MSC_VER) || defined(__BORLANDC__) */ # else /* ! ACE_WIN32 */ # define ACE_Proper_Export_Flag # define ACE_Proper_Import_Flag diff --git a/ace/SString.h b/ace/SString.h index 4164c63bb39..b3c48be5445 100644 --- a/ace/SString.h +++ b/ace/SString.h @@ -40,11 +40,6 @@ class ACE_Export ACE_CString // Instead, its internal representation is set equal to a global // empty string. public: - friend ACE_Export ACE_CString operator+ (const ACE_CString &, const ACE_CString &); -#if !defined (ACE_HAS_WINCE) - friend ACE_Export ostream &operator<< (ostream &, const ACE_CString &); -#endif /* ! ACE_HAS_WINCE */ - static const int npos; // No position constant @@ -188,10 +183,6 @@ class ACE_Export ACE_SString // ACE_Allocator with a persistable memory pool { public: -#if !defined (ACE_HAS_WINCE) - friend ACE_Export ostream &operator<< (ostream &, const ACE_SString &); -#endif /* ! ACE_HAS_WINCE */ - static const int npos; // No position constant @@ -315,11 +306,6 @@ class ACE_Export ACE_WString // memory The user can make this a persistant class by providing // an ACE_Allocator with a persistable memory pool { - friend ACE_Export ACE_WString operator+ (const ACE_WString &, const ACE_WString &); -#if !defined (ACE_HAS_WINCE) - friend ACE_Export ostream &operator<< (ostream &, const ACE_WString &); -#endif /* ! ACE_HAS_WINCE */ - public: static const int npos; // No position constant diff --git a/ace/Stream.cpp b/ace/Stream.cpp index bf8e7db06de..893f24cf373 100644 --- a/ace/Stream.cpp +++ b/ace/Stream.cpp @@ -345,7 +345,7 @@ ACE_Stream<ACE_SYNCH_USE>::control (ACE_IO_Cntl_Msg::ACE_IO_Cntl_Cmds cmd, ACE_TRACE ("ACE_Stream<ACE_SYNCH_USE>::control"); ACE_IO_Cntl_Msg ioc (cmd); - ACE_Message_Block *db = 0; + ACE_Message_Block *db; // Try to create a data block that contains the user-supplied data. ACE_NEW_RETURN (db, ACE_Message_Block (sizeof (int), @@ -371,7 +371,7 @@ ACE_Stream<ACE_SYNCH_USE>::control (ACE_IO_Cntl_Msg::ACE_IO_Cntl_Cmds cmd, return -1; } - int result = 0; + int result; if (this->stream_head_->writer ()->put (cb) == -1) result = -1; @@ -381,7 +381,7 @@ ACE_Stream<ACE_SYNCH_USE>::control (ACE_IO_Cntl_Msg::ACE_IO_Cntl_Cmds cmd, result = ((ACE_IO_Cntl_Msg *) cb->rd_ptr ())->rval (); // This will also release db if it's reference count == 0. - cb->release (); + cb->release (); return result; } diff --git a/ace/Timer_Heap_T.cpp b/ace/Timer_Heap_T.cpp index ad8ff2e5056..cdc7d8c896e 100644 --- a/ace/Timer_Heap_T.cpp +++ b/ace/Timer_Heap_T.cpp @@ -392,7 +392,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::grow_heap (void) // First grow the heap itself. - ACE_Timer_Node_T<TYPE> **new_heap = 0; + ACE_Timer_Node_T<TYPE> **new_heap; ACE_NEW (new_heap, (ACE_Timer_Node_T<TYPE> *[new_size])); ACE_OS::memcpy (new_heap, this->heap_, max_size_ * sizeof *new_heap); @@ -401,7 +401,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::grow_heap (void) // Grow the array of timer ids. - long *new_timer_ids = 0; + long *new_timer_ids; ACE_NEW (new_timer_ids, long[new_size]); diff --git a/ace/ace_bcc.ide b/ace/ace_bcc.ide Binary files differindex 9724de0832e..247e8d70872 100644 --- a/ace/ace_bcc.ide +++ b/ace/ace_bcc.ide diff --git a/tests/Aio_Platform_Test.bpr b/tests/Aio_Platform_Test.bpr index 11896351db5..27888a16835 100644 --- a/tests/Aio_Platform_Test.bpr +++ b/tests/Aio_Platform_Test.bpr @@ -14,7 +14,7 @@ BCB = $(MAKEDIR)\.. VERSION = BCB.03 # --------------------------------------------------------------------------- PROJECT = Aio_Platform_Test.exe -OBJFILES = obj\Aio_Platform_Test.obj +OBJFILES = objs\Aio_Platform_Test.obj RESFILES = RESDEPEN = $(RESFILES) LIBFILES = ..\ace\aced.lib diff --git a/tests/Atomic_Op_Test.bpr b/tests/Atomic_Op_Test.bpr index 8ad0a7fa437..ad9a52149b9 100644 --- a/tests/Atomic_Op_Test.bpr +++ b/tests/Atomic_Op_Test.bpr @@ -14,7 +14,7 @@ BCB = $(MAKEDIR)\.. VERSION = BCB.03 # --------------------------------------------------------------------------- PROJECT = Atomic_Op_Test.exe -OBJFILES = obj\Atomic_Op_Test.obj +OBJFILES = objs\Atomic_Op_Test.obj RESFILES = RESDEPEN = $(RESFILES) LIBFILES = ..\ace\aced.lib diff --git a/tests/Barrier_Test.bpr b/tests/Barrier_Test.bpr index dc3b8702fb9..deb0e0304d0 100644 --- a/tests/Barrier_Test.bpr +++ b/tests/Barrier_Test.bpr @@ -14,7 +14,7 @@ BCB = $(MAKEDIR)\.. VERSION = BCB.03 # --------------------------------------------------------------------------- PROJECT = Barrier_Test.exe -OBJFILES = obj\Barrier_Test.obj +OBJFILES = objs\Barrier_Test.obj RESFILES = RESDEPEN = $(RESFILES) LIBFILES = ..\ace\aced.lib diff --git a/tests/Basic_Types_Test.bpr b/tests/Basic_Types_Test.bpr index fc9192e8d9b..33c81dd44c8 100644 --- a/tests/Basic_Types_Test.bpr +++ b/tests/Basic_Types_Test.bpr @@ -14,7 +14,7 @@ BCB = $(MAKEDIR)\.. VERSION = BCB.03 # --------------------------------------------------------------------------- PROJECT = Basic_Types_Test.exe -OBJFILES = obj\Basic_Types_Test.obj +OBJFILES = objs\Basic_Types_Test.obj RESFILES = RESDEPEN = $(RESFILES) LIBFILES = ..\ace\aced.lib diff --git a/tests/Buffer_Stream_Test.bpr b/tests/Buffer_Stream_Test.bpr index 5f4b61dea0a..07f6d1e5376 100644 --- a/tests/Buffer_Stream_Test.bpr +++ b/tests/Buffer_Stream_Test.bpr @@ -14,7 +14,7 @@ BCB = $(MAKEDIR)\.. VERSION = BCB.03 # --------------------------------------------------------------------------- PROJECT = Buffer_Stream_Test.exe -OBJFILES = obj\Buffer_Stream_Test.obj +OBJFILES = objs\Buffer_Stream_Test.obj RESFILES = RESDEPEN = $(RESFILES) LIBFILES = ..\ace\aced.lib diff --git a/tests/Buffer_Stream_Test.cpp b/tests/Buffer_Stream_Test.cpp index 6959a52939f..4d77da34c1f 100644 --- a/tests/Buffer_Stream_Test.cpp +++ b/tests/Buffer_Stream_Test.cpp @@ -157,7 +157,7 @@ int Consumer::svc (void) { ACE_Message_Block *mb = 0; - int result = 0; + int result; char *c = ACE_ALPHABET; char *output; diff --git a/tests/Conn_Test.bpr b/tests/Conn_Test.bpr index 6b1725e062f..f460b2c2829 100644 --- a/tests/Conn_Test.bpr +++ b/tests/Conn_Test.bpr @@ -14,7 +14,7 @@ BCB = $(MAKEDIR)\.. VERSION = BCB.03 # --------------------------------------------------------------------------- PROJECT = Conn_Test.exe -OBJFILES = obj\Conn_Test.obj +OBJFILES = objs\Conn_Test.obj RESFILES = RESDEPEN = $(RESFILES) LIBFILES = ..\ace\aced.lib diff --git a/tests/Dynamic_Priority_Test.bpr b/tests/Dynamic_Priority_Test.bpr new file mode 100644 index 00000000000..e8cf904574e --- /dev/null +++ b/tests/Dynamic_Priority_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = Dynamic_Priority_Test.exe +OBJFILES = objs\Dynamic_Priority_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/Dynamic_Priority_Test.cpp b/tests/Dynamic_Priority_Test.cpp index f336982c095..6cbee3f55dc 100644 --- a/tests/Dynamic_Priority_Test.cpp +++ b/tests/Dynamic_Priority_Test.cpp @@ -164,7 +164,7 @@ producer (void *args) int run_test (ACE_Message_Queue<ACE_MT_SYNCH>* msg_queue, const char *send_order, const char *receipt_order) { - u_int i = 0; + u_int i; u_int array_size = ACE_OS::strlen (send_order); ACE_ASSERT (msg_queue != 0); @@ -262,7 +262,7 @@ main (int, ASYS_TCHAR *[]) { ACE_START_TEST (ASYS_TEXT ("Dynamic_Priority_Test")); - ACE_Message_Queue<ACE_MT_SYNCH> *test_queue = 0; + ACE_Message_Queue<ACE_MT_SYNCH> *test_queue; // test factory, static message queue test_queue = ACE_Message_Queue_Factory<ACE_MT_SYNCH>::create_static_message_queue (max_queue); diff --git a/tests/Enum_Interfaces_Test.bpr b/tests/Enum_Interfaces_Test.bpr index 38fc21c802d..8d8221e78ed 100644 --- a/tests/Enum_Interfaces_Test.bpr +++ b/tests/Enum_Interfaces_Test.bpr @@ -14,7 +14,7 @@ BCB = $(MAKEDIR)\.. VERSION = BCB.03 # --------------------------------------------------------------------------- PROJECT = Enum_Interfaces_Test.exe -OBJFILES = obj\Enum_Interfaces_Test.obj +OBJFILES = objs\Enum_Interfaces_Test.obj RESFILES = RESDEPEN = $(RESFILES) LIBFILES = ..\ace\aced.lib diff --git a/tests/Env_Value_Test.bpr b/tests/Env_Value_Test.bpr index b58eb881f78..765f66affb7 100644 --- a/tests/Env_Value_Test.bpr +++ b/tests/Env_Value_Test.bpr @@ -14,7 +14,7 @@ BCB = $(MAKEDIR)\.. VERSION = BCB.03 # --------------------------------------------------------------------------- PROJECT = Env_Value_Test.exe -OBJFILES = obj\Env_Value_Test.obj +OBJFILES = objs\Env_Value_Test.obj RESFILES = RESDEPEN = $(RESFILES) LIBFILES = ..\ace\aced.lib diff --git a/tests/Future_Test.bpr b/tests/Future_Test.bpr index cd5368a6fe4..3c694e5d92f 100644 --- a/tests/Future_Test.bpr +++ b/tests/Future_Test.bpr @@ -14,7 +14,7 @@ BCB = $(MAKEDIR)\.. VERSION = BCB.03 # --------------------------------------------------------------------------- PROJECT = Future_Test.exe -OBJFILES = obj\Future_Test.obj +OBJFILES = objs\Future_Test.obj RESFILES = RESDEPEN = $(RESFILES) LIBFILES = ..\ace\aced.lib diff --git a/tests/Future_Test.cpp b/tests/Future_Test.cpp index 04b6b12c95a..df4eba3a8a5 100644 --- a/tests/Future_Test.cpp +++ b/tests/Future_Test.cpp @@ -327,7 +327,7 @@ main (int, ASYS_TCHAR *[]) ACE_START_TEST (ASYS_TEXT ("Future_Test")); #if defined (ACE_HAS_THREADS) - Scheduler *andres = 0, *peter = 0, *helmut = 0, *matias = 0; + Scheduler *andres, *peter, *helmut, *matias; // Create active objects.. // @@ Should "open" be subsumed within the constructor of diff --git a/tests/Handle_Set_Test.bpr b/tests/Handle_Set_Test.bpr index 0c1996854e7..43cb3771f42 100644 --- a/tests/Handle_Set_Test.bpr +++ b/tests/Handle_Set_Test.bpr @@ -14,7 +14,7 @@ BCB = $(MAKEDIR)\.. VERSION = BCB.03 # --------------------------------------------------------------------------- PROJECT = Handle_Set_Test.exe -OBJFILES = obj\Handle_Set_Test.obj +OBJFILES = objs\Handle_Set_Test.obj RESFILES = RESDEPEN = $(RESFILES) LIBFILES = ..\ace\aced.lib diff --git a/tests/Hash_Map_Manager_Test.bpr b/tests/Hash_Map_Manager_Test.bpr index 1d226a3d4d3..bc596c53ad0 100644 --- a/tests/Hash_Map_Manager_Test.bpr +++ b/tests/Hash_Map_Manager_Test.bpr @@ -14,7 +14,7 @@ BCB = $(MAKEDIR)\.. VERSION = BCB.03 # --------------------------------------------------------------------------- PROJECT = Hash_Map_Manager_Test.exe -OBJFILES = obj\Hash_Map_Manager_Test.obj +OBJFILES = objs\Hash_Map_Manager_Test.obj RESFILES = RESDEPEN = $(RESFILES) LIBFILES = ..\ace\aced.lib diff --git a/tests/IOStream_Test.bpr b/tests/IOStream_Test.bpr index 69b2d00f719..ddfccd82dfb 100644 --- a/tests/IOStream_Test.bpr +++ b/tests/IOStream_Test.bpr @@ -14,7 +14,7 @@ BCB = $(MAKEDIR)\.. VERSION = BCB.03 # --------------------------------------------------------------------------- PROJECT = IOStream_Test.exe -OBJFILES = obj\IOStream_Test.obj +OBJFILES = objs\IOStream_Test.obj RESFILES = RESDEPEN = $(RESFILES) LIBFILES = ..\ace\aced.lib diff --git a/tests/MM_Shared_Memory_Test.bpr b/tests/MM_Shared_Memory_Test.bpr index f3bb4b24142..9d7acdedd0e 100644 --- a/tests/MM_Shared_Memory_Test.bpr +++ b/tests/MM_Shared_Memory_Test.bpr @@ -14,7 +14,7 @@ BCB = $(MAKEDIR)\.. VERSION = BCB.03 # --------------------------------------------------------------------------- PROJECT = MM_Shared_Memory_Test.exe -OBJFILES = obj\MM_Shared_Memory_Test.obj +OBJFILES = objs\MM_Shared_Memory_Test.obj RESFILES = RESDEPEN = $(RESFILES) LIBFILES = ..\ace\aced.lib diff --git a/tests/MT_Reactor_Timer_Test.bpr b/tests/MT_Reactor_Timer_Test.bpr index 5e0cb83b321..f5190627c5d 100644 --- a/tests/MT_Reactor_Timer_Test.bpr +++ b/tests/MT_Reactor_Timer_Test.bpr @@ -14,7 +14,7 @@ BCB = $(MAKEDIR)\.. VERSION = BCB.03 # --------------------------------------------------------------------------- PROJECT = MT_Reactor_Timer_Test.exe -OBJFILES = obj\MT_Reactor_Timer_Test.obj +OBJFILES = objs\MT_Reactor_Timer_Test.obj RESFILES = RESDEPEN = $(RESFILES) LIBFILES = ..\ace\aced.lib diff --git a/tests/MT_SOCK_Test.bpr b/tests/MT_SOCK_Test.bpr index 91ac9908e93..b9ccb4f06cb 100644 --- a/tests/MT_SOCK_Test.bpr +++ b/tests/MT_SOCK_Test.bpr @@ -14,7 +14,7 @@ BCB = $(MAKEDIR)\.. VERSION = BCB.03 # --------------------------------------------------------------------------- PROJECT = MT_SOCK_Test.exe -OBJFILES = obj\MT_SOCK_Test.obj +OBJFILES = objs\MT_SOCK_Test.obj RESFILES = RESDEPEN = $(RESFILES) LIBFILES = ..\ace\aced.lib diff --git a/tests/Map_Manager_Test.bpr b/tests/Map_Manager_Test.bpr index c2b309e99ba..fb1c5de2b92 100644 --- a/tests/Map_Manager_Test.bpr +++ b/tests/Map_Manager_Test.bpr @@ -14,7 +14,7 @@ BCB = $(MAKEDIR)\.. VERSION = BCB.03 # --------------------------------------------------------------------------- PROJECT = Map_Manager_Test.exe -OBJFILES = obj\Map_Manager_Test.obj +OBJFILES = objs\Map_Manager_Test.obj RESFILES = RESDEPEN = $(RESFILES) LIBFILES = ..\ace\aced.lib diff --git a/tests/Mem_Map_Test.bpr b/tests/Mem_Map_Test.bpr index 1e33136417d..d346ac21888 100644 --- a/tests/Mem_Map_Test.bpr +++ b/tests/Mem_Map_Test.bpr @@ -14,7 +14,7 @@ BCB = $(MAKEDIR)\.. VERSION = BCB.03 # --------------------------------------------------------------------------- PROJECT = Mem_Map_Test.exe -OBJFILES = obj\Mem_Map_Test.obj +OBJFILES = objs\Mem_Map_Test.obj RESFILES = RESDEPEN = $(RESFILES) LIBFILES = ..\ace\aced.lib diff --git a/tests/Message_Block_Test.bpr b/tests/Message_Block_Test.bpr index df4954d5a60..ac203124fa8 100644 --- a/tests/Message_Block_Test.bpr +++ b/tests/Message_Block_Test.bpr @@ -14,7 +14,7 @@ BCB = $(MAKEDIR)\.. VERSION = BCB.03 # --------------------------------------------------------------------------- PROJECT = Message_Block_Test.exe -OBJFILES = obj\Message_Block_Test.obj +OBJFILES = objs\Message_Block_Test.obj RESFILES = RESDEPEN = $(RESFILES) LIBFILES = ..\ace\aced.lib diff --git a/tests/Message_Queue_Test.bpr b/tests/Message_Queue_Test.bpr index 517c10c27ea..46e7f95026d 100644 --- a/tests/Message_Queue_Test.bpr +++ b/tests/Message_Queue_Test.bpr @@ -14,7 +14,7 @@ BCB = $(MAKEDIR)\.. VERSION = BCB.03 # --------------------------------------------------------------------------- PROJECT = Message_Queue_Test.exe -OBJFILES = obj\Message_Queue_Test.obj +OBJFILES = objs\Message_Queue_Test.obj RESFILES = RESDEPEN = $(RESFILES) LIBFILES = ..\ace\aced.lib diff --git a/tests/MsgQueue_Notifications_Test.bpr b/tests/MsgQueue_Notifications_Test.bpr index 100986c9b15..7792b5e289d 100644 --- a/tests/MsgQueue_Notifications_Test.bpr +++ b/tests/MsgQueue_Notifications_Test.bpr @@ -14,7 +14,7 @@ BCB = $(MAKEDIR)\.. VERSION = BCB.03 # --------------------------------------------------------------------------- PROJECT = MsgQueue_Notifications_Test.exe -OBJFILES = obj\MsgQueue_Notifications_Test.obj +OBJFILES = objs\MsgQueue_Notifications_Test.obj RESFILES = RESDEPEN = $(RESFILES) LIBFILES = ..\ace\aced.lib diff --git a/tests/Naming_Test.bpr b/tests/Naming_Test.bpr index 45b3a992ff6..77ba28a0916 100644 --- a/tests/Naming_Test.bpr +++ b/tests/Naming_Test.bpr @@ -14,7 +14,7 @@ BCB = $(MAKEDIR)\.. VERSION = BCB.03 # --------------------------------------------------------------------------- PROJECT = Naming_Test.exe -OBJFILES = obj\Naming_Test.obj +OBJFILES = objs\Naming_Test.obj RESFILES = RESDEPEN = $(RESFILES) LIBFILES = ..\ace\aced.lib diff --git a/tests/Naming_Test.cpp b/tests/Naming_Test.cpp index 68b1fa484b6..ec61c5f39fa 100644 --- a/tests/Naming_Test.cpp +++ b/tests/Naming_Test.cpp @@ -179,7 +179,7 @@ main (int argc, char *argv[]) TCHAR temp_file [BUFSIZ]; ACE_START_TEST ("Naming_Test"); - ACE_Naming_Context *ns_context = 0; + ACE_Naming_Context *ns_context; ACE_NEW_RETURN (ns_context, ACE_Naming_Context, -1); ACE_Name_Options *name_options = ns_context->name_options (); diff --git a/tests/Notify_Performance_Test.bpr b/tests/Notify_Performance_Test.bpr index 7e09c8baeda..ba68871003c 100644 --- a/tests/Notify_Performance_Test.bpr +++ b/tests/Notify_Performance_Test.bpr @@ -14,7 +14,7 @@ BCB = $(MAKEDIR)\.. VERSION = BCB.03 # --------------------------------------------------------------------------- PROJECT = Notify_Performance_Test.exe -OBJFILES = obj\Notify_Performance_Test.obj +OBJFILES = objs\Notify_Performance_Test.obj RESFILES = RESDEPEN = $(RESFILES) LIBFILES = ..\ace\aced.lib diff --git a/tests/OrdMultiSet_Test.bpr b/tests/OrdMultiSet_Test.bpr index af46541807f..401ebfc3c6f 100644 --- a/tests/OrdMultiSet_Test.bpr +++ b/tests/OrdMultiSet_Test.bpr @@ -14,7 +14,7 @@ BCB = $(MAKEDIR)\.. VERSION = BCB.03 # --------------------------------------------------------------------------- PROJECT = OrdMultiSet_Test.exe -OBJFILES = obj\OrdMultiSet_Test.obj +OBJFILES = objs\OrdMultiSet_Test.obj RESFILES = RESDEPEN = $(RESFILES) LIBFILES = ..\ace\aced.lib diff --git a/tests/Pipe_Test.bpr b/tests/Pipe_Test.bpr index 26208ac8b86..4e66963d621 100644 --- a/tests/Pipe_Test.bpr +++ b/tests/Pipe_Test.bpr @@ -14,7 +14,7 @@ BCB = $(MAKEDIR)\.. VERSION = BCB.03 # --------------------------------------------------------------------------- PROJECT = Pipe_Test.exe -OBJFILES = obj\Pipe_Test.obj +OBJFILES = objs\Pipe_Test.obj RESFILES = RESDEPEN = $(RESFILES) LIBFILES = ..\ace\aced.lib diff --git a/tests/Priority_Buffer_Test.bpr b/tests/Priority_Buffer_Test.bpr index ffa352ed5a1..f62700b8586 100644 --- a/tests/Priority_Buffer_Test.bpr +++ b/tests/Priority_Buffer_Test.bpr @@ -14,7 +14,7 @@ BCB = $(MAKEDIR)\.. VERSION = BCB.03 # --------------------------------------------------------------------------- PROJECT = Priority_Buffer_Test.exe -OBJFILES = obj\Priority_Buffer_Test.obj +OBJFILES = objs\Priority_Buffer_Test.obj RESFILES = RESDEPEN = $(RESFILES) LIBFILES = ..\ace\aced.lib diff --git a/tests/Priority_Buffer_Test.cpp b/tests/Priority_Buffer_Test.cpp index 1a4b6a50456..f852db934fc 100644 --- a/tests/Priority_Buffer_Test.cpp +++ b/tests/Priority_Buffer_Test.cpp @@ -95,7 +95,7 @@ producer (void *args) { ACE_Message_Queue<ACE_MT_SYNCH> *msg_queue = (ACE_Message_Queue<ACE_MT_SYNCH> *) args; - ACE_Message_Block *mb = 0; + ACE_Message_Block *mb; for (char *c = ACE_ALPHABET; *c != '\0'; c++) { diff --git a/tests/Priority_Reactor_Test.bpr b/tests/Priority_Reactor_Test.bpr index 631c86df05c..9034417e64f 100644 --- a/tests/Priority_Reactor_Test.bpr +++ b/tests/Priority_Reactor_Test.bpr @@ -14,7 +14,7 @@ BCB = $(MAKEDIR)\.. VERSION = BCB.03 # --------------------------------------------------------------------------- PROJECT = Priority_Reactor_Test.exe -OBJFILES = obj\Priority_Reactor_Test.obj +OBJFILES = objs\Priority_Reactor_Test.obj RESFILES = RESDEPEN = $(RESFILES) LIBFILES = ..\ace\aced.lib diff --git a/tests/Priority_Task_Test.bpr b/tests/Priority_Task_Test.bpr index 017dd9ff409..b33850de2ef 100644 --- a/tests/Priority_Task_Test.bpr +++ b/tests/Priority_Task_Test.bpr @@ -14,7 +14,7 @@ BCB = $(MAKEDIR)\.. VERSION = BCB.03 # --------------------------------------------------------------------------- PROJECT = Priority_Task_Test.exe -OBJFILES = obj\Priority_Task_Test.obj +OBJFILES = objs\Priority_Task_Test.obj RESFILES = RESDEPEN = $(RESFILES) LIBFILES = ..\ace\aced.lib diff --git a/tests/Process_Mutex_Test.bpr b/tests/Process_Mutex_Test.bpr index 64714dc08db..c5df004a995 100644 --- a/tests/Process_Mutex_Test.bpr +++ b/tests/Process_Mutex_Test.bpr @@ -14,7 +14,7 @@ BCB = $(MAKEDIR)\.. VERSION = BCB.03 # --------------------------------------------------------------------------- PROJECT = Process_Mutex_Test.exe -OBJFILES = obj\Process_Mutex_Test.obj +OBJFILES = objs\Process_Mutex_Test.obj RESFILES = RESDEPEN = $(RESFILES) LIBFILES = ..\ace\aced.lib diff --git a/tests/Process_Strategy_Test.bpr b/tests/Process_Strategy_Test.bpr index 4ca6294183b..f895e9baaa1 100644 --- a/tests/Process_Strategy_Test.bpr +++ b/tests/Process_Strategy_Test.bpr @@ -14,7 +14,7 @@ BCB = $(MAKEDIR)\.. VERSION = BCB.03 # --------------------------------------------------------------------------- PROJECT = Process_Strategy_Test.exe -OBJFILES = obj\Process_Strategy_Test.obj +OBJFILES = objs\Process_Strategy_Test.obj RESFILES = RESDEPEN = $(RESFILES) LIBFILES = ..\ace\aced.lib diff --git a/tests/Reactor_Exceptions_Test.bpr b/tests/Reactor_Exceptions_Test.bpr index 4a6f6ac161a..996473f56c4 100644 --- a/tests/Reactor_Exceptions_Test.bpr +++ b/tests/Reactor_Exceptions_Test.bpr @@ -14,7 +14,7 @@ BCB = $(MAKEDIR)\.. VERSION = BCB.03 # --------------------------------------------------------------------------- PROJECT = Reactor_Exceptions_Test.exe -OBJFILES = obj\Reactor_Exceptions_Test.obj +OBJFILES = objs\Reactor_Exceptions_Test.obj RESFILES = RESDEPEN = $(RESFILES) LIBFILES = ..\ace\aced.lib diff --git a/tests/Reactor_Notify_Test.bpr b/tests/Reactor_Notify_Test.bpr index 32a70afd837..c92c8070ff5 100644 --- a/tests/Reactor_Notify_Test.bpr +++ b/tests/Reactor_Notify_Test.bpr @@ -14,7 +14,7 @@ BCB = $(MAKEDIR)\.. VERSION = BCB.03 # --------------------------------------------------------------------------- PROJECT = Reactor_Notify_Test.exe -OBJFILES = obj\Reactor_Notify_Test.obj +OBJFILES = objs\Reactor_Notify_Test.obj RESFILES = RESDEPEN = $(RESFILES) LIBFILES = ..\ace\aced.lib diff --git a/tests/Reactor_Performance_Test.bpr b/tests/Reactor_Performance_Test.bpr index 8e9a42efd88..a4c7e76c6b3 100644 --- a/tests/Reactor_Performance_Test.bpr +++ b/tests/Reactor_Performance_Test.bpr @@ -14,7 +14,7 @@ BCB = $(MAKEDIR)\.. VERSION = BCB.03 # --------------------------------------------------------------------------- PROJECT = Reactor_Performance_Test.exe -OBJFILES = obj\Reactor_Performance_Test.obj +OBJFILES = objs\Reactor_Performance_Test.obj RESFILES = RESDEPEN = $(RESFILES) LIBFILES = ..\ace\aced.lib diff --git a/tests/Reactor_Timer_Test.bpr b/tests/Reactor_Timer_Test.bpr index d9447e40631..c93f847366b 100644 --- a/tests/Reactor_Timer_Test.bpr +++ b/tests/Reactor_Timer_Test.bpr @@ -14,7 +14,7 @@ BCB = $(MAKEDIR)\.. VERSION = BCB.03 # --------------------------------------------------------------------------- PROJECT = Reactor_Timer_Test.exe -OBJFILES = obj\Reactor_Timer_Test.obj +OBJFILES = objs\Reactor_Timer_Test.obj RESFILES = RESDEPEN = $(RESFILES) LIBFILES = ..\ace\aced.lib diff --git a/tests/Reactors_Test.bpr b/tests/Reactors_Test.bpr index 7f0a5303b9d..9a0ed9a81c2 100644 --- a/tests/Reactors_Test.bpr +++ b/tests/Reactors_Test.bpr @@ -14,7 +14,7 @@ BCB = $(MAKEDIR)\.. VERSION = BCB.03 # --------------------------------------------------------------------------- PROJECT = Reactors_Test.exe -OBJFILES = obj\Reactors_Test.obj +OBJFILES = objs\Reactors_Test.obj RESFILES = RESDEPEN = $(RESFILES) LIBFILES = ..\ace\aced.lib diff --git a/tests/Reader_Writer_Test.bpr b/tests/Reader_Writer_Test.bpr index cc97a2217e9..b3fdb6e01f2 100644 --- a/tests/Reader_Writer_Test.bpr +++ b/tests/Reader_Writer_Test.bpr @@ -14,7 +14,7 @@ BCB = $(MAKEDIR)\.. VERSION = BCB.03 # --------------------------------------------------------------------------- PROJECT = Reader_Writer_Test.exe -OBJFILES = obj\Reader_Writer_Test.obj +OBJFILES = objs\Reader_Writer_Test.obj RESFILES = RESDEPEN = $(RESFILES) LIBFILES = ..\ace\aced.lib diff --git a/tests/Recursive_Mutex_Test.bpr b/tests/Recursive_Mutex_Test.bpr index 9f9304c52ab..a474eb051e4 100644 --- a/tests/Recursive_Mutex_Test.bpr +++ b/tests/Recursive_Mutex_Test.bpr @@ -14,7 +14,7 @@ BCB = $(MAKEDIR)\.. VERSION = BCB.03 # --------------------------------------------------------------------------- PROJECT = Recursive_Mutex_Test.exe -OBJFILES = obj\Recursive_Mutex_Test.obj +OBJFILES = objs\Recursive_Mutex_Test.obj RESFILES = RESDEPEN = $(RESFILES) LIBFILES = ..\ace\aced.lib diff --git a/tests/SOCK_Connector_Test.bpr b/tests/SOCK_Connector_Test.bpr index 232f0e62129..181fcf94b39 100644 --- a/tests/SOCK_Connector_Test.bpr +++ b/tests/SOCK_Connector_Test.bpr @@ -14,7 +14,7 @@ BCB = $(MAKEDIR)\.. VERSION = BCB.03 # --------------------------------------------------------------------------- PROJECT = SOCK_Connector_Test.exe -OBJFILES = obj\SOCK_Connector_Test.obj +OBJFILES = objs\SOCK_Connector_Test.obj RESFILES = RESDEPEN = $(RESFILES) LIBFILES = ..\ace\aced.lib diff --git a/tests/SOCK_Test.bpr b/tests/SOCK_Test.bpr index be8362df51a..8763a3c5110 100644 --- a/tests/SOCK_Test.bpr +++ b/tests/SOCK_Test.bpr @@ -14,7 +14,7 @@ BCB = $(MAKEDIR)\.. VERSION = BCB.03 # --------------------------------------------------------------------------- PROJECT = SOCK_Test.exe -OBJFILES = obj\SOCK_Test.obj +OBJFILES = objs\SOCK_Test.obj RESFILES = RESDEPEN = $(RESFILES) LIBFILES = ..\ace\aced.lib diff --git a/tests/SPIPE_Test.bpr b/tests/SPIPE_Test.bpr index 17b8ede662a..29635091d4b 100644 --- a/tests/SPIPE_Test.bpr +++ b/tests/SPIPE_Test.bpr @@ -14,7 +14,7 @@ BCB = $(MAKEDIR)\.. VERSION = BCB.03 # --------------------------------------------------------------------------- PROJECT = SPIPE_Test.exe -OBJFILES = obj\SPIPE_Test.obj +OBJFILES = objs\SPIPE_Test.obj RESFILES = RESDEPEN = $(RESFILES) LIBFILES = ..\ace\aced.lib diff --git a/tests/SString_Test.bpr b/tests/SString_Test.bpr index ec9adae102c..308fd5181a0 100644 --- a/tests/SString_Test.bpr +++ b/tests/SString_Test.bpr @@ -14,7 +14,7 @@ BCB = $(MAKEDIR)\.. VERSION = BCB.03 # --------------------------------------------------------------------------- PROJECT = SString_Test.exe -OBJFILES = obj\SString_Test.obj +OBJFILES = objs\SString_Test.obj RESFILES = RESDEPEN = $(RESFILES) LIBFILES = ..\ace\aced.lib diff --git a/tests/SV_Shared_Memory_Test.bpr b/tests/SV_Shared_Memory_Test.bpr index 9349f7256be..37ed9effcbb 100644 --- a/tests/SV_Shared_Memory_Test.bpr +++ b/tests/SV_Shared_Memory_Test.bpr @@ -14,7 +14,7 @@ BCB = $(MAKEDIR)\.. VERSION = BCB.03 # --------------------------------------------------------------------------- PROJECT = SV_Shared_Memory_Test.exe -OBJFILES = obj\SV_Shared_Memory_Test.obj +OBJFILES = objs\SV_Shared_Memory_Test.obj RESFILES = RESDEPEN = $(RESFILES) LIBFILES = ..\ace\aced.lib diff --git a/tests/Semaphore_Test.bpr b/tests/Semaphore_Test.bpr index 5f2b7c42cef..829bdedb6e0 100644 --- a/tests/Semaphore_Test.bpr +++ b/tests/Semaphore_Test.bpr @@ -14,7 +14,7 @@ BCB = $(MAKEDIR)\.. VERSION = BCB.03 # --------------------------------------------------------------------------- PROJECT = Semaphore_Test.exe -OBJFILES = obj\Semaphore_Test.obj +OBJFILES = objs\Semaphore_Test.obj RESFILES = RESDEPEN = $(RESFILES) LIBFILES = ..\ace\aced.lib diff --git a/tests/Service_Config_Test.bpr b/tests/Service_Config_Test.bpr index ccd4fe76183..11dc793ef39 100644 --- a/tests/Service_Config_Test.bpr +++ b/tests/Service_Config_Test.bpr @@ -14,7 +14,7 @@ BCB = $(MAKEDIR)\.. VERSION = BCB.03 # --------------------------------------------------------------------------- PROJECT = Service_Config_Test.exe -OBJFILES = obj\Service_Config_Test.obj +OBJFILES = objs\Service_Config_Test.obj RESFILES = RESDEPEN = $(RESFILES) LIBFILES = ..\ace\aced.lib diff --git a/tests/Sigset_Ops_Test.bpr b/tests/Sigset_Ops_Test.bpr index c10dd0df3c1..3d31cf4fb60 100644 --- a/tests/Sigset_Ops_Test.bpr +++ b/tests/Sigset_Ops_Test.bpr @@ -14,7 +14,7 @@ BCB = $(MAKEDIR)\.. VERSION = BCB.03 # --------------------------------------------------------------------------- PROJECT = Sigset_Ops_Test.exe -OBJFILES = obj\Sigset_Ops_Test.obj +OBJFILES = objs\Sigset_Ops_Test.obj RESFILES = RESDEPEN = $(RESFILES) LIBFILES = ..\ace\aced.lib diff --git a/tests/Simple_Message_Block_Test.bpr b/tests/Simple_Message_Block_Test.bpr index 37a92a26e1f..12e9d75fc12 100644 --- a/tests/Simple_Message_Block_Test.bpr +++ b/tests/Simple_Message_Block_Test.bpr @@ -14,7 +14,7 @@ BCB = $(MAKEDIR)\.. VERSION = BCB.03 # --------------------------------------------------------------------------- PROJECT = Simple_Message_Block_Test.exe -OBJFILES = obj\Simple_Message_Block_Test.obj +OBJFILES = objs\Simple_Message_Block_Test.obj RESFILES = RESDEPEN = $(RESFILES) LIBFILES = ..\ace\aced.lib diff --git a/tests/TSS_Test.bpr b/tests/TSS_Test.bpr index 3f0c7be7560..e811d8a650c 100644 --- a/tests/TSS_Test.bpr +++ b/tests/TSS_Test.bpr @@ -14,7 +14,7 @@ BCB = $(MAKEDIR)\.. VERSION = BCB.03 # --------------------------------------------------------------------------- PROJECT = TSS_Test.exe -OBJFILES = obj\TSS_Test.obj +OBJFILES = objs\TSS_Test.obj RESFILES = RESDEPEN = $(RESFILES) LIBFILES = ..\ace\aced.lib diff --git a/tests/Task_Test.bpr b/tests/Task_Test.bpr index afc9e21113e..57d0a4ba97a 100644 --- a/tests/Task_Test.bpr +++ b/tests/Task_Test.bpr @@ -14,7 +14,7 @@ BCB = $(MAKEDIR)\.. VERSION = BCB.03 # --------------------------------------------------------------------------- PROJECT = Task_Test.exe -OBJFILES = obj\Task_Test.obj +OBJFILES = objs\Task_Test.obj RESFILES = RESDEPEN = $(RESFILES) LIBFILES = ..\ace\aced.lib diff --git a/tests/Thread_Manager_Test.bpr b/tests/Thread_Manager_Test.bpr index 9346b4d2edc..d01c42d3247 100644 --- a/tests/Thread_Manager_Test.bpr +++ b/tests/Thread_Manager_Test.bpr @@ -14,7 +14,7 @@ BCB = $(MAKEDIR)\.. VERSION = BCB.03 # --------------------------------------------------------------------------- PROJECT = Thread_Manager_Test.exe -OBJFILES = obj\Thread_Manager_Test.obj +OBJFILES = objs\Thread_Manager_Test.obj RESFILES = RESDEPEN = $(RESFILES) LIBFILES = ..\ace\aced.lib diff --git a/tests/Thread_Mutex_Test.bpr b/tests/Thread_Mutex_Test.bpr index 15aa43311f7..467da61d732 100644 --- a/tests/Thread_Mutex_Test.bpr +++ b/tests/Thread_Mutex_Test.bpr @@ -14,7 +14,7 @@ BCB = $(MAKEDIR)\.. VERSION = BCB.03 # --------------------------------------------------------------------------- PROJECT = Thread_Mutex_Test.exe -OBJFILES = obj\Thread_Mutex_Test.obj +OBJFILES = objs\Thread_Mutex_Test.obj RESFILES = RESDEPEN = $(RESFILES) LIBFILES = ..\ace\aced.lib diff --git a/tests/Thread_Pool_Test.bpr b/tests/Thread_Pool_Test.bpr index 1e40616f8ae..2d4160ff267 100644 --- a/tests/Thread_Pool_Test.bpr +++ b/tests/Thread_Pool_Test.bpr @@ -14,7 +14,7 @@ BCB = $(MAKEDIR)\.. VERSION = BCB.03 # --------------------------------------------------------------------------- PROJECT = Thread_Pool_Test.exe -OBJFILES = obj\Thread_Pool_Test.obj +OBJFILES = objs\Thread_Pool_Test.obj RESFILES = RESDEPEN = $(RESFILES) LIBFILES = ..\ace\aced.lib diff --git a/tests/Thread_Pool_Test.cpp b/tests/Thread_Pool_Test.cpp index a2c5fa3f205..e1a44ecd0a5 100644 --- a/tests/Thread_Pool_Test.cpp +++ b/tests/Thread_Pool_Test.cpp @@ -144,7 +144,7 @@ Thread_Pool::open (void *) for (size_t count = 0; count < n_iterations; count++) { - ACE_Message_Block *mb = 0; + ACE_Message_Block *mb; // Allocate a new message. ACE_NEW_RETURN (mb, @@ -173,7 +173,7 @@ Thread_Pool::open (void *) this->thr_count ())); this->dump (); - ACE_Message_Block *mb = 0; + ACE_Message_Block *mb; ACE_NEW_RETURN (mb, ACE_Message_Block (0, ACE_Message_Block::MB_DATA, diff --git a/tests/Time_Service_Test.bpr b/tests/Time_Service_Test.bpr index c5d5acebd98..d7a283344df 100644 --- a/tests/Time_Service_Test.bpr +++ b/tests/Time_Service_Test.bpr @@ -14,7 +14,7 @@ BCB = $(MAKEDIR)\.. VERSION = BCB.03 # --------------------------------------------------------------------------- PROJECT = Time_Service_Test.exe -OBJFILES = obj\Time_Service_Test.obj +OBJFILES = objs\Time_Service_Test.obj RESFILES = RESDEPEN = $(RESFILES) LIBFILES = ..\ace\aced.lib diff --git a/tests/Time_Value_Test.bpr b/tests/Time_Value_Test.bpr index 357360df3f4..1832f6af3f9 100644 --- a/tests/Time_Value_Test.bpr +++ b/tests/Time_Value_Test.bpr @@ -14,7 +14,7 @@ BCB = $(MAKEDIR)\.. VERSION = BCB.03 # --------------------------------------------------------------------------- PROJECT = Time_Value_Test.exe -OBJFILES = obj\Time_Value_Test.obj +OBJFILES = objs\Time_Value_Test.obj RESFILES = RESDEPEN = $(RESFILES) LIBFILES = ..\ace\aced.lib diff --git a/tests/Timeprobe_Test.bpr b/tests/Timeprobe_Test.bpr new file mode 100644 index 00000000000..f47d0b9e6f7 --- /dev/null +++ b/tests/Timeprobe_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = Timeprobe_Test.exe +OBJFILES = objs\Timeprobe_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/Timer_Queue_Test.bpr b/tests/Timer_Queue_Test.bpr index 5a818b7de98..9470aefc357 100644 --- a/tests/Timer_Queue_Test.bpr +++ b/tests/Timer_Queue_Test.bpr @@ -14,7 +14,7 @@ BCB = $(MAKEDIR)\.. VERSION = BCB.03 # --------------------------------------------------------------------------- PROJECT = Timer_Queue_Test.exe -OBJFILES = obj\Timer_Queue_Test.obj +OBJFILES = objs\Timer_Queue_Test.obj RESFILES = RESDEPEN = $(RESFILES) LIBFILES = ..\ace\aced.lib diff --git a/tests/Tokens_Test.bpr b/tests/Tokens_Test.bpr index 6cb544e94ae..c2ea1b68935 100644 --- a/tests/Tokens_Test.bpr +++ b/tests/Tokens_Test.bpr @@ -14,7 +14,7 @@ BCB = $(MAKEDIR)\.. VERSION = BCB.03 # --------------------------------------------------------------------------- PROJECT = Tokens_Test.exe -OBJFILES = obj\Tokens_Test.obj +OBJFILES = objs\Tokens_Test.obj RESFILES = RESDEPEN = $(RESFILES) LIBFILES = ..\ace\aced.lib diff --git a/tests/UPIPE_SAP_Test.bpr b/tests/UPIPE_SAP_Test.bpr index 71d93dc41b0..b8668f7d04f 100644 --- a/tests/UPIPE_SAP_Test.bpr +++ b/tests/UPIPE_SAP_Test.bpr @@ -14,7 +14,7 @@ BCB = $(MAKEDIR)\.. VERSION = BCB.03 # --------------------------------------------------------------------------- PROJECT = UPIPE_SAP_Test.exe -OBJFILES = obj\UPIPE_SAP_Test.obj +OBJFILES = objs\UPIPE_SAP_Test.obj RESFILES = RESDEPEN = $(RESFILES) LIBFILES = ..\ace\aced.lib diff --git a/tests/Upgradable_RW_Test.bpr b/tests/Upgradable_RW_Test.bpr new file mode 100644 index 00000000000..8bbc99e6898 --- /dev/null +++ b/tests/Upgradable_RW_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = Upgradable_RW_Test.exe +OBJFILES = objs\Upgradable_RW_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/XtReactor_Test.bpr b/tests/XtReactor_Test.bpr new file mode 100644 index 00000000000..7ac903df2f9 --- /dev/null +++ b/tests/XtReactor_Test.bpr @@ -0,0 +1,177 @@ +# --------------------------------------------------------------------------- +!if !$d(BCB) +BCB = $(MAKEDIR)\.. +!endif + +# --------------------------------------------------------------------------- +# IDE SECTION +# --------------------------------------------------------------------------- +# The following section of the project makefile is managed by the BCB IDE. +# It is recommended to use the IDE to change any of the values in this +# section. +# --------------------------------------------------------------------------- + +VERSION = BCB.03 +# --------------------------------------------------------------------------- +PROJECT = XtReactor_Test.exe +OBJFILES = objs\XtReactor_Test.obj +RESFILES = +RESDEPEN = $(RESFILES) +LIBFILES = ..\ace\aced.lib +LIBRARIES = +SPARELIBS = +PACKAGES = VCLX35.bpi VCL35.bpi VCLDB35.bpi VCLDBX35.bpi bcbsmp35.bpi dclocx35.bpi \ + QRPT35.bpi TEEUI35.bpi TEEDB35.bpi TEE35.bpi ibsmp35.bpi NMFAST35.bpi \ + INETDB35.bpi INET35.bpi +DEFFILE = +# --------------------------------------------------------------------------- +PATHCPP = .; +PATHASM = .; +PATHPAS = .; +PATHRC = .; +DEBUGLIBPATH = $(BCB)\lib\debug +RELEASELIBPATH = $(BCB)\lib\release +# --------------------------------------------------------------------------- +CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC +CFLAG2 = -D_NO_VCL -I..;$(BCB)\include +CFLAG3 = -w-rvl -Tkh30000 +PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \ + -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M +RFLAGS = -D_NO_VCL -i..;$(BCB)\include +AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd +LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v +IFLAGS = +# --------------------------------------------------------------------------- +ALLOBJ = c0x32.obj $(OBJFILES) +ALLRES = $(RESFILES) +ALLLIB = $(LIBFILES) import32.lib cw32mt.lib +# --------------------------------------------------------------------------- +!ifdef IDEOPTIONS + +[Version Info] +IncludeVerInfo=0 +AutoIncBuild=0 +MajorVer=1 +MinorVer=0 +Release=0 +Build=0 +Debug=0 +PreRelease=0 +Special=0 +Private=0 +DLL=0 +Locale=1033 +CodePage=1252 + +[Version Info Keys] +CompanyName= +FileDescription=Executable (Console) +FileVersion=1.0.0.0 +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion=1.0.0.0 +Comments= + +[HistoryLists\hlIncludePath] +Count=2 +Item0=..;$(BCB)\include +Item1=$(ACE_ROOT);$(BCB)\include + +[HistoryLists\hlLibraryPath] +Count=1 +Item0=$(BCB)\lib + +[HistoryLists\hlConditionals] +Count=1 +Item0=_NO_VCL + +[HistoryLists\hlIntOutputDir] +Count=1 +Item0=obj + +[Debugging] +DebugSourceDirs= + +[Parameters] +RunParams= +HostApplication= + +!endif + +# --------------------------------------------------------------------------- +# MAKE SECTION +# --------------------------------------------------------------------------- +# This section of the project file is not used by the BCB IDE. It is for +# the benefit of building from the command-line using the MAKE utility. +# --------------------------------------------------------------------------- + +.autodepend +# --------------------------------------------------------------------------- +!if !$d(BCC32) +BCC32 = bcc32 +!endif + +!if !$d(DCC32) +DCC32 = dcc32 +!endif + +!if !$d(TASM32) +TASM32 = tasm32 +!endif + +!if !$d(LINKER) +LINKER = ilink32 +!endif + +!if !$d(BRCC32) +BRCC32 = brcc32 +!endif +# --------------------------------------------------------------------------- +!if $d(PATHCPP) +.PATH.CPP = $(PATHCPP) +.PATH.C = $(PATHCPP) +!endif + +!if $d(PATHPAS) +.PATH.PAS = $(PATHPAS) +!endif + +!if $d(PATHASM) +.PATH.ASM = $(PATHASM) +!endif + +!if $d(PATHRC) +.PATH.RC = $(PATHRC) +!endif +# --------------------------------------------------------------------------- +$(PROJECT): $(OBJFILES) $(RESDEPEN) $(DEFFILE) + $(BCB)\BIN\$(LINKER) @&&! + $(LFLAGS) + + $(ALLOBJ), + + $(PROJECT),, + + $(ALLLIB), + + $(DEFFILE), + + $(ALLRES) +! +# --------------------------------------------------------------------------- +.pas.hpp: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.pas.obj: + $(BCB)\BIN\$(DCC32) $(PFLAGS) {$< } + +.cpp.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.c.obj: + $(BCB)\BIN\$(BCC32) $(CFLAG1) $(CFLAG2) $(CFLAG3) -n$(@D) {$< } + +.asm.obj: + $(BCB)\BIN\$(TASM32) $(AFLAGS) $<, $@ + +.rc.res: + $(BCB)\BIN\$(BRCC32) $(RFLAGS) -fo$@ $< +# --------------------------------------------------------------------------- diff --git a/tests/tests.bpg b/tests/tests.bpg index 628e9bdc754..70087c4843c 100644 --- a/tests/tests.bpg +++ b/tests/tests.bpg @@ -10,7 +10,7 @@ DCC = $(ROOT)\bin\dcc32.exe $** BRCC = $(ROOT)\bin\brcc32.exe $** #------------------------------------------------------------------------------ PROJECTS = Aio_Platform_Test Atomic_Op_Test Barrier_Test Basic_Types_Test \ - Buffer_Stream_Test Conn_Test Enum_Interfaces_Test Env_Value_Test Future_Test \ + Buffer_Stream_Test Conn_Test Dynamic_Priority_Test Enum_Interfaces_Test Env_Value_Test Future_Test \ Handle_Set_Test Hash_Map_Manager_Test Map_Manager_Test MM_Shared_Memory_Test \ MT_Reactor_Timer_Test MT_SOCK_Test Mem_Map_Test Message_Block_Test \ MsgQueue_Notifications_Test Message_Queue_Test Naming_Test \ @@ -21,8 +21,8 @@ PROJECTS = Aio_Platform_Test Atomic_Op_Test Barrier_Test Basic_Types_Test \ Recursive_Mutex_Test SOCK_Connector_Test SOCK_Test SPIPE_Test SString_Test \ SV_Shared_Memory_Test Semaphore_Test Service_Config_Test Sigset_Ops_Test \ Simple_Message_Block_Test TSS_Test Task_Test Thread_Manager_Test \ - Thread_Mutex_Test Thread_Pool_Test Time_Service_Test Time_Value_Test \ - Timer_Queue_Test Tokens_Test UPIPE_SAP_Test + Thread_Mutex_Test Thread_Pool_Test Timeprobe_Test Time_Service_Test Time_Value_Test \ + Timer_Queue_Test Tokens_Test Upgradable_RW_Test UPIPE_SAP_Test XtReactor_Test #------------------------------------------------------------------------------ default: $(PROJECTS) #------------------------------------------------------------------------------ @@ -45,6 +45,9 @@ Buffer_Stream_Test: Buffer_Stream_Test.bpr Conn_Test: Conn_Test.bpr $(MAKE) +Dynamic_Priority_Test: Dynamic_Priority_Test.bpr + $(MAKE) + Enum_Interfaces_Test: Enum_Interfaces_Test.bpr $(MAKE) @@ -174,6 +177,9 @@ Thread_Mutex_Test: Thread_Mutex_Test.bpr Thread_Pool_Test: Thread_Pool_Test.bpr $(MAKE) +Timeprobe_Test: Timeprobe_Test.bpr + $(MAKE) + Time_Service_Test: Time_Service_Test.bpr $(MAKE) @@ -186,5 +192,11 @@ Timer_Queue_Test: Timer_Queue_Test.bpr Tokens_Test: Tokens_Test.bpr $(MAKE) +Upgradable_RW_Test: Upgradable_RW_Test.bpr + $(MAKE) + UPIPE_SAP_Test: UPIPE_SAP_Test.bpr $(MAKE) + +XtReactor_Test: XtReactor_Test.bpr + $(MAKE) diff --git a/tests/tests_bcc.ide b/tests/tests_bcc.ide Binary files differindex c607a1b025d..247e8d70872 100644 --- a/tests/tests_bcc.ide +++ b/tests/tests_bcc.ide |