Merge pull request #32 from stavrospapadopoulos/dev

Small patch for clang
Intel-HLS · Jun 22, 2016 · 19fcf1a · 19fcf1a
2 parents a8f124b + a24c879
commit 19fcf1a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/core/include/c_api/constants.h b/core/include/c_api/constants.h
@@ -37,7 +37,7 @@
 #include <limits.h>
 
 /** Version. */
-#define TILEDB_VERSION                          "0.3.0"
+#define TILEDB_VERSION                          "0.3.1"
 
 /**@{*/
 /** Return code. */  

diff --git a/core/src/array/array_read_state.cc b/core/src/array/array_read_state.cc
@@ -1819,7 +1819,8 @@ void ArrayReadState::PQFragmentCellRange<T>::split_to_3(
 
   // Get enclosing coordinates
   bool left_retrieved, right_retrieved, target_exists;
-  int rc = (*fragment_read_states_)[fragment_id_]->get_enclosing_coords<T>(
+  int rc = 
+      (*fragment_read_states_)[fragment_id_]->template get_enclosing_coords<T>(
                 tile_pos_,                        // Tile
                 fcr->cell_range_,                 // Target coords
                 cell_range_,                      // Start coords
@@ -1943,12 +1944,14 @@ bool ArrayReadState::SmallerPQFragmentCellRange<T>::operator () (
   } else if(cmp > 0) { // b's range start preceded a's
     return true;
   } else {             // a's and b's range starts match - latest fragment wins
-    if(a->fragment_id_ < b->fragment_id_)
+    if(a->fragment_id_ < b->fragment_id_) {
       return true;
-    else if(a->fragment_id_ > b->fragment_id_)
+    } else if(a->fragment_id_ > b->fragment_id_) {
       return false;
-    else
+    } else {
       assert(0); // This should never happen (equal coordinates and fragment id)
+      return false;
+    }
   }
 }