Merge lp:~zorba-coders/zorba/index-default-constructors into lp:zorba

Proposed by Ghislain Fourny
Status: Merged
Approved by: Markos Zaharioudakis
Approved revision: 10691
Merged at revision: 10699
Proposed branch: lp:~zorba-coders/zorba/index-default-constructors
Merge into: lp:zorba
Diff against target: 104 lines (+45/-0)
3 files modified
src/store/naive/simple_index.cpp (+7/-0)
src/store/naive/simple_index_value.cpp (+32/-0)
src/store/naive/simple_index_value.h (+6/-0)
To merge this branch: bzr merge lp:~zorba-coders/zorba/index-default-constructors
Reviewer Review Type Date Requested Status
Markos Zaharioudakis Approve
Matthias Brantner Approve
Review via email: mp+95899@code.launchpad.net

Commit message

Added default constructors for index classes in simple store.

Description of the change

Added default constructors for index classes in simple store.

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

Validation queue job index-default-constructors-2012-03-05T19-29-08.733Z 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 Approve, 2 Pending.

Revision history for this message
Markos Zaharioudakis (markos-za) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job index-default-constructors-2012-03-05T21-22-08.351Z 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/simple_index.cpp'
2--- src/store/naive/simple_index.cpp 2012-02-15 10:25:02 +0000
3+++ src/store/naive/simple_index.cpp 2012-03-05 15:33:23 +0000
4@@ -47,6 +47,13 @@
5 /******************************************************************************
6
7 ********************************************************************************/
8+IndexImpl::IndexImpl()
9+{
10+}
11+
12+/******************************************************************************
13+
14+********************************************************************************/
15 IndexImpl::IndexImpl(
16 const store::Item_t& qname,
17 const store::IndexSpecification& spec)
18
19=== modified file 'src/store/naive/simple_index_value.cpp'
20--- src/store/naive/simple_index_value.cpp 2012-02-15 10:25:02 +0000
21+++ src/store/naive/simple_index_value.cpp 2012-03-05 15:33:23 +0000
22@@ -199,6 +199,16 @@
23 /******************************************************************************
24
25 ********************************************************************************/
26+ValueIndex::ValueIndex()
27+ :
28+theCompFunction(0, 0, std::vector<std::string>())
29+{
30+}
31+
32+
33+/******************************************************************************
34+
35+********************************************************************************/
36 ValueIndex::~ValueIndex()
37 {
38 }
39@@ -289,6 +299,17 @@
40 /******************************************************************************
41
42 ********************************************************************************/
43+ValueHashIndex::ValueHashIndex()
44+ :
45+ ValueIndex(),
46+ theMap(theCompFunction, 0, false)
47+{
48+}
49+
50+
51+/******************************************************************************
52+
53+********************************************************************************/
54 ValueHashIndex::~ValueHashIndex()
55 {
56 IndexMap::iterator ite = theMap.begin();
57@@ -559,6 +580,17 @@
58 /******************************************************************************
59
60 ********************************************************************************/
61+ValueTreeIndex::ValueTreeIndex()
62+ :
63+ ValueIndex(),
64+ theMap(theCompFunction)
65+{
66+}
67+
68+
69+/******************************************************************************
70+
71+********************************************************************************/
72 ValueTreeIndex::~ValueTreeIndex()
73 {
74 IndexMap::iterator ite = theMap.begin();
75
76=== modified file 'src/store/naive/simple_index_value.h'
77--- src/store/naive/simple_index_value.h 2012-02-28 20:45:43 +0000
78+++ src/store/naive/simple_index_value.h 2012-03-05 15:33:23 +0000
79@@ -80,6 +80,8 @@
80
81 protected:
82 ValueIndex(const store::Item_t& qname, const store::IndexSpecification& spec);
83+
84+ ValueIndex();
85
86 virtual ~ValueIndex();
87
88@@ -134,6 +136,8 @@
89 ValueHashIndex(
90 const store::Item_t& qname,
91 const store::IndexSpecification& spec);
92+
93+ ValueHashIndex();
94
95 ~ValueHashIndex();
96
97@@ -217,6 +221,8 @@
98 ValueTreeIndex(
99 const store::Item_t& qname,
100 const store::IndexSpecification& spec);
101+
102+ ValueTreeIndex();
103
104 ~ValueTreeIndex();
105

Subscribers

People subscribed via source and target branches