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
=== modified file 'src/store/naive/atomic_items.cpp'
--- src/store/naive/atomic_items.cpp 2012-01-26 19:56:14 +0000
+++ src/store/naive/atomic_items.cpp 2012-02-02 14:45:36 +0000
@@ -32,14 +32,14 @@
32#include "store/api/store.h"32#include "store/api/store.h"
33#include "store/api/item_factory.h"33#include "store/api/item_factory.h"
34#include "store/api/collection.h"34#include "store/api/collection.h"
35#include "store/naive/qname_pool.h"35#include "qname_pool.h"
36#include "store/naive/simple_store.h"36#include "simple_store.h"
37#include "store/naive/simple_item_factory.h"37#include "simple_item_factory.h"
38#include "store/naive/store_defs.h"38#include "store_defs.h"
39#include "store/naive/item_iterator.h"39#include "item_iterator.h"
40#include "store/naive/node_items.h"40#include "node_items.h"
41#include "store/naive/atomic_items.h"41#include "atomic_items.h"
42#include "store/naive/ordpath.h"42#include "ordpath.h"
4343
44#include "util/ascii_util.h"44#include "util/ascii_util.h"
45#include "util/string_util.h"45#include "util/string_util.h"
4646
=== modified file 'src/store/naive/collection_set.cpp'
--- src/store/naive/collection_set.cpp 2011-10-03 09:18:49 +0000
+++ src/store/naive/collection_set.cpp 2012-02-02 14:45:36 +0000
@@ -15,9 +15,9 @@
15 */15 */
16#include "stdafx.h"16#include "stdafx.h"
1717
18#include "store/naive/collection_set.h"18#include "collection_set.h"
19#include "store/api/iterator.h"19#include "store/api/iterator.h"
20#include "store/naive/name_iterator.h"20#include "name_iterator.h"
2121
22namespace zorba { namespace simplestore {22namespace zorba { namespace simplestore {
2323
2424
=== modified file 'src/store/naive/dataguide.cpp'
--- src/store/naive/dataguide.cpp 2011-07-12 20:15:01 +0000
+++ src/store/naive/dataguide.cpp 2012-02-02 14:45:36 +0000
@@ -16,7 +16,7 @@
16#include "stdafx.h"16#include "stdafx.h"
1717
18#include "zorbautils/fatal.h"18#include "zorbautils/fatal.h"
19#include "store/naive/dataguide.h"19#include "dataguide.h"
2020
2121
22namespace zorba 22namespace zorba
2323
=== modified file 'src/store/naive/inmemorystore.cpp'
--- src/store/naive/inmemorystore.cpp 2011-06-14 17:26:33 +0000
+++ src/store/naive/inmemorystore.cpp 2012-02-02 14:45:36 +0000
@@ -15,9 +15,9 @@
15 */15 */
16#include "stdafx.h"16#include "stdafx.h"
1717
18#include "store/naive/store_manager_impl.h"18#include "store_manager_impl.h"
1919
20#include "store/naive/simple_store.h"20#include "simple_store.h"
2121
22namespace zorba 22namespace zorba
23{ 23{
2424
=== modified file 'src/store/naive/inmemorystorec.cpp'
--- src/store/naive/inmemorystorec.cpp 2011-06-14 17:26:33 +0000
+++ src/store/naive/inmemorystorec.cpp 2012-02-02 14:45:36 +0000
@@ -17,7 +17,7 @@
1717
18#include <zorba/store_manager_c.h>18#include <zorba/store_manager_c.h>
19#include <zorba/store_manager.h>19#include <zorba/store_manager.h>
20#include "store/naive/simple_store.h"20#include "simple_store.h"
2121
22void* 22void*
23create_store()23create_store()
2424
=== modified file 'src/store/naive/item.cpp'
--- src/store/naive/item.cpp 2012-01-26 19:56:14 +0000
+++ src/store/naive/item.cpp 2012-02-02 14:45:36 +0000
@@ -23,9 +23,9 @@
2323
24#include "store/api/item.h"24#include "store/api/item.h"
25#include "store/api/iterator.h"25#include "store/api/iterator.h"
26#include "store/naive/store_defs.h"26#include "store_defs.h"
27#include "store/naive/atomic_items.h"27#include "atomic_items.h"
28#include "store/naive/node_items.h"28#include "node_items.h"
2929
30#include "runtime/function_item/function_item.h"30#include "runtime/function_item/function_item.h"
3131
3232
=== modified file 'src/store/naive/item_iterator.cpp'
--- src/store/naive/item_iterator.cpp 2011-06-14 17:26:33 +0000
+++ src/store/naive/item_iterator.cpp 2012-02-02 14:45:36 +0000
@@ -15,7 +15,7 @@
15 */15 */
16#include "stdafx.h"16#include "stdafx.h"
17#include "store/api/item.h"17#include "store/api/item.h"
18#include "store/naive/item_iterator.h"18#include "item_iterator.h"
19#include "store/api/collection.h"19#include "store/api/collection.h"
2020
21namespace zorba { namespace simplestore {21namespace zorba { namespace simplestore {
2222
=== modified file 'src/store/naive/item_vector.cpp'
--- src/store/naive/item_vector.cpp 2011-06-14 17:26:33 +0000
+++ src/store/naive/item_vector.cpp 2012-02-02 14:45:36 +0000
@@ -18,7 +18,7 @@
18#include <sstream>18#include <sstream>
1919
20#include "store/api/item.h"20#include "store/api/item.h"
21#include "store/naive/item_vector.h"21#include "item_vector.h"
2222
23namespace zorba { namespace simplestore {23namespace zorba { namespace simplestore {
2424
2525
=== modified file 'src/store/naive/loader_dtd.cpp'
--- src/store/naive/loader_dtd.cpp 2012-01-11 17:30:25 +0000
+++ src/store/naive/loader_dtd.cpp 2012-02-02 14:45:36 +0000
@@ -26,17 +26,17 @@
2626
27#include <zorba/store_consts.h>27#include <zorba/store_consts.h>
2828
29#include "store/naive/store_defs.h"29#include "store_defs.h"
30#include "store/naive/string_pool.h"30#include "string_pool.h"
31#include "store/naive/qname_pool.h"31#include "qname_pool.h"
32#include "store/naive/simple_store.h"32#include "simple_store.h"
33#include "store/naive/atomic_items.h"33#include "atomic_items.h"
34#include "store/naive/node_items.h"34#include "node_items.h"
35#include "store/naive/dataguide.h"35#include "dataguide.h"
36#include "store/naive/nsbindings.h"36#include "nsbindings.h"
37#include "store/naive/loader.h"37#include "loader.h"
38#include "store/naive/simple_item_factory.h"38#include "simple_item_factory.h"
39#include "store/naive/node_factory.h"39#include "node_factory.h"
4040
41#include "zorbatypes/datetime.h"41#include "zorbatypes/datetime.h"
42#include "zorbatypes/URI.h"42#include "zorbatypes/URI.h"
4343
=== modified file 'src/store/naive/loader_fast.cpp'
--- src/store/naive/loader_fast.cpp 2012-01-11 17:30:25 +0000
+++ src/store/naive/loader_fast.cpp 2012-02-02 14:45:36 +0000
@@ -23,17 +23,17 @@
2323
24#include <zorba/store_consts.h>24#include <zorba/store_consts.h>
2525
26#include "store/naive/store_defs.h"26#include "store_defs.h"
27#include "store/naive/string_pool.h"27#include "string_pool.h"
28#include "store/naive/qname_pool.h"28#include "qname_pool.h"
29#include "store/naive/simple_store.h"29#include "simple_store.h"
30#include "store/naive/atomic_items.h"30#include "atomic_items.h"
31#include "store/naive/node_items.h"31#include "node_items.h"
32#include "store/naive/dataguide.h"32#include "dataguide.h"
33#include "store/naive/nsbindings.h"33#include "nsbindings.h"
34#include "store/naive/loader.h"34#include "loader.h"
35#include "store/naive/simple_item_factory.h"35#include "simple_item_factory.h"
36#include "store/naive/node_factory.h"36#include "node_factory.h"
3737
38#include "zorbatypes/datetime.h"38#include "zorbatypes/datetime.h"
39#include "zorbatypes/URI.h"39#include "zorbatypes/URI.h"
4040
=== modified file 'src/store/naive/node_factory.cpp'
--- src/store/naive/node_factory.cpp 2012-01-11 17:30:25 +0000
+++ src/store/naive/node_factory.cpp 2012-02-02 14:45:36 +0000
@@ -15,10 +15,10 @@
15 */15 */
16#include "stdafx.h"16#include "stdafx.h"
1717
18#include "store/naive/node_factory.h"18#include "node_factory.h"
19#include "store/naive/node_items.h"19#include "node_items.h"
20#include "store/naive/simple_store.h"20#include "simple_store.h"
21#include "store/naive/store_defs.h"21#include "store_defs.h"
2222
23namespace zorba 23namespace zorba
24{24{
2525
=== modified file 'src/store/naive/node_items.cpp'
--- src/store/naive/node_items.cpp 2012-02-01 14:50:27 +0000
+++ src/store/naive/node_items.cpp 2012-02-02 14:45:36 +0000
@@ -30,18 +30,18 @@
30#include "zorbamisc/ns_consts.h"30#include "zorbamisc/ns_consts.h"
3131
32#include "store/api/copymode.h"32#include "store/api/copymode.h"
33#include "store/naive/atomic_items.h"33#include "atomic_items.h"
34#include "store/naive/node_items.h"34#include "node_items.h"
35#include "store/naive/node_iterators.h"35#include "node_iterators.h"
36#include "store/naive/simple_store.h"36#include "simple_store.h"
37#include "store/naive/simple_collection.h"37#include "simple_collection.h"
38#include "store/naive/simple_item_factory.h"38#include "simple_item_factory.h"
39#include "store/naive/qname_pool.h"39#include "qname_pool.h"
40#include "store/naive/store_defs.h"40#include "store_defs.h"
41#include "store/naive/nsbindings.h"41#include "nsbindings.h"
42#include "store/naive/item_iterator.h"42#include "item_iterator.h"
43#include "store/naive/dataguide.h"43#include "dataguide.h"
44#include "store/naive/node_factory.h"44#include "node_factory.h"
4545
46#include "util/string_util.h"46#include "util/string_util.h"
4747
4848
=== modified file 'src/store/naive/node_iterators.cpp'
--- src/store/naive/node_iterators.cpp 2012-01-11 17:30:25 +0000
+++ src/store/naive/node_iterators.cpp 2012-02-02 14:45:36 +0000
@@ -20,9 +20,9 @@
20#include "diagnostics/assert.h"20#include "diagnostics/assert.h"
21#include "diagnostics/xquery_diagnostics.h"21#include "diagnostics/xquery_diagnostics.h"
2222
23#include "store/naive/node_items.h"23#include "node_items.h"
24#include "store/naive/node_iterators.h"24#include "node_iterators.h"
25#include "store/naive/store_defs.h"25#include "store_defs.h"
2626
27namespace zorba27namespace zorba
28{28{
2929
=== modified file 'src/store/naive/node_updates.cpp'
--- src/store/naive/node_updates.cpp 2012-01-10 10:52:15 +0000
+++ src/store/naive/node_updates.cpp 2012-02-02 14:45:36 +0000
@@ -27,15 +27,15 @@
27#include "store/api/collection.h"27#include "store/api/collection.h"
28#include "store/api/update_consts.h"28#include "store/api/update_consts.h"
2929
30#include "store/naive/store_defs.h"30#include "store_defs.h"
31#include "store/naive/simple_store.h"31#include "simple_store.h"
32#include "store/naive/nsbindings.h"32#include "nsbindings.h"
33#include "store/naive/node_items.h"33#include "node_items.h"
34#include "store/naive/pul_primitives.h"34#include "pul_primitives.h"
35#include "store/naive/simple_pul.h"35#include "simple_pul.h"
36#include "store/naive/atomic_items.h"36#include "atomic_items.h"
37#include "store/naive/simple_item_factory.h"37#include "simple_item_factory.h"
38#include "store/naive/node_factory.h"38#include "node_factory.h"
3939
40#include "store/api/validator.h"40#include "store/api/validator.h"
4141
4242
=== modified file 'src/store/naive/nsbindings.cpp'
--- src/store/naive/nsbindings.cpp 2012-01-11 17:30:25 +0000
+++ src/store/naive/nsbindings.cpp 2012-02-02 14:45:36 +0000
@@ -16,7 +16,7 @@
16#include "stdafx.h"16#include "stdafx.h"
1717
18#include "zorbautils/fatal.h"18#include "zorbautils/fatal.h"
19#include "store/naive/nsbindings.h"19#include "nsbindings.h"
20#include "diagnostics/xquery_diagnostics.h"20#include "diagnostics/xquery_diagnostics.h"
21#include "diagnostics/dict.h"21#include "diagnostics/dict.h"
22#include "zorbamisc/ns_consts.h"22#include "zorbamisc/ns_consts.h"
2323
=== modified file 'src/store/naive/ordpath.cpp'
--- src/store/naive/ordpath.cpp 2011-10-14 13:52:43 +0000
+++ src/store/naive/ordpath.cpp 2012-02-02 14:45:36 +0000
@@ -22,8 +22,8 @@
22#include "diagnostics/xquery_diagnostics.h"22#include "diagnostics/xquery_diagnostics.h"
23#include "diagnostics/assert.h"23#include "diagnostics/assert.h"
2424
25#include "store/naive/ordpath.h"25#include "ordpath.h"
26#include "store/naive/store_defs.h"26#include "store_defs.h"
2727
2828
29namespace zorba { namespace simplestore {29namespace zorba { namespace simplestore {
3030
=== modified file 'src/store/naive/properties.cpp'
--- src/store/naive/properties.cpp 2011-06-14 17:26:33 +0000
+++ src/store/naive/properties.cpp 2012-02-02 14:45:36 +0000
@@ -20,7 +20,7 @@
20#include <sstream>20#include <sstream>
21#include <cstdlib>21#include <cstdlib>
2222
23#include "store/naive/properties.h"23#include "properties.h"
2424
2525
26#define CONFIG_FOLDER "zorba"26#define CONFIG_FOLDER "zorba"
2727
=== modified file 'src/store/naive/pul_primitive_factory.cpp'
--- src/store/naive/pul_primitive_factory.cpp 2011-10-12 20:59:49 +0000
+++ src/store/naive/pul_primitive_factory.cpp 2012-02-02 14:45:36 +0000
@@ -15,9 +15,9 @@
15 */15 */
16#include "stdafx.h"16#include "stdafx.h"
1717
18#include "store/naive/pul_primitive_factory.h"18#include "pul_primitive_factory.h"
19#include "store/naive/pul_primitives.h"19#include "pul_primitives.h"
20#include "store/naive/simple_collection.h"20#include "simple_collection.h"
2121
22namespace zorba { namespace simplestore {22namespace zorba { namespace simplestore {
2323
2424
=== modified file 'src/store/naive/pul_primitives.cpp'
--- src/store/naive/pul_primitives.cpp 2011-11-02 17:19:09 +0000
+++ src/store/naive/pul_primitives.cpp 2012-02-02 14:45:36 +0000
@@ -17,18 +17,18 @@
1717
18#include <exception>18#include <exception>
1919
20#include "store/naive/shared_types.h"20#include "shared_types.h"
21#include "store/naive/store_defs.h"21#include "store_defs.h"
22#include "store/naive/simple_store.h"22#include "simple_store.h"
23#include "store/naive/simple_pul.h"23#include "simple_pul.h"
24#include "store/naive/pul_primitives.h"24#include "pul_primitives.h"
25#include "store/naive/node_items.h"25#include "node_items.h"
26#include "store/naive/atomic_items.h"26#include "atomic_items.h"
27#include "store/naive/simple_collection.h"27#include "simple_collection.h"
28#include "store/naive/simple_item_factory.h"28#include "simple_item_factory.h"
29#include "store/naive/node_factory.h"29#include "node_factory.h"
30#include "store/naive/simple_index.h"30#include "simple_index.h"
31#include "store/naive/simple_index_value.h"31#include "simple_index_value.h"
3232
33#include "store/api/iterator.h"33#include "store/api/iterator.h"
34#include "store/api/copymode.h"34#include "store/api/copymode.h"
3535
=== modified file 'src/store/naive/qname_pool.cpp'
--- src/store/naive/qname_pool.cpp 2012-01-24 11:24:56 +0000
+++ src/store/naive/qname_pool.cpp 2012-02-02 14:45:36 +0000
@@ -18,12 +18,12 @@
18#include "diagnostics/assert.h"18#include "diagnostics/assert.h"
19#include "system/globalenv.h"19#include "system/globalenv.h"
2020
21#include "store/naive/string_pool.h"21#include "string_pool.h"
22#include "store/naive/qname_pool.h"22#include "qname_pool.h"
23#include "store/naive/atomic_items.h"23#include "atomic_items.h"
24#include "store/naive/simple_store.h"24#include "simple_store.h"
25#include "store/naive/store_defs.h"25#include "store_defs.h"
26#include "store/naive/node_items.h"26#include "node_items.h"
27#include "store/api/collection.h"27#include "store/api/collection.h"
28#include "zorbatypes/datetime.h"28#include "zorbatypes/datetime.h"
29#include "util/string_util.h"29#include "util/string_util.h"
3030
=== modified file 'src/store/naive/simple_collection.cpp'
--- src/store/naive/simple_collection.cpp 2012-01-15 09:18:22 +0000
+++ src/store/naive/simple_collection.cpp 2012-02-02 14:45:36 +0000
@@ -18,14 +18,14 @@
18#include "diagnostics/assert.h"18#include "diagnostics/assert.h"
19#include "diagnostics/xquery_diagnostics.h"19#include "diagnostics/xquery_diagnostics.h"
2020
21#include "store/naive/simple_collection.h"21#include "simple_collection.h"
22#include "store/naive/simple_index.h"22#include "simple_index.h"
23#include "store/api/ic.h"23#include "store/api/ic.h"
24#include "store/api/annotation.h"24#include "store/api/annotation.h"
25#include "store/naive/loader.h"25#include "loader.h"
26#include "store/naive/simple_store.h"26#include "simple_store.h"
27#include "store/naive/store_defs.h"27#include "store_defs.h"
28#include "store/naive/node_items.h"28#include "node_items.h"
29#include "zorbatypes/numconversions.h"29#include "zorbatypes/numconversions.h"
3030
31namespace zorba { namespace simplestore {31namespace zorba { namespace simplestore {
3232
=== modified file 'src/store/naive/simple_index.cpp'
--- src/store/naive/simple_index.cpp 2012-01-11 17:30:25 +0000
+++ src/store/naive/simple_index.cpp 2012-02-02 14:45:36 +0000
@@ -21,11 +21,11 @@
21#include "diagnostics/util_macros.h"21#include "diagnostics/util_macros.h"
2222
23#include "store/api/item.h"23#include "store/api/item.h"
24#include "store/naive/store_defs.h"24#include "store_defs.h"
25#include "store/naive/simple_index.h"25#include "simple_index.h"
26//#include "store/naive/simple_index_general.h"26//#include "simple_index_general.h"
27#include "store/naive/atomic_items.h"27#include "atomic_items.h"
28#include "store/naive/simple_store.h"28#include "simple_store.h"
2929
30#include <algorithm>30#include <algorithm>
3131
3232
=== modified file 'src/store/naive/simple_index_general.cpp'
--- src/store/naive/simple_index_general.cpp 2012-01-10 10:52:15 +0000
+++ src/store/naive/simple_index_general.cpp 2012-02-02 14:45:36 +0000
@@ -15,10 +15,10 @@
15 */15 */
16#include "stdafx.h"16#include "stdafx.h"
1717
18#include "store/naive/simple_index_general.h"18#include "simple_index_general.h"
19#include "store/naive/simple_store.h"19#include "simple_store.h"
20#include "store/naive/atomic_items.h"20#include "atomic_items.h"
21#include "store/naive/simple_item_factory.h"21#include "simple_item_factory.h"
2222
23#include "diagnostics/assert.h"23#include "diagnostics/assert.h"
24#include "diagnostics/util_macros.h"24#include "diagnostics/util_macros.h"
2525
=== modified file 'src/store/naive/simple_index_value.cpp'
--- src/store/naive/simple_index_value.cpp 2012-01-11 17:30:25 +0000
+++ src/store/naive/simple_index_value.cpp 2012-02-02 14:45:36 +0000
@@ -17,7 +17,7 @@
1717
18#include <algorithm>18#include <algorithm>
1919
20#include "store/naive/simple_index_value.h"20#include "simple_index_value.h"
2121
22#include "diagnostics/xquery_diagnostics.h"22#include "diagnostics/xquery_diagnostics.h"
23#include "diagnostics/util_macros.h"23#include "diagnostics/util_macros.h"
2424
=== modified file 'src/store/naive/simple_item_factory.cpp'
--- src/store/naive/simple_item_factory.cpp 2011-12-21 14:40:33 +0000
+++ src/store/naive/simple_item_factory.cpp 2012-02-02 14:45:36 +0000
@@ -22,17 +22,17 @@
2222
23//#include "zorbatypes/datetime.h"23//#include "zorbatypes/datetime.h"
2424
25#include "store/naive/store_defs.h"25#include "store_defs.h"
26#include "store/naive/simple_store.h"26#include "simple_store.h"
27#include "store/naive/simple_item_factory.h"27#include "simple_item_factory.h"
28#include "store/naive/atomic_items.h"28#include "atomic_items.h"
29#include "store/naive/node_items.h"29#include "node_items.h"
30#include "store/naive/node_iterators.h"30#include "node_iterators.h"
31#include "store/naive/simple_temp_seq.h"31#include "simple_temp_seq.h"
32#include "store/naive/simple_pul.h"32#include "simple_pul.h"
33#include "store/naive/qname_pool.h"33#include "qname_pool.h"
34#include "store/naive/string_pool.h"34#include "string_pool.h"
35#include "store/naive/node_factory.h"35#include "node_factory.h"
3636
37#include "util/ascii_util.h"37#include "util/ascii_util.h"
3838
3939
=== modified file 'src/store/naive/simple_iterator_factory.cpp'
--- src/store/naive/simple_iterator_factory.cpp 2011-06-14 17:26:33 +0000
+++ src/store/naive/simple_iterator_factory.cpp 2012-02-02 14:45:36 +0000
@@ -16,12 +16,12 @@
1616
17#include "stdafx.h"17#include "stdafx.h"
1818
19#include "store/naive/simple_iterator_factory.h"19#include "simple_iterator_factory.h"
20#include "store/naive/node_iterators.h"20#include "node_iterators.h"
21#include "store/naive/simple_temp_seq.h"21#include "simple_temp_seq.h"
22#include "store/naive/simple_index.h"22#include "simple_index.h"
23#include "store/naive/simple_index_value.h"23#include "simple_index_value.h"
24#include "store/naive/simple_index_general.h"24#include "simple_index_general.h"
2525
2626
27namespace zorba { namespace simplestore {27namespace zorba { namespace simplestore {
2828
=== modified file 'src/store/naive/simple_lazy_temp_seq.cpp'
--- src/store/naive/simple_lazy_temp_seq.cpp 2011-12-21 14:40:33 +0000
+++ src/store/naive/simple_lazy_temp_seq.cpp 2012-02-02 14:45:36 +0000
@@ -21,7 +21,7 @@
21#include "diagnostics/util_macros.h"21#include "diagnostics/util_macros.h"
2222
23#include "store/api/item.h"23#include "store/api/item.h"
24#include "store/naive/simple_lazy_temp_seq.h"24#include "simple_lazy_temp_seq.h"
2525
2626
27namespace zorba27namespace zorba
2828
=== modified file 'src/store/naive/simple_pul.cpp'
--- src/store/naive/simple_pul.cpp 2011-10-30 00:18:34 +0000
+++ src/store/naive/simple_pul.cpp 2012-02-02 14:45:36 +0000
@@ -19,16 +19,16 @@
1919
20#include "diagnostics/xquery_diagnostics.h"20#include "diagnostics/xquery_diagnostics.h"
2121
22#include "store/naive/store_defs.h"22#include "store_defs.h"
23#include "store/naive/simple_store.h"23#include "simple_store.h"
24#include "store/naive/simple_collection.h"24#include "simple_collection.h"
25#include "store/naive/simple_index_value.h"25#include "simple_index_value.h"
26#include "store/naive/simple_pul.h"26#include "simple_pul.h"
27#include "store/naive/pul_primitives.h"27#include "pul_primitives.h"
28#include "store/naive/node_items.h"28#include "node_items.h"
29#include "store/naive/atomic_items.h"29#include "atomic_items.h"
30#include "store/naive/pul_primitive_factory.h"30#include "pul_primitive_factory.h"
31#include "store/naive/node_factory.h"31#include "node_factory.h"
3232
33#include "store/api/iterator.h"33#include "store/api/iterator.h"
34#include "store/api/item_factory.h"34#include "store/api/item_factory.h"
3535
=== modified file 'src/store/naive/simple_store.cpp'
--- src/store/naive/simple_store.cpp 2012-01-14 22:52:27 +0000
+++ src/store/naive/simple_store.cpp 2012-02-02 14:45:36 +0000
@@ -31,31 +31,31 @@
31#include "store/api/pul.h"31#include "store/api/pul.h"
32#include "store/api/xs_type_codes.h"32#include "store/api/xs_type_codes.h"
3333
34#include "store/naive/properties.h"34#include "properties.h"
35#include "store/naive/string_pool.h"35#include "string_pool.h"
36#include "store/naive/simple_store.h"36#include "simple_store.h"
37#include "store/naive/simple_temp_seq.h"37#include "simple_temp_seq.h"
38#include "store/naive/simple_lazy_temp_seq.h"38#include "simple_lazy_temp_seq.h"
39#include "store/naive/simple_collection.h"39#include "simple_collection.h"
40#include "store/naive/collection_set.h"40#include "collection_set.h"
41#include "store/naive/simple_index.h"41#include "simple_index.h"
42#include "store/naive/simple_index_value.h"42#include "simple_index_value.h"
43#include "store/naive/simple_index_general.h"43#include "simple_index_general.h"
44#include "store/naive/simple_ic.h"44#include "simple_ic.h"
45#include "store/naive/qname_pool.h"45#include "qname_pool.h"
46#include "store/naive/loader.h"46#include "loader.h"
47#include "store/naive/store_defs.h"47#include "store_defs.h"
48#include "store/naive/node_items.h"48#include "node_items.h"
49#include "store/naive/dataguide.h"49#include "dataguide.h"
50#include "store/naive/node_iterators.h"50#include "node_iterators.h"
51#include "store/naive/simple_item_factory.h"51#include "simple_item_factory.h"
52#include "store/naive/simple_iterator_factory.h"52#include "simple_iterator_factory.h"
53#include "store/naive/query_context.h"53#include "query_context.h"
54#include "store/naive/item_iterator.h"54#include "item_iterator.h"
55#include "store/naive/node_factory.h"55#include "node_factory.h"
56#include "store/naive/name_iterator.h"56#include "name_iterator.h"
57#include "store/naive/document_name_iterator.h"57#include "document_name_iterator.h"
58#include "store/naive/pul_primitive_factory.h"58#include "pul_primitive_factory.h"
5959
60#include "util/cxx_util.h"60#include "util/cxx_util.h"
61#include "util/uuid/uuid.h"61#include "util/uuid/uuid.h"
6262
=== modified file 'src/store/naive/simple_temp_seq.cpp'
--- src/store/naive/simple_temp_seq.cpp 2012-01-11 17:30:25 +0000
+++ src/store/naive/simple_temp_seq.cpp 2012-02-02 14:45:36 +0000
@@ -21,7 +21,7 @@
21#include "diagnostics/util_macros.h"21#include "diagnostics/util_macros.h"
2222
23#include "store/api/item.h"23#include "store/api/item.h"
24#include "store/naive/simple_temp_seq.h"24#include "simple_temp_seq.h"
25#include "store/api/copymode.h"25#include "store/api/copymode.h"
2626
27namespace zorba { namespace simplestore {27namespace zorba { namespace simplestore {
2828
=== modified file 'src/store/naive/string_pool.cpp'
--- src/store/naive/string_pool.cpp 2011-06-14 17:26:33 +0000
+++ src/store/naive/string_pool.cpp 2012-02-02 14:45:36 +0000
@@ -17,7 +17,7 @@
1717
18#include "zorbautils/fatal.h"18#include "zorbautils/fatal.h"
19#include "util/string_util.h"19#include "util/string_util.h"
20#include "store/naive/string_pool.h"20#include "string_pool.h"
2121
22namespace zorba { namespace simplestore {22namespace zorba { namespace simplestore {
2323

Subscribers

People subscribed via source and target branches