Skip to content

Commit 11eda5a

Browse files
committed
clang-tidy fixes
1 parent 18325f4 commit 11eda5a

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

src/app/clusters/thermostat-server/PresetStructWithOwnedMembers.cpp

+8-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ PresetStructWithOwnedMembers::PresetStructWithOwnedMembers(const PresetStruct::T
3232
*this = other;
3333
}
3434

35-
void PresetStructWithOwnedMembers::operator=(const PresetStruct::Type & other)
35+
PresetStructWithOwnedMembers & PresetStructWithOwnedMembers::operator=(const PresetStruct::Type & other)
3636
{
3737
SetPresetScenario(other.presetScenario);
3838
CHIP_ERROR err = SetPresetHandle(other.presetHandle);
@@ -48,11 +48,17 @@ void PresetStructWithOwnedMembers::operator=(const PresetStruct::Type & other)
4848
SetCoolingSetpoint(other.coolingSetpoint);
4949
SetHeatingSetpoint(other.heatingSetpoint);
5050
SetBuiltIn(other.builtIn);
51+
return *this;
5152
}
5253

53-
void PresetStructWithOwnedMembers::operator=(const PresetStructWithOwnedMembers & other)
54+
PresetStructWithOwnedMembers & PresetStructWithOwnedMembers::operator=(const PresetStructWithOwnedMembers & other)
5455
{
56+
if (this == &other)
57+
{
58+
return *this;
59+
}
5560
*this = static_cast<const PresetStruct::Type &>(other);
61+
return *this;
5662
}
5763

5864
void PresetStructWithOwnedMembers::SetPresetScenario(PresetScenarioEnum enumValue)

src/app/clusters/thermostat-server/PresetStructWithOwnedMembers.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ struct PresetStructWithOwnedMembers : protected Structs::PresetStruct::Type
4242
public:
4343
PresetStructWithOwnedMembers() = default;
4444
PresetStructWithOwnedMembers(const Structs::PresetStruct::Type & other);
45-
void operator=(const Structs::PresetStruct::Type & other);
46-
void operator=(const PresetStructWithOwnedMembers & other);
45+
PresetStructWithOwnedMembers & operator=(const Structs::PresetStruct::Type & other);
46+
PresetStructWithOwnedMembers & operator=(const PresetStructWithOwnedMembers & other);
4747

4848
void SetPresetScenario(PresetScenarioEnum enumValue);
4949
CHIP_ERROR SetPresetHandle(const DataModel::Nullable<ByteSpan> & newPresetHandle);

src/app/clusters/thermostat-server/thermostat-server.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -1446,7 +1446,6 @@ void handleAtomicBegin(CommandHandler * commandObj, const ConcreteCommandPath &
14461446
gThermostatAttrAccess.SetAtomicWrite(endpoint, true);
14471447
gThermostatAttrAccess.SetAtomicWriteScopedNodeId(endpoint, GetSourceScopedNodeId(commandObj));
14481448
sendAtomicResponse(commandObj, commandPath, imcode::Success, imcode::Success, imcode::Success, MakeOptional(timeout));
1449-
return;
14501449
}
14511450

14521451
imcode commitPresets(Delegate * delegate, EndpointId endpoint)

0 commit comments

Comments
 (0)