summaryrefslogblamecommitdiff
path: root/www-client/chromium/files/chromium-120-safe_sprintf-nullptr-t.patch
blob: e452ba00c1f81e95a871154d49897c08551d1544 (plain) (tree)
1
2
3
4
5
6
7
8
9
10
11
12
13
                                                                                                                                                                                                                    
                                   

                                                                                                        








                                                                                                            








                                                                             
diff --git a/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/strings/safe_sprintf.h b/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/strings/safe_sprintf.h
index 3644afae8b..75e14afa24 100644
--- a/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/strings/safe_sprintf.h
+++ b/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/strings/safe_sprintf.h
@@ -5,7 +5,7 @@
 #ifndef BASE_ALLOCATOR_PARTITION_ALLOCATOR_SRC_PARTITION_ALLOC_PARTITION_ALLOC_BASE_STRINGS_SAFE_SPRINTF_H_
 #define BASE_ALLOCATOR_PARTITION_ALLOCATOR_SRC_PARTITION_ALLOC_PARTITION_ALLOC_BASE_STRINGS_SAFE_SPRINTF_H_
 
-#include <stddef.h>
+#include <cstddef>
 #include <stdint.h>
 #include <stdlib.h>
 
@@ -184,7 +184,7 @@ struct Arg {
   //
   // Warning: don't just do Arg(NULL) here because in some libcs, NULL is an
   // alias for nullptr!
-  Arg(nullptr_t p) : type(INT) {
+  Arg(std::nullptr_t p) : type(INT) {
     integer.i = 0;
     // Internally, SafeSprintf expects to represent nulls as integers whose
     // width is equal to sizeof(NULL), which is not necessarily equal to