Merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Proposed by
Paul J. Lucas
Status: | Merged |
---|---|
Approved by: | Paul J. Lucas |
Approved revision: | 11495 |
Merged at revision: | 11717 |
Proposed branch: | lp:~paul-lucas/zorba/pjl-misc |
Merge into: | lp:zorba |
Diff against target: |
281 lines (+32/-6) 21 files modified
src/api/item_seq_chainer.h (+1/-1) src/runtime/base/narybase.h (+1/-0) src/runtime/base/unarybase.h (+2/-0) src/runtime/util/handle_hashmap_item_value.h (+2/-0) src/store/naive/atomic_items.h (+2/-1) src/store/naive/node_items.h (+1/-0) src/store/naive/node_iterators.h (+1/-0) src/store/naive/ordpath.h (+1/-0) src/store/naive/simple_index_general.h (+1/-0) src/store/naive/text_node_content.h (+1/-0) src/system/globalenv.h (+2/-0) src/types/typeimpl.h (+2/-0) src/util/string/default_rep.h (+1/-0) src/util/utf8_util.h (+1/-0) src/zorbaserialization/archiver.h (+1/-0) src/zorbaserialization/serialize_template_types.h (+1/-0) src/zorbaserialization/serialize_zorba_types.h (+4/-3) src/zorbautils/hashmap.h (+2/-1) src/zorbautils/hashset_atomic_itemh.h (+2/-0) src/zorbautils/hashset_node_itemh.h (+2/-0) src/zorbautils/stack.h (+1/-0) |
To merge this branch: | bzr merge lp:~paul-lucas/zorba/pjl-misc |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Matthias Brantner | Approve | ||
Paul J. Lucas | Approve | ||
Review via email: mp+216803@code.launchpad.net |
Commit message
Added missing #include <cassert> all over.
Description of the change
Added missing #include <cassert> all over.
To post a comment you must log in.
Validation queue starting for the following merge proposals: /code.launchpad .net/~paul- lucas/zorba/ pjl-misc/ +merge/ 216803
https:/
Progress dashboard at http:// jenkins. zorba.io: 8180/view/ ValidationQueue