Merge branch 'release/v3.0.0-20120426'

1 files changed, 6 insertions, 9 deletions

diff --git a/src/timelog.h b/src/timelog.h
index 020ae4f2..857952ff 100644
--- a/src/timelog.h
+++ b/src/timelog.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2010, John Wiegley.  All rights reserved.
+ * Copyright (c) 2003-2012, John Wiegley.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -50,6 +50,7 @@ namespace ledger {
 
 class account_t;
 class journal_t;
+class parse_context_t;
 
 class time_xact_t
 {
@@ -86,22 +87,18 @@ public:
 class time_log_t : public boost::noncopyable
 {
   std::list<time_xact_t> time_xacts;
-  journal_t&             journal;
-  scope_t&               scope;
+  parse_context_t&       context;
 
 public:
-  std::size_t *          context_count;
-
-  time_log_t(journal_t& _journal, scope_t& _scope)
-    : journal(_journal), scope(_scope), context_count(NULL) {
-    TRACE_CTOR(time_log_t, "journal_t&, scope_t&, std::size&");
+  time_log_t(parse_context_t& _context) : context(_context) {
+    TRACE_CTOR(time_log_t, "parse_context_t&");
   }
   ~time_log_t() {
     TRACE_DTOR(time_log_t);
   }
 
   void clock_in(time_xact_t event);
-  void clock_out(time_xact_t event);
+  std::size_t clock_out(time_xact_t event);
 
   void close();
 };