From 057e25a86a4a30510a4c53a6d0b019493a465225 Mon Sep 17 00:00:00 2001
From: Piotr Sikora <piotrsikora@google.com>
Date: Fri, 23 Aug 2019 20:17:46 -0700
Subject: [PATCH] Fix after previous commit. (#149)

Signed-off-by: Piotr Sikora <piotrsikora@google.com>
---
 api/wasm/cpp/proxy_wasm_api.h                    | 2 +-
 api/wasm/cpp/proxy_wasm_intrinsics.h             | 2 ++
 source/extensions/common/wasm/null/null_plugin.h | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/api/wasm/cpp/proxy_wasm_api.h b/api/wasm/cpp/proxy_wasm_api.h
index a179701f2acc..dc48e8f33551 100644
--- a/api/wasm/cpp/proxy_wasm_api.h
+++ b/api/wasm/cpp/proxy_wasm_api.h
@@ -530,7 +530,7 @@ inline WasmResult getPluginDirection(PluginDirection *direction_ptr) {
 }
 
 // Generic selector
-inline absl::optional<WasmDataPtr> getSelectorExpression(std::initializer_list<absl::string_view> parts) {
+inline Optional<WasmDataPtr> getSelectorExpression(std::initializer_list<StringView> parts) {
   size_t size = 0;
   for (auto part: parts) {
     size += part.size() + 1; // null terminated string value
diff --git a/api/wasm/cpp/proxy_wasm_intrinsics.h b/api/wasm/cpp/proxy_wasm_intrinsics.h
index 72eba23cce01..9717757cc640 100644
--- a/api/wasm/cpp/proxy_wasm_intrinsics.h
+++ b/api/wasm/cpp/proxy_wasm_intrinsics.h
@@ -12,6 +12,8 @@
 #include <cstdint>
 #include <string_view>
 using StringView = std::string_view;
+#include <optional>
+template <typename T> using Optional = std::optional<T>;
 
 #include "proxy_wasm_enums.h"
 #include "proxy_wasm_result.h"
diff --git a/source/extensions/common/wasm/null/null_plugin.h b/source/extensions/common/wasm/null/null_plugin.h
index d1dc63e9978a..f7581aa1e8e6 100644
--- a/source/extensions/common/wasm/null/null_plugin.h
+++ b/source/extensions/common/wasm/null/null_plugin.h
@@ -19,6 +19,7 @@ using FilterDataStatus = Http::FilterDataStatus;
 using GrpcStatus = Envoy::Grpc::Status::GrpcStatus;
 using MetricType = Envoy::Extensions::Common::Wasm::Context::MetricType;
 using StringView = absl::string_view;
+template <typename T> using Optional = absl::optional<T>;
 } // namespace Plugin
 } // namespace Null
 } // namespace Wasm