Zorba

Merge lp:~zorba-coders/zorba/removing-store-naive-in-includes into lp:zorba

  1. removing-store-naive-in-includes
  2. Merge into trunk
Proposed by Ghislain Fourny
Status: Merged
Approved by: Till Westmann
Approved revision: 11013
Merged at revision: 11018
Proposed branch: lp:~zorba-coders/zorba/removing-store-naive-in-includes
Merge into: lp:zorba
Diff against target: 104 lines (+14/-14)
7 files modified
src/store/naive/query_context.cpp (+2/-2)
src/store/naive/simple_index.h (+1/-1)
src/store/naive/simple_pul.h (+1/-1)
src/store/naive/simple_store.cpp (+1/-1)
src/store/naive/simple_store.h (+4/-4)
src/store/naive/tree_id.h (+2/-2)
src/store/naive/tupleimpl.cpp (+3/-3)
To merge this branch: bzr merge lp:~zorba-coders/zorba/removing-store-naive-in-includes
Reviewer Review Type Date Requested Status
Till Westmann Approve
Matthias Brantner Approve
Review via email: mp+122051@code.launchpad.net

Commit message

Removing superfluous store/naive prefixes in store includes.

Description of the change

Removing superfluous store/naive prefixes in store includes.

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/removing-store-naive-in-includes-2012-08-30T12-28-57.303Z/log.html

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

Validation queue job removing-store-naive-in-includes-2012-08-30T12-28-57.303Z 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, Needs Fixing < 1, Pending < 1. Got: 2 Pending.

Revision history for this message
Matthias Brantner (matthias-brantner) :
review: Approve
Revision history for this message
Till Westmann (tillw) :
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/removing-store-naive-in-includes-2012-09-04T03-14-53.501Z/log.html

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

Validation queue job removing-store-naive-in-includes-2012-09-04T03-14-53.501Z 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/query_context.cpp'
2--- src/store/naive/query_context.cpp 2012-08-29 11:12:58 +0000
3+++ src/store/naive/query_context.cpp 2012-08-30 12:30:25 +0000
4@@ -14,8 +14,8 @@
5 * limitations under the License.
6 */
7
8-#include "store/naive/query_context.h"
9-#include "store/naive/node_items.h"
10+#include "query_context.h"
11+#include "node_items.h"
12
13
14 namespace zorba { namespace store {
15
16=== modified file 'src/store/naive/simple_index.h'
17--- src/store/naive/simple_index.h 2012-08-29 11:12:58 +0000
18+++ src/store/naive/simple_index.h 2012-08-30 12:30:25 +0000
19@@ -20,7 +20,7 @@
20 #include "store/api/index.h"
21 #include "store/api/iterator.h"
22
23-#include "store/naive/shared_types.h"
24+#include "shared_types.h"
25
26 #include "zorbautils/hashmap.h"
27
28
29=== modified file 'src/store/naive/simple_pul.h'
30--- src/store/naive/simple_pul.h 2012-08-29 11:12:58 +0000
31+++ src/store/naive/simple_pul.h 2012-08-30 12:30:25 +0000
32@@ -21,7 +21,7 @@
33 #include "shared_types.h"
34
35 #include "store/api/pul.h"
36-#include "store/naive/simple_index.h"
37+#include "simple_index.h"
38
39 #include "zorbautils/hashfun.h"
40 #include "zorbautils/hashmap.h"
41
42=== modified file 'src/store/naive/simple_store.cpp'
43--- src/store/naive/simple_store.cpp 2012-08-29 11:12:58 +0000
44+++ src/store/naive/simple_store.cpp 2012-08-30 12:30:25 +0000
45@@ -34,7 +34,7 @@
46 #include "zorbautils/string_util.h"
47
48 #ifdef ZORBA_WITH_JSON
49-#include "store/naive/json_loader.h"
50+#include "json_loader.h"
51 #endif
52
53
54
55=== modified file 'src/store/naive/simple_store.h'
56--- src/store/naive/simple_store.h 2012-08-29 11:12:58 +0000
57+++ src/store/naive/simple_store.h 2012-08-30 12:30:25 +0000
58@@ -16,11 +16,11 @@
59 #ifndef ZORBA_SIMPLE_STORE
60 #define ZORBA_SIMPLE_STORE
61
62-#include "store/naive/store.h"
63+#include "store.h"
64
65-#include "store/naive/node_factory.h"
66-#include "store/naive/pul_primitive_factory.h"
67-#include "store/naive/tree_id_generator.h"
68+#include "node_factory.h"
69+#include "pul_primitive_factory.h"
70+#include "tree_id_generator.h"
71
72 namespace zorba {
73 namespace simplestore {
74
75=== modified file 'src/store/naive/tree_id.h'
76--- src/store/naive/tree_id.h 2012-03-21 15:03:00 +0000
77+++ src/store/naive/tree_id.h 2012-08-30 12:30:25 +0000
78@@ -16,8 +16,8 @@
79 #ifndef ZORBA_TREE_ID_H
80 #define ZORBA_TREE_ID_H
81
82-#include "store/naive/shared_types.h"
83-#include "store/naive/store_defs.h"
84+#include "shared_types.h"
85+#include "store_defs.h"
86 #include "zorbatypes/zstring.h"
87
88 namespace zorba {
89
90=== modified file 'src/store/naive/tupleimpl.cpp'
91--- src/store/naive/tupleimpl.cpp 2012-08-29 11:12:58 +0000
92+++ src/store/naive/tupleimpl.cpp 2012-08-30 12:30:25 +0000
93@@ -13,9 +13,9 @@
94 * See the License for the specific language governing permissions and
95 * limitations under the License.
96 */
97-#include "store/naive/tupleimpl.h"
98-#include "store/naive/simple_store.h"
99-#include "store/naive/store_defs.h"
100+#include "tupleimpl.h"
101+#include "simple_store.h"
102+#include "store_defs.h"
103
104 namespace zorba {
105

Subscribers

People subscribed via source and target branches