Repository: lucy Updated Branches: refs/heads/master 90eebf02f -> 2d6629e26
Cast to narrow type from Vec_Get_Size. Cast from size_t to uint32_t to avoid -Wconversion warnings. In each of these cases, the number of elements in the Vector should be small. Project: http://git-wip-us.apache.org/repos/asf/lucy/repo Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/74d7d40d Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/74d7d40d Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/74d7d40d Branch: refs/heads/master Commit: 74d7d40db233e1dbfb2c7961116607d00ddad3bf Parents: 30663d7 Author: Marvin Humphrey <[email protected]> Authored: Mon Apr 25 12:04:35 2016 -0700 Committer: Marvin Humphrey <[email protected]> Committed: Mon Apr 25 12:13:50 2016 -0700 ---------------------------------------------------------------------- core/Lucy/Search/ORMatcher.c | 2 +- core/Lucy/Search/PhraseMatcher.c | 2 +- core/Lucy/Search/PolyMatcher.c | 2 +- core/LucyX/Search/ProximityMatcher.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucy/blob/74d7d40d/core/Lucy/Search/ORMatcher.c ---------------------------------------------------------------------- diff --git a/core/Lucy/Search/ORMatcher.c b/core/Lucy/Search/ORMatcher.c index 60a344e..c5cde4b 100644 --- a/core/Lucy/Search/ORMatcher.c +++ b/core/Lucy/Search/ORMatcher.c @@ -77,7 +77,7 @@ S_ormatcher_init2(ORMatcher *self, ORMatcherIVARS *ivars, Vector *children, ivars->size = 0; // Derive. - ivars->max_size = Vec_Get_Size(children); + ivars->max_size = (uint32_t)Vec_Get_Size(children); // Allocate. ivars->heap = (HeapedMatcherDoc**)CALLOCATE(ivars->max_size + 1, sizeof(HeapedMatcherDoc*)); http://git-wip-us.apache.org/repos/asf/lucy/blob/74d7d40d/core/Lucy/Search/PhraseMatcher.c ---------------------------------------------------------------------- diff --git a/core/Lucy/Search/PhraseMatcher.c b/core/Lucy/Search/PhraseMatcher.c index 7ca4781..f0ffa5c 100644 --- a/core/Lucy/Search/PhraseMatcher.c +++ b/core/Lucy/Search/PhraseMatcher.c @@ -46,7 +46,7 @@ PhraseMatcher_init(PhraseMatcher *self, Similarity *similarity, Vector *plists, ivars->more = true; // Extract PostingLists out of Vector into local C array for quick access. - ivars->num_elements = Vec_Get_Size(plists); + ivars->num_elements = (uint32_t)Vec_Get_Size(plists); ivars->plists = (PostingList**)MALLOCATE( ivars->num_elements * sizeof(PostingList*)); for (size_t i = 0; i < ivars->num_elements; i++) { http://git-wip-us.apache.org/repos/asf/lucy/blob/74d7d40d/core/Lucy/Search/PolyMatcher.c ---------------------------------------------------------------------- diff --git a/core/Lucy/Search/PolyMatcher.c b/core/Lucy/Search/PolyMatcher.c index 444d53c..08bfb07 100644 --- a/core/Lucy/Search/PolyMatcher.c +++ b/core/Lucy/Search/PolyMatcher.c @@ -30,7 +30,7 @@ PolyMatcher* PolyMatcher_init(PolyMatcher *self, Vector *children, Similarity *similarity) { Matcher_init((Matcher*)self); PolyMatcherIVARS *const ivars = PolyMatcher_IVARS(self); - ivars->num_kids = Vec_Get_Size(children); + ivars->num_kids = (uint32_t)Vec_Get_Size(children); ivars->sim = (Similarity*)INCREF(similarity); ivars->children = (Vector*)INCREF(children); ivars->coord_factors = (float*)MALLOCATE((ivars->num_kids + 1) * sizeof(float)); http://git-wip-us.apache.org/repos/asf/lucy/blob/74d7d40d/core/LucyX/Search/ProximityMatcher.c ---------------------------------------------------------------------- diff --git a/core/LucyX/Search/ProximityMatcher.c b/core/LucyX/Search/ProximityMatcher.c index 8967386..e72b61c 100644 --- a/core/LucyX/Search/ProximityMatcher.c +++ b/core/LucyX/Search/ProximityMatcher.c @@ -50,7 +50,7 @@ ProximityMatcher_init(ProximityMatcher *self, Similarity *similarity, ivars->within = within; // Extract PostingLists out of Vector into local C array for quick access. - ivars->num_elements = Vec_Get_Size(plists); + ivars->num_elements = (uint32_t)Vec_Get_Size(plists); ivars->plists = (PostingList**)MALLOCATE( ivars->num_elements * sizeof(PostingList*)); for (size_t i = 0; i < ivars->num_elements; i++) {
