From 7feb72952529269b9d6e8be2e04e992acb8812c7 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Mon, 6 Apr 2015 14:35:29 -0500
Subject: in EngineEds, make the ECalComponentAlarmAction 'omit' array a
 constexpr.

---
 src/engine-eds.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

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);
-- 
cgit v1.2.3