aboutsummaryrefslogtreecommitdiff
path: root/lib/marisa/grimoire/io
diff options
context:
space:
mode:
authorSusumu Yata <susumu.yata@gmail.com>2018-05-20 02:43:17 +0900
committerSusumu Yata <susumu.yata@gmail.com>2018-05-20 02:44:33 +0900
commit1abcdde7f5882ed9b976509f47e63358fd75d5f6 (patch)
treead4f1c9c8611e3088556849c36f44eca2ae37d3b /lib/marisa/grimoire/io
parent6741060c32c893fd2e85415bf63b98e42967f522 (diff)
downloadmarisa-trie-1abcdde7f5882ed9b976509f47e63358fd75d5f6.tar.gz
Add static_casts to suppress warnings for implicit signedness conversion.
Diffstat (limited to 'lib/marisa/grimoire/io')
-rw-r--r--lib/marisa/grimoire/io/reader.cc6
-rw-r--r--lib/marisa/grimoire/io/writer.cc6
2 files changed, 6 insertions, 6 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");
}