[libcxx-commits] [libcxx] cc82a1b - [libc++][NFC] Fix include guards and add a missing license header
Louis Dionne via libcxx-commits
libcxx-commits at lists.llvm.org
Wed Mar 23 10:14:24 PDT 2022
Author: Louis Dionne
Date: 2022-03-23T13:14:19-04:00
New Revision: cc82a1b02a29c1f3a839f388391c13217d361326
URL: https://github.com/llvm/llvm-project/commit/cc82a1b02a29c1f3a839f388391c13217d361326
DIFF: https://github.com/llvm/llvm-project/commit/cc82a1b02a29c1f3a839f388391c13217d361326.diff
LOG: [libc++][NFC] Fix include guards and add a missing license header
Added:
Modified:
libcxx/include/__bsd_locale_defaults.h
libcxx/include/__bsd_locale_fallbacks.h
libcxx/include/__config
libcxx/include/__config_site.in
libcxx/include/__debug
libcxx/include/__hash_table
libcxx/include/__split_buffer
libcxx/include/__threading_support
Removed:
################################################################################
diff --git a/libcxx/include/__bsd_locale_defaults.h b/libcxx/include/__bsd_locale_defaults.h
index ce86b41b8204a..4d990482d4a3a 100644
--- a/libcxx/include/__bsd_locale_defaults.h
+++ b/libcxx/include/__bsd_locale_defaults.h
@@ -11,8 +11,8 @@
// we will define the mapping from an internal macro to the real BSD symbol.
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_BSD_LOCALE_DEFAULTS_H
-#define _LIBCPP_BSD_LOCALE_DEFAULTS_H
+#ifndef _LIBCPP___BSD_LOCALE_DEFAULTS_H
+#define _LIBCPP___BSD_LOCALE_DEFAULTS_H
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
# pragma GCC system_header
@@ -33,4 +33,4 @@
#define __libcpp_asprintf_l(...) asprintf_l(__VA_ARGS__)
#define __libcpp_sscanf_l(...) sscanf_l(__VA_ARGS__)
-#endif // _LIBCPP_BSD_LOCALE_DEFAULTS_H
+#endif // _LIBCPP___BSD_LOCALE_DEFAULTS_H
diff --git a/libcxx/include/__bsd_locale_fallbacks.h b/libcxx/include/__bsd_locale_fallbacks.h
index ceb1407d52459..3d5b785744805 100644
--- a/libcxx/include/__bsd_locale_fallbacks.h
+++ b/libcxx/include/__bsd_locale_fallbacks.h
@@ -10,8 +10,8 @@
// of those functions for non-BSD platforms.
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_BSD_LOCALE_FALLBACKS_DEFAULTS_H
-#define _LIBCPP_BSD_LOCALE_FALLBACKS_DEFAULTS_H
+#ifndef _LIBCPP___BSD_LOCALE_FALLBACKS_H
+#define _LIBCPP___BSD_LOCALE_FALLBACKS_H
#include <memory>
#include <stdarg.h>
@@ -140,4 +140,4 @@ int __libcpp_sscanf_l(const char *__s, locale_t __l, const char *__format, ...)
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP_BSD_LOCALE_FALLBACKS_DEFAULTS_H
+#endif // _LIBCPP___BSD_LOCALE_FALLBACKS_H
diff --git a/libcxx/include/__config b/libcxx/include/__config
index e829816270301..6e3a0bfb56468 100644
--- a/libcxx/include/__config
+++ b/libcxx/include/__config
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_CONFIG
-#define _LIBCPP_CONFIG
+#ifndef _LIBCPP___CONFIG
+#define _LIBCPP___CONFIG
#include <__config_site>
@@ -1363,4 +1363,4 @@ extern "C" _LIBCPP_FUNC_VIS void __sanitizer_annotate_contiguous_container(
#endif // __cplusplus
-#endif // _LIBCPP_CONFIG
+#endif // _LIBCPP___CONFIG
diff --git a/libcxx/include/__config_site.in b/libcxx/include/__config_site.in
index 8f5265e5ca3d4..b85262b14cf62 100644
--- a/libcxx/include/__config_site.in
+++ b/libcxx/include/__config_site.in
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_CONFIG_SITE
-#define _LIBCPP_CONFIG_SITE
+#ifndef _LIBCPP___CONFIG_SITE
+#define _LIBCPP___CONFIG_SITE
#cmakedefine _LIBCPP_ABI_VERSION @_LIBCPP_ABI_VERSION@
#cmakedefine _LIBCPP_ABI_NAMESPACE @_LIBCPP_ABI_NAMESPACE@
@@ -46,4 +46,4 @@
# pragma clang diagnostic pop
#endif
-#endif // _LIBCPP_CONFIG_SITE
+#endif // _LIBCPP___CONFIG_SITE
diff --git a/libcxx/include/__debug b/libcxx/include/__debug
index a4160b3b7f4ad..f5ebcac153d57 100644
--- a/libcxx/include/__debug
+++ b/libcxx/include/__debug
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_DEBUG_H
-#define _LIBCPP_DEBUG_H
+#ifndef _LIBCPP___DEBUG
+#define _LIBCPP___DEBUG
#include <__assert>
#include <__config>
@@ -229,4 +229,4 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 inline void __debug_db_inser
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP_DEBUG_H
+#endif // _LIBCPP___DEBUG
diff --git a/libcxx/include/__hash_table b/libcxx/include/__hash_table
index d53132437767f..f4e3a1e5bb7c3 100644
--- a/libcxx/include/__hash_table
+++ b/libcxx/include/__hash_table
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP__HASH_TABLE
-#define _LIBCPP__HASH_TABLE
+#ifndef _LIBCPP___HASH_TABLE
+#define _LIBCPP___HASH_TABLE
#include <__algorithm/max.h>
#include <__algorithm/min.h>
@@ -2799,4 +2799,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP__HASH_TABLE
+#endif // _LIBCPP___HASH_TABLE
diff --git a/libcxx/include/__split_buffer b/libcxx/include/__split_buffer
index 9565e16960f3d..852f02a2c4d53 100644
--- a/libcxx/include/__split_buffer
+++ b/libcxx/include/__split_buffer
@@ -1,6 +1,14 @@
// -*- C++ -*-
-#ifndef _LIBCPP_SPLIT_BUFFER
-#define _LIBCPP_SPLIT_BUFFER
+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef _LIBCPP___SPLIT_BUFFER
+#define _LIBCPP___SPLIT_BUFFER
#include <__algorithm/max.h>
#include <__algorithm/move.h>
@@ -625,4 +633,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP_SPLIT_BUFFER
+#endif // _LIBCPP___SPLIT_BUFFER
diff --git a/libcxx/include/__threading_support b/libcxx/include/__threading_support
index 4f1640ab36d0c..8f1efb7854b72 100644
--- a/libcxx/include/__threading_support
+++ b/libcxx/include/__threading_support
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_THREADING_SUPPORT
-#define _LIBCPP_THREADING_SUPPORT
+#ifndef _LIBCPP___THREADING_SUPPORT
+#define _LIBCPP___THREADING_SUPPORT
#include <__availability>
#include <__chrono/convert_to_timespec.h>
@@ -674,4 +674,4 @@ get_id() _NOEXCEPT
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP_THREADING_SUPPORT
+#endif // _LIBCPP___THREADING_SUPPORT
More information about the libcxx-commits
mailing list