Merge "Refactoring: C++11 style DISABLE_ bionic marcos"

2014-09-12 16:50:04 +00:00
parent 8d8a789c49 d9ff722661
commit 66bbf1595c
7 changed files with 26 additions and 24 deletions
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -929,7 +929,7 @@ static bool find_libraries(const char* const library_names[], size_t library_nam
  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);