Merge branch 'develop' into feat/patchwork

zgyaru · Feb 12, 2020 · c4440a3 · c4440a3
2 parents aafadb6 + c302bd1
commit c4440a3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: Seurat
-Version: 3.1.3.9001
-Date: 2020-02-11
+Version: 3.1.3.9002
+Date: 2020-02-12
 Title: Tools for Single Cell Genomics
 Description: A toolkit for quality control, analysis, and exploration of single cell RNA sequencing data. 'Seurat' aims to enable users to identify and interpret sources of heterogeneity from single cell transcriptomic measurements, and to integrate diverse types of single cell data. See Satija R, Farrell J, Gennert D, et al (2015) <doi:10.1038/nbt.3192>, Macosko E, Basu A, Satija R, et al (2015) <doi:10.1016/j.cell.2015.05.002>, and Butler A and Satija R (2017) <doi:10.1101/164889> for more details.
 Authors@R: c(

diff --git a/src/data_manipulation.cpp b/src/data_manipulation.cpp
@@ -76,11 +76,11 @@ Eigen::SparseMatrix<double> RowMergeMatrices(Eigen::SparseMatrix<double, Eigen::
 
   // Set up hash maps for rowname based lookup
   std::unordered_map<std::string, int> mat1_map;
-  for(int i = 0; i < mat1_rownames.size(); i++){
+  for(unsigned int i = 0; i < mat1_rownames.size(); i++){
     mat1_map[mat1_rownames[i]] = i;
   }
   std::unordered_map<std::string, int> mat2_map;
-  for(int i = 0; i < mat2_rownames.size(); i++){
+  for(unsigned int i = 0; i < mat2_rownames.size(); i++){
     mat2_map[mat2_rownames[i]] = i;
   }