From a25f742b338faa32587ac2356c7ecdb7498e56f8 Mon Sep 17 00:00:00 2001
From: Olivier Parcollet <olivier.parcollet@cea.fr>
Date: Wed, 26 Feb 2014 17:49:44 +0100
Subject: [PATCH] Correction: left some C++14 used in debug...

- decltype(auto) was left behind in 2 places...
---
 triqs/clef/clef.hpp | 6 ++----
 triqs/gfs/bz.hpp    | 4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/triqs/clef/clef.hpp b/triqs/clef/clef.hpp
index ff512ac5..257aafc1 100644
--- a/triqs/clef/clef.hpp
+++ b/triqs/clef/clef.hpp
@@ -294,10 +294,8 @@ namespace triqs { namespace clef {
 
  template <typename Tag, typename... Childs, typename... Pairs> struct evaluator_node_gal<2, expr<Tag, Childs...>, Pairs...> {
   static constexpr bool is_lazy = __or(evaluator<Childs, Pairs...>::is_lazy...);
-  decltype(auto) operator()(expr<Tag, Childs...> const &ex,
-                            Pairs const &... pairs) const {
-    return op_dispatch<Tag, is_lazy> {}(eval(std::get<0>(ex.childs), pairs...), eval(std::get<1>(ex.childs), pairs...));
-  }
+  auto operator()(expr<Tag, Childs...> const& ex, Pairs const&... pairs) const
+     DECL_AND_RETURN(op_dispatch<Tag, is_lazy> {}(eval(std::get<0>(ex.childs), pairs...), eval(std::get<1>(ex.childs), pairs...)));
  };
 
 // the general case for more than 2 nodes. I put 1 and 2 nodes apart, just because it is the most frequent
diff --git a/triqs/gfs/bz.hpp b/triqs/gfs/bz.hpp
index 7aa97206..b4893999 100644
--- a/triqs/gfs/bz.hpp
+++ b/triqs/gfs/bz.hpp
@@ -55,8 +55,8 @@ namespace gfs {
    template <typename MeshType> evaluator_fnt_on_mesh(MeshType const &m, lattice::k_t const &k) { 
     n = m.locate_neighbours(k); // TO BE IMPROVED
    }
-   //template <typename F> auto operator()(F const &f) const DECL_AND_RETURN(f(k));
-   template <typename F> decltype(auto) operator()(F const &f) const { return f(n); }
+   template <typename F> auto operator()(F const &f) const DECL_AND_RETURN(f(n));
+   //template <typename F> decltype(auto) operator()(F const &f) const { return f(n); }
   };
 
   // ------------- evaluator  -------------------