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

[Paul J. Lucas]

Suppressed warnings; moved gcc diagnostic push macros to config.h.

Suppressed warnings; moved gcc diagnostic push macros to config.h.

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

10977. By Paul J. Lucas on 2012-08-30

Forgot a file.

[Paul J. Lucas (paul-lucas)]

review: Approve

[Matthias Brantner (matthias-brantner)]

/home/mbrantner/zorba/sandbox/src/runtime/full_text/ft_module_impl.cpp:511:33: warning: unknown option after ‘#pragma GCC diagnostic’ kind [-Wpragmas]

review: Needs Fixing

[Paul J. Lucas (paul-lucas)]

I don't know what compiler you're using, but that line isn't any different than before (that's why it's neither green nor red in the diff).

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

10978. By Paul J. Lucas on 2012-08-30

Tweaked #pragmas.

10979. By Paul J. Lucas on 2012-08-30

More #pragma tweaking.

[Paul J. Lucas (paul-lucas)]

Fixed.

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

10980. By Paul J. Lucas on 2012-08-30

Merge from trunk.

[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/pjl-misc-2012-09-04T04-02-04.988Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job pjl-misc-2012-09-04T04-02-04.988Z is finished. The final status was:

All tests succeeded!

=== modified file 'include/zorba/config.h.cmake'
--- include/zorba/config.h.cmake	2012-08-30 13:45:43 +0000
+++ include/zorba/config.h.cmake	2012-08-30 23:52:21 +0000
@@ -147,6 +147,16 @@
 # define ZORBA_TR1_NS std
 #endif
 
+////////// GCC diagnostics ////////////////////////////////////////////////////
+
+#if defined( __GNUC__ ) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 460)
+# define GCC_GREATER_EQUAL_460 1
+#endif
+
+#if defined( GCC_GREATER_EQUAL_460 ) || defined( __llvm__ )
+# define GCC_PRAGMA_DIAGNOSTIC_PUSH 1
+#endif
+
 ////////// Zorba //////////////////////////////////////////////////////////////
 
 // Version
 
=== modified file 'src/runtime/full_text/ft_module_impl.cpp'
--- src/runtime/full_text/ft_module_impl.cpp	2012-08-30 13:45:43 +0000
+++ src/runtime/full_text/ft_module_impl.cpp	2012-08-30 23:52:21 +0000
@@ -504,18 +504,13 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 
-#if defined( __GNUC__ ) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 460)
-# define GCC_GREATER_EQUAL_460 1
-#endif
-
-#if defined( GCC_GREATER_EQUAL_460 ) || defined( __llvm__ )
-# define GCC_PRAGMA_DIAGNOSTIC_PUSH 1
-#endif
-
-#ifdef GCC_PRAGMA_DIAGNOSTIC_PUSH
-# pragma GCC diagnostic push
+#ifdef __GNUC__
+# ifdef GCC_PRAGMA_DIAGNOSTIC_PUSH
+#   pragma GCC diagnostic push
+# endif /* GCC_PRAGMA_DIAGNOSTIC_PUSH */
+# pragma GCC diagnostic ignored "-Wpragmas"
 # pragma GCC diagnostic ignored "-Wbind-to-temporary-copy"
-#endif /* GCC_PRAGMA_DIAGNOSTIC_PUSH */
+#endif /* __GNUC__ */
 
 bool ThesaurusLookupIterator::nextImpl( store::Item_t &result,
                                         PlanState &plan_state ) const {
@@ -612,6 +607,9 @@
 
 #ifdef GCC_PRAGMA_DIAGNOSTIC_PUSH
 # pragma GCC diagnostic pop
+#else
+# pragma GCC diagnostic warning "-Wbind-to-temporary-copy"
+# pragma GCC diagnostic warning "-Wpragmas"
 #endif /* GCC_PRAGMA_DIAGNOSTIC_PUSH */
 
 ///////////////////////////////////////////////////////////////////////////////
 
=== modified file 'src/util/icu_streambuf.cpp'
--- src/util/icu_streambuf.cpp	2012-08-30 13:45:43 +0000
+++ src/util/icu_streambuf.cpp	2012-08-30 23:52:21 +0000
@@ -25,6 +25,7 @@
 #include <cassert>
 #include <stdexcept>
 
+#include <zorba/config.h>
 #include <zorba/diagnostic_list.h>
 
 #include "diagnostics/assert.h"
@@ -177,6 +178,16 @@
   return c;
 }
 
+#ifdef __GNUC__
+# ifdef GCC_PRAGMA_DIAGNOSTIC_PUSH
+#   pragma GCC diagnostic push
+# endif /* GCC_PRAGMA_DIAGNOSTIC_PUSH */
+//
+// Disables warnings about p.pivot_buf_ + sizeof p.pivot_buf_.
+//
+# pragma GCC diagnostic ignored "-Warray-bounds"
+#endif /* __GNUC__ */
+
 bool icu_streambuf::to_external( char_type const **from,
                                  char_type const *from_end, char **to,
                                  char const *to_end, bool flush ) {
@@ -215,6 +226,12 @@
   return true;
 }
 
+#ifdef GCC_PRAGMA_DIAGNOSTIC_PUSH
+# pragma GCC diagnostic pop
+#else
+# pragma GCC diagnostic warning "-Warray-bounds"
+#endif /* GCC_PRAGMA_DIAGNOSTIC_PUSH */
+
 icu_streambuf::int_type icu_streambuf::underflow() {
 #if ZORBA_DEBUG_ICU_STREAMBUF
   printf( "underflow()\n" );