Added inline to all functions

bcgsc · Jan 31, 2017 · 88b8237 · 88b8237
1 parent 72e6702
commit 88b8237
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/Common/nthash.hpp b/Common/nthash.hpp
@@ -306,7 +306,7 @@ inline uint64_t NTPC64(const char * kmerSeq, const unsigned k, const unsigned se
 }
 
 // multihash ntHash, ntBase
-void NTM64(const char * kmerSeq, const unsigned k, const unsigned m, uint64_t *hVal) {
+inline void NTM64(const char * kmerSeq, const unsigned k, const unsigned m, uint64_t *hVal) {
     uint64_t bVal=0, tVal=0;
     bVal = NTP64(kmerSeq, k);
     hVal[0] = bVal;
@@ -318,7 +318,7 @@ void NTM64(const char * kmerSeq, const unsigned k, const unsigned m, uint64_t *h
 }
 
 // ONE extra hash for given base hash
-uint64_t NTE64(const uint64_t hVal, const unsigned k, const unsigned i) {
+inline uint64_t NTE64(const uint64_t hVal, const unsigned k, const unsigned i) {
     if(i==0) return hVal;
     uint64_t tVal = hVal;
     tVal *= (i ^ k * multiSeed);
@@ -327,7 +327,7 @@ uint64_t NTE64(const uint64_t hVal, const unsigned k, const unsigned i) {
 }
 
 // multihash ntHash for sliding k-mers
-void NTM64(const unsigned char charOut, const unsigned char charIn, const unsigned k, const unsigned m, uint64_t *hVal) {
+inline void NTM64(const unsigned char charOut, const unsigned char charIn, const unsigned k, const unsigned m, uint64_t *hVal) {
     uint64_t bVal=0, tVal=0;
     bVal = rol(hVal[0], 1) ^ msTab[charOut][k%64] ^ msTab[charIn][0];
     hVal[0] = bVal;
@@ -339,7 +339,7 @@ void NTM64(const unsigned char charOut, const unsigned char charIn, const unsign
 }
 
 // canonical multihash ntBase
-void NTMC64(const char * kmerSeq, const unsigned k, const unsigned m, uint64_t *hVal) {
+inline void NTMC64(const char * kmerSeq, const unsigned k, const unsigned m, uint64_t *hVal) {
     uint64_t bVal=0, tVal=0;
     bVal = NTPC64(kmerSeq, k);
     hVal[0] = bVal;
@@ -351,7 +351,7 @@ void NTMC64(const char * kmerSeq, const unsigned k, const unsigned m, uint64_t *
 }
 
 // canonical multihash ntHash
-void NTMC64(const char * kmerSeq, const unsigned k, const unsigned m, uint64_t& fhVal, uint64_t& rhVal, uint64_t *hVal) {
+inline void NTMC64(const char * kmerSeq, const unsigned k, const unsigned m, uint64_t& fhVal, uint64_t& rhVal, uint64_t *hVal) {
     uint64_t bVal=0, tVal=0;
     bVal = NTPC64(kmerSeq, k, fhVal, rhVal);
     hVal[0] = bVal;
@@ -363,7 +363,7 @@ void NTMC64(const char * kmerSeq, const unsigned k, const unsigned m, uint64_t&
 }
 
 // canonical multihash ntHash for sliding k-mers
-void NTMC64(const unsigned char charOut, const unsigned char charIn, const unsigned k, const unsigned m, uint64_t& fhVal, uint64_t& rhVal, uint64_t *hVal) {
+inline void NTMC64(const unsigned char charOut, const unsigned char charIn, const unsigned k, const unsigned m, uint64_t& fhVal, uint64_t& rhVal, uint64_t *hVal) {
     uint64_t bVal=0, tVal=0;
     bVal = NTPC64(charOut, charIn, k, fhVal, rhVal);
     hVal[0] = bVal;