lp:~zorba-coders/zorba/bug-986580

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:zorba at revision 10801

Rodolfo Ochoa: Approve on 2012-04-25

Cezar Andrei: Approve on 2012-04-25

Diff: 1326 lines (+298/-764)

16 files modified

CMakeLists.txt (+7/-0)
NOTICE.txt (+0/-18)
NOTICE.xml (+0/-16)
src/api/fileimpl.cpp (+6/-17)
src/api/fileimpl.h (+3/-4)
src/unit_tests/CMakeLists.txt (+1/-0)
src/unit_tests/test_fs_iterator.cpp (+54/-0)
src/unit_tests/unit_test_list.h (+1/-0)
src/unit_tests/unit_tests.cpp (+1/-0)
src/util/CMakeLists.txt (+0/-1)
src/util/dir.cpp (+0/-175)
src/util/dir.h (+0/-100)
src/util/file.cpp (+3/-1)
src/util/fs_util.cpp (+129/-31)
src/util/fs_util.h (+93/-29)
src/util/win32/dirent.h (+0/-372)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #986580: fs::lsdir() improvements

Low

Fix Released

Link a bug report

Related blueprints

10794. By Paul J. Lucas on 2012-04-25

Put file::lsdir() back since it's used by the util-jvm module.

10793. By Paul J. Lucas on 2012-04-25

Removed copyright notice for dirent.h.

10792. By Paul J. Lucas on 2012-04-25

Merge from trunk.

10791. By Rodolfo Ochoa on 2012-04-25

Fix for missing shlwapi.lib missing in windows

10790. By Paul J. Lucas on 2012-04-22

Removed file::lsdir().

10789. By Paul J. Lucas on 2012-04-22

Now making paths absolute.

10788. By Paul J. Lucas on 2012-04-22

Intermediate check-in.

10787. By Cezar Andrei <email address hidden> on 2012-04-20

Update trunk to use data-formating-module branch at at latest tag: zorba-2.2-jvm. Approved: Chris Hillery, Cezar Andrei

10786. By Rodolfo Ochoa on 2012-04-20

Work-around for Windows compiler problem; see:
http://stackoverflow.com/questions/9285657/sfinae-differentiation-between-signed-and-unsigned Approved: Rodolfo Ochoa, Paul J. Lucas

10785. By Markos Zaharioudakis on 2012-04-19

removed get_is_temp_field_also_for_ptr() method and reduced use of set_is_temp_field_one_level(),
changed the serializat5ion of maps (std and hashmaps)
added --serialize-plan option to zorbacmd
 Approved: Markos Zaharioudakis