Changeset 834 for sans/XOP_Dev/SANSAnalysis/lib

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.

Location:

sans/XOP_Dev/SANSAnalysis/lib

Files:

• libCylinder.c (modified) (7 diffs)
• libSANSAnalysis.h (modified) (2 diffs)
• libSphere.c (modified) (2 diffs)

sans/XOP_Dev/SANSAnalysis/lib/libCylinder.c

@@ -12 +12 @@
 
 Warning:
-The call to WaveData() below returns a pointer to the middle
+The call to (float*)WaveData() below returns a pointer to the middle
 of an unlocked Macintosh handle. In the unlikely event that your
 calculations could cause memory to move, you should copy the coefficient
@@ -70 +70 @@
 
 Warning:
-The call to WaveData() below returns a pointer to the middle
+The call to (float*)WaveData() below returns a pointer to the middle
 of an unlocked Macintosh handle. In the unlikely event that your
 calculations could cause memory to move, you should copy the coefficient
@@ -152 +152 @@
 
 Warning:
-The call to WaveData() below returns a pointer to the middle
+The call to (float*)WaveData() below returns a pointer to the middle
 of an unlocked Macintosh handle. In the unlikely event that your
 calculations could cause memory to move, you should copy the coefficient
@@ -235 +235 @@
 
 Warning:
-The call to WaveData() below returns a pointer to the middle
+The call to (float*)WaveData() below returns a pointer to the middle
 of an unlocked Macintosh handle. In the unlikely event that your
 calculations could cause memory to move, you should copy the coefficient
@@ -307 +307 @@
 
 Warning:
-The call to WaveData() below returns a pointer to the middle
+The call to (float*)WaveData() below returns a pointer to the middle
 of an unlocked Macintosh handle. In the unlikely event that your
 calculations could cause memory to move, you should copy the coefficient
@@ -396 +396 @@
 
 Warning:
-The call to WaveData() below returns a pointer to the middle
+The call to (float*)WaveData() below returns a pointer to the middle
 of an unlocked Macintosh handle. In the unlikely event that your
 calculations could cause memory to move, you should copy the coefficient
@@ -451 +451 @@
 
 Warning:
-The call to WaveData() below returns a pointer to the middle
+The call to (float*)WaveData() below returns a pointer to the middle
 of an unlocked Macintosh handle. In the unlikely event that your
 calculations could cause memory to move, you should copy the coefficient

sans/XOP_Dev/SANSAnalysis/lib/libSANSAnalysis.h

@@ -157 +157 @@
 // rather than leave it to the whim of the compiler
 /* SRK08
-#include "XOPStructureAlignmentTwoByte.h"
-
+#pragma pack(2)
+ 
 typedef struct {
     double scale;
@@ -182 +182 @@
 } SmearCylinderParameters;
 
-#include "XOPStructureAlignmentReset.h"
+#pragma pack()
 
 /// 1D scattering function

sans/XOP_Dev/SANSAnalysis/lib/libSphere.c

@@ -1057 +1057 @@
  
         Warning:
- The call to WaveData() below returns a pointer to the middle
+ The call to (float*)WaveData() below returns a pointer to the middle
  of an unlocked Macintosh handle. In the unlikely event that your
  calculations could cause memory to move, you should copy the coefficient
@@ -1121 +1121 @@
  //
         Warning:
- The call to WaveData() below returns a pointer to the middle
+ The call to (float*)WaveData() below returns a pointer to the middle
  of an unlocked Macintosh handle. In the unlikely event that your
  calculations could cause memory to move, you should copy the coefficient