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

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index 793ffd5..f436e85 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -955,7 +955,7 @@
   SoinfoLinkedList found_libs;
   size_t soinfos_size = 0;
 
-  auto failure_guard = create_scope_guard([&]() {
+  auto failure_guard = make_scope_guard([&]() {
     // Housekeeping
     load_tasks.for_each([] (LoadTask* t) {
       LoadTask::deleter(t);