diff options
| author |   Keisuke Kuroyanagi <ksk@google.com> | 2013-12-02 10:53:18 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2013-12-02 10:53:18 +0000 |
| commit | 027de367067c03e4f07c0bafbb79d68d464d6df2 (patch) | |
| tree | 2233c4488c3621d1aaa2473a28919489bd5947cd /native/jni/src/defines.h | |
| parent | 545e4191b30c072315dee61b6189fe2eb03c493f (diff) | |
| parent | 69e6165d2eea707ab6ba2d5b2bfd1a959b412984 (diff) | |
| download | latinime-027de367067c03e4f07c0bafbb79d68d464d6df2.tar.gz latinime-027de367067c03e4f07c0bafbb79d68d464d6df2.tar.xz latinime-027de367067c03e4f07c0bafbb79d68d464d6df2.zip | |
Merge "Extend bigram probability field to support historical info."
Diffstat (limited to 'native/jni/src/defines.h')
| -rw-r--r-- | native/jni/src/defines.h | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/native/jni/src/defines.h b/native/jni/src/defines.h index fbcd612b7..564811560 100644 --- a/native/jni/src/defines.h +++ b/native/jni/src/defines.h @@ -341,12 +341,21 @@ template<typename T> AK_FORCE_INLINE const T &max(const T &a, const T &b) { retu #define INPUTLENGTH_FOR_DEBUG (-1) #define MIN_OUTPUT_INDEX_FOR_DEBUG (-1) -#define DISALLOW_COPY_AND_ASSIGN(TypeName) \ - TypeName(const TypeName&); \ +#define DISALLOW_DEFAULT_CONSTRUCTOR(TypeName) \ + TypeName() + +#define DISALLOW_COPY_CONSTRUCTOR(TypeName) \ + TypeName(const TypeName&) + +#define DISALLOW_ASSIGNMENT_OPERATOR(TypeName) \ void operator=(const TypeName&) +#define DISALLOW_COPY_AND_ASSIGN(TypeName) \ + DISALLOW_COPY_CONSTRUCTOR(TypeName); \ + DISALLOW_ASSIGNMENT_OPERATOR(TypeName) + #define DISALLOW_IMPLICIT_CONSTRUCTORS(TypeName) \ - TypeName(); \ + DISALLOW_DEFAULT_CONSTRUCTOR(TypeName); \ DISALLOW_COPY_AND_ASSIGN(TypeName) // Used as a return value for character comparison |