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

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

Merge "binder: fix inconsistent-missing-override warning."

parents 61addf0d f4bb6ffe

libs/binder/IMemory.cpp

+4 −4
Original line number Diff line number Diff line
@@ -82,10 +82,10 @@ public: 
    explicit BpMemoryHeap(const sp<IBinder>& impl);

    virtual ~BpMemoryHeap();



    virtual int getHeapID() const;

    virtual void* getBase() const;

    virtual size_t getSize() const;

    virtual uint32_t getFlags() const;

    int getHeapID() const override;

    void* getBase() const override;

    size_t getSize() const override;

    uint32_t getFlags() const override;

    off_t getOffset() const override;



private:

libs/binder/include/binder/MemoryHeapBase.h

+5 −5
Original line number Diff line number Diff line
@@ -57,13 +57,13 @@ public: 
    virtual ~MemoryHeapBase();



    /* implement IMemoryHeap interface */

    virtual int         getHeapID() const;

    int         getHeapID() const override;



    /* virtual address of the heap. returns MAP_FAILED in case of error */

    virtual void*       getBase() const;

    void*       getBase() const override;



    virtual size_t      getSize() const;

    virtual uint32_t    getFlags() const;

    size_t      getSize() const override;

    uint32_t    getFlags() const override;

    off_t       getOffset() const override;



    const char*         getDevice() const;