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

Commit 97c921ed authored by Henri Chataing's avatar Henri Chataing Committed by Gerrit Code Review
Browse files

Merge "Inline DISALLOW_COPY_AND_ASSIGN" into main

parents 21c606da cafa0e52

android/app/jni/com_android_bluetooth.h

+2 −1
Original line number Diff line number Diff line
@@ -124,7 +124,8 @@ private: 
    JNIEnv *mCallbackEnv;

    const char *mName;



    DISALLOW_COPY_AND_ASSIGN(CallbackEnv);

    CallbackEnv(const CallbackEnv&) = delete;

    void operator=(const CallbackEnv&) = delete;

};



const bt_interface_t* getBluetoothInterface();

system/common/utils.h

+0 −7
Original line number Diff line number Diff line
@@ -22,10 +22,3 @@ 
  do {                  \

  } while ((fn) == -1 && errno == EINTR)

#endif
 


// A macro to disallow the copy constructor and operator= functions

#ifndef DISALLOW_COPY_AND_ASSIGN

#define DISALLOW_COPY_AND_ASSIGN(TypeName) \

  TypeName(const TypeName&) = delete;      \

  void operator=(const TypeName&) = delete

#endif

system/gd/os/utils.h

+0 −7
Original line number Diff line number Diff line
@@ -23,10 +23,3 @@ 
  do {                  \

  } while ((fn) == -1 && errno == EINTR)

#endif
 


// A macro to disallow the copy constructor and operator= functions

#ifndef DISALLOW_COPY_AND_ASSIGN

#define DISALLOW_COPY_AND_ASSIGN(TypeName) \

  TypeName(const TypeName&) = delete;      \

  void operator=(const TypeName&) = delete

#endif