Fix for RCMD check warnings

SchlossLab · Jul 15, 2024 · 8603183 · 8603183
1 parent fc8b722
commit 8603183
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/src/MothurDependencies/Cluster.h b/src/MothurDependencies/Cluster.h
@@ -37,10 +37,12 @@ class Cluster {
 	SparseDistanceMatrix* dMatrix;
 
 	unsigned long smallRow, smallCol, nRowCells, nColCells;
-	float smallDist, adjust, cutoff;
+	float cutoff;
+	std::string method;
+	float smallDist, adjust;
 	bool mapWanted;
 	std::map<std::string, int> seq2Bin;
-	std::string method;
+
 
     Utils util;
 };

diff --git a/src/MothurDependencies/DataVector.h b/src/MothurDependencies/DataVector.h
@@ -25,10 +25,10 @@ class DataVector {
     //virtual OrderVector getOrderVector(std::map<std::string,int>* hold = nullptr) = 0;
     virtual void resize(int) = 0;
 
-    virtual std::string print(std::ostream&, std::map<std::string, int>&) {}
-    virtual std::string printHeaders(std::ostream&) {};
-    virtual std::string print(std::ostream&, bool&) {}
-    virtual std::string print(std::ostream&) {}
+    virtual std::string print(std::ostream&, std::map<std::string, int>&) {return "";}
+    virtual std::string printHeaders(std::ostream&) {return "";}
+    virtual std::string print(std::ostream&, bool&) {return "";}
+    virtual std::string print(std::ostream&) {return "";}
 
     void setLabel(const std::string& l)		{	label = l;			}
     std::string getLabel()			    {	return label;		}

diff --git a/src/MothurDependencies/PDistCell.h b/src/MothurDependencies/PDistCell.h
@@ -13,8 +13,8 @@ struct PDistCell{
     static bool CompareIndexes(const PDistCell& left, const PDistCell& right){return left.index > right.index; }
 };
 struct PDistCellMin{
-    unsigned long row;
     unsigned long col;
+    unsigned long row;
     PDistCellMin() = default;
     PDistCellMin(const unsigned long r, const unsigned long c) :  col(c), row(r) {}
 };