diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2019-07-29 21:10:45 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2019-07-29 21:10:45 (GMT) |
| commit | 517cadac2647bf325720c74285381045fb84be30 (patch) | |
| tree | fa3b7712ca6f4370cb989ae669c9425f09c21e76 /src/hdf5.h | |
| parent | da2ec6163d4a8f76ef9c32518b5a0b5810f2d63f (diff) | |
| parent | f97e11e7635a0cd8728d4604ca5dceb3925ba44c (diff) | |
| download | hdf5-517cadac2647bf325720c74285381045fb84be30.zip hdf5-517cadac2647bf325720c74285381045fb84be30.tar.gz hdf5-517cadac2647bf325720c74285381045fb84be30.tar.bz2 | |
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit 'f97e11e7635a0cd8728d4604ca5dceb3925ba44c':
Update comment and check for strtoumax.
Modify CMakeLists.txt file for renamed h5tools_test_utils files.
Add HD to string functions. Switched strtoul to strtoumax in H5FDs3comms.c. Removed unused functions and variables in s3 and hdfs TestH5Pfapl*.java. Update Copyright headers.
Squashed commit of the following:
Diffstat (limited to 'src/hdf5.h')
| -rw-r--r-- | src/hdf5.h | 18 |
1 files changed, 10 insertions, 8 deletions
@@ -40,16 +40,18 @@ #include "H5Zpublic.h" /* Data filters */ /* Predefined file drivers */ -#include "H5FDcore.h" /* Files stored entirely in memory */ -#include "H5FDdirect.h" /* Linux direct I/O */ -#include "H5FDfamily.h" /* File families */ +#include "H5FDcore.h" /* Files stored entirely in memory */ +#include "H5FDdirect.h" /* Linux direct I/O */ +#include "H5FDfamily.h" /* File families */ +#include "H5FDhdfs.h" /* Hadoop HDFS */ #include "H5FDlog.h" /* sec2 driver with I/O logging (for debugging) */ -#include "H5FDmpi.h" /* MPI-based file drivers */ -#include "H5FDmulti.h" /* Usage-partitioned file family */ -#include "H5FDsec2.h" /* POSIX unbuffered file I/O */ -#include "H5FDstdio.h" /* Standard C buffered I/O */ +#include "H5FDmpi.h" /* MPI-based file drivers */ +#include "H5FDmulti.h" /* Usage-partitioned file family */ +#include "H5FDros3.h" /* R/O S3 "file" I/O */ +#include "H5FDsec2.h" /* POSIX unbuffered file I/O */ +#include "H5FDstdio.h" /* Standard C buffered I/O */ #ifdef H5_HAVE_WINDOWS -#include "H5FDwindows.h" /* Win32 I/O */ +#include "H5FDwindows.h" /* Win32 I/O */ #endif /* Virtual object layer (VOL) connectors */ |