commit 36493a8144e766d508fb282d4a32a40c78eddcfe
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Dec 20 17:22:27 2019 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Dec 20 17:22:27 2019 +0000
tree f0b2eb64517cdababae49fcfe90ea1df2d7f124f
parent 5e028e6049eaf123d0dfce1cce5dbd7c21727e32
parent 179e2986db06bb4daf6f83809f6e94454986e0a6

Merge "libutils: sp/wp: undef #defines" am: d5c3fe6952 am: 0b955f333d

Change-Id: I0681ca23658a02c5fc935afbfcc7fa798948ff09

libutils/include/utils/RefBase.h

diff --git a/libutils/include/utils/RefBase.h b/libutils/include/utils/RefBase.h
index 42c6efb..89f048d 100644
--- a/libutils/include/utils/RefBase.h
+++ b/libutils/include/utils/RefBase.h
@@ -455,6 +455,7 @@
 };
 
 #undef COMPARE_WEAK
+#undef COMPARE_WEAK_FUNCTIONAL
 
 // ---------------------------------------------------------------------------
 // No user serviceable parts below here.

libutils/include/utils/StrongPointer.h

diff --git a/libutils/include/utils/StrongPointer.h b/libutils/include/utils/StrongPointer.h
index 07dd3f1..100e507 100644
--- a/libutils/include/utils/StrongPointer.h
+++ b/libutils/include/utils/StrongPointer.h
@@ -134,7 +134,8 @@
 void sp_report_race();
 void sp_report_stack_pointer();
 
-#undef COMPARE
+#undef COMPARE_STRONG
+#undef COMPARE_STRONG_FUNCTIONAL
 
 // ---------------------------------------------------------------------------
 // No user serviceable parts below here.