Commit7456109

and

authored

gh-91731: Don't define 'static_assert' in C++11 where is a keyword to avoid UB (GH-93700)

(cherry picked from commit65ff27c)Co-authored-by: Pablo Galindo Salgado <Pablogsal@gmail.com>

1 parent0c49a09 commit7456109Copy full SHA for 7456109

File tree

-0

lines changed

-0

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,10 @@`
`12`	`12`
`13`	`13`	`// static_assert is defined in glibc from version 2.16. Before it requires`
`14`	`14`	`// compiler support (gcc >= 4.6) and is called _Static_assert.`
	`15`	`+// In C++ 11 static_assert is a keyword, redefining is undefined behaviour.`
`15`	`16`	`#if (defined(__GLIBC__) \`
`16`	`17`	`&& (__GLIBC__ <2 \|\| (__GLIBC__ ==2 && __GLIBC_MINOR__ <=16)) \`
	`18`	`+ && !(defined(__cplusplus) && __cplusplus >=201103L) \`
`17`	`19`	`&& !defined(static_assert))`
`18`	`20`	`#definestatic_assert_Static_assert`
`19`	`21`	`#endif`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+Avoid defining the ``static_assert`` when compiling with C++ 11, where this
	`2`	`+is a keyword and redefining it can lead to undefined behavior. Patch by`
	`3`	`+Pablo Galindo`

Comments

(0)