Merge lp:~zorba-coders/zorba/bug-1180220-oracle-nosql-db-module into lp:zorba/oracle-nosql-db-module

Proposed by Paul J. Lucas
Status: Merged
Approved by: Matthias Brantner
Approved revision: 26
Merged at revision: 25
Proposed branch: lp:~zorba-coders/zorba/bug-1180220-oracle-nosql-db-module
Merge into: lp:zorba/oracle-nosql-db-module
Diff against target: 40 lines (+3/-6)
2 files modified
src/nosqldb.xq.src/nosqldb.cpp (+2/-1)
src/nosqldb.xq.src/nosqldb.h (+1/-5)
To merge this branch: bzr merge lp:~zorba-coders/zorba/bug-1180220-oracle-nosql-db-module
Reviewer Review Type Date Requested Status
Matthias Brantner Approve
Paul J. Lucas Approve
Review via email: mp+167362@code.launchpad.net

Commit message

Removed unnecessary #include.

Description of the change

Removed unnecessary #include.

To post a comment you must log in.
26. By Paul J. Lucas

Added #include.

Revision history for this message
Paul J. Lucas (paul-lucas) :
review: Approve
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 bug-1180220-oracle-nosql-db-module-2013-06-04T18-48-46.487Z 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/nosqldb.xq.src/nosqldb.cpp'
2--- src/nosqldb.xq.src/nosqldb.cpp 2013-01-09 17:56:22 +0000
3+++ src/nosqldb.xq.src/nosqldb.cpp 2013-06-04 18:23:27 +0000
4@@ -14,9 +14,10 @@
5 * limitations under the License.
6 */
7
8+#include <sstream>
9+
10 #include "nosqldb.h"
11
12-
13 namespace zorba
14 {
15 namespace nosqldb
16
17=== modified file 'src/nosqldb.xq.src/nosqldb.h'
18--- src/nosqldb.xq.src/nosqldb.h 2013-01-09 17:56:22 +0000
19+++ src/nosqldb.xq.src/nosqldb.h 2013-06-04 18:23:27 +0000
20@@ -17,11 +17,8 @@
21 #ifndef NOSQLDB_H
22 #define NOSQLDB_H
23
24-
25-#include <sstream>
26-#include <iostream>
27 #include <cstdlib>
28-#include <list>
29+#include <map>
30
31 #include <zorba/base64.h>
32 #include <zorba/base64_stream.h>
33@@ -30,7 +27,6 @@
34 #include <zorba/function.h>
35 #include <zorba/external_module.h>
36 #include <zorba/user_exception.h>
37-#include <zorba/file.h>
38 #include <zorba/item_factory.h>
39 #include <zorba/serializer.h>
40 #include <zorba/singleton_item_sequence.h>

Subscribers

People subscribed via source and target branches

to all changes: