zorba-coders team mailing list archive

["Paul J. Lucas" <paul@xxxxxxxxxxxxx>]

Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/pjl-misc into lp:zorba.

Commit message:
Stupid fix; clean-up.

Requested reviews:
  Paul J. Lucas (paul-lucas)

For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/188480

Stupid fix; clean-up.
-- 
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/188480
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'src/context/dynamic_loader.cpp'
--- src/context/dynamic_loader.cpp	2013-09-19 16:22:03 +0000
+++ src/context/dynamic_loader.cpp	2013-09-30 22:56:42 +0000
@@ -222,8 +222,6 @@
   std::vector<zstring> lLibPath;
   aSctx.get_full_lib_path(lLibPath);
 
-  std::unique_ptr<std::istream> modfile(); // result file
-
   if (lLibPath.size() != 0)
   {
     URI lURI(aNsURI);

=== modified file 'src/runtime/csv/csv_impl.cpp'
--- src/runtime/csv/csv_impl.cpp	2013-09-16 19:47:24 +0000
+++ src/runtime/csv/csv_impl.cpp	2013-09-30 22:56:42 +0000
@@ -215,10 +215,8 @@
     --count;
   }
 
-  STACK_PUSH(
-    GENV_ITEMFACTORY->createInteger( result, xs_integer( count ) ),
-    state
-  );
+  GENV_ITEMFACTORY->createInteger( result, xs_integer( count ) );
+  STACK_PUSH( true, state );
   STACK_END( state );
 }