From 243f57bb82e78791848ff3a87cf71f615a740219 Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Thu, 19 Dec 2019 16:17:33 -0800 Subject: [PATCH] libutils: sp/wp: undef #defines Seems these undefs are slightly out of sync/out of date. Bug: N/A Test: libutils_test Change-Id: I884ae1ca97754a6459a2c7844264f513eecddaba --- libutils/include/utils/RefBase.h | 1 + libutils/include/utils/StrongPointer.h | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libutils/include/utils/RefBase.h b/libutils/include/utils/RefBase.h index 42c6efb79..89f048db8 100644 --- a/libutils/include/utils/RefBase.h +++ b/libutils/include/utils/RefBase.h @@ -455,6 +455,7 @@ private: }; #undef COMPARE_WEAK +#undef COMPARE_WEAK_FUNCTIONAL // --------------------------------------------------------------------------- // No user serviceable parts below here. diff --git a/libutils/include/utils/StrongPointer.h b/libutils/include/utils/StrongPointer.h index 07dd3f1cd..100e507db 100644 --- a/libutils/include/utils/StrongPointer.h +++ b/libutils/include/utils/StrongPointer.h @@ -134,7 +134,8 @@ private: void sp_report_race(); void sp_report_stack_pointer(); -#undef COMPARE +#undef COMPARE_STRONG +#undef COMPARE_STRONG_FUNCTIONAL // --------------------------------------------------------------------------- // No user serviceable parts below here.