Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix build

Browse source
This commit is contained in:
Daniel Larimer 2015-02-23 14:01:58 -05:00
parent cf6f81dd5b
commit 537029f09f
6 changed files with 26 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/fc/container/flat.hpp
View file

@ -1,7 +1,9 @@
#pragma once
#include <fc/variant.hpp>
#include <fc/container/flat_fwd.hpp>
#include <boost/container/flat_map.hpp>
#include <boost/container/flat_set.hpp>
#include <fc/io/raw_fwd.hpp>
namespace fc {
namespace raw {

32
include/fc/container/flat_fwd.hpp
View file

@ -1,23 +1,21 @@
#pragma once
namespace boost { namespace container {
template<typename Key,
typename Compare,
typename Allocator >
class flat_set;
template<typename Key,
typename T,
typename Compare,
typename Allocator >
class flat_map;
} } // boost::container
#include <boost/container/flat_map.hpp>
#include <boost/container/flat_set.hpp>
namespace fc {
template<typename K, typename V>
using flat_map = boost::container::flat_map<K,V,std::less<K>,std::allocator<std::pair<K,V>> >;
template<typename V>
using flat_set = boost::container::flat_set<V,std::less<V>, std::allocator<V> >;
using boost::container::flat_map;
using boost::container::flat_set;
namespace raw {
template<typename Stream, typename T>
void pack( Stream& s, const flat_set<T>& value );
template<typename Stream, typename T>
void unpack( Stream& s, flat_set<T>& value );
template<typename Stream, typename K, typename V>
void pack( Stream& s, const flat_map<K,V>& value );
template<typename Stream, typename K, typename V>
void unpack( Stream& s, flat_map<K,V>& value ) ;
} // namespace raw
} // fc

3
include/fc/io/raw.hpp
View file

@ -10,10 +10,9 @@
#include <fc/filesystem.hpp>
#include <fc/exception/exception.hpp>
#include <fc/safe.hpp>
#include <fc/io/raw_fwd.hpp>
#include <map>
#define MAX_ARRAY_ALLOC_SIZE (1024*1024*10)
namespace fc {
namespace raw {
template<typename Stream>

4
include/fc/io/raw_fwd.hpp
View file

@ -1,4 +1,5 @@
#pragma once
#include <fc/container/flat_fwd.hpp>
#include <fc/io/varint.hpp>
#include <fc/array.hpp>
#include <fc/safe.hpp>
@ -7,7 +8,8 @@
#include <unordered_set>
#include <unordered_map>
#include <set>
#include <fc/container/flat_fwd.hpp>
#define MAX_ARRAY_ALLOC_SIZE (1024*1024*10)
namespace fc {
class time_point;

8
include/fc/variant.hpp
View file

@ -68,9 +68,9 @@ namespace fc
void from_variant( const variant& var, std::unordered_map<K,T>& vo );
template<typename K, typename T>
void to_variant( const flat_map<K,T>& var, variant& vo );
void to_variant( const fc::flat_map<K,T>& var, variant& vo );
template<typename K, typename T>
void from_variant( const variant& var, flat_map<K,T>& vo );
void from_variant( const variant& var, fc::flat_map<K,T>& vo );
template<typename K, typename T>
void to_variant( const std::map<K,T>& var, variant& vo );
@ -88,9 +88,9 @@ namespace fc
void from_variant( const variant& var, std::unordered_set<T>& vo );
template<typename T>
void to_variant( const flat_set<T>& var, variant& vo );
void to_variant( const fc::flat_set<T>& var, variant& vo );
template<typename T>
void from_variant( const variant& var, flat_set<T>& vo );
void from_variant( const variant& var, fc::flat_set<T>& vo );
template<typename T>
void to_variant( const std::set<T>& var, variant& vo );

1
src/log/gelf_appender.cpp
View file

@ -14,6 +14,7 @@
#include <iomanip>
#include <queue>
#include <sstream>
#include <iostream>
namespace fc
{