Skip to content

Commit 9d69e3e

Browse files
committed
fix further annotation warnings for vs2022
1 parent f4744bd commit 9d69e3e

File tree

1 file changed

+24
-24
lines changed

1 file changed

+24
-24
lines changed

src/alloc-aligned.c

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,11 @@ static void* mi_heap_malloc_zero_aligned_at(mi_heap_t* const heap, const size_t
9595
// Optimized mi_heap_malloc_aligned / mi_malloc_aligned
9696
// ------------------------------------------------------
9797

98-
mi_decl_restrict void* mi_heap_malloc_aligned_at(mi_heap_t* heap, size_t size, size_t alignment, size_t offset) mi_attr_noexcept {
98+
mi_decl_nodiscard mi_decl_restrict void* mi_heap_malloc_aligned_at(mi_heap_t* heap, size_t size, size_t alignment, size_t offset) mi_attr_noexcept {
9999
return mi_heap_malloc_zero_aligned_at(heap, size, alignment, offset, false);
100100
}
101101

102-
mi_decl_restrict void* mi_heap_malloc_aligned(mi_heap_t* heap, size_t size, size_t alignment) mi_attr_noexcept {
102+
mi_decl_nodiscard mi_decl_restrict void* mi_heap_malloc_aligned(mi_heap_t* heap, size_t size, size_t alignment) mi_attr_noexcept {
103103
#if !MI_PADDING
104104
// without padding, any small sized allocation is naturally aligned (see also `_mi_segment_page_start`)
105105
if (!_mi_is_power_of_two(alignment)) return NULL;
@@ -122,45 +122,45 @@ mi_decl_restrict void* mi_heap_malloc_aligned(mi_heap_t* heap, size_t size, size
122122
// Aligned Allocation
123123
// ------------------------------------------------------
124124

125-
mi_decl_restrict void* mi_heap_zalloc_aligned_at(mi_heap_t* heap, size_t size, size_t alignment, size_t offset) mi_attr_noexcept {
125+
mi_decl_nodiscard mi_decl_restrict void* mi_heap_zalloc_aligned_at(mi_heap_t* heap, size_t size, size_t alignment, size_t offset) mi_attr_noexcept {
126126
return mi_heap_malloc_zero_aligned_at(heap, size, alignment, offset, true);
127127
}
128128

129-
mi_decl_restrict void* mi_heap_zalloc_aligned(mi_heap_t* heap, size_t size, size_t alignment) mi_attr_noexcept {
129+
mi_decl_nodiscard mi_decl_restrict void* mi_heap_zalloc_aligned(mi_heap_t* heap, size_t size, size_t alignment) mi_attr_noexcept {
130130
return mi_heap_zalloc_aligned_at(heap, size, alignment, 0);
131131
}
132132

133-
mi_decl_restrict void* mi_heap_calloc_aligned_at(mi_heap_t* heap, size_t count, size_t size, size_t alignment, size_t offset) mi_attr_noexcept {
133+
mi_decl_nodiscard mi_decl_restrict void* mi_heap_calloc_aligned_at(mi_heap_t* heap, size_t count, size_t size, size_t alignment, size_t offset) mi_attr_noexcept {
134134
size_t total;
135135
if (mi_count_size_overflow(count, size, &total)) return NULL;
136136
return mi_heap_zalloc_aligned_at(heap, total, alignment, offset);
137137
}
138138

139-
mi_decl_restrict void* mi_heap_calloc_aligned(mi_heap_t* heap, size_t count, size_t size, size_t alignment) mi_attr_noexcept {
139+
mi_decl_nodiscard mi_decl_restrict void* mi_heap_calloc_aligned(mi_heap_t* heap, size_t count, size_t size, size_t alignment) mi_attr_noexcept {
140140
return mi_heap_calloc_aligned_at(heap,count,size,alignment,0);
141141
}
142142

143-
mi_decl_restrict void* mi_malloc_aligned_at(size_t size, size_t alignment, size_t offset) mi_attr_noexcept {
143+
mi_decl_nodiscard mi_decl_restrict void* mi_malloc_aligned_at(size_t size, size_t alignment, size_t offset) mi_attr_noexcept {
144144
return mi_heap_malloc_aligned_at(mi_get_default_heap(), size, alignment, offset);
145145
}
146146

147-
mi_decl_restrict void* mi_malloc_aligned(size_t size, size_t alignment) mi_attr_noexcept {
147+
mi_decl_nodiscard mi_decl_restrict void* mi_malloc_aligned(size_t size, size_t alignment) mi_attr_noexcept {
148148
return mi_heap_malloc_aligned(mi_get_default_heap(), size, alignment);
149149
}
150150

151-
mi_decl_restrict void* mi_zalloc_aligned_at(size_t size, size_t alignment, size_t offset) mi_attr_noexcept {
151+
mi_decl_nodiscard mi_decl_restrict void* mi_zalloc_aligned_at(size_t size, size_t alignment, size_t offset) mi_attr_noexcept {
152152
return mi_heap_zalloc_aligned_at(mi_get_default_heap(), size, alignment, offset);
153153
}
154154

155-
mi_decl_restrict void* mi_zalloc_aligned(size_t size, size_t alignment) mi_attr_noexcept {
155+
mi_decl_nodiscard mi_decl_restrict void* mi_zalloc_aligned(size_t size, size_t alignment) mi_attr_noexcept {
156156
return mi_heap_zalloc_aligned(mi_get_default_heap(), size, alignment);
157157
}
158158

159-
mi_decl_restrict void* mi_calloc_aligned_at(size_t count, size_t size, size_t alignment, size_t offset) mi_attr_noexcept {
159+
mi_decl_nodiscard mi_decl_restrict void* mi_calloc_aligned_at(size_t count, size_t size, size_t alignment, size_t offset) mi_attr_noexcept {
160160
return mi_heap_calloc_aligned_at(mi_get_default_heap(), count, size, alignment, offset);
161161
}
162162

163-
mi_decl_restrict void* mi_calloc_aligned(size_t count, size_t size, size_t alignment) mi_attr_noexcept {
163+
mi_decl_nodiscard mi_decl_restrict void* mi_calloc_aligned(size_t count, size_t size, size_t alignment) mi_attr_noexcept {
164164
return mi_heap_calloc_aligned(mi_get_default_heap(), count, size, alignment);
165165
}
166166

@@ -207,55 +207,55 @@ static void* mi_heap_realloc_zero_aligned(mi_heap_t* heap, void* p, size_t newsi
207207
return mi_heap_realloc_zero_aligned_at(heap,p,newsize,alignment,offset,zero);
208208
}
209209

210-
void* mi_heap_realloc_aligned_at(mi_heap_t* heap, void* p, size_t newsize, size_t alignment, size_t offset) mi_attr_noexcept {
210+
mi_decl_nodiscard void* mi_heap_realloc_aligned_at(mi_heap_t* heap, void* p, size_t newsize, size_t alignment, size_t offset) mi_attr_noexcept {
211211
return mi_heap_realloc_zero_aligned_at(heap,p,newsize,alignment,offset,false);
212212
}
213213

214-
void* mi_heap_realloc_aligned(mi_heap_t* heap, void* p, size_t newsize, size_t alignment) mi_attr_noexcept {
214+
mi_decl_nodiscard void* mi_heap_realloc_aligned(mi_heap_t* heap, void* p, size_t newsize, size_t alignment) mi_attr_noexcept {
215215
return mi_heap_realloc_zero_aligned(heap,p,newsize,alignment,false);
216216
}
217217

218-
void* mi_heap_rezalloc_aligned_at(mi_heap_t* heap, void* p, size_t newsize, size_t alignment, size_t offset) mi_attr_noexcept {
218+
mi_decl_nodiscard void* mi_heap_rezalloc_aligned_at(mi_heap_t* heap, void* p, size_t newsize, size_t alignment, size_t offset) mi_attr_noexcept {
219219
return mi_heap_realloc_zero_aligned_at(heap, p, newsize, alignment, offset, true);
220220
}
221221

222-
void* mi_heap_rezalloc_aligned(mi_heap_t* heap, void* p, size_t newsize, size_t alignment) mi_attr_noexcept {
222+
mi_decl_nodiscard void* mi_heap_rezalloc_aligned(mi_heap_t* heap, void* p, size_t newsize, size_t alignment) mi_attr_noexcept {
223223
return mi_heap_realloc_zero_aligned(heap, p, newsize, alignment, true);
224224
}
225225

226-
void* mi_heap_recalloc_aligned_at(mi_heap_t* heap, void* p, size_t newcount, size_t size, size_t alignment, size_t offset) mi_attr_noexcept {
226+
mi_decl_nodiscard void* mi_heap_recalloc_aligned_at(mi_heap_t* heap, void* p, size_t newcount, size_t size, size_t alignment, size_t offset) mi_attr_noexcept {
227227
size_t total;
228228
if (mi_count_size_overflow(newcount, size, &total)) return NULL;
229229
return mi_heap_rezalloc_aligned_at(heap, p, total, alignment, offset);
230230
}
231231

232-
void* mi_heap_recalloc_aligned(mi_heap_t* heap, void* p, size_t newcount, size_t size, size_t alignment) mi_attr_noexcept {
232+
mi_decl_nodiscard void* mi_heap_recalloc_aligned(mi_heap_t* heap, void* p, size_t newcount, size_t size, size_t alignment) mi_attr_noexcept {
233233
size_t total;
234234
if (mi_count_size_overflow(newcount, size, &total)) return NULL;
235235
return mi_heap_rezalloc_aligned(heap, p, total, alignment);
236236
}
237237

238-
void* mi_realloc_aligned_at(void* p, size_t newsize, size_t alignment, size_t offset) mi_attr_noexcept {
238+
mi_decl_nodiscard void* mi_realloc_aligned_at(void* p, size_t newsize, size_t alignment, size_t offset) mi_attr_noexcept {
239239
return mi_heap_realloc_aligned_at(mi_get_default_heap(), p, newsize, alignment, offset);
240240
}
241241

242-
void* mi_realloc_aligned(void* p, size_t newsize, size_t alignment) mi_attr_noexcept {
242+
mi_decl_nodiscard void* mi_realloc_aligned(void* p, size_t newsize, size_t alignment) mi_attr_noexcept {
243243
return mi_heap_realloc_aligned(mi_get_default_heap(), p, newsize, alignment);
244244
}
245245

246-
void* mi_rezalloc_aligned_at(void* p, size_t newsize, size_t alignment, size_t offset) mi_attr_noexcept {
246+
mi_decl_nodiscard void* mi_rezalloc_aligned_at(void* p, size_t newsize, size_t alignment, size_t offset) mi_attr_noexcept {
247247
return mi_heap_rezalloc_aligned_at(mi_get_default_heap(), p, newsize, alignment, offset);
248248
}
249249

250-
void* mi_rezalloc_aligned(void* p, size_t newsize, size_t alignment) mi_attr_noexcept {
250+
mi_decl_nodiscard void* mi_rezalloc_aligned(void* p, size_t newsize, size_t alignment) mi_attr_noexcept {
251251
return mi_heap_rezalloc_aligned(mi_get_default_heap(), p, newsize, alignment);
252252
}
253253

254-
void* mi_recalloc_aligned_at(void* p, size_t newcount, size_t size, size_t alignment, size_t offset) mi_attr_noexcept {
254+
mi_decl_nodiscard void* mi_recalloc_aligned_at(void* p, size_t newcount, size_t size, size_t alignment, size_t offset) mi_attr_noexcept {
255255
return mi_heap_recalloc_aligned_at(mi_get_default_heap(), p, newcount, size, alignment, offset);
256256
}
257257

258-
void* mi_recalloc_aligned(void* p, size_t newcount, size_t size, size_t alignment) mi_attr_noexcept {
258+
mi_decl_nodiscard void* mi_recalloc_aligned(void* p, size_t newcount, size_t size, size_t alignment) mi_attr_noexcept {
259259
return mi_heap_recalloc_aligned(mi_get_default_heap(), p, newcount, size, alignment);
260260
}
261261

0 commit comments

Comments
 (0)