fixed some problems that stopped compilation; changed library flag to…

… -lm
BioInfoTools · Apr 18, 2014 · 4696e99 · 4696e99
1 parent 407d3fe
commit 4696e99
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/phase.2.1.1.source/HapList2.hpp b/src/phase.2.1.1.source/HapList2.hpp
@@ -56,8 +56,8 @@ class HapList {
   void Add(vector<CIndividual> & pop,int, bool = false); 
 
   // Add routines that return pointers to the added haplotype
-  ListType::iterator HapList::Add (CIndividual & ind, int chr, double freq, bool & isnewhap, bool usebestguess = false);
-  ListType::iterator HapList::Add (const Haplotype & h, double freq, bool & isnewhap);
+  ListType::iterator Add (CIndividual & ind, int chr, double freq, bool & isnewhap, bool usebestguess = false);
+  ListType::iterator Add (const Haplotype & h, double freq, bool & isnewhap);
 
   ListType::iterator Find(const Haplotype & h, const vector<int> & uselist);
 

diff --git a/src/phase.2.1.1.source/HapPairList.hpp b/src/phase.2.1.1.source/HapPairList.hpp
@@ -47,8 +47,8 @@ class HapPairList {
   void ComputeFlipProbErrProbAlleleProb(const HPairType & guesspair, vector<double> & flipprob, vector< vector<double> > & errprob, vector< vector< vector<double> > > & alleleprob, const vector<int> & nmissing);
 
   // return summary of HapPairList
-  Summary HapPairList::Summarise(const vector<int> & nmissing, bool allowsplit = true);
-  Summary HapPairList::Summarise(int startlocus, int endlocus, const vector<int> & nmissing, bool allowsplit = true);
+  Summary Summarise(const vector<int> & nmissing, bool allowsplit = true);
+  Summary Summarise(int startlocus, int endlocus, const vector<int> & nmissing, bool allowsplit = true);
 
 };
 

diff --git a/src/phase.2.1.1.source/Makefile b/src/phase.2.1.1.source/Makefile
@@ -20,8 +20,8 @@ SMLFLAGS = -O2 $(INCLUDE)
 DEBUGFLAGS = -g -DDEBUG=5 -DCHECK_BOUNDARY $(INCLUDE)
 
 #LDFLAGS = -L../crand/ -lcrand -lm -ldmallocxx
-#LDFLAGS = -lm
-LDFLAGS = /usr/lib/libm.a -static 
+LDFLAGS = -lm
+#LDFLAGS = /usr/lib/libm.a -static 
 
 .SUFFIXES: 
 .SUFFIXES: .cpp .o .c