diff options
| author | Tom Cherry <tomcherry@google.com> | 2019-05-27 10:56:44 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-27 10:56:44 -0700 |
| commit | 0e68ab18fbef221e1a18fbf63babfd5d17bf3b2c (patch) | |
| tree | 62d78b6f2b3873de7c078a44a0f7b294e68cdd7e /init/rlimit_parser.cpp | |
| parent | 8c261482b8cbf3219cfc646b62a7404951d69905 (diff) | |
| parent | 13775b21afcdde6bb88d7390030d39a9cd6165ea (diff) | |
Merge "init: replace Result<> with expected<>" am: 7d1f11759a am: b1012c9de8 am: eb87c4be66
am: 13775b21af
Change-Id: I426e4ea8314a46025596614beb88ca68a99a6a92
Diffstat (limited to 'init/rlimit_parser.cpp')
| -rw-r--r-- | init/rlimit_parser.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/init/rlimit_parser.cpp b/init/rlimit_parser.cpp index 1e0754ac0..476a46ab8 100644 --- a/init/rlimit_parser.cpp +++ b/init/rlimit_parser.cpp @@ -77,7 +77,7 @@ Result<std::pair<int, rlimit>> ParseRlimit(const std::vector<std::string>& args) return Error() << "Could not parse hard limit '" << args[3] << "'"; } - return {resource, limit}; + return std::pair{resource, limit}; } } // namespace init |