zorba-coders team mailing list archive

[Juan Zacarias <juan457@xxxxxxxxx>]

Juan Zacarias has proposed merging lp:~zorba-coders/zorba/zorba-windows-fix into lp:zorba.

Commit message:
Fixes for Windows

Requested reviews:
  Juan Zacarias (juan457)
  Chris Hillery (ceejatec)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/zorba-windows-fix/+merge/186634

Fixes for Windows
-- 
https://code.launchpad.net/~zorba-coders/zorba/zorba-windows-fix/+merge/186634
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'modules/http-client/json/http-client.xq.src/http_response_parser.cpp'
--- modules/http-client/json/http-client.xq.src/http_response_parser.cpp	2013-09-17 21:12:49 +0000
+++ modules/http-client/json/http-client.xq.src/http_response_parser.cpp	2013-09-19 19:35:55 +0000
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include <algorithm>
 #include <cassert>
 #include <cstring>
 #include <iostream>

=== modified file 'src/context/dynamic_loader.cpp'
--- src/context/dynamic_loader.cpp	2013-09-17 21:12:49 +0000
+++ src/context/dynamic_loader.cpp	2013-09-19 19:35:55 +0000
@@ -222,7 +222,7 @@
   std::vector<zstring> lLibPath;
   aSctx.get_full_lib_path(lLibPath);
 
-  std::unique_ptr<std::istream> modfile(0); // result file
+  std::unique_ptr<std::istream> modfile(); // result file
 
   if (lLibPath.size() != 0)
   {