Skip to content

Commit 939905e

Browse files
Merge pull request #1448 from jchadwick-buf:prefer-ptrdiff-over-ssize
PiperOrigin-RevId: 754173505
2 parents 97068d5 + 6b305e6 commit 939905e

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

extensions/lists_functions.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ absl::StatusOr<ListValue> ListRange(
209209
google::protobuf::Arena* ABSL_NONNULL arena) {
210210
auto builder = NewListValueBuilder(arena);
211211
builder->Reserve(end);
212-
for (ssize_t i = 0; i < end; ++i) {
212+
for (int64_t i = 0; i < end; ++i) {
213213
CEL_RETURN_IF_ERROR(builder->Add(IntValue(i)));
214214
}
215215
return std::move(*builder).Build();
@@ -222,7 +222,7 @@ absl::StatusOr<ListValue> ListReverse(
222222
google::protobuf::Arena* ABSL_NONNULL arena) {
223223
auto builder = NewListValueBuilder(arena);
224224
CEL_ASSIGN_OR_RETURN(size_t size, list.Size());
225-
for (ssize_t i = size - 1; i >= 0; --i) {
225+
for (ptrdiff_t i = size - 1; i >= 0; --i) {
226226
CEL_ASSIGN_OR_RETURN(Value value,
227227
list.Get(i, descriptor_pool, message_factory, arena));
228228
CEL_RETURN_IF_ERROR(builder->Add(value));

parser/parser.cc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -459,26 +459,26 @@ class CodePointStream final : public CharStream {
459459
index_++;
460460
}
461461

462-
size_t LA(ssize_t i) override {
462+
size_t LA(ptrdiff_t i) override {
463463
if (ABSL_PREDICT_FALSE(i == 0)) {
464464
return 0;
465465
}
466-
auto p = static_cast<ssize_t>(index_);
466+
auto p = static_cast<ptrdiff_t>(index_);
467467
if (i < 0) {
468468
i++;
469469
if (p + i - 1 < 0) {
470470
return IntStream::EOF;
471471
}
472472
}
473-
if (p + i - 1 >= static_cast<ssize_t>(size_)) {
473+
if (p + i - 1 >= static_cast<ptrdiff_t>(size_)) {
474474
return IntStream::EOF;
475475
}
476476
return buffer_.at(static_cast<size_t>(p + i - 1));
477477
}
478478

479-
ssize_t mark() override { return -1; }
479+
ptrdiff_t mark() override { return -1; }
480480

481-
void release(ssize_t marker) override {}
481+
void release(ptrdiff_t marker) override {}
482482

483483
size_t index() override { return index_; }
484484

0 commit comments

Comments
 (0)