Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~jake.smith/hdf5 into bugfix/repack_external_storage

2 files changed, 6 insertions, 3 deletions

diff --git a/bin/h5vers b/bin/h5vers
index a00beb7..4200141 100755
--- a/bin/h5vers
+++ b/bin/h5vers
@@ -377,7 +377,7 @@ if ($H5_JAVA) {
   my $version_string2 = sprintf("%d, %d, %d", @newver[0,1,2]);
 
   $data =~ s/\@version HDF5 .* <BR>/\@version HDF5 $version_string1 <BR>/;
-  $data =~ s/    public final static int LIB_VERSION\[\] = { \d*, \d*, \d* };/    public final static int LIB_VERSION[] = { $version_string2 };/;
+  $data =~ s/    public final static int LIB_VERSION\[\] = \{ \d*, \d*, \d* \};/    public final static int LIB_VERSION[] = \{ $version_string2 \};/;
 
   write_file($H5_JAVA, $data);
 }
@@ -394,7 +394,7 @@ if ($TESTH5_JAVA) {
   my $version_string1 = sprintf("%d, %d, %d", @newver[0,1,2]);
   my $version_string2 = sprintf("int majnum = %d, minnum = %d, relnum = %d", @newver[0,1,2]);
 
-  $data =~ s/        int libversion\[\] = { .* };/        int libversion\[\] = { $version_string1 };/;
+  $data =~ s/        int libversion\[\] = \{ .* \};/        int libversion\[\] = \{ $version_string1 \};/;
   $data =~ s/        int majnum = \d*, minnum = \d*, relnum = \d*;/        $version_string2;/;
 
   write_file($TESTH5_JAVA, $data);
@@ -405,7 +405,7 @@ if ($REPACK_LAYOUT_PLUGIN_VERSION) {
   my $data = read_file($REPACK_LAYOUT_PLUGIN_VERSION);
   my $version_string = sprintf("%d %d %d", @newver[0,1,2]);
 
-  $data =~ s/            PARAMS { 9 \d* \d* \d* }/            PARAMS { 9 $version_string }/g;
+  $data =~ s/            PARAMS \{ 9 \d* \d* \d* \}/            PARAMS \{ 9 $version_string \}/g;
 
   write_file($REPACK_LAYOUT_PLUGIN_VERSION, $data);
 }
diff --git a/bin/trace b/bin/trace
index 50660fe..54b6f8f 100755
--- a/bin/trace
+++ b/bin/trace
@@ -139,6 +139,8 @@ $Source = "";
                "H5FD_t"                     => "x",
                "H5FD_class_t"               => "x",
                "H5FD_stream_fapl_t"         => "x",
+               "H5FD_ros3_fapl_t"           => "x",
+               "H5FD_hdfs_fapl_t"           => "x",
                "H5FD_file_image_callbacks_t" => "x",
                "H5G_iterate_t"              => "x",
                "H5G_info_t"                 => "x",
@@ -148,6 +150,7 @@ $Source = "";
                "H5L_class_t"                => "x",
                "H5L_elink_traverse_t"       => "x",
                "H5L_iterate_t"              => "x",
+               "H5M_iterate_t"              => 'x',
                "H5MM_allocate_t"            => "x",
                "H5MM_free_t"                => "x",
                "H5O_info_t"                 => "x",