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

[Paul J. Lucas]

Removed erroneous (?) ZORBA_ASSERT.
Other minor fixes.

Removed erroneous (?) ZORBA_ASSERT.
Other minor fixes.

[Paul J. Lucas (paul-lucas)]

review: Approve

[lp:~paul-lucas/zorba/pjl-misc]

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.

[William Candillon (wcandillon)]

review: Approve

[William Candillon (wcandillon)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2013-06-02T11-59-56.725Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job pjl-misc-2013-06-02T11-59-56.725Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/diagnostics/dict.h'
--- src/diagnostics/dict.h	2013-02-07 17:24:36 +0000
+++ src/diagnostics/dict.h	2013-05-31 14:40:34 +0000
@@ -17,6 +17,8 @@
 #ifndef ZORBA_DIAGNOSTIC_DICT_H
 #define ZORBA_DIAGNOSTIC_DICT_H
 
+#include <zorba/internal/ztd.h>
+
 #include "diagnostics/dict_zed_keys.h"
 
 namespace zorba {
@@ -60,7 +62,8 @@
  * @return Returns the value for the given key or \a key if not found.
  */
 template<class StringType> inline
-char const* lookup( StringType const &key ) {
+typename std::enable_if<ZORBA_HAS_C_STR(StringType),char const*>::type
+lookup( StringType const &key ) {
   return lookup( key.c_str() );
 }
 
 
=== modified file 'src/runtime/full_text/ft_module_impl.cpp'
--- src/runtime/full_text/ft_module_impl.cpp	2013-05-08 20:14:47 +0000
+++ src/runtime/full_text/ft_module_impl.cpp	2013-05-31 14:40:34 +0000
@@ -605,7 +605,6 @@
       state->phrase_, state->relationship_, state->at_least_, state->at_most_
     )
   );
-  ZORBA_ASSERT( state->tresult_.get() );
 }
 
 #ifndef WIN32
@@ -617,6 +616,7 @@
 # pragma GCC diagnostic warning "-Wpragmas"
 #endif /* GCC_PRAGMA_DIAGNOSTIC_PUSH */
 #endif /* WIN32 */
+
 ///////////////////////////////////////////////////////////////////////////////
 
 bool TokenizeNodeIterator::nextImpl( store::Item_t &result,
 
=== modified file 'src/store/naive/item_vector.cpp'
--- src/store/naive/item_vector.cpp	2013-02-07 17:24:36 +0000
+++ src/store/naive/item_vector.cpp	2013-05-31 14:40:34 +0000
@@ -103,7 +103,7 @@
 zstring ItemVector::show() const
 {
   std::ostringstream res;
-  res << "ItemVector size: " << size() + " [";
+  res << "ItemVector size: " << size() << " [";
 	for ( ulong i = 0; i < size(); i++)
 		res << getItem(i)->show() << ", ";
 	res << "]";
 
=== modified file 'src/util/uri_util.h'
--- src/util/uri_util.h	2013-05-09 00:48:27 +0000
+++ src/util/uri_util.h	2013-05-31 14:40:34 +0000
@@ -31,7 +31,7 @@
 ////////// Scheme /////////////////////////////////////////////////////////////
 
 /**
- * A subset of official IANA-registere URI schemes.
+ * A subset of official IANA-registered URI schemes.
  */
 enum scheme {
   none,