blob: 5e832db2883b6176f6027373e43367adb90c3cdd (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
|
--- rstudio-1.3.1093-orig/src/cpp/r/session/RStdCallbacks.cpp
+++ rstudio-1.3.1093/src/cpp/r/session/RStdCallbacks.cpp
@@ -19,7 +19,7 @@
#include <boost/function.hpp>
#include <boost/regex.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
#include <r/RExec.hpp>
#include <r/ROptions.hpp>
@@ -58,6 +58,7 @@ __declspec(dllimport) SA_TYPE SaveAction
}
using namespace rstudio::core;
+using namespace boost::placeholders;
namespace rstudio {
namespace r {
--- rstudio-1.3.1093-orig/src/cpp/core/HtmlUtils.cpp.orig
+++ rstudio-1.3.1093/src/cpp/core/HtmlUtils.cpp
@@ -19,13 +19,15 @@
#include <boost/format.hpp>
#include <boost/algorithm/string/predicate.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
#include <core/Base64.hpp>
#include <core/FileSerializer.hpp>
#include <core/RegexUtils.hpp>
#include <core/http/Util.hpp>
+
+using namespace boost::placeholders;
namespace rstudio {
namespace core {
--- rstudio-1.3.1093-orig/src/cpp/core/file_lock/FileLock.cpp.orig
+++ rstudio-1.3.1093/src/cpp/core/file_lock/FileLock.cpp
@@ -26,10 +26,12 @@
#include <core/system/Environment.hpp>
#include <boost/algorithm/string.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
// borrowed from SessionConstants.hpp
#define kRStudioSessionRoute "RSTUDIO_SESSION_ROUTE"
+
+using namespace boost::placeholders;
namespace rstudio {
namespace core {
|
