Skip to content

Commit

Permalink
Re #7424. Turn off packing for the Intel compiler.
Browse files Browse the repository at this point in the history
With the present set of member variables it makes no difference and,
for the most recent compiler version, leads to a warning every time the
header is included (which is a lot!).
N.B. The packing also has no effect with gcc but I've left it on there.
  • Loading branch information
RussellTaylor committed Jul 16, 2013
1 parent d9058e7 commit 3691bcf
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDBox.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ namespace Mantid
namespace MDEvents
{

#ifndef __INTEL_COMPILER // As of July 13, the packing has no effect for the Intel compiler and produces a warning
#pragma pack(push, 4) //Ensure the structure is no larger than it needs to
#endif

//===============================================================================================
/** Templated class for a multi-dimensional event "box".
Expand Down Expand Up @@ -182,7 +184,9 @@ namespace MDEvents

};

#ifndef __INTEL_COMPILER
#pragma pack(pop) //Return to default packing size
#endif

//------------------------------------------------------------------------------------------------------------------------------------------------------------
/* Internal TMP class to simplify adding events to the box for events and lean events using single interface*/
Expand Down

0 comments on commit 3691bcf

Please sign in to comment.