diff options
| author | Steve Huston <shuston@riverace.com> | 2012-05-24 15:06:21 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2012-05-24 15:06:21 +0000 |
| commit | 9614a67e85070ed793a65ba86d84c7804a1889fc (patch) | |
| tree | 35501c89efc5eed5506574916165425f2adc92a8 | |
| parent | e1a4f61140a253c8183f9212ae231c3737f38026 (diff) | |
| download | ATCD-9614a67e85070ed793a65ba86d84c7804a1889fc.tar.gz | |
ChangeLogTag:Thu May 24 14:35:04 UTC 2012 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ACE/ChangeLog | 9 | ||||
| -rw-r--r-- | ACE/THANKS | 1 | ||||
| -rw-r--r-- | ACE/ace/Cache_Map_Manager_T.cpp | 2 | ||||
| -rw-r--r-- | ACE/tests/Cache_Map_Manager_Test.cpp | 6 |
4 files changed, 16 insertions, 2 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 1aa4c696f6f..25591991538 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,12 @@ +Thu May 24 14:35:04 UTC 2012 Steve Huston <shuston@riverace.com> + + * ace/Cache_Map_Manager_T.cpp (find): Remove extraneous () from + 'second' - leftover from ACE_Pair days. + + * tests/Cache_Map_Manager_Test.cpp: Add call to the above method. + + * THANKS: Thanks to Milind Pangarkar for the above test, and fix. + Thu May 24 07:58:53 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> * ace/High_Res_Timer.h: diff --git a/ACE/THANKS b/ACE/THANKS index 7a509143eca..1267a0594bb 100644 --- a/ACE/THANKS +++ b/ACE/THANKS @@ -2367,6 +2367,7 @@ Andreas Dröscher <ace at anticat dot ch> Markus Manck <Markus dot Manck at Philotech dot de> Deux deVille <dev2 at weitling dot net> Mohsin Zaidi <mohsinrzaidi at gmail dot com> +Milind Pangarkar <Milind dot Pangarkar at amdocs dot com> I would particularly like to thank Paul Stephenson, who worked with me at Ericsson in the early 1990's. Paul devised the recursive Makefile diff --git a/ACE/ace/Cache_Map_Manager_T.cpp b/ACE/ace/Cache_Map_Manager_T.cpp index fa9caf53041..cd041afc75d 100644 --- a/ACE/ace/Cache_Map_Manager_T.cpp +++ b/ACE/ace/Cache_Map_Manager_T.cpp @@ -320,7 +320,7 @@ ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMP { int result = this->caching_strategy_.notify_find (find_result, - cache_value.second ()); + cache_value.second); // Unless the find and notification operations go thru, this // method is not successful. diff --git a/ACE/tests/Cache_Map_Manager_Test.cpp b/ACE/tests/Cache_Map_Manager_Test.cpp index 7953a125251..e66b590ddd5 100644 --- a/ACE/tests/Cache_Map_Manager_Test.cpp +++ b/ACE/tests/Cache_Map_Manager_Test.cpp @@ -238,13 +238,17 @@ find_test_cache (MAP_CACHE &cache) { VALUE j = 0; int result = cache.find (lookup_array[i], j); - + result = cache.find (lookup_array[i]); ACE_TEST_ASSERT (result != -1); ACE_TEST_ASSERT (j == lookup_array[i]); if (debug) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%d "), j)); + // Once more, with only the key. Test Bugzilla #4029. + result = cache.find (lookup_array[i]); + ACE_TEST_ASSERT (result != -1); + ACE_UNUSED_ARG (result); } |