thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-17 21:24:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'prepare-clang-11' into git-to-clickhouse

Browse Source
This commit is contained in:
Alexey Milovidov 2020-09-04 09:12:27 +03:00
commit d3fa22280a
5 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/capnproto-cmake/CMakeLists.txt
View File

@ -74,10 +74,9 @@ target_link_libraries(capnpc PUBLIC capnp)
# The library has substandard code
if (COMPILER_GCC)
set (SUPPRESS_WARNINGS -Wno-non-virtual-dtor -Wno-sign-compare -Wno-strict-aliasing -Wno-maybe-uninitialized
-Wno-deprecated-declarations -Wno-class-memaccess)
set (SUPPRESS_WARNINGS -w)
elseif (COMPILER_CLANG)
set (SUPPRESS_WARNINGS -Wno-non-virtual-dtor -Wno-sign-compare -Wno-strict-aliasing -Wno-deprecated-declarations)
set (SUPPRESS_WARNINGS -w)
set (CAPNP_PRIVATE_CXX_FLAGS -fno-char8_t)
endif ()

2
src/Common/ZooKeeper/ZooKeeperImpl.cpp
View File

@ -424,7 +424,7 @@ void ZooKeeperRequest::write(WriteBuffer & out) const
struct ZooKeeperResponse : virtual Response
{
virtual ~ZooKeeperResponse() = default;
virtual ~ZooKeeperResponse() override = default;
virtual void readImpl(ReadBuffer &) = 0;
};

2
src/Common/ZooKeeper/ZooKeeperImpl.h
View File

@ -260,7 +260,7 @@ struct ZooKeeperRequest : virtual Request
ZooKeeperRequest() = default;
ZooKeeperRequest(const ZooKeeperRequest &) = default;
virtual ~ZooKeeperRequest() = default;
virtual ~ZooKeeperRequest() override = default;
virtual ZooKeeper::OpNum getOpNum() const = 0;

2
src/Core/MySQL/MySQLReplication.h
View File

@ -499,7 +499,7 @@ namespace MySQLReplication
virtual BinlogEventPtr readOneEvent() = 0;
virtual void setReplicateDatabase(String db) = 0;
virtual void setGTIDSets(GTIDSets sets) = 0;
virtual ~IFlavor() = default;
virtual ~IFlavor() override = default;
};
class MySQLFlavor : public IFlavor

12
src/Functions/GatherUtils/Sources.h
View File

@ -122,9 +122,15 @@ struct NumericArraySource : public ArraySourceImpl<NumericArraySource<T>>
}
};
/// The method can be virtual or not depending on the template parameter.
#if !__clang__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wsuggest-override"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wsuggest-override"
#elif __clang_major__ >= 11
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wsuggest-override"
#pragma GCC diagnostic ignored "-Wsuggest-destructor-override"
#endif
template <typename Base>
@ -205,7 +211,7 @@ struct ConstSource : public Base
}
};
#if !__clang__
#if !__clang__ || __clang_major__ >= 11
#pragma GCC diagnostic pop
#endif