Skip to content

Commit f14a715

Browse files
committed
fixup: potential hack for null_ptr
1 parent c0aee51 commit f14a715

File tree

8 files changed

+33
-0
lines changed

8 files changed

+33
-0
lines changed

deps/icu-small/source/common/unicode/char16ptr.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@
1010
#include <cstddef>
1111
#include "unicode/utypes.h"
1212

13+
#if __cplusplus > 201000
14+
namespace std {
15+
typedef decltype(nullptr) nullptr_t;
16+
}
17+
#endif
1318
/**
1419
* \file
1520
* \brief C++ API: char16_t pointer wrappers with

deps/icu-small/source/i18n/number_affixutils.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@
77
#ifndef __NUMBER_AFFIXUTILS_H__
88
#define __NUMBER_AFFIXUTILS_H__
99

10+
#if __cplusplus < 201000
1011
#include <cstdint>
12+
#else
13+
#include <stdint.h>
14+
#endif
1115
#include "number_types.h"
1216
#include "unicode/stringpiece.h"
1317
#include "unicode/unistr.h"

deps/icu-small/source/i18n/number_decimalquantity.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@
77
#ifndef __NUMBER_DECIMALQUANTITY_H__
88
#define __NUMBER_DECIMALQUANTITY_H__
99

10+
#if __cplusplus < 201000
1011
#include <cstdint>
12+
#else
13+
#include <stdint.h>
14+
#endif
1115
#include "unicode/umachine.h"
1216
#include "decNumber.h"
1317
#include "standardplural.h"

deps/icu-small/source/i18n/number_decimfmtprops.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@
88
#define __NUMBER_DECIMFMTPROPS_H__
99

1010
#include "unicode/unistr.h"
11+
#if __cplusplus < 201000
1112
#include <cstdint>
13+
#else
14+
#include <stdint.h>
15+
#endif
1216
#include "unicode/plurrule.h"
1317
#include "unicode/currpinf.h"
1418
#include "unicode/unum.h"

deps/icu-small/source/i18n/number_modifiers.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@
88
#define __NUMBER_MODIFIERS_H__
99

1010
#include <algorithm>
11+
#if __cplusplus < 201000
1112
#include <cstdint>
13+
#else
14+
#include <stdint.h>
15+
#endif
1216
#include "unicode/uniset.h"
1317
#include "unicode/simpleformatter.h"
1418
#include "standardplural.h"

deps/icu-small/source/i18n/number_patternstring.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@
88
#define __NUMBER_PATTERNSTRING_H__
99

1010

11+
#if __cplusplus < 201000
1112
#include <cstdint>
13+
#else
14+
#include <stdint.h>
15+
#endif
1216
#include "unicode/unum.h"
1317
#include "unicode/unistr.h"
1418
#include "number_types.h"

deps/icu-small/source/i18n/number_stringbuilder.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@
88
#define __NUMBER_STRINGBUILDER_H__
99

1010

11+
#if __cplusplus < 201000
1112
#include <cstdint>
13+
#else
14+
#include <stdint.h>
15+
#endif
1216
#include "unicode/numfmt.h"
1317
#include "unicode/ustring.h"
1418
#include "cstring.h"

deps/icu-small/source/i18n/number_types.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@
77
#ifndef __NUMBER_TYPES_H__
88
#define __NUMBER_TYPES_H__
99

10+
#if __cplusplus < 201000
1011
#include <cstdint>
12+
#else
13+
#include <stdint.h>
14+
#endif
1115
#include "unicode/decimfmt.h"
1216
#include "unicode/unum.h"
1317
#include "unicode/numsys.h"

0 commit comments

Comments
 (0)