aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2015-04-06 14:35:29 -0500
committerCharles Kerr <charles.kerr@canonical.com>2015-04-06 14:35:29 -0500
commit7feb72952529269b9d6e8be2e04e992acb8812c7 (patch)
tree74ad7f498dd473a761f97a1b8726d852ed2603cb /src
parent392788b1db2d60cd73cac12e58fbc4e6ce304d9e (diff)
downloadayatana-indicator-datetime-7feb72952529269b9d6e8be2e04e992acb8812c7.tar.gz
ayatana-indicator-datetime-7feb72952529269b9d6e8be2e04e992acb8812c7.tar.bz2
ayatana-indicator-datetime-7feb72952529269b9d6e8be2e04e992acb8812c7.zip
in EngineEds, make the ECalComponentAlarmAction 'omit' array a constexpr.
Diffstat (limited to 'src')
-rw-r--r--src/engine-eds.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/engine-eds.cpp b/src/engine-eds.cpp
index 073b39d..4435bdf 100644
--- a/src/engine-eds.cpp
+++ b/src/engine-eds.cpp
@@ -529,7 +529,7 @@ private:
(status != ICAL_STATUS_COMPLETED) &&
(status != ICAL_STATUS_CANCELLED))
{
- std::array<ECalComponentAlarmAction,1> omit = { (ECalComponentAlarmAction)-1 }; // list of action types to omit, terminated with -1
+ constexpr std::array<ECalComponentAlarmAction,1> omit = { (ECalComponentAlarmAction)-1 }; // list of action types to omit, terminated with -1
Appointment appointment;
ECalComponentText text {};
@@ -549,7 +549,7 @@ private:
auto e_alarms = e_cal_util_generate_alarms_for_comp(component,
subtask->begin,
subtask->end,
- omit.data(),
+ const_cast<ECalComponentAlarmAction*>(omit.data()),
e_cal_client_resolve_tzid_cb,
subtask->client,
subtask->default_timezone);