Merge pull request PointCloudLibrary#925 from jpapon/typename_fix_VS

Fixes for issue PointCloudLibrary#924
gcasey · Sep 23, 2014 · 7039581 · 7039581
2 parents 89ec4f9 + d72b57f
commit 7039581
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/gpu/people/src/cuda/nvidia/NCV.cu b/gpu/people/src/cuda/nvidia/NCV.cu
@@ -41,6 +41,7 @@
 #include <iostream>
 #include <string>
 #include <vector>
+#include <algorithm>
 #include "NCV.hpp"
 
 using namespace std;

diff --git a/segmentation/include/pcl/segmentation/supervoxel_clustering.h b/segmentation/include/pcl/segmentation/supervoxel_clustering.h
@@ -412,7 +412,7 @@ namespace pcl
               return leaf_data_left.idx_ < leaf_data_right.idx_;
             }
           };
-          typedef std::set<LeafContainerT*,SupervoxelHelper::compareLeaves> LeafSetT;
+          typedef std::set<LeafContainerT*, typename SupervoxelHelper::compareLeaves> LeafSetT;
           typedef typename LeafSetT::iterator iterator;
           typedef typename LeafSetT::const_iterator const_iterator;