Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b955f33 authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Merge "libutils: sp/wp: undef #defines" 

am: d5c3fe69

Change-Id: I7316502cc50efd08247d8f6f5a0b2ba16bbb3a48
parents da084f96 d5c3fe69

libutils/include/utils/RefBase.h

+1 −0
Original line number Diff line number Diff line
@@ -455,6 +455,7 @@ private: 
};



#undef COMPARE_WEAK

#undef COMPARE_WEAK_FUNCTIONAL



// ---------------------------------------------------------------------------

// No user serviceable parts below here.

libutils/include/utils/StrongPointer.h

+2 −1
Original line number Diff line number Diff line
@@ -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.