Zorba

Merge lp:~zorba-coders/zorba/mz-lang-module into lp:zorba/languages-module

  1. mz-lang-module
  2. Merge into languages-module
Proposed by Markos Zaharioudakis
Status: Merged
Merged at revision: 20
Proposed branch: lp:~zorba-coders/zorba/mz-lang-module
Merge into: lp:zorba/languages-module
Diff against target: 12 lines (+1/-1)
1 file modified
src/com/zorba-xquery/www/modules/languages/xslt.xq.src/xslt.cpp (+1/-1)
To merge this branch: bzr merge lp:~zorba-coders/zorba/mz-lang-module
Reviewer Review Type Date Requested Status
Markos Zaharioudakis Approve
Review via email: mp+178610@code.launchpad.net

Commit message

XmlDataManager is not a singleton any more

Description of the change

XmlDataManager is not a singleton any more

To post a comment you must log in.
Revision history for this message
Markos Zaharioudakis (markos-za) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/mz-lang-module/+merge/178610

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue succeeded - proposal merged!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/com/zorba-xquery/www/modules/languages/xslt.xq.src/xslt.cpp'
2--- src/com/zorba-xquery/www/modules/languages/xslt.xq.src/xslt.cpp 2011-08-13 00:08:39 +0000
3+++ src/com/zorba-xquery/www/modules/languages/xslt.xq.src/xslt.cpp 2013-08-05 17:27:25 +0000
4@@ -123,7 +123,7 @@
5
6 std::istringstream iss( resStr.c_str() );
7
8- XmlDataManager* lDM = Zorba::getInstance(0)->getXmlDataManager();
9+ XmlDataManager_t lDM = Zorba::getInstance(0)->getXmlDataManager();
10 try
11 {
12 return ItemSequence_t(new SingletonItemSequence(lDM->parseXML(iss)));

Subscribers

People subscribed via source and target branches

to all changes: