Merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Proposed by
Paul J. Lucas
Status: | Merged |
---|---|
Approved by: | Matthias Brantner |
Approved revision: | 10980 |
Merged at revision: | 11019 |
Proposed branch: | lp:~paul-lucas/zorba/pjl-misc |
Merge into: | lp:zorba |
Diff against target: |
101 lines (+36/-11) 3 files modified
include/zorba/config.h.cmake (+10/-0) src/runtime/full_text/ft_module_impl.cpp (+9/-11) src/util/icu_streambuf.cpp (+17/-0) |
To merge this branch: | bzr merge lp:~paul-lucas/zorba/pjl-misc |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Matthias Brantner | Approve | ||
Paul J. Lucas | Approve | ||
Review via email: mp+121978@code.launchpad.net |
Commit message
Suppressed warnings; moved gcc diagnostic push macros to config.h.
Description of the change
Suppressed warnings; moved gcc diagnostic push macros to config.h.
To post a comment you must log in.
/home/mbrantner /zorba/ sandbox/ src/runtime/ full_text/ ft_module_ impl.cpp: 511:33: warning: unknown option after ‘#pragma GCC diagnostic’ kind [-Wpragmas]