commit af99e1e88a4db4d4e88afe9fd0a74a0735a36ae8
author Elliott Hughes <enh@google.com> Mon Aug 17 20:35:59 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Aug 17 20:35:59 2020 +0000
tree ad278ea028bf6023addf448276564449ba13401b
parent 5350746a2b7f87560fcb2d89226545ca54e3259f
parent 884cedc770442b5bb8a1a29fd95964a8c07b209f

Merge "Don't #include <utils/Debug.h> from <utils/Flattenable.h>."

libutils/include/utils/Flattenable.h

diff --git a/libutils/include/utils/Flattenable.h b/libutils/include/utils/Flattenable.h
index 17c5e10..8aa381a 100644
--- a/libutils/include/utils/Flattenable.h
+++ b/libutils/include/utils/Flattenable.h
@@ -14,8 +14,7 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_UTILS_FLATTENABLE_H
-#define ANDROID_UTILS_FLATTENABLE_H
+#pragma once
 
 // DO NOT USE: please use parcelable instead
 // This code is deprecated and will not be supported via AIDL code gen. For data
@@ -25,7 +24,6 @@
 #include <string.h>
 #include <sys/types.h>
 #include <utils/Errors.h>
-#include <utils/Debug.h>
 
 #include <type_traits>
 
@@ -217,5 +215,3 @@
 };
 
 }  // namespace android
-
-#endif /* ANDROID_UTILS_FLATTENABLE_H */