Skip to content

CDRIVER-5813 remove misplaced define BSON_IF_MSVC #1790

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
merged 2 commits into from
Dec 4, 2024
Merged

CDRIVER-5813 remove misplaced define BSON_IF_MSVC #1790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f04e82d
define `BSON_IF_MSVC` and `BSON_IF_GNU_LIKE` as empty for unsupported…
kevinAlbs Nov 15, 2024
c6beefa
CDRIVER-5813 remove misplaced define of BSON_IF_MSVC
kevinAlbs Nov 15, 2024
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
1 change: 0 additions & 1 deletion src/common/src/common-atomic-private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ enum mcommon_memory_order {
#ifdef MCOMMON_USE_LEGACY_GCC_ATOMICS
#undef BSON_IF_GNU_LIKE
#define BSON_IF_GNU_LIKE(...)
#define BSON_IF_MSVC(...)
#define MCOMMON_IF_GNU_LEGACY_ATOMICS(...) __VA_ARGS__
#else
#define MCOMMON_IF_GNU_LEGACY_ATOMICS(...)
Expand Down
1 change: 0 additions & 1 deletion src/libbson/src/bson/bson-atomic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ enum BSON_GNUC_DEPRECATED bson_memory_order {
#ifdef BSON_USE_LEGACY_GCC_ATOMICS
#undef BSON_IF_GNU_LIKE
#define BSON_IF_GNU_LIKE(...)
#define BSON_IF_MSVC(...)
#define BSON_IF_GNU_LEGACY_ATOMICS(...) __VA_ARGS__
#else
#define BSON_IF_GNU_LEGACY_ATOMICS(...)
Expand Down
4 changes: 4 additions & 0 deletions src/libbson/src/bson/bson-compat.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,10 @@ typedef signed char bool;
#define BSON_IF_MSVC(...)
/** Expands the arguments if compiling with GCC or Clang, otherwise empty */
#define BSON_IF_GNU_LIKE(...) __VA_ARGS__
#else
/** Unsupported compiler. **/
#define BSON_IF_MSVC(...)
#define BSON_IF_GNU_LIKE(...)
#endif

#ifdef BSON_OS_WIN32
Expand Down