From 78c867a14744b5af2db8d37caf7804fc2057ea51 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Fri, 6 Jan 2017 20:11:41 +0300
Subject: [PATCH] Miscellaneous [#METR-2944].

---
 dbms/include/DB/Core/FieldVisitors.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dbms/include/DB/Core/FieldVisitors.h b/dbms/include/DB/Core/FieldVisitors.h
index ad4f6070ba0..460f4f527db 100644
--- a/dbms/include/DB/Core/FieldVisitors.h
+++ b/dbms/include/DB/Core/FieldVisitors.h
@@ -28,7 +28,7 @@ struct StaticVisitor
 
 /// F is template parameter, to allow universal reference for field, that is useful for const and non-const values.
 template <typename Visitor, typename F>
-typename Visitor::ResultType apply_visitor(Visitor && visitor, F && field)
+typename std::decay<Visitor>::type::ResultType apply_visitor(Visitor && visitor, F && field)
 {
 	switch (field.getType())
 	{
@@ -47,7 +47,7 @@ typename Visitor::ResultType apply_visitor(Visitor && visitor, F && field)
 
 
 template <typename Visitor, typename F1, typename F2>
-static typename Visitor::ResultType apply_binary_visitor_impl(Visitor && visitor, F1 && field1, F2 && field2)
+static typename std::decay<Visitor>::type::ResultType apply_binary_visitor_impl(Visitor && visitor, F1 && field1, F2 && field2)
 {
 	switch (field2.getType())
 	{
@@ -65,7 +65,7 @@ static typename Visitor::ResultType apply_binary_visitor_impl(Visitor && visitor
 }
 
 template <typename Visitor, typename F1, typename F2>
-typename Visitor::ResultType apply_visitor(Visitor && visitor, F1 && field1, F2 && field2)
+typename std::decay<Visitor>::type::ResultType apply_visitor(Visitor && visitor, F1 && field1, F2 && field2)
 {
 	switch (field1.getType())
 	{