2828
2929namespace jsonifier_internal {
3030
31- template <uint64_t multiple> jsonifier_inline uint64_t roundUpToMultiple (uint64_t num) {
31+ template <uint64_t multiple> JSONIFIER_INLINE uint64_t roundUpToMultiple (uint64_t num) {
3232 uint64_t remainder = num % multiple;
3333 return remainder == 0 ? num : num + (multiple - remainder );
3434 }
3535
36- template <int64_t multiple> jsonifier_inline uint64_t roundDownToMultiple (int64_t value) {
36+ template <int64_t multiple> JSONIFIER_INLINE uint64_t roundDownToMultiple (int64_t value) {
3737 return static_cast <uint64_t >(value >= 0 ? (value / multiple) * multiple : ((value - multiple + 1 ) / multiple) * multiple);
3838 }
3939
40- template <typename value_type_new> class aligned_allocator : public std ::pmr::polymorphic_allocator<value_type_new> {
40+ #if defined(_MSC_VER)
41+
42+ template <typename value_type> JSONIFIER_INLINE value_type* jsonifierAlignedAlloc (uint64_t size) {
43+ return static_cast <value_type*>(_aligned_malloc (roundUpToMultiple<BytesPerStep>(size * sizeof (value_type)), BytesPerStep));
44+ }
45+
46+ JSONIFIER_INLINE void jsonifierFree (void * ptr) {
47+ _aligned_free (ptr);
48+ }
49+
50+ #else
51+
52+ template <typename value_type> JSONIFIER_INLINE value_type* jsonifierAlignedAlloc (uint64_t size) {
53+ return static_cast <value_type*>(std::aligned_alloc (BytesPerStep, roundUpToMultiple<BytesPerStep>(size * sizeof (value_type))));
54+ }
55+
56+ JSONIFIER_INLINE void jsonifierFree (void * ptr) {
57+ free (ptr);
58+ }
59+
60+ #endif
61+
62+ template <typename value_type_new> class aligned_allocator {
4163 public:
4264 using value_type = value_type_new;
4365 using pointer = value_type*;
4466 using size_type = uint64_t ;
45- using allocator = std::pmr::polymorphic_allocator<value_type_new>;
4667
47- jsonifier_inline pointer allocate (size_type n) {
68+ JSONIFIER_INLINE pointer allocate (size_type n) {
4869 if (n == 0 ) {
4970 return nullptr ;
5071 }
51- return static_cast <pointer>( allocator::allocate_bytes (roundUpToMultiple<BytesPerStep>(n * sizeof (value_type)), BytesPerStep) );
72+ return jsonifierAlignedAlloc<value_type>(n );
5273 }
5374
54- jsonifier_inline void deallocate (pointer ptr, size_type n ) {
75+ JSONIFIER_INLINE void deallocate (pointer ptr, size_type) {
5576 if (ptr) {
56- allocator::deallocate_bytes (ptr, roundUpToMultiple<BytesPerStep>(n * sizeof (value_type)), BytesPerStep );
77+ jsonifierFree (ptr);
5778 }
5879 }
5980
60- template <typename ... Args> jsonifier_inline void construct (pointer p, Args &&... args) {
61- new (p) value_type (std::forward<Args >(args)...);
81+ template <typename ... arg_types> JSONIFIER_INLINE void construct (pointer p, arg_types &&... args) {
82+ new (p) value_type (std::forward<arg_types >(args)...);
6283 }
6384
64- jsonifier_inline void destroy (pointer p) {
85+ JSONIFIER_INLINE void destroy (pointer p) {
6586 p->~value_type ();
6687 }
6788 };
@@ -74,23 +95,23 @@ namespace jsonifier_internal {
7495 using allocator = aligned_allocator<value_type>;
7596 using allocator_traits = std::allocator_traits<allocator>;
7697
77- jsonifier_inline pointer allocate (size_type count) {
98+ JSONIFIER_INLINE pointer allocate (size_type count) {
7899 return allocator_traits::allocate (*this , count);
79100 }
80101
81- jsonifier_inline void deallocate (pointer ptr, size_type count) {
102+ JSONIFIER_INLINE void deallocate (pointer ptr, size_type count) {
82103 allocator_traits::deallocate (*this , ptr, count);
83104 }
84105
85- template <typename ... Args> jsonifier_inline void construct (pointer ptr, Args &&... args) {
86- allocator_traits::construct (*this , ptr, std::forward<Args >(args)...);
106+ template <typename ... arg_types> JSONIFIER_INLINE void construct (pointer ptr, arg_types &&... args) {
107+ allocator_traits::construct (*this , ptr, std::forward<arg_types >(args)...);
87108 }
88109
89- jsonifier_inline static size_type maxSize () {
90- return allocator_traits::max_size (allocator{} );
110+ JSONIFIER_INLINE size_type maxSize () {
111+ return allocator_traits::max_size (* this );
91112 }
92113
93- jsonifier_inline void destroy (pointer ptr) {
114+ JSONIFIER_INLINE void destroy (pointer ptr) {
94115 allocator_traits::destroy (*this , ptr);
95116 }
96117 };
0 commit comments