aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/marisa/grimoire/io/reader.cc6
-rw-r--r--lib/marisa/grimoire/io/writer.cc6
-rw-r--r--lib/marisa/grimoire/trie/config.h2
-rw-r--r--lib/marisa/grimoire/trie/louds-trie.cc3
-rw-r--r--lib/marisa/grimoire/vector/bit-vector.cc2
-rw-r--r--tests/marisa-test.cc3
-rw-r--r--tests/vector-test.cc2
-rw-r--r--tools/marisa-benchmark.cc3
-rw-r--r--tools/marisa-build.cc3
-rw-r--r--tools/marisa-common-prefix-search.cc5
-rw-r--r--tools/marisa-dump.cc6
-rw-r--r--tools/marisa-lookup.cc3
-rw-r--r--tools/marisa-predictive-search.cc5
-rw-r--r--tools/marisa-reverse-lookup.cc5
14 files changed, 32 insertions, 22 deletions
diff --git a/lib/marisa/grimoire/io/reader.cc b/lib/marisa/grimoire/io/reader.cc
index caba092..b9c0809 100644
--- a/lib/marisa/grimoire/io/reader.cc
+++ b/lib/marisa/grimoire/io/reader.cc
@@ -128,14 +128,14 @@ void Reader::read_data(void *buf, std::size_t size) {
#endif // _WIN32
MARISA_THROW_IF(size_read <= 0, MARISA_IO_ERROR);
buf = static_cast<char *>(buf) + size_read;
- size -= size_read;
+ size -= static_cast<std::size_t>(size_read);
}
} else if (file_ != NULL) {
MARISA_THROW_IF(::fread(buf, 1, size, file_) != size, MARISA_IO_ERROR);
} else if (stream_ != NULL) {
try {
- MARISA_THROW_IF(!stream_->read(static_cast<char *>(buf), size),
- MARISA_IO_ERROR);
+ MARISA_THROW_IF(!stream_->read(static_cast<char *>(buf),
+ static_cast<std::streamsize>(size)), MARISA_IO_ERROR);
} catch (const std::ios_base::failure &) {
MARISA_THROW(MARISA_IO_ERROR, "std::ios_base::failure");
}
diff --git a/lib/marisa/grimoire/io/writer.cc b/lib/marisa/grimoire/io/writer.cc
index 3c62e06..fb3d2d0 100644
--- a/lib/marisa/grimoire/io/writer.cc
+++ b/lib/marisa/grimoire/io/writer.cc
@@ -128,15 +128,15 @@ void Writer::write_data(const void *data, std::size_t size) {
#endif // _WIN32
MARISA_THROW_IF(size_written <= 0, MARISA_IO_ERROR);
data = static_cast<const char *>(data) + size_written;
- size -= size_written;
+ size -= static_cast<std::size_t>(size_written);
}
} else if (file_ != NULL) {
MARISA_THROW_IF(::fwrite(data, 1, size, file_) != size, MARISA_IO_ERROR);
MARISA_THROW_IF(::fflush(file_) != 0, MARISA_IO_ERROR);
} else if (stream_ != NULL) {
try {
- MARISA_THROW_IF(!stream_->write(static_cast<const char *>(data), size),
- MARISA_IO_ERROR);
+ MARISA_THROW_IF(!stream_->write(static_cast<const char *>(data),
+ static_cast<std::streamsize>(size)), MARISA_IO_ERROR);
} catch (const std::ios_base::failure &) {
MARISA_THROW(MARISA_IO_ERROR, "std::ios_base::failure");
}
diff --git a/lib/marisa/grimoire/trie/config.h b/lib/marisa/grimoire/trie/config.h
index 73cde5b..2f1e17a 100644
--- a/lib/marisa/grimoire/trie/config.h
+++ b/lib/marisa/grimoire/trie/config.h
@@ -67,7 +67,7 @@ class Config {
void parse_num_tries(int config_flags) {
const int num_tries = config_flags & MARISA_NUM_TRIES_MASK;
if (num_tries != 0) {
- num_tries_ = num_tries;
+ num_tries_ = static_cast<std::size_t>(num_tries);
}
}
diff --git a/lib/marisa/grimoire/trie/louds-trie.cc b/lib/marisa/grimoire/trie/louds-trie.cc
index e7f6ff0..df191f5 100644
--- a/lib/marisa/grimoire/trie/louds-trie.cc
+++ b/lib/marisa/grimoire/trie/louds-trie.cc
@@ -400,7 +400,8 @@ void LoudsTrie::build_current_trie(Vector<T> &keys,
keys[w_range.begin()][w_range.key_pos()]);
if (key_pos == w_range.key_pos() + 1) {
- bases_.push_back(keys[w_range.begin()][w_range.key_pos()]);
+ bases_.push_back(static_cast<unsigned char>(
+ keys[w_range.begin()][w_range.key_pos()]));
link_flags_.push_back(false);
} else {
bases_.push_back('\0');
diff --git a/lib/marisa/grimoire/vector/bit-vector.cc b/lib/marisa/grimoire/vector/bit-vector.cc
index 5411220..ab35b5d 100644
--- a/lib/marisa/grimoire/vector/bit-vector.cc
+++ b/lib/marisa/grimoire/vector/bit-vector.cc
@@ -202,7 +202,7 @@ std::size_t select_bit(std::size_t i, std::size_t bit_id, UInt64 unit) {
#endif // _MSC_VER
#endif // defined(MARISA_X64) && defined(MARISA_USE_POPCNT)
- bit_id += skip;
+ bit_id += static_cast<std::size_t>(skip);
unit >>= skip;
i -= ((counts << 8) >> skip) & 0xFF;
diff --git a/tests/marisa-test.cc b/tests/marisa-test.cc
index 73b27dc..36e4258 100644
--- a/tests/marisa-test.cc
+++ b/tests/marisa-test.cc
@@ -204,7 +204,8 @@ void MakeKeyset(std::size_t num_keys, marisa::TailMode tail_mode,
marisa::Keyset *keyset) {
char key_buf[16];
for (std::size_t i = 0; i < num_keys; ++i) {
- const std::size_t length = std::rand() % sizeof(key_buf);
+ const std::size_t length =
+ static_cast<std::size_t>(std::rand()) % sizeof(key_buf);
for (std::size_t j = 0; j < length; ++j) {
key_buf[j] = (char)(std::rand() % 10);
if (tail_mode == MARISA_TEXT_TAIL) {
diff --git a/tests/vector-test.cc b/tests/vector-test.cc
index c137c97..a11cd12 100644
--- a/tests/vector-test.cc
+++ b/tests/vector-test.cc
@@ -340,7 +340,7 @@ void TestFlatVector() {
values.clear();
for (std::size_t i = 0; i < 10000; ++i) {
- values.push_back(std::rand());
+ values.push_back(static_cast<marisa::UInt32>(std::rand()));
}
vec.build(values);
diff --git a/tools/marisa-benchmark.cc b/tools/marisa-benchmark.cc
index c39d006..122073c 100644
--- a/tools/marisa-benchmark.cc
+++ b/tools/marisa-benchmark.cc
@@ -415,5 +415,6 @@ int main(int argc, char *argv[]) {
}
}
print_config();
- return benchmark(cmdopt.argv + cmdopt.optind, cmdopt.argc - cmdopt.optind);
+ return benchmark(cmdopt.argv + cmdopt.optind,
+ static_cast<std::size_t>(cmdopt.argc - cmdopt.optind));
}
diff --git a/tools/marisa-build.cc b/tools/marisa-build.cc
index 92e7bfe..bffddb1 100644
--- a/tools/marisa-build.cc
+++ b/tools/marisa-build.cc
@@ -202,5 +202,6 @@ int main(int argc, char *argv[]) {
}
}
}
- return build(cmdopt.argv + cmdopt.optind, cmdopt.argc - cmdopt.optind);
+ return build(cmdopt.argv + cmdopt.optind,
+ static_cast<std::size_t>(cmdopt.argc - cmdopt.optind));
}
diff --git a/tools/marisa-common-prefix-search.cc b/tools/marisa-common-prefix-search.cc
index 1b2cb31..55a1f86 100644
--- a/tools/marisa-common-prefix-search.cc
+++ b/tools/marisa-common-prefix-search.cc
@@ -69,7 +69,8 @@ int common_prefix_search(const char * const *args, std::size_t num_args) {
const std::size_t end = std::min(max_num_results, keyset.size());
for (std::size_t i = 0; i < end; ++i) {
std::cout << keyset[i].id() << '\t';
- std::cout.write(keyset[i].ptr(), keyset[i].length()) << '\t';
+ std::cout.write(keyset[i].ptr(),
+ static_cast<std::streamsize>(keyset[i].length())) << '\t';
std::cout << str << '\n';
}
}
@@ -139,5 +140,5 @@ int main(int argc, char *argv[]) {
}
}
return common_prefix_search(cmdopt.argv + cmdopt.optind,
- cmdopt.argc - cmdopt.optind);
+ static_cast<std::size_t>(cmdopt.argc - cmdopt.optind));
}
diff --git a/tools/marisa-dump.cc b/tools/marisa-dump.cc
index 1551dfe..1b086d8 100644
--- a/tools/marisa-dump.cc
+++ b/tools/marisa-dump.cc
@@ -34,7 +34,8 @@ int dump(const marisa::Trie &trie) {
agent.set_query("");
try {
while (trie.predictive_search(agent)) {
- std::cout.write(agent.key().ptr(), agent.key().length()) << delimiter;
+ std::cout.write(agent.key().ptr(),
+ static_cast<std::streamsize>(agent.key().length())) << delimiter;
if (!std::cout) {
std::cerr << "error: failed to write results to standard output"
<< std::endl;
@@ -147,5 +148,6 @@ int main(int argc, char *argv[]) {
}
}
}
- return dump(cmdopt.argv + cmdopt.optind, cmdopt.argc - cmdopt.optind);
+ return dump(cmdopt.argv + cmdopt.optind,
+ static_cast<std::size_t>(cmdopt.argc - cmdopt.optind));
}
diff --git a/tools/marisa-lookup.cc b/tools/marisa-lookup.cc
index 9daa2f3..f9f2466 100644
--- a/tools/marisa-lookup.cc
+++ b/tools/marisa-lookup.cc
@@ -106,5 +106,6 @@ int main(int argc, char *argv[]) {
}
}
}
- return lookup(cmdopt.argv + cmdopt.optind, cmdopt.argc - cmdopt.optind);
+ return lookup(cmdopt.argv + cmdopt.optind,
+ static_cast<std::size_t>(cmdopt.argc - cmdopt.optind));
}
diff --git a/tools/marisa-predictive-search.cc b/tools/marisa-predictive-search.cc
index 9d84732..af5069d 100644
--- a/tools/marisa-predictive-search.cc
+++ b/tools/marisa-predictive-search.cc
@@ -69,7 +69,8 @@ int predictive_search(const char * const *args, std::size_t num_args) {
const std::size_t end = std::min(max_num_results, keyset.size());
for (std::size_t i = 0; i < end; ++i) {
std::cout << keyset[i].id() << '\t';
- std::cout.write(keyset[i].ptr(), keyset[i].length()) << '\t';
+ std::cout.write(keyset[i].ptr(),
+ static_cast<std::streamsize>(keyset[i].length())) << '\t';
std::cout << str << '\n';
}
}
@@ -139,5 +140,5 @@ int main(int argc, char *argv[]) {
}
}
return predictive_search(cmdopt.argv + cmdopt.optind,
- cmdopt.argc - cmdopt.optind);
+ static_cast<std::size_t>(cmdopt.argc - cmdopt.optind));
}
diff --git a/tools/marisa-reverse-lookup.cc b/tools/marisa-reverse-lookup.cc
index 076e928..c101a97 100644
--- a/tools/marisa-reverse-lookup.cc
+++ b/tools/marisa-reverse-lookup.cc
@@ -55,7 +55,8 @@ int reverse_lookup(const char * const *args, std::size_t num_args) {
agent.set_query(key_id);
trie.reverse_lookup(agent);
std::cout << agent.key().id() << '\t';
- std::cout.write(agent.key().ptr(), agent.key().length()) << '\n';
+ std::cout.write(agent.key().ptr(),
+ static_cast<std::streamsize>(agent.key().length())) << '\n';
} catch (const marisa::Exception &ex) {
std::cerr << ex.what() << ": reverse_lookup() failed: "
<< key_id << std::endl;
@@ -106,5 +107,5 @@ int main(int argc, char *argv[]) {
}
}
return reverse_lookup(cmdopt.argv + cmdopt.optind,
- cmdopt.argc - cmdopt.optind);
+ static_cast<std::size_t>(cmdopt.argc - cmdopt.optind));
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 00:55:49 +0000