rediff patches

diff --git a/rstudio-boost.patch b/rstudio-boost.patch
index 60a220332f7fa4b5447ea28c3789058a5bf048e3..2875c8118ad25e043908a99456b602eba5ece252 100644 (file)
--- a/rstudio-boost.patch
+++ b/rstudio-boost.patch
@@ -754,8 +754,8 @@ index af79150..d049524 100644
  add_definitions(-DBOOST_ENABLE_ASSERT_HANDLER)
 +add_definitions(-DBOOST_BIND_GLOBAL_PLACEHOLDERS)
  
- # explicitly do not use new c++ 11 features for websocketpp
- # they currently do not work with our source
+ # test directory
+ set(TESTS_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/tests/cpp" CACHE STRING "Test includes")
 diff --git a/src/cpp/core/system/PosixChildProcessTracker.cpp b/src/cpp/core/system/PosixChildProcessTracker.cpp
 index 2ee1a81..976da4f 100644
 --- a/src/cpp/core/system/PosixChildProcessTracker.cpp

diff --git a/websocketpp-boost.patch b/websocketpp-boost.patch
index 3f318de1cd2b605d733e451cc3befad445af77be..1016fe2748afa72fda55010fa956fc61338658aa 100644 (file)
--- a/websocketpp-boost.patch
+++ b/websocketpp-boost.patch
@@ -58,8 +58,8 @@ index 5c8293db..6c7d3524 100644
 -            lib::ref(*service));
 +        m_socket.reset(new boost::asio::ip::tcp::socket(*service));
  
-         if (m_socket_init_handler) {
-             m_socket_init_handler(m_hdl, *m_socket);
+         m_state = READY;
+ 
 diff --git a/websocketpp/transport/asio/security/tls.hpp b/websocketpp/transport/asio/security/tls.hpp
 index c76fd9aa..04ac3790 100644
 --- a/websocketpp/transport/asio/security/tls.hpp
@@ -72,5 +72,5 @@ index c76fd9aa..04ac3790 100644
 -            _WEBSOCKETPP_REF(*service),lib::ref(*m_context));
 +        m_socket.reset(new socket_type(*service, *m_context));
  
-         if (m_socket_init_handler) {
-             m_socket_init_handler(m_hdl, get_socket());
+         m_io_service = service;
+         m_strand = strand;