aboutsummaryrefslogtreecommitdiff
path: root/src/serialization
diff options
context:
space:
mode:
authormikezackles <mikezackles@gmail.com>2014-07-17 19:23:49 -0400
committermikezackles <mikezackles@gmail.com>2014-07-17 19:23:49 -0400
commit905b67bc790a09940bc22a4f199516b2b0157cdd (patch)
treed616ea77f177a5e412022b74122acf62320e5a03 /src/serialization
parentMerge pull request #56 from tewinget/master (diff)
parentFix thread count argument handling in simplewallet (diff)
downloadmonero-905b67bc790a09940bc22a4f199516b2b0157cdd.tar.xz
Merge pull request #63 from mikezackles/bytecoin_for_merge
Misc fixes from bytecoin
Diffstat (limited to 'src/serialization')
-rw-r--r--src/serialization/binary_utils.h2
-rw-r--r--src/serialization/crypto.h2
-rw-r--r--src/serialization/json_utils.h2
-rw-r--r--src/serialization/vector.h7
4 files changed, 13 insertions, 0 deletions
diff --git a/src/serialization/binary_utils.h b/src/serialization/binary_utils.h
index d06e8a22a..00bb1741d 100644
--- a/src/serialization/binary_utils.h
+++ b/src/serialization/binary_utils.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.
+#pragma once
+
#include <sstream>
#include "binary_archive.h"
diff --git a/src/serialization/crypto.h b/src/serialization/crypto.h
index b7763ffeb..6e683e629 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.
+#pragma once
+
#include <vector>
#include "serialization.h"
diff --git a/src/serialization/json_utils.h b/src/serialization/json_utils.h
index 35bcc0335..24f5c11a8 100644
--- a/src/serialization/json_utils.h
+++ b/src/serialization/json_utils.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.
+#pragma once
+
#include <sstream>
#include "json_archive.h"
diff --git a/src/serialization/vector.h b/src/serialization/vector.h
index 9a0c0ee56..d07472352 100644
--- a/src/serialization/vector.h
+++ b/src/serialization/vector.h
@@ -17,6 +17,13 @@ namespace serialization
}
template <typename Archive>
+ bool serialize_vector_element(Archive& ar, uint32_t& e)
+ {
+ ar.serialize_varint(e);
+ return true;
+ }
+
+ template <typename Archive>
bool serialize_vector_element(Archive& ar, uint64_t& e)
{
ar.serialize_varint(e);