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

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

Merge "Fix google-explicit-constructor warnings in utils." 

am: 5b7e3b9a

Change-Id: I88b7d5f20f26a028c90efdb837730e5b8631ce80
parents 9d963a2b 5b7e3b9a

include/utils/Condition.h

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ public: 
    };



    Condition();

    Condition(int type);

    explicit Condition(int type);

    ~Condition();

    // Wait on the condition variable.  Lock the mutex before calling.

    status_t wait(Mutex& mutex);

include/utils/Mutex.h

+4 −4
Original line number Diff line number Diff line
@@ -52,8 +52,8 @@ public: 
    };



                Mutex();

                Mutex(const char* name);

                Mutex(int type, const char* name = NULL);

    explicit    Mutex(const char* name);

    explicit    Mutex(int type, const char* name = NULL);

                ~Mutex();



    // lock or unlock the mutex
@@ -77,8 +77,8 @@ public: 
    // constructed and released when Autolock goes out of scope.

    class Autolock {

    public:

        inline Autolock(Mutex& mutex) : mLock(mutex)  { mLock.lock(); }

        inline Autolock(Mutex* mutex) : mLock(*mutex) { mLock.lock(); }

        inline explicit Autolock(Mutex& mutex) : mLock(mutex)  { mLock.lock(); }

        inline explicit Autolock(Mutex* mutex) : mLock(*mutex) { mLock.lock(); }

        inline ~Autolock() { mLock.unlock(); }

    private:

        Mutex& mLock;

include/utils/RWLock.h

+4 −4
Original line number Diff line number Diff line
@@ -47,8 +47,8 @@ public: 
    };



                RWLock();

                RWLock(const char* name);

                RWLock(int type, const char* name = NULL);

    explicit    RWLock(const char* name);

    explicit    RWLock(int type, const char* name = NULL);

                ~RWLock();



    status_t    readLock();
@@ -59,7 +59,7 @@ public: 


    class AutoRLock {

    public:

        inline AutoRLock(RWLock& rwlock) : mLock(rwlock)  { mLock.readLock(); }

        inline explicit AutoRLock(RWLock& rwlock) : mLock(rwlock)  { mLock.readLock(); }

        inline ~AutoRLock() { mLock.unlock(); }

    private:

        RWLock& mLock;
@@ -67,7 +67,7 @@ public: 


    class AutoWLock {

    public:

        inline AutoWLock(RWLock& rwlock) : mLock(rwlock)  { mLock.writeLock(); }

        inline explicit AutoWLock(RWLock& rwlock) : mLock(rwlock)  { mLock.writeLock(); }

        inline ~AutoWLock() { mLock.unlock(); }

    private:

        RWLock& mLock;

include/utils/RefBase.h

+5 −5
Original line number Diff line number Diff line
@@ -222,12 +222,12 @@ public: 
    

    inline wp() : m_ptr(0) { }



    wp(T* other);

    wp(T* other);  // NOLINT(implicit)

    wp(const wp<T>& other);

    wp(const sp<T>& other);

    template<typename U> wp(U* other);

    template<typename U> wp(const sp<U>& other);

    template<typename U> wp(const wp<U>& other);

    explicit wp(const sp<T>& other);

    template<typename U> wp(U* other);  // NOLINT(implicit)

    template<typename U> wp(const sp<U>& other);  // NOLINT(implicit)

    template<typename U> wp(const wp<U>& other);  // NOLINT(implicit)



    ~wp();

include/utils/StrongPointer.h

+4 −4
Original line number Diff line number Diff line
@@ -60,12 +60,12 @@ class sp { 
public:

    inline sp() : m_ptr(0) { }



    sp(T* other);

    sp(T* other);  // NOLINT(implicit)

    sp(const sp<T>& other);

    sp(sp<T>&& other);

    template<typename U> sp(U* other);

    template<typename U> sp(const sp<U>& other);

    template<typename U> sp(sp<U>&& other);

    template<typename U> sp(U* other);  // NOLINT(implicit)

    template<typename U> sp(const sp<U>& other);  // NOLINT(implicit)

    template<typename U> sp(sp<U>&& other);  // NOLINT(implicit)



    ~sp();