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

Replaces the H5_OVERRIDE macro with override #773

Merged
merged 1 commit into from
Jun 23, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions c++/src/H5ArrayType.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class H5_DLLCPP ArrayType : public DataType {

// Returns an ArrayType object via DataType* by decoding the
// binary object description of this type.
virtual DataType *decode() const H5_OVERRIDE;
virtual DataType *decode() const override;

// Returns the number of dimensions of this array datatype.
int getArrayNDims() const;
Expand All @@ -49,7 +49,7 @@ class H5_DLLCPP ArrayType : public DataType {

///\brief Returns this class name.
virtual H5std_string
fromClass() const H5_OVERRIDE
fromClass() const override
{
return ("ArrayType");
}
Expand All @@ -61,7 +61,7 @@ class H5_DLLCPP ArrayType : public DataType {
ArrayType(const hid_t existing_id);

// Noop destructor
virtual ~ArrayType() H5_OVERRIDE;
virtual ~ArrayType() override;

// Default constructor
ArrayType();
Expand Down
4 changes: 2 additions & 2 deletions c++/src/H5AtomType.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ class H5_DLLCPP AtomType : public DataType {

///\brief Returns this class name.
virtual H5std_string
fromClass() const H5_OVERRIDE
fromClass() const override
{
return ("AtomType");
}
Expand All @@ -68,7 +68,7 @@ class H5_DLLCPP AtomType : public DataType {
AtomType(const AtomType &original);

// Noop destructor
virtual ~AtomType() H5_OVERRIDE;
virtual ~AtomType() override;
#endif // DOXYGEN_SHOULD_SKIP_THIS

protected:
Expand Down
18 changes: 9 additions & 9 deletions c++/src/H5Attribute.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class H5_DLLCPP Attribute : public AbstractDs, public H5Location {
Attribute(const hid_t attr_id);

// Closes this attribute.
virtual void close() H5_OVERRIDE;
virtual void close() override;

// Gets the name of this attribute.
ssize_t getName(char *attr_name, size_t buf_size = 0) const;
Expand All @@ -50,13 +50,13 @@ class H5_DLLCPP Attribute : public AbstractDs, public H5Location {
ssize_t getName(size_t buf_size, H5std_string &attr_name) const;

// Gets a copy of the dataspace for this attribute.
virtual DataSpace getSpace() const H5_OVERRIDE;
virtual DataSpace getSpace() const override;

// Returns the amount of storage size required for this attribute.
virtual hsize_t getStorageSize() const H5_OVERRIDE;
virtual hsize_t getStorageSize() const override;

// Returns the in memory size of this attribute's data.
virtual size_t getInMemDataSize() const H5_OVERRIDE;
virtual size_t getInMemDataSize() const override;

// Reads data from this attribute.
void read(const DataType &mem_type, void *buf) const;
Expand All @@ -68,21 +68,21 @@ class H5_DLLCPP Attribute : public AbstractDs, public H5Location {

///\brief Returns this class name.
virtual H5std_string
fromClass() const H5_OVERRIDE
fromClass() const override
{
return ("Attribute");
}

// Gets the attribute id.
virtual hid_t getId() const H5_OVERRIDE;
virtual hid_t getId() const override;

// Destructor: properly terminates access to this attribute.
virtual ~Attribute() H5_OVERRIDE;
virtual ~Attribute() override;

#ifndef DOXYGEN_SHOULD_SKIP_THIS
protected:
// Sets the attribute id.
virtual void p_setId(const hid_t new_id) H5_OVERRIDE;
virtual void p_setId(const hid_t new_id) override;
#endif // DOXYGEN_SHOULD_SKIP_THIS

private:
Expand All @@ -92,7 +92,7 @@ class H5_DLLCPP Attribute : public AbstractDs, public H5Location {
// getTypeClass and various API functions getXxxType
// defined in AbstractDs for generic datatype and specific
// sub-types
virtual hid_t p_get_type() const H5_OVERRIDE;
virtual hid_t p_get_type() const override;

// Reads variable or fixed len strings from this attribute.
void p_read_variable_len(const DataType &mem_type, H5std_string &strg) const;
Expand Down
6 changes: 3 additions & 3 deletions c++/src/H5CompType.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class H5_DLLCPP CompType : public DataType {

// Returns a CompType object via DataType* by decoding the binary
// object description of this type.
virtual DataType *decode() const H5_OVERRIDE;
virtual DataType *decode() const override;

// Returns the type class of the specified member of this compound
// datatype. It provides to the user a way of knowing what type
Expand Down Expand Up @@ -108,13 +108,13 @@ class H5_DLLCPP CompType : public DataType {

///\brief Returns this class name.
virtual H5std_string
fromClass() const H5_OVERRIDE
fromClass() const override
{
return ("CompType");
}

// Noop destructor.
virtual ~CompType() H5_OVERRIDE;
virtual ~CompType() override;

private:
// Contains common code that is used by the member functions
Expand Down
4 changes: 2 additions & 2 deletions c++/src/H5DaccProp.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class H5_DLLCPP DSetAccPropList : public LinkAccPropList {

///\brief Returns this class name.
virtual H5std_string
fromClass() const H5_OVERRIDE
fromClass() const override
{
return ("DSetAccPropList");
}
Expand All @@ -51,7 +51,7 @@ class H5_DLLCPP DSetAccPropList : public LinkAccPropList {
DSetAccPropList(const hid_t plist_id);

// Noop destructor.
virtual ~DSetAccPropList() H5_OVERRIDE;
virtual ~DSetAccPropList() override;

#ifndef DOXYGEN_SHOULD_SKIP_THIS

Expand Down
18 changes: 9 additions & 9 deletions c++/src/H5DataSet.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ namespace H5 {
class H5_DLLCPP DataSet : public H5Object, public AbstractDs {
public:
// Close this dataset.
virtual void close() H5_OVERRIDE;
virtual void close() override;

// Extends the dataset with unlimited dimension.
void extend(const hsize_t *size) const;
Expand All @@ -53,16 +53,16 @@ class H5_DLLCPP DataSet : public H5Object, public AbstractDs {
haddr_t getOffset() const;

// Gets the dataspace of this dataset.
virtual DataSpace getSpace() const H5_OVERRIDE;
virtual DataSpace getSpace() const override;

// Determines whether space has been allocated for a dataset.
void getSpaceStatus(H5D_space_status_t &status) const;

// Returns the amount of storage size required for this dataset.
virtual hsize_t getStorageSize() const H5_OVERRIDE;
virtual hsize_t getStorageSize() const override;

// Returns the in memory size of this attribute's data.
virtual size_t getInMemDataSize() const H5_OVERRIDE;
virtual size_t getInMemDataSize() const override;

// Returns the number of bytes required to store VL data.
hsize_t getVlenBufSize(const DataType &type, const DataSpace &space) const;
Expand Down Expand Up @@ -100,7 +100,7 @@ class H5_DLLCPP DataSet : public H5Object, public AbstractDs {

///\brief Returns this class name.
virtual H5std_string
fromClass() const H5_OVERRIDE
fromClass() const override
{
return ("DataSet");
}
Expand All @@ -124,15 +124,15 @@ class H5_DLLCPP DataSet : public H5Object, public AbstractDs {
DataSet(const hid_t existing_id);

// Gets the dataset id.
virtual hid_t getId() const H5_OVERRIDE;
virtual hid_t getId() const override;

// Destructor: properly terminates access to this dataset.
virtual ~DataSet() H5_OVERRIDE;
virtual ~DataSet() override;

protected:
#ifndef DOXYGEN_SHOULD_SKIP_THIS
// Sets the dataset id.
virtual void p_setId(const hid_t new_id) H5_OVERRIDE;
virtual void p_setId(const hid_t new_id) override;
#endif // DOXYGEN_SHOULD_SKIP_THIS

private:
Expand All @@ -142,7 +142,7 @@ class H5_DLLCPP DataSet : public H5Object, public AbstractDs {
// getTypeClass and various API functions getXxxType
// defined in AbstractDs for generic datatype and specific
// sub-types
virtual hid_t p_get_type() const H5_OVERRIDE;
virtual hid_t p_get_type() const override;

// Reads variable or fixed len strings from this dataset.
void p_read_fixed_len(const hid_t mem_type_id, const hid_t mem_space_id, const hid_t file_space_id,
Expand Down
10 changes: 5 additions & 5 deletions c++/src/H5DataSpace.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class H5_DLLCPP DataSpace : public IdComponent {
DataSpace &operator=(const DataSpace &rhs);

// Closes this dataspace.
virtual void close() H5_OVERRIDE;
virtual void close() override;

// Makes copy of an existing dataspace.
void copy(const DataSpace &like_space);
Expand Down Expand Up @@ -115,25 +115,25 @@ class H5_DLLCPP DataSpace : public IdComponent {

///\brief Returns this class name.
virtual H5std_string
fromClass() const H5_OVERRIDE
fromClass() const override
{
return ("DataSpace");
}

// Gets the dataspace id.
virtual hid_t getId() const H5_OVERRIDE;
virtual hid_t getId() const override;

// Deletes the global constant
static void deleteConstants();

// Destructor: properly terminates access to this dataspace.
virtual ~DataSpace() H5_OVERRIDE;
virtual ~DataSpace() override;

#ifndef DOXYGEN_SHOULD_SKIP_THIS

protected:
// Sets the dataspace id.
virtual void p_setId(const hid_t new_id) H5_OVERRIDE;
virtual void p_setId(const hid_t new_id) override;

#endif // DOXYGEN_SHOULD_SKIP_THIS

Expand Down
10 changes: 5 additions & 5 deletions c++/src/H5DataType.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class H5_DLLCPP DataType : public H5Object {
// PropList& plist = PropList::DEFAULT);

// Closes this datatype.
virtual void close() H5_OVERRIDE;
virtual void close() override;

// Copies an existing datatype to this datatype object.
void copy(const DataType &like_type);
Expand Down Expand Up @@ -136,7 +136,7 @@ class H5_DLLCPP DataType : public H5Object {

///\brief Returns this class name.
virtual H5std_string
fromClass() const H5_OVERRIDE
fromClass() const override
{
return ("DataType");
}
Expand All @@ -151,10 +151,10 @@ class H5_DLLCPP DataType : public H5Object {
bool hasBinaryDesc() const;

// Gets the datatype id.
virtual hid_t getId() const H5_OVERRIDE;
virtual hid_t getId() const override;

// Destructor: properly terminates access to this datatype.
virtual ~DataType() H5_OVERRIDE;
virtual ~DataType() override;

protected:
#ifndef DOXYGEN_SHOULD_SKIP_THIS
Expand All @@ -165,7 +165,7 @@ class H5_DLLCPP DataType : public H5Object {
hid_t p_decode() const;

// Sets the datatype id.
virtual void p_setId(const hid_t new_id) H5_OVERRIDE;
virtual void p_setId(const hid_t new_id) override;

// Opens a datatype and returns the id.
hid_t p_opentype(const H5Location &loc, const char *dtype_name) const;
Expand Down
4 changes: 2 additions & 2 deletions c++/src/H5DcreatProp.h
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ class H5_DLLCPP DSetCreatPropList : public ObjCreatPropList {

///\brief Returns this class name.
virtual H5std_string
fromClass() const H5_OVERRIDE
fromClass() const override
{
return ("DSetCreatPropList");
}
Expand All @@ -141,7 +141,7 @@ class H5_DLLCPP DSetCreatPropList : public ObjCreatPropList {
DSetCreatPropList(const hid_t plist_id);

// Noop destructor.
virtual ~DSetCreatPropList() H5_OVERRIDE;
virtual ~DSetCreatPropList() override;

#ifndef DOXYGEN_SHOULD_SKIP_THIS

Expand Down
4 changes: 2 additions & 2 deletions c++/src/H5DxferProp.h
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ class H5_DLLCPP DSetMemXferPropList : public PropList {

///\brief Returns this class name.
virtual H5std_string
fromClass() const H5_OVERRIDE
fromClass() const override
{
return ("DSetMemXferPropList");
}
Expand All @@ -113,7 +113,7 @@ class H5_DLLCPP DSetMemXferPropList : public PropList {
DSetMemXferPropList(const hid_t plist_id);

// Noop destructor
virtual ~DSetMemXferPropList() H5_OVERRIDE;
virtual ~DSetMemXferPropList() override;

#ifndef DOXYGEN_SHOULD_SKIP_THIS

Expand Down
6 changes: 3 additions & 3 deletions c++/src/H5EnumType.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class H5_DLLCPP EnumType : public DataType {

// Returns an EnumType object via DataType* by decoding the
// binary object description of this type.
virtual DataType *decode() const H5_OVERRIDE;
virtual DataType *decode() const override;

// Returns the number of members in this enumeration datatype.
int getNmembers() const;
Expand All @@ -68,7 +68,7 @@ class H5_DLLCPP EnumType : public DataType {

///\brief Returns this class name.
virtual H5std_string
fromClass() const H5_OVERRIDE
fromClass() const override
{
return ("EnumType");
}
Expand All @@ -82,7 +82,7 @@ class H5_DLLCPP EnumType : public DataType {
// Copy constructor: same as the original EnumType.
EnumType(const EnumType &original);

virtual ~EnumType() H5_OVERRIDE;
virtual ~EnumType() override;

}; // end of EnumType
} // namespace H5
Expand Down
Loading