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

FC Updates from BitShares and myself #21

Closed
nathanielhourt wants to merge 687 commits from dapp-support into latest-fc
pull from: dapp-support
merge into: Peerplays_Blockchain:latest-fc
Conversation 4 Commits 687 Files changed 314 +3 -1
3 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 4511300081 - Show all commits

1
include/fc/io/iostream.hpp
View file

@ -1,5 +1,6 @@
#pragma once #pragma once
#include <memory> #include <memory>
#include <string>
namespace fc { namespace fc {

1
include/fc/network/http/connection.hpp
View file

@ -1,5 +1,6 @@
#pragma once #pragma once
#include <memory> #include <memory>
#include <string>
#include <vector> #include <vector>
namespace fc { namespace fc {

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

@ -51,7 +51,7 @@ namespace fc {
friend class tcp_server; friend class tcp_server;
class impl; class impl;
#ifdef _WIN64 #ifdef _WIN64
fc::fwd<impl,0x81> my; fc::fwd<impl,0x88> my;
#else #else
fc::fwd<impl,0x54> my; fc::fwd<impl,0x54> my;
#endif #endif