Skip to content

Commit e8c163f

Browse files
joyeecheungjoyeecheung
committed
use std::nullptr_t
1 parent 7ff3bd2 commit e8c163f

2 files changed

Lines changed: 25 additions & 25 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ class V8_EXPORT Object : public Value {
405405
// is removed.
406406
V8_WARN_UNUSED_RESULT Maybe<bool> SetNativeDataProperty(
407407
Local<Context> context, Local<Name> name,
408-
AccessorNameGetterCallback getter, nullptr_t setter = nullptr,
408+
AccessorNameGetterCallback getter, std::nullptr_t setter = nullptr,
409409
Local<Value> data = Local<Value>(), PropertyAttribute attributes = None,
410410
SideEffectType getter_side_effect_type = SideEffectType::kHasSideEffect,
411411
SideEffectType setter_side_effect_type = SideEffectType::kHasSideEffect) {

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

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ class V8_EXPORT Template : public Data {
117117
// is removed.
118118
void SetNativeDataProperty(
119119
Local<Name> name, AccessorNameGetterCallback getter,
120-
nullptr_t setter = nullptr, Local<Value> data = Local<Value>(),
120+
std::nullptr_t setter = nullptr, Local<Value> data = Local<Value>(),
121121
PropertyAttribute attribute = None,
122122
SideEffectType getter_side_effect_type = SideEffectType::kHasSideEffect,
123123
SideEffectType setter_side_effect_type = SideEffectType::kHasSideEffect) {
@@ -748,7 +748,7 @@ struct NamedPropertyHandlerConfiguration {
748748
PropertyHandlerFlags::kInternalNewCallbacksSignatures));
749749
}
750750

751-
static NamedPropertySetterCallbackV2 ConvertSetter(nullptr_t) {
751+
static NamedPropertySetterCallbackV2 ConvertSetter(std::nullptr_t) {
752752
return nullptr;
753753
}
754754
static NamedPropertySetterCallbackV2 ConvertSetter(
@@ -760,7 +760,7 @@ struct NamedPropertyHandlerConfiguration {
760760
return NamedPropertySetterCallbackV2(value);
761761
}
762762

763-
static NamedPropertyDefinerCallbackV2 ConvertDefiner(nullptr_t) {
763+
static NamedPropertyDefinerCallbackV2 ConvertDefiner(std::nullptr_t) {
764764
return nullptr;
765765
}
766766
static NamedPropertyDefinerCallbackV2 ConvertDefiner(
@@ -775,11 +775,11 @@ struct NamedPropertyHandlerConfiguration {
775775
public:
776776
// TODO(https://crbug.com/348660658): cleanup once migration to
777777
// NamedPropertySetterCallbackV2/NamedPropertyDefinerCallbackV2 is done.
778-
template <typename TSetter = nullptr_t, typename TDefiner = nullptr_t>
779-
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> ||
780780
std::is_same_v<TSetter, NamedPropertySetterCallback> ||
781781
std::is_same_v<TSetter, NamedPropertySetterCallbackV2>) &&
782-
(std::is_same_v<TDefiner, nullptr_t> ||
782+
(std::is_same_v<TDefiner, std::nullptr_t> ||
783783
std::is_same_v<TDefiner, NamedPropertyDefinerCallback> ||
784784
std::is_same_v<TDefiner, NamedPropertyDefinerCallbackV2>))
785785
NamedPropertyHandlerConfiguration(
@@ -804,8 +804,8 @@ struct NamedPropertyHandlerConfiguration {
804804

805805
// TODO(https://crbug.com/348660658): cleanup once migration to
806806
// NamedPropertySetterCallbackV2/NamedPropertyDefinerCallbackV2 is done.
807-
template <typename TSetter = nullptr_t>
808-
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> ||
809809
std::is_same_v<TSetter, NamedPropertySetterCallback> ||
810810
std::is_same_v<TSetter, NamedPropertySetterCallbackV2>)
811811
explicit NamedPropertyHandlerConfiguration(
@@ -828,11 +828,11 @@ struct NamedPropertyHandlerConfiguration {
828828

829829
// TODO(https://crbug.com/348660658): cleanup once migration to
830830
// NamedPropertySetterCallbackV2/NamedPropertyDefinerCallbackV2 is done.
831-
template <typename TSetter = nullptr_t, typename TDefiner = nullptr_t>
832-
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> ||
833833
std::is_same_v<TSetter, NamedPropertySetterCallback> ||
834834
std::is_same_v<TSetter, NamedPropertySetterCallbackV2>) &&
835-
(std::is_same_v<TDefiner, nullptr_t> ||
835+
(std::is_same_v<TDefiner, std::nullptr_t> ||
836836
std::is_same_v<TDefiner, NamedPropertyDefinerCallback> ||
837837
std::is_same_v<TDefiner, NamedPropertyDefinerCallbackV2>))
838838
NamedPropertyHandlerConfiguration(
@@ -875,7 +875,7 @@ struct IndexedPropertyHandlerConfiguration {
875875
PropertyHandlerFlags::kInternalNewCallbacksSignatures));
876876
}
877877

878-
static IndexedPropertySetterCallback ConvertSetter(nullptr_t) {
878+
static IndexedPropertySetterCallback ConvertSetter(std::nullptr_t) {
879879
return nullptr;
880880
}
881881
static IndexedPropertySetterCallback ConvertSetter(
@@ -887,7 +887,7 @@ struct IndexedPropertyHandlerConfiguration {
887887
return IndexedPropertySetterCallback(value);
888888
}
889889

890-
static IndexedPropertyDefinerCallback ConvertDefiner(nullptr_t) {
890+
static IndexedPropertyDefinerCallback ConvertDefiner(std::nullptr_t) {
891891
return nullptr;
892892
}
893893
static IndexedPropertyDefinerCallback ConvertDefiner(
@@ -902,11 +902,11 @@ struct IndexedPropertyHandlerConfiguration {
902902
public:
903903
// TODO(https://crbug.com/348660658): cleanup once migration to
904904
// IndexedPropertySetterCallback/IndexedPropertyDefinerCallback is done.
905-
template <typename TSetter = nullptr_t, typename TDefiner = nullptr_t>
906-
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> ||
907907
std::is_same_v<TSetter, IndexedPropertySetterCallback> ||
908908
std::is_same_v<TSetter, IndexedPropertySetterCallbackV2>) &&
909-
(std::is_same_v<TDefiner, nullptr_t> ||
909+
(std::is_same_v<TDefiner, std::nullptr_t> ||
910910
std::is_same_v<TDefiner, IndexedPropertyDefinerCallback> ||
911911
std::is_same_v<TDefiner, IndexedPropertyDefinerCallbackV2>))
912912
IndexedPropertyHandlerConfiguration(
@@ -931,8 +931,8 @@ struct IndexedPropertyHandlerConfiguration {
931931

932932
// TODO(https://crbug.com/348660658): cleanup once migration to
933933
// IndexedPropertySetterCallback/IndexedPropertyDefinerCallback is done.
934-
template <typename TSetter = nullptr_t>
935-
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> ||
936936
std::is_same_v<TSetter, IndexedPropertySetterCallback> ||
937937
std::is_same_v<TSetter, IndexedPropertySetterCallbackV2>)
938938
explicit IndexedPropertyHandlerConfiguration(
@@ -955,11 +955,11 @@ struct IndexedPropertyHandlerConfiguration {
955955

956956
// TODO(https://crbug.com/348660658): cleanup once migration to
957957
// IndexedPropertySetterCallback/IndexedPropertyDefinerCallback is done.
958-
template <typename TSetter = nullptr_t, typename TDefiner = nullptr_t>
959-
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> ||
960960
std::is_same_v<TSetter, IndexedPropertySetterCallback> ||
961961
std::is_same_v<TSetter, IndexedPropertySetterCallbackV2>) &&
962-
(std::is_same_v<TDefiner, nullptr_t> ||
962+
(std::is_same_v<TDefiner, std::nullptr_t> ||
963963
std::is_same_v<TDefiner, IndexedPropertyDefinerCallback> ||
964964
std::is_same_v<TDefiner, IndexedPropertyDefinerCallbackV2>))
965965
IndexedPropertyHandlerConfiguration(
@@ -983,11 +983,11 @@ struct IndexedPropertyHandlerConfiguration {
983983

984984
// TODO(https://crbug.com/348660658): cleanup once migration to
985985
// IndexedPropertySetterCallback/IndexedPropertyDefinerCallback is done.
986-
template <typename TSetter = nullptr_t, typename TDefiner = nullptr_t>
987-
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> ||
988988
std::is_same_v<TSetter, IndexedPropertySetterCallback> ||
989989
std::is_same_v<TSetter, IndexedPropertySetterCallbackV2>) &&
990-
(std::is_same_v<TDefiner, nullptr_t> ||
990+
(std::is_same_v<TDefiner, std::nullptr_t> ||
991991
std::is_same_v<TDefiner, IndexedPropertyDefinerCallback> ||
992992
std::is_same_v<TDefiner, IndexedPropertyDefinerCallbackV2>))
993993
IndexedPropertyHandlerConfiguration(

0 commit comments

Comments
 (0)
⚡