From 5d6bcc40ec64c8780b6c87a740bae34381844f5d Mon Sep 17 00:00:00 2001 From: Simon Brunel Date: Fri, 11 Aug 2017 23:13:44 +0200 Subject: [PATCH] Fix helpers multiple defined symbols --- src/qtpromise/qpromisehelpers.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/qtpromise/qpromisehelpers.h b/src/qtpromise/qpromisehelpers.h index 6f753fa..206a4a6 100644 --- a/src/qtpromise/qpromisehelpers.h +++ b/src/qtpromise/qpromisehelpers.h @@ -7,7 +7,7 @@ namespace QtPromise { template -typename QtPromisePrivate::PromiseDeduce::Type qPromise(T&& value) +static inline typename QtPromisePrivate::PromiseDeduce::Type qPromise(T&& value) { using namespace QtPromisePrivate; using Promise = typename PromiseDeduce::Type; @@ -18,7 +18,7 @@ typename QtPromisePrivate::PromiseDeduce::Type qPromise(T&& value) }); } -QPromise qPromise() +static inline QPromise qPromise() { return QPromise([]( const QPromiseResolve& resolve) { @@ -27,12 +27,12 @@ QPromise qPromise() } template -QPromise > qPromiseAll(const QVector >& promises) +static inline QPromise > qPromiseAll(const QVector >& promises) { return QPromise::all(promises); } -QPromise qPromiseAll(const QVector >& promises) +static inline QPromise qPromiseAll(const QVector >& promises) { return QPromise::all(promises); }