diff index.cpp @ 370:2d5c3f8e8c22

Merge gcc-4.3-cleanups branch (-r629:642, but I consider that branch as
having served its purpose) onto the trunk.

Now compiles cleanly even with a fairly picky gcc.  I await version 4.4
with bated breath.

--- a/index.cpp	Wed Nov 12 10:21:06 2008 +0000
+++ b/index.cpp	Wed Nov 12 15:40:40 2008 +0000
@@ -603,11 +603,13 @@
   }
   else if(numVecsAboveThreshold)
     for( Uns32T pointID = 0 ; pointID < Nq; pointID++ )
-      if(!use_absolute_threshold || (use_absolute_threshold && (*qpp++ >= absolute_threshold)))
-	if((lsh->get_lshHeader()->flags&O2_SERIAL_FILEFORMAT2) || lsh_in_core)
+      if(!use_absolute_threshold || (use_absolute_threshold && (*qpp++ >= absolute_threshold))) {
+	if((lsh->get_lshHeader()->flags&O2_SERIAL_FILEFORMAT2) || lsh_in_core) {
 	  lsh->retrieve_point((*vv)[pointID], pointID, add_point_func, (void*)this);
-	else
+        } else {
 	  lsh->serial_retrieve_point(database, (*vv)[pointID], pointID, add_point_func, (void*)this);   
+        }
+      }
 
   if(lsh_exact)
     // Perform exact distance computation on point pairs in exact_evaluation_queue