From b532fb76356f601dec26411a4d4cc129138cee18 Mon Sep 17 00:00:00 2001 From: Martyn Gigg <martyn.gigg@stfc.ac.uk> Date: Sat, 24 Oct 2015 18:49:35 +0100 Subject: [PATCH] Disable strict aliasing warning on gcc4.4 A known issue with gcc 4.4 & boost optional Refs #14089 --- .../inc/MantidDataObjects/MDEventWorkspace.tcc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Framework/DataObjects/inc/MantidDataObjects/MDEventWorkspace.tcc b/Framework/DataObjects/inc/MantidDataObjects/MDEventWorkspace.tcc index 6a0470c9996..4050994a565 100644 --- a/Framework/DataObjects/inc/MantidDataObjects/MDEventWorkspace.tcc +++ b/Framework/DataObjects/inc/MantidDataObjects/MDEventWorkspace.tcc @@ -9,6 +9,7 @@ #include "MantidKernel/ThreadScheduler.h" #include "MantidKernel/Timer.h" #include "MantidKernel/Utils.h" +#include "MantidKernel/WarningSuppressions.h" #include "MantidDataObjects/MDBoxBase.h" #include "MantidDataObjects/MDBox.h" #include "MantidDataObjects/MDEventWorkspace.h" @@ -22,6 +23,14 @@ #include "MantidKernel/Memory.h" #include "MantidKernel/Exception.h" +// Test for gcc 4.4 +#if __GNUC__ > 4 || \ + (__GNUC__ == 4 && (__GNUC_MINOR__ > 4 || \ + (__GNUC_MINOR__ == 4 && \ + __GNUC_PATCHLEVEL__ > 0))) +GCC_DIAG_OFF(strict-aliasing) +#endif + using namespace Mantid; using namespace Mantid::Kernel; using namespace Mantid::API; -- GitLab