fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-22 16:43:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added -Wzero-as-null-pointer-constant, replaced NULL --> UAVCAN_NULLPTR. All changes are automatic, no manual edits to the library code.

Browse Source
This commit is contained in:
Pavel Kirienko
2016-07-29 15:39:24 +03:00
parent b6fa34fed5
commit 38a241a90a
69 changed files with 306 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/test/node/global_data_type_registry.cpp
+1 -1
View File
@@ -125,7 +125,7 @@ TEST(GlobalDataTypeRegistry, Basic)
/*
* Searching
*/
const uavcan::DataTypeDescriptor* pdtd = NULL;
const uavcan::DataTypeDescriptor* pdtd = UAVCAN_NULLPTR;
ASSERT_FALSE(GlobalDataTypeRegistry::instance().find(uavcan::DataTypeKindMessage, "Nonexistent"));
ASSERT_FALSE(GlobalDataTypeRegistry::instance().find("Nonexistent"));
ASSERT_FALSE(GlobalDataTypeRegistry::instance().find(uavcan::DataTypeKindMessage, 987));
libuavcan/test/node/subscriber.cpp
+1 -1
View File
@@ -82,7 +82,7 @@ TEST(Subscriber, Basic)
sizeof(uavcan::Subscriber<root_ns_a::MavlinkMessage, Listener::ExtendedBinder>) << std::endl;
// Null binder - will fail
ASSERT_EQ(-uavcan::ErrInvalidParam, sub_extended.start(Listener::ExtendedBinder(NULL, NULL)));
ASSERT_EQ(-uavcan::ErrInvalidParam, sub_extended.start(Listener::ExtendedBinder(UAVCAN_NULLPTR, UAVCAN_NULLPTR)));
Listener listener;
libuavcan/test/node/test_node.hpp
+2 -1
View File
@@ -7,6 +7,7 @@
#if __GNUC__
// We need auto_ptr for compatibility reasons
# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
# pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
#endif
#include <uavcan/node/abstract_node.hpp>
@@ -76,7 +77,7 @@ struct PairableCanDriver : public uavcan::ICanDriver, public uavcan::ICanIface
{
return this;
}
return NULL;
return UAVCAN_NULLPTR;
}
virtual uavcan::uint8_t getNumIfaces() const { return 1; }