summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sci-mathematics/rstudio/files/rstudio-1.1.453-boost-1.67.0.patch')
-rw-r--r--sci-mathematics/rstudio/files/rstudio-1.1.453-boost-1.67.0.patch38
1 files changed, 0 insertions, 38 deletions
diff --git a/sci-mathematics/rstudio/files/rstudio-1.1.453-boost-1.67.0.patch b/sci-mathematics/rstudio/files/rstudio-1.1.453-boost-1.67.0.patch
deleted file mode 100644
index 760c9b561055..000000000000
--- a/sci-mathematics/rstudio/files/rstudio-1.1.453-boost-1.67.0.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- rstudio-1.1.453-orig/src/cpp/core/DateTime.cpp 2018-05-15 04:19:30.000000000 +1000
-+++ rstudio-1.1.453/src/cpp/core/DateTime.cpp 2018-07-02 16:19:21.335703471 +1000
-@@ -65,7 +65,7 @@
- using namespace boost::posix_time;
-
- ptime time_t_epoch(date(1970,1,1));
-- return time_t_epoch + seconds(sec);
-+ return time_t_epoch + seconds(static_cast<long>(sec));
- }
-
- boost::posix_time::ptime timeFromMillisecondsSinceEpoch(int64_t ms)
---- rstudio-1.1.453-orig/src/cpp/core/file_lock/FileLock.cpp 2018-05-15 04:19:30.000000000 +1000
-+++ rstudio-1.1.453/src/cpp/core/file_lock/FileLock.cpp 2018-07-02 17:00:35.915695201 +1000
-@@ -133,11 +133,11 @@
-
- // timeout interval
- double timeoutInterval = getFieldPositive(settings, "timeout-interval", kDefaultTimeoutInterval);
-- FileLock::s_timeoutInterval = boost::posix_time::seconds(timeoutInterval);
-+ FileLock::s_timeoutInterval = boost::posix_time::seconds(static_cast<long>(timeoutInterval));
-
- // refresh rate
- double refreshRate = getFieldPositive(settings, "refresh-rate", kDefaultRefreshRate);
-- FileLock::s_refreshRate = boost::posix_time::seconds(refreshRate);
-+ FileLock::s_refreshRate = boost::posix_time::seconds(static_cast<long>(refreshRate));
-
- // logging
- bool loggingEnabled = settings.getBool("enable-logging", false);
-@@ -212,8 +212,8 @@
-
- // default values for static members
- FileLock::LockType FileLock::s_defaultType(FileLock::LOCKTYPE_LINKBASED);
--boost::posix_time::seconds FileLock::s_timeoutInterval(kDefaultTimeoutInterval);
--boost::posix_time::seconds FileLock::s_refreshRate(kDefaultRefreshRate);
-+boost::posix_time::seconds FileLock::s_timeoutInterval(static_cast<long>(kDefaultTimeoutInterval));
-+boost::posix_time::seconds FileLock::s_refreshRate(static_cast<long>(kDefaultRefreshRate));
- bool FileLock::s_loggingEnabled(false);
- bool FileLock::s_isLoadBalanced(false);
- FilePath FileLock::s_logFile;