diff options
author | Charles Kerr <charles.kerr@canonical.com> | 2015-04-06 09:27:01 -0500 |
---|---|---|
committer | Charles Kerr <charles.kerr@canonical.com> | 2015-04-06 09:27:01 -0500 |
commit | 453a09477ec1eb238d214f61f695a09a0d84949d (patch) | |
tree | 9b10ef4cbf942f2bc1aee2d7c69c09c1906a532a | |
parent | 29ba7597614912c068737fad2146561c70ca2dc7 (diff) | |
download | ayatana-indicator-datetime-453a09477ec1eb238d214f61f695a09a0d84949d.tar.gz ayatana-indicator-datetime-453a09477ec1eb238d214f61f695a09a0d84949d.tar.bz2 ayatana-indicator-datetime-453a09477ec1eb238d214f61f695a09a0d84949d.zip |
in new code, use std::array rather than C style arrays
-rw-r--r-- | src/engine-eds.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/engine-eds.cpp b/src/engine-eds.cpp index 856f190..2b62fd1 100644 --- a/src/engine-eds.cpp +++ b/src/engine-eds.cpp @@ -25,6 +25,7 @@ #include <libedataserver/libedataserver.h> #include <algorithm> // std::sort() +#include <array> #include <ctime> // time() #include <map> #include <set> @@ -523,7 +524,7 @@ private: (status != ICAL_STATUS_COMPLETED) && (status != ICAL_STATUS_CANCELLED)) { - ECalComponentAlarmAction omit[] = { (ECalComponentAlarmAction)-1 }; // list of action types to omit, terminated with -1 + std::array<ECalComponentAlarmAction,1> omit = { (ECalComponentAlarmAction)-1 }; // list of action types to omit, terminated with -1 Appointment appointment; ECalComponentText text {}; @@ -543,7 +544,7 @@ private: auto e_alarms = e_cal_util_generate_alarms_for_comp(component, subtask->begin, subtask->end, - omit, + omit.data(), e_cal_client_resolve_tzid_cb, subtask->client, subtask->default_timezone); |