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
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
|
From f7485813af8e50f88c77312fb29b7bb489a0a17d Mon Sep 17 00:00:00 2001
From: Adam Majer <amajer@suse.de>
Date: Wed, 23 May 2018 10:45:56 +0200
Subject: [PATCH] Fix build with Boost 1.67
Boost:DateTime that no longer accepts non-integer types.
In the past, these types were implicitly cast down to integer
values. Now this requires explicit cast.
https://svn.boost.org/trac10/ticket/11168
This fixes #60
---
src/spreadsheet/sheet.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/spreadsheet/sheet.cpp b/src/spreadsheet/sheet.cpp
index 7df1aedb..33b372ad 100644
--- a/src/spreadsheet/sheet.cpp
+++ b/src/spreadsheet/sheet.cpp
@@ -289,7 +289,7 @@ void sheet::set_date_time(row_t row, col_t col, int year, int month, int day, in
double days_since_epoch = (d - origin).days();
- double ms = second * 1000000.0;
+ long ms = second * 1000000.0;
posix_time::time_duration t(
posix_time::hours(hour) +
@@ -606,7 +606,7 @@ date_time_t sheet::get_date_time(row_t row, col_t col) const
if (time_fraction)
{
// Convert a fraction day to microseconds.
- double ms = time_fraction * 24.0 * 60.0 * 60.0 * 1000000.0;
+ long long ms = time_fraction * 24.0 * 60.0 * 60.0 * 1000000.0;
posix_time::time_duration td = posix_time::microsec(ms);
hours = td.hours();
@@ -615,7 +615,7 @@ date_time_t sheet::get_date_time(row_t row, col_t col) const
td -= posix_time::hours(hours);
td -= posix_time::minutes(minutes);
- td -= posix_time::seconds(seconds);
+ td -= posix_time::seconds((long)seconds);
ms = td.total_microseconds(); // remaining microseconds.
--
2.18.0
|
