From 817a8195db18c35f2530b6f1e52ba8568821009f Mon Sep 17 00:00:00 2001
From: "l.fedorov" <l.fedorov@corp.mail.ru>
Date: Wed, 23 Oct 2019 16:10:41 +0000
Subject: [PATCH] Use vanill cttrie with pragma metaheader

---
 3party/cttrie/cttrie.h    |  4 ++--
 3party/cttrie/cttrie.hpp  | 17 +++++++++++++++++
 3party/cttrie/getindex.h  |  4 ++--
 generator/osm_element.cpp |  2 +-
 4 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 3party/cttrie/cttrie.hpp

diff --git a/3party/cttrie/cttrie.h b/3party/cttrie/cttrie.h
index 3946c8b..8a0051f 100644
--- a/3party/cttrie/cttrie.h
+++ b/3party/cttrie/cttrie.h
@@ -119,13 +119,13 @@ namespace detail {
 
   // handle trivial cases already here
   template <typename Stringview,typename FnE,typename... Fns>
-  constexpr auto checkTrie(TrieNode<>,Stringview&&,FnE&& fne,Fns&&...) // possible via Transition<-1>
+  constexpr auto checkTrie(TrieNode<> trie,Stringview&& str,FnE&& fne,Fns&&... fns) // possible via Transition<-1>
     -> decltype(fne())
   {
     return fne();
   }
   template <int Char,typename Next,typename Stringview,typename FnE,typename... Fns,typename =Sfinae<(Char>=0)>>
-  constexpr auto checkTrie(TrieNode<Transition<Char,Next>>,Stringview&& str,FnE&& fne,Fns&&... fns)
+  constexpr auto checkTrie(TrieNode<Transition<Char,Next>> trie,Stringview&& str,FnE&& fne,Fns&&... fns)
     -> decltype(fne())
   {
     return (!str.empty() && (*str==Char)) ? checkTrie(Next(),str.substr(1),(FnE&&)fne,(Fns&&)fns...) : fne();
diff --git a/3party/cttrie/cttrie.hpp b/3party/cttrie/cttrie.hpp
new file mode 100644
index 0000000..9cf594c
--- /dev/null
+++ b/3party/cttrie/cttrie.hpp
@@ -0,0 +1,17 @@
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshorten-64-to-32"
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-parameter"
+#include "3party/cttrie/cttrie.h"
+#pragma clang diagnostic pop
+#pragma clang diagnostic pop
+#elif defined(__GNUC__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#include "3party/cttrie/cttrie.h"
+#pragma GCC diagnostic pop
+#endif
+
+
+
diff --git a/3party/cttrie/getindex.h b/3party/cttrie/getindex.h
index eaab2b4..7f5c68b 100644
--- a/3party/cttrie/getindex.h
+++ b/3party/cttrie/getindex.h
@@ -17,13 +17,13 @@ namespace detail {
   }
 
   template <typename T0,typename... Ts>
-  constexpr T0&& get_index_impl(int_c<0>,T0&& t0,Ts&&...)
+  constexpr T0&& get_index_impl(int_c<0>,T0&& t0,Ts&&... ts)
   {
     return (T0&&)t0;
   }
 
   template <unsigned int I,typename T0,typename... Ts>
-  constexpr auto get_index_impl(int_c<I>,T0&&,Ts&&... ts)
+  constexpr auto get_index_impl(int_c<I>,T0&& t0,Ts&&... ts)
     -> decltype(get_index_impl(int_c<I-1>(),(Ts&&)ts...))
   {
     return get_index_impl(int_c<I-1>(),(Ts&&)ts...);
diff --git a/generator/osm_element.cpp b/generator/osm_element.cpp
index 088c3a7..570ddad 100644
--- a/generator/osm_element.cpp
+++ b/generator/osm_element.cpp
@@ -3,7 +3,7 @@
 #include "base/string_utils.hpp"
 #include "coding/parse_xml.hpp"
 
-#include "3party/cttrie/cttrie.h"
+#include "3party/cttrie/cttrie.hpp"
 
 #include <algorithm>
 #include <cstring>