Merge branch 'master' into new-fontification-scheme

6 files changed, 7 insertions, 7 deletions

diff --git a/src/account.h b/src/account.h
index d1377c39..4a4041b7 100644
--- a/src/account.h
+++ b/src/account.h
@@ -261,7 +261,7 @@ public:
   mutable optional<xdata_t> xdata_;
 
   bool has_xdata() const {
-    return xdata_;
+    return xdata_ != NULL;
   }
   void clear_xdata();
   xdata_t& xdata() {
diff --git a/src/item.h b/src/item.h
index beb32a04..d194ac07 100644
--- a/src/item.h
+++ b/src/item.h
@@ -191,7 +191,7 @@ public:
   static bool use_aux_date;
 
   virtual bool has_date() const {
-    return _date;
+    return _date != NULL;
   }
 
   virtual date_t date() const {
diff --git a/src/post.h b/src/post.h
index c2f77b32..c4fc3827 100644
--- a/src/post.h
+++ b/src/post.h
@@ -205,7 +205,7 @@ public:
   mutable optional<xdata_t> xdata_;
 
   bool has_xdata() const {
-    return xdata_;
+    return xdata_ != NULL;
   }
   void clear_xdata() {
     xdata_ = none;
diff --git a/src/ptree.cc b/src/ptree.cc
index 6609aed9..fa6a1db9 100644
--- a/src/ptree.cc
+++ b/src/ptree.cc
@@ -80,7 +80,7 @@ void format_ptree::flush()
 
   switch (format) {
   case FORMAT_XML:
-    property_tree::xml_writer_settings<char> indented(' ', 2);
+    auto indented = property_tree::xml_writer_make_settings<std::string> (' ', 2);
     property_tree::write_xml(out, pt, indented);
     out << std::endl;
     break;
diff --git a/src/report.h b/src/report.h
index c500fb9b..acfd40db 100644
--- a/src/report.h
+++ b/src/report.h
@@ -465,8 +465,8 @@ public:
        "           12 + 1 + 12 + 1 + 12, true, color))"
        " %(ansify_if("
        "   justify((get_at(display_total, 1) ? "
-       "            (100% * scrub(get_at(display_total, 0))) / "
-       "             -scrub(get_at(display_total, 1)) : 0), "
+       "            (100% * quantity(scrub(get_at(display_total, 0)))) / "
+       "             -quantity(scrub(get_at(display_total, 1))) : 0), "
        "           5, -1, true, false),"
        "   magenta if (color and get_at(display_total, 1) and "
        "               (abs(quantity(scrub(get_at(display_total, 0))) / "
diff --git a/src/times.h b/src/times.h
index 2a5b9277..d2f7bb19 100644
--- a/src/times.h
+++ b/src/times.h
@@ -568,7 +568,7 @@ public:
   void   stabilize(const optional<date_t>& date = none);
 
   bool   is_valid() const {
-    return start;
+    return start != NULL;
   }
 
   /** Find the current or next period containing date.  Returns false if