Merge remote-tracking branch 'origin/master' into PiotrSikora/dual_abi

PiotrSikora · PiotrSikora · commit aa2158d63a6f · 2020-08-04T07:12:29.000Z
diff --git a/.github/workflows/cpp.yml b/.github/workflows/cpp.yml
@@ -19,10 +19,12 @@ on:
   pull_request:
     branches:
     - master
+    - 'envoy-release/**'
 
   push:
     branches:
     - master
+    - 'envoy-release/**'
 
 jobs:
 
diff --git a/include/proxy-wasm/context_interface.h b/include/proxy-wasm/context_interface.h
@@ -20,6 +20,7 @@
 #include <chrono>
 #include <functional>
 #include <iostream>
+#include <optional>
 #include <map>
 #include <memory>
 #include <vector>
diff --git a/include/proxy-wasm/wasm_vm.h b/include/proxy-wasm/wasm_vm.h
@@ -17,6 +17,7 @@
 
 #include <functional>
 #include <memory>
+#include <optional>
 
 #include "include/proxy-wasm/word.h"
 
diff --git a/src/v8/v8.cc b/src/v8/v8.cc
@@ -18,6 +18,7 @@
 #include <cassert>
 
 #include <memory>
+#include <optional>
 #include <utility>
 #include <vector>
 
diff --git a/src/wavm/wavm.cc b/src/wavm/wavm.cc
@@ -17,6 +17,7 @@
 
 #include <iostream>
 #include <memory>
+#include <optional>
 #include <unordered_map>
 #include <utility>
 #include <vector>
