blob: 10ffa194e5ba647a01a5dfb7c0eec5c3569ec619 (
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
|
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
|