Skip to content

Commit 9b45a6b

Browse files
committed
Temporarily backport Praat commit 9e017f1 to make CI pass on macOS 15 with Clang 17, until full Praat subtree gets updated
1 parent dc5d44b commit 9b45a6b

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

praat/melder/melder_strvec.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ class _autostringautovector {
191191
_autostringautovector&& move () noexcept { return static_cast <_autostringautovector&&> (*this); } // enable construction and assignment for l-values (variables) via explicit move()
192192
void initWithCapacity (integer capacity) {
193193
if (capacity > 0)
194-
our cells = MelderArray:: _alloc <_autostring <T>> (capacity, MelderArray::kInitializationType::ZERO);
194+
our elements = MelderArray:: _alloc <_autostring <T>> (capacity, MelderArray::kInitializationType::ZERO);
195195
our size = 0;
196196
our _capacity = capacity;
197197
}

praat/melder/melder_tensor.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ struct vectorview {
157157
}
158158
matrixview<T> asmatrixview (integer nrow, integer ncol) {
159159
Melder_assert (nrow * ncol <= our size);
160-
return matrixview (our cells, nrow, ncol, ncol * our stride, our stride);
160+
return matrixview (our firstCell, nrow, ncol, ncol * our stride, our stride);
161161
}
162162
T *asArgumentToFunctionThatExpectsZeroBasedArray () const { return & our operator[] (1); }
163163
T *asArgumentToFunctionThatExpectsOneBasedArray () const { return & our operator[] (0); }
@@ -190,7 +190,7 @@ struct constvectorview {
190190
}
191191
constmatrixview<T> asmatrixview (integer nrow, integer ncol) {
192192
Melder_assert (nrow * ncol <= our size);
193-
return constmatrixview (our cells, nrow, ncol, ncol * our stride, our stride);
193+
return constmatrixview (our firstCell, nrow, ncol, ncol * our stride, our stride);
194194
}
195195
const T *asArgumentToFunctionThatExpectsZeroBasedArray () const { return & our operator[] (1); }
196196
const T *asArgumentToFunctionThatExpectsOneBasedArray () const { return & our operator[] (0); }
@@ -1049,7 +1049,7 @@ struct consttensor3 {
10491049
our cells
10501050
+ (dim2 - 1) * our stride2
10511051
+ (dim3 - 1) * our stride3,
1052-
our nidm1,
1052+
our ndim1,
10531053
our stride1
10541054
);
10551055
}

0 commit comments

Comments
 (0)