diff options
author | Peter Carbonetto | 2017-05-04 15:17:47 -0500 |
---|---|---|
committer | Peter Carbonetto | 2017-05-04 15:17:47 -0500 |
commit | 12d2acb8f8ea39da448c94754a708c0dd4369c34 (patch) | |
tree | 53995af21cab8f7817439150a7e728b0bffa33f3 /src/bslmmdap.cpp | |
parent | 0dd4e05fc8babc1517de1d7981a99ad0a5241a5e (diff) | |
download | pangemma-12d2acb8f8ea39da448c94754a708c0dd4369c34.tar.gz |
Fixed problems with duplicate symbols; now using static gsl libraries in Makefile.osx so that others don't have to download it using Homebrew.
Diffstat (limited to 'src/bslmmdap.cpp')
-rw-r--r-- | src/bslmmdap.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/bslmmdap.cpp b/src/bslmmdap.cpp index 0bf0e7b..f6e9e9c 100644 --- a/src/bslmmdap.cpp +++ b/src/bslmmdap.cpp @@ -42,6 +42,7 @@ #include "logistic.h" #include "lapack.h" +#include "io.h" #ifdef FORCE_FLOAT #include "param_float.h" @@ -221,7 +222,7 @@ void ReadFile_cat (const string &file_cat, const vector<string> &vec_rs, gsl_mat //read header HEADER header; !safeGetline(infile, line).eof(); - ReadHeader (line, header); + ReadHeader_io (line, header); //use the header to determine the number of categories kc=header.catc_col.size(); kd=header.catd_col.size(); |