From 3a3fedfdcb70fb2e87eb0e33e7e1689f41722a6d Mon Sep 17 00:00:00 2001 From: wangwei <1261385937@qq.com> Date: Sat, 20 Apr 2024 14:04:50 +0800 Subject: [PATCH] fix compile error --- .github/workflows/linux.yml | 22 +--------------------- clickhouse/base/compressed.cpp | 4 ---- clickhouse/columns/lowcardinality.cpp | 3 ++- 3 files changed, 3 insertions(+), 26 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 9994762a..6128f14d 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -23,36 +23,16 @@ jobs: fail-fast: false matrix: os: [ubuntu-20.04] - compiler: [clang-6, clang-10-libc++, gcc-7, gcc-8, gcc-9] + compiler: [clang-10-libc++] ssl: [ssl_ON, ssl_OFF] dependencies: [dependencies_BUILT_IN] include: - - compiler: clang-6 - COMPILER_INSTALL: clang-6.0 libc++-dev - C_COMPILER: clang-6.0 - CXX_COMPILER: clang++-6.0 - - compiler: clang-10-libc++ COMPILER_INSTALL: clang-10 libc++-dev C_COMPILER: clang-10 CXX_COMPILER: clang++-10 - - compiler: gcc-7 - COMPILER_INSTALL: gcc-7 g++-7 - C_COMPILER: gcc-7 - CXX_COMPILER: g++-7 - - - compiler: gcc-8 - COMPILER_INSTALL: gcc-8 g++-8 - C_COMPILER: gcc-8 - CXX_COMPILER: g++-8 - - - compiler: gcc-9 - COMPILER_INSTALL: gcc-9 g++-9 - C_COMPILER: gcc-9 - CXX_COMPILER: g++-9 - - ssl: ssl_ON SSL_CMAKE_OPTION: -D WITH_OPENSSL=ON diff --git a/clickhouse/base/compressed.cpp b/clickhouse/base/compressed.cpp index b5cefe4c..00bb58d6 100644 --- a/clickhouse/base/compressed.cpp +++ b/clickhouse/base/compressed.cpp @@ -27,11 +27,7 @@ CompressedInput::CompressedInput(InputStream* input) CompressedInput::~CompressedInput() { if (!mem_.Exhausted()) { -#if __cplusplus < 201703L - if (!std::uncaught_exception()) { -#else if (!std::uncaught_exceptions()) { -#endif throw LZ4Error("some data was not read"); } } diff --git a/clickhouse/columns/lowcardinality.cpp b/clickhouse/columns/lowcardinality.cpp index 19369d33..06ca47df 100644 --- a/clickhouse/columns/lowcardinality.cpp +++ b/clickhouse/columns/lowcardinality.cpp @@ -346,7 +346,8 @@ void ColumnLowCardinality::SavePrefix(OutputStream* output) { } void ColumnLowCardinality::SaveBody(OutputStream* output) { - const uint64_t index_serialization_type = indexTypeFromIndexColumn(*index_column_) | IndexFlag::HasAdditionalKeysBit; + const uint64_t index_serialization_type = static_cast(indexTypeFromIndexColumn(*index_column_)) + | static_cast(IndexFlag::HasAdditionalKeysBit); WireFormat::WriteFixed(*output, index_serialization_type); const uint64_t number_of_keys = dictionary_column_->Size();