diff options
| -rw-r--r-- | ACE/ChangeLog | 37 | ||||
| -rw-r--r-- | ACE/ace/config-win64.h | 3 | ||||
| -rwxr-xr-x | ACE/bin/fuzz.pl | 10 | ||||
| -rw-r--r-- | ACE/examples/APG/Timers/PCB.cpp | 2 |
4 files changed, 38 insertions, 14 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index dbe2eaacf82..a3609bd3c9c 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,16 @@ +Sat Jul 23 22:37:24 UTC 2011 Phil Mesnier <mesnier_p@ociweb.com> + + * ace/config-win64.h: + * examples/APG/Timers/PCB.cpp: + + Fuzz fixes. + + * bin/fuzz.pl: + + Enhanced the check for ACE_TRACE messages so that it works + correctly with class definitions such as those found in + examples/APG/ThreadPools/Futures.cpp. + Fri Jul 22 12:29:59 UTC 2011 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> * ace/Malloc_T.cpp: Fixed ACE_Dynamic_Cached_Allocator so that it @@ -22,9 +35,9 @@ Mon Jul 18 11:44:16 UTC 2011 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> Mon Jul 11 00:39:05 UTC 2011 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> - * examples/APG/ThreadPools/Futures.cpp (class Manager): - * examples/APG/Containers/Stacks.cpp (StackExample::run): - * examples/APG/Containers/Allocator.cpp (StackExample::run): + * examples/APG/ThreadPools/Futures.cpp (class Manager): + * examples/APG/Containers/Stacks.cpp (StackExample::run): + * examples/APG/Containers/Allocator.cpp (StackExample::run): * examples/APG/Timers/PCB.cpp (PCB::handleClose): Fixed a mismatch in ACE_TRACE. Sat Jul 9 19:07:20 UTC 2011 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> @@ -71,20 +84,20 @@ Sat Jul 9 19:07:20 UTC 2011 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> netsvcs/lib/TS_Clerk_Handler.cpp, netsvcs/lib/TS_Server_Handler.cpp, tests/Bug_3878_Regression_Test.cpp, - tests/Thread_Timer_Queue_Adapter_Test.cpp: Fixed all the + tests/Thread_Timer_Queue_Adapter_Test.cpp: Fixed all the ACE_TRACE statements similar to - - ACE_TRACE( ACE_TEXT( "sometext" ) ); - + + ACE_TRACE( ACE_TEXT( "sometext" ) ); + and - + ACE_TRACE( "some" - "text" ); - + "text" ); + to - + ACE_TRACE( "sometext" ); - + Thanks to Espen Harlinn <espen at harlinn dot no> for this fix, which fixes bugid 3976. diff --git a/ACE/ace/config-win64.h b/ACE/ace/config-win64.h index 7899612052d..e63792b09e6 100644 --- a/ACE/ace/config-win64.h +++ b/ACE/ace/config-win64.h @@ -1,2 +1,5 @@ +/* -*- C++ -*- */ +// $Id$ + // This is all we need to do to build ACE on a 64-bit Windows platform! #include "config-win32.h" diff --git a/ACE/bin/fuzz.pl b/ACE/bin/fuzz.pl index f4128b2bb09..3b1187e78db 100755 --- a/ACE/bin/fuzz.pl +++ b/ACE/bin/fuzz.pl @@ -1708,6 +1708,14 @@ sub check_for_bad_ace_trace() $class = ""; $function = $1; } + elsif (m/^class (.*)\s*:/) { + $class = $1; + $function = ""; + } + elsif (m/^class (.*)\s*$/) { + $class = $1; + $function = ""; + } # print "TRACE_CHECK. Class = $class\n"; @@ -1722,7 +1730,7 @@ sub check_for_bad_ace_trace() # reduce the classname if ($class =~ m/([^\s][^\<^\s]*)\s*\</) { $class = $1; - } + } # print "TRACE_CHECK. Found a trace. Class = $class\n"; diff --git a/ACE/examples/APG/Timers/PCB.cpp b/ACE/examples/APG/Timers/PCB.cpp index 0d4dcad3dff..19b0a534097 100644 --- a/ACE/examples/APG/Timers/PCB.cpp +++ b/ACE/examples/APG/Timers/PCB.cpp @@ -15,7 +15,7 @@ PCB::~PCB() int PCB::handleEvent (const void *arg) { - ACE_TRACE ("PCB::handle_timeout"); + ACE_TRACE ("PCB::handleEvent"); const int *val = static_cast<const int*> (arg); ACE_ASSERT ((*val) == timerID_); |