Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/pjl-misc into lp:zorba.
Commit message: Added missing #include <cassert> all over. Requested reviews: Paul J. Lucas (paul-lucas) For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/216803 Added missing #include <cassert> all over. -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/216803 Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/api/item_seq_chainer.h' --- src/api/item_seq_chainer.h 2013-08-01 11:59:51 +0000 +++ src/api/item_seq_chainer.h 2014-04-23 00:41:51 +0000 @@ -19,7 +19,7 @@ #include <vector> #include <set> -#include <assert.h> +#include <cassert> #include <zorba/config.h> #include <zorba/item_sequence.h> === modified file 'src/runtime/base/narybase.h' --- src/runtime/base/narybase.h 2014-02-12 02:25:45 +0000 +++ src/runtime/base/narybase.h 2014-04-23 00:41:51 +0000 @@ -17,6 +17,7 @@ #ifndef ZORBA_RUNTIME_NARY_ITERATOR #define ZORBA_RUNTIME_NARY_ITERATOR +#include <cassert> #include <vector> #include "common/shared_types.h" === modified file 'src/runtime/base/unarybase.h' --- src/runtime/base/unarybase.h 2014-02-12 02:25:45 +0000 +++ src/runtime/base/unarybase.h 2014-04-23 00:41:51 +0000 @@ -17,6 +17,8 @@ #ifndef ZORBA_RUNTIME_UNARY_ITERATOR #define ZORBA_RUNTIME_UNARY_ITERATOR +#include <cassert> + #include "common/shared_types.h" #include "runtime/base/plan_iterator.h" === modified file 'src/runtime/util/handle_hashmap_item_value.h' --- src/runtime/util/handle_hashmap_item_value.h 2013-02-07 17:24:36 +0000 +++ src/runtime/util/handle_hashmap_item_value.h 2014-04-23 00:41:51 +0000 @@ -16,6 +16,8 @@ #ifndef ZORBA_STORE_HANDLE_HAHSET_ITEM_VALUE_H #define ZORBA_STORE_HANDLE_HAHSET_ITEM_VALUE_H +#include <cassert> + #include "zorbautils/hashmap.h" #include "runtime/booleans/BooleanImpl.h" #include "runtime/api/runtimecb.h" === modified file 'src/store/naive/atomic_items.h' --- src/store/naive/atomic_items.h 2013-06-26 10:59:37 +0000 +++ src/store/naive/atomic_items.h 2014-04-23 00:41:51 +0000 @@ -17,11 +17,12 @@ #ifndef ZORBA_STORE_ATOMIC_ITEMS_H #define ZORBA_STORE_ATOMIC_ITEMS_H -#include <zorba/config.h> +#include <cassert> #include <iostream> #include <vector> #include <cstring> +#include <zorba/config.h> #include <zorba/streams.h> #ifndef ZORBA_NO_FULL_TEXT #include <zorba/tokenizer.h> === modified file 'src/store/naive/node_items.h' --- src/store/naive/node_items.h 2013-06-29 08:38:53 +0000 +++ src/store/naive/node_items.h 2014-04-23 00:41:51 +0000 @@ -17,6 +17,7 @@ #ifndef ZORBA_SIMPLE_STORE_NODE_ITEMS #define ZORBA_SIMPLE_STORE_NODE_ITEMS +#include <cassert> #include <stack> #include <vector> === modified file 'src/store/naive/node_iterators.h' --- src/store/naive/node_iterators.h 2013-06-15 02:57:08 +0000 +++ src/store/naive/node_iterators.h 2014-04-23 00:41:51 +0000 @@ -16,6 +16,7 @@ #ifndef ZORBA_SIMPLE_STORE_NODE_ITERATORS #define ZORBA_SIMPLE_STORE_NODE_ITERATORS +#include <cassert> #include <set> #include <vector> === modified file 'src/store/naive/ordpath.h' --- src/store/naive/ordpath.h 2013-02-26 04:12:43 +0000 +++ src/store/naive/ordpath.h 2014-04-23 00:41:51 +0000 @@ -17,6 +17,7 @@ #ifndef ZORBA_STORE_ORDPATH_H #define ZORBA_STORE_ORDPATH_H +#include <cassert> #include <vector> #include <zorba/config.h> === modified file 'src/store/naive/simple_index_general.h' --- src/store/naive/simple_index_general.h 2013-02-07 17:24:36 +0000 +++ src/store/naive/simple_index_general.h 2014-04-23 00:41:51 +0000 @@ -16,6 +16,7 @@ #ifndef ZORBA_SIMPLE_STORE_INDEX_HASH_GENERAL #define ZORBA_SIMPLE_STORE_INDEX_HASH_GENERAL +#include <cassert> #include <map> #include "simple_index.h" === modified file 'src/store/naive/text_node_content.h' --- src/store/naive/text_node_content.h 2013-02-07 17:24:36 +0000 +++ src/store/naive/text_node_content.h 2014-04-23 00:41:51 +0000 @@ -17,6 +17,7 @@ #ifndef ZORBA_SIMPLE_STORE_TEXT_NODE_CONTENT #define ZORBA_SIMPLE_STORE_TEXT_NODE_CONTENT +#include <cassert> #include <cstring> /* for memset(3) */ #include "shared_types.h" === modified file 'src/system/globalenv.h' --- src/system/globalenv.h 2013-12-25 03:43:06 +0000 +++ src/system/globalenv.h 2014-04-23 00:41:51 +0000 @@ -17,6 +17,8 @@ #ifndef ZORBA_GLOBALENV_H #define ZORBA_GLOBALENV_H +#include <cassert> + #include <zorba/config.h> #include <zorba/internal/unique_ptr.h> === modified file 'src/types/typeimpl.h' --- src/types/typeimpl.h 2013-09-23 09:11:02 +0000 +++ src/types/typeimpl.h 2014-04-23 00:41:51 +0000 @@ -17,6 +17,8 @@ #ifndef ZORBA_TYPEIMPL_H #define ZORBA_TYPEIMPL_H +#include <cassert> + #include "common/shared_types.h" #include "types/node_test.h" === modified file 'src/util/string/default_rep.h' --- src/util/string/default_rep.h 2013-08-02 18:56:15 +0000 +++ src/util/string/default_rep.h 2014-04-23 00:41:51 +0000 @@ -17,6 +17,7 @@ #ifndef ZORBA_RSTRING_DEFAULT_REP_H #define ZORBA_RSTRING_DEFAULT_REP_H +#include <cassert> #include <iterator> #include <zorba/internal/cxx_util.h> === modified file 'src/util/utf8_util.h' --- src/util/utf8_util.h 2013-06-01 00:30:39 +0000 +++ src/util/utf8_util.h 2014-04-23 00:41:51 +0000 @@ -18,6 +18,7 @@ #define ZORBA_UTF8_UTIL_H #include <algorithm> +#include <cassert> #include <cwchar> #include <string> === modified file 'src/zorbaserialization/archiver.h' --- src/zorbaserialization/archiver.h 2013-09-26 09:37:30 +0000 +++ src/zorbaserialization/archiver.h 2014-04-23 00:41:51 +0000 @@ -17,6 +17,7 @@ #ifndef ZORBA_BINARY_SERIALIZATION_ARCHIVER #define ZORBA_BINARY_SERIALIZATION_ARCHIVER +#include <cassert> #include <stack> #include "zorbaserialization/class_serializer.h" === modified file 'src/zorbaserialization/serialize_template_types.h' --- src/zorbaserialization/serialize_template_types.h 2013-05-15 23:22:01 +0000 +++ src/zorbaserialization/serialize_template_types.h 2014-04-23 00:41:51 +0000 @@ -17,6 +17,7 @@ #ifndef TEMPLATE_SERIALIZATION_OPERATORS #define TEMPLATE_SERIALIZATION_OPERATORS +#include <cassert> #include <list> #include <vector> #include <map> === modified file 'src/zorbaserialization/serialize_zorba_types.h' --- src/zorbaserialization/serialize_zorba_types.h 2013-08-05 13:20:52 +0000 +++ src/zorbaserialization/serialize_zorba_types.h 2014-04-23 00:41:51 +0000 @@ -17,6 +17,10 @@ #ifndef ZORBA_SPECIFIC_CLASS_SERIALIZATION #define ZORBA_SPECIFIC_CLASS_SERIALIZATION +#include <cassert> +#include <stdio.h> +#include <map> + #include <zorba/item.h> #include <zorba/xquery_exception.h> @@ -32,9 +36,6 @@ #include "store/api/shared_types.h" #include "diagnostics/assert.h" -#include <stdio.h> -#include <map> - namespace zorba { class Base16; === modified file 'src/zorbautils/hashmap.h' --- src/zorbautils/hashmap.h 2013-02-26 04:12:43 +0000 +++ src/zorbautils/hashmap.h 2014-04-23 00:41:51 +0000 @@ -16,9 +16,10 @@ #ifndef ZORBA_UTILS_HASHMAP_H #define ZORBA_UTILS_HASHMAP_H +#include <cassert> +#include <cstddef> #include <vector> -#include <cstddef> #include <zorba/config.h> #include "common/common.h" === modified file 'src/zorbautils/hashset_atomic_itemh.h' --- src/zorbautils/hashset_atomic_itemh.h 2013-09-25 03:41:10 +0000 +++ src/zorbautils/hashset_atomic_itemh.h 2014-04-23 00:41:51 +0000 @@ -16,6 +16,8 @@ #ifndef ZORBA_ZORBAUTILS_HAHSET_ATOMIC_ITEMH #define ZORBA_ZORBAUTILS_HAHSET_ATOMIC_ITEMH +#include <cassert> + #include "zorbautils/hashset.h" #include "runtime/booleans/BooleanImpl.h" === modified file 'src/zorbautils/hashset_node_itemh.h' --- src/zorbautils/hashset_node_itemh.h 2012-06-29 18:19:56 +0000 +++ src/zorbautils/hashset_node_itemh.h 2014-04-23 00:41:51 +0000 @@ -17,6 +17,8 @@ #ifndef ZORBA_ZORBAUTILS_HASHSET_NODE_ITEMH #define ZORBA_ZORBAUTILS_HASHSET_NODE_ITEMH +#include <cassert> + #include "zorbautils/hashfun.h" #include "zorbautils/hashset.h" === modified file 'src/zorbautils/stack.h' --- src/zorbautils/stack.h 2013-02-07 17:24:36 +0000 +++ src/zorbautils/stack.h 2014-04-23 00:41:51 +0000 @@ -17,6 +17,7 @@ #ifndef ZORBA_UTILS_STACK #define ZORBA_UTILS_STACK +#include <cassert> #include <vector> #include <zorba/config.h>
-- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp