diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-12 13:08:15 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-12 13:08:15 +0100 |
| commit | f64cfa1a8ad6ee6638035b251f7443b98a5f730f (patch) | |
| tree | d3507a249a23db25b0ba0c0caa673b69b7adc01c /src/xmlpatterns/expr | |
| parent | 5fac6d6fda04924b03f6a5651933f0c055d0df23 (diff) | |
| parent | 6b198fef037dc8bc10d209342123f1aa38e807b3 (diff) | |
| download | qtxmlpatterns-f64cfa1a8ad6ee6638035b251f7443b98a5f730f.tar.gz | |
Merge remote-tracking branch 'origin/5.10' into 5.11
Change-Id: Ic4b4cabff030fe494e2f446d99127847c6ba421a
Diffstat (limited to 'src/xmlpatterns/expr')
| -rw-r--r-- | src/xmlpatterns/expr/qevaluationcache_p.h | 2 | ||||
| -rw-r--r-- | src/xmlpatterns/expr/qevaluationcache_tpl_p.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/xmlpatterns/expr/qevaluationcache_p.h b/src/xmlpatterns/expr/qevaluationcache_p.h index 6c2efc7..d3ac422 100644 --- a/src/xmlpatterns/expr/qevaluationcache_p.h +++ b/src/xmlpatterns/expr/qevaluationcache_p.h @@ -120,7 +120,7 @@ namespace QPatternist private: static DynamicContext::Ptr topFocusContext(const DynamicContext::Ptr &context); - const VariableDeclaration* m_declaration; + const VariableDeclaration::Ptr m_declaration; /** * This variable must not be called m_slot. If it so, a compiler bug on * HP-UX-aCC-64 is triggered in the constructor initializor. See the diff --git a/src/xmlpatterns/expr/qevaluationcache_tpl_p.h b/src/xmlpatterns/expr/qevaluationcache_tpl_p.h index 26f53b5..b8e09a9 100644 --- a/src/xmlpatterns/expr/qevaluationcache_tpl_p.h +++ b/src/xmlpatterns/expr/qevaluationcache_tpl_p.h @@ -58,7 +58,7 @@ template<bool IsForGlobal> EvaluationCache<IsForGlobal>::EvaluationCache(const Expression::Ptr &op, const VariableDeclaration::Ptr &varDecl, const VariableSlotID aSlot) : SingleContainer(op) - , m_declaration(varDecl.constData()) + , m_declaration(varDecl) , m_varSlot(aSlot) { Q_ASSERT(m_declaration); |