From 68cf69fabceecec3c4de1df6ee40ee681d5fdc81 Mon Sep 17 00:00:00 2001 From: EinMByte Date: Sun, 27 Sep 2015 22:41:37 +0200 Subject: [PATCH 1/2] Fix #272. --- core/util/util.cpp | 2 +- core/util/util.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/core/util/util.cpp b/core/util/util.cpp index abc14c2b..eef5d1f0 100644 --- a/core/util/util.cpp +++ b/core/util/util.cpp @@ -1,3 +1,4 @@ +#include "util.h" #include #include #include @@ -12,7 +13,6 @@ #include #include #include -#include "util.h" #include "Log.h" #if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__APPLE__) || defined(__OpenBSD__) diff --git a/core/util/util.h b/core/util/util.h index b057d047..fe47cbf6 100644 --- a/core/util/util.h +++ b/core/util/util.h @@ -1,6 +1,8 @@ #ifndef UTIL_H #define UTIL_H +#define BOOST_NO_CXX11_SCOPED_ENUMS // Workaround for issue #272 + #include #include #include From 4a69a0a831e049b8e422376da3e18d5189fdae44 Mon Sep 17 00:00:00 2001 From: EinMByte Date: Mon, 28 Sep 2015 09:46:29 +0200 Subject: [PATCH 2/2] Fix #274 (hack). --- core/AddressBook.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/AddressBook.cpp b/core/AddressBook.cpp index dde56ab0..01f4371f 100644 --- a/core/AddressBook.cpp +++ b/core/AddressBook.cpp @@ -466,7 +466,7 @@ namespace client bool success = false; i2p::util::http::url u (m_Link); i2p::data::IdentHash ident; - if (m_Book.GetIdentHash (u.host_, ident)) + if (m_Book.GetIdentHash (u.host_, ident) && m_Book.getSharedLocalDestination()) { std::condition_variable newDataReceived; std::mutex newDataReceivedMutex;