Changeset bc73be3 in mainline for uspace/lib/c/include/adt/list.h

Timestamp:

2019-06-27T08:51:20Z (7 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8add15e0

Parents:

ad40b74b (diff), aeba767 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

cpp: merge and resolve conflicts

File:

• uspace/lib/c/include/adt/list.h (modified) (14 diffs)

uspace/lib/c/include/adt/list.h

@@ -34 +34 @@
  */
 
-#ifndef LIBC_LIST_H_
-#define LIBC_LIST_H_
+#ifndef _LIBC_LIST_H_
+#define _LIBC_LIST_H_
 
 #include <assert.h>
@@ -42 +42 @@
 #include <stdint.h>
 #include <trace.h>
-
-/** Doubly linked list link. */
-typedef struct link {
-        struct link *prev;  /**< Pointer to the previous item in the list. */
-        struct link *next;  /**< Pointer to the next item in the list. */
-} link_t;
-
-/** Doubly linked list. */
-typedef struct list {
-        link_t head;  /**< List head. Does not have any data. */
-} list_t;
-
-extern bool list_member(const link_t *, const list_t *);
-extern void list_splice(list_t *, link_t *);
-extern unsigned long list_count(const list_t *);
+#include <_bits/decls.h>
+
+#ifndef __cplusplus
+
+/**
+ * We don't define the macros in C++ to avoid polluting headers with
+ * namespaceless names. We don't actually need them, so this is fine.
+ * We still allow including the rest of the file (in `helenos` namespace)
+ * so that we can expose publicly visible types that have list_t members.
+ */
 
 /** Declare and initialize statically allocated list.
@@ -138 +133 @@
         assert(!link_used(link))
 
+#define list_pop(list, type, member) \
+        ((type *) list_pop_internal(list, \
+            (list_link_to_void(&(((type *) NULL)->member)) - NULL)))
+
+#endif  /* !__cplusplus */
+
+__HELENOS_DECLS_BEGIN;
+
+/** Doubly linked list link. */
+typedef struct __adt_list_link {
+        struct __adt_list_link *prev;  /**< Pointer to the previous item in the list. */
+        struct __adt_list_link *next;  /**< Pointer to the next item in the list. */
+} link_t;
+
+/** Doubly linked list. */
+typedef struct {
+        link_t head;  /**< List head. Does not have any data. */
+} list_t;
+
+extern bool list_member(const link_t *, const list_t *);
+extern void list_splice(list_t *, link_t *);
+extern unsigned long list_count(const list_t *);
+
 /** Returns true if the link is definitely part of a list. False if not sure. */
 static inline bool link_in_use(const link_t *link)
@@ -151 +169 @@
  *
  */
-NO_TRACE static inline void link_initialize(link_t *link)
+_NO_TRACE static inline void link_initialize(link_t *link)
 {
         link->prev = NULL;
@@ -164 +182 @@
  *
  */
-NO_TRACE static inline void list_initialize(list_t *list)
+_NO_TRACE static inline void list_initialize(list_t *list)
 {
         list->head.prev = &list->head;
@@ -200 +218 @@
  *
  */
-NO_TRACE static inline void list_prepend(link_t *link, list_t *list)
+_NO_TRACE static inline void list_prepend(link_t *link, list_t *list)
 {
         list_insert_after(link, &list->head);
@@ -213 +231 @@
  *
  */
-NO_TRACE static inline void list_append(link_t *link, list_t *list)
+_NO_TRACE static inline void list_append(link_t *link, list_t *list)
 {
         list_insert_before(link, &list->head);
@@ -226 +244 @@
  *
  */
-NO_TRACE static inline void list_remove(link_t *link)
+_NO_TRACE static inline void list_remove(link_t *link)
 {
         if ((link->prev != NULL) && (link->next != NULL)) {
@@ -243 +261 @@
  *
  */
-NO_TRACE static inline bool list_empty(const list_t *list)
+_NO_TRACE static inline bool list_empty(const list_t *list)
 {
         return (list->head.next == &list->head);
@@ -311 +329 @@
  *
  */
-NO_TRACE static inline void headless_list_split_or_concat(link_t *part1, link_t *part2)
+_NO_TRACE static inline void headless_list_split_or_concat(link_t *part1, link_t *part2)
 {
         part1->prev->next = part2;
@@ -332 +350 @@
  *
  */
-NO_TRACE static inline void headless_list_split(link_t *part1, link_t *part2)
+_NO_TRACE static inline void headless_list_split(link_t *part1, link_t *part2)
 {
         headless_list_split_or_concat(part1, part2);
@@ -347 +365 @@
  *
  */
-NO_TRACE static inline void headless_list_concat(link_t *part1, link_t *part2)
+_NO_TRACE static inline void headless_list_concat(link_t *part1, link_t *part2)
 {
         headless_list_split_or_concat(part1, part2);
@@ -362 +380 @@
  *
  */
-NO_TRACE static inline void list_concat(list_t *list1, list_t *list2)
+_NO_TRACE static inline void list_concat(list_t *list1, list_t *list2)
 {
         list_splice(list2, list1->head.prev);
@@ -425 +443 @@
 }
 
-#define list_pop(list, type, member) \
-        ((type *) list_pop_internal(list, \
-            (list_link_to_void(&(((type *) NULL)->member)) - NULL)))
+__HELENOS_DECLS_END;
 
 #endif