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/SANSAnalysis/lib/libSANSAnalysis.h

    r756 r834  
    157157// rather than leave it to the whim of the compiler 
    158158/* SRK08 
    159 #include "XOPStructureAlignmentTwoByte.h" 
    160  
     159#pragma pack(2) 
     160  
    161161typedef struct { 
    162162    double scale; 
     
    182182} SmearCylinderParameters; 
    183183 
    184 #include "XOPStructureAlignmentReset.h" 
     184#pragma pack() 
    185185 
    186186/// 1D scattering function 
Note: See TracChangeset for help on using the changeset viewer.