Merge lp:~zorba-coders/zorba/xqxq-bug1068240 into lp:zorba/xqxq-module

Proposed by Juan Zacarias
Status: Merged
Approved by: Matthias Brantner
Approved revision: 41
Merged at revision: 42
Proposed branch: lp:~zorba-coders/zorba/xqxq-bug1068240
Merge into: lp:zorba/xqxq-module
Diff against target: 20 lines (+2/-3)
1 file modified
src/xqxq.xq.src/xqxq.cpp (+2/-3)
To merge this branch: bzr merge lp:~zorba-coders/zorba/xqxq-bug1068240
Reviewer Review Type Date Requested Status
Matthias Brantner Approve
Chris Hillery Approve
Review via email: mp+130867@code.launchpad.net

Commit message

Removed cast to const for the DynamicContext.

Description of the change

Removed cast to const for the DynamicContext.

To post a comment you must log in.
Revision history for this message
Chris Hillery (ceejatec) :
review: Approve
Revision history for this message
Matthias Brantner (matthias-brantner) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job xqxq-bug1068240-2012-10-24T15-07-41.913Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/xqxq.xq.src/xqxq.cpp'
2--- src/xqxq.xq.src/xqxq.cpp 2012-10-20 02:18:45 +0000
3+++ src/xqxq.xq.src/xqxq.cpp 2012-10-22 17:25:22 +0000
4@@ -374,14 +374,13 @@
5 const zorba::StaticContext* aSctx,
6 const zorba::DynamicContext* aDctx) const
7 {
8- DynamicContext* lDynCtx = const_cast<DynamicContext*>(aDctx);
9 StaticContext_t lSctxChild = aSctx->createChildContext();
10
11 QueryMap* lQueryMap;
12- if(!(lQueryMap = dynamic_cast<QueryMap*>(lDynCtx->getExternalFunctionParameter("xqxqQueryMap"))))
13+ if(!(lQueryMap = dynamic_cast<QueryMap*>(aDctx->getExternalFunctionParameter("xqxqQueryMap"))))
14 {
15 lQueryMap = new QueryMap();
16- lDynCtx->addExternalFunctionParameter("xqxqQueryMap", lQueryMap);
17+ aDctx->addExternalFunctionParameter("xqxqQueryMap", lQueryMap);
18 }
19
20 Zorba *lZorba = Zorba::getInstance(0);

Subscribers

People subscribed via source and target branches

to all changes: