fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-26 07:03:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

libuavcan core now uses UAVCAN_ASSERT() instead of assert() (autoreplace)

Browse Source
This commit is contained in:
Pavel Kirienko
2014-07-12 17:17:09 +04:00
parent cf19d86842
commit 530242819d
55 changed files with 208 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/include/uavcan/node/generic_publisher.hpp
+2 -2
View File
@@ -33,7 +33,7 @@ protected:
{
setTxTimeout(tx_timeout);
#if UAVCAN_DEBUG
assert(getTxTimeout() == tx_timeout); // Making sure default values are OK
UAVCAN_ASSERT(getTxTimeout() == tx_timeout); // Making sure default values are OK
#endif
}
@@ -135,7 +135,7 @@ int GenericPublisher<DataSpec, DataStruct>::doEncode(const DataStruct& message,
const int encode_res = DataStruct::encode(message, codec);
if (encode_res <= 0)
{
assert(0); // Impossible, internal error
UAVCAN_ASSERT(0); // Impossible, internal error
return -ErrInvalidMarshalData;
}
return encode_res;
libuavcan/include/uavcan/node/generic_subscriber.hpp
+2 -2
View File
@@ -28,7 +28,7 @@ class UAVCAN_EXPORT ReceivedDataStructure : public DataType_
{
if (!transfer_)
{
assert(0);
UAVCAN_ASSERT(0);
return Ret();
}
return (transfer_->*Fun)();
@@ -39,7 +39,7 @@ protected:
void setTransfer(const IncomingTransfer* transfer)
{
assert(transfer);
UAVCAN_ASSERT(transfer);
transfer_ = transfer;
}
libuavcan/include/uavcan/node/global_data_type_registry.hpp
+2 -2
View File
@@ -39,11 +39,11 @@ class UAVCAN_EXPORT GlobalDataTypeRegistry : Noncopyable
explicit EntryInsertionComparator(const Entry* dtd)
: id((dtd == NULL) ? DataTypeID() : dtd->descriptor.getID())
{
assert(dtd != NULL);
UAVCAN_ASSERT(dtd != NULL);
}
bool operator()(const Entry* entry) const
{
assert(entry != NULL);
UAVCAN_ASSERT(entry != NULL);
return entry->descriptor.getID() > id;
}
};
libuavcan/include/uavcan/node/node.hpp
+1 -1
View File
@@ -234,7 +234,7 @@ int Node<MemPoolSize_, OutgoingTransferRegistryStaticEntries, OutgoingTransferMa
started_ = res >= 0;
return res;
fail:
assert(res < 0);
UAVCAN_ASSERT(res < 0);
return res;
}
libuavcan/include/uavcan/node/publisher.hpp
+2 -2
View File
@@ -22,7 +22,7 @@ public:
: BaseType(node, tx_timeout, max_transfer_interval)
{
#if UAVCAN_DEBUG
assert(getTxTimeout() == tx_timeout); // Making sure default values are OK
UAVCAN_ASSERT(getTxTimeout() == tx_timeout); // Making sure default values are OK
#endif
StaticAssert<DataTypeKind(DataType::DataTypeKind) == DataTypeKindMessage>::check();
}
@@ -41,7 +41,7 @@ public:
{
if (!dst_node_id.isUnicast())
{
assert(0);
UAVCAN_ASSERT(0);
return -ErrInvalidParam;
}
return BaseType::publish(message, TransferTypeMessageUnicast, dst_node_id);
libuavcan/include/uavcan/node/service_client.hpp
+7 -7
View File
@@ -44,8 +44,8 @@ struct UAVCAN_EXPORT ServiceCallResult
, server_node_id(arg_server_node_id)
, response(arg_response)
{
assert(server_node_id.isUnicast());
assert((status == Success) || (status == ErrorTimeout));
UAVCAN_ASSERT(server_node_id.isUnicast());
UAVCAN_ASSERT((status == Success) || (status == ErrorTimeout));
}
bool isSuccessful() const { return status == Success; }
@@ -141,7 +141,7 @@ public:
{
setRequestTimeout(getDefaultRequestTimeout());
#if UAVCAN_DEBUG
assert(getRequestTimeout() == getDefaultRequestTimeout()); // Making sure default values are OK
UAVCAN_ASSERT(getRequestTimeout() == getDefaultRequestTimeout()); // Making sure default values are OK
#endif
}
@@ -194,7 +194,7 @@ void ServiceClient<DataType_, Callback_>::invokeCallback(ServiceCallResultType&
template <typename DataType_, typename Callback_>
void ServiceClient<DataType_, Callback_>::handleReceivedDataStruct(ReceivedDataStructure<ResponseType>& response)
{
assert(response.getTransferType() == TransferTypeServiceResponse);
UAVCAN_ASSERT(response.getTransferType() == TransferTypeServiceResponse);
const TransferListenerType* const listener = SubscriberType::getTransferListener();
if (listener)
{
@@ -205,7 +205,7 @@ void ServiceClient<DataType_, Callback_>::handleReceivedDataStruct(ReceivedDataS
}
else
{
assert(0);
UAVCAN_ASSERT(0);
cancel();
}
}
@@ -227,7 +227,7 @@ void ServiceClient<DataType_, Callback_>::handleDeadline(MonotonicTime)
}
else
{
assert(0);
UAVCAN_ASSERT(0);
cancel();
}
}
@@ -272,7 +272,7 @@ int ServiceClient<DataType_, Callback_>::call(NodeID server_node_id, const Reque
TransferListenerType* const tl = SubscriberType::getTransferListener();
if (!tl)
{
assert(0); // Must have been created
UAVCAN_ASSERT(0); // Must have been created
cancel();
return -ErrLogic;
}
libuavcan/include/uavcan/node/service_server.hpp
+2 -2
View File
@@ -59,7 +59,7 @@ private:
void handleReceivedDataStruct(ReceivedDataStructure<RequestType>& request)
{
assert(request.getTransferType() == TransferTypeServiceRequest);
UAVCAN_ASSERT(request.getTransferType() == TransferTypeServiceRequest);
if (try_implicit_cast<bool>(callback_, true))
{
response_ = ResponseType(); // The application needs newly initialized structure
@@ -87,7 +87,7 @@ public:
, callback_()
, response_failure_count_(0)
{
assert(getTxTimeout() == getDefaultTxTimeout()); // Making sure it is valid
UAVCAN_ASSERT(getTxTimeout() == getDefaultTxTimeout()); // Making sure it is valid
StaticAssert<DataTypeKind(DataType::DataTypeKind) == DataTypeKindService>::check();
}