Skip to content

Commit 3865adf

Browse files
authored
CXX-3093 Revert include-guard-conditioned macro guard in mongocxx (#1262)
1 parent a32f94b commit 3865adf

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

src/mongocxx/include/mongocxx/v_noabi/mongocxx/config/postlude.hpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,11 @@
2626

2727
// export.hpp (generated by CMake)
2828
#pragma pop_macro("MONGOCXX_ABI_EXPORT_H")
29-
#if !defined(MONGOCXX_ABI_EXPORT_H)
3029
#pragma pop_macro("MONGOCXX_ABI_EXPORT")
3130
#pragma pop_macro("MONGOCXX_ABI_NO_EXPORT")
3231
#pragma pop_macro("MONGOCXX_ABI_CDECL")
3332
#pragma pop_macro("MONGOCXX_ABI_EXPORT_CDECL")
3433
#pragma pop_macro("MONGOCXX_DEPRECATED")
35-
#endif
3634

3735
// prelude.hpp
3836
#undef MONGOCXX_UNREACHABLE

src/mongocxx/include/mongocxx/v_noabi/mongocxx/config/prelude.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
// export.hpp (generated by CMake)
2828
#pragma push_macro("MONGOCXX_ABI_EXPORT_H")
29-
#if !defined(MONGOCXX_ABI_EXPORT_H)
29+
#undef MONGOCXX_ABI_EXPORT_H
3030
#pragma push_macro("MONGOCXX_ABI_EXPORT")
3131
#undef MONGOCXX_ABI_EXPORT
3232
#pragma push_macro("MONGOCXX_ABI_NO_EXPORT")
@@ -37,7 +37,6 @@
3737
#undef MONGOCXX_ABI_EXPORT_CDECL
3838
#pragma push_macro("MONGOCXX_DEPRECATED")
3939
#undef MONGOCXX_DEPRECATED
40-
#endif
4140

4241
#include <mongocxx/config/compiler.hpp>
4342
#include <mongocxx/config/config.hpp>

0 commit comments

Comments
 (0)