Skip to content

Commit

Permalink
MWC: make Dummy function placeholders callable to fix build with MSVC
Browse files Browse the repository at this point in the history
Signed-off-by: Evgeny Malygin <[email protected]>
  • Loading branch information
678098 committed Jul 16, 2024
1 parent 7f817c4 commit 49fe8ab
Show file tree
Hide file tree
Showing 5 changed files with 366 additions and 426 deletions.
12 changes: 12 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,15 @@ settings.json
.pytest_cache/
.cache/
.venv/

# Symlink from 'src/applications/bmqbrkr/run'
src/applications/bmqbrkr/etc/etc

# 'sim_cpp11_features.pl' backups
src/groups/mwc/mwcex/mwcex_bindutil.h.bak
src/groups/mwc/mwcex/mwcex_future.h.bak
src/groups/mwc/mwcex/mwcex_future_cpp03.h.bak
src/groups/mwc/mwcex/mwcex_promise.h.bak
src/groups/mwc/mwcu/mwcu_noop.h.bak
src/groups/mwc/mwcu/mwcu_objectplaceholder.h.bak
src/groups/mwc/mwcu/mwcu_operationchain.h.bak
4 changes: 2 additions & 2 deletions src/groups/mwc/mwcex/mwcex_executor.h
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@
//..

// MWC

#include <mwcex_executortraits.h>
#include <mwcu_noop.h>

// BDE
#include <bdlb_variant.h>
Expand Down Expand Up @@ -293,7 +293,7 @@ class Executor_Box_SboImp {

/// Provides a "small" dummy object which size is used to calculate the
/// size of the on-stack buffer used to store the executor target.
struct Dummy {
struct Dummy : public mwcu::NoOp {
void* d_padding[4];
};

Expand Down
8 changes: 4 additions & 4 deletions src/groups/mwc/mwcex/mwcex_future.h
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
// result-supplier thread.

// MWC

#include <mwcu_noop.h>
#include <mwcu_objectplaceholder.h>

// BDE
Expand Down Expand Up @@ -150,7 +150,7 @@

#if BSLS_COMPILERFEATURES_SIMULATE_CPP11_FEATURES
// Include version that can be compiled with C++03
// Generated on Wed Jun 29 04:17:13 2022
// Generated on Tue Jul 16 16:28:41 2024
// Command line: sim_cpp11_features.pl mwcex_future.h
#define COMPILING_MWCEX_FUTURE_H
#include <mwcex_future_cpp03.h>
Expand Down Expand Up @@ -232,7 +232,7 @@ class Future_Exception {

/// Provides a "small" dummy object which size is used to calculate the
/// size of the on-stack buffer used for optimization.
struct Dummy {
struct Dummy : public mwcu::NoOp {
void* d_padding[3];
};

Expand Down Expand Up @@ -359,7 +359,7 @@ class Future_Callback {

/// Provides a "small" dummy object which size is used to calculate the
/// size of the on-stack buffer used for optimization.
struct Dummy {
struct Dummy : public mwcu::NoOp {
void* d_padding[3];
};

Expand Down
Loading

0 comments on commit 49fe8ab

Please sign in to comment.