Skip to content

Add missing includes. #173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jun 10, 2021
Merged

Add missing includes. #173

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d7ef133
Add missing includes.
PiotrSikora Jun 9, 2021
33adfe1
Merge remote-tracking branch 'origin/master' into PiotrSikora/fix_inc…
PiotrSikora Jun 9, 2021
6c79d48
review: remove unused proxy-wasm-cpp-sdk.BUILD.
PiotrSikora Jun 9, 2021
2d224a8
Merge remote-tracking branch 'origin/master' into PiotrSikora/fix_inc…
PiotrSikora Jun 9, 2021
a3b8b29
review: backout proxy_wasm_api.h and related changes.
PiotrSikora Jun 9, 2021
3318c97
review: include proxy_wasm_enums.h in a place where it's needed.
PiotrSikora Jun 9, 2021
87ff4bc
review: update to the merged commit.
PiotrSikora Jun 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions bazel/external/proxy-wasm-cpp-sdk.BUILD
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions bazel/repositories.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
def proxy_wasm_cpp_host_repositories():
http_archive(
name = "proxy_wasm_cpp_sdk",
sha256 = "b97e3e716b1f38dc601487aa0bde72490bbc82b8f3ad73f1f3e69733984955df",
strip_prefix = "proxy-wasm-cpp-sdk-956f0d500c380cc1656a2d861b7ee12c2515a664",
urls = ["https://github.com/proxy-wasm/proxy-wasm-cpp-sdk/archive/956f0d500c380cc1656a2d861b7ee12c2515a664.tar.gz"],
sha256 = "73460c9c7243ea27babe9db5e8fc646a1ccaae1faeb6e17a4b21fc46d5867a95",
strip_prefix = "proxy-wasm-cpp-sdk-b8321ec4c758e23ed831361daa55c5b88ee7e4cd",
urls = ["https://github.com/proxy-wasm/proxy-wasm-cpp-sdk/archive/b8321ec4c758e23ed831361daa55c5b88ee7e4cd.tar.gz"],
)

http_archive(
Expand Down
3 changes: 2 additions & 1 deletion include/proxy-wasm/exports.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@

#include <memory>

#include "include/proxy-wasm/word.h"
#include "include/proxy-wasm/context.h"
#include "include/proxy-wasm/wasm_vm.h"
#include "include/proxy-wasm/word.h"

namespace proxy_wasm {

Expand Down
7 changes: 7 additions & 0 deletions include/proxy-wasm/wasm_api_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,14 @@
#include <utility>
#include <vector>

#include "include/proxy-wasm/exports.h"
#include "include/proxy-wasm/word.h"

namespace proxy_wasm {
namespace null_plugin {

#include "proxy_wasm_common.h"

#define WS(_x) Word(static_cast<uint64_t>(_x))
#define WR(_x) Word(reinterpret_cast<uint64_t>(_x))

Expand Down Expand Up @@ -285,7 +290,9 @@ inline WasmResult proxy_call_foreign_function(const char *function_name, size_t
#undef WS
#undef WR

#define PROXY_WASM_USE_CPP_EXTERNS
#include "proxy_wasm_api.h"
#undef PROXY_WASM_USE_CPP_EXTERNS

RootContext *getRoot(std::string_view root_id);
Context *getContext(uint32_t context_id);
Expand Down