From a32c2e14a67ad87496eb8da139bbf7afe26ef9fb Mon Sep 17 00:00:00 2001 From: Alexey Milovidov Date: Wed, 18 Jul 2018 20:16:04 +0300 Subject: [PATCH 1/2] Removed unused method that became incompatible [#CLICKHOUSE-2] --- dbms/src/IO/ReadHelpers.h | 1 - 1 file changed, 1 deletion(-) diff --git a/dbms/src/IO/ReadHelpers.h b/dbms/src/IO/ReadHelpers.h index c19fa173940..40af563d19b 100644 --- a/dbms/src/IO/ReadHelpers.h +++ b/dbms/src/IO/ReadHelpers.h @@ -640,7 +640,6 @@ inline void readBinary(String & x, ReadBuffer & buf) { readStringBinary(x, buf); inline void readBinary(UInt128 & x, ReadBuffer & buf) { readPODBinary(x, buf); } inline void readBinary(UInt256 & x, ReadBuffer & buf) { readPODBinary(x, buf); } inline void readBinary(LocalDate & x, ReadBuffer & buf) { readPODBinary(x, buf); } -inline void readBinary(LocalDateTime & x, ReadBuffer & buf) { readPODBinary(x, buf); } /// Generic methods to read value in text tab-separated format. From dabbad9e428882773705a8eb8aa07ce60cb4d8c7 Mon Sep 17 00:00:00 2001 From: Alexey Milovidov Date: Wed, 18 Jul 2018 20:20:35 +0300 Subject: [PATCH 2/2] Fixed build [#CLICKHOUSE-2] --- libs/libcommon/include/common/LocalDateTime.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libcommon/include/common/LocalDateTime.h b/libs/libcommon/include/common/LocalDateTime.h index 44d24d16dbd..d5c800c621f 100644 --- a/libs/libcommon/include/common/LocalDateTime.h +++ b/libs/libcommon/include/common/LocalDateTime.h @@ -27,7 +27,7 @@ private: /// For struct to fill 8 bytes and for safe invocation of memcmp. /// NOTE We may use attribute packed instead, but it is less portable. - unsigned char pad [[maybe_unused]] = 0; + unsigned char pad = 0; void init(time_t time) { @@ -88,7 +88,7 @@ public: init(s.data(), s.size()); } - LocalDateTime() : m_year(0), m_month(0), m_day(0), m_hour(0), m_minute(0), m_second(0) + LocalDateTime() : m_year(0), m_month(0), m_day(0), m_hour(0), m_minute(0), m_second(0), pad(0) { }