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

Merge branch 'phoenix' of github.com:InvictusInnovations/fc into phoenix

Browse source
This commit is contained in:
Daniel Larimer 2013-11-13 14:51:35 -05:00
commit ee8125050b
3 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/fc/filesystem.hpp
View file

@ -66,7 +66,11 @@ namespace fc {
static char separator_char; static char separator_char;
private: private:
#ifdef _WIN64
fwd<boost::filesystem::path,40> _p;
#else
fwd<boost::filesystem::path,32> _p; fwd<boost::filesystem::path,32> _p;
#endif
}; };
class directory_iterator { class directory_iterator {

4
include/fc/interprocess/file_mapping.hpp
View file

@ -21,7 +21,11 @@ namespace fc {
~file_mapping(); ~file_mapping();
private: private:
friend class mapped_region; friend class mapped_region;
#ifdef _WIN64
fc::fwd<boost::interprocess::file_mapping,0x38> my;
#else
fc::fwd<boost::interprocess::file_mapping,0x24> my; fc::fwd<boost::interprocess::file_mapping,0x24> my;
#endif
}; };
class mapped_region { class mapped_region {

4
include/fc/network/tcp_socket.hpp
View file

@ -32,7 +32,11 @@ namespace fc {
private: private:
friend class tcp_server; friend class tcp_server;
class impl; class impl;
#ifdef _WIN64
fc::fwd<impl,0x68> my;
#else
fc::fwd<impl,0x44> my; fc::fwd<impl,0x44> my;
#endif
}; };
typedef std::shared_ptr<tcp_socket> tcp_socket_ptr; typedef std::shared_ptr<tcp_socket> tcp_socket_ptr;