Brought in the final round of 3.0 code, although it does not compile yet:

report, session, parts of xpath, main, journal, option.

1 files changed, 3 insertions, 3 deletions

diff --git a/format.h b/format.h
index 68cc30dd..d61cdd0f 100644
--- a/format.h
+++ b/format.h
@@ -154,16 +154,16 @@ void print_entry(std::ostream& out, const entry_base_t& entry,
 		 const string& prefix = "");
 
 bool disp_subaccounts_p(const account_t& account,
-			const item_predicate<account_t>& disp_pred,
+			const optional<item_predicate<account_t> >& disp_pred,
 			const account_t *& to_show);
 
 inline bool disp_subaccounts_p(const account_t& account) {
   const account_t * temp;
-  return disp_subaccounts_p(account, item_predicate<account_t>(NULL), temp);
+  return disp_subaccounts_p(account, none, temp);
 }
 
 bool display_account(const account_t& account,
-		     const item_predicate<account_t>& disp_pred);
+		     const optional<item_predicate<account_t> >& disp_pred);
 
 class format_account : public item_handler<account_t>
 {