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

Commit cafa0e52 authored by Henri Chataing's avatar Henri Chataing
Browse files

Inline DISALLOW_COPY_AND_ASSIGN 

Used in one location only, defined twice

Bug: 331817295
Test: m com.android.btservices
Flag: EXEMPT, macro inlining
Change-Id: I4c992ed51ed2df258a69bf7e8aeac6e2317c970b
parent f74910d4

android/app/jni/com_android_bluetooth.h

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

    JNIEnv *mCallbackEnv;

    const char *mName;

    const char *mName;





    DISALLOW_COPY_AND_ASSIGN(CallbackEnv);

    CallbackEnv(const CallbackEnv&) = delete;

    void operator=(const CallbackEnv&) = delete;

};

};





const bt_interface_t* getBluetoothInterface();

const bt_interface_t* getBluetoothInterface();

system/common/utils.h

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

  do {                  \

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

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

#endif
 
#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 Original line Diff line number Diff line
@@ -23,10 +23,3 @@ 
  do {                  \

  do {                  \

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

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

#endif
 
#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