Skip to content

Commit c8d5191

Browse files
committed
Always use the 'virtual' keyword. No longer condition it on a build setting.
Signed-off-by: Rachel Green <[email protected]>
1 parent 612144f commit c8d5191

File tree

1 file changed

+0
-13
lines changed

1 file changed

+0
-13
lines changed

include/proxy-wasm/context.h

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -150,23 +150,14 @@ class ContextBase : public RootInterface,
150150
const std::shared_ptr<PluginHandleBase> &plugin_handle); // Stream context.
151151
virtual ~ContextBase();
152152

153-
#ifdef PROXY_WASM_CPP_HOST_MORE_VIRTUAL_METHODS
154153
virtual WasmBase *wasm() const { return wasm_; }
155-
#else
156-
WasmBase *wasm() const { return wasm_; }
157-
#endif
158154
uint32_t id() const { return id_; }
159155
// The VM Context used for calling "malloc" has an id_ == 0.
160156
bool isVmContext() const { return id_ == 0; }
161157
// Root Contexts have the VM Context as a parent.
162158
bool isRootContext() const { return parent_context_id_ == 0; }
163-
#ifdef PROXY_WASM_CPP_HOST_MORE_VIRTUAL_METHODS
164159
virtual ContextBase *parent_context() const { return parent_context_; }
165160
virtual ContextBase *root_context() const {
166-
#else
167-
ContextBase *parent_context() const { return parent_context_; }
168-
ContextBase *root_context() const {
169-
#endif
170161
const ContextBase *previous = this;
171162
ContextBase *parent = parent_context_;
172163
while (parent != previous) {
@@ -179,11 +170,7 @@ class ContextBase : public RootInterface,
179170
std::string_view log_prefix() const {
180171
return isRootContext() ? root_log_prefix_ : plugin_->log_prefix();
181172
}
182-
#ifdef PROXY_WASM_CPP_HOST_MORE_VIRTUAL_METHODS
183173
virtual WasmVm *wasmVm() const;
184-
#else
185-
WasmVm *wasmVm() const;
186-
#endif
187174

188175
// Called before deleting the context.
189176
virtual void destroy();

0 commit comments

Comments
 (0)