diff --git a/src/env-inl.h b/src/env-inl.h index 612b3c48af2848..74e427e40353d9 100644 --- a/src/env-inl.h +++ b/src/env-inl.h @@ -443,9 +443,9 @@ inline v8::Local Environment::NewInternalFieldObject() { return m_obj.ToLocalChecked(); } -#define VP(PropertyName, StringValue) V(v8::Private, PropertyName, StringValue) -#define VS(PropertyName, StringValue) V(v8::String, PropertyName, StringValue) -#define V(TypeName, PropertyName, StringValue) \ +#define VP(PropertyName, StringValue) V(v8::Private, PropertyName) +#define VS(PropertyName, StringValue) V(v8::String, PropertyName) +#define V(TypeName, PropertyName) \ inline \ v8::Local IsolateData::PropertyName(v8::Isolate* isolate) const { \ /* Strings are immutable so casting away const-ness here is okay. */ \ @@ -457,9 +457,9 @@ inline v8::Local Environment::NewInternalFieldObject() { #undef VS #undef VP -#define VP(PropertyName, StringValue) V(v8::Private, PropertyName, StringValue) -#define VS(PropertyName, StringValue) V(v8::String, PropertyName, StringValue) -#define V(TypeName, PropertyName, StringValue) \ +#define VP(PropertyName, StringValue) V(v8::Private, PropertyName) +#define VS(PropertyName, StringValue) V(v8::String, PropertyName) +#define V(TypeName, PropertyName) \ inline v8::Local Environment::PropertyName() const { \ return isolate_data()->PropertyName(isolate()); \ } diff --git a/src/env.h b/src/env.h index e715095f1bb6ab..c040c1a753324f 100644 --- a/src/env.h +++ b/src/env.h @@ -275,9 +275,9 @@ class IsolateData { inline uv_loop_t* event_loop() const; inline uint32_t* zero_fill_field() const; -#define VP(PropertyName, StringValue) V(v8::Private, PropertyName, StringValue) -#define VS(PropertyName, StringValue) V(v8::String, PropertyName, StringValue) -#define V(TypeName, PropertyName, StringValue) \ +#define VP(PropertyName, StringValue) V(v8::Private, PropertyName) +#define VS(PropertyName, StringValue) V(v8::String, PropertyName) +#define V(TypeName, PropertyName) \ inline v8::Local PropertyName(v8::Isolate* isolate) const; PER_ISOLATE_PRIVATE_SYMBOL_PROPERTIES(VP) PER_ISOLATE_STRING_PROPERTIES(VS) @@ -286,9 +286,9 @@ class IsolateData { #undef VP private: -#define VP(PropertyName, StringValue) V(v8::Private, PropertyName, StringValue) -#define VS(PropertyName, StringValue) V(v8::String, PropertyName, StringValue) -#define V(TypeName, PropertyName, StringValue) \ +#define VP(PropertyName, StringValue) V(v8::Private, PropertyName) +#define VS(PropertyName, StringValue) V(v8::String, PropertyName) +#define V(TypeName, PropertyName) \ v8::Eternal PropertyName ## _; PER_ISOLATE_PRIVATE_SYMBOL_PROPERTIES(VP) PER_ISOLATE_STRING_PROPERTIES(VS) @@ -505,9 +505,9 @@ class Environment { // Strings and private symbols are shared across shared contexts // The getters simply proxy to the per-isolate primitive. -#define VP(PropertyName, StringValue) V(v8::Private, PropertyName, StringValue) -#define VS(PropertyName, StringValue) V(v8::String, PropertyName, StringValue) -#define V(TypeName, PropertyName, StringValue) \ +#define VP(PropertyName, StringValue) V(v8::Private, PropertyName) +#define VS(PropertyName, StringValue) V(v8::String, PropertyName) +#define V(TypeName, PropertyName) \ inline v8::Local PropertyName() const; PER_ISOLATE_PRIVATE_SYMBOL_PROPERTIES(VP) PER_ISOLATE_STRING_PROPERTIES(VS)