Merge lp:~paul-lucas/zorba/bug-1000478 into lp:zorba

[Paul J. Lucas]

Fixed the build error and also fixed several warnings that are new with Xcode 4.3.2.

Fixed the build error and also fixed several warnings that are new with Xcode 4.3.2.

[Paul J. Lucas (paul-lucas)]

review: Approve

[Matthias Brantner (matthias-brantner)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1000478-2012-05-17T15-00-10.469Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~paul-lucas/zorba/bug-1000478 into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message):
  Validation queue job bug-1000478-2012-05-17T15-00-10.469Z is finished. The
  final status was:

  No tests were run - build or configure step must have failed.

  Not commiting changes.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[lp:~paul-lucas/zorba/bug-1000478]

10851. By Paul J. Lucas on 2012-05-17

Moved #pragmas outside of functions.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1000478-2012-05-17T15-30-06.323Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-1000478-2012-05-17T15-30-06.323Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/runtime/full_text/ft_module_impl.cpp'
--- src/runtime/full_text/ft_module_impl.cpp	2012-05-16 00:52:46 +0000
+++ src/runtime/full_text/ft_module_impl.cpp	2012-05-17 15:26:24 +0000
@@ -423,6 +423,11 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 
+#ifdef __GNUC__
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wbind-to-temporary-copy"
+#endif /* __GNUC__ */
+
 bool ThesaurusLookupIterator::nextImpl( store::Item_t &result,
                                         PlanState &plan_state ) const {
   zstring error_msg;
@@ -517,6 +522,10 @@
   ZORBA_ASSERT( state->tresult_.get() );
 }
 
+#ifdef __GNUC__
+# pragma GCC diagnostic pop
+#endif /* __GNUC__ */
+
 ///////////////////////////////////////////////////////////////////////////////
 
 TokenizeIterator::TokenizeIterator( static_context *sctx, QueryLoc const &loc,

=== modified file 'src/unit_tests/string_instantiate.cpp'
--- src/unit_tests/string_instantiate.cpp	2012-05-03 12:31:51 +0000
+++ src/unit_tests/string_instantiate.cpp	2012-05-17 15:26:24 +0000
@@ -196,63 +196,63 @@
   s1.substr();
   s1.swap( s2 );
 
-  s1 == s2;
-  s1 == ss;
-  ss == s1;
-  s1 == cs;
-  s1 == csc;
-  cs == s1;
-  csc == s1;
-
-  s1 != s2;
-  s1 != ss;
-  ss != s1;
-  s1 != cs;
-  s1 != csc;
-  cs != s1;
-  csc != s1;
-
-  s1 < s2;
-  s1 < ss;
-  ss < s1;
-  s1 < cs;
-  s1 < csc;
-  cs < s1;
-  csc < s1;
-
-  s1 <= s2;
-  s1 <= ss;
-  ss <= s1;
-  s1 <= cs;
-  s1 <= csc;
-  cs <= s1;
-  csc <= s1;
-
-  s1 > s2;
-  s1 > ss;
-  ss > s1;
-  s1 > cs;
-  s1 > csc;
-  cs > s1;
-  csc > s1;
-
-  s1 >= s2;
-  s1 >= ss;
-  ss >= s1;
-  s1 >= cs;
-  s1 >= csc;
-  cs >= s1;
-  csc >= s1;
-
-  s1 + s1;
-  s1 + ss;
-  ss + s1;
-  s1 + cs;
-  s1 + csc;
-  cs + s1;
-  csc + s1;
-  s1 + c;
-  c + s1;
+  (void)(s1 == s2);
+  (void)(s1 == ss);
+  (void)(ss == s1);
+  (void)(s1 == cs);
+  (void)(s1 == csc);
+  (void)(cs == s1);
+  (void)(csc == s1);
+
+  (void)(s1 != s2);
+  (void)(s1 != ss);
+  (void)(ss != s1);
+  (void)(s1 != cs);
+  (void)(s1 != csc);
+  (void)(cs != s1);
+  (void)(csc != s1);
+
+  (void)(s1 < s2);
+  (void)(s1 < ss);
+  (void)(ss < s1);
+  (void)(s1 < cs);
+  (void)(s1 < csc);
+  (void)(cs < s1);
+  (void)(csc < s1);
+
+  (void)(s1 <= s2);
+  (void)(s1 <= ss);
+  (void)(ss <= s1);
+  (void)(s1 <= cs);
+  (void)(s1 <= csc);
+  (void)(cs <= s1);
+  (void)(csc <= s1);
+
+  (void)(s1 > s2);
+  (void)(s1 > ss);
+  (void)(ss > s1);
+  (void)(s1 > cs);
+  (void)(s1 > csc);
+  (void)(cs > s1);
+  (void)(csc > s1);
+
+  (void)(s1 >= s2);
+  (void)(s1 >= ss);
+  (void)(ss >= s1);
+  (void)(s1 >= cs);
+  (void)(s1 >= csc);
+  (void)(cs >= s1);
+  (void)(csc >= s1);
+
+  (void)(s1 + s1);
+  (void)(s1 + ss);
+  (void)(ss + s1);
+  (void)(s1 + cs);
+  (void)(s1 + csc);
+  (void)(cs + s1);
+  (void)(csc + s1);
+  (void)(s1 + c);
+  (void)(c + s1);
 
   cout << s1;
 }
@@ -485,65 +485,65 @@
   u1.swap( s );
   u1.swap( u1 );
 
-  u1 == s;
-  u1 == ss;
-  ss == u1;
-  u1 == cs;
-  u1 == csc;
-  cs == u1;
-  csc == u1;
-
-  u1 != s;
-  u1 != ss;
-  ss != u1;
-  u1 != cs;
-  u1 != csc;
-  cs != u1;
-  csc != u1;
-
-  u1 < s;
-  u1 < ss;
-  ss < u1;
-  u1 < cs;
-  u1 < csc;
-  cs < u1;
-  csc < u1;
-
-  u1 <= s;
-  u1 <= ss;
-  ss <= u1;
-  u1 <= cs;
-  u1 <= csc;
-  cs <= u1;
-  csc <= u1;
-
-  u1 > s;
-  u1 > ss;
-  ss > u1;
-  u1 > cs;
-  u1 > csc;
-  cs > u1;
-  csc > u1;
-
-  u1 >= s;
-  u1 >= ss;
-  ss >= u1;
-  u1 >= cs;
-  u1 >= csc;
-  cs >= u1;
-  csc >= u1;
-
-  u1 + u1;
-  u1 + s;
-  s + u1;
-  u1 + ss;
-  ss + u1;
-  u1 + cs;
-  u1 + csc;
-  cs + u1;
-  csc + u1;
-  u1 + c;
-  c + u1;
+  (void)(u1 == s);
+  (void)(u1 == ss);
+  (void)(ss == u1);
+  (void)(u1 == cs);
+  (void)(u1 == csc);
+  (void)(cs == u1);
+  (void)(csc == u1);
+
+  (void)(u1 != s);
+  (void)(u1 != ss);
+  (void)(ss != u1);
+  (void)(u1 != cs);
+  (void)(u1 != csc);
+  (void)(cs != u1);
+  (void)(csc != u1);
+
+  (void)(u1 < s);
+  (void)(u1 < ss);
+  (void)(ss < u1);
+  (void)(u1 < cs);
+  (void)(u1 < csc);
+  (void)(cs < u1);
+  (void)(csc < u1);
+
+  (void)(u1 <= s);
+  (void)(u1 <= ss);
+  (void)(ss <= u1);
+  (void)(u1 <= cs);
+  (void)(u1 <= csc);
+  (void)(cs <= u1);
+  (void)(csc <= u1);
+
+  (void)(u1 > s);
+  (void)(u1 > ss);
+  (void)(ss > u1);
+  (void)(u1 > cs);
+  (void)(u1 > csc);
+  (void)(cs > u1);
+  (void)(csc > u1);
+
+  (void)(u1 >= s);
+  (void)(u1 >= ss);
+  (void)(ss >= u1);
+  (void)(u1 >= cs);
+  (void)(u1 >= csc);
+  (void)(cs >= u1);
+  (void)(csc >= u1);
+
+  (void)(u1 + u1);
+  (void)(u1 + s);
+  (void)(s + u1);
+  (void)(u1 + ss);
+  (void)(ss + u1);
+  (void)(u1 + cs);
+  (void)(u1 + csc);
+  (void)(cs + u1);
+  (void)(csc + u1);
+  (void)(u1 + c);
+  (void)(c + u1);
 }
 
 ///////////////////////////////////////////////////////////////////////////////

=== modified file 'src/util/fs_util.cpp'
--- src/util/fs_util.cpp	2012-05-03 12:31:51 +0000
+++ src/util/fs_util.cpp	2012-05-17 15:26:24 +0000
@@ -324,7 +324,7 @@
         case DT_DIR: {
           char const *const name = ent_->d_name;
           // skip "." and ".." entries
-          if ( name[0] == '.' && (!name[1] || name[1] == '.' && !name[2]) )
+          if ( name[0] == '.' && (!name[1] || (name[1] == '.' && !name[2])) )
             continue;
           ent_type_ = directory;
           break;

=== modified file 'src/util/string/rstring.h'
--- src/util/string/rstring.h	2012-05-03 12:31:51 +0000
+++ src/util/string/rstring.h	2012-05-17 15:26:24 +0000
@@ -2051,13 +2051,12 @@
 
   string_data data_;
 
-#if defined _MSC_VER || defined CLANG
 //
-// Microsoft's Visual Studio C++ compiler doesn't consider the operator+()
-// functions as friends even though they're declared as such.
+// I currently don't understand why the compiler complains about append_safe()
+// being private within operator+() functions even though they are declared as
+// friends.  For now, just make them "public."
 //
 public:
-#endif
   // RSTRING_APPEND_SAFE_CP_ST_CP_ST_X
   /**
    * Appends one or two C strings with known-valid length parameters.
@@ -2073,9 +2072,7 @@
    */
   void append_safe( const_pointer s1, size_type n1,
                     const_pointer s2 = nullptr, size_type n2 = 0 );
-#if defined _MSC_VER || defined CLANG
 private:
-#endif
 
   /**
    * A version of assign() optimized slightly for when \a n == 1.