When closing a namespace a } is sufficient. It doesn't need to be }; like closing a class or enum. Within frameworks/base/libs/hwui there is a mix between } and }; when closing a namespace. There are even mixes between a .h and the corresponding .cpp files. In a separate CL I was asked to not close with };. That was a good comment. I adopted the style from nearby code. This CL cleans up the nearby code. Test: I made sure the code still built as expected. Change-Id: Ieb314a4f48d6e33752463f3be4361fdc9be97482
55 lines
1.4 KiB
C++
55 lines
1.4 KiB
C++
/*
|
|
* Copyright (C) 2018 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <variant>
|
|
#include <log/log.h>
|
|
|
|
namespace android::uirenderer {
|
|
|
|
template <typename E>
|
|
struct Error {
|
|
E error;
|
|
};
|
|
|
|
template <typename R, typename E>
|
|
class Result {
|
|
public:
|
|
Result(const R& r) : result(std::forward<R>(r)) {}
|
|
Result(R&& r) : result(std::forward<R>(r)) {}
|
|
Result(Error<E>&& error) : result(std::forward<Error<E>>(error)) {}
|
|
|
|
operator bool() const {
|
|
return result.index() == 0;
|
|
}
|
|
|
|
R unwrap() const {
|
|
LOG_ALWAYS_FATAL_IF(result.index() == 1, "unwrap called on error value!");
|
|
return std::get<R>(result);
|
|
}
|
|
|
|
E error() const {
|
|
LOG_ALWAYS_FATAL_IF(result.index() == 0, "No error to get from Result");
|
|
return std::get<Error<E>>(result).error;
|
|
}
|
|
|
|
private:
|
|
std::variant<R, Error<E>> result;
|
|
};
|
|
|
|
} // namespace android::uirenderer
|