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 -3
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 4accfdd951 - Show all commits

2
include/fc/crypto/hash160.hpp
View file

@ -64,7 +64,7 @@ class hash160
hash160 result();
private:
class impl;
struct impl;
fc::fwd<impl,117> my;
};

4
src/network/http/websocket.cpp
View file

@ -282,7 +282,7 @@ namespace fc { namespace http {
}).wait();
});
_server.set_socket_init_handler( [this]( websocketpp::connection_hdl hdl,
_server.set_socket_init_handler( []( websocketpp::connection_hdl hdl,
typename websocketpp::server<T>::connection_type::socket_type& s ) {
boost::asio::ip::tcp::no_delay option(true);
s.lowest_layer().set_option(option);
@ -417,7 +417,7 @@ namespace fc { namespace http {
const std::string& forward_header_key )
: generic_websocket_server_impl( forward_header_key )
{
_server.set_tls_init_handler( [this,server_pem,ssl_password]( websocketpp::connection_hdl hdl ) {
_server.set_tls_init_handler( [server_pem,ssl_password]( websocketpp::connection_hdl hdl ) {
context_ptr ctx = websocketpp::lib::make_shared<boost::asio::ssl::context>(
boost::asio::ssl::context::tlsv1 );
try {