Skip to content

Commit e8bdd55

Browse files
author
Liam Mitchell
committed
Merge branch '3.18.00'
2 parents b9ad2e0 + 7c29937 commit e8bdd55

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+2982
-821
lines changed

‎doc/EASTL.natvis‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -558,6 +558,76 @@
558558
<DisplayString>{mFlag.mAtomic}</DisplayString>
559559
</Type>
560560

561+
<Type Name="eastl::variant&lt;*&gt;">
562+
<Intrinsic Name="index" Expression="(int)mIndex"/>
563+
<DisplayString Condition="index() == size_t(-1)">[valueless_by_exception]</DisplayString>
564+
<DisplayString Condition="index() == 0" Optional="true">{{ index=0, value={($T1*)mStorage.mBuffer.mCharData}}</DisplayString>
565+
<DisplayString Condition="index() == 1" Optional="true">{{ index=1, value={($T2*)mStorage.mBuffer.mCharData}}</DisplayString>
566+
<DisplayString Condition="index() == 2" Optional="true">{{ index=2, value={($T3*)mStorage.mBuffer.mCharData}}</DisplayString>
567+
<DisplayString Condition="index() == 3" Optional="true">{{ index=3, value={($T4*)mStorage.mBuffer.mCharData}}</DisplayString>
568+
<DisplayString Condition="index() == 4" Optional="true">{{ index=4, value={($T5*)mStorage.mBuffer.mCharData}}</DisplayString>
569+
<DisplayString Condition="index() == 5" Optional="true">{{ index=5, value={($T6*)mStorage.mBuffer.mCharData}}</DisplayString>
570+
<DisplayString Condition="index() == 6" Optional="true">{{ index=6, value={($T7*)mStorage.mBuffer.mCharData}}</DisplayString>
571+
<DisplayString Condition="index() == 7" Optional="true">{{ index=7, value={($T8*)mStorage.mBuffer.mCharData}}</DisplayString>
572+
<DisplayString Condition="index() == 8" Optional="true">{{ index=8, value={($T9*)mStorage.mBuffer.mCharData}}</DisplayString>
573+
<DisplayString Condition="index() == 9" Optional="true">{{ index=9, value={($T10*)mStorage.mBuffer.mCharData}}</DisplayString>
574+
<DisplayString Condition="index() == 10" Optional="true">{{ index=10, value={($T11*)mStorage.mBuffer.mCharData}}</DisplayString>
575+
<DisplayString Condition="index() == 11" Optional="true">{{ index=11, value={($T12*)mStorage.mBuffer.mCharData}}</DisplayString>
576+
<DisplayString Condition="index() == 12" Optional="true">{{ index=12, value={($T13*)mStorage.mBuffer.mCharData}}</DisplayString>
577+
<DisplayString Condition="index() == 13" Optional="true">{{ index=13, value={($T14*)mStorage.mBuffer.mCharData}}</DisplayString>
578+
<DisplayString Condition="index() == 14" Optional="true">{{ index=14, value={($T15*)mStorage.mBuffer.mCharData}}</DisplayString>
579+
<DisplayString Condition="index() == 15" Optional="true">{{ index=15, value={($T16*)mStorage.mBuffer.mCharData}}</DisplayString>
580+
<DisplayString Condition="index() == 16" Optional="true">{{ index=16, value={($T17*)mStorage.mBuffer.mCharData}}</DisplayString>
581+
<DisplayString Condition="index() == 17" Optional="true">{{ index=17, value={($T18*)mStorage.mBuffer.mCharData}}</DisplayString>
582+
<DisplayString Condition="index() == 18" Optional="true">{{ index=18, value={($T19*)mStorage.mBuffer.mCharData}}</DisplayString>
583+
<DisplayString Condition="index() == 19" Optional="true">{{ index=19, value={($T20*)mStorage.mBuffer.mCharData}}</DisplayString>
584+
<DisplayString Condition="index() == 20" Optional="true">{{ index=20, value={($T21*)mStorage.mBuffer.mCharData}}</DisplayString>
585+
<DisplayString Condition="index() == 21" Optional="true">{{ index=21, value={($T22*)mStorage.mBuffer.mCharData}}</DisplayString>
586+
<DisplayString Condition="index() == 22" Optional="true">{{ index=22, value={($T23*)mStorage.mBuffer.mCharData}}</DisplayString>
587+
<DisplayString Condition="index() == 23" Optional="true">{{ index=23, value={($T24*)mStorage.mBuffer.mCharData}}</DisplayString>
588+
<DisplayString Condition="index() == 24" Optional="true">{{ index=24, value={($T25*)mStorage.mBuffer.mCharData}}</DisplayString>
589+
<DisplayString Condition="index() == 25" Optional="true">{{ index=25, value={($T26*)mStorage.mBuffer.mCharData}}</DisplayString>
590+
<DisplayString Condition="index() == 26" Optional="true">{{ index=26, value={($T27*)mStorage.mBuffer.mCharData}}</DisplayString>
591+
<DisplayString Condition="index() == 27" Optional="true">{{ index=27, value={($T28*)mStorage.mBuffer.mCharData}}</DisplayString>
592+
<DisplayString Condition="index() == 28" Optional="true">{{ index=28, value={($T29*)mStorage.mBuffer.mCharData}}</DisplayString>
593+
<DisplayString Condition="index() == 29" Optional="true">{{ index=29, value={($T30*)mStorage.mBuffer.mCharData}}</DisplayString>
594+
<DisplayString Condition="index() == 30" Optional="true">{{ index=30, value={($T31*)mStorage.mBuffer.mCharData}}</DisplayString>
595+
<Expand>
596+
<Item Name="index">index()</Item>
597+
<Item Name="[value]" Condition="index() == 0" Optional="true">($T1*)mStorage.mBuffer.mCharData</Item>
598+
<Item Name="[value]" Condition="index() == 1" Optional="true">($T2*)mStorage.mBuffer.mCharData</Item>
599+
<Item Name="[value]" Condition="index() == 2" Optional="true">($T3*)mStorage.mBuffer.mCharData</Item>
600+
<Item Name="[value]" Condition="index() == 3" Optional="true">($T4*)mStorage.mBuffer.mCharData</Item>
601+
<Item Name="[value]" Condition="index() == 4" Optional="true">($T5*)mStorage.mBuffer.mCharData</Item>
602+
<Item Name="[value]" Condition="index() == 5" Optional="true">($T6*)mStorage.mBuffer.mCharData</Item>
603+
<Item Name="[value]" Condition="index() == 6" Optional="true">($T7*)mStorage.mBuffer.mCharData</Item>
604+
<Item Name="[value]" Condition="index() == 7" Optional="true">($T8*)mStorage.mBuffer.mCharData</Item>
605+
<Item Name="[value]" Condition="index() == 8" Optional="true">($T9*)mStorage.mBuffer.mCharData</Item>
606+
<Item Name="[value]" Condition="index() == 9" Optional="true">($T10*)mStorage.mBuffer.mCharData</Item>
607+
<Item Name="[value]" Condition="index() == 10" Optional="true">($T11*)mStorage.mBuffer.mCharData</Item>
608+
<Item Name="[value]" Condition="index() == 11" Optional="true">($T12*)mStorage.mBuffer.mCharData</Item>
609+
<Item Name="[value]" Condition="index() == 12" Optional="true">($T13*)mStorage.mBuffer.mCharData</Item>
610+
<Item Name="[value]" Condition="index() == 13" Optional="true">($T14*)mStorage.mBuffer.mCharData</Item>
611+
<Item Name="[value]" Condition="index() == 14" Optional="true">($T15*)mStorage.mBuffer.mCharData</Item>
612+
<Item Name="[value]" Condition="index() == 15" Optional="true">($T16*)mStorage.mBuffer.mCharData</Item>
613+
<Item Name="[value]" Condition="index() == 16" Optional="true">($T17*)mStorage.mBuffer.mCharData</Item>
614+
<Item Name="[value]" Condition="index() == 17" Optional="true">($T18*)mStorage.mBuffer.mCharData</Item>
615+
<Item Name="[value]" Condition="index() == 18" Optional="true">($T19*)mStorage.mBuffer.mCharData</Item>
616+
<Item Name="[value]" Condition="index() == 19" Optional="true">($T20*)mStorage.mBuffer.mCharData</Item>
617+
<Item Name="[value]" Condition="index() == 20" Optional="true">($T21*)mStorage.mBuffer.mCharData</Item>
618+
<Item Name="[value]" Condition="index() == 21" Optional="true">($T22*)mStorage.mBuffer.mCharData</Item>
619+
<Item Name="[value]" Condition="index() == 22" Optional="true">($T23*)mStorage.mBuffer.mCharData</Item>
620+
<Item Name="[value]" Condition="index() == 23" Optional="true">($T24*)mStorage.mBuffer.mCharData</Item>
621+
<Item Name="[value]" Condition="index() == 24" Optional="true">($T25*)mStorage.mBuffer.mCharData</Item>
622+
<Item Name="[value]" Condition="index() == 25" Optional="true">($T26*)mStorage.mBuffer.mCharData</Item>
623+
<Item Name="[value]" Condition="index() == 26" Optional="true">($T27*)mStorage.mBuffer.mCharData</Item>
624+
<Item Name="[value]" Condition="index() == 27" Optional="true">($T28*)mStorage.mBuffer.mCharData</Item>
625+
<Item Name="[value]" Condition="index() == 28" Optional="true">($T29*)mStorage.mBuffer.mCharData</Item>
626+
<Item Name="[value]" Condition="index() == 29" Optional="true">($T30*)mStorage.mBuffer.mCharData</Item>
627+
<Item Name="[value]" Condition="index() == 30" Optional="true">($T31*)mStorage.mBuffer.mCharData</Item>
628+
</Expand>
629+
</Type>
630+
561631

562632
<!-- TODO eastl::tuple -->
563633

‎include/EASTL/allocator_malloc.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
#endif
4141
#elif defined(EA_PLATFORM_BSD)
4242
#include <malloc/malloc.h>
43-
#elif defined(EA_COMPILER_CLANG)
43+
#elif defined(__clang__)
4444
#if __has_include(<malloc/malloc.h>)
4545
#include <malloc/malloc.h>
4646
#elif __has_include(<malloc.h>)

‎include/EASTL/array.h‎

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -279,12 +279,6 @@ namespace eastl
279279
EA_CPP14_CONSTEXPR inline typename array<T, N>::reference
280280
array<T, N>::operator[](size_type i)
281281
{
282-
#if EASTL_ASSERT_ENABLED
283-
if(EASTL_UNLIKELY(i >= N))
284-
EASTL_FAIL_MSG("array::operator[] -- out of range");
285-
#endif
286-
287-
EA_ANALYSIS_ASSUME(i < N);
288282
return mValue[i];
289283
}
290284

@@ -293,13 +287,6 @@ namespace eastl
293287
EA_CPP14_CONSTEXPR inline typename array<T, N>::const_reference
294288
array<T, N>::operator[](size_type i) const
295289
{
296-
#if EASTL_ASSERT_ENABLED
297-
if(EASTL_UNLIKELY(i >= N))
298-
EASTL_FAIL_MSG("array::operator[] -- out of range");
299-
300-
#endif
301-
302-
EA_ANALYSIS_ASSUME(i < N);
303290
return mValue[i];
304291
}
305292

@@ -308,11 +295,6 @@ namespace eastl
308295
EA_CPP14_CONSTEXPR inline typename array<T, N>::reference
309296
array<T, N>::front()
310297
{
311-
#if EASTL_ASSERT_ENABLED
312-
if(EASTL_UNLIKELY(empty())) // We don't allow the user to reference an empty container.
313-
EASTL_FAIL_MSG("array::front -- empty array");
314-
#endif
315-
316298
return mValue[0];
317299
}
318300

@@ -321,11 +303,6 @@ namespace eastl
321303
EA_CPP14_CONSTEXPR inline typename array<T, N>::const_reference
322304
array<T, N>::front() const
323305
{
324-
#if EASTL_ASSERT_ENABLED
325-
if(EASTL_UNLIKELY(empty())) // We don't allow the user to reference an empty container.
326-
EASTL_FAIL_MSG("array::front -- empty array");
327-
#endif
328-
329306
return mValue[0];
330307
}
331308

@@ -334,11 +311,6 @@ namespace eastl
334311
EA_CPP14_CONSTEXPR inline typename array<T, N>::reference
335312
array<T, N>::back()
336313
{
337-
#if EASTL_ASSERT_ENABLED
338-
if(EASTL_UNLIKELY(empty())) // We don't allow the user to reference an empty container.
339-
EASTL_FAIL_MSG("array::back -- empty array");
340-
#endif
341-
342314
return mValue[N - 1];
343315
}
344316

@@ -347,11 +319,6 @@ namespace eastl
347319
EA_CPP14_CONSTEXPR inline typename array<T, N>::const_reference
348320
array<T, N>::back() const
349321
{
350-
#if EASTL_ASSERT_ENABLED
351-
if(EASTL_UNLIKELY(empty())) // We don't allow the user to reference an empty container.
352-
EASTL_FAIL_MSG("array::back -- empty array");
353-
#endif
354-
355322
return mValue[N - 1];
356323
}
357324

@@ -381,7 +348,6 @@ namespace eastl
381348
EASTL_FAIL_MSG("array::at -- out of range");
382349
#endif
383350

384-
EA_ANALYSIS_ASSUME(i < N);
385351
return static_cast<const_reference>(mValue[i]);
386352
}
387353

@@ -397,7 +363,6 @@ namespace eastl
397363
EASTL_FAIL_MSG("array::at -- out of range");
398364
#endif
399365

400-
EA_ANALYSIS_ASSUME(i < N);
401366
return static_cast<reference>(mValue[i]);
402367
}
403368

‎include/EASTL/bit.h‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
/////////////////////////////////////////////////////////////////////////////
2+
// Copyright (c) Electronic Arts Inc. All rights reserved.
3+
/////////////////////////////////////////////////////////////////////////////
4+
5+
#ifndef EASTL_BIT_H
6+
#define EASTL_BIT_H
7+
8+
#include <EASTL/internal/config.h>
9+
10+
#if defined(EA_PRAGMA_ONCE_SUPPORTED)
11+
#pragma once
12+
#endif
13+
14+
#include <EASTL/internal/memory_base.h>
15+
#include <EASTL/type_traits.h>
16+
#include <string.h> // memcpy
17+
18+
namespace eastl
19+
{
20+
// eastl::bit_cast
21+
// Obtains a value of type To by reinterpreting the object representation of 'from'.
22+
// Every bit in the value representation of the returned To object is equal to the
23+
// corresponding bit in the object representation of 'from'.
24+
//
25+
// In order for bit_cast to be constexpr, the compiler needs to explicitly support
26+
// it by providing the __builtin_bit_cast builtin. If that builtin is not available,
27+
// then we memcpy into aligned storage at runtime and return that instead.
28+
//
29+
// Both types To and From must be equal in size, and must be trivially copyable.
30+
31+
#if defined(EASTL_CONSTEXPR_BIT_CAST_SUPPORTED) && EASTL_CONSTEXPR_BIT_CAST_SUPPORTED
32+
33+
template<typename To, typename From,
34+
typename = eastl::enable_if_t<
35+
sizeof(To) == sizeof(From)
36+
&& eastl::is_trivially_copyable<To>::value
37+
&& eastl::is_trivially_copyable<From>::value
38+
>
39+
>
40+
EA_CONSTEXPR To bit_cast(const From& from) EA_NOEXCEPT
41+
{
42+
return __builtin_bit_cast(To, from);
43+
}
44+
45+
#else
46+
47+
template<typename To, typename From,
48+
typename = eastl::enable_if_t<
49+
sizeof(To) == sizeof(From)
50+
&& eastl::is_trivially_copyable<To>::value
51+
&& eastl::is_trivially_copyable<From>::value
52+
>
53+
>
54+
inline To bit_cast(const From& from) EA_NOEXCEPT
55+
{
56+
typename eastl::aligned_storage<sizeof(To), alignof(To)>::type to;
57+
::memcpy(eastl::addressof(to), eastl::addressof(from), sizeof(To));
58+
return reinterpret_cast<To&>(to);
59+
}
60+
61+
#endif // EASTL_CONSTEXPR_BIT_CAST_SUPPORTED
62+
63+
} // namespace eastl
64+
65+
#endif // EASTL_BIT_H

‎include/EASTL/bitset.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1505,7 +1505,7 @@ EA_RESTORE_GCC_WARNING()
15051505
inline typename BitsetBase<2, WordType>::size_type
15061506
BitsetBase<2, WordType>::count() const
15071507
{
1508-
#if defined(__GNUC__) && (((__GNUC__ * 100) + __GNUC_MINOR__) >= 304) // GCC 3.4 or later
1508+
#if (defined(__GNUC__) && (((__GNUC__ * 100) + __GNUC_MINOR__) >= 304)) || defined(__clang__) // GCC 3.4 or later
15091509
#if(EA_PLATFORM_WORD_SIZE == 4)
15101510
return (size_type)__builtin_popcountl(mWord[0]) + (size_type)__builtin_popcountl(mWord[1]);
15111511
#else

‎include/EASTL/chrono.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -597,8 +597,7 @@ namespace chrono
597597
timespec ts;
598598
int result = clock_gettime(CLOCK_MONOTONIC, &ts);
599599

600-
if(result == EINVAL
601-
)
600+
if (result == -1 && errno == EINVAL)
602601
result = clock_gettime(CLOCK_REALTIME, &ts);
603602

604603
const uint64_t nNanoseconds = (uint64_t)ts.tv_nsec + ((uint64_t)ts.tv_sec * UINT64_C(1000000000));

‎include/EASTL/fixed_hash_map.h‎

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ namespace eastl
251251
base_type::set_max_load_factor(10000.f); // Set it so that we will never resize.
252252

253253
#if EASTL_NAME_ENABLED
254-
mAllocator.set_name(EASTL_FIXED_HASH_MAP_DEFAULT_NAME);
254+
mAllocator.set_name(EASTL_FIXED_HASH_MAP_DEFAULT_NAME);
255255
#endif
256256

257257
mAllocator.reset(mNodeBuffer);
@@ -267,11 +267,13 @@ namespace eastl
267267
{
268268
EASTL_CT_ASSERT((nodeCount >= 1) && (bucketCount >= 2));
269269

270-
if(!bEnableOverflow)
270+
if (!bEnableOverflow)
271+
{
271272
base_type::set_max_load_factor(10000.f); // Set it so that we will never resize.
273+
}
272274

273275
#if EASTL_NAME_ENABLED
274-
mAllocator.set_name(EASTL_FIXED_HASH_MAP_DEFAULT_NAME);
276+
mAllocator.set_name(EASTL_FIXED_HASH_MAP_DEFAULT_NAME);
275277
#endif
276278

277279
mAllocator.reset(mNodeBuffer);
@@ -288,11 +290,13 @@ namespace eastl
288290
{
289291
EASTL_CT_ASSERT((nodeCount >= 1) && (bucketCount >= 2));
290292

291-
if(!bEnableOverflow)
293+
if (!bEnableOverflow)
294+
{
292295
base_type::set_max_load_factor(10000.f); // Set it so that we will never resize.
296+
}
293297

294298
#if EASTL_NAME_ENABLED
295-
mAllocator.set_name(EASTL_FIXED_HASH_MAP_DEFAULT_NAME);
299+
mAllocator.set_name(EASTL_FIXED_HASH_MAP_DEFAULT_NAME);
296300
#endif
297301

298302
mAllocator.reset(mNodeBuffer);
@@ -314,7 +318,7 @@ namespace eastl
314318
base_type::set_max_load_factor(10000.f); // Set it so that we will never resize.
315319

316320
#if EASTL_NAME_ENABLED
317-
mAllocator.set_name(EASTL_FIXED_HASH_MAP_DEFAULT_NAME);
321+
mAllocator.set_name(EASTL_FIXED_HASH_MAP_DEFAULT_NAME);
318322
#endif
319323

320324
mAllocator.reset(mNodeBuffer);
@@ -377,7 +381,7 @@ namespace eastl
377381
mAllocator.copy_overflow_allocator(x.mAllocator);
378382

379383
#if EASTL_NAME_ENABLED
380-
mAllocator.set_name(x.mAllocator.get_name());
384+
mAllocator.set_name(x.mAllocator.get_name());
381385
#endif
382386

383387
EASTL_CT_ASSERT((nodeCount >= 1) && (bucketCount >= 2));
@@ -402,7 +406,7 @@ namespace eastl
402406
base_type::set_max_load_factor(10000.f); // Set it so that we will never resize.
403407

404408
#if EASTL_NAME_ENABLED
405-
mAllocator.set_name(EASTL_FIXED_HASH_MAP_DEFAULT_NAME);
409+
mAllocator.set_name(EASTL_FIXED_HASH_MAP_DEFAULT_NAME);
406410
#endif
407411

408412
mAllocator.reset(mNodeBuffer);
@@ -532,8 +536,10 @@ namespace eastl
532536
{
533537
EASTL_CT_ASSERT((nodeCount >= 1) && (bucketCount >= 2));
534538

535-
if(!bEnableOverflow)
539+
if (!bEnableOverflow)
540+
{
536541
base_type::set_max_load_factor(10000.f); // Set it so that we will never resize.
542+
}
537543

538544
#if EASTL_NAME_ENABLED
539545
mAllocator.set_name(EASTL_FIXED_HASH_MULTIMAP_DEFAULT_NAME);
@@ -556,7 +562,7 @@ namespace eastl
556562
base_type::set_max_load_factor(10000.f); // Set it so that we will never resize.
557563

558564
#if EASTL_NAME_ENABLED
559-
mAllocator.set_name(EASTL_FIXED_HASH_MULTIMAP_DEFAULT_NAME);
565+
mAllocator.set_name(EASTL_FIXED_HASH_MULTIMAP_DEFAULT_NAME);
560566
#endif
561567

562568
mAllocator.reset(mNodeBuffer);
@@ -577,7 +583,7 @@ namespace eastl
577583
base_type::set_max_load_factor(10000.f); // Set it so that we will never resize.
578584

579585
#if EASTL_NAME_ENABLED
580-
mAllocator.set_name(EASTL_FIXED_HASH_MULTIMAP_DEFAULT_NAME);
586+
mAllocator.set_name(EASTL_FIXED_HASH_MULTIMAP_DEFAULT_NAME);
581587
#endif
582588

583589
mAllocator.reset(mNodeBuffer);
@@ -599,7 +605,7 @@ namespace eastl
599605
base_type::set_max_load_factor(10000.f); // Set it so that we will never resize.
600606

601607
#if EASTL_NAME_ENABLED
602-
mAllocator.set_name(EASTL_FIXED_HASH_MULTIMAP_DEFAULT_NAME);
608+
mAllocator.set_name(EASTL_FIXED_HASH_MULTIMAP_DEFAULT_NAME);
603609
#endif
604610

605611
mAllocator.reset(mNodeBuffer);
@@ -616,7 +622,7 @@ namespace eastl
616622
mAllocator.copy_overflow_allocator(x.mAllocator);
617623

618624
#if EASTL_NAME_ENABLED
619-
mAllocator.set_name(x.mAllocator.get_name());
625+
mAllocator.set_name(x.mAllocator.get_name());
620626
#endif
621627

622628
EASTL_CT_ASSERT((nodeCount >= 1) && (bucketCount >= 2));
@@ -662,7 +668,7 @@ namespace eastl
662668
mAllocator.copy_overflow_allocator(x.mAllocator);
663669

664670
#if EASTL_NAME_ENABLED
665-
mAllocator.set_name(x.mAllocator.get_name());
671+
mAllocator.set_name(x.mAllocator.get_name());
666672
#endif
667673

668674
EASTL_CT_ASSERT((nodeCount >= 1) && (bucketCount >= 2));
@@ -687,7 +693,7 @@ namespace eastl
687693
base_type::set_max_load_factor(10000.f); // Set it so that we will never resize.
688694

689695
#if EASTL_NAME_ENABLED
690-
mAllocator.set_name(EASTL_FIXED_HASH_MULTIMAP_DEFAULT_NAME);
696+
mAllocator.set_name(EASTL_FIXED_HASH_MULTIMAP_DEFAULT_NAME);
691697
#endif
692698

693699
mAllocator.reset(mNodeBuffer);

0 commit comments

Comments
 (0)