From 90da81e66d8a2d9e0def99f80cd41383eb29ce60 Mon Sep 17 00:00:00 2001 From: Tim Hughes Date: Tue, 18 Feb 2014 17:20:18 +0000 Subject: [PATCH] Refix for Visual Studio. --- libethereum/Common.cpp | 1 - libethereum/Common.h | 4 +++- libethereum/State.cpp | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libethereum/Common.cpp b/libethereum/Common.cpp index 2885bc25a..fd2af14ef 100644 --- a/libethereum/Common.cpp +++ b/libethereum/Common.cpp @@ -37,7 +37,6 @@ #include "Exceptions.h" using namespace std; using namespace eth; -using eth::byte; //#define ETH_ADDRESS_DEBUG 1 diff --git a/libethereum/Common.h b/libethereum/Common.h index d2fee7121..946f5f9fb 100644 --- a/libethereum/Common.h +++ b/libethereum/Common.h @@ -51,11 +51,13 @@ #include #include "vector_ref.h" +// CryptoPP defines byte in the global namespace, so so must we. +using byte = uint8_t; + namespace eth { // Binary data types. -using byte = uint8_t; using bytes = std::vector; using bytesRef = vector_ref; using bytesConstRef = vector_ref; diff --git a/libethereum/State.cpp b/libethereum/State.cpp index b02c0d604..522929024 100644 --- a/libethereum/State.cpp +++ b/libethereum/State.cpp @@ -45,7 +45,6 @@ #include "Defaults.h" using namespace std; using namespace eth; -using eth::byte; u256 const c_stepFee = 1; u256 const c_dataFee = 20;