aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2017-03-16 10:52:59 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2017-03-16 10:09:06 +0000
commita6582636ea5ca3bbe503481a76952fdd79e3a135 (patch)
treebb9746abba59b51b76b0b79ef28578be899fbe5b
parentf0b1109865658ee0c61b08673873622584ca65a3 (diff)
Move DuplicatingFunctionPredicate out of the function
g++ in C99 mode is unable to instantiate std::find_if() with local classes. Amends change 3c325a0004a377da14ad255addb42e23c4e9cf17. Task-number: PYSIDE-323 Change-Id: I250bb43f17a843aee7ef9e39d3dc56ef834aa113 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
-rw-r--r--ApiExtractor/abstractmetabuilder.cpp28
1 files changed, 14 insertions, 14 deletions
diff --git a/ApiExtractor/abstractmetabuilder.cpp b/ApiExtractor/abstractmetabuilder.cpp
index 358f995b1..223e4080c 100644
--- a/ApiExtractor/abstractmetabuilder.cpp
+++ b/ApiExtractor/abstractmetabuilder.cpp
@@ -1587,23 +1587,23 @@ AbstractMetaFunctionList AbstractMetaBuilderPrivate::classFunctionList(const Sco
// template class<T>
// Vector<T>::Vector(const Vector<T>&) {} // More specific, remove declaration.
-AbstractMetaFunctionList AbstractMetaBuilderPrivate::templateClassFunctionList(const ScopeModelItem &scopeItem,
- AbstractMetaClass *metaClass)
-{
- class DuplicatingFunctionPredicate : public std::unary_function<bool, const AbstractMetaFunction *> {
- public:
- explicit DuplicatingFunctionPredicate(const AbstractMetaFunction *f) : m_function(f) {}
+class DuplicatingFunctionPredicate : public std::unary_function<bool, const AbstractMetaFunction *> {
+public:
+ explicit DuplicatingFunctionPredicate(const AbstractMetaFunction *f) : m_function(f) {}
- bool operator()(const AbstractMetaFunction *rhs) const
- {
- return rhs != m_function && rhs->name() == m_function->name()
- && _compareAbstractMetaFunctions(m_function, rhs);
- }
+ bool operator()(const AbstractMetaFunction *rhs) const
+ {
+ return rhs != m_function && rhs->name() == m_function->name()
+ && _compareAbstractMetaFunctions(m_function, rhs);
+ }
- private:
- const AbstractMetaFunction *m_function;
- };
+private:
+ const AbstractMetaFunction *m_function;
+};
+AbstractMetaFunctionList AbstractMetaBuilderPrivate::templateClassFunctionList(const ScopeModelItem &scopeItem,
+ AbstractMetaClass *metaClass)
+{
AbstractMetaFunctionList result;
AbstractMetaFunctionList unchangedFunctions;