diff options
| author | Cassie Wang <cassiewang@google.com> | 2020-01-16 10:12:38 -0800 |
|---|---|---|
| committer | Cassie Wang <cassiewang@google.com> | 2020-01-16 12:26:33 -0800 |
| commit | 533fe97b018af47301d7dc1ca3fb2e3ad5ee3eb8 (patch) | |
| tree | 86f3ed098a3eccd8019f0b31c3ea10e4779cf4bd /icing/text_classifier/lib3 | |
| parent | 88a9b37a20d4a601baf3b6ca0cfb1ad826dc7e29 (diff) | |
| download | icing-533fe97b018af47301d7dc1ca3fb2e3ad5ee3eb8.tar.gz | |
Pull upstream changes.
Upstream synced @290094995
Bug: 146383629
Test: manual, ran 'm -j libicing' with a local Android.bp
Change-Id: I63eb12e93f3de5d6607ba7006fd3ea532dc079e4
Diffstat (limited to 'icing/text_classifier/lib3')
| -rw-r--r-- | icing/text_classifier/lib3/utils/base/integral_types.h | 6 | ||||
| -rw-r--r-- | icing/text_classifier/lib3/utils/base/logging.cc | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/icing/text_classifier/lib3/utils/base/integral_types.h b/icing/text_classifier/lib3/utils/base/integral_types.h index 0906e72..3baa903 100644 --- a/icing/text_classifier/lib3/utils/base/integral_types.h +++ b/icing/text_classifier/lib3/utils/base/integral_types.h @@ -64,9 +64,15 @@ static_assert(sizeof(int64) == 8, "wrong size"); // casts, and C doesn't know how to read braced-initialization for // integers. #if defined(__cplusplus) +const uint16 kuint16max{0xFFFF}; +const int16 kint16max{0x7FFF}; +const int16 kint16min{~0x7FFF}; const uint32 kuint32max{0xFFFFFFFF}; const int32 kint32max{0x7FFFFFFF}; #else // not __cplusplus, this branch exists only for C-compat +static const uint16 kuint16max = ((uint16)0xFFFF); +static const int16 kint16min = ((int16)~0x7FFF); +static const int16 kint16max = ((int16)0x7FFF); static const uint32 kuint32max = ((uint32)0xFFFFFFFF); static const int32 kint32max = ((int32)0x7FFFFFFF); #endif // __cplusplus diff --git a/icing/text_classifier/lib3/utils/base/logging.cc b/icing/text_classifier/lib3/utils/base/logging.cc index 0758062..033a193 100644 --- a/icing/text_classifier/lib3/utils/base/logging.cc +++ b/icing/text_classifier/lib3/utils/base/logging.cc @@ -55,7 +55,7 @@ LogMessage::LogMessage(LogSeverity severity, const char *file_name, } LogMessage::~LogMessage() { - LowLevelLogging(severity_, /* tag = */ "txtClsf", stream_.message); + LowLevelLogging(severity_, /* tag = */ "icing", stream_.message); if (severity_ == FATAL) { std::terminate(); // Will print a stacktrace (stdout or logcat). } |