Move scopeguard into android::base
Test: boot bullhead, bionic unit tests
Change-Id: I223249684867655ecb53713b10da41d3014f96ae
diff --git a/tests/pthread_test.cpp b/tests/pthread_test.cpp
index 60fe294..87b4c81 100755
--- a/tests/pthread_test.cpp
+++ b/tests/pthread_test.cpp
@@ -33,9 +33,10 @@
#include <atomic>
#include <vector>
+#include <android-base/scopeguard.h>
+
#include "private/bionic_constants.h"
#include "private/bionic_macros.h"
-#include "private/ScopeGuard.h"
#include "BionicDeathTest.h"
#include "ScopedSignalHandler.h"
#include "utils.h"
@@ -64,7 +65,7 @@
int nkeys = PTHREAD_KEYS_MAX / 2;
std::vector<pthread_key_t> keys;
- auto scope_guard = make_scope_guard([&keys]{
+ auto scope_guard = android::base::make_scope_guard([&keys] {
for (const auto& key : keys) {
EXPECT_EQ(0, pthread_key_delete(key));
}
@@ -1362,7 +1363,7 @@
}
EXPECT_EQ(rl.rlim_cur, stack_size);
- auto guard = make_scope_guard([&rl, original_rlim_cur]() {
+ auto guard = android::base::make_scope_guard([&rl, original_rlim_cur]() {
rl.rlim_cur = original_rlim_cur;
ASSERT_EQ(0, setrlimit(RLIMIT_STACK, &rl));
});