[svn-r22105] Description:

	Bring r20557:22085 from trunk to this branch, also fixing some other
issues/failures in the branch simultaneously.  The h5repack tests are still
failing, but Neil will be checking into those, so the branch can be fully
functional again.

Tested on:
	Mac OSX/64 10.7.3 (amazon) w/debug

1 files changed, 7 insertions, 0 deletions

diff --git a/bin/trace b/bin/trace
index e0a4dd0..bfaae19 100755
--- a/bin/trace
+++ b/bin/trace
@@ -36,7 +36,9 @@ $Source = "";
                "H5D_fill_time_t"            => "Df",
                "H5D_fill_value_t"           => "DF",
 	       "H5FD_mpio_chunk_opt_t"      => "Dh",
+               "H5D_mpio_actual_io_mode_t"  => "Di",
                "H5D_layout_t"               => "Dl",
+               "H5D_mpio_actual_chunk_opt_mode_t" => "Do",
                "H5D_space_status_t"         => "Ds",
                "H5FD_mpio_xfer_t"           => "Dt",
                "herr_t"                     => "e",
@@ -86,6 +88,8 @@ $Source = "";
                "H5T_sign_t"                 => "Ts",
                "H5T_class_t"                => "Tt",
                "H5T_str_t"                  => "Tz",
+               "unsigned long"              => "Ul",
+               "unsigned long long"         => "UL",
                "void"                       => "x",
                "FILE"                       => "x",
                "H5A_operator_t"             => "x",
@@ -217,6 +221,9 @@ sub rewrite_func ($$$$$) {
     my %names;
 
     for $arg (@args) {
+      if($arg=~/\w*\.{3}\w*/){
+        next;
+      }
       unless ($arg=~/^(([a-z_A-Z]\w*\s+)+\**)
 	      ([a-z_A-Z]\w*)(\[.*?\])?
 	      (\s*\/\*\s*(in|out|in_out)\s*\*\/)?\s*$/x) {