From 9dda53d0abe2b563a510b644746cfc4feb967a8a Mon Sep 17 00:00:00 2001 From: svost Date: Tue, 26 Apr 2016 11:46:43 +0300 Subject: [PATCH 1/1] More less ifdef: success build with gcc, clang, icpc --- src/serialize.h | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/src/serialize.h b/src/serialize.h index 76604fc..459b02b 100644 --- a/src/serialize.h +++ b/src/serialize.h @@ -777,12 +777,10 @@ public: Init(nTypeIn, nVersionIn); } -#if !defined(_MSC_VER) || _MSC_VER >= 1300 CDataStream(const char* pbegin, const char* pend, int nTypeIn, int nVersionIn) : vch(pbegin, pend) { Init(nTypeIn, nVersionIn); } -#endif CDataStream(const vector_type& vchIn, int nTypeIn, int nVersionIn) : vch(vchIn.begin(), vchIn.end()) { @@ -844,7 +842,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); } -#ifdef _MSC_VER void insert(iterator it, const_iterator first, const_iterator last) { assert(last - first >= 0); @@ -857,7 +854,6 @@ public: else vch.insert(it, first, last); } -#endif #ifndef _MSC_VER void insert(iterator it, std::vector::const_iterator first, std::vector::const_iterator last) @@ -874,7 +870,6 @@ public: } #endif -#if !defined(_MSC_VER) || _MSC_VER >= 1300 void insert(iterator it, const char* first, const char* last) { assert(last - first >= 0); @@ -887,7 +882,6 @@ public: else vch.insert(it, first, last); } -#endif iterator erase(iterator it) { -- 1.7.1