diff options
| author | Merlijn Wajer <merlijn@wizzup.org> | 2024-04-22 21:58:20 +0200 |
|---|---|---|
| committer | Merlijn Wajer <merlijn@wizzup.org> | 2024-04-24 00:14:37 +0200 |
| commit | 0824c3cd64499aaa5c2d63ab797951b8f492072a (patch) | |
| tree | 2f0a4c531f8c1ac608dd87f0c4f6d39029a475d8 | |
| parent | 238f9368c2e849bdec5f965137896eb1a8c64123 (diff) | |
commit e88bfa62 ("C++: automatically determine iterator types") broke
the validity of the MaemoCalendarSource.cpp by accident.
Also add the necessary dbus CFLAGS/LIBS flags to ensure successful
compilation
commit e88bfa62143bbbf020c234303c941385c7c19014
Author: Patrick Ohly <patrick.ohly@intel.com>
AuthorDate: Wed Jan 31 17:28:28 2018 +0100
Commit: Patrick Ohly <patrick.ohly@intel.com>
CommitDate: Sat Dec 5 21:28:08 2020 +0100
C++: automatically determine iterator types
| -rw-r--r-- | src/backends/maemo/MaemoCalendarSource.cpp | 2 | ||||
| -rw-r--r-- | src/backends/maemo/maemo.am | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/backends/maemo/MaemoCalendarSource.cpp b/src/backends/maemo/MaemoCalendarSource.cpp index 0349c0ee..20cb9e8e 100644 --- a/src/backends/maemo/MaemoCalendarSource.cpp +++ b/src/backends/maemo/MaemoCalendarSource.cpp @@ -278,7 +278,7 @@ TrackingSyncSource::InsertItemResult MaemoCalendarSource::insertItem(const strin throwError(SE_HERE, string("no events in ical: ") + item); } } - vector< CComponent * auto it = comps.begin(); + auto it = comps.begin(); if (comps.size() > 1) { for (; it != comps.end(); ++it) { delete (*it); diff --git a/src/backends/maemo/maemo.am b/src/backends/maemo/maemo.am index 9c31b8de..edbcb2fb 100644 --- a/src/backends/maemo/maemo.am +++ b/src/backends/maemo/maemo.am @@ -14,8 +14,8 @@ src_backends_maemo_src = \ src/backends/maemo/MaemoCalendarSource.cpp src_backends_maemo_syncmaemocal_la_SOURCES = $(src_backends_maemo_src) -src_backends_maemo_syncmaemocal_la_LIBADD = $(MCALB_LIBS) $(SYNCEVOLUTION_LIBS) +src_backends_maemo_syncmaemocal_la_LIBADD = $(MCALB_LIBS) $(SYNCEVOLUTION_LIBS) $(DBUS_LIBS) $(DBUS_GLIB_LIBS) src_backends_maemo_syncmaemocal_la_LDFLAGS = -module -avoid-version src_backends_maemo_syncmaemocal_la_CXXFLAGS = $(SYNCEVOLUTION_CXXFLAGS) $(SYNCEVO_WFLAGS) -src_backends_maemo_syncmaemocal_la_CPPFLAGS = $(SYNCEVOLUTION_CFLAGS) -I$(top_srcdir)/test $(BACKEND_CPPFLAGS) +src_backends_maemo_syncmaemocal_la_CPPFLAGS = $(SYNCEVOLUTION_CFLAGS) -I$(top_srcdir)/test $(BACKEND_CPPFLAGS) $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS) src_backends_maemo_syncmaemocal_la_DEPENDENCIES = src/syncevo/libsyncevolution.la |