]> git.pld-linux.org Git - packages/rstudio.git/blame - rstudio-boost.patch
projects / packages / rstudio.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
rediff patches
[packages/rstudio.git] / rstudio-boost.patch
CommitLineData
d629e245
JB		 1--- rstudio-1.1.143/src/cpp/CMakeLists.txt.orig 2017-04-12 00:42:14.000000000 +0200
2+++ rstudio-1.1.143/src/cpp/CMakeLists.txt 2019-04-30 18:03:57.109531679 +0200
3@@ -147,7 +147,6 @@
4 iostreams
5 program_options
6 regex
7- signals
8 system
9 thread
10 chrono
11--- rstudio-1.1.143/src/cpp/core/BoostErrors.cpp.orig 2017-04-12 00:42:14.000000000 +0200
12+++ rstudio-1.1.143/src/cpp/core/BoostErrors.cpp 2019-04-30 18:14:58.434346841 +0200
13@@ -148,7 +148,7 @@
14 boost::system::error_code ec_from_exception(const interprocess_exception& e)
15 {
16 if (e.get_error_code() == system_error)
17- return error_code(e.get_native_error(), get_system_category()) ;
18+ return error_code(e.get_native_error(), system_category()) ;
19 else
20 return error_code(e.get_error_code(), interprocess_category()) ;
21 }
22--- rstudio-1.1.143/src/cpp/core/DateTime.cpp.orig 2017-04-12 00:42:14.000000000 +0200
23+++ rstudio-1.1.143/src/cpp/core/DateTime.cpp 2019-04-30 18:41:49.839481751 +0200
24@@ -61,7 +61,7 @@
25 using namespace boost::posix_time;
26
27 ptime time_t_epoch(date(1970,1,1));
28- return time_t_epoch + seconds(sec);
29+ return time_t_epoch + seconds(int64_t(sec));
30 }
31
32 boost::posix_time::ptime timeFromMillisecondsSinceEpoch(int64_t ms)
33--- rstudio-1.1.143/src/cpp/core/Error.cpp.orig 2017-04-12 00:42:14.000000000 +0200
34+++ rstudio-1.1.143/src/cpp/core/Error.cpp 2019-04-30 18:50:13.489560404 +0200
35@@ -165,7 +165,7 @@
36 Error systemError(int value, const ErrorLocation& location)
37 {
38 using namespace boost::system ;
39- return Error(error_code(value, get_system_category()), location);
40+ return Error(error_code(value, system_category()), location);
41 }
42
43 Error systemError(int value,
44@@ -173,7 +173,7 @@
45 const ErrorLocation& location)
46 {
47 using namespace boost::system ;
48- return Error(error_code(value, get_system_category()), cause, location);
49+ return Error(error_code(value, system_category()), cause, location);
50 }
51
d629e245
JB		 52 Error systemError(int value,
53--- rstudio-1.1.143/src/cpp/core/FilePath.cpp.orig 2017-04-12 00:42:14.000000000 +0200
54+++ rstudio-1.1.143/src/cpp/core/FilePath.cpp 2019-04-30 19:08:36.191306900 +0200
55@@ -950,7 +950,7 @@
56 "absolute path not permitted",
57 boost::system::error_code(
58 boost::system::errc::no_such_file_or_directory,
59- boost::system::get_system_category()));
60+ boost::system::system_category()));
61 }
62
63 return complete(path);
64--- rstudio-1.1.143/src/cpp/core/file_lock/FileLock.cpp.orig 2017-04-12 00:42:14.000000000 +0200
65+++ rstudio-1.1.143/src/cpp/core/file_lock/FileLock.cpp 2019-04-30 19:53:12.433089596 +0200
66@@ -49,8 +49,8 @@
67 #endif
68
69 const char * const kLocksConfPath = "/etc/rstudio/file-locks";
70-const double kDefaultRefreshRate = 20.0;
71-const double kDefaultTimeoutInterval = 30.0;
72+const int64_t kDefaultRefreshRate = 20;
73+const int64_t kDefaultTimeoutInterval = 30;
74
75 std::string lockTypeToString(FileLock::LockType type)
76 {
77@@ -134,11 +134,11 @@
78 FileLock::s_defaultType = stringToLockType(settings.get("lock-type", kLockTypeDefault));
79
80 // timeout interval
81- double timeoutInterval = getFieldPositive(settings, "timeout-interval", kDefaultTimeoutInterval);
82+ int64_t timeoutInterval = getFieldPositive(settings, "timeout-interval", kDefaultTimeoutInterval);
83 FileLock::s_timeoutInterval = boost::posix_time::seconds(timeoutInterval);
84
85 // refresh rate
86- double refreshRate = getFieldPositive(settings, "refresh-rate", kDefaultRefreshRate);
87+ int64_t refreshRate = getFieldPositive(settings, "refresh-rate", kDefaultRefreshRate);
88 FileLock::s_refreshRate = boost::posix_time::seconds(refreshRate);
89
90 // logging
91--- rstudio-1.1.143/src/cpp/core/include/core/r_util/RFunctionInformation.hpp.orig 2017-04-12 00:42:14.000000000 +0200
92+++ rstudio-1.1.143/src/cpp/core/include/core/r_util/RFunctionInformation.hpp 2019-04-30 21:29:45.820684223 +0200
93@@ -75,9 +75,9 @@
94 const std::string& name() const { return name_; }
95 const boost::optional<std::string>& defaultValue() const { return defaultValue_; }
96 boost::tribool hasDefault() const { return hasDefault_; }
97- bool isUsed() const { return isUsed_; }
98+ bool isUsed() const { return bool(isUsed_); }
99 void setIsUsed(bool value) { isUsed_ = value; }
100- bool isMissingnessHandled() const { return isMissingnessHandled_; }
101+ bool isMissingnessHandled() const { return bool(isMissingnessHandled_); }
102 void setMissingnessHandled(bool value) { isMissingnessHandled_ = value; }
103
104 private:
105@@ -130,7 +130,7 @@
106
107 bool isPrimitive()
108 {
109- return isPrimitive_ == true;
110+ return bool(isPrimitive_ == true);
111 }
112
113 void setIsPrimitive(bool isPrimitive)
d629e245
JB		 114--- rstudio-1.1.143/src/cpp/r/include/r/session/RConsoleHistory.hpp.orig 2017-04-12 00:42:14.000000000 +0200
115+++ rstudio-1.1.143/src/cpp/r/include/r/session/RConsoleHistory.hpp 2019-04-30 21:38:32.871700755 +0200
116@@ -20,7 +20,7 @@
117
118 #include <boost/utility.hpp>
119 #include <boost/circular_buffer.hpp>
120-#include <boost/signal.hpp>
121+#include <boost/signals2/signal.hpp>
122
123 #include <core/json/Json.hpp>
124
125@@ -44,7 +44,7 @@
126 public:
127 typedef boost::circular_buffer<std::string>::value_type value_type;
128 typedef boost::circular_buffer<std::string>::const_iterator const_iterator;
129- typedef boost::signal<void (const std::string&)> AddSignal;
130+ typedef boost::signals2::signal<void (const std::string&)> AddSignal;
131
132 private:
133 ConsoleHistory();
134@@ -86,7 +86,7 @@
135 core::Error loadFromFile(const core::FilePath& filePath, bool verifyFile);
136 core::Error saveToFile(const core::FilePath& filePath) const;
137
138- boost::signals::connection connectOnAdd(
139+ boost::signals2::connection connectOnAdd(
140 const AddSignal::slot_function_type& slot)
141 {
142 return onAdd_.connect(slot);
143--- rstudio-1.1.143/src/cpp/monitor/include/monitor/MonitorClient.hpp.orig 2017-04-12 00:42:14.000000000 +0200
144+++ rstudio-1.1.143/src/cpp/monitor/include/monitor/MonitorClient.hpp 2019-04-30 21:45:43.674343571 +0200
145@@ -18,6 +18,8 @@
146
147 #include <string>
148
149+#include <boost/asio/io_service.hpp>
150+
151 #include <core/system/System.hpp>
152 #include <core/LogWriter.hpp>
153
154@@ -27,14 +29,6 @@
155
156 #include "MonitorConstants.hpp"
157
158-// forward declaration; boost/asio/io_service may cause errors if included more
159-// than once (Boost 1.50 on Win x64 only)
160-namespace RSTUDIO_BOOST_NAMESPACE {
161-namespace asio {
162- class io_service;
163-}
164-}
165-
166 namespace rstudio {
167 namespace monitor {
168
169--- rstudio-1.1.143/src/cpp/r/include/r/session/RGraphics.hpp.orig 2017-04-12 00:42:14.000000000 +0200
170+++ rstudio-1.1.143/src/cpp/r/include/r/session/RGraphics.hpp 2019-04-30 21:51:36.872886926 +0200
171@@ -56,7 +56,7 @@
172 #include <vector>
173
174 #include <boost/function.hpp>
175-#include <boost/signal.hpp>
176+#include <boost/signals2/signal.hpp>
177
178 #include <core/Error.hpp>
179 #include <core/json/Json.hpp>
180@@ -162,7 +162,7 @@
181 virtual void clear() = 0;
182
183 // subscribe to showManipulator event
184- virtual boost::signal<void ()>& onShowManipulator() = 0;
185+ virtual boost::signals2::signal<void ()>& onShowManipulator() = 0;
186
187 // set manipulator values
188 virtual void setPlotManipulatorValues(const core::json::Object& values) = 0;
189--- rstudio-1.1.143/src/cpp/r/session/graphics/RGraphicsPlotManager.hpp.orig 2017-04-12 00:42:14.000000000 +0200
190+++ rstudio-1.1.143/src/cpp/r/session/graphics/RGraphicsPlotManager.hpp 2019-04-30 21:56:03.636876362 +0200
191@@ -22,7 +22,7 @@
192 #include <boost/utility.hpp>
193 #include <boost/shared_ptr.hpp>
194 #include <boost/function.hpp>
195-#include <boost/signal.hpp>
196+#include <boost/signals2/signal.hpp>
197 #include <boost/regex.hpp>
198 #include <boost/circular_buffer.hpp>
199
200@@ -45,10 +45,10 @@
201
202 struct GraphicsDeviceEvents
203 {
204- boost::signal<void (SEXP)> onNewPage;
205- boost::signal<void ()> onDrawing;
206- boost::signal<void ()> onResized;
207- boost::signal<void ()> onClosed;
208+ boost::signals2::signal<void (SEXP)> onNewPage;
209+ boost::signals2::signal<void ()> onDrawing;
210+ boost::signals2::signal<void ()> onResized;
211+ boost::signals2::signal<void ()> onClosed;
212 };
213
214 class PlotManipulatorManager;
215@@ -110,7 +110,7 @@
216
217 virtual void clear();
218
219- virtual boost::signal<void ()>& onShowManipulator() ;
220+ virtual boost::signals2::signal<void ()>& onShowManipulator() ;
221 virtual void setPlotManipulatorValues(const core::json::Object& values);
222 virtual void manipulatorPlotClicked(int x, int y);
223
224--- rstudio-1.1.143/src/cpp/r/session/graphics/RGraphicsPlotManipulatorManager.hpp.orig 2017-04-12 00:42:14.000000000 +0200
225+++ rstudio-1.1.143/src/cpp/r/session/graphics/RGraphicsPlotManipulatorManager.hpp 2019-04-30 22:05:43.147318776 +0200
226@@ -16,7 +16,7 @@
227 #ifndef R_SESSION_GRAPHICS_PLOT_MANIPULATOR_MANAGER_HPP
228 #define R_SESSION_GRAPHICS_PLOT_MANIPULATOR_MANAGER_HPP
229
230-#include <boost/signal.hpp>
231+#include <boost/signals2/signal.hpp>
232
233 #include <core/Error.hpp>
234 #include <core/json/Json.hpp>
235@@ -53,7 +53,7 @@
236 public:
237 core::Error initialize(const UnitConversionFunctions& convert);
238
239- boost::signal<void ()>& onShowManipulator() ;
240+ boost::signals2::signal<void ()>& onShowManipulator() ;
241 void setPlotManipulatorValues(const core::json::Object& values);
242 void manipulatorPlotClicked(int x, int y);
243
244@@ -85,7 +85,7 @@
245 bool replayingManipulator_;
246
247 // manipulator event hook
248- boost::signal<void ()> onShowManipulator_;
249+ boost::signals2::signal<void ()> onShowManipulator_;
250
251 // unit conversion function
252 UnitConversionFunctions convert_;
253--- rstudio-1.1.143/src/cpp/r/session/graphics/RGraphicsPlotManipulatorManager.cpp.orig 2017-04-12 00:42:14.000000000 +0200
254+++ rstudio-1.1.143/src/cpp/r/session/graphics/RGraphicsPlotManipulatorManager.cpp 2019-04-30 22:08:26.619968572 +0200
255@@ -184,7 +184,7 @@
256 }
257
258
259-boost::signal<void ()>& PlotManipulatorManager::onShowManipulator()
260+boost::signals2::signal<void ()>& PlotManipulatorManager::onShowManipulator()
261 {
262 return onShowManipulator_;
263 }
264--- rstudio-1.1.143/src/cpp/r/session/graphics/RGraphicsPlotManager.cpp.orig 2017-04-12 00:42:14.000000000 +0200
265+++ rstudio-1.1.143/src/cpp/r/session/graphics/RGraphicsPlotManager.cpp 2019-04-30 22:12:31.552894791 +0200
266@@ -540,7 +540,7 @@
267
268
269
270-boost::signal<void ()>& PlotManager::onShowManipulator()
271+boost::signals2::signal<void ()>& PlotManager::onShowManipulator()
272 {
273 return plotManipulatorManager().onShowManipulator();
274 }
275--- rstudio-1.1.143/src/cpp/session/include/session/SessionUserSettings.hpp.orig 2017-04-12 00:42:14.000000000 +0200
276+++ rstudio-1.1.143/src/cpp/session/include/session/SessionUserSettings.hpp 2019-04-30 22:14:26.662303350 +0200
277@@ -20,7 +20,7 @@
278
279 #include <boost/utility.hpp>
280 #include <boost/scoped_ptr.hpp>
281-#include <boost/signal.hpp>
282+#include <boost/signals2/signal.hpp>
283
284 #include <core/Settings.hpp>
285 #include <core/FilePath.hpp>
286@@ -60,7 +60,7 @@
287 friend UserSettings& userSettings();
288
289 public:
290- boost::signal<void()> onChanged;
291+ boost::signals2::signal<void()> onChanged;
292
293 public:
294 // COPYING: boost::noncopyable
295--- rstudio-1.1.143/src/cpp/session/include/session/SessionConsoleProcess.hpp.orig 2017-04-12 00:42:14.000000000 +0200
296+++ rstudio-1.1.143/src/cpp/session/include/session/SessionConsoleProcess.hpp 2019-04-30 22:15:41.852955908 +0200
297@@ -20,7 +20,7 @@
298 #include <deque>
299
300 #include <boost/regex.hpp>
301-#include <boost/signals.hpp>
6d6b4763 302+#include <boost/signals2/signal.hpp>
d629e245
JB		 303 #include <boost/circular_buffer.hpp>
304 #include <boost/enable_shared_from_this.hpp>
305
306@@ -120,7 +120,7 @@
307 void setPromptHandler(
308 const boost::function<bool(const std::string&, Input*)>& onPrompt);
309
310- boost::signal<void(int)>& onExit() { return onExit_; }
311+ boost::signals2::signal<void(int)>& onExit() { return onExit_; }
312
313 std::string handle() const { return procInfo_->getHandle(); }
314 InteractionMode interactionMode() const { return procInfo_->getInteractionMode(); }
315@@ -195,7 +195,7 @@
316 int lastInputSequence_;
317
318 boost::function<bool(const std::string&, Input*)> onPrompt_;
319- boost::signal<void(int)> onExit_;
320+ boost::signals2::signal<void(int)> onExit_;
321
322 // regex for prompt detection
323 boost::regex controlCharsPattern_;
324--- rstudio-1.1.143/src/cpp/session/include/session/SessionModuleContext.hpp.orig 2017-04-12 00:42:14.000000000 +0200
325+++ rstudio-1.1.143/src/cpp/session/include/session/SessionModuleContext.hpp 2019-04-30 22:17:50.683118588 +0200
326@@ -21,7 +21,7 @@
327
328 #include <boost/utility.hpp>
329 #include <boost/function.hpp>
330-#include <boost/signals.hpp>
331+#include <boost/signals2/signal.hpp>
332 #include <boost/shared_ptr.hpp>
333
334 #include <core/HtmlUtils.hpp>
335@@ -316,34 +316,34 @@
336 // session events
337 struct Events : boost::noncopyable
338 {
339- boost::signal<void (core::json::Object*)> onSessionInfo;
340- boost::signal<void ()> onClientInit;
341- boost::signal<void ()> onBeforeExecute;
342- boost::signal<void(const std::string&)> onConsolePrompt;
343- boost::signal<void(const std::string&)> onConsoleInput;
344- boost::signal<void(const std::string&, const std::string&)>
345+ boost::signals2::signal<void (core::json::Object*)> onSessionInfo;
346+ boost::signals2::signal<void ()> onClientInit;
347+ boost::signals2::signal<void ()> onBeforeExecute;
348+ boost::signals2::signal<void(const std::string&)> onConsolePrompt;
349+ boost::signals2::signal<void(const std::string&)> onConsoleInput;
350+ boost::signals2::signal<void(const std::string&, const std::string&)>
351 onActiveConsoleChanged;
352- boost::signal<void (ConsoleOutputType, const std::string&)>
353+ boost::signals2::signal<void (ConsoleOutputType, const std::string&)>
354 onConsoleOutput;
355- boost::signal<void()> onUserInterrupt;
356- boost::signal<void (ChangeSource)> onDetectChanges;
357- boost::signal<void (core::FilePath)> onSourceEditorFileSaved;
358- boost::signal<void(bool)> onDeferredInit;
359- boost::signal<void(bool)> afterSessionInitHook;
360- boost::signal<void(bool)> onBackgroundProcessing;
361- boost::signal<void(bool)> onShutdown;
362- boost::signal<void ()> onQuit;
363- boost::signal<void (const std::vector<std::string>&)>
364+ boost::signals2::signal<void()> onUserInterrupt;
365+ boost::signals2::signal<void (ChangeSource)> onDetectChanges;
366+ boost::signals2::signal<void (core::FilePath)> onSourceEditorFileSaved;
367+ boost::signals2::signal<void(bool)> onDeferredInit;
368+ boost::signals2::signal<void(bool)> afterSessionInitHook;
369+ boost::signals2::signal<void(bool)> onBackgroundProcessing;
370+ boost::signals2::signal<void(bool)> onShutdown;
371+ boost::signals2::signal<void ()> onQuit;
372+ boost::signals2::signal<void (const std::vector<std::string>&)>
373 onLibPathsChanged;
374- boost::signal<void (const std::string&)> onPackageLoaded;
375- boost::signal<void ()> onPackageLibraryMutated;
376- boost::signal<void ()> onPreferencesSaved;
377- boost::signal<void (const DistributedEvent&)>
378+ boost::signals2::signal<void (const std::string&)> onPackageLoaded;
379+ boost::signals2::signal<void ()> onPackageLibraryMutated;
380+ boost::signals2::signal<void ()> onPreferencesSaved;
381+ boost::signals2::signal<void (const DistributedEvent&)>
382 onDistributedEvent;
383- boost::signal<void (core::FilePath)> onPermissionsChanged;
384+ boost::signals2::signal<void (core::FilePath)> onPermissionsChanged;
385
386 // signal for detecting extended type of documents
387- boost::signal<std::string(boost::shared_ptr<source_database::SourceDocument>),
388+ boost::signals2::signal<std::string(boost::shared_ptr<source_database::SourceDocument>),
389 firstNonEmpty<std::string> > onDetectSourceExtendedType;
390 };
391
392--- rstudio-1.1.143/src/cpp/session/include/session/SessionSourceDatabase.hpp.orig 2017-04-12 00:42:14.000000000 +0200
393+++ rstudio-1.1.143/src/cpp/session/include/session/SessionSourceDatabase.hpp 2019-04-30 22:18:33.162037081 +0200
394@@ -21,7 +21,7 @@
395
396 #include <boost/utility.hpp>
397 #include <boost/shared_ptr.hpp>
398-#include <boost/signals.hpp>
399+#include <boost/signals2/signal.hpp>
400
401 #include <core/FilePath.hpp>
402 #include <core/json/Json.hpp>
403@@ -203,14 +203,14 @@
404 // source database events
405 struct Events : boost::noncopyable
406 {
407- boost::signal<void(boost::shared_ptr<SourceDocument>)> onDocUpdated;
408- boost::signal<void(const std::string&,
409+ boost::signals2::signal<void(boost::shared_ptr<SourceDocument>)> onDocUpdated;
410+ boost::signals2::signal<void(const std::string&,
411 boost::shared_ptr<SourceDocument>)> onDocRenamed;
412- boost::signal<void(const std::string&)> onDocAdded;
413- boost::signal<void(
414+ boost::signals2::signal<void(const std::string&)> onDocAdded;
415+ boost::signals2::signal<void(
416 boost::shared_ptr<source_database::SourceDocument>)> onDocPendingRemove;
417- boost::signal<void(const std::string&, const std::string&)> onDocRemoved;
418- boost::signal<void()> onRemoveAll;
419+ boost::signals2::signal<void(const std::string&, const std::string&)> onDocRemoved;
420+ boost::signals2::signal<void()> onRemoveAll;
421 };
422
423 Events& events();
424--- rstudio-1.1.143/src/cpp/session/modules/SessionPlots.hpp.orig 2017-04-12 00:42:14.000000000 +0200
425+++ rstudio-1.1.143/src/cpp/session/modules/SessionPlots.hpp 2019-05-01 07:09:47.229018563 +0200
426@@ -16,7 +16,7 @@
427 #ifndef SESSION_PLOTS_HPP
428 #define SESSION_PLOTS_HPP
429
430-#include <boost/signals.hpp>
431+#include <boost/signals2/signal.hpp>
432
433 namespace rstudio {
434 namespace core {
435@@ -35,9 +35,9 @@
436
437 struct Events : boost::noncopyable
438 {
439- boost::signal<void()> onBeforeNewPlot;
440- boost::signal<void()> onBeforeNewGridPage;
441- boost::signal<void()> onNewPlot;
442+ boost::signals2::signal<void()> onBeforeNewPlot;
443+ boost::signals2::signal<void()> onBeforeNewGridPage;
444+ boost::signals2::signal<void()> onNewPlot;
445 };
446
447 Events& events();
448--- rstudio-1.1.143/src/cpp/ext/websocketpp/transport/asio/connection.hpp.orig 2019-05-01 07:53:58.222087293 +0200
449+++ rstudio-1.1.143/src/cpp/ext/websocketpp/transport/asio/connection.hpp 2019-05-01 07:54:08.975987464 +0200
450@@ -422,7 +422,7 @@
451 m_io_service = io_service;
452
453 if (config::enable_multithreading) {
454- m_strand = lib::make_shared<boost::asio::strand>(
455+ m_strand = lib::make_shared<boost::asio::io_service::strand>(
456 lib::ref(*io_service));
457
458 m_async_read_handler = m_strand->wrap(lib::bind(
459--- rstudio-1.1.143/src/cpp/session/include/session/projects/SessionProjects.hpp.orig 2017-04-12 00:42:14.000000000 +0200
460+++ rstudio-1.1.143/src/cpp/session/include/session/projects/SessionProjects.hpp 2019-05-01 07:54:58.831948702 +0200
461@@ -22,7 +22,7 @@
462 #include <boost/utility.hpp>
463 #include <boost/shared_ptr.hpp>
464 #include <boost/foreach.hpp>
465-#include <boost/signals.hpp>
6d6b4763 466+#include <boost/signals2/signal.hpp>
d629e245
JB		 467
468 #include <core/FileInfo.hpp>
469 #include <core/FilePath.hpp>
470@@ -219,10 +219,10 @@
471
472 bool hasFileMonitor_;
473 std::vector<std::string> monitorSubscribers_;
474- boost::signal<void(const tree<core::FileInfo>&)> onMonitoringEnabled_;
475- boost::signal<void(const std::vector<core::system::FileChangeEvent>&)>
6d6b4763
JB		 476+ boost::signals2::signal<void(const tree<core::FileInfo>&)> onMonitoringEnabled_;
477+ boost::signals2::signal<void(const std::vector<core::system::FileChangeEvent>&)>
d629e245
JB		 478 onFilesChanged_;
479- boost::signal<void()> onMonitoringDisabled_;
6d6b4763 480+ boost::signals2::signal<void()> onMonitoringDisabled_;
d629e245
JB		 481 };
482
483 ProjectContext& projectContext();
484--- rstudio-1.1.143/src/cpp/session/modules/rmarkdown/SessionRmdNotebook.hpp.orig 2017-04-12 00:42:14.000000000 +0200
485+++ rstudio-1.1.143/src/cpp/session/modules/rmarkdown/SessionRmdNotebook.hpp 2019-05-01 08:19:48.877151705 +0200
486@@ -18,7 +18,7 @@
487 #define SESSION_RMARKDOWN_NOTEBOOK_HPP
488
489 #include <ctime>
490-#include <boost/signals.hpp>
491+#include <boost/signals2/signal.hpp>
492 #include <core/json/Json.hpp>
493
494 #define kChunkLibDir "lib"
495@@ -76,24 +76,24 @@
496 struct Events : boost::noncopyable
497 {
498 // Document {0}, chunk {1} from context id {3} execution completed
499- boost::signal<void(const std::string&, const std::string&,
6d6b4763 500+ boost::signals2::signal<void(const std::string&, const std::string&,
d629e245
JB		 501 const std::string&)>
502 onChunkExecCompleted;
503
504 // Document {0}, chunk {1} had console output of type {2} and text {3}
505- boost::signal<void(const std::string&, const std::string&, int,
6d6b4763 506+ boost::signals2::signal<void(const std::string&, const std::string&, int,
d629e245
JB		 507 const std::string&)>
508 onChunkConsoleOutput;
509
510- boost::signal<void(const core::FilePath&, const core::FilePath&,
6d6b4763 511+ boost::signals2::signal<void(const core::FilePath&, const core::FilePath&,
d629e245
JB		 512 const core::json::Value& metadata, unsigned ordinal)>
513 onPlotOutput;
514- boost::signal<void(const core::FilePath&, const core::FilePath&,
6d6b4763 515+ boost::signals2::signal<void(const core::FilePath&, const core::FilePath&,
d629e245
JB		 516 const core::json::Value& metadata)> onHtmlOutput;
517- boost::signal<void(const core::json::Object&)> onErrorOutput;
518- boost::signal<void(const core::FilePath&, const core::FilePath&,
6d6b4763
JB		 519+ boost::signals2::signal<void(const core::json::Object&)> onErrorOutput;
520+ boost::signals2::signal<void(const core::FilePath&, const core::FilePath&,
d629e245
JB		 521 const core::json::Value& metadata)> onDataOutput;
522- boost::signal<void(Condition condition, const std::string& message)>
6d6b4763 523+ boost::signals2::signal<void(Condition condition, const std::string& message)>
d629e245
JB		 524 onCondition;
525 };
526
527--- rstudio-1.1.143/src/cpp/session/SessionModuleContext.cpp.orig 2017-04-12 00:42:14.000000000 +0200
528+++ rstudio-1.1.143/src/cpp/session/SessionModuleContext.cpp 2019-05-01 08:21:14.344989539 +0200
6d6b4763 529@@ -19,7 +19,8 @@
d629e245
JB		 530
531 #include <boost/assert.hpp>
532 #include <boost/utility.hpp>
533-#include <boost/signal.hpp>
6d6b4763
JB		 534+#include <boost/signals2/last_value.hpp>
535+#include <boost/signals2/signal.hpp>
d629e245
JB		 536 #include <boost/format.hpp>
537 #include <boost/numeric/conversion/cast.hpp>
538
6d6b4763 539@@ -571,13 +572,13 @@
d629e245
JB		 540
541 int nextGroup_;
542
543- boost::signal<void(const r::session::RSuspendOptions&,Settings*),
6d6b4763 544- boost::last_value<void>,
d629e245 545+ boost::signals2::signal<void(const r::session::RSuspendOptions&,Settings*),
6d6b4763 546+ boost::signals2::last_value<void>,
d629e245
JB		 547 int,
548 std::less<int> > suspendSignal_;
549
550- boost::signal<void(const Settings&),
6d6b4763 551- boost::last_value<void>,
d629e245 552+ boost::signals2::signal<void(const Settings&),
6d6b4763 553+ boost::signals2::last_value<void>,
d629e245
JB		 554 int,
555 std::greater<int> > resumeSignal_;
6d6b4763
JB		 556 };
557--- rstudio-1.1.143/src/cpp/session/SessionMain.cpp.orig 2017-04-12 00:42:14.000000000 +0200
558+++ rstudio-1.1.143/src/cpp/session/SessionMain.cpp 2019-05-07 17:10:57.302926193 +0200
559@@ -33,7 +33,6 @@
560 #include <boost/lexical_cast.hpp>
561 #include <boost/format.hpp>
562
563-#include <boost/signals.hpp>
564 #include <boost/date_time/posix_time/posix_time.hpp>
565 #include <boost/algorithm/string/predicate.hpp>
566 #include <boost/algorithm/string/join.hpp>
567--- rstudio-1.1.143/src/cpp/session/modules/SessionRParser.cpp.orig 2017-04-12 00:42:14.000000000 +0200
568+++ rstudio-1.1.143/src/cpp/session/modules/SessionRParser.cpp 2019-05-07 18:07:34.070800364 +0200
569@@ -390,7 +390,7 @@
570 if (!failed)
571 {
572 DEBUG("--- Found function in pkgInfo index: " << *fnInfo.binding());
573- return fnInfo.performsNse();
574+ return bool(fnInfo.performsNse());
575 }
576
577 // Handle some special cases first.
578--- rstudio-1.1.143/src/cpp/session/modules/build/SessionSourceCpp.cpp.orig 2017-04-12 00:42:14.000000000 +0200
579+++ rstudio-1.1.143/src/cpp/session/modules/build/SessionSourceCpp.cpp 2019-05-07 18:13:46.346942192 +0200
580@@ -15,7 +15,6 @@
581
582 #include "SessionSourceCpp.hpp"
583
584-#include <boost/signal.hpp>
585 #include <boost/algorithm/string/trim.hpp>
586 #include <boost/algorithm/string/predicate.hpp>
587 #include <boost/algorithm/string/join.hpp>
588--- rstudio-1.1.143/src/cpp/session/modules/rmarkdown/NotebookPlots.hpp.orig 2017-04-12 00:42:14.000000000 +0200
589+++ rstudio-1.1.143/src/cpp/session/modules/rmarkdown/NotebookPlots.hpp 2019-05-07 18:25:48.121369223 +0200
590@@ -18,7 +18,7 @@
591 #define SESSION_NOTEBOOK_PLOTS_HPP
592
593 #include <boost/function.hpp>
594-#include <boost/signals/connection.hpp>
595+#include <boost/signals2/connection.hpp>
596 #include <core/FilePath.hpp>
597 #include <r/RSexp.hpp>
598
599@@ -80,9 +80,9 @@
600
601 unsigned lastOrdinal_;
602
603- boost::signals::connection onBeforeNewPlot_;
604- boost::signals::connection onBeforeNewGridPage_;
605- boost::signals::connection onNewPlot_;
606+ boost::signals2::connection onBeforeNewPlot_;
607+ boost::signals2::connection onBeforeNewGridPage_;
608+ boost::signals2::connection onNewPlot_;
609
610 double width_;
611 double height_;
612--- rstudio-1.1.143/src/cpp/session/modules/rmarkdown/NotebookExec.hpp.orig 2017-04-12 00:42:14.000000000 +0200
613+++ rstudio-1.1.143/src/cpp/session/modules/rmarkdown/NotebookExec.hpp 2019-05-07 18:26:45.201022069 +0200
614@@ -18,7 +18,7 @@
615
616 #include <session/SessionModuleContext.hpp>
617
618-#include <boost/signal.hpp>
619+#include <boost/signals2/signal.hpp>
620
621 #include <core/json/Json.hpp>
622
623@@ -99,7 +99,7 @@
624 bool hasErrors_;
625
626 std::vector<boost::shared_ptr<NotebookCapture> > captures_;
627- std::vector<boost::signals::connection> connections_;
628+ std::vector<boost::signals2::connection> connections_;
629 };
630
631 } // namespace notebook
632--- rstudio-1.1.143/src/cpp/session/modules/rmarkdown/NotebookAlternateEngines.cpp.orig 2017-04-12 00:42:14.000000000 +0200
633+++ rstudio-1.1.143/src/cpp/session/modules/rmarkdown/NotebookAlternateEngines.cpp 2019-05-07 18:28:01.345005619 +0200
634@@ -142,7 +142,7 @@
635 LOG_ERROR(error);
636
637 // capture console output, error
638- boost::signals::scoped_connection consoleHandler =
639+ boost::signals2::scoped_connection consoleHandler =
640 module_context::events().onConsoleOutput.connect(
641 boost::bind(chunkConsoleOutputHandler,
642 _1,
643@@ -219,7 +219,7 @@
644 LOG_ERROR(error);
645
646 // capture console output, error
647- boost::signals::scoped_connection consoleHandler =
648+ boost::signals2::scoped_connection consoleHandler =
649 module_context::events().onConsoleOutput.connect(
650 boost::bind(chunkConsoleOutputHandler,
651 _1,
652@@ -363,7 +363,7 @@
653 LOG_ERROR(error);
654
655 // capture console output, error
656- boost::signals::scoped_connection consoleHandler =
657+ boost::signals2::scoped_connection consoleHandler =
658 module_context::events().onConsoleOutput.connect(
659 boost::bind(chunkConsoleOutputHandler,
660 _1,
661--- rstudio-1.1.143/src/cpp/session/modules/rmarkdown/NotebookCapture.cpp.orig 2017-04-12 00:42:14.000000000 +0200
662+++ rstudio-1.1.143/src/cpp/session/modules/rmarkdown/NotebookCapture.cpp 2019-05-07 18:31:49.423604450 +0200
663@@ -13,6 +13,8 @@
664 *
665 */
666
667+#include <boost/make_shared.hpp>
668+
669 #include "SessionRmdNotebook.hpp"
670 #include "NotebookCapture.hpp"
671
672--- rstudio-1.1.143/src/cpp/session/modules/rmarkdown/NotebookExec.cpp.orig 2017-04-12 00:42:14.000000000 +0200
673+++ rstudio-1.1.143/src/cpp/session/modules/rmarkdown/NotebookExec.cpp 2019-05-07 18:41:06.369408303 +0200
674@@ -441,7 +441,7 @@
675 }
676
677 // unhook all our event handlers
678- BOOST_FOREACH(const boost::signals::connection connection, connections_)
679+ BOOST_FOREACH(const boost::signals2::connection connection, connections_)
680 {
681 connection.disconnect();
682 }
683--- rstudio-1.1.143/src/cpp/session/modules/rmarkdown/NotebookPlots.cpp.orig 2017-04-12 00:42:14.000000000 +0200
684+++ rstudio-1.1.143/src/cpp/session/modules/rmarkdown/NotebookPlots.cpp 2019-05-07 18:52:17.788159856 +0200
685@@ -20,7 +20,6 @@
686
687 #include <boost/format.hpp>
688 #include <boost/foreach.hpp>
689-#include <boost/signals/connection.hpp>
690
691 #include <core/system/FileMonitor.hpp>
692 #include <core/StringUtils.hpp>
693--- rstudio-1.1.143/src/cpp/session/modules/rmarkdown/NotebookQueue.cpp.orig 2017-04-12 00:42:14.000000000 +0200
694+++ rstudio-1.1.143/src/cpp/session/modules/rmarkdown/NotebookQueue.cpp 2019-05-07 18:53:26.498462556 +0200
695@@ -87,7 +87,7 @@
696 pInput_->enque(kThreadQuitCommand);
697
698 // unregister handlers
699- BOOST_FOREACH(boost::signals::connection connection, handlers_)
700+ BOOST_FOREACH(boost::signals2::connection connection, handlers_)
701 {
702 connection.disconnect();
703 }
704@@ -638,7 +638,7 @@
705 boost::shared_ptr<ChunkExecContext> execContext_;
706
707 // registered signal handlers
708- std::vector<boost::signals::connection> handlers_;
709+ std::vector<boost::signals2::connection> handlers_;
710
711 // the thread which submits console input, and the queue which feeds it
712 boost::thread console_;
713--- rstudio-1.1.143/src/cpp/session/http/SessionLocalStreamHttpConnectionListener.hpp.orig 2017-04-12 00:42:14.000000000 +0200
714+++ rstudio-1.1.143/src/cpp/session/http/SessionLocalStreamHttpConnectionListener.hpp 2019-05-07 19:04:36.460299876 +0200
715@@ -77,7 +77,7 @@
716 if (permittedClients_.size() > 0)
717 {
718 // get socket
719- int socket = ptrConnection->socket().native();
720+ int socket = ptrConnection->socket().native_handle();
721
722 // get client identity
723 core::system::user::UserIdentity userIdentity;
86ba1454
JR		 724--- rstudio-1.1.143/src/cpp/core/FilePath.cpp~ 2020-08-12 00:57:08.000000000 +0200
725+++ rstudio-1.1.143/src/cpp/core/FilePath.cpp 2020-08-12 00:57:57.852543328 +0200
726@@ -1020,7 +1020,7 @@
727 {
728 // NOTE: The path gets round-tripped through toString/fromString, would
729 // be nice to have a direct constructor
730- if (!iterationFunction(itr.level(),
731+ if (!iterationFunction(itr.depth(),
732 FilePath(BOOST_FS_PATH2STR(itr->path()))))
733 {
734 // end the iteration if requested
735From ea8aa234b48331d34b8002fab58b4b393864e79b Mon Sep 17 00:00:00 2001
736From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
737Date: Sat, 30 May 2020 15:33:38 +0200
738Subject: [PATCH] boost-173-global-placeholders
739
740---
741 src/cpp/CMakeLists.txt | 1 +
742 src/cpp/core/system/PosixChildProcessTracker.cpp | 1 +
743 src/cpp/core/system/PosixOutputCapture.cpp | 2 ++
744 src/cpp/core/system/PosixSystem.cpp | 1 +
745 4 files changed, 5 insertions(+)
746
747diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
748index af79150..d049524 100644
749--- a/src/cpp/CMakeLists.txt
750+++ b/src/cpp/CMakeLists.txt
751@@ -28,6 +28,7 @@ include("${CMAKE_CURRENT_SOURCE_DIR}/../../CMakeGlobals.txt")
752
753 # global directives
754 add_definitions(-DBOOST_ENABLE_ASSERT_HANDLER)
755+add_definitions(-DBOOST_BIND_GLOBAL_PLACEHOLDERS)
756
7dcfd9a3
JP		 757 # test directory
758 set(TESTS_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/tests/cpp" CACHE STRING "Test includes")
86ba1454
JR		 759diff --git a/src/cpp/core/system/PosixChildProcessTracker.cpp b/src/cpp/core/system/PosixChildProcessTracker.cpp
760index 2ee1a81..976da4f 100644
761--- a/src/cpp/core/system/PosixChildProcessTracker.cpp
762+++ b/src/cpp/core/system/PosixChildProcessTracker.cpp
763@@ -18,6 +18,7 @@
764 #include <sys/wait.h>
765
766 #include <boost/format.hpp>
767+#include <boost/bind.hpp>
768
769 namespace rstudio {
770 namespace core {
771diff --git a/src/cpp/core/system/PosixOutputCapture.cpp b/src/cpp/core/system/PosixOutputCapture.cpp
772index e531e00..01dedd3 100644
773--- a/src/cpp/core/system/PosixOutputCapture.cpp
774+++ b/src/cpp/core/system/PosixOutputCapture.cpp
775@@ -28,6 +28,8 @@
776
777 #include <core/system/System.hpp>
778
779+#include <boost/bind.hpp>
780+
781 namespace rstudio {
782 namespace core {
783 namespace system {
784diff --git a/src/cpp/core/system/PosixSystem.cpp b/src/cpp/core/system/PosixSystem.cpp
785index c25cb32..8dae263 100644
786--- a/src/cpp/core/system/PosixSystem.cpp
787+++ b/src/cpp/core/system/PosixSystem.cpp
788@@ -23,6 +23,7 @@
789
790 #include <boost/foreach.hpp>
791 #include <boost/algorithm/string.hpp>
792+#include <boost/bind.hpp>
793
794 #include <signal.h>
795 #include <fcntl.h>
796--
7972.25.2
798
IDE for R
This page took 0.189266 seconds and 4 git commands to generate.