Zorba

Merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba

  1. pjl-misc
  2. Merge into trunk
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
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.
Revision history for this message
Paul J. Lucas (paul-lucas) :
review: Approve
Revision history for this message
Matthias Brantner (matthias-brantner) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/216803

Progress dashboard at http://jenkins.zorba.io:8180/view/ValidationQueue

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue succeeded - proposal merged!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/api/item_seq_chainer.h'
2--- src/api/item_seq_chainer.h 2013-08-01 11:59:51 +0000
3+++ src/api/item_seq_chainer.h 2014-04-23 00:41:51 +0000
4@@ -19,7 +19,7 @@
5
6 #include <vector>
7 #include <set>
8-#include <assert.h>
9+#include <cassert>
10
11 #include <zorba/config.h>
12 #include <zorba/item_sequence.h>
13
14=== modified file 'src/runtime/base/narybase.h'
15--- src/runtime/base/narybase.h 2014-02-12 02:25:45 +0000
16+++ src/runtime/base/narybase.h 2014-04-23 00:41:51 +0000
17@@ -17,6 +17,7 @@
18 #ifndef ZORBA_RUNTIME_NARY_ITERATOR
19 #define ZORBA_RUNTIME_NARY_ITERATOR
20
21+#include <cassert>
22 #include <vector>
23
24 #include "common/shared_types.h"
25
26=== modified file 'src/runtime/base/unarybase.h'
27--- src/runtime/base/unarybase.h 2014-02-12 02:25:45 +0000
28+++ src/runtime/base/unarybase.h 2014-04-23 00:41:51 +0000
29@@ -17,6 +17,8 @@
30 #ifndef ZORBA_RUNTIME_UNARY_ITERATOR
31 #define ZORBA_RUNTIME_UNARY_ITERATOR
32
33+#include <cassert>
34+
35 #include "common/shared_types.h"
36
37 #include "runtime/base/plan_iterator.h"
38
39=== modified file 'src/runtime/util/handle_hashmap_item_value.h'
40--- src/runtime/util/handle_hashmap_item_value.h 2013-02-07 17:24:36 +0000
41+++ src/runtime/util/handle_hashmap_item_value.h 2014-04-23 00:41:51 +0000
42@@ -16,6 +16,8 @@
43 #ifndef ZORBA_STORE_HANDLE_HAHSET_ITEM_VALUE_H
44 #define ZORBA_STORE_HANDLE_HAHSET_ITEM_VALUE_H
45
46+#include <cassert>
47+
48 #include "zorbautils/hashmap.h"
49 #include "runtime/booleans/BooleanImpl.h"
50 #include "runtime/api/runtimecb.h"
51
52=== modified file 'src/store/naive/atomic_items.h'
53--- src/store/naive/atomic_items.h 2013-06-26 10:59:37 +0000
54+++ src/store/naive/atomic_items.h 2014-04-23 00:41:51 +0000
55@@ -17,11 +17,12 @@
56 #ifndef ZORBA_STORE_ATOMIC_ITEMS_H
57 #define ZORBA_STORE_ATOMIC_ITEMS_H
58
59-#include <zorba/config.h>
60+#include <cassert>
61 #include <iostream>
62 #include <vector>
63 #include <cstring>
64
65+#include <zorba/config.h>
66 #include <zorba/streams.h>
67 #ifndef ZORBA_NO_FULL_TEXT
68 #include <zorba/tokenizer.h>
69
70=== modified file 'src/store/naive/node_items.h'
71--- src/store/naive/node_items.h 2013-06-29 08:38:53 +0000
72+++ src/store/naive/node_items.h 2014-04-23 00:41:51 +0000
73@@ -17,6 +17,7 @@
74 #ifndef ZORBA_SIMPLE_STORE_NODE_ITEMS
75 #define ZORBA_SIMPLE_STORE_NODE_ITEMS
76
77+#include <cassert>
78 #include <stack>
79 #include <vector>
80
81
82=== modified file 'src/store/naive/node_iterators.h'
83--- src/store/naive/node_iterators.h 2013-06-15 02:57:08 +0000
84+++ src/store/naive/node_iterators.h 2014-04-23 00:41:51 +0000
85@@ -16,6 +16,7 @@
86 #ifndef ZORBA_SIMPLE_STORE_NODE_ITERATORS
87 #define ZORBA_SIMPLE_STORE_NODE_ITERATORS
88
89+#include <cassert>
90 #include <set>
91 #include <vector>
92
93
94=== modified file 'src/store/naive/ordpath.h'
95--- src/store/naive/ordpath.h 2013-02-26 04:12:43 +0000
96+++ src/store/naive/ordpath.h 2014-04-23 00:41:51 +0000
97@@ -17,6 +17,7 @@
98 #ifndef ZORBA_STORE_ORDPATH_H
99 #define ZORBA_STORE_ORDPATH_H
100
101+#include <cassert>
102 #include <vector>
103
104 #include <zorba/config.h>
105
106=== modified file 'src/store/naive/simple_index_general.h'
107--- src/store/naive/simple_index_general.h 2013-02-07 17:24:36 +0000
108+++ src/store/naive/simple_index_general.h 2014-04-23 00:41:51 +0000
109@@ -16,6 +16,7 @@
110 #ifndef ZORBA_SIMPLE_STORE_INDEX_HASH_GENERAL
111 #define ZORBA_SIMPLE_STORE_INDEX_HASH_GENERAL
112
113+#include <cassert>
114 #include <map>
115
116 #include "simple_index.h"
117
118=== modified file 'src/store/naive/text_node_content.h'
119--- src/store/naive/text_node_content.h 2013-02-07 17:24:36 +0000
120+++ src/store/naive/text_node_content.h 2014-04-23 00:41:51 +0000
121@@ -17,6 +17,7 @@
122 #ifndef ZORBA_SIMPLE_STORE_TEXT_NODE_CONTENT
123 #define ZORBA_SIMPLE_STORE_TEXT_NODE_CONTENT
124
125+#include <cassert>
126 #include <cstring> /* for memset(3) */
127
128 #include "shared_types.h"
129
130=== modified file 'src/system/globalenv.h'
131--- src/system/globalenv.h 2013-12-25 03:43:06 +0000
132+++ src/system/globalenv.h 2014-04-23 00:41:51 +0000
133@@ -17,6 +17,8 @@
134 #ifndef ZORBA_GLOBALENV_H
135 #define ZORBA_GLOBALENV_H
136
137+#include <cassert>
138+
139 #include <zorba/config.h>
140 #include <zorba/internal/unique_ptr.h>
141
142
143=== modified file 'src/types/typeimpl.h'
144--- src/types/typeimpl.h 2013-09-23 09:11:02 +0000
145+++ src/types/typeimpl.h 2014-04-23 00:41:51 +0000
146@@ -17,6 +17,8 @@
147 #ifndef ZORBA_TYPEIMPL_H
148 #define ZORBA_TYPEIMPL_H
149
150+#include <cassert>
151+
152 #include "common/shared_types.h"
153
154 #include "types/node_test.h"
155
156=== modified file 'src/util/string/default_rep.h'
157--- src/util/string/default_rep.h 2013-08-02 18:56:15 +0000
158+++ src/util/string/default_rep.h 2014-04-23 00:41:51 +0000
159@@ -17,6 +17,7 @@
160 #ifndef ZORBA_RSTRING_DEFAULT_REP_H
161 #define ZORBA_RSTRING_DEFAULT_REP_H
162
163+#include <cassert>
164 #include <iterator>
165
166 #include <zorba/internal/cxx_util.h>
167
168=== modified file 'src/util/utf8_util.h'
169--- src/util/utf8_util.h 2013-06-01 00:30:39 +0000
170+++ src/util/utf8_util.h 2014-04-23 00:41:51 +0000
171@@ -18,6 +18,7 @@
172 #define ZORBA_UTF8_UTIL_H
173
174 #include <algorithm>
175+#include <cassert>
176 #include <cwchar>
177 #include <string>
178
179
180=== modified file 'src/zorbaserialization/archiver.h'
181--- src/zorbaserialization/archiver.h 2013-09-26 09:37:30 +0000
182+++ src/zorbaserialization/archiver.h 2014-04-23 00:41:51 +0000
183@@ -17,6 +17,7 @@
184 #ifndef ZORBA_BINARY_SERIALIZATION_ARCHIVER
185 #define ZORBA_BINARY_SERIALIZATION_ARCHIVER
186
187+#include <cassert>
188 #include <stack>
189
190 #include "zorbaserialization/class_serializer.h"
191
192=== modified file 'src/zorbaserialization/serialize_template_types.h'
193--- src/zorbaserialization/serialize_template_types.h 2013-05-15 23:22:01 +0000
194+++ src/zorbaserialization/serialize_template_types.h 2014-04-23 00:41:51 +0000
195@@ -17,6 +17,7 @@
196 #ifndef TEMPLATE_SERIALIZATION_OPERATORS
197 #define TEMPLATE_SERIALIZATION_OPERATORS
198
199+#include <cassert>
200 #include <list>
201 #include <vector>
202 #include <map>
203
204=== modified file 'src/zorbaserialization/serialize_zorba_types.h'
205--- src/zorbaserialization/serialize_zorba_types.h 2013-08-05 13:20:52 +0000
206+++ src/zorbaserialization/serialize_zorba_types.h 2014-04-23 00:41:51 +0000
207@@ -17,6 +17,10 @@
208 #ifndef ZORBA_SPECIFIC_CLASS_SERIALIZATION
209 #define ZORBA_SPECIFIC_CLASS_SERIALIZATION
210
211+#include <cassert>
212+#include <stdio.h>
213+#include <map>
214+
215 #include <zorba/item.h>
216 #include <zorba/xquery_exception.h>
217
218@@ -32,9 +36,6 @@
219 #include "store/api/shared_types.h"
220 #include "diagnostics/assert.h"
221
222-#include <stdio.h>
223-#include <map>
224-
225 namespace zorba
226 {
227 class Base16;
228
229=== modified file 'src/zorbautils/hashmap.h'
230--- src/zorbautils/hashmap.h 2013-02-26 04:12:43 +0000
231+++ src/zorbautils/hashmap.h 2014-04-23 00:41:51 +0000
232@@ -16,9 +16,10 @@
233 #ifndef ZORBA_UTILS_HASHMAP_H
234 #define ZORBA_UTILS_HASHMAP_H
235
236+#include <cassert>
237+#include <cstddef>
238 #include <vector>
239
240-#include <cstddef>
241 #include <zorba/config.h>
242
243 #include "common/common.h"
244
245=== modified file 'src/zorbautils/hashset_atomic_itemh.h'
246--- src/zorbautils/hashset_atomic_itemh.h 2013-09-25 03:41:10 +0000
247+++ src/zorbautils/hashset_atomic_itemh.h 2014-04-23 00:41:51 +0000
248@@ -16,6 +16,8 @@
249 #ifndef ZORBA_ZORBAUTILS_HAHSET_ATOMIC_ITEMH
250 #define ZORBA_ZORBAUTILS_HAHSET_ATOMIC_ITEMH
251
252+#include <cassert>
253+
254 #include "zorbautils/hashset.h"
255
256 #include "runtime/booleans/BooleanImpl.h"
257
258=== modified file 'src/zorbautils/hashset_node_itemh.h'
259--- src/zorbautils/hashset_node_itemh.h 2012-06-29 18:19:56 +0000
260+++ src/zorbautils/hashset_node_itemh.h 2014-04-23 00:41:51 +0000
261@@ -17,6 +17,8 @@
262 #ifndef ZORBA_ZORBAUTILS_HASHSET_NODE_ITEMH
263 #define ZORBA_ZORBAUTILS_HASHSET_NODE_ITEMH
264
265+#include <cassert>
266+
267 #include "zorbautils/hashfun.h"
268 #include "zorbautils/hashset.h"
269
270
271=== modified file 'src/zorbautils/stack.h'
272--- src/zorbautils/stack.h 2013-02-07 17:24:36 +0000
273+++ src/zorbautils/stack.h 2014-04-23 00:41:51 +0000
274@@ -17,6 +17,7 @@
275 #ifndef ZORBA_UTILS_STACK
276 #define ZORBA_UTILS_STACK
277
278+#include <cassert>
279 #include <vector>
280
281 #include <zorba/config.h>

Subscribers

People subscribed via source and target branches