Commit b5264f2

authored

CXX-3296 fix build if GCC/GNU/Clang/MSVC macro defined (#1409)

* guard Clang/GCC/GNU/MSVC macros

1 parent d688b3e commit b5264f2Copy full SHA for b5264f2

File tree

+16

-0

lines changed

+16

-0

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,10 @@`
`64`	`64`	`#pragma pop_macro("BSONCXX_PRIVATE_WARNINGS_DISABLE")`
`65`	`65`	`#pragma pop_macro("BSONCXX_PRIVATE_WARNINGS_POP")`
`66`	`66`	`#pragma pop_macro("BSONCXX_PRIVATE_WARNINGS_PUSH")`
	`67`	`+#pragma pop_macro("Clang")`
	`68`	`+#pragma pop_macro("GCC")`
	`69`	`+#pragma pop_macro("GNU")`
	`70`	`+#pragma pop_macro("MSVC")`
`67`	`71`	`#endif`
`68`	`72`
`69`	`73`	`#if !defined(BSONCXX_PRIVATE_V1_INSIDE_MACRO_GUARD_SCOPE)`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,14 @@`
`102`	`102`	`#undef BSONCXX_PRIVATE_WARNINGS_PUSH`
`103`	`103`	`#pragma push_macro("BSONCXX_PRIVATE_UNREACHABLE")`
`104`	`104`	`#undef BSONCXX_PRIVATE_UNREACHABLE`
	`105`	`+#pragma push_macro("Clang") // Guard since BSONCXX_PRIVATE_WARNINGS_DISABLE(Clang(...)) assumes Clang is not defined.`
	`106`	`+#undef Clang`
	`107`	`+#pragma push_macro("GCC") // Guard since BSONCXX_PRIVATE_WARNINGS_DISABLE(GCC(...)) assumes GCC is not defined.`
	`108`	`+#undef GCC`
	`109`	`+#pragma push_macro("GNU") // Guard since BSONCXX_PRIVATE_WARNINGS_DISABLE(GNU(...)) assumes GNU is not defined.`
	`110`	`+#undef GNU`
	`111`	`+#pragma push_macro("MSVC") // Guard since BSONCXX_PRIVATE_WARNINGS_DISABLE(MSVC(...)) assumes MSVC is not defined.`
	`112`	`+#undef MSVC`
`105`	`113`	`#endif`
`106`	`114`
`107`	`115`	`///`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -145,6 +145,10 @@ if(ENABLE_MACRO_GUARD_TESTS)`
`145`	`145`	`BSONCXX_PRIVATE_WARNINGS_DISABLE_IMPL_FOR_MSVC`
`146`	`146`	`BSONCXX_PRIVATE_WARNINGS_POP`
`147`	`147`	`BSONCXX_PRIVATE_WARNINGS_PUSH`
	`148`	`+ Clang`
	`149`	`+ GCC`
	`150`	`+ GNU`
	`151`	`+ MSVC`
`148`	`152`
`149`	`153`	`# bsoncxx/v1/detail/prelude.hpp`
`150`	`154`	`BSONCXX_PRIVATE_V1_INSIDE_MACRO_GUARD_SCOPE`

Comments

(0)