diff options
Diffstat (limited to 'rstudio_boost.patch')
| -rw-r--r-- | rstudio_boost.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/rstudio_boost.patch b/rstudio_boost.patch new file mode 100644 index 000000000000..10ffa194e5ba --- /dev/null +++ b/rstudio_boost.patch @@ -0,0 +1,25 @@ +From 6511e6ce3fef2fe628cbb436e30289829351f088 Mon Sep 17 00:00:00 2001 +From: Stephen Martin <stephensrmmartin@gmail.com> +Date: Tue, 31 Mar 2020 16:30:47 -0700 +Subject: [PATCH] Use boost, not rstudio_boost + +--- + src/cpp/server_core/ServerDatabase.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/cpp/server_core/ServerDatabase.cpp b/src/cpp/server_core/ServerDatabase.cpp +index ad04faadb1..1ba5771076 100644 +--- a/src/cpp/server_core/ServerDatabase.cpp ++++ b/src/cpp/server_core/ServerDatabase.cpp +@@ -199,7 +199,7 @@ boost::shared_ptr<IConnection> getConnection() + return s_connectionPool->getConnection(); + } + +-bool getConnection(const rstudio_boost::posix_time::time_duration& waitTime, ++bool getConnection(const boost::posix_time::time_duration& waitTime, + boost::shared_ptr<IConnection>* pConnection) + { + return s_connectionPool->getConnection(waitTime, pConnection); +-- +2.26.0 + |