summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/pstream.h5
-rw-r--r--src/wcwidth.cc4
2 files changed, 6 insertions, 3 deletions
diff --git a/src/pstream.h b/src/pstream.h
index bcbf6755..ed314068 100644
--- a/src/pstream.h
+++ b/src/pstream.h
@@ -83,7 +83,10 @@ class ptristream : public std::istream
virtual pos_type seekoff(off_type off, ios_base::seekdir way,
ios_base::openmode)
{
- switch (way) {
+ // cast to avoid gcc '-Wswitch' warning
+ // as ios_base::beg/cur/end are not necesssarily values of 'way' enum type ios_base::seekdir
+ // based on https://svn.boost.org/trac/boost/ticket/7644
+ switch (static_cast<int>(way)) {
case std::ios::cur:
setg(ptr, gptr()+off, ptr+len);
break;
diff --git a/src/wcwidth.cc b/src/wcwidth.cc
index 71eaf6d6..c23f83d7 100644
--- a/src/wcwidth.cc
+++ b/src/wcwidth.cc
@@ -69,8 +69,8 @@ namespace ledger {
namespace {
struct interval {
- int first;
- int last;
+ boost::uint32_t first;
+ boost::uint32_t last;
};
}