Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 661880 | Differences between
and this patch

Collapse All | Expand All

(-)file_not_specified_in_diff (-5 / +11 lines)
Line  Link Here
 return N;
 return N;
1
 return N;
1
 return N;
2
 size_t x = arraysize(non_empty_array);
2
 size_t x = arraysize(non_empty_array);
3
 size_t x = arraysize(empty_array);
3
 size_t x = arraysize(empty_array);
4
 size_t x = size(non_empty_array);
4
 size_t x = size(non_empty_array);
5
 size_t x = size(empty_array);
5
 size_t x = size(empty_array);
6
 size_t x = ARRAY_LENGTH(non_empty_array);
6
 size_t x = ARRAY_LENGTH(non_empty_array);
7
 size_t x = ARRAY_LENGTH(empty_array);
7
 size_t x = ARRAY_LENGTH(empty_array);
8
#define arraysize(array) (sizeof(ArraySizeHelper(array)))
8
#define arraysize(array) (sizeof(ArraySizeHelper(array)))
9
                                                      ^
9
                                                      ^
10
  size_t x = arraysize(empty_array);
10
  size_t x = arraysize(empty_array);
11
             ^~~~~~~~~
11
             ^~~~~~~~~
12
template <typename T, size_t N> char (&ArraySizeHelper(T (&array)[N]))[N];
12
template <typename T, size_t N> char (&ArraySizeHelper(T (&array)[N]))[N];
13
                                       ^~~~~~~~~~~~~~~
13
                                       ^~~~~~~~~~~~~~~
14
 size_t x = arraysize(empty_array);
14
 size_t x = arraysize(empty_array);
15
            ^~~~~~~~~~~~~~~~~~~~~~
15
            ^~~~~~~~~~~~~~~~~~~~~~
16
                                ^~~~~~~~~~~~~~~
16
                                ^~~~~~~~~~~~~~~
17
                                      ^                               ~
17
                                      ^                               ~
18
  size_t x = size(empty_array);
18
  size_t x = size(empty_array);
19
                             ^
19
                             ^
20
constexpr size_t size(const T (&array)[N]) noexcept {
20
constexpr size_t size(const T (&array)[N]) noexcept {
21
                 ^~~~
21
                 ^~~~
22
 size_t x = size(empty_array);
22
 size_t x = size(empty_array);
23
            ^~~~
23
            ^~~~
24
                ^                     ~
24
                ^                     ~
25
-- /third_party/blink/renderer/platform/text/character.cc
25
++ /third_party/blink/renderer/platform/text/character.cc
Lines 61-69 Link Here
61
  return unicodeSet;
61
  return unicodeSet;
62
}
62
}
63
63
64
#define CREATE_UNICODE_SET(name)                                      \
64
// arraysize (from base/macros.h) and base::size (from base/stl_util.h)
65
  createUnicodeSet(name##Array, arraysize(name##Array), name##Ranges, \
65
// cause compilation errors with zero-length arrays.
66
                   arraysize(name##Ranges))
66
#define ARRAY_LENGTH(a) (sizeof(a) / sizeof((a)[0]))
67
68
#define CREATE_UNICODE_SET(name)                             \
69
  createUnicodeSet(name##Array, ARRAY_LENGTH(name##Array),   \
70
                   name##Ranges, ARRAY_LENGTH(name##Ranges))
67
71
68
#define RETURN_HAS_PROPERTY(c, name)            \
72
#define RETURN_HAS_PROPERTY(c, name)            \
69
  static icu::UnicodeSet* unicodeSet = nullptr; \
73
  static icu::UnicodeSet* unicodeSet = nullptr; \
70
-- /third_party/blink/renderer/platform/text/character_property_data_generator.cc
74
++ /third_party/blink/renderer/platform/text/character_property_data_generator.cc
Lines 21-26 Link Here
21
#else
21
#else
22
22
23
const UChar32 kMaxCodepoint = 0x10FFFF;
23
const UChar32 kMaxCodepoint = 0x10FFFF;
24
// arraysize (from base/macros.h) and base::size (from base/stl_util.h)
25
// cause compilation errors with zero-length arrays.
24
#define ARRAY_LENGTH(a) (sizeof(a) / sizeof((a)[0]))
26
#define ARRAY_LENGTH(a) (sizeof(a) / sizeof((a)[0]))
25
27
26
static void SetRanges(CharacterProperty* values,
28
static void SetRanges(CharacterProperty* values,

Return to bug 661880