commit 906f29ee597c94406fbfc95d1fe868bf122bd6d1
author Elliott Hughes <enh@google.com> Fri Jan 24 10:14:49 2025 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 24 10:14:49 2025 -0800
tree 2eb743ecdb9d066575a4a658a731b2674d190ab2
parent 5632c8ba434c5e4be37e6079b0858ff4abbad4f9
parent 20acaada1ad32506a9758740bf84433472da0bc8

Merge "<string> is always available." into main

libutils/binder/include/utils/String8.h

diff --git a/libutils/binder/include/utils/String8.h b/libutils/binder/include/utils/String8.h
index 11415a1..4a23df7 100644
--- a/libutils/binder/include/utils/String8.h
+++ b/libutils/binder/include/utils/String8.h
@@ -18,6 +18,7 @@
 #define ANDROID_STRING8_H
 
 #include <iostream>
+#include <string>
 
 #include <utils/Errors.h>
 #include <utils/Unicode.h>
@@ -26,11 +27,6 @@
 #include <string.h> // for strcmp
 #include <stdarg.h>
 
-#if __has_include(<string>)
-#include <string>
-#define HAS_STRING
-#endif
-
 #if __has_include(<string_view>)
 #include <string_view>
 #define HAS_STRING_VIEW
@@ -390,7 +386,6 @@
 
 // ---------------------------------------------------------------------------
 
-#undef HAS_STRING
 #undef HAS_STRING_VIEW
 
 #endif // ANDROID_STRING8_H