mirrors/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd synced 2024-11-10 08:00:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #273 from EinMByte/master

Browse Source 
Fix #272 and #274.
This commit is contained in:
EinMByte 2015-09-28 21:26:29 +02:00
commit d05ad68aa4
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/AddressBook.cpp
View File

@ -466,7 +466,7 @@ namespace client
bool success = false; bool success = false;
i2p::util::http::url u (m_Link); i2p::util::http::url u (m_Link);
i2p::data::IdentHash ident; 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::condition_variable newDataReceived;
std::mutex newDataReceivedMutex; std::mutex newDataReceivedMutex;

2
core/util/util.cpp
View File

@ -1,3 +1,4 @@
#include "util.h"
#include <cstdlib> #include <cstdlib>
#include <string> #include <string>
#include <algorithm> #include <algorithm>
@ -12,7 +13,6 @@
#include <boost/program_options/detail/config_file.hpp> #include <boost/program_options/detail/config_file.hpp>
#include <boost/program_options/parsers.hpp> #include <boost/program_options/parsers.hpp>
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
#include "util.h"
#include "Log.h" #include "Log.h"
#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__APPLE__) || defined(__OpenBSD__) #if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__APPLE__) || defined(__OpenBSD__)

2
core/util/util.h
View File

@ -1,6 +1,8 @@
#ifndef UTIL_H #ifndef UTIL_H
#define UTIL_H #define UTIL_H
#define BOOST_NO_CXX11_SCOPED_ENUMS // Workaround for issue #272
#include <map> #include <map>
#include <string> #include <string>
#include <iostream> #include <iostream>