Unverified Commit 9641e4c1 authored by Atkins, Charles Vernon's avatar Atkins, Charles Vernon Committed by GitHub
Browse files

Merge pull request #3145 from garth-wells/fix-cpp-build-errors

Syntax fix in declarations for C++20 compliance
parents 6891c60c 51561aab
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -43,8 +43,8 @@ public:
     * attributes from IO:DefineAttribute<T> or IO:InquireAttribute<T>.
     * Can be used with STL containers.
     */
    Attribute<T>() = default;
    ~Attribute<T>() = default;
    Attribute() = default;
    ~Attribute() = default;

    /** Checks if object is valid, e.g. if( attribute ) { //..valid } */
    explicit operator bool() const noexcept;
@@ -74,7 +74,7 @@ public:
    bool IsValue() const;

private:
    Attribute<T>(core::Attribute<IOType> *attribute);
    Attribute(core::Attribute<IOType> *attribute);
    core::Attribute<IOType> *m_Attribute = nullptr;
};

+3 −3
Original line number Diff line number Diff line
@@ -141,10 +141,10 @@ public:
     * variables from IO:DefineVariable<T> or IO:InquireVariable<T>.
     * Can be used with STL containers.
     */
    Variable<T>() = default;
    Variable() = default;

    /** Default, using RAII STL containers */
    ~Variable<T>() = default;
    ~Variable() = default;

    /** Checks if object is valid, e.g. if( variable ) { //..valid } */
    explicit operator bool() const noexcept;
@@ -389,7 +389,7 @@ public:
    using Span = adios2::detail::Span<T>;

private:
    Variable<T>(core::Variable<IOType> *variable);
    Variable(core::Variable<IOType> *variable);
    core::Variable<IOType> *m_Variable = nullptr;

    std::vector<std::vector<typename Variable<T>::Info>> DoAllStepsBlocksInfo();