comparison procedures.cpp @ 3:42c078b19e9a

* Replace null-pointer hack with use of standard macro offsetof(struct,member)

 //---------------------------------------------------------------------------
 
 #include <math.h>
 #include <string.h>
+#include <stddef.h>
 #include "procedures.h"
 #include "matrix.h"
 #include "opt.h"
 #include "sinest.h"
 

   Returns the number of peaks detected.
 */
 int HxPeak2(double*& hps, double*& vhps, double (*F)(double, void*), double (*dF)(double, void*), double(*ddF)(double, void*), void* params, double st, double en, double epf)
 {
   struct l_hx {int N; union {double B; struct {int k1; int k2;};}; cdouble* x; double dhxpeak; double hxpeak;} *p=(l_hx *)params;
-  int dfshift=int(&((l_hx*)0)->dhxpeak);
-  int fshift=int(&((l_hx*)0)->hxpeak);
+  int dfshift=offsetof(l_hx, dhxpeak);
+  int fshift=offsetof(l_hx, hxpeak);
   double B=p->B;
   int count=0;
 
   int den=ceil(en), dst=floor(st);
   if (den-dst<3) den++, dst--;

   Returns the integral of f(*, params) over [a, b].
 */
 double Romberg(int n, double(*f)(double, void*), double a, double b, void* params)
 {
   int np=1;
-  double* r1=new double[n+1];.
+  double* r1=new double[n+1];
   double* r2=new double[n+1];
   double h=b-a, *swp;
   r1[1]=h*(f(a, params)+f(b, params))/2;
   for (int i=2; i<=n; i++)
   {