From 34ee358f5e16d4018adf3db5dac31d2d9c16b9f5 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Thu, 5 Nov 2009 02:26:06 -0500
Subject: Moved journal reading code into journal_t

---
 src/journal.h | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'src/journal.h')

diff --git a/src/journal.h b/src/journal.h
index 60d703e6..e2af0dde 100644
--- a/src/journal.h
+++ b/src/journal.h
@@ -126,8 +126,12 @@ public:
   hooks_t<xact_finalizer_t, xact_t> xact_finalize_hooks;
 
   journal_t();
+  journal_t(const path& pathname);
+  journal_t(const string& str);
   ~journal_t();
 
+  void initialize();
+
   std::list<fileinfo_t>::iterator sources_begin() {
     return sources.begin();
   }
@@ -171,6 +175,14 @@ public:
     xact_finalize_hooks.remove_hook(finalizer);
   }
 
+  std::size_t read(std::istream& in,
+		   const path&	 pathname,
+		   account_t *   master = NULL,
+		   scope_t *     scope  = NULL);
+  std::size_t read(const path&	 pathname,
+		   account_t *   master = NULL,
+		   scope_t *     scope  = NULL);
+
   std::size_t parse(std::istream& in,
 		    scope_t&      session_scope,
 		    account_t *   master	= NULL,
-- 
cgit v1.2.3