Skip to content

Commit f6b4f74

Browse files
committed
silence some compiler warnings
1 parent 9dc5f8c commit f6b4f74

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

inst/include/tbb/internal/_concurrent_queue_impl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@ concurrent_queue_base_v3<T>::concurrent_queue_base_v3() {
525525
__TBB_ASSERT( (size_t)&my_rep->head_counter % NFS_GetLineSize()==0, "alignment error" );
526526
__TBB_ASSERT( (size_t)&my_rep->tail_counter % NFS_GetLineSize()==0, "alignment error" );
527527
__TBB_ASSERT( (size_t)&my_rep->array % NFS_GetLineSize()==0, "alignment error" );
528-
memset(my_rep,0,sizeof(concurrent_queue_rep<T>));
528+
memset((void*) my_rep, 0, sizeof(concurrent_queue_rep<T>));
529529
my_rep->item_size = item_size;
530530
my_rep->items_per_page = item_size<= 8 ? 32 :
531531
item_size<= 16 ? 16 :

inst/include/tbb/internal/_concurrent_unordered_impl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1210,7 +1210,7 @@ class concurrent_unordered_base : public Traits
12101210
// Initialize the hash and keep the first bucket open
12111211
void internal_init() {
12121212
// Allocate an array of segment pointers
1213-
memset(my_buckets, 0, pointers_per_table * sizeof(void *));
1213+
memset((void*) my_buckets, 0, pointers_per_table * sizeof(void *));
12141214

12151215
// Initialize bucket 0
12161216
raw_iterator dummy_node = my_solist.raw_begin();

src/tbb/src/old/concurrent_queue_v2.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ concurrent_queue_base::concurrent_queue_base( size_t item_sz ) {
210210
__TBB_ASSERT( (size_t)&my_rep->head_counter % NFS_GetLineSize()==0, "alignment error" );
211211
__TBB_ASSERT( (size_t)&my_rep->tail_counter % NFS_GetLineSize()==0, "alignment error" );
212212
__TBB_ASSERT( (size_t)&my_rep->array % NFS_GetLineSize()==0, "alignment error" );
213-
memset(my_rep,0,sizeof(concurrent_queue_rep));
213+
memset((void*) my_rep, 0, sizeof(concurrent_queue_rep));
214214
this->item_size = item_sz;
215215
}
216216

src/tbb/src/tbb/concurrent_queue.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ concurrent_queue_base_v3::concurrent_queue_base_v3( size_t item_sz ) {
353353
__TBB_ASSERT( is_aligned(&my_rep->head_counter, NFS_GetLineSize()), "alignment error" );
354354
__TBB_ASSERT( is_aligned(&my_rep->tail_counter, NFS_GetLineSize()), "alignment error" );
355355
__TBB_ASSERT( is_aligned(&my_rep->array, NFS_GetLineSize()), "alignment error" );
356-
memset((void*)my_rep,0,sizeof(concurrent_queue_rep));
356+
memset((void*) my_rep, 0, sizeof(concurrent_queue_rep));
357357
new ( &my_rep->items_avail ) concurrent_monitor();
358358
new ( &my_rep->slots_avail ) concurrent_monitor();
359359
this->item_size = item_sz;

src/tbb/src/tbb/tbb_statistics.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ struct statistics_counters {
208208

209209
statistics_counters() { reset(); }
210210

211-
void reset () { memset( this, 0, sizeof(statistics_counters) ); }
211+
void reset () { memset( (void*) this, 0, sizeof(statistics_counters) ); }
212212

213213
counter_type& field ( size_t index ) { return reinterpret_cast<counter_type*>(this)[index]; }
214214

0 commit comments

Comments
 (0)