fix for auto-annotating C++ method names (they have :'s in it)

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@191

diff --git a/cachegrind/cg_annotate.in b/cachegrind/cg_annotate.in
index 1a532ca52d5120e75985823b97b82d0a8c4f8d87..088f79b26717bb587b59a85104a0f371bda2fa8e 100644 (file)
--- a/cachegrind/cg_annotate.in
+++ b/cachegrind/cg_annotate.in
@@ -625,7 +625,7 @@ sub print_summary_and_fn_totals ()
 
         # Update the threshold counting
         my $filename = $fn_name;
-        $filename =~ s/:[^:]+$//;    # remove function name
+        $filename =~ s/:.+$//;    # remove function name
         $threshold_files->{$filename} = 1;
         $curr_total += $fn_CC->[$threshold_event_index] 
             if (defined $fn_CC->[$threshold_event_index]);

diff --git a/vg_annotate.in b/vg_annotate.in
index 1a532ca52d5120e75985823b97b82d0a8c4f8d87..088f79b26717bb587b59a85104a0f371bda2fa8e 100644 (file)
--- a/vg_annotate.in
+++ b/vg_annotate.in
@@ -625,7 +625,7 @@ sub print_summary_and_fn_totals ()
 
         # Update the threshold counting
         my $filename = $fn_name;
-        $filename =~ s/:[^:]+$//;    # remove function name
+        $filename =~ s/:.+$//;    # remove function name
         $threshold_files->{$filename} = 1;
         $curr_total += $fn_CC->[$threshold_event_index] 
             if (defined $fn_CC->[$threshold_event_index]);