Paul J. Lucas has proposed merging lp:~zorba-coders/zorba/feature-ft_module into lp:zorba.
Requested reviews: Matthias Brantner (matthias-brantner) Paul J. Lucas (paul-lucas) Related bugs: Bug #944795 in Zorba: "XQDoc doesn't handle & in URLs" https://bugs.launchpad.net/zorba/+bug/944795 For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-ft_module/+merge/106480 Fixed a couple of warnings. -- https://code.launchpad.net/~zorba-coders/zorba/feature-ft_module/+merge/106480 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 2012-05-17 18:16:26 +0000 +++ src/runtime/full_text/ft_module_impl.cpp 2012-05-18 23:24:59 +0000 @@ -423,7 +423,15 @@ /////////////////////////////////////////////////////////////////////////////// -#ifdef __GNUC__ +#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 # pragma GCC diagnostic ignored "-Wbind-to-temporary-copy" #endif /* __GNUC__ */ @@ -522,7 +530,7 @@ ZORBA_ASSERT( state->tresult_.get() ); } -#ifdef __GNUC__ +#ifdef GCC_PRAGMA_DIAGNOSTIC_PUSH # pragma GCC diagnostic pop #endif /* __GNUC__ */ === modified file 'src/util/icu_streambuf.cpp' --- src/util/icu_streambuf.cpp 2012-05-10 04:08:30 +0000 +++ src/util/icu_streambuf.cpp 2012-05-18 23:24:59 +0000 @@ -163,8 +163,12 @@ char_type const *from = &utf8_byte; char ebuf[ Small_External_Buf_Size ], *to = ebuf; +#ifdef NDEBUG + to_external( &from, from + 1, &to, to + sizeof ebuf ); +#else bool const ok = to_external( &from, from + 1, &to, to + sizeof ebuf ); assert( ok ); +#endif /* NDEBUG */ if ( streamsize const n = to - ebuf ) { original()->sputn( ebuf, n ); p_.reset();
-- 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