From e15859ed27cc33558ebad83f84831ad50dd8e2d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Bylica?= Date: Fri, 13 Feb 2015 16:07:16 +0100 Subject: [PATCH] Windows fixes --- evmjit/libevmjit/Arith256.cpp | 2 +- libp2p/NodeTable.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/evmjit/libevmjit/Arith256.cpp b/evmjit/libevmjit/Arith256.cpp index 2ec227dcc..15d18c814 100644 --- a/evmjit/libevmjit/Arith256.cpp +++ b/evmjit/libevmjit/Arith256.cpp @@ -416,7 +416,7 @@ namespace explicit operator uint128() { uint128 r = lo; - r |= ((uint128) mid) << 64; + r = r + ((uint128) mid) << 64; return r; } diff --git a/libp2p/NodeTable.h b/libp2p/NodeTable.h index 0217c700e..23ca33661 100644 --- a/libp2p/NodeTable.h +++ b/libp2p/NodeTable.h @@ -168,10 +168,10 @@ public: /// Returns the Node to the corresponding node id or the empty Node if that id is not found. Node node(NodeId const& _id); -#ifndef BOOST_AUTO_TEST_SUITE -private: -#else +#if defined(BOOST_AUTO_TEST_SUITE) || defined(_MSC_VER) // MSVC includes access specifier in symbol name protected: +#else +private: #endif /// Constants for Kademlia, derived from address space.