diff --git a/src/serialization/serialization.h b/src/serialization/serialization.h index fa1565b0..b3b54e23 100644 --- a/src/serialization/serialization.h +++ b/src/serialization/serialization.h @@ -61,10 +61,10 @@ inline bool do_serialize(Archive &ar, T &v) #define VARIANT_TAG(A, T, Tg) \ template struct variant_serialization_traits, T> { static inline typename A::variant_tag_type get_tag() { return Tg; } } #define BEGIN_SERIALIZE() \ - template class Archive> bool do_serialize(Archive &ar) { + template class Archive> bool do_serialize(Archive &_ser_ar) { #define BEGIN_SERIALIZE_OBJECT() \ - template class Archive> bool do_serialize(Archive &ar) { ar.begin_object(); bool r = do_serialize_object(ar); ar.end_object(); return r; } \ - template class Archive> bool do_serialize_object(Archive &ar){ + template class Archive> bool do_serialize(Archive &_ser_ar) { _ser_ar.begin_object(); bool _ser_res = do_serialize_object(_ser_ar); _ser_ar.end_object(); return _ser_res; } \ + template class Archive> bool do_serialize_object(Archive &_ser_ar){ #define PREPARE_CUSTOM_VECTOR_SERIALIZATION(size, vec) ::serialization::detail::prepare_custom_vector_serialization(size, vec, typename Archive::is_saving()) #define END_SERIALIZE() return true;} @@ -72,30 +72,30 @@ inline bool do_serialize(Archive &ar, T &v) #define VALUE(f) \ do { \ - ar.tag(#f); \ - bool r = ::do_serialize(ar, f); \ - if (!r || !ar.stream().good()) return false; \ + _ser_ar.tag(#f); \ + bool _ser_res = ::do_serialize(_ser_ar, f); \ + if (!_ser_res || !_ser_ar.stream().good()) return false; \ } while (0); #define FIELD_N(t, f) \ do { \ - ar.tag(t); \ - bool r = ::do_serialize(ar, f); \ - if (!r || !ar.stream().good()) return false; \ + _ser_ar.tag(t); \ + bool _ser_res = ::do_serialize(_ser_ar, f); \ + if (!_ser_res || !_ser_ar.stream().good()) return false; \ } while (0); #define FIELDS(f) \ - bool r = ::do_serialize(ar, f); \ -if (!r || !ar.stream().good()) return false; + bool _ser_res = ::do_serialize(_ser_ar, f); \ +if (!_ser_res || !_ser_ar.stream().good()) return false; #define FIELD(f) \ do { \ - ar.tag(#f); \ - bool r = ::do_serialize(ar, f); \ - if (!r || !ar.stream().good()) return false; \ + _ser_ar.tag(#f); \ + bool _ser_res = ::do_serialize(_ser_ar, f); \ + if (!_ser_res || !_ser_ar.stream().good()) return false; \ } while (0); #define VARINT_FIELD(f) \ do { \ - ar.tag(#f); \ - ar.serialize_varint(f); \ - if (!ar.stream().good()) return false; \ + _ser_ar.tag(#f); \ + _ser_ar.serialize_varint(f); \ + if (!_ser_ar.stream().good()) return false; \ } while (0); #define DEFINE_SERIALIZATION_VERSION(v) inline static uint32_t get_serialization_version() { return v; } @@ -103,11 +103,11 @@ do { \ #define VERSION_ENTRY(f) \ do { \ - ar.tag(#f); \ - if (ar.is_saving_arch()) \ + _ser_ar.tag(#f); \ + if (_ser_ar.is_saving_arch()) \ f = this->get_serialization_version(); \ - bool r = ::do_serialize(ar, f); \ - if (!r || !ar.stream().good()) return false; \ + bool _ser_res = ::do_serialize(_ser_ar, f); \ + if (!_ser_res || !_ser_ar.stream().good()) return false; \ } while (0); template @@ -243,7 +243,7 @@ struct transition_t } }; -#define CHAIN_TRANSITION_VER(tx_version, old_type) if (tx_version == version) return transition_t::chain_serialize(ar, *this); +#define CHAIN_TRANSITION_VER(tx_version, old_type) if (tx_version == version) return transition_t::chain_serialize(_ser_ar, *this); #include "serialize_basic_types.h" #include "string.h"