Zorba

Merge lp:~gislenius/zorba/same-directory-store-includes into lp:zorba

  1. same-directory-store-includes
  2. Merge into trunk
Proposed by Ghislain Fourny
Status: Merged
Approved by: Matthias Brantner
Approved revision: 10643
Merged at revision: 10652
Proposed branch: lp:~gislenius/zorba/same-directory-store-includes
Merge into: lp:zorba
Diff against target: 673 lines (+165/-165)
31 files modified
src/store/naive/atomic_items.cpp (+8/-8)
src/store/naive/collection_set.cpp (+2/-2)
src/store/naive/dataguide.cpp (+1/-1)
src/store/naive/inmemorystore.cpp (+2/-2)
src/store/naive/inmemorystorec.cpp (+1/-1)
src/store/naive/item.cpp (+3/-3)
src/store/naive/item_iterator.cpp (+1/-1)
src/store/naive/item_vector.cpp (+1/-1)
src/store/naive/loader_dtd.cpp (+11/-11)
src/store/naive/loader_fast.cpp (+11/-11)
src/store/naive/node_factory.cpp (+4/-4)
src/store/naive/node_items.cpp (+12/-12)
src/store/naive/node_iterators.cpp (+3/-3)
src/store/naive/node_updates.cpp (+9/-9)
src/store/naive/nsbindings.cpp (+1/-1)
src/store/naive/ordpath.cpp (+2/-2)
src/store/naive/properties.cpp (+1/-1)
src/store/naive/pul_primitive_factory.cpp (+3/-3)
src/store/naive/pul_primitives.cpp (+12/-12)
src/store/naive/qname_pool.cpp (+6/-6)
src/store/naive/simple_collection.cpp (+6/-6)
src/store/naive/simple_index.cpp (+5/-5)
src/store/naive/simple_index_general.cpp (+4/-4)
src/store/naive/simple_index_value.cpp (+1/-1)
src/store/naive/simple_item_factory.cpp (+11/-11)
src/store/naive/simple_iterator_factory.cpp (+6/-6)
src/store/naive/simple_lazy_temp_seq.cpp (+1/-1)
src/store/naive/simple_pul.cpp (+10/-10)
src/store/naive/simple_store.cpp (+25/-25)
src/store/naive/simple_temp_seq.cpp (+1/-1)
src/store/naive/string_pool.cpp (+1/-1)
To merge this branch: bzr merge lp:~gislenius/zorba/same-directory-store-includes
Reviewer Review Type Date Requested Status
Matthias Brantner Approve
Markos Zaharioudakis Approve
Review via email: mp+91279@code.launchpad.net

Commit message

Made same-directory simple store includes.

Description of the change

Made store includes occur in same directory, i.e. replaced

#include "store/naive/include-file"

with

#include "include-file"

for all files in the /src/store/naive directory.

To post a comment you must log in.
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/same-directory-store-includes-2012-02-02T14-45-57.461Z/log.html

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

Validation queue job same-directory-store-includes-2012-02-02T14-45-57.461Z is finished. The final status was:

All tests succeeded!

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

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1. Got: 1 Pending.

Revision history for this message
Markos Zaharioudakis (markos-za) :
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 merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/same-directory-store-includes-2012-02-08T15-33-56.706Z/log.html

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

Validation queue job same-directory-store-includes-2012-02-08T15-33-56.706Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/store/naive/atomic_items.cpp'
2--- src/store/naive/atomic_items.cpp 2012-01-26 19:56:14 +0000
3+++ src/store/naive/atomic_items.cpp 2012-02-02 14:45:36 +0000
4@@ -32,14 +32,14 @@
5 #include "store/api/store.h"
6 #include "store/api/item_factory.h"
7 #include "store/api/collection.h"
8-#include "store/naive/qname_pool.h"
9-#include "store/naive/simple_store.h"
10-#include "store/naive/simple_item_factory.h"
11-#include "store/naive/store_defs.h"
12-#include "store/naive/item_iterator.h"
13-#include "store/naive/node_items.h"
14-#include "store/naive/atomic_items.h"
15-#include "store/naive/ordpath.h"
16+#include "qname_pool.h"
17+#include "simple_store.h"
18+#include "simple_item_factory.h"
19+#include "store_defs.h"
20+#include "item_iterator.h"
21+#include "node_items.h"
22+#include "atomic_items.h"
23+#include "ordpath.h"
24
25 #include "util/ascii_util.h"
26 #include "util/string_util.h"
27
28=== modified file 'src/store/naive/collection_set.cpp'
29--- src/store/naive/collection_set.cpp 2011-10-03 09:18:49 +0000
30+++ src/store/naive/collection_set.cpp 2012-02-02 14:45:36 +0000
31@@ -15,9 +15,9 @@
32 */
33 #include "stdafx.h"
34
35-#include "store/naive/collection_set.h"
36+#include "collection_set.h"
37 #include "store/api/iterator.h"
38-#include "store/naive/name_iterator.h"
39+#include "name_iterator.h"
40
41 namespace zorba { namespace simplestore {
42
43
44=== modified file 'src/store/naive/dataguide.cpp'
45--- src/store/naive/dataguide.cpp 2011-07-12 20:15:01 +0000
46+++ src/store/naive/dataguide.cpp 2012-02-02 14:45:36 +0000
47@@ -16,7 +16,7 @@
48 #include "stdafx.h"
49
50 #include "zorbautils/fatal.h"
51-#include "store/naive/dataguide.h"
52+#include "dataguide.h"
53
54
55 namespace zorba
56
57=== modified file 'src/store/naive/inmemorystore.cpp'
58--- src/store/naive/inmemorystore.cpp 2011-06-14 17:26:33 +0000
59+++ src/store/naive/inmemorystore.cpp 2012-02-02 14:45:36 +0000
60@@ -15,9 +15,9 @@
61 */
62 #include "stdafx.h"
63
64-#include "store/naive/store_manager_impl.h"
65+#include "store_manager_impl.h"
66
67-#include "store/naive/simple_store.h"
68+#include "simple_store.h"
69
70 namespace zorba
71 {
72
73=== modified file 'src/store/naive/inmemorystorec.cpp'
74--- src/store/naive/inmemorystorec.cpp 2011-06-14 17:26:33 +0000
75+++ src/store/naive/inmemorystorec.cpp 2012-02-02 14:45:36 +0000
76@@ -17,7 +17,7 @@
77
78 #include <zorba/store_manager_c.h>
79 #include <zorba/store_manager.h>
80-#include "store/naive/simple_store.h"
81+#include "simple_store.h"
82
83 void*
84 create_store()
85
86=== modified file 'src/store/naive/item.cpp'
87--- src/store/naive/item.cpp 2012-01-26 19:56:14 +0000
88+++ src/store/naive/item.cpp 2012-02-02 14:45:36 +0000
89@@ -23,9 +23,9 @@
90
91 #include "store/api/item.h"
92 #include "store/api/iterator.h"
93-#include "store/naive/store_defs.h"
94-#include "store/naive/atomic_items.h"
95-#include "store/naive/node_items.h"
96+#include "store_defs.h"
97+#include "atomic_items.h"
98+#include "node_items.h"
99
100 #include "runtime/function_item/function_item.h"
101
102
103=== modified file 'src/store/naive/item_iterator.cpp'
104--- src/store/naive/item_iterator.cpp 2011-06-14 17:26:33 +0000
105+++ src/store/naive/item_iterator.cpp 2012-02-02 14:45:36 +0000
106@@ -15,7 +15,7 @@
107 */
108 #include "stdafx.h"
109 #include "store/api/item.h"
110-#include "store/naive/item_iterator.h"
111+#include "item_iterator.h"
112 #include "store/api/collection.h"
113
114 namespace zorba { namespace simplestore {
115
116=== modified file 'src/store/naive/item_vector.cpp'
117--- src/store/naive/item_vector.cpp 2011-06-14 17:26:33 +0000
118+++ src/store/naive/item_vector.cpp 2012-02-02 14:45:36 +0000
119@@ -18,7 +18,7 @@
120 #include <sstream>
121
122 #include "store/api/item.h"
123-#include "store/naive/item_vector.h"
124+#include "item_vector.h"
125
126 namespace zorba { namespace simplestore {
127
128
129=== modified file 'src/store/naive/loader_dtd.cpp'
130--- src/store/naive/loader_dtd.cpp 2012-01-11 17:30:25 +0000
131+++ src/store/naive/loader_dtd.cpp 2012-02-02 14:45:36 +0000
132@@ -26,17 +26,17 @@
133
134 #include <zorba/store_consts.h>
135
136-#include "store/naive/store_defs.h"
137-#include "store/naive/string_pool.h"
138-#include "store/naive/qname_pool.h"
139-#include "store/naive/simple_store.h"
140-#include "store/naive/atomic_items.h"
141-#include "store/naive/node_items.h"
142-#include "store/naive/dataguide.h"
143-#include "store/naive/nsbindings.h"
144-#include "store/naive/loader.h"
145-#include "store/naive/simple_item_factory.h"
146-#include "store/naive/node_factory.h"
147+#include "store_defs.h"
148+#include "string_pool.h"
149+#include "qname_pool.h"
150+#include "simple_store.h"
151+#include "atomic_items.h"
152+#include "node_items.h"
153+#include "dataguide.h"
154+#include "nsbindings.h"
155+#include "loader.h"
156+#include "simple_item_factory.h"
157+#include "node_factory.h"
158
159 #include "zorbatypes/datetime.h"
160 #include "zorbatypes/URI.h"
161
162=== modified file 'src/store/naive/loader_fast.cpp'
163--- src/store/naive/loader_fast.cpp 2012-01-11 17:30:25 +0000
164+++ src/store/naive/loader_fast.cpp 2012-02-02 14:45:36 +0000
165@@ -23,17 +23,17 @@
166
167 #include <zorba/store_consts.h>
168
169-#include "store/naive/store_defs.h"
170-#include "store/naive/string_pool.h"
171-#include "store/naive/qname_pool.h"
172-#include "store/naive/simple_store.h"
173-#include "store/naive/atomic_items.h"
174-#include "store/naive/node_items.h"
175-#include "store/naive/dataguide.h"
176-#include "store/naive/nsbindings.h"
177-#include "store/naive/loader.h"
178-#include "store/naive/simple_item_factory.h"
179-#include "store/naive/node_factory.h"
180+#include "store_defs.h"
181+#include "string_pool.h"
182+#include "qname_pool.h"
183+#include "simple_store.h"
184+#include "atomic_items.h"
185+#include "node_items.h"
186+#include "dataguide.h"
187+#include "nsbindings.h"
188+#include "loader.h"
189+#include "simple_item_factory.h"
190+#include "node_factory.h"
191
192 #include "zorbatypes/datetime.h"
193 #include "zorbatypes/URI.h"
194
195=== modified file 'src/store/naive/node_factory.cpp'
196--- src/store/naive/node_factory.cpp 2012-01-11 17:30:25 +0000
197+++ src/store/naive/node_factory.cpp 2012-02-02 14:45:36 +0000
198@@ -15,10 +15,10 @@
199 */
200 #include "stdafx.h"
201
202-#include "store/naive/node_factory.h"
203-#include "store/naive/node_items.h"
204-#include "store/naive/simple_store.h"
205-#include "store/naive/store_defs.h"
206+#include "node_factory.h"
207+#include "node_items.h"
208+#include "simple_store.h"
209+#include "store_defs.h"
210
211 namespace zorba
212 {
213
214=== modified file 'src/store/naive/node_items.cpp'
215--- src/store/naive/node_items.cpp 2012-02-01 14:50:27 +0000
216+++ src/store/naive/node_items.cpp 2012-02-02 14:45:36 +0000
217@@ -30,18 +30,18 @@
218 #include "zorbamisc/ns_consts.h"
219
220 #include "store/api/copymode.h"
221-#include "store/naive/atomic_items.h"
222-#include "store/naive/node_items.h"
223-#include "store/naive/node_iterators.h"
224-#include "store/naive/simple_store.h"
225-#include "store/naive/simple_collection.h"
226-#include "store/naive/simple_item_factory.h"
227-#include "store/naive/qname_pool.h"
228-#include "store/naive/store_defs.h"
229-#include "store/naive/nsbindings.h"
230-#include "store/naive/item_iterator.h"
231-#include "store/naive/dataguide.h"
232-#include "store/naive/node_factory.h"
233+#include "atomic_items.h"
234+#include "node_items.h"
235+#include "node_iterators.h"
236+#include "simple_store.h"
237+#include "simple_collection.h"
238+#include "simple_item_factory.h"
239+#include "qname_pool.h"
240+#include "store_defs.h"
241+#include "nsbindings.h"
242+#include "item_iterator.h"
243+#include "dataguide.h"
244+#include "node_factory.h"
245
246 #include "util/string_util.h"
247
248
249=== modified file 'src/store/naive/node_iterators.cpp'
250--- src/store/naive/node_iterators.cpp 2012-01-11 17:30:25 +0000
251+++ src/store/naive/node_iterators.cpp 2012-02-02 14:45:36 +0000
252@@ -20,9 +20,9 @@
253 #include "diagnostics/assert.h"
254 #include "diagnostics/xquery_diagnostics.h"
255
256-#include "store/naive/node_items.h"
257-#include "store/naive/node_iterators.h"
258-#include "store/naive/store_defs.h"
259+#include "node_items.h"
260+#include "node_iterators.h"
261+#include "store_defs.h"
262
263 namespace zorba
264 {
265
266=== modified file 'src/store/naive/node_updates.cpp'
267--- src/store/naive/node_updates.cpp 2012-01-10 10:52:15 +0000
268+++ src/store/naive/node_updates.cpp 2012-02-02 14:45:36 +0000
269@@ -27,15 +27,15 @@
270 #include "store/api/collection.h"
271 #include "store/api/update_consts.h"
272
273-#include "store/naive/store_defs.h"
274-#include "store/naive/simple_store.h"
275-#include "store/naive/nsbindings.h"
276-#include "store/naive/node_items.h"
277-#include "store/naive/pul_primitives.h"
278-#include "store/naive/simple_pul.h"
279-#include "store/naive/atomic_items.h"
280-#include "store/naive/simple_item_factory.h"
281-#include "store/naive/node_factory.h"
282+#include "store_defs.h"
283+#include "simple_store.h"
284+#include "nsbindings.h"
285+#include "node_items.h"
286+#include "pul_primitives.h"
287+#include "simple_pul.h"
288+#include "atomic_items.h"
289+#include "simple_item_factory.h"
290+#include "node_factory.h"
291
292 #include "store/api/validator.h"
293
294
295=== modified file 'src/store/naive/nsbindings.cpp'
296--- src/store/naive/nsbindings.cpp 2012-01-11 17:30:25 +0000
297+++ src/store/naive/nsbindings.cpp 2012-02-02 14:45:36 +0000
298@@ -16,7 +16,7 @@
299 #include "stdafx.h"
300
301 #include "zorbautils/fatal.h"
302-#include "store/naive/nsbindings.h"
303+#include "nsbindings.h"
304 #include "diagnostics/xquery_diagnostics.h"
305 #include "diagnostics/dict.h"
306 #include "zorbamisc/ns_consts.h"
307
308=== modified file 'src/store/naive/ordpath.cpp'
309--- src/store/naive/ordpath.cpp 2011-10-14 13:52:43 +0000
310+++ src/store/naive/ordpath.cpp 2012-02-02 14:45:36 +0000
311@@ -22,8 +22,8 @@
312 #include "diagnostics/xquery_diagnostics.h"
313 #include "diagnostics/assert.h"
314
315-#include "store/naive/ordpath.h"
316-#include "store/naive/store_defs.h"
317+#include "ordpath.h"
318+#include "store_defs.h"
319
320
321 namespace zorba { namespace simplestore {
322
323=== modified file 'src/store/naive/properties.cpp'
324--- src/store/naive/properties.cpp 2011-06-14 17:26:33 +0000
325+++ src/store/naive/properties.cpp 2012-02-02 14:45:36 +0000
326@@ -20,7 +20,7 @@
327 #include <sstream>
328 #include <cstdlib>
329
330-#include "store/naive/properties.h"
331+#include "properties.h"
332
333
334 #define CONFIG_FOLDER "zorba"
335
336=== modified file 'src/store/naive/pul_primitive_factory.cpp'
337--- src/store/naive/pul_primitive_factory.cpp 2011-10-12 20:59:49 +0000
338+++ src/store/naive/pul_primitive_factory.cpp 2012-02-02 14:45:36 +0000
339@@ -15,9 +15,9 @@
340 */
341 #include "stdafx.h"
342
343-#include "store/naive/pul_primitive_factory.h"
344-#include "store/naive/pul_primitives.h"
345-#include "store/naive/simple_collection.h"
346+#include "pul_primitive_factory.h"
347+#include "pul_primitives.h"
348+#include "simple_collection.h"
349
350 namespace zorba { namespace simplestore {
351
352
353=== modified file 'src/store/naive/pul_primitives.cpp'
354--- src/store/naive/pul_primitives.cpp 2011-11-02 17:19:09 +0000
355+++ src/store/naive/pul_primitives.cpp 2012-02-02 14:45:36 +0000
356@@ -17,18 +17,18 @@
357
358 #include <exception>
359
360-#include "store/naive/shared_types.h"
361-#include "store/naive/store_defs.h"
362-#include "store/naive/simple_store.h"
363-#include "store/naive/simple_pul.h"
364-#include "store/naive/pul_primitives.h"
365-#include "store/naive/node_items.h"
366-#include "store/naive/atomic_items.h"
367-#include "store/naive/simple_collection.h"
368-#include "store/naive/simple_item_factory.h"
369-#include "store/naive/node_factory.h"
370-#include "store/naive/simple_index.h"
371-#include "store/naive/simple_index_value.h"
372+#include "shared_types.h"
373+#include "store_defs.h"
374+#include "simple_store.h"
375+#include "simple_pul.h"
376+#include "pul_primitives.h"
377+#include "node_items.h"
378+#include "atomic_items.h"
379+#include "simple_collection.h"
380+#include "simple_item_factory.h"
381+#include "node_factory.h"
382+#include "simple_index.h"
383+#include "simple_index_value.h"
384
385 #include "store/api/iterator.h"
386 #include "store/api/copymode.h"
387
388=== modified file 'src/store/naive/qname_pool.cpp'
389--- src/store/naive/qname_pool.cpp 2012-01-24 11:24:56 +0000
390+++ src/store/naive/qname_pool.cpp 2012-02-02 14:45:36 +0000
391@@ -18,12 +18,12 @@
392 #include "diagnostics/assert.h"
393 #include "system/globalenv.h"
394
395-#include "store/naive/string_pool.h"
396-#include "store/naive/qname_pool.h"
397-#include "store/naive/atomic_items.h"
398-#include "store/naive/simple_store.h"
399-#include "store/naive/store_defs.h"
400-#include "store/naive/node_items.h"
401+#include "string_pool.h"
402+#include "qname_pool.h"
403+#include "atomic_items.h"
404+#include "simple_store.h"
405+#include "store_defs.h"
406+#include "node_items.h"
407 #include "store/api/collection.h"
408 #include "zorbatypes/datetime.h"
409 #include "util/string_util.h"
410
411=== modified file 'src/store/naive/simple_collection.cpp'
412--- src/store/naive/simple_collection.cpp 2012-01-15 09:18:22 +0000
413+++ src/store/naive/simple_collection.cpp 2012-02-02 14:45:36 +0000
414@@ -18,14 +18,14 @@
415 #include "diagnostics/assert.h"
416 #include "diagnostics/xquery_diagnostics.h"
417
418-#include "store/naive/simple_collection.h"
419-#include "store/naive/simple_index.h"
420+#include "simple_collection.h"
421+#include "simple_index.h"
422 #include "store/api/ic.h"
423 #include "store/api/annotation.h"
424-#include "store/naive/loader.h"
425-#include "store/naive/simple_store.h"
426-#include "store/naive/store_defs.h"
427-#include "store/naive/node_items.h"
428+#include "loader.h"
429+#include "simple_store.h"
430+#include "store_defs.h"
431+#include "node_items.h"
432 #include "zorbatypes/numconversions.h"
433
434 namespace zorba { namespace simplestore {
435
436=== modified file 'src/store/naive/simple_index.cpp'
437--- src/store/naive/simple_index.cpp 2012-01-11 17:30:25 +0000
438+++ src/store/naive/simple_index.cpp 2012-02-02 14:45:36 +0000
439@@ -21,11 +21,11 @@
440 #include "diagnostics/util_macros.h"
441
442 #include "store/api/item.h"
443-#include "store/naive/store_defs.h"
444-#include "store/naive/simple_index.h"
445-//#include "store/naive/simple_index_general.h"
446-#include "store/naive/atomic_items.h"
447-#include "store/naive/simple_store.h"
448+#include "store_defs.h"
449+#include "simple_index.h"
450+//#include "simple_index_general.h"
451+#include "atomic_items.h"
452+#include "simple_store.h"
453
454 #include <algorithm>
455
456
457=== modified file 'src/store/naive/simple_index_general.cpp'
458--- src/store/naive/simple_index_general.cpp 2012-01-10 10:52:15 +0000
459+++ src/store/naive/simple_index_general.cpp 2012-02-02 14:45:36 +0000
460@@ -15,10 +15,10 @@
461 */
462 #include "stdafx.h"
463
464-#include "store/naive/simple_index_general.h"
465-#include "store/naive/simple_store.h"
466-#include "store/naive/atomic_items.h"
467-#include "store/naive/simple_item_factory.h"
468+#include "simple_index_general.h"
469+#include "simple_store.h"
470+#include "atomic_items.h"
471+#include "simple_item_factory.h"
472
473 #include "diagnostics/assert.h"
474 #include "diagnostics/util_macros.h"
475
476=== modified file 'src/store/naive/simple_index_value.cpp'
477--- src/store/naive/simple_index_value.cpp 2012-01-11 17:30:25 +0000
478+++ src/store/naive/simple_index_value.cpp 2012-02-02 14:45:36 +0000
479@@ -17,7 +17,7 @@
480
481 #include <algorithm>
482
483-#include "store/naive/simple_index_value.h"
484+#include "simple_index_value.h"
485
486 #include "diagnostics/xquery_diagnostics.h"
487 #include "diagnostics/util_macros.h"
488
489=== modified file 'src/store/naive/simple_item_factory.cpp'
490--- src/store/naive/simple_item_factory.cpp 2011-12-21 14:40:33 +0000
491+++ src/store/naive/simple_item_factory.cpp 2012-02-02 14:45:36 +0000
492@@ -22,17 +22,17 @@
493
494 //#include "zorbatypes/datetime.h"
495
496-#include "store/naive/store_defs.h"
497-#include "store/naive/simple_store.h"
498-#include "store/naive/simple_item_factory.h"
499-#include "store/naive/atomic_items.h"
500-#include "store/naive/node_items.h"
501-#include "store/naive/node_iterators.h"
502-#include "store/naive/simple_temp_seq.h"
503-#include "store/naive/simple_pul.h"
504-#include "store/naive/qname_pool.h"
505-#include "store/naive/string_pool.h"
506-#include "store/naive/node_factory.h"
507+#include "store_defs.h"
508+#include "simple_store.h"
509+#include "simple_item_factory.h"
510+#include "atomic_items.h"
511+#include "node_items.h"
512+#include "node_iterators.h"
513+#include "simple_temp_seq.h"
514+#include "simple_pul.h"
515+#include "qname_pool.h"
516+#include "string_pool.h"
517+#include "node_factory.h"
518
519 #include "util/ascii_util.h"
520
521
522=== modified file 'src/store/naive/simple_iterator_factory.cpp'
523--- src/store/naive/simple_iterator_factory.cpp 2011-06-14 17:26:33 +0000
524+++ src/store/naive/simple_iterator_factory.cpp 2012-02-02 14:45:36 +0000
525@@ -16,12 +16,12 @@
526
527 #include "stdafx.h"
528
529-#include "store/naive/simple_iterator_factory.h"
530-#include "store/naive/node_iterators.h"
531-#include "store/naive/simple_temp_seq.h"
532-#include "store/naive/simple_index.h"
533-#include "store/naive/simple_index_value.h"
534-#include "store/naive/simple_index_general.h"
535+#include "simple_iterator_factory.h"
536+#include "node_iterators.h"
537+#include "simple_temp_seq.h"
538+#include "simple_index.h"
539+#include "simple_index_value.h"
540+#include "simple_index_general.h"
541
542
543 namespace zorba { namespace simplestore {
544
545=== modified file 'src/store/naive/simple_lazy_temp_seq.cpp'
546--- src/store/naive/simple_lazy_temp_seq.cpp 2011-12-21 14:40:33 +0000
547+++ src/store/naive/simple_lazy_temp_seq.cpp 2012-02-02 14:45:36 +0000
548@@ -21,7 +21,7 @@
549 #include "diagnostics/util_macros.h"
550
551 #include "store/api/item.h"
552-#include "store/naive/simple_lazy_temp_seq.h"
553+#include "simple_lazy_temp_seq.h"
554
555
556 namespace zorba
557
558=== modified file 'src/store/naive/simple_pul.cpp'
559--- src/store/naive/simple_pul.cpp 2011-10-30 00:18:34 +0000
560+++ src/store/naive/simple_pul.cpp 2012-02-02 14:45:36 +0000
561@@ -19,16 +19,16 @@
562
563 #include "diagnostics/xquery_diagnostics.h"
564
565-#include "store/naive/store_defs.h"
566-#include "store/naive/simple_store.h"
567-#include "store/naive/simple_collection.h"
568-#include "store/naive/simple_index_value.h"
569-#include "store/naive/simple_pul.h"
570-#include "store/naive/pul_primitives.h"
571-#include "store/naive/node_items.h"
572-#include "store/naive/atomic_items.h"
573-#include "store/naive/pul_primitive_factory.h"
574-#include "store/naive/node_factory.h"
575+#include "store_defs.h"
576+#include "simple_store.h"
577+#include "simple_collection.h"
578+#include "simple_index_value.h"
579+#include "simple_pul.h"
580+#include "pul_primitives.h"
581+#include "node_items.h"
582+#include "atomic_items.h"
583+#include "pul_primitive_factory.h"
584+#include "node_factory.h"
585
586 #include "store/api/iterator.h"
587 #include "store/api/item_factory.h"
588
589=== modified file 'src/store/naive/simple_store.cpp'
590--- src/store/naive/simple_store.cpp 2012-01-14 22:52:27 +0000
591+++ src/store/naive/simple_store.cpp 2012-02-02 14:45:36 +0000
592@@ -31,31 +31,31 @@
593 #include "store/api/pul.h"
594 #include "store/api/xs_type_codes.h"
595
596-#include "store/naive/properties.h"
597-#include "store/naive/string_pool.h"
598-#include "store/naive/simple_store.h"
599-#include "store/naive/simple_temp_seq.h"
600-#include "store/naive/simple_lazy_temp_seq.h"
601-#include "store/naive/simple_collection.h"
602-#include "store/naive/collection_set.h"
603-#include "store/naive/simple_index.h"
604-#include "store/naive/simple_index_value.h"
605-#include "store/naive/simple_index_general.h"
606-#include "store/naive/simple_ic.h"
607-#include "store/naive/qname_pool.h"
608-#include "store/naive/loader.h"
609-#include "store/naive/store_defs.h"
610-#include "store/naive/node_items.h"
611-#include "store/naive/dataguide.h"
612-#include "store/naive/node_iterators.h"
613-#include "store/naive/simple_item_factory.h"
614-#include "store/naive/simple_iterator_factory.h"
615-#include "store/naive/query_context.h"
616-#include "store/naive/item_iterator.h"
617-#include "store/naive/node_factory.h"
618-#include "store/naive/name_iterator.h"
619-#include "store/naive/document_name_iterator.h"
620-#include "store/naive/pul_primitive_factory.h"
621+#include "properties.h"
622+#include "string_pool.h"
623+#include "simple_store.h"
624+#include "simple_temp_seq.h"
625+#include "simple_lazy_temp_seq.h"
626+#include "simple_collection.h"
627+#include "collection_set.h"
628+#include "simple_index.h"
629+#include "simple_index_value.h"
630+#include "simple_index_general.h"
631+#include "simple_ic.h"
632+#include "qname_pool.h"
633+#include "loader.h"
634+#include "store_defs.h"
635+#include "node_items.h"
636+#include "dataguide.h"
637+#include "node_iterators.h"
638+#include "simple_item_factory.h"
639+#include "simple_iterator_factory.h"
640+#include "query_context.h"
641+#include "item_iterator.h"
642+#include "node_factory.h"
643+#include "name_iterator.h"
644+#include "document_name_iterator.h"
645+#include "pul_primitive_factory.h"
646
647 #include "util/cxx_util.h"
648 #include "util/uuid/uuid.h"
649
650=== modified file 'src/store/naive/simple_temp_seq.cpp'
651--- src/store/naive/simple_temp_seq.cpp 2012-01-11 17:30:25 +0000
652+++ src/store/naive/simple_temp_seq.cpp 2012-02-02 14:45:36 +0000
653@@ -21,7 +21,7 @@
654 #include "diagnostics/util_macros.h"
655
656 #include "store/api/item.h"
657-#include "store/naive/simple_temp_seq.h"
658+#include "simple_temp_seq.h"
659 #include "store/api/copymode.h"
660
661 namespace zorba { namespace simplestore {
662
663=== modified file 'src/store/naive/string_pool.cpp'
664--- src/store/naive/string_pool.cpp 2011-06-14 17:26:33 +0000
665+++ src/store/naive/string_pool.cpp 2012-02-02 14:45:36 +0000
666@@ -17,7 +17,7 @@
667
668 #include "zorbautils/fatal.h"
669 #include "util/string_util.h"
670-#include "store/naive/string_pool.h"
671+#include "string_pool.h"
672
673 namespace zorba { namespace simplestore {
674

Subscribers

People subscribed via source and target branches