Merge pull request #8606 from JanMarvin/boost175

fix building with boost 1.75
rstudio · Dec 16, 2020 · c8b78eb · c8b78eb
2 parents 3a45f44 + a73589c
commit c8b78eb
Show file tree

Hide file tree

Showing 108 changed files with 268 additions and 116 deletions.
diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
@@ -35,7 +35,6 @@ include("${CMAKE_CURRENT_SOURCE_DIR}/../../CMakeGlobals.txt")
 
 # 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 --git a/src/cpp/core/ConfigUtils.cpp b/src/cpp/core/ConfigUtils.cpp
@@ -18,14 +18,16 @@
 #include <algorithm>
 
 #include <boost/regex.hpp>
-#include <boost/bind.hpp>
 #include <boost/algorithm/string/trim.hpp>
 #include <boost/algorithm/string/replace.hpp>
+#include <boost/bind/bind.hpp>
 
 #include <shared_core/Error.hpp>
 #include <shared_core/FilePath.hpp>
 #include <core/FileSerializer.hpp>
 
+using namespace boost::placeholders;
+
 namespace rstudio {
 namespace core {
 namespace config_utils {

diff --git a/src/cpp/core/FileLockTests.cpp b/src/cpp/core/FileLockTests.cpp
@@ -23,11 +23,13 @@
 #include <shared_core/FilePath.hpp>
 
 #include <boost/thread.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 #define RSTUDIO_NO_TESTTHAT_ALIASES
 #include <tests/TestThat.hpp>
 
+using namespace boost::placeholders;
+
 namespace rstudio {
 namespace core {
 namespace tests {

diff --git a/src/cpp/core/FileUtils.cpp b/src/cpp/core/FileUtils.cpp
@@ -16,7 +16,7 @@
 #include <fstream>
 #include <iostream>
 
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 #include <core/FileUtils.hpp>
 #include <core/FileSerializer.hpp>
@@ -29,6 +29,8 @@
 #include <core/system/PosixUser.hpp>
 #endif
 
+using namespace boost::placeholders;
+
 namespace rstudio {
 namespace core {
 namespace file_utils {

diff --git a/src/cpp/core/HtmlUtils.cpp b/src/cpp/core/HtmlUtils.cpp
@@ -19,13 +19,16 @@
 
 #include <boost/format.hpp>
 #include <boost/algorithm/string/predicate.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 {
 namespace html_utils {

diff --git a/src/cpp/core/file_lock/FileLock.cpp b/src/cpp/core/file_lock/FileLock.cpp
@@ -27,10 +27,13 @@
 #include <core/system/Xdg.hpp>
 
 #include <boost/algorithm/string.hpp>
+#include <boost/bind/bind.hpp>
 
 // borrowed from SessionConstants.hpp
 #define kRStudioSessionRoute "RSTUDIO_SESSION_ROUTE"
 
+using namespace boost::placeholders;
+
 namespace rstudio {
 namespace core {
 

diff --git a/src/cpp/core/gwt/GwtSymbolMaps.cpp b/src/cpp/core/gwt/GwtSymbolMaps.cpp
@@ -20,16 +20,18 @@
 #include <set>
 #include <algorithm>
 
-#include <boost/bind.hpp>
 #include <boost/regex.hpp>
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/predicate.hpp>
+#include <boost/bind/bind.hpp>
 
 #include <core/Thread.hpp>
 #include <core/RegexUtils.hpp>
 #include <shared_core/SafeConvert.hpp>
 #include <core/FileSerializer.hpp>
 
+using namespace boost::placeholders;
+
 // NOTE: this is a port of the following GWT class:
 // (our rev was 11565, we should track to future changes)
 

diff --git a/src/cpp/core/http/SocketProxy.cpp b/src/cpp/core/http/SocketProxy.cpp
@@ -27,16 +27,16 @@
 
 #include <iostream>
 
-#include <boost/bind.hpp>
-
 #include <boost/asio/placeholders.hpp>
+#include <boost/bind/bind.hpp>
 
 #include <shared_core/Error.hpp>
 #include <core/Log.hpp>
 
 #include <core/http/SocketUtils.hpp>
 
 using namespace rstudio::core;
+using namespace boost::placeholders;
 
 namespace rstudio {
 namespace core {

diff --git a/src/cpp/core/http/UriHandler.cpp b/src/cpp/core/http/UriHandler.cpp
@@ -17,11 +17,13 @@
 
 #include <algorithm>
 
-#include <boost/bind.hpp>
 #include <boost/algorithm/string/predicate.hpp>
+#include <boost/bind/bind.hpp>
 
 #include <core/http/Request.hpp>
 
+using namespace boost::placeholders;
+
 namespace rstudio {
 namespace core {
 namespace http {

diff --git a/src/cpp/core/include/core/Predicate.hpp b/src/cpp/core/include/core/Predicate.hpp
@@ -16,8 +16,10 @@
 #ifndef CORE_PREDICATE_HPP
 #define CORE_PREDICATE_HPP
 
-#include <boost/bind.hpp>
 #include <boost/function.hpp>
+#include <boost/bind/bind.hpp>
+
+using namespace boost::placeholders;
 
 namespace rstudio {
 namespace core {

diff --git a/src/cpp/core/include/core/http/AsyncUriHandler.hpp b/src/cpp/core/include/core/http/AsyncUriHandler.hpp
@@ -20,15 +20,17 @@
 #include <vector>
 #include <algorithm>
 
-#include <boost/bind.hpp>
 #include <boost/function.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/variant.hpp>
 #include <boost/algorithm/string/predicate.hpp>
+#include <boost/bind/bind.hpp>
 
 #include <core/http/UriHandler.hpp>
 #include <core/http/AsyncConnection.hpp>
 
+using namespace boost::placeholders;
+
 namespace rstudio {
 namespace core {
 namespace http {

diff --git a/src/cpp/core/include/core/http/Message.hpp b/src/cpp/core/include/core/http/Message.hpp
@@ -20,9 +20,11 @@
 #include <vector>
 #include <algorithm>
 
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/utility.hpp>
 
+using namespace boost::placeholders;
+
 namespace RSTUDIO_BOOST_NAMESPACE {
 namespace asio {
    class const_buffer;

diff --git a/src/cpp/core/include/core/json/JsonRpc.hpp b/src/cpp/core/include/core/json/JsonRpc.hpp
@@ -91,14 +91,16 @@ struct is_error_code_enum<rstudio::core::json::errc::errc_t>
 
 #include <string>
 
-#include <boost/bind.hpp>
 #include <boost/function.hpp>
 #include <boost/optional.hpp>
 #include <boost/unordered_map.hpp>
+#include <boost/bind/bind.hpp>
 
 #include <shared_core/Error.hpp>
 #include <shared_core/json/Json.hpp>
 
+using namespace boost::placeholders;
+
 namespace rstudio {
 namespace core {
 namespace http {

diff --git a/src/cpp/core/include/core/r_util/RSourceIndex.hpp b/src/cpp/core/include/core/r_util/RSourceIndex.hpp
@@ -19,12 +19,12 @@
 #include <string>
 #include <vector>
 
-#include <boost/bind.hpp>
 #include <boost/function.hpp>
 #include <boost/utility.hpp>
 #include <boost/regex.hpp>
 #include <boost/range/adaptors.hpp>
 #include <boost/algorithm/string/predicate.hpp>
+#include <boost/bind/bind.hpp>
 
 #include <core/Algorithm.hpp>
 #include <shared_core/SafeConvert.hpp>
@@ -34,6 +34,8 @@
 #include <core/r_util/RTokenizer.hpp>
 #include <core/r_util/RFunctionInformation.hpp>
 
+using namespace boost::placeholders;
+
 namespace rstudio {
 namespace core {
 namespace r_util {

diff --git a/src/cpp/core/include/core/text/TemplateFilter.hpp b/src/cpp/core/include/core/text/TemplateFilter.hpp
@@ -21,13 +21,15 @@
 #include <string>
 #include <map>
 
-#include <boost/bind.hpp>
 #include <boost/function.hpp>
+#include <boost/bind/bind.hpp>
 
 #include <boost/iostreams/filter/regex.hpp>
 
 #include <core/StringUtils.hpp>
 
+using namespace boost::placeholders;
+
 namespace rstudio {
 namespace core {
 

diff --git a/src/cpp/core/markdown/MathJax.cpp b/src/cpp/core/markdown/MathJax.cpp
@@ -17,13 +17,15 @@
 
 #include <algorithm>
 
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/function.hpp>
 #include <boost/algorithm/string.hpp>
 
 #include <core/RegexUtils.hpp>
 #include <core/system/System.hpp>
 
+using namespace boost::placeholders;
+
 namespace rstudio {
 namespace core {
 

diff --git a/src/cpp/core/r_util/RActiveSessions.cpp b/src/cpp/core/r_util/RActiveSessions.cpp
@@ -15,7 +15,7 @@
 
 #include <core/r_util/RActiveSessions.hpp>
 
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 
 #include <core/StringUtils.hpp>
@@ -28,6 +28,8 @@
 
 #define kSessionDirPrefix "session-"
 
+using namespace boost::placeholders;
+
 namespace rstudio {
 namespace core {
 namespace r_util {

diff --git a/src/cpp/core/r_util/RSourceIndex.cpp b/src/cpp/core/r_util/RSourceIndex.cpp
@@ -25,8 +25,10 @@
 #include <core/r_util/RTokenizer.hpp>
 #include <core/r_util/RTokenCursor.hpp>
 
-#include <boost/bind.hpp>
 #include <boost/algorithm/string.hpp>
+#include <boost/bind/bind.hpp>
+
+using namespace boost::placeholders;
 
 namespace rstudio {
 namespace core {

diff --git a/src/cpp/core/r_util/RVersionsPosix.cpp b/src/cpp/core/r_util/RVersionsPosix.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 #include <algorithm>
 
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 #include <core/Algorithm.hpp>
 #include <core/FileSerializer.hpp>
@@ -33,6 +33,8 @@
 #define kRScriptPath "Resources/bin/R"
 #endif
 
+using namespace boost::placeholders;
+
 namespace rstudio {
 namespace core {
 namespace r_util {

diff --git a/src/cpp/core/spelling/HunspellCustomDictionaries.cpp b/src/cpp/core/spelling/HunspellCustomDictionaries.cpp
@@ -15,11 +15,13 @@
 
 #include <core/spelling/HunspellCustomDictionaries.hpp>
 
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 #include <core/Algorithm.hpp>
 #include <core/Log.hpp>
 
+using namespace boost::placeholders;
+
 namespace rstudio {
 namespace core {
 namespace spelling {

diff --git a/src/cpp/core/spelling/HunspellDictionaryManager.cpp b/src/cpp/core/spelling/HunspellDictionaryManager.cpp
@@ -16,11 +16,13 @@
 #include <core/spelling/HunspellDictionaryManager.hpp>
 #include <core/system/Xdg.hpp>
 
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 #include <core/Algorithm.hpp>
 #include <core/Log.hpp>
 
+using namespace boost::placeholders;
+
 namespace rstudio {
 namespace core {
 namespace spelling {

diff --git a/src/cpp/core/system/ChildProcessSubprocPollTests.cpp b/src/cpp/core/system/ChildProcessSubprocPollTests.cpp
@@ -15,11 +15,13 @@
 
 #include "ChildProcessSubprocPoll.hpp"
 
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/thread/thread.hpp>
 
 #include <tests/TestThat.hpp>
 
+using namespace boost::placeholders;
+
 namespace rstudio {
 namespace core {
 namespace system {

diff --git a/src/cpp/core/system/Environment.cpp b/src/cpp/core/system/Environment.cpp
@@ -20,14 +20,16 @@
 
 #include <core/Algorithm.hpp>
 
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 #ifdef _WIN32
 #define kPathSeparator ";"
 #else
 #define kPathSeparator ":"
 #endif
 
+using namespace boost::placeholders;
+
 namespace rstudio {
 namespace core {
 namespace system {

diff --git a/src/cpp/core/system/PosixChildProcess.cpp b/src/cpp/core/system/PosixChildProcess.cpp
@@ -33,7 +33,7 @@
 #include <sys/types.h>
 
 #include <boost/asio.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 #include <shared_core/Error.hpp>
 #include <core/Log.hpp>
@@ -46,6 +46,8 @@
 
 #include <core/PerformanceTimer.hpp>
 
+using namespace boost::placeholders;
+
 namespace rstudio {
 namespace core {
 namespace system {