zorba-coders team mailing list archive

[Ghislain Fourny <ghislain.fourny@xxxxxxxxxx>]

Ghislain Fourny has proposed merging lp:~gislenius/zorba/same-directory-store-includes into lp:zorba.

Requested reviews:
  Zorba Coders (zorba-coders)

For more details, see:
https://code.launchpad.net/~gislenius/zorba/same-directory-store-includes/+merge/94216

Makes same-directory store includes in the headers as well.
-- 
https://code.launchpad.net/~gislenius/zorba/same-directory-store-includes/+merge/94216
Your team Zorba Coders is requested to review the proposed merge of lp:~gislenius/zorba/same-directory-store-includes into lp:zorba.

=== modified file 'src/store/naive/atomic_items.h'
--- src/store/naive/atomic_items.h	2012-01-26 19:56:14 +0000
+++ src/store/naive/atomic_items.h	2012-02-22 16:37:21 +0000
@@ -29,18 +29,18 @@
 #include "store/api/item.h"
 #include "store/api/item_handle.h"
 #include "store/api/xs_type_codes.h"
-#include "store/naive/store_defs.h"
-#include "store/naive/shared_types.h"
+#include "store_defs.h"
+#include "shared_types.h"
 
 #ifndef ZORBA_NO_FULL_TEXT
-#include "store/naive/naive_ft_token_iterator.h"
+#include "naive_ft_token_iterator.h"
 #endif /* ZORBA_NO_FULL_TEXT */
 
 #include "zorbatypes/schema_types.h"
 #include "zorbatypes/datetime.h"
 
 #include "diagnostics/xquery_diagnostics.h"
-#include "store/naive/ordpath.h"
+#include "ordpath.h"
 
 
 namespace zorba

=== modified file 'src/store/naive/collection_set.h'
--- src/store/naive/collection_set.h	2011-06-14 17:26:33 +0000
+++ src/store/naive/collection_set.h	2012-02-22 16:37:21 +0000
@@ -17,7 +17,7 @@
 #define ZORBA_SIMPLE_STORE_COLLECTION_SET_H
 
 #include "store/api/shared_types.h"
-#include "store/naive/shared_types.h"
+#include "shared_types.h"
 #include "zorbautils/hashmap_itemp.h"
 #include "store/api/collection.h"
 

=== modified file 'src/store/naive/loader.h'
--- src/store/naive/loader.h	2011-07-15 16:39:51 +0000
+++ src/store/naive/loader.h	2012-02-22 16:37:21 +0000
@@ -22,7 +22,7 @@
 
 #include "store/api/item.h"
 
-#include "store/naive/ordpath.h"
+#include "ordpath.h"
 
 #include "zorbautils/stack.h"
 #include "runtime/parsing_and_serializing/fragment_istream.h"

=== modified file 'src/store/naive/node_factory.h'
--- src/store/naive/node_factory.h	2012-02-15 10:25:02 +0000
+++ src/store/naive/node_factory.h	2012-02-22 16:37:21 +0000
@@ -21,7 +21,7 @@
 #include "zorbamisc/config/platform.h"
 #include "common/shared_types.h"
 
-#include "store/naive/shared_types.h"
+#include "shared_types.h"
 
 
 namespace zorba 

=== modified file 'src/store/naive/node_items.h'
--- src/store/naive/node_items.h	2012-01-26 19:56:14 +0000
+++ src/store/naive/node_items.h	2012-02-22 16:37:21 +0000
@@ -23,16 +23,16 @@
 #include <zorba/config.h>
 #include <zorba/error.h>
 
-#include "store/naive/store_defs.h"
-#include "store/naive/shared_types.h"
-#include "store/naive/text_node_content.h"
-#include "store/naive/item_vector.h"
-#include "store/naive/ordpath.h"
-#include "store/naive/nsbindings.h" // TODO remove by introducing explicit destructors
+#include "store_defs.h"
+#include "shared_types.h"
+#include "text_node_content.h"
+#include "item_vector.h"
+#include "ordpath.h"
+#include "nsbindings.h" // TODO remove by introducing explicit destructors
 
 // Note: whether the EMBEDED_TYPE is defined or not is done in store_defs.h
 #ifndef EMBEDED_TYPE
-#include "store/naive/hashmap_nodep.h"
+#include "hashmap_nodep.h"
 #endif
 
 #ifndef ZORBA_NO_FULL_TEXT

=== modified file 'src/store/naive/node_iterators.h'
--- src/store/naive/node_iterators.h	2012-01-11 17:30:25 +0000
+++ src/store/naive/node_iterators.h	2012-02-22 16:37:21 +0000
@@ -17,8 +17,8 @@
 #define ZORBA_SIMPLE_STORE_NODE_ITERATORS
 
 #include "store/api/iterator.h"
-#include "store/naive/shared_types.h"
-#include "store/naive/node_items.h"
+#include "shared_types.h"
+#include "node_items.h"
 
 #include "zorbautils/hashfun.h"
 #include "zorbautils/hashset_itemh.h"

=== modified file 'src/store/naive/properties.h'
--- src/store/naive/properties.h	2011-06-14 17:26:33 +0000
+++ src/store/naive/properties.h	2012-02-22 16:37:21 +0000
@@ -20,7 +20,7 @@
 #include <fstream>
 #include <vector>
 
-#include "store/naive/store_properties.h"
+#include "store_properties.h"
 
 namespace zorba { namespace store {
 

=== modified file 'src/store/naive/pul_primitive_factory.h'
--- src/store/naive/pul_primitive_factory.h	2011-10-12 20:59:49 +0000
+++ src/store/naive/pul_primitive_factory.h	2012-02-22 16:37:21 +0000
@@ -19,7 +19,7 @@
 #include "common/shared_types.h"
 #include "store/api/update_consts.h"
 #include "store/api/index.h"
-#include "store/naive/shared_types.h"
+#include "shared_types.h"
 
 namespace zorba { namespace simplestore {
 

=== modified file 'src/store/naive/pul_primitives.h'
--- src/store/naive/pul_primitives.h	2011-12-21 14:40:33 +0000
+++ src/store/naive/pul_primitives.h	2012-02-22 16:37:21 +0000
@@ -18,8 +18,8 @@
 
 #include <vector>
 
-#include "store/naive/shared_types.h"
-#include "store/naive/text_node_content.h"
+#include "shared_types.h"
+#include "text_node_content.h"
 #include "store/api/update_consts.h"
 #include "store/api/collection.h"
 #include "store/api/iterator.h"

=== modified file 'src/store/naive/qname_pool.h'
--- src/store/naive/qname_pool.h	2011-11-07 06:04:55 +0000
+++ src/store/naive/qname_pool.h	2012-02-22 16:37:21 +0000
@@ -24,7 +24,7 @@
 #include "common/shared_types.h"
 #include "common/common.h"
 
-#include "store/naive/atomic_items.h"
+#include "atomic_items.h"
 
 namespace zorba { namespace simplestore {
 

=== modified file 'src/store/naive/simple_collection.h'
--- src/store/naive/simple_collection.h	2012-01-15 09:18:22 +0000
+++ src/store/naive/simple_collection.h	2012-02-22 16:37:21 +0000
@@ -16,7 +16,7 @@
 #ifndef ZORBA_STORE_SIMPLE_COLLECTION
 #define ZORBA_STORE_SIMPLE_COLLECTION
 
-#include "store/naive/shared_types.h"
+#include "shared_types.h"
 
 #include "store/api/iterator.h"
 #include "store/api/collection.h"

=== modified file 'src/store/naive/simple_index_general.h'
--- src/store/naive/simple_index_general.h	2012-01-10 10:52:15 +0000
+++ src/store/naive/simple_index_general.h	2012-02-22 16:37:21 +0000
@@ -18,8 +18,8 @@
 
 #include <map>
 
-#include "store/naive/simple_index.h"
-#include "store/naive/store_defs.h"
+#include "simple_index.h"
+#include "store_defs.h"
 
 namespace zorba 
 { 

=== modified file 'src/store/naive/simple_index_value.h'
--- src/store/naive/simple_index_value.h	2012-01-11 17:30:25 +0000
+++ src/store/naive/simple_index_value.h	2012-02-22 16:37:21 +0000
@@ -16,7 +16,7 @@
 #ifndef ZORBA_SIMPLE_STORE_INDEX_HASH_VALUE
 #define ZORBA_SIMPLE_STORE_INDEX_HASH_VALUE
 
-#include "store/naive/simple_index.h"
+#include "simple_index.h"
 #include <map>
 
 namespace zorba

=== modified file 'src/store/naive/simple_item_factory.h'
--- src/store/naive/simple_item_factory.h	2011-12-21 14:40:33 +0000
+++ src/store/naive/simple_item_factory.h	2012-02-22 16:37:21 +0000
@@ -18,7 +18,7 @@
 
 #include <iostream>
 
-#include "store/naive/shared_types.h"
+#include "shared_types.h"
 
 #include "store/api/item_factory.h"
 //#include "store/api/tuples.h"

=== modified file 'src/store/naive/simple_pul.h'
--- src/store/naive/simple_pul.h	2011-10-12 20:59:49 +0000
+++ src/store/naive/simple_pul.h	2012-02-22 16:37:21 +0000
@@ -18,7 +18,7 @@
 
 #include <vector>
 
-#include "store/naive/shared_types.h"
+#include "shared_types.h"
 
 #include "store/api/pul.h"
 #include "store/api/index.h"

=== modified file 'src/store/naive/simple_store.h'
--- src/store/naive/simple_store.h	2012-01-10 10:52:15 +0000
+++ src/store/naive/simple_store.h	2012-02-22 16:37:21 +0000
@@ -16,12 +16,12 @@
 #ifndef ZORBA_SIMPLE_STORE
 #define ZORBA_SIMPLE_STORE
 
-#include "store/naive/shared_types.h"
-#include "store/naive/store_defs.h"
-#include "store/naive/hashmap_nodep.h"
+#include "shared_types.h"
+#include "store_defs.h"
+#include "hashmap_nodep.h"
 
 #if (defined (WIN32) || defined (WINCE))
-#include "store/naive/node_items.h"
+#include "node_items.h"
 #include "store/api/collection.h"
 #include "store/api/index.h"
 #include "store/api/ic.h"

=== modified file 'src/store/naive/store_defs.h'
--- src/store/naive/store_defs.h	2012-01-10 13:54:05 +0000
+++ src/store/naive/store_defs.h	2012-02-22 16:37:21 +0000
@@ -16,7 +16,7 @@
 #ifndef ZORBA_SIMPLE_STORE_STORE_DEFS_H
 #define ZORBA_SIMPLE_STORE_STORE_DEFS_H
 
-#include "store/naive/store_manager_impl.h"
+#include "store_manager_impl.h"
 
 namespace zorba { 
 

=== modified file 'src/store/naive/text_node_content.h'
--- src/store/naive/text_node_content.h	2011-06-14 17:26:33 +0000
+++ src/store/naive/text_node_content.h	2012-02-22 16:37:21 +0000
@@ -19,7 +19,7 @@
 
 #include <cstring>                      /* for memset(3) */
 
-#include "store/naive/shared_types.h"
+#include "shared_types.h"
 
 #include "store/api/item.h"