commit ef1306d77718cc74a8df5673a15649dea317571d
author Dmitriy Ivanov <dimitry@google.com> Mon Sep 08 16:22:22 2014 -0700
committer Dmitriy Ivanov <dimitry@google.com> Wed Oct 01 16:03:51 2014 -0700
tree 5c3b3bfc11e46b3ae4021545a36c33ec49e0dafa
parent 61c4147fa8c8abb33ae6fecb85dd1ae1b60e1ed6

Refactoring: C++11 style DISABLE_ bionic marcos

  Enable the -std=gnu++11 flag for libstdc++ static and
  dynamic libs.

  ScopeGuard uses DISABLE_ macros instead of '= delete';

(cherry picked from commit d9ff7226613014056c9edd79a68dc5af939107a0)

Change-Id: If2573d080770e18b36b56106f2369f7bb682cd3c

tests/pthread_test.cpp

diff --git a/tests/pthread_test.cpp b/tests/pthread_test.cpp
index 4a7c6bd..32bb54c 100644
--- a/tests/pthread_test.cpp
+++ b/tests/pthread_test.cpp
@@ -869,7 +869,7 @@
 #endif
   EXPECT_EQ(rl.rlim_cur, stack_size);
 
-  auto guard = create_scope_guard([&rl, original_rlim_cur]() {
+  auto guard = make_scope_guard([&rl, original_rlim_cur]() {
     rl.rlim_cur = original_rlim_cur;
     ASSERT_EQ(0, setrlimit(RLIMIT_STACK, &rl));
   });