merge and fix

2 files changed, 35 insertions, 12 deletions

diff --git a/bin/make_vers b/bin/make_vers
index c6d2c04..7154dfb 100755
--- a/bin/make_vers
+++ b/bin/make_vers
@@ -90,7 +90,8 @@ sub print_checkoptions ($) {
     my $curr_idx;               # Current API version index
 
     # Print the option checking
-    print $fh "\n/* Issue error if contradicting macros have been defined. */\n";
+    print $fh "\n\n/* Issue error if contradicting macros have been defined. */\n";
+    print $fh "/* (Can't use an older (deprecated) API version if deprecated symbols have been disabled) */\n";
 
     # Print the #ifdef
     print $fh "#if (";
@@ -119,26 +120,40 @@ sub print_checkoptions ($) {
 ##############################################################################
 # Print "global" API version macro settings
 #
-sub print_globalapivers ($) {
+sub print_globalapidefvers ($) {
     my $fh = shift;             # File handle for output file
     my $curr_idx;               # Current API version index
 
     # Print the descriptive comment
-    print $fh "\n\n/* If a particular \"global\" version of the library's interfaces is chosen,\n";
-    print $fh " *      set the versions for the API symbols affected.\n";
+    print $fh "\n\n/* If a particular default \"global\" version of the library's interfaces is\n";
+    print $fh " *      chosen, set the corresponding version macro for API symbols.\n";
     print $fh " *\n";
-    print $fh " * Note: If an application has already chosen a particular version for an\n";
-    print $fh " *      API symbol, the individual API version macro takes priority.\n";
     print $fh " */\n";
 
     for $curr_idx ($min_sup_idx .. ($max_idx - 1)) {
         # Print API version ifdef
-        print $fh "#if defined(H5_USE_1", ($curr_idx * 2), "_API_DEFAULT) && !defined(H5_USE_1", ($curr_idx * 2), "_API)\n";
+        print $fh "\n#if defined(H5_USE_1", ($curr_idx * 2), "_API_DEFAULT) && !defined(H5_USE_1", ($curr_idx * 2), "_API)\n";
         # Print API version definition
         print $fh " " x $indent, "#define H5_USE_1", ($curr_idx * 2), "_API 1\n";
         # Print API version endif
-        print $fh "#endif /* H5_USE_1", ($curr_idx * 2), "_API_DEFAULT && !H5_USE_1", ($curr_idx * 2), "_API */\n\n";
+        print $fh "#endif /* H5_USE_1", ($curr_idx * 2), "_API_DEFAULT && !H5_USE_1", ($curr_idx * 2), "_API */\n";
     }
+}
+
+##############################################################################
+# Print "global" API symbol version macro settings
+#
+sub print_globalapisymbolvers ($) {
+    my $fh = shift;             # File handle for output file
+    my $curr_idx;               # Current API version index
+
+    # Print the descriptive comment
+    print $fh "\n\n/* If a particular \"global\" version of the library's interfaces is chosen,\n";
+    print $fh " *      set the versions for the API symbols affected.\n";
+    print $fh " *\n";
+    print $fh " * Note: If an application has already chosen a particular version for an\n";
+    print $fh " *      API symbol, the individual API version macro takes priority.\n";
+    print $fh " */\n";
 
     # Loop over supported older library APIs and define the appropriate macros
     for $curr_idx ($min_sup_idx .. ($max_idx - 1)) {
@@ -444,8 +459,9 @@ sub create_public ($) {
     print_copyright(*HEADER);
     print_warning(*HEADER);
     print_startprotect(*HEADER, $file);
+    print_globalapidefvers(*HEADER);
     print_checkoptions(*HEADER);
-    print_globalapivers(*HEADER);
+    print_globalapisymbolvers(*HEADER);
     print_defaultapivers(*HEADER);
     print_endprotect(*HEADER, $file);
 
diff --git a/bin/trace b/bin/trace
index 5db82b0..0256da6 100755
--- a/bin/trace
+++ b/bin/trace
@@ -71,6 +71,7 @@ $Source = "";
                "uint32_t"                   => "Iu",
                "uint64_t"                   => "UL",
                "H5I_type_t"                 => "It",
+               "H5O_token_t"                => "k",
                "H5G_link_t"                 => "Ll", #Same as H5L_type_t now
                "H5L_type_t"                 => "Ll",
                "MPI_Comm"                   => "Mc",
@@ -164,12 +165,18 @@ $Source = "";
                "H5I_search_func_t"          => "x",
                "H5L_class_t"                => "x",
                "H5L_elink_traverse_t"       => "x",
-               "H5L_iterate_t"              => "x",
+               "H5L_info1_t"                => "x",
+               "H5L_info2_t"                => "x",
+               "H5L_iterate1_t"             => "x",
+               "H5L_iterate2_t"             => "x",
                "H5M_iterate_t"              => 'x',
                "H5MM_allocate_t"            => "x",
                "H5MM_free_t"                => "x",
-               "H5O_info_t"                 => "x",
-               "H5O_iterate_t"              => "x",
+               "H5O_info1_t"                => "x",
+               "H5O_info2_t"                => "x",
+               "H5O_native_info_t"          => "x",
+               "H5O_iterate1_t"             => "x",
+               "H5O_iterate2_t"             => "x",
                "H5O_mcdt_search_cb_t"       => "x",
                "H5P_cls_create_func_t"      => "x",
                "H5P_cls_copy_func_t"        => "x",