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/libCylinder.c

    r736 r834  
    1212 
    1313Warning: 
    14 The call to WaveData() below returns a pointer to the middle 
     14The call to (float*)WaveData() below returns a pointer to the middle 
    1515of an unlocked Macintosh handle. In the unlikely event that your 
    1616calculations could cause memory to move, you should copy the coefficient 
     
    7070 
    7171Warning: 
    72 The call to WaveData() below returns a pointer to the middle 
     72The call to (float*)WaveData() below returns a pointer to the middle 
    7373of an unlocked Macintosh handle. In the unlikely event that your 
    7474calculations could cause memory to move, you should copy the coefficient 
     
    152152 
    153153Warning: 
    154 The call to WaveData() below returns a pointer to the middle 
     154The call to (float*)WaveData() below returns a pointer to the middle 
    155155of an unlocked Macintosh handle. In the unlikely event that your 
    156156calculations could cause memory to move, you should copy the coefficient 
     
    235235 
    236236Warning: 
    237 The call to WaveData() below returns a pointer to the middle 
     237The call to (float*)WaveData() below returns a pointer to the middle 
    238238of an unlocked Macintosh handle. In the unlikely event that your 
    239239calculations could cause memory to move, you should copy the coefficient 
     
    307307 
    308308Warning: 
    309 The call to WaveData() below returns a pointer to the middle 
     309The call to (float*)WaveData() below returns a pointer to the middle 
    310310of an unlocked Macintosh handle. In the unlikely event that your 
    311311calculations could cause memory to move, you should copy the coefficient 
     
    396396 
    397397Warning: 
    398 The call to WaveData() below returns a pointer to the middle 
     398The call to (float*)WaveData() below returns a pointer to the middle 
    399399of an unlocked Macintosh handle. In the unlikely event that your 
    400400calculations could cause memory to move, you should copy the coefficient 
     
    451451 
    452452Warning: 
    453 The call to WaveData() below returns a pointer to the middle 
     453The call to (float*)WaveData() below returns a pointer to the middle 
    454454of an unlocked Macintosh handle. In the unlikely event that your 
    455455calculations could cause memory to move, you should copy the coefficient 
Note: See TracChangeset for help on using the changeset viewer.