Skip to content
Snippets Groups Projects
Commit 4dd954d7 authored by Marco Cattaneo's avatar Marco Cattaneo
Browse files

Merge branch 'removeUnsupportedCompilers-2017' into '2017-patches'

Remove ifdefs and link options for Windows, APPLE and ICC, not supported on this branch

See merge request !774
parents ab843b2e 3c37c12c
Branches cherry-pick-3e3553f53c-21.0
No related tags found
1 merge request!774Remove ifdefs and link options for Windows, APPLE and ICC, not supported on this branch
Pipeline #2403771 passed
......@@ -44,6 +44,4 @@ genConf/
QMTest/
test_results/
*-slc[56]-*/
i686-winxp-vc9-dbg/
.*-slc[56]-*.d/
.i686-winxp-vc9-dbg.d/
......@@ -9,15 +9,6 @@
* or submit itself to any jurisdiction. *
\*****************************************************************************/
// ============================================================================
#ifdef __ICC
// ============================================================================
// disable icc remark #1572: floating-point equality and inequality comparisons are unreliable
// The comparisons are meant
// ============================================================================
#pragma warning(disable:1572)
// ============================================================================
#endif
// ============================================================================
// Include files
// ============================================================================
// STD & STL
......
......@@ -14,11 +14,6 @@
// ============================================================================
// Include files
// ============================================================================
#ifdef __INTEL_COMPILER
// non-pointer conversion from "double" to "float" may lose significant bits
#pragma warning(disable:2259)
#endif
// ============================================================================
// GaudiAlg
// ============================================================================
#include "GaudiAlg/Tuple.h"
......
......@@ -18,9 +18,7 @@
// ============================================================================
// Python must always be the first.
#ifndef __APPLE__
# include "Python.h"
#endif // not __APPLE__
#include "Python.h"
// ============================================================================
// Include files
......
......@@ -18,11 +18,6 @@
// ============================================================================
#include "LoKi/LoKiGenMC.h"
// ============================================================================
#ifdef __INTEL_COMPILER // Disable ICC remark
#pragma warning(disable:191) // type qualifier is meaningless on cast type
#pragma warning(disable:177) // variable ... was declared but never referenced
#endif
// ============================================================================
// The END
// ============================================================================
#endif // LOKI_LOKIGENMCDICT_H
......
......@@ -18,14 +18,8 @@
// ============================================================================
#include "LoKi/LoKiPhysMC.h"
#include "LoKi/MCMatcher.h"
// ============================================================================
#include "LoKi/MCMatchDicts.h"
// ============================================================================
#ifdef __INTEL_COMPILER
#pragma warning(disable:177) // variable ... was declared but never referenced
#pragma warning(disable:191) // type qualifier is meaningless on cast type
#endif
// ============================================================================
// The END
// ============================================================================
#endif // LOKI_LOKIPHYSMCDICT_H
......
......@@ -59,14 +59,6 @@
// ============================================================================
namespace
{
// ==========================================================================
// Suppress Intel compiler warnings about missing default constructor
// In this case the compiler generated constructor is fine, since there are
// no member data to be initialised
#ifdef __INTEL_COMPILER
#pragma warning(disable:854)
#pragma warning(push)
#endif
// ==========================================================================
/// validation of decay finder
inline StatusCode _validate
......@@ -100,10 +92,6 @@ namespace
return "Relations/" + loc ;
}
// ==========================================================================
#ifdef __INTEL_COMPILER
#pragma warning(pop)
#endif
// ==========================================================================
} // end of anonymous namespace
// ============================================================================
/* constructor from the decay and MC-truth matching tables
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment