summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/timelog.cc2
-rw-r--r--src/utils.cc4
2 files changed, 5 insertions, 1 deletions
diff --git a/src/timelog.cc b/src/timelog.cc
index 67791bd1..99c2dd36 100644
--- a/src/timelog.cc
+++ b/src/timelog.cc
@@ -55,7 +55,7 @@ namespace {
curr->append_note(in_event.note.c_str(), *context.scope);
char buf[32];
- std::sprintf(buf, "%lds", long((out_event.checkin - in_event.checkin)
+ std::snprintf(buf, 32, "%lds", long((out_event.checkin - in_event.checkin)
.total_seconds()));
amount_t amt;
amt.parse(buf);
diff --git a/src/utils.cc b/src/utils.cc
index e6147f09..1d457891 100644
--- a/src/utils.cc
+++ b/src/utils.cc
@@ -849,7 +849,11 @@ path resolve_path(const path& pathname)
path temp = pathname;
if (temp.string()[0] == '~')
temp = expand_path(temp);
+#if (BOOST_VERSION >= 106000)
+ temp.lexically_normal();
+#else
temp.normalize();
+#endif
return temp;
}