diff options
author | Craig Earls <enderw88@gmail.com> | 2015-02-25 22:01:33 -0700 |
---|---|---|
committer | Craig Earls <enderw88@gmail.com> | 2015-02-25 22:01:33 -0700 |
commit | 1f803d629491991afb8aa9cd1d159313b2af78c7 (patch) | |
tree | 4eb6f0f90162f4808d0687a06ad1a698eb3ed035 /src/flags.h | |
parent | fe48f607be7b9da8d2c4ac1fb30078dea55b8240 (diff) | |
parent | af0da737fc4ef8f9ccebd3d43519610b8a8fcaa1 (diff) | |
download | fork-ledger-1f803d629491991afb8aa9cd1d159313b2af78c7.tar.gz fork-ledger-1f803d629491991afb8aa9cd1d159313b2af78c7.tar.bz2 fork-ledger-1f803d629491991afb8aa9cd1d159313b2af78c7.zip |
Merge commit 'af0da737fc4ef8f9ccebd3d43519610b8a8fcaa1' into next
Conflicts:
lisp/ledger-reconcile.el
Diffstat (limited to 'src/flags.h')
-rw-r--r-- | src/flags.h | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/src/flags.h b/src/flags.h index f3593517..82ebaac1 100644 --- a/src/flags.h +++ b/src/flags.h @@ -90,17 +90,6 @@ public: void drop_flags(const flags_t arg) { _flags = static_cast<T>(static_cast<U>(_flags) & static_cast<U>(~arg)); } - -#if HAVE_BOOST_SERIALIZATION -private: - friend class boost::serialization::access; - - template<class Archive> - void serialize(Archive& ar, const unsigned int /* version */) - { - ar & _flags; - } -#endif // HAVE_BOOST_SERIALIZATION }; template <typename T = boost::uint_least8_t, typename U = T> @@ -193,17 +182,6 @@ public: void drop_flags(const flags_t arg) { _flags.drop_flags(arg); } - -#if HAVE_BOOST_SERIALIZATION -private: - friend class boost::serialization::access; - - template<class Archive> - void serialize(Archive& ar, const unsigned int /* version */) - { - ar & _flags; - } -#endif // HAVE_BOOST_SERIALIZATION }; #endif // _FLAGS_H |