|
|
fb93b36 |
From 6b6f5a9b6a536b87aa5ddc568b2011628b5454d2 Mon Sep 17 00:00:00 2001
|
|
|
fb93b36 |
From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
|
|
|
fb93b36 |
Date: Sat, 30 May 2020 11:42:59 +0200
|
|
|
fb93b36 |
Subject: [PATCH] boost deprecated global placeholders
|
|
|
fb93b36 |
|
|
|
fb93b36 |
---
|
|
|
fb93b36 |
src/cpp/CMakeLists.txt | 1 +
|
|
|
fb93b36 |
src/cpp/core/system/PosixChildProcessTracker.cpp | 1 +
|
|
|
fb93b36 |
src/cpp/core/system/PosixOutputCapture.cpp | 2 ++
|
|
|
fb93b36 |
src/cpp/core/system/PosixSystem.cpp | 1 +
|
|
|
fb93b36 |
4 files changed, 5 insertions(+)
|
|
|
fb93b36 |
|
|
|
fb93b36 |
diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
|
|
|
fb93b36 |
index bd392c5..3a2e974 100644
|
|
|
fb93b36 |
--- a/src/cpp/CMakeLists.txt
|
|
|
fb93b36 |
+++ b/src/cpp/CMakeLists.txt
|
|
|
fb93b36 |
@@ -28,6 +28,7 @@ include("${CMAKE_CURRENT_SOURCE_DIR}/../../CMakeGlobals.txt")
|
|
|
fb93b36 |
|
|
|
fb93b36 |
# global directives
|
|
|
fb93b36 |
add_definitions(-DBOOST_ENABLE_ASSERT_HANDLER)
|
|
|
fb93b36 |
+add_definitions(-DBOOST_BIND_GLOBAL_PLACEHOLDERS)
|
|
|
fb93b36 |
|
|
|
fb93b36 |
# explicitly do not use new c++ 11 features for websocketpp
|
|
|
fb93b36 |
# they currently do not work with our source
|
|
|
fb93b36 |
diff --git a/src/cpp/core/system/PosixChildProcessTracker.cpp b/src/cpp/core/system/PosixChildProcessTracker.cpp
|
|
|
fb93b36 |
index 095973b..fbeb60d 100644
|
|
|
fb93b36 |
--- a/src/cpp/core/system/PosixChildProcessTracker.cpp
|
|
|
fb93b36 |
+++ b/src/cpp/core/system/PosixChildProcessTracker.cpp
|
|
|
fb93b36 |
@@ -18,6 +18,7 @@
|
|
|
fb93b36 |
#include <sys/wait.h>
|
|
|
fb93b36 |
|
|
|
fb93b36 |
#include <boost/format.hpp>
|
|
|
fb93b36 |
+#include <boost/bind.hpp>
|
|
|
fb93b36 |
|
|
|
fb93b36 |
namespace rstudio {
|
|
|
fb93b36 |
namespace core {
|
|
|
fb93b36 |
diff --git a/src/cpp/core/system/PosixOutputCapture.cpp b/src/cpp/core/system/PosixOutputCapture.cpp
|
|
|
fb93b36 |
index 786eedd..ccdd611 100644
|
|
|
fb93b36 |
--- a/src/cpp/core/system/PosixOutputCapture.cpp
|
|
|
fb93b36 |
+++ b/src/cpp/core/system/PosixOutputCapture.cpp
|
|
|
fb93b36 |
@@ -28,6 +28,8 @@
|
|
|
fb93b36 |
|
|
|
fb93b36 |
#include <core/system/System.hpp>
|
|
|
fb93b36 |
|
|
|
fb93b36 |
+#include <boost/bind.hpp>
|
|
|
fb93b36 |
+
|
|
|
fb93b36 |
namespace rstudio {
|
|
|
fb93b36 |
namespace core {
|
|
|
fb93b36 |
namespace system {
|
|
|
fb93b36 |
diff --git a/src/cpp/core/system/PosixSystem.cpp b/src/cpp/core/system/PosixSystem.cpp
|
|
|
fb93b36 |
index 04706b3..2a6e618 100644
|
|
|
fb93b36 |
--- a/src/cpp/core/system/PosixSystem.cpp
|
|
|
fb93b36 |
+++ b/src/cpp/core/system/PosixSystem.cpp
|
|
|
fb93b36 |
@@ -23,6 +23,7 @@
|
|
|
fb93b36 |
#include <boost/algorithm/string.hpp>
|
|
|
fb93b36 |
#include <boost/foreach.hpp>
|
|
|
fb93b36 |
#include <boost/range/as_array.hpp>
|
|
|
fb93b36 |
+#include <boost/bind.hpp>
|
|
|
fb93b36 |
|
|
|
fb93b36 |
#include <signal.h>
|
|
|
fb93b36 |
#include <fcntl.h>
|
|
|
fb93b36 |
--
|
|
|
fb93b36 |
2.25.2
|
|
|
fb93b36 |
|