diff options
| author | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-08-04 15:18:06 +0000 |
|---|---|---|
| committer | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-08-04 15:18:06 +0000 |
| commit | 3e3ec039b7cc980c7419d3b3b419e6e0721aca87 (patch) | |
| tree | c83ae43cfb21a384779c57f46eed6325c5b60440 | |
| parent | 98edb737caee88b17c9e39760397a523a3a1939c (diff) | |
| download | ATCD-3e3ec039b7cc980c7419d3b3b419e6e0721aca87.tar.gz | |
ChangeLogTag: Thu Aug 4 16:10:24 BST 2005 Donald Sharp <Donald.Sharp@prismtech.com>
| -rw-r--r-- | ChangeLog | 15 | ||||
| -rw-r--r-- | tests/Array_Map_Test.cpp | 18 |
2 files changed, 25 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index 9ab89623489..e7a23d50a0b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Thu Aug 4 16:10:24 BST 2005 Donald Sharp <Donald.Sharp@prismtech.com> + + * tests/Array_Map_Test.cpp: + Some compilers, like SunCC5.5 on Solaris, do not delete their + temporaries in expression scope. Placing the expressions in an + inner block ensures that the reference count is as expected + Wed Aug 03 09:35:12 UTC 2005 Martin Corino <mcorino@remedy.nl> * tests/Process_Manual_Event_Test.cpp: @@ -270,14 +277,14 @@ Tue Jul 19 10:28:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> Mon Jul 18 18:21:20 2005 Steve Huston <shuston@riverace.com> - * NEWS: Added ACE_OS::closesocket() and Solaris 10 notes. + * NEWS: Added ACE_OS::closesocket() and Solaris 10 notes. Mon Jul 18 12:11:39 2005 J.T. Conklin <jtc@acorntoolworks.com> - * bin/msvc_static_order.lst: + * bin/msvc_static_order.lst: - Add CosNaming_IDL, CosTrading_IDL, and CosNotification_IDL - projects to list. + Add CosNaming_IDL, CosTrading_IDL, and CosNotification_IDL + projects to list. Mon Jul 18 11:42:09 2005 Chad Elliott <elliott_c@ociweb.com> diff --git a/tests/Array_Map_Test.cpp b/tests/Array_Map_Test.cpp index 2a2e17dcf60..7516608feb1 100644 --- a/tests/Array_Map_Test.cpp +++ b/tests/Array_Map_Test.cpp @@ -419,13 +419,23 @@ reference_count_test (void) ACE_ASSERT (counted.refcount () == 2); - map.insert (std::make_pair (ACE_TString (ACE_TEXT ("Two")), - counted)); + { + // enter a new scope block to assure destruction of temporaries + // on systems like Solaris + + map.insert (std::make_pair (ACE_TString (ACE_TEXT ("Two")), + counted)); + } ACE_ASSERT (counted.refcount () == 3); - map.insert (std::make_pair (ACE_TString (ACE_TEXT ("Three")), - counted)); + { + // enter a new scope block to assure destruction of temporaries + // on systems like Solaris + + map.insert (std::make_pair (ACE_TString (ACE_TEXT ("Three")), + counted)); + } ACE_ASSERT (counted.refcount () == 4); |