AAvoiding some Xcode implicit conversion warnings (int needed to be size_t or intptr_t in a couple places).

Author: James Barbetti

rapidnj.h

@@ -246,7 +246,7 @@ class BoundingMatrix: public SUPER
             #pragma omp parallel num_threads(threadCount)
             #endif
             {
-                int threadNum = getThreadNumber();
+                intptr_t threadNum = getThreadNumber();
                 for (intptr_t r=threadNum; r<row_count; r+=threadCount) {
                     sortRow(r,r,false,sorters[threadNum]);
                     //copies the "left of the diagonal" portion of
@@ -311,7 +311,7 @@ class BoundingMatrix: public SUPER
      *                   to sort), that is "owned" by the current thread.
      * @note 
      */
-    void sortRow(intptr_t r /*row index*/, int c /*upper bound on cluster index*/
+    void sortRow(size_t r /*row index*/, size_t c /*upper bound on cluster index*/
         ,  bool parallel, Sorter& sorter) {
         //1. copy data from a row of the D matrix into the S matrix
         //   (and write the cluster identifiers that correspond to
@@ -351,9 +351,9 @@ class BoundingMatrix: public SUPER
      * @param r the row number
      */
     void purgeRow(intptr_t r /*row index*/) const {
-        T*    values         = entriesSorted.rows[r];
-        int*  clusterIndices = entryToCluster.rows[r];
-        int   c              = rowToCluster[r];
+        T*     values         = entriesSorted.rows[r];
+        int*   clusterIndices = entryToCluster.rows[r];
+        size_t c              = rowToCluster[r];
         intptr_t w = 0;
         intptr_t i = 0;
         for (; i<row_count ; ++i ) {
@@ -781,9 +781,9 @@ class VectorizedBoundingMatrix: public SUPER
                 //better min(Q).
 
         Position<T> pos(row, 0, infiniteDistance, 0);
-        const T*   rowData   = entriesSorted.rows[row];
-        const int* toCluster = entryToCluster.rows[row];
-        const int  cluster   = rowToCluster[row];
+        const T*     rowData   = entriesSorted.rows[row];
+        const int*   toCluster = entryToCluster.rows[row];
+        const size_t cluster   = rowToCluster[row];
 
         size_t partners   = indexOfFirstGreater
                             (rowData, clusterPartners[cluster], rowBound);

upgma.h

@@ -680,7 +680,7 @@ template <class T=NJFloat> class UPGMA_Matrix: public SquareMatrix<T> {
                     if (row_b<row_a) {
                         std::swap(row_a, row_b);
                     }
-                    intptr_t cluster_x = rowToCluster[row_count-1];
+                    size_t cluster_x = rowToCluster[row_count-1];
                     cluster(row_a, row_b);
                     vc[i] = cluster_c;
                     cluster_to_row.push_back(row_a);