Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix poco 1.6.0 warnings #144

Merged
merged 4 commits into from
Feb 10, 2015
Merged

Fix poco 1.6.0 warnings #144

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8a53dae
Refs #10977. Undefine macros defined by poco
quantumsteve Jan 27, 2015
af586c3
Revert "Refs #10977. Undefine macros defined by poco"
quantumsteve Jan 27, 2015
36b4666
Refs #10977. Simpler way to Undefine macros
quantumsteve Jan 27, 2015
c9e2061
Merge remote-tracking branch 'origin/master' into feature/10977_fix_p…
quantumsteve Jan 27, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions Code/Mantid/Framework/Kernel/inc/MantidKernel/WarningSuppressions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,13 @@
#define GCC_DIAG_DO_PRAGMA(x) _Pragma(#x)
#define GCC_DIAG_PRAGMA(x) GCC_DIAG_DO_PRAGMA(GCC diagnostic x)

// the following were previously defined in Poco/Platform_POSIX.h
#ifdef GCC_DIAG_ON
#undef GCC_DIAG_ON
#endif
#ifdef GCC_DIAG_OFF
#undef GCC_DIAG_OFF
#endif
// define macros for turning the warning suppression on/off
#if GCC_VERSION >= 40600 // 4.6.0
#define GCC_DIAG_OFF(x) \
Expand Down