Merge pull request #122 from darioizzo/master

complex type changed in f2c and user classes
esa · Apr 11, 2020 · 2cfdb22 · 2cfdb22
2 parents e9b0a01 + 1c0af0f
commit 2cfdb22
Show file tree

Hide file tree

Showing 13 changed files with 529 additions and 547 deletions.
diff --git a/include/keplerian_toolbox/third_party/cspice/f2c.h b/include/keplerian_toolbox/third_party/cspice/f2c.h
diff --git a/src/third_party/cspice/c_abs.c b/src/third_party/cspice/c_abs.c
@@ -3,11 +3,11 @@
 #ifdef KR_headers
 extern double f__cabs();
 
-double c_abs(z) complex *z;
+double c_abs(z) complex_type *z;
 #else
 extern double f__cabs(double, double);
 
-double c_abs(complex *z)
+double c_abs(complex_type *z)
 #endif
 {
 return( f__cabs( z->r, z->i ) );

diff --git a/src/third_party/cspice/c_cos.c b/src/third_party/cspice/c_cos.c
@@ -3,12 +3,12 @@
 #ifdef KR_headers
 extern double sin(), cos(), sinh(), cosh();
 
-VOID c_cos(r, z) complex *r, *z;
+VOID c_cos(r, z) complex_type *r, *z;
 #else
 #undef abs
 #include "math.h"
 
-void c_cos(complex *r, complex *z)
+void c_cos(complex_type *r, complex_type *z)
 #endif
 {
 	double zr = z->r;

diff --git a/src/third_party/cspice/c_div.c b/src/third_party/cspice/c_div.c
@@ -3,10 +3,10 @@
 #ifdef KR_headers
 extern VOID sig_die();
 VOID c_div(c, a, b)
-complex *a, *b, *c;
+complex_type *a, *b, *c;
 #else
 extern void sig_die(char*,int);
-void c_div(complex *c, complex *a, complex *b)
+void c_div(complex_type *c, complex_type *a, complex_type *b)
 #endif
 {
 	double ratio, den;

diff --git a/src/third_party/cspice/c_exp.c b/src/third_party/cspice/c_exp.c
@@ -3,12 +3,12 @@
 #ifdef KR_headers
 extern double exp(), cos(), sin();
 
- VOID c_exp(r, z) complex *r, *z;
+ VOID c_exp(r, z) complex_type *r, *z;
 #else
 #undef abs
 #include "math.h"
 
-void c_exp(complex *r, complex *z)
+void c_exp(complex_type *r, complex_type *z)
 #endif
 {
 double expx;

diff --git a/src/third_party/cspice/c_log.c b/src/third_party/cspice/c_log.c
@@ -2,13 +2,13 @@
 
 #ifdef KR_headers
 extern double log(), f__cabs(), atan2();
-VOID c_log(r, z) complex *r, *z;
+VOID c_log(r, z) complex_type *r, *z;
 #else
 #undef abs
 #include "math.h"
 extern double f__cabs(double, double);
 
-void c_log(complex *r, complex *z)
+void c_log(complex_type *r, complex_type *z)
 #endif
 {
 	double zi;

diff --git a/src/third_party/cspice/c_sin.c b/src/third_party/cspice/c_sin.c
@@ -3,12 +3,12 @@
 #ifdef KR_headers
 extern double sin(), cos(), sinh(), cosh();
 
-VOID c_sin(r, z) complex *r, *z;
+VOID c_sin(r, z) complex_type *r, *z;
 #else
 #undef abs
 #include "math.h"
 
-void c_sin(complex *r, complex *z)
+void c_sin(complex_type *r, complex_type *z)
 #endif
 {
 	double zr = z->r;

diff --git a/src/third_party/cspice/c_sqrt.c b/src/third_party/cspice/c_sqrt.c
@@ -3,13 +3,13 @@
 #ifdef KR_headers
 extern double sqrt(), f__cabs();
 
-VOID c_sqrt(r, z) complex *r, *z;
+VOID c_sqrt(r, z) complex_type *r, *z;
 #else
 #undef abs
 #include "math.h"
 extern double f__cabs(double, double);
 
-void c_sqrt(complex *r, complex *z)
+void c_sqrt(complex_type *r, complex_type *z)
 #endif
 {
 	double mag, t;