fix: proxy_wasm namespace polution with std defs

fixes:

    In file included from external/proxy_wasm_cpp_host/src/null/null.cc:17:
    In file included from external/proxy_wasm_cpp_host/include/proxy-wasm/null_vm.h:22:
    In file included from external/proxy_wasm_cpp_host/include/proxy-wasm/null_vm_plugin.h:18:
    In file included from external/proxy_wasm_cpp_host/include/proxy-wasm/wasm_vm.h:26:
    In file included from external/proxy_wasm_cpp_host/include/proxy-wasm/word.h:22:
    external/proxy_wasm_cpp_sdk/proxy_wasm_common.h:59:8: error: no type named 'string' in namespace 'proxy_wasm::std'; did you mean '::std::string'?
    inline std::string toString(WasmResult r) {
           ^~~~~~~~~~~
           ::std::string

Signed-off-by: Ivan Prisyazhnyy <[email protected]>

Author: sitano

BUILD

@@ -37,6 +37,7 @@ filegroup(
 cc_library(
     name = "wasm_vm_headers",
     hdrs = [
+        "include/proxy-wasm/sdk.h",
         "include/proxy-wasm/limits.h",
         "include/proxy-wasm/wasm_vm.h",
         "include/proxy-wasm/word.h",

include/proxy-wasm/context.h

@@ -26,13 +26,11 @@
 #include <string_view>
 #include <vector>
 
+#include "include/proxy-wasm/sdk.h"
 #include "include/proxy-wasm/context_interface.h"
 
 namespace proxy_wasm {
 
-#include "proxy_wasm_common.h"
-#include "proxy_wasm_enums.h"
-
 class PluginHandleBase;
 class WasmBase;
 class WasmVm;

include/proxy-wasm/context_interface.h

@@ -25,10 +25,9 @@
 #include <memory>
 #include <vector>
 
-namespace proxy_wasm {
+#include "include/proxy-wasm/sdk.h"
 
-#include "proxy_wasm_common.h"
-#include "proxy_wasm_enums.h"
+namespace proxy_wasm {
 
 using Pairs = std::vector<std::pair<std::string_view, std::string_view>>;
 using PairsWithStringValues = std::vector<std::pair<std::string_view, std::string>>;

include/proxy-wasm/sdk.h

@@ -0,0 +1,59 @@
+// Copyright 2016-2019 Envoy Project Authors
+// Copyright 2020 Google LLC
+//
+// 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 <string>
+#include <cstdint>
+
+namespace proxy_wasm {
+
+namespace internal {
+
+// isolate those includes to prevent ::proxy_wasm namespace pollution with std
+// namespace definitions.
+namespace proxy_wasm {
+
+  // FIXME: remove when <proxy_wasm_common.h> will fix std::string namespace ref.
+  namespace std {
+    using string = ::std::string;
+  }
+
+  #include "proxy_wasm_common.h"
+  #include "proxy_wasm_enums.h"
+
+}
+
+}
+
+  // proxy_wasm_common.h
+  using WasmResult = internal::proxy_wasm::WasmResult;
+  using WasmHeaderMapType = internal::proxy_wasm::WasmHeaderMapType;
+  using WasmBufferType = internal::proxy_wasm::WasmBufferType;
+  using WasmBufferFlags = internal::proxy_wasm::WasmBufferFlags;
+  using WasmStreamType = internal::proxy_wasm::WasmStreamType;
+
+  // proxy_wasm_enums.h
+  using LogLevel = internal::proxy_wasm::LogLevel;
+  using FilterStatus = internal::proxy_wasm::FilterStatus;
+  using FilterHeadersStatus = internal::proxy_wasm::FilterHeadersStatus;
+  using FilterMetadataStatus = internal::proxy_wasm::FilterMetadataStatus;
+  using FilterTrailersStatus = internal::proxy_wasm::FilterTrailersStatus;
+  using FilterDataStatus = internal::proxy_wasm::FilterDataStatus;
+  using GrpcStatus = internal::proxy_wasm::GrpcStatus;
+  using MetricType = internal::proxy_wasm::MetricType;
+  using CloseType = internal::proxy_wasm::CloseType;
+
+}

include/proxy-wasm/wasm.h

@@ -24,15 +24,14 @@
 #include <unordered_map>
 #include <unordered_set>
 
+#include "include/proxy-wasm/sdk.h"
 #include "include/proxy-wasm/context.h"
 #include "include/proxy-wasm/exports.h"
 #include "include/proxy-wasm/wasm_vm.h"
 #include "include/proxy-wasm/vm_id_handle.h"
 
 namespace proxy_wasm {
 
-#include "proxy_wasm_common.h"
-
 class ContextBase;
 class WasmHandleBase;
 

include/proxy-wasm/wasm_api_impl.h

@@ -30,15 +30,13 @@
 #include <utility>
 #include <vector>
 
+#include "include/proxy-wasm/sdk.h"
 #include "include/proxy-wasm/exports.h"
 #include "include/proxy-wasm/word.h"
 
 namespace proxy_wasm {
 namespace null_plugin {
 
-#include "proxy_wasm_enums.h"
-#include "proxy_wasm_common.h"
-
 #define WS(_x) Word(static_cast<uint64_t>(_x))
 #define WR(_x) Word(reinterpret_cast<uint64_t>(_x))
 

include/proxy-wasm/wasm_vm.h

@@ -24,12 +24,11 @@
 #include <unordered_set>
 #include <vector>
 
+#include "include/proxy-wasm/sdk.h"
 #include "include/proxy-wasm/word.h"
 
 namespace proxy_wasm {
 
-#include "proxy_wasm_enums.h"
-
 class ContextBase;
 
 // These are templates and its helper for constructing signatures of functions calling into Wasm

include/proxy-wasm/word.h

@@ -17,9 +17,9 @@
 
 #include <iostream>
 
-namespace proxy_wasm {
+#include "include/proxy-wasm/sdk.h"
 
-#include "proxy_wasm_common.h"
+namespace proxy_wasm {
 
 // Use byteswap functions only when compiling for big-endian platforms.
 #if defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__) &&                                    \