From 4bd58951456ac6082e23a1931293965852c24281 Mon Sep 17 00:00:00 2001 From: Bernie Innocenti Date: Thu, 6 Feb 2020 15:43:57 +0900 Subject: Convert art/ to Result::ok() No functionality changes, this is a mechanical cleanup. Test: m Change-Id: I10030314ad8a06d49a63f1e2f3c5aa5b484e34b6 --- libnativeloader/native_loader_namespace.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libnativeloader/native_loader_namespace.cpp') diff --git a/libnativeloader/native_loader_namespace.cpp b/libnativeloader/native_loader_namespace.cpp index 6faa78cdde..49f3035dd5 100644 --- a/libnativeloader/native_loader_namespace.cpp +++ b/libnativeloader/native_loader_namespace.cpp @@ -68,9 +68,9 @@ Result NativeLoaderNamespace::GetExportedNamespace(const // "default" always exists. Result NativeLoaderNamespace::GetSystemNamespace(bool is_bridged) { auto ns = GetExportedNamespace(kSystemNamespaceName, is_bridged); - if (ns) return ns; + if (ns.ok()) return ns; ns = GetExportedNamespace(kDefaultNamespaceName, is_bridged); - if (ns) return ns; + if (ns.ok()) return ns; // If nothing is found, return NativeLoaderNamespace constructed from nullptr. // nullptr also means default namespace to the linker. @@ -95,7 +95,7 @@ Result NativeLoaderNamespace::Create( // Fall back to the system namespace if no parent is set. auto system_ns = GetSystemNamespace(is_bridged); - if (!system_ns) { + if (!system_ns.ok()) { return system_ns.error(); } const NativeLoaderNamespace& effective_parent = parent != nullptr ? *parent : *system_ns; -- cgit v1.2.3-59-g8ed1b