Use uint32_t as ucs4_t

4 files changed, 6 insertions, 4 deletions

diff --git a/searchlib/src/vespa/searchlib/attribute/string_search_helper.h b/searchlib/src/vespa/searchlib/attribute/string_search_helper.h
index 5763ddcb80a..ee68053122f 100644
--- a/searchlib/src/vespa/searchlib/attribute/string_search_helper.h
+++ b/searchlib/src/vespa/searchlib/attribute/string_search_helper.h
@@ -29,7 +29,7 @@ public:
     const vespalib::Regex & getRegex() const noexcept { return _regex; }
     const FuzzyMatcher & getFuzzyMatcher() const noexcept { return *_fuzzyMatcher; }
 private:
-    using ucs4_t = unsigned int;
+    using ucs4_t = uint32_t;
     vespalib::Regex                _regex;
     std::unique_ptr<FuzzyMatcher>  _fuzzyMatcher;
     std::unique_ptr<ucs4_t[]>      _ucs4;
diff --git a/searchlib/src/vespa/searchlib/query/query_term_ucs4.h b/searchlib/src/vespa/searchlib/query/query_term_ucs4.h
index a987a22f67b..af47873b75e 100644
--- a/searchlib/src/vespa/searchlib/query/query_term_ucs4.h
+++ b/searchlib/src/vespa/searchlib/query/query_term_ucs4.h
@@ -11,7 +11,7 @@ namespace search {
  */
 class QueryTermUCS4 : public QueryTermSimple {
 public:
-    using ucs4_t = unsigned int;
+    using ucs4_t = uint32_t;
     QueryTermUCS4(const QueryTermUCS4 &) = delete;
     QueryTermUCS4 & operator = (const QueryTermUCS4 &) = delete;
     QueryTermUCS4(QueryTermUCS4 &&) = delete;
diff --git a/streamingvisitors/src/vespa/vsm/searcher/fieldsearcher.h b/streamingvisitors/src/vespa/vsm/searcher/fieldsearcher.h
index dedf20021e9..ec3ec359a0c 100644
--- a/streamingvisitors/src/vespa/vsm/searcher/fieldsearcher.h
+++ b/streamingvisitors/src/vespa/vsm/searcher/fieldsearcher.h
@@ -20,7 +20,7 @@ using termsize_t = size_t;
   #define NEED_CHAR_STAT(a)
 #endif
 
-using ucs4_t = unsigned int;
+using ucs4_t = uint32_t;
 using cmptype_t = ucs4_t;
 using SearcherBuf = vespalib::Array<cmptype_t>;
 using SharedSearcherBuf = std::shared_ptr<SearcherBuf>;
diff --git a/vespalib/src/vespa/fastlib/text/unicodeutil.h b/vespalib/src/vespa/fastlib/text/unicodeutil.h
index 39ea9147b5c..da2f9a29d30 100644
--- a/vespalib/src/vespa/fastlib/text/unicodeutil.h
+++ b/vespalib/src/vespa/fastlib/text/unicodeutil.h
@@ -4,10 +4,12 @@
  */
 #pragma once
 
+#include <cstddef>
+#include <cstdint>
 #include <sys/types.h>
 
 /** ucs4_t is the type of the 4-byte UCS4 characters */
-using ucs4_t = unsigned int;
+using ucs4_t = uint32_t;
 
 /**
  * Utility class for unicode character handling.