Merge lp:~zorba-coders/zorba/bug-1158052-archive into lp:zorba/archive-module

Proposed by Paul J. Lucas on 2013-06-22
Status: Merged
Merged at revision: 50
Proposed branch: lp:~zorba-coders/zorba/bug-1158052-archive
Merge into: lp:zorba/archive-module
Diff against target: 30 lines (+3/-3)
1 file modified
src/archive_module.xq.src/archive_module.cpp (+3/-3)
To merge this branch: bzr merge lp:~zorba-coders/zorba/bug-1158052-archive
Reviewer Review Type Date Requested Status
Chris Hillery 2013-06-22 Approve on 2013-06-28
Paul J. Lucas Approve on 2013-06-22
Review via email: mp+170943@code.launchpad.net

Commit message

Corresponding changes for bug #1158052.

Description of the change

Corresponding changes for bug #1158052.

To post a comment you must log in.
Paul J. Lucas (paul-lucas) :
review: Approve
Chris Hillery (ceejatec) :
review: Approve
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/archive_module.xq.src/archive_module.cpp'
2--- src/archive_module.xq.src/archive_module.cpp 2013-06-12 14:17:54 +0000
3+++ src/archive_module.xq.src/archive_module.cpp 2013-06-22 13:08:26 +0000
4@@ -1344,7 +1344,7 @@
5 lResult.insert(lResult.end(), lBuf.begin(), lBuf.begin() + s);
6 }
7
8- aRes = theFactory->createBase64Binary(&lResult[0], lResult.size());
9+ aRes = theFactory->createBase64Binary(reinterpret_cast<char const*>(&lResult[0]), lResult.size(), false);
10
11 return true;
12 }
13@@ -1461,7 +1461,7 @@
14 lResult.insert(lResult.end(), lBuf.begin(), lBuf.begin() + s);
15 }
16
17- aRes = theFactory->createBase64Binary(&lResult[0], lResult.size());
18+ aRes = theFactory->createBase64Binary(reinterpret_cast<char const*>(&lResult[0]), lResult.size(), false);
19 }
20
21 return true;
22@@ -1643,7 +1643,7 @@
23 lResult.insert(lResult.end(), lBuf.begin(), lBuf.begin() + s);
24 }
25
26- aRes = theFactory->createBase64Binary(&lResult[0], lResult.size());
27+ aRes = theFactory->createBase64Binary(reinterpret_cast<char const*>(&lResult[0]), lResult.size(), false);
28 }
29 // else? if the entry represents a directory what are we
30 // going to return??

Subscribers

People subscribed via source and target branches

to all changes: