diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-05-03 15:37:12 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-05-04 06:28:59 +0000 |
| commit | 1c25721ec0157b333bf16c4b859563af1fb95966 (patch) | |
| tree | 36a188891e9b5ef61c176a0feb76a350374f401c | |
| parent | fcb504dedeba1ed6fa49cf6532ff0786e5664ed5 (diff) | |
| download | qt-creator-1c25721ec0157b333bf16c4b859563af1fb95966.tar.gz | |
qtcreatorcdbext: Fix build with MSVC2017
Fix error:
.\containers.cpp(616): error C2664: 'void RedBlackTreeNode::debug<void(__cdecl *)(const SymbolGroupValue &,std::ostream &,unsigned int)>(std::ostream &,DebugFunction,unsigned int) const': cannot convert argument 1 from 'DebugPrint' to 'std::ostream &'
with
[
DebugFunction=void (__cdecl *)(const SymbolGroupValue &,std::ostream &,unsigned int)
]
.\containers.cpp(616): note: A non-const reference may only be bound to an lvalue
Change-Id: Ic4168fe8e3952c4c6b2bd6561f05c138094cb56e
Reviewed-by: David Schulz <david.schulz@qt.io>
| -rw-r--r-- | src/libs/qtcreatorcdbext/containers.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/libs/qtcreatorcdbext/containers.cpp b/src/libs/qtcreatorcdbext/containers.cpp index caf1d8ee68..1248fca175 100644 --- a/src/libs/qtcreatorcdbext/containers.cpp +++ b/src/libs/qtcreatorcdbext/containers.cpp @@ -612,8 +612,10 @@ static inline SymbolGroupValueVector nodeTree = RedBlackTreeNode::buildMapRecursion(head["_Parent"], headAddress, 0, "_Left", "_Right"); if (!nodeTree) return SymbolGroupValueVector(); - if (SymbolGroupValue::verbose > 1) - nodeTree->debug(DebugPrint(), debugMSVC2010MapNode); + if (SymbolGroupValue::verbose > 1) { + DebugPrint dp; + nodeTree->debug(dp, debugMSVC2010MapNode); + } SymbolGroupValueVector rc; rc.reserve(count); int i = 0; @@ -1004,8 +1006,10 @@ static inline AbstractSymbolGroupNodePtrVector qMap5Nodes(const SymbolGroupValue RedBlackTreeNode::buildMapRecursion(root, head.address(), 0, "left", "right"); if (!nodeTree) return AbstractSymbolGroupNodePtrVector(); - if (SymbolGroupValue::verbose > 1) - nodeTree->debug(DebugPrint(), debugQMap5Node); + if (SymbolGroupValue::verbose > 1) { + DebugPrint dp; + nodeTree->debug(dp, debugQMap5Node); + } VectorIndexType i = 0; // Finally convert them into real nodes 'QHashNode<K,V> (potentially expensive) AbstractSymbolGroupNodePtrVector result; |