diff options
author | Dana Robinson <derobins@hdfgroup.org> | 2018-09-19 21:48:52 (GMT) |
---|---|---|
committer | Dana Robinson <derobins@hdfgroup.org> | 2018-09-19 21:48:52 (GMT) |
commit | bbde33f6f9fd5c4bbe949bafe52a7ab6f14b8617 (patch) | |
tree | 99c8bcdb39e5e174f55a7e6f69ae1ee542319ea3 /c++ | |
parent | ec53237fb849042b4a5b276a3e66a98ebb3710ee (diff) | |
parent | eb78fd88325d58a95c026129f1e2b4c7c50f621a (diff) | |
download | hdf5-bbde33f6f9fd5c4bbe949bafe52a7ab6f14b8617.zip hdf5-bbde33f6f9fd5c4bbe949bafe52a7ab6f14b8617.tar.gz hdf5-bbde33f6f9fd5c4bbe949bafe52a7ab6f14b8617.tar.bz2 |
Merge pull request #1245 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop_pull_request to develop
* commit 'eb78fd88325d58a95c026129f1e2b4c7c50f621a':
Develop normalization with vol_integration. Mostly peripheral things like the tools and wrappers, with just enough core library code to support that.
Diffstat (limited to 'c++')
-rw-r--r-- | c++/src/Makefile.am | 10 | ||||
-rw-r--r-- | c++/test/tattr.cpp | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/c++/src/Makefile.am b/c++/src/Makefile.am index 949325a..eb50209 100644 --- a/c++/src/Makefile.am +++ b/c++/src/Makefile.am @@ -32,15 +32,15 @@ bin_SCRIPTS=h5c++ # Source files for the library libhdf5_cpp_la_SOURCES=H5Exception.cpp H5IdComponent.cpp \ - H5DataSpace.cpp H5PropList.cpp H5Library.cpp \ - H5FaccProp.cpp H5FcreatProp.cpp H5LcreatProp.cpp \ - H5LaccProp.cpp H5DaccProp.cpp H5DxferProp.cpp \ + H5DataSpace.cpp H5PropList.cpp H5Library.cpp \ + H5FaccProp.cpp H5FcreatProp.cpp H5LcreatProp.cpp \ + H5LaccProp.cpp H5DaccProp.cpp H5DxferProp.cpp \ H5DcreatProp.cpp H5Location.cpp H5AbstractDs.cpp \ H5Attribute.cpp H5Object.cpp H5OcreatProp.cpp \ - H5DataType.cpp H5AtomType.cpp H5PredType.cpp \ + H5DataType.cpp H5AtomType.cpp H5PredType.cpp \ H5EnumType.cpp H5IntType.cpp H5FloatType.cpp \ H5StrType.cpp H5ArrayType.cpp H5VarLenType.cpp \ - H5CompType.cpp H5DataSet.cpp H5CommonFG.cpp H5Group.cpp \ + H5CompType.cpp H5DataSet.cpp H5CommonFG.cpp H5Group.cpp \ H5File.cpp # HDF5 C++ library depends on HDF5 Library. diff --git a/c++/test/tattr.cpp b/c++/test/tattr.cpp index bdf6d80..4734755 100644 --- a/c++/test/tattr.cpp +++ b/c++/test/tattr.cpp @@ -1712,7 +1712,7 @@ static void test_attr_dense_create(FileCreatPropList& fcpl, // Close property list dcpl.close(); - // H5O_is_attr_dense_test - un-usable + // H5O__is_attr_dense_test - un-usable // Add attributes, until just before converting to dense storage char attr_name[NAME_BUF_SIZE]; @@ -1727,7 +1727,7 @@ static void test_attr_dense_create(FileCreatPropList& fcpl, attr.write(PredType::NATIVE_UINT, &attr_num); } // end for - // H5O_is_attr_dense_test - un-usable + // H5O__is_attr_dense_test - un-usable { // Add one more attribute, to push into "dense" storage @@ -1815,8 +1815,8 @@ static void test_attr_corder_create_basic(FileCreatPropList& fcpl, ds_space.close(); // Check on dataset's attribute storage status. - // NOTE: Wrappers not available yet (H5O_is_attr_empty_test - // and H5O_is_attr_dense_test) + // NOTE: Wrappers not available yet (H5O__is_attr_empty_test + // and H5O__is_attr_dense_test) // Close dataset dataset.close(); |