fixes to build under clang++
This commit is contained in:
parent
23eead5eaa
commit
09c84c1731
5 changed files with 11 additions and 13 deletions
|
|
@ -114,6 +114,7 @@ namespace fc {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#include <unordered_map>
|
||||||
#include <fc/crypto/city.hpp>
|
#include <fc/crypto/city.hpp>
|
||||||
namespace std
|
namespace std
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
#include <unordered_map>
|
||||||
#include <fc/fwd.hpp>
|
#include <fc/fwd.hpp>
|
||||||
#include <fc/string.hpp>
|
#include <fc/string.hpp>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@
|
||||||
#include <fc/string.hpp>
|
#include <fc/string.hpp>
|
||||||
#include <fc/crypto/sha1.hpp>
|
#include <fc/crypto/sha1.hpp>
|
||||||
#include <fc/io/raw_fwd.hpp>
|
#include <fc/io/raw_fwd.hpp>
|
||||||
|
#include <fc/crypto/city.hpp>
|
||||||
|
|
||||||
namespace fc {
|
namespace fc {
|
||||||
|
|
||||||
|
|
@ -115,6 +116,9 @@ namespace std
|
||||||
template<>
|
template<>
|
||||||
struct hash<fc::ip::endpoint>
|
struct hash<fc::ip::endpoint>
|
||||||
{
|
{
|
||||||
size_t operator()( const fc::ip::endpoint& e )const;
|
size_t operator()( const fc::ip::endpoint& e )const
|
||||||
|
{
|
||||||
|
return fc::city_hash64( (char*)&e, sizeof(e) );
|
||||||
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -10,10 +10,10 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
namespace std {
|
//namespace std {
|
||||||
typedef decltype(sizeof(int)) size_t;
|
// typedef decltype(sizeof(int)) size_t;
|
||||||
typedef decltype(nullptr) nullptr_t;
|
// typedef decltype(nullptr) nullptr_t;
|
||||||
}
|
//}
|
||||||
|
|
||||||
namespace fc {
|
namespace fc {
|
||||||
using std::size_t;
|
using std::size_t;
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,4 @@
|
||||||
#include <fc/network/ip.hpp>
|
#include <fc/network/ip.hpp>
|
||||||
#include <fc/crypto/city.hpp>
|
|
||||||
#include <fc/variant.hpp>
|
#include <fc/variant.hpp>
|
||||||
#include <boost/asio.hpp>
|
#include <boost/asio.hpp>
|
||||||
#include <boost/lexical_cast.hpp>
|
#include <boost/lexical_cast.hpp>
|
||||||
|
|
@ -132,10 +131,3 @@ namespace fc { namespace ip {
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
namespace std
|
|
||||||
{
|
|
||||||
size_t hash<fc::ip::endpoint>::operator()( const fc::ip::endpoint& e )const
|
|
||||||
{
|
|
||||||
return fc::city_hash64( (char*)&e, sizeof(e) );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue