Commit00cdaac

authored

Merge pull request#27574 from charris/backport-27557

BUG: Fix warning "differs in levels of indirection" in npy_atomic.h with MSVC

2 parents5d88020 +40be518 commit00cdaacCopy full SHA for 00cdaac

File tree

-4

lines changed

-4

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -53,15 +53,15 @@ npy_atomic_load_ptr(const void *obj) {`
`53`	`53`	`#elif defined(MSC_ATOMICS)`
`54`	`54`	`#ifSIZEOF_VOID_P==8`
`55`	`55`	`#if defined(_M_X64)\|\| defined(_M_IX86)`
`56`		`-return(volatileuint64_t)obj;`
	`56`	`+return(void)(volatileuint64_t*)obj;`
`57`	`57`	`#elif defined(_M_ARM64)`
`58`		`-return (uint64_t)__ldar64((unsigned__int64volatile*)obj);`
	`58`	`+return (void)__ldar64((unsigned__int64volatile)obj);`
`59`	`59`	`#endif`
`60`	`60`	`#else`
`61`	`61`	`#if defined(_M_X64)\|\| defined(_M_IX86)`
`62`		`-return(volatileuint32_t)obj;`
	`62`	`+return(void)(volatileuint32_t*)obj;`
`63`	`63`	`#elif defined(_M_ARM64)`
`64`		`-return (uint32_t)__ldar32((unsigned__int32volatile*)obj);`
	`64`	`+return (void)__ldar32((unsigned__int32volatile)obj);`
`65`	`65`	`#endif`
`66`	`66`	`#endif`
`67`	`67`	`#elif defined(GCC_ATOMICS)`

Comments

(0)