From 224ed0ca670ccc00921caa7f513b84bb0c28f9d9 Mon Sep 17 00:00:00 2001 From: Alexander Kuzmenkov Date: Tue, 6 Aug 2019 17:59:19 +0300 Subject: [PATCH] Revert wrong merge commit. This reverts commit 9cd9c694496d5ae793718c9577ec8bb3a5fedc77. --- dbms/src/DataTypes/IDataType.h | 1 + dbms/src/Functions/GeoUtils.cpp | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dbms/src/DataTypes/IDataType.h b/dbms/src/DataTypes/IDataType.h index 359874c5660..e5020fe19de 100644 --- a/dbms/src/DataTypes/IDataType.h +++ b/dbms/src/DataTypes/IDataType.h @@ -602,6 +602,7 @@ inline bool isStringOrFixedString(const T & data_type) return WhichDataType(data_type).isStringOrFixedString(); } + inline bool isNotDecimalButComparableToDecimal(const DataTypePtr & data_type) { WhichDataType which(data_type); diff --git a/dbms/src/Functions/GeoUtils.cpp b/dbms/src/Functions/GeoUtils.cpp index d08216ad5c6..5134343dae0 100644 --- a/dbms/src/Functions/GeoUtils.cpp +++ b/dbms/src/Functions/GeoUtils.cpp @@ -1,8 +1,6 @@ #include #include -#include - namespace {