Add static_casts to suppress warnings for implicit signedness conversion.

5 files changed, 10 insertions, 9 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;