Fixed build with gcc-7.1 [#CLICKHOUSE-2].

This commit is contained in:
Alexey Milovidov 2017-08-01 04:25:03 +03:00
parent 844990db27
commit a6cb383c4f
3 changed files with 10 additions and 6 deletions

View File

@ -38,6 +38,10 @@ class NamesAndTypesList : public std::list<NameAndTypePair>
public:
using std::list<NameAndTypePair>::list;
/// Without this constructor, gcc 7.1.0 get confused.
template <typename Iterator>
NamesAndTypesList(Iterator begin, Iterator end) : std::list<NameAndTypePair>(begin, end) {}
void readText(ReadBuffer & buf);
void writeText(WriteBuffer & buf) const;

View File

@ -52,13 +52,13 @@ try
" GROUP BY SearchPhrase"
" ORDER BY count() DESC"
" LIMIT 10",
context, QueryProcessingStage::Complete);
context, false, QueryProcessingStage::Complete);
BlockIO io2 = executeQuery(
"SELECT count()"
" FROM hits"
" WHERE SearchPhrase != ''",
context, QueryProcessingStage::Complete);
context, false, QueryProcessingStage::Complete);
WriteBufferFromFileDescriptor wb(STDOUT_FILENO);

View File

@ -165,7 +165,7 @@ private:
};
template <typename Name, Float64(&Function)(Float64)>
template <typename Name, Float64(Function)(Float64)>
struct UnaryFunctionPlain
{
static constexpr auto name = Name::name;
@ -180,7 +180,7 @@ struct UnaryFunctionPlain
#if USE_VECTORCLASS
template <typename Name, Vec2d(&Function)(const Vec2d &)>
template <typename Name, Vec2d(Function)(const Vec2d &)>
struct UnaryFunctionVectorized
{
static constexpr auto name = Name::name;
@ -437,7 +437,7 @@ private:
};
template <typename Name, Float64(&Function)(Float64, Float64)>
template <typename Name, Float64(Function)(Float64, Float64)>
struct BinaryFunctionPlain
{
static constexpr auto name = Name::name;
@ -452,7 +452,7 @@ struct BinaryFunctionPlain
#if USE_VECTORCLASS
template <typename Name, Vec2d(&Function)(const Vec2d &, const Vec2d &)>
template <typename Name, Vec2d(Function)(const Vec2d &, const Vec2d &)>
struct BinaryFunctionVectorized
{
static constexpr auto name = Name::name;