Skip to content

Commit a5889ca

Browse files
committed
Fix build on older distributions (2)
1 parent 83d94b3 commit a5889ca

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

de_web_plugin.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
#include <cmath>
3535
#include "alarm_system_device_table.h"
3636
#include "database.h"
37+
#include "deconz/u_assert.h"
3738
#include "device_ddf_init.h"
3839
#include "device_descriptions.h"
3940
#include "device_tick.h"
@@ -16547,11 +16548,11 @@ Resource *DEV_AddResource(const LightNode &lightNode)
1654716548
*/
1654816549
void DEV_AllocateGroup(const Device *device, Resource *rsub, ResourceItem *item)
1654916550
{
16550-
assert(device);
16551-
assert(rsub);
16552-
assert(rsub->item(RAttrId));
16553-
assert(item);
16554-
assert(item->descriptor().suffix == RConfigGroup);
16551+
U_ASSERT(device);
16552+
U_ASSERT(rsub);
16553+
U_ASSERT(rsub->item(RAttrId));
16554+
U_ASSERT(item);
16555+
U_ASSERT(item->descriptor().suffix == RConfigGroup);
1655516556

1655616557
if (!device || !rsub || !rsub->item(RAttrId) || !item || item->descriptor().suffix != RConfigGroup)
1655716558
{

device_ddf_init.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ static ResourceItem *DEV_InitDeviceDescriptionItem(const DeviceDescription::Item
152152
}
153153
}
154154

155-
assert(ddfItem.handle != DeviceDescription::Item::InvalidItemHandle);
155+
U_ASSERT(ddfItem.handle != DeviceDescription::Item::InvalidItemHandle);
156156
item->setDdfItemHandle(ddfItem.handle);
157157

158158
// check updates

device_descriptions.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1502,7 +1502,7 @@ const DeviceDescription::SubDevice &DeviceDescriptions::getSubDevice(const Resou
15021502
for (int i = 0; i < resource->itemCount(); i++)
15031503
{
15041504
const ResourceItem *item = resource->itemForIndex(size_t(i));
1505-
assert(item);
1505+
U_ASSERT(item);
15061506

15071507
h.handle = item->ddfItemHandle();
15081508
if (h.handle == DeviceDescription::Item::InvalidItemHandle)

rest_devices.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -762,7 +762,7 @@ bool ddfSerializeV1(JsonDoc &doc, const DeviceDescription &ddf, char *buf, size_
762762
{
763763
sz = serializeJson(doc, buf, bufsize);
764764
}
765-
assert(sz < bufsize);
765+
U_ASSERT(sz < bufsize);
766766

767767
DBG_Printf(DBG_INFO, "JSON serialized size %d\n", int(sz));
768768

0 commit comments

Comments
 (0)