Skip to content

Commit 5ca332e

Browse files
authored
Merge pull request #266 from szhorvat/fix/consistent-index-types
fix: use size_t as the default IndexType in metric adaptor classes
2 parents a4fba6d + 770bfab commit 5ca332e

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

include/nanoflann.hpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@ struct Metric
495495
*/
496496
template <
497497
class T, class DataSource, typename _DistanceType = T,
498-
typename IndexType = uint32_t>
498+
typename IndexType = size_t>
499499
struct L1_Adaptor
500500
{
501501
using ElementType = T;
@@ -557,7 +557,7 @@ struct L1_Adaptor
557557
*/
558558
template <
559559
class T, class DataSource, typename _DistanceType = T,
560-
typename IndexType = uint32_t>
560+
typename IndexType = size_t>
561561
struct L2_Adaptor
562562
{
563563
using ElementType = T;
@@ -622,7 +622,7 @@ struct L2_Adaptor
622622
*/
623623
template <
624624
class T, class DataSource, typename _DistanceType = T,
625-
typename IndexType = uint32_t>
625+
typename IndexType = size_t>
626626
struct L2_Simple_Adaptor
627627
{
628628
using ElementType = T;
@@ -667,7 +667,7 @@ struct L2_Simple_Adaptor
667667
*/
668668
template <
669669
class T, class DataSource, typename _DistanceType = T,
670-
typename IndexType = uint32_t>
670+
typename IndexType = size_t>
671671
struct SO2_Adaptor
672672
{
673673
using ElementType = T;
@@ -712,7 +712,7 @@ struct SO2_Adaptor
712712
*/
713713
template <
714714
class T, class DataSource, typename _DistanceType = T,
715-
typename IndexType = uint32_t>
715+
typename IndexType = size_t>
716716
struct SO3_Adaptor
717717
{
718718
using ElementType = T;
@@ -742,7 +742,7 @@ struct SO3_Adaptor
742742
/** Metaprogramming helper traits class for the L1 (Manhattan) metric */
743743
struct metric_L1 : public Metric
744744
{
745-
template <class T, class DataSource, typename IndexType = uint32_t>
745+
template <class T, class DataSource, typename IndexType = size_t>
746746
struct traits
747747
{
748748
using distance_t = L1_Adaptor<T, DataSource, T, IndexType>;
@@ -752,7 +752,7 @@ struct metric_L1 : public Metric
752752
* distance metric */
753753
struct metric_L2 : public Metric
754754
{
755-
template <class T, class DataSource, typename IndexType = uint32_t>
755+
template <class T, class DataSource, typename IndexType = size_t>
756756
struct traits
757757
{
758758
using distance_t = L2_Adaptor<T, DataSource, T, IndexType>;
@@ -762,7 +762,7 @@ struct metric_L2 : public Metric
762762
* **squared** distance metric */
763763
struct metric_L2_Simple : public Metric
764764
{
765-
template <class T, class DataSource, typename IndexType = uint32_t>
765+
template <class T, class DataSource, typename IndexType = size_t>
766766
struct traits
767767
{
768768
using distance_t = L2_Simple_Adaptor<T, DataSource, T, IndexType>;
@@ -771,7 +771,7 @@ struct metric_L2_Simple : public Metric
771771
/** Metaprogramming helper traits class for the SO3_InnerProdQuat metric */
772772
struct metric_SO2 : public Metric
773773
{
774-
template <class T, class DataSource, typename IndexType = uint32_t>
774+
template <class T, class DataSource, typename IndexType = size_t>
775775
struct traits
776776
{
777777
using distance_t = SO2_Adaptor<T, DataSource, T, IndexType>;
@@ -780,7 +780,7 @@ struct metric_SO2 : public Metric
780780
/** Metaprogramming helper traits class for the SO3_InnerProdQuat metric */
781781
struct metric_SO3 : public Metric
782782
{
783-
template <class T, class DataSource, typename IndexType = uint32_t>
783+
template <class T, class DataSource, typename IndexType = size_t>
784784
struct traits
785785
{
786786
using distance_t = SO3_Adaptor<T, DataSource, T, IndexType>;

0 commit comments

Comments
 (0)