fix typo

configure.ac

@@ -20,13 +20,13 @@ dnl
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 
-AC_PROG_CC_C99
+m4_version_prereq(2.70, [AC_PROG_CC], [AC_PROG_CC_C99])
 AC_OPENMP
 
 # add math library
 LIBS="-lm"
 
-AC_PROG_LIBTOOL
+LT_INIT
 
 tmpval=`echo $CFLAGS | grep -c '\-DMULTIARCH'`
 AM_CONDITIONAL([HAVE_MULTIARCH], [test $tmpval -gt 0])

libsharp2/sharp_core_inc.c

@@ -94,7 +94,6 @@ typedef union
   sxdata_s s;
   } sxdata_u;
 
-#if 0
 static inline void Tvnormalize (Tv * restrict val, Tv * restrict scale,
   double maxval)
   {
@@ -115,31 +114,6 @@ static inline void Tvnormalize (Tv * restrict val, Tv * restrict scale,
     mask = vand_mask(vlt(vabs(*val),vfmin),vne(*val,vzero));
     }
   }
-#else
-static inline void Tvnormalize (Tv * restrict val_, Tv * restrict scale_,
-  double maxval)
-  {
-  Tv val=*val_, scale=*scale_;
-  const Tv vfmin=vload(sharp_fsmall*maxval), vfmax=vload(maxval);
-  const Tv vfsmall=vload(sharp_fsmall), vfbig=vload(sharp_fbig);
-  Tm mask = vgt(vabs(val),vfmax);
-  while (vanyTrue(mask))
-    {
-    vmuleq_mask(mask,val,vfsmall);
-    vaddeq_mask(mask,scale,vone);
-    mask = vgt(vabs(val),vfmax);
-    }
-  mask = vand_mask(vlt(vabs(val),vfmin),vne(val,vzero));
-  while (vanyTrue(mask))
-    {
-    vmuleq_mask(mask,val,vfbig);
-    vsubeq_mask(mask,scale,vone);
-    mask = vand_mask(vlt(vabs(val),vfmin),vne(val,vzero));
-    }
-  *val_ = val;
-  *scale_ = scale;
-  }
-#endif
 
 static void mypow(Tv val, int npow, const double * restrict powlimit,
   Tv * restrict resd, Tv * restrict ress)

test/sharp2_testsuite.c

@@ -520,7 +520,7 @@ static void do_sht (sharp_geom_info *ginfo, sharp_alm_info *ainfo,
     {
 #ifdef USE_MPI
     sharp_execute_mpi(MPI_COMM_WORLD,SHARP_MAP2ALM,spin,&alm[itrans*ncomp],&map[itrans*ncomp],ginfo,
-      ainfo,SHARP_DP|SHARP_ADD,&ttm2a,op_&tom2a);
+      ainfo,SHARP_DP|SHARP_ADD,&ttm2a,&tom2a);
 #else
     sharp_execute(SHARP_MAP2ALM,spin,&alm[itrans*ncomp],&map[itrans*ncomp],ginfo,ainfo,
       SHARP_DP|SHARP_ADD,&ttm2a,&tom2a);