diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-05-17 16:33:39 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-05-17 16:33:39 +0000 |
| commit | b7ea886326e3fa9e67527754937e6c0c12187d11 (patch) | |
| tree | bfbbf43cce8b65ee72e87ed64b16c100774f69cb | |
| parent | d2b0a58b9bb76ad573decb171d0afe915bc4a325 (diff) | |
| download | ATCD-b7ea886326e3fa9e67527754937e6c0c12187d11.tar.gz | |
ChangeLogTag:Tue May 17 09:32:01 2005 Ossama Othman <ossama@dre.vanderbilt.edu>
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | tests/Collection_Test.cpp | 7 |
2 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 1d688a77e83..4b13b10f670 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Tue May 17 09:32:01 2005 Ossama Othman <ossama@dre.vanderbilt.edu> + + * tests/Collection_Test.cpp: + + Avoid casting between a pointer to a function a pointer to an + object. ISO C++ forbids such casts. Fixes a g++ 4.0 warning. + Tue May 17 07:50:07 2005 Justin Michel <michel_j@ociweb.com> * ace/Cache_Map_Manager_T.cpp: @@ -46,7 +53,6 @@ Tue May 17 07:50:07 2005 Justin Michel <michel_j@ociweb.com> Add missing "using std::ios_base". - Mon May 16 21:39:30 2005 Ossama Othman <ossama@dre.vanderbilt.edu> * ace/Ping_Socket.h (Ping_Socket): diff --git a/tests/Collection_Test.cpp b/tests/Collection_Test.cpp index e216ab1d3c0..0d723c3c47c 100644 --- a/tests/Collection_Test.cpp +++ b/tests/Collection_Test.cpp @@ -66,7 +66,10 @@ void iterate_const(const UNBOUNDED_SET& set) } } -int dummyfunc() { return 0; } +struct DummyFunctor +{ + int operator() (void) { return 0; } +}; int run_main (int, ACE_TCHAR *[]) @@ -74,6 +77,8 @@ run_main (int, ACE_TCHAR *[]) ACE_START_TEST (ACE_TEXT ("Collection_Test")); deletion_func NO_DFUNC = (deletion_func)0; + DummyFunctor dummyfunc; + { UNBOUNDED_SET unbounded_set; |