diff options
| author | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-06-11 12:40:35 +0000 |
|---|---|---|
| committer | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-06-11 12:40:35 +0000 |
| commit | 02cc01dfbf0288c54325056784ebf9ac9682a052 (patch) | |
| tree | d66b73572f49d3368cb3c73a43cf02838b45b70f | |
| parent | fd84debb427c78736666051cda5fdb77fbd6c0ef (diff) | |
| download | ATCD-02cc01dfbf0288c54325056784ebf9ac9682a052.tar.gz | |
ChangeLogTag: Mon Jun 11 12:40:00 UTC 2007 Simon Massey <sma@prismtech.com>
| -rw-r--r-- | ACE/ChangeLog | 7 | ||||
| -rw-r--r-- | ACE/ace/MMAP_Memory_Pool.cpp | 5 | ||||
| -rw-r--r-- | ACE/tests/run_test.lst | 2 |
3 files changed, 12 insertions, 2 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index de999de3ecd..f15e40c3030 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,10 @@ +Mon Jun 11 12:40:00 UTC 2007 Simon Massey <sma@prismtech.com> + + * ace/MMAP_Memory_Pool.cpp: + * tests/run_test.lst: + + Fix problem in Lynxos and re-enable Test. + Fri Jun 08 08:38:00 UTC 2007 Simon Massey <sma@prismtech.com> * include/makeinclude/platform_hpux_aCC.GNU: diff --git a/ACE/ace/MMAP_Memory_Pool.cpp b/ACE/ace/MMAP_Memory_Pool.cpp index 020468f0936..7959b091906 100644 --- a/ACE/ace/MMAP_Memory_Pool.cpp +++ b/ACE/ace/MMAP_Memory_Pool.cpp @@ -210,6 +210,9 @@ ACE_MMAP_Memory_Pool::commit_backing_store_name (size_t rounded_bytes, { ACE_TRACE ("ACE_MMAP_Memory_Pool::commit_backing_store_name"); +#if defined (__Lynx__) + map_size = rounded_bytes; +#else size_t seek_len; if (this->write_each_page_) @@ -250,7 +253,7 @@ ACE_MMAP_Memory_Pool::commit_backing_store_name (size_t rounded_bytes, // Increment by one to put us at the beginning of the next chunk... ++map_size; - +#endif /* __Lynx__ */ return 0; } diff --git a/ACE/tests/run_test.lst b/ACE/tests/run_test.lst index cd626ab9346..ad885129867 100644 --- a/ACE/tests/run_test.lst +++ b/ACE/tests/run_test.lst @@ -25,7 +25,7 @@ Atomic_Op_Test Auto_Event_Test Auto_IncDec_Test: !DISABLE_ToFix_LynxOS_PPC Barrier_Test: !DISABLE_ToFix_LynxOS_PPC -Based_Pointer_Test: !DISABLE_ToFix_LynxOS_PPC !STATIC !VxWorks !ACE_FOR_TAO !PHARLAP +Based_Pointer_Test: !STATIC !VxWorks !ACE_FOR_TAO !PHARLAP Basic_Types_Test Bound_Ptr_Test: !DISABLE_ToFix_LynxOS_PPC !ACE_FOR_TAO Buffer_Stream_Test: !DISABLE_ToFix_LynxOS_PPC |