Fix return type of functions that don't return values.

AnastasiaMiles · Dec 20, 2018 · c979289 · c979289
1 parent c7d30cb
commit c979289
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/meryl/merylOp-nextMer.C b/src/meryl/merylOp-nextMer.C
@@ -244,15 +244,19 @@ merylOperation::convertToPassThrough(char *inputName) {
 
   _operation = opPassThrough;
 
-  if ((inputName != NULL) && (inputName[0] != 0) && (_onlyConfig == false))
-    addInput(new kmerCountFileReader(inputName));
+  if ((inputName    == NULL) ||
+      (inputName[0] == 0) ||
+      (_onlyConfig  == true))
+    return;
+
+  addInput(new kmerCountFileReader(inputName, threadFile));
 }
 
 
 
 //  Build a list of the inputs that have the smallest kmer, saving their
 //  counts in _actCount, and the input that it is from in _actIndex.
-bool
+void
 merylOperation::nextMer_findSmallestNormal(void) {
 
   _actLen = 0;                                       //  Reset to nothing on the list.
@@ -298,7 +302,7 @@ merylOperation::nextMer_findSmallestNormal(void) {
 //    Intersect -- treat non-multiset as wildcard; add to list with same value
 //    Union     -- treat non-multiset as multiset
 
-bool
+void
 merylOperation::nextMer_findSmallestMultiSet(void) {
 
   _actLen = 0;

diff --git a/src/meryl/merylOp.H b/src/meryl/merylOp.H
@@ -184,8 +184,8 @@ public:
   bool    initialize(void);
 
 private:
-  bool    nextMer_findSmallestNormal(void);
-  bool    nextMer_findSmallestMultiSet(void);
+  void    nextMer_findSmallestNormal(void);
+  void    nextMer_findSmallestMultiSet(void);
   bool    nextMer_finish(void);
 
 public: