diff options
| author | Tim Barron <tjbarron@google.com> | 2021-10-21 16:01:05 -0700 |
|---|---|---|
| committer | Tim Barron <tjbarron@google.com> | 2021-10-21 16:01:05 -0700 |
| commit | da1b8986e7c873efa45529b8adc4a32490eb9c3c (patch) | |
| tree | 1cc9dbe185e88e71c7c82ede8ba02578a36ef78f /icing/legacy/core | |
| parent | 8555f998fccca3aea3f6f67d44fce04775ddea97 (diff) | |
| download | icing-da1b8986e7c873efa45529b8adc4a32490eb9c3c.tar.gz | |
Sync from upstream.
Descriptions:
================
Replace refs to c lib headers w/ c++ stdlib equivalents.
================
Update IDF component of BM25F Calculator in IcingLib
================
Expose QuerySuggestions API.
================
Change the tokenizer used in QuerySuggest.
================
Add SectionWeights API to Icing.
================
Apply SectionWeights to BM25F Scoring.
================
Replaces uses of u_strTo/FromUTF32 w/ u_strTo/FromUTF8.
Bug: 152934343
Bug: 202308641
Bug: 203700301
Change-Id: Ic884a84e5ff4c9c04b2cd6dd1fce90765aa4446e
Diffstat (limited to 'icing/legacy/core')
| -rw-r--r-- | icing/legacy/core/icing-core-types.h | 3 | ||||
| -rw-r--r-- | icing/legacy/core/icing-string-util.cc | 9 | ||||
| -rw-r--r-- | icing/legacy/core/icing-string-util.h | 5 | ||||
| -rw-r--r-- | icing/legacy/core/icing-timer.h | 3 |
4 files changed, 9 insertions, 11 deletions
diff --git a/icing/legacy/core/icing-core-types.h b/icing/legacy/core/icing-core-types.h index cc12663..7db8408 100644 --- a/icing/legacy/core/icing-core-types.h +++ b/icing/legacy/core/icing-core-types.h @@ -21,9 +21,8 @@ #ifndef ICING_LEGACY_CORE_ICING_CORE_TYPES_H_ #define ICING_LEGACY_CORE_ICING_CORE_TYPES_H_ -#include <stdint.h> - #include <cstddef> // size_t not defined implicitly for all platforms. +#include <cstdint> #include <vector> #include "icing/legacy/core/icing-compat.h" diff --git a/icing/legacy/core/icing-string-util.cc b/icing/legacy/core/icing-string-util.cc index 2eb64ac..ed06e03 100644 --- a/icing/legacy/core/icing-string-util.cc +++ b/icing/legacy/core/icing-string-util.cc @@ -13,12 +13,11 @@ // limitations under the License. #include "icing/legacy/core/icing-string-util.h" -#include <stdarg.h> -#include <stddef.h> -#include <stdint.h> -#include <stdio.h> - #include <algorithm> +#include <cstdarg> +#include <cstddef> +#include <cstdint> +#include <cstdio> #include <string> #include "icing/legacy/portable/icing-zlib.h" diff --git a/icing/legacy/core/icing-string-util.h b/icing/legacy/core/icing-string-util.h index 767e581..e5e4941 100644 --- a/icing/legacy/core/icing-string-util.h +++ b/icing/legacy/core/icing-string-util.h @@ -15,9 +15,8 @@ #ifndef ICING_LEGACY_CORE_ICING_STRING_UTIL_H_ #define ICING_LEGACY_CORE_ICING_STRING_UTIL_H_ -#include <stdarg.h> -#include <stdint.h> - +#include <cstdarg> +#include <cstdint> #include <string> #include "icing/legacy/core/icing-compat.h" diff --git a/icing/legacy/core/icing-timer.h b/icing/legacy/core/icing-timer.h index 49ba9ad..af38912 100644 --- a/icing/legacy/core/icing-timer.h +++ b/icing/legacy/core/icing-timer.h @@ -16,7 +16,8 @@ #define ICING_LEGACY_CORE_ICING_TIMER_H_ #include <sys/time.h> -#include <time.h> + +#include <ctime> namespace icing { namespace lib { |