Fix redefinition of QAddConst
ClosedPublic
Actions

Authored by kfunk on Apr 5 2017, 8:29 AM.

Details

Reviewers

Commits

R165:f765c29924a1: Fix redefinition of QAddConst

Summary

/home/kfunk/devel/src/kf5/akonadi/src/server/helper_p.h:27:30: error: redefinition of 'QAddConst'
template <typename T> struct QAddConst {
                             ^
/home/kfunk/devel/src/kf5/akonadi/src/server/utils.h:35:30: note: previous definition is here
template <typename T> struct QAddConst {
                             ^

Fixed build against Qt 5.6

Diff Detail

Repository

R165 Akonadi

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

kfunk created this revision.Apr 5 2017, 8:29 AM

Restricted Application added a project: KDE PIM. · View Herald TranscriptApr 5 2017, 8:29 AM

Restricted Application added a subscriber: KDE PIM. · View Herald Transcript

kfunk edited the summary of this revision. (Show Details)Apr 5 2017, 8:29 AM

kfunk added a reviewer: mlaurent.

Update commit message

kfunk retitled this revision from Fix redefenition of QAddConst to Fix redefinition of QAddConst.Apr 5 2017, 8:30 AM

indeed it was a a bad idea to put it in this include.
Thanks.
(I already fixed some weeks ago same problem in libksieve).

This revision is now accepted and ready to land.Apr 5 2017, 8:55 AM

Closed by commit R165:f765c29924a1: Fix redefinition of QAddConst (authored by kfunk). · Explain WhyApr 6 2017, 1:18 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			src/server/collectionscheduler.cpp (2 lines)
M			src/server/handler/create.cpp (2 lines)
M			src/server/handler/fetchhelper.cpp (2 lines)
M			src/server/handler/list.cpp (2 lines)
M			src/server/handler/searchpersistent.cpp (2 lines)
M			src/server/notificationmanager.cpp (2 lines)
M			src/server/preprocessormanager.cpp (2 lines)
M			src/server/search/searchmanager.cpp (2 lines)
M			src/server/storage/querybuilder.cpp (3 lines)
M			src/server/utils.h (16 lines)

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	13100	37394cb		Apr 5 2017, 8:29 AM	★	★
Diff 2	13101	37394cb	Update commit message	Apr 5 2017, 8:30 AM	★	★
Diff 3	13149	37394cb	R165:f765c29924a18d04b747de9ac8a0941e2a421088	Apr 6 2017, 1:05 PM	★	★