Merge pull request #321 from RuleWorld/fix/lapack-prototypes

Fix LAPACK/Fortran prototypes: add explicit prototypes for DGESV/DSYS…

Author: jrfaeder

bng2/Network3/CMakeLists.txt

@@ -4,6 +4,9 @@ cmake_minimum_required(VERSION 3.5)
 
 project(Network3)
 
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
 add_definitions(-DRUN_NETWORK_VERSION=\"3.0\")
 
 set(SUB_DIRS 

bng2/Network3/src/util/mathutils/linsolve.c

@@ -17,7 +17,14 @@ int LINSOLVE(double **a, double **b, int nrhs, int dim){
     int *ipiv;
     int Nrhs, Dim;
     int info;
-    extern void DGESV();
+#ifdef __cplusplus
+extern "C" {
+#endif
+    /* Fortran dgesv: SUBROUTINE DGESV( N, NRHS, A, LDA, IPIV, B, LDB, INFO ) */
+    void DGESV(int *n, int *nrhs, double *a, int *lda, int *ipiv, double *b, int *ldb, int *info);
+#ifdef __cplusplus
+}
+#endif
 
     /* calculate transpose of a-- this is done because matrices in Fortran */
     /* and C have row and column indices interchanged */
@@ -29,5 +36,3 @@ int LINSOLVE(double **a, double **b, int nrhs, int dim){
     free(ipiv);
     return(info);
 }
-
-

bng2/Network3/src/util/mathutils/norm.c

@@ -12,8 +12,8 @@ double NORM( double *a, int dim){
     int n;
     int inca=1;
     double norm;
-    extern double DNRM2();
-
+    extern double DNRM2(int *n, double *x, int *incx);
+    
     n=dim;
     return(DNRM2(&n, a, &inca));
 }

bng2/Network3/src/util/mathutils/normsq.c

@@ -11,7 +11,7 @@ double NORMSQ( double *a, int dim)
     int n;
     int inca=1;
     double norm;
-    extern double DNRSQ();
+    extern double DNRSQ(int *n, double *a, int *inca);
 
     n=dim;
 

bng2/Network3/src/util/mathutils/sum_vector.c

@@ -8,7 +8,7 @@ double SUM_VECTOR( double *a, int dim)
 {
     int n=dim;
     int inca=1;
-    extern double DSUM();
+    extern double DSUM(int *n, double *a, int *inca);
 
     return(DSUM(&n, a, &inca));
 }

bng2/Network3/src/util/mathutils/sym_linsolve.c

@@ -26,7 +26,14 @@ int SYM_LINSOLVE(double **A, double **B, int nrhs, int dim){
     static int lwork;
     static int olddim;
     static int initflag=1;
-    extern void DSYSV();
+#ifdef __cplusplus
+extern "C" {
+#endif
+    /* Fortran dsysv: SUBROUTINE DSYSV( UPLO, N, NRHS, A, LDA, IPIV, B, LDB, WORK, LWORK, INFO ) */
+    void DSYSV(char *uplo, int *n, int *nrhs, double *a, int *lda, int *ipiv, double *b, int *ldb, double *work, int *lwork, int *info);
+#ifdef __cplusplus
+}
+#endif
 
     if(dim==2){
 	a= A[0][0];  c=A[0][1]; b = A[1][1];
@@ -66,5 +73,3 @@ int SYM_LINSOLVE(double **A, double **B, int nrhs, int dim){
     free(ipiv);
     return(info);
 }
-
-

bng2/Network3/src/util/mathutils/sympos_linsolve.c

@@ -16,7 +16,14 @@ int SYMPOS_LINSOLVE(double **a, double **b, int nrhs, int dim){
 #endif
     int Nrhs, Dim;
     int info;
-    extern void DPOSV();
+#ifdef __cplusplus
+extern "C" {
+#endif
+    /* Fortran dposv: SUBROUTINE DPOSV( UPLO, N, NRHS, A, LDA, B, LDB, INFO ) */
+    void DPOSV(char *uplo, int *n, int *nrhs, double *a, int *lda, double *b, int *ldb, int *info);
+#ifdef __cplusplus
+}
+#endif
 
     Dim= dim;
     Nrhs= nrhs;

bng2/Network3/src/util/mathutils/test_transpose.c

@@ -1,6 +1,6 @@
 #include "mathutils.h"
 
-main()
+int main(void)
 {
   double dat[]={1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0};
   dcomplex **m;

bng2/Network3/src/util/mathutils/testdummy.c

@@ -1,6 +1,6 @@
 #include "mathutils.h"
 
-main(){
+int main(void){
     int i,n;
     int incx=1;
     double *x;

bng2/Network3/src/util/mathutils/testgram.c

@@ -1,6 +1,6 @@
 #include "mathutils.h"
 
-main(int argc, char *argv[]){
+int main(int argc, char *argv[]){
   int i,j,k;
   int nr, n_run;
   int n,m;