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

Proposed by Paul J. Lucas
Status: Merged
Approved by: Matthias Brantner
Approved revision: 11086
Merged at revision: 11261
Proposed branch: lp:~paul-lucas/zorba/pjl-misc
Merge into: lp:zorba
Diff against target: 24 lines (+2/-1)
2 files modified
src/util/ascii_util.h (+1/-0)
src/util/regex.cpp (+1/-1)
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+150626@code.launchpad.net

Commit message

Now initializing char_range_begin_cooked.

Description of the change

Now initializing char_range_begin_cooked.

To post a comment you must log in.
Revision history for this message
Paul J. Lucas (paul-lucas) :
review: Approve
lp:~paul-lucas/zorba/pjl-misc updated
11086. By Paul J. Lucas

Comment fix.

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 pjl-misc-2013-02-26T20-22-44.852Z 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/util/ascii_util.h'
2--- src/util/ascii_util.h 2012-12-18 18:45:59 +0000
3+++ src/util/ascii_util.h 2013-02-26 18:15:27 +0000
4@@ -777,6 +777,7 @@
5 *
6 * @tparam StringType The string type.
7 * @param s The string.
8+ * @param chars The characters to trim.
9 */
10 template<class StringType> inline
11 void trim_start( StringType &s, char const *chars ) {
12
13=== modified file 'src/util/regex.cpp'
14--- src/util/regex.cpp 2013-02-26 06:50:40 +0000
15+++ src/util/regex.cpp 2013-02-26 18:15:27 +0000
16@@ -135,7 +135,7 @@
17 char c; // current (raw) XQuery char
18 char c_cooked; // current cooked XQuery char
19 char prev_c_cooked = 0; // previous c_cooked
20- char char_range_begin_cooked; // the 'a' in [a-b]
21+ char char_range_begin_cooked = 0; // the 'a' in [a-b]
22
23 bool got_backslash = false;
24 int got_quantifier = 0;

Subscribers

People subscribed via source and target branches