diff options
| author | mydesktop <dev.mc2@gmail.com> | 2014-05-28 21:13:32 -0400 |
|---|---|---|
| committer | mydesktop <dev.mc2@gmail.com> | 2014-05-28 21:13:32 -0400 |
| commit | 5c1b7c72249a114b1c30945fc8a9116c07573a48 (patch) | |
| tree | 5e110e349a1f4dccd33867fecbbc4a2c51fc312d /src/serialization/serialization.h | |
| parent | raise min fee and correct COIN value (diff) | |
| parent | typo in tx_pool.cpp (diff) | |
| download | monero-5c1b7c72249a114b1c30945fc8a9116c07573a48.tar.xz | |
Merge branch '0.8.8update'
Update to newest version 0.8.8. See change log for details.
Diffstat (limited to 'src/serialization/serialization.h')
| -rw-r--r-- | src/serialization/serialization.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/serialization/serialization.h b/src/serialization/serialization.h index 2e69ea0a3..7024fdc03 100644 --- a/src/serialization/serialization.h +++ b/src/serialization/serialization.h @@ -10,6 +10,7 @@ #include <vector> #include <string> #include <boost/type_traits/is_integral.hpp> +#include <boost/type_traits/integral_constant.hpp> template <class T> struct is_blob_type { typedef boost::false_type type; }; @@ -79,8 +80,10 @@ inline bool do_serialize(Archive &ar, T &v) if (!r || !ar.stream().good()) return false; \ } while(0); #define FIELDS(f) \ + do { \ bool r = ::do_serialize(ar, f); \ - if (!r || !ar.stream().good()) return false; + if (!r || !ar.stream().good()) return false; \ + } while(0); #define FIELD(f) \ do { \ ar.tag(#f); \ @@ -99,6 +102,7 @@ inline bool do_serialize(Archive &ar, T &v) ar.serialize_varint(f); \ if (!ar.stream().good()) return false; \ } while(0); + namespace serialization { namespace detail { |