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

Proposed by Paul J. Lucas on 2013-05-30
Status: Merged
Approved by: William Candillon on 2013-06-02
Approved revision: 11232
Merged at revision: 11488
Proposed branch: lp:~paul-lucas/zorba/pjl-misc
Merge into: lp:zorba
Diff against target: 68 lines (+7/-4)
4 files modified
src/diagnostics/dict.h (+4/-1)
src/runtime/full_text/ft_module_impl.cpp (+1/-1)
src/store/naive/item_vector.cpp (+1/-1)
src/util/uri_util.h (+1/-1)
To merge this branch: bzr merge lp:~paul-lucas/zorba/pjl-misc
Reviewer Review Type Date Requested Status
William Candillon 2013-05-30 Approve on 2013-06-02
Paul J. Lucas Approve on 2013-05-30
Review via email: mp+166601@code.launchpad.net

Commit message

Removed erroneous (?) ZORBA_ASSERT.
Other minor fixes.

Description of the change

Removed erroneous (?) ZORBA_ASSERT.
Other minor fixes.

To post a comment you must log in.
Paul J. Lucas (paul-lucas) :
review: Approve
lp:~paul-lucas/zorba/pjl-misc updated on 2013-05-31
11230. By Paul J. Lucas on 2013-05-31

Fixed incorrect use of +.

11231. By Paul J. Lucas on 2013-05-31

Added enable_if.

11232. By Paul J. Lucas on 2013-05-31

Merge from trunk.

review: Approve
review: Approve
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job pjl-misc-2013-06-02T11-59-56.725Z 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/diagnostics/dict.h'
2--- src/diagnostics/dict.h 2013-02-07 17:24:36 +0000
3+++ src/diagnostics/dict.h 2013-05-31 14:40:34 +0000
4@@ -17,6 +17,8 @@
5 #ifndef ZORBA_DIAGNOSTIC_DICT_H
6 #define ZORBA_DIAGNOSTIC_DICT_H
7
8+#include <zorba/internal/ztd.h>
9+
10 #include "diagnostics/dict_zed_keys.h"
11
12 namespace zorba {
13@@ -60,7 +62,8 @@
14 * @return Returns the value for the given key or \a key if not found.
15 */
16 template<class StringType> inline
17-char const* lookup( StringType const &key ) {
18+typename std::enable_if<ZORBA_HAS_C_STR(StringType),char const*>::type
19+lookup( StringType const &key ) {
20 return lookup( key.c_str() );
21 }
22
23
24=== modified file 'src/runtime/full_text/ft_module_impl.cpp'
25--- src/runtime/full_text/ft_module_impl.cpp 2013-05-08 20:14:47 +0000
26+++ src/runtime/full_text/ft_module_impl.cpp 2013-05-31 14:40:34 +0000
27@@ -605,7 +605,6 @@
28 state->phrase_, state->relationship_, state->at_least_, state->at_most_
29 )
30 );
31- ZORBA_ASSERT( state->tresult_.get() );
32 }
33
34 #ifndef WIN32
35@@ -617,6 +616,7 @@
36 # pragma GCC diagnostic warning "-Wpragmas"
37 #endif /* GCC_PRAGMA_DIAGNOSTIC_PUSH */
38 #endif /* WIN32 */
39+
40 ///////////////////////////////////////////////////////////////////////////////
41
42 bool TokenizeNodeIterator::nextImpl( store::Item_t &result,
43
44=== modified file 'src/store/naive/item_vector.cpp'
45--- src/store/naive/item_vector.cpp 2013-02-07 17:24:36 +0000
46+++ src/store/naive/item_vector.cpp 2013-05-31 14:40:34 +0000
47@@ -103,7 +103,7 @@
48 zstring ItemVector::show() const
49 {
50 std::ostringstream res;
51- res << "ItemVector size: " << size() + " [";
52+ res << "ItemVector size: " << size() << " [";
53 for ( ulong i = 0; i < size(); i++)
54 res << getItem(i)->show() << ", ";
55 res << "]";
56
57=== modified file 'src/util/uri_util.h'
58--- src/util/uri_util.h 2013-05-09 00:48:27 +0000
59+++ src/util/uri_util.h 2013-05-31 14:40:34 +0000
60@@ -31,7 +31,7 @@
61 ////////// Scheme /////////////////////////////////////////////////////////////
62
63 /**
64- * A subset of official IANA-registere URI schemes.
65+ * A subset of official IANA-registered URI schemes.
66 */
67 enum scheme {
68 none,

Subscribers

People subscribed via source and target branches