diff options
| author | mydesktop <dev.mc2@gmail.com> | 2014-05-25 13:06:40 -0400 |
|---|---|---|
| committer | mydesktop <dev.mc2@gmail.com> | 2014-05-25 13:06:40 -0400 |
| commit | 3a3a8176782a4fa75b0607fba0393c9d4a1746be (patch) | |
| tree | e8e38bdeaf0e9ea8ba773bb27e1de4b288b8150d /src/serialization | |
| parent | Merge pull request #12 from quazarcoin/MRO_master (diff) | |
| download | monero-3a3a8176782a4fa75b0607fba0393c9d4a1746be.tar.xz | |
0.8.8update
Diffstat (limited to 'src/serialization')
| -rw-r--r-- | src/serialization/crypto.h | 2 | ||||
| -rw-r--r-- | src/serialization/serialization.h | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/serialization/crypto.h b/src/serialization/crypto.h index 89d3c9885..b7763ffeb 100644 --- a/src/serialization/crypto.h +++ b/src/serialization/crypto.h @@ -2,6 +2,8 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#include <vector> + #include "serialization.h" #include "debug_archive.h" #include "crypto/chacha8.h" 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 { |