From a24c8795c1984533fa08777ad513536465e3bb05 Mon Sep 17 00:00:00 2001 From: Stavros Papadopoulos Date: Tue, 21 Jun 2016 23:05:15 -0400 Subject: [PATCH] Small patch for clang. --- core/include/c_api/constants.h | 2 +- core/src/array/array_read_state.cc | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/core/include/c_api/constants.h b/core/include/c_api/constants.h index 5d088c0d..7def14b8 100644 --- a/core/include/c_api/constants.h +++ b/core/include/c_api/constants.h @@ -37,7 +37,7 @@ #include /** 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 index 401bb6e7..0e16b8f5 100644 --- a/core/src/array/array_read_state.cc +++ b/core/src/array/array_read_state.cc @@ -1819,7 +1819,8 @@ void ArrayReadState::PQFragmentCellRange::split_to_3( // Get enclosing coordinates bool left_retrieved, right_retrieved, target_exists; - int rc = (*fragment_read_states_)[fragment_id_]->get_enclosing_coords( + int rc = + (*fragment_read_states_)[fragment_id_]->template get_enclosing_coords( tile_pos_, // Tile fcr->cell_range_, // Target coords cell_range_, // Start coords @@ -1943,12 +1944,14 @@ bool ArrayReadState::SmallerPQFragmentCellRange::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; + } } }