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

Commit 849008cc authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Make IGraphicBufferProducer a hybrid interface."

parents 825cc3ac 34cca21e
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -198,7 +198,8 @@ class ObjectPool {
    CObjMap objects_;
    FlagMap owns_;

    DISALLOW_COPY_AND_ASSIGN(ObjectPool);
    ObjectPool(const ObjectPool&) = delete;
    ObjectPool& operator=(const ObjectPool&) = delete;
};

template<typename T> ObjectPool<T>* ObjectPool<T>::instance_ = NULL;
+5 −1
Original line number Diff line number Diff line
@@ -41,7 +41,11 @@ LOCAL_EXPORT_LDLIBS := -llog -lgcc

LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code

LOCAL_STATIC_LIBRARIES := libarect
LOCAL_STATIC_LIBRARIES := \
    libarect \

LOCAL_SHARED_LIBRARIES += \
    libgui \

# TODO: Build a shared library as well?
include $(BUILD_STATIC_LIBRARY)
+0 −12
Original line number Diff line number Diff line
@@ -23,18 +23,6 @@
namespace android {
namespace filterfw {

// Convenience Macro to make copy constructor and assignment operator private
// (thereby disallowing copying and assigning).
#define DISALLOW_COPY_AND_ASSIGN(TypeName) \
  TypeName(const TypeName&);               \
  void operator=(const TypeName&)

// A macro to disallow all the implicit constructors, namely the
// default constructor, copy constructor and operator= functions.
#define DISALLOW_IMPLICIT_CONSTRUCTORS(TypeName) \
  TypeName();                                    \
  DISALLOW_COPY_AND_ASSIGN(TypeName)

// STLDeleteContainerPointers()
//  For a range within a container of pointers, calls delete
//  (non-array version) on these pointers.
+2 −1
Original line number Diff line number Diff line
@@ -256,7 +256,8 @@ class GLEnv {
    std::map<int, ShaderProgram*> attached_shaders_;
    std::map<int, VertexFrame*> attached_vframes_;

    DISALLOW_COPY_AND_ASSIGN(GLEnv);
    GLEnv(const GLEnv&) = delete;
    GLEnv& operator=(const GLEnv&) = delete;
};

} // namespace filterfw
+2 −1
Original line number Diff line number Diff line
@@ -76,7 +76,8 @@ class NativeFrame {
    // Capacity of data buffer in bytes.
    int capacity_;

    DISALLOW_COPY_AND_ASSIGN(NativeFrame);
    NativeFrame(const NativeFrame&) = delete;
    NativeFrame& operator=(const NativeFrame&) = delete;
};

} // namespace filterfw
Loading