Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a3c1dfd authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Reexport operator!= overloads in the derived type to avoid ambiguous... 

Merge "Reexport operator!= overloads in the derived type to avoid ambiguous base class lookups" into main
parents 41c7350d 1c85cbeb

media/codec2/core/include/C2ParamDef.h

+8 −0
Original line number Diff line number Diff line
@@ -404,6 +404,7 @@ public: 
    /// Specialization for an input port parameter.

    struct input : public T, public S,

            public _C2StructCheck<S, ParamIndex, T::PARAM_KIND | T::Index::DIR_INPUT> {

        using T::operator!=;

        _C2_CORE_INDEX_OVERRIDE(ParamIndex)

        /// Wrapper around base structure's constructor.

        template<typename ...Args>
@@ -416,6 +417,7 @@ public: 
    /// Specialization for an output port parameter.

    struct output : public T, public S,

            public _C2StructCheck<S, ParamIndex, T::PARAM_KIND | T::Index::DIR_OUTPUT> {

        using T::operator!=;

        _C2_CORE_INDEX_OVERRIDE(ParamIndex)

        /// Wrapper around base structure's constructor.

        template<typename ...Args>
@@ -470,6 +472,7 @@ public: 
    /// Specialization for an input port parameter.

    struct input : public T,

            public _C2FlexStructCheck<S, ParamIndex, T::PARAM_KIND | T::Index::DIR_INPUT> {

        using T::operator!=;

    private:

        /// Wrapper around base structure's constructor while also specifying port/direction.

        template<typename ...Args>
@@ -486,6 +489,7 @@ public: 
    /// Specialization for an output port parameter.

    struct output : public T,

            public _C2FlexStructCheck<S, ParamIndex, T::PARAM_KIND | T::Index::DIR_OUTPUT> {

        using T::operator!=;

    private:

        /// Wrapper around base structure's constructor while also specifying port/direction.

        template<typename ...Args>
@@ -549,6 +553,7 @@ public: 
    struct input : public T, public S,

            public _C2StructCheck<S, ParamIndex,

                    T::PARAM_KIND | T::Index::IS_STREAM_FLAG | T::Type::DIR_INPUT> {

        using T::operator!=;

        _C2_CORE_INDEX_OVERRIDE(ParamIndex)



        /// Default constructor. Stream-ID is undefined.
@@ -567,6 +572,7 @@ public: 
    struct output : public T, public S,

            public _C2StructCheck<S, ParamIndex,

                    T::PARAM_KIND | T::Index::IS_STREAM_FLAG | T::Type::DIR_OUTPUT> {

        using T::operator!=;

        _C2_CORE_INDEX_OVERRIDE(ParamIndex)



        /// Default constructor. Stream-ID is undefined.
@@ -634,6 +640,7 @@ public: 
    struct input : public T,

            public _C2FlexStructCheck<S, ParamIndex,

                    T::PARAM_KIND | T::Index::IS_STREAM_FLAG | T::Type::DIR_INPUT> {

        using T::operator!=;

    private:

        /// Default constructor. Stream-ID is undefined.

        inline input(size_t flexCount) : T(_Type::CalcSize(flexCount), input::PARAM_TYPE) { }
@@ -656,6 +663,7 @@ public: 
    struct output : public T,

            public _C2FlexStructCheck<S, ParamIndex,

                    T::PARAM_KIND | T::Index::IS_STREAM_FLAG | T::Type::DIR_OUTPUT> {

        using T::operator!=;

    private:

        /// Default constructor. Stream-ID is undefined.

        inline output(size_t flexCount) : T(_Type::CalcSize(flexCount), output::PARAM_TYPE) { }