Skip to content
This repository has been archived by the owner on Jun 12, 2023. It is now read-only.

Commit

Permalink
Merge pull request #33 from Intel-HLS/dev
Browse files Browse the repository at this point in the history
Small patch for clang
  • Loading branch information
stavrospapadopoulos authored Jun 22, 2016
2 parents 058d9bb + 19fcf1a commit 40475b0
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
2 changes: 1 addition & 1 deletion core/include/c_api/constants.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#include <limits.h>

/** Version. */
#define TILEDB_VERSION "0.3.0"
#define TILEDB_VERSION "0.3.1"

/**@{*/
/** Return code. */
Expand Down
11 changes: 7 additions & 4 deletions core/src/array/array_read_state.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
}
}
}

Expand Down

0 comments on commit 40475b0

Please sign in to comment.