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

Commit a640ed60 authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh Committed by android-build-merger
Browse files

Merge "Fix/suppress renderthread google-explicit-constructor warnings" am:...

Merge "Fix/suppress renderthread google-explicit-constructor warnings" am: 138aae8e am: 2e2028ae
am: 4e628bc7

Change-Id: I543de7a1c0e3429ca11addd60ae8300d8aedda29
parents 1c6f7f0e 4e628bc7
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ public:
private:
    friend class RenderThread;

    CacheManager(const DisplayInfo& display);
    explicit CacheManager(const DisplayInfo& display);

    void reset(sk_sp<GrContext> grContext);
    void destroy();
+1 −0
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ private:
            fPtr = ptr;
            return *this;
        }
        // NOLINTNEXTLINE(google-explicit-constructor)
        operator FNPTR_TYPE() const { return fPtr; }

    private: