Skip to content

CXX-3174 Revert include-guard-conditioned macro guards in mongocxx #1262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eramongodb merged 1 commit into from
Nov 11, 2024
Merged

CXX-3174 Revert include-guard-conditioned macro guards in mongocxx #1262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/mongocxx/include/mongocxx/v_noabi/mongocxx/config/postlude.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,11 @@

// export.hpp (generated by CMake)
#pragma pop_macro("MONGOCXX_ABI_EXPORT_H")
#if !defined(MONGOCXX_ABI_EXPORT_H)
#pragma pop_macro("MONGOCXX_ABI_EXPORT")
#pragma pop_macro("MONGOCXX_ABI_NO_EXPORT")
#pragma pop_macro("MONGOCXX_ABI_CDECL")
#pragma pop_macro("MONGOCXX_ABI_EXPORT_CDECL")
#pragma pop_macro("MONGOCXX_DEPRECATED")
#endif

// prelude.hpp
#undef MONGOCXX_UNREACHABLE
Expand Down
3 changes: 1 addition & 2 deletions src/mongocxx/include/mongocxx/v_noabi/mongocxx/config/prelude.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

// export.hpp (generated by CMake)
#pragma push_macro("MONGOCXX_ABI_EXPORT_H")
#if !defined(MONGOCXX_ABI_EXPORT_H)
#undef MONGOCXX_ABI_EXPORT_H
#pragma push_macro("MONGOCXX_ABI_EXPORT")
#undef MONGOCXX_ABI_EXPORT
#pragma push_macro("MONGOCXX_ABI_NO_EXPORT")
Expand All @@ -37,7 +37,6 @@
#undef MONGOCXX_ABI_EXPORT_CDECL
#pragma push_macro("MONGOCXX_DEPRECATED")
#undef MONGOCXX_DEPRECATED
#endif

#include <mongocxx/config/compiler.hpp>
#include <mongocxx/config/config.hpp>
Expand Down