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
It makes no difference and gives a warning. (N.B. there's no difference
with gcc either, only visual c++.)
  • Loading branch information
RussellTaylor committed Jul 16, 2013
1 parent 3691bcf commit f38dc81
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDGridBox.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,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 GRIDDED multi-dimensional event "box".
Expand Down Expand Up @@ -243,9 +245,9 @@ namespace MDEvents

};


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

#endif



Expand Down

0 comments on commit f38dc81

Please sign in to comment.