From ea379ef4d652156d1a8540e71f89a40b6ee0c5a5 Mon Sep 17 00:00:00 2001 From: Sandboxed API Team Date: Mon, 26 Oct 2020 09:08:06 -0700 Subject: [PATCH] Cleans up statusor.h includes. PiperOrigin-RevId: 339050213 Change-Id: Iea5747f907b294503cdb37e1c25cf787c7e83dcf --- oss-internship-2020/curl/tests/test_utils.cc | 2 ++ oss-internship-2020/curl/tests/test_utils.h | 1 + oss-internship-2020/guetzli/guetzli_sapi_test.cc | 1 + oss-internship-2020/guetzli/guetzli_transaction.cc | 2 ++ oss-internship-2020/guetzli/guetzli_transaction.h | 1 + oss-internship-2020/lodepng/examples/helpers.cc | 1 + oss-internship-2020/lodepng/examples/main_sandboxed.cc | 1 + oss-internship-2020/openjpeg/examples/decompress_example.cc | 1 + sandboxed_api/BUILD.bazel | 1 + sandboxed_api/sandbox.cc | 1 + sandboxed_api/sandbox.h | 1 + sandboxed_api/tools/clang_generator/CMakeLists.txt | 1 + sandboxed_api/tools/clang_generator/emitter_test.cc | 1 + sandboxed_api/var_proto.h | 1 + 14 files changed, 16 insertions(+) diff --git a/oss-internship-2020/curl/tests/test_utils.cc b/oss-internship-2020/curl/tests/test_utils.cc index 061fee6..d9fcbd5 100644 --- a/oss-internship-2020/curl/tests/test_utils.cc +++ b/oss-internship-2020/curl/tests/test_utils.cc @@ -25,6 +25,8 @@ #include #include // NOLINT(build/c++11) +#include "absl/status/statusor.h" + int CurlTestUtils::port_; std::thread CurlTestUtils::server_thread_; diff --git a/oss-internship-2020/curl/tests/test_utils.h b/oss-internship-2020/curl/tests/test_utils.h index 05e3a1a..8b849bb 100644 --- a/oss-internship-2020/curl/tests/test_utils.h +++ b/oss-internship-2020/curl/tests/test_utils.h @@ -19,6 +19,7 @@ #include "curl_sapi.sapi.h" // NOLINT(build/include) #include "gtest/gtest.h" #include "sandboxed_api/util/flag.h" +#include "absl/status/statusor.h" #include "sandboxed_api/util/status_matchers.h" namespace curl::tests { diff --git a/oss-internship-2020/guetzli/guetzli_sapi_test.cc b/oss-internship-2020/guetzli/guetzli_sapi_test.cc index b275036..dd9949c 100644 --- a/oss-internship-2020/guetzli/guetzli_sapi_test.cc +++ b/oss-internship-2020/guetzli/guetzli_sapi_test.cc @@ -24,6 +24,7 @@ #include "guetzli_sandbox.h" // NOLINT(build/include) #include "gtest/gtest.h" +#include "absl/status/statusor.h" #include "sandboxed_api/sandbox2/util/fileops.h" #include "sandboxed_api/vars.h" diff --git a/oss-internship-2020/guetzli/guetzli_transaction.cc b/oss-internship-2020/guetzli/guetzli_transaction.cc index d3bc1bd..0252d7c 100644 --- a/oss-internship-2020/guetzli/guetzli_transaction.cc +++ b/oss-internship-2020/guetzli/guetzli_transaction.cc @@ -22,6 +22,8 @@ #include #include +#include "absl/status/statusor.h" + namespace guetzli::sandbox { absl::Status GuetzliTransaction::Main() { diff --git a/oss-internship-2020/guetzli/guetzli_transaction.h b/oss-internship-2020/guetzli/guetzli_transaction.h index 2cda32d..c14528d 100644 --- a/oss-internship-2020/guetzli/guetzli_transaction.h +++ b/oss-internship-2020/guetzli/guetzli_transaction.h @@ -18,6 +18,7 @@ #include #include "guetzli_sandbox.h" // NOLINT(build/include) +#include "absl/status/statusor.h" #include "sandboxed_api/transaction.h" #include "sandboxed_api/vars.h" diff --git a/oss-internship-2020/lodepng/examples/helpers.cc b/oss-internship-2020/lodepng/examples/helpers.cc index 328f21f..cc5ac2e 100644 --- a/oss-internship-2020/lodepng/examples/helpers.cc +++ b/oss-internship-2020/lodepng/examples/helpers.cc @@ -14,6 +14,7 @@ #include "helpers.h" // NOLINT(build/include) +#include "absl/status/statusor.h" #include "sandboxed_api/sandbox2/util/temp_file.h" std::vector GenerateValues() { diff --git a/oss-internship-2020/lodepng/examples/main_sandboxed.cc b/oss-internship-2020/lodepng/examples/main_sandboxed.cc index a1cdfbe..2314785 100644 --- a/oss-internship-2020/lodepng/examples/main_sandboxed.cc +++ b/oss-internship-2020/lodepng/examples/main_sandboxed.cc @@ -17,6 +17,7 @@ #include #include "helpers.h" // NOLINT(build/include) #include "sandbox.h" // NOLINT(build/include) +#include "absl/status/statusor.h" void EncodeDecodeOneStep(SapiLodepngSandbox& sandbox, LodepngApi& api) { // Generate the values. diff --git a/oss-internship-2020/openjpeg/examples/decompress_example.cc b/oss-internship-2020/openjpeg/examples/decompress_example.cc index a090a22..35f2621 100644 --- a/oss-internship-2020/openjpeg/examples/decompress_example.cc +++ b/oss-internship-2020/openjpeg/examples/decompress_example.cc @@ -23,6 +23,7 @@ #include "gen_files/convert.h" // NOLINT(build/include) #include "openjp2_sapi.sapi.h" // NOLINT(build/include) +#include "absl/status/statusor.h" class Openjp2SapiSandbox : public Openjp2Sandbox { public: diff --git a/sandboxed_api/BUILD.bazel b/sandboxed_api/BUILD.bazel index 59ed83a..ca794f0 100644 --- a/sandboxed_api/BUILD.bazel +++ b/sandboxed_api/BUILD.bazel @@ -81,6 +81,7 @@ cc_library( "@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/memory", "@com_google_absl//absl/status", + "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings", "@com_google_absl//absl/strings:str_format", "@com_google_absl//absl/synchronization", diff --git a/sandboxed_api/sandbox.cc b/sandboxed_api/sandbox.cc index cfa7dca..e527d0c 100644 --- a/sandboxed_api/sandbox.cc +++ b/sandboxed_api/sandbox.cc @@ -27,6 +27,7 @@ #include "absl/base/macros.h" #include "absl/memory/memory.h" #include "absl/status/status.h" +#include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" #include "absl/time/time.h" diff --git a/sandboxed_api/sandbox.h b/sandboxed_api/sandbox.h index 8be0bd7..f0503f6 100644 --- a/sandboxed_api/sandbox.h +++ b/sandboxed_api/sandbox.h @@ -21,6 +21,7 @@ #include "sandboxed_api/file_toc.h" #include "absl/base/macros.h" +#include "absl/status/statusor.h" #include "sandboxed_api/rpcchannel.h" #include "sandboxed_api/sandbox2/client.h" #include "sandboxed_api/sandbox2/comms.h" diff --git a/sandboxed_api/tools/clang_generator/CMakeLists.txt b/sandboxed_api/tools/clang_generator/CMakeLists.txt index e3fd9c2..9415d36 100644 --- a/sandboxed_api/tools/clang_generator/CMakeLists.txt +++ b/sandboxed_api/tools/clang_generator/CMakeLists.txt @@ -77,6 +77,7 @@ if(SAPI_ENABLE_TESTS) sapi::sapi sapi::generator sapi::status + sapi::statusor sapi::status_matchers sapi::test_main ) diff --git a/sandboxed_api/tools/clang_generator/emitter_test.cc b/sandboxed_api/tools/clang_generator/emitter_test.cc index e6e82e9..84f7b61 100644 --- a/sandboxed_api/tools/clang_generator/emitter_test.cc +++ b/sandboxed_api/tools/clang_generator/emitter_test.cc @@ -19,6 +19,7 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" #include "absl/memory/memory.h" +#include "absl/status/statusor.h" #include "absl/strings/string_view.h" #include "sandboxed_api/sandbox2/testing.h" #include "sandboxed_api/tools/clang_generator/frontend_action_test_util.h" diff --git a/sandboxed_api/var_proto.h b/sandboxed_api/var_proto.h index ffa8128..d305449 100644 --- a/sandboxed_api/var_proto.h +++ b/sandboxed_api/var_proto.h @@ -23,6 +23,7 @@ #include "absl/base/macros.h" #include "absl/memory/memory.h" +#include "absl/status/statusor.h" #include "sandboxed_api/proto_helper.h" #include "sandboxed_api/var_lenval.h" #include "sandboxed_api/var_pointable.h"