diff options
| author | James Goppert <james.goppert@gmail.com> | 2014-03-16 16:21:06 -0400 |
|---|---|---|
| committer | James Goppert <james.goppert@gmail.com> | 2014-03-20 12:12:42 -0400 |
| commit | da9dab27998fa9e8b7a66d53a00aa3cae93573ec (patch) | |
| tree | 4b1a6a99baff5932a135769b9ab3b8ac8f23e981 | |
| parent | fd6590cfa7e14436fa8af6a0569b6382cd39069a (diff) | |
| download | px4-firmware-da9dab27998fa9e8b7a66d53a00aa3cae93573ec.tar.gz px4-firmware-da9dab27998fa9e8b7a66d53a00aa3cae93573ec.tar.bz2 px4-firmware-da9dab27998fa9e8b7a66d53a00aa3cae93573ec.zip | |
Moved List.hpp from controllib to src/include/containers.
| -rw-r--r-- | src/include/containers/List.hpp (renamed from src/modules/controllib/block/List.hpp) | 6 | ||||
| -rw-r--r-- | src/modules/controllib/block/Block.hpp | 2 | ||||
| -rw-r--r-- | src/modules/controllib/block/BlockParam.hpp | 2 | ||||
| -rw-r--r-- | src/modules/uORB/Publication.hpp | 2 | ||||
| -rw-r--r-- | src/modules/uORB/Subscription.hpp | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/src/modules/controllib/block/List.hpp b/src/include/containers/List.hpp index 96b0b94d1..13cbda938 100644 --- a/src/modules/controllib/block/List.hpp +++ b/src/include/containers/List.hpp @@ -32,9 +32,9 @@ ****************************************************************************/ /** - * @file Node.h + * @file List.hpp * - * A node of a linked list. + * A linked list. */ #pragma once @@ -43,7 +43,7 @@ template<class T> class __EXPORT ListNode { public: - ListNode() : _sibling(NULL) { + ListNode() : _sibling(nullptr) { } void setSibling(T sibling) { _sibling = sibling; } T getSibling() { return _sibling; } diff --git a/src/modules/controllib/block/Block.hpp b/src/modules/controllib/block/Block.hpp index 6a8e1b5b9..736698e21 100644 --- a/src/modules/controllib/block/Block.hpp +++ b/src/modules/controllib/block/Block.hpp @@ -42,7 +42,7 @@ #include <stdint.h> #include <inttypes.h> -#include "List.hpp" +#include <containers/List.hpp> // forward declaration namespace uORB { diff --git a/src/modules/controllib/block/BlockParam.hpp b/src/modules/controllib/block/BlockParam.hpp index 735b2b292..a64d0139e 100644 --- a/src/modules/controllib/block/BlockParam.hpp +++ b/src/modules/controllib/block/BlockParam.hpp @@ -42,7 +42,7 @@ #include <systemlib/param/param.h> #include "Block.hpp" -#include "List.hpp" +#include <containers/List.hpp> namespace control { diff --git a/src/modules/uORB/Publication.hpp b/src/modules/uORB/Publication.hpp index 7fa6bcc17..21840ed70 100644 --- a/src/modules/uORB/Publication.hpp +++ b/src/modules/uORB/Publication.hpp @@ -39,7 +39,7 @@ #pragma once #include <uORB/uORB.h> -#include <controllib/block/List.hpp> +#include <containers/List.hpp> namespace uORB diff --git a/src/modules/uORB/Subscription.hpp b/src/modules/uORB/Subscription.hpp index 55fb95d51..d839f8023 100644 --- a/src/modules/uORB/Subscription.hpp +++ b/src/modules/uORB/Subscription.hpp @@ -39,7 +39,7 @@ #pragma once #include <uORB/uORB.h> -#include <controllib/block/List.hpp> +#include <containers/List.hpp> namespace uORB |