Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1 10 Merges from develop #424

Merged
merged 30 commits into from
Mar 4, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
ebe023d
HDFFV-10865 - merge from dev, HDFArray perf fix.
byrnHDF Dec 29, 2020
cc749db
Remove duplicate setting
byrnHDF Jan 4, 2021
5e6ecc2
Merge branch 'hdf5_1_10' of https://github.com/HDFGroup/hdf5.git into…
byrnHDF Jan 11, 2021
a9227df
Merge branch 'hdf5_1_10' of https://github.com/HDFGroup/hdf5.git into…
byrnHDF Jan 23, 2021
12c9d1a
Whitespace changes after clang format
byrnHDF Jan 27, 2021
55d3565
Undo version 11 clang format changes
byrnHDF Jan 28, 2021
ee4ebd3
Merge branch 'hdf5_1_10' of https://github.com/HDFGroup/hdf5.git into…
byrnHDF Feb 1, 2021
51e5378
Merge CMake changes from develop
byrnHDF Feb 1, 2021
bbc9609
test testing script merge from develop
byrnHDF Feb 1, 2021
a8ae83d
Update supported platforms
byrnHDF Feb 2, 2021
02f185b
Merge branch 'hdf5_1_10' of https://github.com/HDFGroup/hdf5.git into…
byrnHDF Feb 4, 2021
39d6885
PR#3 merge from develop
byrnHDF Feb 4, 2021
28e5eb4
Merge gcc 10 diagnostics option from develop
byrnHDF Feb 8, 2021
678653c
Merge branch 'hdf5_1_10' of https://github.com/HDFGroup/hdf5.git into…
byrnHDF Feb 9, 2021
55368fa
Merge #318 OSX changes from develop
byrnHDF Feb 9, 2021
c74c09c
Merge branch 'hdf5_1_10' of https://github.com/HDFGroup/hdf5.git into…
byrnHDF Feb 9, 2021
d8011e2
Merge small changes from develop
byrnHDF Feb 16, 2021
516ac71
Merge branch 'hdf5_1_10' of https://github.com/HDFGroup/hdf5.git into…
byrnHDF Feb 17, 2021
a6de013
Minor non-space formatting changes
byrnHDF Feb 18, 2021
4b17412
Merge branch 'hdf5_1_10' of https://github.com/HDFGroup/hdf5.git into…
byrnHDF Feb 19, 2021
7faebce
Merge branch 'hdf5_1_10' of https://github.com/HDFGroup/hdf5.git into…
byrnHDF Feb 24, 2021
1e21839
#386 copyright corrections for java folder
byrnHDF Feb 26, 2021
a80a571
Merge branch 'hdf5_1_10' of https://github.com/HDFGroup/hdf5.git into…
byrnHDF Mar 1, 2021
4d7a150
Merges from develop
byrnHDF Mar 2, 2021
e8df4b9
Merge updates
byrnHDF Mar 3, 2021
86563f0
format fix
byrnHDF Mar 3, 2021
7fa5973
Fix missing underscore and make H5public.h closer to dev
byrnHDF Mar 3, 2021
35e1e68
Merges from develop
byrnHDF Mar 4, 2021
061da5f
format alignment
byrnHDF Mar 4, 2021
4f5536c
Add missing test ref file
byrnHDF Mar 4, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 4 additions & 4 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ CMakeTests.* @byrnHDF @derobins

/bin/ @lrknox @derobins

/c++/ @bmribler @byrnHDF
/c++/ @bmribler @byrnHDF @derobins

/config/ @lrknox @derobins @byrnHDF

Expand All @@ -23,7 +23,7 @@ CMakeTests.* @byrnHDF @derobins

/fortran/ @brtnfld @epourmal

/hl/ @bmribler @byrnHDF
/hl/ @bmribler @byrnHDF @derobins

/java/ @jhendersonHDF @byrnHDF

Expand All @@ -37,6 +37,6 @@ CMakeTests.* @byrnHDF @derobins

/testpar/ @jhendersonHDF @rawarren @jrmainzer

/tools/ @byrnHDF @bmribler
/tools/ @byrnHDF @bmribler @derobins

/utils/ @lrknox @byrnHDF
/utils/ @lrknox @byrnHDF @derobins
2 changes: 2 additions & 0 deletions MANIFEST
Original file line number Diff line number Diff line change
Expand Up @@ -1943,6 +1943,7 @@
./tools/testfiles/tintsnodata.h5
./tools/testfiles/tlarge_objname.ddl
./tools/testfiles/tlarge_objname.h5
./tools/testfiles/tldouble.ddl
./tools/testfiles/tldouble.h5
./tools/testfiles/tlonglinks.ddl
./tools/testfiles/tlonglinks.h5
Expand Down Expand Up @@ -2452,6 +2453,7 @@
./tools/test/h5diff/testfiles/h5diff_80.txt
./tools/test/h5diff/testfiles/h5diff_800.txt
./tools/test/h5diff/testfiles/h5diff_801.txt
./tools/test/h5diff/testfiles/h5diff_830.txt
./tools/test/h5diff/testfiles/h5diff_90.txt
./tools/test/h5diff/testfiles/h5diff_100.txt
./tools/test/h5diff/testfiles/h5diff_101.txt
Expand Down
4 changes: 2 additions & 2 deletions bin/make_err
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ sub print_startprotect ($$) {
$file =~ s/(\w*)\.h/$1/;

# Print the ifdef info
print $fh "\n#ifndef _${file}_H\n";
print $fh "#define _${file}_H\n";
print $fh "\n#ifndef ${file}_H\n";
print $fh "#define ${file}_H\n";
}

##############################################################################
Expand Down
4 changes: 2 additions & 2 deletions bin/make_overflow
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ sub print_startprotect ($$) {
$file =~ s/(\w*)\.h/$1/;

# Print the ifdef info
print $fh "\n#ifndef _${file}_H\n";
print $fh "#define _${file}_H\n";
print $fh "\n#ifndef ${file}_H\n";
print $fh "#define ${file}_H\n";
}

##############################################################################
Expand Down
4 changes: 2 additions & 2 deletions bin/make_vers
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ sub print_startprotect ($$) {
$file =~ s/(\w*)\.h/$1/;

# Print the ifdef info
print $fh "\n#ifndef _${file}_H\n";
print $fh "#define _${file}_H\n";
print $fh "\n#ifndef ${file}_H\n";
print $fh "#define ${file}_H\n";
}

##############################################################################
Expand Down
6 changes: 3 additions & 3 deletions c++/src/H5AbstractDs.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
* [email protected]. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

#ifndef __AbstractDs_H
#define __AbstractDs_H
#ifndef AbstractDs_H
#define AbstractDs_H

namespace H5 {

Expand Down Expand Up @@ -81,4 +81,4 @@ class H5_DLLCPP AbstractDs {
}; // end of AbstractDs
} // namespace H5

#endif // __AbstractDs_H
#endif // AbstractDs_H
6 changes: 3 additions & 3 deletions c++/src/H5ArrayType.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
* [email protected]. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

#ifndef __H5ArrayType_H
#define __H5ArrayType_H
#ifndef H5ArrayType_H
#define H5ArrayType_H

namespace H5 {

Expand Down Expand Up @@ -69,4 +69,4 @@ class H5_DLLCPP ArrayType : public DataType {
}; // end of ArrayType
} // namespace H5

#endif // __H5ArrayType_H
#endif // H5ArrayType_H
6 changes: 3 additions & 3 deletions c++/src/H5AtomType.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
* [email protected]. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

#ifndef __H5AtomType_H
#define __H5AtomType_H
#ifndef H5AtomType_H
#define H5AtomType_H

namespace H5 {

Expand Down Expand Up @@ -83,4 +83,4 @@ class H5_DLLCPP AtomType : public DataType {
}; // end of AtomType
} // namespace H5

#endif // __H5AtomType_H
#endif // H5AtomType_H
2 changes: 1 addition & 1 deletion c++/src/H5Attribute.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ namespace H5 {
using std::cerr;
using std::endl;

class H5_DLLCPP H5Object; // forward declaration for UserData4Aiterate
class H5Object; // forward declaration for UserData4Aiterate

//--------------------------------------------------------------------------
// Function: Attribute default constructor
Expand Down
6 changes: 3 additions & 3 deletions c++/src/H5Attribute.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
* [email protected]. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

#ifndef __H5Attribute_H
#define __H5Attribute_H
#ifndef H5Attribute_H
#define H5Attribute_H

namespace H5 {

Expand Down Expand Up @@ -104,4 +104,4 @@ class H5_DLLCPP Attribute : public AbstractDs, public H5Location {
}; // end of Attribute
} // namespace H5

#endif // __H5Attribute_H
#endif // H5Attribute_H
6 changes: 3 additions & 3 deletions c++/src/H5Classes.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
* [email protected]. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

#ifndef __H5Classes_H
#define __H5Classes_H
#ifndef H5Classes_H
#define H5Classes_H

namespace H5 {
class Exception;
Expand Down Expand Up @@ -43,4 +43,4 @@ class H5File;
class Attribute;
class H5Library;
} // namespace H5
#endif // __H5Classes_H
#endif // H5Classes_H
6 changes: 3 additions & 3 deletions c++/src/H5CommonFG.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
* [email protected]. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

#ifndef __CommonFG_H
#define __CommonFG_H
#ifndef CommonFG_H
#define CommonFG_H

namespace H5 {

Expand Down Expand Up @@ -83,7 +83,7 @@ class H5_DLLCPP CommonFG {
}; // end of CommonFG
} // namespace H5

#endif // __CommonFG_H
#endif // CommonFG_H

/***************************************************************************
Design Note
Expand Down
6 changes: 3 additions & 3 deletions c++/src/H5CompType.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
* [email protected]. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

#ifndef __H5CompType_H
#define __H5CompType_H
#ifndef H5CompType_H
#define H5CompType_H

namespace H5 {

Expand Down Expand Up @@ -124,4 +124,4 @@ class H5_DLLCPP CompType : public DataType {
}; // end of CompType
} // namespace H5

#endif // __H5CompType_H
#endif // H5CompType_H
6 changes: 3 additions & 3 deletions c++/src/H5Cpp.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
* [email protected]. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

#ifndef __H5Cpp_H
#define __H5Cpp_H
#ifndef H5Cpp_H
#define H5Cpp_H

#include "H5Include.h"
#include "H5Exception.h"
Expand Down Expand Up @@ -58,4 +58,4 @@
#define HOFFSET(TYPE, MEMBER) ((size_t) & ((TYPE *)0)->MEMBER)
#endif

#endif // __H5Cpp_H
#endif // H5Cpp_H
6 changes: 3 additions & 3 deletions c++/src/H5CppDoc.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
* [email protected]. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

#ifndef __H5CppDoc_H
#define __H5CppDoc_H
#ifndef H5CppDoc_H
#define H5CppDoc_H

//-------------------------------------------------------------------------
// The following section will be used to generate the 'Mainpage'
Expand Down Expand Up @@ -92,4 +92,4 @@
/// This example shows how to work with groups.
///\example h5group.cpp

#endif // __H5CppDoc_H
#endif // H5CppDoc_H
6 changes: 3 additions & 3 deletions c++/src/H5DaccProp.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
* [email protected]. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

#ifndef __H5DSetAccPropList_H
#define __H5DSetAccPropList_H
#ifndef H5DSetAccPropList_H
#define H5DSetAccPropList_H

namespace H5 {

Expand Down Expand Up @@ -69,4 +69,4 @@ class H5_DLLCPP DSetAccPropList : public LinkAccPropList {
}; // end of DSetAccPropList
} // namespace H5

#endif // __H5DSetAccPropList_H
#endif // H5DSetAccPropList_H
6 changes: 3 additions & 3 deletions c++/src/H5DataSet.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
* [email protected]. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

#ifndef __H5DataSet_H
#define __H5DataSet_H
#ifndef H5DataSet_H
#define H5DataSet_H

namespace H5 {

Expand Down Expand Up @@ -153,4 +153,4 @@ class H5_DLLCPP DataSet : public H5Object, public AbstractDs {
}; // end of DataSet
} // namespace H5

#endif // __H5DataSet_H
#endif // H5DataSet_H
6 changes: 3 additions & 3 deletions c++/src/H5DataSpace.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
* [email protected]. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

#ifndef __H5DataSpace_H
#define __H5DataSpace_H
#ifndef H5DataSpace_H
#define H5DataSpace_H

namespace H5 {

Expand Down Expand Up @@ -155,4 +155,4 @@ class H5_DLLCPP DataSpace : public IdComponent {
}; // end of DataSpace
} // namespace H5

#endif // __H5DataSpace_H
#endif // H5DataSpace_H
6 changes: 3 additions & 3 deletions c++/src/H5DataType.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
* [email protected]. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

#ifndef __H5DataType_H
#define __H5DataType_H
#ifndef H5DataType_H
#define H5DataType_H

namespace H5 {

Expand Down Expand Up @@ -183,4 +183,4 @@ class H5_DLLCPP DataType : public H5Object {
}; // end of DataType
} // namespace H5

#endif // __H5DataType_H
#endif // H5DataType_H
6 changes: 3 additions & 3 deletions c++/src/H5DcreatProp.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
* [email protected]. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

#ifndef __H5DSCreatPropList_H
#define __H5DSCreatPropList_H
#ifndef H5DSCreatPropList_H
#define H5DSCreatPropList_H

namespace H5 {

Expand Down Expand Up @@ -159,4 +159,4 @@ class H5_DLLCPP DSetCreatPropList : public ObjCreatPropList {
}; // end of DSetCreatPropList
} // namespace H5

#endif // __H5DSCreatPropList_H
#endif // H5DSCreatPropList_H
6 changes: 3 additions & 3 deletions c++/src/H5DxferProp.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
* [email protected]. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

#ifndef __H5DSetMemXferPropList_H
#define __H5DSetMemXferPropList_H
#ifndef H5DSetMemXferPropList_H
#define H5DSetMemXferPropList_H

namespace H5 {

Expand Down Expand Up @@ -131,4 +131,4 @@ class H5_DLLCPP DSetMemXferPropList : public PropList {
}; // end of DSetMemXferPropList
} // namespace H5

#endif // __H5DSetMemXferPropList_H
#endif // H5DSetMemXferPropList_H
6 changes: 3 additions & 3 deletions c++/src/H5EnumType.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
* [email protected]. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

#ifndef __H5EnumType_H
#define __H5EnumType_H
#ifndef H5EnumType_H
#define H5EnumType_H

namespace H5 {

Expand Down Expand Up @@ -87,4 +87,4 @@ class H5_DLLCPP EnumType : public DataType {
}; // end of EnumType
} // namespace H5

#endif // __H5EnumType_H
#endif // H5EnumType_H
6 changes: 3 additions & 3 deletions c++/src/H5Exception.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
* [email protected]. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

#ifndef __H5Exception_H
#define __H5Exception_H
#ifndef H5Exception_H
#define H5Exception_H

#include <string>

Expand Down Expand Up @@ -176,4 +176,4 @@ class H5_DLLCPP IdComponentException : public Exception {
}; // end of IdComponentException
} // namespace H5

#endif // __H5Exception_H
#endif // H5Exception_H
6 changes: 3 additions & 3 deletions c++/src/H5FaccProp.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
* [email protected]. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

#ifndef __H5FileAccPropList_H
#define __H5FileAccPropList_H
#ifndef H5FileAccPropList_H
#define H5FileAccPropList_H

namespace H5 {

Expand Down Expand Up @@ -168,4 +168,4 @@ class H5_DLLCPP FileAccPropList : public PropList {
}; // end of FileAccPropList
} // namespace H5

#endif // __H5FileAccPropList_H
#endif // H5FileAccPropList_H
Loading