diff options
| author | John Wiegley <johnw@newartisans.com> | 2009-11-05 04:24:15 -0500 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2009-11-05 04:24:15 -0500 |
| commit | 15555d497f56e4b4d39e9a14f74b2c82cce52b90 (patch) | |
| tree | 1e6c661379f02fdc52ef107fd500438ab69f3e60 /src/commodity.h | |
| parent | 94b2518c4156e5a6b2be45bdbeeacf1ced0cd17f (diff) | |
| parent | 060fc0e00bacb96d1d16163779d98c45c3999014 (diff) | |
| download | fork-ledger-15555d497f56e4b4d39e9a14f74b2c82cce52b90.tar.gz fork-ledger-15555d497f56e4b4d39e9a14f74b2c82cce52b90.tar.bz2 fork-ledger-15555d497f56e4b4d39e9a14f74b2c82cce52b90.zip | |
Merge branch 'next'
Diffstat (limited to 'src/commodity.h')
| -rw-r--r-- | src/commodity.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/commodity.h b/src/commodity.h index f65df1b9..e2a17638 100644 --- a/src/commodity.h +++ b/src/commodity.h @@ -70,7 +70,7 @@ private: friend class boost::serialization::access; template<class Archive> - void serialize(Archive & ar, const unsigned int /* version */) { + void serialize(Archive& ar, const unsigned int /* version */) { ar & when; ar & price; } @@ -114,7 +114,7 @@ public: friend class boost::serialization::access; template<class Archive> - void serialize(Archive & ar, const unsigned int /* version */) { + void serialize(Archive& ar, const unsigned int /* version */) { ar & prices; } #endif // HAVE_BOOST_SERIALIZATION @@ -152,7 +152,7 @@ public: friend class boost::serialization::access; template<class Archive> - void serialize(Archive & ar, const unsigned int /* version */) { + void serialize(Archive& ar, const unsigned int /* version */) { ar & histories; } #endif // HAVE_BOOST_SERIALIZATION @@ -188,9 +188,10 @@ protected: public: explicit base_t(const string& _symbol) - : supports_flags<uint_least16_t>(commodity_t::european_by_default ? - COMMODITY_STYLE_EUROPEAN : - COMMODITY_STYLE_DEFAULTS), + : supports_flags<uint_least16_t> + (commodity_t::european_by_default ? + static_cast<uint_least16_t>(COMMODITY_STYLE_EUROPEAN) : + static_cast<uint_least16_t>(COMMODITY_STYLE_DEFAULTS)), symbol(_symbol), precision(0), searched(false) { TRACE_CTOR(base_t, "const string&"); } @@ -209,7 +210,7 @@ protected: friend class boost::serialization::access; template<class Archive> - void serialize(Archive & ar, const unsigned int /* version */) { + void serialize(Archive& ar, const unsigned int /* version */) { ar & boost::serialization::base_object<supports_flags<uint_least16_t> >(*this); ar & symbol; ar & precision; @@ -407,7 +408,7 @@ private: friend class boost::serialization::access; template<class Archive> - void serialize(Archive & ar, const unsigned int /* version */) { + void serialize(Archive& ar, const unsigned int /* version */) { ar & boost::serialization::base_object<delegates_flags<uint_least16_t> >(*this); ar & base; ar & parent_; |