fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-01 01:11:36 +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/include/uavcan/util/map.hpp
+15 -15
View File
@@ -66,20 +66,20 @@ private:
static KVGroup* instantiate(IPoolAllocator& allocator)
{
void* const praw = allocator.allocate(sizeof(KVGroup));
if (praw == NULL)
if (praw == UAVCAN_NULLPTR)
{
return NULL;
return UAVCAN_NULLPTR;
}
return new (praw) KVGroup();
}
static void destroy(KVGroup*& obj, IPoolAllocator& allocator)
{
if (obj != NULL)
if (obj != UAVCAN_NULLPTR)
{
obj->~KVGroup();
allocator.deallocate(obj);
obj = NULL;
obj = UAVCAN_NULLPTR;
}
}
@@ -92,7 +92,7 @@ private:
return kvs + i;
}
}
return NULL;
return UAVCAN_NULLPTR;
}
};
@@ -167,7 +167,7 @@ public:
/**
* Complexity is O(1).
*/
bool isEmpty() const { return find(YesPredicate()) == NULL; }
bool isEmpty() const { return find(YesPredicate()) == UAVCAN_NULLPTR; }
/**
* Complexity is O(N).
@@ -193,7 +193,7 @@ typename Map<Key, Value>::KVPair* Map<Key, Value>::findKey(const Key& key)
}
p = p->getNextListNode();
}
return NULL;
return UAVCAN_NULLPTR;
}
template <typename Key, typename Value>
@@ -226,7 +226,7 @@ Value* Map<Key, Value>::access(const Key& key)
{
UAVCAN_ASSERT(!(key == Key()));
KVPair* const kv = findKey(key);
return kv ? &kv->value : NULL;
return kv ? &kv->value : UAVCAN_NULLPTR;
}
template <typename Key, typename Value>
@@ -243,9 +243,9 @@ Value* Map<Key, Value>::insert(const Key& key, const Value& value)
}
KVGroup* const kvg = KVGroup::instantiate(allocator_);
if (kvg == NULL)
if (kvg == UAVCAN_NULLPTR)
{
return NULL;
return UAVCAN_NULLPTR;
}
list_.insert(kvg);
kvg->kvs[0] = KVPair(key, value);
@@ -271,7 +271,7 @@ void Map<Key, Value>::removeAllWhere(Predicate predicate)
unsigned num_removed = 0;
KVGroup* p = list_.get();
while (p != NULL)
while (p != UAVCAN_NULLPTR)
{
KVGroup* const next_group = p->getNextListNode();
@@ -302,7 +302,7 @@ template <typename Predicate>
const Key* Map<Key, Value>::find(Predicate predicate) const
{
KVGroup* p = list_.get();
while (p != NULL)
while (p != UAVCAN_NULLPTR)
{
KVGroup* const next_group = p->getNextListNode();
@@ -320,7 +320,7 @@ const Key* Map<Key, Value>::find(Predicate predicate) const
p = next_group;
}
return NULL;
return UAVCAN_NULLPTR;
}
template <typename Key, typename Value>
@@ -334,7 +334,7 @@ typename Map<Key, Value>::KVPair* Map<Key, Value>::getByIndex(unsigned index)
{
// Slowly crawling through the dynamic storage
KVGroup* p = list_.get();
while (p != NULL)
while (p != UAVCAN_NULLPTR)
{
KVGroup* const next_group = p->getNextListNode();
@@ -354,7 +354,7 @@ typename Map<Key, Value>::KVPair* Map<Key, Value>::getByIndex(unsigned index)
p = next_group;
}
return NULL;
return UAVCAN_NULLPTR;
}
template <typename Key, typename Value>