diff options
| author |   Jean Chalard <jchalard@google.com> | 2012-07-31 08:30:15 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2012-07-31 08:30:15 -0700 |
| commit | 47e6cf3695ab15b042d85f0d8b55d1eb58e14223 (patch) | |
| tree | c5743ae7eee028a3c68220151a26c1728b3ba617 /native/jni/src/terminal_attributes.h | |
| parent | df3f09c2e7fab17fe39b52fc9da99ac6da3647dc (diff) | |
| parent | 195605084ed156b58f0bae002f121d98c1ace867 (diff) | |
| download | latinime-47e6cf3695ab15b042d85f0d8b55d1eb58e14223.tar.gz latinime-47e6cf3695ab15b042d85f0d8b55d1eb58e14223.tar.xz latinime-47e6cf3695ab15b042d85f0d8b55d1eb58e14223.zip | |
am 19560508: Move flags belonging to BinaryFormat to the right place.
* commit '195605084ed156b58f0bae002f121d98c1ace867':
Move flags belonging to BinaryFormat to the right place.
Diffstat (limited to 'native/jni/src/terminal_attributes.h')
| -rw-r--r-- | native/jni/src/terminal_attributes.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/native/jni/src/terminal_attributes.h b/native/jni/src/terminal_attributes.h index 755635fba..d63364514 100644 --- a/native/jni/src/terminal_attributes.h +++ b/native/jni/src/terminal_attributes.h @@ -17,7 +17,7 @@ #ifndef LATINIME_TERMINAL_ATTRIBUTES_H #define LATINIME_TERMINAL_ATTRIBUTES_H -#include "unigram_dictionary.h" +#include "binary_format.h" namespace latinime { @@ -36,7 +36,7 @@ class TerminalAttributes { public: ShortcutIterator(const uint8_t *dict, const int pos, const uint8_t flags) : mDict(dict), mPos(pos) { - mHasNextShortcutTarget = (0 != (flags & UnigramDictionary::FLAG_HAS_SHORTCUT_TARGETS)); + mHasNextShortcutTarget = (0 != (flags & BinaryFormat::FLAG_HAS_SHORTCUT_TARGETS)); } inline bool hasNextShortcutTarget() const { @@ -49,7 +49,7 @@ class TerminalAttributes { inline int getNextShortcutTarget(const int maxDepth, uint16_t *outWord) { const int shortcutFlags = BinaryFormat::getFlagsAndForwardPointer(mDict, &mPos); mHasNextShortcutTarget = - 0 != (shortcutFlags & UnigramDictionary::FLAG_ATTRIBUTE_HAS_NEXT); + 0 != (shortcutFlags & BinaryFormat::FLAG_ATTRIBUTE_HAS_NEXT); unsigned int i; for (i = 0; i < MAX_WORD_LENGTH_INTERNAL; ++i) { const int charCode = BinaryFormat::getCharCodeAndForwardPointer(mDict, &mPos); |