Skip to content

Commit 8a08d57

Browse files
arkqrestyled-commits
arkq
and
restyled-commits
authored
Use standard std::min std::max functions (project-chip#36065)
* Use standard std::min std::max functions * Restyled by clang-format * Convert some more max calls * More updates * Another fix * Add missing include --------- Co-authored-by: Restyled.io <commits@restyled.io>
1 parent bbc0fb2 commit 8a08d57

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+91
-118
lines changed

‎examples/chip-tool/commands/common/Commands.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
class Commands
3030
{
3131
public:
32-
using CommandsVector = ::std::vector<std::unique_ptr<Command>>;
32+
using CommandsVector = std::vector<std::unique_ptr<Command>>;
3333

3434
void RegisterCluster(const char * clusterName, commands_list commandsList)
3535
{

‎examples/energy-management-app/energy-management-common/energy-evse/src/EnergyEvseDelegateImpl.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -934,10 +934,10 @@ Status EnergyEvseDelegate::ComputeMaxChargeCurrentLimit()
934934

935935
oldValue = mActualChargingCurrentLimit;
936936
mActualChargingCurrentLimit = mMaxHardwareCurrentLimit;
937-
mActualChargingCurrentLimit = min(mActualChargingCurrentLimit, mCircuitCapacity);
938-
mActualChargingCurrentLimit = min(mActualChargingCurrentLimit, mCableAssemblyCurrentLimit);
939-
mActualChargingCurrentLimit = min(mActualChargingCurrentLimit, mMaximumChargingCurrentLimitFromCommand);
940-
mActualChargingCurrentLimit = min(mActualChargingCurrentLimit, mUserMaximumChargeCurrent);
937+
mActualChargingCurrentLimit = std::min(mActualChargingCurrentLimit, mCircuitCapacity);
938+
mActualChargingCurrentLimit = std::min(mActualChargingCurrentLimit, mCableAssemblyCurrentLimit);
939+
mActualChargingCurrentLimit = std::min(mActualChargingCurrentLimit, mMaximumChargingCurrentLimitFromCommand);
940+
mActualChargingCurrentLimit = std::min(mActualChargingCurrentLimit, mUserMaximumChargeCurrent);
941941

942942
/* Set the actual max charging current attribute */
943943
mMaximumChargeCurrent = mActualChargingCurrentLimit;

‎examples/fabric-admin/commands/common/Commands.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
class Commands
3030
{
3131
public:
32-
using CommandsVector = ::std::vector<std::unique_ptr<Command>>;
32+
using CommandsVector = std::vector<std::unique_ptr<Command>>;
3333

3434
void RegisterCluster(const char * clusterName, commands_list commandsList)
3535
{

‎examples/ota-provider-app/ota-provider-common/OTAProviderExample.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ constexpr uint32_t kBdxServerPollIntervalMillis = 50;
6161
void GetUpdateTokenString(const chip::ByteSpan & token, char * buf, size_t bufSize)
6262
{
6363
const uint8_t * tokenData = static_cast<const uint8_t *>(token.data());
64-
size_t minLength = chip::min(token.size(), bufSize);
64+
size_t minLength = std::min(token.size(), bufSize);
6565
for (size_t i = 0; i < (minLength / 2) - 1; ++i)
6666
{
6767
snprintf(&buf[i * 2], bufSize, "%02X", tokenData[i]);

‎examples/platform/nrfconnect/util/PWMDevice.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818

1919
#include "PWMDevice.h"
2020

21+
#include <algorithm>
22+
2123
#include "AppConfig.h"
2224

2325
#include <lib/support/CodeUtils.h>
@@ -129,7 +131,7 @@ void PWMDevice::SuppressOutput()
129131
void PWMDevice::ApplyLevel()
130132
{
131133
const uint8_t maxEffectiveLevel = mMaxLevel - mMinLevel;
132-
const uint8_t effectiveLevel = mState == kState_On ? chip::min<uint8_t>(mLevel - mMinLevel, maxEffectiveLevel) : 0;
134+
const uint8_t effectiveLevel = mState == kState_On ? std::min<uint8_t>(mLevel - mMinLevel, maxEffectiveLevel) : 0;
133135

134136
pwm_set_pulse_dt(mPwmDevice,
135137
static_cast<uint32_t>(static_cast<const uint64_t>(mPwmDevice->period) * effectiveLevel / maxEffectiveLevel));

‎examples/platform/silabs/SiWx917/SiWx917/sl_wifi_if.cpp

+2-6
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,6 @@ bool ps_requirement_added = false;
9494
// TODO: Figure out why we actually need this, we are already handling failure and retries somewhere else.
9595
#define WIFI_SCAN_TIMEOUT_TICK 10000
9696

97-
#if !defined(MIN)
98-
#define MIN(A, B) ((A) < (B) ? (A) : (B))
99-
#endif
100-
10197
WfxRsi_t wfx_rsi;
10298

10399
bool hasNotifiedIPV6 = false;
@@ -541,12 +537,12 @@ sl_status_t show_scan_results(sl_wifi_scan_result_t * scan_result)
541537
memset(&cur_scan_result, 0, sizeof(cur_scan_result));
542538

543539
cur_scan_result.ssid_length = strnlen((char *) scan_result->scan_info[idx].ssid,
544-
chip::min<size_t>(sizeof(scan_result->scan_info[idx].ssid), WFX_MAX_SSID_LENGTH));
540+
std::min<size_t>(sizeof(scan_result->scan_info[idx].ssid), WFX_MAX_SSID_LENGTH));
545541
chip::Platform::CopyString(cur_scan_result.ssid, cur_scan_result.ssid_length, (char *) scan_result->scan_info[idx].ssid);
546542

547543
// if user has provided ssid, then check if the current scan result ssid matches the user provided ssid
548544
if (wfx_rsi.scan_ssid != NULL &&
549-
(strncmp(wfx_rsi.scan_ssid, cur_scan_result.ssid, MIN(strlen(wfx_rsi.scan_ssid), strlen(cur_scan_result.ssid))) ==
545+
(strncmp(wfx_rsi.scan_ssid, cur_scan_result.ssid, std::min(strlen(wfx_rsi.scan_ssid), strlen(cur_scan_result.ssid))) ==
550546
CMP_SUCCESS))
551547
{
552548
continue;

‎examples/platform/silabs/efr32/rs911x/rsi_if.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -752,7 +752,7 @@ void ProcessEvent(WfxEvent_t inEvent)
752752
// clear structure and calculate size of SSID
753753
memset(&ap, 0, sizeof(ap));
754754
ap.ssid_length =
755-
strnlen(reinterpret_cast<char *>(scan->ssid), chip::min<size_t>(sizeof(scan->ssid), WFX_MAX_SSID_LENGTH));
755+
strnlen(reinterpret_cast<char *>(scan->ssid), std::min<size_t>(sizeof(scan->ssid), WFX_MAX_SSID_LENGTH));
756756
chip::Platform::CopyString(ap.ssid, ap.ssid_length, reinterpret_cast<char *>(scan->ssid));
757757

758758
// check if the scanned ssid is the one we are looking for

‎examples/platform/silabs/efr32/wf200/host_if.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -736,7 +736,7 @@ int32_t wfx_get_ap_info(wfx_wifi_scan_result_t * ap)
736736
{
737737
int32_t signal_strength;
738738

739-
ap->ssid_length = strnlen(ap_info.ssid, chip::min<size_t>(sizeof(ap_info.ssid), WFX_MAX_SSID_LENGTH));
739+
ap->ssid_length = strnlen(ap_info.ssid, std::min<size_t>(sizeof(ap_info.ssid), WFX_MAX_SSID_LENGTH));
740740
chip::Platform::CopyString(ap->ssid, ap->ssid_length, ap_info.ssid);
741741
memcpy(ap->bssid, ap_info.bssid, sizeof(ap_info.bssid));
742742
ap->security = ap_info.security;

‎examples/platform/silabs/uart.cpp

+1-5
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,6 @@ extern "C" {
6565
#include "sl_power_manager.h"
6666
#endif
6767

68-
#if !defined(MIN)
69-
#define MIN(A, B) ((A) < (B) ? (A) : (B))
70-
#endif
71-
7268
#ifdef SL_CATALOG_UARTDRV_EUSART_PRESENT
7369
#define HELPER1(x) EUSART##x##_RX_IRQn
7470
#else
@@ -278,7 +274,7 @@ static uint16_t RetrieveFromFifo(Fifo_t * fifo, uint8_t * pData, uint16_t SizeTo
278274
VerifyOrDie(pData != nullptr);
279275
VerifyOrDie(SizeToRead <= fifo->MaxSize);
280276

281-
uint16_t ReadSize = MIN(SizeToRead, AvailableDataCount(fifo));
277+
uint16_t ReadSize = std::min(SizeToRead, AvailableDataCount(fifo));
282278
uint16_t nBytesBeforWrap = (fifo->MaxSize - fifo->Head);
283279

284280
if (ReadSize > nBytesBeforWrap)

‎examples/platform/silabs/wifi/wfx_rsi_host.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ bool wfx_start_scan(char * ssid, void (*callback)(wfx_wifi_scan_result_t *))
369369
wfx_rsi.scan_cb = callback;
370370

371371
VerifyOrReturnError(ssid != nullptr, false);
372-
wfx_rsi.scan_ssid_length = strnlen(ssid, chip::min<size_t>(sizeof(ssid), WFX_MAX_SSID_LENGTH));
372+
wfx_rsi.scan_ssid_length = strnlen(ssid, std::min<size_t>(sizeof(ssid), WFX_MAX_SSID_LENGTH));
373373
wfx_rsi.scan_ssid = reinterpret_cast<char *>(chip::Platform::MemoryAlloc(wfx_rsi.scan_ssid_length));
374374
VerifyOrReturnError(wfx_rsi.scan_ssid != nullptr, false);
375375
chip::Platform::CopyString(wfx_rsi.scan_ssid, wfx_rsi.scan_ssid_length, ssid);

‎src/app/DefaultAttributePersistenceProvider.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ CHIP_ERROR DefaultAttributePersistenceProvider::InternalReadValue(const StorageK
4141
{
4242
VerifyOrReturnError(mStorage != nullptr, CHIP_ERROR_INCORRECT_STATE);
4343

44-
uint16_t size = static_cast<uint16_t>(min(aValue.size(), static_cast<size_t>(UINT16_MAX)));
44+
uint16_t size = static_cast<uint16_t>(std::min(aValue.size(), static_cast<size_t>(UINT16_MAX)));
4545
ReturnErrorOnFailure(mStorage->SyncGetKeyValue(aKey.KeyName(), aValue.data(), size));
4646
aValue.reduce_size(size);
4747
return CHIP_NO_ERROR;

‎src/app/DeferredAttributePersistenceProvider.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ void DeferredAttributePersistenceProvider::FlushAndScheduleNext()
8181
}
8282
else
8383
{
84-
nextFlushTime = chip::min(nextFlushTime, da.GetFlushTime());
84+
nextFlushTime = std::min(nextFlushTime, da.GetFlushTime());
8585
}
8686
}
8787

‎src/app/InteractionModelEngine.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1929,7 +1929,7 @@ uint16_t InteractionModelEngine::GetMinGuaranteedSubscriptionsPerFabric() const
19291929
return UINT16_MAX;
19301930
#else
19311931
return static_cast<uint16_t>(
1932-
min(GetReadHandlerPoolCapacityForSubscriptions() / GetConfigMaxFabrics(), static_cast<size_t>(UINT16_MAX)));
1932+
std::min(GetReadHandlerPoolCapacityForSubscriptions() / GetConfigMaxFabrics(), static_cast<size_t>(UINT16_MAX)));
19331933
#endif
19341934
}
19351935

‎src/app/MessageDef/StatusIB.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ bool FormatStatusIBError(char * buf, uint16_t bufSize, CHIP_ERROR err)
168168
// formatted string, as long as we account for the possible string formats.
169169
constexpr size_t statusNameMaxLength =
170170
#define CHIP_IM_STATUS_CODE(name, spec_name, value) \
171-
max(sizeof(#spec_name),
171+
std::max(sizeof(#spec_name),
172172
#include <protocols/interaction_model/StatusCodeList.h>
173173
#undef CHIP_IM_STATUS_CODE
174174
static_cast<size_t>(0)
@@ -177,7 +177,7 @@ bool FormatStatusIBError(char * buf, uint16_t bufSize, CHIP_ERROR err)
177177
#include <protocols/interaction_model/StatusCodeList.h>
178178
#undef CHIP_IM_STATUS_CODE
179179
;
180-
constexpr size_t formattedSize = max(sizeof(generalFormat) + statusNameMaxLength, sizeof(clusterFormat));
180+
constexpr size_t formattedSize = std::max(sizeof(generalFormat) + statusNameMaxLength, sizeof(clusterFormat));
181181
char formattedString[formattedSize];
182182

183183
StatusIB status(err);

‎src/app/OperationalSessionSetup.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -744,7 +744,7 @@ CHIP_ERROR OperationalSessionSetup::ScheduleSessionSetupReattempt(System::Clock:
744744
"Our backoff calculation will overflow.");
745745
System::Clock::Timeout actualTimerDelay = System::Clock::Seconds16(
746746
static_cast<uint16_t>(CHIP_DEVICE_CONFIG_AUTOMATIC_CASE_RETRY_INITIAL_DELAY_SECONDS
747-
<< min((mAttemptsDone - 1), CHIP_DEVICE_CONFIG_AUTOMATIC_CASE_RETRY_MAX_BACKOFF)));
747+
<< std::min((mAttemptsDone - 1), CHIP_DEVICE_CONFIG_AUTOMATIC_CASE_RETRY_MAX_BACKOFF)));
748748
const bool responseWasBusy = mRequestedBusyDelay != System::Clock::kZero;
749749
if (responseWasBusy)
750750
{

‎src/app/clusters/color-control-server/color-control-server.cpp

+12-12
Original file line numberDiff line numberDiff line change
@@ -1093,7 +1093,7 @@ void ColorControlServer::SetHSVRemainingTime(chip::EndpointId endpoint)
10931093
{
10941094
bool hsvTransitionStart = (hueTransitionState->stepsRemaining == hueTransitionState->stepsTotal) ||
10951095
(saturationTransitionState->stepsRemaining == saturationTransitionState->stepsTotal);
1096-
SetQuietReportRemainingTime(endpoint, max(hueTransitionState->timeRemaining, saturationTransitionState->timeRemaining),
1096+
SetQuietReportRemainingTime(endpoint, std::max(hueTransitionState->timeRemaining, saturationTransitionState->timeRemaining),
10971097
hsvTransitionStart);
10981098
}
10991099
}
@@ -1283,7 +1283,7 @@ Status ColorControlServer::moveToSaturation(uint8_t saturation, uint16_t transit
12831283
// now, kick off the state machine.
12841284
initSaturationTransitionState(endpoint, colorSaturationTransitionState);
12851285
colorSaturationTransitionState->finalValue = saturation;
1286-
colorSaturationTransitionState->stepsRemaining = max<uint16_t>(transitionTime, 1);
1286+
colorSaturationTransitionState->stepsRemaining = std::max<uint16_t>(transitionTime, 1);
12871287
colorSaturationTransitionState->stepsTotal = colorSaturationTransitionState->stepsRemaining;
12881288
colorSaturationTransitionState->timeRemaining = transitionTime;
12891289
colorSaturationTransitionState->transitionTime = transitionTime;
@@ -1363,7 +1363,7 @@ Status ColorControlServer::moveToHueAndSaturation(uint16_t hue, uint8_t saturati
13631363
}
13641364

13651365
colorHueTransitionState->up = moveUp;
1366-
colorHueTransitionState->stepsRemaining = max<uint16_t>(transitionTime, 1);
1366+
colorHueTransitionState->stepsRemaining = std::max<uint16_t>(transitionTime, 1);
13671367
colorHueTransitionState->stepsTotal = colorHueTransitionState->stepsRemaining;
13681368
colorHueTransitionState->timeRemaining = transitionTime;
13691369
colorHueTransitionState->transitionTime = transitionTime;
@@ -1614,7 +1614,7 @@ bool ColorControlServer::moveToHueCommand(app::CommandHandler * commandObj, cons
16141614
colorHueTransitionState->finalHue = static_cast<uint8_t>(hue);
16151615
}
16161616

1617-
colorHueTransitionState->stepsRemaining = max<uint16_t>(transitionTime, 1);
1617+
colorHueTransitionState->stepsRemaining = std::max<uint16_t>(transitionTime, 1);
16181618
colorHueTransitionState->stepsTotal = colorHueTransitionState->stepsRemaining;
16191619
colorHueTransitionState->timeRemaining = transitionTime;
16201620
colorHueTransitionState->transitionTime = transitionTime;
@@ -1758,7 +1758,7 @@ bool ColorControlServer::stepHueCommand(app::CommandHandler * commandObj, const
17581758
}
17591759
}
17601760

1761-
colorHueTransitionState->stepsRemaining = max<uint16_t>(transitionTime, 1);
1761+
colorHueTransitionState->stepsRemaining = std::max<uint16_t>(transitionTime, 1);
17621762
colorHueTransitionState->stepsTotal = colorHueTransitionState->stepsRemaining;
17631763
colorHueTransitionState->timeRemaining = transitionTime;
17641764
colorHueTransitionState->transitionTime = transitionTime;
@@ -1934,7 +1934,7 @@ bool ColorControlServer::stepSaturationCommand(app::CommandHandler * commandObj,
19341934
{
19351935
colorSaturationTransitionState->finalValue = subtractSaturation(currentSaturation, stepSize);
19361936
}
1937-
colorSaturationTransitionState->stepsRemaining = max<uint8_t>(transitionTime, 1);
1937+
colorSaturationTransitionState->stepsRemaining = std::max<uint8_t>(transitionTime, 1);
19381938
colorSaturationTransitionState->stepsTotal = colorSaturationTransitionState->stepsRemaining;
19391939
colorSaturationTransitionState->timeRemaining = transitionTime;
19401940
colorSaturationTransitionState->transitionTime = transitionTime;
@@ -2276,7 +2276,7 @@ Status ColorControlServer::moveToColor(uint16_t colorX, uint16_t colorY, uint16_
22762276
Attributes::CurrentX::Get(endpoint, &(colorXTransitionState->initialValue));
22772277
Attributes::CurrentX::Get(endpoint, &(colorXTransitionState->currentValue));
22782278
colorXTransitionState->finalValue = colorX;
2279-
colorXTransitionState->stepsRemaining = max<uint16_t>(transitionTime, 1);
2279+
colorXTransitionState->stepsRemaining = std::max<uint16_t>(transitionTime, 1);
22802280
colorXTransitionState->stepsTotal = colorXTransitionState->stepsRemaining;
22812281
colorXTransitionState->timeRemaining = transitionTime;
22822282
colorXTransitionState->transitionTime = transitionTime;
@@ -2402,7 +2402,7 @@ bool ColorControlServer::moveColorCommand(app::CommandHandler * commandObj, cons
24022402
colorYTransitionState->lowLimit = MIN_CIE_XY_VALUE;
24032403
colorYTransitionState->highLimit = MAX_CIE_XY_VALUE;
24042404

2405-
SetQuietReportRemainingTime(endpoint, max(transitionTimeX, transitionTimeY), true /* isNewTransition */);
2405+
SetQuietReportRemainingTime(endpoint, std::max(transitionTimeX, transitionTimeY), true /* isNewTransition */);
24062406

24072407
// kick off the state machine:
24082408
scheduleTimerCallbackMs(configureXYEventControl(endpoint), TRANSITION_UPDATE_TIME_MS.count());
@@ -2463,7 +2463,7 @@ bool ColorControlServer::stepColorCommand(app::CommandHandler * commandObj, cons
24632463
colorXTransitionState->initialValue = currentColorX;
24642464
colorXTransitionState->currentValue = currentColorX;
24652465
colorXTransitionState->finalValue = colorX;
2466-
colorXTransitionState->stepsRemaining = max<uint16_t>(transitionTime, 1);
2466+
colorXTransitionState->stepsRemaining = std::max<uint16_t>(transitionTime, 1);
24672467
colorXTransitionState->stepsTotal = colorXTransitionState->stepsRemaining;
24682468
colorXTransitionState->timeRemaining = transitionTime;
24692469
colorXTransitionState->transitionTime = transitionTime;
@@ -2507,7 +2507,7 @@ void ColorControlServer::updateXYCommand(EndpointId endpoint)
25072507
bool isXTransitionDone = computeNewColor16uValue(colorXTransitionState);
25082508
bool isYTransitionDone = computeNewColor16uValue(colorYTransitionState);
25092509

2510-
SetQuietReportRemainingTime(endpoint, max(colorXTransitionState->timeRemaining, colorYTransitionState->timeRemaining));
2510+
SetQuietReportRemainingTime(endpoint, std::max(colorXTransitionState->timeRemaining, colorYTransitionState->timeRemaining));
25112511

25122512
if (isXTransitionDone && isYTransitionDone)
25132513
{
@@ -2607,7 +2607,7 @@ Status ColorControlServer::moveToColorTemp(EndpointId aEndpoint, uint16_t colorT
26072607
Attributes::ColorTemperatureMireds::Get(endpoint, &(colorTempTransitionState->currentValue));
26082608

26092609
colorTempTransitionState->finalValue = colorTemperature;
2610-
colorTempTransitionState->stepsRemaining = max<uint16_t>(transitionTime, 1);
2610+
colorTempTransitionState->stepsRemaining = std::max<uint16_t>(transitionTime, 1);
26112611
colorTempTransitionState->stepsTotal = colorTempTransitionState->stepsRemaining;
26122612
colorTempTransitionState->timeRemaining = transitionTime;
26132613
colorTempTransitionState->transitionTime = transitionTime;
@@ -2990,7 +2990,7 @@ bool ColorControlServer::stepColorTempCommand(app::CommandHandler * commandObj,
29902990
colorTempTransitionState->finalValue = static_cast<uint16_t>(finalValue32u);
29912991
}
29922992
}
2993-
colorTempTransitionState->stepsRemaining = max<uint16_t>(transitionTime, 1);
2993+
colorTempTransitionState->stepsRemaining = std::max<uint16_t>(transitionTime, 1);
29942994
colorTempTransitionState->stepsTotal = colorTempTransitionState->stepsRemaining;
29952995
colorTempTransitionState->timeRemaining = transitionTime;
29962996
colorTempTransitionState->transitionTime = transitionTime;

‎src/app/clusters/network-commissioning/network-commissioning.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ class ThreadScanResponseToTLV : public chip::app::DataModel::EncodableToTLV
233233
CHIP_ERROR ThreadScanResponseToTLV::LoadResponses(Platform::ScopedMemoryBuffer<ThreadScanResponse> & scanResponseArray,
234234
Span<ThreadScanResponse> & validResponses) const
235235
{
236-
VerifyOrReturnError(scanResponseArray.Alloc(chip::min(mNetworks->Count(), kMaxNetworksInScanResponse)), CHIP_ERROR_NO_MEMORY);
236+
VerifyOrReturnError(scanResponseArray.Alloc(std::min(mNetworks->Count(), kMaxNetworksInScanResponse)), CHIP_ERROR_NO_MEMORY);
237237

238238
ThreadScanResponse scanResponse;
239239
size_t scanResponseArrayLength = 0;

‎src/app/clusters/ota-requestor/DefaultOTARequestorDriver.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -219,17 +219,17 @@ CHIP_ERROR DefaultOTARequestorDriver::UpdateNotFound(UpdateNotFoundReason reason
219219
case UpdateNotFoundReason::kUpToDate:
220220
break;
221221
case UpdateNotFoundReason::kBusy: {
222-
status = ScheduleQueryRetry(true, chip::max(kDefaultDelayedActionTime, delay));
222+
status = ScheduleQueryRetry(true, std::max(kDefaultDelayedActionTime, delay));
223223
if (status == CHIP_ERROR_MAX_RETRY_EXCEEDED)
224224
{
225225
// If max retry exceeded with current provider, try a different provider
226-
status = ScheduleQueryRetry(false, chip::max(kDefaultDelayedActionTime, delay));
226+
status = ScheduleQueryRetry(false, std::max(kDefaultDelayedActionTime, delay));
227227
}
228228
break;
229229
}
230230
case UpdateNotFoundReason::kNotAvailable: {
231231
// Schedule a query only if a different provider is available
232-
status = ScheduleQueryRetry(false, chip::max(kDefaultDelayedActionTime, delay));
232+
status = ScheduleQueryRetry(false, std::max(kDefaultDelayedActionTime, delay));
233233
break;
234234
}
235235
}

‎src/app/clusters/scenes-server/SceneTableImpl.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ struct FabricSceneData : public PersistentData<kPersistentFabricBufferMax>
276276
ReturnErrorOnFailure(reader.EnterContainer(fabricSceneContainer));
277277
ReturnErrorOnFailure(reader.Next(TLV::ContextTag(TagScene::kSceneCount)));
278278
ReturnErrorOnFailure(reader.Get(scene_count));
279-
scene_count = min(scene_count, static_cast<uint8_t>(max_scenes_per_fabric));
279+
scene_count = std::min(scene_count, static_cast<uint8_t>(max_scenes_per_fabric));
280280
ReturnErrorOnFailure(reader.Next(TLV::kTLVType_Array, TLV::ContextTag(TagScene::kStorageIDArray)));
281281
TLV::TLVType sceneMapContainer;
282282
ReturnErrorOnFailure(reader.EnterContainer(sceneMapContainer));
@@ -577,7 +577,7 @@ CHIP_ERROR DefaultSceneTableImpl::GetRemainingCapacity(FabricIndex fabric_index,
577577
remaining_capacity_fabric = static_cast<uint8_t>(mMaxScenesPerFabric - fabric.scene_count);
578578
}
579579

580-
capacity = min(remaining_capacity_fabric, remaining_capacity_global);
580+
capacity = std::min(remaining_capacity_fabric, remaining_capacity_global);
581581

582582
return CHIP_NO_ERROR;
583583
}

‎src/app/clusters/thread-network-diagnostics-server/thread-network-diagnostics-provider.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ CHIP_ERROR WriteThreadNetworkDiagnosticAttributeToTlv(AttributeId attributeId, a
214214
}
215215
else
216216
{
217-
lastRssi.SetNonNull(min(static_cast<int8_t>(0), neighInfo.mLastRssi));
217+
lastRssi.SetNonNull(std::min(static_cast<int8_t>(0), neighInfo.mLastRssi));
218218
}
219219

220220
neighborTable.averageRssi = averageRssi;

0 commit comments

Comments
 (0)