Skip to content

Instantly share code, notes, and snippets.

@trap000d
Last active December 23, 2020 04:31
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save trap000d/22b11a58c064046478967e60b3394214 to your computer and use it in GitHub Desktop.
Save trap000d/22b11a58c064046478967e60b3394214 to your computer and use it in GitHub Desktop.
Build RStudio against boost 1.75
diff -Nru rstudio-rstudio-aee4453.original/src/cpp/CMakeLists.txt rstudio-rstudio-aee4453/src/cpp/CMakeLists.txt
--- rstudio-rstudio-aee4453.original/src/cpp/CMakeLists.txt 2020-09-18 06:16:48.000000000 +1200
+++ rstudio-rstudio-aee4453/src/cpp/CMakeLists.txt 2020-12-23 17:29:51.015656459 +1300
@@ -28,6 +28,7 @@
# global directives
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
diff -Nru rstudio-rstudio-aee4453.original/src/cpp/core/file_lock/FileLock.cpp rstudio-rstudio-aee4453/src/cpp/core/file_lock/FileLock.cpp
--- rstudio-rstudio-aee4453.original/src/cpp/core/file_lock/FileLock.cpp 2020-09-18 06:16:48.000000000 +1200
+++ rstudio-rstudio-aee4453/src/cpp/core/file_lock/FileLock.cpp 2020-12-23 17:29:17.029783097 +1300
@@ -26,6 +26,7 @@
#include <core/system/Environment.hpp>
#include <boost/algorithm/string.hpp>
+#include <boost/bind/bind.hpp>
// borrowed from SessionConstants.hpp
#define kRStudioSessionRoute "RSTUDIO_SESSION_ROUTE"
diff -Nru rstudio-rstudio-aee4453.original/src/cpp/core/HtmlUtils.cpp rstudio-rstudio-aee4453/src/cpp/core/HtmlUtils.cpp
--- rstudio-rstudio-aee4453.original/src/cpp/core/HtmlUtils.cpp 2020-09-18 06:16:48.000000000 +1200
+++ rstudio-rstudio-aee4453/src/cpp/core/HtmlUtils.cpp 2020-12-23 17:29:17.029783097 +1300
@@ -19,6 +19,7 @@
#include <boost/format.hpp>
#include <boost/algorithm/string/predicate.hpp>
+#include <boost/bind/bind.hpp>
#include <core/Base64.hpp>
#include <core/FileSerializer.hpp>
@@ -30,6 +31,7 @@
namespace core {
namespace html_utils {
+using namespace boost::placeholders;
HTML::HTML(const std::string& text, bool isHTML)
{
diff -Nru rstudio-rstudio-aee4453.original/src/cpp/core/system/PosixChildProcessTracker.cpp rstudio-rstudio-aee4453/src/cpp/core/system/PosixChildProcessTracker.cpp
--- rstudio-rstudio-aee4453.original/src/cpp/core/system/PosixChildProcessTracker.cpp 2020-09-18 06:16:48.000000000 +1200
+++ rstudio-rstudio-aee4453/src/cpp/core/system/PosixChildProcessTracker.cpp 2020-12-23 17:29:17.029783097 +1300
@@ -18,6 +18,7 @@
#include <sys/wait.h>
#include <boost/format.hpp>
+#include <boost/bind/bind.hpp>
namespace rstudio {
namespace core {
@@ -60,7 +61,7 @@
std::for_each(processes.begin(),
processes.end(),
boost::bind(&ChildProcessTracker::attemptToReapProcess,
- this, _1));
+ this, boost::placeholders::_1));
}
void ChildProcessTracker::attemptToReapProcess(
diff -Nru rstudio-rstudio-aee4453.original/src/cpp/core/system/PosixOutputCapture.cpp rstudio-rstudio-aee4453/src/cpp/core/system/PosixOutputCapture.cpp
--- rstudio-rstudio-aee4453.original/src/cpp/core/system/PosixOutputCapture.cpp 2020-09-18 06:16:48.000000000 +1200
+++ rstudio-rstudio-aee4453/src/cpp/core/system/PosixOutputCapture.cpp 2020-12-23 17:29:17.029783097 +1300
@@ -27,12 +27,14 @@
#include <core/BoostErrors.hpp>
#include <core/system/System.hpp>
+#include <boost/bind/bind.hpp>
namespace rstudio {
namespace core {
namespace system {
namespace {
+using namespace boost::placeholders;
void readFromPipe(
int pipeFd,
diff -Nru rstudio-rstudio-aee4453.original/src/cpp/r/session/RStdCallbacks.cpp rstudio-rstudio-aee4453/src/cpp/r/session/RStdCallbacks.cpp
--- rstudio-rstudio-aee4453.original/src/cpp/r/session/RStdCallbacks.cpp 2020-09-18 06:16:48.000000000 +1200
+++ rstudio-rstudio-aee4453/src/cpp/r/session/RStdCallbacks.cpp 2020-12-23 17:29:17.029783097 +1300
@@ -19,6 +19,7 @@
#include <boost/function.hpp>
#include <boost/regex.hpp>
+#include <boost/bind/bind.hpp>
#include <r/RExec.hpp>
#include <r/ROptions.hpp>
@@ -64,6 +65,8 @@
namespace {
+using namespace boost::placeholders;
+
// have we completed our one-time initialization yet?
bool s_initialized = false;
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment