diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2019-11-13 16:31:35 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2019-11-13 16:31:35 (GMT) |
| commit | e5f9c60e692a9470954f3500c93558117f6ba7bd (patch) | |
| tree | b064a59553bdd0d2063e5ac25e9cfa3c1a1ab1b0 /hl | |
| parent | 6b927a773c83bedc111dcd2ad38805f974660b15 (diff) | |
| parent | e08b69d3d2e572de4707b1fbf908111d29f40a1b (diff) | |
| download | hdf5-e5f9c60e692a9470954f3500c93558117f6ba7bd.zip hdf5-e5f9c60e692a9470954f3500c93558117f6ba7bd.tar.gz hdf5-e5f9c60e692a9470954f3500c93558117f6ba7bd.tar.bz2 | |
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit 'e08b69d3d2e572de4707b1fbf908111d29f40a1b':
Use HD prefix.
Fix issue where H5R__reopen_file did not make the file "post open" callback.
Apparently, + has no special meaning, and neither does \+, in so-called "obsolete" / POSIX "basic" regular expressions. Also, not every version of `sed` out there supports the `-E` option. So delete the -E flag and use the regex `[^/][^/]*` instead of `[^/]+`.
Implement H5VLget_file_type() to return a copy of a datatype with the location set to be in a file. Only meant to be used by VOL connectors. Implement H5VLpeek_connector_id() to support connectors querying their own IDs. Fix app_ref with connector IDs in a couple places (external VOLs registered as default through ENV should be visible to the application). Modify vlen and reference interfaces to work with arbitrary VOL connectors. Implement file "post open" specific callback, to enable connectors to update their file structs after a wrap context has been set.
Fix HDFFV-10937: use a more reliable (and probably faster) scheme for visiting all elements of a matrix in an arbitrary order.
Diffstat (limited to 'hl')
| -rw-r--r-- | hl/c++/examples/run-hlc++-ex.sh.in | 2 | ||||
| -rw-r--r-- | hl/examples/run-hlc-ex.sh.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/hl/c++/examples/run-hlc++-ex.sh.in b/hl/c++/examples/run-hlc++-ex.sh.in index e46534a..43831f5 100644 --- a/hl/c++/examples/run-hlc++-ex.sh.in +++ b/hl/c++/examples/run-hlc++-ex.sh.in @@ -47,7 +47,7 @@ prefix=@prefix@ examplesdir=@examplesdir@ if [ ${examplesdir##${prefix}/} != ${examplesdir} ]; then echo $(echo ${examplesdir##${prefix}/} | \ - sed -E 's,[^/]+,..,g') + sed 's,[^/][^/]*,..,g') else echo $prefix fi diff --git a/hl/examples/run-hlc-ex.sh.in b/hl/examples/run-hlc-ex.sh.in index ceb77dd..e6d0cc9 100644 --- a/hl/examples/run-hlc-ex.sh.in +++ b/hl/examples/run-hlc-ex.sh.in @@ -46,7 +46,7 @@ prefix=@prefix@ examplesdir=@examplesdir@ if [ ${examplesdir##${prefix}/} != ${examplesdir} ]; then echo $(echo ${examplesdir##${prefix}/} | \ - sed -E 's,[^/]+,..,g') + sed 's,[^/][^/]*,..,g') else echo $prefix fi |