Make all remaining inline functions that weren't static already stati…

…c to comply with C99 and clang
jobovy · Mar 20, 2018 · 7e1c2fb · 7e1c2fb
1 parent 7a26480
commit 7e1c2fb
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 32 deletions.
diff --git a/galpy/actionAngle_src/actionAngle_c_ext/actionAngleAdiabatic.c b/galpy/actionAngle_src/actionAngle_c_ext/actionAngleAdiabatic.c
@@ -60,17 +60,17 @@ double evaluateVerticalPotentials(double, double,int, struct potentialArg *);
 /*
   Actual functions, inlines first
 */
-inline void calcEREzL(int ndata,
-		      double *R,
-		      double *vR,
-		      double *vT,
-		      double *z,
-		      double *vz,
-		      double *ER,
-		      double *Ez,
-		      double *Lz,
-		      int nargs,
-		      struct potentialArg * actionAngleArgs){
+static inline void calcEREzL(int ndata,
+			     double *R,
+			     double *vR,
+			     double *vT,
+			     double *z,
+			     double *vz,
+			     double *ER,
+			     double *Ez,
+			     double *Lz,
+			     int nargs,
+			     struct potentialArg * actionAngleArgs){
   int ii;
   UNUSED int chunk= CHUNKSIZE;
 #pragma omp parallel for schedule(static,chunk) private(ii)

diff --git a/galpy/actionAngle_src/actionAngle_c_ext/actionAngleStaeckel.c b/galpy/actionAngle_src/actionAngle_c_ext/actionAngleStaeckel.c
@@ -165,17 +165,18 @@ double evaluatePotentialsUV(double,double,double,int,struct potentialArg *);
 /*
   Actual functions, inlines first
 */
-inline void uv_to_Rz(double u, double v, double * R, double *z,double delta){
+static inline void uv_to_Rz(double u, double v, double * R, double *z,
+			    double delta){
   *R= delta * sinh(u) * sin(v);
   *z= delta * cosh(u) * cos(v);
 }
-inline void Rz_to_uv_vec(int ndata,
-			 double *R,
-			 double *z,
-			 double *u,
-			 double *v,
-			 int ndelta,
-			 double * delta){
+static inline void Rz_to_uv_vec(int ndata,
+				double *R,
+				double *z,
+				double *u,
+				double *v,
+				int ndelta,
+				double * delta){
   int ii;
   double d12, d22, coshu, cosv,tdelta;
   int delta_stride= ndelta == 1 ? 0 : 1;
@@ -191,16 +192,16 @@ inline void Rz_to_uv_vec(int ndata,
   u-= ndata;
   v-= ndata;
 }
-inline void calcEL(int ndata,
-		   double *R,
-		   double *vR,
-		   double *vT,
-		   double *z,
-		   double *vz,
-		   double *E,
-		   double *Lz,
-		   int nargs,
-		   struct potentialArg * actionAngleArgs){
+static inline void calcEL(int ndata,
+			  double *R,
+			  double *vR,
+			  double *vT,
+			  double *z,
+			  double *vz,
+			  double *E,
+			  double *Lz,
+			  int nargs,
+			  struct potentialArg * actionAngleArgs){
   int ii;
   for (ii=0; ii < ndata; ii++){
     *(E+ii)= evaluatePotentials(*(R+ii),*(z+ii),

diff --git a/galpy/util/bovy_symplecticode.c b/galpy/util/bovy_symplecticode.c
@@ -40,16 +40,18 @@ void handle_sigint(int signum)
 {
   interrupted= 1;
 }
-inline void leapfrog_leapq(int dim, double *q,double *p,double dt,double *qn){
+static inline void leapfrog_leapq(int dim, double *q,double *p,
+				  double dt,double *qn){
   int ii;
   for (ii=0; ii < dim; ii++) (*qn++)= (*q++) +dt * (*p++);
 }
-inline void leapfrog_leapp(int dim, double *p,double dt,double *a,double *pn){
+static inline void leapfrog_leapp(int dim, double *p,double dt,
+				  double *a,double *pn){
   int ii;
   for (ii=0; ii< dim; ii++) (*pn++)= (*p++) + dt * (*a++);
 }
 
-inline void save_qp(int dim, double *qo, double *po, double *result){
+static inline void save_qp(int dim, double *qo, double *po, double *result){
   int ii;
   for (ii=0; ii < dim; ii++) *result++= *qo++;
   for (ii=0; ii < dim; ii++) *result++= *po++;