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

raw.hpp: Use fc::raw:: namespace explicitly everywhere, cleanup whitespace

Browse source
This commit is contained in:
theoreticalbts 2016-02-19 16:36:29 -05:00
parent e5ca765f15
commit 232d59525a
1 changed files with 106 additions and 106 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -120,7 +120,7 @@ namespace fc {
template<typename Stream, typename T>
inline void pack( Stream& s, const std::shared_ptr<T>& v)
{
pack( s, *v );
fc::raw::pack( s, *v );
}
template<typename Stream, typename T, size_t N>
@ -133,7 +133,7 @@ namespace fc {
inline void unpack( Stream& s, std::shared_ptr<T>& v)
{ try {
v = std::make_shared<T>();
unpack( s, *v );
fc::raw::unpack( s, *v );
} FC_RETHROW_EXCEPTIONS( warn, "std::shared_ptr<T>", ("type",fc::get_typename<T>::name()) ) }
template<typename Stream> inline void pack( Stream& s, const signed_int& v ) {
@ -180,55 +180,55 @@ namespace fc {
template<typename Stream, typename T> inline void unpack( Stream& s, const T& vi )
{
T tmp;
unpack( s, tmp );
fc::raw::unpack( s, tmp );
FC_ASSERT( vi == tmp );
}
template<typename Stream> inline void pack( Stream& s, const char* v ) { pack( s, fc::string(v) ); }
template<typename Stream> inline void pack( Stream& s, const char* v ) { fc::raw::pack( s, fc::string(v) ); }
template<typename Stream, typename T>
void pack( Stream& s, const safe<T>& v ) { pack( s, v.value ); }
void pack( Stream& s, const safe<T>& v ) { fc::raw::pack( s, v.value ); }
template<typename Stream, typename T>
void unpack( Stream& s, fc::safe<T>& v ) { unpack( s, v.value ); }
void unpack( Stream& s, fc::safe<T>& v ) { fc::raw::unpack( s, v.value ); }
template<typename Stream, typename T, unsigned int S, typename Align>
void pack( Stream& s, const fc::fwd<T,S,Align>& v ) {
pack( *v );
fc::raw::pack( *v );
}
template<typename Stream, typename T, unsigned int S, typename Align>
void unpack( Stream& s, fc::fwd<T,S,Align>& v ) {
unpack( *v );
fc::raw::unpack( *v );
}
template<typename Stream, typename T>
void pack( Stream& s, const fc::smart_ref<T>& v ) { pack( s, *v ); }
void pack( Stream& s, const fc::smart_ref<T>& v ) { fc::raw::pack( s, *v ); }
template<typename Stream, typename T>
void unpack( Stream& s, fc::smart_ref<T>& v ) { unpack( s, *v ); }
void unpack( Stream& s, fc::smart_ref<T>& v ) { fc::raw::unpack( s, *v ); }
// optional
template<typename Stream, typename T>
void pack( Stream& s, const fc::optional<T>& v ) {
pack( s, bool(!!v) );
if( !!v ) pack( s, *v );
fc::raw::pack( s, bool(!!v) );
if( !!v ) fc::raw::pack( s, *v );
}
template<typename Stream, typename T>
void unpack( Stream& s, fc::optional<T>& v )
{ try {
bool b; unpack( s, b );
if( b ) { v = T(); unpack( s, *v ); }
bool b; fc::raw::unpack( s, b );
if( b ) { v = T(); fc::raw::unpack( s, *v ); }
} FC_RETHROW_EXCEPTIONS( warn, "optional<${type}>", ("type",fc::get_typename<T>::name() ) ) }
// std::vector<char>
template<typename Stream> inline void pack( Stream& s, const std::vector<char>& value ) {
pack( s, unsigned_int((uint32_t)value.size()) );
fc::raw::pack( s, unsigned_int((uint32_t)value.size()) );
if( value.size() )
s.write( &value.front(), (uint32_t)value.size() );
}
template<typename Stream> inline void unpack( Stream& s, std::vector<char>& value ) {
unsigned_int size; unpack( s, size );
unsigned_int size; fc::raw::unpack( s, size );
FC_ASSERT( size.value < MAX_ARRAY_ALLOC_SIZE );
value.resize(size.value);
if( value.size() )
@ -237,23 +237,23 @@ namespace fc {
// fc::string
template<typename Stream> inline void pack( Stream& s, const fc::string& v ) {
pack( s, unsigned_int((uint32_t)v.size()));
fc::raw::pack( s, unsigned_int((uint32_t)v.size()));
if( v.size() ) s.write( v.c_str(), v.size() );
}
template<typename Stream> inline void unpack( Stream& s, fc::string& v ) {
std::vector<char> tmp; unpack(s,tmp);
std::vector<char> tmp; fc::raw::unpack(s,tmp);
if( tmp.size() )
v = fc::string(tmp.data(),tmp.data()+tmp.size());
else v = fc::string();
}
// bool
template<typename Stream> inline void pack( Stream& s, const bool& v ) { pack( s, uint8_t(v) ); }
template<typename Stream> inline void pack( Stream& s, const bool& v ) { fc::raw::pack( s, uint8_t(v) ); }
template<typename Stream> inline void unpack( Stream& s, bool& v )
{
uint8_t b;
unpack( s, b );
fc::raw::unpack( s, b );
FC_ASSERT( (b & ~1) == 0 );
v=(b!=0);
}
@ -267,7 +267,7 @@ namespace fc {
template<typename T, typename C, T(C::*p)>
void operator()( const char* name )const {
raw::pack( s, c.*p );
fc::raw::pack( s, c.*p );
}
private:
const Class& c;
@ -282,7 +282,7 @@ namespace fc {
template<typename T, typename C, T(C::*p)>
inline void operator()( const char* name )const
{ try {
raw::unpack( s, c.*p );
fc::raw::unpack( s, c.*p );
} FC_RETHROW_EXCEPTIONS( warn, "Error unpacking field ${field}", ("field",name) ) }
private:
Class& c;
@ -361,7 +361,7 @@ namespace fc {
template<typename Stream, typename T>
inline void pack( Stream& s, const std::unordered_set<T>& value ) {
pack( s, unsigned_int((uint32_t)value.size()) );
fc::raw::pack( s, unsigned_int((uint32_t)value.size()) );
auto itr = value.begin();
auto end = value.end();
while( itr != end ) {
@ -371,7 +371,7 @@ namespace fc {
}
template<typename Stream, typename T>
inline void unpack( Stream& s, std::unordered_set<T>& value ) {
unsigned_int size; unpack( s, size );
unsigned_int size; fc::raw::unpack( s, size );
value.clear();
FC_ASSERT( size.value*sizeof(T) < MAX_ARRAY_ALLOC_SIZE );
value.reserve(size.value);
@ -386,19 +386,19 @@ namespace fc {
template<typename Stream, typename K, typename V>
inline void pack( Stream& s, const std::pair<K,V>& value ) {
pack( s, value.first );
pack( s, value.second );
fc::raw::pack( s, value.first );
fc::raw::pack( s, value.second );
}
template<typename Stream, typename K, typename V>
inline void unpack( Stream& s, std::pair<K,V>& value )
{
unpack( s, value.first );
unpack( s, value.second );
fc::raw::unpack( s, value.first );
fc::raw::unpack( s, value.second );
}
template<typename Stream, typename K, typename V>
inline void pack( Stream& s, const std::unordered_map<K,V>& value ) {
pack( s, unsigned_int((uint32_t)value.size()) );
fc::raw::pack( s, unsigned_int((uint32_t)value.size()) );
auto itr = value.begin();
auto end = value.end();
while( itr != end ) {
@ -409,7 +409,7 @@ namespace fc {
template<typename Stream, typename K, typename V>
inline void unpack( Stream& s, std::unordered_map<K,V>& value )
{
unsigned_int size; unpack( s, size );
unsigned_int size; fc::raw::unpack( s, size );
value.clear();
FC_ASSERT( size.value*(sizeof(K)+sizeof(V)) < MAX_ARRAY_ALLOC_SIZE );
value.reserve(size.value);
@ -422,7 +422,7 @@ namespace fc {
}
template<typename Stream, typename K, typename V>
inline void pack( Stream& s, const std::map<K,V>& value ) {
pack( s, unsigned_int((uint32_t)value.size()) );
fc::raw::pack( s, unsigned_int((uint32_t)value.size()) );
auto itr = value.begin();
auto end = value.end();
while( itr != end ) {
@ -433,7 +433,7 @@ namespace fc {
template<typename Stream, typename K, typename V>
inline void unpack( Stream& s, std::map<K,V>& value )
{
unsigned_int size; unpack( s, size );
unsigned_int size; fc::raw::unpack( s, size );
value.clear();
FC_ASSERT( size.value*(sizeof(K)+sizeof(V)) < MAX_ARRAY_ALLOC_SIZE );
for( uint32_t i = 0; i < size.value; ++i )
@ -446,7 +446,7 @@ namespace fc {
template<typename Stream, typename T>
inline void pack( Stream& s, const std::deque<T>& value ) {
pack( s, unsigned_int((uint32_t)value.size()) );
fc::raw::pack( s, unsigned_int((uint32_t)value.size()) );
auto itr = value.begin();
auto end = value.end();
while( itr != end ) {
@ -457,7 +457,7 @@ namespace fc {
template<typename Stream, typename T>
inline void unpack( Stream& s, std::deque<T>& value ) {
unsigned_int size; unpack( s, size );
unsigned_int size; fc::raw::unpack( s, size );
FC_ASSERT( size.value*sizeof(T) < MAX_ARRAY_ALLOC_SIZE );
value.resize(size.value);
auto itr = value.begin();
@ -470,7 +470,7 @@ namespace fc {
template<typename Stream, typename T>
inline void pack( Stream& s, const std::vector<T>& value ) {
pack( s, unsigned_int((uint32_t)value.size()) );
fc::raw::pack( s, unsigned_int((uint32_t)value.size()) );
auto itr = value.begin();
auto end = value.end();
while( itr != end ) {
@ -481,7 +481,7 @@ namespace fc {
template<typename Stream, typename T>
inline void unpack( Stream& s, std::vector<T>& value ) {
unsigned_int size; unpack( s, size );
unsigned_int size; fc::raw::unpack( s, size );
FC_ASSERT( size.value*sizeof(T) < MAX_ARRAY_ALLOC_SIZE );
value.resize(size.value);
auto itr = value.begin();
@ -494,7 +494,7 @@ namespace fc {
template<typename Stream, typename T>
inline void pack( Stream& s, const std::set<T>& value ) {
pack( s, unsigned_int((uint32_t)value.size()) );
fc::raw::pack( s, unsigned_int((uint32_t)value.size()) );
auto itr = value.begin();
auto end = value.end();
while( itr != end ) {
@ -505,11 +505,11 @@ namespace fc {
template<typename Stream, typename T>
inline void unpack( Stream& s, std::set<T>& value ) {
unsigned_int size; unpack( s, size );
unsigned_int size; fc::raw::unpack( s, size );
for( uint64_t i = 0; i < size.value; ++i )
{
T tmp;
unpack( s, tmp );
fc::raw::unpack( s, tmp );
value.insert( std::move(tmp) );
}
}
@ -530,19 +530,19 @@ namespace fc {
inline size_t pack_size( const T& v )
{
datastream<size_t> ps;
raw::pack(ps,v );
fc::raw::pack(ps,v );
return ps.tellp();
}
template<typename T>
inline std::vector<char> pack( const T& v ) {
datastream<size_t> ps;
raw::pack(ps,v );
fc::raw::pack(ps,v );
std::vector<char> vec(ps.tellp());
if( vec.size() ) {
datastream<char*> ds( vec.data(), size_t(vec.size()) );
raw::pack(ds,v);
fc::raw::pack(ds,v);
}
return vec;
}
@ -553,7 +553,7 @@ namespace fc {
T tmp;
if( s.size() ) {
datastream<const char*> ds( s.data(), size_t(s.size()) );
raw::unpack(ds,tmp);
fc::raw::unpack(ds,tmp);
}
return tmp;
} FC_RETHROW_EXCEPTIONS( warn, "error unpacking ${type}", ("type",fc::get_typename<T>::name() ) ) }
@ -563,14 +563,14 @@ namespace fc {
{ try {
if( s.size() ) {
datastream<const char*> ds( s.data(), size_t(s.size()) );
raw::unpack(ds,tmp);
fc::raw::unpack(ds,tmp);
}
} FC_RETHROW_EXCEPTIONS( warn, "error unpacking ${type}", ("type",fc::get_typename<T>::name() ) ) }
template<typename T>
inline void pack( char* d, uint32_t s, const T& v ) {
datastream<char*> ds(d,s);
raw::pack(ds,v );
fc::raw::pack(ds,v );
}
template<typename T>
@ -578,7 +578,7 @@ namespace fc {
{ try {
T v;
datastream<const char*> ds( d, s );
raw::unpack(ds,v);
fc::raw::unpack(ds,v);
return v;
} FC_RETHROW_EXCEPTIONS( warn, "error unpacking ${type}", ("type",fc::get_typename<T>::name() ) ) }
@ -586,7 +586,7 @@ namespace fc {
inline void unpack( const char* d, uint32_t s, T& v )
{ try {
datastream<const char*> ds( d, s );
raw::unpack(ds,v);
fc::raw::unpack(ds,v);
return v;
} FC_RETHROW_EXCEPTIONS( warn, "error unpacking ${type}", ("type",fc::get_typename<T>::name() ) ) }
@ -599,7 +599,7 @@ namespace fc {
typedef void result_type;
template<typename T> void operator()( const T& v )const
{
pack( stream, v );
fc::raw::pack( stream, v );
}
};
@ -612,7 +612,7 @@ namespace fc {
typedef void result_type;
template<typename T> void operator()( T& v )const
{
unpack( stream, v );
fc::raw::unpack( stream, v );
}
};
@ -620,14 +620,14 @@ namespace fc {
template<typename Stream, typename... T>
void pack( Stream& s, const static_variant<T...>& sv )
{
pack( s, unsigned_int(sv.which()) );
fc::raw::pack( s, unsigned_int(sv.which()) );
sv.visit( pack_static_variant<Stream>(s) );
}
template<typename Stream, typename... T> void unpack( Stream& s, static_variant<T...>& sv )
{
unsigned_int w;
unpack( s, w );
fc::raw::unpack( s, w );
sv.set_which(w.value);
sv.visit( unpack_static_variant<Stream>(s) );
}