diff options
| author |   Yohei Yukawa <yukawa@google.com> | 2014-03-06 04:23:14 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-03-06 04:23:14 -0800 |
| commit | 567779382218b33ce64a4b6529cfc20fcefea386 (patch) | |
| tree | 4fd0850b6ea65ed9e5ff0293bc918a23dc216cf7 | |
| parent | 566e944f39ede694fb85944ee7321926ff2dba46 (diff) | |
| parent | 72c362985cdafacfe9411aa700666bc0be556483 (diff) | |
| download | latinime-567779382218b33ce64a4b6529cfc20fcefea386.tar.gz latinime-567779382218b33ce64a4b6529cfc20fcefea386.tar.xz latinime-567779382218b33ce64a4b6529cfc20fcefea386.zip | |
am 72c36298: Use C++11 deleted functions to implement DISALLOW_ macros
* commit '72c362985cdafacfe9411aa700666bc0be556483':
Use C++11 deleted functions to implement DISALLOW_ macros
| -rw-r--r-- | native/jni/src/defines.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/native/jni/src/defines.h b/native/jni/src/defines.h index 22cc4c02b..0715fbd70 100644 --- a/native/jni/src/defines.h +++ b/native/jni/src/defines.h @@ -352,13 +352,13 @@ template<typename T> AK_FORCE_INLINE const T &max(const T &a, const T &b) { retu #define MIN_OUTPUT_INDEX_FOR_DEBUG (-1) #define DISALLOW_DEFAULT_CONSTRUCTOR(TypeName) \ - TypeName() + TypeName() = delete #define DISALLOW_COPY_CONSTRUCTOR(TypeName) \ - TypeName(const TypeName&) + TypeName(const TypeName&) = delete #define DISALLOW_ASSIGNMENT_OPERATOR(TypeName) \ - void operator=(const TypeName&) + void operator=(const TypeName&) = delete #define DISALLOW_COPY_AND_ASSIGN(TypeName) \ DISALLOW_COPY_CONSTRUCTOR(TypeName); \ |