Skip to content

Commit

Permalink
mwcu: replace mwcu::NoOp with bdlf::NoOp
Browse files Browse the repository at this point in the history
  • Loading branch information
678098 committed Jul 17, 2024
1 parent 30b584e commit a0ab9a1
Show file tree
Hide file tree
Showing 13 changed files with 34 additions and 603 deletions.
9 changes: 2 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,5 @@ settings.json
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
src/groups/mwc/mwcex/*.bak
src/groups/mwc/mwcu/*.bak
3 changes: 2 additions & 1 deletion src/groups/mqb/mqba/mqba_clientsession.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@
#include <bdld_datummapbuilder.h>
#include <bdld_manageddatum.h>
#include <bdlf_bind.h>
#include <bdlf_noop.h>
#include <bdlf_placeholder.h>
#include <bdlma_localsequentialallocator.h>
#include <bdlt_timeunitratio.h>
Expand Down Expand Up @@ -1079,7 +1080,7 @@ void ClientSession::finishCheckUnconfirmedDispatched(
mwcu::WeakMemFnUtil::weakMemFn(&ClientSession::checkUnconfirmed,
d_self.acquireWeak()),
shutdownCtx,
mwcu::NoOp()));
bdlf::NoOp()));
}

void ClientSession::closeChannel()
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,11 +113,11 @@
// result-supplier thread.

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

// BDE
#include <bdlb_nullablevalue.h>
#include <bdlf_noop.h>
#include <bsl_algorithm.h> // bsl::swap
#include <bsl_exception.h>
#include <bsl_functional.h> // bsl::reference_wrapper
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 Tue Jul 16 16:28:41 2024
// Generated on Wed Jul 17 12:44:45 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 : public mwcu::NoOp {
struct Dummy : public bdlf::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 : public mwcu::NoOp {
struct Dummy : public bdlf::NoOp {
void* d_padding[3];
};

Expand Down
6 changes: 3 additions & 3 deletions src/groups/mwc/mwcex/mwcex_future_cpp03.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
// regions of C++11 code, then this header contains no code and is not
// '#include'd in the original header.
//
// Generated on Tue Jul 16 16:28:41 2024
// Generated on Wed Jul 17 12:44:45 2024
// Command line: sim_cpp11_features.pl mwcex_future.h

#ifdef COMPILING_MWCEX_FUTURE_H
Expand Down Expand Up @@ -116,7 +116,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 : public mwcu::NoOp {
struct Dummy : public bdlf::NoOp {
void* d_padding[3];
};

Expand Down Expand Up @@ -243,7 +243,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 : public mwcu::NoOp {
struct Dummy : public bdlf::NoOp {
void* d_padding[3];
};

Expand Down
4 changes: 2 additions & 2 deletions src/groups/mwc/mwcex/mwcex_job.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@
// 'mwcex::Job' does it as as if by 'bsl::move(f)()'.

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

// BDE
#include <bdlf_noop.h>
#include <bslalg_constructorproxy.h>
#include <bslma_allocator.h>
#include <bslma_default.h>
Expand Down Expand Up @@ -127,7 +127,7 @@ class Job {

/// A "small" dummy object used to help calculate the size of the
/// on-stack buffer.
struct Dummy : public mwcu::NoOp {
struct Dummy : public bdlf::NoOp {
void* d_padding[5];
};

Expand Down
25 changes: 0 additions & 25 deletions src/groups/mwc/mwcu/mwcu_noop.cpp

This file was deleted.

98 changes: 0 additions & 98 deletions src/groups/mwc/mwcu/mwcu_noop.h

This file was deleted.

47 changes: 0 additions & 47 deletions src/groups/mwc/mwcu/mwcu_noop_cpp03.cpp

This file was deleted.

Loading

0 comments on commit a0ab9a1

Please sign in to comment.