Add `std::optional` replacement (`nonstd::optional`)

[babeltrace.git] / src / common / list.h

diff --git a/src/common/list.h b/src/common/list.h
index 48d9bbb9c1b75e6d7024dab59f7ea56179972d19..193bf2d7063c3955daed255a8c61abc80465d316 100644 (file)
--- a/src/common/list.h
+++ b/src/common/list.h
@@ -1,21 +1,9 @@
 /*
+ * SPDX-License-Identifier: LGPL-2.1-only
+ *
  * Copyright (C) 2002 Free Software Foundation, Inc.
  * This file is part of the GNU C Library.
  * Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; only
- * version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #ifndef _BT_LIST_H
@@ -142,20 +130,20 @@ bt_list_splice (struct bt_list_head *add, struct bt_list_head *head)
        pos = p, p = pos->prev)
 
 #define bt_list_for_each_entry(pos, head, member)                              \
-       for (pos = bt_list_entry((head)->next, typeof(*pos), member);   \
+       for (pos = bt_list_entry((head)->next, __typeof__(*pos), member);       \
             &pos->member != (head);                                    \
-            pos = bt_list_entry(pos->member.next, typeof(*pos), member))
+            pos = bt_list_entry(pos->member.next, __typeof__(*pos), member))
 
 #define bt_list_for_each_entry_reverse(pos, head, member)                      \
-       for (pos = bt_list_entry((head)->prev, typeof(*pos), member);   \
+       for (pos = bt_list_entry((head)->prev, __typeof__(*pos), member);       \
             &pos->member != (head);                                    \
-            pos = bt_list_entry(pos->member.prev, typeof(*pos), member))
+            pos = bt_list_entry(pos->member.prev, __typeof__(*pos), member))
 
 #define bt_list_for_each_entry_safe(pos, p, head, member)                      \
-       for (pos = bt_list_entry((head)->next, typeof(*pos), member),   \
-                    p = bt_list_entry(pos->member.next,typeof(*pos), member); \
+       for (pos = bt_list_entry((head)->next, __typeof__(*pos), member),       \
+                    p = bt_list_entry(pos->member.next, __typeof__(*pos), member); \
             &pos->member != (head);                                    \
-            pos = p, p = bt_list_entry(pos->member.next, typeof(*pos), member))
+            pos = p, p = bt_list_entry(pos->member.next, __typeof__(*pos), member))
 
 static inline int bt_list_empty(struct bt_list_head *head)
 {