Skip to content

Commit c56b103

Browse files
targostargos
committed
fixup nullptr_t 2
1 parent 1433ef5 commit c56b103

File tree

2 files changed

+26
-28
lines changed

2 files changed

+26
-28
lines changed

‎deps/v8/include/v8-object.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#ifndef INCLUDE_V8_OBJECT_H_
66
#define INCLUDE_V8_OBJECT_H_
77

8-
#include <stddef.h>
8+
#include <cstddef>
99

1010
#include "cppgc/garbage-collected.h"
1111
#include "cppgc/name-provider.h"
@@ -407,7 +407,7 @@ class V8_EXPORT Object : public Value {
407407
// is removed.
408408
V8_WARN_UNUSED_RESULT Maybe<bool> SetNativeDataProperty(
409409
Local<Context> context, Local<Name> name,
410-
AccessorNameGetterCallback getter, nullptr_t setter = nullptr,
410+
AccessorNameGetterCallback getter, std::nullptr_t setter = nullptr,
411411
Local<Value> data = Local<Value>(), PropertyAttribute attributes = None,
412412
SideEffectType getter_side_effect_type = SideEffectType::kHasSideEffect,
413413
SideEffectType setter_side_effect_type = SideEffectType::kHasSideEffect) {

‎deps/v8/include/v8-template.h‎

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
#ifndef INCLUDE_V8_TEMPLATE_H_
66
#define INCLUDE_V8_TEMPLATE_H_
77

8-
#include <stddef.h>
9-
108
#include <cstddef>
119
#include <string_view>
1210

@@ -119,7 +117,7 @@ class V8_EXPORT Template : public Data {
119117
// is removed.
120118
void SetNativeDataProperty(
121119
Local<Name> name, AccessorNameGetterCallback getter,
122-
nullptr_t setter = nullptr, Local<Value> data = Local<Value>(),
120+
std::nullptr_t setter = nullptr, Local<Value> data = Local<Value>(),
123121
PropertyAttribute attribute = None,
124122
SideEffectType getter_side_effect_type = SideEffectType::kHasSideEffect,
125123
SideEffectType setter_side_effect_type = SideEffectType::kHasSideEffect) {
@@ -750,7 +748,7 @@ struct NamedPropertyHandlerConfiguration {
750748
PropertyHandlerFlags::kInternalNewCallbacksSignatures));
751749
}
752750

753-
static NamedPropertySetterCallbackV2 ConvertSetter(nullptr_t) {
751+
static NamedPropertySetterCallbackV2 ConvertSetter(std::nullptr_t) {
754752
return nullptr;
755753
}
756754
static NamedPropertySetterCallbackV2 ConvertSetter(
@@ -762,7 +760,7 @@ struct NamedPropertyHandlerConfiguration {
762760
return NamedPropertySetterCallbackV2(value);
763761
}
764762

765-
static NamedPropertyDefinerCallbackV2 ConvertDefiner(nullptr_t) {
763+
static NamedPropertyDefinerCallbackV2 ConvertDefiner(std::nullptr_t) {
766764
return nullptr;
767765
}
768766
static NamedPropertyDefinerCallbackV2 ConvertDefiner(
@@ -777,11 +775,11 @@ struct NamedPropertyHandlerConfiguration {
777775
public:
778776
// TODO(https://crbug.com/348660658): cleanup once migration to
779777
// NamedPropertySetterCallbackV2/NamedPropertyDefinerCallbackV2 is done.
780-
template <typename TSetter = nullptr_t, typename TDefiner = nullptr_t>
781-
requires((std::is_same_v<TSetter, nullptr_t> ||
778+
template <typename TSetter = std::nullptr_t, typename TDefiner = std::nullptr_t>
779+
requires((std::is_same_v<TSetter, std::nullptr_t> ||
782780
std::is_same_v<TSetter, NamedPropertySetterCallback> ||
783781
std::is_same_v<TSetter, NamedPropertySetterCallbackV2>) &&
784-
(std::is_same_v<TDefiner, nullptr_t> ||
782+
(std::is_same_v<TDefiner, std::nullptr_t> ||
785783
std::is_same_v<TDefiner, NamedPropertyDefinerCallback> ||
786784
std::is_same_v<TDefiner, NamedPropertyDefinerCallbackV2>))
787785
NamedPropertyHandlerConfiguration(
@@ -806,8 +804,8 @@ struct NamedPropertyHandlerConfiguration {
806804

807805
// TODO(https://crbug.com/348660658): cleanup once migration to
808806
// NamedPropertySetterCallbackV2/NamedPropertyDefinerCallbackV2 is done.
809-
template <typename TSetter = nullptr_t>
810-
requires(std::is_same_v<TSetter, nullptr_t> ||
807+
template <typename TSetter = std::nullptr_t>
808+
requires(std::is_same_v<TSetter, std::nullptr_t> ||
811809
std::is_same_v<TSetter, NamedPropertySetterCallback> ||
812810
std::is_same_v<TSetter, NamedPropertySetterCallbackV2>)
813811
explicit NamedPropertyHandlerConfiguration(
@@ -830,11 +828,11 @@ struct NamedPropertyHandlerConfiguration {
830828

831829
// TODO(https://crbug.com/348660658): cleanup once migration to
832830
// NamedPropertySetterCallbackV2/NamedPropertyDefinerCallbackV2 is done.
833-
template <typename TSetter = nullptr_t, typename TDefiner = nullptr_t>
834-
requires((std::is_same_v<TSetter, nullptr_t> ||
831+
template <typename TSetter = std::nullptr_t, typename TDefiner = std::nullptr_t>
832+
requires((std::is_same_v<TSetter, std::nullptr_t> ||
835833
std::is_same_v<TSetter, NamedPropertySetterCallback> ||
836834
std::is_same_v<TSetter, NamedPropertySetterCallbackV2>) &&
837-
(std::is_same_v<TDefiner, nullptr_t> ||
835+
(std::is_same_v<TDefiner, std::nullptr_t> ||
838836
std::is_same_v<TDefiner, NamedPropertyDefinerCallback> ||
839837
std::is_same_v<TDefiner, NamedPropertyDefinerCallbackV2>))
840838
NamedPropertyHandlerConfiguration(
@@ -877,7 +875,7 @@ struct IndexedPropertyHandlerConfiguration {
877875
PropertyHandlerFlags::kInternalNewCallbacksSignatures));
878876
}
879877

880-
static IndexedPropertySetterCallback ConvertSetter(nullptr_t) {
878+
static IndexedPropertySetterCallback ConvertSetter(std::nullptr_t) {
881879
return nullptr;
882880
}
883881
static IndexedPropertySetterCallback ConvertSetter(
@@ -889,7 +887,7 @@ struct IndexedPropertyHandlerConfiguration {
889887
return IndexedPropertySetterCallback(value);
890888
}
891889

892-
static IndexedPropertyDefinerCallback ConvertDefiner(nullptr_t) {
890+
static IndexedPropertyDefinerCallback ConvertDefiner(std::nullptr_t) {
893891
return nullptr;
894892
}
895893
static IndexedPropertyDefinerCallback ConvertDefiner(
@@ -904,11 +902,11 @@ struct IndexedPropertyHandlerConfiguration {
904902
public:
905903
// TODO(https://crbug.com/348660658): cleanup once migration to
906904
// IndexedPropertySetterCallback/IndexedPropertyDefinerCallback is done.
907-
template <typename TSetter = nullptr_t, typename TDefiner = nullptr_t>
908-
requires((std::is_same_v<TSetter, nullptr_t> ||
905+
template <typename TSetter = std::nullptr_t, typename TDefiner = std::nullptr_t>
906+
requires((std::is_same_v<TSetter, std::nullptr_t> ||
909907
std::is_same_v<TSetter, IndexedPropertySetterCallback> ||
910908
std::is_same_v<TSetter, IndexedPropertySetterCallbackV2>) &&
911-
(std::is_same_v<TDefiner, nullptr_t> ||
909+
(std::is_same_v<TDefiner, std::nullptr_t> ||
912910
std::is_same_v<TDefiner, IndexedPropertyDefinerCallback> ||
913911
std::is_same_v<TDefiner, IndexedPropertyDefinerCallbackV2>))
914912
IndexedPropertyHandlerConfiguration(
@@ -933,8 +931,8 @@ struct IndexedPropertyHandlerConfiguration {
933931

934932
// TODO(https://crbug.com/348660658): cleanup once migration to
935933
// IndexedPropertySetterCallback/IndexedPropertyDefinerCallback is done.
936-
template <typename TSetter = nullptr_t>
937-
requires(std::is_same_v<TSetter, nullptr_t> ||
934+
template <typename TSetter = std::nullptr_t>
935+
requires(std::is_same_v<TSetter, std::nullptr_t> ||
938936
std::is_same_v<TSetter, IndexedPropertySetterCallback> ||
939937
std::is_same_v<TSetter, IndexedPropertySetterCallbackV2>)
940938
explicit IndexedPropertyHandlerConfiguration(
@@ -957,11 +955,11 @@ struct IndexedPropertyHandlerConfiguration {
957955

958956
// TODO(https://crbug.com/348660658): cleanup once migration to
959957
// IndexedPropertySetterCallback/IndexedPropertyDefinerCallback is done.
960-
template <typename TSetter = nullptr_t, typename TDefiner = nullptr_t>
961-
requires((std::is_same_v<TSetter, nullptr_t> ||
958+
template <typename TSetter = std::nullptr_t, typename TDefiner = std::nullptr_t>
959+
requires((std::is_same_v<TSetter, std::nullptr_t> ||
962960
std::is_same_v<TSetter, IndexedPropertySetterCallback> ||
963961
std::is_same_v<TSetter, IndexedPropertySetterCallbackV2>) &&
964-
(std::is_same_v<TDefiner, nullptr_t> ||
962+
(std::is_same_v<TDefiner, std::nullptr_t> ||
965963
std::is_same_v<TDefiner, IndexedPropertyDefinerCallback> ||
966964
std::is_same_v<TDefiner, IndexedPropertyDefinerCallbackV2>))
967965
IndexedPropertyHandlerConfiguration(
@@ -985,11 +983,11 @@ struct IndexedPropertyHandlerConfiguration {
985983

986984
// TODO(https://crbug.com/348660658): cleanup once migration to
987985
// IndexedPropertySetterCallback/IndexedPropertyDefinerCallback is done.
988-
template <typename TSetter = nullptr_t, typename TDefiner = nullptr_t>
989-
requires((std::is_same_v<TSetter, nullptr_t> ||
986+
template <typename TSetter = std::nullptr_t, typename TDefiner = std::nullptr_t>
987+
requires((std::is_same_v<TSetter, std::nullptr_t> ||
990988
std::is_same_v<TSetter, IndexedPropertySetterCallback> ||
991989
std::is_same_v<TSetter, IndexedPropertySetterCallbackV2>) &&
992-
(std::is_same_v<TDefiner, nullptr_t> ||
990+
(std::is_same_v<TDefiner, std::nullptr_t> ||
993991
std::is_same_v<TDefiner, IndexedPropertyDefinerCallback> ||
994992
std::is_same_v<TDefiner, IndexedPropertyDefinerCallbackV2>))
995993
IndexedPropertyHandlerConfiguration(

0 commit comments

Comments
 (0)