diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2024-02-24 10:19:58 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2024-02-24 10:19:58 -0500 |
| commit | 68e40ea2a73fd923a85e4095907b4a2244ac8bc4 (patch) | |
| tree | 99de6871e82b5879846b9b73b9c05fc18345115a /src/cryptonote_basic | |
| parent | Merge pull request #9136 (diff) | |
| parent | serialization: fix infinite loops and clean up dispatching (diff) | |
| download | monero-68e40ea2a73fd923a85e4095907b4a2244ac8bc4.tar.xz | |
Merge pull request #9158
33e3f72 serialization: fix infinite loops and clean up dispatching (jeffro256)
Diffstat (limited to 'src/cryptonote_basic')
| -rw-r--r-- | src/cryptonote_basic/tx_extra.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/cryptonote_basic/tx_extra.h b/src/cryptonote_basic/tx_extra.h index 141f72352..c168f48a7 100644 --- a/src/cryptonote_basic/tx_extra.h +++ b/src/cryptonote_basic/tx_extra.h @@ -52,7 +52,7 @@ namespace cryptonote // load template <template <bool> class Archive> - bool do_serialize(Archive<false>& ar) + bool member_do_serialize(Archive<false>& ar) { // size - 1 - because of variant tag for (size = 1; size <= TX_EXTRA_PADDING_MAX_COUNT; ++size) @@ -73,7 +73,7 @@ namespace cryptonote // store template <template <bool> class Archive> - bool do_serialize(Archive<true>& ar) + bool member_do_serialize(Archive<true>& ar) { if(TX_EXTRA_PADDING_MAX_COUNT < size) return false; @@ -129,7 +129,7 @@ namespace cryptonote // load template <template <bool> class Archive> - bool do_serialize(Archive<false>& ar) + bool member_do_serialize(Archive<false>& ar) { std::string field; if(!::do_serialize(ar, field)) @@ -142,7 +142,7 @@ namespace cryptonote // store template <template <bool> class Archive> - bool do_serialize(Archive<true>& ar) + bool member_do_serialize(Archive<true>& ar) { std::ostringstream oss; binary_archive<true> oar(oss); |