Skip to content

Commit 3a3fedf

Browse files
committed
fix compile error
1 parent 82c59a3 commit 3a3fedf

File tree

3 files changed

+3
-26
lines changed

3 files changed

+3
-26
lines changed

.github/workflows/linux.yml

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -23,36 +23,16 @@ jobs:
2323
fail-fast: false
2424
matrix:
2525
os: [ubuntu-20.04]
26-
compiler: [clang-6, clang-10-libc++, gcc-7, gcc-8, gcc-9]
26+
compiler: [clang-10-libc++]
2727
ssl: [ssl_ON, ssl_OFF]
2828
dependencies: [dependencies_BUILT_IN]
2929

3030
include:
31-
- compiler: clang-6
32-
COMPILER_INSTALL: clang-6.0 libc++-dev
33-
C_COMPILER: clang-6.0
34-
CXX_COMPILER: clang++-6.0
35-
3631
- compiler: clang-10-libc++
3732
COMPILER_INSTALL: clang-10 libc++-dev
3833
C_COMPILER: clang-10
3934
CXX_COMPILER: clang++-10
4035

41-
- compiler: gcc-7
42-
COMPILER_INSTALL: gcc-7 g++-7
43-
C_COMPILER: gcc-7
44-
CXX_COMPILER: g++-7
45-
46-
- compiler: gcc-8
47-
COMPILER_INSTALL: gcc-8 g++-8
48-
C_COMPILER: gcc-8
49-
CXX_COMPILER: g++-8
50-
51-
- compiler: gcc-9
52-
COMPILER_INSTALL: gcc-9 g++-9
53-
C_COMPILER: gcc-9
54-
CXX_COMPILER: g++-9
55-
5636
- ssl: ssl_ON
5737
SSL_CMAKE_OPTION: -D WITH_OPENSSL=ON
5838

clickhouse/base/compressed.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,7 @@ CompressedInput::CompressedInput(InputStream* input)
2727

2828
CompressedInput::~CompressedInput() {
2929
if (!mem_.Exhausted()) {
30-
#if __cplusplus < 201703L
31-
if (!std::uncaught_exception()) {
32-
#else
3330
if (!std::uncaught_exceptions()) {
34-
#endif
3531
throw LZ4Error("some data was not read");
3632
}
3733
}

clickhouse/columns/lowcardinality.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,8 @@ void ColumnLowCardinality::SavePrefix(OutputStream* output) {
346346
}
347347

348348
void ColumnLowCardinality::SaveBody(OutputStream* output) {
349-
const uint64_t index_serialization_type = indexTypeFromIndexColumn(*index_column_) | IndexFlag::HasAdditionalKeysBit;
349+
const uint64_t index_serialization_type = static_cast<uint64_t>(indexTypeFromIndexColumn(*index_column_))
350+
| static_cast<uint64_t>(IndexFlag::HasAdditionalKeysBit);
350351
WireFormat::WriteFixed(*output, index_serialization_type);
351352

352353
const uint64_t number_of_keys = dictionary_column_->Size();

0 commit comments

Comments
 (0)