[libc++] Move __memory/utilities.h to __memory/allocation_guard.h
This matches the granularity of other headers that were split off of <__memory>.
GitOrigin-RevId: e98060fa72ccb3c43d359dc5842f7d102dcf4378
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index 155d03d..8050fd9 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -14,6 +14,7 @@
__libcpp_version
__locale
__memory/addressof.h
+ __memory/allocation_guard.h
__memory/allocator.h
__memory/allocator_traits.h
__memory/auto_ptr.h
@@ -26,7 +27,6 @@
__memory/temporary_buffer.h
__memory/uninitialized_algorithms.h
__memory/unique_ptr.h
- __memory/utilities.h
__mutex_base
__node_handle
__nullptr
diff --git a/include/__memory/utilities.h b/include/__memory/allocation_guard.h
similarity index 94%
rename from include/__memory/utilities.h
rename to include/__memory/allocation_guard.h
index aac3d11..ea1d264 100644
--- a/include/__memory/utilities.h
+++ b/include/__memory/allocation_guard.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MEMORY_UTILITIES_H
-#define _LIBCPP___MEMORY_UTILITIES_H
+#ifndef _LIBCPP___MEMORY_ALLOCATION_GUARD_H
+#define _LIBCPP___MEMORY_ALLOCATION_GUARD_H
#include <__config>
#include <__memory/allocator_traits.h>
@@ -85,4 +85,4 @@
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___MEMORY_UTILITIES_H
+#endif // _LIBCPP___MEMORY_ALLOCATION_GUARD_H
diff --git a/include/__memory/shared_ptr.h b/include/__memory/shared_ptr.h
index 32d9af6..fae94be 100644
--- a/include/__memory/shared_ptr.h
+++ b/include/__memory/shared_ptr.h
@@ -14,13 +14,13 @@
#include <__availability>
#include <__functional_base> // std::less, std::binary_function
#include <__memory/addressof.h>
+#include <__memory/allocation_guard.h>
#include <__memory/allocator.h>
#include <__memory/allocator_traits.h>
#include <__memory/auto_ptr.h>
#include <__memory/compressed_pair.h>
#include <__memory/pointer_traits.h>
#include <__memory/unique_ptr.h>
-#include <__memory/utilities.h> // __allocation_guard
#include <cstddef>
#include <cstdlib> // abort
#include <iosfwd>
diff --git a/include/memory b/include/memory
index b3c1a86..ae3c2ce 100644
--- a/include/memory
+++ b/include/memory
@@ -679,6 +679,7 @@
#include <stdexcept>
#include <cstring>
#include <__memory/addressof.h>
+#include <__memory/allocation_guard.h>
#include <__memory/allocator.h>
#include <__memory/allocator_traits.h>
#include <__memory/auto_ptr.h>
@@ -691,7 +692,6 @@
#include <__memory/temporary_buffer.h>
#include <__memory/uninitialized_algorithms.h>
#include <__memory/unique_ptr.h>
-#include <__memory/utilities.h>
#include <version>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
