LCPQ/dft_tools
3
0
Fork 0
mirror of https://github.com/triqs/dft_tools synced 2024-12-25 13:53:40 +01:00
Code Issues Releases Wiki Activity

gcc 4.6: correction

Browse Source 
- removing some test & tuple_tool which fail on old 4.6
For Ubuntu 12.04 compat.
This commit is contained in:
Olivier Parcollet 2013-09-08 15:17:18 +02:00
parent 2c542647fd
commit 4bbcbe35ef
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/triqs/utility/tuple_tools.cpp
View File

@ -109,6 +109,8 @@ int main(int argc, char **argv) {
}
#ifdef TRIQS_COMPILER_IS_C11_COMPLIANT
{ // filter
std::cout << " ----- filter ----"<< std::endl ;
auto t= std::make_tuple(0,1,2,3,4,"=5");
@ -160,6 +162,7 @@ int main(int argc, char **argv) {
std::cout << "replace 1,3,5"<< t << triqs::tuple::replace<1,3,5>(t,s)<< std::endl;
}
#endif
}

7
triqs/utility/tuple_tools.hpp
View File

@ -261,6 +261,8 @@ namespace triqs { namespace tuple {
template<typename F, typename T1, typename T2, typename R>
auto fold_on_zip (F && f,T1 const & t1, T2 const & t2, R && r) DECL_AND_RETURN( fold_on_zip_impl<std::tuple_size<T1>::value-1,T1,T2>()(std::forward<F>(f),t1,t2,std::forward<R>(r)));
#ifdef TRIQS_COMPILER_IS_C11_COMPLIANT
/**
* filter<int ... I>(t) :
* Given a tuple t, and integers, returns the tuple where the elements at initial position I are dropped.
@ -287,9 +289,7 @@ namespace triqs { namespace tuple {
template<typename Tu,int ...I> struct filter_t_tr : std::result_of< filter_impl<0,std::tuple_size<Tu>::value-1, I...>( Tu, std::tuple<>)>{};
#ifdef TRIQS_COMPILER_IS_C11_COMPLIANT
template<typename Tu,int ...I> using filter_t = typename filter_t_tr<Tu,I...>::type;
#endif
/**
* filter_out<int ... I>(t) :
@ -317,9 +317,7 @@ namespace triqs { namespace tuple {
template<typename Tu,int ...I> struct filter_out_t_tr : std::result_of< filter_out_impl<0,std::tuple_size<Tu>::value-1, I...>( Tu, std::tuple<>)>{};
#ifdef TRIQS_COMPILER_IS_C11_COMPLIANT
template<typename Tu,int ...I> using filter_out_t = typename filter_out_t_tr<Tu,I...>::type;
#endif
/**
* inverse_filter<int L, int ... I>(t,x)
@ -412,6 +410,7 @@ namespace triqs { namespace tuple {
template<int ...I, typename Tu, typename R>
auto replace(Tu const & tu, R const &r) DECL_AND_RETURN ( replace_impl<0,std::tuple_size<Tu>::value-1, I...>()(tu, std::make_tuple(),r));
#endif
/*
* print a tuple