Fix getbalance() bug

[novacoin.git] / src / serialize.h

diff --git a/src/serialize.h b/src/serialize.h
index e54d1aa..c0471bb 100644 (file)
--- a/src/serialize.h
+++ b/src/serialize.h
@@ -103,8 +103,6 @@ enum
 
 
 
-
-
 //
 // Basic types
 //
@@ -160,8 +158,6 @@ template<typename Stream> inline void Unserialize(Stream& s, bool& a, int, int=0
 
 
 
-
-
 //
 // Compact size
 //  size <  253          -- 1 byte
@@ -349,11 +345,6 @@ template<typename T0, typename T1, typename T2> unsigned int GetSerializeSize(co
 template<typename Stream, typename T0, typename T1, typename T2> void Serialize(Stream& os, const std::tuple<T0, T1, T2>& item, int nType, int nVersion);
 template<typename Stream, typename T0, typename T1, typename T2> void Unserialize(Stream& is, std::tuple<T0, T1, T2>& item, int nType, int nVersion);
 
-// 4 tuple
-template<typename T0, typename T1, typename T2, typename T3> unsigned int GetSerializeSize(const std::tuple<T0, T1, T2, T3>& item, int nType, int nVersion);
-template<typename Stream, typename T0, typename T1, typename T2, typename T3> void Serialize(Stream& os, const std::tuple<T0, T1, T2, T3>& item, int nType, int nVersion);
-template<typename Stream, typename T0, typename T1, typename T2, typename T3> void Unserialize(Stream& is, std::tuple<T0, T1, T2, T3>& item, int nType, int nVersion);
-
 // map
 template<typename K, typename T, typename Pred, typename A> unsigned int GetSerializeSize(const std::map<K, T, Pred, A>& m, int nType, int nVersion);
 template<typename Stream, typename K, typename T, typename Pred, typename A> void Serialize(Stream& os, const std::map<K, T, Pred, A>& m, int nType, int nVersion);
@@ -367,7 +358,6 @@ template<typename Stream, typename K, typename Pred, typename A> void Unserializ
 
 
 
-
 //
 // If none of the specialized versions above matched, default to calling member function.
 // "int nType" is changed to "long nType" to keep from getting an ambiguous overload error.
@@ -395,7 +385,6 @@ inline void Unserialize(Stream& is, T& a, long nType, int nVersion)
 
 
 
-
 //
 // string
 //
@@ -593,40 +582,6 @@ void Unserialize(Stream& is, std::tuple<T0, T1, T2>& item, int nType, int nVersi
 
 
 //
-// 4 tuple
-//
-template<typename T0, typename T1, typename T2, typename T3>
-unsigned int GetSerializeSize(const std::tuple<T0, T1, T2, T3>& item, int nType, int nVersion)
-{
-    unsigned int nSize = 0;
-    nSize += GetSerializeSize(std::get<0>(item), nType, nVersion);
-    nSize += GetSerializeSize(std::get<1>(item), nType, nVersion);
-    nSize += GetSerializeSize(std::get<2>(item), nType, nVersion);
-    nSize += GetSerializeSize(std::get<3>(item), nType, nVersion);
-    return nSize;
-}
-
-template<typename Stream, typename T0, typename T1, typename T2, typename T3>
-void Serialize(Stream& os, const std::tuple<T0, T1, T2, T3>& item, int nType, int nVersion)
-{
-    Serialize(os, std::get<0>(item), nType, nVersion);
-    Serialize(os, std::get<1>(item), nType, nVersion);
-    Serialize(os, std::get<2>(item), nType, nVersion);
-    Serialize(os, std::get<3>(item), nType, nVersion);
-}
-
-template<typename Stream, typename T0, typename T1, typename T2, typename T3>
-void Unserialize(Stream& is, std::tuple<T0, T1, T2, T3>& item, int nType, int nVersion)
-{
-    Unserialize(is, std::get<0>(item), nType, nVersion);
-    Unserialize(is, std::get<1>(item), nType, nVersion);
-    Unserialize(is, std::get<2>(item), nType, nVersion);
-    Unserialize(is, std::get<3>(item), nType, nVersion);
-}
-
-
-
-//
 // map
 //
 template<typename K, typename T, typename Pred, typename A>
@@ -734,13 +689,6 @@ struct ser_streamplaceholder
 
 
 
-
-
-
-
-
-
-
 typedef std::vector<char, zero_after_free_allocator<char> > CSerializeData;
 
 /** Double ended buffer combining vector and stream-like interfaces.
@@ -845,20 +793,6 @@ public:
     iterator insert(iterator it, const char& x=char()) { return vch.insert(it, x); }
     void insert(iterator it, size_type n, const char& x) { vch.insert(it, n, x); }
 
-    void insert(iterator it, const_iterator first, const_iterator last)
-    {
-        assert(last - first >= 0);
-        if (it == vch.begin() + nReadPos && (unsigned int)(last - first) <= nReadPos)
-        {
-            // special case for inserting at the front when there's room
-            nReadPos -= (unsigned int)(last - first);
-            memcpy(&vch[nReadPos], &first[0], last - first);
-        }
-        else
-            vch.insert(it, first, last);
-    }
-
-#ifndef _MSC_VER
     void insert(iterator it, std::vector<char>::const_iterator first, std::vector<char>::const_iterator last)
     {
         assert(last - first >= 0);
@@ -871,7 +805,6 @@ public:
         else
             vch.insert(it, first, last);
     }
-#endif
 
     void insert(iterator it, const char* first, const char* last)
     {