Ignore:
Timestamp:
Jan 31, 2012 12:13:39 PM (11 years ago)
Author:
srkline
Message:

Changes to the XOP code to upgrade to ToolKit? v6. Changes are the ones outlined in the Appendix A of the TK6 manual. SOme of the XOP support routines and the #pragma for 2-byte structures have changed. Per Howard Rodstein, there is no need to change the c files to cpp. c should work and compile just fine.

These changes work correctly on my mac. Next is to make sure that they work correctly on the two build machines.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sans/XOP_Dev/MonteCarlo/DebyeSpheres.h

    r815 r834  
    1010 
    1111// All structures passed to Igor are two-byte aligned. 
    12 #include "XOPStructureAlignmentTwoByte.h" 
     12#pragma pack(2) 
    1313 
    1414// Parameters passed from Igor to the function, in reverse order of the parameter list 
     
    8585 
    8686 
    87 #include "XOPStructureAlignmentReset.h" 
     87#pragma pack()          // return to default structure packing 
    8888 
    8989 
Note: See TracChangeset for help on using the changeset viewer.