Skip to content

Commit da47ffb

Browse files
mariusmujamariusmuja
committed
Compilation fix for OpenMP 2.0 (MSVC).
1 parent b0425ef commit da47ffb

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

‎src/cpp/flann/algorithms/lsh_index.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ class LshIndex : public NNIndex<Distance>
239239
{
240240
KNNUniqueResultSet<DistanceType> resultSet(knn);
241241
#pragma omp for schedule(static) reduction(+:count)
242-
for (size_t i = 0; i < queries.rows; i++) {
242+
for (int i = 0; i < (int)queries.rows; i++) {
243243
resultSet.clear();
244244
findNeighbors(resultSet, queries[i], params);
245245
size_t n = std::min(resultSet.size(), knn);
@@ -254,7 +254,7 @@ class LshIndex : public NNIndex<Distance>
254254
{
255255
KNNResultSet<DistanceType> resultSet(knn);
256256
#pragma omp for schedule(static) reduction(+:count)
257-
for (size_t i = 0; i < queries.rows; i++) {
257+
for (int i = 0; i < (int)queries.rows; i++) {
258258
resultSet.clear();
259259
findNeighbors(resultSet, queries[i], params);
260260
size_t n = std::min(resultSet.size(), knn);
@@ -292,7 +292,7 @@ class LshIndex : public NNIndex<Distance>
292292
{
293293
KNNUniqueResultSet<DistanceType> resultSet(knn);
294294
#pragma omp for schedule(static) reduction(+:count)
295-
for (size_t i = 0; i < queries.rows; i++) {
295+
for (int i = 0; i < (int)queries.rows; i++) {
296296
resultSet.clear();
297297
findNeighbors(resultSet, queries[i], params);
298298
size_t n = std::min(resultSet.size(), knn);
@@ -311,7 +311,7 @@ class LshIndex : public NNIndex<Distance>
311311
{
312312
KNNResultSet<DistanceType> resultSet(knn);
313313
#pragma omp for schedule(static) reduction(+:count)
314-
for (size_t i = 0; i < queries.rows; i++) {
314+
for (int i = 0; i < (int)queries.rows; i++) {
315315
resultSet.clear();
316316
findNeighbors(resultSet, queries[i], params);
317317
size_t n = std::min(resultSet.size(), knn);

‎src/cpp/flann/algorithms/nn_index.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ class NNIndex : public IndexBase
324324
{
325325
KNNResultSet2<DistanceType> resultSet(knn);
326326
#pragma omp for schedule(static) reduction(+:count)
327-
for (size_t i = 0; i < queries.rows; i++) {
327+
for (int i = 0; i < (int)queries.rows; i++) {
328328
resultSet.clear();
329329
findNeighbors(resultSet, queries[i], params);
330330
size_t n = std::min(resultSet.size(), knn);
@@ -339,7 +339,7 @@ class NNIndex : public IndexBase
339339
{
340340
KNNSimpleResultSet<DistanceType> resultSet(knn);
341341
#pragma omp for schedule(static) reduction(+:count)
342-
for (size_t i = 0; i < queries.rows; i++) {
342+
for (int i = 0; i < (int)queries.rows; i++) {
343343
resultSet.clear();
344344
findNeighbors(resultSet, queries[i], params);
345345
size_t n = std::min(resultSet.size(), knn);
@@ -412,7 +412,7 @@ class NNIndex : public IndexBase
412412
{
413413
KNNResultSet2<DistanceType> resultSet(knn);
414414
#pragma omp for schedule(static) reduction(+:count)
415-
for (size_t i = 0; i < queries.rows; i++) {
415+
for (int i = 0; i < (int)queries.rows; i++) {
416416
resultSet.clear();
417417
findNeighbors(resultSet, queries[i], params);
418418
size_t n = std::min(resultSet.size(), knn);
@@ -431,7 +431,7 @@ class NNIndex : public IndexBase
431431
{
432432
KNNSimpleResultSet<DistanceType> resultSet(knn);
433433
#pragma omp for schedule(static) reduction(+:count)
434-
for (size_t i = 0; i < queries.rows; i++) {
434+
for (int i = 0; i < (int)queries.rows; i++) {
435435
resultSet.clear();
436436
findNeighbors(resultSet, queries[i], params);
437437
size_t n = std::min(resultSet.size(), knn);
@@ -502,7 +502,7 @@ class NNIndex : public IndexBase
502502
{
503503
CountRadiusResultSet<DistanceType> resultSet(radius);
504504
#pragma omp for schedule(static) reduction(+:count)
505-
for (size_t i = 0; i < queries.rows; i++) {
505+
for (int i = 0; i < (int)queries.rows; i++) {
506506
resultSet.clear();
507507
findNeighbors(resultSet, queries[i], params);
508508
count += resultSet.size();
@@ -517,7 +517,7 @@ class NNIndex : public IndexBase
517517
{
518518
RadiusResultSet<DistanceType> resultSet(radius);
519519
#pragma omp for schedule(static) reduction(+:count)
520-
for (size_t i = 0; i < queries.rows; i++) {
520+
for (int i = 0; i < (int)queries.rows; i++) {
521521
resultSet.clear();
522522
findNeighbors(resultSet, queries[i], params);
523523
size_t n = resultSet.size();
@@ -538,7 +538,7 @@ class NNIndex : public IndexBase
538538
{
539539
KNNRadiusResultSet<DistanceType> resultSet(radius, max_neighbors);
540540
#pragma omp for schedule(static) reduction(+:count)
541-
for (size_t i = 0; i < queries.rows; i++) {
541+
for (int i = 0; i < (int)queries.rows; i++) {
542542
resultSet.clear();
543543
findNeighbors(resultSet, queries[i], params);
544544
size_t n = resultSet.size();
@@ -608,7 +608,7 @@ class NNIndex : public IndexBase
608608
{
609609
CountRadiusResultSet<DistanceType> resultSet(radius);
610610
#pragma omp for schedule(static) reduction(+:count)
611-
for (size_t i = 0; i < queries.rows; i++) {
611+
for (int i = 0; i < (int)queries.rows; i++) {
612612
resultSet.clear();
613613
findNeighbors(resultSet, queries[i], params);
614614
count += resultSet.size();
@@ -625,7 +625,7 @@ class NNIndex : public IndexBase
625625
{
626626
RadiusResultSet<DistanceType> resultSet(radius);
627627
#pragma omp for schedule(static) reduction(+:count)
628-
for (size_t i = 0; i < queries.rows; i++) {
628+
for (int i = 0; i < (int)queries.rows; i++) {
629629
resultSet.clear();
630630
findNeighbors(resultSet, queries[i], params);
631631
size_t n = resultSet.size();
@@ -645,7 +645,7 @@ class NNIndex : public IndexBase
645645
{
646646
KNNRadiusResultSet<DistanceType> resultSet(radius, params.max_neighbors);
647647
#pragma omp for schedule(static) reduction(+:count)
648-
for (size_t i = 0; i < queries.rows; i++) {
648+
for (int i = 0; i < (int)queries.rows; i++) {
649649
resultSet.clear();
650650
findNeighbors(resultSet, queries[i], params);
651651
size_t n = resultSet.size();

0 commit comments

Comments
 (0)