Merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba

Proposed by Paul J. Lucas
Status: Merged
Approved by: Paul J. Lucas
Approved revision: 11387
Merged at revision: 11674
Proposed branch: lp:~paul-lucas/zorba/pjl-misc
Merge into: lp:zorba
Diff against target: 111 lines (+14/-8)
5 files modified
include/zorba/diagnostic.h (+9/-4)
include/zorba/internal/ztd.h (+1/-1)
src/api/staticcontextimpl.cpp (+1/-0)
src/runtime/full_text/apply.cpp (+1/-1)
src/util/csv_parser.h (+2/-2)
To merge this branch: bzr merge lp:~paul-lucas/zorba/pjl-misc
Reviewer Review Type Date Requested Status
Matthias Brantner Approve
Paul J. Lucas Approve
Review via email: mp+196806@code.launchpad.net

Commit message

Added missing #include.
Other misc changes.

Description of the change

Added missing #include.
Other misc changes.

To post a comment you must log in.
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 :

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/196806

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

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

Validation queue result for https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/196806

Stage "AddTestSuitesUbuntu" failed.

Check console output at http://jenkins.lambda.nu/job/AddTestSuitesUbuntu/411/console to view the results.

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

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/196806

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

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

Validation queue succeeded - proposal merged!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'include/zorba/diagnostic.h'
2--- include/zorba/diagnostic.h 2013-09-13 23:06:50 +0000
3+++ include/zorba/diagnostic.h 2013-11-27 01:20:42 +0000
4@@ -21,6 +21,7 @@
5 #include <iostream>
6
7 #include <zorba/config.h>
8+#include <zorba/internal/ztd.h>
9
10 namespace zorba {
11 namespace diagnostic {
12@@ -119,7 +120,8 @@
13 * @return Returns \c true only if the QNames are equal.
14 */
15 template<class StringType> inline
16-bool operator==( QName const &q1, StringType const &q2 ) {
17+typename std::enable_if<ZORBA_HAS_C_STR(StringType),bool>::type
18+operator==( QName const &q1, StringType const &q2 ) {
19 return q1 == q2.c_str();
20 }
21
22@@ -136,7 +138,8 @@
23 * @return Returns \c true only if the QNames are equal.
24 */
25 template<class StringType> inline
26-bool operator==( StringType const &q1, QName const &q2 ) {
27+typename std::enable_if<ZORBA_HAS_C_STR(StringType),bool>::type
28+operator==( StringType const &q1, QName const &q2 ) {
29 return q1.c_str() == q2;
30 }
31
32@@ -197,7 +200,8 @@
33 * @return Returns \c true only if the QNames are not equal.
34 */
35 template<class StringType> inline
36-bool operator!=( QName const &q1, StringType const &q2 ) {
37+typename std::enable_if<ZORBA_HAS_C_STR(StringType),bool>::type
38+operator!=( QName const &q1, StringType const &q2 ) {
39 return q1 != q2.c_str();
40 }
41
42@@ -214,7 +218,8 @@
43 * @return Returns \c true only if the QNames are not equal.
44 */
45 template<class StringType> inline
46-bool operator!=( StringType const &q1, QName const &q2 ) {
47+typename std::enable_if<ZORBA_HAS_C_STR(StringType),bool>::type
48+operator!=( StringType const &q1, QName const &q2 ) {
49 return q1.c_str() != q2;
50 }
51
52
53=== modified file 'include/zorba/internal/ztd.h'
54--- include/zorba/internal/ztd.h 2013-06-15 18:20:15 +0000
55+++ include/zorba/internal/ztd.h 2013-11-27 01:20:42 +0000
56@@ -172,7 +172,7 @@
57 * \internal
58 * Gets the \c char* to the given string.
59 *
60- * @tparam OutputStringType The string's type.
61+ * @tparam StringType The string's type.
62 * @param s The string to get the \c char* of.
63 * @return Returns said \c char*.
64 */
65
66=== modified file 'src/api/staticcontextimpl.cpp'
67--- src/api/staticcontextimpl.cpp 2013-10-04 17:30:57 +0000
68+++ src/api/staticcontextimpl.cpp 2013-11-27 01:20:42 +0000
69@@ -39,6 +39,7 @@
70 #include "api/staticcollectionmanagerimpl.h"
71 #include "api/item_iter_vector.h"
72
73+#include "context/dynamic_context.h"
74 #include "context/static_context.h"
75 #include "context/static_context_consts.h"
76 #ifndef ZORBA_NO_FULL_TEXT
77
78=== modified file 'src/runtime/full_text/apply.cpp'
79--- src/runtime/full_text/apply.cpp 2013-10-08 00:56:10 +0000
80+++ src/runtime/full_text/apply.cpp 2013-11-27 01:20:42 +0000
81@@ -66,7 +66,7 @@
82 #ifndef NDEBUG
83
84 /**
85- * An instance of this class is ued to perform RAII (Resource Acquisition Is
86+ * An instance of this class is used to perform RAII (Resource Acquisition Is
87 * Initialization) to guarantee that the result is printed and that the proper
88 * number of "dec_indent" calls are done regardless of how the enclosing
89 * function exits.
90
91=== modified file 'src/util/csv_parser.h'
92--- src/util/csv_parser.h 2013-08-21 23:52:57 +0000
93+++ src/util/csv_parser.h 2013-11-27 01:20:42 +0000
94@@ -40,7 +40,7 @@
95 * of this character.)
96 */
97 csv_parser( char sep = ',', char quote = '"' ) {
98- is_ = 0;
99+ is_ = nullptr;
100 sep_ = sep;
101 quote_ = quote_esc_ = quote;
102 }
103@@ -54,7 +54,7 @@
104 * \a quote, then a quote is escaped by doubling it.
105 */
106 csv_parser( char sep, char quote, char quote_esc ) {
107- is_ = 0;
108+ is_ = nullptr;
109 sep_ = sep;
110 quote_ = quote;
111 quote_esc_ = quote_esc;

Subscribers

People subscribed via source and target branches