Zorba

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

  1. bug-1158052-couchbase
  2. Merge into couchbase-module
Proposed by Paul J. Lucas
Status: Merged
Merged at revision: 44
Proposed branch: lp:~zorba-coders/zorba/bug-1158052-couchbase
Merge into: lp:zorba/couchbase-module
Diff against target: 12 lines (+1/-1)
1 file modified
src/couchbase.xq.src/couchbase.cpp (+1/-1)
To merge this branch: bzr merge lp:~zorba-coders/zorba/bug-1158052-couchbase
Reviewer Review Type Date Requested Status
Chris Hillery Approve
Paul J. Lucas Approve
Review via email: mp+170951@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.
Revision history for this message
Paul J. Lucas (paul-lucas) :
review: Approve
Revision history for this message
Chris Hillery (ceejatec) :
review: Approve
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/couchbase.xq.src/couchbase.cpp'
2--- src/couchbase.xq.src/couchbase.cpp 2013-06-12 12:27:29 +0000
3+++ src/couchbase.xq.src/couchbase.cpp 2013-06-22 13:19:24 +0000
4@@ -708,7 +708,7 @@
5 //unsigned char lData[resp->v.v0.nbytes];
6 //size_t lLen = resp->v.v0.nbytes;
7 //memcpy(lData, resp->v.v0.bytes, lLen);
8- lRes->theItem = CouchbaseModule::getItemFactory()->createBase64Binary((const unsigned char*)resp->v.v0.bytes, resp->v.v0.nbytes);
9+ lRes->theItem = CouchbaseModule::getItemFactory()->createBase64Binary(reinterpret_cast<char const*>(resp->v.v0.bytes), resp->v.v0.nbytes, false);
10 }
11 else
12 {

Subscribers

People subscribed via source and target branches

to all changes: