diff options
| author | Mårten Kongstad <marten.kongstad@sony.com> | 2019-01-31 10:50:48 +0100 |
|---|---|---|
| committer | Ryan Mitchell <rtmitchell@google.com> | 2019-02-27 20:31:51 +0000 |
| commit | 49d835d84ebb53ac291bbc2d9a55877fbcc512a8 (patch) | |
| tree | 72b185cc8b5ab8da7d16b52c620238f061ff2b87 /cmds/idmap2/idmap2d/Idmap2Service.cpp | |
| parent | dbd7154348c1de142a31ae6033c95294b7d363fc (diff) | |
idmap2: switch to improved Result class
Remove the old std::optional based Result class, replace uses with the
new std::variant based Result class.
Test: make idmap2_tests
Change-Id: I401cb36e5af06133a2872d835cf29bfb0b106597
Diffstat (limited to 'cmds/idmap2/idmap2d/Idmap2Service.cpp')
| -rw-r--r-- | cmds/idmap2/idmap2d/Idmap2Service.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/cmds/idmap2/idmap2d/Idmap2Service.cpp b/cmds/idmap2/idmap2d/Idmap2Service.cpp index 0e4bd89e355c..fa944143e408 100644 --- a/cmds/idmap2/idmap2d/Idmap2Service.cpp +++ b/cmds/idmap2/idmap2d/Idmap2Service.cpp @@ -34,7 +34,6 @@ #include "idmap2/FileUtils.h" #include "idmap2/Idmap.h" #include "idmap2/Policies.h" -#include "idmap2/Result.h" #include "idmap2/SysTrace.h" #include "idmap2d/Idmap2Service.h" @@ -45,7 +44,6 @@ using android::idmap2::BinaryStreamVisitor; using android::idmap2::Idmap; using android::idmap2::IdmapHeader; using android::idmap2::PolicyBitmask; -using android::idmap2::Result; using android::idmap2::utils::kIdmapCacheDir; using android::idmap2::utils::kIdmapFilePermissionMask; using android::idmap2::utils::UidHasWriteAccessToPath; |