Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix unsigned vs. signed warnings in sort_manager.h.

  • Loading branch information...
commit f38000b24753350b5440925b9c58664987a7a825 1 parent c33b559
@freekvw freekvw authored
Showing with 2 additions and 2 deletions.
  1. +2 −2 tpie/sort_manager.h
View
4 tpie/sort_manager.h
@@ -710,7 +710,7 @@ void sort_manager<T,I,M>::merge_to_output(progress_indicator_base* indicator, tp
stream->seek(0);
}
- stream_size_type check_size=0;
+ TPIE_OS_OFFSET check_size=0;
// For each new output stream, fill with merged runs.
// strange indexing is for the case that there are fewer than mrgArity
// output streams needed, and we use the LAST nOutputStreams. This
@@ -798,7 +798,7 @@ void sort_manager<T,I,M>::merge_to_output(progress_indicator_base* indicator, tp
outStream, -1, indicator);
if (indicator) indicator->done();
- tp_assert(outStream->size() == nInputItems, "item count mismatch");
+ tp_assert((TPIE_OS_OFFSET)outStream->size() == nInputItems, "item count mismatch");
TP_LOG_DEBUG("merge cleanup\n");
Please sign in to comment.
Something went wrong with that request. Please try again.