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

Commit 1c4902d3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Make some fdevent member functions pure virtual." am: b6a6023b am: dce1b6eb 

Change-Id: I84a95074c03d28a487571168b7ad144eb9e65221
parents d6e8d0b6 dce1b6eb

adb/fdevent/fdevent.h

+2 −2
Original line number Diff line number Diff line
@@ -79,8 +79,8 @@ struct fdevent_context { 
    unique_fd Destroy(fdevent* fde);



  protected:

    virtual void Register(fdevent*) {}

    virtual void Unregister(fdevent*) {}

    virtual void Register(fdevent*) = 0;

    virtual void Unregister(fdevent*) = 0;



  public:

    // Change which events should cause notifications.

adb/fdevent/fdevent_poll.cpp

+4 −0
Original line number Diff line number Diff line
@@ -211,3 +211,7 @@ void fdevent_context_poll::Interrupt() { 
        PLOG(FATAL) << "failed to write to fdevent interrupt fd";

    }

}



void fdevent_context_poll::Register(fdevent*) {}



void fdevent_context_poll::Unregister(fdevent*) {}

adb/fdevent/fdevent_poll.h

+3 −0
Original line number Diff line number Diff line
@@ -48,6 +48,9 @@ struct fdevent_context_poll final : public fdevent_context { 
    fdevent_context_poll();

    virtual ~fdevent_context_poll();



    virtual void Register(fdevent* fde) final;

    virtual void Unregister(fdevent* fde) final;



    virtual void Set(fdevent* fde, unsigned events) final;



    virtual void Loop() final;