mirror of
https://gitee.com/mirrors_PX4/PX4-Autopilot.git
synced 2026-10-22 02:33:33 +08:00
Added -Wzero-as-null-pointer-constant, replaced NULL --> UAVCAN_NULLPTR. All changes are automatic, no manual edits to the library code.
This commit is contained in:
@@ -2,6 +2,12 @@
|
||||
* Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
|
||||
*/
|
||||
|
||||
#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 <string>
|
||||
#include <cstdio>
|
||||
#include <memory>
|
||||
@@ -136,7 +142,7 @@ TEST(Multiset, Basic)
|
||||
{
|
||||
const std::string value = toString(i);
|
||||
std::string* res = mset->emplace(value); // Will NOT override above
|
||||
if (res == NULL)
|
||||
if (res == UAVCAN_NULLPTR)
|
||||
{
|
||||
ASSERT_LT(2, i);
|
||||
break;
|
||||
|
||||
Reference in New Issue
Block a user