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

Commit message:
Added missing #include.
Other misc changes.

Requested reviews:
  Matthias Brantner (matthias-brantner)
  Paul J. Lucas (paul-lucas)

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

Added missing #include.
Other misc changes.
-- 
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/196806
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'include/zorba/diagnostic.h'
--- include/zorba/diagnostic.h	2013-09-13 23:06:50 +0000
+++ include/zorba/diagnostic.h	2013-11-27 01:20:42 +0000
@@ -21,6 +21,7 @@
 #include <iostream>
 
 #include <zorba/config.h>
+#include <zorba/internal/ztd.h>
 
 namespace zorba {
 namespace diagnostic {
@@ -119,7 +120,8 @@
  * @return Returns \c true only if the QNames are equal.
  */
 template<class StringType> inline
-bool operator==( QName const &q1, StringType const &q2 ) {
+typename std::enable_if<ZORBA_HAS_C_STR(StringType),bool>::type
+operator==( QName const &q1, StringType const &q2 ) {
   return q1 == q2.c_str();
 }
 
@@ -136,7 +138,8 @@
  * @return Returns \c true only if the QNames are equal.
  */
 template<class StringType> inline
-bool operator==( StringType const &q1, QName const &q2 ) {
+typename std::enable_if<ZORBA_HAS_C_STR(StringType),bool>::type
+operator==( StringType const &q1, QName const &q2 ) {
   return q1.c_str() == q2;
 }
 
@@ -197,7 +200,8 @@
  * @return Returns \c true only if the QNames are not equal.
  */
 template<class StringType> inline
-bool operator!=( QName const &q1, StringType const &q2 ) {
+typename std::enable_if<ZORBA_HAS_C_STR(StringType),bool>::type
+operator!=( QName const &q1, StringType const &q2 ) {
   return q1 != q2.c_str();
 }
 
@@ -214,7 +218,8 @@
  * @return Returns \c true only if the QNames are not equal.
  */
 template<class StringType> inline
-bool operator!=( StringType const &q1, QName const &q2 ) {
+typename std::enable_if<ZORBA_HAS_C_STR(StringType),bool>::type
+operator!=( StringType const &q1, QName const &q2 ) {
   return q1.c_str() != q2;
 }
 

=== modified file 'include/zorba/internal/ztd.h'
--- include/zorba/internal/ztd.h	2013-06-15 18:20:15 +0000
+++ include/zorba/internal/ztd.h	2013-11-27 01:20:42 +0000
@@ -172,7 +172,7 @@
  * \internal
  * Gets the \c char* to the given string.
  * 
- * @tparam OutputStringType The string's type.
+ * @tparam StringType The string's type.
  * @param s The string to get the \c char* of.
  * @return Returns said \c char*.
  */

=== modified file 'src/api/staticcontextimpl.cpp'
--- src/api/staticcontextimpl.cpp	2013-10-04 17:30:57 +0000
+++ src/api/staticcontextimpl.cpp	2013-11-27 01:20:42 +0000
@@ -39,6 +39,7 @@
 #include "api/staticcollectionmanagerimpl.h"
 #include "api/item_iter_vector.h"
 
+#include "context/dynamic_context.h"
 #include "context/static_context.h"
 #include "context/static_context_consts.h"
 #ifndef ZORBA_NO_FULL_TEXT

=== modified file 'src/runtime/full_text/apply.cpp'
--- src/runtime/full_text/apply.cpp	2013-10-08 00:56:10 +0000
+++ src/runtime/full_text/apply.cpp	2013-11-27 01:20:42 +0000
@@ -66,7 +66,7 @@
 #ifndef NDEBUG
 
 /**
- * An instance of this class is ued to perform RAII (Resource Acquisition Is
+ * An instance of this class is used to perform RAII (Resource Acquisition Is
  * Initialization) to guarantee that the result is printed and that the proper
  * number of "dec_indent" calls are done regardless of how the enclosing
  * function exits.

=== modified file 'src/util/csv_parser.h'
--- src/util/csv_parser.h	2013-08-21 23:52:57 +0000
+++ src/util/csv_parser.h	2013-11-27 01:20:42 +0000
@@ -40,7 +40,7 @@
    * of this character.)
    */
   csv_parser( char sep = ',', char quote = '"' ) {
-    is_ = 0;
+    is_ = nullptr;
     sep_ = sep;
     quote_ = quote_esc_ = quote;
   }
@@ -54,7 +54,7 @@
    * \a quote, then a quote is escaped by doubling it.
    */
   csv_parser( char sep, char quote, char quote_esc ) {
-    is_ = 0;
+    is_ = nullptr;
     sep_ = sep;
     quote_ = quote;
     quote_esc_ = quote_esc;

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to     : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

Reply via email to