diff options
| author | John Wiegley <johnw@newartisans.com> | 2009-11-01 06:10:49 -0500 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2009-11-01 06:10:49 -0500 |
| commit | 0cb80a51ea2d64e2069d6ef9d3a42a0996b73c88 (patch) | |
| tree | 8ec5023a9a5b949f7732e72490283f5d97620f2e /src/archive.h | |
| parent | cebc9f6e8649bcd5ff5f79aa479cf0d90562c18b (diff) | |
| parent | 502fc9bda2b7ba5f7a3fbc5c944a6a93c3b97243 (diff) | |
| download | fork-ledger-0cb80a51ea2d64e2069d6ef9d3a42a0996b73c88.tar.gz fork-ledger-0cb80a51ea2d64e2069d6ef9d3a42a0996b73c88.tar.bz2 fork-ledger-0cb80a51ea2d64e2069d6ef9d3a42a0996b73c88.zip | |
Merge branch 'next'
Diffstat (limited to 'src/archive.h')
| -rw-r--r-- | src/archive.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/archive.h b/src/archive.h index 77272dbe..cd778a03 100644 --- a/src/archive.h +++ b/src/archive.h @@ -58,7 +58,6 @@ namespace ledger { class archive_t { path file; - uint32_t version; std::list<journal_t::fileinfo_t> sources; @@ -66,19 +65,17 @@ public: archive_t() { TRACE_CTOR(archive_t, ""); } - archive_t(const path& _file) - : file(_file), version(0) { + archive_t(const path& _file) : file(_file) { TRACE_CTOR(archive_t, "const path&"); } - archive_t(const archive_t& ar) - : file(ar.file), version(0) { + archive_t(const archive_t& ar) : file(ar.file) { TRACE_CTOR(archive_t, "copy"); } ~archive_t() { TRACE_DTOR(archive_t); } - void read_header(); + bool read_header(); bool should_load(const std::list<path>& data_files); bool should_save(shared_ptr<journal_t> journal); @@ -94,7 +91,6 @@ private: template<class Archive> void serialize(Archive & ar, const unsigned int /* version */) { - ar & version; ar & sources; } #endif // HAVE_BOOST_SERIALIZATION |