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

[Paul J. Lucas]

Corresponding changes for bug #1158052.

Corresponding changes for bug #1158052.

[Paul J. Lucas (paul-lucas)]

review: Approve

[Chris Hillery (ceejatec)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue succeeded - proposal merged!

=== modified file 'src/archive_module.xq.src/archive_module.cpp'
--- src/archive_module.xq.src/archive_module.cpp	2013-06-12 14:17:54 +0000
+++ src/archive_module.xq.src/archive_module.cpp	2013-06-22 13:08:26 +0000
@@ -1344,7 +1344,7 @@
       lResult.insert(lResult.end(), lBuf.begin(), lBuf.begin() + s);
     }
 
-    aRes = theFactory->createBase64Binary(&lResult[0], lResult.size());
+    aRes = theFactory->createBase64Binary(reinterpret_cast<char const*>(&lResult[0]), lResult.size(), false);
 
     return true;
   }
@@ -1461,7 +1461,7 @@
         lResult.insert(lResult.end(), lBuf.begin(), lBuf.begin() + s);
       }
 
-      aRes = theFactory->createBase64Binary(&lResult[0], lResult.size());
+      aRes = theFactory->createBase64Binary(reinterpret_cast<char const*>(&lResult[0]), lResult.size(), false);
     }
 
     return true;
@@ -1643,7 +1643,7 @@
         lResult.insert(lResult.end(), lBuf.begin(), lBuf.begin() + s);
       }
 
-      aRes = theFactory->createBase64Binary(&lResult[0], lResult.size());
+      aRes = theFactory->createBase64Binary(reinterpret_cast<char const*>(&lResult[0]), lResult.size(), false);
     }
     // else? if the entry represents a directory what are we
     // going to return??