merge and fix conflict

1 files changed, 1 insertions, 0 deletions

diff --git a/bin/trace b/bin/trace
index 50fd2f3..5db82b0 100755
--- a/bin/trace
+++ b/bin/trace
@@ -232,6 +232,7 @@ sub argstring ($$$) {
   # certain type qualifiers, and indirection.
   $atype =~ s/^\bconst\b//;
   $atype =~ s/\bH5_ATTR_UNUSED\b//g;
+  $atype =~ s/\bH5_ATTR_NDEBUG_UNUSED\b//g;
   $atype =~ s/\s+/ /g;
   $ptr = length $1 if  $atype =~ s/(\*+)//;
   $atype =~ s/^\s+//;