Skip to content
This repository was archived by the owner on Nov 30, 2022. It is now read-only.

Apply fix for gcc-12 #13

Open
alesapin wants to merge 2 commits into
base: clickhouse
Choose a base branch
from
Open

Apply fix for gcc-12 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6274637
Apply fix for gcc-12
alesapin May 9, 2022
e54c4c7
Trying to check that gcc-12 can build clickhouse
alesapin May 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion include/__hash_table
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2063,7 +2063,8 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc>::__emplace_unique_key_args(_Key const&
size_type __bc = bucket_count();
bool __inserted = false;
__next_pointer __nd;
size_t __chash;
// TODO remove me, just trying to make gcc-12 build this code.
size_t __chash = 0;
if (__bc != 0)
{
__chash = __constrain_hash(__hash, __bc);
Expand Down
22 changes: 2 additions & 20 deletions include/string
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,21 +635,6 @@ struct __can_be_converted_to_string_view : public _BoolConstant<
!is_convertible<const _Tp&, const _CharT*>::value
> {};

#ifdef _LIBCPP_ABI_ALTERNATE_STRING_LAYOUT

template <class _CharT, size_t = sizeof(_CharT)>
struct __padding
{
unsigned char __xx[sizeof(_CharT)-1];
};

template <class _CharT>
struct __padding<_CharT, 1>
{
};

#endif // _LIBCPP_ABI_ALTERNATE_STRING_LAYOUT

#ifndef _LIBCPP_HAS_NO_CHAR8_T
typedef basic_string<char8_t> u8string;
#endif
Expand Down Expand Up @@ -723,11 +708,8 @@ private:
struct __short
{
value_type __data_[__min_cap];
struct
: __padding<value_type>
{
unsigned char __size_;
};
unsigned char __padding[sizeof(value_type) - 1];
unsigned char __size_;
};

#else
Expand Down