zorba-coders team mailing list archive

["Paul J. Lucas" <paul@xxxxxxxxxxxxx>]

Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/pjl-misc into lp:zorba.

Commit message:
Removed erroneous (?) ZORBA_ASSERT.

Requested reviews:
  William Candillon (wcandillon)
  Paul J. Lucas (paul-lucas)

For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/166601

Removed erroneous (?) ZORBA_ASSERT.
-- 
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/166601
Your team Zorba Coders is subscribed to branch lp:zorba.

=== 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-30 21:24:31 +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/util/uri_util.h'
--- src/util/uri_util.h	2013-05-09 00:48:27 +0000
+++ src/util/uri_util.h	2013-05-30 21:24:31 +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,